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: 22-Aug-2003 20:29:39
Branch: OPENPKG_UPGRADE_RPM42 Handle: 2003082219293800
Modified files: (Branch: OPENPKG_UPGRADE_RPM42)
openpkg-src/openpkg rpm.patch.porting
Log:
I'm still wondering how this should built, because the patch does not
even apply cleanly. So, remove 2 conflicting (duplicate) patch parts,
add back an accidently removed part and add an additional missing part.
Summary:
Revision Changes Path
1.5.2.4 +35 -32 openpkg-src/openpkg/rpm.patch.porting
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.porting
============================================================================
$ cvs diff -u -r1.5.2.3 -r1.5.2.4 rpm.patch.porting
--- openpkg-src/openpkg/rpm.patch.porting 22 Aug 2003 16:37:09 -0000 1.5.2.3
+++ openpkg-src/openpkg/rpm.patch.porting 22 Aug 2003 18:29:38 -0000 1.5.2.4
@@ -81,7 +81,22 @@
#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>
++---------------------------------------------------------------------------
+| Make sure that FreeBSD 5 does not complain about deprecated malloc.h
+| Add support for BSD getmntinfo(3).
+---------------------------------------------------------------------------
Index: system.h
--- system.h.dist 2003-08-14 14:27:16.000000000 +0200
@@ -378,21 +393,6 @@
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
@@ -404,22 +404,6 @@
+---------------------------------------------------------------------------
| Add support for BSD getmntinfo(3).
+---------------------------------------------------------------------------
-Index: system.h
---- system.h.dist 2003-08-14 14:27:16.000000000 +0200
-+++ system.h 2003-08-14 14:27:35.000000000 +0200
-@@ -550,7 +550,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
-
-+---------------------------------------------------------------------------
-| Add support for BSD getmntinfo(3).
-+---------------------------------------------------------------------------
Index: lib/fs.c
--- lib/fs.c.dist 2003-08-14 14:25:18.000000000 +0200
+++ lib/fs.c 2003-08-14 14:25:20.000000000 +0200
@@ -521,3 +505,22 @@
/* Largest alignment size needed, minus one.
Usually long double is the worst case. */
#ifndef ALIGNBYTES
++---------------------------------------------------------------------------
+| Avoid literal TAB character (disliked by some shells within here-document)
++---------------------------------------------------------------------------
+--- db3/configure.dist 2003-08-22 16:28:41.000000000 +0200
++++ db3/configure 2003-08-22 16:29:28.000000000 +0200
+@@ -15,11 +15,11 @@
+ cat Makefile.orig | sed -e '/^install[:-]/c\
+ .PHONY: listobjs\
+ listobjs:\
+- @echo $(OBJS) $(C_OBJS) \
[EMAIL PROTECTED] $(OBJS) $(C_OBJS) \
+ \
+ distdir install check:\
+ \
+-db4_install: all install_setip' > Makefile
++db4_install: all install_setip' | tr '~' '\009' > Makefile
+
+ mv db.h db.h.orig
+ cat db.h.orig | sed \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
