OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 08-Jun-2005 15:25:49
Branch: HEAD Handle: 2005060814254800
Modified files:
openpkg-src/openpkg HISTORY openpkg.spec rpm.patch.bugfix
rpm.patch.feature rpm.patch.porting
rpm.patch.regen
Log:
part 2 of AIX port: RPM patches
Summary:
Revision Changes Path
1.266 +2 -1 openpkg-src/openpkg/HISTORY
1.418 +1 -1 openpkg-src/openpkg/openpkg.spec
1.58 +1 -1 openpkg-src/openpkg/rpm.patch.bugfix
1.61 +1 -1 openpkg-src/openpkg/rpm.patch.feature
1.66 +44 -7 openpkg-src/openpkg/rpm.patch.porting
1.56 +1 -1 openpkg-src/openpkg/rpm.patch.regen
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.265 -r1.266 HISTORY
--- openpkg-src/openpkg/HISTORY 7 Jun 2005 11:36:12 -0000 1.265
+++ openpkg-src/openpkg/HISTORY 8 Jun 2005 13:25:48 -0000 1.266
@@ -2,7 +2,8 @@
2005
====
-20050607 add first cut for AIX port: rpm patches
+20050608 part 2 of AIX port: RPM patches
+20050607 part 1 of AIX port: RPM patches
20050606 fix and enhance various vendor file trackings
20050606 upgrade to latest version 20050606 of GNU config.* scripts
20050606 upgrade to GNU bzip2 to fix security issues
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.417 -r1.418 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 7 Jun 2005 11:36:12 -0000 1.417
+++ openpkg-src/openpkg/openpkg.spec 8 Jun 2005 13:25:48 -0000 1.418
@@ -38,7 +38,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20050607
+%define V_openpkg 20050608
# the used software versions
%define V_rpm 4.2.1
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.bugfix
============================================================================
$ cvs diff -u -r1.57 -r1.58 rpm.patch.bugfix
--- openpkg-src/openpkg/rpm.patch.bugfix 7 Jun 2005 11:36:12 -0000
1.57
+++ openpkg-src/openpkg/rpm.patch.bugfix 8 Jun 2005 13:25:48 -0000
1.58
@@ -9,7 +9,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 07-Jun-2005
+## Created on: 08-Jun-2005
##
## 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.60 -r1.61 rpm.patch.feature
--- openpkg-src/openpkg/rpm.patch.feature 7 Jun 2005 11:36:12 -0000
1.60
+++ openpkg-src/openpkg/rpm.patch.feature 8 Jun 2005 13:25:48 -0000
1.61
@@ -9,7 +9,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 07-Jun-2005
+## Created on: 08-Jun-2005
##
## 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.porting
============================================================================
$ cvs diff -u -r1.65 -r1.66 rpm.patch.porting
--- openpkg-src/openpkg/rpm.patch.porting 7 Jun 2005 11:36:12 -0000
1.65
+++ openpkg-src/openpkg/rpm.patch.porting 8 Jun 2005 13:25:48 -0000
1.66
@@ -9,7 +9,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 07-Jun-2005
+## Created on: 08-Jun-2005
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ -821,7 +821,7 @@
+---------------------------------------------------------------------------
Index: rpmio/fts.c
--- rpmio/fts.c 18 Jan 2003 16:13:17 -0000 1.1.1.3
-+++ rpmio/fts.c 7 Jun 2005 07:45:08 -0000
++++ rpmio/fts.c 8 Jun 2005 13:16:25 -0000 1.5
@@ -34,6 +34,8 @@
static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/94";
#endif /* LIBC_SCCS and not lint */
@@ -937,7 +937,7 @@
+---------------------------------------------------------------------------
Index: rpmio/rpmrpc.c
--- rpmio/rpmrpc.c 29 May 2003 22:14:04 -0000 1.1.1.8
-+++ rpmio/rpmrpc.c 7 Jun 2005 07:45:12 -0000
++++ rpmio/rpmrpc.c 8 Jun 2005 13:16:26 -0000 1.5
@@ -1079,6 +1079,8 @@
return rc;
}
@@ -1174,7 +1174,7 @@
+---------------------------------------------------------------------------
Index: system.h
--- system.h 1 Mar 2003 19:53:08 -0000 1.1.1.10
-+++ system.h 7 Jun 2005 07:45:13 -0000
++++ system.h 8 Jun 2005 13:15:16 -0000 1.4
@@ -256,10 +256,6 @@
#include <err.h>
#endif
@@ -1192,7 +1192,7 @@
+---------------------------------------------------------------------------
Index: system.h
--- system.h 1 Mar 2003 19:53:08 -0000 1.1.1.10
-+++ system.h 7 Jun 2005 07:45:14 -0000
++++ system.h 8 Jun 2005 13:15:16 -0000 1.4
@@ -550,7 +546,7 @@
#define lchown chown
#endif
@@ -1208,8 +1208,8 @@
+---------------------------------------------------------------------------
Index: system.h
--- system.h 1 Mar 2003 19:53:08 -0000 1.1.1.10
-+++ system.h 7 Jun 2005 07:45:15 -0000
-@@ -603,11 +599,21 @@
++++ system.h 8 Jun 2005 13:15:16 -0000 1.4
+@@ -603,11 +599,24 @@
#if defined(__LCLINT__)
#define FILE_RCSID(id)
@@ -1229,6 +1229,9 @@
+/* for basename(3) and dirname(3) */
+#if !defined(OPENPKG_AIX)
+#include <libgen.h>
++#endif
++#if defined(OPENPKG_AIX)
++#define unsetenv(x) /* unsetenv() is used in RPM just for malloc debugging
purposes */
#endif
#endif /* H_SYSTEM */
@@ -1430,3 +1433,37 @@
sizeof(*mi->mi_set->recs), hdrNumCmp);
#endif
mi->mi_sorted = 1;
+
++---------------------------------------------------------------------------
+| Workaround a double-inclusion problem under AIX.
++---------------------------------------------------------------------------
+Index: lib/getdate.y
+--- lib/getdate.y 24 Sep 2001 21:53:15 -0000 1.1.1.2
++++ lib/getdate.y 8 Jun 2005 13:16:22 -0000 1.2
+@@ -30,7 +30,9 @@
+ #undef static
+ #endif
+
++#ifndef OPENPKG_AIX
+ #include <stdio.h>
++#endif
+ #include <ctype.h>
+
+ /* The code at the top of get_date which figures out the offset of the
+
++---------------------------------------------------------------------------
+| Workaround a double-inclusion problem under AIX.
++---------------------------------------------------------------------------
+Index: lib/getdate.c
+--- lib/getdate.c 2 Jul 2003 19:21:45 -0000 1.1.1.4
++++ lib/getdate.c 8 Jun 2005 13:16:21 -0000 1.2
+@@ -50,7 +50,9 @@
+ #undef static
+ #endif
+
++#ifndef OPENPKG_AIX
+ #include <stdio.h>
++#endif
+ #include <ctype.h>
+
+ /* The code at the top of get_date which figures out the offset of the
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.regen
============================================================================
$ cvs diff -u -r1.55 -r1.56 rpm.patch.regen
--- openpkg-src/openpkg/rpm.patch.regen 7 Jun 2005 11:36:12 -0000
1.55
+++ openpkg-src/openpkg/rpm.patch.regen 8 Jun 2005 13:25:48 -0000
1.56
@@ -9,7 +9,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 07-Jun-2005
+## Created on: 08-Jun-2005
##
## 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]
