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: 19-Oct-2003 21:36:27
Branch: HEAD Handle: 2003101920362601
Modified files:
openpkg-src/openpkg HISTORY rpm.patch.bugfix rpm.patch.feature
rpm.patch.porting rpm.patch.regen
Log:
port mostly to SCO UnixWare 7.1.3 (only some libtool issues remaining)
Summary:
Revision Changes Path
1.74 +1 -0 openpkg-src/openpkg/HISTORY
1.30 +4 -4 openpkg-src/openpkg/rpm.patch.bugfix
1.31 +4 -4 openpkg-src/openpkg/rpm.patch.feature
1.38 +117 -15 openpkg-src/openpkg/rpm.patch.porting
1.29 +80 -6 openpkg-src/openpkg/rpm.patch.regen
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.73 -r1.74 HISTORY
--- openpkg-src/openpkg/HISTORY 19 Oct 2003 19:00:45 -0000 1.73
+++ openpkg-src/openpkg/HISTORY 19 Oct 2003 19:36:26 -0000 1.74
@@ -2,6 +2,7 @@
2003
====
+20031019 port mostly to SCO UnixWare 7.1.3 (only some libtool issues remaining)
20031019 provide %{l_cppflags -i} for platform identification defines
20031019 use <prefix>/lib/openpkg/bash for rpmtool and lsync for better portability
20031015 fix RPM for building without GCC again
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.bugfix
============================================================================
$ cvs diff -u -r1.29 -r1.30 rpm.patch.bugfix
--- openpkg-src/openpkg/rpm.patch.bugfix 15 Oct 2003 10:16:46 -0000 1.29
+++ openpkg-src/openpkg/rpm.patch.bugfix 19 Oct 2003 19:36:26 -0000 1.30
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 15-Oct-2003
+## Created on: 19-Oct-2003
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ -49,7 +49,7 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 8 Oct 2003 18:03:40 -0000
++++ configure.ac 19 Oct 2003 19:08:19 -0000
@@ -348,7 +349,7 @@
AC_MSG_CHECKING(for $dir/include in INCPATH)
@@ -66,8 +66,8 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 8 Oct 2003 18:03:40 -0000
-@@ -1274,7 +1298,6 @@
++++ configure.ac 19 Oct 2003 19:08:19 -0000
+@@ -1274,7 +1302,6 @@
python/rpmdb/Makefile
python/test/Makefile
], [ echo timestamp > popt/stamp-h.in
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.feature
============================================================================
$ cvs diff -u -r1.30 -r1.31 rpm.patch.feature
--- openpkg-src/openpkg/rpm.patch.feature 15 Oct 2003 10:16:46 -0000 1.30
+++ openpkg-src/openpkg/rpm.patch.feature 19 Oct 2003 19:36:26 -0000 1.31
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 15-Oct-2003
+## Created on: 19-Oct-2003
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ -684,7 +684,7 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 8 Oct 2003 18:03:40 -0000
++++ configure.ac 19 Oct 2003 19:08:19 -0000
@@ -53,7 +53,7 @@
AS=${AS-as}
AC_SUBST(AS)
@@ -718,7 +718,7 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 8 Oct 2003 18:03:40 -0000
++++ configure.ac 19 Oct 2003 19:08:19 -0000
@@ -310,7 +311,7 @@
WITH_ZLIB_SUBDIR=
WITH_ZLIB_INCLUDE=
@@ -734,7 +734,7 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 8 Oct 2003 18:03:40 -0000
++++ configure.ac 19 Oct 2003 19:08:19 -0000
@@ -1200,12 +1202,12 @@
AC_SUBST(LOCALEDIR)
LIBDIR="`echo $libdir | sed 's-/lib$-/%{_lib}-'`"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.porting
============================================================================
$ cvs diff -u -r1.37 -r1.38 rpm.patch.porting
--- openpkg-src/openpkg/rpm.patch.porting 15 Oct 2003 19:26:22 -0000 1.37
+++ openpkg-src/openpkg/rpm.patch.porting 19 Oct 2003 19:36:26 -0000 1.38
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 15-Oct-2003
+## Created on: 19-Oct-2003
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ -21,7 +21,7 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 8 Oct 2003 18:03:40 -0000
++++ configure.ac 19 Oct 2003 19:08:19 -0000
@@ -416,7 +417,7 @@
AC_CHECK_HEADER([beecrypt/beecrypt.h], [
AC_CHECK_LIB(beecrypt, mpfprintln, [
@@ -38,7 +38,7 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 8 Oct 2003 18:03:40 -0000
++++ configure.ac 19 Oct 2003 19:08:19 -0000
@@ -446,14 +447,14 @@
AC_CHECK_LIB(socket, socket)
])
@@ -68,7 +68,7 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 8 Oct 2003 18:03:40 -0000
++++ configure.ac 19 Oct 2003 19:08:19 -0000
@@ -963,12 +964,13 @@
AC_CHECK_FUNCS(getpassphrase)
@@ -95,8 +95,8 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 8 Oct 2003 18:03:40 -0000
-@@ -1249,11 +1251,33 @@
++++ configure.ac 19 Oct 2003 19:08:19 -0000
+@@ -1249,11 +1251,37 @@
AC_SUBST(OBJDUMP)
@@ -122,6 +122,10 @@
+AC_CHECK_TYPE_STDC(uint16_t, unsigned short)
+AC_CHECK_TYPE_STDC(uint32_t, unsigned int)
+
++dnl OpenPKG: some strange platforms (like Unixware) really have MADV_XXX
++dnl but no madvise(2) function itself, so check for madvise explicitly.
++AC_CHECK_FUNC(madvise)
++
dnl XXX this causes popt to depend on zlib et al
dnl # XXX Propagate -lucb to popt ...
dnl export LIBS INCPATH CONFIG_SITE
@@ -218,11 +222,11 @@
+---------------------------------------------------------------------------
| Use more correct Autoconf based size_t check.
-| Add support for Compaq/HP OSF1/Tru64.
+| Add support for Compaq/HP OSF1/Tru64 and SCO UnixWare.
+---------------------------------------------------------------------------
Index: misc/glob.h
--- misc/glob.h 11 Mar 2000 20:59:30 -0000 1.1.1.3
-+++ misc/glob.h 24 Aug 2003 13:10:21 -0000
++++ misc/glob.h 19 Oct 2003 19:15:21 -0000
@@ -46,7 +46,7 @@
#endif /* C++ or ANSI C. */
@@ -241,6 +245,39 @@
# define GLOB_MAGCHAR (1 << 8)/* Set in gl_flags if any metachars seen. */
# define GLOB_ALTDIRFUNC (1 << 9)/* Use gl_opendir et al functions. */
# define GLOB_BRACE (1 << 10)/* Expand "{a,b}" to "a" "b". */
+@@ -151,7 +151,7 @@
+ `glob' returns GLOB_ABEND; if it returns zero, the error is ignored.
+ If memory cannot be allocated for PGLOB, GLOB_NOSPACE is returned.
+ Otherwise, `glob' returns zero. */
+-#if _FILE_OFFSET_BITS != 64
++#if _FILE_OFFSET_BITS != 64 || defined(OPENPKG_UNIXWARE)
+ extern int glob __P ((__const char *__pattern, int __flags,
+ int (*__errfunc) (__const char *, int),
+ glob_t *__pglob));
+
++---------------------------------------------------------------------------
+| Better portability.
++---------------------------------------------------------------------------
+Index: misc/glob.c
+--- misc/glob.c 11 Mar 2000 21:13:18 -0000 1.1.1.4
++++ misc/glob.c 19 Oct 2003 19:15:27 -0000
+@@ -813,6 +813,7 @@
+
+
+ /* Free storage allocated in PGLOB by a previous `glob' call. */
++#if (_FILE_OFFSET_BITS != 64) || (__GNUC__ >= 2)
+ void
+ globfree (pglob)
+ register glob_t *pglob;
+@@ -826,7 +827,7 @@
+ free ((__ptr_t) pglob->gl_pathv);
+ }
+ }
+-
++#endif
+
+ /* Do a collated comparison of A and B. */
+ static int
+---------------------------------------------------------------------------
| Add libmisc.a for platform portability.
@@ -535,12 +572,28 @@
touch $@
+---------------------------------------------------------------------------
+| Add Unixware support.
++---------------------------------------------------------------------------
+Index: rpmio/fts.h
+--- rpmio/fts.h 18 Jan 2003 16:13:17 -0000 1.1.1.3
++++ rpmio/fts.h 19 Oct 2003 19:01:32 -0000
+@@ -51,7 +51,7 @@
+ # define _LARGEFILE64_SOURCE
+ #endif
+
+-#if defined(sun)
++#if defined(sun) || defined(OPENPKG_UNIXWARE)
+ # define _D_EXACT_NAMLEN(d) ((d)->d_reclen)
+ #endif
+
+
++---------------------------------------------------------------------------
| Add FreeBSD/NetBSD/OpenBSD support.
| Workaround some GCC'isms.
+---------------------------------------------------------------------------
Index: rpmio/fts.c
--- rpmio/fts.c 18 Jan 2003 16:13:17 -0000 1.1.1.3
-+++ rpmio/fts.c 15 Oct 2003 18:15:29 -0000
++++ rpmio/fts.c 19 Oct 2003 19:02:24 -0000
@@ -34,6 +34,8 @@
static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/94";
#endif /* LIBC_SCCS and not lint */
@@ -550,7 +603,14 @@
#if defined(_LIBC)
#include <sys/param.h>
#include <include/sys/stat.h>
-@@ -59,6 +61,13 @@
+@@ -53,12 +55,19 @@
+ # define _STAT_VER 0
+ # define __fxstat64(_stat_ver, _fd, _sbp) fstat((_fd), (_sbp))
+ #endif
+-#if defined(sun)
++#if defined(sun) || defined(OPENPKG_UNIXWARE)
+ # define __errno_location() (&errno)
+ # define dirfd(dirp) -1
# define _STAT_VER 0
# define __fxstat64(_stat_ver, _fd, _sbp) fstat((_fd), (_sbp))
#endif
@@ -612,12 +672,13 @@
+---------------------------------------------------------------------------
| Make this whole "dirent" fiddling at least working on
-| FreeBSD/NetBSD/OpenBSD, Solaris and HPUX. This certainly is a bad
-| corner of RPM which inherently leads to portability problems.
+| FreeBSD/NetBSD/OpenBSD, Solaris, HPUX and Unixware. This certainly
+| is a bad corner of RPM which inherently leads to portability
+| problems.
+---------------------------------------------------------------------------
Index: rpmio/rpmrpc.c
--- rpmio/rpmrpc.c 29 May 2003 22:14:04 -0000 1.1.1.8
-+++ rpmio/rpmrpc.c 1 Sep 2003 07:00:46 -0000
++++ rpmio/rpmrpc.c 19 Oct 2003 19:04:21 -0000
@@ -1079,6 +1079,8 @@
return rc;
}
@@ -661,7 +722,7 @@
/[EMAIL PROTECTED]@*/
static int ftpmagicdir = 0x8440291;
-#define ISFTPMAGIC(_dir) (!memcmp((_dir), &ftpmagicdir, sizeof(ftpmagicdir)))
-+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) &&
!defined(sun)
++#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) &&
!defined(sun) && !defined(OPENPKG_UNIXWARE)
+#define SETFTPMAGIC(_dir) ((_dir)->fd) = ftpmagicdir
+#define ISFTPMAGIC(_dir) ((_dir)->fd == ftpmagicdir)
+#else
@@ -814,7 +875,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(hpux) || defined(sun)
++#elif defined(hpux) || defined(sun) || defined(OPENPKG_UNIXWARE)
+ /* XXX glob(3) uses REAL_DIR_ENTRY(dp) test on d_ino */
+ dp->d_ino = i + 1; /* W2DO? */
+ dp->d_reclen = 0; /* W2DO? */
@@ -924,3 +985,44 @@
#define BIT(A) (1 << (A))
#define STRING_IGNORE_LOWERCASE BIT(0)
+
++---------------------------------------------------------------------------
+| Better portability for madvise(2) usage.
++---------------------------------------------------------------------------
+Index: rpmdb/legacy.c
+--- rpmdb/legacy.c 18 Dec 2002 22:40:19 -0000 1.1.1.4
++++ rpmdb/legacy.c 19 Oct 2003 19:08:47 -0000
+@@ -182,7 +182,7 @@
+ break;
+ }
+
+-#ifdef MADV_SEQUENTIAL
++#if defined(HAVE_MADVISE) && defined(MADV_SEQUENTIAL)
+ xx = madvise(mapped, fsize, MADV_SEQUENTIAL);
+ #endif
+
+
++---------------------------------------------------------------------------
+| Better portability for madvise(2) usage.
++---------------------------------------------------------------------------
+Index: lib/fsm.c
+--- lib/fsm.c 3 Mar 2003 21:28:12 -0000 1.1.1.5
++++ lib/fsm.c 19 Oct 2003 19:10:24 -0000
+@@ -879,7 +879,7 @@
+ rdbuf = fsm->rdbuf;
+ fsm->rdbuf = (char *) mapped;
+ fsm->rdlen = nmapped = st->st_size;
+-#if defined(MADV_DONTNEED)
++#if defined(HAVE_MADVISE) && defined(MADV_DONTNEED)
+ xx = madvise(mapped, nmapped, MADV_DONTNEED);
+ #endif
+ }
+@@ -909,7 +909,7 @@
+ #if HAVE_MMAP
+ if (mapped != (void *)-1) {
+ xx = msync(mapped, nmapped, MS_ASYNC);
+-#if defined(MADV_DONTNEED)
++#if defined(HAVE_MADVISE) && defined(MADV_DONTNEED)
+ xx = madvise(mapped, nmapped, MADV_DONTNEED);
+ #endif
+ /[EMAIL PROTECTED]@*/ xx = munmap(mapped, nmapped) /[EMAIL PROTECTED]@*/;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.regen
============================================================================
$ cvs diff -u -r1.28 -r1.29 rpm.patch.regen
--- openpkg-src/openpkg/rpm.patch.regen 15 Oct 2003 10:16:47 -0000 1.28
+++ openpkg-src/openpkg/rpm.patch.regen 19 Oct 2003 19:36:27 -0000 1.29
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 15-Oct-2003
+## Created on: 19-Oct-2003
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ -105,7 +105,7 @@
+---------------------------------------------------------------------------
Index: configure
--- configure 16 Jul 2003 17:05:55 -0000 1.1.1.23
-+++ configure 8 Oct 2003 18:04:18 -0000
++++ configure 19 Oct 2003 19:19:25 -0000
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
@@ -722,7 +722,7 @@
cat >>confdefs.h <<_ACEOF
#define LIBRPMALIAS_FILENAME "$LIBRPMALIAS_FILENAME"
-@@ -23588,9 +23327,119 @@
+@@ -23588,9 +23327,193 @@
@@ -835,6 +835,80 @@
+
+fi
+
++echo "$as_me:$LINENO: checking for madvise" >&5
++echo $ECHO_N "checking for madvise... $ECHO_C" >&6
++if test "${ac_cv_func_madvise+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ cat >conftest.$ac_ext <<_ACEOF
++#line $LINENO "configure"
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++/* System header to define __stub macros and hopefully few prototypes,
++ which can conflict with char madvise (); below.
++ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++ <limits.h> exists even on freestanding compilers. */
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++/* Override any gcc2 internal prototype to avoid an error. */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++ builtin and then its argument prototype would still apply. */
++char madvise ();
++/* The GNU C library defines this for functions which it implements
++ to always fail with ENOSYS. Some functions are actually named
++ something starting with __ and the normal name is an alias. */
++#if defined (__stub_madvise) || defined (__stub___madvise)
++choke me
++#else
++char (*f) () = madvise;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != madvise;
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++ (eval $ac_link) 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } &&
++ { ac_try='test -s conftest$ac_exeext'
++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++ (eval $ac_try) 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; }; then
++ ac_cv_func_madvise=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_madvise=no
++fi
++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_madvise" >&5
++echo "${ECHO_T}$ac_cv_func_madvise" >&6
++
++
+
@@ -843,7 +917,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 +23826,7 @@
+@@ -23977,7 +23900,7 @@
cat >&5 <<_CSEOF
This file was extended by $as_me, which was
@@ -852,7 +926,7 @@
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -24040,7 +23889,7 @@
+@@ -24040,7 +23963,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
config.status
@@ -861,7 +935,7 @@
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
-@@ -25157,7 +25006,6 @@
+@@ -25157,7 +25080,6 @@
esac
done ;;
default ) echo timestamp > popt/stamp-h.in
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
