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: 27-Oct-2003 21:18:45
Branch: HEAD Handle: 2003102720184401
Modified files:
openpkg-src/openpkg HISTORY rpm.patch.feature rpm.patch.porting
rpm.patch.regen
Log:
port RPM to OpenDarwin 6.6.2
Summary:
Revision Changes Path
1.80 +1 -0 openpkg-src/openpkg/HISTORY
1.35 +4 -4 openpkg-src/openpkg/rpm.patch.feature
1.42 +30 -20 openpkg-src/openpkg/rpm.patch.porting
1.33 +40 -32 openpkg-src/openpkg/rpm.patch.regen
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.79 -r1.80 HISTORY
--- openpkg-src/openpkg/HISTORY 27 Oct 2003 15:32:29 -0000 1.79
+++ openpkg-src/openpkg/HISTORY 27 Oct 2003 20:18:44 -0000 1.80
@@ -2,6 +2,7 @@
2003
====
+20031027 port RPM to OpenDarwin 6.6.2
20031027 try to cleanup glob(3) replacement hacks in RPM
20031021 fix RPM GCC building on Unixware by using Linux i386 assembly specific
stuff on Linux only.
20031020 include "trigger argument passing patch" from RPM BugDB
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.feature
============================================================================
$ cvs diff -u -r1.34 -r1.35 rpm.patch.feature
--- openpkg-src/openpkg/rpm.patch.feature 27 Oct 2003 15:32:30 -0000 1.34
+++ openpkg-src/openpkg/rpm.patch.feature 27 Oct 2003 20:18:45 -0000 1.35
@@ -339,11 +339,10 @@
Index: build/build.c
--- build/build.c 4 Mar 2003 15:27:33 -0000 1.1.1.20
+++ build/build.c 15 Sep 2003 19:02:34 -0000
-@@ -337,6 +355,21 @@
-
+@@ -338,6 +356,21 @@
if (what & RPMBUILD_RMSPEC)
(void) Unlink(spec->specFile);
-+
+
+#ifdef OPENPKG
+ if (what & RPMBUILD_RMSOURCE) {
+ const char *pn;
@@ -358,9 +357,10 @@
+ pn = _free(pn);
+ }
+#endif
-
++
exit:
if (rc && rpmlogGetNrecs() > 0) {
+ rpmMessage(RPMMESS_NORMAL, _("\n\nRPM build errors:\n"));
+---------------------------------------------------------------------------
| Make sure the "Provides" headers are available for querying from the
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.porting
============================================================================
$ cvs diff -u -r1.41 -r1.42 rpm.patch.porting
--- openpkg-src/openpkg/rpm.patch.porting 27 Oct 2003 15:32:30 -0000 1.41
+++ openpkg-src/openpkg/rpm.patch.porting 27 Oct 2003 20:18:45 -0000 1.42
@@ -193,16 +193,16 @@
# endif
filesystems = xcalloc((numAlloced + 1), sizeof(*filesystems)); /* XXX memory
leak */
-@@ -191,6 +197,9 @@
- if (getmntent(mtab, &item)) break;
- mntdir = item.our_mntdir;
+@@ -193,6 +199,9 @@
# elif HAVE_GETMNTINFO_R
-+ if (nextMount == mntCount) break;
-+ mntdir = mounts[nextMount++].f_mntonname;
-+# elif HAVE_GETMNTINFO
if (nextMount == mntCount) break;
mntdir = mounts[nextMount++].f_mntonname;
++# elif HAVE_GETMNTINFO
++ if (nextMount == mntCount) break;
++ mntdir = mounts[nextMount++].f_mntonname;
# endif
+
+ if (stat(mntdir, &sb)) {
+---------------------------------------------------------------------------
| Add support for Compaq/HP OSF1/Tru64.
@@ -594,7 +594,7 @@
+---------------------------------------------------------------------------
Index: rpmio/fts.c
--- rpmio/fts.c 18 Jan 2003 16:13:17 -0000 1.1.1.3
-+++ rpmio/fts.c 19 Oct 2003 19:02:24 -0000
++++ rpmio/fts.c 27 Oct 2003 20:11:34 -0000
@@ -34,6 +34,8 @@
static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/94";
#endif /* LIBC_SCCS and not lint */
@@ -615,7 +615,7 @@
# define _STAT_VER 0
# define __fxstat64(_stat_ver, _fd, _sbp) fstat((_fd), (_sbp))
#endif
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) ||
defined(OPENPKG_DARWIN)
+# define __errno_location() (&errno)
+# define stat64 stat
+# define _STAT_VER 0
@@ -679,12 +679,12 @@
+---------------------------------------------------------------------------
Index: rpmio/rpmrpc.c
--- rpmio/rpmrpc.c 29 May 2003 22:14:04 -0000 1.1.1.8
-+++ rpmio/rpmrpc.c 19 Oct 2003 19:04:21 -0000
++++ rpmio/rpmrpc.c 27 Oct 2003 20:11:51 -0000
@@ -1079,6 +1079,8 @@
return rc;
}
-+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) &&
!defined(sun)
++#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) &&
!defined(sun) && !defined(OPENPKG_DARWIN)
+
struct __dirstream {
int fd; /* File descriptor. */
@@ -723,7 +723,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)
++#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) &&
!defined(sun) && !defined(OPENPKG_UNIXWARE) && !defined(OPENPKG_DARWIN)
+#define SETFTPMAGIC(_dir) ((_dir)->fd) = ftpmagicdir
+#define ISFTPMAGIC(_dir) ((_dir)->fd == ftpmagicdir)
+#else
@@ -869,7 +869,7 @@
mydir->offset = i;
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) ||
defined(OPENPKG_DARWIN)
+ dp->d_ino = i + 1;
+ dp->d_reclen = 0;
+ dp->d_type = av[i].type;
@@ -951,7 +951,7 @@
Index: system.h
--- system.h 1 Mar 2003 19:53:08 -0000 1.1.1.10
+++ system.h 27 Aug 2003 13:07:49 -0000
-@@ -603,9 +599,14 @@
+@@ -603,11 +599,16 @@
#if defined(__LCLINT__)
#define FILE_RCSID(id)
@@ -959,14 +959,16 @@
+#elif defined(__GNUC__)
#define FILE_RCSID(id) \
static inline const char *rcsid(const char *p) { \
-+ return rcsid(p = id); \
-+}
+ return rcsid(p = id); \
+ }
+#else
+#define FILE_RCSID(id) \
+static const char *rcsid(const char *p) { \
- return rcsid(p = id); \
- }
++ return rcsid(p = id); \
++}
#endif
+
+ #endif /* H_SYSTEM */
+---------------------------------------------------------------------------
| Remove GCC'ism.
@@ -1029,11 +1031,11 @@
/[EMAIL PROTECTED]@*/ xx = munmap(mapped, nmapped) /[EMAIL PROTECTED]@*/;
+---------------------------------------------------------------------------
-| Support UnixWare 7.1.3, too.
+| Support UnixWare 7.1.3 and OpenDarwin 6.6.2, too.
+---------------------------------------------------------------------------
Index: aclocal.m4
--- aclocal.m4 16 Jul 2003 17:05:28 -0000 1.1.1.10
-+++ aclocal.m4 20 Oct 2003 12:43:23 -0000
++++ aclocal.m4 27 Oct 2003 20:13:35 -0000
@@ -2838,7 +2838,7 @@
runpath_var=LD_RUN_PATH
;;
@@ -1043,7 +1045,15 @@
no_undefined_flag='${wl}-z ${wl}text'
if test "$GCC" = yes; then
archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs
$compiler_flags'
-@@ -4414,7 +4414,7 @@
+@@ -4311,6 +4311,7 @@
+ ;;
+ *) # Darwin 1.3 on
+ lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
++ lt_cv_deplibs_check_method=pass_all
+ ;;
+ esac
+ ;;
+@@ -4414,7 +4415,7 @@
lt_cv_file_magic_test_file=/lib/libc.so
;;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.regen
============================================================================
$ cvs diff -u -r1.32 -r1.33 rpm.patch.regen
--- openpkg-src/openpkg/rpm.patch.regen 27 Oct 2003 15:32:30 -0000 1.32
+++ openpkg-src/openpkg/rpm.patch.regen 27 Oct 2003 20:18:45 -0000 1.33
@@ -82,11 +82,10 @@
/* Define to 1 if you have the `tsearch' function. */
#undef HAVE_TSEARCH
-@@ -585,6 +573,15 @@
-
+@@ -586,6 +574,15 @@
/* Define to `unsigned' if <sys/types.h> does not define. */
#undef size_t
-+
+
+/* uint16_t */
+#undef uint16_t
+
@@ -95,9 +94,10 @@
+
+/* uint8_t */
+#undef uint8_t
-
++
/* Define to unsigned long or unsigned long long if <inttypes.h> and
<stdint.h> don't define. */
+ #undef uintmax_t
+---------------------------------------------------------------------------
| Corresponding patches in "configure" script after regeneration from
@@ -105,7 +105,7 @@
+---------------------------------------------------------------------------
Index: configure
--- configure 16 Jul 2003 17:05:55 -0000 1.1.1.23
-+++ configure 20 Oct 2003 12:45:26 -0000
++++ configure 27 Oct 2003 20:15:57 -0000
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
@@ -158,7 +158,15 @@
else
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
-@@ -5981,7 +5982,7 @@
+@@ -5878,6 +5879,7 @@
+ ;;
+ *) # Darwin 1.3 on
+ lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
++ lt_cv_deplibs_check_method=pass_all
+ ;;
+ esac
+ ;;
+@@ -5981,7 +5983,7 @@
lt_cv_file_magic_test_file=/lib/libc.so
;;
@@ -167,25 +175,25 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -6682,7 +6683,7 @@
+@@ -6682,7 +6684,7 @@
case $host in
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 6685 "configure"' > conftest.$ac_ext
-+ echo '#line 6686 "configure"' > conftest.$ac_ext
++ echo '#line 6687 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -7211,7 +7212,7 @@
+@@ -7211,7 +7213,7 @@
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
compiler_c_o=no
-if { (eval echo configure:7214: \"$ac_compile\") 1>&5; (eval $ac_compile)
2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
-+if { (eval echo configure:7215: \"$ac_compile\") 1>&5; (eval $ac_compile)
2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
++if { (eval echo configure:7216: \"$ac_compile\") 1>&5; (eval $ac_compile)
2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
if test -s out/conftest.err; then
-@@ -8069,7 +8070,7 @@
+@@ -8069,7 +8071,7 @@
runpath_var=LD_RUN_PATH
;;
@@ -194,34 +202,34 @@
no_undefined_flag='${wl}-z ${wl}text'
if test "$GCC" = yes; then
archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs
$compiler_flags'
-@@ -8395,7 +8396,7 @@
+@@ -8395,7 +8397,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*)
- echo '#line 8398 "configure"' > conftest.$ac_ext
-+ echo '#line 8399 "configure"' > conftest.$ac_ext
++ echo '#line 8400 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -9067,7 +9068,7 @@
+@@ -9067,7 +9069,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9070 "configure"
-+#line 9071 "configure"
++#line 9072 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -9165,7 +9166,7 @@
+@@ -9165,7 +9167,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9168 "configure"
-+#line 9169 "configure"
++#line 9170 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11266,7 +11267,7 @@
+@@ -11266,7 +11268,7 @@
WITH_ZLIB_SUBDIR=
WITH_ZLIB_INCLUDE=
WITH_ZLIB_LIB=
@@ -230,7 +238,7 @@
WITH_ZLIB_SUBDIR=zlib
addlib \${top_builddir}/zlib
WITH_ZLIB_INCLUDE="-I\${top_srcdir}/${WITH_ZLIB_SUBDIR}"
-@@ -11312,7 +11313,7 @@
+@@ -11312,7 +11314,7 @@
echo "$as_me:$LINENO: checking for $dir/include in INCPATH" >&5
echo $ECHO_N "checking for $dir/include in INCPATH... $ECHO_C" >&6
if test -d $dir/include 2>/dev/null ; then
@@ -239,7 +247,7 @@
INCPATH="$INCPATH -I$dir/include"
fi
echo "$as_me:$LINENO: result: yes" >&5
-@@ -12051,7 +12052,7 @@
+@@ -12051,7 +12053,7 @@
#define HAVE_LIBBEECRYPT 1
_ACEOF
@@ -248,7 +256,7 @@
WITH_BEECRYPT_LIB="-lbeecrypt"
fi
-@@ -12648,350 +12649,6 @@
+@@ -12648,350 +12650,6 @@
@@ -599,7 +607,7 @@
for ac_header in aio.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-@@ -22911,6 +22568,86 @@
+@@ -22911,6 +22569,86 @@
else
@@ -686,7 +694,7 @@
echo "$as_me:$LINENO: checking for mntctl" >&5
echo $ECHO_N "checking for mntctl... $ECHO_C" >&6
if test "${ac_cv_func_mntctl+set}" = set; then
-@@ -23148,6 +22885,8 @@
+@@ -23148,6 +22886,8 @@
fi
@@ -695,7 +703,7 @@
echo "$as_me:$LINENO: checking for lchown" >&5
echo $ECHO_N "checking for lchown... $ECHO_C" >&6
-@@ -23515,7 +23254,7 @@
+@@ -23515,7 +23255,7 @@
LIBDIR="`echo $libdir | sed 's-/lib$-/%{_lib}-'`"
@@ -704,7 +712,7 @@
cat >>confdefs.h <<_ACEOF
#define RPMCONFIGDIR "$RPMCONFIGDIR"
-@@ -23523,7 +23262,7 @@
+@@ -23523,7 +23263,7 @@
@@ -713,7 +721,7 @@
cat >>confdefs.h <<_ACEOF
#define SYSCONFIGDIR "$SYSCONFIGDIR"
-@@ -23539,7 +23278,7 @@
+@@ -23539,7 +23279,7 @@
@@ -722,7 +730,7 @@
cat >>confdefs.h <<_ACEOF
#define LIBRPMRC_FILENAME "$LIBRPMRC_FILENAME"
-@@ -23547,7 +23286,7 @@
+@@ -23547,7 +23287,7 @@
@@ -731,7 +739,7 @@
cat >>confdefs.h <<_ACEOF
#define VENDORRPMRC_FILENAME "$VENDORRPMRC_FILENAME"
-@@ -23555,7 +23294,7 @@
+@@ -23555,7 +23295,7 @@
@@ -740,7 +748,7 @@
cat >>confdefs.h <<_ACEOF
#define LIBRPMALIAS_FILENAME "$LIBRPMALIAS_FILENAME"
-@@ -23588,9 +23327,193 @@
+@@ -23588,9 +23328,193 @@
@@ -935,7 +943,7 @@
ac_config_files="$ac_config_files Doxyfile Makefile rpmrc macros platform
rpmpopt rpm.spec rpmio/Makefile rpmdb/Makefile lib/Makefile build/Makefile
scripts/Makefile scripts/brp-redhat scripts/macros.perl scripts/macros.php
scripts/macros.python tools/Makefile tests/Makefile tests/rpmrc tests/macros
tests/hello-test/Makefile misc/Makefile intl/Makefile po/Makefile.in doc/Makefile
doc/manual/Makefile doc/fr/Makefile doc/ja/Makefile doc/ko/Makefile doc/pl/Makefile
doc/ru/Makefile doc/sk/Makefile python/Makefile python/rpmdb/Makefile
python/test/Makefile"
-@@ -23977,7 +23900,7 @@
+@@ -23977,7 +23901,7 @@
cat >&5 <<_CSEOF
This file was extended by $as_me, which was
@@ -944,7 +952,7 @@
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -24040,7 +23963,7 @@
+@@ -24040,7 +23964,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
config.status
@@ -953,7 +961,7 @@
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
-@@ -25157,7 +25080,6 @@
+@@ -25157,7 +25081,6 @@
esac
done ;;
default ) echo timestamp > popt/stamp-h.in
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
