Sat Apr 25 21:32:46 2009 UTC ()
Regen.


(joerg)
diff -r1.21 -r1.22 pkgsrc/pkgtools/pkg_install/files/admin/pkg_admin.cat1
diff -r1.5 -r1.6 pkgsrc/pkgtools/pkg_install/files/lib/pkg_install.conf.cat5.in

cvs diff -r1.21 -r1.22 pkgsrc/pkgtools/pkg_install/files/admin/Attic/pkg_admin.cat1 (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkg_install/files/admin/Attic/pkg_admin.cat1 2009/04/22 19:14:16 1.21
+++ pkgsrc/pkgtools/pkg_install/files/admin/Attic/pkg_admin.cat1 2009/04/25 21:32:45 1.22
@@ -79,33 +79,43 @@ OOPPTTIIOONNSS @@ -79,33 +79,43 @@ OOPPTTIIOONNSS
79 time. Symbolic links also have their integrity checked against 79 time. Symbolic links also have their integrity checked against
80 the recorded value at package installation time. If no addi- 80 the recorded value at package installation time. If no addi-
81 tional argument is given, the files of all installed packages are 81 tional argument is given, the files of all installed packages are
82 checked, else only the named packages will be checked (wildcards 82 checked, else only the named packages will be checked (wildcards
83 can be used here, see pkg_info(1)). 83 can be used here, see pkg_info(1)).
84 84
85 The packages' _+_C_O_N_T_E_N_T_S files will be parsed and the checksum 85 The packages' _+_C_O_N_T_E_N_T_S files will be parsed and the checksum
86 will be checked for every file found. A warning message is 86 will be checked for every file found. A warning message is
87 printed if the expected checksum differs from the checksum of the 87 printed if the expected checksum differs from the checksum of the
88 file on disk. Symbolic links are also checked, ensuring that the 88 file on disk. Symbolic links are also checked, ensuring that the
89 targets on disk are the same as the contents recorded at package 89 targets on disk are the same as the contents recorded at package
90 installation time. 90 installation time.
91 91
 92 cchheecckk--lliicceennssee _c_o_n_d_i_t_i_o_n
 93 Check if _c_o_n_d_i_t_i_o_n can be fulfilled with the currently set of
 94 accepted licenses. Prints either yes or no to stdout if the con-
 95 dition can be parsed, otherwise it exits with error.
 96
92 cchheecckk--ppkkgg--vvuullnneerraabbiilliittiieess [--ss] _f_i_l_e 97 cchheecckk--ppkkgg--vvuullnneerraabbiilliittiieess [--ss] _f_i_l_e
93 Check format and hashes in the pkg-vulnerabilities file _f_i_l_e. If 98 Check format and hashes in the pkg-vulnerabilities file _f_i_l_e. If
94 --ss is given, also check the embedded signature. 99 --ss is given, also check the embedded signature.
95 100
96 cchheecckk--ssiiggnnaattuurree _f_i_l_e _._._. 101 cchheecckk--ssiiggnnaattuurree _f_i_l_e _._._.
97 Reports if _f_i_l_e is a correctly signed package. 102 Reports if _f_i_l_e is a correctly signed package.
98 103
 104 cchheecckk--ssiinnggllee--lliicceennssee _l_i_c_c_e_n_s_e
 105 Check if _l_i_c_e_n_s_e is a valid license name and if it is in the set
 106 of acceptable licenses. Prints either yes or no to stdout if the
 107 condition can be parsed, otherwise it exits with error.
 108
99 ccoonnffiigg--vvaarr _v_a_r_i_a_b_l_e 109 ccoonnffiigg--vvaarr _v_a_r_i_a_b_l_e
100 Print the current value of _v_a_r_i_a_b_l_e as used after parsing the 110 Print the current value of _v_a_r_i_a_b_l_e as used after parsing the
101 configuration file. 111 configuration file.
102 112
103 ddeelleettee _p_k_g _._._. 113 ddeelleettee _p_k_g _._._.
104 For each listed package, remove all file entries in the package 114 For each listed package, remove all file entries in the package
105 database that belong to the package. This should be used only by 115 database that belong to the package. This should be used only by
106 pkg_view(1). 116 pkg_view(1).
107 117
108 dduummpp Dump the contents of the package database, similar to ppkkgg__iinnffoo 118 dduummpp Dump the contents of the package database, similar to ppkkgg__iinnffoo
109 --FF. Columns are printed for the key field used in the pkgdb - 119 --FF. Columns are printed for the key field used in the pkgdb -
110 the filename -, and the data field - the package the file belongs 120 the filename -, and the data field - the package the file belongs
111 to. 121 to.
@@ -216,14 +226,14 @@ FFIILLEESS @@ -216,14 +226,14 @@ FFIILLEESS
216 /var/db/pkg/pkgdb.byfile.db 226 /var/db/pkg/pkgdb.byfile.db
217 /var/db/pkg/<pkg>/+CONTENTS 227 /var/db/pkg/<pkg>/+CONTENTS
218 228
219SSEEEE AALLSSOO 229SSEEEE AALLSSOO
220 pkg_add(1), pkg_create(1), pkg_delete(1), pkg_info(1), pkg_view(1), 230 pkg_add(1), pkg_create(1), pkg_delete(1), pkg_info(1), pkg_view(1),
221 pkg_install.conf(5), pkgsrc(7) 231 pkg_install.conf(5), pkgsrc(7)
222 232
223HHIISSTTOORRYY 233HHIISSTTOORRYY
224 The ppkkgg__aaddmmiinn command first appeared in NetBSD 1.4. 234 The ppkkgg__aaddmmiinn command first appeared in NetBSD 1.4.
225 235
226AAUUTTHHOORRSS 236AAUUTTHHOORRSS
227 The ppkkgg__aaddmmiinn command was written by Hubert Feyrer. 237 The ppkkgg__aaddmmiinn command was written by Hubert Feyrer.
228 238
229NetBSD 5.0 May 30, 2008 NetBSD 5.0 239NetBSD 5.0 April 25, 2009 NetBSD 5.0

cvs diff -r1.5 -r1.6 pkgsrc/pkgtools/pkg_install/files/lib/Attic/pkg_install.conf.cat5.in (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkg_install/files/lib/Attic/pkg_install.conf.cat5.in 2009/03/10 20:33:43 1.5
+++ pkgsrc/pkgtools/pkg_install/files/lib/Attic/pkg_install.conf.cat5.in 2009/04/25 21:32:46 1.6
@@ -4,26 +4,29 @@ NNAAMMEE @@ -4,26 +4,29 @@ NNAAMMEE
4 ppkkgg__iinnssttaallll..ccoonnff -- configuration file for package installation tools 4 ppkkgg__iinnssttaallll..ccoonnff -- configuration file for package installation tools
5 5
6DDEESSCCRRIIPPTTIIOONN 6DDEESSCCRRIIPPTTIIOONN
7 The file ppkkgg__iinnssttaallll..ccoonnff contains system defaults for the package 7 The file ppkkgg__iinnssttaallll..ccoonnff contains system defaults for the package
8 installation tools as a list of variable-value pairs. Each line has the 8 installation tools as a list of variable-value pairs. Each line has the
9 format VARIABLE=VALUE. If the value consists of more than one line, each 9 format VARIABLE=VALUE. If the value consists of more than one line, each
10 line is prefixed with VARIABLE=. 10 line is prefixed with VARIABLE=.
11 11
12 The current value of a variable can be checked by running 12 The current value of a variable can be checked by running
13 ppkkgg__aaddmmiinn ccoonnffiigg--vvaarr VVAARRIIAABBLLEE 13 ppkkgg__aaddmmiinn ccoonnffiigg--vvaarr VVAARRIIAABBLLEE
14 14
15 The following variables are supported: 15 The following variables are supported:
16 16
 17 ACCEPTABLE_LICENSES
 18 List of licenses packages are allowed to carry.
 19
17 ACTIVE_FTP 20 ACTIVE_FTP
18 Force the use of active FTP. 21 Force the use of active FTP.
19 22
20 CERTIFICATE_ANCHOR_PKGS 23 CERTIFICATE_ANCHOR_PKGS
21 Path to the file containing the certificates used for validating 24 Path to the file containing the certificates used for validating
22 binary packages. A package is trusted when a certificate chain 25 binary packages. A package is trusted when a certificate chain
23 ends in one of the certificates contained in this file. The cer- 26 ends in one of the certificates contained in this file. The cer-
24 tificates must be PEM-encoded. 27 tificates must be PEM-encoded.
25 28
26 CERTIFICATE_ANCHOR_PKGVULN 29 CERTIFICATE_ANCHOR_PKGVULN
27 Analogous to CERTIFICATE_ANCHOR_PKGS. The _p_k_g_-_v_u_l_n_e_r_a_b_i_l_i_t_i_e_s is 30 Analogous to CERTIFICATE_ANCHOR_PKGS. The _p_k_g_-_v_u_l_n_e_r_a_b_i_l_i_t_i_e_s is
28 trusted when a certificate chain ends in one of the certificates 31 trusted when a certificate chain ends in one of the certificates
29 contained in this file. 32 contained in this file.
@@ -36,26 +39,30 @@ DDEESSCCRRIIPPTTIIOONN @@ -36,26 +39,30 @@ DDEESSCCRRIIPPTTIIOONN
36 CHECK_VULNERABILITIES 39 CHECK_VULNERABILITIES
37 Check for vulnerabilities when installing packages. Supported 40 Check for vulnerabilities when installing packages. Supported
38 values are: 41 values are:
39 42
40 never No check is performed. 43 never No check is performed.
41 44
42 always Passing the vulnerability check is required. A 45 always Passing the vulnerability check is required. A
43 missing pkg-vulnerabilities file is considered an 46 missing pkg-vulnerabilities file is considered an
44 error. 47 error.
45 48
46 interactive The user is always asked to confirm installation 49 interactive The user is always asked to confirm installation
47 of vulnerable packages. 50 of vulnerable packages.
48 51
 52 DEFAULT_ACCEPTABLE_LICENSES
 53 List of common Free and Open Source licenses packages are allowed
 54 to carry.
 55
49 GPG Path to gpg(1), which can be used to verify the signature in the 56 GPG Path to gpg(1), which can be used to verify the signature in the
50 _p_k_g_-_v_u_l_n_e_r_a_b_i_l_i_t_i_e_s file when running 57 _p_k_g_-_v_u_l_n_e_r_a_b_i_l_i_t_i_e_s file when running
51 ppkkgg__aaddmmiinn cchheecckk--ppkkgg--vvuullnneerraabbiilliittiieess --ss 58 ppkkgg__aaddmmiinn cchheecckk--ppkkgg--vvuullnneerraabbiilliittiieess --ss
52 or 59 or
53 ppkkgg__aaddmmiinn ffeettcchh--ppkkgg--vvuullnneerraabbiilliittiieess --ss 60 ppkkgg__aaddmmiinn ffeettcchh--ppkkgg--vvuullnneerraabbiilliittiieess --ss
54 It can also be used to verify and sign binary packages. 61 It can also be used to verify and sign binary packages.
55 62
56 GPG_KEYRING_PKGVULN 63 GPG_KEYRING_PKGVULN
57 Non-default keyring to use for verifying GPG signatures of 64 Non-default keyring to use for verifying GPG signatures of
58 _p_k_g_-_v_u_l_n_e_r_a_b_i_l_i_t_i_e_s. 65 _p_k_g_-_v_u_l_n_e_r_a_b_i_l_i_t_i_e_s.
59 66
60 GPG_KEYRING_SIGN 67 GPG_KEYRING_SIGN
61 Non-default keyring to use for signing packages with GPG. 68 Non-default keyring to use for signing packages with GPG.
@@ -110,14 +117,14 @@ DDEESSCCRRIIPPTTIIOONN @@ -110,14 +117,14 @@ DDEESSCCRRIIPPTTIIOONN
110 package can not be verified, the user is asked 117 package can not be verified, the user is asked
111 interactively. 118 interactively.
112 119
113 interactive The user is always asked interactively when 120 interactive The user is always asked interactively when
114 installing a package. 121 installing a package.
115 122
116FFIILLEESS 123FFIILLEESS
117 @SYSCONFDIR@/pkg_install.conf Default location for the file described in 124 @SYSCONFDIR@/pkg_install.conf Default location for the file described in
118 this manual page. 125 this manual page.
119 126
120SSEEEE AALLSSOO 127SSEEEE AALLSSOO
121 pkg_add(1), pkg_admin(1) 128 pkg_add(1), pkg_admin(1)
122 129
123NetBSD 5.0 February 27, 2009 NetBSD 5.0 130NetBSD 5.0 April 25, 2009 NetBSD 5.0