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: 07-Jun-2005 13:36:13
Branch: HEAD Handle: 2005060712361200
Modified files:
openpkg-src/openpkg HISTORY openpkg.spec rpm.patch.bugfix
rpm.patch.feature rpm.patch.porting
rpm.patch.regen
Log:
add first cut for AIX port: rpm patches
Summary:
Revision Changes Path
1.265 +1 -0 openpkg-src/openpkg/HISTORY
1.417 +1 -1 openpkg-src/openpkg/openpkg.spec
1.57 +4 -4 openpkg-src/openpkg/rpm.patch.bugfix
1.60 +8 -8 openpkg-src/openpkg/rpm.patch.feature
1.65 +36 -27 openpkg-src/openpkg/rpm.patch.porting
1.55 +2 -2 openpkg-src/openpkg/rpm.patch.regen
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.264 -r1.265 HISTORY
--- openpkg-src/openpkg/HISTORY 6 Jun 2005 19:32:53 -0000 1.264
+++ openpkg-src/openpkg/HISTORY 7 Jun 2005 11:36:12 -0000 1.265
@@ -2,6 +2,7 @@
2005
====
+20050607 add first cut for 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.416 -r1.417 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 6 Jun 2005 19:32:53 -0000 1.416
+++ openpkg-src/openpkg/openpkg.spec 7 Jun 2005 11:36:12 -0000 1.417
@@ -38,7 +38,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20050606
+%define V_openpkg 20050607
# the used software versions
%define V_rpm 4.2.1
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.bugfix
============================================================================
$ cvs diff -u -r1.56 -r1.57 rpm.patch.bugfix
--- openpkg-src/openpkg/rpm.patch.bugfix 24 Mar 2005 11:19:44 -0000
1.56
+++ openpkg-src/openpkg/rpm.patch.bugfix 7 Jun 2005 11:36:12 -0000
1.57
@@ -9,7 +9,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 03-Feb-2005
+## Created on: 07-Jun-2005
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ -22,7 +22,7 @@
+---------------------------------------------------------------------------
Index: build/parsePrep.c
--- build/parsePrep.c 7 Aug 2002 14:20:45 -0000 1.1.1.10
-+++ build/parsePrep.c 3 Feb 2005 14:02:48 -0000
++++ build/parsePrep.c 6 Jun 2005 15:53:04 -0000 1.4
@@ -584,12 +635,15 @@
saveLines = splitString(getStringBuf(sb), strlen(getStringBuf(sb)),
'\n');
/[EMAIL PROTECTED]@*/
@@ -49,7 +49,7 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 21 Jul 2004 11:16:59 -0000
++++ configure.ac 6 Jun 2005 15:53:04 -0000 1.4
@@ -416,7 +417,7 @@
AC_CHECK_HEADER([beecrypt/beecrypt.h], [
AC_CHECK_LIB(beecrypt, mpfprintln, [
@@ -66,7 +66,7 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 21 Jul 2004 11:16:59 -0000
++++ configure.ac 6 Jun 2005 15:53:04 -0000 1.4
@@ -1274,7 +1302,6 @@
python/rpmdb/Makefile
python/test/Makefile
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.feature
============================================================================
$ cvs diff -u -r1.59 -r1.60 rpm.patch.feature
--- openpkg-src/openpkg/rpm.patch.feature 24 Mar 2005 11:19:44 -0000
1.59
+++ openpkg-src/openpkg/rpm.patch.feature 7 Jun 2005 11:36:12 -0000
1.60
@@ -9,7 +9,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 03-Feb-2005
+## Created on: 07-Jun-2005
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ -557,7 +557,7 @@
+---------------------------------------------------------------------------
Index: build/parsePrep.c
--- build/parsePrep.c 7 Aug 2002 14:20:45 -0000 1.1.1.10
-+++ build/parsePrep.c 3 Feb 2005 14:02:48 -0000
++++ build/parsePrep.c 6 Jun 2005 15:53:04 -0000 1.4
@@ -66,7 +66,7 @@
*/
/[EMAIL PROTECTED]@*/
@@ -752,7 +752,7 @@
+---------------------------------------------------------------------------
Index: build/parsePrep.c
--- build/parsePrep.c 7 Aug 2002 14:20:45 -0000 1.1.1.10
-+++ build/parsePrep.c 3 Feb 2005 14:02:48 -0000
++++ build/parsePrep.c 6 Jun 2005 15:53:04 -0000 1.4
@@ -87,7 +88,15 @@
return NULL;
}
@@ -837,7 +837,7 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 21 Jul 2004 11:16:59 -0000
++++ configure.ac 6 Jun 2005 15:53:04 -0000 1.4
@@ -53,7 +53,7 @@
AS=${AS-as}
AC_SUBST(AS)
@@ -871,7 +871,7 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 21 Jul 2004 11:16:59 -0000
++++ configure.ac 6 Jun 2005 15:53:04 -0000 1.4
@@ -310,7 +311,7 @@
WITH_ZLIB_SUBDIR=
WITH_ZLIB_INCLUDE=
@@ -889,7 +889,7 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 21 Jul 2004 11:16:59 -0000
++++ configure.ac 6 Jun 2005 15:53:04 -0000 1.4
@@ -324,38 +325,38 @@
localdone=
@@ -967,7 +967,7 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 21 Jul 2004 11:16:59 -0000
++++ configure.ac 6 Jun 2005 15:53:04 -0000 1.4
@@ -1200,12 +1202,12 @@
AC_SUBST(LOCALEDIR)
LIBDIR="`echo $libdir | sed 's-/lib$-/%{_lib}-'`"
@@ -1022,7 +1022,7 @@
+---------------------------------------------------------------------------
Index: lib/rpmrc.c
--- lib/rpmrc.c 4 Jun 2003 18:18:45 -0000 1.1.1.25
-+++ lib/rpmrc.c 4 Jun 2004 14:10:21 -0000
++++ lib/rpmrc.c 6 Jun 2005 15:53:06 -0000 1.3
@@ -27,7 +27,7 @@
const char * macrofiles = MACROFILES;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.porting
============================================================================
$ cvs diff -u -r1.64 -r1.65 rpm.patch.porting
--- openpkg-src/openpkg/rpm.patch.porting 24 Mar 2005 11:19:44 -0000
1.64
+++ openpkg-src/openpkg/rpm.patch.porting 7 Jun 2005 11:36:12 -0000
1.65
@@ -9,7 +9,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 03-Feb-2005
+## Created on: 07-Jun-2005
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ -36,7 +36,7 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 21 Jul 2004 11:16:59 -0000
++++ configure.ac 6 Jun 2005 15:53:04 -0000 1.4
@@ -150,10 +151,10 @@
dnl XXX Test for libpthread.a that is NPTL aware (static link only).
dnl
@@ -59,7 +59,7 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 21 Jul 2004 11:16:59 -0000
++++ configure.ac 6 Jun 2005 15:53:04 -0000 1.4
@@ -446,14 +447,17 @@
AC_CHECK_LIB(socket, socket)
])
@@ -91,7 +91,7 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 21 Jul 2004 11:16:59 -0000
++++ configure.ac 6 Jun 2005 15:53:04 -0000 1.4
@@ -963,12 +967,13 @@
AC_CHECK_FUNCS(getpassphrase)
@@ -114,7 +114,7 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 21 Jul 2004 11:16:59 -0000
++++ configure.ac 6 Jun 2005 15:53:04 -0000 1.4
@@ -1141,9 +1146,6 @@
dnl XXX Choose /usr/lib or /usr/lib64 for library installs.
@@ -136,7 +136,7 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 21 Jul 2004 11:16:59 -0000
++++ configure.ac 6 Jun 2005 15:53:04 -0000 1.4
@@ -1249,11 +1251,37 @@
AC_SUBST(OBJDUMP)
@@ -209,7 +209,7 @@
+---------------------------------------------------------------------------
Index: db3/configure
--- db3/configure 18 Jan 2003 14:04:22 -0000 1.1.1.4
-+++ db3/configure 2 Jun 2004 08:23:49 -0000
++++ db3/configure 6 Jun 2005 15:53:05 -0000 1.3
@@ -7,19 +7,29 @@
# XXX edit CFLAGS= ... out of invocation args ???
ARGS="`echo $* | sed -e 's% [^ ]*CFLAGS=[^ ]*%%' -e 's% -[^-][^ ]*%%g' -e
's%--cache-file=.*$%%'`"
@@ -393,7 +393,7 @@
+---------------------------------------------------------------------------
Index: file/system.h
--- file/system.h 24 Jan 2003 19:41:56 -0000 1.1.1.1
-+++ file/system.h 14 May 2004 20:36:49 -0000
++++ file/system.h 6 Jun 2005 15:53:05 -0000 1.4
@@ -13,6 +13,9 @@
#endif
@@ -508,7 +508,7 @@
+---------------------------------------------------------------------------
Index: file/config.h.in
--- file/config.h.in 7 Mar 2003 19:39:18 -0000 1.1.1.1
-+++ file/config.h.in 14 May 2004 20:40:17 -0000
++++ file/config.h.in 6 Jun 2005 15:53:05 -0000 1.2
@@ -106,6 +106,9 @@
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
@@ -535,7 +535,7 @@
+---------------------------------------------------------------------------
Index: file/configure.ac
--- file/configure.ac 1 Dec 2002 21:34:06 -0000 1.1.1.1
-+++ file/configure.ac 14 May 2004 20:39:10 -0000
++++ file/configure.ac 6 Jun 2005 15:53:05 -0000 1.2
@@ -92,6 +92,7 @@
AC_CHECK_TYPE_STDC(uint8_t, unsigned char)
AC_CHECK_TYPE_STDC(uint16_t, unsigned short)
@@ -559,7 +559,7 @@
+---------------------------------------------------------------------------
Index: file/configure
--- file/configure 16 Jul 2003 17:05:25 -0000 1.1.1.2
-+++ file/configure 14 May 2004 20:40:04 -0000
++++ file/configure 6 Jun 2005 15:53:05 -0000 1.2
@@ -10847,6 +10847,46 @@
fi
@@ -623,7 +623,7 @@
+---------------------------------------------------------------------------
Index: file/print.c
--- file/print.c 24 Jan 2003 19:41:56 -0000 1.1.1.1
-+++ file/print.c 14 May 2004 20:39:45 -0000
++++ file/print.c 6 Jun 2005 15:53:05 -0000 1.2
@@ -187,7 +187,11 @@
va_start(va, f);
@@ -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 4 Jun 2004 12:14:37 -0000
++++ rpmio/fts.c 7 Jun 2005 07:45:08 -0000
@@ -34,6 +34,8 @@
static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/94";
#endif /* LIBC_SCCS and not lint */
@@ -831,7 +831,7 @@
#if defined(_LIBC)
#include <sys/param.h>
#include <include/sys/stat.h>
-@@ -45,20 +47,42 @@
+@@ -45,20 +47,49 @@
#include <string.h>
#include <unistd.h>
#else
@@ -873,10 +873,17 @@
+# define __fxstat64(_stat_ver, _fd, _sbp) fstat((_fd), (_sbp))
+# define _D_EXACT_NAMLEN(d) ((d)->d_reclen)
+#endif
++#if defined(OPENPKG_AIX)
++# define __errno_location() (&errno)
++# define _STAT_VER 0
++# define dirfd(dirp) ((dirp)->dd_fd)
++# define __fxstat64(_stat_ver, _fd, _sbp) fstat((_fd), (_sbp))
++# define _D_EXACT_NAMLEN(d) ((d)->d_namlen)
++#endif
#include "system.h"
#include "fts.h"
#include "rpmio.h"
-@@ -73,7 +97,12 @@
+@@ -73,7 +104,12 @@
/* Largest alignment size needed, minus one.
Usually long double is the worst case. */
#ifndef ALIGNBYTES
@@ -889,7 +896,7 @@
#endif
/* Align P to that size. */
#ifndef ALIGN
-@@ -107,9 +136,13 @@
+@@ -107,9 +143,13 @@
/[EMAIL PROTECTED] fileSystem, internalState @*/;
#ifndef MAX
@@ -930,7 +937,7 @@
+---------------------------------------------------------------------------
Index: rpmio/rpmrpc.c
--- rpmio/rpmrpc.c 29 May 2003 22:14:04 -0000 1.1.1.8
-+++ rpmio/rpmrpc.c 4 Jun 2004 10:59:07 -0000
++++ rpmio/rpmrpc.c 7 Jun 2005 07:45:12 -0000
@@ -1079,6 +1079,8 @@
return rc;
}
@@ -974,7 +981,7 @@
/[EMAIL PROTECTED]@*/
static int ftpmagicdir = 0x8440291;
-#define ISFTPMAGIC(_dir) (!memcmp((_dir), &ftpmagicdir,
sizeof(ftpmagicdir)))
-+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
&& !defined(sun) && !defined(OPENPKG_UNIXWARE) && !defined(OPENPKG_DARWIN) &&
!defined(__osf__) && !defined(OPENPKG_IRIX64) && !defined(OPENPKG_HPUX)
++#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
&& !defined(sun) && !defined(OPENPKG_UNIXWARE) && !defined(OPENPKG_DARWIN) &&
!defined(__osf__) && !defined(OPENPKG_IRIX64) && !defined(OPENPKG_HPUX) &&
!defined(OPENPKG_AIX)
+#define SETFTPMAGIC(_dir) ((_dir)->fd) = ftpmagicdir
+#define ISFTPMAGIC(_dir) ((_dir)->fd == ftpmagicdir)
+#else
@@ -1127,7 +1134,7 @@
+ strncpy(dp->d_name, av[i].name, sizeof(dp->d_name) - 1);
+ dp->d_name[sizeof(dp->d_name)-1] = '\0';
+ dp->d_namlen = strlen(dp->d_name);
-+#elif defined(OPENPKG_HPUX) || defined(sun) || defined(OPENPKG_UNIXWARE) ||
defined(__osf__) || defined(OPENPKG_IRIX64)
++#elif defined(OPENPKG_HPUX) || defined(sun) || defined(OPENPKG_UNIXWARE) ||
defined(__osf__) || defined(OPENPKG_IRIX64) || defined(OPENPKG_AIX)
+ /* XXX glob(3) uses REAL_DIR_ENTRY(dp) test on d_ino */
+ dp->d_ino = i + 1; /* W2DO? */
+ dp->d_reclen = 0; /* W2DO? */
@@ -1167,7 +1174,7 @@
+---------------------------------------------------------------------------
Index: system.h
--- system.h 1 Mar 2003 19:53:08 -0000 1.1.1.10
-+++ system.h 3 Feb 2005 14:02:24 -0000
++++ system.h 7 Jun 2005 07:45:13 -0000
@@ -256,10 +256,6 @@
#include <err.h>
#endif
@@ -1185,7 +1192,7 @@
+---------------------------------------------------------------------------
Index: system.h
--- system.h 1 Mar 2003 19:53:08 -0000 1.1.1.10
-+++ system.h 3 Feb 2005 14:02:24 -0000
++++ system.h 7 Jun 2005 07:45:14 -0000
@@ -550,7 +546,7 @@
#define lchown chown
#endif
@@ -1201,8 +1208,8 @@
+---------------------------------------------------------------------------
Index: system.h
--- system.h 1 Mar 2003 19:53:08 -0000 1.1.1.10
-+++ system.h 3 Feb 2005 14:02:24 -0000
-@@ -603,11 +599,19 @@
++++ system.h 7 Jun 2005 07:45:15 -0000
+@@ -603,11 +599,21 @@
#if defined(__LCLINT__)
#define FILE_RCSID(id)
@@ -1217,11 +1224,13 @@
+static const char *rcsid(const char *p) { \
+ return rcsid(p = id); \
+}
- #endif
-
++#endif
++
+/* for basename(3) and dirname(3) */
++#if !defined(OPENPKG_AIX)
+#include <libgen.h>
-+
+ #endif
+
#endif /* H_SYSTEM */
+---------------------------------------------------------------------------
@@ -1289,7 +1298,7 @@
+---------------------------------------------------------------------------
Index: aclocal.m4
--- aclocal.m4 16 Jul 2003 17:05:28 -0000 1.1.1.10
-+++ aclocal.m4 4 Jun 2004 11:04:22 -0000
++++ aclocal.m4 6 Jun 2005 15:53:03 -0000 1.4
@@ -2838,7 +2838,7 @@
runpath_var=LD_RUN_PATH
;;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.regen
============================================================================
$ cvs diff -u -r1.54 -r1.55 rpm.patch.regen
--- openpkg-src/openpkg/rpm.patch.regen 24 Mar 2005 11:19:44 -0000
1.54
+++ openpkg-src/openpkg/rpm.patch.regen 7 Jun 2005 11:36:12 -0000
1.55
@@ -9,7 +9,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 03-Feb-2005
+## Created on: 07-Jun-2005
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ -104,7 +104,7 @@
+---------------------------------------------------------------------------
Index: configure
--- configure 16 Jul 2003 17:05:55 -0000 1.1.1.23
-+++ configure 21 Jul 2004 11:20:06 -0000
++++ configure 6 Jun 2005 15:53:03 -0000 1.23
@@ -467,7 +467,7 @@
# include <unistd.h>
#endif"
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
