OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 22-Aug-2003 18:37:09
Branch: OPENPKG_UPGRADE_RPM42 Handle: 2003082217370900
Modified files: (Branch: OPENPKG_UPGRADE_RPM42)
openpkg-src/openpkg openpkg.spec rpm.patch.porting rpm.patch.regen
Log:
roll forward latest changes (hopefully all of them)
Summary:
Revision Changes Path
1.192.2.3 +18 -17 openpkg-src/openpkg/openpkg.spec
1.5.2.3 +114 -73 openpkg-src/openpkg/rpm.patch.porting
1.3.2.2 +9 -1 openpkg-src/openpkg/rpm.patch.regen
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.192.2.2 -r1.192.2.3 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 22 Aug 2003 11:06:58 -0000 1.192.2.2
+++ openpkg-src/openpkg/openpkg.spec 22 Aug 2003 16:37:09 -0000 1.192.2.3
@@ -39,7 +39,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20030822
+%define V_openpkg 20030822
# the used software versions
%define V_rpm 4.2.1
@@ -427,14 +427,12 @@
${l_make} CC="${l_cc}" CFLAGS="-O" libz.a || exit $?
) || exit $?
- # build BeeCrypt library
+ # build BEECRYPT library
( cd beecrypt-%{V_beecrypt}
- CC="${l_cc}" \
- CFLAGS="-O" \
- ./configure \
- --prefix=%{l_prefix} \
- --disable-shared
- ${l_make} || exit $?
+ CC="${l_cc}" CFLAGS="-O" ./configure \
+ --prefix=%{l_prefix} \
+ --disable-shared
+ ${l_make} CC="${l_cc}" CFLAGS="-O" || exit $?
cp .libs/libbeecrypt.a .
) || exit $?
@@ -475,7 +473,6 @@
-e 's;LDFLAGS_STATIC="[^"]*";LDFLAGS_STATIC="";g' \
-e "s;SYSCONFIGDIR=.*;SYSCONFIGDIR='%{l_prefix}/etc/openpkg';" \
-e 's;db-[0-9][0-9.]*;db;g' \
- -e 's;beecrypt/stamp-h.in;stamp-h.in;' \
<configure >configure.n && \
mv configure.n configure
sed -e 's;@INTLLIBS@;@INTLLIBS@ @LIBMISC@;' \
@@ -493,20 +490,24 @@
<scripts/Makefile.in >scripts/Makefile.in.n && \
mv scripts/Makefile.in.n scripts/Makefile.in
sed -e 's;/lib/rpm;/lib/openpkg;' \
+ -e 's;-all-static;-static;g' \
<file/Makefile.in >file/Makefile.in.n && \
mv file/Makefile.in.n file/Makefile.in
sed -e 's;^\(SUBDIRS[ ]*=.*\) po$;\1;' \
+ -e 's;-all-static;-static;g' \
<popt/Makefile.in >popt/Makefile.in.n && \
mv popt/Makefile.in.n popt/Makefile.in
sed -e 's;^\(PROGRAMS[ ]*=\).*$;\1;' \
+ -e 's;-all-static;-static;g' \
<rpmdb/Makefile.in >rpmdb/Makefile.in.n && \
mv rpmdb/Makefile.in.n rpmdb/Makefile.in
+ sed -e 's;-all-static;-static;g' \
+ <rpmio/Makefile.in >rpmio/Makefile.in.n && \
+ mv rpmio/Makefile.in.n rpmio/Makefile.in
+ -e 's;-all-static;-static;g' \
sed -e 's;BUFSIZ;8192;g' \
<rpmio/macro.c >rpmio/macro.c.n && \
mv rpmio/macro.c.n rpmio/macro.c
- sed -e 's;--enable-shared;--disable-shared;g' \
- <db3/configure >db3/configure.n && \
- mv db3/configure.n db3/configure
( echo 'ac_cv_path_MSGFMT=${ac_cv_path_MSGFMT=no}'
echo 'ac_cv_path_GMSGFMT=${ac_cv_path_GMSGFMT=no}'
echo "ac_cv_path_MKDIR=%{l_prefix}/lib/openpkg/shtool mkdir -f -p -m 755}"
@@ -517,7 +518,11 @@
mkdir perl >/dev/null 2>&1 || true
touch perl/Makefile.in
touch perl/Makefile.PL.in
+ # move embedded zlib out of the way, we are linking with our own zlib
mv zlib zlib.old
+ # kill linux-preconfigured db header, the makefile will symlink the
+ # header that is configured for the current system
+ rm rpmdb/db.h
case `sh ./config.guess` in
*-*-linux* ) nlsopt="--disable-nls" ;;
* ) nlsopt="--enable-nls --with-included-gettext" ;;
@@ -538,11 +543,7 @@
--without-python \
--without-apidocs \
$nlsopt
- sed -e 's;[EMAIL PROTECTED]; @echo;' \
- <db3/Makefile >db3/Makefile.n && \
- mv db3/Makefile.n db3/Makefile
- ${l_make} \
- EXTRA_LIBS="-L`pwd`/db3 -ldb -L$br/zlib-%{V_zlib} -lz
-L$br/bzip2-%{V_bzip2} -lbz2"
+ ${l_make}
) || exit $?
%install
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.porting
============================================================================
$ cvs diff -u -r1.5.2.2 -r1.5.2.3 rpm.patch.porting
--- openpkg-src/openpkg/rpm.patch.porting 22 Aug 2003 11:27:01 -0000 1.5.2.2
+++ openpkg-src/openpkg/rpm.patch.porting 22 Aug 2003 16:37:09 -0000 1.5.2.3
@@ -81,86 +81,101 @@
#if !defined(__linux__)
+---------------------------------------------------------------------------
| Avoid unconditional inclusion of system header, conflicts with GNU glob
+| make sure that FreeBSD 5 does not complain about deprecated malloc.h
+---------------------------------------------------------------------------
---- rpmio/rpmio.h.dist 2003-08-13 11:35:47.000000000 +0200
-+++ rpmio/rpmio.h 2003-08-13 11:36:01.000000000 +0200
-@@ -9,9 +9,6 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <dirent.h>
--/[EMAIL PROTECTED]@*/
--#include <glob.h>
--/[EMAIL PROTECTED]@*/
- #include <stdio.h>
- #include <stdlib.h>
- #include <unistd.h>
---- rpmio/rpmrpc.c.dist 2003-08-13 13:32:55.000000000 +0200
-+++ rpmio/rpmrpc.c 2003-08-13 13:33:08.000000000 +0200
-@@ -1079,36 +1079,28 @@
+Index: system.h
+--- system.h.dist 2003-08-14 14:27:16.000000000 +0200
++++ system.h 2003-08-22 18:31:18.000000000 +0200
+@@ -256,10 +256,6 @@
+ #include <err.h>
+ #endif
+
+-#if HAVE_MALLOC_H && !defined(__LCLINT__)
+-#include <malloc.h>
+-#endif
+-
+ /[EMAIL PROTECTED] -incondefs @*/ /* FIX: these are macros */
+ /**
+ */
+@@ -550,7 +546,7 @@
+ #define lchown chown
+ #endif
+
+-#if HAVE_GETMNTINFO_R || HAVE_MNTCTL
++#if HAVE_GETMNTINFO_R || HAVE_GETMNTINFO || HAVE_MNTCTL
+ # define GETMNTENT_ONE 0
+ # define GETMNTENT_TWO 0
+ # if HAVE_SYS_MNTCTL_H
++---------------------------------------------------------------------------
+| patch FTP directory function for FreeBSD, better ISO C compatibility
++---------------------------------------------------------------------------
+Index: rpmio/rpmrpc.c
+--- rpmio/rpmrpc.c.dist 2003-05-30 00:14:04.000000000 +0200
++++ rpmio/rpmrpc.c 2003-08-22 16:03:43.000000000 +0200
+@@ -1079,6 +1079,8 @@
return rc;
}
-+struct __dirstreament {
++#if !defined(__FreeBSD__) && !defined(sun)
++
+ struct __dirstream {
+ int fd; /* File descriptor. */
+ char * data; /* Directory block. */
+@@ -1091,6 +1093,8 @@
+ #endif
+ };
+
++#endif
++
+ #if !defined(DT_DIR)
+ # define DT_UNKNOWN 0
+ # define DT_FIFO 1
+@@ -1101,14 +1105,30 @@
+ # define DT_LNK 10
+ # define DT_SOCK 12
+ # define DT_WHT 14
+-typedef struct __dirstream * FTPDIR;
+-#else
+-typedef DIR * FTPDIR;
+ #endif
+
++struct mydirstreament {
+ unsigned char type;
+ char *name;
+};
- struct __dirstream {
-- int fd; /* File descriptor. */
-- char * data; /* Directory block. */
-- size_t allocation; /* Space allocated for the block. */
-- size_t size; /* Total valid data in the block. */
-- size_t offset; /* Current offset into the block. */
-- off_t filepos; /* Position of next entry to read. */
--#if defined(HAVE_PTHREAD_H) && !defined(__LCLINT__)
-- pthread_mutex_t lock; /* Mutex lock for this structure. */
--#endif
++struct mydirstream {
+ DIR dir;
+ struct dirent ent;
+ unsigned int offset;
+ unsigned int size;
-+ struct __dirstreament av[1];
- };
--
--#if !defined(DT_DIR)
--# define DT_UNKNOWN 0
--# define DT_FIFO 1
--# define DT_CHR 2
--# define DT_DIR 4
--# define DT_BLK 6
--# define DT_REG 8
--# define DT_LNK 10
--# define DT_SOCK 12
--# define DT_WHT 14
--typedef struct __dirstream * FTPDIR;
--#else
--typedef DIR * FTPDIR;
--#endif
-+typedef struct __dirstream *FTPDIR;
-
++ struct mydirstreament av[1];
++};
++typedef struct mydirstream *FTPDIR;
++
/[EMAIL PROTECTED]@*/
static int ftpmagicdir = 0x8440291;
-#define ISFTPMAGIC(_dir) (!memcmp((_dir), &ftpmagicdir, sizeof(ftpmagicdir)))
-+#if defined(__FreeBSD__)
-+#define SETFTPMAGIC(_dir) ((_dir)->dd_fd) = ftpmagicdir
-+#define ISFTPMAGIC(_dir) ((_dir)->dd_fd == ftpmagicdir)
-+#else
++#if !defined(__FreeBSD__) && !defined(sun)
+#define SETFTPMAGIC(_dir) ((_dir)->fd) = ftpmagicdir
-+#define ISFTPMAGIC(_dir) ((_dir)->fd == ftpmagicdir)
++#define ISFTPMAGIC(_dir) ((_dir)->fd == ftpmagicdir)
++#else
++#define SETFTPMAGIC(_dir) ((_dir)->dd_fd) = ftpmagicdir
++#define ISFTPMAGIC(_dir) ((_dir)->dd_fd == ftpmagicdir)
+#endif
/[EMAIL PROTECTED]@*/
/[EMAIL PROTECTED]@*/ /* FIX: abstract DIR */
-@@ -1121,8 +1113,7 @@
+@@ -1121,8 +1141,7 @@
struct dirent * dp;
size_t nb;
const char * s, * sb, * se;
- const char ** av;
- unsigned char * dt;
-+ struct __dirstreament * av;
++ struct mydirstreament * av;
char * t;
int ac;
int c;
-@@ -1165,28 +1156,22 @@
+@@ -1165,28 +1184,22 @@
}
}
@@ -198,7 +213,7 @@
/[EMAIL PROTECTED] [EMAIL PROTECTED]/
sb = NULL;
s = se = ftpBuf;
-@@ -1198,34 +1183,34 @@
+@@ -1198,34 +1211,34 @@
/[EMAIL PROTECTED]@*/ break;
case '\r':
/[EMAIL PROTECTED]@*/
@@ -242,7 +257,7 @@
/[EMAIL PROTECTED]@*/ break;
}
/[EMAIL PROTECTED]@*/
-@@ -1243,7 +1228,7 @@
+@@ -1243,7 +1256,7 @@
/[EMAIL PROTECTED]@*/ break;
}
}
@@ -251,13 +266,13 @@
/[EMAIL PROTECTED]@*/
return (DIR *) mydir;
-@@ -1258,43 +1243,50 @@
+@@ -1258,43 +1271,50 @@
{
FTPDIR mydir = (FTPDIR)dir;
struct dirent * dp;
- const char ** av;
- unsigned char * dt;
-+ struct __dirstreament * av;
++ struct mydirstreament * av;
int ac;
int i;
@@ -316,7 +331,7 @@
/[EMAIL PROTECTED]@*/
if (_ftp_debug)
fprintf(stderr, "*** ftpReaddir(%p) %p \"%s\"\n", (void *)mydir, dp, dp->d_name);
-@@ -1313,7 +1305,7 @@
+@@ -1313,7 +1333,7 @@
/[EMAIL PROTECTED]@*/
if (_ftp_debug)
fprintf(stderr, "*** ftpClosedir(%p)\n", (void *)mydir);
@@ -343,10 +358,11 @@
+---------------------------------------------------------------------------
| Add support for BSD getmntinfo(3).
+| Don't fail if optional beecrypt directory is missing
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac.dist 2003-08-14 14:28:05.000000000 +0200
-+++ configure.ac 2003-08-14 14:29:00.000000000 +0200
++++ configure.ac 2003-08-22 15:50:42.000000000 +0200
@@ -963,12 +963,13 @@
AC_CHECK_FUNCS(getpassphrase)
@@ -362,6 +378,29 @@
AC_CHECK_FUNC(lchown,
[__CHOWN_RHF="%{__chown} -Rhf"
+@@ -1215,12 +1216,12 @@
+ [Colon separated paths of macro files to read.])
+ AC_SUBST(MACROFILES)
+
+-LIBRPMRC_FILENAME="${RPMCONFIGDIR}/rpmrc"
++LIBRPMRC_FILENAME="${SYSCONFIGDIR}/rpmrc"
+ AC_DEFINE_UNQUOTED(LIBRPMRC_FILENAME, "$LIBRPMRC_FILENAME",
+ [Full path to rpmrc configuration file (usually /usr/lib/rpm/rpmrc)])
+ AC_SUBST(LIBRPMRC_FILENAME)
+
+-VENDORRPMRC_FILENAME="${RPMCONFIGDIR}/${RPMCANONVENDOR}/rpmrc"
++VENDORRPMRC_FILENAME="${SYSCONFIGDIR}/${RPMCANONVENDOR}/rpmrc"
+ AC_DEFINE_UNQUOTED(VENDORRPMRC_FILENAME, "$VENDORRPMRC_FILENAME",
+ [Full path to vendor rpmrc configuration file (usually
/usr/lib/rpm/vendor/rpmrc)])
+ AC_SUBST(VENDORRPMRC_FILENAME)
+@@ -1274,7 +1275,6 @@
+ python/rpmdb/Makefile
+ python/test/Makefile
+ ], [ echo timestamp > popt/stamp-h.in
+- echo timestamp > beecrypt/stamp-h.in
+ echo timestamp > stamp-h.in
+ ]
+ )
+---------------------------------------------------------------------------
| Add support for BSD getmntinfo(3).
+---------------------------------------------------------------------------
@@ -418,8 +457,12 @@
INCLUDES = \
-I$(top_srcdir)/build \
++---------------------------------------------------------------------------
+| don't unconditionally link with rt/pthread
+| fix for loop which breaks under Solaris sh
++---------------------------------------------------------------------------
--- rpmio/Makefile.in.dist 2003-08-14 15:03:41.000000000 +0200
-+++ rpmio/Makefile.in 2003-08-14 15:03:48.000000000 +0200
++++ rpmio/Makefile.in 2003-08-22 12:57:34.000000000 +0200
@@ -288,8 +288,7 @@
librpmio_la_LDFLAGS = -release 4.2 \
@WITH_BEECRYPT_LIB@ \
@@ -430,6 +473,17 @@
librpmio_la_LIBADD = $(BEECRYPTLOBJS)
librpmio_la_DEPENDENCIES = .created
+@@ -743,8 +742,8 @@
+ .created:
+ if test X"@WITH_BEECRYPT_SUBDIR@" != X; then \
+ ${MAKE} -C $(top_builddir)/@WITH_BEECRYPT_SUBDIR@ listobjs ; \
+- for lo in $(BEECRYPTLOBJS); do \
+- [ -f $$lo ] || $(LN_S) $(top_builddir)/@WITH_BEECRYPT_SUBDIR@/$$lo $$lo ; \
++ for lo in $(BEECRYPTLOBJS) ''; do \
++ [ ".$$lo" = . ] || [ -f $$lo ] || $(LN_S)
$(top_builddir)/@WITH_BEECRYPT_SUBDIR@/$$lo $$lo ; \
+ done \
+ fi
+ touch $@
+---------------------------------------------------------------------------
| Require limits.h header for USHRT_MAX
| Add errno and dirent handling for FreeBSD
@@ -467,16 +521,3 @@
/* Largest alignment size needed, minus one.
Usually long double is the worst case. */
#ifndef ALIGNBYTES
---- system.h.orig Fri Aug 22 13:09:24 2003
-+++ system.h Fri Aug 22 13:14:19 2003
-@@ -256,10 +256,6 @@
- #include <err.h>
- #endif
-
--#if HAVE_MALLOC_H && !defined(__LCLINT__)
--#include <malloc.h>
--#endif
--
- /[EMAIL PROTECTED] -incondefs @*/ /* FIX: these are macros */
- /**
- */
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.regen
============================================================================
$ cvs diff -u -r1.3.2.1 -r1.3.2.2 rpm.patch.regen
--- openpkg-src/openpkg/rpm.patch.regen 22 Aug 2003 10:57:07 -0000 1.3.2.1
+++ openpkg-src/openpkg/rpm.patch.regen 22 Aug 2003 16:37:09 -0000 1.3.2.2
@@ -19,7 +19,7 @@
+---------------------------------------------------------------------------
Index: configure
--- configure.dist 2003-08-20 14:32:33.000000000 +0200
-+++ configure 2003-08-20 14:32:47.000000000 +0200
++++ configure 2003-08-22 16:09:51.000000000 +0200
@@ -22911,6 +22911,86 @@
else
@@ -134,3 +134,11 @@
cat >>confdefs.h <<_ACEOF
#define VENDORRPMRC_FILENAME "$VENDORRPMRC_FILENAME"
+@@ -25157,7 +25239,6 @@
+ esac
+ done ;;
+ default ) echo timestamp > popt/stamp-h.in
+- echo timestamp > beecrypt/stamp-h.in
+ echo timestamp > stamp-h.in
+
+ ;;
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
