diff options
| -rw-r--r-- | CHANGES | 5 | ||||
| -rw-r--r-- | acconfig.h | 6 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | lib/fprint.c | 12 | ||||
| -rw-r--r-- | lib/fprint.h | 26 | ||||
| -rw-r--r-- | lib/rpmdb.c | 2 | ||||
| -rw-r--r-- | lib/transaction.c | 7 | ||||
| -rw-r--r-- | po/cs.po | 2 | ||||
| -rw-r--r-- | po/da.po | 2 | ||||
| -rw-r--r-- | po/de.po | 2 | ||||
| -rw-r--r-- | po/es.po | 2 | ||||
| -rw-r--r-- | po/fi.po | 2 | ||||
| -rw-r--r-- | po/fr.po | 2 | ||||
| -rw-r--r-- | po/gl.po | 2 | ||||
| -rw-r--r-- | po/hu.po | 2 | ||||
| -rw-r--r-- | po/id.po | 2 | ||||
| -rw-r--r-- | po/is.po | 2 | ||||
| -rw-r--r-- | po/it.po | 2 | ||||
| -rw-r--r-- | po/ja.po | 4 | ||||
| -rw-r--r-- | po/ko.po | 2 | ||||
| -rw-r--r-- | po/no.po | 2 | ||||
| -rw-r--r-- | po/pl.po | 2 | ||||
| -rw-r--r-- | po/pt.po | 2 | ||||
| -rw-r--r-- | po/pt_BR.po | 2 | ||||
| -rw-r--r-- | po/ro.po | 2 | ||||
| -rw-r--r-- | po/rpm.pot | 2 | ||||
| -rw-r--r-- | po/ru.po | 2 | ||||
| -rw-r--r-- | po/sk.po | 2 | ||||
| -rw-r--r-- | po/sl.po | 4 | ||||
| -rw-r--r-- | po/sr.po | 2 | ||||
| -rw-r--r-- | po/sv.po | 4 | ||||
| -rw-r--r-- | po/tr.po | 2 | ||||
| -rw-r--r-- | po/uk.po | 2 | ||||
| -rwxr-xr-x | popt/configure.in | 2 | ||||
| -rw-r--r-- | rpm.spec | 5 |
35 files changed, 67 insertions, 58 deletions
@@ -41,7 +41,6 @@ - fix: sparc64 per-platform directory shouldn't be sparc64linux. - fix: (segfault) verify needs rpmdb while query does not. - add calculated nlink field to -qlv output (like ls -al). - - builds against bzip2 1.0 - detects and builds properly against the new fopencookie API in glibc 2.2. - change popt exec alias in oreder to exec rpm children. @@ -62,6 +61,10 @@ - portability: sparc-sun-solaris2.5.1. - fix: don't count removed files if removed packages is empty set. - fix: permit '\0' as special case key (e.g. "/" in Basenames). + +3.0.4 -> 3.0.5 + - builds against bzip2 1.0 + - fix: resurrect symlink unique'ifying property of finger prints. 3.0.3 -> 3.0.4 - use compressed filenames on install side. diff --git a/acconfig.h b/acconfig.h index c4841c72a..32e92af33 100644 --- a/acconfig.h +++ b/acconfig.h @@ -26,9 +26,6 @@ /* Define to 1 if NLS is requested. */ #undef ENABLE_NLS -/* Define as 1 if you bzip2 1.0 */ -#undef HAVE_BZ2_1_0 - /* Define as 1 if you have catgets and don't want to use GNU gettext. */ #undef HAVE_CATGETS @@ -86,6 +83,9 @@ /* Define to the full path name of the bzip2 library (libbz2.a) */ #undef BZIP2LIB +/* Define as 1 if you bzip2 1.0 */ +#undef HAVE_BZ2_1_0 + /* A full path to a program, possibly with arguments, that will create a directory and all necessary parent directories, ala `mkdir -p' */ #undef MKDIR_P diff --git a/configure.in b/configure.in index d269dc475..709113c6d 100644 --- a/configure.in +++ b/configure.in @@ -15,7 +15,7 @@ AC_PREREQ(2.12) dnl Minimum Autoconf version required. dnl XXX AM_MAINTAINER_MODE dnl Set of available languages. -ALL_LINGUAS="cs de fi fr ja pl pt_BR ru sk sl sr sv tr" +ALL_LINGUAS="cs da de es fi fr gl hu id is it ja ko no pl pt pt_BR ro ru sk sl sr sv tr uk" LIBOBJS= diff --git a/lib/fprint.c b/lib/fprint.c index c2ba5b7fc..25af8e9c4 100644 --- a/lib/fprint.c +++ b/lib/fprint.c @@ -185,8 +185,16 @@ int fpEqual(const void * key1, const void * key2) { const fingerPrint *k1 = key1; const fingerPrint *k2 = key2; - /* XXX negated to preserve strcmp return behavior in ht->eq */ - return (FP_EQUAL(*k1, *k2) ? 0 : 1); + + /* If the addresses are the same, so are the values. */ + if (k1 == k2) + return 0; + + /* Otherwise, compare fingerprints by value. */ + if (FP_EQUAL(*k1, *k2)) + return 0; + return 1; + } void fpLookupList(fingerPrintCache cache, const char ** dirNames, diff --git a/lib/fprint.h b/lib/fprint.h index 93c6234c0..d5b97f164 100644 --- a/lib/fprint.h +++ b/lib/fprint.h @@ -46,28 +46,16 @@ typedef struct fingerprint_s { #define fpFree(a) free((void *)(a).baseName) /** */ -#define FP_EQUAL(a, b) ( \ - (&(a) == &(b)) || ( \ - ((a).entry == (b).entry) && \ - !strcmp((a).baseName, (b).baseName) && \ - (((a).subDir && (b).subDir && !strcmp((a).subDir, (b).subDir)) \ - || ((a).subDir == (b).subDir)) \ - ) \ - ) - -/** */ -#define FP_ENTRY_EQUAL(a, b) ( \ - ((a)->dev == (b)->dev) && \ - ((a)->ino == (b)->ino) && \ - !strcmp((a)->dirName, (b)->dirName)) +#define FP_ENTRY_EQUAL(a, b) (((a)->dev == (b)->dev) && ((a)->ino == (b)->ino)) /** */ -#define FP_EQUAL_DIFFERENT_CACHE(a, b) ( \ +#define FP_EQUAL(a, b) ( \ FP_ENTRY_EQUAL((a).entry, (b).entry) && \ - !strcmp((a).baseName, (b).baseName) && \ - (((a).subDir && (b).subDir && !strcmp((a).subDir, (b).subDir)) \ - || ((a).subDir == (b).subDir)) \ - ) + !strcmp((a).baseName, (b).baseName) && ( \ + ((a).subDir == (b).subDir) || \ + ((a).subDir && (b).subDir && !strcmp((a).subDir, (b).subDir)) \ + ) \ + ) #ifdef __cplusplus extern "C" { diff --git a/lib/rpmdb.c b/lib/rpmdb.c index 96bfad655..69243f753 100644 --- a/lib/rpmdb.c +++ b/lib/rpmdb.c @@ -2026,7 +2026,7 @@ int rpmdbFindFpList(rpmdb rpmdb, fingerPrint * fpList, dbiIndexSet * matchList, /* Add db (recnum,filenum) to list for fingerprint matches. */ for (i = 0; i < num; i++, im++) { - if (FP_EQUAL_DIFFERENT_CACHE(fps[i], fpList[im->fpNum])) + if (FP_EQUAL(fps[i], fpList[im->fpNum])) dbiAppendSet(matchList[im->fpNum], im, 1, sizeof(*im), 0); } diff --git a/lib/transaction.c b/lib/transaction.c index f29f4a859..e49626439 100644 --- a/lib/transaction.c +++ b/lib/transaction.c @@ -944,8 +944,15 @@ static void handleOverlappedFiles(TFI_t * fi, hashTable ht, /* TESTME: there are more efficient searches in the world... */ for (otherFileNum = 0; otherFileNum < recs[otherPkgNum]->fc; otherFileNum++) { + + /* If the addresses are the same, so are the values. */ + if ((fi->fps + i) == (recs[otherPkgNum]->fps + otherFileNum)) + break; + + /* Otherwise, compare fingerprints by value. */ if (FP_EQUAL(fi->fps[i], recs[otherPkgNum]->fps[otherFileNum])) break; + } /* XXX is this test still necessary? */ if (recs[otherPkgNum]->actions[otherFileNum] != FA_UNKNOWN) @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-06-14 10:07-0400\n" +"POT-Creation-Date: 2000-06-16 14:54-0400\n" "PO-Revision-Date: 1998-10-10 10:10+0200\n" "Last-Translator: Pavel Makovec <pavelm@terminal.cz>\n" "Language-Team: Czech <pavelm@terminal.cz>\n" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-06-14 10:07-0400\n" +"POT-Creation-Date: 2000-06-16 14:54-0400\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" @@ -37,7 +37,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 2.5.2\n" -"POT-Creation-Date: 2000-06-14 10:07-0400\n" +"POT-Creation-Date: 2000-06-16 14:54-0400\n" "PO-Revision-Date: 1998-08-03 18:02+02:00\n" "Last-Translator: Karl Eichwalder <ke@SuSE.DE>\n" "Language-Team: German <de@li.org>\n" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-06-14 10:07-0400\n" +"POT-Creation-Date: 2000-06-16 14:54-0400\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" @@ -1,6 +1,6 @@ msgid "" msgstr "" -"POT-Creation-Date: 2000-06-14 10:07-0400\n" +"POT-Creation-Date: 2000-06-16 14:54-0400\n" "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n" "Language-Team: Finnish <linux@sot.com>\n" "Content-Type: text/plain; charset=\n" @@ -1,5 +1,5 @@ msgid "" -msgstr "POT-Creation-Date: 2000-06-14 10:07-0400\n" +msgstr "POT-Creation-Date: 2000-06-16 14:54-0400\n" #: build.c:25 lib/rpminstall.c:250 lib/rpminstall.c:422 #, c-format @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-06-14 10:07-0400\n" +"POT-Creation-Date: 2000-06-16 14:54-0400\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" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-06-14 10:07-0400\n" +"POT-Creation-Date: 2000-06-16 14:54-0400\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" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-06-14 10:07-0400\n" +"POT-Creation-Date: 2000-06-16 14:54-0400\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" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 1.0\n" -"POT-Creation-Date: 2000-06-14 10:07-0400\n" +"POT-Creation-Date: 2000-06-16 14:54-0400\n" "PO-Revision-Date: 2000-06-16 02:20+0000\n" "Last-Translator: Richard Allen <ra@hp.is>\n" "Language-Team: is <kde-isl@mmedia.is>\n" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-06-14 10:07-0400\n" +"POT-Creation-Date: 2000-06-16 14:54-0400\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" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm-3.0.4\n" -"POT-Creation-Date: 2000-06-14 10:07-0400\n" +"POT-Creation-Date: 2000-06-16 14:54-0400\n" "PO-Revision-Date: 1999-12-01 22:49 +JST\n" "Last-Translator: Kanda Mitsuru <kanda@nn.iij4u.or.jp>\n" "Language-Team: JRPM <jrpm@linux.or.jp>\n" @@ -127,7 +127,7 @@ msgstr "copyright ¤¬¤¢¤ê¤Þ¤»¤ó!\n" # build root [BuildRoot] # net share [¥Í¥Ã¥È¶¦Í] # reloate [ºÆÇÛÃÖ/°ÜÆ°¤¹¤ë] -# $Id: ja.po,v 1.74 2000/06/14 14:21:07 jbj Exp $ +# $Id: ja.po,v 1.75 2000/06/16 19:12:10 jbj Exp $ #: rpm.c:177 rpmqv.c:256 #, c-format msgid "rpm: %s\n" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-06-14 10:07-0400\n" +"POT-Creation-Date: 2000-06-16 14:54-0400\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" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-06-14 10:07-0400\n" +"POT-Creation-Date: 2000-06-16 14:54-0400\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" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm-3.0.2\n" -"POT-Creation-Date: 2000-06-14 10:07-0400\n" +"POT-Creation-Date: 2000-06-16 14:54-0400\n" "PO-Revision-Date: 1999-05-25 17:00+0100\n" "Last-Translator: Pawe³ Dziekoñski <pdziekonski@mml.ch.pwr.wroc.pl>\n" "Language-Team: Polish <pl@li.org>\n" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-06-14 10:07-0400\n" +"POT-Creation-Date: 2000-06-16 14:54-0400\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" diff --git a/po/pt_BR.po b/po/pt_BR.po index 722bb3766..d133d4d75 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -2,7 +2,7 @@ # Revised by Arnaldo Carvalho de Melo <acme@conectiva.com.br>, 1998. # msgid "" -msgstr "POT-Creation-Date: 2000-06-14 10:07-0400\n" +msgstr "POT-Creation-Date: 2000-06-16 14:54-0400\n" #: build.c:25 lib/rpminstall.c:250 lib/rpminstall.c:422 #, c-format @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0\n" -"POT-Creation-Date: 2000-06-14 10:07-0400\n" +"POT-Creation-Date: 2000-06-16 14:54-0400\n" "PO-Revision-Date: 1999-04-10 12:00+EST\n" "Last-Translator: Cristian Gafton <gafton@redhat.com>\n" "Language-Team: Romanian <ro@li.org>\n" diff --git a/po/rpm.pot b/po/rpm.pot index 75ab5b452..a4babcca4 100644 --- a/po/rpm.pot +++ b/po/rpm.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-06-14 10:07-0400\n" +"POT-Creation-Date: 2000-06-16 14:54-0400\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" @@ -1,6 +1,6 @@ msgid "" msgstr "" -"POT-Creation-Date: 2000-06-14 10:07-0400\n" +"POT-Creation-Date: 2000-06-16 14:54-0400\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=koi8-r\n" "Content-Transfer-Encoding: 8bit\n" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 2.93\n" -"POT-Creation-Date: 2000-06-14 10:07-0400\n" +"POT-Creation-Date: 2000-06-16 14:54-0400\n" "PO-Revision-Date: 1999-04-08 21:37+02:00\n" "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n" "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n" @@ -1,12 +1,12 @@ # -*- mode:po; coding:iso-latin-2; -*- Slovenian messages for Redhat pkg. mngr. # Copyright (C) 2000 Free Software Foundation, Inc. # Primo¾ Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2000. -# $Id: sl.po,v 1.59 2000/06/14 14:21:08 jbj Exp $ +# $Id: sl.po,v 1.60 2000/06/16 19:12:11 jbj Exp $ # msgid "" msgstr "" "Project-Id-Version: rpm 3.0.4\n" -"POT-Creation-Date: 2000-06-14 10:07-0400\n" +"POT-Creation-Date: 2000-06-16 14:54-0400\n" "PO-Revision-Date: 2000-02-17 22:25+01:00\n" "Last-Translator: Primo¾ Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n" "Language-Team: Slovenian <sl@li.org>\n" @@ -1,6 +1,6 @@ msgid "" msgstr "" -"POT-Creation-Date: 2000-06-14 10:07-0400\n" +"POT-Creation-Date: 2000-06-16 14:54-0400\n" "Content-Type: text/plain; charset=\n" "Date: 1998-05-02 21:41:47-0400\n" "From: Erik Troan <ewt@lacrosse.redhat.com>\n" @@ -1,12 +1,12 @@ # Swedish messages for RPM # Copyright © 1999 Free Software Foundation, Inc. # Göran Uddeborg <göran@uddeborg.pp.se>, 1999, 2000. -# $Revision: 1.119 $ +# $Revision: 1.120 $ # msgid "" msgstr "" "Project-Id-Version: rpm 3.0.4\n" -"POT-Creation-Date: 2000-06-14 10:07-0400\n" +"POT-Creation-Date: 2000-06-16 14:54-0400\n" "PO-Revision-Date: 2000-02-21 12:20+0100\n" "Last-Translator: Göran Uddeborg <göran@uddeborg.pp.se>\n" "Language-Team: Swedish <sv@li.org>\n" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-06-14 10:07-0400\n" +"POT-Creation-Date: 2000-06-16 14:54-0400\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" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-06-14 10:07-0400\n" +"POT-Creation-Date: 2000-06-16 14:54-0400\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" diff --git a/popt/configure.in b/popt/configure.in index 56d05af53..1878cf42c 100755 --- a/popt/configure.in +++ b/popt/configure.in @@ -3,7 +3,7 @@ AM_CONFIG_HEADER(config.h) AC_PREREQ(2.12) AC_CANONICAL_SYSTEM AM_INIT_AUTOMAKE(popt, 1.6) -ALL_LINGUAS="ro sk tr" +ALL_LINGUAS="cs da de es fi fr gl hu id is it ja ko no pl pt pt_BR ro ru sk sl sr sv tr uk" AC_ISC_POSIX @@ -5,7 +5,7 @@ Summary: The Red Hat package management system. Name: rpm %define version 4.0 Version: %{version} -Release: 0.37 +Release: 0.38 Group: System Environment/Base Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/rpm-%{version}.tar.gz Copyright: GPL @@ -255,6 +255,9 @@ fi %{__prefix}/include/popt.h %changelog +* Fri Jun 16 2000 Jeff Johnson <jbj@redhat.com> +- fix: resurrect symlink unique'ifying property of finger prints. + * Wed Jun 14 2000 Jeff Johnson <jbj@redhat.com> - fix: don't count removed files if removed packages is empty set. - fix: permit '\0' as special case key (e.g. "/" in Basenames). |