OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 18-Sep-2003 14:29:53
Branch: HEAD Handle: 2003091813295201
Modified files:
openpkg-src/openpkg HISTORY rpm.patch.bugfix rpm.patch.feature
rpm.patch.porting rpm.patch.regen
Log:
add RPM internal %{_force_oldpackage} option for enforcing
--oldpackage on upgrades (this will help us in a few months to mass
upgrade packages from OpenPKG-CURRENT to OpenPKG 2.0)
Summary:
Revision Changes Path
1.55 +1 -0 openpkg-src/openpkg/HISTORY
1.22 +1 -1 openpkg-src/openpkg/rpm.patch.bugfix
1.23 +41 -5 openpkg-src/openpkg/rpm.patch.feature
1.26 +1 -1 openpkg-src/openpkg/rpm.patch.porting
1.21 +1 -1 openpkg-src/openpkg/rpm.patch.regen
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.54 -r1.55 HISTORY
--- openpkg-src/openpkg/HISTORY 18 Sep 2003 11:45:07 -0000 1.54
+++ openpkg-src/openpkg/HISTORY 18 Sep 2003 12:29:52 -0000 1.55
@@ -2,6 +2,7 @@
2003
====
+20030918 add RPM internal %{_force_oldpackage} option for enforcing --oldpackage on
upgrades
20030918 introduce new rpmdb utility for administrating the RPM database on the
lower level
20030916 RPM database mutex workaround for Solaris plus the passing of option -b to
patch(1)
20030915 remove the librpmmisc.a library because its contents RPM includes in
librpmio.a
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.bugfix
============================================================================
$ cvs diff -u -r1.21 -r1.22 rpm.patch.bugfix
--- openpkg-src/openpkg/rpm.patch.bugfix 18 Sep 2003 11:45:08 -0000 1.21
+++ openpkg-src/openpkg/rpm.patch.bugfix 18 Sep 2003 12:29:53 -0000 1.22
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 17-Sep-2003
+## Created on: 18-Sep-2003
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.feature
============================================================================
$ cvs diff -u -r1.22 -r1.23 rpm.patch.feature
--- openpkg-src/openpkg/rpm.patch.feature 18 Sep 2003 11:45:08 -0000 1.22
+++ openpkg-src/openpkg/rpm.patch.feature 18 Sep 2003 12:29:53 -0000 1.23
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 17-Sep-2003
+## Created on: 18-Sep-2003
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ -876,10 +876,14 @@
| Additionally, do not override the "_host_xx" macros because their
| value (derived from <prefix>/etc/openpkg/platform) is already
| correctly set internally.
+| Finally, provide default for introduced variable
+| %{_force_oldpackage}, which, if non-zero, automatically enforces
+| --oldpackage on all upgrade operations (this is useful on
+| mass-upgrades from OpenPKG-CURRENT to OpenPKG-RELEASE).
+---------------------------------------------------------------------------
Index: macros.in
--- macros.in 2 Jul 2003 19:20:52 -0000 1.1.1.14
-+++ macros.in 15 Sep 2003 19:08:46 -0000
++++ macros.in 18 Sep 2003 11:15:49 -0000
@@ -305,7 +305,7 @@
# Returns list of unpackaged files, i.e. files in $RPM_BUILD_ROOT not packaged.
#
@@ -889,7 +893,18 @@
#
# Should unpackaged files in a build root terminate a build?
-@@ -929,11 +929,11 @@
+@@ -618,6 +618,10 @@
+ # If non-zero, all erasures will be automagically repackaged.
+ %_repackage_all_erasures 0
+
++# If non-zero, automatically enforce --oldpackage for all upgrade operations
++# (useful on mass-upgrades from OpenPKG-CURRENT to OpenPKG-RELEASE)
++%_force_oldpackage 0
++
+ # Verify digest/signature flags for various rpm modes:
+ # 1 --nohdrchk if set, don't check rpmdb headers
+ #
+@@ -929,11 +933,11 @@
%_build_cpu %{_host_cpu}
%_build_vendor %{_host_vendor}
%_build_os %{_host_os}
@@ -1235,7 +1250,7 @@
+---------------------------------------------------------------------------
Index: db/env/env_region.c
--- db/env/env_region.c 18 Jan 2003 14:05:01 -0000 1.1.1.5
-+++ db/env/env_region.c 17 Sep 2003 14:12:02 -0000
++++ db/env/env_region.c 17 Sep 2003 17:58:12 -0000
@@ -184,6 +184,24 @@
}
@@ -1252,7 +1267,7 @@
+ if (F_ISSET(dbenv, DB_ENV_CREATE))
+ goto creation;
+ else {
-+ ret = ENOENT;
++ ret = ENOENT;
+ goto err;
+ }
+ }
@@ -1284,3 +1299,24 @@
/* ... non-existent (or unwritable) DBENV, will create ... */
dbi->dbi_oeflags |= DB_CREATE;
dbi->dbi_eflags &= ~DB_JOINENV;
+
++---------------------------------------------------------------------------
+| Add internal feature variable %{_force_oldpackage} which, if
+| non-zero, automatically enforces --oldpackage on all upgrade
+| operations (this is useful on mass-upgrades from OpenPKG-CURRENT to
+| OpenPKG-RELEASE).
++---------------------------------------------------------------------------
+Index: rpm.c
+--- rpm.c 16 May 2002 16:55:25 -0000 1.1.1.23
++++ rpm.c 18 Sep 2003 11:15:08 -0000
+@@ -1016,6 +1016,10 @@
+
+ if (oldPackage && !upgrade)
+ argerror(_("--oldpackage may only be used during upgrades"));
++#ifdef OPENPKG
++ if (upgrade && rpmExpandNumeric("%{?_force_oldpackage}"))
++ probFilter |= RPMPROB_FILTER_OLDPACKAGE;
++#endif
+
+ if (noPgp && bigMode != MODE_CHECKSIG)
+ argerror(_("--nopgp may only be used during signature checking"));
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.porting
============================================================================
$ cvs diff -u -r1.25 -r1.26 rpm.patch.porting
--- openpkg-src/openpkg/rpm.patch.porting 18 Sep 2003 11:45:08 -0000 1.25
+++ openpkg-src/openpkg/rpm.patch.porting 18 Sep 2003 12:29:53 -0000 1.26
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 17-Sep-2003
+## Created on: 18-Sep-2003
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.regen
============================================================================
$ cvs diff -u -r1.20 -r1.21 rpm.patch.regen
--- openpkg-src/openpkg/rpm.patch.regen 18 Sep 2003 11:45:08 -0000 1.20
+++ openpkg-src/openpkg/rpm.patch.regen 18 Sep 2003 12:29:53 -0000 1.21
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 17-Sep-2003
+## Created on: 18-Sep-2003
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
