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 16:53:45
Branch: HEAD Handle: 2003082215534400
Modified files:
openpkg-src/openpkg rpm.patch.porting rpm.patch.regen
Log:
correct inclusion of dirent types, avoid build abort because of
missing embedded beecrypt library, avoid literal TAB character in
shell script
Summary:
Revision Changes Path
1.7 +40 -5 openpkg-src/openpkg/rpm.patch.porting
1.5 +9 -1 openpkg-src/openpkg/rpm.patch.regen
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.porting
============================================================================
$ cvs diff -u -r1.6 -r1.7 rpm.patch.porting
--- openpkg-src/openpkg/rpm.patch.porting 22 Aug 2003 13:08:40 -0000 1.6
+++ openpkg-src/openpkg/rpm.patch.porting 22 Aug 2003 14:53:44 -0000 1.7
@@ -98,7 +98,7 @@
| patch FTP directory function for FreeBSD, better ISO C compatibility
+---------------------------------------------------------------------------
--- rpmio/rpmrpc.c.dist 2003-05-30 00:14:04.000000000 +0200
-+++ rpmio/rpmrpc.c 2003-08-22 12:11:34.000000000 +0200
++++ rpmio/rpmrpc.c 2003-08-22 16:03:43.000000000 +0200
@@ -1079,6 +1079,8 @@
return rc;
}
@@ -108,7 +108,16 @@
struct __dirstream {
int fd; /* File descriptor. */
char * data; /* Directory block. */
-@@ -1101,14 +1103,32 @@
+@@ -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
@@ -117,8 +126,6 @@
-typedef DIR * FTPDIR;
#endif
-+#endif
-+
+struct mydirstreament {
+ unsigned char type;
+ char *name;
@@ -338,10 +345,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)
@@ -357,6 +365,14 @@
AC_CHECK_FUNC(lchown,
[__CHOWN_RHF="%{__chown} -Rhf"
+@@ -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).
+---------------------------------------------------------------------------
@@ -477,3 +493,22 @@
/* Largest alignment size needed, minus one.
Usually long double is the worst case. */
#ifndef ALIGNBYTES
++---------------------------------------------------------------------------
+| Avoid literal TAB character
++---------------------------------------------------------------------------
+--- 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 \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.regen
============================================================================
$ cvs diff -u -r1.4 -r1.5 rpm.patch.regen
--- openpkg-src/openpkg/rpm.patch.regen 22 Aug 2003 13:08:40 -0000 1.4
+++ openpkg-src/openpkg/rpm.patch.regen 22 Aug 2003 14:53:44 -0000 1.5
@@ -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]
