Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Import pkg_install from current pkgsrc.

Licence changes and less warnings when opsys doesn't match build
host opsys version, and documentation updates.
  • Loading branch information...
commit cdefe20845f5b522e2b380d6b064eb86159d1e05 1 parent a6e09af
authored April 20, 2013
8  external/bsd/pkg_install/dist/add/perform.c
... ...
@@ -1,4 +1,4 @@
1  
-/*	$NetBSD: perform.c,v 1.1.1.20 2012/02/21 18:25:14 wiz Exp $	*/
  1
+/*	$NetBSD: perform.c,v 1.1.1.21 2013/04/20 15:26:52 wiz Exp $	*/
2 2
 #if HAVE_CONFIG_H
3 3
 #include "config.h"
4 4
 #endif
@@ -6,7 +6,7 @@
6 6
 #if HAVE_SYS_CDEFS_H
7 7
 #include <sys/cdefs.h>
8 8
 #endif
9  
-__RCSID("$NetBSD: perform.c,v 1.1.1.20 2012/02/21 18:25:14 wiz Exp $");
  9
+__RCSID("$NetBSD: perform.c,v 1.1.1.21 2013/04/20 15:26:52 wiz Exp $");
10 10
 
11 11
 /*-
12 12
  * Copyright (c) 2003 Grant Beattie <grant@NetBSD.org>
@@ -156,6 +156,10 @@ compatible_platform(const char *opsys, const char *host, const char *package)
156 156
     if (strcmp(host, package) == 0)
157 157
 	return 1;
158 158
 
  159
+    /* accept, if host version is a minor release of package version */
  160
+    if (strncmp(host, package, strlen(package)) == 0)
  161
+	return 1;
  162
+
159 163
     /* find offset of first difference */
160 164
     for (i=0; (host[i] != '\0') && (host[i] == package[i]);)
161 165
 	i++;
8  external/bsd/pkg_install/dist/admin/pkg_admin.1
... ...
@@ -1,4 +1,4 @@
1  
-.\"	$NetBSD: pkg_admin.1,v 1.1.1.11 2010/06/26 00:14:27 joerg Exp $
  1
+.\"	$NetBSD: pkg_admin.1,v 1.1.1.12 2013/04/20 15:26:52 wiz Exp $
2 2
 .\"
3 3
 .\" Copyright (c) 1999-2010 The NetBSD Foundation, Inc.
4 4
 .\" All rights reserved.
@@ -34,7 +34,7 @@
34 34
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
35 35
 .\" POSSIBILITY OF SUCH DAMAGE.
36 36
 .\"
37  
-.Dd June 16, 2010
  37
+.Dd December 14, 2012
38 38
 .Dt PKG_ADMIN 1
39 39
 .Os
40 40
 .Sh NAME
@@ -257,7 +257,9 @@ matches
257 257
 .Ar pattern ,
258 258
 otherwise returns false.
259 259
 .It Cm rebuild
260  
-Rebuild the package database mapping from scratch.
  260
+Rebuild the package database mapping from scratch, using the
  261
+.Pa +CONTENTS
  262
+files of the installed packages.
261 263
 This option is only intended for recovery after system crashes
262 264
 during package installation and removal.
263 265
 .It Cm rebuild-tree
6  external/bsd/pkg_install/dist/info/main.c
... ...
@@ -1,4 +1,4 @@
1  
-/*	$NetBSD: main.c,v 1.1.1.8 2010/01/30 21:33:36 joerg Exp $	*/
  1
+/*	$NetBSD: main.c,v 1.1.1.9 2013/04/20 15:26:53 wiz Exp $	*/
2 2
 
3 3
 #if HAVE_CONFIG_H
4 4
 #include "config.h"
@@ -7,7 +7,7 @@
7 7
 #if HAVE_SYS_CDEFS_H
8 8
 #include <sys/cdefs.h>
9 9
 #endif
10  
-__RCSID("$NetBSD: main.c,v 1.1.1.8 2010/01/30 21:33:36 joerg Exp $");
  10
+__RCSID("$NetBSD: main.c,v 1.1.1.9 2013/04/20 15:26:53 wiz Exp $");
11 11
 
12 12
 /*
13 13
  *
@@ -55,7 +55,7 @@ static void
55 55
 usage(void)
56 56
 {
57 57
 	fprintf(stderr, "%s\n%s\n%s\n%s\n",
58  
-	    "usage: pkg_info [-BbcDdFfhIikLmNnpqrRSsVvX] [-e package] [-E package]",
  58
+	    "usage: pkg_info [-BbcDdFfhIikLmNnpqRrSsVvX] [-E pkg-name] [-e pkg-name]",
59 59
 	    "                [-K pkg_dbdir] [-l prefix] pkg-name ...",
60 60
 	    "       pkg_info [-a | -u] [flags]",
61 61
 	    "       pkg_info [-Q variable] pkg-name ...");
154  external/bsd/pkg_install/dist/info/pkg_info.1
... ...
@@ -1,4 +1,4 @@
1  
-.\" $NetBSD: pkg_info.1,v 1.1.1.5 2010/04/23 20:54:09 joerg Exp $
  1
+.\" $NetBSD: pkg_info.1,v 1.1.1.6 2013/04/20 15:26:53 wiz Exp $
2 2
 .\"
3 3
 .\" FreeBSD install - a package for the installation and maintenance
4 4
 .\" of non-core utilities.
@@ -17,7 +17,7 @@
17 17
 .\"
18 18
 .\"     @(#)pkg_info.1
19 19
 .\"
20  
-.Dd February 27, 2010
  20
+.Dd December 14, 2012
21 21
 .Dt PKG_INFO 1
22 22
 .Os
23 23
 .Sh NAME
@@ -26,8 +26,8 @@
26 26
 .Sh SYNOPSIS
27 27
 .Nm
28 28
 .Op Fl BbcDdFfhIikLmNnpqRrSsVvX
29  
-.Op Fl e Ar package
30  
-.Op Fl E Ar package
  29
+.Op Fl E Ar pkg-name
  30
+.Op Fl e Ar pkg-name
31 31
 .Op Fl K Ar pkg_dbdir
32 32
 .Op Fl l Ar prefix
33 33
 .Ar pkg-name ...
@@ -53,16 +53,21 @@ pattern matching several installed packages (see the
53 53
 section for a description of possible patterns),
54 54
 the pathname to a
55 55
 binary package, a filename belonging to an installed
56  
-package (if
57  
-.Fl F
58  
-is also given), or a URL to an ftp-available package.
  56
+package (with
  57
+.Fl F ) ,
  58
+or a URL to an FTP-available package.
59 59
 .Pp
60  
-The following command-line options are supported:
  60
+The following command line options are available:
61 61
 .Bl -tag -width indent
62 62
 .It Fl a
63 63
 Show information for all currently installed packages.
64 64
 See also
65 65
 .Fl u .
  66
+When neither
  67
+.Fl a
  68
+nor
  69
+.Fl u
  70
+is given, the former is assumed.
66 71
 .It Fl B
67 72
 Show some of the important definitions used when building
68 73
 the binary package (the
@@ -78,7 +83,9 @@ as a dependency of another package.
78 83
 Show the
79 84
 .Nx
80 85
 RCS Id strings from the files used in the construction
81  
-of the binary package (the "Build version") for each package.
  86
+of the binary package (the
  87
+.Dq Build version )
  88
+for each package.
82 89
 These files are the package Makefile, any patch files, any checksum
83 90
 files, and the packing list file.
84 91
 .It Fl c
@@ -116,16 +123,21 @@ can contain wildcards (see the
116 123
 .Sx PACKAGE WILDCARDS
117 124
 section below).
118 125
 .It Fl F
119  
-Interpret any pkg-name given as filename, and translate it to a
120  
-package name using the package database.
121  
-This can be used to query information on a per-file basis, e.g. in
122  
-conjunction with the
123  
-.Fl e
124  
-flag to find out which package a file belongs to.
  126
+Interpret any
  127
+.Ar pkg-name
  128
+given as filename, and query information on the package that
  129
+file belongs to.
  130
+This can be used to query information on a per-file basis.
  131
+See the
  132
+.Sx TECHNICAL DETAILS
  133
+section below for more information.
125 134
 .It Fl f
126 135
 Show the packing list instructions for each package.
  136
+.It Fl h
  137
+Print usage message and exit.
127 138
 .It Fl I
128 139
 Show the index entry for each package.
  140
+This option is assumed when no arguments or relevant flags are specified.
129 141
 .It Fl i
130 142
 Show the install script (if any) for each package.
131 143
 .It Fl K Ar pkg_dbdir
@@ -141,11 +153,11 @@ This is different from just viewing the packing list, since full pathnames
141 153
 for everything are generated.
142 154
 Files that were created dynamically during installation of the package
143 155
 are not listed.
144  
-.It Fl l Ar str
  156
+.It Fl l Ar prefix
145 157
 Prefix each information category header (see
146 158
 .Fl q )
147 159
 shown with
148  
-.Ar str .
  160
+.Ar prefix .
149 161
 This is primarily of use to front-end programs that want to request a
150 162
 lot of different information fields at once for a package, but don't
151 163
 necessary want the output intermingled in such a way that they can't
@@ -159,7 +171,7 @@ Show which packages each package was built with (exact dependencies), if any.
159 171
 Show which packages each package needs (depends upon), if any.
160 172
 .It Fl p
161 173
 Show the installation prefix for each package.
162  
-.It Fl Q
  174
+.It Fl Q Ar variable
163 175
 Show the definition of
164 176
 .Ar variable
165 177
 from the build information for each package.
@@ -182,8 +194,8 @@ in bytes.
182 194
 Show the size of this package in bytes.
183 195
 The size is calculated by adding up the size of each file of the package.
184 196
 .It Fl u
185  
-Show information for all user-installed packages.
186  
-Automatically installed packages (as dependencies
  197
+Show information for all user-installed packages:
  198
+automatically installed packages (as dependencies
187 199
 of other packages) are not displayed.
188 200
 See also
189 201
 .Fl a .
@@ -205,18 +217,24 @@ command line, or from already installed package information
205 217
 in
206 218
 .Pa \*[Lt]PKG_DBDIR\*[Gt]/\*[Lt]pkg-name\*[Gt] .
207 219
 .Pp
208  
-A filename can be given instead of a (installed) package name to query
209  
-information on the package this file belongs to.
210  
-This filename is then resolved to a package name using the package database.
211  
-For this translation to take place, the
  220
+When the
212 221
 .Fl F
213  
-flag must be given.
214  
-The filename must be absolute, compare the output of pkg_info
215  
-.Fl aF .
  222
+option is used,
  223
+a filename can be given instead of a package name to query
  224
+information on the (installed) package that file belongs to.
  225
+The filename is resolved to a package name using the package database.
  226
+The filename must be absolute, as in the output of
  227
+.Dl pkg_info -aF .
  228
+For example,
  229
+.Dl pkg_info -eF /path/to/file
  230
+can be used to display the package the given file belongs to, and
  231
+.Dl pkg_info -LF /path/to/file
  232
+can be used to display all files belonging to the package the given
  233
+file belongs to.
216 234
 .Sh PACKAGE WILDCARDS
217  
-In the places where a package name/version is expected, e.g. for the
  235
+In the places where a package name/version is expected, e.g., for the
218 236
 .Fl e
219  
-switch, several forms can be used.
  237
+option, several forms can be used.
220 238
 Either use a package name with or without version, or specify a
221 239
 package wildcard that gets matched against all installed packages.
222 240
 .Pp
@@ -227,40 +245,52 @@ In addition,
227 245
 style {,} alternates have been implemented.
228 246
 Package version numbers can also be matched in a relational manner
229 247
 using the
230  
-.Pa \*[Ge] , \*[Le] , \*[Gt] ,
  248
+.Dq \*[Ge] ,
  249
+.Dq \*[Le] ,
  250
+.Dq \*[Gt] ,
231 251
 and
232  
-.Pa \*[Lt]
  252
+.Dq \*[Lt]
233 253
 operators.
234 254
 For example,
235  
-.Pa pkg_info -e 'name\*[Ge]1.3'
  255
+.Dl pkg_info -e 'name\*[Ge]1.3'
236 256
 will match versions 1.3 and later of the
237  
-.Pa name
  257
+.Dq name
238 258
 package.
239  
-Additionally, ranges can be defined by giving a lower bound with
240  
-\*[Gt] or \*[Ge] and an upper bound with \*[Lt] or \*[Le].
  259
+(Make sure to use shell quoting.)
  260
+Additionally, ranges can be defined, by giving both a lower bound
  261
+.Po with
  262
+.Dq \*[Gt]
  263
+or
  264
+.Dq \*[Ge]
  265
+.Pc
  266
+as well as an upper bound
  267
+.Po with
  268
+.Dq \*[Lt]
  269
+or
  270
+. Dq \*[Le]
  271
+.Pc .
241 272
 The lower bound has to come first.
242 273
 For example,
243  
-.Pa pkg_info -e 'name\*[Ge]1.3\*[Lt]2.0'
244  
-will match versions 1.3 (inclusive) to 2.0 (exclusive)
245  
-of package
246  
-.Pa name .
  274
+.Dl pkg_info -e 'name\*[Ge]1.3\*[Lt]2.0'
  275
+will match versions 1.3 (inclusive) to 2.0 (exclusive) of package
  276
+.Dq name .
247 277
 .Pp
248 278
 The collating sequence of the various package version numbers is
249 279
 unusual, but strives to be consistent.
250 280
 The magic string
251 281
 .Dq alpha
252 282
 equates to
253  
-.Pa alpha version
  283
+.Dq alpha version ,
254 284
 and sorts before a beta version.
255 285
 The magic string
256 286
 .Dq beta
257 287
 equates to
258  
-.Pa beta version
  288
+.Dq beta version ,
259 289
 and sorts before a release candidate.
260 290
 The magic string
261 291
 .Dq rc
262 292
 equates to
263  
-.Pa release candidate
  293
+.Dq release candidate ,
264 294
 and sorts before a release.
265 295
 The magic string
266 296
 .Dq pre ,
@@ -269,29 +299,31 @@ short for
269 299
 is a synonym for
270 300
 .Dq rc .
271 301
 For example,
272  
-.Pa name-1.3rc3
273  
-will sort before
274  
-.Pa name-1.3
275  
-and after
276  
-.Pa name-1.2.9 .
277  
-Similarly
278  
-.Pa name-1.3alpha2
  302
+.Dq name-1.3alpha2
279 303
 will sort before
280  
-.Pa name-1.3beta1
  304
+.Dq name-1.3beta1 ,
281 305
 and they both sort before
282  
-.Pa name-1.3rc1 .
283  
-In addition, alphabetic characters sort in the same place as
284  
-their numeric counterparts, so that
285  
-.Pa name-1.2e
286  
-has the same sorting value as
287  
-.Pa name-1.2.5
  306
+.Dq name-1.3rc1 .
  307
+Similarly,
  308
+.Dq name-1.3rc3
  309
+will sort before
  310
+.Dq name-1.3 ,
  311
+and after
  312
+.Dq name-1.2.9 .
288 313
 The magic string
289 314
 .Dq pl
290  
-equates to a
291  
-.Pa patch level
292  
-and has the same value as a dot in the dewey-decimal ordering schemes,
  315
+equates to
  316
+.Dq patch level ,
  317
+and has the same value as a dot
  318
+.Pq Sq \&.
  319
+in the dewey-decimal ordering schemes,
293 320
 as does the underscore
294  
-.Sq _ .
  321
+.Pq Sq _ .
  322
+Additionally, alphabetic characters sort in the same place as
  323
+their numeric counterparts, so that
  324
+.Dq name-1.2e
  325
+has the same sorting value as
  326
+.Dq name-1.2.5 .
295 327
 .Sh ENVIRONMENT
296 328
 See
297 329
 .Xr pkg_install.conf 5
@@ -313,5 +345,5 @@ refined it for
313 345
 .It "Hubert Feyrer"
314 346
 .Nx
315 347
 wildcard dependency processing, pkgdb, depends displaying,
316  
-pkg size display etc.
  348
+pkg size display, and more.
317 349
 .El
48  external/bsd/pkg_install/dist/lib/license.c
... ...
@@ -1,4 +1,4 @@
1  
-/*	$NetBSD: license.c,v 1.1.1.11 2012/02/19 17:46:47 tron Exp $	*/
  1
+/*	$NetBSD: license.c,v 1.1.1.12 2013/04/20 15:26:53 wiz Exp $	*/
2 2
 
3 3
 /*-
4 4
  * Copyright (c) 2009 Joerg Sonnenberger <joerg@NetBSD.org>.
@@ -46,32 +46,40 @@
46 46
 #define	HASH_SIZE	521
47 47
 
48 48
 const char *default_acceptable_licenses =
49  
-    "public-domain unlicense "
50  
-    "gnu-fdl-v1.1 gnu-fdl-v1.2 gnu-fdl-v1.3 "
51  
-    "gnu-gpl-v1 "
52  
-    "gnu-gpl-v2 gnu-lgpl-v2 gnu-lgpl-v2.1 "
53  
-    "gnu-gpl-v3 gnu-lgpl-v3 "
54  
-    "original-bsd modified-bsd 2-clause-bsd "
55  
-    "x11 mit miros "
56 49
     "apache-1.1 apache-2.0 "
  50
+    "arphic-public "
57 51
     "artistic artistic-2.0 "
  52
+    "boost-license "
  53
+    "cc-by-sa-v3.0 "
58 54
     "cddl-1.0 "
59 55
     "cpl-1.0 "
60  
-    "open-font-license "
61  
-    "mpl-1.0 mpl-1.1 mpl-2.0 "
62  
-    "php png-license "
63  
-    "postgresql-license "
64  
-    "zlib "
65  
-    "zpl "
66  
-    "python-software-foundation "
  56
+    "epl-v1.0 "
  57
+    "gnu-fdl-v1.1 gnu-fdl-v1.2 gnu-fdl-v1.3 "
  58
+    "gnu-gpl-v1 "
  59
+    "gnu-gpl-v2 gnu-lgpl-v2 gnu-lgpl-v2.1 "
  60
+    "gnu-gpl-v3 gnu-lgpl-v3 "
  61
+    "ibm-public-license-1.0 "
67 62
     "ipafont "
68 63
     "isc "
69  
-    "info-zip "
70  
-    "boost-license "
71  
-    "mplusfont "
72  
-    "cc-by-sa-v3.0 "
73 64
     "lppl-1.3c "
74  
-    "epl-v1.0";
  65
+    "lucent "
  66
+    "miros "
  67
+    "mit "
  68
+    "mpl-1.0 mpl-1.1 mpl-2.0 "
  69
+    "mplusfont "
  70
+    "ofl-v1.0 ofl-v1.1 "
  71
+    "original-bsd modified-bsd 2-clause-bsd "
  72
+    "php "
  73
+    "png-license "
  74
+    "postgresql-license "
  75
+    "public-domain "
  76
+    "python-software-foundation "
  77
+    "qpl-v1.0 "
  78
+    "sleepycat-public "
  79
+    "unlicense "
  80
+    "x11 "
  81
+    "zlib "
  82
+    "zpl";
75 83
 
76 84
 #ifdef DEBUG
77 85
 static size_t hash_collisions;
16  external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in
... ...
@@ -1,6 +1,6 @@
1  
-.\"	$NetBSD: pkg_install.conf.5.in,v 1.1.1.12 2011/02/18 22:32:31 aymeric Exp $
  1
+.\"	$NetBSD: pkg_install.conf.5.in,v 1.1.1.13 2013/04/20 15:26:53 wiz Exp $
2 2
 .\"
3  
-.\" Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
  3
+.\" Copyright (c) 2008, 2009, 2012 The NetBSD Foundation, Inc.
4 4
 .\" All rights reserved.
5 5
 .\"
6 6
 .\" This code is derived from software contributed to The NetBSD Foundation
@@ -27,7 +27,7 @@
27 27
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
28 28
 .\" POSSIBILITY OF SUCH DAMAGE.
29 29
 .\"
30  
-.Dd November 13, 2010
  30
+.Dd February 22, 2012
31 31
 .Dt PKG_INSTALL.CONF 5
32 32
 .Os
33 33
 .Sh NAME
@@ -89,7 +89,7 @@ The check is performed if the package has license conditions set.
89 89
 Passing the license check is required.
90 90
 Missing license conditions are considered an error.
91 91
 .El
92  
-.It Dv CHECK_END_OF_FILE
  92
+.It Dv CHECK_END_OF_LIFE
93 93
 During vulnerability checks, consider packages that have reached end-of-life
94 94
 as vulnerable.
95 95
 This option is enabled by default.
@@ -107,10 +107,10 @@ The user is always asked to confirm installation of vulnerable packages.
107 107
 .El
108 108
 .It Dv CONFIG_CACHE_CONNECTIONS
109 109
 Limit the global connection cache to this value.
110  
-For FTP this is the number of sessions without active command.
111  
-For HTTP this is the number of connections open with keep-alive.
  110
+For FTP, this is the number of sessions without active command.
  111
+For HTTP, this is the number of connections open with keep-alive.
112 112
 .It Dv CONFIG_CACHE_CONNECTIONS_HOST
113  
-Like 
  113
+Like
114 114
 .Dv CONFIG_CACHE_CONNECTIONS ,
115 115
 but limit the number of connections to the host as well.
116 116
 See
@@ -210,7 +210,7 @@ Default location for the file described in this manual page.
210 210
 .El
211 211
 .Sh SEE ALSO
212 212
 .Xr pkg_add 1 ,
213  
-.Xr pkg_admin 1
  213
+.Xr pkg_admin 1 ,
214 214
 .Xr pkg_create 1 ,
215 215
 .Xr pkg_delete 1 ,
216 216
 .Xr pkg_info 1
4  external/bsd/pkg_install/dist/lib/version.h
... ...
@@ -1,4 +1,4 @@
1  
-/*	$NetBSD: version.h,v 1.1.1.32 2012/02/21 18:25:16 wiz Exp $	*/
  1
+/*	$NetBSD: version.h,v 1.1.1.33 2013/04/20 15:26:53 wiz Exp $	*/
2 2
 
3 3
 /*
4 4
  * Copyright (c) 2001 Thomas Klausner.  All rights reserved.
@@ -27,6 +27,6 @@
27 27
 #ifndef _INST_LIB_VERSION_H_
28 28
 #define _INST_LIB_VERSION_H_
29 29
 
30  
-#define PKGTOOLS_VERSION 20120221
  30
+#define PKGTOOLS_VERSION 20130131
31 31
 
32 32
 #endif /* _INST_LIB_VERSION_H_ */

0 notes on commit cdefe20

Please sign in to comment.
Something went wrong with that request. Please try again.