port RPM to OpenDarwin 6.6.2

openpkg/openpkg.spec

@@ -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

openpkg/rpm.patch.porting

@@ -1078,3 +1078,70 @@ Index: rpmio/rpmsw.c
  /* 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 @@
+ /*@access pgpDigParams@*/
+ 
+ #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).
+  */
+ /*@unused@*/
+-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 *))
+ 	/*@globals errno @*/
+ 	/*@modifies 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);
+ /*@=boundsread@*/
+ #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;