- add translated man pages from PLD.

CVS patchset: 5514
CVS date: 2002/06/20 17:17:23

diff --git a/CHANGES b/CHANGES
index bd21623..30fe2d7 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -136,8 +136,9 @@
        - beecrypt: merge changes from beecrypt-2.3.0.
        - beecrypt: merge doxygen markup with rpmapi doco.
        - beecrypt: revert cpu/arch compile option mixup (#66752).
-       - make sure that rpm can verify prelinked shared libraries.
+       - ix86: make sure that rpm can verify prelinked shared libraries.
        - don't install /usr/lib/rpm/redhat per-vendor configuration anymore.
+       - add translated man pages from PLD.
 
 4.0.3 -> 4.0.4:
        - solaris: translate i86pc to i386 (#57182).

diff --git a/Makefile.am b/Makefile.am
index bdf668b..42517ba 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -104,12 +104,13 @@ $(PROGRAMS):              $(myLDADD) @WITH_APIDOCS_TARGET@
 
 .PHONY:        lclint
 lclint:
-       lclint $(DEFS) $(INCLUDES) rpmqv.c $(rpmb_SOURCES) \
+       lclint -Dlint $(DEFS) $(INCLUDES) rpmqv.c $(rpmb_SOURCES) \
                `make -s sources -C build` \
                `make -s sources -C lib` \
                `make -s sources -C rpmdb` \
                `make -s sources -C rpmio` \
                `make -s sources -C beecrypt` \
+               `make -s sources -C libelf` \
                `make -s sources -C popt`
 
 CVSTAG = r$(subst .,-,$(VERSION))

diff --git a/configure.in b/configure.in
index 83961d7..b919f76 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -364,20 +364,23 @@ WITH_LIBELF_LIB=
 AC_CHECK_HEADER([libelf/gelf.h], [
        AC_DEFINE(HAVE_LIBELF_GELF_H, 1, [Define to 1 if you have the <libelf/gelf.h> header file.])
        WITH_LIBELF_INCLUDE="-I/usr/include/libelf"
-       INCPATH="$INCPATH -I/usr/include/libelf"
        AC_CHECK_FUNC(gelf_getdyn, [],
            AC_CHECK_LIB(elf, gelf_getdyn)
        )
     ], [
-       if test -d libelf ; then
+       case `uname -m` in
+       i[[3456]]86)
+         if test -d libelf ; then
            AC_DEFINE(HAVE_LIBELF_GELF_H, 1, [Define to 1 if you have the <libelf/gelf.h> header file.])
            AC_DEFINE(HAVE_LIBELF, 1, [Define to 1 if you have the `elf' library (-lelf).])
            WITH_LIBELF_SUBDIR=libelf
-           addlib \${top_builddir}/libelf
            WITH_LIBELF_INCLUDE="-I\${top_srcdir}/${WITH_LIBELF_SUBDIR}/lib"
-           INCPATH="$INCPATH -I\${top_srcdir}/${WITH_LIBELF_SUBDIR}/lib"
            WITH_LIBELF_LIB="\${top_builddir}/${WITH_LIBELF_SUBDIR}/lib/libelf.la"
-       fi
+         fi
+         ;;
+       *)
+         ;;
+       esac
 ])
 AC_SUBST(WITH_LIBELF_SUBDIR)
 AC_SUBST(WITH_LIBELF_INCLUDE)
@@ -1190,10 +1193,18 @@ AC_OUTPUT([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec
        scripts/Makefile scripts/brp-redhat tools/Makefile
        tests/Makefile tests/rpmrc tests/macros tests/hello-test/Makefile
        misc/Makefile intl/Makefile po/Makefile.in
-       doc/Makefile doc/manual/Makefile
-       doc/ja/Makefile doc/pl/Makefile doc/ru/Makefile doc/sk/Makefile
-       python/Makefile python/rpmdb/Makefile python/test/Makefile ],
-  [    echo timestamp > popt/stamp-h.in
+       doc/Makefile
+       doc/manual/Makefile
+       doc/fr/Makefile
+       doc/ja/Makefile
+       doc/ko/Makefile
+       doc/pl/Makefile
+       doc/ru/Makefile
+       doc/sk/Makefile
+       python/Makefile
+       python/rpmdb/Makefile
+       python/test/Makefile
+  ], [ echo timestamp > popt/stamp-h.in
        echo timestamp > beecrypt/stamp-h.in
        echo timestamp > stamp-h.in
   ]

diff --git a/doc/fr/.cvsignore b/doc/fr/.cvsignore
new file mode 100644 (file)
index 0000000..282522d
--- /dev/null
+++ b/doc/fr/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in

diff --git a/doc/ko/.cvsignore b/doc/ko/.cvsignore
new file mode 100644 (file)
index 0000000..282522d
--- /dev/null
+++ b/doc/ko/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in

diff --git a/lib/signature.c b/lib/signature.c
index aeb72d7..b144ab8 100644 (file)
--- a/lib/signature.c
+++ b/lib/signature.c
@@ -597,7 +597,7 @@ int rpmAddSignature(Header sig, const char * file, int_32 sigTag,
     case RPMSIGTAG_MD5:
        pktlen = 16;
        pkt = xcalloc(1, pktlen);
-       if (domd5(file, pkt, 1, NULL)
+       if (domd5(file, pkt, 0, NULL)
         || !headerAddEntry(sig, sigTag, RPM_BIN_TYPE, pkt, pktlen))
            break;
        ret = 0;

diff --git a/libelf/Makefile.am b/libelf/Makefile.am
index 7fb725c..81226d5 100755 (executable)
--- a/libelf/Makefile.am
+++ b/libelf/Makefile.am
@@ -8,4 +8,12 @@ EXTRA_DIST = \
        aclocal.m4 ChangeLog config.guess config.h.in \
        config.sub configure configure.in COPYING.LIB INSTALL install-sh \
        Makefile.in mkinstalldirs README stamp-h.in VERSION \
-       po/*.in po/*.po po/@PACKAGE@.pot
+       libelf.spec po/*.in po/*.po po/@PACKAGE@.pot
+
+.PHONY: sources
+sources:
+       make -C lib sources
+
+.PHONY: lclint
+lclint:
+       make -C lib lclint

diff --git a/libelf/lib/Makefile.am b/libelf/lib/Makefile.am
index f23489c..9eb4ff8 100755 (executable)
--- a/libelf/lib/Makefile.am
+++ b/libelf/lib/Makefile.am
@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = 1.4 foreign
 
 EXTRA_DIST = sys_elf.h.in
 
-INCLUDES = -I$(topdir) -I. -I$(srcdir)
+INCLUDES = -I$(top_srcdir) -I. -I$(srcdir)
 
 # generic sources
 SRCS1 = begin.c cntl.c end.c errmsg.c errno.c fill.c flag.c getarhdr.c \
@@ -49,11 +49,11 @@ noinst_HEADERS = \
 
 .PHONY: sources
 sources:
-       @echo $(libelf_la_SOURCES:%=libelf/%)
+       @echo $(libelf_la_SOURCES:%=libelf/lib/%)
 
 .PHONY: lclint
 lclint:
-       lclint -Dlint $(DEFS) $(INCLUDES) $(SRCS)
+       lclint -Dlint $(DEFS) $(INCLUDES) $(libelf_la_SOURCES)
 
 t1:    libelf.a t1.o
        $(CC) -o $@ $@.o libelf.a

diff --git a/libelf/lib/gelf.h b/libelf/lib/gelf.h
index 018da7b..1dfeda0 100755 (executable)
--- a/libelf/lib/gelf.h
+++ b/libelf/lib/gelf.h
@@ -36,7 +36,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 extern "C" {
 #endif /* __cplusplus */
 
-#ifndef __P
+#if !defined(__P)
 # if __STDC__ || defined(__cplusplus)
 #  define __P(args) args
 # else /* __STDC__ || defined(__cplusplus) */
@@ -111,7 +111,7 @@ extern Elf_Data       *gelf_xlatetom __P((Elf *elf, Elf_Data *dst, const Elf_Dat
        /*@modifies *dst @*/;
 
 /*@null@*/
-extern GElf_Ehdr       *gelf_getehdr __P((Elf *elf, /*@returned@*/ GElf_Ehdr *dst))
+extern GElf_Ehdr       *gelf_getehdr __P((Elf *elf, /*@returned@*/ /*@out@*/ GElf_Ehdr *dst))
        /*@modifies *elf, dst @*/;
 extern int          gelf_update_ehdr __P((Elf *elf, GElf_Ehdr *src))
        /*@modifies *elf @*/;
@@ -119,7 +119,7 @@ extern unsigned long    gelf_newehdr __P((Elf *elf, int cls))
        /*@modifies *elf @*/;
 
 /*@null@*/
-extern GElf_Phdr       *gelf_getphdr __P((Elf *elf, int ndx, /*@returned@*/ GElf_Phdr *dst))
+extern GElf_Phdr       *gelf_getphdr __P((Elf *elf, int ndx, /*@returned@*/ /*@out@*/ GElf_Phdr *dst))
        /*@modifies *elf, dst @*/;
 extern int          gelf_update_phdr __P((Elf *elf, int ndx, GElf_Phdr *src))
        /*@modifies *elf @*/;
@@ -127,31 +127,31 @@ extern unsigned long    gelf_newphdr __P((Elf *elf, size_t phnum))
        /*@modifies *elf @*/;
 
 /*@null@*/
-extern GElf_Shdr       *gelf_getshdr __P((Elf_Scn *scn, /*@returned@*/ GElf_Shdr *dst))
+extern GElf_Shdr       *gelf_getshdr __P((Elf_Scn *scn, /*@returned@*/ /*@out@*/ GElf_Shdr *dst))
        /*@modifies dst @*/;
 extern int          gelf_update_shdr __P((Elf_Scn *scn, GElf_Shdr *src))
        /*@modifies scn @*/;
 
 /*@null@*/
-extern GElf_Dyn         *gelf_getdyn __P((Elf_Data *src, int ndx, /*@returned@*/ GElf_Dyn *dst))
+extern GElf_Dyn         *gelf_getdyn __P((Elf_Data *src, int ndx, /*@returned@*/ /*@out@*/ GElf_Dyn *dst))
        /*@modifies *dst @*/;
 extern int           gelf_update_dyn __P((Elf_Data *dst, int ndx, GElf_Dyn *src))
        /*@modifies *dst @*/;
 
 /*@null@*/
-extern GElf_Rel         *gelf_getrel __P((Elf_Data *src, int ndx, /*@returned@*/ GElf_Rel *dst))
+extern GElf_Rel         *gelf_getrel __P((Elf_Data *src, int ndx, /*@returned@*/ /*@out@*/ GElf_Rel *dst))
        /*@modifies *dst @*/;
 extern int           gelf_update_rel __P((Elf_Data *dst, int ndx, GElf_Rel *src))
        /*@modifies *dst @*/;
 
 /*@null@*/
-extern GElf_Rela       *gelf_getrela __P((Elf_Data *src, int ndx, /*@returned@*/ GElf_Rela *dst))
+extern GElf_Rela       *gelf_getrela __P((Elf_Data *src, int ndx, /*@returned@*/ /*@out@*/ GElf_Rela *dst))
        /*@modifies *dst @*/;
 extern int          gelf_update_rela __P((Elf_Data *dst, int ndx, GElf_Rela *src))
        /*@modifies *dst @*/;
 
 /*@null@*/
-extern GElf_Sym         *gelf_getsym __P((Elf_Data *src, int ndx, /*@returned@*/ GElf_Sym *dst))
+extern GElf_Sym         *gelf_getsym __P((Elf_Data *src, int ndx, /*@returned@*/ /*@out@*/ GElf_Sym *dst))
        /*@modifies *dst @*/;
 extern int           gelf_update_sym __P((Elf_Data *dst, int ndx, GElf_Sym *src))
        /*@modifies *dst @*/;
@@ -164,12 +164,12 @@ extern long            gelf_checksum __P((Elf *elf))
  *
  */
 #if 0
-extern GElf_Move       *gelf_getmove __P((Elf_Data *src, int ndx, GElf_Move *src))
+extern GElf_Move       *gelf_getmove __P((Elf_Data *src, int ndx, /*@returned@*/ /*@out@*/ GElf_Move *src))
        /*@*/;
 extern int          gelf_update_move __P((Elf_Data *dst, int ndx, GElf_Move *src))
        /*@modifies *dst @*/;
 
-extern GElf_Syminfo* gelf_getsyminfo __P((Elf_Data *src, int ndx, GElf_Syminfo *dst))
+extern GElf_Syminfo* gelf_getsyminfo __P((Elf_Data *src, int ndx, /*@returned@*/ /*@null@*/ GElf_Syminfo *dst))
        /*@modifies *dst @*/;
 extern int       gelf_update_syminfo __P((Elf_Data *dst, int ndx, GElf_Syminfo *src))
        /*@modifies *dst @*/;

diff --git a/libelf/lib/libelf.h b/libelf/lib/libelf.h
index 73436c1..d30a7f2 100755 (executable)
--- a/libelf/lib/libelf.h
+++ b/libelf/lib/libelf.h
@@ -171,7 +171,7 @@ extern int elf_cntl __P((/*@null@*/ Elf *elf, Elf_Cmd cmd))
 extern int elf_end __P((/*@only@*/ /*@null@*/ Elf *elf))
        /*@globals fileSystem @*/
        /*@modifies elf, fileSystem @*/;
-/*@null@*/
+/*@observer@*/ /*@null@*/
 extern const char *elf_errmsg __P((int err))
        /*@*/;
 extern int elf_errno __P((void))
@@ -300,8 +300,7 @@ extern Elf64_Phdr *elf64_newphdr __P((Elf *elf, size_t count))
 /*@null@*/
 extern Elf64_Shdr *elf64_getshdr __P((Elf_Scn *scn))
        /*@*/;
-extern size_t elf64_fsize __P((Elf_Type type, size_t count,
-       unsigned ver))
+extern size_t elf64_fsize __P((Elf_Type type, size_t count, unsigned ver))
        /*@*/;
 /*@null@*/
 extern Elf_Data *elf64_xlatetof __P((/*@returned@*/ Elf_Data *dst, const Elf_Data *src,

diff --git a/po/cs.po b/po/cs.po
index 215e3fb..d228a3e 100644 (file)
--- 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-06-19 19:58-0400\n"
+"POT-Creation-Date: 2002-06-20 13:05-0400\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"

diff --git a/po/da.po b/po/da.po
index 85c82df..0af6aa6 100644 (file)
--- 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-06-19 19:58-0400\n"
+"POT-Creation-Date: 2002-06-20 13:05-0400\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"

diff --git a/po/de.po b/po/de.po
index 6ff58d5..5596a2e 100644 (file)
--- 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-06-19 19:58-0400\n"
+"POT-Creation-Date: 2002-06-20 13:05-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"

diff --git a/po/en_RN.po b/po/en_RN.po
index 21f7f9b..2e3de48 100644 (file)
--- a/po/en_RN.po
+++ b/po/en_RN.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-06-19 19:58-0400\n"
+"POT-Creation-Date: 2002-06-20 13:05-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/es.po b/po/es.po
index 21f7f9b..2e3de48 100644 (file)
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-06-19 19:58-0400\n"
+"POT-Creation-Date: 2002-06-20 13:05-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/eu_ES.po b/po/eu_ES.po
index 21f7f9b..2e3de48 100644 (file)
--- a/po/eu_ES.po
+++ b/po/eu_ES.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-06-19 19:58-0400\n"
+"POT-Creation-Date: 2002-06-20 13:05-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/fi.po b/po/fi.po
index b5559b2..faa0949 100644 (file)
--- 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-06-19 19:58-0400\n"
+"POT-Creation-Date: 2002-06-20 13:05-0400\n"
 "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
 "Language-Team: Finnish <linux@sot.com>\n"
 "Content-Type: text/plain; charset=\n"

diff --git a/po/fr.po b/po/fr.po
index 457767c..db94fc5 100644 (file)
--- 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-06-19 19:58-0400\n"
+"POT-Creation-Date: 2002-06-20 13:05-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/gl.po b/po/gl.po
index 2eab443..bdea20a 100644 (file)
--- 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-06-19 19:58-0400\n"
+"POT-Creation-Date: 2002-06-20 13:05-0400\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"

diff --git a/po/hu.po b/po/hu.po
index 21f7f9b..2e3de48 100644 (file)
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-06-19 19:58-0400\n"
+"POT-Creation-Date: 2002-06-20 13:05-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/id.po b/po/id.po
index 21f7f9b..2e3de48 100644 (file)
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-06-19 19:58-0400\n"
+"POT-Creation-Date: 2002-06-20 13:05-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/is.po b/po/is.po
index 7213b7b..dbcb444 100644 (file)
--- 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-06-19 19:58-0400\n"
+"POT-Creation-Date: 2002-06-20 13:05-0400\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"

diff --git a/po/it.po b/po/it.po
index 21f7f9b..2e3de48 100644 (file)
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-06-19 19:58-0400\n"
+"POT-Creation-Date: 2002-06-20 13:05-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/ja.po b/po/ja.po
index c78b152..cb98e7b 100644 (file)
--- 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-06-19 19:58-0400\n"
+"POT-Creation-Date: 2002-06-20 13:05-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"

diff --git a/po/ko.po b/po/ko.po
index 4843f2e..44368ee 100644 (file)
--- 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-06-19 19:58-0400\n"
+"POT-Creation-Date: 2002-06-20 13:05-0400\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"

diff --git a/po/no.po b/po/no.po
index c42a4a5..9813cd1 100644 (file)
--- 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-06-19 19:58-0400\n"
+"POT-Creation-Date: 2002-06-20 13:05-0400\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"

diff --git a/po/pl.po b/po/pl.po
index 5bdf75e..2dcceac 100644 (file)
--- 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-06-19 19:58-0400\n"
+"POT-Creation-Date: 2002-06-20 13:05-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"

diff --git a/po/pt.po b/po/pt.po
index 00866ac..5faee07 100644 (file)
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm\n"
-"POT-Creation-Date: 2002-06-19 19:58-0400\n"
+"POT-Creation-Date: 2002-06-20 13:05-0400\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"

diff --git a/po/pt_BR.po b/po/pt_BR.po
index 0f825b7..d9a850f 100644 (file)
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-06-19 19:58-0400\n"
+"POT-Creation-Date: 2002-06-20 13:05-0400\n"
 
 #: build.c:40
 #, fuzzy

diff --git a/po/ro.po b/po/ro.po
index 3ec303b..750b77a 100644 (file)
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-06-19 19:58-0400\n"
+"POT-Creation-Date: 2002-06-20 13:05-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 20d423f..38605ce 100644 (file)
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-06-19 19:58-0400\n"
+"POT-Creation-Date: 2002-06-20 13:05-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/ru.po b/po/ru.po
index aefb166..8a61d84 100644 (file)
--- 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-06-19 19:58-0400\n"
+"POT-Creation-Date: 2002-06-20 13:05-0400\n"
 "PO-Revision-Date: 2002-04-09 16:44-0400\n"
 "Last-Translator: Eugene Kanter, <eugene@bcl.bz>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"

diff --git a/po/sk.po b/po/sk.po
index 94da129..9240e74 100644 (file)
--- 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-06-19 19:58-0400\n"
+"POT-Creation-Date: 2002-06-20 13:05-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"

diff --git a/po/sl.po b/po/sl.po
index d82ec7a..3fb2b23 100644 (file)
--- 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 <primoz.peterlin@biofiz.mf.uni-lj.si>, 2000.
-# $Id: sl.po,v 1.258 2002/06/20 02:19:56 jbj Exp $
+# $Id: sl.po,v 1.259 2002/06/20 17:18:07 jbj Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-06-19 19:58-0400\n"
+"POT-Creation-Date: 2002-06-20 13:05-0400\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"

diff --git a/po/sr.po b/po/sr.po
index 06927ca..0fc6877 100644 (file)
--- 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-06-19 19:58-0400\n"
+"POT-Creation-Date: 2002-06-20 13:05-0400\n"
 "Content-Type: text/plain; charset=\n"
 "Date: 1998-05-02 21:41:47-0400\n"
 

diff --git a/po/sv.po b/po/sv.po
index 0925f24..50c3fe2 100644 (file)
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-06-19 19:58-0400\n"
+"POT-Creation-Date: 2002-06-20 13:05-0400\n"
 "PO-Revision-Date: 2002-02-18 21:13+0100\n"
 "Last-Translator: Göran Uddeborg <goeran@uddeborg.pp.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"

diff --git a/po/tr.po b/po/tr.po
index 5eca9cf..4937863 100644 (file)
--- 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-06-19 19:58-0400\n"
+"POT-Creation-Date: 2002-06-20 13:05-0400\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"

diff --git a/po/uk.po b/po/uk.po
index 21f7f9b..2e3de48 100644 (file)
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-06-19 19:58-0400\n"
+"POT-Creation-Date: 2002-06-20 13:05-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/wa.po b/po/wa.po
index 21f7f9b..2e3de48 100644 (file)
--- a/po/wa.po
+++ b/po/wa.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-06-19 19:58-0400\n"
+"POT-Creation-Date: 2002-06-20 13:05-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/zh.po b/po/zh.po
index 21f7f9b..2e3de48 100644 (file)
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-06-19 19:58-0400\n"
+"POT-Creation-Date: 2002-06-20 13:05-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/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index 21f7f9b..2e3de48 100644 (file)
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-06-19 19:58-0400\n"
+"POT-Creation-Date: 2002-06-20 13:05-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/rpm.spec.in b/rpm.spec.in
index 48e2776..68e3b8c 100644 (file)
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -17,7 +17,7 @@ Name: rpm
 %define version @VERSION@
 Version: %{version}
 %{expand: %%define rpm_version %{version}}
-Release: 0.28
+Release: 0.29
 Group: System Environment/Base
 Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz
 Copyright: GPL
@@ -402,6 +402,9 @@ fi
 %{__prefix}%{__share}/man/man1/gendiff.1*
 %{__prefix}%{__share}/man/man8/rpm.8*
 %{__prefix}%{__share}/man/man8/rpm2cpio.8*
+%lang(fr)      %{__prefix}%{__share}/man/fr/man[18]/*.[18]*
+%lang(ja)      %{__prefix}%{__share}/man/ja/man[18]/*.[18]*
+%lang(ko)      %{__prefix}%{__share}/man/ko/man[18]/*.[18]*
 %lang(pl)      %{__prefix}%{__share}/man/pl/man[18]/*.[18]*
 %lang(ru)      %{__prefix}%{__share}/man/ru/man[18]/*.[18]*
 %lang(sk)      %{__prefix}%{__share}/man/sk/man[18]/*.[18]*
@@ -519,8 +522,11 @@ fi
 %{__prefix}/include/popt.h
 
 %changelog
+* Thu Jun 20 2002 Jeff Johnson <jbj@redhat.com>
+- add translated man pages from PLD.
+
 * Wed Jun 19 2002 Jeff Johnson <jbj@redhat.com> 4.1-0.28
-- make sure that rpm can verify prelinked shared libraries.
+- ix86: make sure that rpm can verify prelinked shared libraries.
 - don't install /usr/lib/rpm/redhat per-vendor configuration anymore.
 
 * Sat Jun 15 2002 Jeff Johnson <jbj@redhat.com> 4.1-0.27

diff --git a/rpmdb/legacy.c b/rpmdb/legacy.c
index 1607b45..2afb5df 100644 (file)
--- a/rpmdb/legacy.c
+++ b/rpmdb/legacy.c
@@ -5,6 +5,9 @@
 #include "system.h"
 
 #if HAVE_LIBELF_GELF_H
+#define        __LIBELF_INTERNAL__     1
+#  undef __P
+#  define __P(protos)   protos
 #include <gelf.h>
 #define        DT_GNU_PRELINKED        0x6ffffdf5
 #endif
@@ -23,12 +26,15 @@
  * @param path         file path
  * @retval pidp                prelink helper pid or 0
  * @retval fsizep      file size
- * @return             -1 on error, otherwise open file descriptor
+ * @return             -1 on error, otherwise, an open file descriptor
  */ 
 static int open_dso(const char * path, /*@null@*/ pid_t * pidp, /*@null@*/ size_t *fsizep)
-       /*@globals rpmGlobalMacroContext, fileSystem @*/
-       /*@modifies *pidp, *fsizep, rpmGlobalMacroContext, fileSystem @*/
+       /*@globals rpmGlobalMacroContext,
+               fileSystem, internalState @*/
+       /*@modifies *pidp, *fsizep, rpmGlobalMacroContext,
+               fileSystem, internalState @*/
 {
+/*@only@*/
     static const char * cmd = NULL;
     static int initted = 0;
     pid_t pid;
@@ -64,7 +70,7 @@ static int open_dso(const char * path, /*@null@*/ pid_t * pidp, /*@null@*/ size_
     GElf_Dyn dyn;
     int bingo;
 
-    elf_version(EV_CURRENT);
+    (void) elf_version(EV_CURRENT);
 
     if ((elf = elf_begin (fdno, ELF_C_READ, NULL)) == NULL
      || elf_kind(elf) != ELF_K_ELF
@@ -73,8 +79,9 @@ static int open_dso(const char * path, /*@null@*/ pid_t * pidp, /*@null@*/ size_
        goto exit;
 
     bingo = 0;
+    /*@-branchstate -uniondef @*/
     while (!bingo && (scn = elf_nextscn(elf, scn)) != NULL) {
-       gelf_getshdr(scn, &shdr);
+       (void) gelf_getshdr(scn, &shdr);
        if (shdr.sh_type != SHT_DYNAMIC)
            continue;
        while (!bingo && (data = elf_getdata (scn, data)) != NULL) {
@@ -82,16 +89,17 @@ static int open_dso(const char * path, /*@null@*/ pid_t * pidp, /*@null@*/ size_
            int ndx;
 
             for (ndx = 0; ndx < maxndx; ++ndx) {
-               gelf_getdyn (data, ndx, &dyn);
+               (void) gelf_getdyn (data, ndx, &dyn);
                if (dyn.d_tag != DT_GNU_PRELINKED)
-                   continue;
+                   /*@innercontinue@*/ continue;
                bingo = 1;
-               break;
+               /*@innerbreak@*/ break;
            }
        }
     }
+    /*@=branchstate =uniondef @*/
 
-    if (bingo) {
+    if (pidp != NULL && bingo) {
        int pipes[2];
        int xx;
 
@@ -138,7 +146,9 @@ int domd5(const char * fn, unsigned char * digest, int asAscii, size_t *fsizep)
     int fdno;
     int xx;
 
+/*@-globs -internalglobs -mods @*/
     fdno = open_dso(path, &pid, &fsize);
+/*@=globs =internalglobs =mods @*/
     if (fdno < 0) {
        rc = 1;
        goto exit;

diff --git a/rpmdb/legacy.h b/rpmdb/legacy.h
index fcf4e7c..69ade41 100644 (file)
--- a/rpmdb/legacy.h
+++ b/rpmdb/legacy.h
@@ -27,8 +27,8 @@ extern "C" {
  */
 int domd5(const char * fn, /*@out@*/ unsigned char * digest, int asAscii,
                /*@null@*/ /*@out@*/ size_t *fsizep)
-       /*@globals fileSystem@*/
-       /*@modifies digest, fileSystem @*/;
+       /*@globals fileSystem @*/
+       /*@modifies digest, *fsizep, fileSystem @*/;
 
 /**
  * Convert absolute path tag to (dirname,basename,dirindex) tags.

diff --git a/scripts/macros.perl.in b/scripts/macros.perl.in
new file mode 100644 (file)
index 0000000..226878c
--- /dev/null
+++ b/scripts/macros.perl.in
@@ -0,0 +1,12 @@
+# Perl specific macro definitions.
+# To make use of these macros insert the following line into your spec file:
+# %include @RPMCONFIGDIR@/macros.perl
+
+%define                __find_requires @RPMCONFIGDIR@/find-perl-requires
+%define                __find_provides @RPMCONFIGDIR@/find-perl-provides
+
+%define                perl_sitelib    %(eval "`perl -V:installsitelib`"; echo $installsitelib)
+%define                perl_sitearch   %(eval "`perl -V:installsitearch`"; echo $installsitearch)
+%define                perl_archlib    %(eval "`perl -V:installarchlib`"; echo $installarchlib)
+%define                perl_privlib    %(eval "`perl -V:installprivlib`"; echo $installprivlib)
+

diff --git a/scripts/macros.python.in b/scripts/macros.python.in
new file mode 100644 (file)
index 0000000..0a63605
--- /dev/null
+++ b/scripts/macros.python.in
@@ -0,0 +1,18 @@
+# Python specific macro definitions.
+# To make use of these macros insert the following line into your spec file:
+# %include @RPMCONFIGDIR@/macros.python
+
+# python main version
+%define py_ver         %(echo `python -c "import sys; print sys.version[:3]"`)
+
+# directories
+%define py_prefix      %(echo `python -c "import sys; print sys.prefix"`)
+%define py_libdir      %{py_prefix}/lib/python%{py_ver}
+%define py_incdir      /usr/include/python%{py_ver}
+%define py_sitedir     %{py_libdir}/site-packages
+%define py_dyndir      %{py_libdir}/lib-dynload
+
+# pure python modules compilation
+%define py_comp        python -c "import compileall; import sys; compileall.compile_dir(sys.argv[1], ddir=sys.argv[1][len('$RPM_BUILD_ROOT'):])"
+
+%define py_ocomp       python -O -c "import compileall; import sys; compileall.compile_dir(sys.argv[1], ddir=sys.argv[1][len('$RPM_BUILD_ROOT'):])"

diff --git a/system.h b/system.h
index 087e1eb..7a5d255 100644 (file)
--- a/system.h
+++ b/system.h
@@ -10,6 +10,7 @@
 #endif
 
 #include <sys/types.h>
+
 #if defined(__LCLINT__)
 /*@-redef@*/
 typedef unsigned int u_int32_t;