- add AC_SYS_LARGFILE throughout.
- statically link rpmdeps against (internal) libfmagic. CVS patchset: 5876 CVS date: 2002/11/19 18:40:21
This commit is contained in:
jbj
parent
1c023424d7
commit
22389abbd4
2
CHANGES
2
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.
|
||||
|
|
|
|||
|
|
@ -81,6 +81,7 @@ AC_PROG_INSTALL
|
|||
AC_PROG_CPP
|
||||
AC_PROG_CXX
|
||||
AC_PROG_LIBTOOL
|
||||
AC_SYS_LARGEFILE
|
||||
|
||||
# Initialize tool flags
|
||||
CFLAGS=""
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
|
|
|
|||
|
|
@ -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
|
||||
*/
|
||||
|
|
|
|||
10
file/file.c
10
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 */
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
9
po/cs.po
9
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 <kerslage@linux.cz>\n"
|
||||
"Language-Team: Czech <cs@li.org>\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"
|
||||
|
||||
|
|
|
|||
9
po/da.po
9
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 <claus_h@image.dk>\n"
|
||||
"Language-Team: Danish <dansk@klid.dk>\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"
|
||||
|
||||
|
|
|
|||
10
po/de.po
10
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 <ke@SuSE.DE>\n"
|
||||
"Language-Team: German <de@li.org>\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"
|
||||
|
|
|
|||
9
po/fi.po
9
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 <rkoski@pp.weppi.fi>\n"
|
||||
"Language-Team: Finnish <linux@sot.com>\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ä"
|
||||
|
|
|
|||
11
po/fr.po
11
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 <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\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"
|
||||
|
|
|
|||
4
po/gl.po
4
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 <jba@pobox.com>\n"
|
||||
"Language-Team: Galician <trasno@ceu.fi.udc.es>\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
|
||||
|
|
|
|||
4
po/is.po
4
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 <ra@hp.is>\n"
|
||||
"Language-Team: is <kde-isl@mmedia.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
|
||||
|
|
|
|||
9
po/ja.po
9
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 <kanda@nn.iij4u.or.jp>\n"
|
||||
"Language-Team: JRPM <jrpm@linux.or.jp>\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"
|
||||
|
|
|
|||
9
po/ko.po
9
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 <redhat4u@netian.com>\n"
|
||||
"Language-Team: GNU Translation project <ko@li.org>\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"
|
||||
|
||||
|
|
|
|||
9
po/no.po
9
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 <kmaraas@gnome.org>\n"
|
||||
"Language-Team: Norwegian <no@li.org>\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"
|
||||
|
||||
|
|
|
|||
9
po/pl.po
9
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 <pdziekonski@mml.ch.pwr.wroc.pl>\n"
|
||||
"Language-Team: Polish <pl@li.org>\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"
|
||||
|
|
|
|||
9
po/pt.po
9
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 <jncp@rnl.ist.utl.pt>\n"
|
||||
"Language-Team: pt <morais@kde.org\n"
|
||||
|
|
@ -161,8 +161,8 @@ msgstr ""
|
|||
"os ficheiros só podem ser mudados de sítio durante a instalação do pacote"
|
||||
|
||||
#: rpmqv.c:424
|
||||
msgid "only one of --prefix or --relocate may be used"
|
||||
msgstr "só uma das opções --prefix ou --relocate pode ser usada"
|
||||
msgid "cannot use --prefix with --relocate or --excludepath"
|
||||
msgstr ""
|
||||
|
||||
#: rpmqv.c:427
|
||||
msgid ""
|
||||
|
|
@ -3813,6 +3813,9 @@ msgstr ""
|
|||
msgid "DIRECTORY"
|
||||
msgstr ""
|
||||
|
||||
#~ msgid "only one of --prefix or --relocate may be used"
|
||||
#~ msgstr "só uma das opções --prefix ou --relocate pode ser usada"
|
||||
|
||||
#~ msgid "Couldn't exec %s: %s\n"
|
||||
#~ msgstr "Não consegui executar o %s: %s\n"
|
||||
|
||||
|
|
|
|||
12
po/pt_BR.po
12
po/pt_BR.po
|
|
@ -4,7 +4,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-1\n"
|
||||
"Content-Transfer-Encoding: 8-bit\n"
|
||||
|
|
@ -178,9 +178,8 @@ msgid "files may only be relocated during package installation"
|
|||
msgstr "--percent somente pode ser especificado durante instalaes de pacotes"
|
||||
|
||||
#: rpmqv.c:424
|
||||
#, fuzzy
|
||||
msgid "only one of --prefix or --relocate may be used"
|
||||
msgstr "somente um entre --excludedocs e --includedocs pode ser especificado"
|
||||
msgid "cannot use --prefix with --relocate or --excludepath"
|
||||
msgstr ""
|
||||
|
||||
#: rpmqv.c:427
|
||||
#, fuzzy
|
||||
|
|
@ -4099,6 +4098,11 @@ msgstr ""
|
|||
msgid "DIRECTORY"
|
||||
msgstr ""
|
||||
|
||||
#, fuzzy
|
||||
#~ msgid "only one of --prefix or --relocate may be used"
|
||||
#~ msgstr ""
|
||||
#~ "somente um entre --excludedocs e --includedocs pode ser especificado"
|
||||
|
||||
# , c-format
|
||||
#, fuzzy
|
||||
#~ msgid "Couldn't exec %s: %s\n"
|
||||
|
|
|
|||
4
po/ro.po
4
po/ro.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-10 12:00+EST\n"
|
||||
"Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
|
||||
"Language-Team: Romanian <ro@li.org>\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
|
||||
|
|
|
|||
|
|
@ -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 <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\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
|
||||
|
|
|
|||
9
po/ru.po
9
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, <eugene@blackcatlinux.com>\n"
|
||||
"Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\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"
|
||||
|
||||
|
|
|
|||
9
po/sk.po
9
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 <stano@eunet.sk>\n"
|
||||
"Language-Team: Slovak <sk-i18n@rak.isternet.sk>\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"
|
||||
|
|
|
|||
11
po/sl.po
11
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 <primoz.peterlin@biofiz.mf.uni-lj.si>, 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 <gregor.fajdiga@telemach.net>\n"
|
||||
"Language-Team: Slovenian <sl@li.org>\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"
|
||||
|
|
|
|||
9
po/sr.po
9
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"
|
||||
|
|
|
|||
9
po/sv.po
9
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 <goeran@uddeborg.pp.se>\n"
|
||||
"Language-Team: Swedish <sv@li.org>\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"
|
||||
|
||||
|
|
|
|||
9
po/tr.po
9
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 <nilgun@technologist.com>\n"
|
||||
"Language-Team: Turkish <tr@li.org>\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"
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 <jbj@redhat.com> 4.2-0.11
|
||||
* Tue Nov 19 2002 Jeff Johnson <jbj@redhat.com> 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 <jbj@redhat.com> 4.2-0.10
|
||||
- update to elfutils-0.56.
|
||||
|
|
|
|||
|
|
@ -57,14 +57,6 @@
|
|||
#include <sys/stat.h>
|
||||
#include <dirent.h>
|
||||
|
||||
/* The fts interface is incompatible with the LFS interface which
|
||||
transparently uses the 64-bit file access functions. */
|
||||
|
||||
#ifdef __USE_FILE_OFFSET64
|
||||
# error "<fts.h> cannot be used with -D_FILE_OFFSET_BITS==64"
|
||||
#endif
|
||||
|
||||
|
||||
typedef struct {
|
||||
/*@owned@*/
|
||||
struct _ftsent *fts_cur; /*!< current node */
|
||||
|
|
|
|||
|
|
@ -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@
|
||||
|
|
|
|||
|
|
@ -3,10 +3,23 @@
|
|||
#include <rpmbuild.h>
|
||||
#include <argv.h>
|
||||
#include <rpmfc.h>
|
||||
#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);
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in New Issue