Tue Sep 14 22:26:19 2010 UTC ()
Add -D flag to pkg_install, to override the "pkg_add -U" check that
all depending packages have their dependencies satisfied by the new
package.  Essentially, split off this particular behavior as a special
case of -f, so that -f works as before, unforced works as before, and
one can give -D to override exactly this check, leaving all other
checks intact.

The -D flag is in support of make replace, as the workflow for make
replace is that inter-package dependencies are sometimes violated (but
then one must replace the depending packages, which is what
pkg_rolling-replace does via the unsafe_depends flags).

Bump PKGTOOLS_VERSION.

Add missing break statement in option parsing of "pkg_add -C", riding
the version bump.

Discussed extensively on tech-pkg@ over the summer.
OK pkgsrc-pmc@.


(gdt)
diff -r1.18 -r1.19 pkgsrc/pkgtools/pkg_install/files/add/add.h
diff -r1.26 -r1.27 pkgsrc/pkgtools/pkg_install/files/add/main.c
diff -r1.97 -r1.98 pkgsrc/pkgtools/pkg_install/files/add/perform.c
diff -r1.44 -r1.45 pkgsrc/pkgtools/pkg_install/files/add/pkg_add.1
diff -r1.4 -r1.5 pkgsrc/pkgtools/pkg_install/files/add/pkg_add.cat
diff -r1.156 -r1.157 pkgsrc/pkgtools/pkg_install/files/lib/version.h

cvs diff -r1.18 -r1.19 pkgsrc/pkgtools/pkg_install/files/add/add.h (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkg_install/files/add/add.h 2010/01/30 20:09:34 1.18
+++ pkgsrc/pkgtools/pkg_install/files/add/add.h 2010/09/14 22:26:18 1.19
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: add.h,v 1.18 2010/01/30 20:09:34 joerg Exp $ */ 1/* $NetBSD: add.h,v 1.19 2010/09/14 22:26:18 gdt Exp $ */
2 2
3/* from FreeBSD Id: add.h,v 1.8 1997/02/22 16:09:15 peter Exp */ 3/* from FreeBSD Id: add.h,v 1.8 1997/02/22 16:09:15 peter Exp */
4 4
5/* 5/*
6 * FreeBSD install - a package for the installation and maintainance 6 * FreeBSD install - a package for the installation and maintainance
7 * of non-core utilities. 7 * of non-core utilities.
8 * 8 *
9 * Redistribution and use in source and binary forms, with or without 9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions 10 * modification, are permitted provided that the following conditions
11 * are met: 11 * are met:
12 * 1. Redistributions of source code must retain the above copyright 12 * 1. Redistributions of source code must retain the above copyright
13 * notice, this list of conditions and the following disclaimer. 13 * notice, this list of conditions and the following disclaimer.
14 * 2. Redistributions in binary form must reproduce the above copyright 14 * 2. Redistributions in binary form must reproduce the above copyright
@@ -30,20 +30,21 @@ extern char *OverrideMachine; @@ -30,20 +30,21 @@ extern char *OverrideMachine;
30extern char *Prefix; 30extern char *Prefix;
31extern char *View; 31extern char *View;
32extern char *Viewbase; 32extern char *Viewbase;
33extern Boolean NoView; 33extern Boolean NoView;
34extern Boolean NoInstall; 34extern Boolean NoInstall;
35extern Boolean NoRecord; 35extern Boolean NoRecord;
36extern Boolean Force; 36extern Boolean Force;
37extern Boolean Automatic; 37extern Boolean Automatic;
38extern int LicenseCheck; 38extern int LicenseCheck;
39extern int Replace; 39extern int Replace;
40extern int ReplaceSame; 40extern int ReplaceSame;
41 41
42extern Boolean ForceDepends; 42extern Boolean ForceDepends;
 43extern Boolean ForceDepending;
43 44
44int make_hierarchy(char *); 45int make_hierarchy(char *);
45void apply_perms(char *, char **, int); 46void apply_perms(char *, char **, int);
46 47
47int pkg_perform(lpkg_head_t *); 48int pkg_perform(lpkg_head_t *);
48 49
49#endif /* _INST_ADD_H_INCLUDE */ 50#endif /* _INST_ADD_H_INCLUDE */

cvs diff -r1.26 -r1.27 pkgsrc/pkgtools/pkg_install/files/add/main.c (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkg_install/files/add/main.c 2010/06/16 23:02:48 1.26
+++ pkgsrc/pkgtools/pkg_install/files/add/main.c 2010/09/14 22:26:18 1.27
@@ -1,23 +1,23 @@ @@ -1,23 +1,23 @@
1/* $NetBSD: main.c,v 1.26 2010/06/16 23:02:48 joerg Exp $ */ 1/* $NetBSD: main.c,v 1.27 2010/09/14 22:26:18 gdt Exp $ */
2 2
3#if HAVE_CONFIG_H 3#if HAVE_CONFIG_H
4#include "config.h" 4#include "config.h"
5#endif 5#endif
6#include <nbcompat.h> 6#include <nbcompat.h>
7#if HAVE_SYS_CDEFS_H 7#if HAVE_SYS_CDEFS_H
8#include <sys/cdefs.h> 8#include <sys/cdefs.h>
9#endif 9#endif
10__RCSID("$NetBSD: main.c,v 1.26 2010/06/16 23:02:48 joerg Exp $"); 10__RCSID("$NetBSD: main.c,v 1.27 2010/09/14 22:26:18 gdt Exp $");
11 11
12/* 12/*
13 * 13 *
14 * FreeBSD install - a package for the installation and maintainance 14 * FreeBSD install - a package for the installation and maintainance
15 * of non-core utilities. 15 * of non-core utilities.
16 * 16 *
17 * Redistribution and use in source and binary forms, with or without 17 * Redistribution and use in source and binary forms, with or without
18 * modification, are permitted provided that the following conditions 18 * modification, are permitted provided that the following conditions
19 * are met: 19 * are met:
20 * 1. Redistributions of source code must retain the above copyright 20 * 1. Redistributions of source code must retain the above copyright
21 * notice, this list of conditions and the following disclaimer. 21 * notice, this list of conditions and the following disclaimer.
22 * 2. Redistributions in binary form must reproduce the above copyright 22 * 2. Redistributions in binary form must reproduce the above copyright
23 * notice, this list of conditions and the following disclaimer in the 23 * notice, this list of conditions and the following disclaimer in the
@@ -29,38 +29,44 @@ __RCSID("$NetBSD: main.c,v 1.26 2010/06/ @@ -29,38 +29,44 @@ __RCSID("$NetBSD: main.c,v 1.26 2010/06/
29 * This is the add module. 29 * This is the add module.
30 * 30 *
31 */ 31 */
32 32
33#if HAVE_ERR_H 33#if HAVE_ERR_H
34#include <err.h> 34#include <err.h>
35#endif 35#endif
36#if HAVE_SYS_PARAM_H 36#if HAVE_SYS_PARAM_H
37#include <sys/param.h> 37#include <sys/param.h>
38#endif 38#endif
39#include "lib.h" 39#include "lib.h"
40#include "add.h" 40#include "add.h"
41 41
42static char Options[] = "AC:IK:LP:RVW:fhm:np:t:Uuvw:"; 42static char Options[] = "AC:DIK:LP:RVW:fhm:np:t:Uuvw:";
43 43
44char *Destdir = NULL; 44char *Destdir = NULL;
45char *OverrideMachine = NULL; 45char *OverrideMachine = NULL;
46char *Prefix = NULL; 46char *Prefix = NULL;
47char *View = NULL; 47char *View = NULL;
48char *Viewbase = NULL; 48char *Viewbase = NULL;
49Boolean NoView = FALSE; 49Boolean NoView = FALSE;
50Boolean NoInstall = FALSE; 50Boolean NoInstall = FALSE;
51Boolean NoRecord = FALSE; 51Boolean NoRecord = FALSE;
52Boolean Automatic = FALSE; 52Boolean Automatic = FALSE;
53Boolean ForceDepends = FALSE; 53Boolean ForceDepends = FALSE;
 54/*
 55 * Normally, updating fails if the dependencies of a depending package
 56 * are not satisfied by the package to be updated. ForceDepending
 57 * turns that failure into a warning.
 58 */
 59Boolean ForceDepending = FALSE;
54 60
55int LicenseCheck = 0; 61int LicenseCheck = 0;
56int Replace = 0; 62int Replace = 0;
57int ReplaceSame = 0; 63int ReplaceSame = 0;
58 64
59static void 65static void
60usage(void) 66usage(void)
61{ 67{
62 (void) fprintf(stderr, "%s\n%s\n%s\n%s\n", 68 (void) fprintf(stderr, "%s\n%s\n%s\n%s\n",
63 "usage: pkg_add [-AfhILnRuVv] [-C config] [-P destdir] [-K pkg_dbdir]", 69 "usage: pkg_add [-AfhILnRuVv] [-C config] [-P destdir] [-K pkg_dbdir]",
64 " [-m machine] [-p prefix] [-s verification-type", 70 " [-m machine] [-p prefix] [-s verification-type",
65 " [-W viewbase] [-w view]\n", 71 " [-W viewbase] [-w view]\n",
66 " [[ftp|http]://[user[:password]@]host[:port]][/path/]pkg-name ..."); 72 " [[ftp|http]://[user[:password]@]host[:port]][/path/]pkg-name ...");
@@ -72,34 +78,40 @@ main(int argc, char **argv) @@ -72,34 +78,40 @@ main(int argc, char **argv)
72{ 78{
73 int ch, error=0; 79 int ch, error=0;
74 lpkg_head_t pkgs; 80 lpkg_head_t pkgs;
75 81
76 setprogname(argv[0]); 82 setprogname(argv[0]);
77 while ((ch = getopt(argc, argv, Options)) != -1) { 83 while ((ch = getopt(argc, argv, Options)) != -1) {
78 switch (ch) { 84 switch (ch) {
79 case 'A': 85 case 'A':
80 Automatic = TRUE; 86 Automatic = TRUE;
81 break; 87 break;
82 88
83 case 'C': 89 case 'C':
84 config_file = optarg; 90 config_file = optarg;
 91 break;
85 92
 93 case 'D':
 94 ForceDepending = TRUE;
 95 break;
 96
86 case 'P': 97 case 'P':
87 Destdir = optarg; 98 Destdir = optarg;
88 break; 99 break;
89 100
90 case 'f': 101 case 'f':
91 Force = TRUE; 102 Force = TRUE;
92 ForceDepends = TRUE; 103 ForceDepends = TRUE;
 104 ForceDepending = TRUE;
93 break; 105 break;
94 106
95 case 'I': 107 case 'I':
96 NoInstall = TRUE; 108 NoInstall = TRUE;
97 break; 109 break;
98 110
99 case 'K': 111 case 'K':
100 pkgdb_set_dir(optarg, 3); 112 pkgdb_set_dir(optarg, 3);
101 break; 113 break;
102 114
103 case 'L': 115 case 'L':
104 NoView = TRUE; 116 NoView = TRUE;
105 break; 117 break;

cvs diff -r1.97 -r1.98 pkgsrc/pkgtools/pkg_install/files/add/perform.c (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkg_install/files/add/perform.c 2010/06/16 23:02:48 1.97
+++ pkgsrc/pkgtools/pkg_install/files/add/perform.c 2010/09/14 22:26:18 1.98
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1/* $NetBSD: perform.c,v 1.97 2010/06/16 23:02:48 joerg Exp $ */ 1/* $NetBSD: perform.c,v 1.98 2010/09/14 22:26:18 gdt Exp $ */
2#if HAVE_CONFIG_H 2#if HAVE_CONFIG_H
3#include "config.h" 3#include "config.h"
4#endif 4#endif
5#include <nbcompat.h> 5#include <nbcompat.h>
6#if HAVE_SYS_CDEFS_H 6#if HAVE_SYS_CDEFS_H
7#include <sys/cdefs.h> 7#include <sys/cdefs.h>
8#endif 8#endif
9__RCSID("$NetBSD: perform.c,v 1.97 2010/06/16 23:02:48 joerg Exp $"); 9__RCSID("$NetBSD: perform.c,v 1.98 2010/09/14 22:26:18 gdt Exp $");
10 10
11/*- 11/*-
12 * Copyright (c) 2003 Grant Beattie <grant@NetBSD.org> 12 * Copyright (c) 2003 Grant Beattie <grant@NetBSD.org>
13 * Copyright (c) 2005 Dieter Baron <dillo@NetBSD.org> 13 * Copyright (c) 2005 Dieter Baron <dillo@NetBSD.org>
14 * Copyright (c) 2007 Roland Illig <rillig@NetBSD.org> 14 * Copyright (c) 2007 Roland Illig <rillig@NetBSD.org>
15 * Copyright (c) 2008, 2009 Joerg Sonnenberger <joerg@NetBSD.org> 15 * Copyright (c) 2008, 2009 Joerg Sonnenberger <joerg@NetBSD.org>
16 * All rights reserved. 16 * All rights reserved.
17 * 17 *
18 * Redistribution and use in source and binary forms, with or without 18 * Redistribution and use in source and binary forms, with or without
19 * modification, are permitted provided that the following conditions 19 * modification, are permitted provided that the following conditions
20 * are met: 20 * are met:
21 * 21 *
22 * 1. Redistributions of source code must retain the above copyright 22 * 1. Redistributions of source code must retain the above copyright
@@ -448,27 +448,27 @@ check_other_installed(struct pkg_task *p @@ -448,27 +448,27 @@ check_other_installed(struct pkg_task *p
448 continue; 448 continue;
449 /* 449 /*
450 * XXX This is stricter than necessary. 450 * XXX This is stricter than necessary.
451 * XXX One pattern might be fulfilled by 451 * XXX One pattern might be fulfilled by
452 * XXX a different package and still need this 452 * XXX a different package and still need this
453 * XXX one for a different pattern. 453 * XXX one for a different pattern.
454 */ 454 */
455 if (pkg_match(p->name, pkg->other_version) == 0) 455 if (pkg_match(p->name, pkg->other_version) == 0)
456 continue; 456 continue;
457 if (pkg_match(p->name, pkg->pkgname) == 1) 457 if (pkg_match(p->name, pkg->pkgname) == 1)
458 continue; /* Both match, ok. */ 458 continue; /* Both match, ok. */
459 warnx("Dependency of %s fulfilled by %s, but not by %s", 459 warnx("Dependency of %s fulfilled by %s, but not by %s",
460 iter, pkg->other_version, pkg->pkgname); 460 iter, pkg->other_version, pkg->pkgname);
461 if (!Force) 461 if (!ForceDepending)
462 status = -1; 462 status = -1;
463 break; 463 break;
464 } 464 }
465 free_plist(&plist);  465 free_plist(&plist);
466 } 466 }
467 467
468 fclose(f); 468 fclose(f);
469 469
470 return status; 470 return status;
471} 471}
472 472
473/* 473/*
474 * Read package build information from meta data. 474 * Read package build information from meta data.

cvs diff -r1.44 -r1.45 pkgsrc/pkgtools/pkg_install/files/add/pkg_add.1 (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkg_install/files/add/pkg_add.1 2010/06/16 23:02:48 1.44
+++ pkgsrc/pkgtools/pkg_install/files/add/pkg_add.1 2010/09/14 22:26:18 1.45
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1.\" $NetBSD: pkg_add.1,v 1.44 2010/06/16 23:02:48 joerg Exp $ 1.\" $NetBSD: pkg_add.1,v 1.45 2010/09/14 22:26:18 gdt Exp $
2.\" 2.\"
3.\" FreeBSD install - a package for the installation and maintenance 3.\" FreeBSD install - a package for the installation and maintenance
4.\" of non-core utilities. 4.\" of non-core utilities.
5.\" 5.\"
6.\" Redistribution and use in source and binary forms, with or without 6.\" Redistribution and use in source and binary forms, with or without
7.\" modification, are permitted provided that the following conditions 7.\" modification, are permitted provided that the following conditions
8.\" are met: 8.\" are met:
9.\" 1. Redistributions of source code must retain the above copyright 9.\" 1. Redistributions of source code must retain the above copyright
10.\" notice, this list of conditions and the following disclaimer. 10.\" notice, this list of conditions and the following disclaimer.
11.\" 2. Redistributions in binary form must reproduce the above copyright 11.\" 2. Redistributions in binary form must reproduce the above copyright
12.\" notice, this list of conditions and the following disclaimer in the 12.\" notice, this list of conditions and the following disclaimer in the
13.\" documentation and/or other materials provided with the distribution. 13.\" documentation and/or other materials provided with the distribution.
14.\" 14.\"
@@ -120,26 +120,31 @@ removed. @@ -120,26 +120,31 @@ removed.
120.It Fl C Ar config 120.It Fl C Ar config
121Read the configuration file from 121Read the configuration file from
122.Ar config 122.Ar config
123instead of the system default. 123instead of the system default.
124.It Fl f 124.It Fl f
125Force installation to proceed even if prerequisite packages are not 125Force installation to proceed even if prerequisite packages are not
126installed or the install script fails. 126installed or the install script fails.
127Although 127Although
128.Nm 128.Nm
129will still try to find and auto-install missing prerequisite packages, 129will still try to find and auto-install missing prerequisite packages,
130a failure to find one will not be fatal. 130a failure to find one will not be fatal.
131This flag also overrides the fatal error when the operating system or 131This flag also overrides the fatal error when the operating system or
132architecture the package was built on differ from that of the host. 132architecture the package was built on differ from that of the host.
 133.It Fl D
 134Force updating even if the dependencies of depending packages are not
 135satisfied by the new package.
 136This is used by "make replace", after which one would typically
 137replace the depending packages.
133.It Fl I 138.It Fl I
134If an installation script exists for a given package, do not execute it. 139If an installation script exists for a given package, do not execute it.
135.It Fl K Ar pkg_dbdir 140.It Fl K Ar pkg_dbdir
136Override the value of the 141Override the value of the
137.Dv PKG_DBDIR 142.Dv PKG_DBDIR
138configuration option with the value 143configuration option with the value
139.Ar pkg_dbdir . 144.Ar pkg_dbdir .
140.It Fl L 145.It Fl L
141Don't add the package to any views after installation. 146Don't add the package to any views after installation.
142.It Fl m 147.It Fl m
143Override the machine architecture returned by uname with 148Override the machine architecture returned by uname with
144.Ar machine . 149.Ar machine .
145.It Fl n 150.It Fl n

cvs diff -r1.4 -r1.5 pkgsrc/pkgtools/pkg_install/files/add/pkg_add.cat (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkg_install/files/add/pkg_add.cat 2010/06/16 23:02:48 1.4
+++ pkgsrc/pkgtools/pkg_install/files/add/pkg_add.cat 2010/09/14 22:26:18 1.5
@@ -54,26 +54,31 @@ OOPPTTIIOONNSS @@ -54,26 +54,31 @@ OOPPTTIIOONNSS
54 removed. 54 removed.
55 55
56 --CC _c_o_n_f_i_g 56 --CC _c_o_n_f_i_g
57 Read the configuration file from _c_o_n_f_i_g instead of the system 57 Read the configuration file from _c_o_n_f_i_g instead of the system
58 default. 58 default.
59 59
60 --ff Force installation to proceed even if prerequisite packages are 60 --ff Force installation to proceed even if prerequisite packages are
61 not installed or the install script fails. Although ppkkgg__aadddd will 61 not installed or the install script fails. Although ppkkgg__aadddd will
62 still try to find and auto-install missing prerequisite packages, 62 still try to find and auto-install missing prerequisite packages,
63 a failure to find one will not be fatal. This flag also over- 63 a failure to find one will not be fatal. This flag also over-
64 rides the fatal error when the operating system or architecture 64 rides the fatal error when the operating system or architecture
65 the package was built on differ from that of the host. 65 the package was built on differ from that of the host.
66 66
 67 --DD Force updating even if the dependencies of depending packages are
 68 not satisfied by the new package. This is used by "make
 69 replace", after which one would typically replace the depending
 70 packages.
 71
67 --II If an installation script exists for a given package, do not exe- 72 --II If an installation script exists for a given package, do not exe-
68 cute it. 73 cute it.
69 74
70 --KK _p_k_g___d_b_d_i_r 75 --KK _p_k_g___d_b_d_i_r
71 Override the value of the PKG_DBDIR configuration option with the 76 Override the value of the PKG_DBDIR configuration option with the
72 value _p_k_g___d_b_d_i_r. 77 value _p_k_g___d_b_d_i_r.
73 78
74 --LL Don't add the package to any views after installation. 79 --LL Don't add the package to any views after installation.
75 80
76 --mm Override the machine architecture returned by uname with _m_a_c_h_i_n_e. 81 --mm Override the machine architecture returned by uname with _m_a_c_h_i_n_e.
77 82
78 --nn Don't actually install a package, just report the steps that 83 --nn Don't actually install a package, just report the steps that
79 would be taken if it was. 84 would be taken if it was.

cvs diff -r1.156 -r1.157 pkgsrc/pkgtools/pkg_install/files/lib/version.h (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkg_install/files/lib/version.h 2010/06/16 23:02:49 1.156
+++ pkgsrc/pkgtools/pkg_install/files/lib/version.h 2010/09/14 22:26:19 1.157
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: version.h,v 1.156 2010/06/16 23:02:49 joerg Exp $ */ 1/* $NetBSD: version.h,v 1.157 2010/09/14 22:26:19 gdt Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2001 Thomas Klausner. All rights reserved. 4 * Copyright (c) 2001 Thomas Klausner. All rights reserved.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
11 * 2. Redistributions in binary form must reproduce the above copyright 11 * 2. Redistributions in binary form must reproduce the above copyright
12 * notice, this list of conditions and the following disclaimer in the 12 * notice, this list of conditions and the following disclaimer in the
13 * documentation and/or other materials provided with the distribution. 13 * documentation and/or other materials provided with the distribution.
14 * 14 *
@@ -17,16 +17,16 @@ @@ -17,16 +17,16 @@
17 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 17 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
18 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, 18 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
19 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 19 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */ 25 */
26 26
27#ifndef _INST_LIB_VERSION_H_ 27#ifndef _INST_LIB_VERSION_H_
28#define _INST_LIB_VERSION_H_ 28#define _INST_LIB_VERSION_H_
29 29
30#define PKGTOOLS_VERSION 20100616 30#define PKGTOOLS_VERSION 20100914
31 31
32#endif /* _INST_LIB_VERSION_H_ */ 32#endif /* _INST_LIB_VERSION_H_ */