From 22389abbd44af3376c4c86824a558eae412bc541 Mon Sep 17 00:00:00 2001 From: jbj Date: Tue, 19 Nov 2002 18:40:21 +0000 Subject: [PATCH] - add AC_SYS_LARGFILE throughout. - statically link rpmdeps against (internal) libfmagic. CVS patchset: 5876 CVS date: 2002/11/19 18:40:21 --- CHANGES | 2 ++ beecrypt/configure.ac | 1 + build/rpmfc.c | 4 +-- configure.ac | 1 + elfutils/po/elfutils.pot | 2 +- file/apprentice.c | 7 +++++ file/file.c | 10 ++----- file/fsmagic.c | 2 +- po/cs.po | 9 ++++-- po/da.po | 9 ++++-- po/de.po | 10 +++++-- po/fi.po | 9 ++++-- po/fr.po | 11 ++++--- po/gl.po | 4 +-- po/is.po | 4 +-- po/ja.po | 9 ++++-- po/ko.po | 9 ++++-- po/no.po | 9 ++++-- po/pl.po | 9 ++++-- po/pt.po | 9 ++++-- po/pt_BR.po | 12 +++++--- po/ro.po | 4 +-- po/rpm.pot | 4 +-- po/ru.po | 9 ++++-- po/sk.po | 9 ++++-- po/sl.po | 11 ++++--- po/sr.po | 9 ++++-- po/sv.po | 9 ++++-- po/tr.po | 9 ++++-- popt/configure.ac | 1 + rpm.spec.in | 6 ++-- rpmio/fts.h | 8 ------ tools/Makefile.am | 3 +- tools/rpmdeps.c | 62 ++++++++++++++++++++++++++-------------- zlib/configure.in | 1 + 35 files changed, 180 insertions(+), 107 deletions(-) diff --git a/CHANGES b/CHANGES index d614d4440..384b20c0c 100644 --- a/CHANGES +++ b/CHANGES @@ -25,6 +25,8 @@ - apply patches 1-6 to db-4.1.24. - resurrect availablePackages one more time. - fix: option conflict error message (#77373). + - add AC_SYS_LARGFILE throughout. + - statically link rpmdeps against (internal) libfmagic. 4.0.4 -> 4.1: - loosely wire beecrypt library into rpm. diff --git a/beecrypt/configure.ac b/beecrypt/configure.ac index 5413871d9..1642a844a 100644 --- a/beecrypt/configure.ac +++ b/beecrypt/configure.ac @@ -81,6 +81,7 @@ AC_PROG_INSTALL AC_PROG_CPP AC_PROG_CXX AC_PROG_LIBTOOL +AC_SYS_LARGEFILE # Initialize tool flags CFLAGS="" diff --git a/build/rpmfc.c b/build/rpmfc.c index 03f94e8fb..668a15b01 100644 --- a/build/rpmfc.c +++ b/build/rpmfc.c @@ -697,9 +697,7 @@ static int rpmfcELF(rpmfc fc) s = elf_strptr(elf, shdr->sh_link, aux->vda_name); if (s == NULL) /*@innerbreak@*/ break; - /* XXX Ick, but what's a girl to do. */ - if (!strncmp("ld-", s, 3) || !strncmp("lib", s, 3)) - { + if (def->vd_flags & VER_FLG_BASE) { soname = _free(soname); soname = xstrdup(s); auxoffset += aux->vda_next; diff --git a/configure.ac b/configure.ac index ba17aca90..d39279feb 100644 --- a/configure.ac +++ b/configure.ac @@ -57,6 +57,7 @@ export CFLAGS AC_PROG_CPP AC_PROG_GCC_TRADITIONAL +AC_SYS_LARGEFILE dnl Does this platform require array notation to assign to a va_list? dnl If cross-compiling, we assume va_list is "normal". If this breaks diff --git a/elfutils/po/elfutils.pot b/elfutils/po/elfutils.pot index 93be5aff4..924f260b2 100644 --- a/elfutils/po/elfutils.pot +++ b/elfutils/po/elfutils.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2002-11-15 16:10-0500\n" +"POT-Creation-Date: 2002-11-19 13:42-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/file/apprentice.c b/file/apprentice.c index 4212256e3..bbfe44a43 100644 --- a/file/apprentice.c +++ b/file/apprentice.c @@ -65,6 +65,13 @@ FILE_RCSID("@(#)Id: apprentice.c,v 1.49 2002/07/03 19:00:41 christos Exp ") /*@unchecked@*/ static int maxmagic = 0; +#ifndef MAGIC +# define MAGIC "/etc/magic" +#endif + +/*@unchecked@*/ /*@observer@*/ +const char *default_magicfile = MAGIC; + /* * extend the sign bit if the comparison is to be signed */ diff --git a/file/file.c b/file/file.c index 33cf289bb..c366651d7 100644 --- a/file/file.c +++ b/file/file.c @@ -37,6 +37,9 @@ FILE_RCSID("@(#)Id: file.c,v 1.66 2002/07/03 19:00:41 christos Exp ") /*@unchecked@*/ extern fmagic global_fmagic; +/*@unchecked@*/ /*@observer@*/ +extern const char * default_magicfile; + #ifdef S_IFLNK # define USAGE "Usage: %s [-bciknsvzL] [-f namefile] [-m magicfiles] file...\n" #else @@ -48,10 +51,6 @@ static char *apptypeName = NULL; int os2_apptype (const char *fn, char *buf, int nb); #endif /* __EMX__ */ -#ifndef MAGIC -# define MAGIC "/etc/magic" -#endif - #ifndef MAXPATHLEN #define MAXPATHLEN 512 #endif @@ -60,9 +59,6 @@ int os2_apptype (const char *fn, char *buf, int nb); /*@unchecked@*/ static int nobuffer = 0; /* Do not buffer stdout */ -/*@unchecked@*/ /*@observer@*/ -static const char *default_magicfile = MAGIC; - /*@unchecked@*/ char *progname; /* used throughout */ diff --git a/file/fsmagic.c b/file/fsmagic.c index 41ed54ba5..09be7a141 100644 --- a/file/fsmagic.c +++ b/file/fsmagic.c @@ -267,7 +267,7 @@ fmagicF(fmagic fm, int zfl) int fmagicProcess(fmagic fm, const char *fn, int wid) { - static const char stdname[] = "standard input"; + static const char stdname[] = "standard input"; char match = '\0'; int ret = 0; diff --git a/po/cs.po b/po/cs.po index 1bab24516..8cea35e4e 100644 --- a/po/cs.po +++ b/po/cs.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-11-13 13:20-0500\n" +"POT-Creation-Date: 2002-11-19 13:41-0500\n" "PO-Revision-Date: 2001-07-24 10:02+0100\n" "Last-Translator: Milan Kerslager \n" "Language-Team: Czech \n" @@ -161,8 +161,8 @@ msgid "files may only be relocated during package installation" msgstr "soubory mohou být pøemístìny jen pøi instalaci balíèkù" #: rpmqv.c:424 -msgid "only one of --prefix or --relocate may be used" -msgstr "pou¾ít lze jen jeden z parametrù --prefix nebo --relocate" +msgid "cannot use --prefix with --relocate or --excludepath" +msgstr "" #: rpmqv.c:427 msgid "" @@ -3819,6 +3819,9 @@ msgstr "" msgid "DIRECTORY" msgstr "" +#~ msgid "only one of --prefix or --relocate may be used" +#~ msgstr "pou¾ít lze jen jeden z parametrù --prefix nebo --relocate" + #~ msgid "Couldn't exec %s: %s\n" #~ msgstr "Nemohu spustit %s: %s\n" diff --git a/po/da.po b/po/da.po index a91403c06..9e1b8be15 100644 --- a/po/da.po +++ b/po/da.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-11-13 13:20-0500\n" +"POT-Creation-Date: 2002-11-19 13:41-0500\n" "PO-Revision-Date: 2001-04-05 23:03GMT\n" "Last-Translator: Claus Hindsgaul \n" "Language-Team: Danish \n" @@ -159,8 +159,8 @@ msgid "files may only be relocated during package installation" msgstr "filer kan kun omrokeres under installation" #: rpmqv.c:424 -msgid "only one of --prefix or --relocate may be used" -msgstr "kun én af --prefix eller --relocate kan bruges" +msgid "cannot use --prefix with --relocate or --excludepath" +msgstr "" #: rpmqv.c:427 msgid "" @@ -3830,6 +3830,9 @@ msgstr "" msgid "DIRECTORY" msgstr "" +#~ msgid "only one of --prefix or --relocate may be used" +#~ msgstr "kun én af --prefix eller --relocate kan bruges" + #~ msgid "Couldn't exec %s: %s\n" #~ msgstr "Kunne ikke udføre %s: %s\n" diff --git a/po/de.po b/po/de.po index ac8b86d74..e439ee579 100644 --- a/po/de.po +++ b/po/de.po @@ -37,7 +37,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-11-13 13:20-0500\n" +"POT-Creation-Date: 2002-11-19 13:41-0500\n" "PO-Revision-Date: 1998-08-03 18:02+02:00\n" "Last-Translator: Karl Eichwalder \n" "Language-Team: German \n" @@ -207,8 +207,8 @@ msgid "files may only be relocated during package installation" msgstr "Dateien können nur während der Paketinstallation verschoben werden" #: rpmqv.c:424 -msgid "only one of --prefix or --relocate may be used" -msgstr "nur eines der Argumente --prefix oder --relocate darf angegeben werden" +msgid "cannot use --prefix with --relocate or --excludepath" +msgstr "" #: rpmqv.c:427 #, fuzzy @@ -4025,6 +4025,10 @@ msgstr "" msgid "DIRECTORY" msgstr "" +#~ msgid "only one of --prefix or --relocate may be used" +#~ msgstr "" +#~ "nur eines der Argumente --prefix oder --relocate darf angegeben werden" + #, fuzzy #~ msgid "Couldn't exec %s: %s\n" #~ msgstr "Konnte pgp nicht durchführen" diff --git a/po/fi.po b/po/fi.po index 993d4436b..ec9138091 100644 --- a/po/fi.po +++ b/po/fi.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-11-13 13:20-0500\n" +"POT-Creation-Date: 2002-11-19 13:41-0500\n" "PO-Revision-Date: 1998-05-02 21:41:47-0400\n" "Last-Translator: Raimo Koski \n" "Language-Team: Finnish \n" @@ -161,8 +161,8 @@ msgid "files may only be relocated during package installation" msgstr "tiedostoja voidaan siirtää toiselle polulle vain asennettaessa" #: rpmqv.c:424 -msgid "only one of --prefix or --relocate may be used" -msgstr "vain toinen --prefix tai --relocate voidaan antaa" +msgid "cannot use --prefix with --relocate or --excludepath" +msgstr "" #: rpmqv.c:427 #, fuzzy @@ -3879,6 +3879,9 @@ msgstr "" msgid "DIRECTORY" msgstr "" +#~ msgid "only one of --prefix or --relocate may be used" +#~ msgstr "vain toinen --prefix tai --relocate voidaan antaa" + #, fuzzy #~ msgid "Couldn't exec %s: %s\n" #~ msgstr "En voinut ajaa pgp:tä" diff --git a/po/fr.po b/po/fr.po index 97519ff43..2477636f7 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-11-13 13:20-0500\n" +"POT-Creation-Date: 2002-11-19 13:41-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -167,9 +167,8 @@ msgstr "" "--replacefiles ne peut tre spcifi que lors de l'installation d'un package" #: rpmqv.c:424 -#, fuzzy -msgid "only one of --prefix or --relocate may be used" -msgstr "un seul mode majeur peut tre spcifi" +msgid "cannot use --prefix with --relocate or --excludepath" +msgstr "" #: rpmqv.c:427 #, fuzzy @@ -3905,6 +3904,10 @@ msgstr "" msgid "DIRECTORY" msgstr "" +#, fuzzy +#~ msgid "only one of --prefix or --relocate may be used" +#~ msgstr "un seul mode majeur peut tre spcifi" + #, fuzzy #~ msgid "Couldn't exec %s: %s\n" #~ msgstr "impossible d'ouvrir: %s\n" diff --git a/po/gl.po b/po/gl.po index 1f9c10e29..29adae063 100644 --- a/po/gl.po +++ b/po/gl.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2002-11-13 13:20-0500\n" +"POT-Creation-Date: 2002-11-19 13:41-0500\n" "PO-Revision-Date: 2001-01-13 22:31+0100\n" "Last-Translator: Jesús Bravo Álvarez \n" "Language-Team: Galician \n" @@ -155,7 +155,7 @@ msgid "files may only be relocated during package installation" msgstr "" #: rpmqv.c:424 -msgid "only one of --prefix or --relocate may be used" +msgid "cannot use --prefix with --relocate or --excludepath" msgstr "" #: rpmqv.c:427 diff --git a/po/is.po b/po/is.po index 0906d8d0d..ef05e7e05 100644 --- a/po/is.po +++ b/po/is.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-11-13 13:20-0500\n" +"POT-Creation-Date: 2002-11-19 13:41-0500\n" "PO-Revision-Date: 2001-07-12 13:25+0000\n" "Last-Translator: Richard Allen \n" "Language-Team: is \n" @@ -158,7 +158,7 @@ msgid "files may only be relocated during package installation" msgstr "" #: rpmqv.c:424 -msgid "only one of --prefix or --relocate may be used" +msgid "cannot use --prefix with --relocate or --excludepath" msgstr "" #: rpmqv.c:427 diff --git a/po/ja.po b/po/ja.po index c8e866c23..18685285f 100644 --- a/po/ja.po +++ b/po/ja.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-11-13 13:20-0500\n" +"POT-Creation-Date: 2002-11-19 13:41-0500\n" "PO-Revision-Date: 1999-12-01 22:49 +JST\n" "Last-Translator: Kanda Mitsuru \n" "Language-Team: JRPM \n" @@ -174,8 +174,8 @@ msgid "files may only be relocated during package installation" msgstr "¥Õ¥¡¥¤¥ë¤Ï¥Ñ¥Ã¥±¡¼¥¸¥¤¥ó¥¹¥È¡¼¥ë»þ¤Î¤ßºÆÇÛÃ֤Ǥ­¤Þ¤¹" #: rpmqv.c:424 -msgid "only one of --prefix or --relocate may be used" -msgstr "--prefix ¤â¤·¤¯¤Ï --relocate ¤Î¤¤¤º¤ì¤«¤Î¤ß»ÈÍѤǤ­¤Þ¤¹" +msgid "cannot use --prefix with --relocate or --excludepath" +msgstr "" #: rpmqv.c:427 #, fuzzy @@ -3929,6 +3929,9 @@ msgstr "" msgid "DIRECTORY" msgstr "" +#~ msgid "only one of --prefix or --relocate may be used" +#~ msgstr "--prefix ¤â¤·¤¯¤Ï --relocate ¤Î¤¤¤º¤ì¤«¤Î¤ß»ÈÍѤǤ­¤Þ¤¹" + #, fuzzy #~ msgid "Couldn't exec %s: %s\n" #~ msgstr "%s ¤ò¼Â¹Ô¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿: %s" diff --git a/po/ko.po b/po/ko.po index 5033de12c..41b806a17 100644 --- a/po/ko.po +++ b/po/ko.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.4\n" -"POT-Creation-Date: 2002-11-13 13:20-0500\n" +"POT-Creation-Date: 2002-11-19 13:41-0500\n" "PO-Revision-Date: 2002-03-04 17:17+0900\n" "Last-Translator: Jong-Hoon Ryu \n" "Language-Team: GNU Translation project \n" @@ -159,8 +159,8 @@ msgid "files may only be relocated during package installation" msgstr "ÆÐÅ°Áö ¼³Ä¡½Ã¿¡¸¸ ÆÄÀÏÀ» Àç¹èÄ¡ÇÒ ¼ö ÀÖ½À´Ï´Ù" #: rpmqv.c:424 -msgid "only one of --prefix or --relocate may be used" -msgstr "--prefix ¶Ç´Â --relocate ¿É¼Ç Áß Çϳª¸¸ »ç¿ëÇÒ ¼ö ÀÖ½À´Ï´Ù" +msgid "cannot use --prefix with --relocate or --excludepath" +msgstr "" #: rpmqv.c:427 msgid "" @@ -3808,6 +3808,9 @@ msgstr "" msgid "DIRECTORY" msgstr "" +#~ msgid "only one of --prefix or --relocate may be used" +#~ msgstr "--prefix ¶Ç´Â --relocate ¿É¼Ç Áß Çϳª¸¸ »ç¿ëÇÒ ¼ö ÀÖ½À´Ï´Ù" + #~ msgid "Couldn't exec %s: %s\n" #~ msgstr "%s(À»)¸¦ ½ÇÇàÇÒ ¼ö ¾øÀ½: %s\n" diff --git a/po/no.po b/po/no.po index fdc08e373..04284a33c 100644 --- a/po/no.po +++ b/po/no.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-11-13 13:20-0500\n" +"POT-Creation-Date: 2002-11-19 13:41-0500\n" "PO-Revision-Date: 2001-06-27 12:24+0200\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian \n" @@ -159,8 +159,8 @@ msgid "files may only be relocated during package installation" msgstr "filer kan kun omplasseres under pakkeinstallasjon" #: rpmqv.c:424 -msgid "only one of --prefix or --relocate may be used" -msgstr "kune en av --prefix eller --relocate kan brukes" +msgid "cannot use --prefix with --relocate or --excludepath" +msgstr "" #: rpmqv.c:427 msgid "" @@ -3774,6 +3774,9 @@ msgstr "" msgid "DIRECTORY" msgstr "" +#~ msgid "only one of --prefix or --relocate may be used" +#~ msgstr "kune en av --prefix eller --relocate kan brukes" + #~ msgid "Couldn't exec %s: %s\n" #~ msgstr "Kunne ikke kjøre %s: %s\n" diff --git a/po/pl.po b/po/pl.po index 33e24d665..ae1768a13 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-11-13 13:20-0500\n" +"POT-Creation-Date: 2002-11-19 13:41-0500\n" "PO-Revision-Date: 1999-05-25 17:00+0100\n" "Last-Translator: Pawe³ Dziekoñski \n" "Language-Team: Polish \n" @@ -166,8 +166,8 @@ msgid "files may only be relocated during package installation" msgstr "przesuwania plików mo¿na dokonaæ tylko w trakcie instalacji" #: rpmqv.c:424 -msgid "only one of --prefix or --relocate may be used" -msgstr "nie mo¿na jednocze¶nie u¿yæ --prefix i --relocate" +msgid "cannot use --prefix with --relocate or --excludepath" +msgstr "" #: rpmqv.c:427 msgid "" @@ -3874,6 +3874,9 @@ msgstr "" msgid "DIRECTORY" msgstr "" +#~ msgid "only one of --prefix or --relocate may be used" +#~ msgstr "nie mo¿na jednocze¶nie u¿yæ --prefix i --relocate" + #, fuzzy #~ msgid "Couldn't exec %s: %s\n" #~ msgstr "Nie mo¿na uruchomiæ %s" diff --git a/po/pt.po b/po/pt.po index bf9a75c9c..0a33a8b74 100644 --- a/po/pt.po +++ b/po/pt.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm\n" -"POT-Creation-Date: 2002-11-13 13:20-0500\n" +"POT-Creation-Date: 2002-11-19 13:41-0500\n" "PO-Revision-Date: 2002-02-14 10:51+0000\n" "Last-Translator: José Nuno Coelho Sanarra Pires \n" "Language-Team: pt \n" "Language-Team: Romanian \n" @@ -155,7 +155,7 @@ msgid "files may only be relocated during package installation" msgstr "" #: rpmqv.c:424 -msgid "only one of --prefix or --relocate may be used" +msgid "cannot use --prefix with --relocate or --excludepath" msgstr "" #: rpmqv.c:427 diff --git a/po/rpm.pot b/po/rpm.pot index 5353fb770..dd5b59077 100644 --- a/po/rpm.pot +++ b/po/rpm.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2002-11-13 13:20-0500\n" +"POT-Creation-Date: 2002-11-19 13:41-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -161,7 +161,7 @@ msgid "files may only be relocated during package installation" msgstr "" #: rpmqv.c:424 -msgid "only one of --prefix or --relocate may be used" +msgid "cannot use --prefix with --relocate or --excludepath" msgstr "" #: rpmqv.c:427 diff --git a/po/ru.po b/po/ru.po index ed9833987..f0ab817e5 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-11-13 13:20-0500\n" +"POT-Creation-Date: 2002-11-19 13:41-0500\n" "PO-Revision-Date: 2002-08-27 13:36-0400\n" "Last-Translator: Eugene Kanter, \n" "Language-Team: Black Cat Linux Team \n" @@ -160,9 +160,8 @@ msgid "files may only be relocated during package installation" msgstr "ÆÁÊÌÙ ÍÏÇÕÔ ÂÙÔØ ÐÅÒÅÍÅÝÅÎÙ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÐÁËÅÔÁ" #: rpmqv.c:424 -msgid "only one of --prefix or --relocate may be used" +msgid "cannot use --prefix with --relocate or --excludepath" msgstr "" -"ÍÏÖÅÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎ ÔÏÌØËÏ ÏÄÉÎ ÉÚ ×ÁÒÉÁÎÔÏ× --prefix ÉÌÉ --relocate" #: rpmqv.c:427 msgid "" @@ -3777,6 +3776,10 @@ msgstr " msgid "DIRECTORY" msgstr "ëáôáìïç" +#~ msgid "only one of --prefix or --relocate may be used" +#~ msgstr "" +#~ "ÍÏÖÅÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎ ÔÏÌØËÏ ÏÄÉÎ ÉÚ ×ÁÒÉÁÎÔÏ× --prefix ÉÌÉ --relocate" + #~ msgid "Couldn't exec %s: %s\n" #~ msgstr "îÅ×ÏÚÍÏÖÎÏ ×ÙÐÏÌÎÉÔØ %s: %s\n" diff --git a/po/sk.po b/po/sk.po index a901fa3af..edc8972fb 100644 --- a/po/sk.po +++ b/po/sk.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-11-13 13:20-0500\n" +"POT-Creation-Date: 2002-11-19 13:41-0500\n" "PO-Revision-Date: 1999-04-08 21:37+02:00\n" "Last-Translator: Stanislav Meduna \n" "Language-Team: Slovak \n" @@ -162,8 +162,8 @@ msgid "files may only be relocated during package installation" msgstr "súbory mô¾u by» presunuté iba poèas inètalácie balíka" #: rpmqv.c:424 -msgid "only one of --prefix or --relocate may be used" -msgstr "mo¾e by» pou¾itá iba jedna z volieb --prefix a --relocate" +msgid "cannot use --prefix with --relocate or --excludepath" +msgstr "" #: rpmqv.c:427 msgid "" @@ -3870,6 +3870,9 @@ msgstr "" msgid "DIRECTORY" msgstr "" +#~ msgid "only one of --prefix or --relocate may be used" +#~ msgstr "mo¾e by» pou¾itá iba jedna z volieb --prefix a --relocate" + #, fuzzy #~ msgid "Couldn't exec %s: %s\n" #~ msgstr "Nie je mo¾né spusti» %s" diff --git a/po/sl.po b/po/sl.po index 46c2e70ff..b5dc839a8 100644 --- a/po/sl.po +++ b/po/sl.po @@ -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 , 2000. -# $Id: sl.po,v 1.325 2002/11/15 18:02:19 jbj Exp $ +# $Id: sl.po,v 1.326 2002/11/19 18:40:47 jbj Exp $ # msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-11-13 13:20-0500\n" +"POT-Creation-Date: 2002-11-19 13:41-0500\n" "PO-Revision-Date: 2000-10-08 19:05+0200\n" "Last-Translator: Grega Fajdiga \n" "Language-Team: Slovenian \n" @@ -165,8 +165,8 @@ msgid "files may only be relocated during package installation" msgstr "datoteke smemo premakniti samo med namestitvijo paketa" #: rpmqv.c:424 -msgid "only one of --prefix or --relocate may be used" -msgstr "izbiri --prefix in --relocate se medsebojno izkljuèujeta" +msgid "cannot use --prefix with --relocate or --excludepath" +msgstr "" #: rpmqv.c:427 msgid "" @@ -3877,6 +3877,9 @@ msgstr "" msgid "DIRECTORY" msgstr "" +#~ msgid "only one of --prefix or --relocate may be used" +#~ msgstr "izbiri --prefix in --relocate se medsebojno izkljuèujeta" + #, fuzzy #~ msgid "Couldn't exec %s: %s\n" #~ msgstr "Ni mo¾no izvesti %s: %s" diff --git a/po/sr.po b/po/sr.po index 5a768907e..d938ad6cc 100644 --- a/po/sr.po +++ b/po/sr.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-11-13 13:20-0500\n" +"POT-Creation-Date: 2002-11-19 13:41-0500\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-2\n" "Content-Transfer-Encoding: 8bit\n" @@ -159,8 +159,8 @@ msgid "files may only be relocated during package installation" msgstr "datoteke mogu biti preme¹tene samo tokom instalacije paketa" #: rpmqv.c:424 -msgid "only one of --prefix or --relocate may be used" -msgstr "samo jedno mo¾ete koristiti: --prefix ili --relocate" +msgid "cannot use --prefix with --relocate or --excludepath" +msgstr "" #: rpmqv.c:427 #, fuzzy @@ -3870,6 +3870,9 @@ msgstr "" msgid "DIRECTORY" msgstr "" +#~ msgid "only one of --prefix or --relocate may be used" +#~ msgstr "samo jedno mo¾ete koristiti: --prefix ili --relocate" + #, fuzzy #~ msgid "Couldn't exec %s: %s\n" #~ msgstr "Ne mogu da izvr¹im PGP" diff --git a/po/sv.po b/po/sv.po index 83f1005a7..744a783ed 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.1\n" -"POT-Creation-Date: 2002-11-13 13:20-0500\n" +"POT-Creation-Date: 2002-11-19 13:41-0500\n" "PO-Revision-Date: 2002-08-19 22:26+0200\n" "Last-Translator: Göran Uddeborg \n" "Language-Team: Swedish \n" @@ -156,8 +156,8 @@ msgid "files may only be relocated during package installation" msgstr "filer kan relokeras endast under paketinstallation" #: rpmqv.c:424 -msgid "only one of --prefix or --relocate may be used" -msgstr "enbart en av --prefix eller --relocate kan användas" +msgid "cannot use --prefix with --relocate or --excludepath" +msgstr "" #: rpmqv.c:427 msgid "" @@ -3751,6 +3751,9 @@ msgstr "anv msgid "DIRECTORY" msgstr "KATALOG" +#~ msgid "only one of --prefix or --relocate may be used" +#~ msgstr "enbart en av --prefix eller --relocate kan användas" + #~ msgid "Couldn't exec %s: %s\n" #~ msgstr "Kunde inte köra %s: %s\n" diff --git a/po/tr.po b/po/tr.po index d01e9554a..ba8d12fa8 100644 --- a/po/tr.po +++ b/po/tr.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-11-13 13:20-0500\n" +"POT-Creation-Date: 2002-11-19 13:41-0500\n" "PO-Revision-Date: 2001-07-05 08:02+300\n" "Last-Translator: Nilgun Belma Buguner \n" "Language-Team: Turkish \n" @@ -163,8 +163,8 @@ msgstr "" "dosyalar sadece paket kurulumu sýrasýnda yeni yerlerine yerleþtirilebilir" #: rpmqv.c:424 -msgid "only one of --prefix or --relocate may be used" -msgstr "--prefix ve --relocate seçeneklerinden sadece biri kullanýlabilir" +msgid "cannot use --prefix with --relocate or --excludepath" +msgstr "" #: rpmqv.c:427 msgid "" @@ -3824,6 +3824,9 @@ msgstr "" msgid "DIRECTORY" msgstr "" +#~ msgid "only one of --prefix or --relocate may be used" +#~ msgstr "--prefix ve --relocate seçeneklerinden sadece biri kullanýlabilir" + #~ msgid "Couldn't exec %s: %s\n" #~ msgstr "%s icra edilemedi: %s\n" diff --git a/popt/configure.ac b/popt/configure.ac index 7b20ce699..ce49069c4 100755 --- a/popt/configure.ac +++ b/popt/configure.ac @@ -12,6 +12,7 @@ AC_ISC_POSIX AC_PROG_CC AC_GCC_TRADITIONAL AM_C_PROTOTYPES +AC_SYS_LARGEFILE dnl AM_DISABLE_SHARED AM_PROG_LIBTOOL diff --git a/rpm.spec.in b/rpm.spec.in index 65722c651..8187294b5 100644 --- a/rpm.spec.in +++ b/rpm.spec.in @@ -16,7 +16,7 @@ Name: rpm %define version @VERSION@ Version: %{version} %{expand: %%define rpm_version %{version}} -Release: 0.10 +Release: 0.11 Group: System Environment/Base Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz Copyright: GPL @@ -483,8 +483,10 @@ exit 0 %{__prefix}/include/popt.h %changelog -* Sat Nov 16 2002 Jeff Johnson 4.2-0.11 +* Tue Nov 19 2002 Jeff Johnson 4.2-0.11 - fix: option conflict error message (#77373). +- add AC_SYS_LARGFILE throughout. +- statically link rpmdeps against (internal) libfmagic. * Fri Nov 15 2002 Jeff Johnson 4.2-0.10 - update to elfutils-0.56. diff --git a/rpmio/fts.h b/rpmio/fts.h index 1f65a48ff..036059a0f 100644 --- a/rpmio/fts.h +++ b/rpmio/fts.h @@ -57,14 +57,6 @@ #include #include -/* The fts interface is incompatible with the LFS interface which - transparently uses the 64-bit file access functions. */ - -#ifdef __USE_FILE_OFFSET64 -# error " cannot be used with -D_FILE_OFFSET_BITS==64" -#endif - - typedef struct { /*@owned@*/ struct _ftsent *fts_cur; /*!< current node */ diff --git a/tools/Makefile.am b/tools/Makefile.am index c6673cf3d..b17938ba3 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -11,6 +11,7 @@ INCLUDES = -I. \ -I$(top_srcdir)/popt \ @WITH_LIBELF_INCLUDE@ \ @WITH_LIBDWARF_INCLUDE@ \ + -I$(top_srcdir)/file \ @WITH_ZLIB_INCLUDE@ \ @INCPATH@ \ -I$(top_srcdir)/misc @@ -45,7 +46,7 @@ rpmcache_SOURCES = rpmcache.c #rpmcache_LDFLAGS = @LDFLAGS_STATIC@ rpmdeps_SOURCES = rpmdeps.c -rpmdeps_LDFLAGS = @LDFLAGS_STATIC@ +rpmdeps_LDFLAGS = @LDFLAGS_STATIC@ $(top_builddir)/file/libfmagic.la rpmgraph_SOURCES = rpmgraph.c #rpmgraph_LDFLAGS = @LDFLAGS_STATIC@ diff --git a/tools/rpmdeps.c b/tools/rpmdeps.c index 604b76194..5a570dc66 100644 --- a/tools/rpmdeps.c +++ b/tools/rpmdeps.c @@ -3,10 +3,23 @@ #include #include #include +#include "file.h" #include "debug.h" +/*@unchecked@*/ +extern fmagic global_fmagic; + +/*@unchecked@*//*@observer@*/ +extern const char * default_magicfile; + +/*@unchecked@*/ +char *progname; + +/*@unchecked@*/ static int print_provides; + +/*@unchecked@*/ static int print_requires; static struct poptOption optionsTable[] = { @@ -31,11 +44,7 @@ static struct poptOption optionsTable[] = { int main(int argc, char *const argv[]) { - static const char * av_file[] = { "%{?__file_z_n}", NULL }; poptContext optCon; - StringBuf sb_stdin = NULL; - StringBuf sb_stdout; - int failnonzero = 1; ARGV_t xav; ARGV_t av = NULL; rpmfc fc; @@ -43,6 +52,18 @@ main(int argc, char *const argv[]) int ec = 1; int xx; char buf[BUFSIZ]; +fmagic fm = global_fmagic; +StringBuf sb_stdout; +int action = 0; +int wid = 1; +int i; + +/*@-modobserver@*/ + if ((progname = strrchr(argv[0], '/')) != NULL) + progname++; + else + progname = argv[0]; +/*@=modobserver@*/ optCon = rpmcliInit(argc, argv, optionsTable); if (optCon == NULL) @@ -53,7 +74,6 @@ char buf[BUFSIZ]; if (ac == 0) { char * b, * be; - sb_stdin = newStringBuf(); av = NULL; while ((b = fgets(buf, sizeof(buf), stdin)) != NULL) { buf[sizeof(buf)-1] = '\0'; @@ -61,32 +81,30 @@ char buf[BUFSIZ]; while (strchr("\r\n", *be) != NULL) *be-- = '\0'; xx = argvAdd(&av, b); - appendLineStringBuf(sb_stdin, b); } ac = argvCount(av); } - - xav = NULL; - xx = argvAppend(&xav, av_file); - sb_stdout = NULL; - if (sb_stdin != NULL) { -fprintf(stderr, "========\n%s\n==========\n", getStringBuf(sb_stdin)); - xx = rpmfcExec(xav, sb_stdin, &sb_stdout, failnonzero); - xx = argvAppend(&xav, av); - } else { - xx = argvAppend(&xav, av); - xx = rpmfcExec(xav, sb_stdin, &sb_stdout, failnonzero); + xx = argvSort(av, NULL); + + /* Output of file(1) in sb_stdout. */ + sb_stdout = newStringBuf(); + fm->magicfile = default_magicfile; + /* XXX TODO fm->flags = ??? */ + + xx = fmagicSetup(fm, fm->magicfile, action); + + for (i = 0; i < ac; i++) { + fm->obp = fm->obuf; + *fm->obp = '\0'; + fm->nob = sizeof(fm->obuf); + xx = fmagicProcess(fm, av[i], wid); + appendLineStringBuf(sb_stdout, fm->obuf); } - sb_stdin = freeStringBuf(sb_stdin); - - xav = argvFree(xav); xx = argvSplit(&xav, getStringBuf(sb_stdout), "\n"); sb_stdout = freeStringBuf(sb_stdout); - xx = argvSort(xav, NULL); - /* Build file class dictionary. */ fc = rpmfcNew(); xx = rpmfcClassify(fc, xav); diff --git a/zlib/configure.in b/zlib/configure.in index 588f05198..f378b63d3 100644 --- a/zlib/configure.in +++ b/zlib/configure.in @@ -7,6 +7,7 @@ AM_INIT_AUTOMAKE(zlib, 1.1.4) dnl Check for programs. AC_PROG_CC AC_PROG_LIBTOOL +AC_SYS_LARGEFILE CFLAGS="-DHAS_snprintf -DHAS_snprintf" if test "$ac_cv_prog_gcc" = yes; then