- solaris: translate i86pc to i386 (#57182).

- fix: %GNUconfigure breaks with single quotes (#57264).
- fix: typo in find-requires.
- tru64 compiler message cleanup.
- add buildarch lines for hppa (#57728).

CVS patchset: 5228
CVS date: 2001/12/20 16:28:46

15 files changed, 38 insertions, 27 deletions

diff --git a/CHANGES b/CHANGES
index 401421ac4..ada938a87 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-4.0.3 -> 4.1:
+4.0.4 -> 4.1:
 	- loosely wire beecrypt library into rpm.
 	- drop rpmio/base64.[ch] in favor of beecrypt.
 	- drop lib/md5*.[ch] files in favor of beecrypt.
@@ -79,6 +79,11 @@
 	- lclint-3.0.0.19 fiddles.
 
 4.0.3 -> 4.0.4:
+	- solaris: translate i86pc to i386 (#57182).
+	- fix: %GNUconfigure breaks with single quotes (#57264).
+	- fix: typo in find-requires.
+	- tru64 compiler message cleanup.
+	- add buildarch lines for hppa (#57728).
 
 4.0.2 -> 4.0.3:
 	- update per-interpreter dependency scripts, add sql/tcl (#20295).
diff --git a/autodeps/linux.req b/autodeps/linux.req
index 22bd17270..2ec07a153 100644
--- a/autodeps/linux.req
+++ b/autodeps/linux.req
@@ -83,7 +83,7 @@ for f in $liblist $exelist ; do
 	    sub(/:/, "", $3);
 	    LIBNAME=$3;
 	}
-	(START==1) && (LIBNAME!="") && ($4!="") && ($4~/^GLIBC_*/) {
+	(START==1) && (LIBNAME!="") && ($4!="") && (($4~/^GLIBC_*/) || ($4~/^GCC_*/)) {
 	    print LIBNAME "(" $4 ")'$lib64'";
 	}
 	/^$/ { START=0; }
diff --git a/db/mp/mp_fopen.c b/db/mp/mp_fopen.c
index 094414d8a..d27b8d4c7 100644
--- a/db/mp/mp_fopen.c
+++ b/db/mp/mp_fopen.c
@@ -314,7 +314,7 @@ __memp_fopen_int(dbmfp, mfp, path, flags, mode, pagesize, needlock)
 if (chroot_prefix) {
     int chrlen = strlen(chroot_prefix);
     if (!strncmp(rpath, chroot_prefix, chrlen))
-	rpath += chrlen;
+	rpath += (chrlen - 1);
 }
 		oflags = 0;
 		if (LF_ISSET(DB_CREATE))
diff --git a/lib/fsm.h b/lib/fsm.h
index d7ef6153b..9cc09b6cf 100644
--- a/lib/fsm.h
+++ b/lib/fsm.h
@@ -80,7 +80,7 @@ typedef enum fileStage_e {
     FSM_RCLOSE	=  _fs(131),
     FSM_WOPEN	=  _fs(132),
     FSM_WRITE	=  _fs(133),
-    FSM_WCLOSE	=  _fs(134),
+    FSM_WCLOSE	=  _fs(134)
 } fileStage;
 #undef	_fv
 #undef	_fi
diff --git a/lib/psm.h b/lib/psm.h
index 5d497cc23..165d6144f 100644
--- a/lib/psm.h
+++ b/lib/psm.h
@@ -47,7 +47,7 @@ typedef enum pkgStage_e {
 
     PSM_RPMDB_LOAD	= 97,
     PSM_RPMDB_ADD	= 98,
-    PSM_RPMDB_REMOVE	= 99,
+    PSM_RPMDB_REMOVE	= 99
 
 } pkgStage;
 #undef	_fv
diff --git a/lib/rpmcli.h b/lib/rpmcli.h
index 4e4e922e8..e1f01f950 100644
--- a/lib/rpmcli.h
+++ b/lib/rpmcli.h
@@ -134,7 +134,7 @@ typedef enum rpmQueryFlags_e {
     QUERY_FOR_STATE	= (1 << 24),	/*!< query:  from --state */
     QUERY_FOR_DOCS	= (1 << 25),	/*!< query:  from --docfiles */
     QUERY_FOR_CONFIG	= (1 << 26),	/*!< query:  from --configfiles */
-    QUERY_FOR_DUMPFILES	= (1 << 27),	/*!< query:  from --dump */
+    QUERY_FOR_DUMPFILES	= (1 << 27)	/*!< query:  from --dump */
 } rpmQueryFlags;
 
 /** \ingroup rpmcli
@@ -165,7 +165,7 @@ typedef enum rpmVerifyFlags_e {
     VERIFY_FOR_STATE	= (1 << 24),	/*!< query:  from --state */
     VERIFY_FOR_DOCS	= (1 << 25),	/*!< query:  from --docfiles */
     VERIFY_FOR_CONFIG	= (1 << 26),	/*!< query:  from --configfiles */
-    VERIFY_FOR_DUMPFILES= (1 << 27),	/*!< query:  from --dump */
+    VERIFY_FOR_DUMPFILES= (1 << 27)	/*!< query:  from --dump */
 /*@=enummemuse@*/
 	/* bits 28-30 used in rpmVerifyAttrs */
 } rpmVerifyFlags;
diff --git a/lib/rpmlib.h b/lib/rpmlib.h
index 3512deee9..57853fef2 100644
--- a/lib/rpmlib.h
+++ b/lib/rpmlib.h
@@ -19,7 +19,7 @@ typedef	enum rpmRC_e {
     RPMRC_BADMAGIC	= 1,
     RPMRC_FAIL		= 2,
     RPMRC_BADSIZE	= 3,
-    RPMRC_SHORTREAD	= 4,
+    RPMRC_SHORTREAD	= 4
 } rpmRC;
 
 /*@-redecl@*/
@@ -1232,7 +1232,7 @@ typedef enum fileAction_e {
     FA_ERASE,		/*!< ... to be removed. */
     FA_SKIPNSTATE,	/*!< ... untouched, state "not installed". */
     FA_SKIPNETSHARED,	/*!< ... untouched, state "netshared". */
-    FA_SKIPMULTILIB,	/*!< ... untouched. @todo state "multilib" ???. */
+    FA_SKIPMULTILIB	/*!< ... untouched. @todo state "multilib" ???. */
 } fileAction;
 
 #define XFA_SKIPPING(_a)	\
@@ -1252,7 +1252,7 @@ typedef enum fileTypes_e {
     BDEV	=  6,	/*!< block device */
     REG		=  8,	/*!< regular file */
     LINK	= 10,	/*!< hard link */
-    SOCK	= 12,	/*!< socket */
+    SOCK	= 12	/*!< socket */
 } fileTypes;
 
 /** \ingroup payload
@@ -1555,7 +1555,7 @@ typedef enum rpmtransFlags_e {
     RPMTRANS_FLAG_APPLYONLY	= (1 << 25),
 
 /*@-enummemuse@*/
-    RPMTRANS_FLAG_CHAINSAW	= (1 << 26),
+    RPMTRANS_FLAG_CHAINSAW	= (1 << 26)
 /*@=enummemuse@*/
 } rpmtransFlags;
 
diff --git a/lib/signature.h b/lib/signature.h
index 1c70ce9b8..fc5ee8931 100644
--- a/lib/signature.h
+++ b/lib/signature.h
@@ -20,7 +20,7 @@ typedef	enum sigType_e {
     RPMSIGTYPE_MD5	= 3,	/*!< unused, legacy. */
     RPMSIGTYPE_MD5_PGP	= 4,	/*!< unused, legacy. */
     RPMSIGTYPE_HEADERSIG= 5,	/*!< Header style signature */
-    RPMSIGTYPE_DISABLE	= 6,	/*!< Disable verification (debugging only) */
+    RPMSIGTYPE_DISABLE	= 6	/*!< Disable verification (debugging only) */
 } sigType;
 
 /** \ingroup signature
diff --git a/macros.in b/macros.in
index dc47d79ff..3bb58008d 100644
--- a/macros.in
+++ b/macros.in
@@ -1,7 +1,7 @@
 #/*! \page config_macros Default configuration: /usr/lib/rpm/macros
 # \verbatim
 #
-# $Id: macros.in,v 1.90 2001/10/20 22:31:09 jbj Exp $
+# $Id: macros.in,v 1.91 2001/12/20 16:28:46 jbj 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
@@ -759,7 +759,7 @@
 #
 %GNUconfigure(MCs:)      \
   CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS; \
-  LDFLAGS="${LDFLAGS:-'%{-s:-s}'}"  ; export LDFLAGS; \
+  LDFLAGS="${LDFLAGS:-%{-s:-s}}"  ; export LDFLAGS; \
   %{-C:_mydir="`pwd`"; %{-M: %{__mkdir} -p %{-C*};} cd %{-C*}} \
   dirs="`find ${_mydir} -name configure.in -print`"; export dirs; \
     for coin in `echo ${dirs}` \
diff --git a/po/rpm.pot b/po/rpm.pot
index 0e6ba5921..8b009bd30 100644
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-12-08 12:20-0500\n"
+"POT-Creation-Date: 2001-12-20 11:00-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2530,26 +2530,26 @@ msgstr ""
 msgid "bad option '%s' at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:1362
+#: lib/rpmrc.c:1368
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1363
+#: lib/rpmrc.c:1369
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/rpmrc.c:1588
+#: lib/rpmrc.c:1594
 #, c-format
 msgid "Cannot expand %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1593
+#: lib/rpmrc.c:1599
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr ""
 
-#: lib/rpmrc.c:1610
+#: lib/rpmrc.c:1616
 #, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr ""
diff --git a/rpm.spec.in b/rpm.spec.in
index 926282aa8..54121bff6 100644
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -190,7 +190,7 @@ mkdir -p ${RPM_BUILD_ROOT}/etc/cron.daily
 install -m 755 scripts/rpm.daily ${RPM_BUILD_ROOT}/etc/cron.daily/rpm
 
 mkdir -p ${RPM_BUILD_ROOT}/etc/logrotate.d
-install -m 755 scripts/rpm.log ${RPM_BUILD_ROOT}/etc/logrotate.d/rpm
+install -m 644 scripts/rpm.log ${RPM_BUILD_ROOT}/etc/logrotate.d/rpm
 
 mkdir -p $RPM_BUILD_ROOT/etc/rpm
 cat << E_O_F > $RPM_BUILD_ROOT/etc/rpm/macros.db1
@@ -595,3 +595,5 @@ fi
 - use db-4.0.14 final internally.
 - 1st crack at making zlib rsync friendly.
 - lclint-3.0.0.19 fiddles.
+- solaris: translate i86pc to i386 (#57182).
+- fix: %GNUconfigure breaks with single quotes (#57264).
diff --git a/rpmio/rpmio_internal.h b/rpmio/rpmio_internal.h
index e59bb6091..8c645ca14 100644
--- a/rpmio/rpmio_internal.h
+++ b/rpmio/rpmio_internal.h
@@ -34,7 +34,7 @@ enum FDSTAT_e {
     FDSTAT_READ		= 0,	/*!< Read statistics index. */
     FDSTAT_WRITE	= 1,	/*!< Write statistics index. */
     FDSTAT_SEEK		= 2,	/*!< Seek statistics index. */
-    FDSTAT_CLOSE	= 3	/*!< Close statistics. index */
+    FDSTAT_CLOSE	= 3	/*!< Close statistics index */
 };
 
 /** \ingroup rpmio
@@ -50,7 +50,7 @@ typedef	/*@abstract@*/ struct {
  * Bit(s) to control digest operation.
  */
 typedef enum rpmDigestFlags_e {
-    RPMDIGEST_NONE	= 0,
+    RPMDIGEST_NONE	= 0
 } rpmDigestFlags;
 
 /** \ingroup rpmio
diff --git a/rpmrc.in b/rpmrc.in
index 368703320..d28fd5dc2 100644
--- a/rpmrc.in
+++ b/rpmrc.in
@@ -1,7 +1,7 @@
 #/*! \page config_rpmrc Default configuration: /usr/lib/rpm/rpmrc
 # \verbatim
 #
-# $Id: rpmrc.in,v 2.45 2001/09/15 13:49:11 jbj Exp $
+# $Id: rpmrc.in,v 2.46 2001/12/20 16:28:46 jbj 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
@@ -318,6 +318,10 @@ buildarch_compat: armv3l: noarch
 buildarch_compat: armv4b: noarch
 buildarch_compat: armv4l: noarch
 
+buildarch_compat: hppa2.0: hppa1.2
+buildarch_compat: hppa1.2: hppa1.1
+buildarch_compat: hppa1.1: hppa1.0
+buildarch_compat: hppa1.0: parisc
 buildarch_compat: parisc: noarch
 
 buildarch_compat: atarist: m68kmint noarch
diff --git a/zlib/Makefile b/zlib/Makefile
index 85d314ac7..7fe6f7334 100644
--- a/zlib/Makefile
+++ b/zlib/Makefile
@@ -14,7 +14,7 @@
 
 CC=gcc
 
-CFLAGS=-O3 -fomit-frame-pointer -DHAVE_UNISTD_H -DUSE_MMAP
+CFLAGS=-O3 -fomit-frame-pointer -DWITH_RSYNC_PAD -DHAVE_UNISTD_H -DUSE_MMAP
 #CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
 #CFLAGS=-g -DDEBUG
 #CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
@@ -33,7 +33,7 @@ RANLIB=ranlib
 TAR=tar
 SHELL=/bin/sh
 
-prefix =/usr/local
+prefix =/usr
 exec_prefix =${prefix}
 libdir =${exec_prefix}/lib
 includedir =${prefix}/include
diff --git a/zlib/configure b/zlib/configure
index 4622adb73..385f4e802 100755
--- a/zlib/configure
+++ b/zlib/configure
@@ -61,7 +61,7 @@ EOF
 
 test -z "$CC" && echo Checking for gcc...
 cc=${CC-gcc}
-cflags=${CFLAGS-"-O3 -fomit-frame-pointer"}
+cflags=${CFLAGS-"-O3 -fomit-frame-pointer -DWITH_RSYNC_PAD"}
 # to force the asm version use: CFLAGS="-O3 -DASMV" ./configure
 case "$cc" in
   *gcc*) gcc=1;;