- port RPM to Tru64 5.1 (again) - remove left-over object files from RPM distribution tarball before building Submitted partly by: Karl Vogel

openpkg/HISTORY

@@ -2,6 +2,9 @@
 2004
 ====
 
+20040418 port RPM to Tru64 5.1 (again)
+20040418 remove left-over object files from RPM distribution tarball before building
+20040418 use "openpkg lsync" consistently in lsync manual page
 20040414 fix "rpm --help" output related to option "--with"
 20040414 fix building of GNU tar by applying more "no iconv here" enforcement
 20040409 removed old RPM extensions (now part of "openpkg-tools")

openpkg/openpkg.spec

@@ -39,7 +39,7 @@
 #   o any cc(1)
 
 #   the package version/release
-%define       V_openpkg  20040414
+%define       V_openpkg  20040418
 
 #   the used software versions
 %define       V_rpm      4.2.1
@@ -652,6 +652,10 @@ Provides:     openpkg = 2.0.1-2.0.1
     ( br=`pwd`
       cd rpm-%{V_rpm}
 
+      #   remove objects files accidently distributed with the RPM tarball
+      rm -f db/build_unix/*.o
+      rm -f db/build_unix/*.lo
+
       #   remove embedded zlib (we are linking with an external one)
       rm -rf zlib
 
@@ -682,6 +686,7 @@ Provides:     openpkg = 2.0.1-2.0.1
         echo "ac_cv_path___PYTHON=true"
         echo "ac_cv_path___DOXYGEN=true"
         echo "acl_cv_rpath=no"
+        echo "ac_cv_header_getopt_h=no"
       ) >config.cache
 
       #   provide platform identification

openpkg/rpm.patch.bugfix

@@ -10,7 +10,7 @@
 ##  'patch' tool to upgrade those files. Each patch snippet is annotated
 ##  with a short description.
 ##
-##  Created on: 12-Feb-2004
+##  Created on: 18-Apr-2004
 ##
 ##  ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
 ##             RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ -23,7 +23,7 @@
 +---------------------------------------------------------------------------
 Index: build/parsePrep.c
 --- build/parsePrep.c	7 Aug 2002 14:20:45 -0000	1.1.1.10
-+++ build/parsePrep.c	12 Feb 2004 16:29:32 -0000
++++ build/parsePrep.c	12 Feb 2004 16:58:58 -0000	1.3
 @@ -584,12 +635,15 @@
      saveLines = splitString(getStringBuf(sb), strlen(getStringBuf(sb)), '\n');
      /*@-usereleased@*/

openpkg/rpm.patch.feature

@@ -10,7 +10,7 @@
 ##  'patch' tool to upgrade those files. Each patch snippet is annotated
 ##  with a short description.
 ##
-##  Created on: 12-Feb-2004
+##  Created on: 18-Apr-2004
 ##
 ##  ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
 ##             RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ -558,7 +558,7 @@ Index: build/parsePreamble.c
 +---------------------------------------------------------------------------
 Index: build/parsePrep.c
 --- build/parsePrep.c	7 Aug 2002 14:20:45 -0000	1.1.1.10
-+++ build/parsePrep.c	12 Feb 2004 16:29:32 -0000
++++ build/parsePrep.c	12 Feb 2004 16:58:58 -0000	1.3
 @@ -66,7 +66,7 @@
   */
  /*@-boundswrite@*/
@@ -752,7 +752,7 @@ Index: build/parsePrep.c
 +---------------------------------------------------------------------------
 Index: build/parsePrep.c
 --- build/parsePrep.c	7 Aug 2002 14:20:45 -0000	1.1.1.10
-+++ build/parsePrep.c	12 Feb 2004 16:29:32 -0000
++++ build/parsePrep.c	12 Feb 2004 16:58:58 -0000	1.3
 @@ -87,7 +88,15 @@
  	return NULL;
      }
@@ -1175,8 +1175,8 @@ Index: macros.in
  #/*! \page config_macros Default configuration: @RPMCONFIGDIR@/macros
  # \verbatim
  #
--# $Id: rpm.patch.feature,v 1.46 2004/02/12 16:52:03 rse Exp $
-+# $Id: rpm.patch.feature,v 1.46 2004/02/12 16:52:03 rse Exp $
+-# $Id: macros.in,v 1.138.2.1 2003/07/02 19:14:06 jbj Exp $
++# $Id: macros.in,v 1.2 2004/01/22 21:42:09 rse Exp $
  #
  # This is a global RPM configuration file. All changes made here will
  # be lost when the rpm package is upgraded. Any per-system configuration

openpkg/rpm.patch.porting

@@ -10,7 +10,7 @@
 ##  'patch' tool to upgrade those files. Each patch snippet is annotated
 ##  with a short description.
 ##
-##  Created on: 12-Feb-2004
+##  Created on: 18-Apr-2004
 ##
 ##  ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
 ##             RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ -302,8 +302,18 @@ Index: tools/Makefile.in
 +---------------------------------------------------------------------------
 Index: file/system.h
 --- file/system.h	24 Jan 2003 19:41:56 -0000	1.1.1.1
-+++ file/system.h	22 Jan 2004 21:42:22 -0000	1.2
-@@ -53,6 +53,8 @@
++++ file/system.h	18 Apr 2004 11:17:25 -0000
+@@ -13,6 +13,9 @@
+ #endif
+ 
+ #include <sys/types.h>
++#ifdef HAVE_INTTYPES_H
++#include <inttypes.h>
++#endif
+ 
+ #include <sys/stat.h>
+ #include <stdio.h>
+@@ -53,6 +56,8 @@
  #else
  #if HAVE_ERROR && HAVE_ERROR_H
  #include <error.h>
@@ -312,7 +322,7 @@ Index: file/system.h
  #endif
  #endif
  
-@@ -246,7 +248,11 @@
+@@ -246,7 +251,11 @@
   */
  /*@-shadow@*/
  /*@unused@*/ /*@exits@*/ /*@only@*/
@@ -324,7 +334,7 @@ Index: file/system.h
  	/*@globals fileSystem @*/
  	/*@modifies fileSystem @*/
  {
-@@ -286,9 +292,33 @@
+@@ -286,9 +295,33 @@
  
  #if !defined(__LCLINT__)
  /* Memory allocation via macro defs to get meaningful locations from mtrace() */
@@ -358,7 +368,7 @@ Index: file/system.h
  #define	xstrdup(_str)	(strcpy(xmalloc(strlen(_str)+1), (_str)))
  #endif
  
-@@ -314,9 +344,14 @@
+@@ -314,9 +347,14 @@
  
  #if defined(__LCLINT__)
  #define FILE_RCSID(id)
@@ -578,7 +588,7 @@ Index: rpmio/fts.h
 +---------------------------------------------------------------------------
 Index: rpmio/fts.c
 --- rpmio/fts.c	18 Jan 2003 16:13:17 -0000	1.1.1.3
-+++ rpmio/fts.c	22 Jan 2004 21:42:32 -0000	1.2
++++ rpmio/fts.c	18 Apr 2004 11:16:24 -0000
 @@ -34,6 +34,8 @@
  static char sccsid[] = "@(#)fts.c	8.6 (Berkeley) 8/14/94";
  #endif /* LIBC_SCCS and not lint */
@@ -588,7 +598,7 @@ Index: rpmio/fts.c
  #if defined(_LIBC)
  #include <sys/param.h>
  #include <include/sys/stat.h>
-@@ -53,12 +55,19 @@
+@@ -53,12 +55,27 @@
  #   define _STAT_VER		0
  #   define __fxstat64(_stat_ver, _fd, _sbp)	fstat((_fd), (_sbp))
  #endif
@@ -605,11 +615,19 @@ Index: rpmio/fts.c
 +#   define _STAT_VER		0
 +#   define __fxstat64(_stat_ver, _fd, _sbp)	fstat((_fd), (_sbp))
 +#   define _D_EXACT_NAMLEN(d) ((d)->d_namlen)
++#endif
++#if defined(__osf__)
++#   define __errno_location()   (&errno)
++#   define dirfd(dirp)          -1
++#   define stat64               stat
++#   define _STAT_VER            0
++#   define __fxstat64(_stat_ver, _fd, _sbp)     fstat((_fd), (_sbp))
++#   define _D_EXACT_NAMLEN(d) ((d)->d_namlen)
 +#endif
  #include "system.h"
  #include "fts.h"
  #include "rpmio.h"
-@@ -73,7 +82,12 @@
+@@ -73,7 +90,12 @@
  /* Largest alignment size needed, minus one.
     Usually long double is the worst case.  */
  #ifndef ALIGNBYTES
@@ -622,7 +640,7 @@ Index: rpmio/fts.c
  #endif
  /* Align P to that size.  */
  #ifndef ALIGN
-@@ -107,9 +121,13 @@
+@@ -107,9 +129,13 @@
  	/*@modifies fileSystem, internalState @*/;
  
  #ifndef MAX
@@ -663,7 +681,7 @@ Index: rpmio/rpmio.h
 +---------------------------------------------------------------------------
 Index: rpmio/rpmrpc.c
 --- rpmio/rpmrpc.c	29 May 2003 22:14:04 -0000	1.1.1.8
-+++ rpmio/rpmrpc.c	22 Jan 2004 21:42:33 -0000	1.2
++++ rpmio/rpmrpc.c	18 Apr 2004 11:15:27 -0000
 @@ -1079,6 +1079,8 @@
      return rc;
  }
@@ -707,7 +725,7 @@ Index: rpmio/rpmrpc.c
  /*@unchecked@*/
  static int ftpmagicdir = 0x8440291;
 -#define	ISFTPMAGIC(_dir) (!memcmp((_dir), &ftpmagicdir, sizeof(ftpmagicdir)))
-+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(sun) && !defined(OPENPKG_UNIXWARE) && !defined(OPENPKG_DARWIN)
++#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(sun) && !defined(OPENPKG_UNIXWARE) && !defined(OPENPKG_DARWIN) && !defined(__osf__)
 +#define SETFTPMAGIC(_dir) ((_dir)->fd) = ftpmagicdir
 +#define ISFTPMAGIC(_dir) ((_dir)->fd == ftpmagicdir)
 +#else
@@ -860,7 +878,7 @@ Index: rpmio/rpmrpc.c
 +    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) || defined(OPENPKG_UNIXWARE)
++#elif defined(hpux) || defined(sun) || defined(OPENPKG_UNIXWARE) || defined(__osf__)
 +    /* XXX glob(3) uses REAL_DIR_ENTRY(dp) test on d_ino */
 +    dp->d_ino = i + 1;		/* W2DO? */
 +    dp->d_reclen = 0;		/* W2DO? */

openpkg/rpm.patch.regen

@@ -10,7 +10,7 @@
 ##  'patch' tool to upgrade those files. Each patch snippet is annotated
 ##  with a short description.
 ##
-##  Created on: 12-Feb-2004
+##  Created on: 18-Apr-2004
 ##
 ##  ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
 ##             RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.