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 openpkg-web Date: 28-Oct-2003 07:08:07
Branch: HEAD Handle: 2003102806080502
Modified files:
openpkg-src/openpkg openpkg.spec rpm.patch.porting
openpkg-web news.txt
Log:
port RPM to OpenDarwin 6.6.2
Summary:
Revision Changes Path
1.238 +1 -1 openpkg-src/openpkg/openpkg.spec
1.43 +67 -0 openpkg-src/openpkg/rpm.patch.porting
1.7197 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.237 -r1.238 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 27 Oct 2003 15:32:29 -0000 1.237
+++ openpkg-src/openpkg/openpkg.spec 28 Oct 2003 06:08:07 -0000 1.238
@@ -39,7 +39,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20031027
+%define V_openpkg 20031028
# the used software versions
%define V_rpm 4.2.1
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.porting
============================================================================
$ cvs diff -u -r1.42 -r1.43 rpm.patch.porting
--- openpkg-src/openpkg/rpm.patch.porting 27 Oct 2003 20:18:45 -0000 1.42
+++ openpkg-src/openpkg/rpm.patch.porting 28 Oct 2003 06:08:07 -0000 1.43
@@ -1078,3 +1078,70 @@
/* Swiped from glibc-2.3.2 sysdeps/i386/i686/hp-timing.h */
#define HP_TIMING_ZERO(Var) (Var) = (0)
+
++---------------------------------------------------------------------------
+| Fix "environ" declaration.
++---------------------------------------------------------------------------
+Index: lib/signature.c
+--- lib/signature.c 29 May 2003 18:42:23 -0000 1.1.1.23
++++ lib/signature.c 27 Oct 2003 20:58:47 -0000
+@@ -27,7 +27,7 @@
+ /[EMAIL PROTECTED] [EMAIL PROTECTED]/
+
+ #if !defined(__GLIBC__)
+-char ** environ = NULL;
++extern char ** environ;
+ #endif
+
+ int rpmLookupSignatureType(int action)
+
++---------------------------------------------------------------------------
+| Rename own mergesort(3) implementation to avoid conflicts
+| with a possibly existing vendor version.
++---------------------------------------------------------------------------
+Index: rpmdb/merge.c
+--- rpmdb/merge.c 22 Jun 2002 18:51:58 -0000 1.1.1.2
++++ rpmdb/merge.c 27 Oct 2003 21:03:51 -0000
+@@ -204,7 +204,7 @@
+ * Arguments are as for qsort.
+ */
+ int
+-mergesort(void *base, size_t nmemb, size_t size,
++rpmdb_mergesort(void *base, size_t nmemb, size_t size,
+ int (*cmp) (const void *, const void *))
+ {
+ register int i, sense;
+
++---------------------------------------------------------------------------
+| Rename own mergesort(3) implementation to avoid conflicts
+| with a possibly existing vendor version.
++---------------------------------------------------------------------------
+Index: rpmdb/rpmdb.h
+--- rpmdb/rpmdb.h 18 Jan 2003 14:04:35 -0000 1.1.1.5
++++ rpmdb/rpmdb.h 27 Oct 2003 21:03:44 -0000
+@@ -1080,7 +1080,7 @@
+ * Mergesort, same arguments as qsort(2).
+ */
+ /[EMAIL PROTECTED]@*/
+-int mergesort(void *base, size_t nmemb, size_t size,
++int rpmdb_mergesort(void *base, size_t nmemb, size_t size,
+ int (*cmp) (const void *, const void *))
+ /[EMAIL PROTECTED] errno @*/
+ /[EMAIL PROTECTED] base, errno @*/;
+
++---------------------------------------------------------------------------
+| Rename own mergesort(3) implementation to avoid conflicts
+| with a possibly existing vendor version.
++---------------------------------------------------------------------------
+Index: rpmdb/rpmdb.c
+--- rpmdb/rpmdb.c 2 Jul 2003 19:21:54 -0000 1.1.1.6
++++ rpmdb/rpmdb.c 27 Oct 2003 21:03:36 -0000
+@@ -2361,7 +2361,7 @@
+ sizeof(*mi->mi_set->recs), hdrNumCmp);
+ /[EMAIL PROTECTED]@*/
+ #else
+- mergesort(mi->mi_set->recs, mi->mi_set->count,
++ rpmdb_mergesort(mi->mi_set->recs, mi->mi_set->count,
+ sizeof(*mi->mi_set->recs), hdrNumCmp);
+ #endif
+ mi->mi_sorted = 1;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.7196 -r1.7197 news.txt
--- openpkg-web/news.txt 27 Oct 2003 20:23:11 -0000 1.7196
+++ openpkg-web/news.txt 28 Oct 2003 06:08:05 -0000 1.7197
@@ -1,3 +1,4 @@
+28-Oct-2003: Upgraded package: P<openpkg-20031028-20031028>
27-Oct-2003: Upgraded package: P<dbtool-1.6-20031027>
27-Oct-2003: Upgraded package: P<cvs-1.12.2-20031027>
27-Oct-2003: Upgraded package: P<perl-tk-20031027-20031027>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
