diff options
126 files changed, 5102 insertions, 10590 deletions
diff --git a/Makefile.am b/Makefile.am index a0f8bf973..cf2cdd13b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,5 @@ # Top level Makefile for rpm -LINT = splint - CLEANFILES = EXTRA_DIST = CHANGES ChangeLog CREDITS Doxyheader GROUPS INSTALL \ autodeps autogen.sh \ @@ -22,6 +20,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/misc \ @WITH_LIBELF_INCLUDE@ AM_CPPFLAGS += -DLOCALEDIR="\"$(localedir)\"" +AM_CPPFLAGS += -DRPMCONFIGDIR="\"@RPMCONFIGDIR@\"" +AM_CPPFLAGS += -DLIBRPMALIAS_FILENAME="\"@RPMCONFIGDIR@/rpmpopt-${VERSION}\"" staticLDFLAGS = @LDFLAGS_STATIC@ @LDFLAGS_NPTL@ @@ -79,28 +79,17 @@ rpmrc: $(top_srcdir)/rpmrc.in CLEANFILES += rpmrc.tmp rpmrc EXTRA_DIST += rpmrc.in -.PHONY: splint -splint: - splint \ - -load build/rpmbuild.lcd \ - -load lib/rpmlib.lcd \ - -load rpmdb/rpmdb.lcd \ - -load rpmio/rpmio.lcd \ - $(DEFS) $(AM_CPPFLAGS) rpmqv.c $(rpmb_SOURCES) - -.PHONY: lint -lint: - $(LINT) -Dlint $(DEFS) $(AM_CPPFLAGS) rpmqv.c $(rpmb_SOURCES) \ - `make -s sources -C build` \ - `make -s sources -C lib` \ - `make -s sources -C rpmdb` \ - `make -s sources -C rpmio` - -CVSTAG = r$(subst .,-,$(VERSION)) +macros: $(top_srcdir)/macros.in + @sed \ + -e "s,[@]varprefix[@],$(localstatedir),g" \ + < $(top_srcdir)/macros.in > macros.tmp \ + && ( cd $(top_builddir) && ./config.status --file=${subdir}/macros:${subdir}/macros.tmp ) +CLEANFILES += macros.tmp macros +EXTRA_DIST += macros.in pkgsrcdir = $(prefix)/src/$(RPMCANONVENDOR) -rpmvardir = $(varprefix)/lib/rpm +rpmvardir = $(localstatedir)/lib/rpm rpmvar_DATA = install-data-local: @@ -165,7 +154,7 @@ install-data-local: solaris*|linux*|darwin*) \ chmod u+x $(top_srcdir)/installplatform; DESTDIR="$(DESTDIR)" pkglibdir="$(pkglibdir)" $(top_srcdir)/installplatform rpmrc macros platform ;; \ esac - @$(MKDIR_P) $(DESTDIR)/var/tmp + @$(MKDIR_P) $(DESTDIR)$(localstatedir)/tmp # XXX to appease distcheck we need to remove "stuff" here... uninstall-local: @@ -193,10 +182,10 @@ setperms: $(__CHOWN) ${RPMUSER}.${RPMGROUP} $(DESTDIR)$(pkglibdir)/$$f ;\ done @$(__CHOWN) ${RPMUSER}.${RPMGROUP} $(DESTDIR)$(pkglibdir) - @$(__CHOWN) -R ${RPMUSER}.${RPMGROUP} $(DESTDIR)$(varprefix)/lib/rpm - -@$(__CHMOD) 0664 $(DESTDIR)$(varprefix)/lib/rpm/[A-Z]* - -@$(__CHMOD) 0775 $(DESTDIR)$(varprefix)/lib/rpm - -@$(__CHMOD) 0664 $(DESTDIR)$(varprefix)/lib/rpm/__db.* + @$(__CHOWN) -R ${RPMUSER}.${RPMGROUP} $(DESTDIR)$(rpmvardir) + -@$(__CHMOD) 0664 $(DESTDIR)$(rpmvardir)/[A-Z]* + -@$(__CHMOD) 0775 $(DESTDIR)$(rpmvardir) + -@$(__CHMOD) 0664 $(DESTDIR)$(rpmvardir)/__db.* .PHONY: unsetgid unsetgid: @@ -207,33 +196,14 @@ unsetgid: $(__CHMOD) g-s $(DESTDIR)$(pkglibdir)/$$f ;\ done -.PHONY: tar -tar: - rm -rf /tmp/rpm-$(VERSION) - $(MAKE) DESTDIR=/tmp/rpm-$(VERSION) install - cd /tmp/rpm-$(VERSION) ; tar cvf /tmp/rpm-$(VERSION).tar . - -.PHONY: noconfig -noconfig: - find . -name "Makefile" -exec rm {} \; - rm -f *gz *rpm config.* - .PHONY: doxygen doxygen @WITH_APIDOCS_TARGET@: Doxyfile rpmpopt-@VERSION@ rm -rf $@ $(MKDIR_P) $@ - [ X"@__DOXYGEN@" != Xno ] && @__DOXYGEN@ -ctags: - find . -type f -name "*.[ch]*" | xargs @CTAGS@ - -cscope: - @CSCOPE@ -b -R - -cref: ctags cscope - .PHONY: ChangeLog ChangeLog: - hg log -v > ChangeLog + hg log --no-merge -v > ChangeLog ACLOCAL_AMFLAGS = -I m4 diff --git a/build/Makefile.am b/build/Makefile.am index 15857eb12..a09cf8a9d 100644 --- a/build/Makefile.am +++ b/build/Makefile.am @@ -1,7 +1,5 @@ # Makefile for rpmbuild library. -LINT = splint - AM_CPPFLAGS = -I. \ -I$(top_srcdir) \ -I$(top_srcdir)/lib \ @@ -28,20 +26,6 @@ librpmbuild_la_LDFLAGS = -release 4.4 \ $(top_builddir)/lib/librpm.la \ $(top_builddir)/rpmdb/librpmdb.la \ $(top_builddir)/rpmio/librpmio.la \ - @WITH_LIBELF_LIB@ - -clean-local: - rm -f *.o - -#BUILT_SOURCES = rpmbuild.lcd - -rpmbuild.lcd: Makefile.am ${librpmbuild_la_SOURCES} ${pkginc_HEADERS} ${noinst_HEADERS} - -lclint ${DEFS} ${AM_CPPFLAGS} ${librpmbuild_la_SOURCES} -dump $@ 2>/dev/null - -.PHONY: sources -sources: - @echo $(librpmbuild_la_SOURCES:%=build/%) - -.PHONY: lint -lint: - $(LINT) ${DEFS} ${AM_CPPFLAGS} ${librpmbuild_la_SOURCES} + @WITH_POPT_LIB@ \ + @WITH_LIBELF_LIB@ \ + @WITH_MAGIC_LIB@ diff --git a/build/files.c b/build/files.c index c3ff036ca..25adeac07 100644 --- a/build/files.c +++ b/build/files.c @@ -23,8 +23,6 @@ #define _RPMFI_INTERNAL #include "rpmfi.h" -#include "rpmsx.h" - #define _RPMTE_INTERNAL #include "rpmte.h" @@ -940,9 +938,6 @@ static int parseForSimple(/*@unused@*/Spec spec, Package pkg, char * buf, } break; } -#if defined(__LCLINT__) - assert(s != NULL); -#endif /* Set flags for virtual file attributes */ { VFA_t *vfa; @@ -1136,8 +1131,6 @@ static void genCpioListAndHeader(/*@partial@*/ FileList fl, int apathlen = 0; int dpathlen = 0; int skipLen = 0; - rpmsx sx = NULL; - const char * sxfn; size_t fnlen; FileListRec flp; char buf[BUFSIZ]; @@ -1154,10 +1147,6 @@ static void genCpioListAndHeader(/*@partial@*/ FileList fl, skipLen += strlen(fl->prefix); } - sxfn = rpmGetPath("%{?_build_file_context_path}", NULL); - if (sxfn != NULL && *sxfn != '\0') - sx = rpmsxNew(sxfn); - for (i = 0, flp = fl->fileList; i < fl->fileListRecsUsed; i++, flp++) { const char *s; @@ -1337,20 +1326,7 @@ static void genCpioListAndHeader(/*@partial@*/ FileList fl, (void) headerAddOrAppendEntry(h, RPMTAG_FILEFLAGS, RPM_INT32_TYPE, &(flp->flags), 1); - /* Add file security context to package. */ -/*@-branchstate@*/ - if (sx != NULL) { - mode_t fmode = (uint_16)flp->fl_mode; - s = rpmsxFContext(sx, flp->fileURL, fmode); - if (s == NULL) s = ""; - (void) headerAddOrAppendEntry(h, RPMTAG_FILECONTEXTS, RPM_STRING_ARRAY_TYPE, - &s, 1); - } -/*@=branchstate@*/ - } - sx = rpmsxFree(sx); - sxfn = _free(sxfn); (void) headerAddEntry(h, RPMTAG_SIZE, RPM_INT32_TYPE, &(fl->totalFileSize), 1); diff --git a/build/rpmfc.h b/build/rpmfc.h index b40801246..f7405c9b6 100644 --- a/build/rpmfc.h +++ b/build/rpmfc.h @@ -1,7 +1,6 @@ #ifndef _H_RPMFC_ #define _H_RPMFC_ -#undef FILE_RCSID #include "magic.h" /*@-exportlocal@*/ diff --git a/configure.ac b/configure.ac index 9e79d3015..e9e8d4b13 100644 --- a/configure.ac +++ b/configure.ac @@ -81,9 +81,6 @@ AC_SUBST(RPMUID) AC_SUBST(RPMGROUP) AC_SUBST(RPMGID) -AC_PATH_PROG(CTAGS, ctags, /bin/true) -AC_PATH_PROG(CSCOPE, cscope, /bin/true) - dnl dnl This now uses libtool. Put dnl LDFLAGS_STATIC="-all" @@ -961,34 +958,6 @@ int main() AC_MSG_RESULT($ROOT_GROUP) AC_SUBST(ROOT_GROUP) -if test "x$varprefix" = "x"; then - # For /usr and /usr/local, we want the 'var' directory to go - # in /var and /var/local respectively. For everything else, - # just put the 'var' directory in prefix/var. - case $prefix in - /usr | /usr/local ) - varprefix=`echo $prefix | sed 's/usr/var/'` ;; - NONE) - varprefix=`echo $ac_default_prefix | sed 's/usr/var/'` ;; - *) - varprefix=$prefix/var ;; - esac -fi -AC_SUBST(varprefix) - -if test "x$tmpdir" = "x"; then - if test -d $varprefix/tmp; then - tmpdir=$varprefix/tmp - else - if test -d /var/tmp; then - tmpdir=/var/tmp - else - tmpdir=/tmp - fi - fi -fi -AC_SUBST(tmpdir) - if echo "$build_os" | grep sco > /dev/null; then echo "hacking things up for sco" AC_DEFINE(NEED_STRINGS_H, 1, [Define as one if we need to include <strings.h> (along with <string.h>)]) @@ -1124,32 +1093,19 @@ AC_DEFINE_UNQUOTED(VENDORRPMRC_FILENAME, "$VENDORRPMRC_FILENAME", [Full path to vendor rpmrc configuration file (usually /usr/lib/rpm/vendor/rpmrc)]) AC_SUBST(VENDORRPMRC_FILENAME) -LIBRPMALIAS_FILENAME="${RPMCONFIGDIR}/rpmpopt-${VERSION}" -AC_DEFINE_UNQUOTED(LIBRPMALIAS_FILENAME, "$LIBRPMALIAS_FILENAME", - [Full path to rpmpopt configuration file (usually /usr/lib/rpm/rpmpopt)]) -AC_SUBST(LIBRPMALIAS_FILENAME) - -AC_SUBST(RPM) - AC_SUBST(OBJDUMP) AC_CONFIG_SUBDIRS(db3) AC_PATH_PROG(AUTOM4TE,autom4te,:) -AC_CONFIG_FILES([ Doxyfile Makefile macros platform rpm.pc +AC_CONFIG_FILES([ Doxyfile Makefile platform rpm.pc rpmio/Makefile rpmdb/Makefile lib/Makefile build/Makefile - po/Makefile.in scripts/Makefile scripts/brp-redhat + po/Makefile.in scripts/Makefile scripts/macros.perl scripts/macros.php scripts/macros.python tools/Makefile misc/Makefile doc/Makefile - doc/fr/Makefile - doc/ja/Makefile - doc/ko/Makefile - doc/pl/Makefile - doc/ru/Makefile - doc/sk/Makefile python/Makefile lua/Makefile tests/Makefile diff --git a/db3/configure b/db3/configure index 6f9c580b9..6a26c50ab 100755 --- a/db3/configure +++ b/db3/configure @@ -24,7 +24,11 @@ distdir install check installcheck:\ \ db4_install: all install_setip' \ -e '/^uninstall[:-]/c\ -uninstall:' > Makefile +uninstall:' \ +-e 's/^check depend/\ +check: all\ +depend/' \ + > Makefile mv db.h db.h.orig cat db.h.orig | sed \ @@ -6,13 +6,6 @@ #include <assert.h> -#ifdef __LCLINT__ -#define ntohl(_x) (_x) -#define ntohs(_x) (_x) -#define htonl(_x) (_x) -#define htons(_x) (_x) -#endif - #ifdef DMALLOC #include <dmalloc.h> #endif diff --git a/doc/Makefile.am b/doc/Makefile.am index d5e19868e..7d3d13788 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,12 +1,43 @@ ## Process this file with automake to produce Makefile.in -SUBDIRS = fr ja ko pl ru sk +EXTRA_DIST = -man_MANS = gendiff.1 rpm.8 rpmbuild.8 rpmcache.8 rpmdeps.8 rpmgraph.8 rpm2cpio.8 +man_man1dir = $(mandir)/man1 +man_man1_DATA = gendiff.1 +EXTRA_DIST += $(man_man1_DATA) -EXTRA_DIST = $(man_MANS) +man_man8dir = $(mandir)/man8 +man_man8_DATA = rpm.8 rpmbuild.8 rpmcache.8 rpmdeps.8 rpmgraph.8 rpm2cpio.8 +EXTRA_DIST += $(man_man8_DATA) -EXTRA_DIST += \ +man_fr_man8dir = $(mandir)/fr/man8 +man_fr_man8_DATA = fr/rpm.8 +EXTRA_DIST += $(man_fr_man8_DATA) + +man_ja_man8dir = $(mandir)/ja/man8 +man_ja_man8_DATA = ja/rpm.8 ja/rpm2cpio.8 ja/rpmbuild.8 ja/rpmcache.8 ja/rpmgraph.8 +EXTRA_DIST += $(man_ja_man8_DATA) + +man_ko_man8dir = $(mandir)/ko/man8 +man_ko_man8_DATA = ko/rpm.8 ko/rpm2cpio.8 +EXTRA_DIST += $(man_ko_man8_DATA) + +man_pl_man1dir = $(mandir)/pl/man1 +man_pl_man1_DATA = pl/gendiff.1 +man_pl_man8dir = $(mandir)/pl/man8 +man_pl_man8_DATA = pl/rpm.8 pl/rpm2cpio.8 pl/rpmbuild.8 pl/rpmcache.8 pl/rpmdeps.8 pl/rpmgraph.8 +EXTRA_DIST += $(man_pl_man1_DATA) $(man_pl_man8_DATA) + +man_ru_man8dir = $(mandir)/ru/man8 +man_ru_man8_DATA = ru/rpm.8 ru/rpm2cpio.8 +EXTRA_DIST += $(man_ru_man8_DATA) + +man_sk_man8dir = $(mandir)/sk/man8 +man_sk_man8_DATA = sk/rpm.8 +EXTRA_DIST += $(man_sk_man8_DATA) + + +EXTRA_DIST += \ manual/builddependencies \ manual/buildroot \ manual/conditionalbuilds \ diff --git a/doc/fr/Makefile.am b/doc/fr/Makefile.am deleted file mode 100644 index 6861c5849..000000000 --- a/doc/fr/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -## Process this file with automake to produce Makefile.in - -man_MANS = rpm.8 -mandir = @mandir@/fr - -EXTRA_DIST = $(man_MANS) diff --git a/doc/ja/Makefile.am b/doc/ja/Makefile.am deleted file mode 100644 index 34fb3e041..000000000 --- a/doc/ja/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -## Process this file with automake to produce Makefile.in - -man_MANS = rpm.8 rpm2cpio.8 rpmbuild.8 rpmcache.8 rpmgraph.8 -mandir = @mandir@/ja - -EXTRA_DIST = $(man_MANS) diff --git a/doc/ko/Makefile.am b/doc/ko/Makefile.am deleted file mode 100644 index b295c3375..000000000 --- a/doc/ko/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -## Process this file with automake to produce Makefile.in - -man_MANS = rpm.8 rpm2cpio.8 -mandir = @mandir@/ko - -EXTRA_DIST = $(man_MANS) diff --git a/doc/pl/Makefile.am b/doc/pl/Makefile.am deleted file mode 100644 index b6ebc6e23..000000000 --- a/doc/pl/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -## Process this file with automake to produce Makefile.in - -man_MANS = gendiff.1 rpm.8 rpm2cpio.8 rpmbuild.8 rpmcache.8 rpmdeps.8 rpmgraph.8 -mandir = @mandir@/pl - -EXTRA_DIST = $(man_MANS) diff --git a/doc/ru/Makefile.am b/doc/ru/Makefile.am deleted file mode 100644 index d6b042458..000000000 --- a/doc/ru/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -## Process this file with automake to produce Makefile.in - -man_MANS = rpm.8 rpm2cpio.8 -mandir = @mandir@/ru - -EXTRA_DIST = $(man_MANS) diff --git a/doc/sk/Makefile.am b/doc/sk/Makefile.am deleted file mode 100644 index b49131a07..000000000 --- a/doc/sk/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -## Process this file with automake to produce Makefile.in - -man_MANS = rpm.8 -mandir = @mandir@/sk - -EXTRA_DIST = $(man_MANS) diff --git a/lib/Makefile.am b/lib/Makefile.am index 8c1d6783f..50150fab4 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,7 +1,5 @@ # Makefile for rpm library. -LINT = splint - AM_CPPFLAGS = -I. \ -I$(top_srcdir) \ -I$(top_srcdir)/rpmdb \ @@ -11,6 +9,9 @@ AM_CPPFLAGS = -I. \ -I$(top_srcdir)/misc AM_CPPFLAGS += -DLOCALEDIR="\"$(localedir)\"" AM_CPPFLAGS += -DSYSCONFDIR="\"$(sysconfdir)\"" +AM_CPPFLAGS += -DLOCALSTATEDIR="\"$(localstatedir)\"" +AM_CPPFLAGS += -DRPMCONFIGDIR="\"@RPMCONFIGDIR@\"" +AM_CPPFLAGS += -DLIBRPMALIAS_FILENAME="\"@RPMCONFIGDIR@/rpmpopt-${VERSION}\"" EXTRA_DIST = getdate.y @@ -18,23 +19,24 @@ check_PROGRAMS = pkgincdir = $(pkgincludedir) pkginc_HEADERS = \ - misc.h rpmcli.h rpmlib.h \ - rpmal.h rpmds.h rpmfi.h rpmgi.h rpmps.h rpmsx.h rpmte.h rpmts.h \ + idtx.h misc.h rpmcli.h rpmlib.h \ + rpmal.h rpmds.h rpmfi.h rpmgi.h rpmps.h rpmte.h rpmts.h \ stringbuf.h usrlibdir = $(libdir) usrlib_LTLIBRARIES = librpm.la librpm_la_SOURCES = \ cpio.c cpio.h depends.c formats.c fs.c fsm.c fsm.h getdate.c \ - manifest.c manifest.h misc.c package.c \ + idtx.c manifest.c manifest.h misc.c package.c \ poptALL.c poptI.c poptQV.c psm.c psm.h query.c \ rpmal.c rpmchecksig.c rpmds.c rpmfi.c rpmgi.c rpminstall.c \ - rpmlead.c rpmlead.h rpmlibprov.c rpmps.c rpmrc.c rpmsx.c rpmte.c rpmts.c \ + rpmlead.c rpmlead.h rpmlibprov.c rpmps.c rpmrc.c rpmte.c rpmts.c \ rpmvercmp.c signature.c signature.h stringbuf.c transaction.c \ verify.c rpmlock.c rpmlock.h librpm_la_LDFLAGS = -release 4.4 \ $(top_builddir)/rpmdb/librpmdb.la \ $(top_builddir)/rpmio/librpmio.la \ + @WITH_BEECRYPT_LIB@ \ @WITH_POPT_LIB@ \ @WITH_SELINUX_LIB@ \ @LIBINTL@ @@ -68,27 +70,7 @@ getdate.c: getdate.y fi ;\ fi -BUILT_SOURCES = getdate.c # rpmlib.lcd - -rpmlib.lcd: Makefile.am ${librpm_la_SOURCES} ${pkginc_HEADERS} - -lclint ${DEFS} ${AM_CPPFLAGS} ${librpm_la_SOURCES} -dump $@ 2>/dev/null - -.PHONY: sources -sources: - @echo $(librpm_la_SOURCES:%=lib/%) - -.PHONY: lint -lint: - $(LINT) $(DEFS) $(AM_CPPFLAGS) $(librpm_la_SOURCES) - -if SELINUX -check_PROGRAMS += setfiles -setfiles_SOURCES = setfiles.c -# setfiles_LDFLAGS = @LDFLAGS_STATIC@ -setfiles_LDADD = @WITH_SELINUX_LIB@ \ - ../rpmio/librpmio.la \ - @WITH_POPT_LIB@ -endif +BUILT_SOURCES = getdate.c check_PROGRAMS += tds tds_SOURCES = tds.c @@ -109,11 +91,6 @@ tsystem_SOURCES = tsystem.c tsystem_LDFLAGS = tsystem_LDADD = ../rpmio/librpmio.la @WITH_POPT_LIB@ -check_PROGRAMS += tre -tre_SOURCES = tre.c -tre_LDFLAGS = -tre_LDADD = librpm.la @WITH_SELINUX_LIB@ - check_PROGRAMS += tcpu tcpu_SOURCES = tcpu.c # tcpu_LDFLAGS = @LDFLAGS_STATIC@ diff --git a/lib/depends.c b/lib/depends.c index 39150d3a7..989cb6c21 100644 --- a/lib/depends.c +++ b/lib/depends.c @@ -474,7 +474,7 @@ static int unsatisfiedDepend(rpmts ts, rpmds dep, int adding) retry: rc = 0; /* assume dependency is satisfied */ -#if defined(DYING) || defined(__LCLINT__) +#if defined(DYING) { static /*@observer@*/ const char noProvidesString[] = "nada"; static /*@observer@*/ const char * rcProvidesString = noProvidesString; int_32 Flags = rpmdsFlags(dep); @@ -558,7 +558,7 @@ retry: } mi = rpmdbFreeIterator(mi); -#if defined(DYING) || defined(__LCLINT__) +#if defined(DYING) mi = rpmtsInitIterator(ts, RPMTAG_NAME, Name, 0); (void) rpmdbPruneIterator(mi, ts->removedPackages, ts->numRemovedPackages, 1); @@ -1746,7 +1746,7 @@ int rpmtsCheck(rpmts ts) rpmteNEVR(p), rpmteA(p), rpmteO(p), rpmteColor(p)); /*@=nullpass@*/ -#if defined(DYING) || defined(__LCLINT__) +#if defined(DYING) /* XXX all packages now have Provides: name = version-release */ /* Erasing: check name against requiredby matches. */ rc = checkDependentPackages(ts, rpmteN(p)); diff --git a/lib/formats.c b/lib/formats.c index d3f65b3af..afd0728be 100644 --- a/lib/formats.c +++ b/lib/formats.c @@ -859,78 +859,6 @@ static int fileclassTag(Header h, /*@out@*/ rpmTagType * type, } /** - * Retrieve file contexts from header. - * @param h header - * @retval *type tag type - * @retval *data tag value - * @retval *count no. of data items - * @retval *freeData data-was-malloc'ed indicator - * @return 0 on success - */ -static int filecontextsTag(Header h, /*@out@*/ rpmTagType * type, - /*@out@*/ const void ** data, /*@out@*/ int_32 * count, - /*@out@*/ int * freeData) - /*@globals rpmGlobalMacroContext, h_errno, fileSystem @*/ - /*@modifies h, *type, *data, *count, *freeData, - rpmGlobalMacroContext, fileSystem @*/ - /*@requires maxSet(type) >= 0 /\ maxSet(data) >= 0 - /\ maxSet(count) >= 0 /\ maxSet(freeData) >= 0 @*/ -{ - *type = RPM_STRING_ARRAY_TYPE; - rpmfiBuildFContexts(h, (const char ***) data, count); - *freeData = 1; - return 0; -} - -/** - * Retrieve file contexts from file system. - * @param h header - * @retval *type tag type - * @retval *data tag value - * @retval *count no. of data items - * @retval *freeData data-was-malloc'ed indicator - * @return 0 on success - */ -static int fscontextsTag(Header h, /*@out@*/ rpmTagType * type, - /*@out@*/ const void ** data, /*@out@*/ int_32 * count, - /*@out@*/ int * freeData) - /*@globals rpmGlobalMacroContext, h_errno, fileSystem @*/ - /*@modifies h, *type, *data, *count, *freeData, - rpmGlobalMacroContext, fileSystem @*/ - /*@requires maxSet(type) >= 0 /\ maxSet(data) >= 0 - /\ maxSet(count) >= 0 /\ maxSet(freeData) >= 0 @*/ -{ - *type = RPM_STRING_ARRAY_TYPE; - rpmfiBuildFSContexts(h, (const char ***) data, count); - *freeData = 1; - return 0; -} - -/** - * Retrieve file contexts from policy RE's. - * @param h header - * @retval *type tag type - * @retval *data tag value - * @retval *count no. of data items - * @retval *freeData data-was-malloc'ed indicator - * @return 0 on success - */ -static int recontextsTag(Header h, /*@out@*/ rpmTagType * type, - /*@out@*/ const void ** data, /*@out@*/ int_32 * count, - /*@out@*/ int * freeData) - /*@globals rpmGlobalMacroContext, h_errno, fileSystem @*/ - /*@modifies h, *type, *data, *count, *freeData, - rpmGlobalMacroContext, fileSystem @*/ - /*@requires maxSet(type) >= 0 /\ maxSet(data) >= 0 - /\ maxSet(count) >= 0 /\ maxSet(freeData) >= 0 @*/ -{ - *type = RPM_STRING_ARRAY_TYPE; - rpmfiBuildREContexts(h, (const char ***) data, count); - *freeData = 1; - return 0; -} - -/** * Retrieve file provides. * @param h header * @retval *type tag type @@ -1157,15 +1085,12 @@ const struct headerSprintfExtension_s rpmHeaderFormats[] = { { HEADER_EXT_TAG, "RPMTAG_DESCRIPTION", { descriptionTag } }, { HEADER_EXT_TAG, "RPMTAG_SUMMARY", { summaryTag } }, { HEADER_EXT_TAG, "RPMTAG_FILECLASS", { fileclassTag } }, - { HEADER_EXT_TAG, "RPMTAG_FILECONTEXTS", { filecontextsTag } }, { HEADER_EXT_TAG, "RPMTAG_FILENAMES", { filenamesTag } }, { HEADER_EXT_TAG, "RPMTAG_FILEPROVIDE", { fileprovideTag } }, { HEADER_EXT_TAG, "RPMTAG_FILEREQUIRE", { filerequireTag } }, - { HEADER_EXT_TAG, "RPMTAG_FSCONTEXTS", { fscontextsTag } }, { HEADER_EXT_TAG, "RPMTAG_FSNAMES", { fsnamesTag } }, { HEADER_EXT_TAG, "RPMTAG_FSSIZES", { fssizesTag } }, { HEADER_EXT_TAG, "RPMTAG_INSTALLPREFIX", { instprefixTag } }, - { HEADER_EXT_TAG, "RPMTAG_RECONTEXTS", { recontextsTag } }, { HEADER_EXT_TAG, "RPMTAG_TRIGGERCONDS", { triggercondsTag } }, { HEADER_EXT_TAG, "RPMTAG_TRIGGERTYPE", { triggertypeTag } }, { HEADER_EXT_FORMAT, "armor", { armorFormat } }, @@ -624,28 +624,17 @@ static int fsmMapFContext(FSM_t fsm) /*@modifies fsm @*/ { rpmts ts = fsmGetTs(fsm); - rpmfi fi = fsmGetFi(fsm); struct stat * st = &fsm->sb; /* * Find file security context (if not disabled). */ fsm->fcontext = NULL; - if (ts != NULL && rpmtsSELinuxEnabled(ts) == 1 && - !(rpmtsFlags(ts) & RPMTRANS_FLAG_NOCONTEXTS)) - { - rpmsx sx = rpmtsREContext(ts); - - if (sx != NULL) { - /* Get file security context from patterns. */ - fsm->fcontext = rpmsxFContext(sx, fsm->path, st->st_mode); - sx = rpmsxFree(sx); - } else { - int i = fsm->ix; + if (ts != NULL && !(rpmtsFlags(ts) & RPMTRANS_FLAG_NOCONTEXTS)) { + security_context_t scon = NULL; - /* Get file security context from package. */ - if (fi && i >= 0 && i < fi->fc) - fsm->fcontext = (fi->fcontexts ? fi->fcontexts[i] : NULL); + if (matchpathcon(fsm->path, st->st_mode, &scon) == 0 && scon != NULL) { + fsm->fcontext = scon; } } return 0; @@ -1276,7 +1265,7 @@ static int fsmMkdirs(/*@special@*/ /*@partial@*/ FSM_t fsm) /*@-compdef@*/ rpmts ts = fsmGetTs(fsm); /*@=compdef@*/ - rpmsx sx = rpmtsREContext(ts); + security_context_t scon = NULL; fsm->path = NULL; @@ -1340,10 +1329,14 @@ static int fsmMkdirs(/*@special@*/ /*@partial@*/ FSM_t fsm) if (!rc) { /* XXX FIXME? only new dir will have context set. */ /* Get file security context from patterns. */ - if (sx != NULL) { - fsm->fcontext = rpmsxFContext(sx, fsm->path, st->st_mode); - rc = fsmNext(fsm, FSM_LSETFCON); + if (! rpmtsFlags(ts) & RPMTRANS_FLAG_NOCONTEXTS) { + if (matchpathcon(fsm->path, st->st_mode, &scon) == 0 && + scon != NULL) { + fsm->fcontext = scon; + rc = fsmNext(fsm, FSM_LSETFCON); + } } + if (fsm->fcontext == NULL) rpmMessage(RPMMESS_DEBUG, _("%s directory created with perms %04o, no context.\n"), @@ -1376,7 +1369,6 @@ static int fsmMkdirs(/*@special@*/ /*@partial@*/ FSM_t fsm) } /*@=boundswrite@*/ dnli = dnlFreeIterator(dnli); - sx = rpmsxFree(sx); /*@=observertrans =dependenttrans@*/ fsm->path = path; diff --git a/lib/idtx.c b/lib/idtx.c new file mode 100644 index 000000000..6f585416e --- /dev/null +++ b/lib/idtx.c @@ -0,0 +1,190 @@ + +#include "idtx.h" +#include "rpmlib.h" +#include "rpmdb.h" +#include "rpmts.h" +#include "rpmmacro.h" + +/*@unchecked@*/ +static int reverse = -1; + +/** + */ +static int IDTintcmp(const void * a, const void * b) + /*@*/ +{ + /*@-castexpose@*/ + return ( reverse * (((IDT)a)->val.u32 - ((IDT)b)->val.u32) ); + /*@=castexpose@*/ +} + +IDTX IDTXfree(IDTX idtx) +{ + if (idtx) { + int i; + if (idtx->idt) + for (i = 0; i < idtx->nidt; i++) { + IDT idt = idtx->idt + i; + idt->h = headerFree(idt->h); + idt->key = _free(idt->key); + } + idtx->idt = _free(idtx->idt); + idtx = _free(idtx); + } + return NULL; +} + +IDTX IDTXnew(void) +{ + IDTX idtx = xcalloc(1, sizeof(*idtx)); + idtx->delta = 10; + idtx->size = sizeof(*((IDT)0)); + return idtx; +} + +IDTX IDTXgrow(IDTX idtx, int need) +{ + if (need < 0) return NULL; + if (idtx == NULL) + idtx = IDTXnew(); + if (need == 0) return idtx; + + if ((idtx->nidt + need) > idtx->alloced) { + while (need > 0) { + idtx->alloced += idtx->delta; + need -= idtx->delta; + } + idtx->idt = xrealloc(idtx->idt, (idtx->alloced * idtx->size) ); + } + return idtx; +} + +IDTX IDTXsort(IDTX idtx) +{ + if (idtx != NULL && idtx->idt != NULL && idtx->nidt > 0) + qsort(idtx->idt, idtx->nidt, idtx->size, IDTintcmp); + return idtx; +} + +IDTX IDTXload(rpmts ts, rpmTag tag) +{ + IDTX idtx = NULL; + rpmdbMatchIterator mi; + HGE_t hge = (HGE_t) headerGetEntry; + Header h; + + /*@-branchstate@*/ + mi = rpmtsInitIterator(ts, tag, NULL, 0); +#ifdef NOTYET + (void) rpmdbSetIteratorRE(mi, RPMTAG_NAME, RPMMIRE_DEFAULT, '!gpg-pubkey'); +#endif + while ((h = rpmdbNextIterator(mi)) != NULL) { + rpmTagType type = RPM_NULL_TYPE; + int_32 count = 0; + int_32 * tidp; + + tidp = NULL; + if (!hge(h, tag, &type, (void **)&tidp, &count) || tidp == NULL) + continue; + + if (type == RPM_INT32_TYPE && (*tidp == 0 || *tidp == -1)) + continue; + + idtx = IDTXgrow(idtx, 1); + if (idtx == NULL) + continue; + if (idtx->idt == NULL) + continue; + + { IDT idt; + /*@-nullderef@*/ + idt = idtx->idt + idtx->nidt; + /*@=nullderef@*/ + idt->h = headerLink(h); + idt->key = NULL; + idt->instance = rpmdbGetIteratorOffset(mi); + idt->val.u32 = *tidp; + } + idtx->nidt++; + } + mi = rpmdbFreeIterator(mi); + /*@=branchstate@*/ + + return IDTXsort(idtx); +} + +IDTX IDTXglob(rpmts ts, const char * globstr, rpmTag tag) +{ + IDTX idtx = NULL; + HGE_t hge = (HGE_t) headerGetEntry; + Header h; + int_32 * tidp; + FD_t fd; + const char ** av = NULL; + int ac = 0; + rpmRC rpmrc; + int xx; + int i; + + av = NULL; ac = 0; + xx = rpmGlob(globstr, &ac, &av); + + if (xx == 0) + for (i = 0; i < ac; i++) { + rpmTagType type; + int_32 count; + int isSource; + + fd = Fopen(av[i], "r.ufdio"); + if (fd == NULL || Ferror(fd)) { + rpmError(RPMERR_OPEN, _("open of %s failed: %s\n"), av[i], + Fstrerror(fd)); + if (fd != NULL) (void) Fclose(fd); + continue; + } + + rpmrc = rpmReadPackageFile(ts, fd, av[i], &h); + (void) Fclose(fd); + switch (rpmrc) { + default: + goto bottom; + /*@notreached@*/ /*@switchbreak@*/ break; + case RPMRC_NOTTRUSTED: + case RPMRC_NOKEY: + case RPMRC_OK: + isSource = headerIsEntry(h, RPMTAG_SOURCEPACKAGE); + if (isSource) + goto bottom; + /*@switchbreak@*/ break; + } + + tidp = NULL; + /*@-branchstate@*/ + if (hge(h, tag, &type, (void **) &tidp, &count) && tidp != NULL) { + + idtx = IDTXgrow(idtx, 1); + if (idtx == NULL || idtx->idt == NULL) + goto bottom; + + { IDT idt; + idt = idtx->idt + idtx->nidt; + idt->h = headerLink(h); + idt->key = av[i]; + av[i] = NULL; + idt->instance = 0; + idt->val.u32 = *tidp; + } + idtx->nidt++; + } + /*@=branchstate@*/ +bottom: + h = headerFree(h); + } + + for (i = 0; i < ac; i++) + av[i] = _free(av[i]); + av = _free(av); ac = 0; + + return IDTXsort(idtx); +} + diff --git a/lib/idtx.h b/lib/idtx.h new file mode 100644 index 000000000..79276d031 --- /dev/null +++ b/lib/idtx.h @@ -0,0 +1,93 @@ +#ifndef H_RPMIDTX +#define H_RPMIDTX + +#include "system.h" +#include "rpmlib.h" + +/** + * * A rollback transaction id element. + * */ +/*@-fielduse@*/ +typedef /*@abstract@*/ struct IDT_s { + unsigned int instance; /*!< installed package transaction id. */ +/*@owned@*/ /*@null@*/ + const char * key; /*! removed package file name. */ + Header h; /*!< removed package header. */ + union { + uint_32 u32; /*!< install/remove transaction id */ + } val; +} * IDT; +/*@=fielduse@*/ + +/** + * A rollback transaction id index. + */ +typedef /*@abstract@*/ struct IDTindex_s { + int delta; /*!< no. elements to realloc as a chunk. */ + int size; /*!< size of id index element. */ + int alloced; /*!< current number of elements allocated. */ + int nidt; /*!< current number of elements initialized. */ +/*@only@*/ /*@null@*/ + IDT idt; /*!< id index elements. */ +} * IDTX; + +/** + * Destroy id index. + * @param idtx id index + * @return NULL always + */ +/*@null@*/ +IDTX IDTXfree(/*@only@*/ /*@null@*/ IDTX idtx) + /*@modifies idtx @*/; + +/** + * Create id index. + * @return new id index + */ +/*@only@*/ +IDTX IDTXnew(void) + /*@*/; + +/** + * Insure that index has room for "need" elements. + * @param idtx id index + * @param need additional no. of elements needed + * @return id index (with room for "need" elements) + */ +/*@only@*/ /*@null@*/ +IDTX IDTXgrow(/*@only@*/ /*@null@*/ IDTX idtx, int need) + /*@modifies idtx @*/; + +/** + * Sort tag (instance,value) pairs. + * @param idtx id index + * @return id index + */ +/*@only@*/ /*@null@*/ +IDTX IDTXsort(/*@only@*/ /*@null@*/ IDTX idtx) + /*@modifies idtx @*/; + +/** + * Load tag (instance,value) pairs from rpm databse, and return sorted id index. + * @param ts transaction set + * @param tag rpm tag + * @return id index + */ +/*@only@*/ /*@null@*/ +IDTX IDTXload(rpmts ts, rpmTag tag) + /*@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/ + /*@modifies ts, rpmGlobalMacroContext, fileSystem, internalState @*/; + +/** + * Load tag (instance,value) pairs from packages, and return sorted id index. + * @param ts transaction set + * @param globstr glob expression + * @param tag rpm tag + * @return id index + */ +/*@only@*/ /*@null@*/ +IDTX IDTXglob(rpmts ts, const char * globstr, rpmTag tag) + /*@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/ + /*@modifies ts, rpmGlobalMacroContext, fileSystem, internalState @*/; + +#endif /* H_RPMIDTX */ diff --git a/lib/misc.c b/lib/misc.c index 4c55d0bf2..686cc0c94 100644 --- a/lib/misc.c +++ b/lib/misc.c @@ -121,7 +121,7 @@ int dosetenv(const char * name, const char * value, int overwrite) int makeTempFile(const char * prefix, const char ** fnptr, FD_t * fdptr) { - const char * tpmacro = "%{?_tmppath:%{_tmppath}}%{!?_tmppath:/var/tmp}"; + const char * tpmacro = "%{?_tmppath:%{_tmppath}}%{!?_tmppath:" LOCALSTATEDIR "/tmp}"; const char * tempfn = NULL; const char * tfn = NULL; static int _initialized = 0; diff --git a/lib/poptALL.c b/lib/poptALL.c index e1c6e43fa..14b24619c 100644 --- a/lib/poptALL.c +++ b/lib/poptALL.c @@ -73,9 +73,6 @@ extern int _rpmps_debug; extern int _rpmsq_debug; /*@unchecked@*/ -extern int _rpmsx_debug; - -/*@unchecked@*/ extern int _rpmte_debug; /*@unchecked@*/ @@ -357,8 +354,6 @@ struct poptOption rpmcliAllPoptTable[] = { NULL, NULL}, { "rpmsqdebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_rpmsq_debug, -1, NULL, NULL}, - { "rpmsxdebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_rpmsx_debug, -1, - NULL, NULL}, { "rpmtedebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_rpmte_debug, -1, NULL, NULL}, { "rpmtsdebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_rpmts_debug, -1, @@ -409,7 +404,7 @@ rpmcliInit(int argc, char *const argv[], struct poptOption * optionsTable) } /*@=globs =mods@*/ -#if defined(ENABLE_NLS) && !defined(__LCLINT__) +#if defined(ENABLE_NLS) (void) setlocale(LC_ALL, "" ); (void) bindtextdomain(PACKAGE, LOCALEDIR); (void) textdomain(PACKAGE); diff --git a/lib/rpmcli.h b/lib/rpmcli.h index c24f518de..d972d9a29 100644 --- a/lib/rpmcli.h +++ b/lib/rpmcli.h @@ -9,6 +9,7 @@ #include "rpmurl.h" #include "rpmmacro.h" #include "argv.h" +#include "idtx.h" /** \ingroup rpmcli * Should version 3 packages be produced? @@ -606,98 +607,13 @@ int rpmInstall(rpmts ts, struct rpmInstallArguments_s * ia, * @param argv array of package file names (NULL terminated) * @return 0 on success */ + int rpmErase(rpmts ts, struct rpmInstallArguments_s * ia, /*@null@*/ const char ** argv) /*@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/ /*@modifies ts, ia, rpmGlobalMacroContext, fileSystem, internalState @*/; -/** - * A rollback transaction id element. - */ -/*@-fielduse@*/ -typedef /*@abstract@*/ struct IDT_s { - unsigned int instance; /*!< installed package transaction id. */ -/*@owned@*/ /*@null@*/ - const char * key; /*! removed package file name. */ - Header h; /*!< removed package header. */ - union { - uint_32 u32; /*!< install/remove transaction id */ - } val; -} * IDT; -/*@=fielduse@*/ - -/** - * A rollback transaction id index. - */ -typedef /*@abstract@*/ struct IDTindex_s { - int delta; /*!< no. elements to realloc as a chunk. */ - int size; /*!< size of id index element. */ - int alloced; /*!< current number of elements allocated. */ - int nidt; /*!< current number of elements initialized. */ -/*@only@*/ /*@null@*/ - IDT idt; /*!< id index elements. */ -} * IDTX; - -/** - * Destroy id index. - * @param idtx id index - * @return NULL always - */ -/*@null@*/ -IDTX IDTXfree(/*@only@*/ /*@null@*/ IDTX idtx) - /*@modifies idtx @*/; - -/** - * Create id index. - * @return new id index - */ -/*@only@*/ -IDTX IDTXnew(void) - /*@*/; - -/** - * Insure that index has room for "need" elements. - * @param idtx id index - * @param need additional no. of elements needed - * @return id index (with room for "need" elements) - */ -/*@only@*/ /*@null@*/ -IDTX IDTXgrow(/*@only@*/ /*@null@*/ IDTX idtx, int need) - /*@modifies idtx @*/; - -/** - * Sort tag (instance,value) pairs. - * @param idtx id index - * @return id index - */ -/*@only@*/ /*@null@*/ -IDTX IDTXsort(/*@only@*/ /*@null@*/ IDTX idtx) - /*@modifies idtx @*/; - -/** - * Load tag (instance,value) pairs from rpm databse, and return sorted id index. - * @param ts transaction set - * @param tag rpm tag - * @return id index - */ -/*@only@*/ /*@null@*/ -IDTX IDTXload(rpmts ts, rpmTag tag) - /*@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/ - /*@modifies ts, rpmGlobalMacroContext, fileSystem, internalState @*/; - -/** - * Load tag (instance,value) pairs from packages, and return sorted id index. - * @param ts transaction set - * @param globstr glob expression - * @param tag rpm tag - * @return id index - */ -/*@only@*/ /*@null@*/ -IDTX IDTXglob(rpmts ts, const char * globstr, rpmTag tag) - /*@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/ - /*@modifies ts, rpmGlobalMacroContext, fileSystem, internalState @*/; - /** \ingroup rpmcli * Rollback transactions, erasing new, reinstalling old, package(s). * @param ts transaction set diff --git a/lib/rpmfi.c b/lib/rpmfi.c index 3cca3bc18..acd4185f8 100644 --- a/lib/rpmfi.c +++ b/lib/rpmfi.c @@ -16,8 +16,6 @@ #define _RPMFI_INTERNAL #include "rpmfi.h" -#include "rpmsx.h" - #define _RPMTE_INTERNAL /* relocations */ #include "rpmte.h" #include "rpmts.h" @@ -1380,7 +1378,6 @@ if (fi->actions == NULL) xx = hge(h, RPMTAG_FILEMTIMES, NULL, (void **) &fi->fmtimes, NULL); xx = hge(h, RPMTAG_FILERDEVS, NULL, (void **) &fi->frdevs, NULL); xx = hge(h, RPMTAG_FILEINODES, NULL, (void **) &fi->finodes, NULL); - xx = hge(h, RPMTAG_FILECONTEXTS, NULL, (void **) &fi->fcontexts, NULL); fi->replacedSizes = xcalloc(fi->fc, sizeof(*fi->replacedSizes)); @@ -1561,209 +1558,6 @@ exit: if (fcp) *fcp = ac; } -void rpmfiBuildFContexts(Header h, - /*@out@*/ const char *** fcontextp, /*@out@*/ int * fcp) -{ - int scareMem = 0; - rpmfi fi = rpmfiNew(NULL, h, RPMTAG_BASENAMES, scareMem); - const char * fcontext; - const char ** av; - int ac; - size_t nb; - char * t; - - if ((ac = rpmfiFC(fi)) <= 0) { - av = NULL; - ac = 0; - goto exit; - } - - /* Compute size of argv array blob. */ - nb = (ac + 1) * sizeof(*av); - fi = rpmfiInit(fi, 0); - if (fi != NULL) - while (rpmfiNext(fi) >= 0) { - fcontext = rpmfiFContext(fi); - if (fcontext && *fcontext != '\0') - nb += strlen(fcontext); - nb += 1; - } - - /* Create and load argv array. */ - av = xmalloc(nb); - t = ((char *) av) + ((ac + 1) * sizeof(*av)); - ac = 0; - fi = rpmfiInit(fi, 0); - if (fi != NULL) - while (rpmfiNext(fi) >= 0) { - fcontext = rpmfiFContext(fi); - av[ac++] = t; - if (fcontext && *fcontext != '\0') - t = stpcpy(t, fcontext); - *t++ = '\0'; - } - av[ac] = NULL; /* XXX tag arrays are not NULL terminated. */ - /*@=branchstate@*/ - -exit: - fi = rpmfiFree(fi); - /*@-branchstate@*/ - if (fcontextp) - *fcontextp = av; - else - av = _free(av); - /*@=branchstate@*/ - if (fcp) *fcp = ac; -} - -void rpmfiBuildFSContexts(Header h, - /*@out@*/ const char *** fcontextp, /*@out@*/ int * fcp) -{ - int scareMem = 0; - rpmfi fi = rpmfiNew(NULL, h, RPMTAG_BASENAMES, scareMem); - const char ** av; - int ac; - size_t nb; - char * t; - char * fctxt = NULL; - size_t fctxtlen = 0; - int * fcnb; - - if ((ac = rpmfiFC(fi)) <= 0) { - av = NULL; - ac = 0; - goto exit; - } - - /* Compute size of argv array blob, concatenating file contexts. */ - nb = ac * sizeof(*fcnb); - fcnb = memset(alloca(nb), 0, nb); - ac = 0; - fi = rpmfiInit(fi, 0); - if (fi != NULL) - while (rpmfiNext(fi) >= 0) { - const char * fn = rpmfiFN(fi); - security_context_t scon; - - fcnb[ac] = lgetfilecon(fn, &scon); -/*@-branchstate@*/ - if (fcnb[ac] > 0) { - fctxt = xrealloc(fctxt, fctxtlen + fcnb[ac]); - memcpy(fctxt+fctxtlen, scon, fcnb[ac]); - fctxtlen += fcnb[ac]; - freecon(scon); - } -/*@=branchstate@*/ - ac++; - } - - /* Create and load argv array from concatenated file contexts. */ - nb = (ac + 1) * sizeof(*av) + fctxtlen; - av = xmalloc(nb); - t = ((char *) av) + ((ac + 1) * sizeof(*av)); - if (fctxt != NULL && fctxtlen > 0) - (void) memcpy(t, fctxt, fctxtlen); - ac = 0; - fi = rpmfiInit(fi, 0); - if (fi != NULL) - while (rpmfiNext(fi) >= 0) { - av[ac] = ""; - if (fcnb[ac] > 0) { - av[ac] = t; - t += fcnb[ac]; - } - ac++; - } - av[ac] = NULL; /* XXX tag arrays are not NULL terminated. */ - -exit: - fi = rpmfiFree(fi); - /*@-branchstate@*/ - if (fcontextp) - *fcontextp = av; - else - av = _free(av); - /*@=branchstate@*/ - if (fcp) *fcp = ac; -} - -void rpmfiBuildREContexts(Header h, - /*@out@*/ const char *** fcontextp, /*@out@*/ int * fcp) -{ - int scareMem = 0; - rpmfi fi = rpmfiNew(NULL, h, RPMTAG_BASENAMES, scareMem); - rpmsx sx = NULL; - const char ** av = NULL; - int ac; - size_t nb; - char * t; - char * fctxt = NULL; - size_t fctxtlen = 0; - int * fcnb; - - if ((ac = rpmfiFC(fi)) <= 0) { - ac = 0; - goto exit; - } - - /* Read security context patterns. */ - sx = rpmsxNew(NULL); - - /* Compute size of argv array blob, concatenating file contexts. */ - nb = ac * sizeof(*fcnb); - fcnb = memset(alloca(nb), 0, nb); - ac = 0; - fi = rpmfiInit(fi, 0); - if (fi != NULL) - while (rpmfiNext(fi) >= 0) { - const char * fn = rpmfiFN(fi); - mode_t fmode = rpmfiFMode(fi); - const char * scon; - - scon = rpmsxFContext(sx, fn, fmode); - if (scon != NULL) { - fcnb[ac] = strlen(scon) + 1; -/*@-branchstate@*/ - if (fcnb[ac] > 0) { - fctxt = xrealloc(fctxt, fctxtlen + fcnb[ac]); - memcpy(fctxt+fctxtlen, scon, fcnb[ac]); - fctxtlen += fcnb[ac]; - } -/*@=branchstate@*/ - } - ac++; - } - - /* Create and load argv array from concatenated file contexts. */ - nb = (ac + 1) * sizeof(*av) + fctxtlen; - av = xmalloc(nb); - t = ((char *) av) + ((ac + 1) * sizeof(*av)); - (void) memcpy(t, fctxt, fctxtlen); - ac = 0; - fi = rpmfiInit(fi, 0); - if (fi != NULL) - while (rpmfiNext(fi) >= 0) { - av[ac] = ""; - if (fcnb[ac] > 0) { - av[ac] = t; - t += fcnb[ac]; - } - ac++; - } - av[ac] = NULL; /* XXX tag arrays are not NULL terminated. */ - -exit: - fi = rpmfiFree(fi); - sx = rpmsxFree(sx); - /*@-branchstate@*/ - if (fcontextp) - *fcontextp = av; - else - av = _free(av); - /*@=branchstate@*/ - if (fcp) *fcp = ac; -} - void rpmfiBuildFDeps(Header h, rpmTag tagN, /*@out@*/ const char *** fdepsp, /*@out@*/ int * fcp) { diff --git a/lib/rpmfi.h b/lib/rpmfi.h index 2e28afece..f6135d598 100644 --- a/lib/rpmfi.h +++ b/lib/rpmfi.h @@ -533,47 +533,6 @@ void rpmfiBuildFClasses(Header h, /*@globals rpmGlobalMacroContext, h_errno, fileSystem @*/ /*@modifies h, *fclassp, *fcp, rpmGlobalMacroContext, fileSystem @*/; -/** - * Retrieve file security contexts from header. - * - * This function is used to retrieve file contexts from the header. - * - * @param h header - * @retval *fcontextp array of file contexts - * @retval *fcp number of files - */ -void rpmfiBuildFContexts(Header h, - /*@out@*/ const char *** fcontextp, /*@out@*/ int * fcp) - /*@globals rpmGlobalMacroContext, h_errno, fileSystem @*/ - /*@modifies h, *fcontextp, *fcp, rpmGlobalMacroContext, fileSystem @*/; - -/** - * Retrieve file security contexts from file system. - * - * This function is used to retrieve file contexts from the file system. - * - * @param h header - * @retval *fcontextp array of file contexts - * @retval *fcp number of files - */ -void rpmfiBuildFSContexts(Header h, - /*@out@*/ const char *** fcontextp, /*@out@*/ int * fcp) - /*@globals rpmGlobalMacroContext, h_errno, fileSystem @*/ - /*@modifies h, *fcontextp, *fcp, rpmGlobalMacroContext, fileSystem @*/; - -/** - * Retrieve file security contexts from policy RE's. - * - * This function is used to retrieve file contexts from policy RE's. - * - * @param h header - * @retval *fcontextp array of file contexts - * @retval *fcp number of files - */ -void rpmfiBuildREContexts(Header h, - /*@out@*/ const char *** fcontextp, /*@out@*/ int * fcp) - /*@globals rpmGlobalMacroContext, h_errno, fileSystem @*/ - /*@modifies h, *fcontextp, *fcp, rpmGlobalMacroContext, fileSystem @*/; /** * Retrieve per-file dependencies from header. diff --git a/lib/rpminstall.c b/lib/rpminstall.c index 3d9906297..2606e89f1 100644 --- a/lib/rpminstall.c +++ b/lib/rpminstall.c @@ -307,19 +307,6 @@ int rpmInstall(rpmts ts, if (rpmExpandNumeric("%{?_repackage_all_erasures}")) ia->transFlags |= RPMTRANS_FLAG_REPACKAGE; - /* Initialize security context patterns (if not already done). */ - if (!(ia->transFlags & RPMTRANS_FLAG_NOCONTEXTS)) { - rpmsx sx = rpmtsREContext(ts); - if (sx == NULL) { - const char *fn = rpmGetPath("%{?_install_file_context_path}", NULL); - if (fn != NULL && *fn != '\0') { - sx = rpmsxNew(fn); - (void) rpmtsSetREContext(ts, sx); - } - fn = _free(fn); - } - sx = rpmsxFree(sx); - } (void) rpmtsSetFlags(ts, ia->transFlags); probFilter = ia->probFilter; @@ -905,189 +892,6 @@ int rpmInstallSource(rpmts ts, const char * arg, return rc; } -/*@unchecked@*/ -static int reverse = -1; - -/** - */ -static int IDTintcmp(const void * a, const void * b) - /*@*/ -{ - /*@-castexpose@*/ - return ( reverse * (((IDT)a)->val.u32 - ((IDT)b)->val.u32) ); - /*@=castexpose@*/ -} - -IDTX IDTXfree(IDTX idtx) -{ - if (idtx) { - int i; - if (idtx->idt) - for (i = 0; i < idtx->nidt; i++) { - IDT idt = idtx->idt + i; - idt->h = headerFree(idt->h); - idt->key = _free(idt->key); - } - idtx->idt = _free(idtx->idt); - idtx = _free(idtx); - } - return NULL; -} - -IDTX IDTXnew(void) -{ - IDTX idtx = xcalloc(1, sizeof(*idtx)); - idtx->delta = 10; - idtx->size = sizeof(*((IDT)0)); - return idtx; -} - -IDTX IDTXgrow(IDTX idtx, int need) -{ - if (need < 0) return NULL; - if (idtx == NULL) - idtx = IDTXnew(); - if (need == 0) return idtx; - - if ((idtx->nidt + need) > idtx->alloced) { - while (need > 0) { - idtx->alloced += idtx->delta; - need -= idtx->delta; - } - idtx->idt = xrealloc(idtx->idt, (idtx->alloced * idtx->size) ); - } - return idtx; -} - -IDTX IDTXsort(IDTX idtx) -{ - if (idtx != NULL && idtx->idt != NULL && idtx->nidt > 0) - qsort(idtx->idt, idtx->nidt, idtx->size, IDTintcmp); - return idtx; -} - -IDTX IDTXload(rpmts ts, rpmTag tag) -{ - IDTX idtx = NULL; - rpmdbMatchIterator mi; - HGE_t hge = (HGE_t) headerGetEntry; - Header h; - - /*@-branchstate@*/ - mi = rpmtsInitIterator(ts, tag, NULL, 0); -#ifdef NOTYET - (void) rpmdbSetIteratorRE(mi, RPMTAG_NAME, RPMMIRE_DEFAULT, '!gpg-pubkey'); -#endif - while ((h = rpmdbNextIterator(mi)) != NULL) { - rpmTagType type = RPM_NULL_TYPE; - int_32 count = 0; - int_32 * tidp; - - tidp = NULL; - if (!hge(h, tag, &type, (void **)&tidp, &count) || tidp == NULL) - continue; - - if (type == RPM_INT32_TYPE && (*tidp == 0 || *tidp == -1)) - continue; - - idtx = IDTXgrow(idtx, 1); - if (idtx == NULL) - continue; - if (idtx->idt == NULL) - continue; - - { IDT idt; - /*@-nullderef@*/ - idt = idtx->idt + idtx->nidt; - /*@=nullderef@*/ - idt->h = headerLink(h); - idt->key = NULL; - idt->instance = rpmdbGetIteratorOffset(mi); - idt->val.u32 = *tidp; - } - idtx->nidt++; - } - mi = rpmdbFreeIterator(mi); - /*@=branchstate@*/ - - return IDTXsort(idtx); -} - -IDTX IDTXglob(rpmts ts, const char * globstr, rpmTag tag) -{ - IDTX idtx = NULL; - HGE_t hge = (HGE_t) headerGetEntry; - Header h; - int_32 * tidp; - FD_t fd; - const char ** av = NULL; - int ac = 0; - rpmRC rpmrc; - int xx; - int i; - - av = NULL; ac = 0; - xx = rpmGlob(globstr, &ac, &av); - - if (xx == 0) - for (i = 0; i < ac; i++) { - rpmTagType type; - int_32 count; - int isSource; - - fd = Fopen(av[i], "r.ufdio"); - if (fd == NULL || Ferror(fd)) { - rpmError(RPMERR_OPEN, _("open of %s failed: %s\n"), av[i], - Fstrerror(fd)); - if (fd != NULL) (void) Fclose(fd); - continue; - } - - rpmrc = rpmReadPackageFile(ts, fd, av[i], &h); - (void) Fclose(fd); - switch (rpmrc) { - default: - goto bottom; - /*@notreached@*/ /*@switchbreak@*/ break; - case RPMRC_NOTTRUSTED: - case RPMRC_NOKEY: - case RPMRC_OK: - isSource = headerIsEntry(h, RPMTAG_SOURCEPACKAGE); - if (isSource) - goto bottom; - /*@switchbreak@*/ break; - } - - tidp = NULL; - /*@-branchstate@*/ - if (hge(h, tag, &type, (void **) &tidp, &count) && tidp != NULL) { - - idtx = IDTXgrow(idtx, 1); - if (idtx == NULL || idtx->idt == NULL) - goto bottom; - - { IDT idt; - idt = idtx->idt + idtx->nidt; - idt->h = headerLink(h); - idt->key = av[i]; - av[i] = NULL; - idt->instance = 0; - idt->val.u32 = *tidp; - } - idtx->nidt++; - } - /*@=branchstate@*/ -bottom: - h = headerFree(h); - } - - for (i = 0; i < ac; i++) - av[i] = _free(av[i]); - av = _free(av); ac = 0; - - return IDTXsort(idtx); -} - /** @todo Transaction handling, more, needs work. */ int rpmRollback(rpmts ts, struct rpmInstallArguments_s * ia, const char ** argv) { diff --git a/lib/rpmlib.h b/lib/rpmlib.h index 33daaa4c0..ea8794494 100644 --- a/lib/rpmlib.h +++ b/lib/rpmlib.h @@ -430,7 +430,7 @@ typedef enum rpmTag_e { RPMTAG_FILEDEPENDSN = 1144, /* i[] */ RPMTAG_DEPENDSDICT = 1145, /* i[] */ RPMTAG_SOURCEPKGID = 1146, /* x */ - RPMTAG_FILECONTEXTS = 1147, /* s[] */ + RPMTAG_FILECONTEXTS = 1147, /* s[] - obsolete */ RPMTAG_FSCONTEXTS = 1148, /* s[] extension */ RPMTAG_RECONTEXTS = 1149, /* s[] extension */ RPMTAG_POLICIES = 1150, /* s[] selinux *.te policy file. */ diff --git a/lib/rpmlock.c b/lib/rpmlock.c index 30a6c8852..c493e88ae 100644 --- a/lib/rpmlock.c +++ b/lib/rpmlock.c @@ -11,7 +11,7 @@ /* Internal interface */ -#define RPMLOCK_PATH "/var/lock/rpm/transaction" +#define RPMLOCK_PATH LOCALSTATEDIR "/lock/rpm/transaction" /*@unchecked@*/ /*@observer@*/ static const char * rpmlock_path_default = "%{?_rpmlock_path}"; /*@unchecked@*/ diff --git a/lib/rpmrc.c b/lib/rpmrc.c index beca93769..32b6e3204 100644 --- a/lib/rpmrc.c +++ b/lib/rpmrc.c @@ -535,16 +535,16 @@ static void setDefaults(void) { addMacro(NULL, "_usr", NULL, "/usr", RMIL_DEFAULT); - addMacro(NULL, "_var", NULL, "/var", RMIL_DEFAULT); + addMacro(NULL, "_var", NULL, LOCALSTATEDIR, RMIL_DEFAULT); addMacro(NULL, "_preScriptEnvironment",NULL, prescriptenviron,RMIL_DEFAULT); setVarDefault(-1, "_topdir", "/usr/src/redhat", "%{_usr}/src/redhat"); setVarDefault(-1, "_tmppath", - "/var/tmp", "%{_var}/tmp"); + LOCALSTATEDIR "/tmp", "%{_var}/tmp"); setVarDefault(-1, "_dbpath", - "/var/lib/rpm", "%{_var}/lib/rpm"); + LOCALSTATEDIR "/lib/rpm", "%{_var}/lib/rpm"); setVarDefault(-1, "_defaultdocdir", "/usr/doc", "%{_usr}/doc"); @@ -679,16 +679,6 @@ static int doReadRC( /*@killref@*/ FD_t fd, const char * urlfn) if (rc) return rc; continue; /* XXX don't save include value as var/macro */ } /*@notreached@*/ /*@switchbreak@*/ break; - case RPMVAR_MACROFILES: - fn = rpmGetPath(se, NULL); - if (fn == NULL || *fn == '\0') { - rpmError(RPMERR_RPMRC, _("%s expansion failed at %s:%d \"%s\"\n"), - option->name, urlfn, linenum, fn); - fn = _free(fn); - return 1; - } - se = (char *)fn; - /*@switchbreak@*/ break; case RPMVAR_PROVIDES: { char *t; s = rpmGetVar(RPMVAR_PROVIDES); @@ -905,9 +895,6 @@ exit: static inline void cpuid(unsigned int op, int *eax, int *ebx, int *ecx, int *edx) /*@modifies *eax, *ebx, *ecx, *edx @*/ { -#ifdef __LCLINT__ - *eax = *ebx = *ecx = *edx = 0; -#endif asm volatile ( "pushl %%ebx \n" "cpuid \n" @@ -1850,16 +1837,6 @@ static int rpmReadRC(/*@null@*/ const char * rcfiles) rpmSetMachine(NULL, NULL); /* XXX WTFO? Why bother? */ - { const char *mfpath; - /*@-branchstate@*/ - if ((mfpath = rpmGetVar(RPMVAR_MACROFILES)) != NULL) { - mfpath = xstrdup(mfpath); - rpmInitMacros(NULL, mfpath); - mfpath = _free(mfpath); - } - /*@=branchstate@*/ - } - return rc; } @@ -1873,6 +1850,12 @@ int rpmReadConfigFiles(const char * file, const char * target) /* Read the files */ if (rpmReadRC(file)) return -1; + if (macrofiles != NULL) { + const char *mf = rpmGetPath(macrofiles, NULL); + rpmInitMacros(NULL, mf); + _free(mf); + } + /* Reset target macros */ rpmRebuildTargetVars(&target, NULL); /*@=nullstate@*/ diff --git a/lib/rpmsx.c b/lib/rpmsx.c deleted file mode 100644 index 1eebaee68..000000000 --- a/lib/rpmsx.c +++ /dev/null @@ -1,709 +0,0 @@ -/** \ingroup rpmdep - * \file lib/rpmsx.c - */ -#include "system.h" - -#include <rpmlib.h> -#include <rpmmacro.h> /* for rpmGetPath() */ - -#define _RPMSX_INTERNAL -#include "rpmsx.h" - -#include "debug.h" - -/*@access regex_t @*/ - -/*@unchecked@*/ -int _rpmsx_debug = 0; - -/** - * Stable sort for policy specifications, patterns before paths. - * @param sx security context patterns - */ -static void rpmsxSort(rpmsx sx) - /*@modifies sx @*/ -{ - rpmsxp sxp; - int i, j; - - /* Stable sort for policy regex's and paths. */ - sxp = xmalloc(sizeof(*sxp) * sx->Count); - - /* Regex patterns first ... */ - j = 0; - for (i = 0; i < sx->Count; i++) { - if (!sx->sxp[i].hasMetaChars) - continue; - memcpy(sxp + j, sx->sxp + i, sizeof(*sxp)); - j++; - } - - /* ... then file paths. */ - for (i = 0; i < sx->Count; i++) { - if (sx->sxp[i].hasMetaChars) - continue; - memcpy(sxp + j, sx->sxp + i, sizeof(*sxp)); - j++; - } - - sx->sxp = _free(sx->sxp); - sx->sxp = sxp; -/*@-compdef@*/ /* XXX *(sx->sxp) annotation */ - return; -/*@=compdef@*/ -} - -/* Determine if the regular expression specification has any meta characters. */ -static void rpmsxpHasMetaChars(rpmsxp sxp) - /*@modifies sxp @*/ -{ - const char * s = sxp->pattern; - size_t ns = strlen(s); - const char * se = s + ns; - - sxp->hasMetaChars = 0; - - /* Look at each character in the RE specification string for a - * meta character. Return when any meta character reached. */ - while (s != se) { - switch(*s) { - case '.': - case '^': - case '$': - case '?': - case '*': - case '+': - case '|': - case '[': - case '(': - case '{': - sxp->hasMetaChars = 1; - return; - /*@notreached@*/ /*@switchbreak@*/ break; - case '\\': /* skip the next character */ - s++; - /*@switchbreak@*/ break; - default: - /*@switchbreak@*/ break; - - } - s++; - } - return; -} - -/** - * Return the length of the text that can be considered the stem. - * @return stem length, 0 if no identifiable stem - */ -static size_t rpmsxsPStem(const char * const buf) - /*@*/ -{ - /*@observer@*/ - static const char * const regex_chars = ".^$?*+|[({"; - const char * tmp = strchr(buf, '/'); - const char * ind; - - if (!tmp) - return 0; - - for (ind = buf; ind < tmp; ind++) { - if (strchr(regex_chars, (int)*ind)) - return 0; - } - return tmp - buf; -} - -/** - * Return the length of the text that is the stem of a file name. - * @return stem length, 0 if no identifiable stem - */ -static size_t rpmsxsFStem(const char * const buf) - /*@*/ -{ - const char * tmp = strchr(buf + 1, '/'); - - if (!tmp) - return 0; - return tmp - buf; -} - -/** - * Find (or create) the stem of a file spec. - * Error iff a file in the root directory or a regex that is too complex. - * - * @retval *bpp ptr to text after stem. - * @return stem index, -1 on error - */ -static int rpmsxAdd(rpmsx sx, const char ** bpp) - /*@modifies sx, *bpp @*/ -{ - size_t stem_len = rpmsxsPStem(*bpp); - rpmsxs sxs; - int i; - - if (!stem_len) - return -1; - for (i = 0; i < sx->nsxs; i++) { - sxs = sx->sxs + i; - if (stem_len != sxs->len) - continue; - if (strncmp(*bpp, sxs->stem, stem_len)) - continue; - *bpp += stem_len; - return i; - } - - if (sx->nsxs == sx->maxsxs) { - sx->maxsxs = sx->maxsxs * 2 + 16; - sx->sxs = xrealloc(sx->sxs, sizeof(*sx->sxs) * sx->maxsxs); - } - sxs = sx->sxs + sx->nsxs; - sxs->len = stem_len; -#ifdef HAVE_STRNDUP -/*@i@*/ sxs->stem = strndup(*bpp, stem_len); -#else - sxs->stem = xmalloc(stem_len+1); - strncpy(sxs->stem, *bpp, stem_len); -#endif - sx->nsxs++; - *bpp += stem_len; - return sx->nsxs - 1; -} - -/** - * Find the stem of a file name. - * Error iff a file in the root directory or a regex that is too complex. - * - * @param sx security context patterns - * @retval *bpp ptr to text after stem. - * @return stem index, -1 on error - */ -static int rpmsxFind(/*@null@*/ const rpmsx sx, const char ** bpp) - /*@modifies *bpp @*/ -{ - size_t stem_len = rpmsxsFStem(*bpp); - rpmsxs sxs; - int i; - - if (sx != NULL && stem_len > 0) - for (i = 0; i < sx->nsxs; i++) { - sxs = sx->sxs + i; - if (stem_len != sxs->len) - continue; -/*@i@*/ if (strncmp(*bpp, sxs->stem, stem_len)) - continue; - *bpp += stem_len; - return i; - } - return -1; -} - -rpmsx XrpmsxUnlink(rpmsx sx, const char * msg, const char * fn, unsigned ln) -{ - if (sx == NULL) return NULL; -/*@-modfilesys@*/ -if (_rpmsx_debug && msg != NULL) -fprintf(stderr, "--> sx %p -- %d %s at %s:%u\n", sx, sx->nrefs, msg, fn, ln); -/*@=modfilesys@*/ - sx->nrefs--; - return NULL; -} - -rpmsx XrpmsxLink(rpmsx sx, const char * msg, const char * fn, unsigned ln) -{ - if (sx == NULL) return NULL; - sx->nrefs++; - -/*@-modfilesys@*/ -if (_rpmsx_debug && msg != NULL) -fprintf(stderr, "--> sx %p ++ %d %s at %s:%u\n", sx, sx->nrefs, msg, fn, ln); -/*@=modfilesys@*/ - - /*@-refcounttrans@*/ return sx; /*@=refcounttrans@*/ -} - -rpmsx rpmsxFree(rpmsx sx) -{ - int i; - - if (sx == NULL) - return NULL; - - if (sx->nrefs > 1) - return rpmsxUnlink(sx, __func__); - -/*@-modfilesys@*/ -if (_rpmsx_debug < 0) -fprintf(stderr, "*** sx %p\t%s[%d]\n", sx, __func__, sx->Count); -/*@=modfilesys@*/ - - /*@-branchstate@*/ - if (sx->Count > 0) - for (i = 0; i < sx->Count; i++) { - rpmsxp sxp = sx->sxp + i; - sxp->pattern = _free(sxp->pattern); - sxp->type = _free(sxp->type); - sxp->context = _free(sxp->context); -/*@i@*/ regfree(sxp->preg); -/*@i@*/ sxp->preg = _free(sxp->preg); - } - sx->sxp = _free(sx->sxp); - - if (sx->nsxs > 0) - for (i = 0; i < sx->nsxs; i++) { - rpmsxs sxs = sx->sxs + i; - sxs->stem = _free(sxs->stem); - } - sx->sxs = _free(sx->sxs); - /*@=branchstate@*/ - - (void) rpmsxUnlink(sx, __func__); - /*@-refcounttrans -usereleased@*/ -/*@-boundswrite@*/ - memset(sx, 0, sizeof(*sx)); /* XXX trash and burn */ -/*@=boundswrite@*/ - sx = _free(sx); - /*@=refcounttrans =usereleased@*/ - return NULL; -} - -/** - * Check for duplicate specifications. If a duplicate specification is found - * and the context is the same, give a warning to the user. If a duplicate - * specification is found and the context is different, give a warning - * to the user (This could be changed to error). Return of non-zero is an error. - * - * @param sx security context patterns - * @return 0 on success - */ -static int rpmsxpCheckNoDupes(const rpmsx sx) - /*@*/ -{ - int i, j; - int rc = 0; - - for (i = 0; i < sx->Count; i++) { - rpmsxp sxpi = sx->sxp + i; - for (j = i + 1; j < sx->Count; j++) { - rpmsxp sxpj = sx->sxp + j; - - /* Check if same RE string */ - if (strcmp(sxpj->pattern, sxpi->pattern)) - /*@innercontinue@*/ continue; - if (sxpj->fmode && sxpi->fmode && sxpj->fmode != sxpi->fmode) - /*@innercontinue@*/ continue; - - /* Same RE string found */ - if (strcmp(sxpj->context, sxpi->context)) { - /* If different contexts, give warning */ -/*@-modfilesys@*/ - fprintf(stderr, - "ERROR: Multiple different specifications for %s (%s and %s).\n", - sxpi->pattern, sxpj->context, sxpi->context); -/*@=modfilesys@*/ - rc = -1; - } else { - /* If same contexts give warning */ -/*@-modfilesys@*/ - fprintf(stderr, - "WARNING: Multiple same specifications for %s.\n", - sxpi->pattern); -/*@=modfilesys@*/ - } - } - } - return rc; -} - -int rpmsxParse(rpmsx sx, const char * fn) -{ - FILE * fp; - char buf[BUFSIZ + 1]; - char * bp; - char * regex; - char * type; - char * context; - char * anchored_regex; - int items; - int len; - int lineno; - int pass; - int regerr; - int nerr = 0; - -#define inc_err() nerr++ - -/*@-branchstate@*/ - if (fn == NULL) - fn = "%{?__file_context_path}"; -/*@=branchstate@*/ - - { const char * myfn = rpmGetPath(fn, NULL); - - if (myfn == NULL || *myfn == '\0' - || (fp = fopen(myfn, "r")) == NULL) - { - myfn = _free(myfn); - return -1; - } - myfn = _free(myfn); - } - - /* - * Perform two passes over the specification file. - * The first pass counts the number of specifications and - * performs simple validation of the input. At the end - * of the first pass, the spec array is allocated. - * The second pass performs detailed validation of the input - * and fills in the spec array. - */ -/*@-branchstate@*/ - for (pass = 0; pass < 2; pass++) { - rpmsxp sxp; - - lineno = 0; - sx->Count = 0; - sxp = sx->sxp; - while (fgets(buf, sizeof(buf)-1, fp)) { - buf[sizeof(buf)-1] = '\0'; - lineno++; - len = strlen(buf); - if (buf[len - 1] != '\n') { - fprintf(stderr, - _("%s: no newline on line number %d (only read %s)\n"), - fn, lineno, buf); - inc_err(); - /*@innercontinue@*/ continue; - } - buf[len - 1] = 0; - bp = buf; - while (isspace(*bp)) - bp++; - /* Skip comment lines and empty lines. */ - if (*bp == '#' || *bp == 0) - /*@innercontinue@*/ continue; -/*@-formatcode@*/ - items = sscanf(buf, "%as %as %as", ®ex, &type, &context); -/*@=formatcode@*/ - if (items < 2) { - fprintf(stderr, - _("%s: line number %d is missing fields (only read %s)\n"), - fn, lineno, buf); - inc_err(); - if (items == 1) - free(regex); - /*@innercontinue@*/ continue; - } else if (items == 2) { - /* The type field is optional. */ - free(context); - context = type; - type = 0; - } - - /* On pass 2, compile and store the specification. */ - if (pass == 1) { - const char * reg_buf = regex; - sxp->fstem = rpmsxAdd(sx, ®_buf); - sxp->pattern = regex; - - /* Anchor the regular expression. */ - len = strlen(reg_buf); - anchored_regex = xmalloc(len + 3); - sprintf(anchored_regex, "^%s$", reg_buf); - - /* Compile the regular expression. */ -/*@i@*/ sxp->preg = xcalloc(1, sizeof(*sxp->preg)); - regerr = regcomp(sxp->preg, anchored_regex, - REG_EXTENDED | REG_NOSUB); - if (regerr < 0) { - char errbuf[BUFSIZ + 1]; - (void) regerror(regerr, sxp->preg, errbuf, sizeof(errbuf)-1); - errbuf[sizeof(errbuf)-1] = '\0'; - fprintf(stderr, - _("%s: unable to compile regular expression %s on line number %d: %s\n"), - fn, regex, lineno, - errbuf); - inc_err(); - } - free(anchored_regex); - - /* Convert the type string to a mode format */ - sxp->type = type; - sxp->fmode = 0; - if (!type) - goto skip_type; - len = strlen(type); - if (type[0] != '-' || len != 2) { - fprintf(stderr, - _("%s: invalid type specifier %s on line number %d\n"), - fn, type, lineno); - inc_err(); - goto skip_type; - } - switch (type[1]) { - case 'b': sxp->fmode = S_IFBLK; /*@switchbreak@*/ break; - case 'c': sxp->fmode = S_IFCHR; /*@switchbreak@*/ break; - case 'd': sxp->fmode = S_IFDIR; /*@switchbreak@*/ break; - case 'p': sxp->fmode = S_IFIFO; /*@switchbreak@*/ break; - case 'l': sxp->fmode = S_IFLNK; /*@switchbreak@*/ break; -/*@i@*/ case 's': sxp->fmode = S_IFSOCK; /*@switchbreak@*/ break; - case '-': sxp->fmode = S_IFREG; /*@switchbreak@*/ break; - default: - fprintf(stderr, - _("%s: invalid type specifier %s on line number %d\n"), - fn, type, lineno); - inc_err(); - /*@switchbreak@*/ break; - } - - skip_type: - - sxp->context = context; - - if (strcmp(context, "<<none>>")) { - if (security_check_context(context) < 0 && errno != ENOENT) { - fprintf(stderr, - _("%s: invalid context %s on line number %d\n"), - fn, context, lineno); - inc_err(); - } - } - - /* Determine if specification has - * any meta characters in the RE */ - rpmsxpHasMetaChars(sxp); - sxp++; - } - - sx->Count++; - if (pass == 0) { -/*@-kepttrans@*/ - free(regex); - if (type) - free(type); - free(context); -/*@=kepttrans@*/ - } - } - - if (nerr) { - (void) fclose(fp); - return -1; - } - - if (pass == 0) { - if (sx->Count == 0) { - (void) fclose(fp); - return 0; - } - sx->sxp = xcalloc(sx->Count, sizeof(*sx->sxp)); - rewind(fp); - } - } -/*@=branchstate@*/ - (void) fclose(fp); - - /* Stable sort for policy specifications, patterns before paths. */ - rpmsxSort(sx); - - /* Verify no exact duplicates */ - if (rpmsxpCheckNoDupes(sx) != 0) - return -1; - - return 0; - -} - -rpmsx rpmsxNew(const char * fn) -{ - rpmsx sx; - - sx = xcalloc(1, sizeof(*sx)); - sx->sxp = NULL; - sx->Count = 0; - sx->i = -1; - sx->sxs = NULL; - sx->nsxs = 0; - sx->maxsxs = 0; - sx->reverse = 0; - - (void) rpmsxLink(sx, __func__); - - if (rpmsxParse(sx, fn) != 0) - return rpmsxFree(sx); - - return sx; -} - -int rpmsxCount(const rpmsx sx) -{ - return (sx != NULL ? sx->Count : 0); -} - -int rpmsxIx(const rpmsx sx) -{ - return (sx != NULL ? sx->i : -1); -} - -int rpmsxSetIx(rpmsx sx, int ix) -{ - int i = -1; - - if (sx != NULL) { - i = sx->i; - sx->i = ix; - } - return i; -} - -const char * rpmsxPattern(const rpmsx sx) -{ - const char * pattern = NULL; - - if (sx != NULL && sx->i >= 0 && sx->i < sx->Count) - pattern = (sx->sxp + sx->i)->pattern; - return pattern; -} - -const char * rpmsxType(const rpmsx sx) -{ - const char * type = NULL; - - if (sx != NULL && sx->i >= 0 && sx->i < sx->Count) - type = (sx->sxp + sx->i)->type; - return type; -} - -const char * rpmsxContext(const rpmsx sx) -{ - const char * context = NULL; - - if (sx != NULL && sx->i >= 0 && sx->i < sx->Count) - context = (sx->sxp + sx->i)->context; - return context; -} - -regex_t * rpmsxRE(const rpmsx sx) -{ - regex_t * preg = NULL; - - if (sx != NULL && sx->i >= 0 && sx->i < sx->Count) - preg = (sx->sxp + sx->i)->preg; - return preg; -} - -mode_t rpmsxFMode(const rpmsx sx) -{ - mode_t fmode = 0; - - if (sx != NULL && sx->i >= 0 && sx->i < sx->Count) - fmode = (sx->sxp + sx->i)->fmode; - return fmode; -} - -int rpmsxFStem(const rpmsx sx) -{ - int fstem = -1; - - if (sx != NULL && sx->i >= 0 && sx->i < sx->Count) - fstem = (sx->sxp + sx->i)->fstem; - return fstem; -} - -int rpmsxNext(/*@null@*/ rpmsx sx) - /*@modifies sx @*/ -{ - int i = -1; - - if (sx != NULL) { - if (sx->reverse != 0) { - i = --sx->i; - if (sx->i < 0) { - sx->i = sx->Count; - i = -1; - } - } else { - i = ++sx->i; - if (sx->i >= sx->Count) { - sx->i = -1; - i = -1; - } - } - -/*@-modfilesys @*/ -if (_rpmsx_debug < 0 && i != -1) { -rpmsxp sxp = sx->sxp + i; -fprintf(stderr, "*** sx %p\t%s[%d]\t%s\t%s\n", sx, __func__, i, sxp->pattern, sxp->context); -/*@=modfilesys @*/ -} - - } - - return i; -} - -rpmsx rpmsxInit(/*@null@*/ rpmsx sx, int reverse) - /*@modifies sx @*/ -{ - if (sx != NULL) { - sx->reverse = reverse; - sx->i = (sx->reverse ? sx->Count : -1); - } - /*@-refcounttrans@*/ - return sx; - /*@=refcounttrans@*/ -} - -const char * rpmsxFContext(rpmsx sx, const char * fn, mode_t fmode) -{ - const char * fcontext = NULL; - const char * myfn = fn; -/*@-mods@*/ - int fstem = rpmsxFind(sx, &myfn); -/*@=mods@*/ - int i; - - sx = rpmsxInit(sx, 1); - if (sx != NULL) - while ((i = rpmsxNext(sx)) >= 0) { - regex_t * preg; - mode_t sxfmode; - int sxfstem; - int ret; - - sxfstem = rpmsxFStem(sx); - if (sxfstem != -1 && sxfstem != fstem) - continue; - - sxfmode = rpmsxFMode(sx); - if (sxfmode && (fmode & S_IFMT) != sxfmode) - continue; - - preg = rpmsxRE(sx); - if (preg == NULL) - continue; - - ret = regexec(preg, (sxfstem == -1 ? fn : myfn), 0, NULL, 0); - switch (ret) { - case REG_NOMATCH: - continue; - /*@notreached@*/ /*@switchbreak@*/ break; - case 0: - fcontext = rpmsxContext(sx); - /*@switchbreak@*/ break; - default: - { static char errbuf[BUFSIZ + 1]; - (void) regerror(ret, preg, errbuf, sizeof(errbuf)-1); -/*@-modfilesys -nullpass @*/ - errbuf[sizeof(errbuf)-1] = '\0'; - fprintf(stderr, "unable to match %s against %s: %s\n", - fn, rpmsxPattern(sx), errbuf); -/*@=modfilesys =nullpass @*/ - } /*@switchbreak@*/ break; - } - break; - } - - return fcontext; -} diff --git a/lib/rpmsx.h b/lib/rpmsx.h deleted file mode 100644 index 64001c981..000000000 --- a/lib/rpmsx.h +++ /dev/null @@ -1,277 +0,0 @@ -#ifndef H_RPMSX -#define H_RPMSX - -/** \ingroup rpmdep rpmtrans - * \file lib/rpmsx.h - * Structure(s) used for file security context pattern handling - */ - -#include <regex.h> - -/** - */ -/*@-exportlocal@*/ -/*@unchecked@*/ -extern int _rpmsx_debug; -/*@=exportlocal@*/ - -/** - */ -/*@-exportlocal@*/ -/*@unchecked@*/ -extern int _rpmsx_nopromote; -/*@=exportlocal@*/ - -typedef /*@abstract@*/ /*@refcounted@*/ struct rpmsx_s * rpmsx; -typedef struct rpmsxp_s * rpmsxp; -typedef struct rpmsxs_s * rpmsxs; - -#if defined(_RPMSX_INTERNAL) -/** - * File security context regex pattern. - */ -struct rpmsxp_s { -/*@only@*/ /*@relnull@*/ - const char * pattern; /*!< File path regex pattern. */ -/*@only@*/ /*@relnull@*/ - const char * type; /*!< File type string. */ -/*@only@*/ /*@relnull@*/ - const char * context; /*!< Security context. */ -/*@only@*/ /*@relnull@*/ - regex_t * preg; /*!< Compiled regex. */ - mode_t fmode; /*!< File type. */ - int matches; - int hasMetaChars; - int fstem; /*!< Stem id. */ -}; - -/** - * File/pattern stem. - */ -struct rpmsxs_s { -/*@only@*/ /*@relnull@*/ - const char * stem; - int len; -}; - -/** - * File security context patterns container. - */ -struct rpmsx_s { -/*@only@*/ /*@relnull@*/ - rpmsxp sxp; /*!< File context patterns. */ - int Count; /*!< No. of file context patterns. */ - int i; /*!< Current pattern index. */ -/*@only@*/ /*@relnull@*/ - rpmsxs sxs; /*!< File stems. */ - int nsxs; /*!< No. of file stems. */ - int maxsxs; /*!< No. of allocated file stems. */ - int reverse; /*!< Reverse traversal? */ -/*@refs@*/ - int nrefs; /*!< Reference count. */ -}; -#endif /* defined(_RPMSX_INTERNAL) */ - -#ifdef __cplusplus -extern "C" { -#endif - -/** - * Unreference a security context patterns instance. - * @param sx security context patterns - * @param msg - * @return NULL always - */ -/*@unused@*/ /*@null@*/ -rpmsx rpmsxUnlink (/*@killref@*/ /*@only@*/ /*@null@*/ rpmsx sx, - /*@null@*/ const char * msg) - /*@modifies sx @*/; - -/** @todo Remove debugging entry from the ABI. */ -/*@-exportlocal@*/ -/*@null@*/ -rpmsx XrpmsxUnlink (/*@killref@*/ /*@only@*/ /*@null@*/ rpmsx sx, - /*@null@*/ const char * msg, const char * fn, unsigned ln) - /*@modifies sx @*/; -/*@=exportlocal@*/ -#define rpmsxUnlink(_sx, _msg) XrpmsxUnlink(_sx, _msg, __FILE__, __LINE__) - -/** - * Reference a security context patterns instance. - * @param sx security context patterns - * @param msg - * @return new security context patterns reference - */ -/*@-exportlocal@*/ -/*@unused@*/ /*@newref@*/ /*@null@*/ -rpmsx rpmsxLink (/*@null@*/ rpmsx sx, /*@null@*/ const char * msg) - /*@modifies sx @*/; - -/** @todo Remove debugging entry from the ABI. */ -/*@newref@*/ /*@null@*/ -rpmsx XrpmsxLink (/*@null@*/ rpmsx sx, /*@null@*/ const char * msg, - const char * fn, unsigned ln) - /*@modifies sx @*/; -/*@=exportlocal@*/ -#define rpmsxLink(_sx, _msg) XrpmsxLink(_sx, _msg, __FILE__, __LINE__) - -/** - * Destroy a security context patterns. - * @param sx security context patterns - * @return NULL always - */ -/*@-exportlocal@*/ -/*@null@*/ -rpmsx rpmsxFree(/*@killref@*/ /*@only@*/ /*@null@*/ rpmsx sx) - /*@modifies sx@*/; -/*@=exportlocal@*/ - -/** - * Parse selinux file security context patterns. - * @param sx security context patterns - * @param fn file name to parse - * @return 0 on success - */ -/*@-exportlocal@*/ -int rpmsxParse(rpmsx sx, /*@null@*/ const char *fn) - /*@globals rpmGlobalMacroContext, h_errno, fileSystem @*/ - /*@modifies sx, rpmGlobalMacroContext, h_errno, fileSystem @*/; -/*@=exportlocal@*/ - -/** - * Create and load security context patterns. - * @param fn security context patterns file name - * @return new security context patterns - */ -/*@null@*/ -rpmsx rpmsxNew(const char * fn) - /*@globals rpmGlobalMacroContext, h_errno, fileSystem @*/ - /*@modifies rpmGlobalMacroContext, h_errno, fileSystem @*/; - -/** - * Return security context patterns count. - * @param sx security context patterns - * @return current count - */ -int rpmsxCount(/*@null@*/ const rpmsx sx) - /*@*/; - -/** - * Return security context patterns index. - * @param sx security context patterns - * @return current index - */ -int rpmsxIx(/*@null@*/ const rpmsx sx) - /*@*/; - -/** - * Set security context patterns index. - * @param sx security context patterns - * @param ix new index - * @return current index - */ -int rpmsxSetIx(/*@null@*/ rpmsx sx, int ix) - /*@modifies sx @*/; - -/** - * Return current pattern. - * @param sx security context patterns - * @return current pattern, NULL on invalid - */ -/*@-exportlocal@*/ -/*@observer@*/ /*@null@*/ -extern const char * rpmsxPattern(/*@null@*/ const rpmsx sx) - /*@*/; -/*@=exportlocal@*/ - -/** - * Return current type. - * @param sx security context patterns - * @return current type, NULL on invalid/missing - */ -/*@-exportlocal@*/ -/*@observer@*/ /*@null@*/ -extern const char * rpmsxType(/*@null@*/ const rpmsx sx) - /*@*/; -/*@=exportlocal@*/ - -/** - * Return current context. - * @param sx security context patterns - * @return current context, NULL on invalid - */ -/*@-exportlocal@*/ -/*@observer@*/ /*@null@*/ -extern const char * rpmsxContext(/*@null@*/ const rpmsx sx) - /*@*/; -/*@=exportlocal@*/ - -/** - * Return current regex. - * @param sx security context patterns - * @return current context, NULL on invalid - */ -/*@-exportlocal@*/ -/*@observer@*/ /*@null@*/ -extern regex_t * rpmsxRE(/*@null@*/ const rpmsx sx) - /*@*/; -/*@=exportlocal@*/ - -/** - * Return current file mode. - * @param sx security context patterns - * @return current file mode, 0 on invalid - */ -/*@-exportlocal@*/ -extern mode_t rpmsxFMode(/*@null@*/ const rpmsx sx) - /*@*/; -/*@=exportlocal@*/ - -/** - * Return current file stem. - * @param sx security context patterns - * @return current file stem, -1 on invalid - */ -/*@-exportlocal@*/ -extern int rpmsxFStem(/*@null@*/ const rpmsx sx) - /*@*/; -/*@=exportlocal@*/ - -/** - * Return next security context patterns iterator index. - * @param sx security context patterns - * @return security context patterns iterator index, -1 on termination - */ -/*@-exportlocal@*/ -int rpmsxNext(/*@null@*/ rpmsx sx) - /*@modifies sx @*/; -/*@=exportlocal@*/ - -/** - * Initialize security context patterns iterator. - * @param sx security context patterns - * @param reverse iterate in reverse order? - * @return security context patterns - */ -/*@-exportlocal@*/ -/*@null@*/ -rpmsx rpmsxInit(/*@null@*/ rpmsx sx, int reverse) - /*@modifies sx @*/; -/*@=exportlocal@*/ - -/** - * Find file security context from path and type. - * @param sx security context patterns - * @param fn file path - * @param fmode file mode - * @return file security context - */ -/*@owned@*/ /*@null@*/ -const char * rpmsxFContext(/*@null@*/ rpmsx sx, const char * fn, mode_t fmode) - /*@modifies sx @*/; - -#ifdef __cplusplus -} -#endif - -#endif /* H_RPMSX */ diff --git a/lib/rpmts.c b/lib/rpmts.c index 32f83e545..a456c9840 100644 --- a/lib/rpmts.c +++ b/lib/rpmts.c @@ -25,16 +25,8 @@ /* portability fiddles */ #if STATFS_IN_SYS_STATVFS /*@-incondefs@*/ -#if defined(__LCLINT__) -/*@-declundef -exportheader -protoparammatch @*/ /* LCL: missing annotation */ -extern int statvfs (const char * file, /*@out@*/ struct statvfs * buf) - /*@globals fileSystem @*/ - /*@modifies *buf, fileSystem @*/; -/*@=declundef =exportheader =protoparammatch @*/ -/*@=incondefs@*/ -#else -# include <sys/statvfs.h> -#endif +#include <sys/statvfs.h> + #else # if STATFS_IN_SYS_VFS # include <sys/vfs.h> @@ -55,7 +47,6 @@ extern int statvfs (const char * file, /*@out@*/ struct statvfs * buf) /*@access rpmps @*/ /*@access rpmDiskSpaceInfo @*/ -/*@access rpmsx @*/ /*@access rpmte @*/ /*@access rpmtsi @*/ /*@access fnpyKey @*/ @@ -863,8 +854,6 @@ rpmts rpmtsFree(rpmts ts) (void) rpmtsCloseSDB(ts); - ts->sx = rpmsxFree(ts->sx); - ts->removedPackages = _free(ts->removedPackages); ts->availablePackages = rpmalFree(ts->availablePackages); @@ -1084,23 +1073,6 @@ int rpmtsSetChrootDone(rpmts ts, int chrootDone) return ochrootDone; } -rpmsx rpmtsREContext(rpmts ts) -{ - return ( (ts && ts->sx ? rpmsxLink(ts->sx, __func__) : NULL) ); -} - -int rpmtsSetREContext(rpmts ts, rpmsx sx) -{ - int rc = -1; - if (ts != NULL) { - ts->sx = rpmsxFree(ts->sx); - ts->sx = rpmsxLink(sx, __func__); - if (ts->sx != NULL) - rc = 0; - } - return rc; -} - int_32 rpmtsGetTid(rpmts ts) { int_32 tid = 0; diff --git a/lib/rpmts.h b/lib/rpmts.h index 1948c1eb2..cb3ccf355 100644 --- a/lib/rpmts.h +++ b/lib/rpmts.h @@ -8,7 +8,6 @@ #include "rpmps.h" #include "rpmsw.h" -#include "rpmsx.h" /*@-exportlocal@*/ /*@unchecked@*/ @@ -283,9 +282,6 @@ struct rpmts_s { int numAvailablePackages; /*!< No. available package instances. */ #endif -/*@refcounted@*/ /*@null@*/ - rpmsx sx; /*!< Security context patterns. */ - /*@null@*/ rpmte relocateElement; /*!< Element to use when relocating packages. */ @@ -732,24 +728,6 @@ int rpmtsSetChrootDone(rpmts ts, int chrootDone) /*@modifies ts @*/; /** \ingroup rpmts - * Get file security context patterns. - * @param ts transaction set - * @return file security context patterns - */ -/*@null@*/ -rpmsx rpmtsREContext(const rpmts ts) - /*@modifies ts @*/; - -/** \ingroup rpmts - * Get file security context patterns. - * @param ts transaction set - * @param sx security context patterns - * @return 0 on success - */ -int rpmtsSetREContext(rpmts ts, rpmsx sx) - /*@modifies ts, sx @*/; - -/** \ingroup rpmts * Get transaction id, i.e. transaction time stamp. * @param ts transaction set * @return transaction id diff --git a/lib/setfiles.c b/lib/setfiles.c deleted file mode 100644 index 9f34a312f..000000000 --- a/lib/setfiles.c +++ /dev/null @@ -1,991 +0,0 @@ -/* - * setfiles - * - * AUTHOR: Stephen Smalley <sds@epoch.ncsc.mil> - * This program was derived in part from the setfiles.pl script - * developed by Secure Computing Corporation. - * - * PURPOSE: - * This program reads a set of file security context specifications - * based on pathname regular expressions and labels files - * accordingly, traversing a set of file systems specified by - * the user. The program does not cross file system boundaries. - * - * USAGE: - * setfiles [-dnpqsvW] spec_file pathname... - * - * -d Show what specification matched each file. - * -n Do not change any file labels. - * -q Be quiet (suppress non-error output). - * -r Use an alternate root path - * -s Use stdin for a list of files instead of searching a partition. - * -v Show changes in file labels. - * -W Warn about entries that have no matching file. - * - * spec_file The specification file. - * pathname... The file systems to label (omit if using -s). - * - * EXAMPLE USAGE: - * ./setfiles -v file_contexts `mount | awk '/ext3/{print $3}'` - * - * SPECIFICATION FILE: - * Each specification has the form: - * regexp [ -type ] ( context | <<none>> ) - * - * By default, the regexp is an anchored match on both ends (i.e. a - * caret (^) is prepended and a dollar sign ($) is appended automatically). - * This default may be overridden by using .* at the beginning and/or - * end of the regular expression. - * - * The optional type field specifies the file type as shown in the mode - * field by ls, e.g. use -d to match only directories or -- to match only - * regular files. - * - * The value of <<none> may be used to indicate that matching files - * should not be relabeled. - * - * The last matching specification is used. - * - * If there are multiple hard links to a file that match - * different specifications and those specifications indicate - * different security contexts, then a warning is displayed - * but the file is still labeled based on the last matching - * specification other than <<none>>. - */ - -#include "system.h" -const char *__progname; - -#include <regex.h> -#include <sys/vfs.h> -#define __USE_XOPEN_EXTENDED 1 /* nftw */ -#include <ftw.h> - -#include <selinux/selinux.h> -#include <popt.h> - -#include "debug.h" - -static int add_assoc = 1; - -/* - * Command-line options. - */ -static int debug = 0; -static int change = 1; -static int quiet = 0; -#define QPRINTF(args...) do { if (!quiet) printf(args); } while (0) -static int use_stdin = 0; -static int verbose = 0; -static int warn_no_match = 0; -static char *rootpath = NULL; -static int rootpathlen = 0; - -/* - * A file security context specification. - */ -typedef struct spec { -/*@only@*/ - char *pattern; /* regular expession string for diagnostic messages */ -/*@only@*/ - char *type_str; /* type string for diagnostic messages */ -/*@only@*/ - char *context; /* context string */ -/*@only@*/ - regex_t * preg; /* compiled regular expression */ - mode_t mode; /* mode format value */ - int matches; /* number of matching pathnames */ - int hasMetaChars; /* indicates whether the RE has - any meta characters. - 0 = no meta chars - 1 = has one or more meta chars */ - int stem_id; /* indicates which of the stem-compression - items it matches */ -} * spec_t; - -typedef struct stem { - char *buf; - int len; -} * stem_t; - -stem_t stem_arr = NULL; -int num_stems = 0; -int alloc_stems = 0; - -const char * const regex_chars = ".^$?*+|[({"; - -/* Return the length of the text that can be considered the stem, returns 0 - * if there is no identifiable stem */ -static int get_stem_from_spec(const char * const buf) -{ - const char *tmp = strchr(buf + 1, '/'); - const char *ind; - - if (!tmp) - return 0; - - for (ind = buf + 1; ind < tmp; ind++) { - if (strchr(regex_chars, (int)*ind)) - return 0; - } - return tmp - buf; -} - -/* return the length of the text that is the stem of a file name */ -static int get_stem_from_file_name(const char * const buf) -{ - const char *tmp = strchr(buf + 1, '/'); - - if (!tmp) - return 0; - return tmp - buf; -} - -/* find the stem of a file spec, returns the index into stem_arr for a new - * or existing stem, (or -1 if there is no possible stem - IE for a file in - * the root directory or a regex that is too complex for us). Makes buf - * point to the text AFTER the stem. */ -static int find_stem_from_spec(const char **buf) -{ - int stem_len = get_stem_from_spec(*buf); - int i; - - if (!stem_len) - return -1; - for (i = 0; i < num_stems; i++) { - if (stem_len != stem_arr[i].len) - continue; - if (strncmp(*buf, stem_arr[i].buf, stem_len)) - continue; - *buf += stem_len; - return i; - } - - if (num_stems == alloc_stems) { - alloc_stems = alloc_stems * 2 + 16; - stem_arr = xrealloc(stem_arr, sizeof(*stem_arr) * alloc_stems); - } - stem_arr[num_stems].len = stem_len; - stem_arr[num_stems].buf = xmalloc(stem_len + 1); - memcpy(stem_arr[num_stems].buf, *buf, stem_len); - stem_arr[num_stems].buf[stem_len] = '\0'; - num_stems++; - *buf += stem_len; - return num_stems - 1; -} - -/* find the stem of a file name, returns the index into stem_arr (or -1 if - * there is no match - IE for a file in the root directory or a regex that is - * too complex for us). Makes buf point to the text AFTER the stem. */ -static int find_stem_from_file(const char **buf) -{ - int stem_len = get_stem_from_file_name(*buf); - int i; - - if (stem_len) - for (i = 0; i < num_stems; i++) { - if (stem_len != stem_arr[i].len) - continue; - if (strncmp(*buf, stem_arr[i].buf, stem_len)) - continue; - *buf += stem_len; - return i; - } - return -1; -} - -/* - * The array of specifications, initially in the - * same order as in the specification file. - * Sorting occurs based on hasMetaChars - */ -static spec_t spec_arr; -static int nspec; - -/* - * An association between an inode and a - * specification. - */ -typedef struct file_spec * file_spec_t; -struct file_spec { - ino_t ino; /* inode number */ - int specind; /* index of specification in spec */ - char *file; /* full pathname for diagnostic messages about conflicts */ - file_spec_t next; /* next association in hash bucket chain */ -}; - -/* - * The hash table of associations, hashed by inode number. - * Chaining is used for collisions, with elements ordered - * by inode number in each bucket. Each hash bucket has a dummy - * header. - */ -#define HASH_BITS 16 -#define HASH_BUCKETS (1 << HASH_BITS) -#define HASH_MASK (HASH_BUCKETS-1) -static struct file_spec fl_head[HASH_BUCKETS]; - -/* - * Try to add an association between an inode and - * a specification. If there is already an association - * for the inode and it conflicts with this specification, - * then use the specification that occurs later in the - * specification array. - */ -static file_spec_t file_spec_add(ino_t ino, int specind, const char *file) -{ - file_spec_t prevfl; - file_spec_t fl; - int h, no_conflict, ret; - struct stat sb; - - h = (ino + (ino >> HASH_BITS)) & HASH_MASK; - for (prevfl = &fl_head[h], fl = fl_head[h].next; - fl != NULL; - prevfl = fl, fl = fl->next) - { - if (ino == fl->ino) { - ret = lstat(fl->file, &sb); - if (ret < 0 || sb.st_ino != ino) { - fl->specind = specind; - free(fl->file); - fl->file = xstrdup(file); - return fl; - } - - no_conflict = (strcmp(spec_arr[fl->specind].context,spec_arr[specind].context) == 0); - if (no_conflict) - return fl; - - fprintf(stderr, - "%s: conflicting specifications for %s and %s, using %s.\n", - __progname, file, fl->file, - ((specind > fl->specind) ? spec_arr[specind]. - context : spec_arr[fl->specind].context)); - fl->specind = - (specind > fl->specind) ? specind : fl->specind; - free(fl->file); - fl->file = xstrdup(file); - return fl; - } - - if (ino > fl->ino) - break; - } - - fl = xmalloc(sizeof(*fl)); - fl->ino = ino; - fl->specind = specind; - fl->file = xstrdup(file); - fl->next = prevfl->next; - prevfl->next = fl; - return fl; -} - -/* - * Evaluate the association hash table distribution. - */ -static void file_spec_eval(void) -{ - file_spec_t fl; - int h, used, nel, len, longest; - - used = 0; - longest = 0; - nel = 0; - for (h = 0; h < HASH_BUCKETS; h++) { - len = 0; - for (fl = fl_head[h].next; fl; fl = fl->next) { - len++; - } - if (len) - used++; - if (len > longest) - longest = len; - nel += len; - } - - QPRINTF ("%s: hash table stats: %d elements, %d/%d buckets used, longest chain length %d\n", - __progname, nel, used, HASH_BUCKETS, longest); -} - - -/* - * Destroy the association hash table. - */ -static void file_spec_destroy(void) -{ - file_spec_t fl; - file_spec_t tmp; - int h; - - for (h = 0; h < HASH_BUCKETS; h++) { - fl = fl_head[h].next; - while (fl) { - tmp = fl; - fl = fl->next; - free(tmp->file); - free(tmp); - } - fl_head[h].next = NULL; - } -} - - -static int match(const char *name, struct stat *sb) -{ - static char errbuf[255 + 1]; - const char *fullname = name; - const char *buf = name; - int i, ret, file_stem; - - /* fullname will be the real file that gets labeled - * name will be what is matched in the policy */ - if (rootpath != NULL) { - if (strncmp(rootpath, name, rootpathlen) != 0) { - fprintf(stderr, "%s: %s is not located in %s\n", - __progname, name, rootpath); - return -1; - } - name += rootpathlen; - buf += rootpathlen; - } - - ret = lstat(fullname, sb); - if (ret) { - fprintf(stderr, "%s: unable to stat file %s\n", __progname, fullname); - return -1; - } - - file_stem = find_stem_from_file(&buf); - - /* - * Check for matching specifications in reverse order, so that - * the last matching specification is used. - */ - for (i = nspec - 1; i >= 0; i--) { - spec_t sp; - - sp = spec_arr + i; - - /* if the spec in question matches no stem or has the same - * stem as the file AND if the spec in question has no mode - * specified or if the mode matches the file mode then we do - * a regex check */ - if (sp->stem_id != -1 && sp->stem_id != file_stem) - continue; - if (sp->mode && (sb->st_mode & S_IFMT) != sp->mode) - continue; - - if (sp->stem_id == -1) - ret = regexec(sp->preg, name, 0, NULL, 0); - else - ret = regexec(sp->preg, buf, 0, NULL, 0); - if (ret == 0) - break; - - if (ret == REG_NOMATCH) - continue; - - /* else it's an error */ - regerror(ret, sp->preg, errbuf, sizeof errbuf); - fprintf(stderr, "%s: unable to match %s against %s: %s\n", - __progname, name, sp->pattern, errbuf); - return -1; - } - - /* Cound matches found. */ - if (i >= 0) - spec_arr[i].matches++; - - return i; -} - -/* Used with qsort to sort specs from lowest to highest hasMetaChars value */ -static int spec_compare(const void* specA, const void* specB) -{ - return ( - ((const spec_t)specB)->hasMetaChars - - ((const spec_t)specA)->hasMetaChars - ); -} - -/* - * Check for duplicate specifications. If a duplicate specification is found - * and the context is the same, give a warning to the user. If a duplicate - * specification is found and the context is different, give a warning - * to the user (This could be changed to error). Return of non-zero is an error. - */ -static int nodups_specs(void) -{ - int i, j; - - for (i = 0; i < nspec; i++) { - spec_t sip = spec_arr + i; - for (j = i + 1; j < nspec; j++) { - spec_t sjp = spec_arr + j; - - /* Check if same RE string */ - if (strcmp(sjp->pattern, sip->pattern)) - continue; - if (sjp->mode && sip->mode && sjp->mode != sip->mode) - continue; - - /* Same RE string found */ - if (strcmp(sjp->context, sip->context)) { - /* If different contexts, give warning */ - fprintf(stderr, - "ERROR: Multiple different specifications for %s (%s and %s).\n", - sip->pattern, sjp->context, sip->context); - } else { - /* If same contexts give warning */ - fprintf(stderr, - "WARNING: Multiple same specifications for %s.\n", - sip->pattern); - } - } - } - return 0; -} - -static void usage(const char * const name, poptContext optCon) -{ - fprintf(stderr, - "usage: %s [-dnqvW] spec_file pathname...\n" - "usage: %s -s [-dnqvW] spec_file\n", name, name); - poptPrintUsage(optCon, stderr, 0); - exit(1); -} - -/* Determine if the regular expression specification has any meta characters. */ -static void spec_hasMetaChars(spec_t sp) -{ - char * c = sp->pattern; - int len = strlen(c); - char * end = c + len; - - sp->hasMetaChars = 0; - - /* Look at each character in the RE specification string for a - * meta character. Return when any meta character reached. */ - while (c != end) { - switch(*c) { - case '.': - case '^': - case '$': - case '?': - case '*': - case '+': - case '|': - case '[': - case '(': - case '{': - sp->hasMetaChars = 1; - return; - break; - case '\\': /* skip the next character */ - c++; - break; - default: - break; - - } - c++; - } - return; -} - -/* - * Apply the last matching specification to a file. - * This function is called by nftw on each file during - * the directory traversal. - */ -static int apply_spec(const char *file, - const struct stat *sb_unused, int flag, struct FTW *s_unused) -{ - const char * my_file; - file_spec_t fl; - struct stat my_sb; - int i, ret; - char * context; - spec_t sp; - - /* Skip the extra slash at the beginning, if present. */ - if (file[0] == '/' && file[1] == '/') - my_file = &file[1]; - else - my_file = file; - - if (flag == FTW_DNR) { - fprintf(stderr, "%s: unable to read directory %s\n", - __progname, my_file); - return 0; - } - - i = match(my_file, &my_sb); - if (i < 0) - /* No matching specification. */ - return 0; - sp = spec_arr + i; - - /* - * Try to add an association between this inode and - * this specification. If there is already an association - * for this inode and it conflicts with this specification, - * then use the last matching specification. - */ - if (add_assoc) { - fl = file_spec_add(my_sb.st_ino, i, my_file); - if (!fl) - /* Insufficient memory to proceed. */ - return 1; - - if (fl->specind != i) - /* There was already an association and it took precedence. */ - return 0; - } - - if (debug) { - if (sp->type_str) { - printf("%s: %s matched by (%s,%s,%s)\n", __progname, - my_file, sp->pattern, - sp->type_str, sp->context); - } else { - printf("%s: %s matched by (%s,%s)\n", __progname, - my_file, sp->pattern, sp->context); - } - } - - /* Get the current context of the file. */ - ret = lgetfilecon(my_file, &context); - if (ret < 0) { - if (errno == ENODATA) { - context = xstrdup("<<none>>"); - } else { - perror(my_file); - fprintf(stderr, "%s: unable to obtain attribute for file %s\n", - __progname, my_file); - return -1; - } - } - - /* - * Do not relabel the file if the matching specification is - * <<none>> or the file is already labeled according to the - * specification. - */ - if ((strcmp(sp->context, "<<none>>") == 0) || - (strcmp(sp->context, context) == 0)) - { - freecon(context); - return 0; - } - - if (verbose) { - printf("%s: relabeling %s from %s to %s\n", __progname, - my_file, context, sp->context); - } - - freecon(context); - - /* - * Do not relabel the file if -n was used. - */ - if (!change) - return 0; - - /* - * Relabel the file to the specified context. - */ - ret = lsetfilecon(my_file, sp->context); - if (ret) { - perror(my_file); - fprintf(stderr, "%s: unable to relabel %s to %s\n", - __progname, my_file, sp->context); - return 1; - } - - return 0; -} - -static int nerr = 0; - -static void inc_err(void) -{ - nerr++; - if (nerr > 9 && !debug) { - fprintf(stderr, "Exiting after 10 errors.\n"); - exit(1); - } -} - -static -int parseREContexts(const char *fn) -{ - FILE * fp; - char errbuf[255 + 1]; - char buf[255 + 1]; - char * bp; - char * regex; - char * type; - char * context; - char * anchored_regex; - int items; - int len; - int lineno; - int pass; - int regerr; - spec_t sp; - - if ((fp = fopen(fn, "r")) == NULL) { - perror(fn); - return -1; - } - - /* - * Perform two passes over the specification file. - * The first pass counts the number of specifications and - * performs simple validation of the input. At the end - * of the first pass, the spec array is allocated. - * The second pass performs detailed validation of the input - * and fills in the spec array. - */ - for (pass = 0; pass < 2; pass++) { - lineno = 0; - nspec = 0; - sp = spec_arr; - while (fgets(buf, sizeof buf, fp)) { - lineno++; - len = strlen(buf); - if (buf[len - 1] != '\n') { - fprintf(stderr, - "%s: no newline on line number %d (only read %s)\n", - fn, lineno, buf); - inc_err(); - continue; - } - buf[len - 1] = 0; - bp = buf; - while (isspace(*bp)) - bp++; - /* Skip comment lines and empty lines. */ - if (*bp == '#' || *bp == 0) - continue; - items = sscanf(buf, "%as %as %as", ®ex, &type, &context); - if (items < 2) { - fprintf(stderr, - "%s: line number %d is missing fields (only read %s)\n", - fn, lineno, buf); - inc_err(); - if (items == 1) - free(regex); - continue; - } else if (items == 2) { - /* The type field is optional. */ - free(context); - context = type; - type = 0; - } - - if (pass == 1) { - /* On the second pass, compile and store the specification in spec. */ - const char *reg_buf = regex; - sp->stem_id = find_stem_from_spec(®_buf); - sp->pattern = regex; - - /* Anchor the regular expression. */ - len = strlen(reg_buf); - anchored_regex = xmalloc(len + 3); - sprintf(anchored_regex, "^%s$", reg_buf); - - /* Compile the regular expression. */ - sp->preg = xcalloc(1, sizeof(*sp->preg)); - regerr = regcomp(sp->preg, anchored_regex, - REG_EXTENDED | REG_NOSUB); - if (regerr < 0) { - regerror(regerr, sp->preg, errbuf, sizeof errbuf); - fprintf(stderr, - "%s: unable to compile regular expression %s on line number %d: %s\n", - fn, regex, lineno, - errbuf); - inc_err(); - } - free(anchored_regex); - - /* Convert the type string to a mode format */ - sp->type_str = type; - sp->mode = 0; - if (!type) - goto skip_type; - len = strlen(type); - if (type[0] != '-' || len != 2) { - fprintf(stderr, - "%s: invalid type specifier %s on line number %d\n", - fn, type, lineno); - inc_err(); - goto skip_type; - } - switch (type[1]) { - case 'b': - sp->mode = S_IFBLK; - break; - case 'c': - sp->mode = S_IFCHR; - break; - case 'd': - sp->mode = S_IFDIR; - break; - case 'p': - sp->mode = S_IFIFO; - break; - case 'l': - sp->mode = S_IFLNK; - break; - case 's': - sp->mode = S_IFSOCK; - break; - case '-': - sp->mode = S_IFREG; - break; - default: - fprintf(stderr, - "%s: invalid type specifier %s on line number %d\n", - fn, type, lineno); - inc_err(); - } - - skip_type: - - sp->context = context; - - if (strcmp(context, "<<none>>")) { - if (security_check_context(context) < 0 && errno != ENOENT) { - fprintf(stderr, - "%s: invalid context %s on line number %d\n", - fn, context, lineno); - inc_err(); - } - } - - /* Determine if specification has - * any meta characters in the RE */ - spec_hasMetaChars(sp); - sp++; - } - - nspec++; - if (pass == 0) { - free(regex); - if (type) - free(type); - free(context); - } - } - - if (nerr) - return -1; - - if (pass == 0) { - QPRINTF("%s: read %d specifications\n", fn, nspec); - if (nspec == 0) - return 0; - spec_arr = xcalloc(nspec, sizeof(*spec_arr)); - rewind(fp); - } - } - fclose(fp); - - /* Sort the specifications with most general first */ - qsort(spec_arr, nspec, sizeof(*spec_arr), spec_compare); - - /* Verify no exact duplicates */ - if (nodups_specs() != 0) - return -1; - return 0; -} - -static struct poptOption optionsTable[] = { - { "debug", 'd', POPT_ARG_VAL, &debug, 1, - N_("show what specification matched each file"), NULL }, - { "nochange", 'n', POPT_ARG_VAL, &change, 0, - N_("do not change any file labels"), NULL }, - { "quiet", 'q', POPT_ARG_VAL, &quiet, 1, - N_("be quiet (suppress non-error output)"), NULL }, - { "root", 'r', POPT_ARG_STRING|POPT_ARGFLAG_SHOW_DEFAULT, &rootpath, 0, - N_("use an alternate root path"), N_("ROOT") }, - { "stdin", 's', POPT_ARG_VAL, &use_stdin, 1, - N_("use stdin for a list of files instead of searching a partition"), NULL }, - { "verbose", 'v', POPT_ARG_VAL, &warn_no_match, 1, - N_("show changes in file labels"), NULL }, - { "warn", 'W', POPT_ARG_VAL, &warn_no_match, 1, - N_("warn about entries that have no matching file"), NULL }, - - POPT_AUTOHELP - POPT_TABLEEND -}; - -int main(int argc, char **argv) -{ - poptContext optCon; - const char ** av; - const char * arg; - int ec = EXIT_FAILURE; /* assume failure. */ - int rc; - int i; - -#if HAVE_MCHECK_H && HAVE_MTRACE - /*@-noeffect@*/ - mtrace(); /* Trace malloc only if MALLOC_TRACE=mtrace-output-file. */ - /*@=noeffect@*/ -#endif - - setprogname(argv[0]); /* Retrofit glibc __progname */ - /* XXX glibc churn sanity */ - if (__progname == NULL) { - if ((__progname = strrchr(argv[0], '/')) != NULL) __progname++; - else __progname = argv[0]; - } - - (void) setlocale(LC_ALL, "" ); - (void) bindtextdomain(PACKAGE, LOCALEDIR); - (void) textdomain(PACKAGE); - - optCon = poptGetContext(__progname, argc, (const char **)argv, optionsTable, 0); - - /* Process all options, whine if unknown. */ - while ((rc = poptGetNextOpt(optCon)) > 0) { - switch (rc) { - default: -/*@-nullpass@*/ - fprintf(stderr, _("%s: option table misconfigured (%d)\n"), - __progname, rc); -/*@=nullpass@*/ - goto exit; - /*@notreached@*/ /*@switchbreak@*/ break; - } - } - - if (rc < -1) { -/*@-nullpass@*/ - fprintf(stderr, "%s: %s: %s\n", __progname, - poptBadOption(optCon, POPT_BADOPTION_NOALIAS), - poptStrerror(rc)); -/*@=nullpass@*/ - goto exit; - } - - /* trim trailing /, if present */ - if (rootpath != NULL) { - rootpathlen = strlen(rootpath); - while (rootpath[rootpathlen - 1] == '/') - rootpath[--rootpathlen] = 0; - } - - av = poptGetArgs(optCon); - if (use_stdin) { - add_assoc = 0; - /* Check exactly 1 arg */ - if (av == NULL || !(av[0] != NULL && av[1] == NULL)) { - usage(__progname, optCon); - } - } else { - /* Check at least 2 args */ - if (av == NULL || !(av[0] != NULL && av[1] != NULL)) - usage(__progname, optCon); - } - - /* Parse the specification file. */ - if (parseREContexts(*av) != 0) { - perror(*av); - goto exit; - } - av++; - - /* - * Apply the specifications to the file systems. - */ - if (use_stdin) { - char buf[PATH_MAX]; - struct stat sb; - int flag; - - while(fgets(buf, sizeof(buf), stdin)) { - strtok(buf, "\n"); - if (buf[0] == '\n') - continue; - if (stat(buf, &sb)) { - fprintf(stderr, "File \"%s\" not found.\n", buf); - continue; - } - switch(sb.st_mode) { - case S_IFDIR: - flag = FTW_D; - break; - case S_IFLNK: - flag = FTW_SL; - break; - default: - flag = FTW_F; - break; - } - apply_spec(buf, &sb, flag, NULL); - } - } - else while ((arg = *av++) != NULL) - { - if (rootpath != NULL) { - QPRINTF("%s: labeling files, pretending %s is /\n", - __progname, rootpath); - } - - QPRINTF("%s: labeling files under %s\n", __progname, arg); - - /* Walk the file tree, calling apply_spec on each file. */ - if (nftw(arg, apply_spec, 1024, FTW_PHYS | FTW_MOUNT)) { - fprintf(stderr, "%s: error while labeling files under %s\n", - __progname, arg); - goto exit; - } - - /* - * Evaluate the association hash table distribution for the - * directory tree just traversed. - */ - file_spec_eval(); - - /* Reset the association hash table for the next directory tree. */ - file_spec_destroy(); - } - - if (warn_no_match) { - for (i = 0; i < nspec; i++) { - spec_t sp; - - sp = spec_arr + i; - if (sp->matches > 0) - continue; - if (sp->type_str) { - printf("%s: Warning! No matches for (%s, %s, %s)\n", - __progname, sp->pattern, - sp->type_str, sp->context); - } else { - printf("%s: Warning! No matches for (%s, %s)\n", - __progname, sp->pattern, sp->context); - } - } - } - - QPRINTF("%s: Done.\n", __progname); - ec = 0; - -exit: - optCon = poptFreeContext(optCon); - -#if HAVE_MCHECK_H && HAVE_MTRACE - /*@-noeffect@*/ - muntrace(); /* Trace malloc only if MALLOC_TRACE=mtrace-output-file. */ - /*@=noeffect@*/ -#endif - - return ec; -} diff --git a/lib/tplatform.c b/lib/tplatform.c index 3857165f3..4fda9e2c2 100644 --- a/lib/tplatform.c +++ b/lib/tplatform.c @@ -1,10 +1,10 @@ #include "system.h" + +#include "rpmio_internal.h" #include <rpmlib.h> #include <rpmmacro.h> #include <rpmio.h> -extern int _rpmio_debug; - #define _ETC_RPM_PLATFORM "/etc/rpm/platform" static const char * platform = _ETC_RPM_PLATFORM; @@ -14,7 +14,7 @@ static int nplatpat = 0; static int rpmPlatform(void) { char *cpu = NULL, *vendor = NULL, *os = NULL, *gnu = NULL; - char * b = NULL; + byte * b = NULL; ssize_t blen = 0; int init_platform = 0; char * p, * pe; diff --git a/lib/transaction.c b/lib/transaction.c index 35d0ac084..4d743c102 100644 --- a/lib/transaction.c +++ b/lib/transaction.c @@ -32,12 +32,7 @@ #include "debug.h" -/* - * This is needed for the IDTX definitions. I think probably those need - * to be moved into a different source file (idtx.{c,h}), but that is up - * to Jeff Johnson. - */ -#include "rpmcli.h" +#include "idtx.h" /*@access Header @*/ /* XXX ts->notify arg1 is void ptr */ /*@access rpmps @*/ /* XXX need rpmProblemSetOK() */ @@ -1454,6 +1449,19 @@ int rpmtsRun(rpmts ts, rpmps okProbs, rpmprobFilterFlags ignoreSet) if (rpmtsFlags(ts) & RPMTRANS_FLAG_JUSTDB) (void) rpmtsSetFlags(ts, (rpmtsFlags(ts) | _noTransScripts | _noTransTriggers)); + /* if SELinux isn't enabled or init fails, don't bother... */ + if (!rpmtsSELinuxEnabled(ts)) { + rpmtsSetFlags(ts, (rpmtsFlags(ts) | RPMTRANS_FLAG_NOCONTEXTS)); + } + + if (!rpmtsFlags(ts) & RPMTRANS_FLAG_NOCONTEXTS) { + const char *fn = rpmGetPath("%{?_install_file_context_path}", NULL); + if (matchpathcon_init(fn) == -1) { + rpmtsSetFlags(ts, (rpmtsFlags(ts) | RPMTRANS_FLAG_NOCONTEXTS)); + } + _free(fn); + } + ts->probs = rpmpsFree(ts->probs); ts->probs = rpmpsCreate(); diff --git a/lib/tre.c b/lib/tre.c deleted file mode 100644 index eda4181b5..000000000 --- a/lib/tre.c +++ /dev/null @@ -1,142 +0,0 @@ -#include "system.h" - -#define _RPMSX_INTERNAL -#include <rpmsx.h> -#include <popt.h> - -#include "debug.h" - -static int add_assoc = 1; - -/* - * Command-line options. - */ -static int change = 1; -static int quiet = 0; -#define QPRINTF(args...) do { if (!quiet) printf(args); } while (0) -static int use_stdin = 0; -static int verbose = 0; -static int warn_no_match = 0; -static char *rootpath = NULL; -static int rootpathlen = 0; - -static struct poptOption optionsTable[] = { - { "debug", 'd', POPT_ARG_VAL, &_rpmsx_debug, -1, - N_("show what specification matched each file"), NULL }, - { "nochange", 'n', POPT_ARG_VAL, &change, 0, - N_("do not change any file labels"), NULL }, - { "quiet", 'q', POPT_ARG_VAL, &quiet, 1, - N_("be quiet (suppress non-error output)"), NULL }, - { "root", 'r', POPT_ARG_STRING|POPT_ARGFLAG_SHOW_DEFAULT, &rootpath, 0, - N_("use an alternate root path"), N_("ROOT") }, - { "stdin", 's', POPT_ARG_VAL, &use_stdin, 1, - N_("use stdin for a list of files instead of searching a partition"), NULL }, - { "verbose", 'v', POPT_ARG_VAL, &warn_no_match, 1, - N_("show changes in file labels"), NULL }, - { "warn", 'W', POPT_ARG_VAL, &warn_no_match, 1, - N_("warn about entries that have no matching file"), NULL }, - - POPT_AUTOHELP - POPT_TABLEEND -}; - -int main(int argc, char **argv) -{ - poptContext optCon; - const char ** av; - const char * arg; - rpmsx sx; - int ec = EXIT_FAILURE; /* assume failure. */ - int rc; - int i; - -#if HAVE_MCHECK_H && HAVE_MTRACE - /*@-noeffect@*/ - mtrace(); /* Trace malloc only if MALLOC_TRACE=mtrace-output-file. */ - /*@=noeffect@*/ -#endif - - setprogname(argv[0]); /* Retrofit glibc __progname */ - /* XXX glibc churn sanity */ - if (__progname == NULL) { - if ((__progname = strrchr(argv[0], '/')) != NULL) __progname++; - else __progname = argv[0]; - } - - (void) setlocale(LC_ALL, "" ); - (void) bindtextdomain(PACKAGE, LOCALEDIR); - (void) textdomain(PACKAGE); - - optCon = poptGetContext(__progname, argc, (const char **)argv, optionsTable, 0); - - /* Process all options, whine if unknown. */ - while ((rc = poptGetNextOpt(optCon)) > 0) { - switch (rc) { - default: -/*@-nullpass@*/ - fprintf(stderr, _("%s: option table misconfigured (%d)\n"), - __progname, rc); -/*@=nullpass@*/ - goto exit; - /*@notreached@*/ /*@switchbreak@*/ break; - } - } - - if (rc < -1) { -/*@-nullpass@*/ - fprintf(stderr, "%s: %s: %s\n", __progname, - poptBadOption(optCon, POPT_BADOPTION_NOALIAS), - poptStrerror(rc)); -/*@=nullpass@*/ - goto exit; - } - - /* trim trailing /, if present */ - if (rootpath != NULL) { - rootpathlen = strlen(rootpath); - while (rootpath[rootpathlen - 1] == '/') - rootpath[--rootpathlen] = 0; - } - - av = poptGetArgs(optCon); - - /* Parse the specification file. */ - sx = rpmsxNew(NULL); - - if (_rpmsx_debug) { - sx = rpmsxInit(sx, 1); - if (sx != NULL) - while ((i = rpmsxNext(sx)) >= 0) { - const char * pattern = rpmsxPattern(sx); - const char * type = rpmsxType(sx); - const char * context = rpmsxContext(sx); - - fprintf(stderr, "%5d: %s\t%s\t%s\n", i, - pattern, (type ? type : ""), context); - } - } - - if (av != NULL) - while ((arg = *av++) != NULL) { - const char * context = rpmsxFContext(sx, arg, S_IFREG); - fprintf(stderr, "%s: %s\n", arg, context); - } - - sx = rpmsxFree(sx); - - /* - * Apply the specifications to the file systems. - */ - ec = 0; - -exit: - optCon = poptFreeContext(optCon); - -#if HAVE_MCHECK_H && HAVE_MTRACE - /*@-noeffect@*/ - muntrace(); /* Trace malloc only if MALLOC_TRACE=mtrace-output-file. */ - /*@=noeffect@*/ -#endif - - return ec; -} diff --git a/lua/Makefile.am b/lua/Makefile.am index 3154095fc..5fb0641cc 100644 --- a/lua/Makefile.am +++ b/lua/Makefile.am @@ -1,6 +1,3 @@ - -LINT = splint - noinst_LTLIBRARIES = liblua.la noinst_PROGRAMS = lua/lua luac/luac @@ -83,73 +80,3 @@ liblua_la_SOURCES = \ local/linit.lch: local/linit.lua bin2c local/linit.lua > local/linit.lch - -# XXX to avoid local/linit.lch syntax problem. -# -# local/linit.c \ -# lib/lstrlib.c \ -# -LUA_SPLINT_SRCS = \ - lua/lua.c \ - include/lauxlib.h \ - include/lua.h \ - include/lualib.h \ - lib/lauxlib.c \ - lib/lbaselib.c \ - lib/ldblib.c \ - lib/liolib.c \ - lib/loadlib.c \ - lib/lmathlib.c \ - lib/ltablib.c \ - local/lposix.h \ - local/lposix.c \ - local/lrexlib.h \ - local/lrexlib.c \ - lapi.c \ - lapi.h \ - lcode.c \ - lcode.h \ - ldebug.c \ - ldebug.h \ - ldo.c \ - ldo.h \ - ldump.c \ - lfunc.c \ - lfunc.h \ - lgc.c \ - lgc.h \ - llex.c \ - llex.h \ - llimits.h \ - lmem.c \ - lmem.h \ - lobject.c \ - lobject.h \ - lopcodes.c \ - lopcodes.h \ - lparser.c \ - lparser.h \ - lstate.c \ - lstate.h \ - lstring.c \ - lstring.h \ - ltable.c \ - ltable.h \ - ltests.c \ - ltm.c \ - ltm.h \ - lundump.c \ - lundump.h \ - lvm.c \ - lvm.h \ - lzio.c \ - lzio.h - -.PHONY: sources -sources: - @echo $(LUA_SPLINT_SRCS:%=lua/%) - -.PHONY: lint -lint: - $(LINT) $(DEFS) $(AM_CPPFLAGS) $(LUA_SPLINT_SRCS) - @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n" -"POT-Creation-Date: 2007-08-21 08:04+0200\n" +"POT-Creation-Date: 2007-08-30 18:37+0200\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" @@ -1278,20 +1278,20 @@ msgstr "nekontrolovat závislosti balíèkù" msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "generovat hlavièky balíèkù kompatibilní s RPM verze 2 a 3" -#: build/poptBT.c:229 lib/poptALL.c:273 lib/poptI.c:282 lib/poptQV.c:363 -#: lib/poptQV.c:372 lib/poptQV.c:413 +#: build/poptBT.c:229 lib/poptALL.c:273 lib/poptI.c:282 lib/poptQV.c:362 +#: lib/poptQV.c:371 lib/poptQV.c:412 #, fuzzy msgid "don't verify package digest(s)" msgstr "nekontrolovat závislosti balíèkù" -#: build/poptBT.c:231 lib/poptALL.c:275 lib/poptI.c:284 lib/poptQV.c:366 -#: lib/poptQV.c:374 lib/poptQV.c:416 +#: build/poptBT.c:231 lib/poptALL.c:275 lib/poptI.c:284 lib/poptQV.c:365 +#: lib/poptQV.c:373 lib/poptQV.c:415 #, fuzzy msgid "don't verify database header(s) when retrieved" msgstr "nekontrolovat architekturu balíèku" -#: build/poptBT.c:233 lib/poptALL.c:281 lib/poptI.c:286 lib/poptQV.c:369 -#: lib/poptQV.c:376 lib/poptQV.c:418 +#: build/poptBT.c:233 lib/poptALL.c:281 lib/poptI.c:286 lib/poptQV.c:368 +#: lib/poptQV.c:375 lib/poptQV.c:417 #, fuzzy msgid "don't verify package signature(s)" msgstr "ovìøit podpis v balíèku" @@ -1354,27 +1354,27 @@ msgstr "%s selhalo\n" msgid "failed to write all data to %s\n" msgstr "Nemohu zapsat v¹echna data do %s\n" -#: build/rpmfc.c:1250 +#: build/rpmfc.c:1249 #, fuzzy, c-format msgid "magic_open(0x%x) failed: %s\n" msgstr "otevøení %s selhalo: %s\n" -#: build/rpmfc.c:1258 +#: build/rpmfc.c:1257 #, fuzzy, c-format -msgid "magic_load(ms, \"%s\") failed: %s\n" +msgid "magic_load failed: %s\n" msgstr "%s rmdir %s selhal: %s\n" -#: build/rpmfc.c:1303 +#: build/rpmfc.c:1301 #, fuzzy, c-format msgid "magic_file(ms, \"%s\") failed: mode %06o %s\n" msgstr "%s rmdir %s selhal: %s\n" -#: build/rpmfc.c:1524 +#: build/rpmfc.c:1522 #, fuzzy, c-format msgid "Finding %s: %s\n" msgstr "Hledám %s: (pou¾it %s)...\n" -#: build/rpmfc.c:1530 build/rpmfc.c:1539 +#: build/rpmfc.c:1528 build/rpmfc.c:1537 #, c-format msgid "Failed to find %s:\n" msgstr "Selhalo vyhledání %s:\n" @@ -1499,11 +1499,11 @@ msgstr "" msgid "removing %s \"%s\" from tsort relations.\n" msgstr "odstraòuji %s-%s-%s \"%s\" z tsort relací.\n" -#: lib/depends.c:1265 +#: lib/depends.c:1271 msgid "========== recording tsort relations\n" msgstr "========== ukládání tsort relací\n" -#: lib/depends.c:1357 +#: lib/depends.c:1363 #, fuzzy msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, depth, " @@ -1511,20 +1511,20 @@ msgid "" msgstr "" "========== tsorting balíèkù (poøadí, #pøedchùdce, #následovník, hloubka)\n" -#: lib/depends.c:1453 +#: lib/depends.c:1459 #, fuzzy, c-format msgid "========== successors only (%d bytes)\n" msgstr "========== pouze úspì¹né (poøadí dle prezentace)\n" -#: lib/depends.c:1526 +#: lib/depends.c:1532 msgid "LOOP:\n" msgstr "SMYÈKA:\n" -#: lib/depends.c:1561 +#: lib/depends.c:1567 msgid "========== continuing tsort ...\n" msgstr "========== pokraèuje tsort ...\n" -#: lib/depends.c:1566 +#: lib/depends.c:1572 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2082,7 +2082,7 @@ msgstr "upravit databázi, ale neupravovat systém souborovù" msgid "do not verify package dependencies" msgstr "nekontrolovat závislosti balíèkù" -#: lib/poptI.c:252 lib/poptQV.c:307 lib/poptQV.c:310 +#: lib/poptI.c:252 lib/poptQV.c:306 lib/poptQV.c:309 msgid "don't verify MD5 digest of files" msgstr "nekontrolovat MD5 souborù v balíèku" @@ -2200,233 +2200,233 @@ msgstr "neinstalovat ale sdìlit, zda-li by to fungovalo èi nikoli" msgid "upgrade package(s)" msgstr "aktualizace balíèku" -#: lib/poptQV.c:103 +#: lib/poptQV.c:102 msgid "query/verify all packages" msgstr "dotázat/ovìøit v¹echny balíèky" -#: lib/poptQV.c:105 +#: lib/poptQV.c:104 #, fuzzy msgid "rpm checksig mode" msgstr "re¾im kontroly" -#: lib/poptQV.c:107 +#: lib/poptQV.c:106 msgid "query/verify package(s) owning file" msgstr "dotaz/ovìøení balíèkù vlastnícího soubor" -#: lib/poptQV.c:109 +#: lib/poptQV.c:108 msgid "query/verify package(s) in group" msgstr "dotaz/ovìøení balíèkù ve skupinì" -#: lib/poptQV.c:111 +#: lib/poptQV.c:110 #, fuzzy msgid "query/verify a package file" msgstr "dotázat/ovìøit v¹echny balíèky" -#: lib/poptQV.c:114 +#: lib/poptQV.c:113 #, fuzzy msgid "query/verify package(s) from TOP file tree walk" msgstr "dotaz/ovìøení balíèkù ve skupinì" -#: lib/poptQV.c:116 +#: lib/poptQV.c:115 #, fuzzy msgid "query/verify package(s) from system HDLIST" msgstr "dotaz/ovìøení balíèkù ve skupinì" -#: lib/poptQV.c:119 +#: lib/poptQV.c:118 #, fuzzy msgid "query/verify package(s) with package identifier" msgstr "dotaz/ovìøení balíèkù vlastnícího soubor" -#: lib/poptQV.c:121 +#: lib/poptQV.c:120 #, fuzzy msgid "query/verify package(s) with header identifier" msgstr "dotaz/ovìøení balíèkù vlastnícího soubor" -#: lib/poptQV.c:123 +#: lib/poptQV.c:122 #, fuzzy msgid "query/verify package(s) with file identifier" msgstr "dotaz/ovìøení balíèkù vlastnícího soubor" -#: lib/poptQV.c:126 +#: lib/poptQV.c:125 msgid "rpm query mode" msgstr "re¾im dotazù" -#: lib/poptQV.c:128 +#: lib/poptQV.c:127 #, fuzzy msgid "query/verify a header instance" msgstr "dotaz/ovìøení balíèkù vlastnícího soubor" -#: lib/poptQV.c:130 +#: lib/poptQV.c:129 msgid "query a spec file" msgstr "dotaz na spec soubor" -#: lib/poptQV.c:130 +#: lib/poptQV.c:129 msgid "<spec>" msgstr "<spec>" -#: lib/poptQV.c:132 +#: lib/poptQV.c:131 #, fuzzy msgid "query/verify package(s) from install transaction" msgstr "dotaz/ovìøení balíèkù ve skupinì" -#: lib/poptQV.c:134 +#: lib/poptQV.c:133 msgid "query the package(s) triggered by the package" msgstr "dotaz na balíèky aktivované balíèkem" -#: lib/poptQV.c:136 +#: lib/poptQV.c:135 msgid "rpm verify mode" msgstr "re¾im kontroly" -#: lib/poptQV.c:138 +#: lib/poptQV.c:137 msgid "query/verify the package(s) which require a dependency" msgstr "dotaz/ovìøení balíèkù vy¾adujících závislost" -#: lib/poptQV.c:140 +#: lib/poptQV.c:139 msgid "query/verify the package(s) which provide a dependency" msgstr "dotaz/ovìøení balíèkù poskytujících závislost" -#: lib/poptQV.c:143 +#: lib/poptQV.c:142 msgid "create transaction set" msgstr "" -#: lib/poptQV.c:145 +#: lib/poptQV.c:144 msgid "do not order transaction set" msgstr "" -#: lib/poptQV.c:147 +#: lib/poptQV.c:146 #, fuzzy msgid "do not glob arguments" msgstr "k dotazu nezadány ¾ádné parametry" -#: lib/poptQV.c:149 +#: lib/poptQV.c:148 msgid "do not process non-package files as manifests" msgstr "" -#: lib/poptQV.c:151 +#: lib/poptQV.c:150 #, fuzzy msgid "do not read headers" msgstr "©patná nebo neèitelná hlavièka" -#: lib/poptQV.c:258 +#: lib/poptQV.c:257 msgid "list all configuration files" msgstr "vypsat v¹echny konfiguraèní soubory" -#: lib/poptQV.c:260 +#: lib/poptQV.c:259 msgid "list all documentation files" msgstr "vypsat v¹echny soubory s dokumentací" -#: lib/poptQV.c:262 +#: lib/poptQV.c:261 msgid "dump basic file information" msgstr "zobrazit základní informace o souborech" -#: lib/poptQV.c:266 +#: lib/poptQV.c:265 msgid "list files in package" msgstr "vypsat soubory v balíèku" -#: lib/poptQV.c:271 +#: lib/poptQV.c:270 #, c-format msgid "skip %%ghost files" msgstr "vynechat %%ghost soubory" -#: lib/poptQV.c:275 +#: lib/poptQV.c:274 #, c-format msgid "skip %%license files" msgstr "vynechat %%license soubory" -#: lib/poptQV.c:278 +#: lib/poptQV.c:277 #, c-format msgid "skip %%readme files" msgstr "vynechat %%readme soubory" -#: lib/poptQV.c:284 +#: lib/poptQV.c:283 msgid "use the following query format" msgstr "pou¾ij následující formát dotazù" -#: lib/poptQV.c:286 +#: lib/poptQV.c:285 msgid "substitute i18n sections into spec file" msgstr "nahradit i18n sekce do spec souboru" -#: lib/poptQV.c:288 +#: lib/poptQV.c:287 msgid "display the states of the listed files" msgstr "zobrazit stav vypsaných souborù" -#: lib/poptQV.c:314 +#: lib/poptQV.c:313 msgid "don't verify size of files" msgstr "nekontrolovat velikost souborù" -#: lib/poptQV.c:317 +#: lib/poptQV.c:316 msgid "don't verify symlink path of files" msgstr "nekontrolovat cesty symbolických linek" -#: lib/poptQV.c:320 +#: lib/poptQV.c:319 msgid "don't verify owner of files" msgstr "nekontrolovat vlastníka souborù" -#: lib/poptQV.c:323 +#: lib/poptQV.c:322 msgid "don't verify group of files" msgstr "nekontrolovat skupinu souborù" -#: lib/poptQV.c:326 +#: lib/poptQV.c:325 msgid "don't verify modification time of files" msgstr "nekontrolovat èas zmìny souboru" -#: lib/poptQV.c:329 lib/poptQV.c:332 +#: lib/poptQV.c:328 lib/poptQV.c:331 msgid "don't verify mode of files" msgstr "nekontrolovat mód souborù" -#: lib/poptQV.c:335 +#: lib/poptQV.c:334 #, fuzzy msgid "don't verify file security contexts" msgstr "nekontrolovat soubory v balíèku" -#: lib/poptQV.c:337 +#: lib/poptQV.c:336 msgid "don't verify files in package" msgstr "nekontrolovat soubory v balíèku" -#: lib/poptQV.c:340 lib/poptQV.c:343 tools/rpmgraph.c:266 +#: lib/poptQV.c:339 lib/poptQV.c:342 tools/rpmgraph.c:266 msgid "don't verify package dependencies" msgstr "nekontrolovat závislosti balíèkù" -#: lib/poptQV.c:348 lib/poptQV.c:352 lib/poptQV.c:355 lib/poptQV.c:358 +#: lib/poptQV.c:347 lib/poptQV.c:351 lib/poptQV.c:354 lib/poptQV.c:357 #, fuzzy msgid "don't execute verify script(s)" msgstr "nespou¹tìt %verifyscript (pokud existuje)" -#: lib/poptQV.c:382 +#: lib/poptQV.c:381 #, fuzzy msgid "don't verify GPG V3 DSA signature(s)" msgstr "nekontrolovat SHA1 digest v hlavièce" -#: lib/poptQV.c:385 +#: lib/poptQV.c:384 #, fuzzy msgid "don't verify PGP V3 RSA/MD5 signature(s)" msgstr "nekontrolovat MD5 souborù v balíèku" -#: lib/poptQV.c:400 +#: lib/poptQV.c:399 #, fuzzy msgid "sign package(s) (identical to --resign)" msgstr "podepsat balíèek (zahodit aktuální podpis)" -#: lib/poptQV.c:402 +#: lib/poptQV.c:401 #, fuzzy msgid "verify package signature(s)" msgstr "ovìøit podpis v balíèku" -#: lib/poptQV.c:404 +#: lib/poptQV.c:403 #, fuzzy msgid "delete package signatures" msgstr "ovìøit podpis v balíèku" -#: lib/poptQV.c:406 +#: lib/poptQV.c:405 msgid "import an armored public key" msgstr "" -#: lib/poptQV.c:408 +#: lib/poptQV.c:407 #, fuzzy msgid "sign package(s) (identical to --addsign)" msgstr "podepsat balíèek (zahodit aktuální podpis)" -#: lib/poptQV.c:410 +#: lib/poptQV.c:409 msgid "generate signature" msgstr "generovat PGP/GPG podpis" @@ -2770,39 +2770,39 @@ msgstr "balíèek %s-%s-%s má nesplnìné po¾adavky: %s\n" msgid "%s skipped due to missingok flag\n" msgstr "" -#: lib/rpmfi.c:846 +#: lib/rpmfi.c:850 #, fuzzy msgid "========== relocations\n" msgstr "========== ukládání tsort relací\n" -#: lib/rpmfi.c:850 +#: lib/rpmfi.c:854 #, fuzzy, c-format msgid "%5d exclude %s\n" msgstr "OS je vyøazen: %s\n" -#: lib/rpmfi.c:853 +#: lib/rpmfi.c:857 #, fuzzy, c-format msgid "%5d relocate %s -> %s\n" msgstr "%s vytvoøen jako %s\n" -#: lib/rpmfi.c:987 +#: lib/rpmfi.c:991 #, fuzzy, c-format msgid "excluding %s %s\n" msgstr "Provádìní(%s): %s\n" -#: lib/rpmfi.c:997 +#: lib/rpmfi.c:1001 #, fuzzy, c-format msgid "relocating %s to %s\n" msgstr "Provádìní(%s): %s\n" -#: lib/rpmfi.c:1089 +#: lib/rpmfi.c:1093 #, fuzzy, c-format msgid "relocating directory %s to %s\n" msgstr "nemohu provést dotaz %s: %s\n" #: lib/rpmgi.c:81 lib/rpminstall.c:124 lib/rpminstall.c:480 -#: lib/rpminstall.c:615 lib/rpminstall.c:1041 lib/rpmts.c:643 -#: tools/rpmgraph.c:121 tools/rpmgraph.c:158 +#: lib/rpminstall.c:615 lib/rpmts.c:643 tools/rpmgraph.c:121 +#: tools/rpmgraph.c:158 #, c-format msgid "open of %s failed: %s\n" msgstr "otevøení %s selhalo: %s\n" @@ -2813,7 +2813,7 @@ msgid "unknown tag: \"%s\"\n" msgstr "neznámá znaèka" #: lib/rpmgi.c:628 lib/rpminstall.c:659 lib/rpminstall.c:834 -#: lib/rpminstall.c:1267 lib/transaction.c:1031 tools/rpmgraph.c:196 +#: lib/rpminstall.c:1084 lib/transaction.c:1026 tools/rpmgraph.c:196 #, fuzzy msgid "Failed dependencies:\n" msgstr "chybné závislosti pøi sestavování:\n" @@ -2933,16 +2933,16 @@ msgstr "nemohu vytvoøit %s: %s\n" msgid "Installing %s\n" msgstr "øádek: %s\n" -#: lib/rpminstall.c:1261 lib/transaction.c:1024 +#: lib/rpminstall.c:1078 lib/transaction.c:1019 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" -#: lib/rpminstall.c:1292 lib/transaction.c:1075 +#: lib/rpminstall.c:1109 lib/transaction.c:1070 msgid "Cleaning up repackaged packages:\n" msgstr "" -#: lib/rpminstall.c:1299 lib/transaction.c:1081 +#: lib/rpminstall.c:1116 lib/transaction.c:1076 #, fuzzy, c-format msgid "\tRemoving %s:\n" msgstr "RPM verze %s\n" @@ -3077,97 +3077,97 @@ msgstr " koliduje s %s-%s-%s\n" msgid "unknown error %d encountered while manipulating package %s" msgstr "neznámá chyba %d vznikla pøi manipulaci s balíèkem %s" -#: lib/rpmrc.c:199 +#: lib/rpmrc.c:213 #, fuzzy, c-format msgid "missing second ':' at %s:%d\n" msgstr "Chybí '(' v %s %s\n" -#: lib/rpmrc.c:202 +#: lib/rpmrc.c:216 #, c-format msgid "missing architecture name at %s:%d\n" msgstr "" -#: lib/rpmrc.c:356 +#: lib/rpmrc.c:370 #, c-format msgid "Incomplete data line at %s:%d\n" msgstr "" -#: lib/rpmrc.c:361 +#: lib/rpmrc.c:375 #, c-format msgid "Too many args in data line at %s:%d\n" msgstr "" -#: lib/rpmrc.c:369 +#: lib/rpmrc.c:383 #, fuzzy, c-format msgid "Bad arch/os number: %s (%s:%d)\n" msgstr "©patná práva adresáøe: %s(%s)\n" -#: lib/rpmrc.c:406 +#: lib/rpmrc.c:420 #, c-format msgid "Incomplete default line at %s:%d\n" msgstr "" -#: lib/rpmrc.c:411 +#: lib/rpmrc.c:425 #, c-format msgid "Too many args in default line at %s:%d\n" msgstr "" -#: lib/rpmrc.c:577 +#: lib/rpmrc.c:591 #, fuzzy, c-format msgid "Failed to read %s: %s.\n" msgstr "nemohu zjistit stav %s: %s\n" -#: lib/rpmrc.c:615 +#: lib/rpmrc.c:629 #, c-format msgid "missing ':' (found 0x%02x) at %s:%d\n" msgstr "" -#: lib/rpmrc.c:632 lib/rpmrc.c:706 +#: lib/rpmrc.c:646 lib/rpmrc.c:710 #, fuzzy, c-format msgid "missing argument for %s at %s:%d\n" msgstr "Sestavuji cílové platformy: %s\n" -#: lib/rpmrc.c:649 lib/rpmrc.c:671 +#: lib/rpmrc.c:663 #, fuzzy, c-format msgid "%s expansion failed at %s:%d \"%s\"\n" msgstr "nemohu otevøít %s: %s\n" -#: lib/rpmrc.c:658 +#: lib/rpmrc.c:672 #, fuzzy, c-format msgid "cannot open %s at %s:%d: %s\n" msgstr "nemohu vytvoøit %s: %s\n" -#: lib/rpmrc.c:698 +#: lib/rpmrc.c:702 #, fuzzy, c-format msgid "missing architecture for %s at %s:%d\n" msgstr "øádek %d: ©patný formát BuildArchitecture: %s\n" -#: lib/rpmrc.c:765 +#: lib/rpmrc.c:769 #, fuzzy, c-format msgid "bad option '%s' at %s:%d\n" msgstr "nemohu zjistit stav %s: %m\n" -#: lib/rpmrc.c:1564 +#: lib/rpmrc.c:1568 #, fuzzy, c-format msgid "Unknown system: %s\n" msgstr "Neznámý typ ikony: %s\n" -#: lib/rpmrc.c:1565 +#: lib/rpmrc.c:1569 #, c-format msgid "Please contact %s\n" msgstr "" -#: lib/rpmrc.c:1802 +#: lib/rpmrc.c:1806 #, fuzzy, c-format msgid "Cannot expand %s\n" msgstr "nemohu znovu otevøít payload: %s\n" -#: lib/rpmrc.c:1807 +#: lib/rpmrc.c:1811 #, c-format msgid "Cannot read %s, HOME is too large.\n" msgstr "" -#: lib/rpmrc.c:1824 +#: lib/rpmrc.c:1828 #, fuzzy, c-format msgid "Unable to open %s for reading: %s.\n" msgstr "Nemohu otevøít %s: %s\n" @@ -3464,160 +3464,160 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:935 +#: lib/transaction.c:930 #, c-format msgid "excluding directory %s\n" msgstr "" -#: lib/transaction.c:1022 +#: lib/transaction.c:1017 msgid "Transaction failed...rolling back\n" msgstr "" -#: lib/transaction.c:1042 +#: lib/transaction.c:1037 msgid "Could not order auto-rollback transaction!\n" msgstr "" -#: lib/transaction.c:1132 +#: lib/transaction.c:1127 msgid "Getting repackaged header from transaction element\n" msgstr "" -#: lib/transaction.c:1157 +#: lib/transaction.c:1152 #, c-format msgid "\tLooking for %s...\n" msgstr "" -#: lib/transaction.c:1161 +#: lib/transaction.c:1156 msgid "\tMatches found.\n" msgstr "" -#: lib/transaction.c:1165 +#: lib/transaction.c:1160 msgid "\tNo matches found.\n" msgstr "" -#: lib/transaction.c:1178 +#: lib/transaction.c:1173 #, fuzzy msgid "\tRepackaged package not found!.\n" msgstr "oèekávám balíèek se zdrojovými kódy, nalezen v¹ak binární\n" -#: lib/transaction.c:1199 +#: lib/transaction.c:1194 msgid "\tREMOVETID matched INSTALLTID.\n" msgstr "" -#: lib/transaction.c:1201 +#: lib/transaction.c:1196 #, c-format msgid "\t\tName: %s.\n" msgstr "" -#: lib/transaction.c:1224 +#: lib/transaction.c:1219 #, fuzzy, c-format msgid "\tRepackaged Package was %s...\n" msgstr "¾ádný balíèek neaktivuje %s\n" -#: lib/transaction.c:1268 +#: lib/transaction.c:1263 msgid "Adding install element to auto-rollback transaction.\n" msgstr "" -#: lib/transaction.c:1277 +#: lib/transaction.c:1272 msgid "Could not get install element database instance!\n" msgstr "" -#: lib/transaction.c:1290 +#: lib/transaction.c:1285 msgid "Could not get header for auto-rollback transaction!\n" msgstr "" -#: lib/transaction.c:1300 +#: lib/transaction.c:1295 #, fuzzy, c-format msgid "\tAdded repackaged package header: %s.\n" msgstr "<zdrojový balíèek>" -#: lib/transaction.c:1302 lib/transaction.c:1313 +#: lib/transaction.c:1297 lib/transaction.c:1308 #, c-format msgid "\tAdded from install element %s.\n" msgstr "" -#: lib/transaction.c:1311 +#: lib/transaction.c:1306 msgid "\tAdded erase element.\n" msgstr "" -#: lib/transaction.c:1320 +#: lib/transaction.c:1315 msgid "Could not get repackaged header for auto-rollback transaction!\n" msgstr "" -#: lib/transaction.c:1327 +#: lib/transaction.c:1322 msgid "Add erase element to auto-rollback transaction.\n" msgstr "" -#: lib/transaction.c:1335 +#: lib/transaction.c:1330 msgid "\tFound existing upgrade element.\n" msgstr "" -#: lib/transaction.c:1336 +#: lib/transaction.c:1331 #, c-format msgid "\tNot adding erase element for %s.\n" msgstr "" -#: lib/transaction.c:1353 +#: lib/transaction.c:1348 #, fuzzy, c-format msgid "\tAdded repackaged package %s.\n" msgstr "<zdrojový balíèek>" -#: lib/transaction.c:1355 +#: lib/transaction.c:1350 #, c-format msgid "\tAdded from erase element %s.\n" msgstr "" -#: lib/transaction.c:1360 +#: lib/transaction.c:1355 msgid "Could not add erase element to auto-rollback transaction.\n" msgstr "" -#: lib/transaction.c:1366 +#: lib/transaction.c:1361 msgid "\tNo repackaged package...nothing to do.\n" msgstr "" -#: lib/transaction.c:1372 +#: lib/transaction.c:1367 #, fuzzy msgid "Failure reading repackaged package!\n" msgstr "chyba pøi pøi ètení hlavièky balíèku\n" -#: lib/transaction.c:1495 +#: lib/transaction.c:1490 #, c-format msgid "sanity checking %d elements\n" msgstr "" -#: lib/transaction.c:1581 +#: lib/transaction.c:1576 msgid "running pre-transaction scripts\n" msgstr "" -#: lib/transaction.c:1655 +#: lib/transaction.c:1650 #, c-format msgid "computing %d file fingerprints\n" msgstr "" -#: lib/transaction.c:1739 +#: lib/transaction.c:1734 msgid "computing file dispositions\n" msgstr "" -#: lib/transaction.c:1932 +#: lib/transaction.c:1927 msgid "Creating auto-rollback transaction\n" msgstr "" -#: lib/transaction.c:2086 +#: lib/transaction.c:2077 msgid "Add failed. Could not read package header.\n" msgstr "" -#: lib/transaction.c:2170 +#: lib/transaction.c:2161 msgid "Add failed in rpmpsmStage().\n" msgstr "" -#: lib/transaction.c:2214 +#: lib/transaction.c:2205 msgid "Add failed. Could not get file list.\n" msgstr "" -#: lib/transaction.c:2263 +#: lib/transaction.c:2254 msgid "Erase failed failed in rpmpsmStage().\n" msgstr "" -#: lib/transaction.c:2324 +#: lib/transaction.c:2315 msgid "running post-transaction scripts\n" msgstr "" @@ -4009,86 +4009,86 @@ msgstr "" msgid "======================== active %d empty %d\n" msgstr "" -#: rpmio/macro.c:394 +#: rpmio/macro.c:396 #, c-format msgid "%3d>%*s(empty)" msgstr "" -#: rpmio/macro.c:437 +#: rpmio/macro.c:439 #, c-format msgid "%3d<%*s(empty)\n" msgstr "" -#: rpmio/macro.c:664 rpmio/macro.c:705 +#: rpmio/macro.c:608 rpmio/macro.c:1090 rpmio/macro.c:1123 rpmio/macro.c:1863 +msgid "Target buffer overflow\n" +msgstr "" + +#: rpmio/macro.c:671 rpmio/macro.c:712 #, c-format msgid "Macro %%%s has unterminated body\n" msgstr "" -#: rpmio/macro.c:727 +#: rpmio/macro.c:734 #, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "" -#: rpmio/macro.c:733 +#: rpmio/macro.c:740 #, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "" -#: rpmio/macro.c:738 +#: rpmio/macro.c:745 #, c-format msgid "Macro %%%s has empty body\n" msgstr "" -#: rpmio/macro.c:744 +#: rpmio/macro.c:751 #, c-format msgid "Macro %%%s failed to expand\n" msgstr "" -#: rpmio/macro.c:779 +#: rpmio/macro.c:786 #, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "" -#: rpmio/macro.c:897 +#: rpmio/macro.c:904 #, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "" -#: rpmio/macro.c:1024 +#: rpmio/macro.c:1031 #, fuzzy, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "Neznámý typ ikony: %s\n" -#: rpmio/macro.c:1224 +#: rpmio/macro.c:1239 #, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "" -#: rpmio/macro.c:1297 rpmio/macro.c:1314 +#: rpmio/macro.c:1312 rpmio/macro.c:1329 #, fuzzy, c-format msgid "Unterminated %c: %s\n" msgstr "Glob není dovolen: %s\n" -#: rpmio/macro.c:1355 +#: rpmio/macro.c:1370 #, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "" -#: rpmio/macro.c:1512 +#: rpmio/macro.c:1527 #, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "" -#: rpmio/macro.c:1848 -msgid "Target buffer overflow\n" -msgstr "" - -#: rpmio/macro.c:2056 rpmio/macro.c:2062 +#: rpmio/macro.c:2076 rpmio/macro.c:2082 #, fuzzy, c-format msgid "File %s: %s\n" msgstr "soubor %s: %s\n" -#: rpmio/macro.c:2065 +#: rpmio/macro.c:2085 #, c-format msgid "File %s is smaller than %u bytes\n" msgstr "" @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n" -"POT-Creation-Date: 2007-08-21 08:04+0200\n" +"POT-Creation-Date: 2007-08-30 18:37+0200\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" @@ -1278,20 +1278,20 @@ msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "" "generér pakkehoved(er), der er kompatible med (gamle) rpm[23]-indpakninger" -#: build/poptBT.c:229 lib/poptALL.c:273 lib/poptI.c:282 lib/poptQV.c:363 -#: lib/poptQV.c:372 lib/poptQV.c:413 +#: build/poptBT.c:229 lib/poptALL.c:273 lib/poptI.c:282 lib/poptQV.c:362 +#: lib/poptQV.c:371 lib/poptQV.c:412 #, fuzzy msgid "don't verify package digest(s)" msgstr "undlad at tjekke pakkers afhængighedskrav" -#: build/poptBT.c:231 lib/poptALL.c:275 lib/poptI.c:284 lib/poptQV.c:366 -#: lib/poptQV.c:374 lib/poptQV.c:416 +#: build/poptBT.c:231 lib/poptALL.c:275 lib/poptI.c:284 lib/poptQV.c:365 +#: lib/poptQV.c:373 lib/poptQV.c:415 #, fuzzy msgid "don't verify database header(s) when retrieved" msgstr "tjek ikke pakkens arkitektur" -#: build/poptBT.c:233 lib/poptALL.c:281 lib/poptI.c:286 lib/poptQV.c:369 -#: lib/poptQV.c:376 lib/poptQV.c:418 +#: build/poptBT.c:233 lib/poptALL.c:281 lib/poptI.c:286 lib/poptQV.c:368 +#: lib/poptQV.c:375 lib/poptQV.c:417 #, fuzzy msgid "don't verify package signature(s)" msgstr "verificér pakkesignatur" @@ -1354,27 +1354,27 @@ msgstr "%s mislykkedes\n" msgid "failed to write all data to %s\n" msgstr "kunne ikke skrive alle data til %s\n" -#: build/rpmfc.c:1250 +#: build/rpmfc.c:1249 #, fuzzy, c-format msgid "magic_open(0x%x) failed: %s\n" msgstr "åbning af %s mislykkedes %s\n" -#: build/rpmfc.c:1258 +#: build/rpmfc.c:1257 #, fuzzy, c-format -msgid "magic_load(ms, \"%s\") failed: %s\n" +msgid "magic_load failed: %s\n" msgstr "fjernelse af %s mislykkedes: %s\n" -#: build/rpmfc.c:1303 +#: build/rpmfc.c:1301 #, fuzzy, c-format msgid "magic_file(ms, \"%s\") failed: mode %06o %s\n" msgstr "fjernelse af %s mislykkedes: %s\n" -#: build/rpmfc.c:1524 +#: build/rpmfc.c:1522 #, fuzzy, c-format msgid "Finding %s: %s\n" msgstr "Finder %s: (benytter %s)...\n" -#: build/rpmfc.c:1530 build/rpmfc.c:1539 +#: build/rpmfc.c:1528 build/rpmfc.c:1537 #, c-format msgid "Failed to find %s:\n" msgstr "Kunne ikke finde %s:\n" @@ -1500,30 +1500,30 @@ msgstr "" msgid "removing %s \"%s\" from tsort relations.\n" msgstr "fjerne %s-%s-%s \"%s\" fra tsort-relationer.\n" -#: lib/depends.c:1265 +#: lib/depends.c:1271 msgid "========== recording tsort relations\n" msgstr "========== gemmer tsort-relationer\n" -#: lib/depends.c:1357 +#: lib/depends.c:1363 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, depth, " "breadth)\n" msgstr "" -#: lib/depends.c:1453 +#: lib/depends.c:1459 #, fuzzy, c-format msgid "========== successors only (%d bytes)\n" msgstr "========== kun efterfølgere (præsentationsrækkefølge)\n" -#: lib/depends.c:1526 +#: lib/depends.c:1532 msgid "LOOP:\n" msgstr "LØKKE:\n" -#: lib/depends.c:1561 +#: lib/depends.c:1567 msgid "========== continuing tsort ...\n" msgstr "========== fortsætter tsort ...\n" -#: lib/depends.c:1566 +#: lib/depends.c:1572 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2082,7 +2082,7 @@ msgstr "opdatér databasen, men rør ikke filsystemet" msgid "do not verify package dependencies" msgstr "undlad at tjekke pakkers afhængighedskrav" -#: lib/poptI.c:252 lib/poptQV.c:307 lib/poptQV.c:310 +#: lib/poptI.c:252 lib/poptQV.c:306 lib/poptQV.c:309 #, fuzzy msgid "don't verify MD5 digest of files" msgstr "verificér ikke filerne i pakke" @@ -2205,239 +2205,239 @@ msgstr "installér ikke, men fortæl om det ville lykkes eller ej" msgid "upgrade package(s)" msgstr "opgradér pakke" -#: lib/poptQV.c:103 +#: lib/poptQV.c:102 msgid "query/verify all packages" msgstr "forespørg/verificér alle pakker" -#: lib/poptQV.c:105 +#: lib/poptQV.c:104 #, fuzzy msgid "rpm checksig mode" msgstr "rpm verifikationstilstand" -#: lib/poptQV.c:107 +#: lib/poptQV.c:106 msgid "query/verify package(s) owning file" msgstr "forespørg/verificér pakke(r), der ejer filen" -#: lib/poptQV.c:109 +#: lib/poptQV.c:108 msgid "query/verify package(s) in group" msgstr "forespørg/verificér pakke(r) i gruppen" -#: lib/poptQV.c:111 +#: lib/poptQV.c:110 #, fuzzy msgid "query/verify a package file" msgstr "forespørg/verificér alle pakker" -#: lib/poptQV.c:114 +#: lib/poptQV.c:113 #, fuzzy msgid "query/verify package(s) from TOP file tree walk" msgstr "forespørg/verificér pakke(r) i gruppen" -#: lib/poptQV.c:116 +#: lib/poptQV.c:115 #, fuzzy msgid "query/verify package(s) from system HDLIST" msgstr "forespørg/verificér pakke(r) i gruppen" -#: lib/poptQV.c:119 +#: lib/poptQV.c:118 #, fuzzy msgid "query/verify package(s) with package identifier" msgstr "forespørg/verificér pakke(r), der ejer filen" -#: lib/poptQV.c:121 +#: lib/poptQV.c:120 #, fuzzy msgid "query/verify package(s) with header identifier" msgstr "forespørg/verificér pakke(r), der ejer filen" -#: lib/poptQV.c:123 +#: lib/poptQV.c:122 #, fuzzy msgid "query/verify package(s) with file identifier" msgstr "forespørg/verificér pakke(r), der ejer filen" -#: lib/poptQV.c:126 +#: lib/poptQV.c:125 msgid "rpm query mode" msgstr "rpm forespørgselstilstand" -#: lib/poptQV.c:128 +#: lib/poptQV.c:127 #, fuzzy msgid "query/verify a header instance" msgstr "forespørg/verificér pakke(r), der ejer filen" -#: lib/poptQV.c:130 +#: lib/poptQV.c:129 msgid "query a spec file" msgstr "forespørg en spec-fil" -#: lib/poptQV.c:130 +#: lib/poptQV.c:129 msgid "<spec>" msgstr "<spec>" -#: lib/poptQV.c:132 +#: lib/poptQV.c:131 #, fuzzy msgid "query/verify package(s) from install transaction" msgstr "forespørg/verificér pakke(r) i gruppen" -#: lib/poptQV.c:134 +#: lib/poptQV.c:133 msgid "query the package(s) triggered by the package" msgstr "forespørg pakke(r), der udløses af pakken" -#: lib/poptQV.c:136 +#: lib/poptQV.c:135 msgid "rpm verify mode" msgstr "rpm verifikationstilstand" -#: lib/poptQV.c:138 +#: lib/poptQV.c:137 msgid "query/verify the package(s) which require a dependency" msgstr "forespørg/verificér pakke(r), der stiller et krav" -#: lib/poptQV.c:140 +#: lib/poptQV.c:139 msgid "query/verify the package(s) which provide a dependency" msgstr "forespørg/verificér pakke(r), der tilfredsstiller et krav" -#: lib/poptQV.c:143 +#: lib/poptQV.c:142 msgid "create transaction set" msgstr "" -#: lib/poptQV.c:145 +#: lib/poptQV.c:144 msgid "do not order transaction set" msgstr "" -#: lib/poptQV.c:147 +#: lib/poptQV.c:146 #, fuzzy msgid "do not glob arguments" msgstr "ingen parametre angivet ved forespørgsel" -#: lib/poptQV.c:149 +#: lib/poptQV.c:148 msgid "do not process non-package files as manifests" msgstr "" -#: lib/poptQV.c:151 +#: lib/poptQV.c:150 #, fuzzy msgid "do not read headers" msgstr "%s: kan ikke læse hoved ved 0x%x\n" -#: lib/poptQV.c:258 +#: lib/poptQV.c:257 msgid "list all configuration files" msgstr "vis alle konfigurationsfiler" -#: lib/poptQV.c:260 +#: lib/poptQV.c:259 msgid "list all documentation files" msgstr "vis alle dokumentationsfiler" -#: lib/poptQV.c:262 +#: lib/poptQV.c:261 msgid "dump basic file information" msgstr "vis grundlæggende filinformation" -#: lib/poptQV.c:266 +#: lib/poptQV.c:265 msgid "list files in package" msgstr "vis liste over filerne i pakken" -#: lib/poptQV.c:271 +#: lib/poptQV.c:270 #, c-format msgid "skip %%ghost files" msgstr "" -#: lib/poptQV.c:275 +#: lib/poptQV.c:274 #, c-format msgid "skip %%license files" msgstr "" -#: lib/poptQV.c:278 +#: lib/poptQV.c:277 #, fuzzy, c-format msgid "skip %%readme files" msgstr "%s: readLead mislykkedes\n" -#: lib/poptQV.c:284 +#: lib/poptQV.c:283 msgid "use the following query format" msgstr "brug følgende forespørgselsformat" -#: lib/poptQV.c:286 +#: lib/poptQV.c:285 msgid "substitute i18n sections into spec file" msgstr "erstat i18n-sektioner i spec-fil" -#: lib/poptQV.c:288 +#: lib/poptQV.c:287 msgid "display the states of the listed files" msgstr "vis filernes status" -#: lib/poptQV.c:314 +#: lib/poptQV.c:313 #, fuzzy msgid "don't verify size of files" msgstr "verificér ikke filerne i pakke" -#: lib/poptQV.c:317 +#: lib/poptQV.c:316 #, fuzzy msgid "don't verify symlink path of files" msgstr "verificér ikke filerne i pakke" -#: lib/poptQV.c:320 +#: lib/poptQV.c:319 #, fuzzy msgid "don't verify owner of files" msgstr "verificér ikke filerne i pakke" -#: lib/poptQV.c:323 +#: lib/poptQV.c:322 #, fuzzy msgid "don't verify group of files" msgstr "verificér ikke filerne i pakke" -#: lib/poptQV.c:326 +#: lib/poptQV.c:325 msgid "don't verify modification time of files" msgstr "" -#: lib/poptQV.c:329 lib/poptQV.c:332 +#: lib/poptQV.c:328 lib/poptQV.c:331 #, fuzzy msgid "don't verify mode of files" msgstr "verificér ikke filerne i pakke" -#: lib/poptQV.c:335 +#: lib/poptQV.c:334 #, fuzzy msgid "don't verify file security contexts" msgstr "verificér ikke filerne i pakke" -#: lib/poptQV.c:337 +#: lib/poptQV.c:336 msgid "don't verify files in package" msgstr "verificér ikke filerne i pakke" -#: lib/poptQV.c:340 lib/poptQV.c:343 tools/rpmgraph.c:266 +#: lib/poptQV.c:339 lib/poptQV.c:342 tools/rpmgraph.c:266 #, fuzzy msgid "don't verify package dependencies" msgstr "undlad at tjekke pakkers afhængighedskrav" -#: lib/poptQV.c:348 lib/poptQV.c:352 lib/poptQV.c:355 lib/poptQV.c:358 +#: lib/poptQV.c:347 lib/poptQV.c:351 lib/poptQV.c:354 lib/poptQV.c:357 #, fuzzy msgid "don't execute verify script(s)" msgstr "udfør ikke eventuelt %verifyscript" -#: lib/poptQV.c:382 +#: lib/poptQV.c:381 #, fuzzy msgid "don't verify GPG V3 DSA signature(s)" msgstr "verificér ikke filerne i pakke" -#: lib/poptQV.c:385 +#: lib/poptQV.c:384 #, fuzzy msgid "don't verify PGP V3 RSA/MD5 signature(s)" msgstr "verificér ikke filerne i pakke" -#: lib/poptQV.c:400 +#: lib/poptQV.c:399 #, fuzzy msgid "sign package(s) (identical to --resign)" msgstr "underskriv en pakke (slet nuværende signatur)" -#: lib/poptQV.c:402 +#: lib/poptQV.c:401 #, fuzzy msgid "verify package signature(s)" msgstr "verificér pakkesignatur" -#: lib/poptQV.c:404 +#: lib/poptQV.c:403 #, fuzzy msgid "delete package signatures" msgstr "verificér pakkesignatur" -#: lib/poptQV.c:406 +#: lib/poptQV.c:405 msgid "import an armored public key" msgstr "" -#: lib/poptQV.c:408 +#: lib/poptQV.c:407 #, fuzzy msgid "sign package(s) (identical to --addsign)" msgstr "underskriv en pakke (slet nuværende signatur)" -#: lib/poptQV.c:410 +#: lib/poptQV.c:409 #, fuzzy msgid "generate signature" msgstr "generér PGP/GPG-signatur" @@ -2784,38 +2784,38 @@ msgstr "pakke %s-%s-%s krav ikke opfyldt: %s\n" msgid "%s skipped due to missingok flag\n" msgstr "%s oversprunget grundet manglende ok-flag\n" -#: lib/rpmfi.c:846 +#: lib/rpmfi.c:850 msgid "========== relocations\n" msgstr "========== gemmer omrokeringer\n" -#: lib/rpmfi.c:850 +#: lib/rpmfi.c:854 #, c-format msgid "%5d exclude %s\n" msgstr "%5d ekskluderer %s\n" -#: lib/rpmfi.c:853 +#: lib/rpmfi.c:857 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "%5d omrokerer %s -> %s\n" -#: lib/rpmfi.c:987 +#: lib/rpmfi.c:991 #, c-format msgid "excluding %s %s\n" msgstr "ekskluderer %s %s\n" -#: lib/rpmfi.c:997 +#: lib/rpmfi.c:1001 #, c-format msgid "relocating %s to %s\n" msgstr "omrokerer %s til %s\n" -#: lib/rpmfi.c:1089 +#: lib/rpmfi.c:1093 #, c-format msgid "relocating directory %s to %s\n" msgstr "omrokerer kataloget %s til %s\n" #: lib/rpmgi.c:81 lib/rpminstall.c:124 lib/rpminstall.c:480 -#: lib/rpminstall.c:615 lib/rpminstall.c:1041 lib/rpmts.c:643 -#: tools/rpmgraph.c:121 tools/rpmgraph.c:158 +#: lib/rpminstall.c:615 lib/rpmts.c:643 tools/rpmgraph.c:121 +#: tools/rpmgraph.c:158 #, c-format msgid "open of %s failed: %s\n" msgstr "åbning af %s mislykkedes %s\n" @@ -2826,7 +2826,7 @@ msgid "unknown tag: \"%s\"\n" msgstr "ukendt mærke" #: lib/rpmgi.c:628 lib/rpminstall.c:659 lib/rpminstall.c:834 -#: lib/rpminstall.c:1267 lib/transaction.c:1031 tools/rpmgraph.c:196 +#: lib/rpminstall.c:1084 lib/transaction.c:1026 tools/rpmgraph.c:196 #, fuzzy msgid "Failed dependencies:\n" msgstr "afhængighedskrav, der ikke kunne imødekommes:\n" @@ -2946,16 +2946,16 @@ msgstr "kunne ikke åbne %s: %s\n" msgid "Installing %s\n" msgstr "Installerer %s\n" -#: lib/rpminstall.c:1261 lib/transaction.c:1024 +#: lib/rpminstall.c:1078 lib/transaction.c:1019 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" -#: lib/rpminstall.c:1292 lib/transaction.c:1075 +#: lib/rpminstall.c:1109 lib/transaction.c:1070 msgid "Cleaning up repackaged packages:\n" msgstr "" -#: lib/rpminstall.c:1299 lib/transaction.c:1081 +#: lib/rpminstall.c:1116 lib/transaction.c:1076 #, fuzzy, c-format msgid "\tRemoving %s:\n" msgstr "Modtager %s\n" @@ -3091,99 +3091,99 @@ msgstr " skaber konflikt med %s-%s-%s\n" msgid "unknown error %d encountered while manipulating package %s" msgstr "ukendt fejl %d under arbejdet med pakken %s" -#: lib/rpmrc.c:199 +#: lib/rpmrc.c:213 #, c-format msgid "missing second ':' at %s:%d\n" msgstr "manglende andet ':' ved %s:%d\n" -#: lib/rpmrc.c:202 +#: lib/rpmrc.c:216 #, c-format msgid "missing architecture name at %s:%d\n" msgstr "manglende navn på arkitektur ved %s:%d\n" -#: lib/rpmrc.c:356 +#: lib/rpmrc.c:370 #, c-format msgid "Incomplete data line at %s:%d\n" msgstr "Ufærdig datalinie ved %s:%d\n" -#: lib/rpmrc.c:361 +#: lib/rpmrc.c:375 #, c-format msgid "Too many args in data line at %s:%d\n" msgstr "For mange parametre på datalinie ved %s:%d\n" -#: lib/rpmrc.c:369 +#: lib/rpmrc.c:383 #, c-format msgid "Bad arch/os number: %s (%s:%d)\n" msgstr "Ugyldigt arch/os-tal: %s (%s:%d)\n" -#: lib/rpmrc.c:406 +#: lib/rpmrc.c:420 #, c-format msgid "Incomplete default line at %s:%d\n" msgstr "Ufuldstændig standardlinie ved %s:%d\n" -#: lib/rpmrc.c:411 +#: lib/rpmrc.c:425 #, c-format msgid "Too many args in default line at %s:%d\n" msgstr "For mange parametre i standardlinie ved %s:%d\n" -#: lib/rpmrc.c:577 +#: lib/rpmrc.c:591 #, c-format msgid "Failed to read %s: %s.\n" msgstr "Kunne ikke læse %s: %s.\n" -#: lib/rpmrc.c:615 +#: lib/rpmrc.c:629 #, c-format msgid "missing ':' (found 0x%02x) at %s:%d\n" msgstr "manglende ':' (fandt 0x%02x) ved %s:%d\n" -#: lib/rpmrc.c:632 lib/rpmrc.c:706 +#: lib/rpmrc.c:646 lib/rpmrc.c:710 #, c-format msgid "missing argument for %s at %s:%d\n" msgstr "manglende parameter til %s ved %s:%d\n" -#: lib/rpmrc.c:649 lib/rpmrc.c:671 +#: lib/rpmrc.c:663 #, c-format msgid "%s expansion failed at %s:%d \"%s\"\n" msgstr "%s-udvidelse mislykkedes ved %s:%d \"%s\"\n" -#: lib/rpmrc.c:658 +#: lib/rpmrc.c:672 #, c-format msgid "cannot open %s at %s:%d: %s\n" msgstr "kan ikke åbne %s ved %s:%d: %s\n" -#: lib/rpmrc.c:698 +#: lib/rpmrc.c:702 #, c-format msgid "missing architecture for %s at %s:%d\n" msgstr "manglende arkitektur for %s ved %s:%d\n" -#: lib/rpmrc.c:765 +#: lib/rpmrc.c:769 #, c-format msgid "bad option '%s' at %s:%d\n" msgstr "ugyldig tilvalg '%s' ved %s:%d\n" -#: lib/rpmrc.c:1564 +#: lib/rpmrc.c:1568 #, c-format msgid "Unknown system: %s\n" msgstr "" "Ukendt system: %s\n" "\n" -#: lib/rpmrc.c:1565 +#: lib/rpmrc.c:1569 #, c-format msgid "Please contact %s\n" msgstr "" -#: lib/rpmrc.c:1802 +#: lib/rpmrc.c:1806 #, c-format msgid "Cannot expand %s\n" msgstr "Kan ikke udfolde %s\n" -#: lib/rpmrc.c:1807 +#: lib/rpmrc.c:1811 #, c-format msgid "Cannot read %s, HOME is too large.\n" msgstr "Kunne ikke læse %s, HOME er for stor.\n" -#: lib/rpmrc.c:1824 +#: lib/rpmrc.c:1828 #, c-format msgid "Unable to open %s for reading: %s.\n" msgstr "Kunne ikke åbne %s for læsning: %s.\n" @@ -3478,161 +3478,161 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Signaturfyld : %d\n" -#: lib/transaction.c:935 +#: lib/transaction.c:930 #, c-format msgid "excluding directory %s\n" msgstr "ekskluderer kataloget %s\n" -#: lib/transaction.c:1022 +#: lib/transaction.c:1017 msgid "Transaction failed...rolling back\n" msgstr "" -#: lib/transaction.c:1042 +#: lib/transaction.c:1037 msgid "Could not order auto-rollback transaction!\n" msgstr "" -#: lib/transaction.c:1132 +#: lib/transaction.c:1127 msgid "Getting repackaged header from transaction element\n" msgstr "" -#: lib/transaction.c:1157 +#: lib/transaction.c:1152 #, c-format msgid "\tLooking for %s...\n" msgstr "" -#: lib/transaction.c:1161 +#: lib/transaction.c:1156 msgid "\tMatches found.\n" msgstr "" -#: lib/transaction.c:1165 +#: lib/transaction.c:1160 msgid "\tNo matches found.\n" msgstr "" -#: lib/transaction.c:1178 +#: lib/transaction.c:1173 #, fuzzy msgid "\tRepackaged package not found!.\n" msgstr "kildepakke forventet, binær fundet\n" -#: lib/transaction.c:1199 +#: lib/transaction.c:1194 msgid "\tREMOVETID matched INSTALLTID.\n" msgstr "" -#: lib/transaction.c:1201 +#: lib/transaction.c:1196 #, c-format msgid "\t\tName: %s.\n" msgstr "" -#: lib/transaction.c:1224 +#: lib/transaction.c:1219 #, fuzzy, c-format msgid "\tRepackaged Package was %s...\n" msgstr "ingen pakker udløser %s\n" -#: lib/transaction.c:1268 +#: lib/transaction.c:1263 msgid "Adding install element to auto-rollback transaction.\n" msgstr "" -#: lib/transaction.c:1277 +#: lib/transaction.c:1272 msgid "Could not get install element database instance!\n" msgstr "" -#: lib/transaction.c:1290 +#: lib/transaction.c:1285 msgid "Could not get header for auto-rollback transaction!\n" msgstr "" -#: lib/transaction.c:1300 +#: lib/transaction.c:1295 #, fuzzy, c-format msgid "\tAdded repackaged package header: %s.\n" msgstr "<kildepakke>" -#: lib/transaction.c:1302 lib/transaction.c:1313 +#: lib/transaction.c:1297 lib/transaction.c:1308 #, c-format msgid "\tAdded from install element %s.\n" msgstr "" -#: lib/transaction.c:1311 +#: lib/transaction.c:1306 msgid "\tAdded erase element.\n" msgstr "" -#: lib/transaction.c:1320 +#: lib/transaction.c:1315 msgid "Could not get repackaged header for auto-rollback transaction!\n" msgstr "" -#: lib/transaction.c:1327 +#: lib/transaction.c:1322 msgid "Add erase element to auto-rollback transaction.\n" msgstr "" -#: lib/transaction.c:1335 +#: lib/transaction.c:1330 msgid "\tFound existing upgrade element.\n" msgstr "" -#: lib/transaction.c:1336 +#: lib/transaction.c:1331 #, c-format msgid "\tNot adding erase element for %s.\n" msgstr "" -#: lib/transaction.c:1353 +#: lib/transaction.c:1348 #, fuzzy, c-format msgid "\tAdded repackaged package %s.\n" msgstr "<kildepakke>" -#: lib/transaction.c:1355 +#: lib/transaction.c:1350 #, c-format msgid "\tAdded from erase element %s.\n" msgstr "" -#: lib/transaction.c:1360 +#: lib/transaction.c:1355 msgid "Could not add erase element to auto-rollback transaction.\n" msgstr "" -#: lib/transaction.c:1366 +#: lib/transaction.c:1361 msgid "\tNo repackaged package...nothing to do.\n" msgstr "" -#: lib/transaction.c:1372 +#: lib/transaction.c:1367 #, fuzzy msgid "Failure reading repackaged package!\n" msgstr "fejl ved læsning af hovedet på pakke\n" -#: lib/transaction.c:1495 +#: lib/transaction.c:1490 #, c-format msgid "sanity checking %d elements\n" msgstr "" -#: lib/transaction.c:1581 +#: lib/transaction.c:1576 #, fuzzy msgid "running pre-transaction scripts\n" msgstr "kører præinstallations-skript (hvis det findes)\n" -#: lib/transaction.c:1655 +#: lib/transaction.c:1650 #, c-format msgid "computing %d file fingerprints\n" msgstr "" -#: lib/transaction.c:1739 +#: lib/transaction.c:1734 msgid "computing file dispositions\n" msgstr "" -#: lib/transaction.c:1932 +#: lib/transaction.c:1927 msgid "Creating auto-rollback transaction\n" msgstr "" -#: lib/transaction.c:2086 +#: lib/transaction.c:2077 msgid "Add failed. Could not read package header.\n" msgstr "" -#: lib/transaction.c:2170 +#: lib/transaction.c:2161 msgid "Add failed in rpmpsmStage().\n" msgstr "" -#: lib/transaction.c:2214 +#: lib/transaction.c:2205 msgid "Add failed. Could not get file list.\n" msgstr "" -#: lib/transaction.c:2263 +#: lib/transaction.c:2254 msgid "Erase failed failed in rpmpsmStage().\n" msgstr "" -#: lib/transaction.c:2324 +#: lib/transaction.c:2315 #, fuzzy msgid "running post-transaction scripts\n" msgstr "kører skriptet postuninstall (hvis det findes)\n" @@ -4031,86 +4031,86 @@ msgstr "åbner db-indeks %s/%s %s mode=0x%x\n" msgid "======================== active %d empty %d\n" msgstr "======================== aktiv %d tom %d\n" -#: rpmio/macro.c:394 +#: rpmio/macro.c:396 #, c-format msgid "%3d>%*s(empty)" msgstr "%3d>%*s(tom)" -#: rpmio/macro.c:437 +#: rpmio/macro.c:439 #, c-format msgid "%3d<%*s(empty)\n" msgstr "%3d<%*s(tom)\n" -#: rpmio/macro.c:664 rpmio/macro.c:705 +#: rpmio/macro.c:608 rpmio/macro.c:1090 rpmio/macro.c:1123 rpmio/macro.c:1863 +msgid "Target buffer overflow\n" +msgstr "Overløb i målbuffer\n" + +#: rpmio/macro.c:671 rpmio/macro.c:712 #, c-format msgid "Macro %%%s has unterminated body\n" msgstr "Makroen %%%s har et uafsluttet indhold (body)\n" -#: rpmio/macro.c:727 +#: rpmio/macro.c:734 #, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "Makroen %%%s har et ugyldig navn (%%define)\n" -#: rpmio/macro.c:733 +#: rpmio/macro.c:740 #, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "Makroen %%%s har uafsluttede parametre\n" -#: rpmio/macro.c:738 +#: rpmio/macro.c:745 #, c-format msgid "Macro %%%s has empty body\n" msgstr "Makroen %%%s har intet indhold\n" -#: rpmio/macro.c:744 +#: rpmio/macro.c:751 #, c-format msgid "Macro %%%s failed to expand\n" msgstr "Makroen %%%s kunne ikke udfoldes\n" -#: rpmio/macro.c:779 +#: rpmio/macro.c:786 #, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "Makroen %%%s har ugyldigt navn (%%undefine)\n" -#: rpmio/macro.c:897 +#: rpmio/macro.c:904 #, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "Makro %%%s (%s) blev ikke brugt under niveau %d\n" -#: rpmio/macro.c:1024 +#: rpmio/macro.c:1031 #, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "Ukendt tilvalg %c i %s(%s)\n" -#: rpmio/macro.c:1224 +#: rpmio/macro.c:1239 #, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "Rekursionsdybde(%d) overskrider maks(%d)\n" -#: rpmio/macro.c:1297 rpmio/macro.c:1314 +#: rpmio/macro.c:1312 rpmio/macro.c:1329 #, c-format msgid "Unterminated %c: %s\n" msgstr "Uafsluttet %c: %s\n" -#: rpmio/macro.c:1355 +#: rpmio/macro.c:1370 #, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "Et %% efterfølges af en makro, der ikke kan tolkes\n" -#: rpmio/macro.c:1512 +#: rpmio/macro.c:1527 #, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "Makroen %%%.*s blev ikke fundet, overspringer\n" -#: rpmio/macro.c:1848 -msgid "Target buffer overflow\n" -msgstr "Overløb i målbuffer\n" - -#: rpmio/macro.c:2056 rpmio/macro.c:2062 +#: rpmio/macro.c:2076 rpmio/macro.c:2082 #, c-format msgid "File %s: %s\n" msgstr "Fil %s: %s\n" -#: rpmio/macro.c:2065 +#: rpmio/macro.c:2085 #, c-format msgid "File %s is smaller than %u bytes\n" msgstr "Filen %s er mindre end %u byte\n" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.4.2\n" "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n" -"POT-Creation-Date: 2007-08-21 08:04+0200\n" +"POT-Creation-Date: 2007-08-30 18:37+0200\n" "PO-Revision-Date: 2005-07-08 17:21+0200\n" "Last-Translator: Robert Scheck <rpm@robert-scheck.de>\n" "Language-Team: German <de@li.org>\n" @@ -1295,18 +1295,18 @@ msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "" "Generiere Paket-Header, die mit veralteten RPM-Paketen (v2/3) kompatibel sind" -#: build/poptBT.c:229 lib/poptALL.c:273 lib/poptI.c:282 lib/poptQV.c:363 -#: lib/poptQV.c:372 lib/poptQV.c:413 +#: build/poptBT.c:229 lib/poptALL.c:273 lib/poptI.c:282 lib/poptQV.c:362 +#: lib/poptQV.c:371 lib/poptQV.c:412 msgid "don't verify package digest(s)" msgstr "Paket-Kurzfassung nicht überprüfen" -#: build/poptBT.c:231 lib/poptALL.c:275 lib/poptI.c:284 lib/poptQV.c:366 -#: lib/poptQV.c:374 lib/poptQV.c:416 +#: build/poptBT.c:231 lib/poptALL.c:275 lib/poptI.c:284 lib/poptQV.c:365 +#: lib/poptQV.c:373 lib/poptQV.c:415 msgid "don't verify database header(s) when retrieved" msgstr "Datenbank-Header beim Abrufen nicht überprüfen" -#: build/poptBT.c:233 lib/poptALL.c:281 lib/poptI.c:286 lib/poptQV.c:369 -#: lib/poptQV.c:376 lib/poptQV.c:418 +#: build/poptBT.c:233 lib/poptALL.c:281 lib/poptI.c:286 lib/poptQV.c:368 +#: lib/poptQV.c:375 lib/poptQV.c:417 msgid "don't verify package signature(s)" msgstr "Paket-Signatur(en) nicht überprüfen" @@ -1368,27 +1368,27 @@ msgstr "%s fehlgeschlagen\n" msgid "failed to write all data to %s\n" msgstr "Konnte nicht all Daten nach %s schreiben\n" -#: build/rpmfc.c:1250 +#: build/rpmfc.c:1249 #, c-format msgid "magic_open(0x%x) failed: %s\n" msgstr "magic_open(0x%x) fehlgeschlagen: %s\n" -#: build/rpmfc.c:1258 +#: build/rpmfc.c:1257 #, fuzzy, c-format -msgid "magic_load(ms, \"%s\") failed: %s\n" +msgid "magic_load failed: %s\n" msgstr "magic_load(ms, \"%s\") fehlgeschlagen: %s\n" -#: build/rpmfc.c:1303 +#: build/rpmfc.c:1301 #, c-format msgid "magic_file(ms, \"%s\") failed: mode %06o %s\n" msgstr "magic_file(ms, \"%s\") fehlgeschlagen: mode %06o %s\n" -#: build/rpmfc.c:1524 +#: build/rpmfc.c:1522 #, c-format msgid "Finding %s: %s\n" msgstr "Finde %s: %s\n" -#: build/rpmfc.c:1530 build/rpmfc.c:1539 +#: build/rpmfc.c:1528 build/rpmfc.c:1537 #, c-format msgid "Failed to find %s:\n" msgstr "Fehlgeschlagenes zu finden %s:\n" @@ -1508,11 +1508,11 @@ msgstr "Ignoriere Paketnamensrelation(en) [%d]\t%s -> %s\n" msgid "removing %s \"%s\" from tsort relations.\n" msgstr "Entferne %s \"%s\" von tsort-Relationen.\n" -#: lib/depends.c:1265 +#: lib/depends.c:1271 msgid "========== recording tsort relations\n" msgstr "========== zeichne tsort-Relationen auf\n" -#: lib/depends.c:1357 +#: lib/depends.c:1363 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, depth, " "breadth)\n" @@ -1520,20 +1520,20 @@ msgstr "" "========== tsorting Pakete (order, #predecessors, #succesors, tree, depth, " "breadth)\n" -#: lib/depends.c:1453 +#: lib/depends.c:1459 #, c-format msgid "========== successors only (%d bytes)\n" msgstr "========== Nur Nachfolger (%d Bytes)\n" -#: lib/depends.c:1526 +#: lib/depends.c:1532 msgid "LOOP:\n" msgstr "SCHLEIFE:\n" -#: lib/depends.c:1561 +#: lib/depends.c:1567 msgid "========== continuing tsort ...\n" msgstr "========== setze tsort fort...\n" -#: lib/depends.c:1566 +#: lib/depends.c:1572 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "rpmtsOrder fehlgeschlagen, %d Elemente verbleiben\n" @@ -2073,7 +2073,7 @@ msgstr "Aktualisiere die Datenbank, aber verändere nichts im Dateisystem" msgid "do not verify package dependencies" msgstr "Keine Ãœberprüfung der Paket-Abhängigkeiten" -#: lib/poptI.c:252 lib/poptQV.c:307 lib/poptQV.c:310 +#: lib/poptI.c:252 lib/poptQV.c:306 lib/poptQV.c:309 msgid "don't verify MD5 digest of files" msgstr "Keine Ãœberprüfung der MD5-Kurzfassung der Dateien" @@ -2193,214 +2193,214 @@ msgstr "Nicht installieren - nur anzeigen, ob es funktionieren würde" msgid "upgrade package(s)" msgstr "Paket(e) aktualisieren" -#: lib/poptQV.c:103 +#: lib/poptQV.c:102 msgid "query/verify all packages" msgstr "Abfrage aller Pakete" -#: lib/poptQV.c:105 +#: lib/poptQV.c:104 msgid "rpm checksig mode" msgstr "Abfrage-Modus der Signatur" -#: lib/poptQV.c:107 +#: lib/poptQV.c:106 msgid "query/verify package(s) owning file" msgstr "Abfragen/überprüfen eines Pakets, das die Datei besitzt" -#: lib/poptQV.c:109 +#: lib/poptQV.c:108 msgid "query/verify package(s) in group" msgstr "Abfragen/überprüfen eines Pakets einer Gruppe" -#: lib/poptQV.c:111 +#: lib/poptQV.c:110 msgid "query/verify a package file" msgstr "Abfragen/überprüfen einer Paket-Datei" -#: lib/poptQV.c:114 +#: lib/poptQV.c:113 msgid "query/verify package(s) from TOP file tree walk" msgstr "Abfragen/überprüfen von mit Durchlaufen des Dateibaumes von OBEN" -#: lib/poptQV.c:116 +#: lib/poptQV.c:115 msgid "query/verify package(s) from system HDLIST" msgstr "Abfragen/überprüfen von Paketen der System-HDLIST" -#: lib/poptQV.c:119 +#: lib/poptQV.c:118 msgid "query/verify package(s) with package identifier" msgstr "Abfragen/überprüfen von Paketen mit der Paket-Kennung" -#: lib/poptQV.c:121 +#: lib/poptQV.c:120 msgid "query/verify package(s) with header identifier" msgstr "Abfragen/überprüfen von Paketen mit Header-Kennung" -#: lib/poptQV.c:123 +#: lib/poptQV.c:122 msgid "query/verify package(s) with file identifier" msgstr "Abfragen/überprüfen von Paketen mit Datei-Kennung" -#: lib/poptQV.c:126 +#: lib/poptQV.c:125 msgid "rpm query mode" msgstr "Abfrage-Modus" -#: lib/poptQV.c:128 +#: lib/poptQV.c:127 msgid "query/verify a header instance" msgstr "Abfragen/überprüfen einer Header-Instanz" -#: lib/poptQV.c:130 +#: lib/poptQV.c:129 msgid "query a spec file" msgstr "Abfragen einer Spec-Datei" -#: lib/poptQV.c:130 +#: lib/poptQV.c:129 msgid "<spec>" msgstr "<Spec-Datei>" -#: lib/poptQV.c:132 +#: lib/poptQV.c:131 msgid "query/verify package(s) from install transaction" msgstr "Abfragen/überprüfen von Paketen einer Installation" -#: lib/poptQV.c:134 +#: lib/poptQV.c:133 msgid "query the package(s) triggered by the package" msgstr "Abfragen eines Pakets gesteuert vom Paket" -#: lib/poptQV.c:136 +#: lib/poptQV.c:135 msgid "rpm verify mode" msgstr "Ãœberprüfungsmodus" -#: lib/poptQV.c:138 +#: lib/poptQV.c:137 msgid "query/verify the package(s) which require a dependency" msgstr "Abfrage nach Paketen, die die Fähigkeit benötigen" -#: lib/poptQV.c:140 +#: lib/poptQV.c:139 msgid "query/verify the package(s) which provide a dependency" msgstr "Abfrage nach Paketen, die die Fähigkeit bereitstellen" -#: lib/poptQV.c:143 +#: lib/poptQV.c:142 msgid "create transaction set" msgstr "Erstelle Transaktionsset" -#: lib/poptQV.c:145 +#: lib/poptQV.c:144 msgid "do not order transaction set" msgstr "Keine Sortierung des Transaktionssets" -#: lib/poptQV.c:147 +#: lib/poptQV.c:146 msgid "do not glob arguments" msgstr "\"Globbe\" nicht nach Argumenten" -#: lib/poptQV.c:149 +#: lib/poptQV.c:148 msgid "do not process non-package files as manifests" msgstr "Dateien nicht als Paket-Liste verarbeiten" -#: lib/poptQV.c:151 +#: lib/poptQV.c:150 msgid "do not read headers" msgstr "Header nicht lesen" -#: lib/poptQV.c:258 +#: lib/poptQV.c:257 msgid "list all configuration files" msgstr "Alle Konfigurationsdateien anzeigen" -#: lib/poptQV.c:260 +#: lib/poptQV.c:259 msgid "list all documentation files" msgstr "Alle Dokumentationsdateien anzeigen" -#: lib/poptQV.c:262 +#: lib/poptQV.c:261 msgid "dump basic file information" msgstr "Grundlegende Datei-Informationen auflisten" -#: lib/poptQV.c:266 +#: lib/poptQV.c:265 msgid "list files in package" msgstr "Alle Dateien im Paket auflisten" -#: lib/poptQV.c:271 +#: lib/poptQV.c:270 #, c-format msgid "skip %%ghost files" msgstr "Ãœberspringe %%ghost-Dateien" -#: lib/poptQV.c:275 +#: lib/poptQV.c:274 #, c-format msgid "skip %%license files" msgstr "Ãœberspringe %%license-Dateien" -#: lib/poptQV.c:278 +#: lib/poptQV.c:277 #, c-format msgid "skip %%readme files" msgstr "Ãœberspringe %%readme-Dateien" -#: lib/poptQV.c:284 +#: lib/poptQV.c:283 msgid "use the following query format" msgstr "Folgendes Abfrage-Format benutzen" -#: lib/poptQV.c:286 +#: lib/poptQV.c:285 msgid "substitute i18n sections into spec file" msgstr "Austauschen von i18n-Abschnitten in der Spec-Datei" -#: lib/poptQV.c:288 +#: lib/poptQV.c:287 msgid "display the states of the listed files" msgstr "Anzeigen der Zustände der aufgelisteten Dateien" -#: lib/poptQV.c:314 +#: lib/poptQV.c:313 msgid "don't verify size of files" msgstr "Keine Größenüberprüfung der Dateien" -#: lib/poptQV.c:317 +#: lib/poptQV.c:316 msgid "don't verify symlink path of files" msgstr "Keine Ãœberprüfung der symbolischen Links der Dateien" -#: lib/poptQV.c:320 +#: lib/poptQV.c:319 msgid "don't verify owner of files" msgstr "Keine Ãœberprüfung der Eigentümer der Dateien" -#: lib/poptQV.c:323 +#: lib/poptQV.c:322 msgid "don't verify group of files" msgstr "Keine Ãœberprüfung der Gruppen der Dateien" -#: lib/poptQV.c:326 +#: lib/poptQV.c:325 msgid "don't verify modification time of files" msgstr "Keine Ãœberprüfung der letzten Bearbeitungszeit der Dateien" -#: lib/poptQV.c:329 lib/poptQV.c:332 +#: lib/poptQV.c:328 lib/poptQV.c:331 msgid "don't verify mode of files" msgstr "Keine Ãœberprüfung der Berechtigungen der Dateien" -#: lib/poptQV.c:335 +#: lib/poptQV.c:334 msgid "don't verify file security contexts" msgstr "Keine Ãœberprüfung des Sicherheitskontexts" -#: lib/poptQV.c:337 +#: lib/poptQV.c:336 msgid "don't verify files in package" msgstr "Keine Ãœberprüfung der Dateien im Paket" -#: lib/poptQV.c:340 lib/poptQV.c:343 tools/rpmgraph.c:266 +#: lib/poptQV.c:339 lib/poptQV.c:342 tools/rpmgraph.c:266 msgid "don't verify package dependencies" msgstr "Keine Ãœberprüfung der Paket-Abhängigkeiten" -#: lib/poptQV.c:348 lib/poptQV.c:352 lib/poptQV.c:355 lib/poptQV.c:358 +#: lib/poptQV.c:347 lib/poptQV.c:351 lib/poptQV.c:354 lib/poptQV.c:357 msgid "don't execute verify script(s)" msgstr "Kein(e) Ãœberprüfungsskript(e) ausführen" -#: lib/poptQV.c:382 +#: lib/poptQV.c:381 msgid "don't verify GPG V3 DSA signature(s)" msgstr "Keine Ãœberprüfung der GPG V3 DSA-Signatur(en)" -#: lib/poptQV.c:385 +#: lib/poptQV.c:384 msgid "don't verify PGP V3 RSA/MD5 signature(s)" msgstr "Keine Ãœberprüfung der PGP V3 RSA/MD5-Sigantur(en)" -#: lib/poptQV.c:400 +#: lib/poptQV.c:399 msgid "sign package(s) (identical to --resign)" msgstr "Signiere Paket(e) (identisch mit --resign)" -#: lib/poptQV.c:402 +#: lib/poptQV.c:401 msgid "verify package signature(s)" msgstr "Ãœberprüfe Paket-Signatur(en)" -#: lib/poptQV.c:404 +#: lib/poptQV.c:403 msgid "delete package signatures" msgstr "Lösche Paket-Signatur(en)" -#: lib/poptQV.c:406 +#: lib/poptQV.c:405 msgid "import an armored public key" msgstr "Importiere einen gepanzerten öffentlichen Schlüssel" -#: lib/poptQV.c:408 +#: lib/poptQV.c:407 msgid "sign package(s) (identical to --addsign)" msgstr "Signiere Paket(e) (identisch mit --addsign)" -#: lib/poptQV.c:410 +#: lib/poptQV.c:409 msgid "generate signature" msgstr "Erzeuge Signatur" @@ -2740,38 +2740,38 @@ msgstr "Paket %s hat unerfüllte %s: %s\n" msgid "%s skipped due to missingok flag\n" msgstr "%s durch \"missingok flag\" übersprungen\n" -#: lib/rpmfi.c:846 +#: lib/rpmfi.c:850 msgid "========== relocations\n" msgstr "========== Verschiebungen\n" -#: lib/rpmfi.c:850 +#: lib/rpmfi.c:854 #, c-format msgid "%5d exclude %s\n" msgstr "%5d schließe %s aus\n" -#: lib/rpmfi.c:853 +#: lib/rpmfi.c:857 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "%5d verschiebe %s -> %s\n" -#: lib/rpmfi.c:987 +#: lib/rpmfi.c:991 #, c-format msgid "excluding %s %s\n" msgstr "Ausschließen %s %s\n" -#: lib/rpmfi.c:997 +#: lib/rpmfi.c:1001 #, c-format msgid "relocating %s to %s\n" msgstr "Verschiebe %s nach %s\n" -#: lib/rpmfi.c:1089 +#: lib/rpmfi.c:1093 #, c-format msgid "relocating directory %s to %s\n" msgstr "Verschiebe Verzeichnis %s nach %s\n" #: lib/rpmgi.c:81 lib/rpminstall.c:124 lib/rpminstall.c:480 -#: lib/rpminstall.c:615 lib/rpminstall.c:1041 lib/rpmts.c:643 -#: tools/rpmgraph.c:121 tools/rpmgraph.c:158 +#: lib/rpminstall.c:615 lib/rpmts.c:643 tools/rpmgraph.c:121 +#: tools/rpmgraph.c:158 #, c-format msgid "open of %s failed: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s\n" @@ -2782,7 +2782,7 @@ msgid "unknown tag: \"%s\"\n" msgstr "Unbekannter Tag: \"%s\"\n" #: lib/rpmgi.c:628 lib/rpminstall.c:659 lib/rpminstall.c:834 -#: lib/rpminstall.c:1267 lib/transaction.c:1031 tools/rpmgraph.c:196 +#: lib/rpminstall.c:1084 lib/transaction.c:1026 tools/rpmgraph.c:196 msgid "Failed dependencies:\n" msgstr "Fehlgeschlagende Abhängigkeiten:\n" @@ -2898,16 +2898,16 @@ msgstr "Kann %s nicht öffnen: %s\n" msgid "Installing %s\n" msgstr "Installiere %s\n" -#: lib/rpminstall.c:1261 lib/transaction.c:1024 +#: lib/rpminstall.c:1078 lib/transaction.c:1019 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "Rollback-Pakete (+%d/-%d) bis %-24.24s (0x%08x):\n" -#: lib/rpminstall.c:1292 lib/transaction.c:1075 +#: lib/rpminstall.c:1109 lib/transaction.c:1070 msgid "Cleaning up repackaged packages:\n" msgstr "Aufräumen bei neu gebauten Paketen:\n" -#: lib/rpminstall.c:1299 lib/transaction.c:1081 +#: lib/rpminstall.c:1116 lib/transaction.c:1076 #, c-format msgid "\tRemoving %s:\n" msgstr "\tEntferne %s:\n" @@ -3049,97 +3049,97 @@ msgstr "%s kollidiert mit %s%s" msgid "unknown error %d encountered while manipulating package %s" msgstr "Unbekannter Fehler %d trat während dem Verarbeiten des Pakets %s auf" -#: lib/rpmrc.c:199 +#: lib/rpmrc.c:213 #, c-format msgid "missing second ':' at %s:%d\n" msgstr "Fehlender zweiter ':' bei %s:%d\n" -#: lib/rpmrc.c:202 +#: lib/rpmrc.c:216 #, c-format msgid "missing architecture name at %s:%d\n" msgstr "Fehlender Architektur-Name bei %s:%d\n" -#: lib/rpmrc.c:356 +#: lib/rpmrc.c:370 #, c-format msgid "Incomplete data line at %s:%d\n" msgstr "Unvollständige Datenzeile bei %s:%d\n" -#: lib/rpmrc.c:361 +#: lib/rpmrc.c:375 #, c-format msgid "Too many args in data line at %s:%d\n" msgstr "Zu viele Argumente in der Datenzeile bei %s:%d\n" -#: lib/rpmrc.c:369 +#: lib/rpmrc.c:383 #, c-format msgid "Bad arch/os number: %s (%s:%d)\n" msgstr "Ungültige Architektur/Betriebssystem-Nummer: %s (%s:%d)\n" -#: lib/rpmrc.c:406 +#: lib/rpmrc.c:420 #, c-format msgid "Incomplete default line at %s:%d\n" msgstr "Unvollständige Standardzeile bei %s:%d\n" -#: lib/rpmrc.c:411 +#: lib/rpmrc.c:425 #, c-format msgid "Too many args in default line at %s:%d\n" msgstr "Zu viele Argumente in der Standardzeile bei %s:%d\n" -#: lib/rpmrc.c:577 +#: lib/rpmrc.c:591 #, c-format msgid "Failed to read %s: %s.\n" msgstr "Fehlgeschlagenes Lesen von %s: %s.\n" -#: lib/rpmrc.c:615 +#: lib/rpmrc.c:629 #, c-format msgid "missing ':' (found 0x%02x) at %s:%d\n" msgstr "Fehlender ':' (0x%02x gefunden) bei %s:%d\n" -#: lib/rpmrc.c:632 lib/rpmrc.c:706 +#: lib/rpmrc.c:646 lib/rpmrc.c:710 #, c-format msgid "missing argument for %s at %s:%d\n" msgstr "Fehlendes Argument für %s bei %s:%d\n" -#: lib/rpmrc.c:649 lib/rpmrc.c:671 +#: lib/rpmrc.c:663 #, c-format msgid "%s expansion failed at %s:%d \"%s\"\n" msgstr "Erweiterung von %s bei %s:%d \"%s\" fehlgeschlagen\n" -#: lib/rpmrc.c:658 +#: lib/rpmrc.c:672 #, c-format msgid "cannot open %s at %s:%d: %s\n" msgstr "Kann %s bei %s:%d nicht öffnen: %s\n" -#: lib/rpmrc.c:698 +#: lib/rpmrc.c:702 #, c-format msgid "missing architecture for %s at %s:%d\n" msgstr "Fehlende Architektur für %s bei %s:%d\n" -#: lib/rpmrc.c:765 +#: lib/rpmrc.c:769 #, c-format msgid "bad option '%s' at %s:%d\n" msgstr "Ungültige Option '%s' bei %s:%d\n" -#: lib/rpmrc.c:1564 +#: lib/rpmrc.c:1568 #, c-format msgid "Unknown system: %s\n" msgstr "Unbekanntes System: %s\n" -#: lib/rpmrc.c:1565 +#: lib/rpmrc.c:1569 #, c-format msgid "Please contact %s\n" msgstr "Bitte (in Englisch) %s kontaktieren\n" -#: lib/rpmrc.c:1802 +#: lib/rpmrc.c:1806 #, c-format msgid "Cannot expand %s\n" msgstr "Kann %s nicht erweitern\n" -#: lib/rpmrc.c:1807 +#: lib/rpmrc.c:1811 #, c-format msgid "Cannot read %s, HOME is too large.\n" msgstr "Kann %s nicht lesen, HOME ist zu groß.\n" -#: lib/rpmrc.c:1824 +#: lib/rpmrc.c:1828 #, c-format msgid "Unable to open %s for reading: %s.\n" msgstr "Kann %s nicht zum Lesen öffnen: %s.\n" @@ -3428,162 +3428,162 @@ msgstr "Fehlerhafte MD5-Kurzfassung: NICHT UNTERSTÃœTZT\n" msgid "Signature: UNKNOWN (%d)\n" msgstr "Signatur: UNBEKANNT (%d)\n" -#: lib/transaction.c:935 +#: lib/transaction.c:930 #, c-format msgid "excluding directory %s\n" msgstr "Schließe Verzeichnis %s aus\n" -#: lib/transaction.c:1022 +#: lib/transaction.c:1017 msgid "Transaction failed...rolling back\n" msgstr "Transaktion fehlgeschlagen...mache Rollback\n" -#: lib/transaction.c:1042 +#: lib/transaction.c:1037 msgid "Could not order auto-rollback transaction!\n" msgstr "Konnte Auto-Rollback-Transaktion nicht sortieren!\n" -#: lib/transaction.c:1132 +#: lib/transaction.c:1127 msgid "Getting repackaged header from transaction element\n" msgstr "Hole erneut gepackten Header des Transaktionselements\n" -#: lib/transaction.c:1157 +#: lib/transaction.c:1152 #, c-format msgid "\tLooking for %s...\n" msgstr "\tSuche nach %s...\n" -#: lib/transaction.c:1161 +#: lib/transaction.c:1156 msgid "\tMatches found.\n" msgstr "\tÃœbereinstimmungen gefunden.\n" -#: lib/transaction.c:1165 +#: lib/transaction.c:1160 msgid "\tNo matches found.\n" msgstr "\tKeine Ãœbereinstimmungen gefunden.\n" -#: lib/transaction.c:1178 +#: lib/transaction.c:1173 msgid "\tRepackaged package not found!.\n" msgstr "\tErneut gebautes Paket nicht gefunden.\n" -#: lib/transaction.c:1199 +#: lib/transaction.c:1194 msgid "\tREMOVETID matched INSTALLTID.\n" msgstr "\tREMOVETID entspricht INSTALLTID.\n" -#: lib/transaction.c:1201 +#: lib/transaction.c:1196 #, c-format msgid "\t\tName: %s.\n" msgstr "\t\tName: %s.\n" -#: lib/transaction.c:1224 +#: lib/transaction.c:1219 #, c-format msgid "\tRepackaged Package was %s...\n" msgstr "\tErneut gebautes Paket war %s...\n" -#: lib/transaction.c:1268 +#: lib/transaction.c:1263 msgid "Adding install element to auto-rollback transaction.\n" msgstr "" "Installationselement zur Transaktion für das Auto-Rollback hinzugefügt.\n" -#: lib/transaction.c:1277 +#: lib/transaction.c:1272 msgid "Could not get install element database instance!\n" msgstr "Keine Datenbank-Instanz des Installationselements!\n" -#: lib/transaction.c:1290 +#: lib/transaction.c:1285 msgid "Could not get header for auto-rollback transaction!\n" msgstr "Keine Header der Transaktion für das Auto-Rollback!\n" -#: lib/transaction.c:1300 +#: lib/transaction.c:1295 #, c-format msgid "\tAdded repackaged package header: %s.\n" msgstr "\tErneut gepackten Paket-Header hinzugefügt: %s.\n" -#: lib/transaction.c:1302 lib/transaction.c:1313 +#: lib/transaction.c:1297 lib/transaction.c:1308 #, c-format msgid "\tAdded from install element %s.\n" msgstr "\tVom Installationselement %s hinzugefügt.\n" -#: lib/transaction.c:1311 +#: lib/transaction.c:1306 msgid "\tAdded erase element.\n" msgstr "\tDeinstallationselement hinzugefügt.\n" -#: lib/transaction.c:1320 +#: lib/transaction.c:1315 msgid "Could not get repackaged header for auto-rollback transaction!\n" msgstr "Kein erneut gepackter Header für Transaktion des Auto-Rollbacks!\n" -#: lib/transaction.c:1327 +#: lib/transaction.c:1322 msgid "Add erase element to auto-rollback transaction.\n" msgstr "" "Deinstallationselement für Transaktion des Auto-Rollbacks hinzufügen.\n" -#: lib/transaction.c:1335 +#: lib/transaction.c:1330 msgid "\tFound existing upgrade element.\n" msgstr "\tBereits vorhandenes Aktualisierungselement gefunden.\n" -#: lib/transaction.c:1336 +#: lib/transaction.c:1331 #, c-format msgid "\tNot adding erase element for %s.\n" msgstr "\tKein Deinstallationselement für %s hinzufügen.\n" -#: lib/transaction.c:1353 +#: lib/transaction.c:1348 #, c-format msgid "\tAdded repackaged package %s.\n" msgstr "\tErneut gepacktes Paket %s hinzugefügt.\n" -#: lib/transaction.c:1355 +#: lib/transaction.c:1350 #, c-format msgid "\tAdded from erase element %s.\n" msgstr "\tVom Deinstallationselement %s hinzugefügt.\n" -#: lib/transaction.c:1360 +#: lib/transaction.c:1355 msgid "Could not add erase element to auto-rollback transaction.\n" msgstr "" "Konnte das Deinstallationselement für Transaktion des Auto-Rollbacks nicht " "hinzufügen.\n" -#: lib/transaction.c:1366 +#: lib/transaction.c:1361 msgid "\tNo repackaged package...nothing to do.\n" msgstr "\tKein erneut gepacktes Paket...nichts zu tun.\n" -#: lib/transaction.c:1372 +#: lib/transaction.c:1367 msgid "Failure reading repackaged package!\n" msgstr "Fehler beim Lesen des erneut gepackten Pakets!\n" -#: lib/transaction.c:1495 +#: lib/transaction.c:1490 #, c-format msgid "sanity checking %d elements\n" msgstr "Gesundheitsprüfung von %d Elementen\n" -#: lib/transaction.c:1581 +#: lib/transaction.c:1576 msgid "running pre-transaction scripts\n" msgstr "Führe Pre-Transaktionsskripte aus\n" -#: lib/transaction.c:1655 +#: lib/transaction.c:1650 #, c-format msgid "computing %d file fingerprints\n" msgstr "Berechne %d Datei-Fingerabdrücke\n" -#: lib/transaction.c:1739 +#: lib/transaction.c:1734 msgid "computing file dispositions\n" msgstr "Berechne Dateianordnungen\n" -#: lib/transaction.c:1932 +#: lib/transaction.c:1927 msgid "Creating auto-rollback transaction\n" msgstr "Erstelle Transaktion für ein Auto-Rollback\n" -#: lib/transaction.c:2086 +#: lib/transaction.c:2077 msgid "Add failed. Could not read package header.\n" msgstr "Hinzufügen fehlgeschlagen. Konnte den Paket-Header nicht lesen.\n" -#: lib/transaction.c:2170 +#: lib/transaction.c:2161 msgid "Add failed in rpmpsmStage().\n" msgstr "Hinzufügen fehlgeschlagen bei rpmpsmStage().\n" -#: lib/transaction.c:2214 +#: lib/transaction.c:2205 msgid "Add failed. Could not get file list.\n" msgstr "Hinzufügen fehlgeschlagen. Konnte keine Dateiliste bekommen.\n" -#: lib/transaction.c:2263 +#: lib/transaction.c:2254 msgid "Erase failed failed in rpmpsmStage().\n" msgstr "Löschen fehlgeschlagen bei rpmpsmStage().\n" -#: lib/transaction.c:2324 +#: lib/transaction.c:2315 msgid "running post-transaction scripts\n" msgstr "Führe Post-Transaktionsskripte aus\n" @@ -3977,86 +3977,86 @@ msgstr "Öffne SQL-DB %s (%s) Mode=0x%x\n" msgid "======================== active %d empty %d\n" msgstr "======================== aktiv %d leer %d\n" -#: rpmio/macro.c:394 +#: rpmio/macro.c:396 #, c-format msgid "%3d>%*s(empty)" msgstr "%3d>%*s(leer)" -#: rpmio/macro.c:437 +#: rpmio/macro.c:439 #, c-format msgid "%3d<%*s(empty)\n" msgstr "%3d<%*s(leer)\n" -#: rpmio/macro.c:664 rpmio/macro.c:705 +#: rpmio/macro.c:608 rpmio/macro.c:1090 rpmio/macro.c:1123 rpmio/macro.c:1863 +msgid "Target buffer overflow\n" +msgstr "Ãœberlauf des Zielpuffers\n" + +#: rpmio/macro.c:671 rpmio/macro.c:712 #, c-format msgid "Macro %%%s has unterminated body\n" msgstr "Makro %%%s hat keinen terminierten Hauptteil\n" -#: rpmio/macro.c:727 +#: rpmio/macro.c:734 #, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "Makro %%%s hat einen ungültigen Namen (%%define)\n" -#: rpmio/macro.c:733 +#: rpmio/macro.c:740 #, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "Makro %%%s hat keine terminierten Optionen\n" -#: rpmio/macro.c:738 +#: rpmio/macro.c:745 #, c-format msgid "Macro %%%s has empty body\n" msgstr "Makro %%%s hat einen leeren Hauptteil\n" -#: rpmio/macro.c:744 +#: rpmio/macro.c:751 #, c-format msgid "Macro %%%s failed to expand\n" msgstr "Makro %%%s konnte nicht erweitert werden\n" -#: rpmio/macro.c:779 +#: rpmio/macro.c:786 #, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "Makro %%%s hat einen ungültigen Namen (%%undefine)\n" -#: rpmio/macro.c:897 +#: rpmio/macro.c:904 #, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "Makro %%%s (%s) wurde nicht unter Level %d benutzt\n" -#: rpmio/macro.c:1024 +#: rpmio/macro.c:1031 #, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "Unbekannte Option %c in %s (%s)\n" -#: rpmio/macro.c:1224 +#: rpmio/macro.c:1239 #, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "Rekursionstiefe (%d) ist größer als Maximum (%d)\n" -#: rpmio/macro.c:1297 rpmio/macro.c:1314 +#: rpmio/macro.c:1312 rpmio/macro.c:1329 #, c-format msgid "Unterminated %c: %s\n" msgstr "Nicht terminiertes %c: %s\n" -#: rpmio/macro.c:1355 +#: rpmio/macro.c:1370 #, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "Ein %% ist gefolgt von einem nicht parsbaren Makro\n" -#: rpmio/macro.c:1512 +#: rpmio/macro.c:1527 #, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "Makro %%%.*s nicht gefunden, überspringe\n" -#: rpmio/macro.c:1848 -msgid "Target buffer overflow\n" -msgstr "Ãœberlauf des Zielpuffers\n" - -#: rpmio/macro.c:2056 rpmio/macro.c:2062 +#: rpmio/macro.c:2076 rpmio/macro.c:2082 #, c-format msgid "File %s: %s\n" msgstr "Datei %s: %s\n" -#: rpmio/macro.c:2065 +#: rpmio/macro.c:2085 #, c-format msgid "File %s is smaller than %u bytes\n" msgstr "Datei %s ist kleiner als %u Byte\n" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n" -"POT-Creation-Date: 2007-08-21 08:04+0200\n" +"POT-Creation-Date: 2007-08-30 18:37+0200\n" "PO-Revision-Date: 2006-04-28 09:52+1000\n" "Last-Translator: Manuel Ospina <mospina@redhat.com>\n" "Language-Team: Spanish <en@li.org>\n" @@ -1302,18 +1302,18 @@ msgstr "" "generar cabeceras de paquetes compatibles con el empaquetamiento rpm[23] " "(legado)" -#: build/poptBT.c:229 lib/poptALL.c:273 lib/poptI.c:282 lib/poptQV.c:363 -#: lib/poptQV.c:372 lib/poptQV.c:413 +#: build/poptBT.c:229 lib/poptALL.c:273 lib/poptI.c:282 lib/poptQV.c:362 +#: lib/poptQV.c:371 lib/poptQV.c:412 msgid "don't verify package digest(s)" msgstr "no verificar resumen del paquete(s)" -#: build/poptBT.c:231 lib/poptALL.c:275 lib/poptI.c:284 lib/poptQV.c:366 -#: lib/poptQV.c:374 lib/poptQV.c:416 +#: build/poptBT.c:231 lib/poptALL.c:275 lib/poptI.c:284 lib/poptQV.c:365 +#: lib/poptQV.c:373 lib/poptQV.c:415 msgid "don't verify database header(s) when retrieved" msgstr "no verificar cabeceras de paquetes al recuperar" -#: build/poptBT.c:233 lib/poptALL.c:281 lib/poptI.c:286 lib/poptQV.c:369 -#: lib/poptQV.c:376 lib/poptQV.c:418 +#: build/poptBT.c:233 lib/poptALL.c:281 lib/poptI.c:286 lib/poptQV.c:368 +#: lib/poptQV.c:375 lib/poptQV.c:417 msgid "don't verify package signature(s)" msgstr "no verificar firma(s) del paquete" @@ -1375,27 +1375,27 @@ msgstr "%s fallido\n" msgid "failed to write all data to %s\n" msgstr "falló la escritura de todos los datos a %s\n" -#: build/rpmfc.c:1250 +#: build/rpmfc.c:1249 #, fuzzy, c-format msgid "magic_open(0x%x) failed: %s\n" msgstr "la apertura de %s falló: %s\n" -#: build/rpmfc.c:1258 +#: build/rpmfc.c:1257 #, fuzzy, c-format -msgid "magic_load(ms, \"%s\") failed: %s\n" +msgid "magic_load failed: %s\n" msgstr "%s rmdir de %s falló: %s\n" -#: build/rpmfc.c:1303 +#: build/rpmfc.c:1301 #, fuzzy, c-format msgid "magic_file(ms, \"%s\") failed: mode %06o %s\n" msgstr "%s rmdir de %s falló: %s\n" -#: build/rpmfc.c:1524 +#: build/rpmfc.c:1522 #, c-format msgid "Finding %s: %s\n" msgstr "Buscando %s: %s\n" -#: build/rpmfc.c:1530 build/rpmfc.c:1539 +#: build/rpmfc.c:1528 build/rpmfc.c:1537 #, c-format msgid "Failed to find %s:\n" msgstr "Falló la búsqueda de %s:\n" @@ -1515,11 +1515,11 @@ msgstr "ignorar relación de nombre de paquete [%d]\t%s -> %s\n" msgid "removing %s \"%s\" from tsort relations.\n" msgstr "removiendo %s \"%s\" de relaciones tsort.\n" -#: lib/depends.c:1265 +#: lib/depends.c:1271 msgid "========== recording tsort relations\n" msgstr "========== grabando relaciones tsort\n" -#: lib/depends.c:1357 +#: lib/depends.c:1363 #, fuzzy msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, depth, " @@ -1528,20 +1528,20 @@ msgstr "" "========== tsorting paquetes (orden, #predecesores, #sucesores, árbol, " "profundidad)\n" -#: lib/depends.c:1453 +#: lib/depends.c:1459 #, fuzzy, c-format msgid "========== successors only (%d bytes)\n" msgstr "========== sucesores únicamente (orden de presentación)\n" -#: lib/depends.c:1526 +#: lib/depends.c:1532 msgid "LOOP:\n" msgstr "LOOP:\n" -#: lib/depends.c:1561 +#: lib/depends.c:1567 msgid "========== continuing tsort ...\n" msgstr "========== continuando tsort ...\n" -#: lib/depends.c:1566 +#: lib/depends.c:1572 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "falló rpmtsOrder, permanecen %d elementos\n" @@ -2104,7 +2104,7 @@ msgstr "actualizar la base de datos, mas no modificar el sistema de archivos" msgid "do not verify package dependencies" msgstr "no verificar las dependencias del paquete" -#: lib/poptI.c:252 lib/poptQV.c:307 lib/poptQV.c:310 +#: lib/poptI.c:252 lib/poptQV.c:306 lib/poptQV.c:309 msgid "don't verify MD5 digest of files" msgstr "no verificar MD5 de los archivos" @@ -2220,220 +2220,220 @@ msgstr "no instalar, pero señalar si se puede o no" msgid "upgrade package(s)" msgstr "actualizar paquete(s)" -#: lib/poptQV.c:103 +#: lib/poptQV.c:102 msgid "query/verify all packages" msgstr "consultar/verificar todos los paquetes" -#: lib/poptQV.c:105 +#: lib/poptQV.c:104 msgid "rpm checksig mode" msgstr "modo rpm checksig" -#: lib/poptQV.c:107 +#: lib/poptQV.c:106 msgid "query/verify package(s) owning file" msgstr "consultar/verificar archivo propietario de paquete(s)" -#: lib/poptQV.c:109 +#: lib/poptQV.c:108 msgid "query/verify package(s) in group" msgstr "consultar/verificar paquete(s) en grupo" -#: lib/poptQV.c:111 +#: lib/poptQV.c:110 msgid "query/verify a package file" msgstr "consultar/verificar un archivo de paquete" -#: lib/poptQV.c:114 +#: lib/poptQV.c:113 #, fuzzy msgid "query/verify package(s) from TOP file tree walk" msgstr "consultar/verificar paquete(s) de la transacción de la instalación" -#: lib/poptQV.c:116 +#: lib/poptQV.c:115 #, fuzzy msgid "query/verify package(s) from system HDLIST" msgstr "consultar/verificar paquete(s) de la transacción de la instalación" -#: lib/poptQV.c:119 +#: lib/poptQV.c:118 msgid "query/verify package(s) with package identifier" msgstr "consultar/verificar paquete(s) con identificador de paquete" -#: lib/poptQV.c:121 +#: lib/poptQV.c:120 msgid "query/verify package(s) with header identifier" msgstr "consultar/verificar paquete(s)con identificador de cabecera" -#: lib/poptQV.c:123 +#: lib/poptQV.c:122 msgid "query/verify package(s) with file identifier" msgstr "consultar/verificar paquete(s) con archivo identificador " -#: lib/poptQV.c:126 +#: lib/poptQV.c:125 msgid "rpm query mode" msgstr "modo de consulta rpm" -#: lib/poptQV.c:128 +#: lib/poptQV.c:127 msgid "query/verify a header instance" msgstr "consultar/verificar una instancia de la cabecera" -#: lib/poptQV.c:130 +#: lib/poptQV.c:129 msgid "query a spec file" msgstr "consultar un archivo spec" -#: lib/poptQV.c:130 +#: lib/poptQV.c:129 msgid "<spec>" msgstr "<spec>" -#: lib/poptQV.c:132 +#: lib/poptQV.c:131 msgid "query/verify package(s) from install transaction" msgstr "consultar/verificar paquete(s) de la transacción de la instalación" -#: lib/poptQV.c:134 +#: lib/poptQV.c:133 msgid "query the package(s) triggered by the package" msgstr "consultar los paquetes lanzados por el paquete" -#: lib/poptQV.c:136 +#: lib/poptQV.c:135 msgid "rpm verify mode" msgstr "modo de verificación de rpm" -#: lib/poptQV.c:138 +#: lib/poptQV.c:137 msgid "query/verify the package(s) which require a dependency" msgstr "consultar/verificar los paquetes que requieren una dependencia" -#: lib/poptQV.c:140 +#: lib/poptQV.c:139 msgid "query/verify the package(s) which provide a dependency" msgstr "consultar/verificar paquetes que proporcionan una dependencia" -#: lib/poptQV.c:143 +#: lib/poptQV.c:142 msgid "create transaction set" msgstr "" -#: lib/poptQV.c:145 +#: lib/poptQV.c:144 msgid "do not order transaction set" msgstr "" -#: lib/poptQV.c:147 +#: lib/poptQV.c:146 #, fuzzy msgid "do not glob arguments" msgstr "ningún argumento dado" -#: lib/poptQV.c:149 +#: lib/poptQV.c:148 msgid "do not process non-package files as manifests" msgstr "" -#: lib/poptQV.c:151 +#: lib/poptQV.c:150 #, fuzzy msgid "do not read headers" msgstr "%s: no se pudo leer cabecera en 0x%x\n" -#: lib/poptQV.c:258 +#: lib/poptQV.c:257 msgid "list all configuration files" msgstr "listar todos los archivos de configuración" -#: lib/poptQV.c:260 +#: lib/poptQV.c:259 msgid "list all documentation files" msgstr "listar todos los archivos de documentación" -#: lib/poptQV.c:262 +#: lib/poptQV.c:261 msgid "dump basic file information" msgstr "Volcar información de archivo básica" -#: lib/poptQV.c:266 +#: lib/poptQV.c:265 msgid "list files in package" msgstr "listar archivos del paquete" -#: lib/poptQV.c:271 +#: lib/poptQV.c:270 #, c-format msgid "skip %%ghost files" msgstr "saltar archivos %%ghost" -#: lib/poptQV.c:275 +#: lib/poptQV.c:274 #, c-format msgid "skip %%license files" msgstr "saltar archivos %%license" -#: lib/poptQV.c:278 +#: lib/poptQV.c:277 #, c-format msgid "skip %%readme files" msgstr "saltar archivos %%readme" -#: lib/poptQV.c:284 +#: lib/poptQV.c:283 msgid "use the following query format" msgstr "utilizar el siguiente formato de consulta" -#: lib/poptQV.c:286 +#: lib/poptQV.c:285 msgid "substitute i18n sections into spec file" msgstr "substituir las secciones i18n en el archivo spec" -#: lib/poptQV.c:288 +#: lib/poptQV.c:287 msgid "display the states of the listed files" msgstr "mostrar el estado de los archivos listados" -#: lib/poptQV.c:314 +#: lib/poptQV.c:313 msgid "don't verify size of files" msgstr "no verificar el tamaño de los archivos" -#: lib/poptQV.c:317 +#: lib/poptQV.c:316 msgid "don't verify symlink path of files" msgstr "no verificar la ruta symlink de los archivos" -#: lib/poptQV.c:320 +#: lib/poptQV.c:319 msgid "don't verify owner of files" msgstr "no verificar el propietario de los archivos" -#: lib/poptQV.c:323 +#: lib/poptQV.c:322 msgid "don't verify group of files" msgstr "no verificar el grupo de los archivos" -#: lib/poptQV.c:326 +#: lib/poptQV.c:325 msgid "don't verify modification time of files" msgstr "no verificar el tiempo de modificación de los archivos" -#: lib/poptQV.c:329 lib/poptQV.c:332 +#: lib/poptQV.c:328 lib/poptQV.c:331 msgid "don't verify mode of files" msgstr "no verificar el modo de los archivos" -#: lib/poptQV.c:335 +#: lib/poptQV.c:334 #, fuzzy msgid "don't verify file security contexts" msgstr "no verificar los archivos en el paquete" -#: lib/poptQV.c:337 +#: lib/poptQV.c:336 msgid "don't verify files in package" msgstr "no verificar los archivos en el paquete" -#: lib/poptQV.c:340 lib/poptQV.c:343 tools/rpmgraph.c:266 +#: lib/poptQV.c:339 lib/poptQV.c:342 tools/rpmgraph.c:266 msgid "don't verify package dependencies" msgstr "no verificar las dependencias de paquetes" -#: lib/poptQV.c:348 lib/poptQV.c:352 lib/poptQV.c:355 lib/poptQV.c:358 +#: lib/poptQV.c:347 lib/poptQV.c:351 lib/poptQV.c:354 lib/poptQV.c:357 msgid "don't execute verify script(s)" msgstr "no ejecutar script de verificación" -#: lib/poptQV.c:382 +#: lib/poptQV.c:381 msgid "don't verify GPG V3 DSA signature(s)" msgstr "no verificar firmas GPG V3 DSA" -#: lib/poptQV.c:385 +#: lib/poptQV.c:384 msgid "don't verify PGP V3 RSA/MD5 signature(s)" msgstr "no verificar firmas PGP V3 RSA/MD5" -#: lib/poptQV.c:400 +#: lib/poptQV.c:399 msgid "sign package(s) (identical to --resign)" msgstr "firmar paquetes (idéntico a --resign)" -#: lib/poptQV.c:402 +#: lib/poptQV.c:401 msgid "verify package signature(s)" msgstr "verificar firma(s) del paquete" -#: lib/poptQV.c:404 +#: lib/poptQV.c:403 #, fuzzy msgid "delete package signatures" msgstr "verificar firma(s) del paquete" -#: lib/poptQV.c:406 +#: lib/poptQV.c:405 msgid "import an armored public key" msgstr "importar una llave pública con armadura" -#: lib/poptQV.c:408 +#: lib/poptQV.c:407 msgid "sign package(s) (identical to --addsign)" msgstr "firmar paquete(s) (idéntico a --addsign)" -#: lib/poptQV.c:410 +#: lib/poptQV.c:409 msgid "generate signature" msgstr "generar firma" @@ -2773,38 +2773,38 @@ msgstr "el paquete %s tiene %s no satisfechas: %s\n" msgid "%s skipped due to missingok flag\n" msgstr "%s omitido debido a bandera missingok\n" -#: lib/rpmfi.c:846 +#: lib/rpmfi.c:850 msgid "========== relocations\n" msgstr "========== realocación\n" -#: lib/rpmfi.c:850 +#: lib/rpmfi.c:854 #, c-format msgid "%5d exclude %s\n" msgstr "%5d excluir %s\n" -#: lib/rpmfi.c:853 +#: lib/rpmfi.c:857 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "%5d realocar %s -> %s\n" -#: lib/rpmfi.c:987 +#: lib/rpmfi.c:991 #, c-format msgid "excluding %s %s\n" msgstr "excluyendo %s %s\n" -#: lib/rpmfi.c:997 +#: lib/rpmfi.c:1001 #, c-format msgid "relocating %s to %s\n" msgstr "realocando %s a %s\n" -#: lib/rpmfi.c:1089 +#: lib/rpmfi.c:1093 #, c-format msgid "relocating directory %s to %s\n" msgstr "realocando directorio %s a %s\n" #: lib/rpmgi.c:81 lib/rpminstall.c:124 lib/rpminstall.c:480 -#: lib/rpminstall.c:615 lib/rpminstall.c:1041 lib/rpmts.c:643 -#: tools/rpmgraph.c:121 tools/rpmgraph.c:158 +#: lib/rpminstall.c:615 lib/rpmts.c:643 tools/rpmgraph.c:121 +#: tools/rpmgraph.c:158 #, c-format msgid "open of %s failed: %s\n" msgstr "la apertura de %s falló: %s\n" @@ -2815,7 +2815,7 @@ msgid "unknown tag: \"%s\"\n" msgstr "etiqueta desconocida" #: lib/rpmgi.c:628 lib/rpminstall.c:659 lib/rpminstall.c:834 -#: lib/rpminstall.c:1267 lib/transaction.c:1031 tools/rpmgraph.c:196 +#: lib/rpminstall.c:1084 lib/transaction.c:1026 tools/rpmgraph.c:196 msgid "Failed dependencies:\n" msgstr "Error de dependencias:\n" @@ -2931,16 +2931,16 @@ msgstr "no se puede abrir %s: %s\n" msgid "Installing %s\n" msgstr "Instalando %s\n" -#: lib/rpminstall.c:1261 lib/transaction.c:1024 +#: lib/rpminstall.c:1078 lib/transaction.c:1019 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "Restaurar paquetes (+%d/-%d) a %-24.24s (0x%08x):\n" -#: lib/rpminstall.c:1292 lib/transaction.c:1075 +#: lib/rpminstall.c:1109 lib/transaction.c:1070 msgid "Cleaning up repackaged packages:\n" msgstr "" -#: lib/rpminstall.c:1299 lib/transaction.c:1081 +#: lib/rpminstall.c:1116 lib/transaction.c:1076 #, fuzzy, c-format msgid "\tRemoving %s:\n" msgstr "Recuperando %s\n" @@ -3086,97 +3086,97 @@ msgid "unknown error %d encountered while manipulating package %s" msgstr "" "se encontró el error desconocido %d mientras se manipulaba el paquete %s" -#: lib/rpmrc.c:199 +#: lib/rpmrc.c:213 #, c-format msgid "missing second ':' at %s:%d\n" msgstr "segundo ':' omitido en %s:%d\n" -#: lib/rpmrc.c:202 +#: lib/rpmrc.c:216 #, c-format msgid "missing architecture name at %s:%d\n" msgstr "nombre de arquitectura omitida en %s:%d\n" -#: lib/rpmrc.c:356 +#: lib/rpmrc.c:370 #, c-format msgid "Incomplete data line at %s:%d\n" msgstr "lÃnea de datos incompleta en %s:%d\n" -#: lib/rpmrc.c:361 +#: lib/rpmrc.c:375 #, c-format msgid "Too many args in data line at %s:%d\n" msgstr "Demasiados argumentos en la lÃnea de datos en %s:%d\n" -#: lib/rpmrc.c:369 +#: lib/rpmrc.c:383 #, c-format msgid "Bad arch/os number: %s (%s:%d)\n" msgstr "número de arq/os erróneo: %s (%s:%d)\n" -#: lib/rpmrc.c:406 +#: lib/rpmrc.c:420 #, c-format msgid "Incomplete default line at %s:%d\n" msgstr "LÃnea determinada incompleta en %s:%d\n" -#: lib/rpmrc.c:411 +#: lib/rpmrc.c:425 #, c-format msgid "Too many args in default line at %s:%d\n" msgstr "Demasiados argumentos en la lÃnea predeterminada en %s:%d\n" -#: lib/rpmrc.c:577 +#: lib/rpmrc.c:591 #, c-format msgid "Failed to read %s: %s.\n" msgstr "Falló la lectura de %s: %s.\n" -#: lib/rpmrc.c:615 +#: lib/rpmrc.c:629 #, c-format msgid "missing ':' (found 0x%02x) at %s:%d\n" msgstr "':' faltante (se encontró 0x%02x) en %s:%d\n" -#: lib/rpmrc.c:632 lib/rpmrc.c:706 +#: lib/rpmrc.c:646 lib/rpmrc.c:710 #, c-format msgid "missing argument for %s at %s:%d\n" msgstr "falta argumento para %s en %s:%d\n" -#: lib/rpmrc.c:649 lib/rpmrc.c:671 +#: lib/rpmrc.c:663 #, c-format msgid "%s expansion failed at %s:%d \"%s\"\n" msgstr "falló la expansión de %s a %s:%d \"%s\"\n" -#: lib/rpmrc.c:658 +#: lib/rpmrc.c:672 #, c-format msgid "cannot open %s at %s:%d: %s\n" msgstr "no se puede abrir %s en %s:%d: %s\n" -#: lib/rpmrc.c:698 +#: lib/rpmrc.c:702 #, c-format msgid "missing architecture for %s at %s:%d\n" msgstr "falta la arquitectura para %s en %s:%d\n" -#: lib/rpmrc.c:765 +#: lib/rpmrc.c:769 #, c-format msgid "bad option '%s' at %s:%d\n" msgstr "opción errónea '%s' en %s:%d\n" -#: lib/rpmrc.c:1564 +#: lib/rpmrc.c:1568 #, c-format msgid "Unknown system: %s\n" msgstr "Sistema desconocido: %s\n" -#: lib/rpmrc.c:1565 +#: lib/rpmrc.c:1569 #, c-format msgid "Please contact %s\n" msgstr "Por favor contacte %s\n" -#: lib/rpmrc.c:1802 +#: lib/rpmrc.c:1806 #, c-format msgid "Cannot expand %s\n" msgstr "No se puede expandir %s\n" -#: lib/rpmrc.c:1807 +#: lib/rpmrc.c:1811 #, c-format msgid "Cannot read %s, HOME is too large.\n" msgstr "No se puede leer %s, HOME es demasiado grande.\n" -#: lib/rpmrc.c:1824 +#: lib/rpmrc.c:1828 #, c-format msgid "Unable to open %s for reading: %s.\n" msgstr "Incapaz de abrir %s para lectura: %s.\n" @@ -3467,160 +3467,160 @@ msgstr "Resumen MD5 incompleto: NO SOPORTADO\n" msgid "Signature: UNKNOWN (%d)\n" msgstr "Firma: DESCONOCIDA (%d)\n" -#: lib/transaction.c:935 +#: lib/transaction.c:930 #, c-format msgid "excluding directory %s\n" msgstr "excluyendo directorio %s\n" -#: lib/transaction.c:1022 +#: lib/transaction.c:1017 msgid "Transaction failed...rolling back\n" msgstr "" -#: lib/transaction.c:1042 +#: lib/transaction.c:1037 msgid "Could not order auto-rollback transaction!\n" msgstr "" -#: lib/transaction.c:1132 +#: lib/transaction.c:1127 msgid "Getting repackaged header from transaction element\n" msgstr "" -#: lib/transaction.c:1157 +#: lib/transaction.c:1152 #, c-format msgid "\tLooking for %s...\n" msgstr "" -#: lib/transaction.c:1161 +#: lib/transaction.c:1156 msgid "\tMatches found.\n" msgstr "" -#: lib/transaction.c:1165 +#: lib/transaction.c:1160 msgid "\tNo matches found.\n" msgstr "" -#: lib/transaction.c:1178 +#: lib/transaction.c:1173 #, fuzzy msgid "\tRepackaged package not found!.\n" msgstr "se esperaba el paquete fuente, paquete binario encontrado\n" -#: lib/transaction.c:1199 +#: lib/transaction.c:1194 msgid "\tREMOVETID matched INSTALLTID.\n" msgstr "" -#: lib/transaction.c:1201 +#: lib/transaction.c:1196 #, c-format msgid "\t\tName: %s.\n" msgstr "" -#: lib/transaction.c:1224 +#: lib/transaction.c:1219 #, fuzzy, c-format msgid "\tRepackaged Package was %s...\n" msgstr "ningún paquete coincide con %s: %s\n" -#: lib/transaction.c:1268 +#: lib/transaction.c:1263 msgid "Adding install element to auto-rollback transaction.\n" msgstr "" -#: lib/transaction.c:1277 +#: lib/transaction.c:1272 msgid "Could not get install element database instance!\n" msgstr "" -#: lib/transaction.c:1290 +#: lib/transaction.c:1285 msgid "Could not get header for auto-rollback transaction!\n" msgstr "" -#: lib/transaction.c:1300 +#: lib/transaction.c:1295 #, c-format msgid "\tAdded repackaged package header: %s.\n" msgstr "" -#: lib/transaction.c:1302 lib/transaction.c:1313 +#: lib/transaction.c:1297 lib/transaction.c:1308 #, c-format msgid "\tAdded from install element %s.\n" msgstr "" -#: lib/transaction.c:1311 +#: lib/transaction.c:1306 msgid "\tAdded erase element.\n" msgstr "" -#: lib/transaction.c:1320 +#: lib/transaction.c:1315 msgid "Could not get repackaged header for auto-rollback transaction!\n" msgstr "" -#: lib/transaction.c:1327 +#: lib/transaction.c:1322 msgid "Add erase element to auto-rollback transaction.\n" msgstr "" -#: lib/transaction.c:1335 +#: lib/transaction.c:1330 msgid "\tFound existing upgrade element.\n" msgstr "" -#: lib/transaction.c:1336 +#: lib/transaction.c:1331 #, c-format msgid "\tNot adding erase element for %s.\n" msgstr "" -#: lib/transaction.c:1353 +#: lib/transaction.c:1348 #, c-format msgid "\tAdded repackaged package %s.\n" msgstr "" -#: lib/transaction.c:1355 +#: lib/transaction.c:1350 #, c-format msgid "\tAdded from erase element %s.\n" msgstr "" -#: lib/transaction.c:1360 +#: lib/transaction.c:1355 msgid "Could not add erase element to auto-rollback transaction.\n" msgstr "" -#: lib/transaction.c:1366 +#: lib/transaction.c:1361 msgid "\tNo repackaged package...nothing to do.\n" msgstr "" -#: lib/transaction.c:1372 +#: lib/transaction.c:1367 #, fuzzy msgid "Failure reading repackaged package!\n" msgstr "error al leer cabecera del paquete\n" -#: lib/transaction.c:1495 +#: lib/transaction.c:1490 #, fuzzy, c-format msgid "sanity checking %d elements\n" msgstr "revisión de sanidad de %d elementos\n" -#: lib/transaction.c:1581 +#: lib/transaction.c:1576 msgid "running pre-transaction scripts\n" msgstr "" -#: lib/transaction.c:1655 +#: lib/transaction.c:1650 #, c-format msgid "computing %d file fingerprints\n" msgstr "computando %d hullas de archivo\n" -#: lib/transaction.c:1739 +#: lib/transaction.c:1734 msgid "computing file dispositions\n" msgstr "calculando disposiciones del archivo\n" -#: lib/transaction.c:1932 +#: lib/transaction.c:1927 msgid "Creating auto-rollback transaction\n" msgstr "" -#: lib/transaction.c:2086 +#: lib/transaction.c:2077 msgid "Add failed. Could not read package header.\n" msgstr "" -#: lib/transaction.c:2170 +#: lib/transaction.c:2161 msgid "Add failed in rpmpsmStage().\n" msgstr "" -#: lib/transaction.c:2214 +#: lib/transaction.c:2205 msgid "Add failed. Could not get file list.\n" msgstr "" -#: lib/transaction.c:2263 +#: lib/transaction.c:2254 msgid "Erase failed failed in rpmpsmStage().\n" msgstr "" -#: lib/transaction.c:2324 +#: lib/transaction.c:2315 msgid "running post-transaction scripts\n" msgstr "" @@ -4020,87 +4020,87 @@ msgstr "abriendo Ãndice db %s/%s %s modo=0x%x\n" msgid "======================== active %d empty %d\n" msgstr "======================== activo %d vacÃo %d\n" -#: rpmio/macro.c:394 +#: rpmio/macro.c:396 #, c-format msgid "%3d>%*s(empty)" msgstr "%3d>%*s(vacÃo)" -#: rpmio/macro.c:437 +#: rpmio/macro.c:439 #, c-format msgid "%3d<%*s(empty)\n" msgstr "%3d<%*s(vacÃo)\n" -#: rpmio/macro.c:664 rpmio/macro.c:705 +#: rpmio/macro.c:608 rpmio/macro.c:1090 rpmio/macro.c:1123 rpmio/macro.c:1863 +msgid "Target buffer overflow\n" +msgstr "Desborde del buffer objetivo\n" + +#: rpmio/macro.c:671 rpmio/macro.c:712 #, c-format msgid "Macro %%%s has unterminated body\n" msgstr "El Macro %%%s tiene un cuerpo incompleto\n" -#: rpmio/macro.c:727 +#: rpmio/macro.c:734 #, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "El Macro %%%s tiene un nombre ilegal (%%define)\n" -#: rpmio/macro.c:733 +#: rpmio/macro.c:740 #, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "la Macro %%%s tiene opciones no terminadas\n" -#: rpmio/macro.c:738 +#: rpmio/macro.c:745 #, c-format msgid "Macro %%%s has empty body\n" msgstr "La Macro %%%s tiene un cuerpo vacÃo\n" -#: rpmio/macro.c:744 +#: rpmio/macro.c:751 #, c-format msgid "Macro %%%s failed to expand\n" msgstr " Falló la expansión de la Macro %%%s\n" -#: rpmio/macro.c:779 +#: rpmio/macro.c:786 #, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "La Macro %%%s tiene un nombre ilegal (%%undefine)\n" -#: rpmio/macro.c:897 +#: rpmio/macro.c:904 #, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "La Macro %%%s (%s) no fue utilizada bajo el nivel %d\n" -#: rpmio/macro.c:1024 +#: rpmio/macro.c:1031 #, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "Opción desconocida %c en %s(%s)\n" -#: rpmio/macro.c:1224 +#: rpmio/macro.c:1239 #, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "" "La profundidad de recursión (%d) es mayor que el máximo permitido (%d)\n" -#: rpmio/macro.c:1297 rpmio/macro.c:1314 +#: rpmio/macro.c:1312 rpmio/macro.c:1329 #, c-format msgid "Unterminated %c: %s\n" msgstr "No terminado %c: %s\n" -#: rpmio/macro.c:1355 +#: rpmio/macro.c:1370 #, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "Un %% está seguido por una macro no analizable\n" -#: rpmio/macro.c:1512 +#: rpmio/macro.c:1527 #, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "La Macro %%%.*s no se encontró, omitiendo\n" -#: rpmio/macro.c:1848 -msgid "Target buffer overflow\n" -msgstr "Desborde del buffer objetivo\n" - -#: rpmio/macro.c:2056 rpmio/macro.c:2062 +#: rpmio/macro.c:2076 rpmio/macro.c:2082 #, c-format msgid "File %s: %s\n" msgstr "Archivo %s: %s\n" -#: rpmio/macro.c:2065 +#: rpmio/macro.c:2085 #, c-format msgid "File %s is smaller than %u bytes\n" msgstr "El archivo %s tiene menos de %u bytes\n" @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n" -"POT-Creation-Date: 2007-08-21 08:04+0200\n" +"POT-Creation-Date: 2007-08-30 18:37+0200\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" @@ -1262,18 +1262,18 @@ msgstr "älä tarkista käännösriippuvuuksia" msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "" -#: build/poptBT.c:229 lib/poptALL.c:273 lib/poptI.c:282 lib/poptQV.c:363 -#: lib/poptQV.c:372 lib/poptQV.c:413 +#: build/poptBT.c:229 lib/poptALL.c:273 lib/poptI.c:282 lib/poptQV.c:362 +#: lib/poptQV.c:371 lib/poptQV.c:412 msgid "don't verify package digest(s)" msgstr "" -#: build/poptBT.c:231 lib/poptALL.c:275 lib/poptI.c:284 lib/poptQV.c:366 -#: lib/poptQV.c:374 lib/poptQV.c:416 +#: build/poptBT.c:231 lib/poptALL.c:275 lib/poptI.c:284 lib/poptQV.c:365 +#: lib/poptQV.c:373 lib/poptQV.c:415 msgid "don't verify database header(s) when retrieved" msgstr "" -#: build/poptBT.c:233 lib/poptALL.c:281 lib/poptI.c:286 lib/poptQV.c:369 -#: lib/poptQV.c:376 lib/poptQV.c:418 +#: build/poptBT.c:233 lib/poptALL.c:281 lib/poptI.c:286 lib/poptQV.c:368 +#: lib/poptQV.c:375 lib/poptQV.c:417 msgid "don't verify package signature(s)" msgstr "älä tarkista paketin allekirjoitusta" @@ -1335,27 +1335,27 @@ msgstr "pgp epäonnistui" msgid "failed to write all data to %s\n" msgstr "%s:n luonti epäonnistui\n" -#: build/rpmfc.c:1250 +#: build/rpmfc.c:1249 #, fuzzy, c-format msgid "magic_open(0x%x) failed: %s\n" msgstr "%s:n avaus ei onnistunut: %s\n" -#: build/rpmfc.c:1258 +#: build/rpmfc.c:1257 #, fuzzy, c-format -msgid "magic_load(ms, \"%s\") failed: %s\n" +msgid "magic_load failed: %s\n" msgstr "%s:n poisto epäonnistui: %s" -#: build/rpmfc.c:1303 +#: build/rpmfc.c:1301 #, fuzzy, c-format msgid "magic_file(ms, \"%s\") failed: mode %06o %s\n" msgstr "%s:n poisto epäonnistui: %s" -#: build/rpmfc.c:1524 +#: build/rpmfc.c:1522 #, fuzzy, c-format msgid "Finding %s: %s\n" msgstr "en voinut avata %s: %s" -#: build/rpmfc.c:1530 build/rpmfc.c:1539 +#: build/rpmfc.c:1528 build/rpmfc.c:1537 #, fuzzy, c-format msgid "Failed to find %s:\n" msgstr "%s:n luonti epäonnistui\n" @@ -1475,30 +1475,30 @@ msgstr "" msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" -#: lib/depends.c:1265 +#: lib/depends.c:1271 msgid "========== recording tsort relations\n" msgstr "" -#: lib/depends.c:1357 +#: lib/depends.c:1363 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, depth, " "breadth)\n" msgstr "" -#: lib/depends.c:1453 +#: lib/depends.c:1459 #, c-format msgid "========== successors only (%d bytes)\n" msgstr "" -#: lib/depends.c:1526 +#: lib/depends.c:1532 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1561 +#: lib/depends.c:1567 msgid "========== continuing tsort ...\n" msgstr "" -#: lib/depends.c:1566 +#: lib/depends.c:1572 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2038,7 +2038,7 @@ msgstr "päivitä tietokanta, mutta älä muuta tiedostojärjestelmää" msgid "do not verify package dependencies" msgstr "älä tarkista paketin riippuvuuksia" -#: lib/poptI.c:252 lib/poptQV.c:307 lib/poptQV.c:310 +#: lib/poptI.c:252 lib/poptQV.c:306 lib/poptQV.c:309 msgid "don't verify MD5 digest of files" msgstr "älä tarkista tiedostojen MD5-summaa" @@ -2155,214 +2155,214 @@ msgstr "älä asenna, mutta kerro onnistuisiko se" msgid "upgrade package(s)" msgstr "päivitä paketteja" -#: lib/poptQV.c:103 +#: lib/poptQV.c:102 msgid "query/verify all packages" msgstr "kysele/tarkista kaikki paketit" -#: lib/poptQV.c:105 +#: lib/poptQV.c:104 msgid "rpm checksig mode" msgstr "rpm allekirjoituksen tarkistusmoodi" -#: lib/poptQV.c:107 +#: lib/poptQV.c:106 msgid "query/verify package(s) owning file" msgstr "kysele/tarkista pakettia, jonka omistuksessa <tiedosto> on" -#: lib/poptQV.c:109 +#: lib/poptQV.c:108 msgid "query/verify package(s) in group" msgstr "kysele/tarkista paketteja ryhmässä" -#: lib/poptQV.c:111 +#: lib/poptQV.c:110 msgid "query/verify a package file" msgstr "kysele/tarkista pakettitiedostoa" -#: lib/poptQV.c:114 +#: lib/poptQV.c:113 msgid "query/verify package(s) from TOP file tree walk" msgstr "" -#: lib/poptQV.c:116 +#: lib/poptQV.c:115 msgid "query/verify package(s) from system HDLIST" msgstr "" -#: lib/poptQV.c:119 +#: lib/poptQV.c:118 msgid "query/verify package(s) with package identifier" msgstr "" -#: lib/poptQV.c:121 +#: lib/poptQV.c:120 msgid "query/verify package(s) with header identifier" msgstr "" -#: lib/poptQV.c:123 +#: lib/poptQV.c:122 msgid "query/verify package(s) with file identifier" msgstr "" -#: lib/poptQV.c:126 +#: lib/poptQV.c:125 msgid "rpm query mode" msgstr "rpm kyselymoodi" -#: lib/poptQV.c:128 +#: lib/poptQV.c:127 msgid "query/verify a header instance" msgstr "" -#: lib/poptQV.c:130 +#: lib/poptQV.c:129 msgid "query a spec file" msgstr "kysele määrittelytiedostoa" -#: lib/poptQV.c:130 +#: lib/poptQV.c:129 msgid "<spec>" msgstr "" -#: lib/poptQV.c:132 +#: lib/poptQV.c:131 msgid "query/verify package(s) from install transaction" msgstr "" -#: lib/poptQV.c:134 +#: lib/poptQV.c:133 msgid "query the package(s) triggered by the package" msgstr "" -#: lib/poptQV.c:136 +#: lib/poptQV.c:135 msgid "rpm verify mode" msgstr "rpm tarkistusmoodi" -#: lib/poptQV.c:138 +#: lib/poptQV.c:137 msgid "query/verify the package(s) which require a dependency" msgstr "kysele/tarkista paketteja, jotka vaativat ominaisuutta" -#: lib/poptQV.c:140 +#: lib/poptQV.c:139 msgid "query/verify the package(s) which provide a dependency" msgstr "kysele/tarkista paketteja, jotka tarjoavat ominaisuuden" -#: lib/poptQV.c:143 +#: lib/poptQV.c:142 msgid "create transaction set" msgstr "" -#: lib/poptQV.c:145 +#: lib/poptQV.c:144 msgid "do not order transaction set" msgstr "" -#: lib/poptQV.c:147 +#: lib/poptQV.c:146 msgid "do not glob arguments" msgstr "" -#: lib/poptQV.c:149 +#: lib/poptQV.c:148 msgid "do not process non-package files as manifests" msgstr "" -#: lib/poptQV.c:151 +#: lib/poptQV.c:150 msgid "do not read headers" msgstr "" -#: lib/poptQV.c:258 +#: lib/poptQV.c:257 msgid "list all configuration files" msgstr "luettele kaikki konfiguraatiotiedostot" -#: lib/poptQV.c:260 +#: lib/poptQV.c:259 msgid "list all documentation files" msgstr "luettele kaikki dokumentaatiotiedostot" -#: lib/poptQV.c:262 +#: lib/poptQV.c:261 msgid "dump basic file information" msgstr "" -#: lib/poptQV.c:266 +#: lib/poptQV.c:265 msgid "list files in package" msgstr "luettele paketin tiedostot" -#: lib/poptQV.c:271 +#: lib/poptQV.c:270 #, c-format msgid "skip %%ghost files" msgstr "ohita %%ghost tiedostot" -#: lib/poptQV.c:275 +#: lib/poptQV.c:274 #, c-format msgid "skip %%license files" msgstr "ohita %%license tiedostot" -#: lib/poptQV.c:278 +#: lib/poptQV.c:277 #, c-format msgid "skip %%readme files" msgstr "ohita %%readme tiedostot" -#: lib/poptQV.c:284 +#: lib/poptQV.c:283 msgid "use the following query format" msgstr "käytä seuraava kyselyformaattia" -#: lib/poptQV.c:286 +#: lib/poptQV.c:285 msgid "substitute i18n sections into spec file" msgstr "" -#: lib/poptQV.c:288 +#: lib/poptQV.c:287 msgid "display the states of the listed files" msgstr "näytä lueteltujen tiedostojen tilat" -#: lib/poptQV.c:314 +#: lib/poptQV.c:313 msgid "don't verify size of files" msgstr "älä tarkista tiedostojen kokoa" -#: lib/poptQV.c:317 +#: lib/poptQV.c:316 msgid "don't verify symlink path of files" msgstr "älä tarkista tiedostojen symbolisen linkin polkua" -#: lib/poptQV.c:320 +#: lib/poptQV.c:319 msgid "don't verify owner of files" msgstr "älä tarkista tiedostojen omistajaa" -#: lib/poptQV.c:323 +#: lib/poptQV.c:322 msgid "don't verify group of files" msgstr "älä tarkista tiedostojen ryhmää" -#: lib/poptQV.c:326 +#: lib/poptQV.c:325 msgid "don't verify modification time of files" msgstr "älä tarkista tiedostojen muutosaikaa" -#: lib/poptQV.c:329 lib/poptQV.c:332 +#: lib/poptQV.c:328 lib/poptQV.c:331 msgid "don't verify mode of files" msgstr "älä tarkista tiedostojen oikeuksia" -#: lib/poptQV.c:335 +#: lib/poptQV.c:334 msgid "don't verify file security contexts" msgstr "" -#: lib/poptQV.c:337 +#: lib/poptQV.c:336 msgid "don't verify files in package" msgstr "älä tarkista paketin tiedostoja" -#: lib/poptQV.c:340 lib/poptQV.c:343 tools/rpmgraph.c:266 +#: lib/poptQV.c:339 lib/poptQV.c:342 tools/rpmgraph.c:266 msgid "don't verify package dependencies" msgstr "älä tarkista paketin riippuvuuksia" -#: lib/poptQV.c:348 lib/poptQV.c:352 lib/poptQV.c:355 lib/poptQV.c:358 +#: lib/poptQV.c:347 lib/poptQV.c:351 lib/poptQV.c:354 lib/poptQV.c:357 msgid "don't execute verify script(s)" msgstr "älä suorita tarkistusskriptejä" -#: lib/poptQV.c:382 +#: lib/poptQV.c:381 msgid "don't verify GPG V3 DSA signature(s)" msgstr "älä tarkista GPG V3 DSA allekirjoituksia" -#: lib/poptQV.c:385 +#: lib/poptQV.c:384 msgid "don't verify PGP V3 RSA/MD5 signature(s)" msgstr "älä tarkista PGP V3 RSA/MD5 allekirjoituksia" -#: lib/poptQV.c:400 +#: lib/poptQV.c:399 msgid "sign package(s) (identical to --resign)" msgstr "allekirjoita paketti (hylkää nykyinen allekirjoitus)" -#: lib/poptQV.c:402 +#: lib/poptQV.c:401 msgid "verify package signature(s)" msgstr "tarkista paketin allekirjoitus" -#: lib/poptQV.c:404 +#: lib/poptQV.c:403 msgid "delete package signatures" msgstr "poista paketin allekirjoitus" -#: lib/poptQV.c:406 +#: lib/poptQV.c:405 msgid "import an armored public key" msgstr "" -#: lib/poptQV.c:408 +#: lib/poptQV.c:407 msgid "sign package(s) (identical to --addsign)" msgstr "allekirjoita paketti (hylkää nykyinen allekirjoitus)" -#: lib/poptQV.c:410 +#: lib/poptQV.c:409 msgid "generate signature" msgstr "luo allekirjoitus" @@ -2699,38 +2699,38 @@ msgstr "" msgid "%s skipped due to missingok flag\n" msgstr "" -#: lib/rpmfi.c:846 +#: lib/rpmfi.c:850 msgid "========== relocations\n" msgstr "" -#: lib/rpmfi.c:850 +#: lib/rpmfi.c:854 #, c-format msgid "%5d exclude %s\n" msgstr "" -#: lib/rpmfi.c:853 +#: lib/rpmfi.c:857 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "" -#: lib/rpmfi.c:987 +#: lib/rpmfi.c:991 #, c-format msgid "excluding %s %s\n" msgstr "" -#: lib/rpmfi.c:997 +#: lib/rpmfi.c:1001 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/rpmfi.c:1089 +#: lib/rpmfi.c:1093 #, c-format msgid "relocating directory %s to %s\n" msgstr "" #: lib/rpmgi.c:81 lib/rpminstall.c:124 lib/rpminstall.c:480 -#: lib/rpminstall.c:615 lib/rpminstall.c:1041 lib/rpmts.c:643 -#: tools/rpmgraph.c:121 tools/rpmgraph.c:158 +#: lib/rpminstall.c:615 lib/rpmts.c:643 tools/rpmgraph.c:121 +#: tools/rpmgraph.c:158 #, c-format msgid "open of %s failed: %s\n" msgstr "%s:n avaus ei onnistunut: %s\n" @@ -2741,7 +2741,7 @@ msgid "unknown tag: \"%s\"\n" msgstr "tuntematon nimiö: \"%s\"\n" #: lib/rpmgi.c:628 lib/rpminstall.c:659 lib/rpminstall.c:834 -#: lib/rpminstall.c:1267 lib/transaction.c:1031 tools/rpmgraph.c:196 +#: lib/rpminstall.c:1084 lib/transaction.c:1026 tools/rpmgraph.c:196 msgid "Failed dependencies:\n" msgstr "Puuttuvia riippuvuuksia:\n" @@ -2857,16 +2857,16 @@ msgstr "virhe: en voi avata %s: %s\n" msgid "Installing %s\n" msgstr "Asennetaan %s\n" -#: lib/rpminstall.c:1261 lib/transaction.c:1024 +#: lib/rpminstall.c:1078 lib/transaction.c:1019 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" -#: lib/rpminstall.c:1292 lib/transaction.c:1075 +#: lib/rpminstall.c:1109 lib/transaction.c:1070 msgid "Cleaning up repackaged packages:\n" msgstr "Siivotaan uudelleenpaketoituja paketteja:\n" -#: lib/rpminstall.c:1299 lib/transaction.c:1081 +#: lib/rpminstall.c:1116 lib/transaction.c:1076 #, c-format msgid "\tRemoving %s:\n" msgstr "\tPoistetaan %s\n" @@ -2999,97 +2999,97 @@ msgstr "%s on ristiriidassa %s-%s:n kanssa" msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/rpmrc.c:199 +#: lib/rpmrc.c:213 #, c-format msgid "missing second ':' at %s:%d\n" msgstr "toinen ':' puuttuu, %s:%d\n" -#: lib/rpmrc.c:202 +#: lib/rpmrc.c:216 #, c-format msgid "missing architecture name at %s:%d\n" msgstr "puuttuva arkkitehtuurin nimi, %s:%d\n" -#: lib/rpmrc.c:356 +#: lib/rpmrc.c:370 #, c-format msgid "Incomplete data line at %s:%d\n" msgstr "Epätäydellinen datarivi, %s:%d\n" -#: lib/rpmrc.c:361 +#: lib/rpmrc.c:375 #, c-format msgid "Too many args in data line at %s:%d\n" msgstr "Liian monta parametriä datarivillä %s:%d\n" -#: lib/rpmrc.c:369 +#: lib/rpmrc.c:383 #, c-format msgid "Bad arch/os number: %s (%s:%d)\n" msgstr "Virheellinen arkkitehtuuri/käyttöjärjestelmä numero: %s (%s:%d)\n" -#: lib/rpmrc.c:406 +#: lib/rpmrc.c:420 #, c-format msgid "Incomplete default line at %s:%d\n" msgstr "Epätäydellinen oletusrivi, %s:%d\n" -#: lib/rpmrc.c:411 +#: lib/rpmrc.c:425 #, c-format msgid "Too many args in default line at %s:%d\n" msgstr "Liian monta parametriä oletusrivillä %s:%d\n" -#: lib/rpmrc.c:577 +#: lib/rpmrc.c:591 #, c-format msgid "Failed to read %s: %s.\n" msgstr "En voi lukea %s: %s.\n" -#: lib/rpmrc.c:615 +#: lib/rpmrc.c:629 #, c-format msgid "missing ':' (found 0x%02x) at %s:%d\n" msgstr "" -#: lib/rpmrc.c:632 lib/rpmrc.c:706 +#: lib/rpmrc.c:646 lib/rpmrc.c:710 #, c-format msgid "missing argument for %s at %s:%d\n" msgstr "" -#: lib/rpmrc.c:649 lib/rpmrc.c:671 +#: lib/rpmrc.c:663 #, c-format msgid "%s expansion failed at %s:%d \"%s\"\n" msgstr "" -#: lib/rpmrc.c:658 +#: lib/rpmrc.c:672 #, c-format msgid "cannot open %s at %s:%d: %s\n" msgstr "" -#: lib/rpmrc.c:698 +#: lib/rpmrc.c:702 #, c-format msgid "missing architecture for %s at %s:%d\n" msgstr "" -#: lib/rpmrc.c:765 +#: lib/rpmrc.c:769 #, c-format msgid "bad option '%s' at %s:%d\n" msgstr "" -#: lib/rpmrc.c:1564 +#: lib/rpmrc.c:1568 #, c-format msgid "Unknown system: %s\n" msgstr "Tuntematon järjestelmä: %s\n" -#: lib/rpmrc.c:1565 +#: lib/rpmrc.c:1569 #, c-format msgid "Please contact %s\n" msgstr "" -#: lib/rpmrc.c:1802 +#: lib/rpmrc.c:1806 #, c-format msgid "Cannot expand %s\n" msgstr "" -#: lib/rpmrc.c:1807 +#: lib/rpmrc.c:1811 #, c-format msgid "Cannot read %s, HOME is too large.\n" msgstr "" -#: lib/rpmrc.c:1824 +#: lib/rpmrc.c:1828 #, c-format msgid "Unable to open %s for reading: %s.\n" msgstr "En voi avata %s luettavaksi: %s.\n" @@ -3377,158 +3377,158 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:935 +#: lib/transaction.c:930 #, c-format msgid "excluding directory %s\n" msgstr "" -#: lib/transaction.c:1022 +#: lib/transaction.c:1017 msgid "Transaction failed...rolling back\n" msgstr "" -#: lib/transaction.c:1042 +#: lib/transaction.c:1037 msgid "Could not order auto-rollback transaction!\n" msgstr "" -#: lib/transaction.c:1132 +#: lib/transaction.c:1127 msgid "Getting repackaged header from transaction element\n" msgstr "" -#: lib/transaction.c:1157 +#: lib/transaction.c:1152 #, c-format msgid "\tLooking for %s...\n" msgstr "" -#: lib/transaction.c:1161 +#: lib/transaction.c:1156 msgid "\tMatches found.\n" msgstr "" -#: lib/transaction.c:1165 +#: lib/transaction.c:1160 msgid "\tNo matches found.\n" msgstr "" -#: lib/transaction.c:1178 +#: lib/transaction.c:1173 msgid "\tRepackaged package not found!.\n" msgstr "" -#: lib/transaction.c:1199 +#: lib/transaction.c:1194 msgid "\tREMOVETID matched INSTALLTID.\n" msgstr "" -#: lib/transaction.c:1201 +#: lib/transaction.c:1196 #, c-format msgid "\t\tName: %s.\n" msgstr "" -#: lib/transaction.c:1224 +#: lib/transaction.c:1219 #, c-format msgid "\tRepackaged Package was %s...\n" msgstr "" -#: lib/transaction.c:1268 +#: lib/transaction.c:1263 msgid "Adding install element to auto-rollback transaction.\n" msgstr "" -#: lib/transaction.c:1277 +#: lib/transaction.c:1272 msgid "Could not get install element database instance!\n" msgstr "" -#: lib/transaction.c:1290 +#: lib/transaction.c:1285 msgid "Could not get header for auto-rollback transaction!\n" msgstr "" -#: lib/transaction.c:1300 +#: lib/transaction.c:1295 #, c-format msgid "\tAdded repackaged package header: %s.\n" msgstr "" -#: lib/transaction.c:1302 lib/transaction.c:1313 +#: lib/transaction.c:1297 lib/transaction.c:1308 #, c-format msgid "\tAdded from install element %s.\n" msgstr "" -#: lib/transaction.c:1311 +#: lib/transaction.c:1306 msgid "\tAdded erase element.\n" msgstr "" -#: lib/transaction.c:1320 +#: lib/transaction.c:1315 msgid "Could not get repackaged header for auto-rollback transaction!\n" msgstr "" -#: lib/transaction.c:1327 +#: lib/transaction.c:1322 msgid "Add erase element to auto-rollback transaction.\n" msgstr "" -#: lib/transaction.c:1335 +#: lib/transaction.c:1330 msgid "\tFound existing upgrade element.\n" msgstr "" -#: lib/transaction.c:1336 +#: lib/transaction.c:1331 #, c-format msgid "\tNot adding erase element for %s.\n" msgstr "" -#: lib/transaction.c:1353 +#: lib/transaction.c:1348 #, c-format msgid "\tAdded repackaged package %s.\n" msgstr "" -#: lib/transaction.c:1355 +#: lib/transaction.c:1350 #, c-format msgid "\tAdded from erase element %s.\n" msgstr "" -#: lib/transaction.c:1360 +#: lib/transaction.c:1355 msgid "Could not add erase element to auto-rollback transaction.\n" msgstr "" -#: lib/transaction.c:1366 +#: lib/transaction.c:1361 msgid "\tNo repackaged package...nothing to do.\n" msgstr "" -#: lib/transaction.c:1372 +#: lib/transaction.c:1367 msgid "Failure reading repackaged package!\n" msgstr "" -#: lib/transaction.c:1495 +#: lib/transaction.c:1490 #, c-format msgid "sanity checking %d elements\n" msgstr "" -#: lib/transaction.c:1581 +#: lib/transaction.c:1576 msgid "running pre-transaction scripts\n" msgstr "" -#: lib/transaction.c:1655 +#: lib/transaction.c:1650 #, c-format msgid "computing %d file fingerprints\n" msgstr "" -#: lib/transaction.c:1739 +#: lib/transaction.c:1734 msgid "computing file dispositions\n" msgstr "" -#: lib/transaction.c:1932 +#: lib/transaction.c:1927 msgid "Creating auto-rollback transaction\n" msgstr "" -#: lib/transaction.c:2086 +#: lib/transaction.c:2077 msgid "Add failed. Could not read package header.\n" msgstr "" -#: lib/transaction.c:2170 +#: lib/transaction.c:2161 msgid "Add failed in rpmpsmStage().\n" msgstr "" -#: lib/transaction.c:2214 +#: lib/transaction.c:2205 msgid "Add failed. Could not get file list.\n" msgstr "" -#: lib/transaction.c:2263 +#: lib/transaction.c:2254 msgid "Erase failed failed in rpmpsmStage().\n" msgstr "" -#: lib/transaction.c:2324 +#: lib/transaction.c:2315 msgid "running post-transaction scripts\n" msgstr "" @@ -3918,86 +3918,86 @@ msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" msgid "======================== active %d empty %d\n" msgstr "" -#: rpmio/macro.c:394 +#: rpmio/macro.c:396 #, c-format msgid "%3d>%*s(empty)" msgstr "" -#: rpmio/macro.c:437 +#: rpmio/macro.c:439 #, c-format msgid "%3d<%*s(empty)\n" msgstr "" -#: rpmio/macro.c:664 rpmio/macro.c:705 +#: rpmio/macro.c:608 rpmio/macro.c:1090 rpmio/macro.c:1123 rpmio/macro.c:1863 +msgid "Target buffer overflow\n" +msgstr "" + +#: rpmio/macro.c:671 rpmio/macro.c:712 #, c-format msgid "Macro %%%s has unterminated body\n" msgstr "" -#: rpmio/macro.c:727 +#: rpmio/macro.c:734 #, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "" -#: rpmio/macro.c:733 +#: rpmio/macro.c:740 #, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "" -#: rpmio/macro.c:738 +#: rpmio/macro.c:745 #, c-format msgid "Macro %%%s has empty body\n" msgstr "" -#: rpmio/macro.c:744 +#: rpmio/macro.c:751 #, c-format msgid "Macro %%%s failed to expand\n" msgstr "" -#: rpmio/macro.c:779 +#: rpmio/macro.c:786 #, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "" -#: rpmio/macro.c:897 +#: rpmio/macro.c:904 #, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "" -#: rpmio/macro.c:1024 +#: rpmio/macro.c:1031 #, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "" -#: rpmio/macro.c:1224 +#: rpmio/macro.c:1239 #, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "" -#: rpmio/macro.c:1297 rpmio/macro.c:1314 +#: rpmio/macro.c:1312 rpmio/macro.c:1329 #, c-format msgid "Unterminated %c: %s\n" msgstr "" -#: rpmio/macro.c:1355 +#: rpmio/macro.c:1370 #, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "" -#: rpmio/macro.c:1512 +#: rpmio/macro.c:1527 #, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "" -#: rpmio/macro.c:1848 -msgid "Target buffer overflow\n" -msgstr "" - -#: rpmio/macro.c:2056 rpmio/macro.c:2062 +#: rpmio/macro.c:2076 rpmio/macro.c:2082 #, c-format msgid "File %s: %s\n" msgstr "" -#: rpmio/macro.c:2065 +#: rpmio/macro.c:2085 #, c-format msgid "File %s is smaller than %u bytes\n" msgstr "" @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: RPM 4.2.1\n" "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n" -"POT-Creation-Date: 2007-08-21 08:04+0200\n" +"POT-Creation-Date: 2007-08-30 18:37+0200\n" "PO-Revision-Date: 2003-07-06 01:36+0200\n" "Last-Translator: RPM French Translation <rpm-fr@livna.org>\n" "Language-Team: RPM French Translation <rpm-fr@livna.org>\n" @@ -1299,18 +1299,18 @@ msgstr "ne pas vérifier les dépendances de construction" msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "générer un(des) entête(s) compatible(s) avec l'emballage rpm[23]" -#: build/poptBT.c:229 lib/poptALL.c:273 lib/poptI.c:282 lib/poptQV.c:363 -#: lib/poptQV.c:372 lib/poptQV.c:413 +#: build/poptBT.c:229 lib/poptALL.c:273 lib/poptI.c:282 lib/poptQV.c:362 +#: lib/poptQV.c:371 lib/poptQV.c:412 msgid "don't verify package digest(s)" msgstr "ne pas vérifier les sommes de hachage du paquetage" -#: build/poptBT.c:231 lib/poptALL.c:275 lib/poptI.c:284 lib/poptQV.c:366 -#: lib/poptQV.c:374 lib/poptQV.c:416 +#: build/poptBT.c:231 lib/poptALL.c:275 lib/poptI.c:284 lib/poptQV.c:365 +#: lib/poptQV.c:373 lib/poptQV.c:415 msgid "don't verify database header(s) when retrieved" msgstr "ne pas vérifier l'entête de la base de données à la récupération" -#: build/poptBT.c:233 lib/poptALL.c:281 lib/poptI.c:286 lib/poptQV.c:369 -#: lib/poptQV.c:376 lib/poptQV.c:418 +#: build/poptBT.c:233 lib/poptALL.c:281 lib/poptI.c:286 lib/poptQV.c:368 +#: lib/poptQV.c:375 lib/poptQV.c:417 msgid "don't verify package signature(s)" msgstr "ne pas vérifier la(les) signature(s) du paquetage" @@ -1373,27 +1373,27 @@ msgstr "échec %s: %s\n" msgid "failed to write all data to %s\n" msgstr "Impossible d'écrire la charge utile dans %s: %s\n" -#: build/rpmfc.c:1250 +#: build/rpmfc.c:1249 #, fuzzy, c-format msgid "magic_open(0x%x) failed: %s\n" msgstr "échec de l'ouverture de %s: %s\n" -#: build/rpmfc.c:1258 +#: build/rpmfc.c:1257 #, fuzzy, c-format -msgid "magic_load(ms, \"%s\") failed: %s\n" +msgid "magic_load failed: %s\n" msgstr "%s échec du rmdir sur %s: %s\n" -#: build/rpmfc.c:1303 +#: build/rpmfc.c:1301 #, fuzzy, c-format msgid "magic_file(ms, \"%s\") failed: mode %06o %s\n" msgstr "%s échec du rmdir sur %s: %s\n" -#: build/rpmfc.c:1524 +#: build/rpmfc.c:1522 #, fuzzy, c-format msgid "Finding %s: %s\n" msgstr "Fichier %s: %s\n" -#: build/rpmfc.c:1530 build/rpmfc.c:1539 +#: build/rpmfc.c:1528 build/rpmfc.c:1537 #, fuzzy, c-format msgid "Failed to find %s:\n" msgstr "Impossible de lire %s: %s.\n" @@ -1516,11 +1516,11 @@ msgstr "" msgid "removing %s \"%s\" from tsort relations.\n" msgstr "on enlève %s \"%s\" des relations de Ttri.\n" -#: lib/depends.c:1265 +#: lib/depends.c:1271 msgid "========== recording tsort relations\n" msgstr "========== enregistrement des relations de Ttri\n" -#: lib/depends.c:1357 +#: lib/depends.c:1363 #, fuzzy msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, depth, " @@ -1529,20 +1529,20 @@ msgstr "" "========== Ttri des paquetages (ordre, #prédécesseurs, #succeseurs, arbre, " "profondeur)\n" -#: lib/depends.c:1453 +#: lib/depends.c:1459 #, c-format msgid "========== successors only (%d bytes)\n" msgstr "========== successeurs seulement (%d octets)\n" -#: lib/depends.c:1526 +#: lib/depends.c:1532 msgid "LOOP:\n" msgstr "BOUCLE:\n" -#: lib/depends.c:1561 +#: lib/depends.c:1567 msgid "========== continuing tsort ...\n" msgstr "========== continuation du Ttri ...\n" -#: lib/depends.c:1566 +#: lib/depends.c:1572 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "échec de rpmtsOrder, %d éléments toujours présents\n" @@ -2101,7 +2101,7 @@ msgstr "" msgid "do not verify package dependencies" msgstr "ne pas vérifier les dépendances du paquetage" -#: lib/poptI.c:252 lib/poptQV.c:307 lib/poptQV.c:310 +#: lib/poptI.c:252 lib/poptQV.c:306 lib/poptQV.c:309 msgid "don't verify MD5 digest of files" msgstr "ne pas vérifier les sommes MD5 des fichiers" @@ -2223,229 +2223,229 @@ msgstr "n'installe pas, mais dit si ça marcherait ou pas" msgid "upgrade package(s)" msgstr "mises à jour des paquetages" -#: lib/poptQV.c:103 +#: lib/poptQV.c:102 msgid "query/verify all packages" msgstr "vérifier/demander à tous les paquetages" -#: lib/poptQV.c:105 +#: lib/poptQV.c:104 msgid "rpm checksig mode" msgstr "mode rpm vérifsign" -#: lib/poptQV.c:107 +#: lib/poptQV.c:106 msgid "query/verify package(s) owning file" msgstr "vérifier/demander un package possèdant un fichier" -#: lib/poptQV.c:109 +#: lib/poptQV.c:108 msgid "query/verify package(s) in group" msgstr "vérifier/questionner le(s) paquetage(s) d'un même groupe" -#: lib/poptQV.c:111 +#: lib/poptQV.c:110 msgid "query/verify a package file" msgstr "vérifier/questionner un fichier paquetage" -#: lib/poptQV.c:114 +#: lib/poptQV.c:113 #, fuzzy msgid "query/verify package(s) from TOP file tree walk" msgstr "" "questionner/vérifier le(s) paquetage(s) à partir de la transaction " "d'installation" -#: lib/poptQV.c:116 +#: lib/poptQV.c:115 #, fuzzy msgid "query/verify package(s) from system HDLIST" msgstr "" "questionner/vérifier le(s) paquetage(s) à partir de la transaction " "d'installation" -#: lib/poptQV.c:119 +#: lib/poptQV.c:118 msgid "query/verify package(s) with package identifier" msgstr "" "questionner/vérifier le(s) paquetage(s) grâce à un identifieur de paquetage" -#: lib/poptQV.c:121 +#: lib/poptQV.c:120 msgid "query/verify package(s) with header identifier" msgstr "" "questionner/vérifier le(s) paquetage(s) grâce à un identifieur d'entête" -#: lib/poptQV.c:123 +#: lib/poptQV.c:122 msgid "query/verify package(s) with file identifier" msgstr "" "questionner/vérifier le(s) paquetage(s) grâce à un identifieur de fichier" -#: lib/poptQV.c:126 +#: lib/poptQV.c:125 msgid "rpm query mode" msgstr "mode de requête de rpm" -#: lib/poptQV.c:128 +#: lib/poptQV.c:127 msgid "query/verify a header instance" msgstr "questionner/vérifier une instance d'entête" -#: lib/poptQV.c:130 +#: lib/poptQV.c:129 msgid "query a spec file" msgstr "questionner un fichier spec" -#: lib/poptQV.c:130 +#: lib/poptQV.c:129 msgid "<spec>" msgstr "<spec>" -#: lib/poptQV.c:132 +#: lib/poptQV.c:131 msgid "query/verify package(s) from install transaction" msgstr "" "questionner/vérifier le(s) paquetage(s) à partir de la transaction " "d'installation" -#: lib/poptQV.c:134 +#: lib/poptQV.c:133 msgid "query the package(s) triggered by the package" msgstr "questionner le(s) paquetage(s) surveillé(s) par le paquetage" -#: lib/poptQV.c:136 +#: lib/poptQV.c:135 msgid "rpm verify mode" msgstr "mode de vérification de rpm" -#: lib/poptQV.c:138 +#: lib/poptQV.c:137 msgid "query/verify the package(s) which require a dependency" msgstr "vérifier/demander le(s) paquetage(s) qui requier(en)t une dépendance" -#: lib/poptQV.c:140 +#: lib/poptQV.c:139 msgid "query/verify the package(s) which provide a dependency" msgstr "vérifier/demander le(s) paquetage(s) qui fourni(ssen)t une dépendance" -#: lib/poptQV.c:143 +#: lib/poptQV.c:142 msgid "create transaction set" msgstr "" -#: lib/poptQV.c:145 +#: lib/poptQV.c:144 msgid "do not order transaction set" msgstr "" -#: lib/poptQV.c:147 +#: lib/poptQV.c:146 #, fuzzy msgid "do not glob arguments" msgstr "aucun argument fourni" -#: lib/poptQV.c:149 +#: lib/poptQV.c:148 msgid "do not process non-package files as manifests" msgstr "" -#: lib/poptQV.c:151 +#: lib/poptQV.c:150 #, fuzzy msgid "do not read headers" msgstr "%s: impossible de lire l'entête à 0x%x\n" -#: lib/poptQV.c:258 +#: lib/poptQV.c:257 msgid "list all configuration files" msgstr "lister les fichiers de configuration" -#: lib/poptQV.c:260 +#: lib/poptQV.c:259 msgid "list all documentation files" msgstr "lister les fichiers documents" -#: lib/poptQV.c:262 +#: lib/poptQV.c:261 msgid "dump basic file information" msgstr "débite les informations de base des fichiers" -#: lib/poptQV.c:266 +#: lib/poptQV.c:265 msgid "list files in package" msgstr "lister les fichiers du paquetage" -#: lib/poptQV.c:271 +#: lib/poptQV.c:270 #, c-format msgid "skip %%ghost files" msgstr "éviter les fichiers fantômes %%ghost" -#: lib/poptQV.c:275 +#: lib/poptQV.c:274 #, c-format msgid "skip %%license files" msgstr "éviter les fichiers %%license" -#: lib/poptQV.c:278 +#: lib/poptQV.c:277 #, c-format msgid "skip %%readme files" msgstr "éviter les fichier %%readme" -#: lib/poptQV.c:284 +#: lib/poptQV.c:283 msgid "use the following query format" msgstr "utiliser le format de requête suivant" -#: lib/poptQV.c:286 +#: lib/poptQV.c:285 msgid "substitute i18n sections into spec file" msgstr "substituer les section i18n dans le fichier spec" -#: lib/poptQV.c:288 +#: lib/poptQV.c:287 msgid "display the states of the listed files" msgstr "affiche la liste des fichiers et leur état" -#: lib/poptQV.c:314 +#: lib/poptQV.c:313 msgid "don't verify size of files" msgstr "ne pas vérifier la taille des fichiers" -#: lib/poptQV.c:317 +#: lib/poptQV.c:316 msgid "don't verify symlink path of files" msgstr "ne pas vérifier le chemin du lien symbolique des fichiers" -#: lib/poptQV.c:320 +#: lib/poptQV.c:319 msgid "don't verify owner of files" msgstr "ne pas vérifier le possesseur des fichiers" -#: lib/poptQV.c:323 +#: lib/poptQV.c:322 msgid "don't verify group of files" msgstr "ne pas vérifier le groupe possesseur des fichiers" -#: lib/poptQV.c:326 +#: lib/poptQV.c:325 msgid "don't verify modification time of files" msgstr "ne pas vérifier les dates de modification des fichiers" -#: lib/poptQV.c:329 lib/poptQV.c:332 +#: lib/poptQV.c:328 lib/poptQV.c:331 msgid "don't verify mode of files" msgstr "ne pas vérifier les permissions des fichiers" -#: lib/poptQV.c:335 +#: lib/poptQV.c:334 #, fuzzy msgid "don't verify file security contexts" msgstr "ne pas vérifier les fichiers du paquetage" -#: lib/poptQV.c:337 +#: lib/poptQV.c:336 msgid "don't verify files in package" msgstr "ne pas vérifier les fichiers du paquetage" -#: lib/poptQV.c:340 lib/poptQV.c:343 tools/rpmgraph.c:266 +#: lib/poptQV.c:339 lib/poptQV.c:342 tools/rpmgraph.c:266 msgid "don't verify package dependencies" msgstr "ne pas vérifier les dépendances du paquetage" -#: lib/poptQV.c:348 lib/poptQV.c:352 lib/poptQV.c:355 lib/poptQV.c:358 +#: lib/poptQV.c:347 lib/poptQV.c:351 lib/poptQV.c:354 lib/poptQV.c:357 msgid "don't execute verify script(s)" msgstr "ne pas exécuter le(s) script(s) de vérification" -#: lib/poptQV.c:382 +#: lib/poptQV.c:381 msgid "don't verify GPG V3 DSA signature(s)" msgstr "ne pas vérifier la(les) signature(s) GPG V3 DSA" -#: lib/poptQV.c:385 +#: lib/poptQV.c:384 msgid "don't verify PGP V3 RSA/MD5 signature(s)" msgstr "ne pas vérifier la(les) signature(s) PGP V3 RSA/MD5" -#: lib/poptQV.c:400 +#: lib/poptQV.c:399 msgid "sign package(s) (identical to --resign)" msgstr "signer le(s) paquetage(s) (identique à --resign)" -#: lib/poptQV.c:402 +#: lib/poptQV.c:401 msgid "verify package signature(s)" msgstr "vérifier la(les) signature(s) du paquetage" -#: lib/poptQV.c:404 +#: lib/poptQV.c:403 #, fuzzy msgid "delete package signatures" msgstr "vérifier la(les) signature(s) du paquetage" -#: lib/poptQV.c:406 +#: lib/poptQV.c:405 msgid "import an armored public key" msgstr "importer une clé publique blindé" -#: lib/poptQV.c:408 +#: lib/poptQV.c:407 msgid "sign package(s) (identical to --addsign)" msgstr "signer le(s) paquetage(s) (identique à --addsign)" -#: lib/poptQV.c:410 +#: lib/poptQV.c:409 msgid "generate signature" msgstr "génération de signature" @@ -2786,38 +2786,38 @@ msgstr "le paquetage %s a un(e) %s non-satisfaites: %s\n" msgid "%s skipped due to missingok flag\n" msgstr "%s ignoré à cause du drapeau missingok\n" -#: lib/rpmfi.c:846 +#: lib/rpmfi.c:850 msgid "========== relocations\n" msgstr "========== relogements\n" -#: lib/rpmfi.c:850 +#: lib/rpmfi.c:854 #, c-format msgid "%5d exclude %s\n" msgstr "%5d exclus %s\n" -#: lib/rpmfi.c:853 +#: lib/rpmfi.c:857 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "%5d reloge %s -> %s\n" -#: lib/rpmfi.c:987 +#: lib/rpmfi.c:991 #, c-format msgid "excluding %s %s\n" msgstr "exclusion de %s %s\n" -#: lib/rpmfi.c:997 +#: lib/rpmfi.c:1001 #, c-format msgid "relocating %s to %s\n" msgstr "relogement de %s vers %s\n" -#: lib/rpmfi.c:1089 +#: lib/rpmfi.c:1093 #, c-format msgid "relocating directory %s to %s\n" msgstr "relogement du répertoire %s vers %s\n" #: lib/rpmgi.c:81 lib/rpminstall.c:124 lib/rpminstall.c:480 -#: lib/rpminstall.c:615 lib/rpminstall.c:1041 lib/rpmts.c:643 -#: tools/rpmgraph.c:121 tools/rpmgraph.c:158 +#: lib/rpminstall.c:615 lib/rpmts.c:643 tools/rpmgraph.c:121 +#: tools/rpmgraph.c:158 #, c-format msgid "open of %s failed: %s\n" msgstr "échec de l'ouverture de %s: %s\n" @@ -2828,7 +2828,7 @@ msgid "unknown tag: \"%s\"\n" msgstr "tag inconnu: \"%s\"\n" #: lib/rpmgi.c:628 lib/rpminstall.c:659 lib/rpminstall.c:834 -#: lib/rpminstall.c:1267 lib/transaction.c:1031 tools/rpmgraph.c:196 +#: lib/rpminstall.c:1084 lib/transaction.c:1026 tools/rpmgraph.c:196 msgid "Failed dependencies:\n" msgstr "Dépendances requises:\n" @@ -2944,17 +2944,17 @@ msgstr "impossible d'ouvrir %s: %s\n" msgid "Installing %s\n" msgstr "Installation de %s\n" -#: lib/rpminstall.c:1261 lib/transaction.c:1024 +#: lib/rpminstall.c:1078 lib/transaction.c:1019 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" "Roulement arrière des paquetages (+%d/-%d) jusqu'à %-24.24s (0x%08x):\n" -#: lib/rpminstall.c:1292 lib/transaction.c:1075 +#: lib/rpminstall.c:1109 lib/transaction.c:1070 msgid "Cleaning up repackaged packages:\n" msgstr "" -#: lib/rpminstall.c:1299 lib/transaction.c:1081 +#: lib/rpminstall.c:1116 lib/transaction.c:1076 #, fuzzy, c-format msgid "\tRemoving %s:\n" msgstr "Récupération de %s\n" @@ -3105,97 +3105,97 @@ msgstr "%s entre en conflit avec %s%s" msgid "unknown error %d encountered while manipulating package %s" msgstr "erreur %d inconnue rencontrée en manipulant le paquetage %s" -#: lib/rpmrc.c:199 +#: lib/rpmrc.c:213 #, c-format msgid "missing second ':' at %s:%d\n" msgstr "il manque un second ':' à %s:%d\n" -#: lib/rpmrc.c:202 +#: lib/rpmrc.c:216 #, c-format msgid "missing architecture name at %s:%d\n" msgstr "architecture manquante à %s:%d\n" -#: lib/rpmrc.c:356 +#: lib/rpmrc.c:370 #, c-format msgid "Incomplete data line at %s:%d\n" msgstr "Ligne de données incomplète à %s:%d\n" -#: lib/rpmrc.c:361 +#: lib/rpmrc.c:375 #, c-format msgid "Too many args in data line at %s:%d\n" msgstr "Trop d'arguments dans la ligne de données à %s:%d\n" -#: lib/rpmrc.c:369 +#: lib/rpmrc.c:383 #, c-format msgid "Bad arch/os number: %s (%s:%d)\n" msgstr "Mauvais numéro d'arch/OS: %s (%s:%d)\n" -#: lib/rpmrc.c:406 +#: lib/rpmrc.c:420 #, c-format msgid "Incomplete default line at %s:%d\n" msgstr "valeur par défaut imcomplète à la ligne %s:%d\n" -#: lib/rpmrc.c:411 +#: lib/rpmrc.c:425 #, c-format msgid "Too many args in default line at %s:%d\n" msgstr "Trop d'arguments pour la valeur par défaut de la ligne %s:%d\n" -#: lib/rpmrc.c:577 +#: lib/rpmrc.c:591 #, c-format msgid "Failed to read %s: %s.\n" msgstr "Impossible de lire %s: %s.\n" -#: lib/rpmrc.c:615 +#: lib/rpmrc.c:629 #, c-format msgid "missing ':' (found 0x%02x) at %s:%d\n" msgstr "':' manquant (trouvé 0x%02x) à %s:%d\n" -#: lib/rpmrc.c:632 lib/rpmrc.c:706 +#: lib/rpmrc.c:646 lib/rpmrc.c:710 #, c-format msgid "missing argument for %s at %s:%d\n" msgstr "argument manquant pour %s à %s:%d\n" -#: lib/rpmrc.c:649 lib/rpmrc.c:671 +#: lib/rpmrc.c:663 #, c-format msgid "%s expansion failed at %s:%d \"%s\"\n" msgstr "échec de l'expansion de %s à %s:%d \"%s\"\n" -#: lib/rpmrc.c:658 +#: lib/rpmrc.c:672 #, c-format msgid "cannot open %s at %s:%d: %s\n" msgstr "Impossible d'ouvrir %s à %s:%d: %s\n" -#: lib/rpmrc.c:698 +#: lib/rpmrc.c:702 #, c-format msgid "missing architecture for %s at %s:%d\n" msgstr "architecture manquante pour %s à %s:%d\n" -#: lib/rpmrc.c:765 +#: lib/rpmrc.c:769 #, c-format msgid "bad option '%s' at %s:%d\n" msgstr "mauvaise option '%s' à %s:%d\n" -#: lib/rpmrc.c:1564 +#: lib/rpmrc.c:1568 #, c-format msgid "Unknown system: %s\n" msgstr "système inconnu: %s\n" -#: lib/rpmrc.c:1565 +#: lib/rpmrc.c:1569 #, c-format msgid "Please contact %s\n" msgstr "Contactez %s\n" -#: lib/rpmrc.c:1802 +#: lib/rpmrc.c:1806 #, c-format msgid "Cannot expand %s\n" msgstr "Impossible d'expanser %s\n" -#: lib/rpmrc.c:1807 +#: lib/rpmrc.c:1811 #, c-format msgid "Cannot read %s, HOME is too large.\n" msgstr "Impossible de lire %s, HOME trop gros.\n" -#: lib/rpmrc.c:1824 +#: lib/rpmrc.c:1828 #, c-format msgid "Unable to open %s for reading: %s.\n" msgstr "Impossible d'ouvrir %s en lecture: %s.\n" @@ -3489,160 +3489,160 @@ msgstr "Somme MD5 erronée: NONSUPPORTE\n" msgid "Signature: UNKNOWN (%d)\n" msgstr "Signature: INCONNUE (%d)\n" -#: lib/transaction.c:935 +#: lib/transaction.c:930 #, c-format msgid "excluding directory %s\n" msgstr "répertoire %s exclus\n" -#: lib/transaction.c:1022 +#: lib/transaction.c:1017 msgid "Transaction failed...rolling back\n" msgstr "" -#: lib/transaction.c:1042 +#: lib/transaction.c:1037 msgid "Could not order auto-rollback transaction!\n" msgstr "" -#: lib/transaction.c:1132 +#: lib/transaction.c:1127 msgid "Getting repackaged header from transaction element\n" msgstr "" -#: lib/transaction.c:1157 +#: lib/transaction.c:1152 #, c-format msgid "\tLooking for %s...\n" msgstr "" -#: lib/transaction.c:1161 +#: lib/transaction.c:1156 msgid "\tMatches found.\n" msgstr "" -#: lib/transaction.c:1165 +#: lib/transaction.c:1160 msgid "\tNo matches found.\n" msgstr "" -#: lib/transaction.c:1178 +#: lib/transaction.c:1173 #, fuzzy msgid "\tRepackaged package not found!.\n" msgstr "paquetage source attendu, paquetage binaire trouvé\n" -#: lib/transaction.c:1199 +#: lib/transaction.c:1194 msgid "\tREMOVETID matched INSTALLTID.\n" msgstr "" -#: lib/transaction.c:1201 +#: lib/transaction.c:1196 #, c-format msgid "\t\tName: %s.\n" msgstr "" -#: lib/transaction.c:1224 +#: lib/transaction.c:1219 #, fuzzy, c-format msgid "\tRepackaged Package was %s...\n" msgstr "aucun paquetage ne correspond à %s: %s\n" -#: lib/transaction.c:1268 +#: lib/transaction.c:1263 msgid "Adding install element to auto-rollback transaction.\n" msgstr "" -#: lib/transaction.c:1277 +#: lib/transaction.c:1272 msgid "Could not get install element database instance!\n" msgstr "" -#: lib/transaction.c:1290 +#: lib/transaction.c:1285 msgid "Could not get header for auto-rollback transaction!\n" msgstr "" -#: lib/transaction.c:1300 +#: lib/transaction.c:1295 #, fuzzy, c-format msgid "\tAdded repackaged package header: %s.\n" msgstr "<paquetage source>" -#: lib/transaction.c:1302 lib/transaction.c:1313 +#: lib/transaction.c:1297 lib/transaction.c:1308 #, c-format msgid "\tAdded from install element %s.\n" msgstr "" -#: lib/transaction.c:1311 +#: lib/transaction.c:1306 msgid "\tAdded erase element.\n" msgstr "" -#: lib/transaction.c:1320 +#: lib/transaction.c:1315 msgid "Could not get repackaged header for auto-rollback transaction!\n" msgstr "" -#: lib/transaction.c:1327 +#: lib/transaction.c:1322 msgid "Add erase element to auto-rollback transaction.\n" msgstr "" -#: lib/transaction.c:1335 +#: lib/transaction.c:1330 msgid "\tFound existing upgrade element.\n" msgstr "" -#: lib/transaction.c:1336 +#: lib/transaction.c:1331 #, c-format msgid "\tNot adding erase element for %s.\n" msgstr "" -#: lib/transaction.c:1353 +#: lib/transaction.c:1348 #, fuzzy, c-format msgid "\tAdded repackaged package %s.\n" msgstr "<paquetage source>" -#: lib/transaction.c:1355 +#: lib/transaction.c:1350 #, c-format msgid "\tAdded from erase element %s.\n" msgstr "" -#: lib/transaction.c:1360 +#: lib/transaction.c:1355 msgid "Could not add erase element to auto-rollback transaction.\n" msgstr "" -#: lib/transaction.c:1366 +#: lib/transaction.c:1361 msgid "\tNo repackaged package...nothing to do.\n" msgstr "" -#: lib/transaction.c:1372 +#: lib/transaction.c:1367 #, fuzzy msgid "Failure reading repackaged package!\n" msgstr "erreur dans la lecteur de l'entête du paquetage\n" -#: lib/transaction.c:1495 +#: lib/transaction.c:1490 #, c-format msgid "sanity checking %d elements\n" msgstr "vérification de santé de %d éléments\n" -#: lib/transaction.c:1581 +#: lib/transaction.c:1576 msgid "running pre-transaction scripts\n" msgstr "" -#: lib/transaction.c:1655 +#: lib/transaction.c:1650 #, c-format msgid "computing %d file fingerprints\n" msgstr "calcul de %d empreintes de fichier\n" -#: lib/transaction.c:1739 +#: lib/transaction.c:1734 msgid "computing file dispositions\n" msgstr "calcul de la disposition des fichiers\n" -#: lib/transaction.c:1932 +#: lib/transaction.c:1927 msgid "Creating auto-rollback transaction\n" msgstr "" -#: lib/transaction.c:2086 +#: lib/transaction.c:2077 msgid "Add failed. Could not read package header.\n" msgstr "" -#: lib/transaction.c:2170 +#: lib/transaction.c:2161 msgid "Add failed in rpmpsmStage().\n" msgstr "" -#: lib/transaction.c:2214 +#: lib/transaction.c:2205 msgid "Add failed. Could not get file list.\n" msgstr "" -#: lib/transaction.c:2263 +#: lib/transaction.c:2254 msgid "Erase failed failed in rpmpsmStage().\n" msgstr "" -#: lib/transaction.c:2324 +#: lib/transaction.c:2315 msgid "running post-transaction scripts\n" msgstr "" @@ -4041,86 +4041,86 @@ msgstr "ouverture index db %s/%s %s mode=0x%x\n" msgid "======================== active %d empty %d\n" msgstr "======================== %d actif(s) %d vide(s)\n" -#: rpmio/macro.c:394 +#: rpmio/macro.c:396 #, c-format msgid "%3d>%*s(empty)" msgstr "%3d>%*s(vide)" -#: rpmio/macro.c:437 +#: rpmio/macro.c:439 #, c-format msgid "%3d<%*s(empty)\n" msgstr "%3d<%*s(vide)\n" -#: rpmio/macro.c:664 rpmio/macro.c:705 +#: rpmio/macro.c:608 rpmio/macro.c:1090 rpmio/macro.c:1123 rpmio/macro.c:1863 +msgid "Target buffer overflow\n" +msgstr "Tampon cible en surcharge\n" + +#: rpmio/macro.c:671 rpmio/macro.c:712 #, c-format msgid "Macro %%%s has unterminated body\n" msgstr "La macro %%%s a un corps sans fin\n" -#: rpmio/macro.c:727 +#: rpmio/macro.c:734 #, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "La macro %%%s a un nom illégal (%%define)\n" -#: rpmio/macro.c:733 +#: rpmio/macro.c:740 #, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "La macro %%%s a des options non-terminées\n" -#: rpmio/macro.c:738 +#: rpmio/macro.c:745 #, c-format msgid "Macro %%%s has empty body\n" msgstr "La macro %%%s a un corps vide\n" -#: rpmio/macro.c:744 +#: rpmio/macro.c:751 #, c-format msgid "Macro %%%s failed to expand\n" msgstr "La macro %%%s ne peut être expansée\n" -#: rpmio/macro.c:779 +#: rpmio/macro.c:786 #, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "La macro %%%s a un nom illégal (%%undefine)\n" -#: rpmio/macro.c:897 +#: rpmio/macro.c:904 #, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "La macro %%%s (%s) n'est plus utilisée en dessous du niveau %d\n" -#: rpmio/macro.c:1024 +#: rpmio/macro.c:1031 #, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "Option inconnue %c dans %s(%s)\n" -#: rpmio/macro.c:1224 +#: rpmio/macro.c:1239 #, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "Profondeur de récursion(%d) plus grande que le max(%d)\n" -#: rpmio/macro.c:1297 rpmio/macro.c:1314 +#: rpmio/macro.c:1312 rpmio/macro.c:1329 #, c-format msgid "Unterminated %c: %s\n" msgstr "%c non terminé: %s\n" -#: rpmio/macro.c:1355 +#: rpmio/macro.c:1370 #, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "Un %% est suivi d'une macro in-analysable\n" -#: rpmio/macro.c:1512 +#: rpmio/macro.c:1527 #, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "Macro %%%.*s non trouvé, ignoré\n" -#: rpmio/macro.c:1848 -msgid "Target buffer overflow\n" -msgstr "Tampon cible en surcharge\n" - -#: rpmio/macro.c:2056 rpmio/macro.c:2062 +#: rpmio/macro.c:2076 rpmio/macro.c:2082 #, c-format msgid "File %s: %s\n" msgstr "Fichier %s: %s\n" -#: rpmio/macro.c:2065 +#: rpmio/macro.c:2085 #, c-format msgid "File %s is smaller than %u bytes\n" msgstr "Le fichier %s est plus petit que %u octets\n" @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n" -"POT-Creation-Date: 2007-08-21 08:04+0200\n" +"POT-Creation-Date: 2007-08-30 18:37+0200\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" @@ -1253,20 +1253,20 @@ msgstr "ekki skoða pakkaskilyrðin" msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "" -#: build/poptBT.c:229 lib/poptALL.c:273 lib/poptI.c:282 lib/poptQV.c:363 -#: lib/poptQV.c:372 lib/poptQV.c:413 +#: build/poptBT.c:229 lib/poptALL.c:273 lib/poptI.c:282 lib/poptQV.c:362 +#: lib/poptQV.c:371 lib/poptQV.c:412 #, fuzzy msgid "don't verify package digest(s)" msgstr "ekki skoða pakkaskilyrðin" -#: build/poptBT.c:231 lib/poptALL.c:275 lib/poptI.c:284 lib/poptQV.c:366 -#: lib/poptQV.c:374 lib/poptQV.c:416 +#: build/poptBT.c:231 lib/poptALL.c:275 lib/poptI.c:284 lib/poptQV.c:365 +#: lib/poptQV.c:373 lib/poptQV.c:415 #, fuzzy msgid "don't verify database header(s) when retrieved" msgstr "ekki skoða pakkaskilyrðin" -#: build/poptBT.c:233 lib/poptALL.c:281 lib/poptI.c:286 lib/poptQV.c:369 -#: lib/poptQV.c:376 lib/poptQV.c:418 +#: build/poptBT.c:233 lib/poptALL.c:281 lib/poptI.c:286 lib/poptQV.c:368 +#: lib/poptQV.c:375 lib/poptQV.c:417 #, fuzzy msgid "don't verify package signature(s)" msgstr "ekki skoða pakkaskilyrðin" @@ -1329,27 +1329,27 @@ msgstr "%s brást\n" msgid "failed to write all data to %s\n" msgstr "gat ekki ritað öll gögn í %s\n" -#: build/rpmfc.c:1250 +#: build/rpmfc.c:1249 #, fuzzy, c-format msgid "magic_open(0x%x) failed: %s\n" msgstr "%s brást\n" -#: build/rpmfc.c:1258 +#: build/rpmfc.c:1257 #, fuzzy, c-format -msgid "magic_load(ms, \"%s\") failed: %s\n" +msgid "magic_load failed: %s\n" msgstr "%s rmdir %s brást: %s\n" -#: build/rpmfc.c:1303 +#: build/rpmfc.c:1301 #, fuzzy, c-format msgid "magic_file(ms, \"%s\") failed: mode %06o %s\n" msgstr "%s rmdir %s brást: %s\n" -#: build/rpmfc.c:1524 +#: build/rpmfc.c:1522 #, fuzzy, c-format msgid "Finding %s: %s\n" msgstr "Skrá %s: %s\n" -#: build/rpmfc.c:1530 build/rpmfc.c:1539 +#: build/rpmfc.c:1528 build/rpmfc.c:1537 #, c-format msgid "Failed to find %s:\n" msgstr "gat ekki fundið %s:\n" @@ -1470,30 +1470,30 @@ msgstr "" msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" -#: lib/depends.c:1265 +#: lib/depends.c:1271 msgid "========== recording tsort relations\n" msgstr "" -#: lib/depends.c:1357 +#: lib/depends.c:1363 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, depth, " "breadth)\n" msgstr "" -#: lib/depends.c:1453 +#: lib/depends.c:1459 #, c-format msgid "========== successors only (%d bytes)\n" msgstr "" -#: lib/depends.c:1526 +#: lib/depends.c:1532 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1561 +#: lib/depends.c:1567 msgid "========== continuing tsort ...\n" msgstr "" -#: lib/depends.c:1566 +#: lib/depends.c:1572 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2032,7 +2032,7 @@ msgstr "" msgid "do not verify package dependencies" msgstr "" -#: lib/poptI.c:252 lib/poptQV.c:307 lib/poptQV.c:310 +#: lib/poptI.c:252 lib/poptQV.c:306 lib/poptQV.c:309 msgid "don't verify MD5 digest of files" msgstr "ekki yfirfara MD5 undirritun skráa" @@ -2147,227 +2147,227 @@ msgstr "" msgid "upgrade package(s)" msgstr "uppfæra pakka" -#: lib/poptQV.c:103 +#: lib/poptQV.c:102 msgid "query/verify all packages" msgstr "" -#: lib/poptQV.c:105 +#: lib/poptQV.c:104 msgid "rpm checksig mode" msgstr "" -#: lib/poptQV.c:107 +#: lib/poptQV.c:106 msgid "query/verify package(s) owning file" msgstr "fyrirspurn/yfirferð á pakkann sam á skrá" -#: lib/poptQV.c:109 +#: lib/poptQV.c:108 msgid "query/verify package(s) in group" msgstr "" -#: lib/poptQV.c:111 +#: lib/poptQV.c:110 #, fuzzy msgid "query/verify a package file" msgstr "fyrirspurn/yfirferð á pakkann sam á skrá" -#: lib/poptQV.c:114 +#: lib/poptQV.c:113 #, fuzzy msgid "query/verify package(s) from TOP file tree walk" msgstr "fyrirspurn/yfirferð á pakkann sam á skrá" -#: lib/poptQV.c:116 +#: lib/poptQV.c:115 #, fuzzy msgid "query/verify package(s) from system HDLIST" msgstr "fyrirspurn/yfirferð á pakkann sam á skrá" -#: lib/poptQV.c:119 +#: lib/poptQV.c:118 #, fuzzy msgid "query/verify package(s) with package identifier" msgstr "fyrirspurn/yfirferð á pakkann sam á skrá" -#: lib/poptQV.c:121 +#: lib/poptQV.c:120 #, fuzzy msgid "query/verify package(s) with header identifier" msgstr "fyrirspurn/yfirferð á pakkann sam á skrá" -#: lib/poptQV.c:123 +#: lib/poptQV.c:122 #, fuzzy msgid "query/verify package(s) with file identifier" msgstr "fyrirspurn/yfirferð á pakkann sam á skrá" -#: lib/poptQV.c:126 +#: lib/poptQV.c:125 msgid "rpm query mode" msgstr "" -#: lib/poptQV.c:128 +#: lib/poptQV.c:127 #, fuzzy msgid "query/verify a header instance" msgstr "fyrirspurn/yfirferð á pakkann sam á skrá" -#: lib/poptQV.c:130 +#: lib/poptQV.c:129 msgid "query a spec file" msgstr "" -#: lib/poptQV.c:130 +#: lib/poptQV.c:129 msgid "<spec>" msgstr "" -#: lib/poptQV.c:132 +#: lib/poptQV.c:131 #, fuzzy msgid "query/verify package(s) from install transaction" msgstr "fyrirspurn/yfirferð á pakkann sam á skrá" -#: lib/poptQV.c:134 +#: lib/poptQV.c:133 msgid "query the package(s) triggered by the package" msgstr "" -#: lib/poptQV.c:136 +#: lib/poptQV.c:135 msgid "rpm verify mode" msgstr "" -#: lib/poptQV.c:138 +#: lib/poptQV.c:137 msgid "query/verify the package(s) which require a dependency" msgstr "fyrirspurn/yfirferð á pakkana sem hafa pakkaþarfir" -#: lib/poptQV.c:140 +#: lib/poptQV.c:139 msgid "query/verify the package(s) which provide a dependency" msgstr "fyrirspurn/yfirferð á pakkana sem uppfylla þarfir annara pakka" -#: lib/poptQV.c:143 +#: lib/poptQV.c:142 msgid "create transaction set" msgstr "" -#: lib/poptQV.c:145 +#: lib/poptQV.c:144 msgid "do not order transaction set" msgstr "" -#: lib/poptQV.c:147 +#: lib/poptQV.c:146 msgid "do not glob arguments" msgstr "" -#: lib/poptQV.c:149 +#: lib/poptQV.c:148 msgid "do not process non-package files as manifests" msgstr "" -#: lib/poptQV.c:151 +#: lib/poptQV.c:150 msgid "do not read headers" msgstr "" -#: lib/poptQV.c:258 +#: lib/poptQV.c:257 msgid "list all configuration files" msgstr "" -#: lib/poptQV.c:260 +#: lib/poptQV.c:259 msgid "list all documentation files" msgstr "" -#: lib/poptQV.c:262 +#: lib/poptQV.c:261 msgid "dump basic file information" msgstr "" -#: lib/poptQV.c:266 +#: lib/poptQV.c:265 msgid "list files in package" msgstr "" -#: lib/poptQV.c:271 +#: lib/poptQV.c:270 #, c-format msgid "skip %%ghost files" msgstr "" -#: lib/poptQV.c:275 +#: lib/poptQV.c:274 #, c-format msgid "skip %%license files" msgstr "" -#: lib/poptQV.c:278 +#: lib/poptQV.c:277 #, c-format msgid "skip %%readme files" msgstr "" -#: lib/poptQV.c:284 +#: lib/poptQV.c:283 msgid "use the following query format" msgstr "" -#: lib/poptQV.c:286 +#: lib/poptQV.c:285 msgid "substitute i18n sections into spec file" msgstr "" -#: lib/poptQV.c:288 +#: lib/poptQV.c:287 msgid "display the states of the listed files" msgstr "" -#: lib/poptQV.c:314 +#: lib/poptQV.c:313 msgid "don't verify size of files" msgstr "ekki yfirfara stærð skráa" -#: lib/poptQV.c:317 +#: lib/poptQV.c:316 msgid "don't verify symlink path of files" msgstr "ekki yfirfara symlink slóð skráa" -#: lib/poptQV.c:320 +#: lib/poptQV.c:319 msgid "don't verify owner of files" msgstr "ekki yfirfara eiganda skráa" -#: lib/poptQV.c:323 +#: lib/poptQV.c:322 msgid "don't verify group of files" msgstr "ekki yfirfara hop skráa" -#: lib/poptQV.c:326 +#: lib/poptQV.c:325 msgid "don't verify modification time of files" msgstr "" -#: lib/poptQV.c:329 lib/poptQV.c:332 +#: lib/poptQV.c:328 lib/poptQV.c:331 msgid "don't verify mode of files" msgstr "ekki yfirfara heimildir skráa" -#: lib/poptQV.c:335 +#: lib/poptQV.c:334 #, fuzzy msgid "don't verify file security contexts" msgstr "ekki yfirfara skrárnar í pakkanum" -#: lib/poptQV.c:337 +#: lib/poptQV.c:336 msgid "don't verify files in package" msgstr "ekki yfirfara skrárnar í pakkanum" -#: lib/poptQV.c:340 lib/poptQV.c:343 tools/rpmgraph.c:266 +#: lib/poptQV.c:339 lib/poptQV.c:342 tools/rpmgraph.c:266 msgid "don't verify package dependencies" msgstr "ekki skoða pakkaskilyrðin" -#: lib/poptQV.c:348 lib/poptQV.c:352 lib/poptQV.c:355 lib/poptQV.c:358 +#: lib/poptQV.c:347 lib/poptQV.c:351 lib/poptQV.c:354 lib/poptQV.c:357 msgid "don't execute verify script(s)" msgstr "" -#: lib/poptQV.c:382 +#: lib/poptQV.c:381 #, fuzzy msgid "don't verify GPG V3 DSA signature(s)" msgstr "ekki yfirfara SHA1 undirritunina" -#: lib/poptQV.c:385 +#: lib/poptQV.c:384 #, fuzzy msgid "don't verify PGP V3 RSA/MD5 signature(s)" msgstr "ekki yfirfara MD5 undirritun skráa" -#: lib/poptQV.c:400 +#: lib/poptQV.c:399 msgid "sign package(s) (identical to --resign)" msgstr "" -#: lib/poptQV.c:402 +#: lib/poptQV.c:401 #, fuzzy msgid "verify package signature(s)" msgstr "búa til undirskrift" -#: lib/poptQV.c:404 +#: lib/poptQV.c:403 #, fuzzy msgid "delete package signatures" msgstr "búa til undirskrift" -#: lib/poptQV.c:406 +#: lib/poptQV.c:405 msgid "import an armored public key" msgstr "" -#: lib/poptQV.c:408 +#: lib/poptQV.c:407 msgid "sign package(s) (identical to --addsign)" msgstr "" -#: lib/poptQV.c:410 +#: lib/poptQV.c:409 msgid "generate signature" msgstr "búa til undirskrift" @@ -2705,38 +2705,38 @@ msgstr "get ekki opnað pakka gagnagrunn í\n" msgid "%s skipped due to missingok flag\n" msgstr "" -#: lib/rpmfi.c:846 +#: lib/rpmfi.c:850 msgid "========== relocations\n" msgstr "" -#: lib/rpmfi.c:850 +#: lib/rpmfi.c:854 #, fuzzy, c-format msgid "%5d exclude %s\n" msgstr "%5d færa %s -> %s\n" -#: lib/rpmfi.c:853 +#: lib/rpmfi.c:857 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "%5d færa %s -> %s\n" -#: lib/rpmfi.c:987 +#: lib/rpmfi.c:991 #, fuzzy, c-format msgid "excluding %s %s\n" msgstr "lína %d: %s\n" -#: lib/rpmfi.c:997 +#: lib/rpmfi.c:1001 #, fuzzy, c-format msgid "relocating %s to %s\n" msgstr "%5d færa %s -> %s\n" -#: lib/rpmfi.c:1089 +#: lib/rpmfi.c:1093 #, fuzzy, c-format msgid "relocating directory %s to %s\n" msgstr "%5d færa %s -> %s\n" #: lib/rpmgi.c:81 lib/rpminstall.c:124 lib/rpminstall.c:480 -#: lib/rpminstall.c:615 lib/rpminstall.c:1041 lib/rpmts.c:643 -#: tools/rpmgraph.c:121 tools/rpmgraph.c:158 +#: lib/rpminstall.c:615 lib/rpmts.c:643 tools/rpmgraph.c:121 +#: tools/rpmgraph.c:158 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2747,7 +2747,7 @@ msgid "unknown tag: \"%s\"\n" msgstr "Óþekkt tegund táknmyndar: %s\n" #: lib/rpmgi.c:628 lib/rpminstall.c:659 lib/rpminstall.c:834 -#: lib/rpminstall.c:1267 lib/transaction.c:1031 tools/rpmgraph.c:196 +#: lib/rpminstall.c:1084 lib/transaction.c:1026 tools/rpmgraph.c:196 #, fuzzy msgid "Failed dependencies:\n" msgstr "gat ekki útbúið pakkaskilyrði:\n" @@ -2865,16 +2865,16 @@ msgstr "" msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1261 lib/transaction.c:1024 +#: lib/rpminstall.c:1078 lib/transaction.c:1019 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" -#: lib/rpminstall.c:1292 lib/transaction.c:1075 +#: lib/rpminstall.c:1109 lib/transaction.c:1070 msgid "Cleaning up repackaged packages:\n" msgstr "" -#: lib/rpminstall.c:1299 lib/transaction.c:1081 +#: lib/rpminstall.c:1116 lib/transaction.c:1076 #, c-format msgid "\tRemoving %s:\n" msgstr "" @@ -3007,97 +3007,97 @@ msgstr "" msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/rpmrc.c:199 +#: lib/rpmrc.c:213 #, c-format msgid "missing second ':' at %s:%d\n" msgstr "vantar seinni ':' á %s:%d\n" -#: lib/rpmrc.c:202 +#: lib/rpmrc.c:216 #, c-format msgid "missing architecture name at %s:%d\n" msgstr "" -#: lib/rpmrc.c:356 +#: lib/rpmrc.c:370 #, c-format msgid "Incomplete data line at %s:%d\n" msgstr "" -#: lib/rpmrc.c:361 +#: lib/rpmrc.c:375 #, c-format msgid "Too many args in data line at %s:%d\n" msgstr "" -#: lib/rpmrc.c:369 +#: lib/rpmrc.c:383 #, c-format msgid "Bad arch/os number: %s (%s:%d)\n" msgstr "" -#: lib/rpmrc.c:406 +#: lib/rpmrc.c:420 #, c-format msgid "Incomplete default line at %s:%d\n" msgstr "" -#: lib/rpmrc.c:411 +#: lib/rpmrc.c:425 #, c-format msgid "Too many args in default line at %s:%d\n" msgstr "" -#: lib/rpmrc.c:577 +#: lib/rpmrc.c:591 #, c-format msgid "Failed to read %s: %s.\n" msgstr "Get ekki lesið %s: %s.\n" -#: lib/rpmrc.c:615 +#: lib/rpmrc.c:629 #, c-format msgid "missing ':' (found 0x%02x) at %s:%d\n" msgstr "" -#: lib/rpmrc.c:632 lib/rpmrc.c:706 +#: lib/rpmrc.c:646 lib/rpmrc.c:710 #, c-format msgid "missing argument for %s at %s:%d\n" msgstr "viðfang vantar fyrir %s á %s:%d\n" -#: lib/rpmrc.c:649 lib/rpmrc.c:671 +#: lib/rpmrc.c:663 #, c-format msgid "%s expansion failed at %s:%d \"%s\"\n" msgstr "" -#: lib/rpmrc.c:658 +#: lib/rpmrc.c:672 #, c-format msgid "cannot open %s at %s:%d: %s\n" msgstr "get ekki opnað %s á %s:%d: %s\n" -#: lib/rpmrc.c:698 +#: lib/rpmrc.c:702 #, c-format msgid "missing architecture for %s at %s:%d\n" msgstr "" -#: lib/rpmrc.c:765 +#: lib/rpmrc.c:769 #, c-format msgid "bad option '%s' at %s:%d\n" msgstr "ólöglegur rofi '%s' á %s:%d\n" -#: lib/rpmrc.c:1564 +#: lib/rpmrc.c:1568 #, c-format msgid "Unknown system: %s\n" msgstr "" -#: lib/rpmrc.c:1565 +#: lib/rpmrc.c:1569 #, c-format msgid "Please contact %s\n" msgstr "" -#: lib/rpmrc.c:1802 +#: lib/rpmrc.c:1806 #, c-format msgid "Cannot expand %s\n" msgstr "" -#: lib/rpmrc.c:1807 +#: lib/rpmrc.c:1811 #, c-format msgid "Cannot read %s, HOME is too large.\n" msgstr "" -#: lib/rpmrc.c:1824 +#: lib/rpmrc.c:1828 #, c-format msgid "Unable to open %s for reading: %s.\n" msgstr "Get ekki opnað %s til lesturs: %s.\n" @@ -3387,158 +3387,158 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:935 +#: lib/transaction.c:930 #, c-format msgid "excluding directory %s\n" msgstr "" -#: lib/transaction.c:1022 +#: lib/transaction.c:1017 msgid "Transaction failed...rolling back\n" msgstr "" -#: lib/transaction.c:1042 +#: lib/transaction.c:1037 msgid "Could not order auto-rollback transaction!\n" msgstr "" -#: lib/transaction.c:1132 +#: lib/transaction.c:1127 msgid "Getting repackaged header from transaction element\n" msgstr "" -#: lib/transaction.c:1157 +#: lib/transaction.c:1152 #, c-format msgid "\tLooking for %s...\n" msgstr "" -#: lib/transaction.c:1161 +#: lib/transaction.c:1156 msgid "\tMatches found.\n" msgstr "" -#: lib/transaction.c:1165 +#: lib/transaction.c:1160 msgid "\tNo matches found.\n" msgstr "" -#: lib/transaction.c:1178 +#: lib/transaction.c:1173 msgid "\tRepackaged package not found!.\n" msgstr "" -#: lib/transaction.c:1199 +#: lib/transaction.c:1194 msgid "\tREMOVETID matched INSTALLTID.\n" msgstr "" -#: lib/transaction.c:1201 +#: lib/transaction.c:1196 #, c-format msgid "\t\tName: %s.\n" msgstr "" -#: lib/transaction.c:1224 +#: lib/transaction.c:1219 #, fuzzy, c-format msgid "\tRepackaged Package was %s...\n" msgstr "get ekki opnað pakka gagnagrunn í\n" -#: lib/transaction.c:1268 +#: lib/transaction.c:1263 msgid "Adding install element to auto-rollback transaction.\n" msgstr "" -#: lib/transaction.c:1277 +#: lib/transaction.c:1272 msgid "Could not get install element database instance!\n" msgstr "" -#: lib/transaction.c:1290 +#: lib/transaction.c:1285 msgid "Could not get header for auto-rollback transaction!\n" msgstr "" -#: lib/transaction.c:1300 +#: lib/transaction.c:1295 #, fuzzy, c-format msgid "\tAdded repackaged package header: %s.\n" msgstr "Get ekki ritað í pakka: %s\n" -#: lib/transaction.c:1302 lib/transaction.c:1313 +#: lib/transaction.c:1297 lib/transaction.c:1308 #, c-format msgid "\tAdded from install element %s.\n" msgstr "" -#: lib/transaction.c:1311 +#: lib/transaction.c:1306 msgid "\tAdded erase element.\n" msgstr "" -#: lib/transaction.c:1320 +#: lib/transaction.c:1315 msgid "Could not get repackaged header for auto-rollback transaction!\n" msgstr "" -#: lib/transaction.c:1327 +#: lib/transaction.c:1322 msgid "Add erase element to auto-rollback transaction.\n" msgstr "" -#: lib/transaction.c:1335 +#: lib/transaction.c:1330 msgid "\tFound existing upgrade element.\n" msgstr "" -#: lib/transaction.c:1336 +#: lib/transaction.c:1331 #, c-format msgid "\tNot adding erase element for %s.\n" msgstr "" -#: lib/transaction.c:1353 +#: lib/transaction.c:1348 #, fuzzy, c-format msgid "\tAdded repackaged package %s.\n" msgstr "Get ekki ritað í pakka: %s\n" -#: lib/transaction.c:1355 +#: lib/transaction.c:1350 #, c-format msgid "\tAdded from erase element %s.\n" msgstr "" -#: lib/transaction.c:1360 +#: lib/transaction.c:1355 msgid "Could not add erase element to auto-rollback transaction.\n" msgstr "" -#: lib/transaction.c:1366 +#: lib/transaction.c:1361 msgid "\tNo repackaged package...nothing to do.\n" msgstr "" -#: lib/transaction.c:1372 +#: lib/transaction.c:1367 msgid "Failure reading repackaged package!\n" msgstr "" -#: lib/transaction.c:1495 +#: lib/transaction.c:1490 #, c-format msgid "sanity checking %d elements\n" msgstr "" -#: lib/transaction.c:1581 +#: lib/transaction.c:1576 msgid "running pre-transaction scripts\n" msgstr "" -#: lib/transaction.c:1655 +#: lib/transaction.c:1650 #, c-format msgid "computing %d file fingerprints\n" msgstr "" -#: lib/transaction.c:1739 +#: lib/transaction.c:1734 msgid "computing file dispositions\n" msgstr "" -#: lib/transaction.c:1932 +#: lib/transaction.c:1927 msgid "Creating auto-rollback transaction\n" msgstr "" -#: lib/transaction.c:2086 +#: lib/transaction.c:2077 msgid "Add failed. Could not read package header.\n" msgstr "" -#: lib/transaction.c:2170 +#: lib/transaction.c:2161 msgid "Add failed in rpmpsmStage().\n" msgstr "" -#: lib/transaction.c:2214 +#: lib/transaction.c:2205 msgid "Add failed. Could not get file list.\n" msgstr "" -#: lib/transaction.c:2263 +#: lib/transaction.c:2254 msgid "Erase failed failed in rpmpsmStage().\n" msgstr "" -#: lib/transaction.c:2324 +#: lib/transaction.c:2315 msgid "running post-transaction scripts\n" msgstr "" @@ -3928,86 +3928,86 @@ msgstr "" msgid "======================== active %d empty %d\n" msgstr "======================== virkt %d tómt %d\n" -#: rpmio/macro.c:394 +#: rpmio/macro.c:396 #, c-format msgid "%3d>%*s(empty)" msgstr "%3d>%*s(tómt)" -#: rpmio/macro.c:437 +#: rpmio/macro.c:439 #, c-format msgid "%3d<%*s(empty)\n" msgstr "%3d<%*s(tómt)\n" -#: rpmio/macro.c:664 rpmio/macro.c:705 +#: rpmio/macro.c:608 rpmio/macro.c:1090 rpmio/macro.c:1123 rpmio/macro.c:1863 +msgid "Target buffer overflow\n" +msgstr "" + +#: rpmio/macro.c:671 rpmio/macro.c:712 #, c-format msgid "Macro %%%s has unterminated body\n" msgstr "" -#: rpmio/macro.c:727 +#: rpmio/macro.c:734 #, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "" -#: rpmio/macro.c:733 +#: rpmio/macro.c:740 #, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "" -#: rpmio/macro.c:738 +#: rpmio/macro.c:745 #, c-format msgid "Macro %%%s has empty body\n" msgstr "" -#: rpmio/macro.c:744 +#: rpmio/macro.c:751 #, c-format msgid "Macro %%%s failed to expand\n" msgstr "" -#: rpmio/macro.c:779 +#: rpmio/macro.c:786 #, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "" -#: rpmio/macro.c:897 +#: rpmio/macro.c:904 #, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "" -#: rpmio/macro.c:1024 +#: rpmio/macro.c:1031 #, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "Óþekkt viðfang %c í %s(%s)\n" -#: rpmio/macro.c:1224 +#: rpmio/macro.c:1239 #, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "" -#: rpmio/macro.c:1297 rpmio/macro.c:1314 +#: rpmio/macro.c:1312 rpmio/macro.c:1329 #, c-format msgid "Unterminated %c: %s\n" msgstr "" -#: rpmio/macro.c:1355 +#: rpmio/macro.c:1370 #, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "" -#: rpmio/macro.c:1512 +#: rpmio/macro.c:1527 #, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "Fjölvi %%%.*s fannst ekki. Sleppi\n" -#: rpmio/macro.c:1848 -msgid "Target buffer overflow\n" -msgstr "" - -#: rpmio/macro.c:2056 rpmio/macro.c:2062 +#: rpmio/macro.c:2076 rpmio/macro.c:2082 #, c-format msgid "File %s: %s\n" msgstr "Skrá %s: %s\n" -#: rpmio/macro.c:2065 +#: rpmio/macro.c:2085 #, c-format msgid "File %s is smaller than %u bytes\n" msgstr "Skráin %s er minni en %u bæti\n" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: it\n" "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n" -"POT-Creation-Date: 2007-08-21 08:04+0200\n" +"POT-Creation-Date: 2007-08-30 18:37+0200\n" "PO-Revision-Date: 2006-04-28 06:25+0200\n" "Last-Translator: \n" "Language-Team: <it@li.org>\n" @@ -1306,18 +1306,18 @@ msgstr "" "genera l'intestazione del pacchetto compatibile con il packaging (legacy) rpm" "[23]" -#: build/poptBT.c:229 lib/poptALL.c:273 lib/poptI.c:282 lib/poptQV.c:363 -#: lib/poptQV.c:372 lib/poptQV.c:413 +#: build/poptBT.c:229 lib/poptALL.c:273 lib/poptI.c:282 lib/poptQV.c:362 +#: lib/poptQV.c:371 lib/poptQV.c:412 msgid "don't verify package digest(s)" msgstr "non verificare il digest del pacchetto/i" -#: build/poptBT.c:231 lib/poptALL.c:275 lib/poptI.c:284 lib/poptQV.c:366 -#: lib/poptQV.c:374 lib/poptQV.c:416 +#: build/poptBT.c:231 lib/poptALL.c:275 lib/poptI.c:284 lib/poptQV.c:365 +#: lib/poptQV.c:373 lib/poptQV.c:415 msgid "don't verify database header(s) when retrieved" msgstr "non verificare l'intestazione del database una volta ripristinata" -#: build/poptBT.c:233 lib/poptALL.c:281 lib/poptI.c:286 lib/poptQV.c:369 -#: lib/poptQV.c:376 lib/poptQV.c:418 +#: build/poptBT.c:233 lib/poptALL.c:281 lib/poptI.c:286 lib/poptQV.c:368 +#: lib/poptQV.c:375 lib/poptQV.c:417 msgid "don't verify package signature(s)" msgstr "non verificare la firma(e) del pacchetto" @@ -1379,27 +1379,27 @@ msgstr "%s fallito\n" msgid "failed to write all data to %s\n" msgstr "salvataggio di tutti i dati su %s fallito\n" -#: build/rpmfc.c:1250 +#: build/rpmfc.c:1249 #, fuzzy, c-format msgid "magic_open(0x%x) failed: %s\n" msgstr "apertura di %s fallita: %s\n" -#: build/rpmfc.c:1258 +#: build/rpmfc.c:1257 #, fuzzy, c-format -msgid "magic_load(ms, \"%s\") failed: %s\n" +msgid "magic_load failed: %s\n" msgstr "%s rmdir di %s fallito: %s\n" -#: build/rpmfc.c:1303 +#: build/rpmfc.c:1301 #, fuzzy, c-format msgid "magic_file(ms, \"%s\") failed: mode %06o %s\n" msgstr "%s rmdir di %s fallito: %s\n" -#: build/rpmfc.c:1524 +#: build/rpmfc.c:1522 #, c-format msgid "Finding %s: %s\n" msgstr "Ricerca di %s in corso: %s\n" -#: build/rpmfc.c:1530 build/rpmfc.c:1539 +#: build/rpmfc.c:1528 build/rpmfc.c:1537 #, c-format msgid "Failed to find %s:\n" msgstr "Impossibile trovare %s:\n" @@ -1519,11 +1519,11 @@ msgstr "ignora il rapporto del nome del pacchetto [%d]\t%s -> %s\n" msgid "removing %s \"%s\" from tsort relations.\n" msgstr "rimozione di %s \"%s\" dalle relazioni tsort in corso.\n" -#: lib/depends.c:1265 +#: lib/depends.c:1271 msgid "========== recording tsort relations\n" msgstr "========== registrazione relazioni tsort\n" -#: lib/depends.c:1357 +#: lib/depends.c:1363 #, fuzzy msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, depth, " @@ -1532,20 +1532,20 @@ msgstr "" "========== tsorting dei pacchetti (ordine, #predecessori, #successori, " "albero, profondità )\n" -#: lib/depends.c:1453 +#: lib/depends.c:1459 #, fuzzy, c-format msgid "========== successors only (%d bytes)\n" msgstr "========== solo successori (in ordine di presentazione)\n" -#: lib/depends.c:1526 +#: lib/depends.c:1532 msgid "LOOP:\n" msgstr "LOOP:\n" -#: lib/depends.c:1561 +#: lib/depends.c:1567 msgid "========== continuing tsort ...\n" msgstr "========== continuazione tsort ...\n" -#: lib/depends.c:1566 +#: lib/depends.c:1572 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "rpmtsOrder fallito, %d elementi rimanenti\n" @@ -2109,7 +2109,7 @@ msgstr "aggiorna il database, senza modificare il filesystem" msgid "do not verify package dependencies" msgstr "non verificare le dipendenze del pacchetto" -#: lib/poptI.c:252 lib/poptQV.c:307 lib/poptQV.c:310 +#: lib/poptI.c:252 lib/poptQV.c:306 lib/poptQV.c:309 msgid "don't verify MD5 digest of files" msgstr "non verificare l'MD5 digest dei file" @@ -2226,221 +2226,221 @@ msgstr "non installare, ma indicare se funziona oppure no" msgid "upgrade package(s)" msgstr "aggiorna i pacchetti" -#: lib/poptQV.c:103 +#: lib/poptQV.c:102 msgid "query/verify all packages" msgstr "interrogare/verificare tutti i pacchetti" -#: lib/poptQV.c:105 +#: lib/poptQV.c:104 msgid "rpm checksig mode" msgstr "modalità rpm checksig" -#: lib/poptQV.c:107 +#: lib/poptQV.c:106 msgid "query/verify package(s) owning file" msgstr "interrogare/verificare i pacchetti proprietari di file" -#: lib/poptQV.c:109 +#: lib/poptQV.c:108 msgid "query/verify package(s) in group" msgstr "interrogare/verificare i pacchetti in gruppo" -#: lib/poptQV.c:111 +#: lib/poptQV.c:110 msgid "query/verify a package file" msgstr "interrogare/verificare un file del pacchetto" -#: lib/poptQV.c:114 +#: lib/poptQV.c:113 #, fuzzy msgid "query/verify package(s) from TOP file tree walk" msgstr "interrogare/verificare i pacchetti dall'operazione di installazione" -#: lib/poptQV.c:116 +#: lib/poptQV.c:115 #, fuzzy msgid "query/verify package(s) from system HDLIST" msgstr "interrogare/verificare i pacchetti dall'operazione di installazione" -#: lib/poptQV.c:119 +#: lib/poptQV.c:118 msgid "query/verify package(s) with package identifier" msgstr "interrogare/verificare i pacchetti con un identificatore del pacchetto" -#: lib/poptQV.c:121 +#: lib/poptQV.c:120 msgid "query/verify package(s) with header identifier" msgstr "" "interrogare/verificare i pacchetti con un identificatore di intestazione" -#: lib/poptQV.c:123 +#: lib/poptQV.c:122 msgid "query/verify package(s) with file identifier" msgstr "interrogare/verificare i pacchetti con un identificatore di file" -#: lib/poptQV.c:126 +#: lib/poptQV.c:125 msgid "rpm query mode" msgstr "modalità interroga rpm" -#: lib/poptQV.c:128 +#: lib/poptQV.c:127 msgid "query/verify a header instance" msgstr "interrogare/verificare una istanza dell'intestazione" -#: lib/poptQV.c:130 +#: lib/poptQV.c:129 msgid "query a spec file" msgstr "interrogare un file spec" -#: lib/poptQV.c:130 +#: lib/poptQV.c:129 msgid "<spec>" msgstr "<spec>" -#: lib/poptQV.c:132 +#: lib/poptQV.c:131 msgid "query/verify package(s) from install transaction" msgstr "interrogare/verificare i pacchetti dall'operazione di installazione" -#: lib/poptQV.c:134 +#: lib/poptQV.c:133 msgid "query the package(s) triggered by the package" msgstr "interroga i pacchetti azionati dal pacchetto" -#: lib/poptQV.c:136 +#: lib/poptQV.c:135 msgid "rpm verify mode" msgstr "modalità verifica rpm" -#: lib/poptQV.c:138 +#: lib/poptQV.c:137 msgid "query/verify the package(s) which require a dependency" msgstr "interrogare/verificare i pacchetti che necessitano di una dipendenza" -#: lib/poptQV.c:140 +#: lib/poptQV.c:139 msgid "query/verify the package(s) which provide a dependency" msgstr "interrogare/verificare i pacchetti che forniscono una dipendenza" -#: lib/poptQV.c:143 +#: lib/poptQV.c:142 msgid "create transaction set" msgstr "" -#: lib/poptQV.c:145 +#: lib/poptQV.c:144 msgid "do not order transaction set" msgstr "" -#: lib/poptQV.c:147 +#: lib/poptQV.c:146 #, fuzzy msgid "do not glob arguments" msgstr "non è stato specificato alcun argomento" -#: lib/poptQV.c:149 +#: lib/poptQV.c:148 msgid "do not process non-package files as manifests" msgstr "" -#: lib/poptQV.c:151 +#: lib/poptQV.c:150 #, fuzzy msgid "do not read headers" msgstr "%s: impossibile leggere intestazione su 0x%x\n" -#: lib/poptQV.c:258 +#: lib/poptQV.c:257 msgid "list all configuration files" msgstr "elenca tutti i file di configurazione" -#: lib/poptQV.c:260 +#: lib/poptQV.c:259 msgid "list all documentation files" msgstr "elenca tutti i file di documentazione" -#: lib/poptQV.c:262 +#: lib/poptQV.c:261 msgid "dump basic file information" msgstr "rimuovere le informazioni di base del file" -#: lib/poptQV.c:266 +#: lib/poptQV.c:265 msgid "list files in package" msgstr "elenca i file in un pacchetto" -#: lib/poptQV.c:271 +#: lib/poptQV.c:270 #, c-format msgid "skip %%ghost files" msgstr "salta file %%ghost" -#: lib/poptQV.c:275 +#: lib/poptQV.c:274 #, c-format msgid "skip %%license files" msgstr "salta file %%licens" -#: lib/poptQV.c:278 +#: lib/poptQV.c:277 #, c-format msgid "skip %%readme files" msgstr "salta file %%readme" -#: lib/poptQV.c:284 +#: lib/poptQV.c:283 msgid "use the following query format" msgstr "usare il seguente formato di interrogazione" -#: lib/poptQV.c:286 +#: lib/poptQV.c:285 msgid "substitute i18n sections into spec file" msgstr "sostituire le sezioni i18n nel file spec" -#: lib/poptQV.c:288 +#: lib/poptQV.c:287 msgid "display the states of the listed files" msgstr "visualizzare gli stati dei file elencati" -#: lib/poptQV.c:314 +#: lib/poptQV.c:313 msgid "don't verify size of files" msgstr "non verificare la dimensione dei file" -#: lib/poptQV.c:317 +#: lib/poptQV.c:316 msgid "don't verify symlink path of files" msgstr "non verificare il percorso symlink dei file" -#: lib/poptQV.c:320 +#: lib/poptQV.c:319 msgid "don't verify owner of files" msgstr "non verificare il proprietario dei file" -#: lib/poptQV.c:323 +#: lib/poptQV.c:322 msgid "don't verify group of files" msgstr "non verificare il gruppo dei file" -#: lib/poptQV.c:326 +#: lib/poptQV.c:325 msgid "don't verify modification time of files" msgstr "non verificare l'ora di modifica dei file" -#: lib/poptQV.c:329 lib/poptQV.c:332 +#: lib/poptQV.c:328 lib/poptQV.c:331 msgid "don't verify mode of files" msgstr "non verificare la modalità dei file" -#: lib/poptQV.c:335 +#: lib/poptQV.c:334 #, fuzzy msgid "don't verify file security contexts" msgstr "non verificare i file nel pacchetto" -#: lib/poptQV.c:337 +#: lib/poptQV.c:336 msgid "don't verify files in package" msgstr "non verificare i file nel pacchetto" -#: lib/poptQV.c:340 lib/poptQV.c:343 tools/rpmgraph.c:266 +#: lib/poptQV.c:339 lib/poptQV.c:342 tools/rpmgraph.c:266 msgid "don't verify package dependencies" msgstr "non verificare le dipendenze del pacchetto" -#: lib/poptQV.c:348 lib/poptQV.c:352 lib/poptQV.c:355 lib/poptQV.c:358 +#: lib/poptQV.c:347 lib/poptQV.c:351 lib/poptQV.c:354 lib/poptQV.c:357 msgid "don't execute verify script(s)" msgstr "non eseguire gli script di verifica" -#: lib/poptQV.c:382 +#: lib/poptQV.c:381 msgid "don't verify GPG V3 DSA signature(s)" msgstr "non verificare le firme GPG V3 DSA" -#: lib/poptQV.c:385 +#: lib/poptQV.c:384 msgid "don't verify PGP V3 RSA/MD5 signature(s)" msgstr "non verificare le firme PGP V3 RSA/MD5" -#: lib/poptQV.c:400 +#: lib/poptQV.c:399 msgid "sign package(s) (identical to --resign)" msgstr "firma pacchetto (identico a --resign)" -#: lib/poptQV.c:402 +#: lib/poptQV.c:401 msgid "verify package signature(s)" msgstr "verifica firma del pacchetto" -#: lib/poptQV.c:404 +#: lib/poptQV.c:403 #, fuzzy msgid "delete package signatures" msgstr "verifica firma del pacchetto" -#: lib/poptQV.c:406 +#: lib/poptQV.c:405 msgid "import an armored public key" msgstr "importa una chiave pubblica corazzata" -#: lib/poptQV.c:408 +#: lib/poptQV.c:407 msgid "sign package(s) (identical to --addsign)" msgstr "firma pacchetto (identico a --addsign)" -#: lib/poptQV.c:410 +#: lib/poptQV.c:409 msgid "generate signature" msgstr "genera firma" @@ -2781,38 +2781,38 @@ msgstr "il pacchetto %s presenta un %s non soddisfatto/i: %s\n" msgid "%s skipped due to missingok flag\n" msgstr "%s omesso/a a causa della mancanza del flag ok\n" -#: lib/rpmfi.c:846 +#: lib/rpmfi.c:850 msgid "========== relocations\n" msgstr "========== riposizionamenti\n" -#: lib/rpmfi.c:850 +#: lib/rpmfi.c:854 #, c-format msgid "%5d exclude %s\n" msgstr "esclude %5d in %s\n" -#: lib/rpmfi.c:853 +#: lib/rpmfi.c:857 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "%5d riposiziona %s -> %s\n" -#: lib/rpmfi.c:987 +#: lib/rpmfi.c:991 #, c-format msgid "excluding %s %s\n" msgstr "esclusione %s %s in corso\n" -#: lib/rpmfi.c:997 +#: lib/rpmfi.c:1001 #, c-format msgid "relocating %s to %s\n" msgstr "riposizionamento di %s su %s\n" -#: lib/rpmfi.c:1089 +#: lib/rpmfi.c:1093 #, c-format msgid "relocating directory %s to %s\n" msgstr "riposizionamento directory %s su %s\n" #: lib/rpmgi.c:81 lib/rpminstall.c:124 lib/rpminstall.c:480 -#: lib/rpminstall.c:615 lib/rpminstall.c:1041 lib/rpmts.c:643 -#: tools/rpmgraph.c:121 tools/rpmgraph.c:158 +#: lib/rpminstall.c:615 lib/rpmts.c:643 tools/rpmgraph.c:121 +#: tools/rpmgraph.c:158 #, c-format msgid "open of %s failed: %s\n" msgstr "apertura di %s fallita: %s\n" @@ -2823,7 +2823,7 @@ msgid "unknown tag: \"%s\"\n" msgstr "etichetta sconosciuta" #: lib/rpmgi.c:628 lib/rpminstall.c:659 lib/rpminstall.c:834 -#: lib/rpminstall.c:1267 lib/transaction.c:1031 tools/rpmgraph.c:196 +#: lib/rpminstall.c:1084 lib/transaction.c:1026 tools/rpmgraph.c:196 msgid "Failed dependencies:\n" msgstr "Dipendenze fallite:\n" @@ -2939,16 +2939,16 @@ msgstr "impossibile aprire %s: %s\n" msgid "Installing %s\n" msgstr "installazione di %s in corso\n" -#: lib/rpminstall.c:1261 lib/transaction.c:1024 +#: lib/rpminstall.c:1078 lib/transaction.c:1019 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "Rollback dei pacchetti (+%d/-%d) fino a %-24.24s (0x%08x):\n" -#: lib/rpminstall.c:1292 lib/transaction.c:1075 +#: lib/rpminstall.c:1109 lib/transaction.c:1070 msgid "Cleaning up repackaged packages:\n" msgstr "" -#: lib/rpminstall.c:1299 lib/transaction.c:1081 +#: lib/rpminstall.c:1116 lib/transaction.c:1076 #, fuzzy, c-format msgid "\tRemoving %s:\n" msgstr "Ripristino di %s\n" @@ -3099,97 +3099,97 @@ msgstr "" "si è verificato un errore sconosciuto %d durante la manipolazione del " "pacchetto %s" -#: lib/rpmrc.c:199 +#: lib/rpmrc.c:213 #, c-format msgid "missing second ':' at %s:%d\n" msgstr "secondi ':' mancanti su %s:%d\n" -#: lib/rpmrc.c:202 +#: lib/rpmrc.c:216 #, c-format msgid "missing architecture name at %s:%d\n" msgstr "nome architettura mancante su %s:%d\n" -#: lib/rpmrc.c:356 +#: lib/rpmrc.c:370 #, c-format msgid "Incomplete data line at %s:%d\n" msgstr "Riga dati incompleta su %s:%d\n" -#: lib/rpmrc.c:361 +#: lib/rpmrc.c:375 #, c-format msgid "Too many args in data line at %s:%d\n" msgstr "Troppi argomenti sulla riga dati di %s:%d\n" -#: lib/rpmrc.c:369 +#: lib/rpmrc.c:383 #, c-format msgid "Bad arch/os number: %s (%s:%d)\n" msgstr "Numero arch/OS errato: %s (%s:%d)\n" -#: lib/rpmrc.c:406 +#: lib/rpmrc.c:420 #, c-format msgid "Incomplete default line at %s:%d\n" msgstr "Riga di default incompleta su %s:%d\n" -#: lib/rpmrc.c:411 +#: lib/rpmrc.c:425 #, c-format msgid "Too many args in default line at %s:%d\n" msgstr "Troppi argomenti nella riga di default su %s:%d\n" -#: lib/rpmrc.c:577 +#: lib/rpmrc.c:591 #, c-format msgid "Failed to read %s: %s.\n" msgstr "Lettura di %s fallita: %s.\n" -#: lib/rpmrc.c:615 +#: lib/rpmrc.c:629 #, c-format msgid "missing ':' (found 0x%02x) at %s:%d\n" msgstr "':' mancanti (trovato 0x%02x) su %s:%d\n" -#: lib/rpmrc.c:632 lib/rpmrc.c:706 +#: lib/rpmrc.c:646 lib/rpmrc.c:710 #, c-format msgid "missing argument for %s at %s:%d\n" msgstr "argomento mancante per %s su %s:%d\n" -#: lib/rpmrc.c:649 lib/rpmrc.c:671 +#: lib/rpmrc.c:663 #, c-format msgid "%s expansion failed at %s:%d \"%s\"\n" msgstr "espansione %s su %s fallita:%d \"%s\"\n" -#: lib/rpmrc.c:658 +#: lib/rpmrc.c:672 #, c-format msgid "cannot open %s at %s:%d: %s\n" msgstr "impossibile aprire %s su %s:%d: %s\n" -#: lib/rpmrc.c:698 +#: lib/rpmrc.c:702 #, c-format msgid "missing architecture for %s at %s:%d\n" msgstr "architettura mancante per %s su %s:%d\n" -#: lib/rpmrc.c:765 +#: lib/rpmrc.c:769 #, c-format msgid "bad option '%s' at %s:%d\n" msgstr "opzione errata '%s' su %s:%d\n" -#: lib/rpmrc.c:1564 +#: lib/rpmrc.c:1568 #, c-format msgid "Unknown system: %s\n" msgstr "Sistema sconosciuto: %s\n" -#: lib/rpmrc.c:1565 +#: lib/rpmrc.c:1569 #, c-format msgid "Please contact %s\n" msgstr "Si prega di contattare %s\n" -#: lib/rpmrc.c:1802 +#: lib/rpmrc.c:1806 #, c-format msgid "Cannot expand %s\n" msgstr "Impossibile espandere %s\n" -#: lib/rpmrc.c:1807 +#: lib/rpmrc.c:1811 #, c-format msgid "Cannot read %s, HOME is too large.\n" msgstr "Impossibile leggere %s, HOME è troppo grande.\n" -#: lib/rpmrc.c:1824 +#: lib/rpmrc.c:1828 #, c-format msgid "Unable to open %s for reading: %s.\n" msgstr "Impossibile aprire %s per la lettura: %s.\n" @@ -3480,160 +3480,160 @@ msgstr "MD5 digest discontinuo: NON SUPPORTATO\n" msgid "Signature: UNKNOWN (%d)\n" msgstr "Firma: SCONOSCIUTA (%d)\n" -#: lib/transaction.c:935 +#: lib/transaction.c:930 #, c-format msgid "excluding directory %s\n" msgstr "esclusione directory %s in corso\n" -#: lib/transaction.c:1022 +#: lib/transaction.c:1017 msgid "Transaction failed...rolling back\n" msgstr "" -#: lib/transaction.c:1042 +#: lib/transaction.c:1037 msgid "Could not order auto-rollback transaction!\n" msgstr "" -#: lib/transaction.c:1132 +#: lib/transaction.c:1127 msgid "Getting repackaged header from transaction element\n" msgstr "" -#: lib/transaction.c:1157 +#: lib/transaction.c:1152 #, c-format msgid "\tLooking for %s...\n" msgstr "" -#: lib/transaction.c:1161 +#: lib/transaction.c:1156 msgid "\tMatches found.\n" msgstr "" -#: lib/transaction.c:1165 +#: lib/transaction.c:1160 msgid "\tNo matches found.\n" msgstr "" -#: lib/transaction.c:1178 +#: lib/transaction.c:1173 #, fuzzy msgid "\tRepackaged package not found!.\n" msgstr "pacchetto sorgente atteso, trovato binario\n" -#: lib/transaction.c:1199 +#: lib/transaction.c:1194 msgid "\tREMOVETID matched INSTALLTID.\n" msgstr "" -#: lib/transaction.c:1201 +#: lib/transaction.c:1196 #, c-format msgid "\t\tName: %s.\n" msgstr "" -#: lib/transaction.c:1224 +#: lib/transaction.c:1219 #, fuzzy, c-format msgid "\tRepackaged Package was %s...\n" msgstr "nessun pacchetto corrisponde a %s: %s\n" -#: lib/transaction.c:1268 +#: lib/transaction.c:1263 msgid "Adding install element to auto-rollback transaction.\n" msgstr "" -#: lib/transaction.c:1277 +#: lib/transaction.c:1272 msgid "Could not get install element database instance!\n" msgstr "" -#: lib/transaction.c:1290 +#: lib/transaction.c:1285 msgid "Could not get header for auto-rollback transaction!\n" msgstr "" -#: lib/transaction.c:1300 +#: lib/transaction.c:1295 #, c-format msgid "\tAdded repackaged package header: %s.\n" msgstr "" -#: lib/transaction.c:1302 lib/transaction.c:1313 +#: lib/transaction.c:1297 lib/transaction.c:1308 #, c-format msgid "\tAdded from install element %s.\n" msgstr "" -#: lib/transaction.c:1311 +#: lib/transaction.c:1306 msgid "\tAdded erase element.\n" msgstr "" -#: lib/transaction.c:1320 +#: lib/transaction.c:1315 msgid "Could not get repackaged header for auto-rollback transaction!\n" msgstr "" -#: lib/transaction.c:1327 +#: lib/transaction.c:1322 msgid "Add erase element to auto-rollback transaction.\n" msgstr "" -#: lib/transaction.c:1335 +#: lib/transaction.c:1330 msgid "\tFound existing upgrade element.\n" msgstr "" -#: lib/transaction.c:1336 +#: lib/transaction.c:1331 #, c-format msgid "\tNot adding erase element for %s.\n" msgstr "" -#: lib/transaction.c:1353 +#: lib/transaction.c:1348 #, c-format msgid "\tAdded repackaged package %s.\n" msgstr "" -#: lib/transaction.c:1355 +#: lib/transaction.c:1350 #, c-format msgid "\tAdded from erase element %s.\n" msgstr "" -#: lib/transaction.c:1360 +#: lib/transaction.c:1355 msgid "Could not add erase element to auto-rollback transaction.\n" msgstr "" -#: lib/transaction.c:1366 +#: lib/transaction.c:1361 msgid "\tNo repackaged package...nothing to do.\n" msgstr "" -#: lib/transaction.c:1372 +#: lib/transaction.c:1367 #, fuzzy msgid "Failure reading repackaged package!\n" msgstr "errore durante la lettura dell'intestazione dal pacchetto\n" -#: lib/transaction.c:1495 +#: lib/transaction.c:1490 #, fuzzy, c-format msgid "sanity checking %d elements\n" msgstr "controllo correttezza degli elementi %d\n" -#: lib/transaction.c:1581 +#: lib/transaction.c:1576 msgid "running pre-transaction scripts\n" msgstr "" -#: lib/transaction.c:1655 +#: lib/transaction.c:1650 #, c-format msgid "computing %d file fingerprints\n" msgstr "elaborazione impronte file %d\n" -#: lib/transaction.c:1739 +#: lib/transaction.c:1734 msgid "computing file dispositions\n" msgstr "elaborazione disposizioni file\n" -#: lib/transaction.c:1932 +#: lib/transaction.c:1927 msgid "Creating auto-rollback transaction\n" msgstr "" -#: lib/transaction.c:2086 +#: lib/transaction.c:2077 msgid "Add failed. Could not read package header.\n" msgstr "" -#: lib/transaction.c:2170 +#: lib/transaction.c:2161 msgid "Add failed in rpmpsmStage().\n" msgstr "" -#: lib/transaction.c:2214 +#: lib/transaction.c:2205 msgid "Add failed. Could not get file list.\n" msgstr "" -#: lib/transaction.c:2263 +#: lib/transaction.c:2254 msgid "Erase failed failed in rpmpsmStage().\n" msgstr "" -#: lib/transaction.c:2324 +#: lib/transaction.c:2315 msgid "running post-transaction scripts\n" msgstr "" @@ -4032,86 +4032,86 @@ msgstr "apertura indice db in corso %s/%s %s modalità =0x%x\n" msgid "======================== active %d empty %d\n" msgstr "======================== %d attivo %d vuoto\n" -#: rpmio/macro.c:394 +#: rpmio/macro.c:396 #, c-format msgid "%3d>%*s(empty)" msgstr "%3d>%*s(vuoto)" -#: rpmio/macro.c:437 +#: rpmio/macro.c:439 #, c-format msgid "%3d<%*s(empty)\n" msgstr "%3d<%*s(vuoto)\n" -#: rpmio/macro.c:664 rpmio/macro.c:705 +#: rpmio/macro.c:608 rpmio/macro.c:1090 rpmio/macro.c:1123 rpmio/macro.c:1863 +msgid "Target buffer overflow\n" +msgstr "Target buffer overflow\n" + +#: rpmio/macro.c:671 rpmio/macro.c:712 #, c-format msgid "Macro %%%s has unterminated body\n" msgstr "Macro %%%s presenta un corpo incompleto\n" -#: rpmio/macro.c:727 +#: rpmio/macro.c:734 #, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "Macro %%%s presenta un nome illegale (%%define)\n" -#: rpmio/macro.c:733 +#: rpmio/macro.c:740 #, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "Macro %%%s presenta delle opzioni incomplete\n" -#: rpmio/macro.c:738 +#: rpmio/macro.c:745 #, c-format msgid "Macro %%%s has empty body\n" msgstr "Macro %%%s presenta un corpo vuoto\n" -#: rpmio/macro.c:744 +#: rpmio/macro.c:751 #, c-format msgid "Macro %%%s failed to expand\n" msgstr "Macro %%%s non è in grado di espandersi\n" -#: rpmio/macro.c:779 +#: rpmio/macro.c:786 #, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "Macro %%%s presenta un nome illegale (%%undefine)\n" -#: rpmio/macro.c:897 +#: rpmio/macro.c:904 #, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "Macro %%%s (%s) non è stato utilizzato sotto il livello %d\n" -#: rpmio/macro.c:1024 +#: rpmio/macro.c:1031 #, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "Opzione %c sconosciuta in %s(%s)\n" -#: rpmio/macro.c:1224 +#: rpmio/macro.c:1239 #, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "Profondità (%d) di ricorsione maggiore del valore massimo(%d)\n" -#: rpmio/macro.c:1297 rpmio/macro.c:1314 +#: rpmio/macro.c:1312 rpmio/macro.c:1329 #, c-format msgid "Unterminated %c: %s\n" msgstr "%c non terminato: %s\n" -#: rpmio/macro.c:1355 +#: rpmio/macro.c:1370 #, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "Un/a %% è seguito/a da una macro non analizzabile\n" -#: rpmio/macro.c:1512 +#: rpmio/macro.c:1527 #, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "Macro %%%.*s non trovata, omissione in corso\n" -#: rpmio/macro.c:1848 -msgid "Target buffer overflow\n" -msgstr "Target buffer overflow\n" - -#: rpmio/macro.c:2056 rpmio/macro.c:2062 +#: rpmio/macro.c:2076 rpmio/macro.c:2082 #, c-format msgid "File %s: %s\n" msgstr "File %s: %s\n" -#: rpmio/macro.c:2065 +#: rpmio/macro.c:2085 #, c-format msgid "File %s is smaller than %u bytes\n" msgstr "File %s è più piccolo di %u byte\n" @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm-4.4\n" "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n" -"POT-Creation-Date: 2007-08-21 08:04+0200\n" +"POT-Creation-Date: 2007-08-30 18:37+0200\n" "PO-Revision-Date: 2005-04-04 22:30+1000\n" "Last-Translator: SEKINE Tatsuo <tsekine@sdri.co.jp>\n" "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n" @@ -1277,18 +1277,18 @@ msgstr "¥Ó¥ë¥É°Í¸À¤ò¸¡¾Ú¤·¤Ê¤¤" msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "(¸Å¤¤) rpm[23] ¥Ñ¥Ã¥±¡¼¥¸¥ó¥°¸ß´¹¤Î¥Ø¥Ã¥À¤òÀ¸À®" -#: build/poptBT.c:229 lib/poptALL.c:273 lib/poptI.c:282 lib/poptQV.c:363 -#: lib/poptQV.c:372 lib/poptQV.c:413 +#: build/poptBT.c:229 lib/poptALL.c:273 lib/poptI.c:282 lib/poptQV.c:362 +#: lib/poptQV.c:371 lib/poptQV.c:412 msgid "don't verify package digest(s)" msgstr "¥Ñ¥Ã¥±¡¼¥¸¥À¥¤¥¸¥§¥¹¥È¤Î¸¡¾Ú¤ò¤·¤Þ¤»¤ó¡£" -#: build/poptBT.c:231 lib/poptALL.c:275 lib/poptI.c:284 lib/poptQV.c:366 -#: lib/poptQV.c:374 lib/poptQV.c:416 +#: build/poptBT.c:231 lib/poptALL.c:275 lib/poptI.c:284 lib/poptQV.c:365 +#: lib/poptQV.c:373 lib/poptQV.c:415 msgid "don't verify database header(s) when retrieved" msgstr "¼èÆÀ¤·¤¿¥Ç¡¼¥¿¥Ù¡¼¥¹¥Ø¥Ã¥À¤ò¸¡¾Ú¤·¤Þ¤»¤ó¡£" -#: build/poptBT.c:233 lib/poptALL.c:281 lib/poptI.c:286 lib/poptQV.c:369 -#: lib/poptQV.c:376 lib/poptQV.c:418 +#: build/poptBT.c:233 lib/poptALL.c:281 lib/poptI.c:286 lib/poptQV.c:368 +#: lib/poptQV.c:375 lib/poptQV.c:417 msgid "don't verify package signature(s)" msgstr "¥Ñ¥Ã¥±¡¼¥¸½ð̾¤Î¸¡¾Ú¤ò¤·¤Þ¤»¤ó¡£" @@ -1350,27 +1350,27 @@ msgstr "%s: ¼ºÇÔ: %s\n" msgid "failed to write all data to %s\n" msgstr "%s ¤Ø¤Î Payload ½ñ¤¹þ¤ß¤Ë¼ºÇÔ: %s\n" -#: build/rpmfc.c:1250 +#: build/rpmfc.c:1249 #, fuzzy, c-format msgid "magic_open(0x%x) failed: %s\n" msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s\n" -#: build/rpmfc.c:1258 +#: build/rpmfc.c:1257 #, fuzzy, c-format -msgid "magic_load(ms, \"%s\") failed: %s\n" +msgid "magic_load failed: %s\n" msgstr "%s %s ¤Î rmdir ¤Ë¼ºÇÔ: %s\n" -#: build/rpmfc.c:1303 +#: build/rpmfc.c:1301 #, fuzzy, c-format msgid "magic_file(ms, \"%s\") failed: mode %06o %s\n" msgstr "%s %s ¤Î rmdir ¤Ë¼ºÇÔ: %s\n" -#: build/rpmfc.c:1524 +#: build/rpmfc.c:1522 #, fuzzy, c-format msgid "Finding %s: %s\n" msgstr "¥Õ¥¡¥¤¥ë %s: %s\n" -#: build/rpmfc.c:1530 build/rpmfc.c:1539 +#: build/rpmfc.c:1528 build/rpmfc.c:1537 #, fuzzy, c-format msgid "Failed to find %s:\n" msgstr "%s ¤ÎÆɤ߹þ¤ß¤Ë¼ºÇÔ: %s¡£\n" @@ -1490,11 +1490,11 @@ msgstr "¥Ñ¥Ã¥±¡¼¥¸Ì¾¤Î´Ø·¸¤ò̵»ë¤·¤Þ¤¹ [%d]\t%s ¢ª %s\n" msgid "removing %s \"%s\" from tsort relations.\n" msgstr "tsort ´Ø·¸¤«¤é %s \"%s\" ¤òºï½ü¤·¤Þ¤¹¡£\n" -#: lib/depends.c:1265 +#: lib/depends.c:1271 msgid "========== recording tsort relations\n" msgstr "========== tsort ´Ø·¸¤òµÏ¿¤·¤Æ¤¤¤Þ¤¹\n" -#: lib/depends.c:1357 +#: lib/depends.c:1363 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, depth, " "breadth)\n" @@ -1502,20 +1502,20 @@ msgstr "" "========== ¥Ñ¥Ã¥±¡¼¥¸¤ò tsort (½çÈÖ¡¢Àè¹Ô¿ô¡¢¸å³¿ô¡¢¥Ä¥ê¡¼¡¢¿¼¤µ¡¢Éý) ¤·¤Æ¤¤" "¤Þ¤¹\n" -#: lib/depends.c:1453 +#: lib/depends.c:1459 #, c-format msgid "========== successors only (%d bytes)\n" msgstr "========== ¸å³¤Î¤ß (%d ¥Ð¥¤¥È)\n" -#: lib/depends.c:1526 +#: lib/depends.c:1532 msgid "LOOP:\n" msgstr "¥ë¡¼¥×:\n" -#: lib/depends.c:1561 +#: lib/depends.c:1567 msgid "========== continuing tsort ...\n" msgstr "========== tsort ¤ò³¹ÔÃæ...\n" -#: lib/depends.c:1566 +#: lib/depends.c:1572 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "rpmtsOrder ¤Ë¼ºÇÔ, »Ä¤ê %d ¸Ä\n" @@ -2057,7 +2057,7 @@ msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò¹¹¿·¤·¤Þ¤¹¤¬¡¢¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤ÎÊѹ¹¤Ï¹Ô¤¤¤Þ¤»¤ó¡£" msgid "do not verify package dependencies" msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î°Í¸´Ø·¸¤Î¸¡¾Ú¤ò¹Ô¤¤¤Þ¤»¤ó¡£" -#: lib/poptI.c:252 lib/poptQV.c:307 lib/poptQV.c:310 +#: lib/poptI.c:252 lib/poptQV.c:306 lib/poptQV.c:309 msgid "don't verify MD5 digest of files" msgstr "¥Õ¥¡¥¤¥ë¤Î MD5 ¥À¥¤¥¸¥§¥¹¥È¤ò¸¡¾Ú¤·¤Þ¤»¤ó¡£" @@ -2175,215 +2175,215 @@ msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤»¤º¤Ë¡¢¥Æ¥¹¥È¤Î¤ß¤ò¹Ô¤¤¤Þ¤¹¡£" msgid "upgrade package(s)" msgstr "¥Ñ¥Ã¥±¡¼¥¸¤ò¥¢¥Ã¥×¥°¥ì¡¼¥É¤·¤Þ¤¹¡£" -#: lib/poptQV.c:103 +#: lib/poptQV.c:102 msgid "query/verify all packages" msgstr "Á´¤Æ¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ë¤Ä¤¤¤ÆÌ䤤¹ç¤ï¤»/¸¡¾Ú¤·¤Þ¤¹¡£" -#: lib/poptQV.c:105 +#: lib/poptQV.c:104 msgid "rpm checksig mode" msgstr "rpm ¤Î½ð̾¸¡ºº¥â¡¼¥É" -#: lib/poptQV.c:107 +#: lib/poptQV.c:106 msgid "query/verify package(s) owning file" msgstr "<file> ¤ò½êͤ·¤Æ¤¤¤ë¥Ñ¥Ã¥±¡¼¥¸¤òÌ䤤¹ç¤ï¤»/¸¡¾Ú¤·¤Þ¤¹¡£" -#: lib/poptQV.c:109 +#: lib/poptQV.c:108 msgid "query/verify package(s) in group" msgstr "¥°¥ë¡¼¥×¤Ë½ê°¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤òÌ䤤¹ç¤ï¤»/¸¡¾Ú¤·¤Þ¤¹¡£" -#: lib/poptQV.c:111 +#: lib/poptQV.c:110 msgid "query/verify a package file" msgstr "¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¤ÎÌ䤤¹ç¤ï¤»/¸¡¾Ú¤ò¤·¤Þ¤¹¡£" -#: lib/poptQV.c:114 +#: lib/poptQV.c:113 msgid "query/verify package(s) from TOP file tree walk" msgstr "¥Õ¥¡¥¤¥ë¥Ä¥ê¡¼Ãµº÷¤ÎÀèƬ¤«¤é¡¢Ì䤤¹ç¤ï¤»/¸¡¾Ú¤·¤Þ¤¹" -#: lib/poptQV.c:116 +#: lib/poptQV.c:115 msgid "query/verify package(s) from system HDLIST" msgstr "¥·¥¹¥Æ¥à¤Î HDLIST ¤«¤éÌ䤤¹ç¤ï¤»/¸¡¾Ú¤ò¤·¤Þ¤¹¡£" -#: lib/poptQV.c:119 +#: lib/poptQV.c:118 msgid "query/verify package(s) with package identifier" msgstr "¥Ñ¥Ã¥±¡¼¥¸ ID ¤ÇÌ䤤¹ç¤ï¤»/¸¡¾Ú¤·¤Þ¤¹¡£" -#: lib/poptQV.c:121 +#: lib/poptQV.c:120 msgid "query/verify package(s) with header identifier" msgstr "¥Ø¥Ã¥À ID ¤Ç¥Ñ¥Ã¥±¡¼¥¸¤òÌ䤤¹ç¤ï¤»/¸¡¾Ú¤·¤Þ¤¹¡£" -#: lib/poptQV.c:123 +#: lib/poptQV.c:122 msgid "query/verify package(s) with file identifier" msgstr "¥Õ¥¡¥¤¥ë ID ¤Ç¥Ñ¥Ã¥±¡¼¥¸¤òÌ䤤¹ç¤ï¤»/¸¡¾Ú¤·¤Þ¤¹¡£" -#: lib/poptQV.c:126 +#: lib/poptQV.c:125 msgid "rpm query mode" msgstr "rpm Ì䤤¹ç¤ï¤»¥â¡¼¥É" -#: lib/poptQV.c:128 +#: lib/poptQV.c:127 msgid "query/verify a header instance" msgstr "¥Ø¥Ã¥À¥¤¥ó¥¹¥¿¥ó¥¹¤ÎÌ䤤¹ç¤ï¤»/¸¡¾Ú¤ò¤·¤Þ¤¹¡£" -#: lib/poptQV.c:130 +#: lib/poptQV.c:129 msgid "query a spec file" msgstr "spec ¥Õ¥¡¥¤¥ë¤òÌ䤤¹ç¤ï¤»¤Þ¤¹¡£" -#: lib/poptQV.c:130 +#: lib/poptQV.c:129 msgid "<spec>" msgstr "<spec>" -#: lib/poptQV.c:132 +#: lib/poptQV.c:131 msgid "query/verify package(s) from install transaction" msgstr "" "¥¤¥ó¥¹¥È¡¼¥ë¥È¥é¥ó¥¶¥¯¥·¥ç¥ó¤«¤é¤Î¥Ñ¥Ã¥±¡¼¥¸¤ÎÌ䤤¹ç¤ï¤»/¸¡¾Ú¤ò¤·¤Þ¤¹¡£" -#: lib/poptQV.c:134 +#: lib/poptQV.c:133 msgid "query the package(s) triggered by the package" msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ë¤è¤Ã¤Æ¥È¥ê¥¬¡¼¤µ¤ì¤ë¥Ñ¥Ã¥±¡¼¥¸¤òÌ䤤¹ç¤ï¤»¤Þ¤¹¡£" -#: lib/poptQV.c:136 +#: lib/poptQV.c:135 msgid "rpm verify mode" msgstr "RPM ¸¡¾Ú¥â¡¼¥É" -#: lib/poptQV.c:138 +#: lib/poptQV.c:137 msgid "query/verify the package(s) which require a dependency" msgstr "°Í¸À¤òÍ׵᤹¤ë¥Ñ¥Ã¥±¡¼¥¸¤ÎÌ䤤¹ç¤ï¤»/¸¡¾Ú¤ò¤·¤Þ¤¹¡£" -#: lib/poptQV.c:140 +#: lib/poptQV.c:139 msgid "query/verify the package(s) which provide a dependency" msgstr "°Í¸À¤òÄ󶡤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤ÎÌ䤤¹ç¤ï¤»/¸¡¾Ú¤ò¤·¤Þ¤¹¡£" -#: lib/poptQV.c:143 +#: lib/poptQV.c:142 msgid "create transaction set" msgstr "¥È¥é¥ó¥¶¥¯¥·¥ç¥ó¥»¥Ã¥È¤ÎºîÀ®" -#: lib/poptQV.c:145 +#: lib/poptQV.c:144 msgid "do not order transaction set" msgstr "¥È¥é¥ó¥¶¥¯¥·¥ç¥ó¥»¥Ã¥È¤òʤÓÂؤ¨¤Þ¤»¤ó¡£" -#: lib/poptQV.c:147 +#: lib/poptQV.c:146 msgid "do not glob arguments" msgstr "°ú¿ô¤ò glob ¥Ñ¥¿¡¼¥ó¤È¤·¤Æ¤ß¤Ê¤·¤Þ¤»¤ó¡£" -#: lib/poptQV.c:149 +#: lib/poptQV.c:148 msgid "do not process non-package files as manifests" msgstr "¥ê¥¹¥ÈÆâ¤ÎÈó¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¤ò½èÍý¤·¤Þ¤»¤ó¡£" -#: lib/poptQV.c:151 +#: lib/poptQV.c:150 msgid "do not read headers" msgstr "¥Ø¥Ã¥À¡¼¤òÆɤ߹þ¤ß¤Þ¤»¤ó¡£" -#: lib/poptQV.c:258 +#: lib/poptQV.c:257 msgid "list all configuration files" msgstr "Á´¤Æ¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤òÎóµó¤·¤Þ¤¹¡£" -#: lib/poptQV.c:260 +#: lib/poptQV.c:259 msgid "list all documentation files" msgstr "Á´¤Æ¤Î¥É¥¥å¥á¥ó¥È¥Õ¥¡¥¤¥ë¤òÎóµó¤·¤Þ¤¹¡£" -#: lib/poptQV.c:262 +#: lib/poptQV.c:261 msgid "dump basic file information" msgstr "´ðËÜŪ¤Ê¥Õ¥¡¥¤¥ë¾ðÊó¤ò¥À¥ó¥×¤·¤Þ¤¹¡£" -#: lib/poptQV.c:266 +#: lib/poptQV.c:265 msgid "list files in package" msgstr "¥Ñ¥Ã¥±¡¼¥¸Ãæ¤Î¥Õ¥¡¥¤¥ë¤òÎóµó¤·¤Þ¤¹¡£" -#: lib/poptQV.c:271 +#: lib/poptQV.c:270 #, c-format msgid "skip %%ghost files" msgstr "%%ghost ¥Õ¥¡¥¤¥ë¤ò¥¹¥¥Ã¥×¤·¤Þ¤¹¡£" -#: lib/poptQV.c:275 +#: lib/poptQV.c:274 #, c-format msgid "skip %%license files" msgstr "%%license ¥Õ¥¡¥¤¥ë¤ò¥¹¥¥Ã¥×¤·¤Þ¤¹¡£" -#: lib/poptQV.c:278 +#: lib/poptQV.c:277 #, c-format msgid "skip %%readme files" msgstr "%%readme ¥Õ¥¡¥¤¥ë¤ò¥¹¥¥Ã¥×¤·¤Þ¤¹¡£" -#: lib/poptQV.c:284 +#: lib/poptQV.c:283 msgid "use the following query format" msgstr "°Ê²¼¤ÎÌ䤤¹ç¤ï¤»¥Õ¥©¡¼¥Þ¥Ã¥È¤ò»ÈÍѤ·¤Þ¤¹¡£" -#: lib/poptQV.c:286 +#: lib/poptQV.c:285 msgid "substitute i18n sections into spec file" msgstr "spec ¥Õ¥¡¥¤¥ë¤Î i18n Éôʬ¤ò½ñ¤´¹¤¨¤Þ¤¹¡£" -#: lib/poptQV.c:288 +#: lib/poptQV.c:287 msgid "display the states of the listed files" msgstr "Îóµó¤·¤¿¥Õ¥¡¥¤¥ë¤Î¾õÂÖ¤òɽ¼¨¤·¤Þ¤¹¡£" -#: lib/poptQV.c:314 +#: lib/poptQV.c:313 msgid "don't verify size of files" msgstr "¥Õ¥¡¥¤¥ë¥µ¥¤¥º¤ò¸¡¾Ú¤·¤Þ¤»¤ó¡£" -#: lib/poptQV.c:317 +#: lib/poptQV.c:316 msgid "don't verify symlink path of files" msgstr "¥Õ¥¡¥¤¥ë¤Î¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤ò¸¡¾Ú¤·¤Þ¤»¤ó¡£" -#: lib/poptQV.c:320 +#: lib/poptQV.c:319 msgid "don't verify owner of files" msgstr "¥Õ¥¡¥¤¥ë¤Î½êͼԤò¸¡¾Ú¤·¤Þ¤»¤ó¡£" -#: lib/poptQV.c:323 +#: lib/poptQV.c:322 msgid "don't verify group of files" msgstr "¥Õ¥¡¥¤¥ë¤Î½êÍ¥°¥ë¡¼¥×¤ò¸¡¾Ú¤·¤Þ¤»¤ó¡£" -#: lib/poptQV.c:326 +#: lib/poptQV.c:325 msgid "don't verify modification time of files" msgstr "¥Õ¥¡¥¤¥ë¤ÎºÇ½ª¹¹¿·Æü¤ò¸¡¾Ú¤·¤Þ¤»¤ó¡£" -#: lib/poptQV.c:329 lib/poptQV.c:332 +#: lib/poptQV.c:328 lib/poptQV.c:331 msgid "don't verify mode of files" msgstr "¥Õ¥¡¥¤¥ë¤Î¥â¡¼¥É¤ò¸¡¾Ú¤·¤Þ¤»¤ó¡£" -#: lib/poptQV.c:335 +#: lib/poptQV.c:334 msgid "don't verify file security contexts" msgstr "¥Õ¥¡¥¤¥ë¥»¥¥å¥ê¥Æ¥£¥³¥ó¥Æ¥¥¹¥È¤ò¸¡¾Ú¤·¤Þ¤»¤ó¡£" -#: lib/poptQV.c:337 +#: lib/poptQV.c:336 msgid "don't verify files in package" msgstr "¥Ñ¥Ã¥±¡¼¥¸Ãæ¤Î¥Õ¥¡¥¤¥ë¤ò¸¡¾Ú¤·¤Þ¤»¤ó¡£" -#: lib/poptQV.c:340 lib/poptQV.c:343 tools/rpmgraph.c:266 +#: lib/poptQV.c:339 lib/poptQV.c:342 tools/rpmgraph.c:266 msgid "don't verify package dependencies" msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î°Í¸´Ø·¸¤ò¸¡¾Ú¤·¤Þ¤»¤ó¡£" -#: lib/poptQV.c:348 lib/poptQV.c:352 lib/poptQV.c:355 lib/poptQV.c:358 +#: lib/poptQV.c:347 lib/poptQV.c:351 lib/poptQV.c:354 lib/poptQV.c:357 msgid "don't execute verify script(s)" msgstr "¸¡¾Ú¥¹¥¯¥ê¥×¥È¤ò¼Â¹Ô¤·¤Þ¤»¤ó¡£" -#: lib/poptQV.c:382 +#: lib/poptQV.c:381 msgid "don't verify GPG V3 DSA signature(s)" msgstr "GPG V3 RSA ½ð̾¤ò¸¡¾Ú¤·¤Þ¤»¤ó¡£" -#: lib/poptQV.c:385 +#: lib/poptQV.c:384 msgid "don't verify PGP V3 RSA/MD5 signature(s)" msgstr "PGP V3 RSA/MD5 ½ð̾¤ò¸¡¾Ú¤·¤Þ¤»¤ó¡£" -#: lib/poptQV.c:400 +#: lib/poptQV.c:399 msgid "sign package(s) (identical to --resign)" msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ë½ð̾¤·¤Þ¤¹ (--resign ¤ÈƱ°ì¤Ç¤¹)" -#: lib/poptQV.c:402 +#: lib/poptQV.c:401 msgid "verify package signature(s)" msgstr "½ð̾¤Î¸¡¾Ú¤ò¹Ô¤¤¤Þ¤¹¡£" -#: lib/poptQV.c:404 +#: lib/poptQV.c:403 msgid "delete package signatures" msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î½ð̾¤òºï½ü¤¹¤ë" -#: lib/poptQV.c:406 +#: lib/poptQV.c:405 msgid "import an armored public key" msgstr "ASCII ²½¤µ¤ì¤¿¸ø³«¸°¤ò¼è¤ê¹þ¤ß¤Þ¤¹¡£" -#: lib/poptQV.c:408 +#: lib/poptQV.c:407 msgid "sign package(s) (identical to --addsign)" msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ë½ð̾¤¹¤ë (--addsign ¤ÈƱ°ì¤Ç¤¹)" -#: lib/poptQV.c:410 +#: lib/poptQV.c:409 msgid "generate signature" msgstr "½ð̾¤òÀ¸À®¤·¤Þ¤¹¡£" @@ -2727,38 +2727,38 @@ msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï %s ¤òËþ¤¿¤·¤Þ¤»¤ó: %s\n" msgid "%s skipped due to missingok flag\n" msgstr "%s ¤Ï missingok ¥Õ¥é¥°¤Î¤¿¤á¥¹¥¥Ã¥×¤·¤Þ¤¹\n" -#: lib/rpmfi.c:846 +#: lib/rpmfi.c:850 msgid "========== relocations\n" msgstr "========== ºÆÇÛÃÖ\n" -#: lib/rpmfi.c:850 +#: lib/rpmfi.c:854 #, c-format msgid "%5d exclude %s\n" msgstr "%5d ½ü³°¤·¤Æ¤¤¤Þ¤¹ %s\n" -#: lib/rpmfi.c:853 +#: lib/rpmfi.c:857 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "%5d ºÆÇÛÃÖ¤·¤Æ¤¤¤Þ¤¹ %s -> %s\n" -#: lib/rpmfi.c:987 +#: lib/rpmfi.c:991 #, c-format msgid "excluding %s %s\n" msgstr "%s %s ¤ò½ü³°¤·¤Æ¤¤¤Þ¤¹¡£\n" -#: lib/rpmfi.c:997 +#: lib/rpmfi.c:1001 #, c-format msgid "relocating %s to %s\n" msgstr "%s ¤ò %s ¤ËºÆÇÛÃÖ¤·¤Æ¤¤¤Þ¤¹¡£\n" -#: lib/rpmfi.c:1089 +#: lib/rpmfi.c:1093 #, c-format msgid "relocating directory %s to %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤ò %s ¤ËºÆÇÛÃÖ¤·¤Æ¤¤¤Þ¤¹\n" #: lib/rpmgi.c:81 lib/rpminstall.c:124 lib/rpminstall.c:480 -#: lib/rpminstall.c:615 lib/rpminstall.c:1041 lib/rpmts.c:643 -#: tools/rpmgraph.c:121 tools/rpmgraph.c:158 +#: lib/rpminstall.c:615 lib/rpmts.c:643 tools/rpmgraph.c:121 +#: tools/rpmgraph.c:158 #, c-format msgid "open of %s failed: %s\n" msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s\n" @@ -2769,7 +2769,7 @@ msgid "unknown tag: \"%s\"\n" msgstr "ÉÔÌÀ¤Ê¥¿¥°: \"%s\"\n" #: lib/rpmgi.c:628 lib/rpminstall.c:659 lib/rpminstall.c:834 -#: lib/rpminstall.c:1267 lib/transaction.c:1031 tools/rpmgraph.c:196 +#: lib/rpminstall.c:1084 lib/transaction.c:1026 tools/rpmgraph.c:196 msgid "Failed dependencies:\n" msgstr "°Í¸À¤Î·çÇ¡:\n" @@ -2886,16 +2886,16 @@ msgstr "%s ¤ò¥ª¡¼¥×¥ó¤Ç¤¤Þ¤»¤ó: %s\n" msgid "Installing %s\n" msgstr "%s ¤ò¥¤¥ó¥¹¥È¡¼¥ëÃæ¤Ç¤¹¡£\n" -#: lib/rpminstall.c:1261 lib/transaction.c:1024 +#: lib/rpminstall.c:1078 lib/transaction.c:1019 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ (+%d/-%d) ¤ò %-24.24s ¤Ø¥í¡¼¥ë¥Ð¥Ã¥¯(0x%08x):\n" -#: lib/rpminstall.c:1292 lib/transaction.c:1075 +#: lib/rpminstall.c:1109 lib/transaction.c:1070 msgid "Cleaning up repackaged packages:\n" msgstr "ºÆ¥Ñ¥Ã¥±¡¼¥¸¤µ¤ì¤¿¥Ñ¥Ã¥±¡¼¥¸¤òºï½üÃæ:\n" -#: lib/rpminstall.c:1299 lib/transaction.c:1081 +#: lib/rpminstall.c:1116 lib/transaction.c:1076 #, c-format msgid "\tRemoving %s:\n" msgstr "\t%s ¤òºï½üÃæ:\n" @@ -3038,97 +3038,97 @@ msgstr "%s ¤Ï %s%s ¤È¶¥¹ç¤·¤Þ¤¹¡£" msgid "unknown error %d encountered while manipulating package %s" msgstr "ÉÔÌÀ¤Ê¥¨¥é¡¼ %d ¤¬¥Ñ¥Ã¥±¡¼¥¸ %s ÁàºîÃæ¤ËȯÀ¸¤·¤Þ¤·¤¿" -#: lib/rpmrc.c:199 +#: lib/rpmrc.c:213 #, c-format msgid "missing second ':' at %s:%d\n" msgstr "2ÈÖÌܤΠ':' ¤¬¤¢¤ê¤Þ¤»¤ó (%s:%d ¤Ç)\n" -#: lib/rpmrc.c:202 +#: lib/rpmrc.c:216 #, c-format msgid "missing architecture name at %s:%d\n" msgstr "%s:%d ¤Ë¥¢¡¼¥¥Æ¥¯¥Á¥ã̾¤¬¤¢¤ê¤Þ¤»¤ó\n" -#: lib/rpmrc.c:356 +#: lib/rpmrc.c:370 #, c-format msgid "Incomplete data line at %s:%d\n" msgstr "%s:%d ¤Ç¥Ç¡¼¥¿¹Ô¤¬ÉÔ´°Á´¤Ç¤¹\n" -#: lib/rpmrc.c:361 +#: lib/rpmrc.c:375 #, c-format msgid "Too many args in data line at %s:%d\n" msgstr "%s:%d ¤Ç¥Ç¡¼¥¿¹Ô¤Ë°ú¿ô¤¬Â¿¤¹¤®¤Þ¤¹\n" -#: lib/rpmrc.c:369 +#: lib/rpmrc.c:383 #, c-format msgid "Bad arch/os number: %s (%s:%d)\n" msgstr "ÉÔÀµ¤Ê arch/os ÈÖ¹æ: %s (%s:%d)\n" -#: lib/rpmrc.c:406 +#: lib/rpmrc.c:420 #, c-format msgid "Incomplete default line at %s:%d\n" msgstr "%s:%d ¤ÇÉÔ´°Á´¤Ê¥Ç¥Õ¥©¥ë¥È¹Ô\n" -#: lib/rpmrc.c:411 +#: lib/rpmrc.c:425 #, c-format msgid "Too many args in default line at %s:%d\n" msgstr "%s:%d ¤Ç¥Ç¥Õ¥©¥ë¥È¹Ô¤Ë°ú¿ô¤¬Â¿¤¹¤®¤Þ¤¹\n" -#: lib/rpmrc.c:577 +#: lib/rpmrc.c:591 #, c-format msgid "Failed to read %s: %s.\n" msgstr "%s ¤ÎÆɤ߹þ¤ß¤Ë¼ºÇÔ: %s¡£\n" -#: lib/rpmrc.c:615 +#: lib/rpmrc.c:629 #, c-format msgid "missing ':' (found 0x%02x) at %s:%d\n" msgstr "':' ¤¬¤¢¤ê¤Þ¤»¤ó (0x%02x ¤¬¸«¤Ä¤«¤Ã¤¿) (%s:%d)\n" -#: lib/rpmrc.c:632 lib/rpmrc.c:706 +#: lib/rpmrc.c:646 lib/rpmrc.c:710 #, c-format msgid "missing argument for %s at %s:%d\n" msgstr "%s ¤Î°ú¿ô¤¬¤¢¤ê¤Þ¤»¤ó (%s:%d)\n" -#: lib/rpmrc.c:649 lib/rpmrc.c:671 +#: lib/rpmrc.c:663 #, c-format msgid "%s expansion failed at %s:%d \"%s\"\n" msgstr "%s ¤ÎŸ³«¤Ë¼ºÇÔ¤·¤Þ¤·¤¿ (%s:%d) \"%s\"\n" -#: lib/rpmrc.c:658 +#: lib/rpmrc.c:672 #, c-format msgid "cannot open %s at %s:%d: %s\n" msgstr "%s ¤ò¥ª¡¼¥×¥ó¤Ç¤¤Þ¤»¤ó (%s:%d): %s\n" -#: lib/rpmrc.c:698 +#: lib/rpmrc.c:702 #, c-format msgid "missing architecture for %s at %s:%d\n" msgstr "%s ÍѤΥ¢¡¼¥¥Æ¥¯¥Á¥ã¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó (%s:%d)\n" -#: lib/rpmrc.c:765 +#: lib/rpmrc.c:769 #, c-format msgid "bad option '%s' at %s:%d\n" msgstr "ÉÔÀµ¤Ê¥ª¥×¥·¥ç¥ó¤Ç¤¹: '%s' (%s:%d)\n" -#: lib/rpmrc.c:1564 +#: lib/rpmrc.c:1568 #, c-format msgid "Unknown system: %s\n" msgstr "ÉÔÌÀ¤Ê¥·¥¹¥Æ¥à: %s\n" -#: lib/rpmrc.c:1565 +#: lib/rpmrc.c:1569 #, c-format msgid "Please contact %s\n" msgstr "" -#: lib/rpmrc.c:1802 +#: lib/rpmrc.c:1806 #, c-format msgid "Cannot expand %s\n" msgstr "%s ¤òŸ³«¤Ç¤¤Þ¤»¤ó¡£\n" -#: lib/rpmrc.c:1807 +#: lib/rpmrc.c:1811 #, c-format msgid "Cannot read %s, HOME is too large.\n" msgstr "%s ¤òÆɤ߹þ¤á¤Þ¤»¤ó¡£HOME ¤¬Â礤¹¤®¤Þ¤¹¡£\n" -#: lib/rpmrc.c:1824 +#: lib/rpmrc.c:1828 #, c-format msgid "Unable to open %s for reading: %s.\n" msgstr "%s ¤òÆɤ߹þ¤ßÍѤ˥ª¡¼¥×¥ó¤Ç¤¤Þ¤»¤ó: %s¡£\n" @@ -3418,162 +3418,162 @@ msgstr "MD5 ¥À¥¤¥¸¥§¥¹¥È¤¬ÇË»: ¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n" msgid "Signature: UNKNOWN (%d)\n" msgstr "½ð̾: ̤ÃÎ(%d)\n" -#: lib/transaction.c:935 +#: lib/transaction.c:930 #, c-format msgid "excluding directory %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤Î½ü³°: %s\n" -#: lib/transaction.c:1022 +#: lib/transaction.c:1017 msgid "Transaction failed...rolling back\n" msgstr "¥È¥é¥ó¥¶¥¯¥·¥ç¥ó¤Ë¼ºÇÔ¤·¤Þ¤·¤¿...¥í¡¼¥ë¥Ð¥Ã¥¯Ãæ\n" -#: lib/transaction.c:1042 +#: lib/transaction.c:1037 msgid "Could not order auto-rollback transaction!\n" msgstr "¼«Æ°¥í¡¼¥ë¥Ð¥Ã¥¯¥È¥é¥ó¥¶¥¯¥·¥ç¥ó¤ò½ç½øÉÕ¤±¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿!\n" -#: lib/transaction.c:1132 +#: lib/transaction.c:1127 msgid "Getting repackaged header from transaction element\n" msgstr "¥È¥é¥ó¥¶¥¯¥·¥ç¥ó¤ÎÍ×ÁǤ«¤éºÆ¥Ñ¥Ã¥±¡¼¥¸¤µ¤ì¤¿¥Ø¥Ã¥À¤ò¼èÆÀ¤·¤Æ¤¤¤Þ¤¹¡£\n" -#: lib/transaction.c:1157 +#: lib/transaction.c:1152 #, c-format msgid "\tLooking for %s...\n" msgstr "\t%s ¤ò¸¡º÷Ãæ...\n" -#: lib/transaction.c:1161 +#: lib/transaction.c:1156 msgid "\tMatches found.\n" msgstr "\t°ìÃפò¸«¤Ä¤±¤Þ¤·¤¿¡£\n" -#: lib/transaction.c:1165 +#: lib/transaction.c:1160 msgid "\tNo matches found.\n" msgstr "\t°ìÃפ¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¡£\n" -#: lib/transaction.c:1178 +#: lib/transaction.c:1173 msgid "\tRepackaged package not found!.\n" msgstr "\tºÆ¥Ñ¥Ã¥±¡¼¥¸¤µ¤ì¤¿¥Ñ¥Ã¥±¡¼¥¸¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó!\n" -#: lib/transaction.c:1199 +#: lib/transaction.c:1194 msgid "\tREMOVETID matched INSTALLTID.\n" msgstr "\tREMOVETID ¤¬ INSTALLTID ¤Ë°ìÃפ·¤Þ¤·¤¿¡£\n" -#: lib/transaction.c:1201 +#: lib/transaction.c:1196 #, c-format msgid "\t\tName: %s.\n" msgstr "\t\t̾Á°: %s.\n" -#: lib/transaction.c:1224 +#: lib/transaction.c:1219 #, c-format msgid "\tRepackaged Package was %s...\n" msgstr "\tºÆ¥Ñ¥Ã¥±¡¼¥¸¤µ¤ì¤¿¥Ñ¥Ã¥±¡¼¥¸¤Ï %s ¤Ç¤¹...\n" -#: lib/transaction.c:1268 +#: lib/transaction.c:1263 #, fuzzy msgid "Adding install element to auto-rollback transaction.\n" msgstr "¼«Æ°¥í¡¼¥ë¥Ð¥Ã¥¯¥È¥é¥ó¥¶¥¯¥·¥ç¥ó¤Ë %s ¤òÄɲä·¤Þ¤·¤¿¡£\n" -#: lib/transaction.c:1277 +#: lib/transaction.c:1272 msgid "Could not get install element database instance!\n" msgstr "¥¤¥ó¥¹¥È¡¼¥ëÍ×Áǥǡ¼¥¿¥Ù¡¼¥¹¤Î¥¤¥ó¥¹¥¿¥ó¥¹¤ò¼èÆÀ¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿!\n" -#: lib/transaction.c:1290 +#: lib/transaction.c:1285 msgid "Could not get header for auto-rollback transaction!\n" msgstr "¼«Æ°¥í¡¼¥ë¥Ð¥Ã¥¯¥È¥é¥ó¥¶¥¯¥·¥ç¥ó¤Î¥Ø¥Ã¥À¤ò¼èÆÀ¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿¡£\n" -#: lib/transaction.c:1300 +#: lib/transaction.c:1295 #, c-format msgid "\tAdded repackaged package header: %s.\n" msgstr "\tºÆ¥Ñ¥Ã¥±¡¼¥¸¤µ¤ì¤¿¥Ñ¥Ã¥±¡¼¥¸¥Ø¥Ã¥À¤òÄɲä·¤Þ¤·¤¿: %s.\n" -#: lib/transaction.c:1302 lib/transaction.c:1313 +#: lib/transaction.c:1297 lib/transaction.c:1308 #, c-format msgid "\tAdded from install element %s.\n" msgstr "\t¥¤¥ó¥¹¥È¡¼¥ëÍ×ÁÇ %s ¤«¤éÄɲä·¤Þ¤·¤¿¡£\n" -#: lib/transaction.c:1311 +#: lib/transaction.c:1306 msgid "\tAdded erase element.\n" msgstr "\tºï½üÍ×ÁǤòÄɲä·¤Þ¤·¤¿¡£\n" -#: lib/transaction.c:1320 +#: lib/transaction.c:1315 msgid "Could not get repackaged header for auto-rollback transaction!\n" msgstr "" "¼«Æ°¥í¡¼¥ë¥Ð¥Ã¥¯¥È¥é¥ó¥¶¥¯¥·¥ç¥ó¤ÎºÆ¥Ñ¥Ã¥±¡¼¥¸¥Ø¥Ã¥À¤ò¼èÆÀ¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿!\n" -#: lib/transaction.c:1327 +#: lib/transaction.c:1322 #, fuzzy msgid "Add erase element to auto-rollback transaction.\n" msgstr "¼«Æ°¥í¡¼¥ë¥Ð¥Ã¥¯¥È¥é¥ó¥¶¥¯¥·¥ç¥ó¤Ëºï½üÍ×ÁǤòÄɲäǤ¤Þ¤»¤ó¡£\n" -#: lib/transaction.c:1335 +#: lib/transaction.c:1330 #, fuzzy msgid "\tFound existing upgrade element.\n" msgstr "\tºï½üÍ×ÁǤòÄɲä·¤Þ¤·¤¿¡£\n" -#: lib/transaction.c:1336 +#: lib/transaction.c:1331 #, fuzzy, c-format msgid "\tNot adding erase element for %s.\n" msgstr "\tºï½üÍ×ÁǤòÄɲä·¤Þ¤·¤¿¡£\n" -#: lib/transaction.c:1353 +#: lib/transaction.c:1348 #, c-format msgid "\tAdded repackaged package %s.\n" msgstr "\tºÆ¥Ñ¥Ã¥±¡¼¥¸¤µ¤ì¤¿¥Ñ¥Ã¥±¡¼¥¸ %s ¤òÄɲä·¤Þ¤·¤¿¡£\n" -#: lib/transaction.c:1355 +#: lib/transaction.c:1350 #, fuzzy, c-format msgid "\tAdded from erase element %s.\n" msgstr "\tºï½üÍ×ÁǤòÄɲä·¤Þ¤·¤¿¡£\n" -#: lib/transaction.c:1360 +#: lib/transaction.c:1355 msgid "Could not add erase element to auto-rollback transaction.\n" msgstr "¼«Æ°¥í¡¼¥ë¥Ð¥Ã¥¯¥È¥é¥ó¥¶¥¯¥·¥ç¥ó¤Ëºï½üÍ×ÁǤòÄɲäǤ¤Þ¤»¤ó¡£\n" -#: lib/transaction.c:1366 +#: lib/transaction.c:1361 msgid "\tNo repackaged package...nothing to do.\n" msgstr "\tºÆ¥Ñ¥Ã¥±¡¼¥¸¤µ¤ì¤¿¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Þ¤»¤ó...²¿¤â¤·¤Þ¤»¤ó¡£\n" -#: lib/transaction.c:1372 +#: lib/transaction.c:1367 msgid "Failure reading repackaged package!\n" msgstr "ºÆ¥Ñ¥Ã¥±¡¼¥¸¤µ¤ì¤¿¥Ñ¥Ã¥±¡¼¥¸¤ÎÆɤ߹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿!\n" -#: lib/transaction.c:1495 +#: lib/transaction.c:1490 #, c-format msgid "sanity checking %d elements\n" msgstr "%d ¸Ä¤ÎÍ×ÁǤηòÁ´À¥Á¥§¥Ã¥¯Ãæ\n" -#: lib/transaction.c:1581 +#: lib/transaction.c:1576 msgid "running pre-transaction scripts\n" msgstr "¥È¥é¥ó¥¶¥¯¥·¥ç¥óÁ°¤Î¥¹¥¯¥ê¥×¥È¤ò¼Â¹ÔÃæ\n" -#: lib/transaction.c:1655 +#: lib/transaction.c:1650 #, c-format msgid "computing %d file fingerprints\n" msgstr "%d ¥Õ¥¡¥¤¥ë¤Î»ØÌæ¤ò·×»»¤·¤Æ¤¤¤Þ¤¹¡£\n" -#: lib/transaction.c:1739 +#: lib/transaction.c:1734 msgid "computing file dispositions\n" msgstr "¥Õ¥¡¥¤¥ë¤ÎÀ¼Á¤ò·×»»¤·¤Æ¤¤¤Þ¤¹¡£\n" -#: lib/transaction.c:1932 +#: lib/transaction.c:1927 msgid "Creating auto-rollback transaction\n" msgstr "¼«Æ°¥í¡¼¥ë¥Ð¥Ã¥¯¥È¥é¥ó¥¶¥¯¥·¥ç¥ó¤òºîÀ®¤·¤Æ¤¤¤Þ¤¹¡£\n" -#: lib/transaction.c:2086 +#: lib/transaction.c:2077 msgid "Add failed. Could not read package header.\n" msgstr "Äɲä˼ºÇÔ¤·¤Þ¤·¤¿¡£¥Ñ¥Ã¥±¡¼¥¸¥Ø¥Ã¥À¤òÆɤ߹þ¤á¤Þ¤»¤ó¤Ç¤·¤¿¡£\n" -#: lib/transaction.c:2170 +#: lib/transaction.c:2161 msgid "Add failed in rpmpsmStage().\n" msgstr "rpmpsmStage() ¤ÇÄɲä˼ºÇÔ¤·¤Þ¤·¤¿¡£\n" -#: lib/transaction.c:2214 +#: lib/transaction.c:2205 msgid "Add failed. Could not get file list.\n" msgstr "Äɲä˼ºÇÔ¤·¤Þ¤·¤¿¡£¥Õ¥¡¥¤¥ë°ìÍ÷¤Î¼èÆÀ¤¬¤Ç¤¤Þ¤»¤ó¡£\n" -#: lib/transaction.c:2263 +#: lib/transaction.c:2254 msgid "Erase failed failed in rpmpsmStage().\n" msgstr "rpmpsmStage() ¤Çºï½ü¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£\n" -#: lib/transaction.c:2324 +#: lib/transaction.c:2315 msgid "running post-transaction scripts\n" msgstr "¥È¥é¥ó¥¶¥¯¥·¥ç¥ó¸å¤Î¥¹¥¯¥ê¥×¥È¤ò¼Â¹ÔÃæ\n" @@ -3968,86 +3968,86 @@ msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¥¤¥ó¥Ç¥Ã¥¯¥¹ %s/%s ¤ò¥ª¡¼¥×¥ó¤·¤Þ¤¹ %s (mode=0x%x)\n" msgid "======================== active %d empty %d\n" msgstr "======================== ͸ú %d ¶õ %d\n" -#: rpmio/macro.c:394 +#: rpmio/macro.c:396 #, c-format msgid "%3d>%*s(empty)" msgstr "%3d>%*s(¶õ)" -#: rpmio/macro.c:437 +#: rpmio/macro.c:439 #, c-format msgid "%3d<%*s(empty)\n" msgstr "%3d<%*s(¶õ)\n" -#: rpmio/macro.c:664 rpmio/macro.c:705 +#: rpmio/macro.c:608 rpmio/macro.c:1090 rpmio/macro.c:1123 rpmio/macro.c:1863 +msgid "Target buffer overflow\n" +msgstr "¥¿¡¼¥²¥Ã¥È¥Ð¥Ã¥Õ¥¡¤Î¥ª¡¼¥Ð¥Õ¥í¡¼¤Ç¤¹¡£\n" + +#: rpmio/macro.c:671 rpmio/macro.c:712 #, c-format msgid "Macro %%%s has unterminated body\n" msgstr "¥Þ¥¯¥í %%%s ¤Ï¥Ü¥Ç¥£¤¬½ªÃ¼¤·¤Æ¤¤¤Þ¤»¤ó¡£\n" -#: rpmio/macro.c:727 +#: rpmio/macro.c:734 #, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "¥Þ¥¯¥í %%%s ¤ÏÉÔÀµ¤Ê̾Á°¤Ç¤¹ (%%define)\n" -#: rpmio/macro.c:733 +#: rpmio/macro.c:740 #, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "¥Þ¥¯¥í %%%s ¤Ï¥ª¥×¥·¥ç¥ó¤¬½ªÃ¼¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n" -#: rpmio/macro.c:738 +#: rpmio/macro.c:745 #, c-format msgid "Macro %%%s has empty body\n" msgstr "¥Þ¥¯¥í %%%s ¤Î¥Ü¥Ç¥£¤Ï¶õ¤Ç¤¹¡£\n" -#: rpmio/macro.c:744 +#: rpmio/macro.c:751 #, c-format msgid "Macro %%%s failed to expand\n" msgstr "¥Þ¥¯¥í %%%s ¤ÎŸ³«¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£\n" -#: rpmio/macro.c:779 +#: rpmio/macro.c:786 #, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "¥Þ¥¯¥í %%%s ¤ÏÉÔÀµ¤Ê̾Á°¤Ç¤¹ (%%undefine)\n" -#: rpmio/macro.c:897 +#: rpmio/macro.c:904 #, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "¥Þ¥¯¥í %%%s (%s) ¤Ï¥ì¥Ù¥ë %d ̤Ëþ¤Ç»ÈÍѤµ¤ì¤Þ¤»¤ó¤Ç¤·¤¿¡£\n" -#: rpmio/macro.c:1024 +#: rpmio/macro.c:1031 #, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "ÉÔÌÀ¤Ê¥ª¥×¥·¥ç¥ó %c (%s(%s)Ãæ¤Ë)\n" -#: rpmio/macro.c:1224 +#: rpmio/macro.c:1239 #, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "ºÆµ¢¤Î¿¼¤µ (%d) ¤¬ºÇÂçÃÍ (%d) ¤è¤êÂ礤¯¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£\n" -#: rpmio/macro.c:1297 rpmio/macro.c:1314 +#: rpmio/macro.c:1312 rpmio/macro.c:1329 #, c-format msgid "Unterminated %c: %s\n" msgstr "½ªÃ¼¤µ¤ì¤Æ¤¤¤Ê¤¤ %c: %s\n" -#: rpmio/macro.c:1355 +#: rpmio/macro.c:1370 #, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "%% ¤Î¸å¤í¤Ë¹½Ê¸²òÀϤǤ¤Ê¤¤¥Þ¥¯¥í¤¬Â³¤¤¤Æ¤¤¤Þ¤¹¡£\n" -#: rpmio/macro.c:1512 +#: rpmio/macro.c:1527 #, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "¥Þ¥¯¥í %%%.*s ¤Ï¸«¤Ä¤«¤ê¤Þ¤»¤ó¡£¥¹¥¥Ã¥×¤·¤Þ¤¹¡£\n" -#: rpmio/macro.c:1848 -msgid "Target buffer overflow\n" -msgstr "¥¿¡¼¥²¥Ã¥È¥Ð¥Ã¥Õ¥¡¤Î¥ª¡¼¥Ð¥Õ¥í¡¼¤Ç¤¹¡£\n" - -#: rpmio/macro.c:2056 rpmio/macro.c:2062 +#: rpmio/macro.c:2076 rpmio/macro.c:2082 #, c-format msgid "File %s: %s\n" msgstr "¥Õ¥¡¥¤¥ë %s: %s\n" -#: rpmio/macro.c:2065 +#: rpmio/macro.c:2085 #, c-format msgid "File %s is smaller than %u bytes\n" msgstr "¥Õ¥¡¥¤¥ë %s ¤Ï %u ¥Ð¥¤¥È¤è¤ê¾®¤µ¤¯¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£\n" @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.4\n" "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n" -"POT-Creation-Date: 2007-08-21 08:04+0200\n" +"POT-Creation-Date: 2007-08-30 18:37+0200\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" @@ -1264,20 +1264,20 @@ msgstr "ÆÐÅ°Áö Á¦ÀÛ ÀÇÁ¸¼ºÀ» °Ë»çÇÏÁö ¾Ê½À´Ï´Ù" msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "(±âÁ¸ÀÇ) rpm[23] ÆÐŰ¡°ú ȣȯÇÏ´Â ÆÐÅ°Áö Çì´õ¸¦ »ý¼ºÇÕ´Ï´Ù" -#: build/poptBT.c:229 lib/poptALL.c:273 lib/poptI.c:282 lib/poptQV.c:363 -#: lib/poptQV.c:372 lib/poptQV.c:413 +#: build/poptBT.c:229 lib/poptALL.c:273 lib/poptI.c:282 lib/poptQV.c:362 +#: lib/poptQV.c:371 lib/poptQV.c:412 #, fuzzy msgid "don't verify package digest(s)" msgstr "ÆÐÅ°ÁöÀÇ ÀÇÁ¸¼ºÀ» °Ë»çÇÏÁö ¾Ê½À´Ï´Ù" -#: build/poptBT.c:231 lib/poptALL.c:275 lib/poptI.c:284 lib/poptQV.c:366 -#: lib/poptQV.c:374 lib/poptQV.c:416 +#: build/poptBT.c:231 lib/poptALL.c:275 lib/poptI.c:284 lib/poptQV.c:365 +#: lib/poptQV.c:373 lib/poptQV.c:415 #, fuzzy msgid "don't verify database header(s) when retrieved" msgstr "ÆÐÅ°ÁöÀÇ ¾ÆÅ°ÅØÃĸ¦ °Ë»çÇÏÁö ¾Ê½À´Ï´Ù" -#: build/poptBT.c:233 lib/poptALL.c:281 lib/poptI.c:286 lib/poptQV.c:369 -#: lib/poptQV.c:376 lib/poptQV.c:418 +#: build/poptBT.c:233 lib/poptALL.c:281 lib/poptI.c:286 lib/poptQV.c:368 +#: lib/poptQV.c:375 lib/poptQV.c:417 #, fuzzy msgid "don't verify package signature(s)" msgstr "ÆÐÅ°ÁöÀÇ ¼¸íÀ» °Ë»çÇÕ´Ï´Ù" @@ -1340,27 +1340,27 @@ msgstr "%s(ÀÌ)°¡ ½ÇÆÐÇß½À´Ï´Ù\n" msgid "failed to write all data to %s\n" msgstr "%s¿¡ ¸ðµç ÀڷḦ ±â·ÏÇϴµ¥ ½ÇÆÐÇß½À´Ï´Ù\n" -#: build/rpmfc.c:1250 +#: build/rpmfc.c:1249 #, fuzzy, c-format msgid "magic_open(0x%x) failed: %s\n" msgstr "%s(À»)¸¦ ¿©´Âµ¥ ½ÇÆÐÇÔ: %s\n" -#: build/rpmfc.c:1258 +#: build/rpmfc.c:1257 #, fuzzy, c-format -msgid "magic_load(ms, \"%s\") failed: %s\n" +msgid "magic_load failed: %s\n" msgstr "%s %s µð·ºÅ丮 »èÁ¦¿¡ ½ÇÆÐÇÔ: %s\n" -#: build/rpmfc.c:1303 +#: build/rpmfc.c:1301 #, fuzzy, c-format msgid "magic_file(ms, \"%s\") failed: mode %06o %s\n" msgstr "%s %s µð·ºÅ丮 »èÁ¦¿¡ ½ÇÆÐÇÔ: %s\n" -#: build/rpmfc.c:1524 +#: build/rpmfc.c:1522 #, fuzzy, c-format msgid "Finding %s: %s\n" msgstr "%s(À»)¸¦ ã´Â Áß: (%s »ç¿ë)...\n" -#: build/rpmfc.c:1530 build/rpmfc.c:1539 +#: build/rpmfc.c:1528 build/rpmfc.c:1537 #, c-format msgid "Failed to find %s:\n" msgstr "%s(À»)¸¦ ã´Âµ¥ ½ÇÆÐÇÔ:\n" @@ -1486,11 +1486,11 @@ msgstr "´ÙÀ½°ú °ü·ÃµÈ ÆÐÅ°Áö À̸§À» ¹«½ÃÇÕ´Ï´Ù [%d]\t%s -> %s\n" msgid "removing %s \"%s\" from tsort relations.\n" msgstr "tsort °ü°è¿¡¼ %s-%s-%s \"%s\"(À»)¸¦ »èÁ¦ÇÕ´Ï´Ù.\n" -#: lib/depends.c:1265 +#: lib/depends.c:1271 msgid "========== recording tsort relations\n" msgstr "========== tsort °ü°è¸¦ ±â·Ï(record)ÇÕ´Ï´Ù\n" -#: lib/depends.c:1357 +#: lib/depends.c:1363 #, fuzzy msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, depth, " @@ -1499,20 +1499,20 @@ msgstr "" "========== ÆÐÅ°Áö¸¦ tsort ÇÕ´Ï´Ù (¼ø¼, #¼±ÀÓÀÚ, #ÈÄÀÓÀÚ, Æ®¸®, ±íÀÌ" "[depth])\n" -#: lib/depends.c:1453 +#: lib/depends.c:1459 #, fuzzy, c-format msgid "========== successors only (%d bytes)\n" msgstr "========== ÈÄÀÓÀÚ¸¸ [successors only] (Ç¥Çö ¼ø)\n" -#: lib/depends.c:1526 +#: lib/depends.c:1532 msgid "LOOP:\n" msgstr "·çÇÁ(LOOP):\n" -#: lib/depends.c:1561 +#: lib/depends.c:1567 msgid "========== continuing tsort ...\n" msgstr "========== tsort¸¦ ÁøÇàÇÕ´Ï´Ù...\n" -#: lib/depends.c:1566 +#: lib/depends.c:1572 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2071,7 +2071,7 @@ msgstr "ÆÄÀϽýºÅÛÀ» º¯°æÇÏÁö ¾Ê°í, µ¥ÀÌÅͺ£À̽º¸¦ °»½ÅÇÕ´Ï´Ù" msgid "do not verify package dependencies" msgstr "ÆÐÅ°ÁöÀÇ ÀÇÁ¸¼ºÀ» °Ë»çÇÏÁö ¾Ê½À´Ï´Ù" -#: lib/poptI.c:252 lib/poptQV.c:307 lib/poptQV.c:310 +#: lib/poptI.c:252 lib/poptQV.c:306 lib/poptQV.c:309 msgid "don't verify MD5 digest of files" msgstr "ÆÄÀÏÀÇ MD5 Ãà¾à(digest)À» °Ë»çÇÏÁö ¾Ê½À´Ï´Ù" @@ -2191,229 +2191,229 @@ msgstr "ÆÐÅ°Áö¸¦ ¼³Ä¡ÇÏÁö ¾Ê°í, Á¦´ë·Î ¼³Ä¡µÇ´ÂÁö¸¸ È®ÀÎÇÕ´Ï´Ù" msgid "upgrade package(s)" msgstr "ÆÐÅ°Áö¸¦ ¾÷±×·¹À̵å ÇÕ´Ï´Ù" -#: lib/poptQV.c:103 +#: lib/poptQV.c:102 msgid "query/verify all packages" msgstr "¸ðµç ÆÐÅ°Áö¿¡ ´ëÇØ ÁúÀÇ/°ËÁõÇÕ´Ï´Ù" -#: lib/poptQV.c:105 +#: lib/poptQV.c:104 #, fuzzy msgid "rpm checksig mode" msgstr "rpm °ËÁõ ¸ðµå" -#: lib/poptQV.c:107 +#: lib/poptQV.c:106 msgid "query/verify package(s) owning file" msgstr "ÆÄÀÏÀÌ µé¾îÀÖ´Â ÆÐÅ°Áö¿¡ ´ëÇØ ÁúÀÇ/°ËÁõ ÇÕ´Ï´Ù" -#: lib/poptQV.c:109 +#: lib/poptQV.c:108 msgid "query/verify package(s) in group" msgstr "±×·ì ¾ÈÀÇ ÆÐÅ°Áö¸¦ ÁúÀÇ/°ËÁõ ÇÕ´Ï´Ù" -#: lib/poptQV.c:111 +#: lib/poptQV.c:110 #, fuzzy msgid "query/verify a package file" msgstr "¸ðµç ÆÐÅ°Áö¿¡ ´ëÇØ ÁúÀÇ/°ËÁõÇÕ´Ï´Ù" -#: lib/poptQV.c:114 +#: lib/poptQV.c:113 #, fuzzy msgid "query/verify package(s) from TOP file tree walk" msgstr "¼³Ä¡ ³»¿ëÀ» ÅëÇØ ÆÐÅ°Áö¸¦ ÁúÀÇ/°ËÁõ ÇÕ´Ï´Ù" -#: lib/poptQV.c:116 +#: lib/poptQV.c:115 #, fuzzy msgid "query/verify package(s) from system HDLIST" msgstr "¼³Ä¡ ³»¿ëÀ» ÅëÇØ ÆÐÅ°Áö¸¦ ÁúÀÇ/°ËÁõ ÇÕ´Ï´Ù" -#: lib/poptQV.c:119 +#: lib/poptQV.c:118 msgid "query/verify package(s) with package identifier" msgstr "ÆÐÅ°Áö ½Äº°ÀÚ(identifier)¸¦ »ç¿ëÇÏ¿© ÆÐÅ°Áö¸¦ ÁúÀÇ/°ËÁõ ÇÕ´Ï´Ù" -#: lib/poptQV.c:121 +#: lib/poptQV.c:120 msgid "query/verify package(s) with header identifier" msgstr "Çì´õ ½Äº°ÀÚ(identifier)¸¦ »ç¿ëÇÏ¿© ÆÐÅ°Áö¸¦ ÁúÀÇ/°ËÁõ ÇÕ´Ï´Ù" -#: lib/poptQV.c:123 +#: lib/poptQV.c:122 msgid "query/verify package(s) with file identifier" msgstr "ÆÄÀÏ ½Äº°ÀÚ(identifier)¸¦ »ç¿ëÇÏ¿© ÆÐÅ°Áö¸¦ ÁúÀÇ/°ËÁõ ÇÕ´Ï´Ù" -#: lib/poptQV.c:126 +#: lib/poptQV.c:125 msgid "rpm query mode" msgstr "rpm ÁúÀÇ ¸ðµå" -#: lib/poptQV.c:128 +#: lib/poptQV.c:127 #, fuzzy msgid "query/verify a header instance" msgstr "Çì´õ ½Äº°ÀÚ(identifier)¸¦ »ç¿ëÇÏ¿© ÆÐÅ°Áö¸¦ ÁúÀÇ/°ËÁõ ÇÕ´Ï´Ù" -#: lib/poptQV.c:130 +#: lib/poptQV.c:129 msgid "query a spec file" msgstr "spec ÆÄÀÏ¿¡ ´ëÇØ ÁúÀÇÇÕ´Ï´Ù" -#: lib/poptQV.c:130 +#: lib/poptQV.c:129 msgid "<spec>" msgstr "<spec>" -#: lib/poptQV.c:132 +#: lib/poptQV.c:131 msgid "query/verify package(s) from install transaction" msgstr "¼³Ä¡ ³»¿ëÀ» ÅëÇØ ÆÐÅ°Áö¸¦ ÁúÀÇ/°ËÁõ ÇÕ´Ï´Ù" -#: lib/poptQV.c:134 +#: lib/poptQV.c:133 msgid "query the package(s) triggered by the package" msgstr "ÆÐÅ°Áö·Î ÀÎÇØ »ý¼ºµÇ´Â(triggered) ÆÐÅ°Áö¿¡ ´ëÇØ ÁúÀÇÇÕ´Ï´Ù" -#: lib/poptQV.c:136 +#: lib/poptQV.c:135 msgid "rpm verify mode" msgstr "rpm °ËÁõ ¸ðµå" -#: lib/poptQV.c:138 +#: lib/poptQV.c:137 msgid "query/verify the package(s) which require a dependency" msgstr "ÀÇÁ¸¼ºÀ» ÇÊ¿ä·Î ÇÏ´Â ÆÐÅ°Áö¿¡ ´ëÇØ ÁúÀÇ/°ËÁõ ÇÕ´Ï´Ù" -#: lib/poptQV.c:140 +#: lib/poptQV.c:139 msgid "query/verify the package(s) which provide a dependency" msgstr "ÀÇÁ¸¼ºÀ» Á¦°øÇÏ´Â ÆÐÅ°Áö¿¡ ´ëÇØ ÁúÀÇ/°ËÁõ ÇÕ´Ï´Ù" -#: lib/poptQV.c:143 +#: lib/poptQV.c:142 msgid "create transaction set" msgstr "" -#: lib/poptQV.c:145 +#: lib/poptQV.c:144 msgid "do not order transaction set" msgstr "" -#: lib/poptQV.c:147 +#: lib/poptQV.c:146 #, fuzzy msgid "do not glob arguments" msgstr "ÁúÀÇ¿¡ ÇÊ¿äÇÑ Àμö°¡ ÁöÁ¤µÇÁö ¾Ê¾Ò½À´Ï´Ù" -#: lib/poptQV.c:149 +#: lib/poptQV.c:148 msgid "do not process non-package files as manifests" msgstr "" -#: lib/poptQV.c:151 +#: lib/poptQV.c:150 #, fuzzy msgid "do not read headers" msgstr "%s: 0x%xÀÇ Çì´õ¸¦ ÀÐÀ» ¼ö ¾ø½À´Ï´Ù\n" -#: lib/poptQV.c:258 +#: lib/poptQV.c:257 msgid "list all configuration files" msgstr "¸ðµç ¼³Á¤ ÆÄÀÏÀ» ³ª¿ÇÕ´Ï´Ù" -#: lib/poptQV.c:260 +#: lib/poptQV.c:259 msgid "list all documentation files" msgstr "¸ðµç ¹®¼ ÆÄÀÏÀ» ³ª¿ÇÕ´Ï´Ù" -#: lib/poptQV.c:262 +#: lib/poptQV.c:261 msgid "dump basic file information" msgstr "±âº» ÆÄÀÏ Á¤º¸¸¦ º¸¿©ÁÝ´Ï´Ù" -#: lib/poptQV.c:266 +#: lib/poptQV.c:265 msgid "list files in package" msgstr "ÆÐÅ°Áö ¾ÈÀÇ ÆÄÀÏÀ» ³ª¿ÇÕ´Ï´Ù" -#: lib/poptQV.c:271 +#: lib/poptQV.c:270 #, c-format msgid "skip %%ghost files" msgstr "%%ghost ÆÄÀÏÀ» »ý·«ÇÕ´Ï´Ù" -#: lib/poptQV.c:275 +#: lib/poptQV.c:274 #, c-format msgid "skip %%license files" msgstr "%%license ÆÄÀÏÀ» »ý·«ÇÕ´Ï´Ù" -#: lib/poptQV.c:278 +#: lib/poptQV.c:277 #, c-format msgid "skip %%readme files" msgstr "%%readme ÆÄÀÏÀ» »ý·«ÇÕ´Ï´Ù" -#: lib/poptQV.c:284 +#: lib/poptQV.c:283 msgid "use the following query format" msgstr "´ÙÀ½ÀÇ ÁúÀÇ Çü½ÄÀ» »ç¿ëÇϽʽÿä" -#: lib/poptQV.c:286 +#: lib/poptQV.c:285 msgid "substitute i18n sections into spec file" msgstr "spec ÆÄÀÏ ¾ÈÀÇ i18n Ç׸ñ(section)À» ´ëü(substitute)ÇÕ´Ï´Ù" -#: lib/poptQV.c:288 +#: lib/poptQV.c:287 msgid "display the states of the listed files" msgstr "³ª¿µÈ ÆÄÀÏÀÇ »óÅÂ(state)¸¦ º¸¿©ÁÝ´Ï´Ù" -#: lib/poptQV.c:314 +#: lib/poptQV.c:313 msgid "don't verify size of files" msgstr "ÆÄÀÏÀÇ ¿ë·®À» °Ë»çÇÏÁö ¾Ê½À´Ï´Ù" -#: lib/poptQV.c:317 +#: lib/poptQV.c:316 msgid "don't verify symlink path of files" msgstr "ÆÄÀÏÀÇ ½Éº¼¸¯ ¸µÅ© °æ·Î¸¦ °Ë»çÇÏÁö ¾Ê½À´Ï´Ù" -#: lib/poptQV.c:320 +#: lib/poptQV.c:319 msgid "don't verify owner of files" msgstr "ÆÄÀÏÀÇ ¼ÒÀ¯ÀÚ¸¦ °Ë»çÇÏÁö ¾Ê½À´Ï´Ù" -#: lib/poptQV.c:323 +#: lib/poptQV.c:322 msgid "don't verify group of files" msgstr "ÆÄÀÏÀÇ ±×·ìÀ» °Ë»çÇÏÁö ¾Ê½À´Ï´Ù" -#: lib/poptQV.c:326 +#: lib/poptQV.c:325 msgid "don't verify modification time of files" msgstr "ÆÄÀÏÀÇ ÃÖÁ¾ º¯°æ ½Ã°£À» °Ë»çÇÏÁö ¾Ê½À´Ï´Ù" -#: lib/poptQV.c:329 lib/poptQV.c:332 +#: lib/poptQV.c:328 lib/poptQV.c:331 msgid "don't verify mode of files" msgstr "ÆÄÀÏÀÇ ¸ðµå¸¦ °Ë»çÇÏÁö ¾Ê½À´Ï´Ù" -#: lib/poptQV.c:335 +#: lib/poptQV.c:334 #, fuzzy msgid "don't verify file security contexts" msgstr "ÆÐÅ°Áö ¾ÈÀÇ ÆÄÀÏÀ» °Ë»çÇÏÁö ¾Ê½À´Ï´Ù" -#: lib/poptQV.c:337 +#: lib/poptQV.c:336 msgid "don't verify files in package" msgstr "ÆÐÅ°Áö ¾ÈÀÇ ÆÄÀÏÀ» °Ë»çÇÏÁö ¾Ê½À´Ï´Ù" -#: lib/poptQV.c:340 lib/poptQV.c:343 tools/rpmgraph.c:266 +#: lib/poptQV.c:339 lib/poptQV.c:342 tools/rpmgraph.c:266 msgid "don't verify package dependencies" msgstr "ÆÐÅ°ÁöÀÇ ÀÇÁ¸¼ºÀ» °Ë»çÇÏÁö ¾Ê½À´Ï´Ù" -#: lib/poptQV.c:348 lib/poptQV.c:352 lib/poptQV.c:355 lib/poptQV.c:358 +#: lib/poptQV.c:347 lib/poptQV.c:351 lib/poptQV.c:354 lib/poptQV.c:357 #, fuzzy msgid "don't execute verify script(s)" msgstr "%verifyscript¸¦ ½ÇÇàÇÏÁö ¾Ê½À´Ï´Ù (ÀÖÀ» °æ¿ì)" -#: lib/poptQV.c:382 +#: lib/poptQV.c:381 #, fuzzy msgid "don't verify GPG V3 DSA signature(s)" msgstr "SHA1 Ãà¾à(digest) Çì´õ¸¦ °Ë»çÇÏÁö ¾Ê½À´Ï´Ù" -#: lib/poptQV.c:385 +#: lib/poptQV.c:384 #, fuzzy msgid "don't verify PGP V3 RSA/MD5 signature(s)" msgstr "ÆÄÀÏÀÇ MD5 Ãà¾à(digest)À» °Ë»çÇÏÁö ¾Ê½À´Ï´Ù" -#: lib/poptQV.c:400 +#: lib/poptQV.c:399 #, fuzzy msgid "sign package(s) (identical to --resign)" msgstr "ÆÐÅ°Áö¿¡ ¼¸íÇÕ´Ï´Ù (±âÁ¸ÀÇ ¼¸íÀº »èÁ¦µË´Ï´Ù)" -#: lib/poptQV.c:402 +#: lib/poptQV.c:401 #, fuzzy msgid "verify package signature(s)" msgstr "ÆÐÅ°ÁöÀÇ ¼¸íÀ» °Ë»çÇÕ´Ï´Ù" -#: lib/poptQV.c:404 +#: lib/poptQV.c:403 #, fuzzy msgid "delete package signatures" msgstr "ÆÐÅ°ÁöÀÇ ¼¸íÀ» °Ë»çÇÕ´Ï´Ù" -#: lib/poptQV.c:406 +#: lib/poptQV.c:405 msgid "import an armored public key" msgstr "" -#: lib/poptQV.c:408 +#: lib/poptQV.c:407 #, fuzzy msgid "sign package(s) (identical to --addsign)" msgstr "ÆÐÅ°Áö¿¡ ¼¸íÇÕ´Ï´Ù (±âÁ¸ÀÇ ¼¸íÀº »èÁ¦µË´Ï´Ù)" -#: lib/poptQV.c:410 +#: lib/poptQV.c:409 msgid "generate signature" msgstr "¼¸íÀ» ÀÛ¼ºÇÕ´Ï´Ù" @@ -2762,38 +2762,38 @@ msgstr "%s ÆÐÅ°ÁöÀÇ ÇÊ¿ä»çÇ×(³»¿ª)ÀÌ ¸¸Á·ÇÏÁö ¾ÊÀ½: %s\n" msgid "%s skipped due to missingok flag\n" msgstr "missingok Ç÷¡±×·Î ÀÎÇØ %s(À»)¸¦ »ý·«ÇÕ´Ï´Ù\n" -#: lib/rpmfi.c:846 +#: lib/rpmfi.c:850 msgid "========== relocations\n" msgstr "========== Àç¹èÄ¡\n" -#: lib/rpmfi.c:850 +#: lib/rpmfi.c:854 #, c-format msgid "%5d exclude %s\n" msgstr "%5d Á¦¿Ü %s\n" -#: lib/rpmfi.c:853 +#: lib/rpmfi.c:857 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "%5d Àç¹èÄ¡ %s -> %s\n" -#: lib/rpmfi.c:987 +#: lib/rpmfi.c:991 #, c-format msgid "excluding %s %s\n" msgstr "%s %s(À»)¸¦ Á¦¿Ü½Ãŵ´Ï´Ù\n" -#: lib/rpmfi.c:997 +#: lib/rpmfi.c:1001 #, c-format msgid "relocating %s to %s\n" msgstr "%s(À»)¸¦ %s(À¸)·Î Àç¹èÄ¡ ÇÕ´Ï´Ù\n" -#: lib/rpmfi.c:1089 +#: lib/rpmfi.c:1093 #, c-format msgid "relocating directory %s to %s\n" msgstr "%s µð·ºÅ丮¸¦ %s(À¸)·Î Àç¹èÄ¡ ÇÕ´Ï´Ù\n" #: lib/rpmgi.c:81 lib/rpminstall.c:124 lib/rpminstall.c:480 -#: lib/rpminstall.c:615 lib/rpminstall.c:1041 lib/rpmts.c:643 -#: tools/rpmgraph.c:121 tools/rpmgraph.c:158 +#: lib/rpminstall.c:615 lib/rpmts.c:643 tools/rpmgraph.c:121 +#: tools/rpmgraph.c:158 #, c-format msgid "open of %s failed: %s\n" msgstr "%s(À»)¸¦ ¿©´Âµ¥ ½ÇÆÐÇÔ: %s\n" @@ -2804,7 +2804,7 @@ msgid "unknown tag: \"%s\"\n" msgstr "¾Ë ¼ö ¾ø´Â ÅÂ±× ÀÔ´Ï´Ù" #: lib/rpmgi.c:628 lib/rpminstall.c:659 lib/rpminstall.c:834 -#: lib/rpminstall.c:1267 lib/transaction.c:1031 tools/rpmgraph.c:196 +#: lib/rpminstall.c:1084 lib/transaction.c:1026 tools/rpmgraph.c:196 #, fuzzy msgid "Failed dependencies:\n" msgstr "ÀÇÁ¸¼º ¹®Á¦·Î ÀÎÇØ ½ÇÆÐÇÔ:\n" @@ -2924,16 +2924,16 @@ msgstr "%s(À»)¸¦ ¿ ¼ö ¾øÀ½: %s\n" msgid "Installing %s\n" msgstr "%s(À»)¸¦ ¼³Ä¡ÇÕ´Ï´Ù\n" -#: lib/rpminstall.c:1261 lib/transaction.c:1024 +#: lib/rpminstall.c:1078 lib/transaction.c:1019 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" -#: lib/rpminstall.c:1292 lib/transaction.c:1075 +#: lib/rpminstall.c:1109 lib/transaction.c:1070 msgid "Cleaning up repackaged packages:\n" msgstr "" -#: lib/rpminstall.c:1299 lib/transaction.c:1081 +#: lib/rpminstall.c:1116 lib/transaction.c:1076 #, fuzzy, c-format msgid "\tRemoving %s:\n" msgstr "%s(À»)¸¦ º¹±¸ÇÕ´Ï´Ù\n" @@ -3074,97 +3074,97 @@ msgid "unknown error %d encountered while manipulating package %s" msgstr "" "%2$s ÆÐÅ°Áö¸¦ ó¸®ÇÏ´Â °úÁ¤¿¡¼ ¾Ë ¼ö ¾ø´Â ¿À·ù %1$d(ÀÌ)°¡ ¹ß»ýÇß½À´Ï´Ù" -#: lib/rpmrc.c:199 +#: lib/rpmrc.c:213 #, c-format msgid "missing second ':' at %s:%d\n" msgstr "%s¿¡ µÎ¹ø° ':' ÀÌ ¾øÀ½:%d\n" -#: lib/rpmrc.c:202 +#: lib/rpmrc.c:216 #, c-format msgid "missing architecture name at %s:%d\n" msgstr "%s¿¡ ¾ÆÅ°ÅØÃĸíÀÌ ¾øÀ½:%d\n" -#: lib/rpmrc.c:356 +#: lib/rpmrc.c:370 #, c-format msgid "Incomplete data line at %s:%d\n" msgstr "%sÀÇ µ¥ÀÌÅÍ Ç׸ñ(line)ÀÌ ºÒÃæºÐÇÔ:%d\n" -#: lib/rpmrc.c:361 +#: lib/rpmrc.c:375 #, c-format msgid "Too many args in data line at %s:%d\n" msgstr "%sÀÇ µ¥ÀÌÅÍ Ç׸ñ(line)¿¡ Àμö°¡ ³Ê¹« ¸¹À½:%d\n" -#: lib/rpmrc.c:369 +#: lib/rpmrc.c:383 #, c-format msgid "Bad arch/os number: %s (%s:%d)\n" msgstr "À߸øµÈ ¾ÆÅ°ÅØÃÄ/¿î¿µÃ¼Á¦ ¹øÈ£: %s (%s:%d)\n" -#: lib/rpmrc.c:406 +#: lib/rpmrc.c:420 #, c-format msgid "Incomplete default line at %s:%d\n" msgstr "%sÀÇ ±âº» Ç׸ñ(line)ÀÌ ºÒÃæºÐÇÔ:%d\n" -#: lib/rpmrc.c:411 +#: lib/rpmrc.c:425 #, c-format msgid "Too many args in default line at %s:%d\n" msgstr "%sÀÇ ±âº» Ç׸ñ(line)¿¡ Àμö°¡ ³Ê¹« ¸¹À½:%d\n" -#: lib/rpmrc.c:577 +#: lib/rpmrc.c:591 #, c-format msgid "Failed to read %s: %s.\n" msgstr "%s(À»)¸¦ Àдµ¥ ½ÇÆÐÇÔ: %s.\n" -#: lib/rpmrc.c:615 +#: lib/rpmrc.c:629 #, c-format msgid "missing ':' (found 0x%02x) at %s:%d\n" msgstr "%2$s¿¡ ':' (0x%1$02x ãÀ½) ÀÌ ¾øÀ½:%3$d\n" -#: lib/rpmrc.c:632 lib/rpmrc.c:706 +#: lib/rpmrc.c:646 lib/rpmrc.c:710 #, c-format msgid "missing argument for %s at %s:%d\n" msgstr "%2$s¿¡ %1$s(À»)¸¦ À§ÇÑ Àμö°¡ ¾øÀ½:%3$d\n" -#: lib/rpmrc.c:649 lib/rpmrc.c:671 +#: lib/rpmrc.c:663 #, c-format msgid "%s expansion failed at %s:%d \"%s\"\n" msgstr "%2$sÀÇ %1$s È®Àå(expansion)¿¡ ½ÇÆÐÇÔ:%3$d \"%4$s\"\n" -#: lib/rpmrc.c:658 +#: lib/rpmrc.c:672 #, c-format msgid "cannot open %s at %s:%d: %s\n" msgstr "%2$sÀÇ %1$s(À»)¸¦ ¿ ¼ö ¾øÀ½:%3$d: %4$s\n" -#: lib/rpmrc.c:698 +#: lib/rpmrc.c:702 #, c-format msgid "missing architecture for %s at %s:%d\n" msgstr "%2$s¿¡ %1$s(À»)¸¦ À§ÇÑ ¾ÆÅ°ÅØÃÄ°¡ ¾øÀ½:%3$d\n" -#: lib/rpmrc.c:765 +#: lib/rpmrc.c:769 #, c-format msgid "bad option '%s' at %s:%d\n" msgstr "%2$s¿¡ À߸øµÈ '%1$s' ¿É¼Ç:%3$d\n" -#: lib/rpmrc.c:1564 +#: lib/rpmrc.c:1568 #, c-format msgid "Unknown system: %s\n" msgstr "¾Ë ¼ö ¾ø´Â ½Ã½ºÅÛ: %s\n" -#: lib/rpmrc.c:1565 +#: lib/rpmrc.c:1569 #, c-format msgid "Please contact %s\n" msgstr "" -#: lib/rpmrc.c:1802 +#: lib/rpmrc.c:1806 #, c-format msgid "Cannot expand %s\n" msgstr "%s(À»)¸¦ È®Àå(expand)ÇÒ ¼ö ¾ø½À´Ï´Ù\n" -#: lib/rpmrc.c:1807 +#: lib/rpmrc.c:1811 #, c-format msgid "Cannot read %s, HOME is too large.\n" msgstr "%s(À»)¸¦ ÀÐÀ» ¼ö ¾ø½À´Ï´Ù, HOMEÀÌ ³Ê¹« Å®´Ï´Ù.\n" -#: lib/rpmrc.c:1824 +#: lib/rpmrc.c:1828 #, c-format msgid "Unable to open %s for reading: %s.\n" msgstr "%s(À»)¸¦ ¿ ¼ö ¾øÀ½: %s.\n" @@ -3456,160 +3456,160 @@ msgstr "¼Õ»óµÈ MD5 Ãà¾à(digest): Áö¿øÇÏÁö ¾ÊÀ½\n" msgid "Signature: UNKNOWN (%d)\n" msgstr "¼¸í: size(%d)+pad(%d)\n" -#: lib/transaction.c:935 +#: lib/transaction.c:930 #, c-format msgid "excluding directory %s\n" msgstr "%s µð·ºÅ丮¸¦ Á¦¿Ü½Ãŵ´Ï´Ù\n" -#: lib/transaction.c:1022 +#: lib/transaction.c:1017 msgid "Transaction failed...rolling back\n" msgstr "" -#: lib/transaction.c:1042 +#: lib/transaction.c:1037 msgid "Could not order auto-rollback transaction!\n" msgstr "" -#: lib/transaction.c:1132 +#: lib/transaction.c:1127 msgid "Getting repackaged header from transaction element\n" msgstr "" -#: lib/transaction.c:1157 +#: lib/transaction.c:1152 #, c-format msgid "\tLooking for %s...\n" msgstr "" -#: lib/transaction.c:1161 +#: lib/transaction.c:1156 msgid "\tMatches found.\n" msgstr "" -#: lib/transaction.c:1165 +#: lib/transaction.c:1160 msgid "\tNo matches found.\n" msgstr "" -#: lib/transaction.c:1178 +#: lib/transaction.c:1173 #, fuzzy msgid "\tRepackaged package not found!.\n" msgstr "¼Ò½º ÆÐÅ°Áö°¡ ÇÊ¿äÇϸç, ¹ÙÀ̳ʸ®°¡ °Ë»öµÇ¾ú½À´Ï´Ù\n" -#: lib/transaction.c:1199 +#: lib/transaction.c:1194 msgid "\tREMOVETID matched INSTALLTID.\n" msgstr "" -#: lib/transaction.c:1201 +#: lib/transaction.c:1196 #, c-format msgid "\t\tName: %s.\n" msgstr "" -#: lib/transaction.c:1224 +#: lib/transaction.c:1219 #, fuzzy, c-format msgid "\tRepackaged Package was %s...\n" msgstr "%s(¿Í)°ú ÀÏÄ¡ÇÏ´Â ÆÐÅ°Áö°¡ ¾øÀ½: %s\n" -#: lib/transaction.c:1268 +#: lib/transaction.c:1263 msgid "Adding install element to auto-rollback transaction.\n" msgstr "" -#: lib/transaction.c:1277 +#: lib/transaction.c:1272 msgid "Could not get install element database instance!\n" msgstr "" -#: lib/transaction.c:1290 +#: lib/transaction.c:1285 msgid "Could not get header for auto-rollback transaction!\n" msgstr "" -#: lib/transaction.c:1300 +#: lib/transaction.c:1295 #, fuzzy, c-format msgid "\tAdded repackaged package header: %s.\n" msgstr "<¼Ò½º ÆÐÅ°Áö>" -#: lib/transaction.c:1302 lib/transaction.c:1313 +#: lib/transaction.c:1297 lib/transaction.c:1308 #, c-format msgid "\tAdded from install element %s.\n" msgstr "" -#: lib/transaction.c:1311 +#: lib/transaction.c:1306 msgid "\tAdded erase element.\n" msgstr "" -#: lib/transaction.c:1320 +#: lib/transaction.c:1315 msgid "Could not get repackaged header for auto-rollback transaction!\n" msgstr "" -#: lib/transaction.c:1327 +#: lib/transaction.c:1322 msgid "Add erase element to auto-rollback transaction.\n" msgstr "" -#: lib/transaction.c:1335 +#: lib/transaction.c:1330 msgid "\tFound existing upgrade element.\n" msgstr "" -#: lib/transaction.c:1336 +#: lib/transaction.c:1331 #, c-format msgid "\tNot adding erase element for %s.\n" msgstr "" -#: lib/transaction.c:1353 +#: lib/transaction.c:1348 #, fuzzy, c-format msgid "\tAdded repackaged package %s.\n" msgstr "<¼Ò½º ÆÐÅ°Áö>" -#: lib/transaction.c:1355 +#: lib/transaction.c:1350 #, c-format msgid "\tAdded from erase element %s.\n" msgstr "" -#: lib/transaction.c:1360 +#: lib/transaction.c:1355 msgid "Could not add erase element to auto-rollback transaction.\n" msgstr "" -#: lib/transaction.c:1366 +#: lib/transaction.c:1361 msgid "\tNo repackaged package...nothing to do.\n" msgstr "" -#: lib/transaction.c:1372 +#: lib/transaction.c:1367 #, fuzzy msgid "Failure reading repackaged package!\n" msgstr "ÆÐÅ°ÁöÀÇ Çì´õ¸¦ Àд µµÁß ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù\n" -#: lib/transaction.c:1495 +#: lib/transaction.c:1490 #, c-format msgid "sanity checking %d elements\n" msgstr "" -#: lib/transaction.c:1581 +#: lib/transaction.c:1576 msgid "running pre-transaction scripts\n" msgstr "" -#: lib/transaction.c:1655 +#: lib/transaction.c:1650 #, c-format msgid "computing %d file fingerprints\n" msgstr "" -#: lib/transaction.c:1739 +#: lib/transaction.c:1734 msgid "computing file dispositions\n" msgstr "" -#: lib/transaction.c:1932 +#: lib/transaction.c:1927 msgid "Creating auto-rollback transaction\n" msgstr "" -#: lib/transaction.c:2086 +#: lib/transaction.c:2077 msgid "Add failed. Could not read package header.\n" msgstr "" -#: lib/transaction.c:2170 +#: lib/transaction.c:2161 msgid "Add failed in rpmpsmStage().\n" msgstr "" -#: lib/transaction.c:2214 +#: lib/transaction.c:2205 msgid "Add failed. Could not get file list.\n" msgstr "" -#: lib/transaction.c:2263 +#: lib/transaction.c:2254 msgid "Erase failed failed in rpmpsmStage().\n" msgstr "" -#: lib/transaction.c:2324 +#: lib/transaction.c:2315 msgid "running post-transaction scripts\n" msgstr "" @@ -4008,86 +4008,86 @@ msgstr "¿©´ÂÁß db À妽º %s/%s %s ¸ðµå=0x%x\n" msgid "======================== active %d empty %d\n" msgstr "======================== %d È°¼º %d ºñ¾îÀÖÀ½\n" -#: rpmio/macro.c:394 +#: rpmio/macro.c:396 #, c-format msgid "%3d>%*s(empty)" msgstr "%3d>%*s(ºñ¾îÀÖÀ½)" -#: rpmio/macro.c:437 +#: rpmio/macro.c:439 #, c-format msgid "%3d<%*s(empty)\n" msgstr "%3d<%*s(ºñ¾îÀÖÀ½)\n" -#: rpmio/macro.c:664 rpmio/macro.c:705 +#: rpmio/macro.c:608 rpmio/macro.c:1090 rpmio/macro.c:1123 rpmio/macro.c:1863 +msgid "Target buffer overflow\n" +msgstr "¸ñÇ¥´ë»ó(Target) ¹öÆÛ ¿À¹öÇ÷οì\n" + +#: rpmio/macro.c:671 rpmio/macro.c:712 #, c-format msgid "Macro %%%s has unterminated body\n" msgstr "¸ÅÅ©·Î %%%s¿¡ Á¾·áµÇÁö ¾ÊÀº ³»¿ë(body)ÀÌ ÀÖ½À´Ï´Ù\n" -#: rpmio/macro.c:727 +#: rpmio/macro.c:734 #, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "¸ÅÅ©·Î %%%s¿¡ ºÎÀûÇÕÇÑ À̸§ÀÌ ÀÖ½À´Ï´Ù (%%define)\n" -#: rpmio/macro.c:733 +#: rpmio/macro.c:740 #, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "¸ÅÅ©·Î %%%s¿¡ Á¾·áµÇÁö ¾ÊÀº ¿É¼ÇÀÌ ÀÖ½À´Ï´Ù\n" -#: rpmio/macro.c:738 +#: rpmio/macro.c:745 #, c-format msgid "Macro %%%s has empty body\n" msgstr "¸ÅÅ©·Î %%%s¿¡ ºñ¾îÀÖ´Â ³»¿ë(body)ÀÌ ÀÖ½À´Ï´Ù\n" -#: rpmio/macro.c:744 +#: rpmio/macro.c:751 #, c-format msgid "Macro %%%s failed to expand\n" msgstr "¸ÅÅ©·Î %%%s(À»)¸¦ È®Àå(expand)Çϴµ¥ ½ÇÆÐÇß½À´Ï´Ù\n" -#: rpmio/macro.c:779 +#: rpmio/macro.c:786 #, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "¸ÅÅ©·Î %%%s¿¡ ºÎÀûÇÕÇÑ À̸§ÀÌ ÀÖ½À´Ï´Ù (%%undefine)\n" -#: rpmio/macro.c:897 +#: rpmio/macro.c:904 #, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "¸ÅÅ©·Î %%%s (%s)´Â ·¹º§ %d ÀÌÇÏ¿¡¼´Â »ç¿ëÇÒ ¼ö ¾ø½À´Ï´Ù\n" -#: rpmio/macro.c:1024 +#: rpmio/macro.c:1031 #, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "%2$s(%3$s)¿¡ ¾Ë ¼ö ¾ø´Â ¿É¼Ç %1$c(ÀÌ)°¡ ÀÖ½À´Ï´Ù\n" -#: rpmio/macro.c:1224 +#: rpmio/macro.c:1239 #, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "¹Ýº¹ Ƚ¼ö(%d)°¡ ÃÖ´ëÄ¡(%d) º¸´Ù Å®´Ï´Ù\n" -#: rpmio/macro.c:1297 rpmio/macro.c:1314 +#: rpmio/macro.c:1312 rpmio/macro.c:1329 #, c-format msgid "Unterminated %c: %s\n" msgstr "%c(ÀÌ)°¡ Á¾·áµÇÁö ¾ÊÀ½: %s\n" -#: rpmio/macro.c:1355 +#: rpmio/macro.c:1370 #, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "'%%' ´ÙÀ½¿¡ ó¸®ÇÒ ¼ö ¾ø´Â(unparseable) ¸ÅÅ©·Î°¡ ÀÖ½À´Ï´Ù\n" -#: rpmio/macro.c:1512 +#: rpmio/macro.c:1527 #, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "¸ÅÅ©·Î %%%.*s¸¦ ãÀ» ¼ö ¾ø½À´Ï´Ù, »ý·«ÇÕ´Ï´Ù\n" -#: rpmio/macro.c:1848 -msgid "Target buffer overflow\n" -msgstr "¸ñÇ¥´ë»ó(Target) ¹öÆÛ ¿À¹öÇ÷οì\n" - -#: rpmio/macro.c:2056 rpmio/macro.c:2062 +#: rpmio/macro.c:2076 rpmio/macro.c:2082 #, c-format msgid "File %s: %s\n" msgstr "%s ÆÄÀÏ: %s\n" -#: rpmio/macro.c:2065 +#: rpmio/macro.c:2085 #, c-format msgid "File %s is smaller than %u bytes\n" msgstr "%s ÆÄÀÏÀÌ %u ¹ÙÀÌÆ® º¸´Ù Àû½À´Ï´Ù\n" @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n" -"POT-Creation-Date: 2007-08-21 08:04+0200\n" +"POT-Creation-Date: 2007-08-30 18:37+0200\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" @@ -1268,20 +1268,20 @@ msgstr "ikke verifiser pakkeavhengigheter" msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "" -#: build/poptBT.c:229 lib/poptALL.c:273 lib/poptI.c:282 lib/poptQV.c:363 -#: lib/poptQV.c:372 lib/poptQV.c:413 +#: build/poptBT.c:229 lib/poptALL.c:273 lib/poptI.c:282 lib/poptQV.c:362 +#: lib/poptQV.c:371 lib/poptQV.c:412 #, fuzzy msgid "don't verify package digest(s)" msgstr "ikke verifiser pakkeavhengigheter" -#: build/poptBT.c:231 lib/poptALL.c:275 lib/poptI.c:284 lib/poptQV.c:366 -#: lib/poptQV.c:374 lib/poptQV.c:416 +#: build/poptBT.c:231 lib/poptALL.c:275 lib/poptI.c:284 lib/poptQV.c:365 +#: lib/poptQV.c:373 lib/poptQV.c:415 #, fuzzy msgid "don't verify database header(s) when retrieved" msgstr "ikke verifiser pakkearkitektur" -#: build/poptBT.c:233 lib/poptALL.c:281 lib/poptI.c:286 lib/poptQV.c:369 -#: lib/poptQV.c:376 lib/poptQV.c:418 +#: build/poptBT.c:233 lib/poptALL.c:281 lib/poptI.c:286 lib/poptQV.c:368 +#: lib/poptQV.c:375 lib/poptQV.c:417 #, fuzzy msgid "don't verify package signature(s)" msgstr "verifiser pakkesignatur" @@ -1344,27 +1344,27 @@ msgstr "%s feilet\n" msgid "failed to write all data to %s\n" msgstr "kunne ikke skrive alle data til %s\n" -#: build/rpmfc.c:1250 +#: build/rpmfc.c:1249 #, fuzzy, c-format msgid "magic_open(0x%x) failed: %s\n" msgstr "feil under åpning av %s: %s\n" -#: build/rpmfc.c:1258 +#: build/rpmfc.c:1257 #, fuzzy, c-format -msgid "magic_load(ms, \"%s\") failed: %s\n" +msgid "magic_load failed: %s\n" msgstr "%s rmdir av %s feilet: %s\n" -#: build/rpmfc.c:1303 +#: build/rpmfc.c:1301 #, fuzzy, c-format msgid "magic_file(ms, \"%s\") failed: mode %06o %s\n" msgstr "%s rmdir av %s feilet: %s\n" -#: build/rpmfc.c:1524 +#: build/rpmfc.c:1522 #, fuzzy, c-format msgid "Finding %s: %s\n" msgstr "Fil %s: %s\n" -#: build/rpmfc.c:1530 build/rpmfc.c:1539 +#: build/rpmfc.c:1528 build/rpmfc.c:1537 #, c-format msgid "Failed to find %s:\n" msgstr "Klarte ikke å finne %s:\n" @@ -1485,30 +1485,30 @@ msgstr "" msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" -#: lib/depends.c:1265 +#: lib/depends.c:1271 msgid "========== recording tsort relations\n" msgstr "" -#: lib/depends.c:1357 +#: lib/depends.c:1363 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, depth, " "breadth)\n" msgstr "" -#: lib/depends.c:1453 +#: lib/depends.c:1459 #, c-format msgid "========== successors only (%d bytes)\n" msgstr "" -#: lib/depends.c:1526 +#: lib/depends.c:1532 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1561 +#: lib/depends.c:1567 msgid "========== continuing tsort ...\n" msgstr "" -#: lib/depends.c:1566 +#: lib/depends.c:1572 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2056,7 +2056,7 @@ msgstr "oppdater databasen, men ikke modifiser filsystemet" msgid "do not verify package dependencies" msgstr "ikke verifiser pakkeavhengigheter" -#: lib/poptI.c:252 lib/poptQV.c:307 lib/poptQV.c:310 +#: lib/poptI.c:252 lib/poptQV.c:306 lib/poptQV.c:309 msgid "don't verify MD5 digest of files" msgstr "" @@ -2174,232 +2174,232 @@ msgstr "ikke installer, men si ifra om det ville virke eller ikke" msgid "upgrade package(s)" msgstr "oppgrader pakke(r)" -#: lib/poptQV.c:103 +#: lib/poptQV.c:102 msgid "query/verify all packages" msgstr "spør/verifiser alle pakker" -#: lib/poptQV.c:105 +#: lib/poptQV.c:104 #, fuzzy msgid "rpm checksig mode" msgstr "rpm spørremodus" -#: lib/poptQV.c:107 +#: lib/poptQV.c:106 msgid "query/verify package(s) owning file" msgstr "spør/verifiser pakke(r) som eier fil" -#: lib/poptQV.c:109 +#: lib/poptQV.c:108 msgid "query/verify package(s) in group" msgstr "spør/verifiser pakke(r) i gruppe" -#: lib/poptQV.c:111 +#: lib/poptQV.c:110 #, fuzzy msgid "query/verify a package file" msgstr "spør/verifiser alle pakker" -#: lib/poptQV.c:114 +#: lib/poptQV.c:113 #, fuzzy msgid "query/verify package(s) from TOP file tree walk" msgstr "spør/verifiser pakke(r) i gruppe" -#: lib/poptQV.c:116 +#: lib/poptQV.c:115 #, fuzzy msgid "query/verify package(s) from system HDLIST" msgstr "spør/verifiser pakke(r) i gruppe" -#: lib/poptQV.c:119 +#: lib/poptQV.c:118 #, fuzzy msgid "query/verify package(s) with package identifier" msgstr "spør/verifiser pakke(r) som eier fil" -#: lib/poptQV.c:121 +#: lib/poptQV.c:120 #, fuzzy msgid "query/verify package(s) with header identifier" msgstr "spør/verifiser pakke(r) som eier fil" -#: lib/poptQV.c:123 +#: lib/poptQV.c:122 #, fuzzy msgid "query/verify package(s) with file identifier" msgstr "spør/verifiser pakke(r) som eier fil" -#: lib/poptQV.c:126 +#: lib/poptQV.c:125 msgid "rpm query mode" msgstr "rpm spørremodus" -#: lib/poptQV.c:128 +#: lib/poptQV.c:127 #, fuzzy msgid "query/verify a header instance" msgstr "spør/verifiser pakke(r) som eier fil" -#: lib/poptQV.c:130 +#: lib/poptQV.c:129 msgid "query a spec file" msgstr "spørring på spec-fil" -#: lib/poptQV.c:130 +#: lib/poptQV.c:129 msgid "<spec>" msgstr "" -#: lib/poptQV.c:132 +#: lib/poptQV.c:131 #, fuzzy msgid "query/verify package(s) from install transaction" msgstr "spør/verifiser pakke(r) i gruppe" -#: lib/poptQV.c:134 +#: lib/poptQV.c:133 msgid "query the package(s) triggered by the package" msgstr "spør pakker utløst av <pakke>" -#: lib/poptQV.c:136 +#: lib/poptQV.c:135 msgid "rpm verify mode" msgstr "" -#: lib/poptQV.c:138 +#: lib/poptQV.c:137 msgid "query/verify the package(s) which require a dependency" msgstr "spør etter etter pakker som trenger <funk> funksjonalitet" -#: lib/poptQV.c:140 +#: lib/poptQV.c:139 msgid "query/verify the package(s) which provide a dependency" msgstr "spør etter pakker som tilbyr <funk> funksjonalitet" -#: lib/poptQV.c:143 +#: lib/poptQV.c:142 msgid "create transaction set" msgstr "" -#: lib/poptQV.c:145 +#: lib/poptQV.c:144 msgid "do not order transaction set" msgstr "" -#: lib/poptQV.c:147 +#: lib/poptQV.c:146 #, fuzzy msgid "do not glob arguments" msgstr "ingen argumenter oppgitt for spørring" -#: lib/poptQV.c:149 +#: lib/poptQV.c:148 msgid "do not process non-package files as manifests" msgstr "" -#: lib/poptQV.c:151 +#: lib/poptQV.c:150 #, fuzzy msgid "do not read headers" msgstr "Ugyldig/ulesbar header" -#: lib/poptQV.c:258 +#: lib/poptQV.c:257 msgid "list all configuration files" msgstr "" -#: lib/poptQV.c:260 +#: lib/poptQV.c:259 msgid "list all documentation files" msgstr "" -#: lib/poptQV.c:262 +#: lib/poptQV.c:261 msgid "dump basic file information" msgstr "" -#: lib/poptQV.c:266 +#: lib/poptQV.c:265 msgid "list files in package" msgstr "" -#: lib/poptQV.c:271 +#: lib/poptQV.c:270 #, c-format msgid "skip %%ghost files" msgstr "" -#: lib/poptQV.c:275 +#: lib/poptQV.c:274 #, c-format msgid "skip %%license files" msgstr "" -#: lib/poptQV.c:278 +#: lib/poptQV.c:277 #, c-format msgid "skip %%readme files" msgstr "" -#: lib/poptQV.c:284 +#: lib/poptQV.c:283 msgid "use the following query format" msgstr "" -#: lib/poptQV.c:286 +#: lib/poptQV.c:285 msgid "substitute i18n sections into spec file" msgstr "" -#: lib/poptQV.c:288 +#: lib/poptQV.c:287 msgid "display the states of the listed files" msgstr "" -#: lib/poptQV.c:314 +#: lib/poptQV.c:313 msgid "don't verify size of files" msgstr "ikke verifiser størrelse på filer" -#: lib/poptQV.c:317 +#: lib/poptQV.c:316 msgid "don't verify symlink path of files" msgstr "ikke verifiser sti til symbolske lenker for filer" -#: lib/poptQV.c:320 +#: lib/poptQV.c:319 msgid "don't verify owner of files" msgstr "ikke verifiser eier av filer" -#: lib/poptQV.c:323 +#: lib/poptQV.c:322 msgid "don't verify group of files" msgstr "ikke verifiser gruppe for filer" -#: lib/poptQV.c:326 +#: lib/poptQV.c:325 msgid "don't verify modification time of files" msgstr "ikke verifisert endringsdato for filer" -#: lib/poptQV.c:329 lib/poptQV.c:332 +#: lib/poptQV.c:328 lib/poptQV.c:331 msgid "don't verify mode of files" msgstr "ikke verifiser modus for filer" -#: lib/poptQV.c:335 +#: lib/poptQV.c:334 #, fuzzy msgid "don't verify file security contexts" msgstr "ikke verifiser filer i pakke" -#: lib/poptQV.c:337 +#: lib/poptQV.c:336 msgid "don't verify files in package" msgstr "ikke verifiser filer i pakke" -#: lib/poptQV.c:340 lib/poptQV.c:343 tools/rpmgraph.c:266 +#: lib/poptQV.c:339 lib/poptQV.c:342 tools/rpmgraph.c:266 msgid "don't verify package dependencies" msgstr "ikke verifiser pakkeavhengigheter" -#: lib/poptQV.c:348 lib/poptQV.c:352 lib/poptQV.c:355 lib/poptQV.c:358 +#: lib/poptQV.c:347 lib/poptQV.c:351 lib/poptQV.c:354 lib/poptQV.c:357 #, fuzzy msgid "don't execute verify script(s)" msgstr "ikke kjør %verifyscript (hvis noen)" -#: lib/poptQV.c:382 +#: lib/poptQV.c:381 #, fuzzy msgid "don't verify GPG V3 DSA signature(s)" msgstr "ikke verifiser header SHA1 digest" -#: lib/poptQV.c:385 +#: lib/poptQV.c:384 msgid "don't verify PGP V3 RSA/MD5 signature(s)" msgstr "" -#: lib/poptQV.c:400 +#: lib/poptQV.c:399 #, fuzzy msgid "sign package(s) (identical to --resign)" msgstr "signer en pakke (forkast nåværende signatur)" -#: lib/poptQV.c:402 +#: lib/poptQV.c:401 #, fuzzy msgid "verify package signature(s)" msgstr "verifiser pakkesignatur" -#: lib/poptQV.c:404 +#: lib/poptQV.c:403 #, fuzzy msgid "delete package signatures" msgstr "verifiser pakkesignatur" -#: lib/poptQV.c:406 +#: lib/poptQV.c:405 msgid "import an armored public key" msgstr "" -#: lib/poptQV.c:408 +#: lib/poptQV.c:407 #, fuzzy msgid "sign package(s) (identical to --addsign)" msgstr "signer en pakke (forkast nåværende signatur)" -#: lib/poptQV.c:410 +#: lib/poptQV.c:409 msgid "generate signature" msgstr "generer signatur" @@ -2738,38 +2738,38 @@ msgstr "pakke %s er i konflikt: %s\n" msgid "%s skipped due to missingok flag\n" msgstr "" -#: lib/rpmfi.c:846 +#: lib/rpmfi.c:850 msgid "========== relocations\n" msgstr "" -#: lib/rpmfi.c:850 +#: lib/rpmfi.c:854 #, fuzzy, c-format msgid "%5d exclude %s\n" msgstr "eksluderer %s %s\n" -#: lib/rpmfi.c:853 +#: lib/rpmfi.c:857 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "%5d omplasser %s -> %s\n" -#: lib/rpmfi.c:987 +#: lib/rpmfi.c:991 #, c-format msgid "excluding %s %s\n" msgstr "eksluderer %s %s\n" -#: lib/rpmfi.c:997 +#: lib/rpmfi.c:1001 #, c-format msgid "relocating %s to %s\n" msgstr "relokerer %s til %s\n" -#: lib/rpmfi.c:1089 +#: lib/rpmfi.c:1093 #, c-format msgid "relocating directory %s to %s\n" msgstr "relokerer katalog %s til %s\n" #: lib/rpmgi.c:81 lib/rpminstall.c:124 lib/rpminstall.c:480 -#: lib/rpminstall.c:615 lib/rpminstall.c:1041 lib/rpmts.c:643 -#: tools/rpmgraph.c:121 tools/rpmgraph.c:158 +#: lib/rpminstall.c:615 lib/rpmts.c:643 tools/rpmgraph.c:121 +#: tools/rpmgraph.c:158 #, c-format msgid "open of %s failed: %s\n" msgstr "feil under åpning av %s: %s\n" @@ -2780,7 +2780,7 @@ msgid "unknown tag: \"%s\"\n" msgstr "linje %d: Ukjent tagg: %s\n" #: lib/rpmgi.c:628 lib/rpminstall.c:659 lib/rpminstall.c:834 -#: lib/rpminstall.c:1267 lib/transaction.c:1031 tools/rpmgraph.c:196 +#: lib/rpminstall.c:1084 lib/transaction.c:1026 tools/rpmgraph.c:196 #, fuzzy msgid "Failed dependencies:\n" msgstr "feilede avhengigheter:\n" @@ -2900,16 +2900,16 @@ msgstr "kan ikke åpne %s: %s\n" msgid "Installing %s\n" msgstr "Installerer %s\n" -#: lib/rpminstall.c:1261 lib/transaction.c:1024 +#: lib/rpminstall.c:1078 lib/transaction.c:1019 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" -#: lib/rpminstall.c:1292 lib/transaction.c:1075 +#: lib/rpminstall.c:1109 lib/transaction.c:1070 msgid "Cleaning up repackaged packages:\n" msgstr "" -#: lib/rpminstall.c:1299 lib/transaction.c:1081 +#: lib/rpminstall.c:1116 lib/transaction.c:1076 #, fuzzy, c-format msgid "\tRemoving %s:\n" msgstr "Henter %s\n" @@ -3044,97 +3044,97 @@ msgstr " er i konflikt med %s-%s-%s\n" msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/rpmrc.c:199 +#: lib/rpmrc.c:213 #, c-format msgid "missing second ':' at %s:%d\n" msgstr "mangler andre ':' ved %s:%d\n" -#: lib/rpmrc.c:202 +#: lib/rpmrc.c:216 #, c-format msgid "missing architecture name at %s:%d\n" msgstr "manglende navn på arkitektur ved %s:%d\n" -#: lib/rpmrc.c:356 +#: lib/rpmrc.c:370 #, c-format msgid "Incomplete data line at %s:%d\n" msgstr "Ukomplett datalinje ved %s:%d\n" -#: lib/rpmrc.c:361 +#: lib/rpmrc.c:375 #, c-format msgid "Too many args in data line at %s:%d\n" msgstr "For mange argumenter i datalinje ved %s:%d\n" -#: lib/rpmrc.c:369 +#: lib/rpmrc.c:383 #, c-format msgid "Bad arch/os number: %s (%s:%d)\n" msgstr "" -#: lib/rpmrc.c:406 +#: lib/rpmrc.c:420 #, c-format msgid "Incomplete default line at %s:%d\n" msgstr "Ukomplett standardlinje ved %s:%d\n" -#: lib/rpmrc.c:411 +#: lib/rpmrc.c:425 #, c-format msgid "Too many args in default line at %s:%d\n" msgstr "" -#: lib/rpmrc.c:577 +#: lib/rpmrc.c:591 #, c-format msgid "Failed to read %s: %s.\n" msgstr "kunne ikke opprette %s: %s\n" -#: lib/rpmrc.c:615 +#: lib/rpmrc.c:629 #, c-format msgid "missing ':' (found 0x%02x) at %s:%d\n" msgstr "mangler ':' (fant 0x%02X) ved %s:%d\n" -#: lib/rpmrc.c:632 lib/rpmrc.c:706 +#: lib/rpmrc.c:646 lib/rpmrc.c:710 #, c-format msgid "missing argument for %s at %s:%d\n" msgstr "manglende argumentfor %s ved %s:%d\n" -#: lib/rpmrc.c:649 lib/rpmrc.c:671 +#: lib/rpmrc.c:663 #, c-format msgid "%s expansion failed at %s:%d \"%s\"\n" msgstr "" -#: lib/rpmrc.c:658 +#: lib/rpmrc.c:672 #, c-format msgid "cannot open %s at %s:%d: %s\n" msgstr "kan ikke åpne %s ved %s:%d %s\n" -#: lib/rpmrc.c:698 +#: lib/rpmrc.c:702 #, c-format msgid "missing architecture for %s at %s:%d\n" msgstr "manglende arkitektur for %s ved %s:%d\n" -#: lib/rpmrc.c:765 +#: lib/rpmrc.c:769 #, c-format msgid "bad option '%s' at %s:%d\n" msgstr "ugyldig flagg '%s' ved %s:%d\n" -#: lib/rpmrc.c:1564 +#: lib/rpmrc.c:1568 #, c-format msgid "Unknown system: %s\n" msgstr "" -#: lib/rpmrc.c:1565 +#: lib/rpmrc.c:1569 #, c-format msgid "Please contact %s\n" msgstr "" -#: lib/rpmrc.c:1802 +#: lib/rpmrc.c:1806 #, c-format msgid "Cannot expand %s\n" msgstr "Kan ikke utvide %s\n" -#: lib/rpmrc.c:1807 +#: lib/rpmrc.c:1811 #, c-format msgid "Cannot read %s, HOME is too large.\n" msgstr "" -#: lib/rpmrc.c:1824 +#: lib/rpmrc.c:1828 #, c-format msgid "Unable to open %s for reading: %s.\n" msgstr "Kunne ikke åpne spec fil %s: %s\n" @@ -3427,160 +3427,160 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:935 +#: lib/transaction.c:930 #, c-format msgid "excluding directory %s\n" msgstr "ekskluderer katalog %s\n" -#: lib/transaction.c:1022 +#: lib/transaction.c:1017 msgid "Transaction failed...rolling back\n" msgstr "" -#: lib/transaction.c:1042 +#: lib/transaction.c:1037 msgid "Could not order auto-rollback transaction!\n" msgstr "" -#: lib/transaction.c:1132 +#: lib/transaction.c:1127 msgid "Getting repackaged header from transaction element\n" msgstr "" -#: lib/transaction.c:1157 +#: lib/transaction.c:1152 #, c-format msgid "\tLooking for %s...\n" msgstr "" -#: lib/transaction.c:1161 +#: lib/transaction.c:1156 msgid "\tMatches found.\n" msgstr "" -#: lib/transaction.c:1165 +#: lib/transaction.c:1160 msgid "\tNo matches found.\n" msgstr "" -#: lib/transaction.c:1178 +#: lib/transaction.c:1173 #, fuzzy msgid "\tRepackaged package not found!.\n" msgstr "kildepakke forventet, binær funnet\n" -#: lib/transaction.c:1199 +#: lib/transaction.c:1194 msgid "\tREMOVETID matched INSTALLTID.\n" msgstr "" -#: lib/transaction.c:1201 +#: lib/transaction.c:1196 #, c-format msgid "\t\tName: %s.\n" msgstr "" -#: lib/transaction.c:1224 +#: lib/transaction.c:1219 #, fuzzy, c-format msgid "\tRepackaged Package was %s...\n" msgstr "ingen pakke utløser %s\n" -#: lib/transaction.c:1268 +#: lib/transaction.c:1263 msgid "Adding install element to auto-rollback transaction.\n" msgstr "" -#: lib/transaction.c:1277 +#: lib/transaction.c:1272 msgid "Could not get install element database instance!\n" msgstr "" -#: lib/transaction.c:1290 +#: lib/transaction.c:1285 msgid "Could not get header for auto-rollback transaction!\n" msgstr "" -#: lib/transaction.c:1300 +#: lib/transaction.c:1295 #, fuzzy, c-format msgid "\tAdded repackaged package header: %s.\n" msgstr "<kildepakke>" -#: lib/transaction.c:1302 lib/transaction.c:1313 +#: lib/transaction.c:1297 lib/transaction.c:1308 #, c-format msgid "\tAdded from install element %s.\n" msgstr "" -#: lib/transaction.c:1311 +#: lib/transaction.c:1306 msgid "\tAdded erase element.\n" msgstr "" -#: lib/transaction.c:1320 +#: lib/transaction.c:1315 msgid "Could not get repackaged header for auto-rollback transaction!\n" msgstr "" -#: lib/transaction.c:1327 +#: lib/transaction.c:1322 msgid "Add erase element to auto-rollback transaction.\n" msgstr "" -#: lib/transaction.c:1335 +#: lib/transaction.c:1330 msgid "\tFound existing upgrade element.\n" msgstr "" -#: lib/transaction.c:1336 +#: lib/transaction.c:1331 #, c-format msgid "\tNot adding erase element for %s.\n" msgstr "" -#: lib/transaction.c:1353 +#: lib/transaction.c:1348 #, fuzzy, c-format msgid "\tAdded repackaged package %s.\n" msgstr "<kildepakke>" -#: lib/transaction.c:1355 +#: lib/transaction.c:1350 #, c-format msgid "\tAdded from erase element %s.\n" msgstr "" -#: lib/transaction.c:1360 +#: lib/transaction.c:1355 msgid "Could not add erase element to auto-rollback transaction.\n" msgstr "" -#: lib/transaction.c:1366 +#: lib/transaction.c:1361 msgid "\tNo repackaged package...nothing to do.\n" msgstr "" -#: lib/transaction.c:1372 +#: lib/transaction.c:1367 #, fuzzy msgid "Failure reading repackaged package!\n" msgstr "feil under lesing av header fra pakke\n" -#: lib/transaction.c:1495 +#: lib/transaction.c:1490 #, c-format msgid "sanity checking %d elements\n" msgstr "" -#: lib/transaction.c:1581 +#: lib/transaction.c:1576 msgid "running pre-transaction scripts\n" msgstr "" -#: lib/transaction.c:1655 +#: lib/transaction.c:1650 #, c-format msgid "computing %d file fingerprints\n" msgstr "" -#: lib/transaction.c:1739 +#: lib/transaction.c:1734 msgid "computing file dispositions\n" msgstr "" -#: lib/transaction.c:1932 +#: lib/transaction.c:1927 msgid "Creating auto-rollback transaction\n" msgstr "" -#: lib/transaction.c:2086 +#: lib/transaction.c:2077 msgid "Add failed. Could not read package header.\n" msgstr "" -#: lib/transaction.c:2170 +#: lib/transaction.c:2161 msgid "Add failed in rpmpsmStage().\n" msgstr "" -#: lib/transaction.c:2214 +#: lib/transaction.c:2205 msgid "Add failed. Could not get file list.\n" msgstr "" -#: lib/transaction.c:2263 +#: lib/transaction.c:2254 msgid "Erase failed failed in rpmpsmStage().\n" msgstr "" -#: lib/transaction.c:2324 +#: lib/transaction.c:2315 msgid "running post-transaction scripts\n" msgstr "" @@ -3969,86 +3969,86 @@ msgstr "" msgid "======================== active %d empty %d\n" msgstr "" -#: rpmio/macro.c:394 +#: rpmio/macro.c:396 #, c-format msgid "%3d>%*s(empty)" msgstr "" -#: rpmio/macro.c:437 +#: rpmio/macro.c:439 #, c-format msgid "%3d<%*s(empty)\n" msgstr "" -#: rpmio/macro.c:664 rpmio/macro.c:705 +#: rpmio/macro.c:608 rpmio/macro.c:1090 rpmio/macro.c:1123 rpmio/macro.c:1863 +msgid "Target buffer overflow\n" +msgstr "Overflyt i målbuffer\n" + +#: rpmio/macro.c:671 rpmio/macro.c:712 #, c-format msgid "Macro %%%s has unterminated body\n" msgstr "" -#: rpmio/macro.c:727 +#: rpmio/macro.c:734 #, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "" -#: rpmio/macro.c:733 +#: rpmio/macro.c:740 #, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "" -#: rpmio/macro.c:738 +#: rpmio/macro.c:745 #, c-format msgid "Macro %%%s has empty body\n" msgstr "" -#: rpmio/macro.c:744 +#: rpmio/macro.c:751 #, c-format msgid "Macro %%%s failed to expand\n" msgstr "" -#: rpmio/macro.c:779 +#: rpmio/macro.c:786 #, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "" -#: rpmio/macro.c:897 +#: rpmio/macro.c:904 #, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "" -#: rpmio/macro.c:1024 +#: rpmio/macro.c:1031 #, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "" -#: rpmio/macro.c:1224 +#: rpmio/macro.c:1239 #, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "" -#: rpmio/macro.c:1297 rpmio/macro.c:1314 +#: rpmio/macro.c:1312 rpmio/macro.c:1329 #, c-format msgid "Unterminated %c: %s\n" msgstr "" -#: rpmio/macro.c:1355 +#: rpmio/macro.c:1370 #, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "" -#: rpmio/macro.c:1512 +#: rpmio/macro.c:1527 #, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "" -#: rpmio/macro.c:1848 -msgid "Target buffer overflow\n" -msgstr "Overflyt i målbuffer\n" - -#: rpmio/macro.c:2056 rpmio/macro.c:2062 +#: rpmio/macro.c:2076 rpmio/macro.c:2082 #, c-format msgid "File %s: %s\n" msgstr "Fil %s: %s\n" -#: rpmio/macro.c:2065 +#: rpmio/macro.c:2085 #, c-format msgid "File %s is smaller than %u bytes\n" msgstr "Fil %s er mindre enn %u bytes\n" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: pl\n" "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n" -"POT-Creation-Date: 2007-08-21 08:04+0200\n" +"POT-Creation-Date: 2007-08-30 18:37+0200\n" "PO-Revision-Date: 2007-06-29 23:42+0200\n" "Last-Translator: Piotr DrÄ…g <raven@pmail.pl>\n" "Language-Team: Polish <pl@li.org>\n" @@ -1278,18 +1278,18 @@ msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "" "utwórz nagłówki pakietu kompatybilne z (przestarzaÅ‚ymi) pakietami rpm[23]" -#: build/poptBT.c:229 lib/poptALL.c:273 lib/poptI.c:282 lib/poptQV.c:363 -#: lib/poptQV.c:372 lib/poptQV.c:413 +#: build/poptBT.c:229 lib/poptALL.c:273 lib/poptI.c:282 lib/poptQV.c:362 +#: lib/poptQV.c:371 lib/poptQV.c:412 msgid "don't verify package digest(s)" msgstr "nie sprawdzaj skrótów pakietu" -#: build/poptBT.c:231 lib/poptALL.c:275 lib/poptI.c:284 lib/poptQV.c:366 -#: lib/poptQV.c:374 lib/poptQV.c:416 +#: build/poptBT.c:231 lib/poptALL.c:275 lib/poptI.c:284 lib/poptQV.c:365 +#: lib/poptQV.c:373 lib/poptQV.c:415 msgid "don't verify database header(s) when retrieved" msgstr "nie sprawdzaj nagłówków bazy danych po otrzymaniu" -#: build/poptBT.c:233 lib/poptALL.c:281 lib/poptI.c:286 lib/poptQV.c:369 -#: lib/poptQV.c:376 lib/poptQV.c:418 +#: build/poptBT.c:233 lib/poptALL.c:281 lib/poptI.c:286 lib/poptQV.c:368 +#: lib/poptQV.c:375 lib/poptQV.c:417 msgid "don't verify package signature(s)" msgstr "nie sprawdzaj podpisów pakietu" @@ -1351,27 +1351,27 @@ msgstr "%s nie powiodÅ‚o siÄ™: %s\n" msgid "failed to write all data to %s\n" msgstr "Nie można zapisać danych do %s: %s\n" -#: build/rpmfc.c:1250 +#: build/rpmfc.c:1249 #, fuzzy, c-format msgid "magic_open(0x%x) failed: %s\n" msgstr "otwarcie %s nie powiodÅ‚o siÄ™: %s\n" -#: build/rpmfc.c:1258 +#: build/rpmfc.c:1257 #, fuzzy, c-format -msgid "magic_load(ms, \"%s\") failed: %s\n" +msgid "magic_load failed: %s\n" msgstr "%s rmdir %s nie powiodÅ‚o siÄ™: %s\n" -#: build/rpmfc.c:1303 +#: build/rpmfc.c:1301 #, fuzzy, c-format msgid "magic_file(ms, \"%s\") failed: mode %06o %s\n" msgstr "%s rmdir %s nie powiodÅ‚o siÄ™: %s\n" -#: build/rpmfc.c:1524 +#: build/rpmfc.c:1522 #, fuzzy, c-format msgid "Finding %s: %s\n" msgstr "Plik %s: %s\n" -#: build/rpmfc.c:1530 build/rpmfc.c:1539 +#: build/rpmfc.c:1528 build/rpmfc.c:1537 #, fuzzy, c-format msgid "Failed to find %s:\n" msgstr "Odczytanie %s nie powiodÅ‚o siÄ™: %s.\n" @@ -1491,11 +1491,11 @@ msgstr "zignoruj relacje nazw pakietów [%d]\t%s -> %s\n" msgid "removing %s \"%s\" from tsort relations.\n" msgstr "usuwanie %s \"%s\" z relacji tsort.\n" -#: lib/depends.c:1265 +#: lib/depends.c:1271 msgid "========== recording tsort relations\n" msgstr "========== zapisywanie relacji tsort\n" -#: lib/depends.c:1357 +#: lib/depends.c:1363 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, depth, " "breadth)\n" @@ -1503,20 +1503,20 @@ msgstr "" "========== tsortowanie pakietów (kolejność, #poprzedniki, #nastÄ™pniki, " "drzewo, gÅ‚Ä™bokość, szerokość)\n" -#: lib/depends.c:1453 +#: lib/depends.c:1459 #, c-format msgid "========== successors only (%d bytes)\n" msgstr "========== tylko nastÄ™pniki (%d bajtów)\n" -#: lib/depends.c:1526 +#: lib/depends.c:1532 msgid "LOOP:\n" msgstr "PĘTLA:\n" -#: lib/depends.c:1561 +#: lib/depends.c:1567 msgid "========== continuing tsort ...\n" msgstr "========== kontynuowanie tsort ...\n" -#: lib/depends.c:1566 +#: lib/depends.c:1572 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "rpmtsOrder nie powiodÅ‚o siÄ™, zostaÅ‚o %d elementów\n" @@ -2054,7 +2054,7 @@ msgstr "zaktualizuj bazÄ™, ale nie modyfikuj systemu plików" msgid "do not verify package dependencies" msgstr "nie sprawdzaj zależnoÅ›ci pakietu" -#: lib/poptI.c:252 lib/poptQV.c:307 lib/poptQV.c:310 +#: lib/poptI.c:252 lib/poptQV.c:306 lib/poptQV.c:309 msgid "don't verify MD5 digest of files" msgstr "nie sprawdzaj skrótów MD5 plików" @@ -2170,214 +2170,214 @@ msgstr "nie instaluj, podaj tylko czy instalacja zadziaÅ‚a czy nie" msgid "upgrade package(s)" msgstr "zaktualizuj pakiety" -#: lib/poptQV.c:103 +#: lib/poptQV.c:102 msgid "query/verify all packages" msgstr "odpytaj/sprawdź wszystkie pakiety" -#: lib/poptQV.c:105 +#: lib/poptQV.c:104 msgid "rpm checksig mode" msgstr "tryb sprawdzania podpisów RPM-ów" -#: lib/poptQV.c:107 +#: lib/poptQV.c:106 msgid "query/verify package(s) owning file" msgstr "odpytaj/sprawdź pakiety zawierajÄ…ce plik" -#: lib/poptQV.c:109 +#: lib/poptQV.c:108 msgid "query/verify package(s) in group" msgstr "odpytaj/sprawdź pakiety w grupie" -#: lib/poptQV.c:111 +#: lib/poptQV.c:110 msgid "query/verify a package file" msgstr "odpytaj/sprawdź plik pakietu" -#: lib/poptQV.c:114 +#: lib/poptQV.c:113 msgid "query/verify package(s) from TOP file tree walk" msgstr "odpytaj/sprawdź pakiety z przejÅ›cia tree plików TOP" -#: lib/poptQV.c:116 +#: lib/poptQV.c:115 msgid "query/verify package(s) from system HDLIST" msgstr "odpytaj/sprawdź pakiety z HDLIST systemu" -#: lib/poptQV.c:119 +#: lib/poptQV.c:118 msgid "query/verify package(s) with package identifier" msgstr "odpytaj/sprawdź pakiety z identyfikatorem pakietu" -#: lib/poptQV.c:121 +#: lib/poptQV.c:120 msgid "query/verify package(s) with header identifier" msgstr "odpytaj/sprawdź pakiety z identyfikatorem nagłówka" -#: lib/poptQV.c:123 +#: lib/poptQV.c:122 msgid "query/verify package(s) with file identifier" msgstr "odpytaj/sprawdź pakiety z identyfikatorem pliku" -#: lib/poptQV.c:126 +#: lib/poptQV.c:125 msgid "rpm query mode" msgstr "tryb odpytywania RPM-ów" -#: lib/poptQV.c:128 +#: lib/poptQV.c:127 msgid "query/verify a header instance" msgstr "odpytaj/sprawdź instancjÄ™ nagłówka" -#: lib/poptQV.c:130 +#: lib/poptQV.c:129 msgid "query a spec file" msgstr "odpytaj plik spec" -#: lib/poptQV.c:130 +#: lib/poptQV.c:129 msgid "<spec>" msgstr "<spec>" -#: lib/poptQV.c:132 +#: lib/poptQV.c:131 msgid "query/verify package(s) from install transaction" msgstr "odpytaj/sprawdź pakiety z transakcji instalacji" -#: lib/poptQV.c:134 +#: lib/poptQV.c:133 msgid "query the package(s) triggered by the package" msgstr "odpytaj pakiety aktywowane przez pakiet" -#: lib/poptQV.c:136 +#: lib/poptQV.c:135 msgid "rpm verify mode" msgstr "tryb sprawdzania RPM-ów" -#: lib/poptQV.c:138 +#: lib/poptQV.c:137 msgid "query/verify the package(s) which require a dependency" msgstr "odpytaj/sprawdź pakiety wymagajÄ…ce zależnoÅ›ci" -#: lib/poptQV.c:140 +#: lib/poptQV.c:139 msgid "query/verify the package(s) which provide a dependency" msgstr "odpytaj/sprawdź pakiety dostarczajÄ…ce zależność" -#: lib/poptQV.c:143 +#: lib/poptQV.c:142 msgid "create transaction set" msgstr "utwórz ustawienia transakcji" -#: lib/poptQV.c:145 +#: lib/poptQV.c:144 msgid "do not order transaction set" msgstr "nie porzÄ…dkuj ustawieÅ„ transakcji" -#: lib/poptQV.c:147 +#: lib/poptQV.c:146 msgid "do not glob arguments" msgstr "nie używaj argumentów glob" -#: lib/poptQV.c:149 +#: lib/poptQV.c:148 msgid "do not process non-package files as manifests" msgstr "nie przetwarzaj plików nie bÄ™dÄ…cych pakietami jako manifesty" -#: lib/poptQV.c:151 +#: lib/poptQV.c:150 msgid "do not read headers" msgstr "nie odczytuj nagłówków" -#: lib/poptQV.c:258 +#: lib/poptQV.c:257 msgid "list all configuration files" msgstr "wyÅ›wietl wszystkie pliki konfiguracyjne" -#: lib/poptQV.c:260 +#: lib/poptQV.c:259 msgid "list all documentation files" msgstr "wyÅ›wietl wszystkie pliki dokumentacji" -#: lib/poptQV.c:262 +#: lib/poptQV.c:261 msgid "dump basic file information" msgstr "podaj podstawowe informacje o pliku" -#: lib/poptQV.c:266 +#: lib/poptQV.c:265 msgid "list files in package" msgstr "wyÅ›wietl pliki pakietu" -#: lib/poptQV.c:271 +#: lib/poptQV.c:270 #, c-format msgid "skip %%ghost files" msgstr "pomiÅ„ pliki %%ghost" -#: lib/poptQV.c:275 +#: lib/poptQV.c:274 #, c-format msgid "skip %%license files" msgstr "pomiÅ„ pliki %%license" -#: lib/poptQV.c:278 +#: lib/poptQV.c:277 #, c-format msgid "skip %%readme files" msgstr "pomiÅ„ pliki %%readme" -#: lib/poptQV.c:284 +#: lib/poptQV.c:283 msgid "use the following query format" msgstr "użyj nastÄ™pujÄ…cego formatu zapytania" -#: lib/poptQV.c:286 +#: lib/poptQV.c:285 msgid "substitute i18n sections into spec file" msgstr "zamieÅ„ sekcje i18n w plik spec" -#: lib/poptQV.c:288 +#: lib/poptQV.c:287 msgid "display the states of the listed files" msgstr "wyÅ›wietl stan wyÅ›wietlonych plików" -#: lib/poptQV.c:314 +#: lib/poptQV.c:313 msgid "don't verify size of files" msgstr "nie sprawdzaj rozmiaru plików" -#: lib/poptQV.c:317 +#: lib/poptQV.c:316 msgid "don't verify symlink path of files" msgstr "nie sprawdzaj Å›cieżek dowiÄ…zaÅ„ symbolicznych plików" -#: lib/poptQV.c:320 +#: lib/poptQV.c:319 msgid "don't verify owner of files" msgstr "nie sprawdzaj wÅ‚aÅ›cicieli plików" -#: lib/poptQV.c:323 +#: lib/poptQV.c:322 msgid "don't verify group of files" msgstr "nie sprawdzaj grup plików" -#: lib/poptQV.c:326 +#: lib/poptQV.c:325 msgid "don't verify modification time of files" msgstr "nie sprawdzaj czasu modyfikacji plików" -#: lib/poptQV.c:329 lib/poptQV.c:332 +#: lib/poptQV.c:328 lib/poptQV.c:331 msgid "don't verify mode of files" msgstr "nie sprawdzaj trybu plików" -#: lib/poptQV.c:335 +#: lib/poptQV.c:334 msgid "don't verify file security contexts" msgstr "nie sprawdzaj kontekstów bezpieczeÅ„stwa plików" -#: lib/poptQV.c:337 +#: lib/poptQV.c:336 msgid "don't verify files in package" msgstr "nie sprawdzaj plików pakietu" -#: lib/poptQV.c:340 lib/poptQV.c:343 tools/rpmgraph.c:266 +#: lib/poptQV.c:339 lib/poptQV.c:342 tools/rpmgraph.c:266 msgid "don't verify package dependencies" msgstr "nie sprawdzaj zależnoÅ›ci pakietu" -#: lib/poptQV.c:348 lib/poptQV.c:352 lib/poptQV.c:355 lib/poptQV.c:358 +#: lib/poptQV.c:347 lib/poptQV.c:351 lib/poptQV.c:354 lib/poptQV.c:357 msgid "don't execute verify script(s)" msgstr "nie wykonuj żadnych skryptów verify" -#: lib/poptQV.c:382 +#: lib/poptQV.c:381 msgid "don't verify GPG V3 DSA signature(s)" msgstr "nie sprawdzaj podpisów GPG V3 DSA" -#: lib/poptQV.c:385 +#: lib/poptQV.c:384 msgid "don't verify PGP V3 RSA/MD5 signature(s)" msgstr "nie sprawdzaj podpisów PGP V3 RSA/MD5" -#: lib/poptQV.c:400 +#: lib/poptQV.c:399 msgid "sign package(s) (identical to --resign)" msgstr "podpisz pakiety (identyczne z --resign)" -#: lib/poptQV.c:402 +#: lib/poptQV.c:401 msgid "verify package signature(s)" msgstr "sprawdź podpis pakietu" -#: lib/poptQV.c:404 +#: lib/poptQV.c:403 msgid "delete package signatures" msgstr "usuÅ„ podpisy pakietu" -#: lib/poptQV.c:406 +#: lib/poptQV.c:405 msgid "import an armored public key" msgstr "zaimportuj opakowany klucz publiczny" -#: lib/poptQV.c:408 +#: lib/poptQV.c:407 msgid "sign package(s) (identical to --addsign)" msgstr "podpisz pakiety (identyczne z --addsign)" -#: lib/poptQV.c:410 +#: lib/poptQV.c:409 msgid "generate signature" msgstr "utwórz podpis" @@ -2716,38 +2716,38 @@ msgstr "pakiet %s ma niespeÅ‚nione %s: %s\n" msgid "%s skipped due to missingok flag\n" msgstr "%s pominiÄ™ty z powodu flagi missingok\n" -#: lib/rpmfi.c:846 +#: lib/rpmfi.c:850 msgid "========== relocations\n" msgstr "========== przesuniÄ™cia\n" -#: lib/rpmfi.c:850 +#: lib/rpmfi.c:854 #, c-format msgid "%5d exclude %s\n" msgstr "%5d wyÅ‚Ä…czenie %s\n" -#: lib/rpmfi.c:853 +#: lib/rpmfi.c:857 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "%5d przesuniÄ™cie %s -> %s\n" -#: lib/rpmfi.c:987 +#: lib/rpmfi.c:991 #, c-format msgid "excluding %s %s\n" msgstr "wyÅ‚Ä…czanie %s %s\n" -#: lib/rpmfi.c:997 +#: lib/rpmfi.c:1001 #, c-format msgid "relocating %s to %s\n" msgstr "przesuwanie %s do %s\n" -#: lib/rpmfi.c:1089 +#: lib/rpmfi.c:1093 #, c-format msgid "relocating directory %s to %s\n" msgstr "przesuwanie katalogu %s do %s\n" #: lib/rpmgi.c:81 lib/rpminstall.c:124 lib/rpminstall.c:480 -#: lib/rpminstall.c:615 lib/rpminstall.c:1041 lib/rpmts.c:643 -#: tools/rpmgraph.c:121 tools/rpmgraph.c:158 +#: lib/rpminstall.c:615 lib/rpmts.c:643 tools/rpmgraph.c:121 +#: tools/rpmgraph.c:158 #, c-format msgid "open of %s failed: %s\n" msgstr "otwarcie %s nie powiodÅ‚o siÄ™: %s\n" @@ -2758,7 +2758,7 @@ msgid "unknown tag: \"%s\"\n" msgstr "nieznany znacznik: \"%s\"\n" #: lib/rpmgi.c:628 lib/rpminstall.c:659 lib/rpminstall.c:834 -#: lib/rpminstall.c:1267 lib/transaction.c:1031 tools/rpmgraph.c:196 +#: lib/rpminstall.c:1084 lib/transaction.c:1026 tools/rpmgraph.c:196 msgid "Failed dependencies:\n" msgstr "NiespeÅ‚nione zależnoÅ›ci:\n" @@ -2874,16 +2874,16 @@ msgstr "nie można otworzyć %s: %s\n" msgid "Installing %s\n" msgstr "Instalowanie %s\n" -#: lib/rpminstall.c:1261 lib/transaction.c:1024 +#: lib/rpminstall.c:1078 lib/transaction.c:1019 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "Cofnij pakiety (+%d/-%d) do %-24.24s (0x%08x):\n" -#: lib/rpminstall.c:1292 lib/transaction.c:1075 +#: lib/rpminstall.c:1109 lib/transaction.c:1070 msgid "Cleaning up repackaged packages:\n" msgstr "Czyszczenie ponownie spakowanych pakietów:\n" -#: lib/rpminstall.c:1299 lib/transaction.c:1081 +#: lib/rpminstall.c:1116 lib/transaction.c:1076 #, c-format msgid "\tRemoving %s:\n" msgstr "\tUsuwanie %s\n" @@ -3018,97 +3018,97 @@ msgstr "%s jest w konflikcie z %s%s" msgid "unknown error %d encountered while manipulating package %s" msgstr "wystÄ…piÅ‚ nieznany bÅ‚Ä…d %d podczas manipulowania pakietem %s" -#: lib/rpmrc.c:199 +#: lib/rpmrc.c:213 #, c-format msgid "missing second ':' at %s:%d\n" msgstr "brak drugiego \":\" w %s:%d\n" -#: lib/rpmrc.c:202 +#: lib/rpmrc.c:216 #, c-format msgid "missing architecture name at %s:%d\n" msgstr "brak nazwy architektury w %s:%d\n" -#: lib/rpmrc.c:356 +#: lib/rpmrc.c:370 #, c-format msgid "Incomplete data line at %s:%d\n" msgstr "Niekompletny wiersz danych w %s:%d\n" -#: lib/rpmrc.c:361 +#: lib/rpmrc.c:375 #, c-format msgid "Too many args in data line at %s:%d\n" msgstr "Za dużo argumentów w wierszu danych w %s:%d\n" -#: lib/rpmrc.c:369 +#: lib/rpmrc.c:383 #, c-format msgid "Bad arch/os number: %s (%s:%d)\n" msgstr "BÅ‚Ä™dny numer architektury/systemu operacyjnego: %s (%s:%d)\n" -#: lib/rpmrc.c:406 +#: lib/rpmrc.c:420 #, c-format msgid "Incomplete default line at %s:%d\n" msgstr "Niekompletny domyÅ›lny wiersz w %s:%d\n" -#: lib/rpmrc.c:411 +#: lib/rpmrc.c:425 #, c-format msgid "Too many args in default line at %s:%d\n" msgstr "Za dużo argumentów w domyÅ›lnym wierszu w %s:%d\n" -#: lib/rpmrc.c:577 +#: lib/rpmrc.c:591 #, c-format msgid "Failed to read %s: %s.\n" msgstr "Odczytanie %s nie powiodÅ‚o siÄ™: %s.\n" -#: lib/rpmrc.c:615 +#: lib/rpmrc.c:629 #, c-format msgid "missing ':' (found 0x%02x) at %s:%d\n" msgstr "brak \":\" (znaleziono 0x%02x) w %s:%d\n" -#: lib/rpmrc.c:632 lib/rpmrc.c:706 +#: lib/rpmrc.c:646 lib/rpmrc.c:710 #, c-format msgid "missing argument for %s at %s:%d\n" msgstr "brak argumentu dla %s w %s:%d\n" -#: lib/rpmrc.c:649 lib/rpmrc.c:671 +#: lib/rpmrc.c:663 #, c-format msgid "%s expansion failed at %s:%d \"%s\"\n" msgstr "rozwiniÄ™cie %s nie powiodÅ‚o siÄ™ w %s:%d \"%s\"\n" -#: lib/rpmrc.c:658 +#: lib/rpmrc.c:672 #, c-format msgid "cannot open %s at %s:%d: %s\n" msgstr "nie można otworzyć %s w %s:%d: %s\n" -#: lib/rpmrc.c:698 +#: lib/rpmrc.c:702 #, c-format msgid "missing architecture for %s at %s:%d\n" msgstr "brak architektury dla %s w %s:%d\n" -#: lib/rpmrc.c:765 +#: lib/rpmrc.c:769 #, c-format msgid "bad option '%s' at %s:%d\n" msgstr "bÅ‚Ä™dna opcja \"%s\" w %s:%d\n" -#: lib/rpmrc.c:1564 +#: lib/rpmrc.c:1568 #, c-format msgid "Unknown system: %s\n" msgstr "Nieznany system: %s\n" -#: lib/rpmrc.c:1565 +#: lib/rpmrc.c:1569 #, c-format msgid "Please contact %s\n" msgstr "" -#: lib/rpmrc.c:1802 +#: lib/rpmrc.c:1806 #, c-format msgid "Cannot expand %s\n" msgstr "Nie można rozwinąć %s\n" -#: lib/rpmrc.c:1807 +#: lib/rpmrc.c:1811 #, c-format msgid "Cannot read %s, HOME is too large.\n" msgstr "Nie można odczytać %s, HOME jest za duże.\n" -#: lib/rpmrc.c:1824 +#: lib/rpmrc.c:1828 #, c-format msgid "Unable to open %s for reading: %s.\n" msgstr "Nie można otworzyć %s do odczytania: %s.\n" @@ -3400,163 +3400,163 @@ msgstr "Uszkodzony skrót MD5: NIE OBSÅUGIWANY\n" msgid "Signature: UNKNOWN (%d)\n" msgstr "Podpis: NIEZNANY (%d)\n" -#: lib/transaction.c:935 +#: lib/transaction.c:930 #, c-format msgid "excluding directory %s\n" msgstr "wyÅ‚Ä…czanie katalogu %s\n" -#: lib/transaction.c:1022 +#: lib/transaction.c:1017 msgid "Transaction failed...rolling back\n" msgstr "Transakcja nie powiodÅ‚a siÄ™... Cofanie zmian\n" -#: lib/transaction.c:1042 +#: lib/transaction.c:1037 msgid "Could not order auto-rollback transaction!\n" msgstr "Nie można uporzÄ…dkować transakcji automatycznego cofania zmian!\n" -#: lib/transaction.c:1132 +#: lib/transaction.c:1127 msgid "Getting repackaged header from transaction element\n" msgstr "Otrzymywanie ponownie spakowanego nagłówka z elementu transakcji\n" -#: lib/transaction.c:1157 +#: lib/transaction.c:1152 #, c-format msgid "\tLooking for %s...\n" msgstr "\tWyszukiwanie %s...\n" -#: lib/transaction.c:1161 +#: lib/transaction.c:1156 msgid "\tMatches found.\n" msgstr "\tZnaleziono pasujÄ…ce.\n" -#: lib/transaction.c:1165 +#: lib/transaction.c:1160 msgid "\tNo matches found.\n" msgstr "\tNie znaleziono pasujÄ…cych.\n" -#: lib/transaction.c:1178 +#: lib/transaction.c:1173 msgid "\tRepackaged package not found!.\n" msgstr "\tNie znaleziono ponownie spakowanego pakietu!.\n" -#: lib/transaction.c:1199 +#: lib/transaction.c:1194 msgid "\tREMOVETID matched INSTALLTID.\n" msgstr "\tREMOVETID pasuje do INSTALLTID.\n" -#: lib/transaction.c:1201 +#: lib/transaction.c:1196 #, c-format msgid "\t\tName: %s.\n" msgstr "\t\tNazwa: %s.\n" -#: lib/transaction.c:1224 +#: lib/transaction.c:1219 #, c-format msgid "\tRepackaged Package was %s...\n" msgstr "\tPonownie spakowany pakiet byÅ‚ %s...\n" -#: lib/transaction.c:1268 +#: lib/transaction.c:1263 msgid "Adding install element to auto-rollback transaction.\n" msgstr "" "Dodawanie zainstalowanego elementu do transakcji automatycznego cofania " "zmian.\n" -#: lib/transaction.c:1277 +#: lib/transaction.c:1272 msgid "Could not get install element database instance!\n" msgstr "Nie można otrzymać zainstalowanego elementu instancji bazy danych!\n" -#: lib/transaction.c:1290 +#: lib/transaction.c:1285 msgid "Could not get header for auto-rollback transaction!\n" msgstr "" "Nie można otrzymać nagłówka dla transakcji automatycznego cofania zmian!\n" -#: lib/transaction.c:1300 +#: lib/transaction.c:1295 #, c-format msgid "\tAdded repackaged package header: %s.\n" msgstr "\tDodano ponownie spakowany nagłówek pakietu: %s.\n" -#: lib/transaction.c:1302 lib/transaction.c:1313 +#: lib/transaction.c:1297 lib/transaction.c:1308 #, c-format msgid "\tAdded from install element %s.\n" msgstr "\tDodano z zainstalowanego elementu %s.\n" -#: lib/transaction.c:1311 +#: lib/transaction.c:1306 msgid "\tAdded erase element.\n" msgstr "\tDodano usuniÄ™ty element.\n" -#: lib/transaction.c:1320 +#: lib/transaction.c:1315 msgid "Could not get repackaged header for auto-rollback transaction!\n" msgstr "" "Nie można otrzymać ponownie spakowanego nagłówka dla transakcji " "automatycznego cofania zmian!\n" -#: lib/transaction.c:1327 +#: lib/transaction.c:1322 msgid "Add erase element to auto-rollback transaction.\n" msgstr "Dodaj usuniÄ™ty element do automatycznego cofania zmian.\n" -#: lib/transaction.c:1335 +#: lib/transaction.c:1330 msgid "\tFound existing upgrade element.\n" msgstr "\tZnaleziono istniejÄ…cy zaktualizowany element.\n" -#: lib/transaction.c:1336 +#: lib/transaction.c:1331 #, c-format msgid "\tNot adding erase element for %s.\n" msgstr "\tUsuniÄ™ty element nie zostanie dodany do %s.\n" -#: lib/transaction.c:1353 +#: lib/transaction.c:1348 #, c-format msgid "\tAdded repackaged package %s.\n" msgstr "\tDodano ponownie spakowany pakiet %s.\n" -#: lib/transaction.c:1355 +#: lib/transaction.c:1350 #, c-format msgid "\tAdded from erase element %s.\n" msgstr "\tDodano usuniÄ™ty element %s.\n" -#: lib/transaction.c:1360 +#: lib/transaction.c:1355 msgid "Could not add erase element to auto-rollback transaction.\n" msgstr "Nie można dodać usuniÄ™tego elementu do automatycznego cofania zmian.\n" -#: lib/transaction.c:1366 +#: lib/transaction.c:1361 msgid "\tNo repackaged package...nothing to do.\n" msgstr "\tBrak ponownie spakowanego pakietu... Nie ma nic do zrobienia.\n" -#: lib/transaction.c:1372 +#: lib/transaction.c:1367 msgid "Failure reading repackaged package!\n" msgstr "Odczytanie ponownie spakowanego pakietu nie powiodÅ‚o siÄ™!\n" -#: lib/transaction.c:1495 +#: lib/transaction.c:1490 #, c-format msgid "sanity checking %d elements\n" msgstr "sprawdzanie poprawnoÅ›ci %d elementów\n" -#: lib/transaction.c:1581 +#: lib/transaction.c:1576 msgid "running pre-transaction scripts\n" msgstr "uruchamianie skryptów przedtransakcyjnych\n" -#: lib/transaction.c:1655 +#: lib/transaction.c:1650 #, c-format msgid "computing %d file fingerprints\n" msgstr "obliczanie %d odcisków plików\n" -#: lib/transaction.c:1739 +#: lib/transaction.c:1734 msgid "computing file dispositions\n" msgstr "obliczanie dyspozycji plików\n" -#: lib/transaction.c:1932 +#: lib/transaction.c:1927 msgid "Creating auto-rollback transaction\n" msgstr "Tworzenie transakcji automatycznego cofania zmian\n" -#: lib/transaction.c:2086 +#: lib/transaction.c:2077 msgid "Add failed. Could not read package header.\n" msgstr "Dodanie nie powiodÅ‚o siÄ™. Nie można odczytać nagłówka pakietu.\n" -#: lib/transaction.c:2170 +#: lib/transaction.c:2161 msgid "Add failed in rpmpsmStage().\n" msgstr "Dodanie nie powiodÅ‚o siÄ™ w rpmpsmStage().\n" -#: lib/transaction.c:2214 +#: lib/transaction.c:2205 msgid "Add failed. Could not get file list.\n" msgstr "Dodanie nie powiodÅ‚o siÄ™. Nie można otrzymać listy plików.\n" -#: lib/transaction.c:2263 +#: lib/transaction.c:2254 msgid "Erase failed failed in rpmpsmStage().\n" msgstr "Usuwanie nie powiodÅ‚o siÄ™ w rpmpsmStage().\n" -#: lib/transaction.c:2324 +#: lib/transaction.c:2315 msgid "running post-transaction scripts\n" msgstr "uruchamianie skryptów potransakcyjnych\n" @@ -3951,86 +3951,86 @@ msgstr "otwieranie indeksu bazy danych %s/%s %s tryb=0x%x\n" msgid "======================== active %d empty %d\n" msgstr "======================== aktywny %d pusty %d\n" -#: rpmio/macro.c:394 +#: rpmio/macro.c:396 #, c-format msgid "%3d>%*s(empty)" msgstr "%3d>%*s(pusty)" -#: rpmio/macro.c:437 +#: rpmio/macro.c:439 #, c-format msgid "%3d<%*s(empty)\n" msgstr "%3d<%*s(pusty)\n" -#: rpmio/macro.c:664 rpmio/macro.c:705 +#: rpmio/macro.c:608 rpmio/macro.c:1090 rpmio/macro.c:1123 rpmio/macro.c:1863 +msgid "Target buffer overflow\n" +msgstr "PrzepeÅ‚nienie bufora docelowego\n" + +#: rpmio/macro.c:671 rpmio/macro.c:712 #, c-format msgid "Macro %%%s has unterminated body\n" msgstr "Makro %%%s ma nie zakoÅ„czone ciaÅ‚o\n" -#: rpmio/macro.c:727 +#: rpmio/macro.c:734 #, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "Makro %%%s ma niedozwolonÄ… nazwÄ™ (%%define)\n" -#: rpmio/macro.c:733 +#: rpmio/macro.c:740 #, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "Makro %%%s ma nie zakoÅ„czone opcje\n" -#: rpmio/macro.c:738 +#: rpmio/macro.c:745 #, c-format msgid "Macro %%%s has empty body\n" msgstr "Makro %%%s ma puste ciaÅ‚o\n" -#: rpmio/macro.c:744 +#: rpmio/macro.c:751 #, c-format msgid "Macro %%%s failed to expand\n" msgstr "RozwiniÄ™cie makra %%%s nie powiodÅ‚o siÄ™\n" -#: rpmio/macro.c:779 +#: rpmio/macro.c:786 #, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "Makro %%%s ma niedozwolonÄ… nazwÄ™ (%%undefine)\n" -#: rpmio/macro.c:897 +#: rpmio/macro.c:904 #, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "Makro %%%s (%s) nie byÅ‚o użyte poniżej poziomu %d\n" -#: rpmio/macro.c:1024 +#: rpmio/macro.c:1031 #, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "Nieznana opcja %c w %s(%s)\n" -#: rpmio/macro.c:1224 +#: rpmio/macro.c:1239 #, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "GÅ‚Ä™bokość rekursji(%d) wiÄ™ksza niż maksymalna(%d)\n" -#: rpmio/macro.c:1297 rpmio/macro.c:1314 +#: rpmio/macro.c:1312 rpmio/macro.c:1329 #, c-format msgid "Unterminated %c: %s\n" msgstr "NiezakoÅ„czone %c: %s\n" -#: rpmio/macro.c:1355 +#: rpmio/macro.c:1370 #, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "Napotkano makro nie do przeanalizowania po %%\n" -#: rpmio/macro.c:1512 +#: rpmio/macro.c:1527 #, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "Nie znaleziono makra %%%.*s, pomijanie\n" -#: rpmio/macro.c:1848 -msgid "Target buffer overflow\n" -msgstr "PrzepeÅ‚nienie bufora docelowego\n" - -#: rpmio/macro.c:2056 rpmio/macro.c:2062 +#: rpmio/macro.c:2076 rpmio/macro.c:2082 #, c-format msgid "File %s: %s\n" msgstr "Plik %s: %s\n" -#: rpmio/macro.c:2065 +#: rpmio/macro.c:2085 #, c-format msgid "File %s is smaller than %u bytes\n" msgstr "Plik %s jest mniejszy niż %u bajtów\n" @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm\n" "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n" -"POT-Creation-Date: 2007-08-21 08:04+0200\n" +"POT-Creation-Date: 2007-08-30 18:37+0200\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" @@ -1280,20 +1280,20 @@ msgstr "não verificar as dependências de compilação" msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "gerar um cabeçalho do pacote compatÃvel com os pacotes do rpm[23]" -#: build/poptBT.c:229 lib/poptALL.c:273 lib/poptI.c:282 lib/poptQV.c:363 -#: lib/poptQV.c:372 lib/poptQV.c:413 +#: build/poptBT.c:229 lib/poptALL.c:273 lib/poptI.c:282 lib/poptQV.c:362 +#: lib/poptQV.c:371 lib/poptQV.c:412 #, fuzzy msgid "don't verify package digest(s)" msgstr "não verificar as dependências do pacote" -#: build/poptBT.c:231 lib/poptALL.c:275 lib/poptI.c:284 lib/poptQV.c:366 -#: lib/poptQV.c:374 lib/poptQV.c:416 +#: build/poptBT.c:231 lib/poptALL.c:275 lib/poptI.c:284 lib/poptQV.c:365 +#: lib/poptQV.c:373 lib/poptQV.c:415 #, fuzzy msgid "don't verify database header(s) when retrieved" msgstr "não verifica a arquitectura do pacote" -#: build/poptBT.c:233 lib/poptALL.c:281 lib/poptI.c:286 lib/poptQV.c:369 -#: lib/poptQV.c:376 lib/poptQV.c:418 +#: build/poptBT.c:233 lib/poptALL.c:281 lib/poptI.c:286 lib/poptQV.c:368 +#: lib/poptQV.c:375 lib/poptQV.c:417 #, fuzzy msgid "don't verify package signature(s)" msgstr "verificar a assinatura do pacote" @@ -1356,27 +1356,27 @@ msgstr "O %s falhou\n" msgid "failed to write all data to %s\n" msgstr "não consegui escrever todos os dados em %s\n" -#: build/rpmfc.c:1250 +#: build/rpmfc.c:1249 #, fuzzy, c-format msgid "magic_open(0x%x) failed: %s\n" msgstr "o acesso ao %s falhou: %s\n" -#: build/rpmfc.c:1258 +#: build/rpmfc.c:1257 #, fuzzy, c-format -msgid "magic_load(ms, \"%s\") failed: %s\n" +msgid "magic_load failed: %s\n" msgstr "%s rmdir de %s falhou: %s\n" -#: build/rpmfc.c:1303 +#: build/rpmfc.c:1301 #, fuzzy, c-format msgid "magic_file(ms, \"%s\") failed: mode %06o %s\n" msgstr "%s rmdir de %s falhou: %s\n" -#: build/rpmfc.c:1524 +#: build/rpmfc.c:1522 #, fuzzy, c-format msgid "Finding %s: %s\n" msgstr "A procurar o %s: (usando o %s)...\n" -#: build/rpmfc.c:1530 build/rpmfc.c:1539 +#: build/rpmfc.c:1528 build/rpmfc.c:1537 #, c-format msgid "Failed to find %s:\n" msgstr "Não consegui encontrar o %s:\n" @@ -1501,11 +1501,11 @@ msgstr "ignorar relações entre o nome do pacote [%d]\t%s -> %s\n" msgid "removing %s \"%s\" from tsort relations.\n" msgstr "a remover o %s-%s-%s \"%s\" das relações do tsort.\n" -#: lib/depends.c:1265 +#: lib/depends.c:1271 msgid "========== recording tsort relations\n" msgstr "=========== a guardar as relações do tsort\n" -#: lib/depends.c:1357 +#: lib/depends.c:1363 #, fuzzy msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, depth, " @@ -1513,20 +1513,20 @@ msgid "" msgstr "" "========== ordenar pacotes (order, #predecessors, #succesors, tree, depth)\n" -#: lib/depends.c:1453 +#: lib/depends.c:1459 #, fuzzy, c-format msgid "========== successors only (%d bytes)\n" msgstr "========== só os sucessores (ordem de apresentação)\n" -#: lib/depends.c:1526 +#: lib/depends.c:1532 msgid "LOOP:\n" msgstr "CICLO:\n" -#: lib/depends.c:1561 +#: lib/depends.c:1567 msgid "========== continuing tsort ...\n" msgstr "========== a prosseguir o tsort ...\n" -#: lib/depends.c:1566 +#: lib/depends.c:1572 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2086,7 +2086,7 @@ msgstr "actualiza a base de dados, mas não altera o sistema de ficheiros" msgid "do not verify package dependencies" msgstr "não verifica as dependências do pacote" -#: lib/poptI.c:252 lib/poptQV.c:307 lib/poptQV.c:310 +#: lib/poptI.c:252 lib/poptQV.c:306 lib/poptQV.c:309 msgid "don't verify MD5 digest of files" msgstr "não verificar o MD5 dos ficheiros" @@ -2204,229 +2204,229 @@ msgstr "não instala, mas indica se iria funcionar ou não" msgid "upgrade package(s)" msgstr "actualizar pacote(s)" -#: lib/poptQV.c:103 +#: lib/poptQV.c:102 msgid "query/verify all packages" msgstr "pesquisar/verificar todos os pacotes" -#: lib/poptQV.c:105 +#: lib/poptQV.c:104 #, fuzzy msgid "rpm checksig mode" msgstr "modo de verificação do rpm" -#: lib/poptQV.c:107 +#: lib/poptQV.c:106 msgid "query/verify package(s) owning file" msgstr "pesquisar/verificar o(s) pacote(s) que contém(êm) o ficheiro" -#: lib/poptQV.c:109 +#: lib/poptQV.c:108 msgid "query/verify package(s) in group" msgstr "pesquisar/verificar o(s) pacote(s) no grupo" -#: lib/poptQV.c:111 +#: lib/poptQV.c:110 #, fuzzy msgid "query/verify a package file" msgstr "pesquisar/verificar todos os pacotes" -#: lib/poptQV.c:114 +#: lib/poptQV.c:113 #, fuzzy msgid "query/verify package(s) from TOP file tree walk" msgstr "pesquisar/verificar o(s) pacote(s) de transacção de instalação" -#: lib/poptQV.c:116 +#: lib/poptQV.c:115 #, fuzzy msgid "query/verify package(s) from system HDLIST" msgstr "pesquisar/verificar o(s) pacote(s) de transacção de instalação" -#: lib/poptQV.c:119 +#: lib/poptQV.c:118 msgid "query/verify package(s) with package identifier" msgstr "pesquisar/verificar o(s) pacote(s) com o identificador do pacote" -#: lib/poptQV.c:121 +#: lib/poptQV.c:120 msgid "query/verify package(s) with header identifier" msgstr "pesquisar/verificar o(s) pacote(s) com o identificador do cabeçalho" -#: lib/poptQV.c:123 +#: lib/poptQV.c:122 msgid "query/verify package(s) with file identifier" msgstr "pesquisar/verificar o(s) pacote(s) com o identificador do ficheiro" -#: lib/poptQV.c:126 +#: lib/poptQV.c:125 msgid "rpm query mode" msgstr "modo de pesquisa do rpm" -#: lib/poptQV.c:128 +#: lib/poptQV.c:127 #, fuzzy msgid "query/verify a header instance" msgstr "pesquisar/verificar o(s) pacote(s) com o identificador do cabeçalho" -#: lib/poptQV.c:130 +#: lib/poptQV.c:129 msgid "query a spec file" msgstr "pesquisar um ficheiro spec" -#: lib/poptQV.c:130 +#: lib/poptQV.c:129 msgid "<spec>" msgstr "<spec>" -#: lib/poptQV.c:132 +#: lib/poptQV.c:131 msgid "query/verify package(s) from install transaction" msgstr "pesquisar/verificar o(s) pacote(s) de transacção de instalação" -#: lib/poptQV.c:134 +#: lib/poptQV.c:133 msgid "query the package(s) triggered by the package" msgstr "pesquisar o(s) pacote(s) activados pelo pacote" -#: lib/poptQV.c:136 +#: lib/poptQV.c:135 msgid "rpm verify mode" msgstr "modo de verificação do rpm" -#: lib/poptQV.c:138 +#: lib/poptQV.c:137 msgid "query/verify the package(s) which require a dependency" msgstr "pesquisar/verificar o(s) pacote(s) que precisa duma dependência" -#: lib/poptQV.c:140 +#: lib/poptQV.c:139 msgid "query/verify the package(s) which provide a dependency" msgstr "pesquisar/verificar o(s) pacote(s) que oferecem uma dependência" -#: lib/poptQV.c:143 +#: lib/poptQV.c:142 msgid "create transaction set" msgstr "" -#: lib/poptQV.c:145 +#: lib/poptQV.c:144 msgid "do not order transaction set" msgstr "" -#: lib/poptQV.c:147 +#: lib/poptQV.c:146 #, fuzzy msgid "do not glob arguments" msgstr "não foram indicados argumentos para a pesquisa" -#: lib/poptQV.c:149 +#: lib/poptQV.c:148 msgid "do not process non-package files as manifests" msgstr "" -#: lib/poptQV.c:151 +#: lib/poptQV.c:150 #, fuzzy msgid "do not read headers" msgstr "%s: não consigo ler o cabeçalho em 0x%x\n" -#: lib/poptQV.c:258 +#: lib/poptQV.c:257 msgid "list all configuration files" msgstr "listar todos os ficheiros de configuração" -#: lib/poptQV.c:260 +#: lib/poptQV.c:259 msgid "list all documentation files" msgstr "listar todos os ficheiros de documentação" -#: lib/poptQV.c:262 +#: lib/poptQV.c:261 msgid "dump basic file information" msgstr "apresentar a informação básica do ficheiro" -#: lib/poptQV.c:266 +#: lib/poptQV.c:265 msgid "list files in package" msgstr "listar os ficheiros no pacote" -#: lib/poptQV.c:271 +#: lib/poptQV.c:270 #, c-format msgid "skip %%ghost files" msgstr "ignorar ficheiros %%ghost" -#: lib/poptQV.c:275 +#: lib/poptQV.c:274 #, c-format msgid "skip %%license files" msgstr "ignorar ficheiro %%licence" -#: lib/poptQV.c:278 +#: lib/poptQV.c:277 #, c-format msgid "skip %%readme files" msgstr "ignorar ficheiros %%readme" -#: lib/poptQV.c:284 +#: lib/poptQV.c:283 msgid "use the following query format" msgstr "usar o formato de pesquisa seguinte" -#: lib/poptQV.c:286 +#: lib/poptQV.c:285 msgid "substitute i18n sections into spec file" msgstr "substituir as secções i18n no ficheiro spec" -#: lib/poptQV.c:288 +#: lib/poptQV.c:287 msgid "display the states of the listed files" msgstr "mostrar os estados dos ficheiros listados" -#: lib/poptQV.c:314 +#: lib/poptQV.c:313 msgid "don't verify size of files" msgstr "não verificar os tamanho dos ficheiros" -#: lib/poptQV.c:317 +#: lib/poptQV.c:316 msgid "don't verify symlink path of files" msgstr "não verificar as ligações simbólicas dos ficheiros" -#: lib/poptQV.c:320 +#: lib/poptQV.c:319 msgid "don't verify owner of files" msgstr "não verificar o dono dos ficheiros" -#: lib/poptQV.c:323 +#: lib/poptQV.c:322 msgid "don't verify group of files" msgstr "não verificar o grupo dos ficheiros" -#: lib/poptQV.c:326 +#: lib/poptQV.c:325 msgid "don't verify modification time of files" msgstr "não verificar hora de modificação dos ficheiros" -#: lib/poptQV.c:329 lib/poptQV.c:332 +#: lib/poptQV.c:328 lib/poptQV.c:331 msgid "don't verify mode of files" msgstr "não verificar o modo dos ficheiros" -#: lib/poptQV.c:335 +#: lib/poptQV.c:334 #, fuzzy msgid "don't verify file security contexts" msgstr "não verificar os ficheiros no pacote" -#: lib/poptQV.c:337 +#: lib/poptQV.c:336 msgid "don't verify files in package" msgstr "não verificar os ficheiros no pacote" -#: lib/poptQV.c:340 lib/poptQV.c:343 tools/rpmgraph.c:266 +#: lib/poptQV.c:339 lib/poptQV.c:342 tools/rpmgraph.c:266 msgid "don't verify package dependencies" msgstr "não verificar as dependências do pacote" -#: lib/poptQV.c:348 lib/poptQV.c:352 lib/poptQV.c:355 lib/poptQV.c:358 +#: lib/poptQV.c:347 lib/poptQV.c:351 lib/poptQV.c:354 lib/poptQV.c:357 #, fuzzy msgid "don't execute verify script(s)" msgstr "não executar o %verifyscript (se existir)" -#: lib/poptQV.c:382 +#: lib/poptQV.c:381 #, fuzzy msgid "don't verify GPG V3 DSA signature(s)" msgstr "não verificar o SHA1 do cabeçalho" -#: lib/poptQV.c:385 +#: lib/poptQV.c:384 #, fuzzy msgid "don't verify PGP V3 RSA/MD5 signature(s)" msgstr "não verificar o MD5 dos ficheiros" -#: lib/poptQV.c:400 +#: lib/poptQV.c:399 #, fuzzy msgid "sign package(s) (identical to --resign)" msgstr "assinar um pacote (retira a assinatura actual)" -#: lib/poptQV.c:402 +#: lib/poptQV.c:401 #, fuzzy msgid "verify package signature(s)" msgstr "verificar a assinatura do pacote" -#: lib/poptQV.c:404 +#: lib/poptQV.c:403 #, fuzzy msgid "delete package signatures" msgstr "verificar a assinatura do pacote" -#: lib/poptQV.c:406 +#: lib/poptQV.c:405 msgid "import an armored public key" msgstr "" -#: lib/poptQV.c:408 +#: lib/poptQV.c:407 #, fuzzy msgid "sign package(s) (identical to --addsign)" msgstr "assinar um pacote (retira a assinatura actual)" -#: lib/poptQV.c:410 +#: lib/poptQV.c:409 msgid "generate signature" msgstr "gerar a assinatura" @@ -2772,38 +2772,38 @@ msgstr "o pacote %s tem requisitos não satisfeitos: %s\n" msgid "%s skipped due to missingok flag\n" msgstr "%s ignorado devido à opção missingok\n" -#: lib/rpmfi.c:846 +#: lib/rpmfi.c:850 msgid "========== relocations\n" msgstr "========== mudanças de local\n" -#: lib/rpmfi.c:850 +#: lib/rpmfi.c:854 #, c-format msgid "%5d exclude %s\n" msgstr "%5d excluir o %s\n" -#: lib/rpmfi.c:853 +#: lib/rpmfi.c:857 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "%5d mudar de local %s -> %s\n" -#: lib/rpmfi.c:987 +#: lib/rpmfi.c:991 #, c-format msgid "excluding %s %s\n" msgstr "a excluir o %s %s\n" -#: lib/rpmfi.c:997 +#: lib/rpmfi.c:1001 #, c-format msgid "relocating %s to %s\n" msgstr "a mudar o %s para %s\n" -#: lib/rpmfi.c:1089 +#: lib/rpmfi.c:1093 #, c-format msgid "relocating directory %s to %s\n" msgstr "a mudar a directoria %s para %s\n" #: lib/rpmgi.c:81 lib/rpminstall.c:124 lib/rpminstall.c:480 -#: lib/rpminstall.c:615 lib/rpminstall.c:1041 lib/rpmts.c:643 -#: tools/rpmgraph.c:121 tools/rpmgraph.c:158 +#: lib/rpminstall.c:615 lib/rpmts.c:643 tools/rpmgraph.c:121 +#: tools/rpmgraph.c:158 #, c-format msgid "open of %s failed: %s\n" msgstr "o acesso ao %s falhou: %s\n" @@ -2814,7 +2814,7 @@ msgid "unknown tag: \"%s\"\n" msgstr "opção desconhecida" #: lib/rpmgi.c:628 lib/rpminstall.c:659 lib/rpminstall.c:834 -#: lib/rpminstall.c:1267 lib/transaction.c:1031 tools/rpmgraph.c:196 +#: lib/rpminstall.c:1084 lib/transaction.c:1026 tools/rpmgraph.c:196 #, fuzzy msgid "Failed dependencies:\n" msgstr "dependências falhadas:\n" @@ -2934,16 +2934,16 @@ msgstr "não consigo aceder ao %s: %s\n" msgid "Installing %s\n" msgstr "A instalar o %s\n" -#: lib/rpminstall.c:1261 lib/transaction.c:1024 +#: lib/rpminstall.c:1078 lib/transaction.c:1019 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" -#: lib/rpminstall.c:1292 lib/transaction.c:1075 +#: lib/rpminstall.c:1109 lib/transaction.c:1070 msgid "Cleaning up repackaged packages:\n" msgstr "" -#: lib/rpminstall.c:1299 lib/transaction.c:1081 +#: lib/rpminstall.c:1116 lib/transaction.c:1076 #, fuzzy, c-format msgid "\tRemoving %s:\n" msgstr "A obter o %s\n" @@ -3082,97 +3082,97 @@ msgstr " está em conflito com o %s-%s-%s\n" msgid "unknown error %d encountered while manipulating package %s" msgstr "encontrado o erro desconhecido %d ao manipular o pacote %s" -#: lib/rpmrc.c:199 +#: lib/rpmrc.c:213 #, c-format msgid "missing second ':' at %s:%d\n" msgstr "falta o segundo ':' em %s:%d\n" -#: lib/rpmrc.c:202 +#: lib/rpmrc.c:216 #, c-format msgid "missing architecture name at %s:%d\n" msgstr "falta o nome da arquitectura em %s:%d\n" -#: lib/rpmrc.c:356 +#: lib/rpmrc.c:370 #, c-format msgid "Incomplete data line at %s:%d\n" msgstr "Linha de dados incompleta em %s:%d\n" -#: lib/rpmrc.c:361 +#: lib/rpmrc.c:375 #, c-format msgid "Too many args in data line at %s:%d\n" msgstr "Demasiados argumentos na linha de dados em %s:%d\n" -#: lib/rpmrc.c:369 +#: lib/rpmrc.c:383 #, c-format msgid "Bad arch/os number: %s (%s:%d)\n" msgstr "Número de arq./SO errado: %s (%s:%d)\n" -#: lib/rpmrc.c:406 +#: lib/rpmrc.c:420 #, c-format msgid "Incomplete default line at %s:%d\n" msgstr "Linha por omissão incompleta em %s:%d\n" -#: lib/rpmrc.c:411 +#: lib/rpmrc.c:425 #, c-format msgid "Too many args in default line at %s:%d\n" msgstr "Demasiados argumentos na linha por omissão em %s:%d\n" -#: lib/rpmrc.c:577 +#: lib/rpmrc.c:591 #, c-format msgid "Failed to read %s: %s.\n" msgstr "Não consegui ler o %s: %s.\n" -#: lib/rpmrc.c:615 +#: lib/rpmrc.c:629 #, c-format msgid "missing ':' (found 0x%02x) at %s:%d\n" msgstr "falta um ':' (encontrado um 0x%02x) em %s:%d\n" -#: lib/rpmrc.c:632 lib/rpmrc.c:706 +#: lib/rpmrc.c:646 lib/rpmrc.c:710 #, c-format msgid "missing argument for %s at %s:%d\n" msgstr "faltam argumentos para o %s em %s:%d\n" -#: lib/rpmrc.c:649 lib/rpmrc.c:671 +#: lib/rpmrc.c:663 #, c-format msgid "%s expansion failed at %s:%d \"%s\"\n" msgstr "a expansão do %s falhou em %s:%d \"%s\"\n" -#: lib/rpmrc.c:658 +#: lib/rpmrc.c:672 #, c-format msgid "cannot open %s at %s:%d: %s\n" msgstr "não consigo abrir o %s em %s:%d: %s\n" -#: lib/rpmrc.c:698 +#: lib/rpmrc.c:702 #, c-format msgid "missing architecture for %s at %s:%d\n" msgstr "falta a arquitectura para o %s em %s:%d\n" -#: lib/rpmrc.c:765 +#: lib/rpmrc.c:769 #, c-format msgid "bad option '%s' at %s:%d\n" msgstr "má opção '%s' em %s:%d\n" -#: lib/rpmrc.c:1564 +#: lib/rpmrc.c:1568 #, c-format msgid "Unknown system: %s\n" msgstr "Sistema desconhecido: %s\n" -#: lib/rpmrc.c:1565 +#: lib/rpmrc.c:1569 #, c-format msgid "Please contact %s\n" msgstr "Por favor contacte o %s\n" -#: lib/rpmrc.c:1802 +#: lib/rpmrc.c:1806 #, c-format msgid "Cannot expand %s\n" msgstr "Não consigo expandir o %s\n" -#: lib/rpmrc.c:1807 +#: lib/rpmrc.c:1811 #, c-format msgid "Cannot read %s, HOME is too large.\n" msgstr "Não consigo ler o %s, a HOME é demasiado grande.\n" -#: lib/rpmrc.c:1824 +#: lib/rpmrc.c:1828 #, c-format msgid "Unable to open %s for reading: %s.\n" msgstr "Não consegui abrir o %s para leitura: %s.\n" @@ -3465,161 +3465,161 @@ msgstr "'Digest' MD5 estragado: NÃO SUPORTADO\n" msgid "Signature: UNKNOWN (%d)\n" msgstr "Assinatura: tamanho(%d)+pad(%d)\n" -#: lib/transaction.c:935 +#: lib/transaction.c:930 #, c-format msgid "excluding directory %s\n" msgstr "a excluir a directoria %s\n" -#: lib/transaction.c:1022 +#: lib/transaction.c:1017 msgid "Transaction failed...rolling back\n" msgstr "" -#: lib/transaction.c:1042 +#: lib/transaction.c:1037 msgid "Could not order auto-rollback transaction!\n" msgstr "" -#: lib/transaction.c:1132 +#: lib/transaction.c:1127 msgid "Getting repackaged header from transaction element\n" msgstr "" -#: lib/transaction.c:1157 +#: lib/transaction.c:1152 #, c-format msgid "\tLooking for %s...\n" msgstr "" -#: lib/transaction.c:1161 +#: lib/transaction.c:1156 msgid "\tMatches found.\n" msgstr "" -#: lib/transaction.c:1165 +#: lib/transaction.c:1160 msgid "\tNo matches found.\n" msgstr "" -#: lib/transaction.c:1178 +#: lib/transaction.c:1173 #, fuzzy msgid "\tRepackaged package not found!.\n" msgstr "" "esperava-se um pacote com código-fonte, foi encontrado um pacote binário\n" -#: lib/transaction.c:1199 +#: lib/transaction.c:1194 msgid "\tREMOVETID matched INSTALLTID.\n" msgstr "" -#: lib/transaction.c:1201 +#: lib/transaction.c:1196 #, c-format msgid "\t\tName: %s.\n" msgstr "" -#: lib/transaction.c:1224 +#: lib/transaction.c:1219 #, fuzzy, c-format msgid "\tRepackaged Package was %s...\n" msgstr "nenhum pacote coincide com %s: %s\n" -#: lib/transaction.c:1268 +#: lib/transaction.c:1263 msgid "Adding install element to auto-rollback transaction.\n" msgstr "" -#: lib/transaction.c:1277 +#: lib/transaction.c:1272 msgid "Could not get install element database instance!\n" msgstr "" -#: lib/transaction.c:1290 +#: lib/transaction.c:1285 msgid "Could not get header for auto-rollback transaction!\n" msgstr "" -#: lib/transaction.c:1300 +#: lib/transaction.c:1295 #, fuzzy, c-format msgid "\tAdded repackaged package header: %s.\n" msgstr "<pacote de código>" -#: lib/transaction.c:1302 lib/transaction.c:1313 +#: lib/transaction.c:1297 lib/transaction.c:1308 #, c-format msgid "\tAdded from install element %s.\n" msgstr "" -#: lib/transaction.c:1311 +#: lib/transaction.c:1306 msgid "\tAdded erase element.\n" msgstr "" -#: lib/transaction.c:1320 +#: lib/transaction.c:1315 msgid "Could not get repackaged header for auto-rollback transaction!\n" msgstr "" -#: lib/transaction.c:1327 +#: lib/transaction.c:1322 msgid "Add erase element to auto-rollback transaction.\n" msgstr "" -#: lib/transaction.c:1335 +#: lib/transaction.c:1330 msgid "\tFound existing upgrade element.\n" msgstr "" -#: lib/transaction.c:1336 +#: lib/transaction.c:1331 #, c-format msgid "\tNot adding erase element for %s.\n" msgstr "" -#: lib/transaction.c:1353 +#: lib/transaction.c:1348 #, fuzzy, c-format msgid "\tAdded repackaged package %s.\n" msgstr "<pacote de código>" -#: lib/transaction.c:1355 +#: lib/transaction.c:1350 #, c-format msgid "\tAdded from erase element %s.\n" msgstr "" -#: lib/transaction.c:1360 +#: lib/transaction.c:1355 msgid "Could not add erase element to auto-rollback transaction.\n" msgstr "" -#: lib/transaction.c:1366 +#: lib/transaction.c:1361 msgid "\tNo repackaged package...nothing to do.\n" msgstr "" -#: lib/transaction.c:1372 +#: lib/transaction.c:1367 #, fuzzy msgid "Failure reading repackaged package!\n" msgstr "erro ao ler o cabeçalho do pacote\n" -#: lib/transaction.c:1495 +#: lib/transaction.c:1490 #, c-format msgid "sanity checking %d elements\n" msgstr "" -#: lib/transaction.c:1581 +#: lib/transaction.c:1576 msgid "running pre-transaction scripts\n" msgstr "" -#: lib/transaction.c:1655 +#: lib/transaction.c:1650 #, c-format msgid "computing %d file fingerprints\n" msgstr "" -#: lib/transaction.c:1739 +#: lib/transaction.c:1734 msgid "computing file dispositions\n" msgstr "" -#: lib/transaction.c:1932 +#: lib/transaction.c:1927 msgid "Creating auto-rollback transaction\n" msgstr "" -#: lib/transaction.c:2086 +#: lib/transaction.c:2077 msgid "Add failed. Could not read package header.\n" msgstr "" -#: lib/transaction.c:2170 +#: lib/transaction.c:2161 msgid "Add failed in rpmpsmStage().\n" msgstr "" -#: lib/transaction.c:2214 +#: lib/transaction.c:2205 msgid "Add failed. Could not get file list.\n" msgstr "" -#: lib/transaction.c:2263 +#: lib/transaction.c:2254 msgid "Erase failed failed in rpmpsmStage().\n" msgstr "" -#: lib/transaction.c:2324 +#: lib/transaction.c:2315 msgid "running post-transaction scripts\n" msgstr "" @@ -4013,86 +4013,86 @@ msgstr "a abrir o Ãndice do db %s/%s %s modo=0x%x\n" msgid "======================== active %d empty %d\n" msgstr "======================== activo %d vazio %d\n" -#: rpmio/macro.c:394 +#: rpmio/macro.c:396 #, c-format msgid "%3d>%*s(empty)" msgstr "%3d>%*s(vazio)" -#: rpmio/macro.c:437 +#: rpmio/macro.c:439 #, c-format msgid "%3d<%*s(empty)\n" msgstr "%3d<%*s(vazio)\n" -#: rpmio/macro.c:664 rpmio/macro.c:705 +#: rpmio/macro.c:608 rpmio/macro.c:1090 rpmio/macro.c:1123 rpmio/macro.c:1863 +msgid "Target buffer overflow\n" +msgstr "Sobrecarga do tampão de destino\n" + +#: rpmio/macro.c:671 rpmio/macro.c:712 #, c-format msgid "Macro %%%s has unterminated body\n" msgstr "A macro %%%s tem o conteúdo incompleto\n" -#: rpmio/macro.c:727 +#: rpmio/macro.c:734 #, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "A macro %%%s tem um nome inválido (%%define)\n" -#: rpmio/macro.c:733 +#: rpmio/macro.c:740 #, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "A macro %%%s tem as opções incompletas\n" -#: rpmio/macro.c:738 +#: rpmio/macro.c:745 #, c-format msgid "Macro %%%s has empty body\n" msgstr "A macro %%%s tem o conteúdo em branco\n" -#: rpmio/macro.c:744 +#: rpmio/macro.c:751 #, c-format msgid "Macro %%%s failed to expand\n" msgstr "A macro %%%s não conseguiu ser expandida\n" -#: rpmio/macro.c:779 +#: rpmio/macro.c:786 #, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "A macro %%%s tem um nome ilegal (%%undefine)\n" -#: rpmio/macro.c:897 +#: rpmio/macro.c:904 #, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "A macro %%%s (%s) não foi usada abaixo do nÃvel %d\n" -#: rpmio/macro.c:1024 +#: rpmio/macro.c:1031 #, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "Opção desconhecida %c em %s(%s)\n" -#: rpmio/macro.c:1224 +#: rpmio/macro.c:1239 #, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "NÃvel de recursividade(%d) maior que o máximo(%d)\n" -#: rpmio/macro.c:1297 rpmio/macro.c:1314 +#: rpmio/macro.c:1312 rpmio/macro.c:1329 #, c-format msgid "Unterminated %c: %s\n" msgstr "%c não terminado: %s\n" -#: rpmio/macro.c:1355 +#: rpmio/macro.c:1370 #, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "Segue-se uma macro impossÃvel de analisar ao %%\n" -#: rpmio/macro.c:1512 +#: rpmio/macro.c:1527 #, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "A macro %%%.*s não foi encontrada, por isso foi ignorada\n" -#: rpmio/macro.c:1848 -msgid "Target buffer overflow\n" -msgstr "Sobrecarga do tampão de destino\n" - -#: rpmio/macro.c:2056 rpmio/macro.c:2062 +#: rpmio/macro.c:2076 rpmio/macro.c:2082 #, c-format msgid "File %s: %s\n" msgstr "Ficheiro %s: %s\n" -#: rpmio/macro.c:2065 +#: rpmio/macro.c:2085 #, c-format msgid "File %s is smaller than %u bytes\n" msgstr "O ficheiro %s tem menos de %u bytes\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index 9c3e13168..02cbc56ee 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm\n" "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n" -"POT-Creation-Date: 2007-08-21 08:04+0200\n" +"POT-Creation-Date: 2007-08-30 18:37+0200\n" "PO-Revision-Date: 2007-08-03 15:46-0300\n" "Last-Translator: Igor Pires Soares <igor@projetofedora.org>\n" "Language-Team: Brazilian Portuguese <fedora-trans-pt_br@redhat.com>\n" @@ -1409,18 +1409,18 @@ msgstr "" "gerar cabeçalhos de pacotes compatÃveis com o empacotamento do rpm[23] " "(legado)" -#: build/poptBT.c:229 lib/poptALL.c:273 lib/poptI.c:282 lib/poptQV.c:363 -#: lib/poptQV.c:372 lib/poptQV.c:413 +#: build/poptBT.c:229 lib/poptALL.c:273 lib/poptI.c:282 lib/poptQV.c:362 +#: lib/poptQV.c:371 lib/poptQV.c:412 msgid "don't verify package digest(s)" msgstr "não verificar digest(s) dos pacotes" -#: build/poptBT.c:231 lib/poptALL.c:275 lib/poptI.c:284 lib/poptQV.c:366 -#: lib/poptQV.c:374 lib/poptQV.c:416 +#: build/poptBT.c:231 lib/poptALL.c:275 lib/poptI.c:284 lib/poptQV.c:365 +#: lib/poptQV.c:373 lib/poptQV.c:415 msgid "don't verify database header(s) when retrieved" msgstr "não verificar cabeçalho(s) do banco de dados ao recuperá-lo(s)" -#: build/poptBT.c:233 lib/poptALL.c:281 lib/poptI.c:286 lib/poptQV.c:369 -#: lib/poptQV.c:376 lib/poptQV.c:418 +#: build/poptBT.c:233 lib/poptALL.c:281 lib/poptI.c:286 lib/poptQV.c:368 +#: lib/poptQV.c:375 lib/poptQV.c:417 msgid "don't verify package signature(s)" msgstr "não verificar a(s) assinatura(s) do pacote" @@ -1485,29 +1485,29 @@ msgstr "%s falhou: %s\n" msgid "failed to write all data to %s\n" msgstr "Não foi possÃvel gravar carga útil em %s: %s\n" -#: build/rpmfc.c:1250 +#: build/rpmfc.c:1249 #, fuzzy, c-format msgid "magic_open(0x%x) failed: %s\n" msgstr "falha ao abrir %s: %s\n" -#: build/rpmfc.c:1258 +#: build/rpmfc.c:1257 #, fuzzy, c-format -msgid "magic_load(ms, \"%s\") failed: %s\n" +msgid "magic_load failed: %s\n" msgstr "%s rmdir de %s falhou: %s\n" -#: build/rpmfc.c:1303 +#: build/rpmfc.c:1301 #, fuzzy, c-format msgid "magic_file(ms, \"%s\") failed: mode %06o %s\n" msgstr "%s rmdir de %s falhou: %s\n" # , c-format -#: build/rpmfc.c:1524 +#: build/rpmfc.c:1522 #, fuzzy, c-format msgid "Finding %s: %s\n" msgstr "Arquivo %s: %s\n" # , c-format -#: build/rpmfc.c:1530 build/rpmfc.c:1539 +#: build/rpmfc.c:1528 build/rpmfc.c:1537 #, fuzzy, c-format msgid "Failed to find %s:\n" msgstr "Falha ao ler %s: %s.\n" @@ -1632,11 +1632,11 @@ msgstr "ignorar relações do nome dos pacotes [%d]\t%s -> %s\n" msgid "removing %s \"%s\" from tsort relations.\n" msgstr "removendo %s \"%s\" das relações do tsort.\n" -#: lib/depends.c:1265 +#: lib/depends.c:1271 msgid "========== recording tsort relations\n" msgstr "========== gravando relações do tsort\n" -#: lib/depends.c:1357 +#: lib/depends.c:1363 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, depth, " "breadth)\n" @@ -1644,20 +1644,20 @@ msgstr "" "========== tsorting dos pacotes (ordem, #predecessores, #sucessores, " "árvore, profundidade, extensão)\n" -#: lib/depends.c:1453 +#: lib/depends.c:1459 #, c-format msgid "========== successors only (%d bytes)\n" msgstr "========== sucessores apenas (%d bytes)\n" -#: lib/depends.c:1526 +#: lib/depends.c:1532 msgid "LOOP:\n" msgstr "LOOP:\n" -#: lib/depends.c:1561 +#: lib/depends.c:1567 msgid "========== continuing tsort ...\n" msgstr "========== continuando tsort ...\n" -#: lib/depends.c:1566 +#: lib/depends.c:1572 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "rpmtsOrder falhou, permaneceram %d elementos\n" @@ -2217,7 +2217,7 @@ msgstr "atualizar o banco de dados, mas não modificar o sistema de arquivos" msgid "do not verify package dependencies" msgstr "não verificar as dependências do pacote" -#: lib/poptI.c:252 lib/poptQV.c:307 lib/poptQV.c:310 +#: lib/poptI.c:252 lib/poptQV.c:306 lib/poptQV.c:309 msgid "don't verify MD5 digest of files" msgstr "não verificar o digest MD5 dos arquivos" @@ -2334,216 +2334,216 @@ msgstr "não instalar, mas dizer se a instalação funcionaria ou não" msgid "upgrade package(s)" msgstr "atualizar pacote(s)" -#: lib/poptQV.c:103 +#: lib/poptQV.c:102 msgid "query/verify all packages" msgstr "consultar/verificar todos os pacotes" -#: lib/poptQV.c:105 +#: lib/poptQV.c:104 msgid "rpm checksig mode" msgstr "modo checksig do rpm" -#: lib/poptQV.c:107 +#: lib/poptQV.c:106 msgid "query/verify package(s) owning file" msgstr "consultar/verificar pacote(s) que detém o arquivo" -#: lib/poptQV.c:109 +#: lib/poptQV.c:108 msgid "query/verify package(s) in group" msgstr "consultar/verificar pacote(s) em um grupo" -#: lib/poptQV.c:111 +#: lib/poptQV.c:110 msgid "query/verify a package file" msgstr "consultar/verificar um arquivo de pacote" -#: lib/poptQV.c:114 +#: lib/poptQV.c:113 msgid "query/verify package(s) from TOP file tree walk" msgstr "" "consultar/verificar pacote(s) do topo do caminhamento da árvore de arquivos" -#: lib/poptQV.c:116 +#: lib/poptQV.c:115 msgid "query/verify package(s) from system HDLIST" msgstr "consultar/verificar pacote(s) do sistema HDLIST" -#: lib/poptQV.c:119 +#: lib/poptQV.c:118 msgid "query/verify package(s) with package identifier" msgstr "consultar/verificar pacote(s) com um identificador de pacotes" -#: lib/poptQV.c:121 +#: lib/poptQV.c:120 msgid "query/verify package(s) with header identifier" msgstr "consultar/verificar pacote(s) com um identificador de cabeçalhos" -#: lib/poptQV.c:123 +#: lib/poptQV.c:122 msgid "query/verify package(s) with file identifier" msgstr "consultar/verificar pacote(s) com um identificador de arquivos" -#: lib/poptQV.c:126 +#: lib/poptQV.c:125 msgid "rpm query mode" msgstr "modo de consulta do rpm" -#: lib/poptQV.c:128 +#: lib/poptQV.c:127 msgid "query/verify a header instance" msgstr "consultar/verificar uma instância do cabeçalho" -#: lib/poptQV.c:130 +#: lib/poptQV.c:129 msgid "query a spec file" msgstr "consultar um arquivo spec" -#: lib/poptQV.c:130 +#: lib/poptQV.c:129 msgid "<spec>" msgstr "<spec>" -#: lib/poptQV.c:132 +#: lib/poptQV.c:131 msgid "query/verify package(s) from install transaction" msgstr "consultar/verificar pacote(s) da transação de instalação" -#: lib/poptQV.c:134 +#: lib/poptQV.c:133 msgid "query the package(s) triggered by the package" msgstr "consultar o(s) pacote(s) disparado pelo pacote" -#: lib/poptQV.c:136 +#: lib/poptQV.c:135 msgid "rpm verify mode" msgstr "modo de verificação do rpm" -#: lib/poptQV.c:138 +#: lib/poptQV.c:137 msgid "query/verify the package(s) which require a dependency" msgstr "consultar/verificar pacotes que precisam de uma dependência" -#: lib/poptQV.c:140 +#: lib/poptQV.c:139 msgid "query/verify the package(s) which provide a dependency" msgstr "consultar/verificar pacote(s) que fornecem uma dependência" -#: lib/poptQV.c:143 +#: lib/poptQV.c:142 msgid "create transaction set" msgstr "criar conjunto de transações" -#: lib/poptQV.c:145 +#: lib/poptQV.c:144 msgid "do not order transaction set" msgstr "não ordenar o conjunto de transações" -#: lib/poptQV.c:147 +#: lib/poptQV.c:146 msgid "do not glob arguments" msgstr "não fazer glob com os argumentos" -#: lib/poptQV.c:149 +#: lib/poptQV.c:148 msgid "do not process non-package files as manifests" msgstr "não processar arquivos que não são de pacotes como manifestos" -#: lib/poptQV.c:151 +#: lib/poptQV.c:150 msgid "do not read headers" msgstr "não ler os cabeçalhos" -#: lib/poptQV.c:258 +#: lib/poptQV.c:257 msgid "list all configuration files" msgstr "listar todos os arquivos de configuração" -#: lib/poptQV.c:260 +#: lib/poptQV.c:259 msgid "list all documentation files" msgstr "listar todos os arquivos de documentação" -#: lib/poptQV.c:262 +#: lib/poptQV.c:261 msgid "dump basic file information" msgstr "descarregar informações básicas do arquivo" -#: lib/poptQV.c:266 +#: lib/poptQV.c:265 msgid "list files in package" msgstr "listar arquivos do pacote" -#: lib/poptQV.c:271 +#: lib/poptQV.c:270 #, c-format msgid "skip %%ghost files" msgstr "ignorar arquivos %%ghost" -#: lib/poptQV.c:275 +#: lib/poptQV.c:274 #, c-format msgid "skip %%license files" msgstr "ignorar arquivos %%license" # , c-format -#: lib/poptQV.c:278 +#: lib/poptQV.c:277 #, c-format msgid "skip %%readme files" msgstr "ignorar arquivos %%readme" -#: lib/poptQV.c:284 +#: lib/poptQV.c:283 msgid "use the following query format" msgstr "utilizar o seguinte formato de consulta" -#: lib/poptQV.c:286 +#: lib/poptQV.c:285 msgid "substitute i18n sections into spec file" msgstr "substituir seções i18n no arquivo spec" -#: lib/poptQV.c:288 +#: lib/poptQV.c:287 msgid "display the states of the listed files" msgstr "exibir o estado dos arquivos listados" -#: lib/poptQV.c:314 +#: lib/poptQV.c:313 msgid "don't verify size of files" msgstr "não verificar o tamanho dos arquivos" -#: lib/poptQV.c:317 +#: lib/poptQV.c:316 msgid "don't verify symlink path of files" msgstr "não verificar o caminho da ligação simbólica dos arquivos" -#: lib/poptQV.c:320 +#: lib/poptQV.c:319 msgid "don't verify owner of files" msgstr "não verificar o proprietário dos arquivos" -#: lib/poptQV.c:323 +#: lib/poptQV.c:322 msgid "don't verify group of files" msgstr "não verificar o grupo dos arquivos" -#: lib/poptQV.c:326 +#: lib/poptQV.c:325 msgid "don't verify modification time of files" msgstr "não verificar a hora de modificação dos arquivos" -#: lib/poptQV.c:329 lib/poptQV.c:332 +#: lib/poptQV.c:328 lib/poptQV.c:331 msgid "don't verify mode of files" msgstr "não verificar o modo dos arquivos" -#: lib/poptQV.c:335 +#: lib/poptQV.c:334 msgid "don't verify file security contexts" msgstr "não verificar os contextos de segurança dos arquivos" -#: lib/poptQV.c:337 +#: lib/poptQV.c:336 msgid "don't verify files in package" msgstr "não verificar os arquivos do pacote" -#: lib/poptQV.c:340 lib/poptQV.c:343 tools/rpmgraph.c:266 +#: lib/poptQV.c:339 lib/poptQV.c:342 tools/rpmgraph.c:266 msgid "don't verify package dependencies" msgstr "não verificar as dependências do pacote" -#: lib/poptQV.c:348 lib/poptQV.c:352 lib/poptQV.c:355 lib/poptQV.c:358 +#: lib/poptQV.c:347 lib/poptQV.c:351 lib/poptQV.c:354 lib/poptQV.c:357 msgid "don't execute verify script(s)" msgstr "não executar script(s) de verificação" -#: lib/poptQV.c:382 +#: lib/poptQV.c:381 msgid "don't verify GPG V3 DSA signature(s)" msgstr "não verificar assinatura(s) GPG V3 DSA" -#: lib/poptQV.c:385 +#: lib/poptQV.c:384 msgid "don't verify PGP V3 RSA/MD5 signature(s)" msgstr "não verificar assinatura(s) PGP V3 RSA/MD5" -#: lib/poptQV.c:400 +#: lib/poptQV.c:399 msgid "sign package(s) (identical to --resign)" msgstr "assinar pacote(s) (idêntico ao --resign)" -#: lib/poptQV.c:402 +#: lib/poptQV.c:401 msgid "verify package signature(s)" msgstr "verificar a(s) assinatura(s) do pacote" -#: lib/poptQV.c:404 +#: lib/poptQV.c:403 msgid "delete package signatures" msgstr "remover a assinatura dos pacotes" -#: lib/poptQV.c:406 +#: lib/poptQV.c:405 msgid "import an armored public key" msgstr "importar uma chave pública blindada" -#: lib/poptQV.c:408 +#: lib/poptQV.c:407 msgid "sign package(s) (identical to --addsign)" msgstr "assinar pacote(s) (idêntico ao --addsign)" -#: lib/poptQV.c:410 +#: lib/poptQV.c:409 msgid "generate signature" msgstr "gerar assinatura" @@ -2895,7 +2895,7 @@ msgstr "o pacote %s tem %s não satisfeito: %s\n" msgid "%s skipped due to missingok flag\n" msgstr "%s ignorado devido ao sinalizador missingok\n" -#: lib/rpmfi.c:846 +#: lib/rpmfi.c:850 msgid "========== relocations\n" msgstr "========== realocações\n" @@ -2907,13 +2907,13 @@ msgstr "========== realocações\n" # "Content-Type: text/plain; charset=ISO-8859-1\n" # "Content-Transfer-Encoding: 8-bit\n" # , c-format -#: lib/rpmfi.c:850 +#: lib/rpmfi.c:854 #, c-format msgid "%5d exclude %s\n" msgstr "%5d exclui %s\n" # , c-format -#: lib/rpmfi.c:853 +#: lib/rpmfi.c:857 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "%5d realoca %s -> %s\n" @@ -2926,26 +2926,26 @@ msgstr "%5d realoca %s -> %s\n" # "Content-Type: text/plain; charset=ISO-8859-1\n" # "Content-Transfer-Encoding: 8-bit\n" # , c-format -#: lib/rpmfi.c:987 +#: lib/rpmfi.c:991 #, c-format msgid "excluding %s %s\n" msgstr "excluindo %s %s\n" # , c-format -#: lib/rpmfi.c:997 +#: lib/rpmfi.c:1001 #, c-format msgid "relocating %s to %s\n" msgstr "realocando %s para %s\n" # , c-format -#: lib/rpmfi.c:1089 +#: lib/rpmfi.c:1093 #, c-format msgid "relocating directory %s to %s\n" msgstr "realocando diretório %s para %s\n" #: lib/rpmgi.c:81 lib/rpminstall.c:124 lib/rpminstall.c:480 -#: lib/rpminstall.c:615 lib/rpminstall.c:1041 lib/rpmts.c:643 -#: tools/rpmgraph.c:121 tools/rpmgraph.c:158 +#: lib/rpminstall.c:615 lib/rpmts.c:643 tools/rpmgraph.c:121 +#: tools/rpmgraph.c:158 #, c-format msgid "open of %s failed: %s\n" msgstr "falha ao abrir %s: %s\n" @@ -2957,7 +2957,7 @@ msgid "unknown tag: \"%s\"\n" msgstr "etiqueta desconhecida: \"%s\"\n" #: lib/rpmgi.c:628 lib/rpminstall.c:659 lib/rpminstall.c:834 -#: lib/rpminstall.c:1267 lib/transaction.c:1031 tools/rpmgraph.c:196 +#: lib/rpminstall.c:1084 lib/transaction.c:1026 tools/rpmgraph.c:196 msgid "Failed dependencies:\n" msgstr "Dependências não satisfeitas:\n" @@ -3084,12 +3084,12 @@ msgstr "Não foi possÃvel abrir %s: %s\n" msgid "Installing %s\n" msgstr "Instalando %s\n" -#: lib/rpminstall.c:1261 lib/transaction.c:1024 +#: lib/rpminstall.c:1078 lib/transaction.c:1019 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "Recuar pacotes (+%d/-%d) para %-24.24s (0x%08x):\n" -#: lib/rpminstall.c:1292 lib/transaction.c:1075 +#: lib/rpminstall.c:1109 lib/transaction.c:1070 msgid "Cleaning up repackaged packages:\n" msgstr "Limpando pacotes reempacotados:\n" @@ -3101,7 +3101,7 @@ msgstr "Limpando pacotes reempacotados:\n" # "Content-Type: text/plain; charset=ISO-8859-1\n" # "Content-Transfer-Encoding: 8-bit\n" # , c-format -#: lib/rpminstall.c:1299 lib/transaction.c:1081 +#: lib/rpminstall.c:1116 lib/transaction.c:1076 #, c-format msgid "\tRemoving %s:\n" msgstr "\tRemovendo %s:\n" @@ -3244,103 +3244,103 @@ msgstr "%s conflita com %s%s" msgid "unknown error %d encountered while manipulating package %s" msgstr "erro desconhecido %d encontrado ao manipular o pacote %s" -#: lib/rpmrc.c:199 +#: lib/rpmrc.c:213 #, c-format msgid "missing second ':' at %s:%d\n" msgstr "segundo \":\" faltando em %s:%d\n" -#: lib/rpmrc.c:202 +#: lib/rpmrc.c:216 #, c-format msgid "missing architecture name at %s:%d\n" msgstr "nome da arquitetura faltando em %s:%d\n" -#: lib/rpmrc.c:356 +#: lib/rpmrc.c:370 #, c-format msgid "Incomplete data line at %s:%d\n" msgstr "Linha de dados incompleta em %s:%d\n" -#: lib/rpmrc.c:361 +#: lib/rpmrc.c:375 #, c-format msgid "Too many args in data line at %s:%d\n" msgstr "Argumentos em excesso na linha de dados em %s:%d\n" -#: lib/rpmrc.c:369 +#: lib/rpmrc.c:383 #, c-format msgid "Bad arch/os number: %s (%s:%d)\n" msgstr "Número de arquitetura/SO inválido: %s (%s:%d)\n" -#: lib/rpmrc.c:406 +#: lib/rpmrc.c:420 #, c-format msgid "Incomplete default line at %s:%d\n" msgstr "Linha padrão incompleta em %s:%d\n" -#: lib/rpmrc.c:411 +#: lib/rpmrc.c:425 #, c-format msgid "Too many args in default line at %s:%d\n" msgstr "Argumentos em excesso na linha padrão em %s:%d\n" # , c-format -#: lib/rpmrc.c:577 +#: lib/rpmrc.c:591 #, c-format msgid "Failed to read %s: %s.\n" msgstr "Falha ao ler %s: %s.\n" -#: lib/rpmrc.c:615 +#: lib/rpmrc.c:629 #, c-format msgid "missing ':' (found 0x%02x) at %s:%d\n" msgstr "\":\" faltando (0x%02x encontrado) em %s:%d\n" -#: lib/rpmrc.c:632 lib/rpmrc.c:706 +#: lib/rpmrc.c:646 lib/rpmrc.c:710 #, c-format msgid "missing argument for %s at %s:%d\n" msgstr "argumento faltando para %s em %s:%d\n" # , c-format -#: lib/rpmrc.c:649 lib/rpmrc.c:671 +#: lib/rpmrc.c:663 #, c-format msgid "%s expansion failed at %s:%d \"%s\"\n" msgstr "a expansão do %s falhou em %s:%d \"%s\"\n" # , c-format -#: lib/rpmrc.c:658 +#: lib/rpmrc.c:672 #, c-format msgid "cannot open %s at %s:%d: %s\n" msgstr "não foi possÃvel abrir %s em %s:%d: %s\n" -#: lib/rpmrc.c:698 +#: lib/rpmrc.c:702 #, c-format msgid "missing architecture for %s at %s:%d\n" msgstr "arquitetura faltando para %s em %s:%d\n" # , c-format -#: lib/rpmrc.c:765 +#: lib/rpmrc.c:769 #, c-format msgid "bad option '%s' at %s:%d\n" msgstr "opção inválida \"%s\" em %s:%d\n" -#: lib/rpmrc.c:1564 +#: lib/rpmrc.c:1568 #, c-format msgid "Unknown system: %s\n" msgstr "Sistema desconhecido: %s\n" -#: lib/rpmrc.c:1565 +#: lib/rpmrc.c:1569 #, c-format msgid "Please contact %s\n" msgstr "Por favor, contate %s\n" # , c-format -#: lib/rpmrc.c:1802 +#: lib/rpmrc.c:1806 #, c-format msgid "Cannot expand %s\n" msgstr "Não foi possÃvel expandir %s\n" -#: lib/rpmrc.c:1807 +#: lib/rpmrc.c:1811 #, c-format msgid "Cannot read %s, HOME is too large.\n" msgstr "Não foi possÃvel ler %s, HOME é muito grande.\n" # , c-format -#: lib/rpmrc.c:1824 +#: lib/rpmrc.c:1828 #, c-format msgid "Unable to open %s for reading: %s.\n" msgstr "Não foi possÃvel abrir %s para leitura: %s\n" @@ -3652,164 +3652,164 @@ msgstr "Assinatura: DESCONHECIDA (%d)\n" # "Content-Type: text/plain; charset=ISO-8859-1\n" # "Content-Transfer-Encoding: 8-bit\n" # , c-format -#: lib/transaction.c:935 +#: lib/transaction.c:930 #, c-format msgid "excluding directory %s\n" msgstr "excluindo diretório %s\n" -#: lib/transaction.c:1022 +#: lib/transaction.c:1017 msgid "Transaction failed...rolling back\n" msgstr "A transação falhou... recuando\n" -#: lib/transaction.c:1042 +#: lib/transaction.c:1037 msgid "Could not order auto-rollback transaction!\n" msgstr "Não foi possÃvel ordenar a transação de auto-recuo!\n" -#: lib/transaction.c:1132 +#: lib/transaction.c:1127 msgid "Getting repackaged header from transaction element\n" msgstr "Obtendo o cabeçalho reempacotado a partir do elemento da transação\n" -#: lib/transaction.c:1157 +#: lib/transaction.c:1152 #, c-format msgid "\tLooking for %s...\n" msgstr "\tProcurando por %s...\n" -#: lib/transaction.c:1161 +#: lib/transaction.c:1156 msgid "\tMatches found.\n" msgstr "\tResultados encontrados.\n" -#: lib/transaction.c:1165 +#: lib/transaction.c:1160 msgid "\tNo matches found.\n" msgstr "\tNenhum resultado encontrado.\n" -#: lib/transaction.c:1178 +#: lib/transaction.c:1173 msgid "\tRepackaged package not found!.\n" msgstr "\tPacote reempacotado não encontrado!\n" -#: lib/transaction.c:1199 +#: lib/transaction.c:1194 msgid "\tREMOVETID matched INSTALLTID.\n" msgstr "\tREMOVETID coincide com INSTALLTID.\n" -#: lib/transaction.c:1201 +#: lib/transaction.c:1196 #, c-format msgid "\t\tName: %s.\n" msgstr "\t\tNome: %s.\n" -#: lib/transaction.c:1224 +#: lib/transaction.c:1219 #, c-format msgid "\tRepackaged Package was %s...\n" msgstr "\tO pacote reempacotado era %s...\n" -#: lib/transaction.c:1268 +#: lib/transaction.c:1263 msgid "Adding install element to auto-rollback transaction.\n" msgstr "Adicionando elemento de instalação à transação de auto-recuo.\n" -#: lib/transaction.c:1277 +#: lib/transaction.c:1272 msgid "Could not get install element database instance!\n" msgstr "" "Não foi possÃvel obter a instância do banco de dados do elemento de " "instalação!\n" -#: lib/transaction.c:1290 +#: lib/transaction.c:1285 msgid "Could not get header for auto-rollback transaction!\n" msgstr "Não foi possÃvel obter o cabeçalho da transação de auto-recuo!\n" -#: lib/transaction.c:1300 +#: lib/transaction.c:1295 #, c-format msgid "\tAdded repackaged package header: %s.\n" msgstr "\tCabeçalho do pacote reempacotado adicionado: %s.\n" -#: lib/transaction.c:1302 lib/transaction.c:1313 +#: lib/transaction.c:1297 lib/transaction.c:1308 #, c-format msgid "\tAdded from install element %s.\n" msgstr "\tAdicionado a partir do elemento de instalação %s.\n" -#: lib/transaction.c:1311 +#: lib/transaction.c:1306 msgid "\tAdded erase element.\n" msgstr "\tElemento de remoção adicionado.\n" -#: lib/transaction.c:1320 +#: lib/transaction.c:1315 msgid "Could not get repackaged header for auto-rollback transaction!\n" msgstr "" "Não foi possÃvel obter o cabeçalho reempacotado para a transação de auto-" "recuo!\n" -#: lib/transaction.c:1327 +#: lib/transaction.c:1322 msgid "Add erase element to auto-rollback transaction.\n" msgstr "Adicionar um elemento de remoção à transação de auto-recuo.\n" -#: lib/transaction.c:1335 +#: lib/transaction.c:1330 msgid "\tFound existing upgrade element.\n" msgstr "\tElemento de atualização existente encontrado.\n" -#: lib/transaction.c:1336 +#: lib/transaction.c:1331 #, c-format msgid "\tNot adding erase element for %s.\n" msgstr "\tNão está adicionando um elemento de remoção para %s.\n" -#: lib/transaction.c:1353 +#: lib/transaction.c:1348 #, c-format msgid "\tAdded repackaged package %s.\n" msgstr "\tPacote reempacotado %s adicionado.\n" -#: lib/transaction.c:1355 +#: lib/transaction.c:1350 #, c-format msgid "\tAdded from erase element %s.\n" msgstr "\tAdicionado a partir de um elemento de remoção %s.\n" -#: lib/transaction.c:1360 +#: lib/transaction.c:1355 msgid "Could not add erase element to auto-rollback transaction.\n" msgstr "" "Não foi possÃvel adicionar um elemento de remoção à transação de auto-" "recuo.\n" -#: lib/transaction.c:1366 +#: lib/transaction.c:1361 msgid "\tNo repackaged package...nothing to do.\n" msgstr "\tNenhum pacote reempacotado... nada a ser feito.\n" -#: lib/transaction.c:1372 +#: lib/transaction.c:1367 msgid "Failure reading repackaged package!\n" msgstr "Falha ao ler o pacote reempacotado!\n" -#: lib/transaction.c:1495 +#: lib/transaction.c:1490 #, c-format msgid "sanity checking %d elements\n" msgstr "verificando a integridade de %d elementos\n" -#: lib/transaction.c:1581 +#: lib/transaction.c:1576 msgid "running pre-transaction scripts\n" msgstr "executando scripts de pré-transação\n" -#: lib/transaction.c:1655 +#: lib/transaction.c:1650 #, c-format msgid "computing %d file fingerprints\n" msgstr "computando %d impressões digitais do arquivo\n" -#: lib/transaction.c:1739 +#: lib/transaction.c:1734 msgid "computing file dispositions\n" msgstr "computando disposições dos arquivos\n" -#: lib/transaction.c:1932 +#: lib/transaction.c:1927 msgid "Creating auto-rollback transaction\n" msgstr "Criando transação de auto-recuo\n" -#: lib/transaction.c:2086 +#: lib/transaction.c:2077 msgid "Add failed. Could not read package header.\n" msgstr "A adição falhou. Não foi possÃvel ler o cabeçalho do pacote.\n" -#: lib/transaction.c:2170 +#: lib/transaction.c:2161 msgid "Add failed in rpmpsmStage().\n" msgstr "A adição falhou no rpmpsmStage().\n" -#: lib/transaction.c:2214 +#: lib/transaction.c:2205 msgid "Add failed. Could not get file list.\n" msgstr "A adição falhou. Não foi possÃvel obter a lista de arquivos.\n" -#: lib/transaction.c:2263 +#: lib/transaction.c:2254 msgid "Erase failed failed in rpmpsmStage().\n" msgstr "A remoção falhou no rpmpsmStage().\n" -#: lib/transaction.c:2324 +#: lib/transaction.c:2315 msgid "running post-transaction scripts\n" msgstr "executando scripts de pós-transação\n" @@ -4228,88 +4228,88 @@ msgstr "abrindo Ãndice db %s/%s %s mode=0x%x\n" msgid "======================== active %d empty %d\n" msgstr "======================== %d ativo %d vazio\n" -#: rpmio/macro.c:394 +#: rpmio/macro.c:396 #, c-format msgid "%3d>%*s(empty)" msgstr "%3d>%*s(vazio)" -#: rpmio/macro.c:437 +#: rpmio/macro.c:439 #, c-format msgid "%3d<%*s(empty)\n" msgstr "%3d<%*s(vazio)\n" -#: rpmio/macro.c:664 rpmio/macro.c:705 +#: rpmio/macro.c:608 rpmio/macro.c:1090 rpmio/macro.c:1123 rpmio/macro.c:1863 +msgid "Target buffer overflow\n" +msgstr "Estouro de buffer do destino\n" + +#: rpmio/macro.c:671 rpmio/macro.c:712 #, c-format msgid "Macro %%%s has unterminated body\n" msgstr "O macro %%%s tem um corpo incompleto\n" -#: rpmio/macro.c:727 +#: rpmio/macro.c:734 #, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "O macro %%%s tem um nome inválido (%%define)\n" -#: rpmio/macro.c:733 +#: rpmio/macro.c:740 #, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "O macro %%%s tem opções incompletas\n" -#: rpmio/macro.c:738 +#: rpmio/macro.c:745 #, c-format msgid "Macro %%%s has empty body\n" msgstr "O macro %%%s tem um corpo vazio\n" -#: rpmio/macro.c:744 +#: rpmio/macro.c:751 #, c-format msgid "Macro %%%s failed to expand\n" msgstr "O macro %%%s falhou ao expandir\n" -#: rpmio/macro.c:779 +#: rpmio/macro.c:786 #, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "O macro %%%s tem um nome inválido (%%undefine)\n" -#: rpmio/macro.c:897 +#: rpmio/macro.c:904 #, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "O macro %%%s (%s) não foi usado abaixo do nÃvel %d\n" -#: rpmio/macro.c:1024 +#: rpmio/macro.c:1031 #, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "Opção desconhecida %c em %s(%s)\n" -#: rpmio/macro.c:1224 +#: rpmio/macro.c:1239 #, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "Profundidade de recursão (%d) maior do que o máximo (%d)\n" # , c-format -#: rpmio/macro.c:1297 rpmio/macro.c:1314 +#: rpmio/macro.c:1312 rpmio/macro.c:1329 #, c-format msgid "Unterminated %c: %s\n" msgstr "%c incompleto: %s\n" -#: rpmio/macro.c:1355 +#: rpmio/macro.c:1370 #, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "Um %% é seguido por um macro não analisável\n" -#: rpmio/macro.c:1512 +#: rpmio/macro.c:1527 #, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "Macro %%%.*s não encontrado, ignorando\n" -#: rpmio/macro.c:1848 -msgid "Target buffer overflow\n" -msgstr "Estouro de buffer do destino\n" - # , c-format -#: rpmio/macro.c:2056 rpmio/macro.c:2062 +#: rpmio/macro.c:2076 rpmio/macro.c:2082 #, c-format msgid "File %s: %s\n" msgstr "Arquivo %s: %s\n" -#: rpmio/macro.c:2065 +#: rpmio/macro.c:2085 #, c-format msgid "File %s is smaller than %u bytes\n" msgstr "O arquivo %s é menor que %u bytes\n" diff --git a/po/rpm.pot b/po/rpm.pot index f56426d5a..a67410872 100644 --- a/po/rpm.pot +++ b/po/rpm.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n" -"POT-Creation-Date: 2007-08-21 08:04+0200\n" +"POT-Creation-Date: 2007-08-30 18:37+0200\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" @@ -1253,18 +1253,18 @@ msgstr "" msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "" -#: build/poptBT.c:229 lib/poptALL.c:273 lib/poptI.c:282 lib/poptQV.c:363 -#: lib/poptQV.c:372 lib/poptQV.c:413 +#: build/poptBT.c:229 lib/poptALL.c:273 lib/poptI.c:282 lib/poptQV.c:362 +#: lib/poptQV.c:371 lib/poptQV.c:412 msgid "don't verify package digest(s)" msgstr "" -#: build/poptBT.c:231 lib/poptALL.c:275 lib/poptI.c:284 lib/poptQV.c:366 -#: lib/poptQV.c:374 lib/poptQV.c:416 +#: build/poptBT.c:231 lib/poptALL.c:275 lib/poptI.c:284 lib/poptQV.c:365 +#: lib/poptQV.c:373 lib/poptQV.c:415 msgid "don't verify database header(s) when retrieved" msgstr "" -#: build/poptBT.c:233 lib/poptALL.c:281 lib/poptI.c:286 lib/poptQV.c:369 -#: lib/poptQV.c:376 lib/poptQV.c:418 +#: build/poptBT.c:233 lib/poptALL.c:281 lib/poptI.c:286 lib/poptQV.c:368 +#: lib/poptQV.c:375 lib/poptQV.c:417 msgid "don't verify package signature(s)" msgstr "" @@ -1326,27 +1326,27 @@ msgstr "" msgid "failed to write all data to %s\n" msgstr "" -#: build/rpmfc.c:1250 +#: build/rpmfc.c:1249 #, c-format msgid "magic_open(0x%x) failed: %s\n" msgstr "" -#: build/rpmfc.c:1258 +#: build/rpmfc.c:1257 #, c-format -msgid "magic_load(ms, \"%s\") failed: %s\n" +msgid "magic_load failed: %s\n" msgstr "" -#: build/rpmfc.c:1303 +#: build/rpmfc.c:1301 #, c-format msgid "magic_file(ms, \"%s\") failed: mode %06o %s\n" msgstr "" -#: build/rpmfc.c:1524 +#: build/rpmfc.c:1522 #, c-format msgid "Finding %s: %s\n" msgstr "" -#: build/rpmfc.c:1530 build/rpmfc.c:1539 +#: build/rpmfc.c:1528 build/rpmfc.c:1537 #, c-format msgid "Failed to find %s:\n" msgstr "" @@ -1466,30 +1466,30 @@ msgstr "" msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" -#: lib/depends.c:1265 +#: lib/depends.c:1271 msgid "========== recording tsort relations\n" msgstr "" -#: lib/depends.c:1357 +#: lib/depends.c:1363 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, depth, " "breadth)\n" msgstr "" -#: lib/depends.c:1453 +#: lib/depends.c:1459 #, c-format msgid "========== successors only (%d bytes)\n" msgstr "" -#: lib/depends.c:1526 +#: lib/depends.c:1532 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1561 +#: lib/depends.c:1567 msgid "========== continuing tsort ...\n" msgstr "" -#: lib/depends.c:1566 +#: lib/depends.c:1572 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2022,7 +2022,7 @@ msgstr "" msgid "do not verify package dependencies" msgstr "" -#: lib/poptI.c:252 lib/poptQV.c:307 lib/poptQV.c:310 +#: lib/poptI.c:252 lib/poptQV.c:306 lib/poptQV.c:309 msgid "don't verify MD5 digest of files" msgstr "" @@ -2136,214 +2136,214 @@ msgstr "" msgid "upgrade package(s)" msgstr "" -#: lib/poptQV.c:103 +#: lib/poptQV.c:102 msgid "query/verify all packages" msgstr "" -#: lib/poptQV.c:105 +#: lib/poptQV.c:104 msgid "rpm checksig mode" msgstr "" -#: lib/poptQV.c:107 +#: lib/poptQV.c:106 msgid "query/verify package(s) owning file" msgstr "" -#: lib/poptQV.c:109 +#: lib/poptQV.c:108 msgid "query/verify package(s) in group" msgstr "" -#: lib/poptQV.c:111 +#: lib/poptQV.c:110 msgid "query/verify a package file" msgstr "" -#: lib/poptQV.c:114 +#: lib/poptQV.c:113 msgid "query/verify package(s) from TOP file tree walk" msgstr "" -#: lib/poptQV.c:116 +#: lib/poptQV.c:115 msgid "query/verify package(s) from system HDLIST" msgstr "" -#: lib/poptQV.c:119 +#: lib/poptQV.c:118 msgid "query/verify package(s) with package identifier" msgstr "" -#: lib/poptQV.c:121 +#: lib/poptQV.c:120 msgid "query/verify package(s) with header identifier" msgstr "" -#: lib/poptQV.c:123 +#: lib/poptQV.c:122 msgid "query/verify package(s) with file identifier" msgstr "" -#: lib/poptQV.c:126 +#: lib/poptQV.c:125 msgid "rpm query mode" msgstr "" -#: lib/poptQV.c:128 +#: lib/poptQV.c:127 msgid "query/verify a header instance" msgstr "" -#: lib/poptQV.c:130 +#: lib/poptQV.c:129 msgid "query a spec file" msgstr "" -#: lib/poptQV.c:130 +#: lib/poptQV.c:129 msgid "<spec>" msgstr "" -#: lib/poptQV.c:132 +#: lib/poptQV.c:131 msgid "query/verify package(s) from install transaction" msgstr "" -#: lib/poptQV.c:134 +#: lib/poptQV.c:133 msgid "query the package(s) triggered by the package" msgstr "" -#: lib/poptQV.c:136 +#: lib/poptQV.c:135 msgid "rpm verify mode" msgstr "" -#: lib/poptQV.c:138 +#: lib/poptQV.c:137 msgid "query/verify the package(s) which require a dependency" msgstr "" -#: lib/poptQV.c:140 +#: lib/poptQV.c:139 msgid "query/verify the package(s) which provide a dependency" msgstr "" -#: lib/poptQV.c:143 +#: lib/poptQV.c:142 msgid "create transaction set" msgstr "" -#: lib/poptQV.c:145 +#: lib/poptQV.c:144 msgid "do not order transaction set" msgstr "" -#: lib/poptQV.c:147 +#: lib/poptQV.c:146 msgid "do not glob arguments" msgstr "" -#: lib/poptQV.c:149 +#: lib/poptQV.c:148 msgid "do not process non-package files as manifests" msgstr "" -#: lib/poptQV.c:151 +#: lib/poptQV.c:150 msgid "do not read headers" msgstr "" -#: lib/poptQV.c:258 +#: lib/poptQV.c:257 msgid "list all configuration files" msgstr "" -#: lib/poptQV.c:260 +#: lib/poptQV.c:259 msgid "list all documentation files" msgstr "" -#: lib/poptQV.c:262 +#: lib/poptQV.c:261 msgid "dump basic file information" msgstr "" -#: lib/poptQV.c:266 +#: lib/poptQV.c:265 msgid "list files in package" msgstr "" -#: lib/poptQV.c:271 +#: lib/poptQV.c:270 #, c-format msgid "skip %%ghost files" msgstr "" -#: lib/poptQV.c:275 +#: lib/poptQV.c:274 #, c-format msgid "skip %%license files" msgstr "" -#: lib/poptQV.c:278 +#: lib/poptQV.c:277 #, c-format msgid "skip %%readme files" msgstr "" -#: lib/poptQV.c:284 +#: lib/poptQV.c:283 msgid "use the following query format" msgstr "" -#: lib/poptQV.c:286 +#: lib/poptQV.c:285 msgid "substitute i18n sections into spec file" msgstr "" -#: lib/poptQV.c:288 +#: lib/poptQV.c:287 msgid "display the states of the listed files" msgstr "" -#: lib/poptQV.c:314 +#: lib/poptQV.c:313 msgid "don't verify size of files" msgstr "" -#: lib/poptQV.c:317 +#: lib/poptQV.c:316 msgid "don't verify symlink path of files" msgstr "" -#: lib/poptQV.c:320 +#: lib/poptQV.c:319 msgid "don't verify owner of files" msgstr "" -#: lib/poptQV.c:323 +#: lib/poptQV.c:322 msgid "don't verify group of files" msgstr "" -#: lib/poptQV.c:326 +#: lib/poptQV.c:325 msgid "don't verify modification time of files" msgstr "" -#: lib/poptQV.c:329 lib/poptQV.c:332 +#: lib/poptQV.c:328 lib/poptQV.c:331 msgid "don't verify mode of files" msgstr "" -#: lib/poptQV.c:335 +#: lib/poptQV.c:334 msgid "don't verify file security contexts" msgstr "" -#: lib/poptQV.c:337 +#: lib/poptQV.c:336 msgid "don't verify files in package" msgstr "" -#: lib/poptQV.c:340 lib/poptQV.c:343 tools/rpmgraph.c:266 +#: lib/poptQV.c:339 lib/poptQV.c:342 tools/rpmgraph.c:266 msgid "don't verify package dependencies" msgstr "" -#: lib/poptQV.c:348 lib/poptQV.c:352 lib/poptQV.c:355 lib/poptQV.c:358 +#: lib/poptQV.c:347 lib/poptQV.c:351 lib/poptQV.c:354 lib/poptQV.c:357 msgid "don't execute verify script(s)" msgstr "" -#: lib/poptQV.c:382 +#: lib/poptQV.c:381 msgid "don't verify GPG V3 DSA signature(s)" msgstr "" -#: lib/poptQV.c:385 +#: lib/poptQV.c:384 msgid "don't verify PGP V3 RSA/MD5 signature(s)" msgstr "" -#: lib/poptQV.c:400 +#: lib/poptQV.c:399 msgid "sign package(s) (identical to --resign)" msgstr "" -#: lib/poptQV.c:402 +#: lib/poptQV.c:401 msgid "verify package signature(s)" msgstr "" -#: lib/poptQV.c:404 +#: lib/poptQV.c:403 msgid "delete package signatures" msgstr "" -#: lib/poptQV.c:406 +#: lib/poptQV.c:405 msgid "import an armored public key" msgstr "" -#: lib/poptQV.c:408 +#: lib/poptQV.c:407 msgid "sign package(s) (identical to --addsign)" msgstr "" -#: lib/poptQV.c:410 +#: lib/poptQV.c:409 msgid "generate signature" msgstr "" @@ -2680,38 +2680,38 @@ msgstr "" msgid "%s skipped due to missingok flag\n" msgstr "" -#: lib/rpmfi.c:846 +#: lib/rpmfi.c:850 msgid "========== relocations\n" msgstr "" -#: lib/rpmfi.c:850 +#: lib/rpmfi.c:854 #, c-format msgid "%5d exclude %s\n" msgstr "" -#: lib/rpmfi.c:853 +#: lib/rpmfi.c:857 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "" -#: lib/rpmfi.c:987 +#: lib/rpmfi.c:991 #, c-format msgid "excluding %s %s\n" msgstr "" -#: lib/rpmfi.c:997 +#: lib/rpmfi.c:1001 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/rpmfi.c:1089 +#: lib/rpmfi.c:1093 #, c-format msgid "relocating directory %s to %s\n" msgstr "" #: lib/rpmgi.c:81 lib/rpminstall.c:124 lib/rpminstall.c:480 -#: lib/rpminstall.c:615 lib/rpminstall.c:1041 lib/rpmts.c:643 -#: tools/rpmgraph.c:121 tools/rpmgraph.c:158 +#: lib/rpminstall.c:615 lib/rpmts.c:643 tools/rpmgraph.c:121 +#: tools/rpmgraph.c:158 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2722,7 +2722,7 @@ msgid "unknown tag: \"%s\"\n" msgstr "" #: lib/rpmgi.c:628 lib/rpminstall.c:659 lib/rpminstall.c:834 -#: lib/rpminstall.c:1267 lib/transaction.c:1031 tools/rpmgraph.c:196 +#: lib/rpminstall.c:1084 lib/transaction.c:1026 tools/rpmgraph.c:196 msgid "Failed dependencies:\n" msgstr "" @@ -2838,16 +2838,16 @@ msgstr "" msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1261 lib/transaction.c:1024 +#: lib/rpminstall.c:1078 lib/transaction.c:1019 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" -#: lib/rpminstall.c:1292 lib/transaction.c:1075 +#: lib/rpminstall.c:1109 lib/transaction.c:1070 msgid "Cleaning up repackaged packages:\n" msgstr "" -#: lib/rpminstall.c:1299 lib/transaction.c:1081 +#: lib/rpminstall.c:1116 lib/transaction.c:1076 #, c-format msgid "\tRemoving %s:\n" msgstr "" @@ -2980,97 +2980,97 @@ msgstr "" msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/rpmrc.c:199 +#: lib/rpmrc.c:213 #, c-format msgid "missing second ':' at %s:%d\n" msgstr "" -#: lib/rpmrc.c:202 +#: lib/rpmrc.c:216 #, c-format msgid "missing architecture name at %s:%d\n" msgstr "" -#: lib/rpmrc.c:356 +#: lib/rpmrc.c:370 #, c-format msgid "Incomplete data line at %s:%d\n" msgstr "" -#: lib/rpmrc.c:361 +#: lib/rpmrc.c:375 #, c-format msgid "Too many args in data line at %s:%d\n" msgstr "" -#: lib/rpmrc.c:369 +#: lib/rpmrc.c:383 #, c-format msgid "Bad arch/os number: %s (%s:%d)\n" msgstr "" -#: lib/rpmrc.c:406 +#: lib/rpmrc.c:420 #, c-format msgid "Incomplete default line at %s:%d\n" msgstr "" -#: lib/rpmrc.c:411 +#: lib/rpmrc.c:425 #, c-format msgid "Too many args in default line at %s:%d\n" msgstr "" -#: lib/rpmrc.c:577 +#: lib/rpmrc.c:591 #, c-format msgid "Failed to read %s: %s.\n" msgstr "" -#: lib/rpmrc.c:615 +#: lib/rpmrc.c:629 #, c-format msgid "missing ':' (found 0x%02x) at %s:%d\n" msgstr "" -#: lib/rpmrc.c:632 lib/rpmrc.c:706 +#: lib/rpmrc.c:646 lib/rpmrc.c:710 #, c-format msgid "missing argument for %s at %s:%d\n" msgstr "" -#: lib/rpmrc.c:649 lib/rpmrc.c:671 +#: lib/rpmrc.c:663 #, c-format msgid "%s expansion failed at %s:%d \"%s\"\n" msgstr "" -#: lib/rpmrc.c:658 +#: lib/rpmrc.c:672 #, c-format msgid "cannot open %s at %s:%d: %s\n" msgstr "" -#: lib/rpmrc.c:698 +#: lib/rpmrc.c:702 #, c-format msgid "missing architecture for %s at %s:%d\n" msgstr "" -#: lib/rpmrc.c:765 +#: lib/rpmrc.c:769 #, c-format msgid "bad option '%s' at %s:%d\n" msgstr "" -#: lib/rpmrc.c:1564 +#: lib/rpmrc.c:1568 #, c-format msgid "Unknown system: %s\n" msgstr "" -#: lib/rpmrc.c:1565 +#: lib/rpmrc.c:1569 #, c-format msgid "Please contact %s\n" msgstr "" -#: lib/rpmrc.c:1802 +#: lib/rpmrc.c:1806 #, c-format msgid "Cannot expand %s\n" msgstr "" -#: lib/rpmrc.c:1807 +#: lib/rpmrc.c:1811 #, c-format msgid "Cannot read %s, HOME is too large.\n" msgstr "" -#: lib/rpmrc.c:1824 +#: lib/rpmrc.c:1828 #, c-format msgid "Unable to open %s for reading: %s.\n" msgstr "" @@ -3358,158 +3358,158 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:935 +#: lib/transaction.c:930 #, c-format msgid "excluding directory %s\n" msgstr "" -#: lib/transaction.c:1022 +#: lib/transaction.c:1017 msgid "Transaction failed...rolling back\n" msgstr "" -#: lib/transaction.c:1042 +#: lib/transaction.c:1037 msgid "Could not order auto-rollback transaction!\n" msgstr "" -#: lib/transaction.c:1132 +#: lib/transaction.c:1127 msgid "Getting repackaged header from transaction element\n" msgstr "" -#: lib/transaction.c:1157 +#: lib/transaction.c:1152 #, c-format msgid "\tLooking for %s...\n" msgstr "" -#: lib/transaction.c:1161 +#: lib/transaction.c:1156 msgid "\tMatches found.\n" msgstr "" -#: lib/transaction.c:1165 +#: lib/transaction.c:1160 msgid "\tNo matches found.\n" msgstr "" -#: lib/transaction.c:1178 +#: lib/transaction.c:1173 msgid "\tRepackaged package not found!.\n" msgstr "" -#: lib/transaction.c:1199 +#: lib/transaction.c:1194 msgid "\tREMOVETID matched INSTALLTID.\n" msgstr "" -#: lib/transaction.c:1201 +#: lib/transaction.c:1196 #, c-format msgid "\t\tName: %s.\n" msgstr "" -#: lib/transaction.c:1224 +#: lib/transaction.c:1219 #, c-format msgid "\tRepackaged Package was %s...\n" msgstr "" -#: lib/transaction.c:1268 +#: lib/transaction.c:1263 msgid "Adding install element to auto-rollback transaction.\n" msgstr "" -#: lib/transaction.c:1277 +#: lib/transaction.c:1272 msgid "Could not get install element database instance!\n" msgstr "" -#: lib/transaction.c:1290 +#: lib/transaction.c:1285 msgid "Could not get header for auto-rollback transaction!\n" msgstr "" -#: lib/transaction.c:1300 +#: lib/transaction.c:1295 #, c-format msgid "\tAdded repackaged package header: %s.\n" msgstr "" -#: lib/transaction.c:1302 lib/transaction.c:1313 +#: lib/transaction.c:1297 lib/transaction.c:1308 #, c-format msgid "\tAdded from install element %s.\n" msgstr "" -#: lib/transaction.c:1311 +#: lib/transaction.c:1306 msgid "\tAdded erase element.\n" msgstr "" -#: lib/transaction.c:1320 +#: lib/transaction.c:1315 msgid "Could not get repackaged header for auto-rollback transaction!\n" msgstr "" -#: lib/transaction.c:1327 +#: lib/transaction.c:1322 msgid "Add erase element to auto-rollback transaction.\n" msgstr "" -#: lib/transaction.c:1335 +#: lib/transaction.c:1330 msgid "\tFound existing upgrade element.\n" msgstr "" -#: lib/transaction.c:1336 +#: lib/transaction.c:1331 #, c-format msgid "\tNot adding erase element for %s.\n" msgstr "" -#: lib/transaction.c:1353 +#: lib/transaction.c:1348 #, c-format msgid "\tAdded repackaged package %s.\n" msgstr "" -#: lib/transaction.c:1355 +#: lib/transaction.c:1350 #, c-format msgid "\tAdded from erase element %s.\n" msgstr "" -#: lib/transaction.c:1360 +#: lib/transaction.c:1355 msgid "Could not add erase element to auto-rollback transaction.\n" msgstr "" -#: lib/transaction.c:1366 +#: lib/transaction.c:1361 msgid "\tNo repackaged package...nothing to do.\n" msgstr "" -#: lib/transaction.c:1372 +#: lib/transaction.c:1367 msgid "Failure reading repackaged package!\n" msgstr "" -#: lib/transaction.c:1495 +#: lib/transaction.c:1490 #, c-format msgid "sanity checking %d elements\n" msgstr "" -#: lib/transaction.c:1581 +#: lib/transaction.c:1576 msgid "running pre-transaction scripts\n" msgstr "" -#: lib/transaction.c:1655 +#: lib/transaction.c:1650 #, c-format msgid "computing %d file fingerprints\n" msgstr "" -#: lib/transaction.c:1739 +#: lib/transaction.c:1734 msgid "computing file dispositions\n" msgstr "" -#: lib/transaction.c:1932 +#: lib/transaction.c:1927 msgid "Creating auto-rollback transaction\n" msgstr "" -#: lib/transaction.c:2086 +#: lib/transaction.c:2077 msgid "Add failed. Could not read package header.\n" msgstr "" -#: lib/transaction.c:2170 +#: lib/transaction.c:2161 msgid "Add failed in rpmpsmStage().\n" msgstr "" -#: lib/transaction.c:2214 +#: lib/transaction.c:2205 msgid "Add failed. Could not get file list.\n" msgstr "" -#: lib/transaction.c:2263 +#: lib/transaction.c:2254 msgid "Erase failed failed in rpmpsmStage().\n" msgstr "" -#: lib/transaction.c:2324 +#: lib/transaction.c:2315 msgid "running post-transaction scripts\n" msgstr "" @@ -3898,86 +3898,86 @@ msgstr "" msgid "======================== active %d empty %d\n" msgstr "" -#: rpmio/macro.c:394 +#: rpmio/macro.c:396 #, c-format msgid "%3d>%*s(empty)" msgstr "" -#: rpmio/macro.c:437 +#: rpmio/macro.c:439 #, c-format msgid "%3d<%*s(empty)\n" msgstr "" -#: rpmio/macro.c:664 rpmio/macro.c:705 +#: rpmio/macro.c:608 rpmio/macro.c:1090 rpmio/macro.c:1123 rpmio/macro.c:1863 +msgid "Target buffer overflow\n" +msgstr "" + +#: rpmio/macro.c:671 rpmio/macro.c:712 #, c-format msgid "Macro %%%s has unterminated body\n" msgstr "" -#: rpmio/macro.c:727 +#: rpmio/macro.c:734 #, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "" -#: rpmio/macro.c:733 +#: rpmio/macro.c:740 #, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "" -#: rpmio/macro.c:738 +#: rpmio/macro.c:745 #, c-format msgid "Macro %%%s has empty body\n" msgstr "" -#: rpmio/macro.c:744 +#: rpmio/macro.c:751 #, c-format msgid "Macro %%%s failed to expand\n" msgstr "" -#: rpmio/macro.c:779 +#: rpmio/macro.c:786 #, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "" -#: rpmio/macro.c:897 +#: rpmio/macro.c:904 #, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "" -#: rpmio/macro.c:1024 +#: rpmio/macro.c:1031 #, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "" -#: rpmio/macro.c:1224 +#: rpmio/macro.c:1239 #, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "" -#: rpmio/macro.c:1297 rpmio/macro.c:1314 +#: rpmio/macro.c:1312 rpmio/macro.c:1329 #, c-format msgid "Unterminated %c: %s\n" msgstr "" -#: rpmio/macro.c:1355 +#: rpmio/macro.c:1370 #, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "" -#: rpmio/macro.c:1512 +#: rpmio/macro.c:1527 #, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "" -#: rpmio/macro.c:1848 -msgid "Target buffer overflow\n" -msgstr "" - -#: rpmio/macro.c:2056 rpmio/macro.c:2062 +#: rpmio/macro.c:2076 rpmio/macro.c:2082 #, c-format msgid "File %s: %s\n" msgstr "" -#: rpmio/macro.c:2065 +#: rpmio/macro.c:2085 #, c-format msgid "File %s is smaller than %u bytes\n" msgstr "" @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n" -"POT-Creation-Date: 2007-08-21 08:04+0200\n" +"POT-Creation-Date: 2007-08-30 18:37+0200\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" @@ -1284,18 +1284,18 @@ msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "" "ÓÏÚÄÁÔØ ÚÁÇÏÌÏ×ÏË(ËÉ) ÐÁËÅÔÁ, ÓÏ×ÍÅÓÔÉÍÙÅ Ó (ÕÓÔÁÒÅ×ÛÉÍÉ) ÆÏÒÍÁÔÁÍÉ rpm[23]" -#: build/poptBT.c:229 lib/poptALL.c:273 lib/poptI.c:282 lib/poptQV.c:363 -#: lib/poptQV.c:372 lib/poptQV.c:413 +#: build/poptBT.c:229 lib/poptALL.c:273 lib/poptI.c:282 lib/poptQV.c:362 +#: lib/poptQV.c:371 lib/poptQV.c:412 msgid "don't verify package digest(s)" msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÄÁÊÄÖÅÓÔ ÐÁËÅÔÁ(Ï×)" -#: build/poptBT.c:231 lib/poptALL.c:275 lib/poptI.c:284 lib/poptQV.c:366 -#: lib/poptQV.c:374 lib/poptQV.c:416 +#: build/poptBT.c:231 lib/poptALL.c:275 lib/poptI.c:284 lib/poptQV.c:365 +#: lib/poptQV.c:373 lib/poptQV.c:415 msgid "don't verify database header(s) when retrieved" msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÚÁÇÏÌÏ×ËÉ, ÉÚ×ÌÅËÁÅÍÙÅ ÉÚ ÂÁÚÙ ÄÁÎÎÙÈ" -#: build/poptBT.c:233 lib/poptALL.c:281 lib/poptI.c:286 lib/poptQV.c:369 -#: lib/poptQV.c:376 lib/poptQV.c:418 +#: build/poptBT.c:233 lib/poptALL.c:281 lib/poptI.c:286 lib/poptQV.c:368 +#: lib/poptQV.c:375 lib/poptQV.c:417 msgid "don't verify package signature(s)" msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÐÏÄÐÉÓØ(É) × ÐÁËÅÔÅ(ÁÈ)" @@ -1357,27 +1357,27 @@ msgstr "%s ÎÅ ÕÄÁÌÏÓØ\n" msgid "failed to write all data to %s\n" msgstr "ÚÁÐÉÓØ ×ÓÅÈ ÄÁÎÎÙÈ × %s ÎÅ ÕÄÁÌÁÓØ\n" -#: build/rpmfc.c:1250 +#: build/rpmfc.c:1249 #, fuzzy, c-format msgid "magic_open(0x%x) failed: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s\n" -#: build/rpmfc.c:1258 +#: build/rpmfc.c:1257 #, fuzzy, c-format -msgid "magic_load(ms, \"%s\") failed: %s\n" +msgid "magic_load failed: %s\n" msgstr "%s ÏÛÉÂËÁ ÕÄÁÌÅÎÉÑ ËÁÔÁÌÏÇÁ %s: %s\n" -#: build/rpmfc.c:1303 +#: build/rpmfc.c:1301 #, c-format msgid "magic_file(ms, \"%s\") failed: mode %06o %s\n" msgstr "" -#: build/rpmfc.c:1524 +#: build/rpmfc.c:1522 #, c-format msgid "Finding %s: %s\n" msgstr "éÄÅÔ ÐÏÉÓË %s: %s\n" -#: build/rpmfc.c:1530 build/rpmfc.c:1539 +#: build/rpmfc.c:1528 build/rpmfc.c:1537 #, c-format msgid "Failed to find %s:\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ %s:\n" @@ -1497,11 +1497,11 @@ msgstr "ÉÇÎÏÒÉÒÏ×ÁÔØ ÚÁ×ÉÓÉÍÏÓÔ(É) ÉͣΠÐÁËÅÔÁ(Ï×) [%d]\t%s -> %s\n" msgid "removing %s \"%s\" from tsort relations.\n" msgstr "ÕÄÁÌÑÅÔÓÑ %s \"%s\" ÉÚ ÓÏÒÔÉÒÏ×ÁÎÎÙÈ Ó×ÑÚÅÊ.\n" -#: lib/depends.c:1265 +#: lib/depends.c:1271 msgid "========== recording tsort relations\n" msgstr "========== ÚÁÐÉÓØ ÕÐÏÒÑÄÏÞÅÎÎÙÈ ÚÁ×ÉÓÉÍÏÓÔÅÊ\n" -#: lib/depends.c:1357 +#: lib/depends.c:1363 #, fuzzy msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, depth, " @@ -1510,20 +1510,20 @@ msgstr "" "========== ÓÏÒÔÉÒÏ×ËÁ ÐÁËÅÔÏ× (ÏÞÅÒÅÄÎÏÓÔØ, #predecessors, #succesors, " "ÄÅÒÅ×Ï, ÇÌÕÂÉÎÁ)\n" -#: lib/depends.c:1453 +#: lib/depends.c:1459 #, fuzzy, c-format msgid "========== successors only (%d bytes)\n" msgstr "========== ÔÏÌØËÏ ÐÏÓÌÅÄÏ×ÁÔÅÌÉ (× ÐÏÒÑÄËÅ ÐÒÅÄÓÔÁ×ÌÅÎÉÑ)\n" -#: lib/depends.c:1526 +#: lib/depends.c:1532 msgid "LOOP:\n" msgstr "ãéëì:\n" -#: lib/depends.c:1561 +#: lib/depends.c:1567 msgid "========== continuing tsort ...\n" msgstr "========== ÐÒÏÄÏÌÖÅÎÉÅ ÕÐÏÒÑÄÏÞÅÎÉÑ ...\n" -#: lib/depends.c:1566 +#: lib/depends.c:1572 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "ÏÛÉÂËÁ rpmtsOrder, ÏÓÔÁÌÏÓØ %d ÜÌÅÍÅÎÔÏ×\n" @@ -2073,7 +2073,7 @@ msgstr "ÏÂÎÏ×ÉÔØ ÂÁÚÕ ÄÁÎÎÙÈ, ÎÏ ÎÅ ÍÏÄÉÆÉÃÉÒÏ×ÁÔØ ÆÁÊÌÏ×ÕÀ ÓÉÓÔÅÍÕ" msgid "do not verify package dependencies" msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÚÁ×ÉÓÉÍÏÓÔÉ ÐÁËÅÔÁ" -#: lib/poptI.c:252 lib/poptQV.c:307 lib/poptQV.c:310 +#: lib/poptI.c:252 lib/poptQV.c:306 lib/poptQV.c:309 msgid "don't verify MD5 digest of files" msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÆÁÊÌÙ ÎÁ ËÏÎÔÒÏÌØÎÕÀ ÓÕÍÍÕ MD5" @@ -2192,220 +2192,220 @@ msgstr "ÎÅ ÕÓÔÁÎÁ×ÌÉ×ÁÔØ, Á ÔÏÌØËÏ ÓÏÏÂÝÉÔØ, ÕÄÁÓÔÓÑ ÌÉ ÕÓÔÁÎÏ×ËÁ" msgid "upgrade package(s)" msgstr "ÏÂÎÏ×ÉÔØ ÐÁËÅÔ(Ù)" -#: lib/poptQV.c:103 +#: lib/poptQV.c:102 msgid "query/verify all packages" msgstr "ÚÁÐÒÏÓÉÔØ/ÐÒÏ×ÅÒÉÔØ ×ÓÅ ÐÁËÅÔÙ" -#: lib/poptQV.c:105 +#: lib/poptQV.c:104 msgid "rpm checksig mode" msgstr "ÒÅÖÉÍ ÐÒÏ×ÅÒËÉ ÐÏÄÐÉÓÉ" -#: lib/poptQV.c:107 +#: lib/poptQV.c:106 msgid "query/verify package(s) owning file" msgstr "ÚÁÐÒÏÓÉÔØ/ÐÒÏ×ÅÒÉÔØ ÐÁËÅÔ, ËÏÔÏÒÏÍÕ ÐÒÉÎÁÄÌÅÖÉÔ ÆÁÊÌ" -#: lib/poptQV.c:109 +#: lib/poptQV.c:108 msgid "query/verify package(s) in group" msgstr "ÚÁÐÒÏÓÉÔØ/ÐÒÏ×ÅÒÉÔØ ÐÁËÅÔÙ × ÇÒÕÐÐÅ" -#: lib/poptQV.c:111 +#: lib/poptQV.c:110 msgid "query/verify a package file" msgstr "ÚÁÐÒÏÓÉÔØ/ÐÒÏ×ÅÒÉÔØ ÆÁÊÌ ÐÁËÅÔÁ" -#: lib/poptQV.c:114 +#: lib/poptQV.c:113 #, fuzzy msgid "query/verify package(s) from TOP file tree walk" msgstr "ÚÁÐÒÏÓÉÔØ/ÐÒÏ×ÅÒÉÔØ ÐÁËÅÔ(Ù) ÉÚ ÔÒÁÎÚÁËÃÉÉ ÕÓÔÁÎÏ×ËÉ" -#: lib/poptQV.c:116 +#: lib/poptQV.c:115 #, fuzzy msgid "query/verify package(s) from system HDLIST" msgstr "ÚÁÐÒÏÓÉÔØ/ÐÒÏ×ÅÒÉÔØ ÐÁËÅÔ(Ù) ÉÚ ÔÒÁÎÚÁËÃÉÉ ÕÓÔÁÎÏ×ËÉ" -#: lib/poptQV.c:119 +#: lib/poptQV.c:118 msgid "query/verify package(s) with package identifier" msgstr "ÚÁÐÒÏÓÉÔØ/ÐÒÏ×ÅÒÉÔØ ÐÁËÅÔ(Ù) ÐÏ ÉÄÅÎÔÉÆÉËÁÔÏÒÕ ÐÁËÅÔÁ" -#: lib/poptQV.c:121 +#: lib/poptQV.c:120 msgid "query/verify package(s) with header identifier" msgstr "ÚÁÐÒÏÓÉÔØ/ÐÒÏ×ÅÒÉÔØ ÐÁËÅÔ(Ù), ÐÏ ÉÄÅÎÔÉÆÉËÁÔÏÒÕ ÚÁÇÏÌÏ×ËÁ" -#: lib/poptQV.c:123 +#: lib/poptQV.c:122 msgid "query/verify package(s) with file identifier" msgstr "ÚÁÐÒÏÓÉÔØ/ÐÒÏ×ÅÒÉÔØ ÐÁËÅÔ(Ù) ÐÏ ÉÄÅÎÔÉÆÉËÁÔÏÒÕ ÆÁÊÌÁ" -#: lib/poptQV.c:126 +#: lib/poptQV.c:125 msgid "rpm query mode" msgstr "ÒÅÖÉÍ ÚÁÐÒÏÓÁ rpm" -#: lib/poptQV.c:128 +#: lib/poptQV.c:127 msgid "query/verify a header instance" msgstr "ÚÁÐÒÏÓÉÔØ/ÐÒÏ×ÅÒÉÔØ ÚÁÇÏÌÏ×ÏË" -#: lib/poptQV.c:130 +#: lib/poptQV.c:129 msgid "query a spec file" msgstr "ÚÁÐÒÏÓÉÔØ ÆÁÊÌ ÓÐÅÃÉÆÉËÁÃÉÉ" -#: lib/poptQV.c:130 +#: lib/poptQV.c:129 msgid "<spec>" msgstr "<ÆÁÊÌ ÓÐÅÃÉÆÉËÁÃÉÉ>" -#: lib/poptQV.c:132 +#: lib/poptQV.c:131 msgid "query/verify package(s) from install transaction" msgstr "ÚÁÐÒÏÓÉÔØ/ÐÒÏ×ÅÒÉÔØ ÐÁËÅÔ(Ù) ÉÚ ÔÒÁÎÚÁËÃÉÉ ÕÓÔÁÎÏ×ËÉ" -#: lib/poptQV.c:134 +#: lib/poptQV.c:133 msgid "query the package(s) triggered by the package" msgstr "ÚÁÐÒÏÓÉÔØ ÐÁËÅÔÙ Ó ÔÒÉÇÇÅÒ-ÓÃÅÎÁÒÉÑÍÉ ÎÁ ÐÁËÅÔ" -#: lib/poptQV.c:136 +#: lib/poptQV.c:135 msgid "rpm verify mode" msgstr "ÒÅÖÉÍ ÐÒÏ×ÅÒËÉ rpm" -#: lib/poptQV.c:138 +#: lib/poptQV.c:137 msgid "query/verify the package(s) which require a dependency" msgstr "ÎÁÊÔÉ/ÐÒÏ×ÅÒÉÔØ ÐÁËÅÔÙ, ÔÒÅÂÕÀÝÉÅ ÓÅÒ×ÉÓ" -#: lib/poptQV.c:140 +#: lib/poptQV.c:139 msgid "query/verify the package(s) which provide a dependency" msgstr "ÎÁÊÔÉ/ÐÒÏ×ÅÒÉÔØ ÐÁËÅÔÙ, ÐÒÅÄÏÓÔÁ×ÌÑÀÝÉÅ ÓÅÒ×ÉÓ" -#: lib/poptQV.c:143 +#: lib/poptQV.c:142 msgid "create transaction set" msgstr "" -#: lib/poptQV.c:145 +#: lib/poptQV.c:144 msgid "do not order transaction set" msgstr "" -#: lib/poptQV.c:147 +#: lib/poptQV.c:146 #, fuzzy msgid "do not glob arguments" msgstr "ÎÅ ÚÁÄÁÎÙ ÁÒÇÕÍÅÎÔÙ" -#: lib/poptQV.c:149 +#: lib/poptQV.c:148 msgid "do not process non-package files as manifests" msgstr "" -#: lib/poptQV.c:151 +#: lib/poptQV.c:150 #, fuzzy msgid "do not read headers" msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÅÓÔØ ÚÁÇÏÌÏ×ÏË × 0x%x\n" -#: lib/poptQV.c:258 +#: lib/poptQV.c:257 msgid "list all configuration files" msgstr "ÐÏËÁÚÁÔØ ×ÓÅ ÆÁÊÌÙ ËÏÎÆÉÇÕÒÁÃÉÉ" -#: lib/poptQV.c:260 +#: lib/poptQV.c:259 msgid "list all documentation files" msgstr "ÐÏËÁÚÁÔØ ×ÓÅ ÆÁÊÌÙ ÄÏËÕÍÅÎÔÁÃÉÉ" -#: lib/poptQV.c:262 +#: lib/poptQV.c:261 msgid "dump basic file information" msgstr "ÐÏËÁÚÁÔØ ÏÓÎÏ×ÎÕÀ ÉÎÆÏÒÍÁÃÉÀ Ï ÆÁÊÌÅ" -#: lib/poptQV.c:266 +#: lib/poptQV.c:265 msgid "list files in package" msgstr "ÐÏËÁÚÁÔØ ÓÐÉÓÏË ÆÁÊÌÏ× ÐÁËÅÔÁ" -#: lib/poptQV.c:271 +#: lib/poptQV.c:270 #, c-format msgid "skip %%ghost files" msgstr "ÐÒÏÐÕÓÔÉÔØ ÆÁÊÌÙ %%ghost" -#: lib/poptQV.c:275 +#: lib/poptQV.c:274 #, c-format msgid "skip %%license files" msgstr "ÐÒÏÐÕÓÔÉÔØ ÆÁÊÌÙ %%license" -#: lib/poptQV.c:278 +#: lib/poptQV.c:277 #, c-format msgid "skip %%readme files" msgstr "ÐÒÏÐÕÓÔÉÔØ ÆÁÊÌÙ %%readme" -#: lib/poptQV.c:284 +#: lib/poptQV.c:283 msgid "use the following query format" msgstr "ÉÓÐÏÌØÚÕÊÔÅ ÓÌÅÄÕÀÝÉÊ ÆÏÒÍÁÔ ÚÁÐÒÏÓÁ" -#: lib/poptQV.c:286 +#: lib/poptQV.c:285 msgid "substitute i18n sections into spec file" msgstr "ÚÁÍÅÎÉÔØ ÓÅËÃÉÉ i18n × ÆÁÊÌÅ ÓÐÅÃÉÆÉËÁÃÉÉ" -#: lib/poptQV.c:288 +#: lib/poptQV.c:287 msgid "display the states of the listed files" msgstr "ÐÏËÁÚÁÔØ ÓÏÓÔÏÑÎÉÅ ÐÅÒÅÞÉÓÌÅÎÎÙÈ ÆÁÊÌÏ×" -#: lib/poptQV.c:314 +#: lib/poptQV.c:313 msgid "don't verify size of files" msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÒÁÚÍÅÒ ÆÁÊÌÏ×" -#: lib/poptQV.c:317 +#: lib/poptQV.c:316 msgid "don't verify symlink path of files" msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÐÕÔØ ÓÉÍ×ÏÌÉÞÅÓËÉÈ ÓÓÙÌÏË" -#: lib/poptQV.c:320 +#: lib/poptQV.c:319 msgid "don't verify owner of files" msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÈÏÚÑÉÎÁ ÆÁÊÌÏ×" -#: lib/poptQV.c:323 +#: lib/poptQV.c:322 msgid "don't verify group of files" msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÇÒÕÐÐÕ ÆÁÊÌÏ×" -#: lib/poptQV.c:326 +#: lib/poptQV.c:325 msgid "don't verify modification time of files" msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ×ÒÅÍÑ ÍÏÄÉÆÉËÁÃÉÉ ÆÁÊÌÏ×" -#: lib/poptQV.c:329 lib/poptQV.c:332 +#: lib/poptQV.c:328 lib/poptQV.c:331 msgid "don't verify mode of files" msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÐÒÁ×Á ÄÏÓÔÕÐÁ ÆÁÊÌÏ× ÐÁËÅÔÁ" -#: lib/poptQV.c:335 +#: lib/poptQV.c:334 #, fuzzy msgid "don't verify file security contexts" msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÆÁÊÌÙ ÐÁËÅÔÁ" -#: lib/poptQV.c:337 +#: lib/poptQV.c:336 msgid "don't verify files in package" msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÆÁÊÌÙ ÐÁËÅÔÁ" -#: lib/poptQV.c:340 lib/poptQV.c:343 tools/rpmgraph.c:266 +#: lib/poptQV.c:339 lib/poptQV.c:342 tools/rpmgraph.c:266 msgid "don't verify package dependencies" msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÚÁ×ÉÓÉÍÏÓÔÉ ÐÁËÅÔÁ" -#: lib/poptQV.c:348 lib/poptQV.c:352 lib/poptQV.c:355 lib/poptQV.c:358 +#: lib/poptQV.c:347 lib/poptQV.c:351 lib/poptQV.c:354 lib/poptQV.c:357 msgid "don't execute verify script(s)" msgstr "ÎÅ ÉÓÐÏÌÎÑÔØ ÓÃÅÎÁÒÉÊ(É) ÐÒÏ×ÅÒËÉ" -#: lib/poptQV.c:382 +#: lib/poptQV.c:381 msgid "don't verify GPG V3 DSA signature(s)" msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÐÏÄÐÉÓØ(É) ÔÉÐÁ GPG V3 DSA" -#: lib/poptQV.c:385 +#: lib/poptQV.c:384 msgid "don't verify PGP V3 RSA/MD5 signature(s)" msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÐÏÄÐÉÓÉ ÔÉÐÁ PGP V3 RSA/MD5" -#: lib/poptQV.c:400 +#: lib/poptQV.c:399 msgid "sign package(s) (identical to --resign)" msgstr "ÐÏÄÐÉÓÁÔØ ÐÁËÅÔ(Ù) (ÔÏ ÖÅ ÓÁÍÏÅ ÞÔÏ --resign)" -#: lib/poptQV.c:402 +#: lib/poptQV.c:401 msgid "verify package signature(s)" msgstr "ÐÒÏ×ÅÒÉÔØ ÐÏÄÐÉÓØ(É) ÐÁËÅÔÁ" -#: lib/poptQV.c:404 +#: lib/poptQV.c:403 #, fuzzy msgid "delete package signatures" msgstr "ÐÒÏ×ÅÒÉÔØ ÐÏÄÐÉÓØ(É) ÐÁËÅÔÁ" -#: lib/poptQV.c:406 +#: lib/poptQV.c:405 msgid "import an armored public key" msgstr "ÉÍÐÏÒÔÉÒÏ×ÁÔØ ÏÔËÒÙÔÙÊ ËÌÀÞ" -#: lib/poptQV.c:408 +#: lib/poptQV.c:407 msgid "sign package(s) (identical to --addsign)" msgstr "ÐÏÄÐÉÓÁÔØ ÐÁËÅÔ (ÔÏ ÖÅ ÓÁÍÏÅ ÞÔÏ --addsign)" -#: lib/poptQV.c:410 +#: lib/poptQV.c:409 msgid "generate signature" msgstr "ÇÅÎÅÒÉÒÏ×ÁÔØ ÐÏÄÐÉÓØ" @@ -2745,38 +2745,38 @@ msgstr "ÐÁËÅÔ %s ÓÏÄÅÒÖÉÔ ÎÅÕÄÏ×ÌÅÔ×ÏÒÅÎÎÙÅ %s: %s\n" msgid "%s skipped due to missingok flag\n" msgstr "%s ÐÒÏÐÕÝÅÎ ÉÚ-ÚÁ ÆÌÁÇÁ missingok\n" -#: lib/rpmfi.c:846 +#: lib/rpmfi.c:850 msgid "========== relocations\n" msgstr "========== ÐÅÒÅÍÅÝÅÎÉÊ\n" -#: lib/rpmfi.c:850 +#: lib/rpmfi.c:854 #, c-format msgid "%5d exclude %s\n" msgstr "%5d ÉÓËÌÀÞÅÎ %s\n" -#: lib/rpmfi.c:853 +#: lib/rpmfi.c:857 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "%5d ÐÅÒÅÍÅÝÅÎÉÅ %s -> %s\n" -#: lib/rpmfi.c:987 +#: lib/rpmfi.c:991 #, c-format msgid "excluding %s %s\n" msgstr "ÉÓËÌÀÞÁÅÔÓÑ %s %s\n" -#: lib/rpmfi.c:997 +#: lib/rpmfi.c:1001 #, c-format msgid "relocating %s to %s\n" msgstr "ÐÅÒÅÍÅÝÁÅÔÓÑ %s × %s\n" -#: lib/rpmfi.c:1089 +#: lib/rpmfi.c:1093 #, c-format msgid "relocating directory %s to %s\n" msgstr "ÐÅÒÅÍÅÝÁÅÔÓÑ ËÁÔÁÌÏÇ %s × %s\n" #: lib/rpmgi.c:81 lib/rpminstall.c:124 lib/rpminstall.c:480 -#: lib/rpminstall.c:615 lib/rpminstall.c:1041 lib/rpmts.c:643 -#: tools/rpmgraph.c:121 tools/rpmgraph.c:158 +#: lib/rpminstall.c:615 lib/rpmts.c:643 tools/rpmgraph.c:121 +#: tools/rpmgraph.c:158 #, c-format msgid "open of %s failed: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s\n" @@ -2787,7 +2787,7 @@ msgid "unknown tag: \"%s\"\n" msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ ÔÜÇ" #: lib/rpmgi.c:628 lib/rpminstall.c:659 lib/rpminstall.c:834 -#: lib/rpminstall.c:1267 lib/transaction.c:1031 tools/rpmgraph.c:196 +#: lib/rpminstall.c:1084 lib/transaction.c:1026 tools/rpmgraph.c:196 msgid "Failed dependencies:\n" msgstr "îÅÕÄÏ×ÌÅÔ×ÏÒÅÎÎÙÅ ÚÁ×ÉÓÉÍÏÓÔÉ:\n" @@ -2903,16 +2903,16 @@ msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s\n" msgid "Installing %s\n" msgstr "õÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ %s\n" -#: lib/rpminstall.c:1261 lib/transaction.c:1024 +#: lib/rpminstall.c:1078 lib/transaction.c:1019 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "ïÔËÁÔ ÐÁËÅÔÏ× (+%d/-%d) ÎÁ %-24.24s (0x%08x):\n" -#: lib/rpminstall.c:1292 lib/transaction.c:1075 +#: lib/rpminstall.c:1109 lib/transaction.c:1070 msgid "Cleaning up repackaged packages:\n" msgstr "" -#: lib/rpminstall.c:1299 lib/transaction.c:1081 +#: lib/rpminstall.c:1116 lib/transaction.c:1076 #, fuzzy, c-format msgid "\tRemoving %s:\n" msgstr "úÁÇÒÕÖÁÅÔÓÑ %s\n" @@ -3048,97 +3048,97 @@ msgstr "%s ËÏÎÆÌÉËÔÕÅÔ Ó%s%s" msgid "unknown error %d encountered while manipulating package %s" msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ ÏÛÉÂËÁ %d ÐÒÉ ÒÁÂÏÔÅ Ó ÐÁËÅÔÏÍ %s" -#: lib/rpmrc.c:199 +#: lib/rpmrc.c:213 #, c-format msgid "missing second ':' at %s:%d\n" msgstr "ÏÔÓÕÔÓÔ×ÕÅÔ ×ÔÏÒÏÅ ':' × %s:%d\n" -#: lib/rpmrc.c:202 +#: lib/rpmrc.c:216 #, c-format msgid "missing architecture name at %s:%d\n" msgstr "ÏÔÓÕÔÓÔ×ÕÅÔ ÎÁÚ×ÁÎÉÅ ÁÒÈÉÔÅËÔÕÒÙ × %s:%d\n" -#: lib/rpmrc.c:356 +#: lib/rpmrc.c:370 #, c-format msgid "Incomplete data line at %s:%d\n" msgstr "îÅÐÏÌÎÁÑ ÓÔÒÏËÁ ÄÁÎÎÙÈ × %s:%d\n" -#: lib/rpmrc.c:361 +#: lib/rpmrc.c:375 #, c-format msgid "Too many args in data line at %s:%d\n" msgstr "óÌÉÛËÏÍ ÍÎÏÇÏ ÁÒÇÕÍÅÎÔÏ× × ÓÔÒÏËÅ ÄÁÎÎÙÈ × %s:%d\n" -#: lib/rpmrc.c:369 +#: lib/rpmrc.c:383 #, c-format msgid "Bad arch/os number: %s (%s:%d)\n" msgstr "îÅ×ÅÒÎÙÊ ÎÏÍÅÒ arch/os: %s (%s:%d)\n" -#: lib/rpmrc.c:406 +#: lib/rpmrc.c:420 #, c-format msgid "Incomplete default line at %s:%d\n" msgstr "îÅÐÏÌÎÁÑ ÓÔÒÏËÁ ÐÏ ÕÍÏÌÞÁÎÉÀ × %s:%d\n" -#: lib/rpmrc.c:411 +#: lib/rpmrc.c:425 #, c-format msgid "Too many args in default line at %s:%d\n" msgstr "óÌÉÛËÏÍ ÍÎÏÇÏ ÁÒÇÕÍÅÎÔÏ× × ÓÔÒÏËÅ ÐÏ ÕÍÏÌÞÁÎÉÀ × %s:%d\n" -#: lib/rpmrc.c:577 +#: lib/rpmrc.c:591 #, c-format msgid "Failed to read %s: %s.\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÅÓÔØ %s: %s.\n" -#: lib/rpmrc.c:615 +#: lib/rpmrc.c:629 #, c-format msgid "missing ':' (found 0x%02x) at %s:%d\n" msgstr "ÏÔÓÕÔÓÔ×ÕÅÔ ':' (ÎÁÊÄÅÎ 0x%02x) × %s:%d\n" -#: lib/rpmrc.c:632 lib/rpmrc.c:706 +#: lib/rpmrc.c:646 lib/rpmrc.c:710 #, c-format msgid "missing argument for %s at %s:%d\n" msgstr "ÏÔÓÕÔÓÔ×ÕÅÔ ÁÒÇÕÍÅÎÔ ÄÌÑ %s × %s:%d\n" -#: lib/rpmrc.c:649 lib/rpmrc.c:671 +#: lib/rpmrc.c:663 #, c-format msgid "%s expansion failed at %s:%d \"%s\"\n" msgstr "ÏÛÉÂËÁ ÒÁÓËÒÙÔÉÑ %s ÎÁ %s:%d \"%s\"\n" -#: lib/rpmrc.c:658 +#: lib/rpmrc.c:672 #, c-format msgid "cannot open %s at %s:%d: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s × %s:%d %s\n" -#: lib/rpmrc.c:698 +#: lib/rpmrc.c:702 #, c-format msgid "missing architecture for %s at %s:%d\n" msgstr "ÏÔÓÕÔÓÔ×ÕÅÔ ÁÒÈÉÔÅËÔÕÒÁ ÄÌÑ %s × %s:%d\n" -#: lib/rpmrc.c:765 +#: lib/rpmrc.c:769 #, c-format msgid "bad option '%s' at %s:%d\n" msgstr "ÎÅ×ÅÒÎÙÊ ÐÁÒÁÍÅÔÒ '%s' × %s:%d\n" -#: lib/rpmrc.c:1564 +#: lib/rpmrc.c:1568 #, c-format msgid "Unknown system: %s\n" msgstr "îÅÉÚ×ÅÓÔÎÁÑ ÓÉÓÔÅÍÁ: %s\n" -#: lib/rpmrc.c:1565 +#: lib/rpmrc.c:1569 #, c-format msgid "Please contact %s\n" msgstr "" -#: lib/rpmrc.c:1802 +#: lib/rpmrc.c:1806 #, c-format msgid "Cannot expand %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÒÁÓËÒÙÔØ %s\n" -#: lib/rpmrc.c:1807 +#: lib/rpmrc.c:1811 #, c-format msgid "Cannot read %s, HOME is too large.\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ %s, ÚÎÁÞÅÎÉÅ HOME ÓÌÉÛËÏÍ ×ÅÌÉËÏ.\n" -#: lib/rpmrc.c:1824 +#: lib/rpmrc.c:1828 #, c-format msgid "Unable to open %s for reading: %s.\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s ÄÌÑ ÞÔÅÎÉÑ: %s.\n" @@ -3429,160 +3429,160 @@ msgstr "ëÏÎÔÒ. ÓÕÍÍÁ MD5 ÐÏ×ÒÅÖÄÅÎÁ: îå ðïääåòöé÷áåôóñ\n" msgid "Signature: UNKNOWN (%d)\n" msgstr "ðÏÄÐÉÓØ: îåéú÷åóôîï (%d)\n" -#: lib/transaction.c:935 +#: lib/transaction.c:930 #, c-format msgid "excluding directory %s\n" msgstr "ÉÓËÌÀÞÁÅÔÓÑ ËÁÔÁÌÏÇ %s\n" -#: lib/transaction.c:1022 +#: lib/transaction.c:1017 msgid "Transaction failed...rolling back\n" msgstr "" -#: lib/transaction.c:1042 +#: lib/transaction.c:1037 msgid "Could not order auto-rollback transaction!\n" msgstr "" -#: lib/transaction.c:1132 +#: lib/transaction.c:1127 msgid "Getting repackaged header from transaction element\n" msgstr "" -#: lib/transaction.c:1157 +#: lib/transaction.c:1152 #, c-format msgid "\tLooking for %s...\n" msgstr "" -#: lib/transaction.c:1161 +#: lib/transaction.c:1156 msgid "\tMatches found.\n" msgstr "" -#: lib/transaction.c:1165 +#: lib/transaction.c:1160 msgid "\tNo matches found.\n" msgstr "" -#: lib/transaction.c:1178 +#: lib/transaction.c:1173 #, fuzzy msgid "\tRepackaged package not found!.\n" msgstr "ÏÂÎÁÒÕÖÅÎ Ä×ÏÉÞÎÙÊ ÐÁËÅÔ ×ÍÅÓÔÏ ÏÖÉÄÁÅÍÏÇÏ ÉÓÈÏÄÎÏÇÏ\n" -#: lib/transaction.c:1199 +#: lib/transaction.c:1194 msgid "\tREMOVETID matched INSTALLTID.\n" msgstr "" -#: lib/transaction.c:1201 +#: lib/transaction.c:1196 #, c-format msgid "\t\tName: %s.\n" msgstr "" -#: lib/transaction.c:1224 +#: lib/transaction.c:1219 #, fuzzy, c-format msgid "\tRepackaged Package was %s...\n" msgstr "ÎÉ ÏÄÉÎ ÐÁËÅÔ ÎÅ ÐÏÄÈÏÄÉÔ Ë %s: %s\n" -#: lib/transaction.c:1268 +#: lib/transaction.c:1263 msgid "Adding install element to auto-rollback transaction.\n" msgstr "" -#: lib/transaction.c:1277 +#: lib/transaction.c:1272 msgid "Could not get install element database instance!\n" msgstr "" -#: lib/transaction.c:1290 +#: lib/transaction.c:1285 msgid "Could not get header for auto-rollback transaction!\n" msgstr "" -#: lib/transaction.c:1300 +#: lib/transaction.c:1295 #, fuzzy, c-format msgid "\tAdded repackaged package header: %s.\n" msgstr "<ÉÓÈÏÄÎÙÊ ÐÁËÅÔ>" -#: lib/transaction.c:1302 lib/transaction.c:1313 +#: lib/transaction.c:1297 lib/transaction.c:1308 #, c-format msgid "\tAdded from install element %s.\n" msgstr "" -#: lib/transaction.c:1311 +#: lib/transaction.c:1306 msgid "\tAdded erase element.\n" msgstr "" -#: lib/transaction.c:1320 +#: lib/transaction.c:1315 msgid "Could not get repackaged header for auto-rollback transaction!\n" msgstr "" -#: lib/transaction.c:1327 +#: lib/transaction.c:1322 msgid "Add erase element to auto-rollback transaction.\n" msgstr "" -#: lib/transaction.c:1335 +#: lib/transaction.c:1330 msgid "\tFound existing upgrade element.\n" msgstr "" -#: lib/transaction.c:1336 +#: lib/transaction.c:1331 #, c-format msgid "\tNot adding erase element for %s.\n" msgstr "" -#: lib/transaction.c:1353 +#: lib/transaction.c:1348 #, fuzzy, c-format msgid "\tAdded repackaged package %s.\n" msgstr "<ÉÓÈÏÄÎÙÊ ÐÁËÅÔ>" -#: lib/transaction.c:1355 +#: lib/transaction.c:1350 #, c-format msgid "\tAdded from erase element %s.\n" msgstr "" -#: lib/transaction.c:1360 +#: lib/transaction.c:1355 msgid "Could not add erase element to auto-rollback transaction.\n" msgstr "" -#: lib/transaction.c:1366 +#: lib/transaction.c:1361 msgid "\tNo repackaged package...nothing to do.\n" msgstr "" -#: lib/transaction.c:1372 +#: lib/transaction.c:1367 #, fuzzy msgid "Failure reading repackaged package!\n" msgstr "ÏÛÉÂËÁ ÞÔÅÎÉÑ ÚÁÇÏÌÏ×ËÁ ÉÚ ÐÁËÅÔÁ\n" -#: lib/transaction.c:1495 +#: lib/transaction.c:1490 #, fuzzy, c-format msgid "sanity checking %d elements\n" msgstr "ÐÒÏ×eÒÑÅÔÓÑ %d ÜÌÅÍÅÎÔÏ×\n" -#: lib/transaction.c:1581 +#: lib/transaction.c:1576 msgid "running pre-transaction scripts\n" msgstr "" -#: lib/transaction.c:1655 +#: lib/transaction.c:1650 #, c-format msgid "computing %d file fingerprints\n" msgstr "ÐÏÄÓÞÉÔÙ×ÁÅÔÓÑ ÏÔÐÅÞÁÔÏË(ËÉ) %d ÆÁÊÌÁ(Ï×)\n" -#: lib/transaction.c:1739 +#: lib/transaction.c:1734 msgid "computing file dispositions\n" msgstr "ÐÏÄÓÞÉÔÙ×ÁÅÔÓÑ ÄÉÓÐÏÚÉÃÉÑ ÆÁÊÌÏ×\n" -#: lib/transaction.c:1932 +#: lib/transaction.c:1927 msgid "Creating auto-rollback transaction\n" msgstr "" -#: lib/transaction.c:2086 +#: lib/transaction.c:2077 msgid "Add failed. Could not read package header.\n" msgstr "" -#: lib/transaction.c:2170 +#: lib/transaction.c:2161 msgid "Add failed in rpmpsmStage().\n" msgstr "" -#: lib/transaction.c:2214 +#: lib/transaction.c:2205 msgid "Add failed. Could not get file list.\n" msgstr "" -#: lib/transaction.c:2263 +#: lib/transaction.c:2254 msgid "Erase failed failed in rpmpsmStage().\n" msgstr "" -#: lib/transaction.c:2324 +#: lib/transaction.c:2315 msgid "running post-transaction scripts\n" msgstr "" @@ -3979,86 +3979,86 @@ msgstr "ÏÔËÒÙ×ÁÅÔÓÑ ÉÎÄÅËÓ ÂÁÚÙ ÄÁÎÎÙÈ %s/%s %s mode=0x%x\n" msgid "======================== active %d empty %d\n" msgstr "====================== ÁËÔÉ×ÎÙÈ %d ÐÕÓÔÙÈ %d\n" -#: rpmio/macro.c:394 +#: rpmio/macro.c:396 #, c-format msgid "%3d>%*s(empty)" msgstr "%3d>%*s(ÐÕÓÔÏ)" -#: rpmio/macro.c:437 +#: rpmio/macro.c:439 #, c-format msgid "%3d<%*s(empty)\n" msgstr "%3d<%*s(ÐÕÓÔÏ)\n" -#: rpmio/macro.c:664 rpmio/macro.c:705 +#: rpmio/macro.c:608 rpmio/macro.c:1090 rpmio/macro.c:1123 rpmio/macro.c:1863 +msgid "Target buffer overflow\n" +msgstr "ðÅÒÅÐÏÌÎÅÎÉÅ ÃÅÌÅ×ÏÇÏ ÂÕÆÅÒÁ\n" + +#: rpmio/macro.c:671 rpmio/macro.c:712 #, c-format msgid "Macro %%%s has unterminated body\n" msgstr "îÅÚÁËÒÙÔÙÊ ÍÁËÒÏÓ %%%s\n" -#: rpmio/macro.c:727 +#: rpmio/macro.c:734 #, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "îÅÄÏÐÕÓÔÉÍÏÅ ÉÍÑ (%%define) ÍÁËÒÏÓÁ %%%s\n" -#: rpmio/macro.c:733 +#: rpmio/macro.c:740 #, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "îÅÚÁËÒÙÔÙÅ ÐÁÒÁÍÅÔÒÙ × ÍÁËÒÏÓÅ %%%s\n" -#: rpmio/macro.c:738 +#: rpmio/macro.c:745 #, c-format msgid "Macro %%%s has empty body\n" msgstr "íÁËÒÏÓ %%%s ÐÕÓÔ\n" -#: rpmio/macro.c:744 +#: rpmio/macro.c:751 #, c-format msgid "Macro %%%s failed to expand\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÒÁÓËÒÙÔØ ÍÁËÒÏÓ %%%s\n" -#: rpmio/macro.c:779 +#: rpmio/macro.c:786 #, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "îÅÄÏÐÕÓÔÉÍÏÅ ÉÍÑ (%%undefine) ÍÁËÒÏÓÁ %%%s\n" -#: rpmio/macro.c:897 +#: rpmio/macro.c:904 #, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "íÁËÒÏÓ %%%s (%s) ÎÅ ÂÙÌ ÉÓÐÏÌØÚÏ×ÁÎ ÎÉÖÅ ÕÒÏ×ÎÑ %d\n" -#: rpmio/macro.c:1024 +#: rpmio/macro.c:1031 #, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "îÅÉÚ×ÅÓÔÎÙÊ ÐÁÒÁÍÅÔÒ %c × %s(%s)\n" -#: rpmio/macro.c:1224 +#: rpmio/macro.c:1239 #, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "çÌÕÂÉÎÁ ÒÅËÕÒÓÉÉ(%d) ÂÏÌØÛÅ ÄÏÐÕÓÔÉÍÏÊ(%d)\n" -#: rpmio/macro.c:1297 rpmio/macro.c:1314 +#: rpmio/macro.c:1312 rpmio/macro.c:1329 #, c-format msgid "Unterminated %c: %s\n" msgstr "îÅÚÁËÒÙÔÁÑ %c: %s\n" -#: rpmio/macro.c:1355 +#: rpmio/macro.c:1370 #, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "ÎÅÐÏÎÑÔÎÙÊ ÍÁËÒÏÓ ÐÏÓÌÅ %%\n" -#: rpmio/macro.c:1512 +#: rpmio/macro.c:1527 #, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "íÁËÒÏÓ %%%.*s ÎÅ ÎÁÊÄÅÎ, ÐÒÏÐÕÓËÁÀ\n" -#: rpmio/macro.c:1848 -msgid "Target buffer overflow\n" -msgstr "ðÅÒÅÐÏÌÎÅÎÉÅ ÃÅÌÅ×ÏÇÏ ÂÕÆÅÒÁ\n" - -#: rpmio/macro.c:2056 rpmio/macro.c:2062 +#: rpmio/macro.c:2076 rpmio/macro.c:2082 #, c-format msgid "File %s: %s\n" msgstr "æÁÊÌ %s: %s\n" -#: rpmio/macro.c:2065 +#: rpmio/macro.c:2085 #, c-format msgid "File %s is smaller than %u bytes\n" msgstr "äÌÉÎÁ ÆÁÊÌÁ %s ÍÅÎØÛÅ ÞÅÍ %u ÂÁÊÔ\n" @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n" -"POT-Creation-Date: 2007-08-21 08:04+0200\n" +"POT-Creation-Date: 2007-08-30 18:37+0200\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" @@ -1298,20 +1298,20 @@ msgstr "neoverova» závislosti balíka" msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "" -#: build/poptBT.c:229 lib/poptALL.c:273 lib/poptI.c:282 lib/poptQV.c:363 -#: lib/poptQV.c:372 lib/poptQV.c:413 +#: build/poptBT.c:229 lib/poptALL.c:273 lib/poptI.c:282 lib/poptQV.c:362 +#: lib/poptQV.c:371 lib/poptQV.c:412 #, fuzzy msgid "don't verify package digest(s)" msgstr "neoverova» závislosti balíka" -#: build/poptBT.c:231 lib/poptALL.c:275 lib/poptI.c:284 lib/poptQV.c:366 -#: lib/poptQV.c:374 lib/poptQV.c:416 +#: build/poptBT.c:231 lib/poptALL.c:275 lib/poptI.c:284 lib/poptQV.c:365 +#: lib/poptQV.c:373 lib/poptQV.c:415 #, fuzzy msgid "don't verify database header(s) when retrieved" msgstr "neoverova» architektúru balíka" -#: build/poptBT.c:233 lib/poptALL.c:281 lib/poptI.c:286 lib/poptQV.c:369 -#: lib/poptQV.c:376 lib/poptQV.c:418 +#: build/poptBT.c:233 lib/poptALL.c:281 lib/poptI.c:286 lib/poptQV.c:368 +#: lib/poptQV.c:375 lib/poptQV.c:417 #, fuzzy msgid "don't verify package signature(s)" msgstr "overi» podpis balíka" @@ -1378,27 +1378,27 @@ msgstr "%s zlyhalo" msgid "failed to write all data to %s\n" msgstr "nepodarilo sa zapísa» v¹etky dáta do %s" -#: build/rpmfc.c:1250 +#: build/rpmfc.c:1249 #, fuzzy, c-format msgid "magic_open(0x%x) failed: %s\n" msgstr "otvorenie %s zlyhalo\n" -#: build/rpmfc.c:1258 +#: build/rpmfc.c:1257 #, fuzzy, c-format -msgid "magic_load(ms, \"%s\") failed: %s\n" +msgid "magic_load failed: %s\n" msgstr "odstránenie %s zlyhalo: %s" -#: build/rpmfc.c:1303 +#: build/rpmfc.c:1301 #, c-format msgid "magic_file(ms, \"%s\") failed: mode %06o %s\n" msgstr "" -#: build/rpmfc.c:1524 +#: build/rpmfc.c:1522 #, fuzzy, c-format msgid "Finding %s: %s\n" msgstr "Zis»ujú sa po¾adované vlastnosti...\n" -#: build/rpmfc.c:1530 build/rpmfc.c:1539 +#: build/rpmfc.c:1528 build/rpmfc.c:1537 #, fuzzy, c-format msgid "Failed to find %s:\n" msgstr "Nepodarilo sa zisti» poskytované vlastnosti" @@ -1523,30 +1523,30 @@ msgstr "" msgid "removing %s \"%s\" from tsort relations.\n" msgstr "odstraòuje sa index skupín\n" -#: lib/depends.c:1265 +#: lib/depends.c:1271 msgid "========== recording tsort relations\n" msgstr "" -#: lib/depends.c:1357 +#: lib/depends.c:1363 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, depth, " "breadth)\n" msgstr "" -#: lib/depends.c:1453 +#: lib/depends.c:1459 #, c-format msgid "========== successors only (%d bytes)\n" msgstr "" -#: lib/depends.c:1526 +#: lib/depends.c:1532 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1561 +#: lib/depends.c:1567 msgid "========== continuing tsort ...\n" msgstr "" -#: lib/depends.c:1566 +#: lib/depends.c:1572 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2107,7 +2107,7 @@ msgstr "aktualizova» databázu bez zmeny súborového systému" msgid "do not verify package dependencies" msgstr "neoverova» závislosti balíka" -#: lib/poptI.c:252 lib/poptQV.c:307 lib/poptQV.c:310 +#: lib/poptI.c:252 lib/poptQV.c:306 lib/poptQV.c:309 #, fuzzy msgid "don't verify MD5 digest of files" msgstr "zobrazi» súbory v balíku" @@ -2229,250 +2229,250 @@ msgstr "nein¹talova», ale oznámi», èi by to bolo mo¾né" msgid "upgrade package(s)" msgstr " --upgrade <súbor_balíka>" -#: lib/poptQV.c:103 +#: lib/poptQV.c:102 #, fuzzy msgid "query/verify all packages" msgstr "opýta» sa na v¹etky balíky" -#: lib/poptQV.c:105 +#: lib/poptQV.c:104 #, fuzzy msgid "rpm checksig mode" msgstr "re¾im otázok" -#: lib/poptQV.c:107 +#: lib/poptQV.c:106 #, fuzzy msgid "query/verify package(s) owning file" msgstr "opýta» sa na balík vlastniaci <súbor>" -#: lib/poptQV.c:109 +#: lib/poptQV.c:108 #, fuzzy msgid "query/verify package(s) in group" msgstr "opýta» sa v¹etkých balíkov v skupine" -#: lib/poptQV.c:111 +#: lib/poptQV.c:110 #, fuzzy msgid "query/verify a package file" msgstr "opýta» sa na v¹etky balíky" -#: lib/poptQV.c:114 +#: lib/poptQV.c:113 #, fuzzy msgid "query/verify package(s) from TOP file tree walk" msgstr "opýta» sa v¹etkých balíkov v skupine" -#: lib/poptQV.c:116 +#: lib/poptQV.c:115 #, fuzzy msgid "query/verify package(s) from system HDLIST" msgstr "opýta» sa v¹etkých balíkov v skupine" -#: lib/poptQV.c:119 +#: lib/poptQV.c:118 #, fuzzy msgid "query/verify package(s) with package identifier" msgstr "opýta» sa balíku vlastniaceho súbor" -#: lib/poptQV.c:121 +#: lib/poptQV.c:120 #, fuzzy msgid "query/verify package(s) with header identifier" msgstr "opýta» sa balíku vlastniaceho súbor" -#: lib/poptQV.c:123 +#: lib/poptQV.c:122 #, fuzzy msgid "query/verify package(s) with file identifier" msgstr "opýta» sa balíku vlastniaceho súbor" -#: lib/poptQV.c:126 +#: lib/poptQV.c:125 #, fuzzy msgid "rpm query mode" msgstr "re¾im otázok" -#: lib/poptQV.c:128 +#: lib/poptQV.c:127 #, fuzzy msgid "query/verify a header instance" msgstr "opýta» sa balíku vlastniaceho súbor" -#: lib/poptQV.c:130 +#: lib/poptQV.c:129 msgid "query a spec file" msgstr "opýta» sa spec súboru" -#: lib/poptQV.c:130 +#: lib/poptQV.c:129 msgid "<spec>" msgstr "" -#: lib/poptQV.c:132 +#: lib/poptQV.c:131 #, fuzzy msgid "query/verify package(s) from install transaction" msgstr "opýta» sa v¹etkých balíkov v skupine" -#: lib/poptQV.c:134 +#: lib/poptQV.c:133 #, fuzzy msgid "query the package(s) triggered by the package" msgstr "opýta» sa balíkov spustených balíkom" -#: lib/poptQV.c:136 +#: lib/poptQV.c:135 #, fuzzy msgid "rpm verify mode" msgstr "re¾im otázok" -#: lib/poptQV.c:138 +#: lib/poptQV.c:137 #, fuzzy msgid "query/verify the package(s) which require a dependency" msgstr "opýta» sa na balíky vy¾adujúce schopnos» <schopnos»>" -#: lib/poptQV.c:140 +#: lib/poptQV.c:139 #, fuzzy msgid "query/verify the package(s) which provide a dependency" msgstr "opýta» sa na balíky poskytujúce schopnos» <schopnos»>" -#: lib/poptQV.c:143 +#: lib/poptQV.c:142 msgid "create transaction set" msgstr "" -#: lib/poptQV.c:145 +#: lib/poptQV.c:144 msgid "do not order transaction set" msgstr "" -#: lib/poptQV.c:147 +#: lib/poptQV.c:146 #, fuzzy msgid "do not glob arguments" msgstr "neboli zadané ¾iadne argumenty pre otázku" -#: lib/poptQV.c:149 +#: lib/poptQV.c:148 msgid "do not process non-package files as manifests" msgstr "" -#: lib/poptQV.c:151 +#: lib/poptQV.c:150 #, fuzzy msgid "do not read headers" msgstr "nie je mo¾né preèíta» hlavièku na %d pre vyhµadanie" -#: lib/poptQV.c:258 +#: lib/poptQV.c:257 msgid "list all configuration files" msgstr "zobrazi» v¹etky konfiguraèné súbory" -#: lib/poptQV.c:260 +#: lib/poptQV.c:259 #, fuzzy msgid "list all documentation files" msgstr "zobrazi» v¹etky dokumentaèné súbory" -#: lib/poptQV.c:262 +#: lib/poptQV.c:261 msgid "dump basic file information" msgstr "zobrazi» základné informácie o balíku" -#: lib/poptQV.c:266 +#: lib/poptQV.c:265 msgid "list files in package" msgstr "zobrazi» súbory v balíku" -#: lib/poptQV.c:271 +#: lib/poptQV.c:270 #, c-format msgid "skip %%ghost files" msgstr "" -#: lib/poptQV.c:275 +#: lib/poptQV.c:274 #, c-format msgid "skip %%license files" msgstr "" -#: lib/poptQV.c:278 +#: lib/poptQV.c:277 #, fuzzy, c-format msgid "skip %%readme files" msgstr "%s: readLead zlyhalo\n" -#: lib/poptQV.c:284 +#: lib/poptQV.c:283 msgid "use the following query format" msgstr "pou¾i» nasledovný formát otázky" -#: lib/poptQV.c:286 +#: lib/poptQV.c:285 #, fuzzy msgid "substitute i18n sections into spec file" msgstr "zdrojový balík neobsahuje ¾iadny .spec súbor" -#: lib/poptQV.c:288 +#: lib/poptQV.c:287 msgid "display the states of the listed files" msgstr "zobrazii» stav daných súborov" -#: lib/poptQV.c:314 +#: lib/poptQV.c:313 #, fuzzy msgid "don't verify size of files" msgstr "zobrazi» súbory v balíku" -#: lib/poptQV.c:317 +#: lib/poptQV.c:316 #, fuzzy msgid "don't verify symlink path of files" msgstr "zobrazi» súbory v balíku" -#: lib/poptQV.c:320 +#: lib/poptQV.c:319 #, fuzzy msgid "don't verify owner of files" msgstr "zobrazi» súbory v balíku" -#: lib/poptQV.c:323 +#: lib/poptQV.c:322 #, fuzzy msgid "don't verify group of files" msgstr "zobrazi» súbory v balíku" -#: lib/poptQV.c:326 +#: lib/poptQV.c:325 msgid "don't verify modification time of files" msgstr "" -#: lib/poptQV.c:329 lib/poptQV.c:332 +#: lib/poptQV.c:328 lib/poptQV.c:331 #, fuzzy msgid "don't verify mode of files" msgstr "zobrazi» súbory v balíku" -#: lib/poptQV.c:335 +#: lib/poptQV.c:334 #, fuzzy msgid "don't verify file security contexts" msgstr "zobrazi» súbory v balíku" -#: lib/poptQV.c:337 +#: lib/poptQV.c:336 #, fuzzy msgid "don't verify files in package" msgstr "zobrazi» súbory v balíku" -#: lib/poptQV.c:340 lib/poptQV.c:343 tools/rpmgraph.c:266 +#: lib/poptQV.c:339 lib/poptQV.c:342 tools/rpmgraph.c:266 #, fuzzy msgid "don't verify package dependencies" msgstr "neoverova» závislosti balíka" -#: lib/poptQV.c:348 lib/poptQV.c:352 lib/poptQV.c:355 lib/poptQV.c:358 +#: lib/poptQV.c:347 lib/poptQV.c:351 lib/poptQV.c:354 lib/poptQV.c:357 #, fuzzy msgid "don't execute verify script(s)" msgstr "nevykona» ¾iadne etapy" -#: lib/poptQV.c:382 +#: lib/poptQV.c:381 #, fuzzy msgid "don't verify GPG V3 DSA signature(s)" msgstr "zobrazi» súbory v balíku" -#: lib/poptQV.c:385 +#: lib/poptQV.c:384 #, fuzzy msgid "don't verify PGP V3 RSA/MD5 signature(s)" msgstr "zobrazi» súbory v balíku" -#: lib/poptQV.c:400 +#: lib/poptQV.c:399 #, fuzzy msgid "sign package(s) (identical to --resign)" msgstr "podpísa» balík (znièi» aktuálny podpis)" -#: lib/poptQV.c:402 +#: lib/poptQV.c:401 #, fuzzy msgid "verify package signature(s)" msgstr "overi» podpis balíka" -#: lib/poptQV.c:404 +#: lib/poptQV.c:403 #, fuzzy msgid "delete package signatures" msgstr "overi» podpis balíka" -#: lib/poptQV.c:406 +#: lib/poptQV.c:405 msgid "import an armored public key" msgstr "" -#: lib/poptQV.c:408 +#: lib/poptQV.c:407 #, fuzzy msgid "sign package(s) (identical to --addsign)" msgstr "podpísa» balík (znièi» aktuálny podpis)" -#: lib/poptQV.c:410 +#: lib/poptQV.c:409 #, fuzzy msgid "generate signature" msgstr "vytvori» PGP/GPG podpis" @@ -2818,38 +2818,38 @@ msgstr "po¾iadavka balíka %s nie je uspokojená: %s\n" msgid "%s skipped due to missingok flag\n" msgstr "%s vynechané kvôli príznaku missingok\n" -#: lib/rpmfi.c:846 +#: lib/rpmfi.c:850 msgid "========== relocations\n" msgstr "" -#: lib/rpmfi.c:850 +#: lib/rpmfi.c:854 #, fuzzy, c-format msgid "%5d exclude %s\n" msgstr "OS je vynechaný: %s" -#: lib/rpmfi.c:853 +#: lib/rpmfi.c:857 #, fuzzy, c-format msgid "%5d relocate %s -> %s\n" msgstr "presúva sa %s do %s\n" -#: lib/rpmfi.c:987 +#: lib/rpmfi.c:991 #, fuzzy, c-format msgid "excluding %s %s\n" msgstr "vynecháva sa %s\n" -#: lib/rpmfi.c:997 +#: lib/rpmfi.c:1001 #, c-format msgid "relocating %s to %s\n" msgstr "presúva sa %s do %s\n" -#: lib/rpmfi.c:1089 +#: lib/rpmfi.c:1093 #, fuzzy, c-format msgid "relocating directory %s to %s\n" msgstr "presúva sa %s do %s\n" #: lib/rpmgi.c:81 lib/rpminstall.c:124 lib/rpminstall.c:480 -#: lib/rpminstall.c:615 lib/rpminstall.c:1041 lib/rpmts.c:643 -#: tools/rpmgraph.c:121 tools/rpmgraph.c:158 +#: lib/rpminstall.c:615 lib/rpmts.c:643 tools/rpmgraph.c:121 +#: tools/rpmgraph.c:158 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "otvorenie %s zlyhalo\n" @@ -2860,7 +2860,7 @@ msgid "unknown tag: \"%s\"\n" msgstr "neznámy tag" #: lib/rpmgi.c:628 lib/rpminstall.c:659 lib/rpminstall.c:834 -#: lib/rpminstall.c:1267 lib/transaction.c:1031 tools/rpmgraph.c:196 +#: lib/rpminstall.c:1084 lib/transaction.c:1026 tools/rpmgraph.c:196 #, fuzzy msgid "Failed dependencies:\n" msgstr "nevyrie¹ené závislosti:\n" @@ -2980,16 +2980,16 @@ msgstr "nie je mo¾né otvori» %s\n" msgid "Installing %s\n" msgstr "In¹taluje sa %s\n" -#: lib/rpminstall.c:1261 lib/transaction.c:1024 +#: lib/rpminstall.c:1078 lib/transaction.c:1019 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" -#: lib/rpminstall.c:1292 lib/transaction.c:1075 +#: lib/rpminstall.c:1109 lib/transaction.c:1070 msgid "Cleaning up repackaged packages:\n" msgstr "" -#: lib/rpminstall.c:1299 lib/transaction.c:1081 +#: lib/rpminstall.c:1116 lib/transaction.c:1076 #, fuzzy, c-format msgid "\tRemoving %s:\n" msgstr "Prená¹a sa %s\n" @@ -3124,97 +3124,97 @@ msgstr " koliduje s %s-%s-%s\n" msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/rpmrc.c:199 +#: lib/rpmrc.c:213 #, fuzzy, c-format msgid "missing second ':' at %s:%d\n" msgstr "chýbajúce druhé ':' na %s:%d" -#: lib/rpmrc.c:202 +#: lib/rpmrc.c:216 #, fuzzy, c-format msgid "missing architecture name at %s:%d\n" msgstr "chýba názov architektúry na %s:%d" -#: lib/rpmrc.c:356 +#: lib/rpmrc.c:370 #, fuzzy, c-format msgid "Incomplete data line at %s:%d\n" msgstr "Neúplný riadok údajov na %s:%d" -#: lib/rpmrc.c:361 +#: lib/rpmrc.c:375 #, fuzzy, c-format msgid "Too many args in data line at %s:%d\n" msgstr "Priveµa argumentov v riadku údajov na %s:%d" -#: lib/rpmrc.c:369 +#: lib/rpmrc.c:383 #, fuzzy, c-format msgid "Bad arch/os number: %s (%s:%d)\n" msgstr "Chybné èíslo arch/os: %s (%s:%d)" -#: lib/rpmrc.c:406 +#: lib/rpmrc.c:420 #, fuzzy, c-format msgid "Incomplete default line at %s:%d\n" msgstr "Neúplný implicitný riadok na %s:%d" -#: lib/rpmrc.c:411 +#: lib/rpmrc.c:425 #, fuzzy, c-format msgid "Too many args in default line at %s:%d\n" msgstr "Priveµa argumentov v implicitnom riadku na %s:%d" -#: lib/rpmrc.c:577 +#: lib/rpmrc.c:591 #, fuzzy, c-format msgid "Failed to read %s: %s.\n" msgstr "Nie je mo¾né preèíta» %s: %s." -#: lib/rpmrc.c:615 +#: lib/rpmrc.c:629 #, fuzzy, c-format msgid "missing ':' (found 0x%02x) at %s:%d\n" msgstr "chýbajúca ':' na %s:%d" -#: lib/rpmrc.c:632 lib/rpmrc.c:706 +#: lib/rpmrc.c:646 lib/rpmrc.c:710 #, fuzzy, c-format msgid "missing argument for %s at %s:%d\n" msgstr "chýbajúci argument pre %s na %s:%d" -#: lib/rpmrc.c:649 lib/rpmrc.c:671 +#: lib/rpmrc.c:663 #, fuzzy, c-format msgid "%s expansion failed at %s:%d \"%s\"\n" msgstr "expanzia %s zlyhala na %s:%d \"%s\"" -#: lib/rpmrc.c:658 +#: lib/rpmrc.c:672 #, fuzzy, c-format msgid "cannot open %s at %s:%d: %s\n" msgstr "nie je mo¾né otvori» %s na %s:%d" -#: lib/rpmrc.c:698 +#: lib/rpmrc.c:702 #, fuzzy, c-format msgid "missing architecture for %s at %s:%d\n" msgstr "chýbajúca architektúra pre %s na %s:%d" -#: lib/rpmrc.c:765 +#: lib/rpmrc.c:769 #, fuzzy, c-format msgid "bad option '%s' at %s:%d\n" msgstr "chybná voµba '%s' na %s:%d" -#: lib/rpmrc.c:1564 +#: lib/rpmrc.c:1568 #, c-format msgid "Unknown system: %s\n" msgstr "Neznámy systém: %s\n" -#: lib/rpmrc.c:1565 +#: lib/rpmrc.c:1569 #, c-format msgid "Please contact %s\n" msgstr "" -#: lib/rpmrc.c:1802 +#: lib/rpmrc.c:1806 #, fuzzy, c-format msgid "Cannot expand %s\n" msgstr "Nie je mo¾né expandova» %s" -#: lib/rpmrc.c:1807 +#: lib/rpmrc.c:1811 #, c-format msgid "Cannot read %s, HOME is too large.\n" msgstr "" -#: lib/rpmrc.c:1824 +#: lib/rpmrc.c:1828 #, fuzzy, c-format msgid "Unable to open %s for reading: %s.\n" msgstr "Nie je mo¾né otvori» %s pre èítanie: %s." @@ -3510,161 +3510,161 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Doplnenie podpisu: %d\n" -#: lib/transaction.c:935 +#: lib/transaction.c:930 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "vytvára sa adresár %s\n" -#: lib/transaction.c:1022 +#: lib/transaction.c:1017 msgid "Transaction failed...rolling back\n" msgstr "" -#: lib/transaction.c:1042 +#: lib/transaction.c:1037 msgid "Could not order auto-rollback transaction!\n" msgstr "" -#: lib/transaction.c:1132 +#: lib/transaction.c:1127 msgid "Getting repackaged header from transaction element\n" msgstr "" -#: lib/transaction.c:1157 +#: lib/transaction.c:1152 #, c-format msgid "\tLooking for %s...\n" msgstr "" -#: lib/transaction.c:1161 +#: lib/transaction.c:1156 msgid "\tMatches found.\n" msgstr "" -#: lib/transaction.c:1165 +#: lib/transaction.c:1160 msgid "\tNo matches found.\n" msgstr "" -#: lib/transaction.c:1178 +#: lib/transaction.c:1173 #, fuzzy msgid "\tRepackaged package not found!.\n" msgstr "balík nemá skupinu\n" -#: lib/transaction.c:1199 +#: lib/transaction.c:1194 msgid "\tREMOVETID matched INSTALLTID.\n" msgstr "" -#: lib/transaction.c:1201 +#: lib/transaction.c:1196 #, c-format msgid "\t\tName: %s.\n" msgstr "" -#: lib/transaction.c:1224 +#: lib/transaction.c:1219 #, fuzzy, c-format msgid "\tRepackaged Package was %s...\n" msgstr "¾iadny z balíkov nespú¹»a %s\n" -#: lib/transaction.c:1268 +#: lib/transaction.c:1263 msgid "Adding install element to auto-rollback transaction.\n" msgstr "" -#: lib/transaction.c:1277 +#: lib/transaction.c:1272 msgid "Could not get install element database instance!\n" msgstr "" -#: lib/transaction.c:1290 +#: lib/transaction.c:1285 msgid "Could not get header for auto-rollback transaction!\n" msgstr "" -#: lib/transaction.c:1300 +#: lib/transaction.c:1295 #, fuzzy, c-format msgid "\tAdded repackaged package header: %s.\n" msgstr "nájdených %d balíkov\n" -#: lib/transaction.c:1302 lib/transaction.c:1313 +#: lib/transaction.c:1297 lib/transaction.c:1308 #, c-format msgid "\tAdded from install element %s.\n" msgstr "" -#: lib/transaction.c:1311 +#: lib/transaction.c:1306 msgid "\tAdded erase element.\n" msgstr "" -#: lib/transaction.c:1320 +#: lib/transaction.c:1315 msgid "Could not get repackaged header for auto-rollback transaction!\n" msgstr "" -#: lib/transaction.c:1327 +#: lib/transaction.c:1322 msgid "Add erase element to auto-rollback transaction.\n" msgstr "" -#: lib/transaction.c:1335 +#: lib/transaction.c:1330 msgid "\tFound existing upgrade element.\n" msgstr "" -#: lib/transaction.c:1336 +#: lib/transaction.c:1331 #, c-format msgid "\tNot adding erase element for %s.\n" msgstr "" -#: lib/transaction.c:1353 +#: lib/transaction.c:1348 #, fuzzy, c-format msgid "\tAdded repackaged package %s.\n" msgstr "nájdených %d balíkov\n" -#: lib/transaction.c:1355 +#: lib/transaction.c:1350 #, c-format msgid "\tAdded from erase element %s.\n" msgstr "" -#: lib/transaction.c:1360 +#: lib/transaction.c:1355 msgid "Could not add erase element to auto-rollback transaction.\n" msgstr "" -#: lib/transaction.c:1366 +#: lib/transaction.c:1361 msgid "\tNo repackaged package...nothing to do.\n" msgstr "" -#: lib/transaction.c:1372 +#: lib/transaction.c:1367 #, fuzzy msgid "Failure reading repackaged package!\n" msgstr "chyba pri èítaní hlavièky balíka\n" -#: lib/transaction.c:1495 +#: lib/transaction.c:1490 #, c-format msgid "sanity checking %d elements\n" msgstr "" -#: lib/transaction.c:1581 +#: lib/transaction.c:1576 #, fuzzy msgid "running pre-transaction scripts\n" msgstr "vykonávajú sa predin¹talaèné skripty (ak existujú)\n" -#: lib/transaction.c:1655 +#: lib/transaction.c:1650 #, c-format msgid "computing %d file fingerprints\n" msgstr "" -#: lib/transaction.c:1739 +#: lib/transaction.c:1734 msgid "computing file dispositions\n" msgstr "" -#: lib/transaction.c:1932 +#: lib/transaction.c:1927 msgid "Creating auto-rollback transaction\n" msgstr "" -#: lib/transaction.c:2086 +#: lib/transaction.c:2077 msgid "Add failed. Could not read package header.\n" msgstr "" -#: lib/transaction.c:2170 +#: lib/transaction.c:2161 msgid "Add failed in rpmpsmStage().\n" msgstr "" -#: lib/transaction.c:2214 +#: lib/transaction.c:2205 msgid "Add failed. Could not get file list.\n" msgstr "" -#: lib/transaction.c:2263 +#: lib/transaction.c:2254 msgid "Erase failed failed in rpmpsmStage().\n" msgstr "" -#: lib/transaction.c:2324 +#: lib/transaction.c:2315 #, fuzzy msgid "running post-transaction scripts\n" msgstr "vykonávajú sa postdein¹talaèné skripty (ak existujú)\n" @@ -4059,87 +4059,87 @@ msgstr "otvára sa databáza s právami 0x%x v %s\n" msgid "======================== active %d empty %d\n" msgstr "======================== aktívnych %d prázdnych %d\n" -#: rpmio/macro.c:394 +#: rpmio/macro.c:396 #, c-format msgid "%3d>%*s(empty)" msgstr "%3d>%*s(prázdne)" -#: rpmio/macro.c:437 +#: rpmio/macro.c:439 #, c-format msgid "%3d<%*s(empty)\n" msgstr "%3d<%*s(prázdne)\n" -#: rpmio/macro.c:664 rpmio/macro.c:705 +#: rpmio/macro.c:608 rpmio/macro.c:1090 rpmio/macro.c:1123 rpmio/macro.c:1863 +#, fuzzy +msgid "Target buffer overflow\n" +msgstr "Preplnenie cieµovej vyrovnávacej pamäti" + +#: rpmio/macro.c:671 rpmio/macro.c:712 #, fuzzy, c-format msgid "Macro %%%s has unterminated body\n" msgstr "Makro %%%s obsahuje neukonèené telo" -#: rpmio/macro.c:727 +#: rpmio/macro.c:734 #, fuzzy, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "Makro %%%s obsahuje chybný názov (%%define)" -#: rpmio/macro.c:733 +#: rpmio/macro.c:740 #, fuzzy, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "Makro %%%s obsahuje neukonèené voµby" -#: rpmio/macro.c:738 +#: rpmio/macro.c:745 #, fuzzy, c-format msgid "Macro %%%s has empty body\n" msgstr "Makro %%%s obsahuje prázdne telo" -#: rpmio/macro.c:744 +#: rpmio/macro.c:751 #, fuzzy, c-format msgid "Macro %%%s failed to expand\n" msgstr "Makro %%%s sa nepodarilo expandova»" -#: rpmio/macro.c:779 +#: rpmio/macro.c:786 #, fuzzy, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "Makro %%%s obsahuje chybný názov (%%undefine)" -#: rpmio/macro.c:897 +#: rpmio/macro.c:904 #, fuzzy, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "Makro %%%s (%s) nebolo pou¾ité pod úrovòou %d " -#: rpmio/macro.c:1024 +#: rpmio/macro.c:1031 #, fuzzy, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "Neznáma voµba %c v %s(%s)" -#: rpmio/macro.c:1224 +#: rpmio/macro.c:1239 #, fuzzy, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "Håbka rekurzie (%d) väè¹ia ako maximálna (%d)" -#: rpmio/macro.c:1297 rpmio/macro.c:1314 +#: rpmio/macro.c:1312 rpmio/macro.c:1329 #, fuzzy, c-format msgid "Unterminated %c: %s\n" msgstr "Neukonèené %c: %s" -#: rpmio/macro.c:1355 +#: rpmio/macro.c:1370 #, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "" -#: rpmio/macro.c:1512 +#: rpmio/macro.c:1527 #, fuzzy, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "balík %%%.*s nebol nájdený, vynecháva sa" -#: rpmio/macro.c:1848 -#, fuzzy -msgid "Target buffer overflow\n" -msgstr "Preplnenie cieµovej vyrovnávacej pamäti" - -#: rpmio/macro.c:2056 rpmio/macro.c:2062 +#: rpmio/macro.c:2076 rpmio/macro.c:2082 #, fuzzy, c-format msgid "File %s: %s\n" msgstr "Súbor %s: %s" -#: rpmio/macro.c:2065 +#: rpmio/macro.c:2085 #, fuzzy, c-format msgid "File %s is smaller than %u bytes\n" msgstr "Súbor %s je men¹í ako %d bajtov" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n" -"POT-Creation-Date: 2007-08-21 08:04+0200\n" +"POT-Creation-Date: 2007-08-30 18:37+0200\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" @@ -1302,20 +1302,20 @@ msgstr "brez preverjanja soodvisnosti paketa" msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "" -#: build/poptBT.c:229 lib/poptALL.c:273 lib/poptI.c:282 lib/poptQV.c:363 -#: lib/poptQV.c:372 lib/poptQV.c:413 +#: build/poptBT.c:229 lib/poptALL.c:273 lib/poptI.c:282 lib/poptQV.c:362 +#: lib/poptQV.c:371 lib/poptQV.c:412 #, fuzzy msgid "don't verify package digest(s)" msgstr "brez preverjanja soodvisnosti paketa" -#: build/poptBT.c:231 lib/poptALL.c:275 lib/poptI.c:284 lib/poptQV.c:366 -#: lib/poptQV.c:374 lib/poptQV.c:416 +#: build/poptBT.c:231 lib/poptALL.c:275 lib/poptI.c:284 lib/poptQV.c:365 +#: lib/poptQV.c:373 lib/poptQV.c:415 #, fuzzy msgid "don't verify database header(s) when retrieved" msgstr "brez preverjanja arhitekture paketa" -#: build/poptBT.c:233 lib/poptALL.c:281 lib/poptI.c:286 lib/poptQV.c:369 -#: lib/poptQV.c:376 lib/poptQV.c:418 +#: build/poptBT.c:233 lib/poptALL.c:281 lib/poptI.c:286 lib/poptQV.c:368 +#: lib/poptQV.c:375 lib/poptQV.c:417 #, fuzzy msgid "don't verify package signature(s)" msgstr "preveri podpis paketa(-ov)" @@ -1380,27 +1380,27 @@ msgstr "%s neuspe¹en" msgid "failed to write all data to %s\n" msgstr "pisanje podatkov v %s je bilo neuspe¹no" -#: build/rpmfc.c:1250 +#: build/rpmfc.c:1249 #, fuzzy, c-format msgid "magic_open(0x%x) failed: %s\n" msgstr "odpiranje %s je bilo neuspe¹no: %s\n" -#: build/rpmfc.c:1258 +#: build/rpmfc.c:1257 #, fuzzy, c-format -msgid "magic_load(ms, \"%s\") failed: %s\n" +msgid "magic_load failed: %s\n" msgstr "odstranitev %s je bila neuspe¹na: %s" -#: build/rpmfc.c:1303 +#: build/rpmfc.c:1301 #, c-format msgid "magic_file(ms, \"%s\") failed: mode %06o %s\n" msgstr "" -#: build/rpmfc.c:1524 +#: build/rpmfc.c:1522 #, fuzzy, c-format msgid "Finding %s: %s\n" msgstr "Iskanje %s: (z uporabo %s)...\n" -#: build/rpmfc.c:1530 build/rpmfc.c:1539 +#: build/rpmfc.c:1528 build/rpmfc.c:1537 #, fuzzy, c-format msgid "Failed to find %s:\n" msgstr "Neuspe¹no iskanje %s:" @@ -1526,30 +1526,30 @@ msgstr "" msgid "removing %s \"%s\" from tsort relations.\n" msgstr "odstranjujemo seznam skupin\n" -#: lib/depends.c:1265 +#: lib/depends.c:1271 msgid "========== recording tsort relations\n" msgstr "" -#: lib/depends.c:1357 +#: lib/depends.c:1363 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, depth, " "breadth)\n" msgstr "" -#: lib/depends.c:1453 +#: lib/depends.c:1459 #, c-format msgid "========== successors only (%d bytes)\n" msgstr "" -#: lib/depends.c:1526 +#: lib/depends.c:1532 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1561 +#: lib/depends.c:1567 msgid "========== continuing tsort ...\n" msgstr "" -#: lib/depends.c:1566 +#: lib/depends.c:1572 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2109,7 +2109,7 @@ msgstr "obnovi podatkovno zbirko, a ne spreminjaj datoteènega sistema" msgid "do not verify package dependencies" msgstr "brez preverjanja soodvisnosti paketa" -#: lib/poptI.c:252 lib/poptQV.c:307 lib/poptQV.c:310 +#: lib/poptI.c:252 lib/poptQV.c:306 lib/poptQV.c:309 #, fuzzy msgid "don't verify MD5 digest of files" msgstr "brez preverjanja datotek v paketu" @@ -2232,248 +2232,248 @@ msgstr "ne namesti, a ugotovi, èe bi delovalo" msgid "upgrade package(s)" msgstr " --upgrade <paket> " -#: lib/poptQV.c:103 +#: lib/poptQV.c:102 #, fuzzy msgid "query/verify all packages" msgstr "poizvedba/preverba po vseh paketih" -#: lib/poptQV.c:105 +#: lib/poptQV.c:104 #, fuzzy msgid "rpm checksig mode" msgstr "poizvedbeni naèin" -#: lib/poptQV.c:107 +#: lib/poptQV.c:106 #, fuzzy msgid "query/verify package(s) owning file" msgstr "poizvedba po paketu, ki vsebuje <datoteko>" -#: lib/poptQV.c:109 +#: lib/poptQV.c:108 #, fuzzy msgid "query/verify package(s) in group" msgstr "poizvedba po paketu v skupini" -#: lib/poptQV.c:111 +#: lib/poptQV.c:110 #, fuzzy msgid "query/verify a package file" msgstr "poizvedba/preverba po vseh paketih" -#: lib/poptQV.c:114 +#: lib/poptQV.c:113 #, fuzzy msgid "query/verify package(s) from TOP file tree walk" msgstr "poizvedba po paketu v skupini" -#: lib/poptQV.c:116 +#: lib/poptQV.c:115 #, fuzzy msgid "query/verify package(s) from system HDLIST" msgstr "poizvedba po paketu v skupini" -#: lib/poptQV.c:119 +#: lib/poptQV.c:118 #, fuzzy msgid "query/verify package(s) with package identifier" msgstr "poizvedba po paketu, ki vsebuje datoteko" -#: lib/poptQV.c:121 +#: lib/poptQV.c:120 #, fuzzy msgid "query/verify package(s) with header identifier" msgstr "poizvedba po paketu, ki vsebuje datoteko" -#: lib/poptQV.c:123 +#: lib/poptQV.c:122 #, fuzzy msgid "query/verify package(s) with file identifier" msgstr "poizvedba po paketu, ki vsebuje datoteko" -#: lib/poptQV.c:126 +#: lib/poptQV.c:125 #, fuzzy msgid "rpm query mode" msgstr "poizvedbeni naèin" -#: lib/poptQV.c:128 +#: lib/poptQV.c:127 #, fuzzy msgid "query/verify a header instance" msgstr "poizvedba po paketu, ki vsebuje datoteko" -#: lib/poptQV.c:130 +#: lib/poptQV.c:129 msgid "query a spec file" msgstr "poizvedba po datoteki spec" -#: lib/poptQV.c:130 +#: lib/poptQV.c:129 msgid "<spec>" msgstr "" -#: lib/poptQV.c:132 +#: lib/poptQV.c:131 #, fuzzy msgid "query/verify package(s) from install transaction" msgstr "poizvedba po paketu v skupini" -#: lib/poptQV.c:134 +#: lib/poptQV.c:133 #, fuzzy msgid "query the package(s) triggered by the package" msgstr "poizvedba po paketih, ki jih spro¾i paket" -#: lib/poptQV.c:136 +#: lib/poptQV.c:135 #, fuzzy msgid "rpm verify mode" msgstr "poizvedbeni naèin" -#: lib/poptQV.c:138 +#: lib/poptQV.c:137 #, fuzzy msgid "query/verify the package(s) which require a dependency" msgstr "poizvedba po paketih, ki potrebujejo dano zmo¾nost <mo¾>" -#: lib/poptQV.c:140 +#: lib/poptQV.c:139 #, fuzzy msgid "query/verify the package(s) which provide a dependency" msgstr "poizvedba po paketih, ki ponujajo dano zmo¾nost <mo¾>" -#: lib/poptQV.c:143 +#: lib/poptQV.c:142 msgid "create transaction set" msgstr "" -#: lib/poptQV.c:145 +#: lib/poptQV.c:144 msgid "do not order transaction set" msgstr "" -#: lib/poptQV.c:147 +#: lib/poptQV.c:146 #, fuzzy msgid "do not glob arguments" msgstr "argumenti za poizvedbo niso podani" -#: lib/poptQV.c:149 +#: lib/poptQV.c:148 msgid "do not process non-package files as manifests" msgstr "" -#: lib/poptQV.c:151 +#: lib/poptQV.c:150 #, fuzzy msgid "do not read headers" msgstr "%s: ni mo¾no prebrati glave pri 0x%x" -#: lib/poptQV.c:258 +#: lib/poptQV.c:257 msgid "list all configuration files" msgstr "izpis vseh nastavitvene datoteke" -#: lib/poptQV.c:260 +#: lib/poptQV.c:259 msgid "list all documentation files" msgstr "izpis vseh dokumentacijske datoteke" -#: lib/poptQV.c:262 +#: lib/poptQV.c:261 msgid "dump basic file information" msgstr "iznos osnovnih podatkov o datoteki" -#: lib/poptQV.c:266 +#: lib/poptQV.c:265 msgid "list files in package" msgstr "izpis seznama datotek v paketu" -#: lib/poptQV.c:271 +#: lib/poptQV.c:270 #, c-format msgid "skip %%ghost files" msgstr "" -#: lib/poptQV.c:275 +#: lib/poptQV.c:274 #, c-format msgid "skip %%license files" msgstr "" -#: lib/poptQV.c:278 +#: lib/poptQV.c:277 #, fuzzy, c-format msgid "skip %%readme files" msgstr "%s: readLead je bil neuspe¹en\n" -#: lib/poptQV.c:284 +#: lib/poptQV.c:283 msgid "use the following query format" msgstr "uporabi naslednjo obliko poizvedbe" -#: lib/poptQV.c:286 +#: lib/poptQV.c:285 #, fuzzy msgid "substitute i18n sections into spec file" msgstr "zamenjava razdeljkov I18N z naslednjim katalogom" -#: lib/poptQV.c:288 +#: lib/poptQV.c:287 msgid "display the states of the listed files" msgstr "izpis stanja seznama datotek" -#: lib/poptQV.c:314 +#: lib/poptQV.c:313 #, fuzzy msgid "don't verify size of files" msgstr "brez preverjanja datotek v paketu" -#: lib/poptQV.c:317 +#: lib/poptQV.c:316 #, fuzzy msgid "don't verify symlink path of files" msgstr "brez preverjanja datotek v paketu" -#: lib/poptQV.c:320 +#: lib/poptQV.c:319 #, fuzzy msgid "don't verify owner of files" msgstr "brez preverjanja datotek v paketu" -#: lib/poptQV.c:323 +#: lib/poptQV.c:322 #, fuzzy msgid "don't verify group of files" msgstr "brez preverjanja datotek v paketu" -#: lib/poptQV.c:326 +#: lib/poptQV.c:325 msgid "don't verify modification time of files" msgstr "" -#: lib/poptQV.c:329 lib/poptQV.c:332 +#: lib/poptQV.c:328 lib/poptQV.c:331 #, fuzzy msgid "don't verify mode of files" msgstr "brez preverjanja datotek v paketu" -#: lib/poptQV.c:335 +#: lib/poptQV.c:334 #, fuzzy msgid "don't verify file security contexts" msgstr "brez preverjanja datotek v paketu" -#: lib/poptQV.c:337 +#: lib/poptQV.c:336 msgid "don't verify files in package" msgstr "brez preverjanja datotek v paketu" -#: lib/poptQV.c:340 lib/poptQV.c:343 tools/rpmgraph.c:266 +#: lib/poptQV.c:339 lib/poptQV.c:342 tools/rpmgraph.c:266 #, fuzzy msgid "don't verify package dependencies" msgstr "brez preverjanja soodvisnosti paketa" -#: lib/poptQV.c:348 lib/poptQV.c:352 lib/poptQV.c:355 lib/poptQV.c:358 +#: lib/poptQV.c:347 lib/poptQV.c:351 lib/poptQV.c:354 lib/poptQV.c:357 #, fuzzy msgid "don't execute verify script(s)" msgstr "brez izvajanja katerekoli stopen izgradnje" -#: lib/poptQV.c:382 +#: lib/poptQV.c:381 #, fuzzy msgid "don't verify GPG V3 DSA signature(s)" msgstr "brez preverjanja datotek v paketu" -#: lib/poptQV.c:385 +#: lib/poptQV.c:384 #, fuzzy msgid "don't verify PGP V3 RSA/MD5 signature(s)" msgstr "brez preverjanja datotek v paketu" -#: lib/poptQV.c:400 +#: lib/poptQV.c:399 #, fuzzy msgid "sign package(s) (identical to --resign)" msgstr "podpi¹i paket(e) (trenutni podpis zavrzi)" -#: lib/poptQV.c:402 +#: lib/poptQV.c:401 #, fuzzy msgid "verify package signature(s)" msgstr "preveri podpis paketa(-ov)" -#: lib/poptQV.c:404 +#: lib/poptQV.c:403 #, fuzzy msgid "delete package signatures" msgstr "preveri podpis paketa(-ov)" -#: lib/poptQV.c:406 +#: lib/poptQV.c:405 msgid "import an armored public key" msgstr "" -#: lib/poptQV.c:408 +#: lib/poptQV.c:407 #, fuzzy msgid "sign package(s) (identical to --addsign)" msgstr "podpi¹i paket(e) (trenutni podpis zavrzi)" -#: lib/poptQV.c:410 +#: lib/poptQV.c:409 #, fuzzy msgid "generate signature" msgstr "izdelava podpisa PGP/GPG" @@ -2821,38 +2821,38 @@ msgstr "Za paket %s-%s-%s: zahteva %s ni zadovoljena\n" msgid "%s skipped due to missingok flag\n" msgstr "%s preskoèen zaradi manjkajoèe zastavice OK\n" -#: lib/rpmfi.c:846 +#: lib/rpmfi.c:850 msgid "========== relocations\n" msgstr "" -#: lib/rpmfi.c:850 +#: lib/rpmfi.c:854 #, fuzzy, c-format msgid "%5d exclude %s\n" msgstr "OS je izkljuèen: %s" -#: lib/rpmfi.c:853 +#: lib/rpmfi.c:857 #, fuzzy, c-format msgid "%5d relocate %s -> %s\n" msgstr "premikanje %s v %s\n" -#: lib/rpmfi.c:987 +#: lib/rpmfi.c:991 #, fuzzy, c-format msgid "excluding %s %s\n" msgstr "izkljuèevanje datoteke %s%s\n" -#: lib/rpmfi.c:997 +#: lib/rpmfi.c:1001 #, c-format msgid "relocating %s to %s\n" msgstr "premikanje %s v %s\n" -#: lib/rpmfi.c:1089 +#: lib/rpmfi.c:1093 #, c-format msgid "relocating directory %s to %s\n" msgstr "premiokanje imenika %s v %s\n" #: lib/rpmgi.c:81 lib/rpminstall.c:124 lib/rpminstall.c:480 -#: lib/rpminstall.c:615 lib/rpminstall.c:1041 lib/rpmts.c:643 -#: tools/rpmgraph.c:121 tools/rpmgraph.c:158 +#: lib/rpminstall.c:615 lib/rpmts.c:643 tools/rpmgraph.c:121 +#: tools/rpmgraph.c:158 #, c-format msgid "open of %s failed: %s\n" msgstr "odpiranje %s je bilo neuspe¹no: %s\n" @@ -2863,7 +2863,7 @@ msgid "unknown tag: \"%s\"\n" msgstr "neznana znaèka" #: lib/rpmgi.c:628 lib/rpminstall.c:659 lib/rpminstall.c:834 -#: lib/rpminstall.c:1267 lib/transaction.c:1031 tools/rpmgraph.c:196 +#: lib/rpminstall.c:1084 lib/transaction.c:1026 tools/rpmgraph.c:196 #, fuzzy msgid "Failed dependencies:\n" msgstr "neuspe¹ne soodvisnosti:\n" @@ -2983,16 +2983,16 @@ msgstr "ni mo¾no odpreti %s: %s\n" msgid "Installing %s\n" msgstr "Name¹èanje %s\n" -#: lib/rpminstall.c:1261 lib/transaction.c:1024 +#: lib/rpminstall.c:1078 lib/transaction.c:1019 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" -#: lib/rpminstall.c:1292 lib/transaction.c:1075 +#: lib/rpminstall.c:1109 lib/transaction.c:1070 msgid "Cleaning up repackaged packages:\n" msgstr "" -#: lib/rpminstall.c:1299 lib/transaction.c:1081 +#: lib/rpminstall.c:1116 lib/transaction.c:1076 #, fuzzy, c-format msgid "\tRemoving %s:\n" msgstr "Prena¹anje %s\n" @@ -3128,97 +3128,97 @@ msgstr " je v sporu z %s-%s-%s\n" msgid "unknown error %d encountered while manipulating package %s" msgstr "neznana napaka %d ob rokovanju s paketom %s-%s-%s" -#: lib/rpmrc.c:199 +#: lib/rpmrc.c:213 #, fuzzy, c-format msgid "missing second ':' at %s:%d\n" msgstr "manjka drugi ,:` v %s:%d" -#: lib/rpmrc.c:202 +#: lib/rpmrc.c:216 #, fuzzy, c-format msgid "missing architecture name at %s:%d\n" msgstr "manjkajoèe ime arhitekture v %s:%d" -#: lib/rpmrc.c:356 +#: lib/rpmrc.c:370 #, fuzzy, c-format msgid "Incomplete data line at %s:%d\n" msgstr "Nepopolna podatkovna vrstica v %s:%d" -#: lib/rpmrc.c:361 +#: lib/rpmrc.c:375 #, fuzzy, c-format msgid "Too many args in data line at %s:%d\n" msgstr "Preveè argumentov v podatkovni vrstici v %s:%d" -#: lib/rpmrc.c:369 +#: lib/rpmrc.c:383 #, fuzzy, c-format msgid "Bad arch/os number: %s (%s:%d)\n" msgstr "Okvarjena ¹tevilka arh./op.sist.: %s (%s:%d)" -#: lib/rpmrc.c:406 +#: lib/rpmrc.c:420 #, fuzzy, c-format msgid "Incomplete default line at %s:%d\n" msgstr "Nepopolna privzeta vrstica v %s:%d" -#: lib/rpmrc.c:411 +#: lib/rpmrc.c:425 #, fuzzy, c-format msgid "Too many args in default line at %s:%d\n" msgstr "Preveè argumentov v privzeti vrstici v %s:%d" -#: lib/rpmrc.c:577 +#: lib/rpmrc.c:591 #, fuzzy, c-format msgid "Failed to read %s: %s.\n" msgstr "Neuspe¹no branje %s: %s." -#: lib/rpmrc.c:615 +#: lib/rpmrc.c:629 #, fuzzy, c-format msgid "missing ':' (found 0x%02x) at %s:%d\n" msgstr "manjkajoèi ,:` (najden 0x%02x) v %s:%d" -#: lib/rpmrc.c:632 lib/rpmrc.c:706 +#: lib/rpmrc.c:646 lib/rpmrc.c:710 #, fuzzy, c-format msgid "missing argument for %s at %s:%d\n" msgstr "manjkajoèi argument za %s v %s:%d" -#: lib/rpmrc.c:649 lib/rpmrc.c:671 +#: lib/rpmrc.c:663 #, fuzzy, c-format msgid "%s expansion failed at %s:%d \"%s\"\n" msgstr "raz¹iritev %s je bila neuspe¹na v %s:%d \"%s\"" -#: lib/rpmrc.c:658 +#: lib/rpmrc.c:672 #, fuzzy, c-format msgid "cannot open %s at %s:%d: %s\n" msgstr "ni mo¾no odpreti %s v %s:%d: %s" -#: lib/rpmrc.c:698 +#: lib/rpmrc.c:702 #, fuzzy, c-format msgid "missing architecture for %s at %s:%d\n" msgstr "manjkajoèa arhitektura za %s v %s:%d" -#: lib/rpmrc.c:765 +#: lib/rpmrc.c:769 #, fuzzy, c-format msgid "bad option '%s' at %s:%d\n" msgstr "nepravilna izbira ,%s` v %s:%d" -#: lib/rpmrc.c:1564 +#: lib/rpmrc.c:1568 #, c-format msgid "Unknown system: %s\n" msgstr "Neznan sistem: %s\n" -#: lib/rpmrc.c:1565 +#: lib/rpmrc.c:1569 #, c-format msgid "Please contact %s\n" msgstr "" -#: lib/rpmrc.c:1802 +#: lib/rpmrc.c:1806 #, fuzzy, c-format msgid "Cannot expand %s\n" msgstr "Ni mo¾no raz¹iriti %s" -#: lib/rpmrc.c:1807 +#: lib/rpmrc.c:1811 #, fuzzy, c-format msgid "Cannot read %s, HOME is too large.\n" msgstr "Ni mo¾no prebrati %s, HOME je prevelik." -#: lib/rpmrc.c:1824 +#: lib/rpmrc.c:1828 #, fuzzy, c-format msgid "Unable to open %s for reading: %s.\n" msgstr "%s ni mo¾no odpreti za branje: %s." @@ -3515,161 +3515,161 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Dol¾. polnila : %d\n" -#: lib/transaction.c:935 +#: lib/transaction.c:930 #, c-format msgid "excluding directory %s\n" msgstr "izkljuèevanje imenika %s\n" -#: lib/transaction.c:1022 +#: lib/transaction.c:1017 msgid "Transaction failed...rolling back\n" msgstr "" -#: lib/transaction.c:1042 +#: lib/transaction.c:1037 msgid "Could not order auto-rollback transaction!\n" msgstr "" -#: lib/transaction.c:1132 +#: lib/transaction.c:1127 msgid "Getting repackaged header from transaction element\n" msgstr "" -#: lib/transaction.c:1157 +#: lib/transaction.c:1152 #, c-format msgid "\tLooking for %s...\n" msgstr "" -#: lib/transaction.c:1161 +#: lib/transaction.c:1156 msgid "\tMatches found.\n" msgstr "" -#: lib/transaction.c:1165 +#: lib/transaction.c:1160 msgid "\tNo matches found.\n" msgstr "" -#: lib/transaction.c:1178 +#: lib/transaction.c:1173 #, fuzzy msgid "\tRepackaged package not found!.\n" msgstr "paket ne vsebuje skupine\n" -#: lib/transaction.c:1199 +#: lib/transaction.c:1194 msgid "\tREMOVETID matched INSTALLTID.\n" msgstr "" -#: lib/transaction.c:1201 +#: lib/transaction.c:1196 #, c-format msgid "\t\tName: %s.\n" msgstr "" -#: lib/transaction.c:1224 +#: lib/transaction.c:1219 #, fuzzy, c-format msgid "\tRepackaged Package was %s...\n" msgstr "noben paket ne pro¾i %s\n" -#: lib/transaction.c:1268 +#: lib/transaction.c:1263 msgid "Adding install element to auto-rollback transaction.\n" msgstr "" -#: lib/transaction.c:1277 +#: lib/transaction.c:1272 msgid "Could not get install element database instance!\n" msgstr "" -#: lib/transaction.c:1290 +#: lib/transaction.c:1285 msgid "Could not get header for auto-rollback transaction!\n" msgstr "" -#: lib/transaction.c:1300 +#: lib/transaction.c:1295 #, fuzzy, c-format msgid "\tAdded repackaged package header: %s.\n" msgstr "ni paketov\n" -#: lib/transaction.c:1302 lib/transaction.c:1313 +#: lib/transaction.c:1297 lib/transaction.c:1308 #, c-format msgid "\tAdded from install element %s.\n" msgstr "" -#: lib/transaction.c:1311 +#: lib/transaction.c:1306 msgid "\tAdded erase element.\n" msgstr "" -#: lib/transaction.c:1320 +#: lib/transaction.c:1315 msgid "Could not get repackaged header for auto-rollback transaction!\n" msgstr "" -#: lib/transaction.c:1327 +#: lib/transaction.c:1322 msgid "Add erase element to auto-rollback transaction.\n" msgstr "" -#: lib/transaction.c:1335 +#: lib/transaction.c:1330 msgid "\tFound existing upgrade element.\n" msgstr "" -#: lib/transaction.c:1336 +#: lib/transaction.c:1331 #, c-format msgid "\tNot adding erase element for %s.\n" msgstr "" -#: lib/transaction.c:1353 +#: lib/transaction.c:1348 #, fuzzy, c-format msgid "\tAdded repackaged package %s.\n" msgstr "ni paketov\n" -#: lib/transaction.c:1355 +#: lib/transaction.c:1350 #, c-format msgid "\tAdded from erase element %s.\n" msgstr "" -#: lib/transaction.c:1360 +#: lib/transaction.c:1355 msgid "Could not add erase element to auto-rollback transaction.\n" msgstr "" -#: lib/transaction.c:1366 +#: lib/transaction.c:1361 msgid "\tNo repackaged package...nothing to do.\n" msgstr "" -#: lib/transaction.c:1372 +#: lib/transaction.c:1367 #, fuzzy msgid "Failure reading repackaged package!\n" msgstr "napaka pri branju glave paketa\n" -#: lib/transaction.c:1495 +#: lib/transaction.c:1490 #, c-format msgid "sanity checking %d elements\n" msgstr "" -#: lib/transaction.c:1581 +#: lib/transaction.c:1576 #, fuzzy msgid "running pre-transaction scripts\n" msgstr "poganjanje prednamestitvenih skript (èe obstajajo)\n" -#: lib/transaction.c:1655 +#: lib/transaction.c:1650 #, c-format msgid "computing %d file fingerprints\n" msgstr "" -#: lib/transaction.c:1739 +#: lib/transaction.c:1734 msgid "computing file dispositions\n" msgstr "" -#: lib/transaction.c:1932 +#: lib/transaction.c:1927 msgid "Creating auto-rollback transaction\n" msgstr "" -#: lib/transaction.c:2086 +#: lib/transaction.c:2077 msgid "Add failed. Could not read package header.\n" msgstr "" -#: lib/transaction.c:2170 +#: lib/transaction.c:2161 msgid "Add failed in rpmpsmStage().\n" msgstr "" -#: lib/transaction.c:2214 +#: lib/transaction.c:2205 msgid "Add failed. Could not get file list.\n" msgstr "" -#: lib/transaction.c:2263 +#: lib/transaction.c:2254 msgid "Erase failed failed in rpmpsmStage().\n" msgstr "" -#: lib/transaction.c:2324 +#: lib/transaction.c:2315 #, fuzzy msgid "running post-transaction scripts\n" msgstr "poganjanje poodnamestitvenih skriptov (èe obstajajo)\n" @@ -4068,87 +4068,87 @@ msgstr "odpiranje db kazala %s/%s %s naèin=0x%x\n" msgid "======================== active %d empty %d\n" msgstr "======================== aktivni %d prazni %d\n" -#: rpmio/macro.c:394 +#: rpmio/macro.c:396 #, c-format msgid "%3d>%*s(empty)" msgstr "%3d>%*s(prazni)" -#: rpmio/macro.c:437 +#: rpmio/macro.c:439 #, c-format msgid "%3d<%*s(empty)\n" msgstr "%3d<%*s(prazni)\n" -#: rpmio/macro.c:664 rpmio/macro.c:705 +#: rpmio/macro.c:608 rpmio/macro.c:1090 rpmio/macro.c:1123 rpmio/macro.c:1863 +#, fuzzy +msgid "Target buffer overflow\n" +msgstr "Ciljni medpomnilnik je bil prekoraèen" + +#: rpmio/macro.c:671 rpmio/macro.c:712 #, fuzzy, c-format msgid "Macro %%%s has unterminated body\n" msgstr "Makro %%%s vsebuje nezakljuèeno telo" -#: rpmio/macro.c:727 +#: rpmio/macro.c:734 #, fuzzy, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "Makro %%%s vsebuje nedovoljeno ime (%%define)" -#: rpmio/macro.c:733 +#: rpmio/macro.c:740 #, fuzzy, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "Makro %%%s vsebuje nezakljuèene izbire" -#: rpmio/macro.c:738 +#: rpmio/macro.c:745 #, fuzzy, c-format msgid "Macro %%%s has empty body\n" msgstr "Makro %%%s vsebuje prazno telo" -#: rpmio/macro.c:744 +#: rpmio/macro.c:751 #, fuzzy, c-format msgid "Macro %%%s failed to expand\n" msgstr "Makro %%%s se ne raz¹iri" -#: rpmio/macro.c:779 +#: rpmio/macro.c:786 #, fuzzy, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "Makro %%%s vsebuje nedovoljeno ime (%%undefine)" -#: rpmio/macro.c:897 +#: rpmio/macro.c:904 #, fuzzy, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "Makro %%%s (%s) ni bil uporabljen pod ravnijo %d" -#: rpmio/macro.c:1024 +#: rpmio/macro.c:1031 #, fuzzy, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "Neznana izbira %c v %s(%s)" -#: rpmio/macro.c:1224 +#: rpmio/macro.c:1239 #, fuzzy, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "Globina rekurzije (%d) veèja od maksimalne (%d)" -#: rpmio/macro.c:1297 rpmio/macro.c:1314 +#: rpmio/macro.c:1312 rpmio/macro.c:1329 #, fuzzy, c-format msgid "Unterminated %c: %s\n" msgstr "Nezakljuèeni %c: %s" -#: rpmio/macro.c:1355 +#: rpmio/macro.c:1370 #, fuzzy, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "Oznaki %% sledi nerazèlenljiv makro" -#: rpmio/macro.c:1512 +#: rpmio/macro.c:1527 #, fuzzy, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "Makro %%%.*s ni najden - preskoèeno" -#: rpmio/macro.c:1848 -#, fuzzy -msgid "Target buffer overflow\n" -msgstr "Ciljni medpomnilnik je bil prekoraèen" - -#: rpmio/macro.c:2056 rpmio/macro.c:2062 +#: rpmio/macro.c:2076 rpmio/macro.c:2082 #, fuzzy, c-format msgid "File %s: %s\n" msgstr "Datoteka %s: %s" -#: rpmio/macro.c:2065 +#: rpmio/macro.c:2085 #, fuzzy, c-format msgid "File %s is smaller than %u bytes\n" msgstr "Datoteka %s je kraj¹a od %d bajtov" @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n" -"POT-Creation-Date: 2007-08-21 08:04+0200\n" +"POT-Creation-Date: 2007-08-30 18:37+0200\n" "PO-Revision-Date: 2004-02-29 07:48+0500\n" "Last-Translator: unknown\n" "Language-Team: unknown\n" @@ -1288,20 +1288,20 @@ msgstr "nemoj proveravati zavisnosti paketa" msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "" -#: build/poptBT.c:229 lib/poptALL.c:273 lib/poptI.c:282 lib/poptQV.c:363 -#: lib/poptQV.c:372 lib/poptQV.c:413 +#: build/poptBT.c:229 lib/poptALL.c:273 lib/poptI.c:282 lib/poptQV.c:362 +#: lib/poptQV.c:371 lib/poptQV.c:412 #, fuzzy msgid "don't verify package digest(s)" msgstr "nemoj proveravati zavisnosti paketa" -#: build/poptBT.c:231 lib/poptALL.c:275 lib/poptI.c:284 lib/poptQV.c:366 -#: lib/poptQV.c:374 lib/poptQV.c:416 +#: build/poptBT.c:231 lib/poptALL.c:275 lib/poptI.c:284 lib/poptQV.c:365 +#: lib/poptQV.c:373 lib/poptQV.c:415 #, fuzzy msgid "don't verify database header(s) when retrieved" msgstr "nemoj proveravati arhitekturu paketa" -#: build/poptBT.c:233 lib/poptALL.c:281 lib/poptI.c:286 lib/poptQV.c:369 -#: lib/poptQV.c:376 lib/poptQV.c:418 +#: build/poptBT.c:233 lib/poptALL.c:281 lib/poptI.c:286 lib/poptQV.c:368 +#: lib/poptQV.c:375 lib/poptQV.c:417 #, fuzzy msgid "don't verify package signature(s)" msgstr "proveri potpis u paketu" @@ -1367,27 +1367,27 @@ msgstr "PGP omanuo" msgid "failed to write all data to %s\n" msgstr "neuspelo kreiranje %s\n" -#: build/rpmfc.c:1250 +#: build/rpmfc.c:1249 #, fuzzy, c-format msgid "magic_open(0x%x) failed: %s\n" msgstr "neuspelo otvaranje %s: %s\n" -#: build/rpmfc.c:1258 +#: build/rpmfc.c:1257 #, fuzzy, c-format -msgid "magic_load(ms, \"%s\") failed: %s\n" +msgid "magic_load failed: %s\n" msgstr "uklanjanje %s nije uspelo: %s" -#: build/rpmfc.c:1303 +#: build/rpmfc.c:1301 #, c-format msgid "magic_file(ms, \"%s\") failed: mode %06o %s\n" msgstr "" -#: build/rpmfc.c:1524 +#: build/rpmfc.c:1522 #, fuzzy, c-format msgid "Finding %s: %s\n" msgstr "neuspelo otvaranje %s: %s" -#: build/rpmfc.c:1530 build/rpmfc.c:1539 +#: build/rpmfc.c:1528 build/rpmfc.c:1537 #, fuzzy, c-format msgid "Failed to find %s:\n" msgstr "neuspelo kreiranje %s\n" @@ -1514,30 +1514,30 @@ msgstr "" msgid "removing %s \"%s\" from tsort relations.\n" msgstr "gre¹ka uklanjanja sloga %s u %s" -#: lib/depends.c:1265 +#: lib/depends.c:1271 msgid "========== recording tsort relations\n" msgstr "" -#: lib/depends.c:1357 +#: lib/depends.c:1363 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, depth, " "breadth)\n" msgstr "" -#: lib/depends.c:1453 +#: lib/depends.c:1459 #, c-format msgid "========== successors only (%d bytes)\n" msgstr "" -#: lib/depends.c:1526 +#: lib/depends.c:1532 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1561 +#: lib/depends.c:1567 msgid "========== continuing tsort ...\n" msgstr "" -#: lib/depends.c:1566 +#: lib/depends.c:1572 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2096,7 +2096,7 @@ msgstr "a¾uriraj bazu podataka, ali nemoj menjati fajl-sistem" msgid "do not verify package dependencies" msgstr "nemoj proveravati zavisnosti paketa" -#: lib/poptI.c:252 lib/poptQV.c:307 lib/poptQV.c:310 +#: lib/poptI.c:252 lib/poptQV.c:306 lib/poptQV.c:309 #, fuzzy msgid "don't verify MD5 digest of files" msgstr "instaliraj paket" @@ -2218,255 +2218,255 @@ msgstr "nemoj instalirati, ali reci da li æe da radi ili ne" msgid "upgrade package(s)" msgstr "instaliraj paket" -#: lib/poptQV.c:103 +#: lib/poptQV.c:102 #, fuzzy msgid "query/verify all packages" msgstr "upit nad svim paketima" -#: lib/poptQV.c:105 +#: lib/poptQV.c:104 #, fuzzy msgid "rpm checksig mode" msgstr "re¾im upita" -#: lib/poptQV.c:107 +#: lib/poptQV.c:106 #, fuzzy msgid "query/verify package(s) owning file" msgstr "upit nad paketom koji ima <datoteku>" -#: lib/poptQV.c:109 +#: lib/poptQV.c:108 #, fuzzy msgid "query/verify package(s) in group" msgstr "paket nema imena" -#: lib/poptQV.c:111 +#: lib/poptQV.c:110 #, fuzzy msgid "query/verify a package file" msgstr "upit nad svim paketima" -#: lib/poptQV.c:114 +#: lib/poptQV.c:113 #, fuzzy msgid "query/verify package(s) from TOP file tree walk" msgstr "paket nema imena" -#: lib/poptQV.c:116 +#: lib/poptQV.c:115 #, fuzzy msgid "query/verify package(s) from system HDLIST" msgstr "paket nema imena" -#: lib/poptQV.c:119 +#: lib/poptQV.c:118 #, fuzzy msgid "query/verify package(s) with package identifier" msgstr "upit nad paketom koji ima <datoteku>" -#: lib/poptQV.c:121 +#: lib/poptQV.c:120 #, fuzzy msgid "query/verify package(s) with header identifier" msgstr "upit nad paketom koji ima <datoteku>" -#: lib/poptQV.c:123 +#: lib/poptQV.c:122 #, fuzzy msgid "query/verify package(s) with file identifier" msgstr "upit nad paketom koji ima <datoteku>" -#: lib/poptQV.c:126 +#: lib/poptQV.c:125 #, fuzzy msgid "rpm query mode" msgstr "re¾im upita" -#: lib/poptQV.c:128 +#: lib/poptQV.c:127 #, fuzzy msgid "query/verify a header instance" msgstr "upit nad paketom koji ima <datoteku>" -#: lib/poptQV.c:130 +#: lib/poptQV.c:129 #, fuzzy msgid "query a spec file" msgstr "upit nad %s neuspeo\n" -#: lib/poptQV.c:130 +#: lib/poptQV.c:129 msgid "<spec>" msgstr "" -#: lib/poptQV.c:132 +#: lib/poptQV.c:131 #, fuzzy msgid "query/verify package(s) from install transaction" msgstr "paket nema imena" -#: lib/poptQV.c:134 +#: lib/poptQV.c:133 #, fuzzy msgid "query the package(s) triggered by the package" msgstr "upit nad paketom koji ima <datoteku>" -#: lib/poptQV.c:136 +#: lib/poptQV.c:135 #, fuzzy msgid "rpm verify mode" msgstr "re¾im upita" -#: lib/poptQV.c:138 +#: lib/poptQV.c:137 #, fuzzy msgid "query/verify the package(s) which require a dependency" msgstr "upit za pakete koji zahtevaju <i> svojstvo" -#: lib/poptQV.c:140 +#: lib/poptQV.c:139 #, fuzzy msgid "query/verify the package(s) which provide a dependency" msgstr "upit za pakete koji omoguæavaju <i> svojstvo" -#: lib/poptQV.c:143 +#: lib/poptQV.c:142 msgid "create transaction set" msgstr "" -#: lib/poptQV.c:145 +#: lib/poptQV.c:144 msgid "do not order transaction set" msgstr "" -#: lib/poptQV.c:147 +#: lib/poptQV.c:146 #, fuzzy msgid "do not glob arguments" msgstr "nedostaju argumenti za upit" -#: lib/poptQV.c:149 +#: lib/poptQV.c:148 msgid "do not process non-package files as manifests" msgstr "" -#: lib/poptQV.c:151 +#: lib/poptQV.c:150 #, fuzzy msgid "do not read headers" msgstr "ne mogu da proèitam zaglavlje na %d za proveru" -#: lib/poptQV.c:258 +#: lib/poptQV.c:257 #, fuzzy msgid "list all configuration files" msgstr "prika¾i samo konfiguracione datoteke (povlaèi -i)" -#: lib/poptQV.c:260 +#: lib/poptQV.c:259 #, fuzzy msgid "list all documentation files" msgstr "instaliraj dokumentaciju" -#: lib/poptQV.c:262 +#: lib/poptQV.c:261 #, fuzzy msgid "dump basic file information" msgstr "prika¾i informacije o paketu" -#: lib/poptQV.c:266 +#: lib/poptQV.c:265 #, fuzzy msgid "list files in package" msgstr "instaliraj paket" -#: lib/poptQV.c:271 +#: lib/poptQV.c:270 #, c-format msgid "skip %%ghost files" msgstr "" -#: lib/poptQV.c:275 +#: lib/poptQV.c:274 #, c-format msgid "skip %%license files" msgstr "" -#: lib/poptQV.c:278 +#: lib/poptQV.c:277 #, fuzzy, c-format msgid "skip %%readme files" msgstr "%s: Neuspeo 'readLead'\n" -#: lib/poptQV.c:284 +#: lib/poptQV.c:283 #, fuzzy msgid "use the following query format" msgstr "neoèekivan izvor upita" -#: lib/poptQV.c:286 +#: lib/poptQV.c:285 #, fuzzy msgid "substitute i18n sections into spec file" msgstr "upit nad paketom koji ima <datoteku>" -#: lib/poptQV.c:288 +#: lib/poptQV.c:287 msgid "display the states of the listed files" msgstr "" -#: lib/poptQV.c:314 +#: lib/poptQV.c:313 #, fuzzy msgid "don't verify size of files" msgstr "instaliraj paket" -#: lib/poptQV.c:317 +#: lib/poptQV.c:316 #, fuzzy msgid "don't verify symlink path of files" msgstr "instaliraj paket" -#: lib/poptQV.c:320 +#: lib/poptQV.c:319 #, fuzzy msgid "don't verify owner of files" msgstr "instaliraj paket" -#: lib/poptQV.c:323 +#: lib/poptQV.c:322 #, fuzzy msgid "don't verify group of files" msgstr "instaliraj paket" -#: lib/poptQV.c:326 +#: lib/poptQV.c:325 msgid "don't verify modification time of files" msgstr "" -#: lib/poptQV.c:329 lib/poptQV.c:332 +#: lib/poptQV.c:328 lib/poptQV.c:331 #, fuzzy msgid "don't verify mode of files" msgstr "instaliraj paket" -#: lib/poptQV.c:335 +#: lib/poptQV.c:334 #, fuzzy msgid "don't verify file security contexts" msgstr "instaliraj paket" -#: lib/poptQV.c:337 +#: lib/poptQV.c:336 #, fuzzy msgid "don't verify files in package" msgstr "instaliraj paket" -#: lib/poptQV.c:340 lib/poptQV.c:343 tools/rpmgraph.c:266 +#: lib/poptQV.c:339 lib/poptQV.c:342 tools/rpmgraph.c:266 #, fuzzy msgid "don't verify package dependencies" msgstr "nemoj proveravati zavisnosti paketa" -#: lib/poptQV.c:348 lib/poptQV.c:352 lib/poptQV.c:355 lib/poptQV.c:358 +#: lib/poptQV.c:347 lib/poptQV.c:351 lib/poptQV.c:354 lib/poptQV.c:357 #, fuzzy msgid "don't execute verify script(s)" msgstr "nemoj izvr¹iti nijednu fazu" -#: lib/poptQV.c:382 +#: lib/poptQV.c:381 #, fuzzy msgid "don't verify GPG V3 DSA signature(s)" msgstr "instaliraj paket" -#: lib/poptQV.c:385 +#: lib/poptQV.c:384 #, fuzzy msgid "don't verify PGP V3 RSA/MD5 signature(s)" msgstr "instaliraj paket" -#: lib/poptQV.c:400 +#: lib/poptQV.c:399 #, fuzzy msgid "sign package(s) (identical to --resign)" msgstr "potpi¹i paket (ukloni tekuæi potpis)" -#: lib/poptQV.c:402 +#: lib/poptQV.c:401 #, fuzzy msgid "verify package signature(s)" msgstr "proveri potpis u paketu" -#: lib/poptQV.c:404 +#: lib/poptQV.c:403 #, fuzzy msgid "delete package signatures" msgstr "proveri potpis u paketu" -#: lib/poptQV.c:406 +#: lib/poptQV.c:405 msgid "import an armored public key" msgstr "" -#: lib/poptQV.c:408 +#: lib/poptQV.c:407 #, fuzzy msgid "sign package(s) (identical to --addsign)" msgstr "potpi¹i paket (ukloni tekuæi potpis)" -#: lib/poptQV.c:410 +#: lib/poptQV.c:409 #, fuzzy msgid "generate signature" msgstr "napravi PGP potpis" @@ -2812,38 +2812,38 @@ msgstr "paket %s nije naveden u %s" msgid "%s skipped due to missingok flag\n" msgstr "" -#: lib/rpmfi.c:846 +#: lib/rpmfi.c:850 msgid "========== relocations\n" msgstr "" -#: lib/rpmfi.c:850 +#: lib/rpmfi.c:854 #, fuzzy, c-format msgid "%5d exclude %s\n" msgstr "Pribavljam %s\n" -#: lib/rpmfi.c:853 +#: lib/rpmfi.c:857 #, fuzzy, c-format msgid "%5d relocate %s -> %s\n" msgstr "Ne mogu da otvorim datoteku %s: " -#: lib/rpmfi.c:987 +#: lib/rpmfi.c:991 #, fuzzy, c-format msgid "excluding %s %s\n" msgstr "Pribavljam %s\n" -#: lib/rpmfi.c:997 +#: lib/rpmfi.c:1001 #, fuzzy, c-format msgid "relocating %s to %s\n" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" -#: lib/rpmfi.c:1089 +#: lib/rpmfi.c:1093 #, fuzzy, c-format msgid "relocating directory %s to %s\n" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" #: lib/rpmgi.c:81 lib/rpminstall.c:124 lib/rpminstall.c:480 -#: lib/rpminstall.c:615 lib/rpminstall.c:1041 lib/rpmts.c:643 -#: tools/rpmgraph.c:121 tools/rpmgraph.c:158 +#: lib/rpminstall.c:615 lib/rpmts.c:643 tools/rpmgraph.c:121 +#: tools/rpmgraph.c:158 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "neuspelo otvaranje %s: %s\n" @@ -2854,7 +2854,7 @@ msgid "unknown tag: \"%s\"\n" msgstr "nepoznat tag" #: lib/rpmgi.c:628 lib/rpminstall.c:659 lib/rpminstall.c:834 -#: lib/rpminstall.c:1267 lib/transaction.c:1031 tools/rpmgraph.c:196 +#: lib/rpminstall.c:1084 lib/transaction.c:1026 tools/rpmgraph.c:196 #, fuzzy msgid "Failed dependencies:\n" msgstr "lo¹e meðuzavisnosti:\n" @@ -2974,16 +2974,16 @@ msgstr "gre¹ka: ne mogu da otvorim %s\n" msgid "Installing %s\n" msgstr "Instaliram %s\n" -#: lib/rpminstall.c:1261 lib/transaction.c:1024 +#: lib/rpminstall.c:1078 lib/transaction.c:1019 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" -#: lib/rpminstall.c:1292 lib/transaction.c:1075 +#: lib/rpminstall.c:1109 lib/transaction.c:1070 msgid "Cleaning up repackaged packages:\n" msgstr "" -#: lib/rpminstall.c:1299 lib/transaction.c:1081 +#: lib/rpminstall.c:1116 lib/transaction.c:1076 #, fuzzy, c-format msgid "\tRemoving %s:\n" msgstr "Pribavljam %s\n" @@ -3117,97 +3117,97 @@ msgstr " se sudara sa %s-%s-%s\n" msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/rpmrc.c:199 +#: lib/rpmrc.c:213 #, fuzzy, c-format msgid "missing second ':' at %s:%d\n" msgstr "nedostaje drugo ':' na %s:%d" -#: lib/rpmrc.c:202 +#: lib/rpmrc.c:216 #, fuzzy, c-format msgid "missing architecture name at %s:%d\n" msgstr "nedostaje ime arhitekture na %s:%d" -#: lib/rpmrc.c:356 +#: lib/rpmrc.c:370 #, fuzzy, c-format msgid "Incomplete data line at %s:%d\n" msgstr "Nepotpuna linija podataka na %s:%d" -#: lib/rpmrc.c:361 +#: lib/rpmrc.c:375 #, fuzzy, c-format msgid "Too many args in data line at %s:%d\n" msgstr "Premnogo argumenata u liniji podataka na %s:%d" -#: lib/rpmrc.c:369 +#: lib/rpmrc.c:383 #, fuzzy, c-format msgid "Bad arch/os number: %s (%s:%d)\n" msgstr "Lo¹ broj arhitekture/oper.sist.: %s (%s:%d)" -#: lib/rpmrc.c:406 +#: lib/rpmrc.c:420 #, fuzzy, c-format msgid "Incomplete default line at %s:%d\n" msgstr "Nepotpuna podrazumevana linija na %s:%d" -#: lib/rpmrc.c:411 +#: lib/rpmrc.c:425 #, fuzzy, c-format msgid "Too many args in default line at %s:%d\n" msgstr "Premnogo argumenata u podrazumevanoj liniji na %s:%d" -#: lib/rpmrc.c:577 +#: lib/rpmrc.c:591 #, fuzzy, c-format msgid "Failed to read %s: %s.\n" msgstr "Neuspelo èitanje %s: %s." -#: lib/rpmrc.c:615 +#: lib/rpmrc.c:629 #, fuzzy, c-format msgid "missing ':' (found 0x%02x) at %s:%d\n" msgstr "nedostaje ':' na %s:%d" -#: lib/rpmrc.c:632 lib/rpmrc.c:706 +#: lib/rpmrc.c:646 lib/rpmrc.c:710 #, fuzzy, c-format msgid "missing argument for %s at %s:%d\n" msgstr "nedostaje argument za %s na %s:%d" -#: lib/rpmrc.c:649 lib/rpmrc.c:671 +#: lib/rpmrc.c:663 #, fuzzy, c-format msgid "%s expansion failed at %s:%d \"%s\"\n" msgstr "neuspelo otvaranje %s: %s" -#: lib/rpmrc.c:658 +#: lib/rpmrc.c:672 #, fuzzy, c-format msgid "cannot open %s at %s:%d: %s\n" msgstr "Ne mogu da otvorim datoteku %s: " -#: lib/rpmrc.c:698 +#: lib/rpmrc.c:702 #, fuzzy, c-format msgid "missing architecture for %s at %s:%d\n" msgstr "nedostaje arhitektura za %s na %s:%d" -#: lib/rpmrc.c:765 +#: lib/rpmrc.c:769 #, fuzzy, c-format msgid "bad option '%s' at %s:%d\n" msgstr "lo¹a opcija '%s' na %s:%d" -#: lib/rpmrc.c:1564 +#: lib/rpmrc.c:1568 #, c-format msgid "Unknown system: %s\n" msgstr "" -#: lib/rpmrc.c:1565 +#: lib/rpmrc.c:1569 #, c-format msgid "Please contact %s\n" msgstr "" -#: lib/rpmrc.c:1802 +#: lib/rpmrc.c:1806 #, fuzzy, c-format msgid "Cannot expand %s\n" msgstr "gre¹ka: ne mogu da otvorim %s\n" -#: lib/rpmrc.c:1807 +#: lib/rpmrc.c:1811 #, c-format msgid "Cannot read %s, HOME is too large.\n" msgstr "" -#: lib/rpmrc.c:1824 +#: lib/rpmrc.c:1828 #, fuzzy, c-format msgid "Unable to open %s for reading: %s.\n" msgstr "Ne mogu da otvorim %s za èitanje: %s" @@ -3502,160 +3502,160 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:935 +#: lib/transaction.c:930 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" -#: lib/transaction.c:1022 +#: lib/transaction.c:1017 msgid "Transaction failed...rolling back\n" msgstr "" -#: lib/transaction.c:1042 +#: lib/transaction.c:1037 msgid "Could not order auto-rollback transaction!\n" msgstr "" -#: lib/transaction.c:1132 +#: lib/transaction.c:1127 msgid "Getting repackaged header from transaction element\n" msgstr "" -#: lib/transaction.c:1157 +#: lib/transaction.c:1152 #, c-format msgid "\tLooking for %s...\n" msgstr "" -#: lib/transaction.c:1161 +#: lib/transaction.c:1156 msgid "\tMatches found.\n" msgstr "" -#: lib/transaction.c:1165 +#: lib/transaction.c:1160 msgid "\tNo matches found.\n" msgstr "" -#: lib/transaction.c:1178 +#: lib/transaction.c:1173 #, fuzzy msgid "\tRepackaged package not found!.\n" msgstr "paket nema imena" -#: lib/transaction.c:1199 +#: lib/transaction.c:1194 msgid "\tREMOVETID matched INSTALLTID.\n" msgstr "" -#: lib/transaction.c:1201 +#: lib/transaction.c:1196 #, c-format msgid "\t\tName: %s.\n" msgstr "" -#: lib/transaction.c:1224 +#: lib/transaction.c:1219 #, fuzzy, c-format msgid "\tRepackaged Package was %s...\n" msgstr "nijedan paket ne aktivira %s\n" -#: lib/transaction.c:1268 +#: lib/transaction.c:1263 msgid "Adding install element to auto-rollback transaction.\n" msgstr "" -#: lib/transaction.c:1277 +#: lib/transaction.c:1272 msgid "Could not get install element database instance!\n" msgstr "" -#: lib/transaction.c:1290 +#: lib/transaction.c:1285 msgid "Could not get header for auto-rollback transaction!\n" msgstr "" -#: lib/transaction.c:1300 +#: lib/transaction.c:1295 #, fuzzy, c-format msgid "\tAdded repackaged package header: %s.\n" msgstr "upit nad svim paketima" -#: lib/transaction.c:1302 lib/transaction.c:1313 +#: lib/transaction.c:1297 lib/transaction.c:1308 #, c-format msgid "\tAdded from install element %s.\n" msgstr "" -#: lib/transaction.c:1311 +#: lib/transaction.c:1306 msgid "\tAdded erase element.\n" msgstr "" -#: lib/transaction.c:1320 +#: lib/transaction.c:1315 msgid "Could not get repackaged header for auto-rollback transaction!\n" msgstr "" -#: lib/transaction.c:1327 +#: lib/transaction.c:1322 msgid "Add erase element to auto-rollback transaction.\n" msgstr "" -#: lib/transaction.c:1335 +#: lib/transaction.c:1330 msgid "\tFound existing upgrade element.\n" msgstr "" -#: lib/transaction.c:1336 +#: lib/transaction.c:1331 #, c-format msgid "\tNot adding erase element for %s.\n" msgstr "" -#: lib/transaction.c:1353 +#: lib/transaction.c:1348 #, fuzzy, c-format msgid "\tAdded repackaged package %s.\n" msgstr "upit nad svim paketima" -#: lib/transaction.c:1355 +#: lib/transaction.c:1350 #, c-format msgid "\tAdded from erase element %s.\n" msgstr "" -#: lib/transaction.c:1360 +#: lib/transaction.c:1355 msgid "Could not add erase element to auto-rollback transaction.\n" msgstr "" -#: lib/transaction.c:1366 +#: lib/transaction.c:1361 msgid "\tNo repackaged package...nothing to do.\n" msgstr "" -#: lib/transaction.c:1372 +#: lib/transaction.c:1367 #, fuzzy msgid "Failure reading repackaged package!\n" msgstr "gre¹ka potrage za paketom %s\n" -#: lib/transaction.c:1495 +#: lib/transaction.c:1490 #, c-format msgid "sanity checking %d elements\n" msgstr "" -#: lib/transaction.c:1581 +#: lib/transaction.c:1576 msgid "running pre-transaction scripts\n" msgstr "" -#: lib/transaction.c:1655 +#: lib/transaction.c:1650 #, c-format msgid "computing %d file fingerprints\n" msgstr "" -#: lib/transaction.c:1739 +#: lib/transaction.c:1734 msgid "computing file dispositions\n" msgstr "" -#: lib/transaction.c:1932 +#: lib/transaction.c:1927 msgid "Creating auto-rollback transaction\n" msgstr "" -#: lib/transaction.c:2086 +#: lib/transaction.c:2077 msgid "Add failed. Could not read package header.\n" msgstr "" -#: lib/transaction.c:2170 +#: lib/transaction.c:2161 msgid "Add failed in rpmpsmStage().\n" msgstr "" -#: lib/transaction.c:2214 +#: lib/transaction.c:2205 msgid "Add failed. Could not get file list.\n" msgstr "" -#: lib/transaction.c:2263 +#: lib/transaction.c:2254 msgid "Erase failed failed in rpmpsmStage().\n" msgstr "" -#: lib/transaction.c:2324 +#: lib/transaction.c:2315 msgid "running post-transaction scripts\n" msgstr "" @@ -4050,86 +4050,86 @@ msgstr "rekreiraj bazu podataka iz postojeæe baze" msgid "======================== active %d empty %d\n" msgstr "" -#: rpmio/macro.c:394 +#: rpmio/macro.c:396 #, c-format msgid "%3d>%*s(empty)" msgstr "" -#: rpmio/macro.c:437 +#: rpmio/macro.c:439 #, c-format msgid "%3d<%*s(empty)\n" msgstr "" -#: rpmio/macro.c:664 rpmio/macro.c:705 +#: rpmio/macro.c:608 rpmio/macro.c:1090 rpmio/macro.c:1123 rpmio/macro.c:1863 +msgid "Target buffer overflow\n" +msgstr "" + +#: rpmio/macro.c:671 rpmio/macro.c:712 #, c-format msgid "Macro %%%s has unterminated body\n" msgstr "" -#: rpmio/macro.c:727 +#: rpmio/macro.c:734 #, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "" -#: rpmio/macro.c:733 +#: rpmio/macro.c:740 #, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "" -#: rpmio/macro.c:738 +#: rpmio/macro.c:745 #, c-format msgid "Macro %%%s has empty body\n" msgstr "" -#: rpmio/macro.c:744 +#: rpmio/macro.c:751 #, c-format msgid "Macro %%%s failed to expand\n" msgstr "" -#: rpmio/macro.c:779 +#: rpmio/macro.c:786 #, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "" -#: rpmio/macro.c:897 +#: rpmio/macro.c:904 #, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "" -#: rpmio/macro.c:1024 +#: rpmio/macro.c:1031 #, fuzzy, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "(nepoznat tip)" -#: rpmio/macro.c:1224 +#: rpmio/macro.c:1239 #, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "" -#: rpmio/macro.c:1297 rpmio/macro.c:1314 +#: rpmio/macro.c:1312 rpmio/macro.c:1329 #, fuzzy, c-format msgid "Unterminated %c: %s\n" msgstr "Ne mogu da otvorim datoteku %s: " -#: rpmio/macro.c:1355 +#: rpmio/macro.c:1370 #, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "" -#: rpmio/macro.c:1512 +#: rpmio/macro.c:1527 #, fuzzy, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "paket %s nije naðen u %s" -#: rpmio/macro.c:1848 -msgid "Target buffer overflow\n" -msgstr "" - -#: rpmio/macro.c:2056 rpmio/macro.c:2062 +#: rpmio/macro.c:2076 rpmio/macro.c:2082 #, fuzzy, c-format msgid "File %s: %s\n" msgstr "neuspelo otvaranje %s: %s" -#: rpmio/macro.c:2065 +#: rpmio/macro.c:2085 #, c-format msgid "File %s is smaller than %u bytes\n" msgstr "" @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm\n" "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n" -"POT-Creation-Date: 2007-08-21 08:04+0200\n" +"POT-Creation-Date: 2007-08-30 18:37+0200\n" "PO-Revision-Date: 2005-02-18 22:29+0100\n" "Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n" "Language-Team: Swedish <sv@li.org>\n" @@ -1269,18 +1269,18 @@ msgstr "verifiera inte byggberoenden" msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "generera pakethuvuden kompatibla med (äldre) rpm[23]-paketering" -#: build/poptBT.c:229 lib/poptALL.c:273 lib/poptI.c:282 lib/poptQV.c:363 -#: lib/poptQV.c:372 lib/poptQV.c:413 +#: build/poptBT.c:229 lib/poptALL.c:273 lib/poptI.c:282 lib/poptQV.c:362 +#: lib/poptQV.c:371 lib/poptQV.c:412 msgid "don't verify package digest(s)" msgstr "verifiera inte paketkontrollsummor" -#: build/poptBT.c:231 lib/poptALL.c:275 lib/poptI.c:284 lib/poptQV.c:366 -#: lib/poptQV.c:374 lib/poptQV.c:416 +#: build/poptBT.c:231 lib/poptALL.c:275 lib/poptI.c:284 lib/poptQV.c:365 +#: lib/poptQV.c:373 lib/poptQV.c:415 msgid "don't verify database header(s) when retrieved" msgstr "verifiera inte databashuvuden när de hämtas" -#: build/poptBT.c:233 lib/poptALL.c:281 lib/poptI.c:286 lib/poptQV.c:369 -#: lib/poptQV.c:376 lib/poptQV.c:418 +#: build/poptBT.c:233 lib/poptALL.c:281 lib/poptI.c:286 lib/poptQV.c:368 +#: lib/poptQV.c:375 lib/poptQV.c:417 msgid "don't verify package signature(s)" msgstr "verifiera inte paketsignatur(er)" @@ -1342,27 +1342,27 @@ msgstr "%s misslyckades: %s\n" msgid "failed to write all data to %s\n" msgstr "Kan inte skriva last till %s: %s\n" -#: build/rpmfc.c:1250 +#: build/rpmfc.c:1249 #, fuzzy, c-format msgid "magic_open(0x%x) failed: %s\n" msgstr "misslyckades med att öppna %s: %s\n" -#: build/rpmfc.c:1258 +#: build/rpmfc.c:1257 #, fuzzy, c-format -msgid "magic_load(ms, \"%s\") failed: %s\n" +msgid "magic_load failed: %s\n" msgstr "%s rmdir av %s misslyckades: %s\n" -#: build/rpmfc.c:1303 +#: build/rpmfc.c:1301 #, c-format msgid "magic_file(ms, \"%s\") failed: mode %06o %s\n" msgstr "" -#: build/rpmfc.c:1524 +#: build/rpmfc.c:1522 #, fuzzy, c-format msgid "Finding %s: %s\n" msgstr "Fil %s: %s\n" -#: build/rpmfc.c:1530 build/rpmfc.c:1539 +#: build/rpmfc.c:1528 build/rpmfc.c:1537 #, fuzzy, c-format msgid "Failed to find %s:\n" msgstr "Misslyckades med att läsa %s: %s.\n" @@ -1482,11 +1482,11 @@ msgstr "ignorera paketnamnsrelation(er) [%d]\t%s -> %s\n" msgid "removing %s \"%s\" from tsort relations.\n" msgstr "tar bort %s \"%s\" från tsort-relationer.\n" -#: lib/depends.c:1265 +#: lib/depends.c:1271 msgid "========== recording tsort relations\n" msgstr "========== noterar alla relationer\n" -#: lib/depends.c:1357 +#: lib/depends.c:1363 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, depth, " "breadth)\n" @@ -1494,20 +1494,20 @@ msgstr "" "========== tsort:erar paket (ordning, #föregångare, #efterföljare, träd, " "djup, bredd)\n" -#: lib/depends.c:1453 +#: lib/depends.c:1459 #, c-format msgid "========== successors only (%d bytes)\n" msgstr "========== endast efterföljare (%d byte)\n" -#: lib/depends.c:1526 +#: lib/depends.c:1532 msgid "LOOP:\n" msgstr "LOOP:\n" -#: lib/depends.c:1561 +#: lib/depends.c:1567 msgid "========== continuing tsort ...\n" msgstr "========== fortsätter med tsort ...\n" -#: lib/depends.c:1566 +#: lib/depends.c:1572 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "rpmtsOrder misslyckades, %d element återstår\n" @@ -2044,7 +2044,7 @@ msgstr "uppdatera databasen, men ändra inte filsystemet" msgid "do not verify package dependencies" msgstr "verifiera inte paketberoenden" -#: lib/poptI.c:252 lib/poptQV.c:307 lib/poptQV.c:310 +#: lib/poptI.c:252 lib/poptQV.c:306 lib/poptQV.c:309 msgid "don't verify MD5 digest of files" msgstr "verifiera inte MD5-summor för filer" @@ -2160,214 +2160,214 @@ msgstr "installera inte, men tala om ifall det skulle fungera eller inte" msgid "upgrade package(s)" msgstr "uppgradera paket" -#: lib/poptQV.c:103 +#: lib/poptQV.c:102 msgid "query/verify all packages" msgstr "fråga/verifiera alla paket" -#: lib/poptQV.c:105 +#: lib/poptQV.c:104 msgid "rpm checksig mode" msgstr "rpm signaturkontrolläge" -#: lib/poptQV.c:107 +#: lib/poptQV.c:106 msgid "query/verify package(s) owning file" msgstr "fråga/verifiera paket som äger fil" -#: lib/poptQV.c:109 +#: lib/poptQV.c:108 msgid "query/verify package(s) in group" msgstr "fråga/verifiera paket i grupp" -#: lib/poptQV.c:111 +#: lib/poptQV.c:110 msgid "query/verify a package file" msgstr "fråga/verifiera en paketfil" -#: lib/poptQV.c:114 +#: lib/poptQV.c:113 msgid "query/verify package(s) from TOP file tree walk" msgstr "fråga/verifiera paket från TOP-trädtraversering" -#: lib/poptQV.c:116 +#: lib/poptQV.c:115 msgid "query/verify package(s) from system HDLIST" msgstr "fråga/verifiera paket från system-HDLIST" -#: lib/poptQV.c:119 +#: lib/poptQV.c:118 msgid "query/verify package(s) with package identifier" msgstr "fråga/verifiera paket som med paketidentifierare" -#: lib/poptQV.c:121 +#: lib/poptQV.c:120 msgid "query/verify package(s) with header identifier" msgstr "fråga/verifiera paket med huvudidentifierare" -#: lib/poptQV.c:123 +#: lib/poptQV.c:122 msgid "query/verify package(s) with file identifier" msgstr "fråga/verifiera paket med filidentifierare" -#: lib/poptQV.c:126 +#: lib/poptQV.c:125 msgid "rpm query mode" msgstr "rpm frågeläge" -#: lib/poptQV.c:128 +#: lib/poptQV.c:127 msgid "query/verify a header instance" msgstr "fråga/verifiera en huvudinstans" -#: lib/poptQV.c:130 +#: lib/poptQV.c:129 msgid "query a spec file" msgstr "fråga en specfil" -#: lib/poptQV.c:130 +#: lib/poptQV.c:129 msgid "<spec>" msgstr "<spec>" -#: lib/poptQV.c:132 +#: lib/poptQV.c:131 msgid "query/verify package(s) from install transaction" msgstr "fråga/verifiera paket från installationstransaktion" -#: lib/poptQV.c:134 +#: lib/poptQV.c:133 msgid "query the package(s) triggered by the package" msgstr "fråga paket utlösta av paketet" -#: lib/poptQV.c:136 +#: lib/poptQV.c:135 msgid "rpm verify mode" msgstr "rpm verifieringsläge" -#: lib/poptQV.c:138 +#: lib/poptQV.c:137 msgid "query/verify the package(s) which require a dependency" msgstr "fråga/verifiera paket som behöver ett beroende" -#: lib/poptQV.c:140 +#: lib/poptQV.c:139 msgid "query/verify the package(s) which provide a dependency" msgstr "fråga/verifiera paket som tillhandahåller ett beroende" -#: lib/poptQV.c:143 +#: lib/poptQV.c:142 msgid "create transaction set" msgstr "skapa transaktionsmängd" -#: lib/poptQV.c:145 +#: lib/poptQV.c:144 msgid "do not order transaction set" msgstr "ordna inte transaktionsmängd" -#: lib/poptQV.c:147 +#: lib/poptQV.c:146 msgid "do not glob arguments" msgstr "mönstermatcha inte argument" -#: lib/poptQV.c:149 +#: lib/poptQV.c:148 msgid "do not process non-package files as manifests" msgstr "behandla inte icke-paket-filer som förteckningar" -#: lib/poptQV.c:151 +#: lib/poptQV.c:150 msgid "do not read headers" msgstr "läs inte huvuden" -#: lib/poptQV.c:258 +#: lib/poptQV.c:257 msgid "list all configuration files" msgstr "lista alla konfigurationsfiler" -#: lib/poptQV.c:260 +#: lib/poptQV.c:259 msgid "list all documentation files" msgstr "lista alla dokumentationsfiler" -#: lib/poptQV.c:262 +#: lib/poptQV.c:261 msgid "dump basic file information" msgstr "visa filinformation" -#: lib/poptQV.c:266 +#: lib/poptQV.c:265 msgid "list files in package" msgstr "lista filer i paketet" -#: lib/poptQV.c:271 +#: lib/poptQV.c:270 #, c-format msgid "skip %%ghost files" msgstr "hoppa över %%ghost-filer" -#: lib/poptQV.c:275 +#: lib/poptQV.c:274 #, c-format msgid "skip %%license files" msgstr "hoppa över %%license-filer" -#: lib/poptQV.c:278 +#: lib/poptQV.c:277 #, c-format msgid "skip %%readme files" msgstr "hoppa över %%readme-filer" -#: lib/poptQV.c:284 +#: lib/poptQV.c:283 msgid "use the following query format" msgstr "använd följande frågeformat" -#: lib/poptQV.c:286 +#: lib/poptQV.c:285 msgid "substitute i18n sections into spec file" msgstr "ersätt översatta sektioner till specfil" -#: lib/poptQV.c:288 +#: lib/poptQV.c:287 msgid "display the states of the listed files" msgstr "visa tillstånd för de listade filerna" -#: lib/poptQV.c:314 +#: lib/poptQV.c:313 msgid "don't verify size of files" msgstr "verifiera inte storlekar på filer" -#: lib/poptQV.c:317 +#: lib/poptQV.c:316 msgid "don't verify symlink path of files" msgstr "verifiera inte sökvägen i symboliska länkar" -#: lib/poptQV.c:320 +#: lib/poptQV.c:319 msgid "don't verify owner of files" msgstr "verifiera inte ägare till filer" -#: lib/poptQV.c:323 +#: lib/poptQV.c:322 msgid "don't verify group of files" msgstr "verifiera inte grupper till filer" -#: lib/poptQV.c:326 +#: lib/poptQV.c:325 msgid "don't verify modification time of files" msgstr "verifiera inte modifikationstiden för filer" -#: lib/poptQV.c:329 lib/poptQV.c:332 +#: lib/poptQV.c:328 lib/poptQV.c:331 msgid "don't verify mode of files" msgstr "verifiera inte rättigheter för filer" -#: lib/poptQV.c:335 +#: lib/poptQV.c:334 msgid "don't verify file security contexts" msgstr "verifiera inte filsäkerhetskontexter" -#: lib/poptQV.c:337 +#: lib/poptQV.c:336 msgid "don't verify files in package" msgstr "verifiera inte filerna i paketet" -#: lib/poptQV.c:340 lib/poptQV.c:343 tools/rpmgraph.c:266 +#: lib/poptQV.c:339 lib/poptQV.c:342 tools/rpmgraph.c:266 msgid "don't verify package dependencies" msgstr "verifiera inte paketberoenden" -#: lib/poptQV.c:348 lib/poptQV.c:352 lib/poptQV.c:355 lib/poptQV.c:358 +#: lib/poptQV.c:347 lib/poptQV.c:351 lib/poptQV.c:354 lib/poptQV.c:357 msgid "don't execute verify script(s)" msgstr "utför inte verifieringsskript" -#: lib/poptQV.c:382 +#: lib/poptQV.c:381 msgid "don't verify GPG V3 DSA signature(s)" msgstr "verifiera inte GPG V3 DSA-signatur(er)" -#: lib/poptQV.c:385 +#: lib/poptQV.c:384 msgid "don't verify PGP V3 RSA/MD5 signature(s)" msgstr "verifiera inte PGP V3 RSA/MD5-signatur(er)" -#: lib/poptQV.c:400 +#: lib/poptQV.c:399 msgid "sign package(s) (identical to --resign)" msgstr "signera paket (detsamma som --resign)" -#: lib/poptQV.c:402 +#: lib/poptQV.c:401 msgid "verify package signature(s)" msgstr "verifiera paketsignatur(er)" -#: lib/poptQV.c:404 +#: lib/poptQV.c:403 msgid "delete package signatures" msgstr "tag bort paketsignaturer" -#: lib/poptQV.c:406 +#: lib/poptQV.c:405 msgid "import an armored public key" msgstr "importera en publik nyckel med skal" -#: lib/poptQV.c:408 +#: lib/poptQV.c:407 msgid "sign package(s) (identical to --addsign)" msgstr "signera paket (detsamma som --addsign)" -#: lib/poptQV.c:410 +#: lib/poptQV.c:409 msgid "generate signature" msgstr "generera signatur" @@ -2709,38 +2709,38 @@ msgstr "paket %s har ouppfyllda %s: %s\n" msgid "%s skipped due to missingok flag\n" msgstr "%s överhoppad på grund av missingok-flagga\n" -#: lib/rpmfi.c:846 +#: lib/rpmfi.c:850 msgid "========== relocations\n" msgstr "========== omflyttningar\n" -#: lib/rpmfi.c:850 +#: lib/rpmfi.c:854 #, c-format msgid "%5d exclude %s\n" msgstr "%5d utesluter %s\n" -#: lib/rpmfi.c:853 +#: lib/rpmfi.c:857 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "%5d flyttar om %s -> %s\n" -#: lib/rpmfi.c:987 +#: lib/rpmfi.c:991 #, c-format msgid "excluding %s %s\n" msgstr "hoppar över %s %s\n" -#: lib/rpmfi.c:997 +#: lib/rpmfi.c:1001 #, c-format msgid "relocating %s to %s\n" msgstr "flyttar %s till %s\n" -#: lib/rpmfi.c:1089 +#: lib/rpmfi.c:1093 #, c-format msgid "relocating directory %s to %s\n" msgstr "flyttar katalogen %s till %s\n" #: lib/rpmgi.c:81 lib/rpminstall.c:124 lib/rpminstall.c:480 -#: lib/rpminstall.c:615 lib/rpminstall.c:1041 lib/rpmts.c:643 -#: tools/rpmgraph.c:121 tools/rpmgraph.c:158 +#: lib/rpminstall.c:615 lib/rpmts.c:643 tools/rpmgraph.c:121 +#: tools/rpmgraph.c:158 #, c-format msgid "open of %s failed: %s\n" msgstr "misslyckades med att öppna %s: %s\n" @@ -2751,7 +2751,7 @@ msgid "unknown tag: \"%s\"\n" msgstr "okänd tagg: \"%s\"\n" #: lib/rpmgi.c:628 lib/rpminstall.c:659 lib/rpminstall.c:834 -#: lib/rpminstall.c:1267 lib/transaction.c:1031 tools/rpmgraph.c:196 +#: lib/rpminstall.c:1084 lib/transaction.c:1026 tools/rpmgraph.c:196 msgid "Failed dependencies:\n" msgstr "Ouppfyllda beroenden:\n" @@ -2867,16 +2867,16 @@ msgstr "kan inte öppna %s: %s\n" msgid "Installing %s\n" msgstr "Installerar %s\n" -#: lib/rpminstall.c:1261 lib/transaction.c:1024 +#: lib/rpminstall.c:1078 lib/transaction.c:1019 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "Återställer paket (+%d/-%d) till %-24.24s (0x%08x):\n" -#: lib/rpminstall.c:1292 lib/transaction.c:1075 +#: lib/rpminstall.c:1109 lib/transaction.c:1070 msgid "Cleaning up repackaged packages:\n" msgstr "Rensar upp ompaketerade paket:\n" -#: lib/rpminstall.c:1299 lib/transaction.c:1081 +#: lib/rpminstall.c:1116 lib/transaction.c:1076 #, c-format msgid "\tRemoving %s:\n" msgstr "\tTar bort %s:\n" @@ -3009,97 +3009,97 @@ msgstr "%s står i konflikt med %s%s" msgid "unknown error %d encountered while manipulating package %s" msgstr "okänt fel %d uppträdde under behandling av paket %s" -#: lib/rpmrc.c:199 +#: lib/rpmrc.c:213 #, c-format msgid "missing second ':' at %s:%d\n" msgstr "andra \":\" saknas vid %s:%d\n" -#: lib/rpmrc.c:202 +#: lib/rpmrc.c:216 #, c-format msgid "missing architecture name at %s:%d\n" msgstr "arkitekturnamn saknas vid %s:%d\n" -#: lib/rpmrc.c:356 +#: lib/rpmrc.c:370 #, c-format msgid "Incomplete data line at %s:%d\n" msgstr "Ofullständig datarad vid %s:%d\n" -#: lib/rpmrc.c:361 +#: lib/rpmrc.c:375 #, c-format msgid "Too many args in data line at %s:%d\n" msgstr "För många argument i datarad vid %s:%d\n" -#: lib/rpmrc.c:369 +#: lib/rpmrc.c:383 #, c-format msgid "Bad arch/os number: %s (%s:%d)\n" msgstr "Felaktigt arkitektur-/os-nummer: %s (%s:%d)\n" -#: lib/rpmrc.c:406 +#: lib/rpmrc.c:420 #, c-format msgid "Incomplete default line at %s:%d\n" msgstr "Ofullständig standardvärdesrad vid %s:%d\n" -#: lib/rpmrc.c:411 +#: lib/rpmrc.c:425 #, c-format msgid "Too many args in default line at %s:%d\n" msgstr "För många argument i standardvärdesrad vid %s:%d\n" -#: lib/rpmrc.c:577 +#: lib/rpmrc.c:591 #, c-format msgid "Failed to read %s: %s.\n" msgstr "Misslyckades med att läsa %s: %s.\n" -#: lib/rpmrc.c:615 +#: lib/rpmrc.c:629 #, c-format msgid "missing ':' (found 0x%02x) at %s:%d\n" msgstr "\":\" saknas (hittade 0x%02x) vid %s:%d\n" -#: lib/rpmrc.c:632 lib/rpmrc.c:706 +#: lib/rpmrc.c:646 lib/rpmrc.c:710 #, c-format msgid "missing argument for %s at %s:%d\n" msgstr "argument till %s saknas vid %s:%d\n" -#: lib/rpmrc.c:649 lib/rpmrc.c:671 +#: lib/rpmrc.c:663 #, c-format msgid "%s expansion failed at %s:%d \"%s\"\n" msgstr "%s expansion misslyckades vid %s:%d \"%s\"\n" -#: lib/rpmrc.c:658 +#: lib/rpmrc.c:672 #, c-format msgid "cannot open %s at %s:%d: %s\n" msgstr "kan inte öppna %s vid %s:%d: %s\n" -#: lib/rpmrc.c:698 +#: lib/rpmrc.c:702 #, c-format msgid "missing architecture for %s at %s:%d\n" msgstr "arkitektur saknas för %s vid %s:%d\n" -#: lib/rpmrc.c:765 +#: lib/rpmrc.c:769 #, c-format msgid "bad option '%s' at %s:%d\n" msgstr "okänd flagga \"%s\" vid %s:%d\n" -#: lib/rpmrc.c:1564 +#: lib/rpmrc.c:1568 #, c-format msgid "Unknown system: %s\n" msgstr "Okänt system: %s\n" -#: lib/rpmrc.c:1565 +#: lib/rpmrc.c:1569 #, c-format msgid "Please contact %s\n" msgstr "" -#: lib/rpmrc.c:1802 +#: lib/rpmrc.c:1806 #, c-format msgid "Cannot expand %s\n" msgstr "Kan inte expandera %s\n" -#: lib/rpmrc.c:1807 +#: lib/rpmrc.c:1811 #, c-format msgid "Cannot read %s, HOME is too large.\n" msgstr "Kan inte läsa %s, HOME är för stor.\n" -#: lib/rpmrc.c:1824 +#: lib/rpmrc.c:1828 #, c-format msgid "Unable to open %s for reading: %s.\n" msgstr "Kan inte öppna %s för läsning: %s.\n" @@ -3392,162 +3392,162 @@ msgstr "Trasig MD5-summa: STÖDS EJ\n" msgid "Signature: UNKNOWN (%d)\n" msgstr "Signatur: OKÄND (%d)\n" -#: lib/transaction.c:935 +#: lib/transaction.c:930 #, c-format msgid "excluding directory %s\n" msgstr "hoppar över katalogen %s\n" -#: lib/transaction.c:1022 +#: lib/transaction.c:1017 msgid "Transaction failed...rolling back\n" msgstr "Transaktion misslyckades...rullar tillbaka\n" -#: lib/transaction.c:1042 +#: lib/transaction.c:1037 msgid "Could not order auto-rollback transaction!\n" msgstr "Kunde inte ordna automatiskt återrullad transaktion!\n" -#: lib/transaction.c:1132 +#: lib/transaction.c:1127 msgid "Getting repackaged header from transaction element\n" msgstr "Hämtar ompaketerade huvuden från transaktionselement\n" -#: lib/transaction.c:1157 +#: lib/transaction.c:1152 #, c-format msgid "\tLooking for %s...\n" msgstr "\tLetar efter %s...\n" -#: lib/transaction.c:1161 +#: lib/transaction.c:1156 msgid "\tMatches found.\n" msgstr "\tTräffar hittade.\n" -#: lib/transaction.c:1165 +#: lib/transaction.c:1160 msgid "\tNo matches found.\n" msgstr "\tInga träffar hittade.\n" -#: lib/transaction.c:1178 +#: lib/transaction.c:1173 msgid "\tRepackaged package not found!.\n" msgstr "\tOmpaketerat paket hittades inte!\n" -#: lib/transaction.c:1199 +#: lib/transaction.c:1194 msgid "\tREMOVETID matched INSTALLTID.\n" msgstr "REMOVETID matchar INSTALLTID.\n" -#: lib/transaction.c:1201 +#: lib/transaction.c:1196 #, c-format msgid "\t\tName: %s.\n" msgstr "\t\tNamn: %s.\n" -#: lib/transaction.c:1224 +#: lib/transaction.c:1219 #, c-format msgid "\tRepackaged Package was %s...\n" msgstr "\tOmpaketerat paket var %s ...\n" -#: lib/transaction.c:1268 +#: lib/transaction.c:1263 msgid "Adding install element to auto-rollback transaction.\n" msgstr "" "Lägger till installationselement till automatisk återrullningstransaktion.\n" -#: lib/transaction.c:1277 +#: lib/transaction.c:1272 msgid "Could not get install element database instance!\n" msgstr "Kunde inte hämta databasinstans för installationselement!\n" -#: lib/transaction.c:1290 +#: lib/transaction.c:1285 msgid "Could not get header for auto-rollback transaction!\n" msgstr "Kunde inte hämta huvud för automatisk återrullningstransaktion!\n" -#: lib/transaction.c:1300 +#: lib/transaction.c:1295 #, c-format msgid "\tAdded repackaged package header: %s.\n" msgstr "\tLade till ompaketerat pakethuvud: %s.\n" -#: lib/transaction.c:1302 lib/transaction.c:1313 +#: lib/transaction.c:1297 lib/transaction.c:1308 #, c-format msgid "\tAdded from install element %s.\n" msgstr "\tLade till från installationselement %s.\n" -#: lib/transaction.c:1311 +#: lib/transaction.c:1306 msgid "\tAdded erase element.\n" msgstr "\tLade till raderingselement.\n" -#: lib/transaction.c:1320 +#: lib/transaction.c:1315 msgid "Could not get repackaged header for auto-rollback transaction!\n" msgstr "" "Kunde inte hämta ompaketerat huvud för automatisk återrullningstransaktion!\n" -#: lib/transaction.c:1327 +#: lib/transaction.c:1322 msgid "Add erase element to auto-rollback transaction.\n" msgstr "Lägg till raderingselement till automatisk återrullningstransaktion.\n" -#: lib/transaction.c:1335 +#: lib/transaction.c:1330 msgid "\tFound existing upgrade element.\n" msgstr "\tHittade ett existerande uppdateringselement.\n" -#: lib/transaction.c:1336 +#: lib/transaction.c:1331 #, c-format msgid "\tNot adding erase element for %s.\n" msgstr "\tLägger inte till raderingselemtn för %s.\n" -#: lib/transaction.c:1353 +#: lib/transaction.c:1348 #, c-format msgid "\tAdded repackaged package %s.\n" msgstr "\tLade till ompaketerat paket %s.\n" -#: lib/transaction.c:1355 +#: lib/transaction.c:1350 #, c-format msgid "\tAdded from erase element %s.\n" msgstr "\tLade till från raderingselement %s.\n" -#: lib/transaction.c:1360 +#: lib/transaction.c:1355 msgid "Could not add erase element to auto-rollback transaction.\n" msgstr "" "Kunde inte lägga till raderingselement till automatiskt återrullad " "transaktion.\n" -#: lib/transaction.c:1366 +#: lib/transaction.c:1361 msgid "\tNo repackaged package...nothing to do.\n" msgstr "\tInget ompaketerat paket ... inget att göra.\n" -#: lib/transaction.c:1372 +#: lib/transaction.c:1367 msgid "Failure reading repackaged package!\n" msgstr "Misslyckades läsa ompaketerat paket!\n" -#: lib/transaction.c:1495 +#: lib/transaction.c:1490 #, c-format msgid "sanity checking %d elements\n" msgstr "rimlighetskontrollerar %d element\n" -#: lib/transaction.c:1581 +#: lib/transaction.c:1576 msgid "running pre-transaction scripts\n" msgstr "kör skript före transaktion\n" -#: lib/transaction.c:1655 +#: lib/transaction.c:1650 #, c-format msgid "computing %d file fingerprints\n" msgstr "beräknar %d filfingeravtryck\n" -#: lib/transaction.c:1739 +#: lib/transaction.c:1734 msgid "computing file dispositions\n" msgstr "beräknar filåtgärder\n" -#: lib/transaction.c:1932 +#: lib/transaction.c:1927 msgid "Creating auto-rollback transaction\n" msgstr "Skapar automatiskt återrullad transaktion\n" -#: lib/transaction.c:2086 +#: lib/transaction.c:2077 msgid "Add failed. Could not read package header.\n" msgstr "Tilläggande misslyckades. Kunde inte läsa pakethuvud.\n" -#: lib/transaction.c:2170 +#: lib/transaction.c:2161 msgid "Add failed in rpmpsmStage().\n" msgstr "Tilläggande misslyckades i rpmpsmStage().\n" -#: lib/transaction.c:2214 +#: lib/transaction.c:2205 msgid "Add failed. Could not get file list.\n" msgstr "Tilläggande misslyckades. Kunde inte hämta fillista.\n" -#: lib/transaction.c:2263 +#: lib/transaction.c:2254 msgid "Erase failed failed in rpmpsmStage().\n" msgstr "Radering misslyckades i rpmpsmStage().\n" -#: lib/transaction.c:2324 +#: lib/transaction.c:2315 msgid "running post-transaction scripts\n" msgstr "kör skript efter transaktion\n" @@ -3940,86 +3940,86 @@ msgstr "öppnar db-index %s/%s %s rättighet=0x%x\n" msgid "======================== active %d empty %d\n" msgstr "======================== aktiva %d tomma %d\n" -#: rpmio/macro.c:394 +#: rpmio/macro.c:396 #, c-format msgid "%3d>%*s(empty)" msgstr "%3d>%*s(tom)" -#: rpmio/macro.c:437 +#: rpmio/macro.c:439 #, c-format msgid "%3d<%*s(empty)\n" msgstr "%3d<%*s(tom)\n" -#: rpmio/macro.c:664 rpmio/macro.c:705 +#: rpmio/macro.c:608 rpmio/macro.c:1090 rpmio/macro.c:1123 rpmio/macro.c:1863 +msgid "Target buffer overflow\n" +msgstr "Målbuffert översvämmad\n" + +#: rpmio/macro.c:671 rpmio/macro.c:712 #, c-format msgid "Macro %%%s has unterminated body\n" msgstr "Makro %%%s har oavslutad kropp\n" -#: rpmio/macro.c:727 +#: rpmio/macro.c:734 #, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "Makro %%%s har otillåtet namn (%%define)\n" -#: rpmio/macro.c:733 +#: rpmio/macro.c:740 #, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "Makro %%%s har oavslutade flaggor\n" -#: rpmio/macro.c:738 +#: rpmio/macro.c:745 #, c-format msgid "Macro %%%s has empty body\n" msgstr "makro %%%s har tom kropp\n" -#: rpmio/macro.c:744 +#: rpmio/macro.c:751 #, c-format msgid "Macro %%%s failed to expand\n" msgstr "Makro %%%s misslyckades att expandera\n" -#: rpmio/macro.c:779 +#: rpmio/macro.c:786 #, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "Makro %%%s har otillåtet namn (%%undefine)\n" -#: rpmio/macro.c:897 +#: rpmio/macro.c:904 #, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "Makro %%%s (%s) användes inte under nivå %d\n" -#: rpmio/macro.c:1024 +#: rpmio/macro.c:1031 #, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "Okänd flagga %c i %s(%s)\n" -#: rpmio/macro.c:1224 +#: rpmio/macro.c:1239 #, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "Rekursionsdjup(%d) större än max(%d)\n" -#: rpmio/macro.c:1297 rpmio/macro.c:1314 +#: rpmio/macro.c:1312 rpmio/macro.c:1329 #, c-format msgid "Unterminated %c: %s\n" msgstr "Oavslutad %c: %s\n" -#: rpmio/macro.c:1355 +#: rpmio/macro.c:1370 #, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "Ett %% följs av ett makro som inte kan tolkas\n" -#: rpmio/macro.c:1512 +#: rpmio/macro.c:1527 #, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "Inget makro %%%.*s hittat, hoppar över\n" -#: rpmio/macro.c:1848 -msgid "Target buffer overflow\n" -msgstr "Målbuffert översvämmad\n" - -#: rpmio/macro.c:2056 rpmio/macro.c:2062 +#: rpmio/macro.c:2076 rpmio/macro.c:2082 #, c-format msgid "File %s: %s\n" msgstr "Fil %s: %s\n" -#: rpmio/macro.c:2065 +#: rpmio/macro.c:2085 #, c-format msgid "File %s is smaller than %u bytes\n" msgstr "Filen %s är mindre än %u byte\n" @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n" -"POT-Creation-Date: 2007-08-21 08:04+0200\n" +"POT-Creation-Date: 2007-08-30 18:37+0200\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" @@ -1292,20 +1292,20 @@ msgstr "paket baðýmlýlýklarýný denetlemez" msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "paket baþlýklarýný (eski) rpm[23] paketleme ile uyumlu üretir" -#: build/poptBT.c:229 lib/poptALL.c:273 lib/poptI.c:282 lib/poptQV.c:363 -#: lib/poptQV.c:372 lib/poptQV.c:413 +#: build/poptBT.c:229 lib/poptALL.c:273 lib/poptI.c:282 lib/poptQV.c:362 +#: lib/poptQV.c:371 lib/poptQV.c:412 #, fuzzy msgid "don't verify package digest(s)" msgstr "paket baðýmlýlýklarý doðrulanmaz" -#: build/poptBT.c:231 lib/poptALL.c:275 lib/poptI.c:284 lib/poptQV.c:366 -#: lib/poptQV.c:374 lib/poptQV.c:416 +#: build/poptBT.c:231 lib/poptALL.c:275 lib/poptI.c:284 lib/poptQV.c:365 +#: lib/poptQV.c:373 lib/poptQV.c:415 #, fuzzy msgid "don't verify database header(s) when retrieved" msgstr "paket mimarisi denetlenmez" -#: build/poptBT.c:233 lib/poptALL.c:281 lib/poptI.c:286 lib/poptQV.c:369 -#: lib/poptQV.c:376 lib/poptQV.c:418 +#: build/poptBT.c:233 lib/poptALL.c:281 lib/poptI.c:286 lib/poptQV.c:368 +#: lib/poptQV.c:375 lib/poptQV.c:417 #, fuzzy msgid "don't verify package signature(s)" msgstr "paket imzasýný denetler" @@ -1368,27 +1368,27 @@ msgstr "%s baþarýsýz\n" msgid "failed to write all data to %s\n" msgstr "tüm veri %s içine yazýlamadý\n" -#: build/rpmfc.c:1250 +#: build/rpmfc.c:1249 #, fuzzy, c-format msgid "magic_open(0x%x) failed: %s\n" msgstr "%s açýlamadý: %s\n" -#: build/rpmfc.c:1258 +#: build/rpmfc.c:1257 #, fuzzy, c-format -msgid "magic_load(ms, \"%s\") failed: %s\n" +msgid "magic_load failed: %s\n" msgstr "%s / %s dizinin silinmesi baþarýsýz: %s\n" -#: build/rpmfc.c:1303 +#: build/rpmfc.c:1301 #, c-format msgid "magic_file(ms, \"%s\") failed: mode %06o %s\n" msgstr "" -#: build/rpmfc.c:1524 +#: build/rpmfc.c:1522 #, fuzzy, c-format msgid "Finding %s: %s\n" msgstr "%s aranýyor: (%s kullanarak)...\n" -#: build/rpmfc.c:1530 build/rpmfc.c:1539 +#: build/rpmfc.c:1528 build/rpmfc.c:1537 #, c-format msgid "Failed to find %s:\n" msgstr "%s bulunamadý:\n" @@ -1513,11 +1513,11 @@ msgstr "" msgid "removing %s \"%s\" from tsort relations.\n" msgstr "tsort baðýntýlarýndan %s-%s-%s \"%s\" kaldýrýlýyor\n" -#: lib/depends.c:1265 +#: lib/depends.c:1271 msgid "========== recording tsort relations\n" msgstr "========== tsort baðýntýlarý kaydediliyor\n" -#: lib/depends.c:1357 +#: lib/depends.c:1363 #, fuzzy msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, depth, " @@ -1525,20 +1525,20 @@ msgid "" msgstr "" "========== paketler tsort'lanýyor (sýra, #öncüller, #ardýllar, derinlik)\n" -#: lib/depends.c:1453 +#: lib/depends.c:1459 #, fuzzy, c-format msgid "========== successors only (%d bytes)\n" msgstr "========== sadece ardýllar (sunum sýrasý)\n" -#: lib/depends.c:1526 +#: lib/depends.c:1532 msgid "LOOP:\n" msgstr "ÇEVRÝM:\n" -#: lib/depends.c:1561 +#: lib/depends.c:1567 msgid "========== continuing tsort ...\n" msgstr "========== tsort sürüyor ...\n" -#: lib/depends.c:1566 +#: lib/depends.c:1572 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2099,7 +2099,7 @@ msgstr "veri tabanýný günceller, ama dosya sistemini deðiþtirmez" msgid "do not verify package dependencies" msgstr "paket baðýmlýlýklarýný denetlemez" -#: lib/poptI.c:252 lib/poptQV.c:307 lib/poptQV.c:310 +#: lib/poptI.c:252 lib/poptQV.c:306 lib/poptQV.c:309 msgid "don't verify MD5 digest of files" msgstr "dosyalarýn MD5 özümlemesi doðrulanmaz" @@ -2218,233 +2218,233 @@ msgstr "yükleme yapmaz, sadece çalýþýp çalýþmayacaðýný belirtir" msgid "upgrade package(s)" msgstr "paket günceller" -#: lib/poptQV.c:103 +#: lib/poptQV.c:102 msgid "query/verify all packages" msgstr "tüm paketleri sorgular/doðrular" -#: lib/poptQV.c:105 +#: lib/poptQV.c:104 #, fuzzy msgid "rpm checksig mode" msgstr "rpm denetleme kipi" -#: lib/poptQV.c:107 +#: lib/poptQV.c:106 msgid "query/verify package(s) owning file" msgstr "dosyayý içeren paketleri sorgular/denetler" -#: lib/poptQV.c:109 +#: lib/poptQV.c:108 msgid "query/verify package(s) in group" msgstr "gruptaki paketleri sorgular/denetler" -#: lib/poptQV.c:111 +#: lib/poptQV.c:110 #, fuzzy msgid "query/verify a package file" msgstr "tüm paketleri sorgular/doðrular" -#: lib/poptQV.c:114 +#: lib/poptQV.c:113 #, fuzzy msgid "query/verify package(s) from TOP file tree walk" msgstr "gruptaki paketleri sorgular/denetler" -#: lib/poptQV.c:116 +#: lib/poptQV.c:115 #, fuzzy msgid "query/verify package(s) from system HDLIST" msgstr "gruptaki paketleri sorgular/denetler" -#: lib/poptQV.c:119 +#: lib/poptQV.c:118 #, fuzzy msgid "query/verify package(s) with package identifier" msgstr "dosyayý içeren paketleri sorgular/denetler" -#: lib/poptQV.c:121 +#: lib/poptQV.c:120 #, fuzzy msgid "query/verify package(s) with header identifier" msgstr "dosyayý içeren paketleri sorgular/denetler" -#: lib/poptQV.c:123 +#: lib/poptQV.c:122 #, fuzzy msgid "query/verify package(s) with file identifier" msgstr "dosyayý içeren paketleri sorgular/denetler" -#: lib/poptQV.c:126 +#: lib/poptQV.c:125 msgid "rpm query mode" msgstr "rpm sorgulama kipi" -#: lib/poptQV.c:128 +#: lib/poptQV.c:127 #, fuzzy msgid "query/verify a header instance" msgstr "dosyayý içeren paketleri sorgular/denetler" -#: lib/poptQV.c:130 +#: lib/poptQV.c:129 msgid "query a spec file" msgstr "bir spec dosyasýný sorgular" -#: lib/poptQV.c:130 +#: lib/poptQV.c:129 msgid "<spec>" msgstr "<spec>" -#: lib/poptQV.c:132 +#: lib/poptQV.c:131 #, fuzzy msgid "query/verify package(s) from install transaction" msgstr "gruptaki paketleri sorgular/denetler" -#: lib/poptQV.c:134 +#: lib/poptQV.c:133 msgid "query the package(s) triggered by the package" msgstr "paket tarafýndan tetiklenen paketleri sorgular" -#: lib/poptQV.c:136 +#: lib/poptQV.c:135 msgid "rpm verify mode" msgstr "rpm denetleme kipi" -#: lib/poptQV.c:138 +#: lib/poptQV.c:137 msgid "query/verify the package(s) which require a dependency" msgstr "bir baðýmlýlýk gerektiren paketleri sorgular/denetler" -#: lib/poptQV.c:140 +#: lib/poptQV.c:139 msgid "query/verify the package(s) which provide a dependency" msgstr "bir baðýmlýlýðý saðlayan paketleri sorgular/denetler" -#: lib/poptQV.c:143 +#: lib/poptQV.c:142 msgid "create transaction set" msgstr "" -#: lib/poptQV.c:145 +#: lib/poptQV.c:144 msgid "do not order transaction set" msgstr "" -#: lib/poptQV.c:147 +#: lib/poptQV.c:146 #, fuzzy msgid "do not glob arguments" msgstr "sorgulama için hiç argüman belirtilmedi" -#: lib/poptQV.c:149 +#: lib/poptQV.c:148 msgid "do not process non-package files as manifests" msgstr "" -#: lib/poptQV.c:151 +#: lib/poptQV.c:150 #, fuzzy msgid "do not read headers" msgstr "%s: 0x%x de baþlýk okunamadý\n" -#: lib/poptQV.c:258 +#: lib/poptQV.c:257 msgid "list all configuration files" msgstr "tüm yapýlandýrma dosyalarýný listeler" -#: lib/poptQV.c:260 +#: lib/poptQV.c:259 msgid "list all documentation files" msgstr "tüm belgeleme dosyalarýný gösterir" -#: lib/poptQV.c:262 +#: lib/poptQV.c:261 msgid "dump basic file information" msgstr "temel dosya bilgilerini gösterir" -#: lib/poptQV.c:266 +#: lib/poptQV.c:265 msgid "list files in package" msgstr "paketteki dosyalarý gösterir" -#: lib/poptQV.c:271 +#: lib/poptQV.c:270 #, c-format msgid "skip %%ghost files" msgstr "%%ghost dosyalarý atlanýr" -#: lib/poptQV.c:275 +#: lib/poptQV.c:274 #, c-format msgid "skip %%license files" msgstr "%%license dosyalarý atlanýr" -#: lib/poptQV.c:278 +#: lib/poptQV.c:277 #, c-format msgid "skip %%readme files" msgstr "%%readme dosyalarý atlanýr" -#: lib/poptQV.c:284 +#: lib/poptQV.c:283 msgid "use the following query format" msgstr "izleyen sorgulama biçimini kullanýr" -#: lib/poptQV.c:286 +#: lib/poptQV.c:285 msgid "substitute i18n sections into spec file" msgstr "spec dosyasýndaki i18n bölümleri yerine kullanýlýr" -#: lib/poptQV.c:288 +#: lib/poptQV.c:287 msgid "display the states of the listed files" msgstr "listelenmiþ dosyalarýn durumunu gösterir" -#: lib/poptQV.c:314 +#: lib/poptQV.c:313 msgid "don't verify size of files" msgstr "dosyalarýn uzunluklarý doðrulanmaz" -#: lib/poptQV.c:317 +#: lib/poptQV.c:316 msgid "don't verify symlink path of files" msgstr "dosyalarýn sembolik bað dosya yollarý doðrulanmaz" -#: lib/poptQV.c:320 +#: lib/poptQV.c:319 msgid "don't verify owner of files" msgstr "dosyalarýn sahipleri doðrulanmaz" -#: lib/poptQV.c:323 +#: lib/poptQV.c:322 msgid "don't verify group of files" msgstr "dosyalarýn gruplarý doðrulanmaz" -#: lib/poptQV.c:326 +#: lib/poptQV.c:325 msgid "don't verify modification time of files" msgstr "dosyalarýn deðiþiklik zamanlarý doðrulanmaz" -#: lib/poptQV.c:329 lib/poptQV.c:332 +#: lib/poptQV.c:328 lib/poptQV.c:331 msgid "don't verify mode of files" msgstr "dosyalarýn kipleri doðrulanmaz" -#: lib/poptQV.c:335 +#: lib/poptQV.c:334 #, fuzzy msgid "don't verify file security contexts" msgstr "paketteki dosyalar doðrulanamaz" -#: lib/poptQV.c:337 +#: lib/poptQV.c:336 msgid "don't verify files in package" msgstr "paketteki dosyalar doðrulanamaz" -#: lib/poptQV.c:340 lib/poptQV.c:343 tools/rpmgraph.c:266 +#: lib/poptQV.c:339 lib/poptQV.c:342 tools/rpmgraph.c:266 msgid "don't verify package dependencies" msgstr "paket baðýmlýlýklarý doðrulanmaz" -#: lib/poptQV.c:348 lib/poptQV.c:352 lib/poptQV.c:355 lib/poptQV.c:358 +#: lib/poptQV.c:347 lib/poptQV.c:351 lib/poptQV.c:354 lib/poptQV.c:357 #, fuzzy msgid "don't execute verify script(s)" msgstr "(varsa) %verifyscript çalýþtýrýlmaz" -#: lib/poptQV.c:382 +#: lib/poptQV.c:381 #, fuzzy msgid "don't verify GPG V3 DSA signature(s)" msgstr "Baþlýk SHA1 özümlemesi doðrulanmaz" -#: lib/poptQV.c:385 +#: lib/poptQV.c:384 #, fuzzy msgid "don't verify PGP V3 RSA/MD5 signature(s)" msgstr "dosyalarýn MD5 özümlemesi doðrulanmaz" -#: lib/poptQV.c:400 +#: lib/poptQV.c:399 #, fuzzy msgid "sign package(s) (identical to --resign)" msgstr "paketi imzalar (mevcut imza kaldýrýlýr)" -#: lib/poptQV.c:402 +#: lib/poptQV.c:401 #, fuzzy msgid "verify package signature(s)" msgstr "paket imzasýný denetler" -#: lib/poptQV.c:404 +#: lib/poptQV.c:403 #, fuzzy msgid "delete package signatures" msgstr "paket imzasýný denetler" -#: lib/poptQV.c:406 +#: lib/poptQV.c:405 msgid "import an armored public key" msgstr "" -#: lib/poptQV.c:408 +#: lib/poptQV.c:407 #, fuzzy msgid "sign package(s) (identical to --addsign)" msgstr "paketi imzalar (mevcut imza kaldýrýlýr)" -#: lib/poptQV.c:410 +#: lib/poptQV.c:409 msgid "generate signature" msgstr "imza üretir" @@ -2787,38 +2787,38 @@ msgstr "paket %s-%s-%s gereksinimi tatmin edici deðil: %s\n" msgid "%s skipped due to missingok flag\n" msgstr "missingok flamasýndan dolayý %s atlandý\n" -#: lib/rpmfi.c:846 +#: lib/rpmfi.c:850 msgid "========== relocations\n" msgstr "========== yeniden konumlama\n" -#: lib/rpmfi.c:850 +#: lib/rpmfi.c:854 #, c-format msgid "%5d exclude %s\n" msgstr "%5d %s'i dýþlýyor\n" -#: lib/rpmfi.c:853 +#: lib/rpmfi.c:857 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "%5d yeniden konumlandýrýlýyor: %s -> %s\n" -#: lib/rpmfi.c:987 +#: lib/rpmfi.c:991 #, c-format msgid "excluding %s %s\n" msgstr "%s %s dýþlanýyor\n" -#: lib/rpmfi.c:997 +#: lib/rpmfi.c:1001 #, c-format msgid "relocating %s to %s\n" msgstr "%s %s'e konumlanýyor\n" -#: lib/rpmfi.c:1089 +#: lib/rpmfi.c:1093 #, c-format msgid "relocating directory %s to %s\n" msgstr "%s dizini %s de yeniden konumlanýyor\n" #: lib/rpmgi.c:81 lib/rpminstall.c:124 lib/rpminstall.c:480 -#: lib/rpminstall.c:615 lib/rpminstall.c:1041 lib/rpmts.c:643 -#: tools/rpmgraph.c:121 tools/rpmgraph.c:158 +#: lib/rpminstall.c:615 lib/rpmts.c:643 tools/rpmgraph.c:121 +#: tools/rpmgraph.c:158 #, c-format msgid "open of %s failed: %s\n" msgstr "%s açýlamadý: %s\n" @@ -2829,7 +2829,7 @@ msgid "unknown tag: \"%s\"\n" msgstr "bilinmeyen etiket" #: lib/rpmgi.c:628 lib/rpminstall.c:659 lib/rpminstall.c:834 -#: lib/rpminstall.c:1267 lib/transaction.c:1031 tools/rpmgraph.c:196 +#: lib/rpminstall.c:1084 lib/transaction.c:1026 tools/rpmgraph.c:196 #, fuzzy msgid "Failed dependencies:\n" msgstr "baðýmlýlýklarda hata; gerekli paketler:\n" @@ -2949,16 +2949,16 @@ msgstr "%s açýlamadý: %s\n" msgid "Installing %s\n" msgstr "%s kuruluyor\n" -#: lib/rpminstall.c:1261 lib/transaction.c:1024 +#: lib/rpminstall.c:1078 lib/transaction.c:1019 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" -#: lib/rpminstall.c:1292 lib/transaction.c:1075 +#: lib/rpminstall.c:1109 lib/transaction.c:1070 msgid "Cleaning up repackaged packages:\n" msgstr "" -#: lib/rpminstall.c:1299 lib/transaction.c:1081 +#: lib/rpminstall.c:1116 lib/transaction.c:1076 #, fuzzy, c-format msgid "\tRemoving %s:\n" msgstr "%s alýnýyor\n" @@ -3093,97 +3093,97 @@ msgstr " %s-%s-%s ile çeliþiyor\n" msgid "unknown error %d encountered while manipulating package %s" msgstr "anlaþýlamayan %d hatasý, %s paketi iþlenirken saptandý" -#: lib/rpmrc.c:199 +#: lib/rpmrc.c:213 #, c-format msgid "missing second ':' at %s:%d\n" msgstr "%s:%d - ikinci ':' eksik\n" -#: lib/rpmrc.c:202 +#: lib/rpmrc.c:216 #, c-format msgid "missing architecture name at %s:%d\n" msgstr "%s:%d - mimari ismi eksik\n" -#: lib/rpmrc.c:356 +#: lib/rpmrc.c:370 #, c-format msgid "Incomplete data line at %s:%d\n" msgstr "%s:%d - veri satýrý tamamlanmamýþ\n" -#: lib/rpmrc.c:361 +#: lib/rpmrc.c:375 #, c-format msgid "Too many args in data line at %s:%d\n" msgstr "%s:%d - veri satýrýnda çok fazla argüman\n" -#: lib/rpmrc.c:369 +#: lib/rpmrc.c:383 #, c-format msgid "Bad arch/os number: %s (%s:%d)\n" msgstr "arch/os numarasý hatalý: %s (%s:%d)\n" -#: lib/rpmrc.c:406 +#: lib/rpmrc.c:420 #, c-format msgid "Incomplete default line at %s:%d\n" msgstr "%s:%d - öntanýmlý satýr tamamlanmamýþ\n" -#: lib/rpmrc.c:411 +#: lib/rpmrc.c:425 #, c-format msgid "Too many args in default line at %s:%d\n" msgstr "%s:%d - öntanýmlý satýrda çok fazla argüman\n" -#: lib/rpmrc.c:577 +#: lib/rpmrc.c:591 #, c-format msgid "Failed to read %s: %s.\n" msgstr "%s okunamadý: %s.\n" -#: lib/rpmrc.c:615 +#: lib/rpmrc.c:629 #, c-format msgid "missing ':' (found 0x%02x) at %s:%d\n" msgstr "(0x%02x bulundu) %s:%d de ':' yok\n" -#: lib/rpmrc.c:632 lib/rpmrc.c:706 +#: lib/rpmrc.c:646 lib/rpmrc.c:710 #, c-format msgid "missing argument for %s at %s:%d\n" msgstr "%s için %s:%d de argüman eksik\n" -#: lib/rpmrc.c:649 lib/rpmrc.c:671 +#: lib/rpmrc.c:663 #, c-format msgid "%s expansion failed at %s:%d \"%s\"\n" msgstr "%s geniþletmesi %s:%d \"%s\" de baþarýsýz \n" -#: lib/rpmrc.c:658 +#: lib/rpmrc.c:672 #, c-format msgid "cannot open %s at %s:%d: %s\n" msgstr "%s dosyasý açýlamýyor (%s:%d): %s\n" -#: lib/rpmrc.c:698 +#: lib/rpmrc.c:702 #, c-format msgid "missing architecture for %s at %s:%d\n" msgstr "%s için %s:%d'de eksik mimari\n" -#: lib/rpmrc.c:765 +#: lib/rpmrc.c:769 #, c-format msgid "bad option '%s' at %s:%d\n" msgstr "seçenek '%s' (%s:%d) de hatalý\n" -#: lib/rpmrc.c:1564 +#: lib/rpmrc.c:1568 #, c-format msgid "Unknown system: %s\n" msgstr "Bilinmeyen sistem: %s\n" -#: lib/rpmrc.c:1565 +#: lib/rpmrc.c:1569 #, c-format msgid "Please contact %s\n" msgstr "" -#: lib/rpmrc.c:1802 +#: lib/rpmrc.c:1806 #, c-format msgid "Cannot expand %s\n" msgstr "%s geniþletilemiyor\n" -#: lib/rpmrc.c:1807 +#: lib/rpmrc.c:1811 #, c-format msgid "Cannot read %s, HOME is too large.\n" msgstr "%s okunamýyor, EV çok büyük\n" -#: lib/rpmrc.c:1824 +#: lib/rpmrc.c:1828 #, c-format msgid "Unable to open %s for reading: %s.\n" msgstr "%s okuma eriþimi için açýlamadý: %s.\n" @@ -3476,160 +3476,160 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Ýmza: boyut(%d)+iz(%d)\n" -#: lib/transaction.c:935 +#: lib/transaction.c:930 #, c-format msgid "excluding directory %s\n" msgstr "%s dizini dýþlanýyor\n" -#: lib/transaction.c:1022 +#: lib/transaction.c:1017 msgid "Transaction failed...rolling back\n" msgstr "" -#: lib/transaction.c:1042 +#: lib/transaction.c:1037 msgid "Could not order auto-rollback transaction!\n" msgstr "" -#: lib/transaction.c:1132 +#: lib/transaction.c:1127 msgid "Getting repackaged header from transaction element\n" msgstr "" -#: lib/transaction.c:1157 +#: lib/transaction.c:1152 #, c-format msgid "\tLooking for %s...\n" msgstr "" -#: lib/transaction.c:1161 +#: lib/transaction.c:1156 msgid "\tMatches found.\n" msgstr "" -#: lib/transaction.c:1165 +#: lib/transaction.c:1160 msgid "\tNo matches found.\n" msgstr "" -#: lib/transaction.c:1178 +#: lib/transaction.c:1173 #, fuzzy msgid "\tRepackaged package not found!.\n" msgstr "kaynak paketi gerekirken çalýþtýrýlabilir paketi bulundu\n" -#: lib/transaction.c:1199 +#: lib/transaction.c:1194 msgid "\tREMOVETID matched INSTALLTID.\n" msgstr "" -#: lib/transaction.c:1201 +#: lib/transaction.c:1196 #, c-format msgid "\t\tName: %s.\n" msgstr "" -#: lib/transaction.c:1224 +#: lib/transaction.c:1219 #, fuzzy, c-format msgid "\tRepackaged Package was %s...\n" msgstr "%s tetikleyen paket yok\n" -#: lib/transaction.c:1268 +#: lib/transaction.c:1263 msgid "Adding install element to auto-rollback transaction.\n" msgstr "" -#: lib/transaction.c:1277 +#: lib/transaction.c:1272 msgid "Could not get install element database instance!\n" msgstr "" -#: lib/transaction.c:1290 +#: lib/transaction.c:1285 msgid "Could not get header for auto-rollback transaction!\n" msgstr "" -#: lib/transaction.c:1300 +#: lib/transaction.c:1295 #, fuzzy, c-format msgid "\tAdded repackaged package header: %s.\n" msgstr "<kaynak paketi>" -#: lib/transaction.c:1302 lib/transaction.c:1313 +#: lib/transaction.c:1297 lib/transaction.c:1308 #, c-format msgid "\tAdded from install element %s.\n" msgstr "" -#: lib/transaction.c:1311 +#: lib/transaction.c:1306 msgid "\tAdded erase element.\n" msgstr "" -#: lib/transaction.c:1320 +#: lib/transaction.c:1315 msgid "Could not get repackaged header for auto-rollback transaction!\n" msgstr "" -#: lib/transaction.c:1327 +#: lib/transaction.c:1322 msgid "Add erase element to auto-rollback transaction.\n" msgstr "" -#: lib/transaction.c:1335 +#: lib/transaction.c:1330 msgid "\tFound existing upgrade element.\n" msgstr "" -#: lib/transaction.c:1336 +#: lib/transaction.c:1331 #, c-format msgid "\tNot adding erase element for %s.\n" msgstr "" -#: lib/transaction.c:1353 +#: lib/transaction.c:1348 #, fuzzy, c-format msgid "\tAdded repackaged package %s.\n" msgstr "<kaynak paketi>" -#: lib/transaction.c:1355 +#: lib/transaction.c:1350 #, c-format msgid "\tAdded from erase element %s.\n" msgstr "" -#: lib/transaction.c:1360 +#: lib/transaction.c:1355 msgid "Could not add erase element to auto-rollback transaction.\n" msgstr "" -#: lib/transaction.c:1366 +#: lib/transaction.c:1361 msgid "\tNo repackaged package...nothing to do.\n" msgstr "" -#: lib/transaction.c:1372 +#: lib/transaction.c:1367 #, fuzzy msgid "Failure reading repackaged package!\n" msgstr "paketten baþlýk okunmasý sýrasýnda hata oluþtu\n" -#: lib/transaction.c:1495 +#: lib/transaction.c:1490 #, c-format msgid "sanity checking %d elements\n" msgstr "" -#: lib/transaction.c:1581 +#: lib/transaction.c:1576 msgid "running pre-transaction scripts\n" msgstr "" -#: lib/transaction.c:1655 +#: lib/transaction.c:1650 #, c-format msgid "computing %d file fingerprints\n" msgstr "" -#: lib/transaction.c:1739 +#: lib/transaction.c:1734 msgid "computing file dispositions\n" msgstr "" -#: lib/transaction.c:1932 +#: lib/transaction.c:1927 msgid "Creating auto-rollback transaction\n" msgstr "" -#: lib/transaction.c:2086 +#: lib/transaction.c:2077 msgid "Add failed. Could not read package header.\n" msgstr "" -#: lib/transaction.c:2170 +#: lib/transaction.c:2161 msgid "Add failed in rpmpsmStage().\n" msgstr "" -#: lib/transaction.c:2214 +#: lib/transaction.c:2205 msgid "Add failed. Could not get file list.\n" msgstr "" -#: lib/transaction.c:2263 +#: lib/transaction.c:2254 msgid "Erase failed failed in rpmpsmStage().\n" msgstr "" -#: lib/transaction.c:2324 +#: lib/transaction.c:2315 msgid "running post-transaction scripts\n" msgstr "" @@ -4022,86 +4022,86 @@ msgstr "açýlýyor db endeks %s/%s %s kip=0x%x\n" msgid "======================== active %d empty %d\n" msgstr "======================== %d etkin %d boþ\n" -#: rpmio/macro.c:394 +#: rpmio/macro.c:396 #, c-format msgid "%3d>%*s(empty)" msgstr "%3d>%*s(boþ)" -#: rpmio/macro.c:437 +#: rpmio/macro.c:439 #, c-format msgid "%3d<%*s(empty)\n" msgstr "%3d<%*s(boþ)\n" -#: rpmio/macro.c:664 rpmio/macro.c:705 +#: rpmio/macro.c:608 rpmio/macro.c:1090 rpmio/macro.c:1123 rpmio/macro.c:1863 +msgid "Target buffer overflow\n" +msgstr "Hedef tampon bellek taþtý\n" + +#: rpmio/macro.c:671 rpmio/macro.c:712 #, c-format msgid "Macro %%%s has unterminated body\n" msgstr "%%%s makrosunun gövdesi sonlandýrýlmamýþ\n" -#: rpmio/macro.c:727 +#: rpmio/macro.c:734 #, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "%%%s makrosunun ismi kuraldýþý (%%define)\n" -#: rpmio/macro.c:733 +#: rpmio/macro.c:740 #, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "%%%s makrosunu seçenekleri sonlandýrýlmamýþ\n" -#: rpmio/macro.c:738 +#: rpmio/macro.c:745 #, c-format msgid "Macro %%%s has empty body\n" msgstr "%%%s makrosu boþ\n" -#: rpmio/macro.c:744 +#: rpmio/macro.c:751 #, c-format msgid "Macro %%%s failed to expand\n" msgstr "%%%s makrosu geniþletmede baþarýsýz\n" -#: rpmio/macro.c:779 +#: rpmio/macro.c:786 #, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "%%%s makrosunun ismi kuraldýþý (%%define)\n" -#: rpmio/macro.c:897 +#: rpmio/macro.c:904 #, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "%%%s (%s) makrosu %d seviyenin altýnda kullanýlmadý\n" -#: rpmio/macro.c:1024 +#: rpmio/macro.c:1031 #, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "%c seçeneði %s(%s) de anlaþýlamadý\n" -#: rpmio/macro.c:1224 +#: rpmio/macro.c:1239 #, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "Yineleme derinliði(%d) mümkün miktardan(%d) büyük\n" -#: rpmio/macro.c:1297 rpmio/macro.c:1314 +#: rpmio/macro.c:1312 rpmio/macro.c:1329 #, c-format msgid "Unterminated %c: %s\n" msgstr "%c sonlandýrýlmamýþ: %s\n" -#: rpmio/macro.c:1355 +#: rpmio/macro.c:1370 #, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "Bir ayrýþtýrýlamayan makro tarafýndan bir %% izlendi\n" -#: rpmio/macro.c:1512 +#: rpmio/macro.c:1527 #, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "%%%.*s makrosu bulunamadý, atlanýyor\n" -#: rpmio/macro.c:1848 -msgid "Target buffer overflow\n" -msgstr "Hedef tampon bellek taþtý\n" - -#: rpmio/macro.c:2056 rpmio/macro.c:2062 +#: rpmio/macro.c:2076 rpmio/macro.c:2082 #, c-format msgid "File %s: %s\n" msgstr "%s dosyasý: %s\n" -#: rpmio/macro.c:2065 +#: rpmio/macro.c:2085 #, c-format msgid "File %s is smaller than %u bytes\n" msgstr "%s dosyasý %u bayttan küçük\n" diff --git a/po/zh_TW.po b/po/zh_TW.po index 103d4d546..f46648df9 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.4.2\n" "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n" -"POT-Creation-Date: 2007-08-21 08:04+0200\n" +"POT-Creation-Date: 2007-08-30 18:37+0200\n" "PO-Revision-Date: 2007-05-05 10:52+0800\n" "Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n" "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n" @@ -1259,18 +1259,18 @@ msgstr "ä¸æ ¡é©—組建相ä¾é—œä¿‚" msgid "generate package header(s) compatible with (legacy) rpm[23] packaging" msgstr "產生相容於éŽåŽ»çš„ rpm2/rpm3 打包的表é " -#: build/poptBT.c:229 lib/poptALL.c:273 lib/poptI.c:282 lib/poptQV.c:363 -#: lib/poptQV.c:372 lib/poptQV.c:413 +#: build/poptBT.c:229 lib/poptALL.c:273 lib/poptI.c:282 lib/poptQV.c:362 +#: lib/poptQV.c:371 lib/poptQV.c:412 msgid "don't verify package digest(s)" msgstr "ä¸æ ¡é©—套件摘è¦" -#: build/poptBT.c:231 lib/poptALL.c:275 lib/poptI.c:284 lib/poptQV.c:366 -#: lib/poptQV.c:374 lib/poptQV.c:416 +#: build/poptBT.c:231 lib/poptALL.c:275 lib/poptI.c:284 lib/poptQV.c:365 +#: lib/poptQV.c:373 lib/poptQV.c:415 msgid "don't verify database header(s) when retrieved" msgstr "å–回時ä¸é©—è‰è³‡æ–™åº«è¡¨é " -#: build/poptBT.c:233 lib/poptALL.c:281 lib/poptI.c:286 lib/poptQV.c:369 -#: lib/poptQV.c:376 lib/poptQV.c:418 +#: build/poptBT.c:233 lib/poptALL.c:281 lib/poptI.c:286 lib/poptQV.c:368 +#: lib/poptQV.c:375 lib/poptQV.c:417 msgid "don't verify package signature(s)" msgstr "ä¸æ ¡é©—套件簽å" @@ -1332,27 +1332,27 @@ msgstr "%s 失敗：%s\n" msgid "failed to write all data to %s\n" msgstr "無法寫入酬載到 %s: %s\n" -#: build/rpmfc.c:1250 +#: build/rpmfc.c:1249 #, fuzzy, c-format msgid "magic_open(0x%x) failed: %s\n" msgstr "é–‹å•Ÿ %s 失敗：%s\n" -#: build/rpmfc.c:1258 +#: build/rpmfc.c:1257 #, fuzzy, c-format -msgid "magic_load(ms, \"%s\") failed: %s\n" +msgid "magic_load failed: %s\n" msgstr "%s 移除目錄 %s 失敗：%s\n" -#: build/rpmfc.c:1303 +#: build/rpmfc.c:1301 #, c-format msgid "magic_file(ms, \"%s\") failed: mode %06o %s\n" msgstr "" -#: build/rpmfc.c:1524 +#: build/rpmfc.c:1522 #, fuzzy, c-format msgid "Finding %s: %s\n" msgstr "檔案 %s: %s\n" -#: build/rpmfc.c:1530 build/rpmfc.c:1539 +#: build/rpmfc.c:1528 build/rpmfc.c:1537 #, fuzzy, c-format msgid "Failed to find %s:\n" msgstr "è®€å– %s 失敗: %s。\n" @@ -1472,30 +1472,30 @@ msgstr "忽略套件åç¨±é—œè¯ [%d]\t %s-> %s\n" msgid "removing %s \"%s\" from tsort relations.\n" msgstr "從樹狀排列關係移除 %s\"%s\"。\n" -#: lib/depends.c:1265 +#: lib/depends.c:1271 msgid "========== recording tsort relations\n" msgstr "========== 記錄樹狀排列關係\n" -#: lib/depends.c:1357 +#: lib/depends.c:1363 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, depth, " "breadth)\n" msgstr "========== 樹狀排列套件 (次åºã€#å‰è¡Œè€…ã€#後繼者ã€æ¨¹ã€æ·±åº¦ã€å»£åº¦)\n" -#: lib/depends.c:1453 +#: lib/depends.c:1459 #, c-format msgid "========== successors only (%d bytes)\n" msgstr "========== åªæœ‰å¾Œç¹¼ç¬¦è™Ÿ (%d ä½å…ƒçµ„)\n" -#: lib/depends.c:1526 +#: lib/depends.c:1532 msgid "LOOP:\n" msgstr "迴圈：\n" -#: lib/depends.c:1561 +#: lib/depends.c:1567 msgid "========== continuing tsort ...\n" msgstr "========== 繼續樹狀排列…\n" -#: lib/depends.c:1566 +#: lib/depends.c:1572 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "rpmtsOrder 失敗，剩下 %d 個元件\n" @@ -2029,7 +2029,7 @@ msgstr "僅更新資料庫，但ä¸å°æª”案系統進行修改" msgid "do not verify package dependencies" msgstr "ä¸åµæ¸¬å¥—件相ä¾æ€§" -#: lib/poptI.c:252 lib/poptQV.c:307 lib/poptQV.c:310 +#: lib/poptI.c:252 lib/poptQV.c:306 lib/poptQV.c:309 msgid "don't verify MD5 digest of files" msgstr "ä¸æ ¡é©—檔案的 MD5 碼值" @@ -2143,214 +2143,214 @@ msgstr "ä¸çœŸæ£å®‰è£ï¼Œåªå›žå ±ä½œæ¥çµæžœæ˜¯å¦æ£ç¢º" msgid "upgrade package(s)" msgstr "更新套件" -#: lib/poptQV.c:103 +#: lib/poptQV.c:102 msgid "query/verify all packages" msgstr "查詢/æ ¡é©—æ‰€æœ‰å¥—ä»¶" -#: lib/poptQV.c:105 +#: lib/poptQV.c:104 msgid "rpm checksig mode" msgstr "rpm 檢查簽å模å¼" -#: lib/poptQV.c:107 +#: lib/poptQV.c:106 msgid "query/verify package(s) owning file" msgstr "查詢/æ ¡é©—å±¬æ–¼å¥—ä»¶çš„æª”æ¡ˆ" -#: lib/poptQV.c:109 +#: lib/poptQV.c:108 msgid "query/verify package(s) in group" msgstr "查詢/æ ¡é©—å¥—ä»¶æ‰€å±¬çš„çµ„åˆ¥" -#: lib/poptQV.c:111 +#: lib/poptQV.c:110 msgid "query/verify a package file" msgstr "查詢/æ ¡é©—ä¸€å€‹å¥—ä»¶æª”æ¡ˆ" -#: lib/poptQV.c:114 +#: lib/poptQV.c:113 msgid "query/verify package(s) from TOP file tree walk" msgstr "å¾žé ‚ç«¯éæ·æª”案樹查詢/é©—è‰å¥—件" -#: lib/poptQV.c:116 +#: lib/poptQV.c:115 msgid "query/verify package(s) from system HDLIST" msgstr "系統 HDLIST 查詢/é©—è‰å¥—件從" -#: lib/poptQV.c:119 +#: lib/poptQV.c:118 msgid "query/verify package(s) with package identifier" msgstr "æ ¹æ“šå¥—ä»¶çš„è˜åˆ¥æŸ¥è©¢/æ ¡é©—å¥—ä»¶" -#: lib/poptQV.c:121 +#: lib/poptQV.c:120 msgid "query/verify package(s) with header identifier" msgstr "æ ¹æ“šè¡¨é è˜åˆ¥æŸ¥è©¢/æ ¡é©—å¥—ä»¶" -#: lib/poptQV.c:123 +#: lib/poptQV.c:122 msgid "query/verify package(s) with file identifier" msgstr "æ ¹æ“šæª”æ¡ˆè˜åˆ¥æŸ¥è©¢/æ ¡é©—å¥—ä»¶" -#: lib/poptQV.c:126 +#: lib/poptQV.c:125 msgid "rpm query mode" msgstr "rpm 查詢模å¼" -#: lib/poptQV.c:128 +#: lib/poptQV.c:127 msgid "query/verify a header instance" msgstr "查詢/é©—è‰è¡¨é 實體" -#: lib/poptQV.c:130 +#: lib/poptQV.c:129 msgid "query a spec file" msgstr "查詢一個è¦æ ¼æª”案" -#: lib/poptQV.c:130 +#: lib/poptQV.c:129 msgid "<spec>" msgstr "<è¦æ ¼æª”>" -#: lib/poptQV.c:132 +#: lib/poptQV.c:131 msgid "query/verify package(s) from install transaction" msgstr "從安è£ç•°å‹•ä½œæ¥æŸ¥è©¢/é©—è‰å¥—件" -#: lib/poptQV.c:134 +#: lib/poptQV.c:133 msgid "query the package(s) triggered by the package" msgstr "查詢由套件所觸發的套件" -#: lib/poptQV.c:136 +#: lib/poptQV.c:135 msgid "rpm verify mode" msgstr "rpm æ ¡é©—æ¨¡å¼" -#: lib/poptQV.c:138 +#: lib/poptQV.c:137 msgid "query/verify the package(s) which require a dependency" msgstr "查詢/æ ¡é©—éœ€è¦æŸå€‹ç›¸ä¾ç‰©ä»¶çš„套件" -#: lib/poptQV.c:140 +#: lib/poptQV.c:139 msgid "query/verify the package(s) which provide a dependency" msgstr "查詢/æ ¡é©—æä¾›æŸå€‹ç›¸ä¾ç‰©ä»¶çš„套件" -#: lib/poptQV.c:143 +#: lib/poptQV.c:142 msgid "create transaction set" msgstr "建立異動作æ¥é›†" -#: lib/poptQV.c:145 +#: lib/poptQV.c:144 msgid "do not order transaction set" msgstr "ä¸æŽ’åºç•°å‹•ä½œæ¥é›†" -#: lib/poptQV.c:147 +#: lib/poptQV.c:146 msgid "do not glob arguments" msgstr "ä¸ä»¥è¬ç”¨å—元解æžå¼•æ•¸" -#: lib/poptQV.c:149 +#: lib/poptQV.c:148 msgid "do not process non-package files as manifests" msgstr "ä¸ä»¥æ¸…單方å¼è™•ç†éžå¥—件檔案" -#: lib/poptQV.c:151 +#: lib/poptQV.c:150 msgid "do not read headers" msgstr "ä¸è®€å–表é " -#: lib/poptQV.c:258 +#: lib/poptQV.c:257 msgid "list all configuration files" msgstr "列出所有é…置檔案" -#: lib/poptQV.c:260 +#: lib/poptQV.c:259 msgid "list all documentation files" msgstr "列出所有文件檔案" -#: lib/poptQV.c:262 +#: lib/poptQV.c:261 msgid "dump basic file information" msgstr "調出基本的檔案資訊" -#: lib/poptQV.c:266 +#: lib/poptQV.c:265 msgid "list files in package" msgstr "列出套件內的檔案" -#: lib/poptQV.c:271 +#: lib/poptQV.c:270 #, c-format msgid "skip %%ghost files" msgstr "ç•¥éŽ %%ghost 檔案" -#: lib/poptQV.c:275 +#: lib/poptQV.c:274 #, c-format msgid "skip %%license files" msgstr "ç•¥éŽ %%license 檔案" -#: lib/poptQV.c:278 +#: lib/poptQV.c:277 #, c-format msgid "skip %%readme files" msgstr "ç•¥éŽ %%readme 檔案" -#: lib/poptQV.c:284 +#: lib/poptQV.c:283 msgid "use the following query format" msgstr "ä½¿ç”¨ä»¥ä¸‹çš„æŸ¥è©¢æ ¼å¼" -#: lib/poptQV.c:286 +#: lib/poptQV.c:285 msgid "substitute i18n sections into spec file" msgstr "替代 i18n å€æ®µé€²å…¥è¦æ ¼æª”案" -#: lib/poptQV.c:288 +#: lib/poptQV.c:287 msgid "display the states of the listed files" msgstr "顯示列出的æ¯å€‹æª”案的狀態" -#: lib/poptQV.c:314 +#: lib/poptQV.c:313 msgid "don't verify size of files" msgstr "ä¸æ ¡é©—檔案大å°" -#: lib/poptQV.c:317 +#: lib/poptQV.c:316 msgid "don't verify symlink path of files" msgstr "ä¸æ ¡é©—檔案的連çµè·¯å¾‘" -#: lib/poptQV.c:320 +#: lib/poptQV.c:319 msgid "don't verify owner of files" msgstr "ä¸æ ¡é©—檔案的æ“有者" -#: lib/poptQV.c:323 +#: lib/poptQV.c:322 msgid "don't verify group of files" msgstr "ä¸æ ¡é©—檔案的屬組" -#: lib/poptQV.c:326 +#: lib/poptQV.c:325 msgid "don't verify modification time of files" msgstr "ä¸æ ¡é©—檔案的修改時間" -#: lib/poptQV.c:329 lib/poptQV.c:332 +#: lib/poptQV.c:328 lib/poptQV.c:331 msgid "don't verify mode of files" msgstr "ä¸æ ¡é©—檔案的模å¼" -#: lib/poptQV.c:335 +#: lib/poptQV.c:334 msgid "don't verify file security contexts" msgstr "ä¸æ ¡é©—檔案的安全關è¯" -#: lib/poptQV.c:337 +#: lib/poptQV.c:336 msgid "don't verify files in package" msgstr "ä¸æ ¡é©—套件內的檔案" -#: lib/poptQV.c:340 lib/poptQV.c:343 tools/rpmgraph.c:266 +#: lib/poptQV.c:339 lib/poptQV.c:342 tools/rpmgraph.c:266 msgid "don't verify package dependencies" msgstr "ä¸æ ¡é©—套件的相ä¾é—œä¿‚" -#: lib/poptQV.c:348 lib/poptQV.c:352 lib/poptQV.c:355 lib/poptQV.c:358 +#: lib/poptQV.c:347 lib/poptQV.c:351 lib/poptQV.c:354 lib/poptQV.c:357 msgid "don't execute verify script(s)" msgstr "ä¸åŸ·è¡Œæ ¡é©—命令稿" -#: lib/poptQV.c:382 +#: lib/poptQV.c:381 msgid "don't verify GPG V3 DSA signature(s)" msgstr "ä¸æ ¡é©— GPG V3 DSA ç°½å" -#: lib/poptQV.c:385 +#: lib/poptQV.c:384 msgid "don't verify PGP V3 RSA/MD5 signature(s)" msgstr "ä¸æ ¡é©— PGP V3 RSA/MD5 ç°½å" -#: lib/poptQV.c:400 +#: lib/poptQV.c:399 msgid "sign package(s) (identical to --resign)" msgstr "å°å¥—件簽å (與 --resign å«ç¾©ç›¸åŒ)" -#: lib/poptQV.c:402 +#: lib/poptQV.c:401 msgid "verify package signature(s)" msgstr "æ ¡é©—å¥—ä»¶ç°½å" -#: lib/poptQV.c:404 +#: lib/poptQV.c:403 msgid "delete package signatures" msgstr "刪除套件簽å" -#: lib/poptQV.c:406 +#: lib/poptQV.c:405 msgid "import an armored public key" msgstr "匯入一個å—ä¿è·çš„公鑰" -#: lib/poptQV.c:408 +#: lib/poptQV.c:407 msgid "sign package(s) (identical to --addsign)" msgstr "å°å¥—件簽å (與 --addsign å«ç¾©ç›¸åŒ)" -#: lib/poptQV.c:410 +#: lib/poptQV.c:409 msgid "generate signature" msgstr "產生簽å" @@ -2689,38 +2689,38 @@ msgstr "套件 %s 有ä¸æ»¿è¶³çš„ %s：%s\n" msgid "%s skipped due to missingok flag\n" msgstr "%s 由於 missingok 旗標而被略éŽ\n" -#: lib/rpmfi.c:846 +#: lib/rpmfi.c:850 msgid "========== relocations\n" msgstr "========== é‡æ–°éƒ¨ç½²\n" -#: lib/rpmfi.c:850 +#: lib/rpmfi.c:854 #, c-format msgid "%5d exclude %s\n" msgstr "%5d 排除 %s\n" -#: lib/rpmfi.c:853 +#: lib/rpmfi.c:857 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "%5d é‡æ–°éƒ¨ç½² %s -> %s\n" -#: lib/rpmfi.c:987 +#: lib/rpmfi.c:991 #, c-format msgid "excluding %s %s\n" msgstr "排除 %s %s\n" -#: lib/rpmfi.c:997 +#: lib/rpmfi.c:1001 #, c-format msgid "relocating %s to %s\n" msgstr "é‡æ–°éƒ¨ç½² %s 到 %s\n" -#: lib/rpmfi.c:1089 +#: lib/rpmfi.c:1093 #, c-format msgid "relocating directory %s to %s\n" msgstr "é‡æ–°éƒ¨ç½²ç›®éŒ„ %s 到 %s\n" #: lib/rpmgi.c:81 lib/rpminstall.c:124 lib/rpminstall.c:480 -#: lib/rpminstall.c:615 lib/rpminstall.c:1041 lib/rpmts.c:643 -#: tools/rpmgraph.c:121 tools/rpmgraph.c:158 +#: lib/rpminstall.c:615 lib/rpmts.c:643 tools/rpmgraph.c:121 +#: tools/rpmgraph.c:158 #, c-format msgid "open of %s failed: %s\n" msgstr "é–‹å•Ÿ %s 失敗：%s\n" @@ -2731,7 +2731,7 @@ msgid "unknown tag: \"%s\"\n" msgstr "ä¸æ˜Žçš„標記：「%sã€\n" #: lib/rpmgi.c:628 lib/rpminstall.c:659 lib/rpminstall.c:834 -#: lib/rpminstall.c:1267 lib/transaction.c:1031 tools/rpmgraph.c:196 +#: lib/rpminstall.c:1084 lib/transaction.c:1026 tools/rpmgraph.c:196 msgid "Failed dependencies:\n" msgstr "相ä¾æ€§åµæ¸¬å¤±æ•—：\n" @@ -2847,16 +2847,16 @@ msgstr "無法開啟檔案 %s：%s\n" msgid "Installing %s\n" msgstr "æ£åœ¨å®‰è£ %s\n" -#: lib/rpminstall.c:1261 lib/transaction.c:1024 +#: lib/rpminstall.c:1078 lib/transaction.c:1019 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "回溯套件 (+%d/-%d) to %-24.24s (0x%08x)：\n" -#: lib/rpminstall.c:1292 lib/transaction.c:1075 +#: lib/rpminstall.c:1109 lib/transaction.c:1070 msgid "Cleaning up repackaged packages:\n" msgstr "æ£åœ¨æ¸…除é‡æ–°ç”¢ç”Ÿçš„打包：\n" -#: lib/rpminstall.c:1299 lib/transaction.c:1081 +#: lib/rpminstall.c:1116 lib/transaction.c:1076 #, c-format msgid "\tRemoving %s:\n" msgstr "\tæ£åœ¨ç§»é™¤ %s：\n" @@ -2989,97 +2989,97 @@ msgstr "%s 與 %s%s è¡çª" msgid "unknown error %d encountered while manipulating package %s" msgstr "ä¸æ˜ŽéŒ¯èª¤ %d 發生在處ç†å¥—件 %s 的程åºä¸" -#: lib/rpmrc.c:199 +#: lib/rpmrc.c:213 #, c-format msgid "missing second ':' at %s:%d\n" msgstr "在 %s:%d 處æ¼å¤±äº†ç¬¬äºŒå€‹ã€Œ:ã€\n" -#: lib/rpmrc.c:202 +#: lib/rpmrc.c:216 #, c-format msgid "missing architecture name at %s:%d\n" msgstr "在 %s:%d 處æ¼å¤±äº†æž¶æ§‹å稱\n" -#: lib/rpmrc.c:356 +#: lib/rpmrc.c:370 #, c-format msgid "Incomplete data line at %s:%d\n" msgstr "ä¸å®Œæ•´è³‡æ–™åˆ—ä½æ–¼ %s:%d\n" -#: lib/rpmrc.c:361 +#: lib/rpmrc.c:375 #, c-format msgid "Too many args in data line at %s:%d\n" msgstr "在資料列的 %s:%d ä¸æœ‰å¤ªå¤šå¼•æ•¸\n" -#: lib/rpmrc.c:369 +#: lib/rpmrc.c:383 #, c-format msgid "Bad arch/os number: %s (%s:%d)\n" msgstr "æ壞的架構/作æ¥ç³»çµ±åºè™Ÿï¼š%s (%s:%d)\n" -#: lib/rpmrc.c:406 +#: lib/rpmrc.c:420 #, c-format msgid "Incomplete default line at %s:%d\n" msgstr "ä¸å®Œæ•´é è¨åˆ—ä½æ–¼ %s:%d\n" -#: lib/rpmrc.c:411 +#: lib/rpmrc.c:425 #, c-format msgid "Too many args in default line at %s:%d\n" msgstr "在é è¨åˆ—çš„ %s:%d ä¸æœ‰å¤ªå¤šå¼•æ•¸\n" -#: lib/rpmrc.c:577 +#: lib/rpmrc.c:591 #, c-format msgid "Failed to read %s: %s.\n" msgstr "è®€å– %s 失敗: %s。\n" -#: lib/rpmrc.c:615 +#: lib/rpmrc.c:629 #, c-format msgid "missing ':' (found 0x%02x) at %s:%d\n" msgstr "缺少 ':' (找到 0x%02x) æ–¼ %s:%d\n" -#: lib/rpmrc.c:632 lib/rpmrc.c:706 +#: lib/rpmrc.c:646 lib/rpmrc.c:710 #, c-format msgid "missing argument for %s at %s:%d\n" msgstr "%s 缺少引數於 %s:%d\n" -#: lib/rpmrc.c:649 lib/rpmrc.c:671 +#: lib/rpmrc.c:663 #, c-format msgid "%s expansion failed at %s:%d \"%s\"\n" msgstr "%s 擴充失敗於 %s:%d \"%s\"\n" -#: lib/rpmrc.c:658 +#: lib/rpmrc.c:672 #, c-format msgid "cannot open %s at %s:%d: %s\n" msgstr "無法開啟 %s æ–¼ %s:%d: %s\n" -#: lib/rpmrc.c:698 +#: lib/rpmrc.c:702 #, c-format msgid "missing architecture for %s at %s:%d\n" msgstr "缺少 %s 架構於 %s:%d\n" -#: lib/rpmrc.c:765 +#: lib/rpmrc.c:769 #, c-format msgid "bad option '%s' at %s:%d\n" msgstr "ä¸ç•¶çš„é¸é … '%s' æ–¼ %s:%d\n" -#: lib/rpmrc.c:1564 +#: lib/rpmrc.c:1568 #, c-format msgid "Unknown system: %s\n" msgstr "ä¸æ˜Žçš„系統：%s\n" -#: lib/rpmrc.c:1565 +#: lib/rpmrc.c:1569 #, c-format msgid "Please contact %s\n" msgstr "" -#: lib/rpmrc.c:1802 +#: lib/rpmrc.c:1806 #, c-format msgid "Cannot expand %s\n" msgstr "無法展開 %s\n" -#: lib/rpmrc.c:1807 +#: lib/rpmrc.c:1811 #, c-format msgid "Cannot read %s, HOME is too large.\n" msgstr "ç„¡æ³•è®€å– %s，HOME éŽå¤§ã€‚\n" -#: lib/rpmrc.c:1824 +#: lib/rpmrc.c:1828 #, c-format msgid "Unable to open %s for reading: %s.\n" msgstr "無法開啟 %s 以讀å–：%s\n" @@ -3367,158 +3367,158 @@ msgstr "ä¸å®Œæ•´çš„ MD 5 摘è¦ï¼šä¸æ”¯æ´\n" msgid "Signature: UNKNOWN (%d)\n" msgstr "ç°½å：ä¸æ˜Ž (%d)\n" -#: lib/transaction.c:935 +#: lib/transaction.c:930 #, c-format msgid "excluding directory %s\n" msgstr "排除目錄 %s\n" -#: lib/transaction.c:1022 +#: lib/transaction.c:1017 msgid "Transaction failed...rolling back\n" msgstr "異動作æ¥å¤±æ•—…返回\n" -#: lib/transaction.c:1042 +#: lib/transaction.c:1037 msgid "Could not order auto-rollback transaction!\n" msgstr "無法排列自動返回異動作æ¥çš„é †åºï¼\n" -#: lib/transaction.c:1132 +#: lib/transaction.c:1127 msgid "Getting repackaged header from transaction element\n" msgstr "從異動作æ¥å…ƒä»¶å–å¾—é‡æ–°åŒ…è£çš„表é \n" -#: lib/transaction.c:1157 +#: lib/transaction.c:1152 #, c-format msgid "\tLooking for %s...\n" msgstr "\t查找 %s…\n" -#: lib/transaction.c:1161 +#: lib/transaction.c:1156 msgid "\tMatches found.\n" msgstr "\t找到相符者。\n" -#: lib/transaction.c:1165 +#: lib/transaction.c:1160 msgid "\tNo matches found.\n" msgstr "\t找ä¸åˆ°ç›¸ç¬¦è€…。\n" -#: lib/transaction.c:1178 +#: lib/transaction.c:1173 msgid "\tRepackaged package not found!.\n" msgstr "\t找ä¸åˆ°é‡æ–°åŒ…è£çš„套件ï¼ã€‚\n" -#: lib/transaction.c:1199 +#: lib/transaction.c:1194 msgid "\tREMOVETID matched INSTALLTID.\n" msgstr "\t移除è˜åˆ¥è™Ÿç¬¦åˆå®‰è£è˜åˆ¥è™Ÿã€‚\n" -#: lib/transaction.c:1201 +#: lib/transaction.c:1196 #, c-format msgid "\t\tName: %s.\n" msgstr "\t\tå稱： %s。\n" -#: lib/transaction.c:1224 +#: lib/transaction.c:1219 #, c-format msgid "\tRepackaged Package was %s...\n" msgstr "\té‡æ–°åŒ…è£çš„套件是 %s…\n" -#: lib/transaction.c:1268 +#: lib/transaction.c:1263 msgid "Adding install element to auto-rollback transaction.\n" msgstr "åŠ å…¥å®‰è£å…ƒä»¶åˆ°è‡ªå‹•è¿”回異動作æ¥ã€‚\n" -#: lib/transaction.c:1277 +#: lib/transaction.c:1272 msgid "Could not get install element database instance!\n" msgstr "無法å–得安è£å…ƒä»¶è³‡æ–™åº«å¯¦é«”ï¼\n" -#: lib/transaction.c:1290 +#: lib/transaction.c:1285 msgid "Could not get header for auto-rollback transaction!\n" msgstr "無法å–得表é 用於自動返回異動作æ¥ï¼\n" -#: lib/transaction.c:1300 +#: lib/transaction.c:1295 #, c-format msgid "\tAdded repackaged package header: %s.\n" msgstr "\tå·²åŠ å…¥é‡æ–°åŒ…è£çš„套件表é ：%s。\n" -#: lib/transaction.c:1302 lib/transaction.c:1313 +#: lib/transaction.c:1297 lib/transaction.c:1308 #, c-format msgid "\tAdded from install element %s.\n" msgstr "\t已從安è£å…ƒä»¶ %s åŠ å…¥ã€‚\n" -#: lib/transaction.c:1311 +#: lib/transaction.c:1306 msgid "\tAdded erase element.\n" msgstr "\tå·²åŠ å…¥æ¸…é™¤å…ƒä»¶ã€‚\n" -#: lib/transaction.c:1320 +#: lib/transaction.c:1315 msgid "Could not get repackaged header for auto-rollback transaction!\n" msgstr "無法å–å¾—é‡æ–°åŒ…è£çš„表é 用於自動返回異動作æ¥ï¼\n" -#: lib/transaction.c:1327 +#: lib/transaction.c:1322 msgid "Add erase element to auto-rollback transaction.\n" msgstr "åŠ å…¥æ¸…é™¤å…ƒä»¶åˆ°è‡ªå‹•è¿”å›žç•°å‹•ä½œæ¥ã€‚\n" -#: lib/transaction.c:1335 +#: lib/transaction.c:1330 msgid "\tFound existing upgrade element.\n" msgstr "\t找到ç¾æœ‰å‡ç´šå…ƒä»¶ã€‚\n" -#: lib/transaction.c:1336 +#: lib/transaction.c:1331 #, c-format msgid "\tNot adding erase element for %s.\n" msgstr "\tä¸åŠ å…¥ %s 的清除元件。\n" -#: lib/transaction.c:1353 +#: lib/transaction.c:1348 #, c-format msgid "\tAdded repackaged package %s.\n" msgstr "\tå·²åŠ å…¥é‡æ–°åŒ…è£çš„套件 %s。\n" -#: lib/transaction.c:1355 +#: lib/transaction.c:1350 #, c-format msgid "\tAdded from erase element %s.\n" msgstr "\t已從清除元件 %s åŠ å…¥ã€‚\n" -#: lib/transaction.c:1360 +#: lib/transaction.c:1355 msgid "Could not add erase element to auto-rollback transaction.\n" msgstr "ç„¡æ³•åŠ å…¥æ¸…é™¤å…ƒä»¶åˆ°è‡ªå‹•è¿”å›žç•°å‹•ä½œæ¥ã€‚\n" -#: lib/transaction.c:1366 +#: lib/transaction.c:1361 msgid "\tNo repackaged package...nothing to do.\n" msgstr "\t沒有é‡æ–°åŒ…è£çš„套件…無事å¯åšã€‚\n" -#: lib/transaction.c:1372 +#: lib/transaction.c:1367 msgid "Failure reading repackaged package!\n" msgstr "讀å–é‡æ–°åŒ…è£çš„套件時失敗ï¼\n" -#: lib/transaction.c:1495 +#: lib/transaction.c:1490 #, c-format msgid "sanity checking %d elements\n" msgstr "明智地檢查 %d 元件\n" -#: lib/transaction.c:1581 +#: lib/transaction.c:1576 msgid "running pre-transaction scripts\n" msgstr "æ£åœ¨åŸ·è¡Œç•°å‹•ä½œæ¥å‰å‘½ä»¤ç¨¿\n" -#: lib/transaction.c:1655 +#: lib/transaction.c:1650 #, c-format msgid "computing %d file fingerprints\n" msgstr "æ£åœ¨è¨ˆç®— %d 個檔案指紋\n" -#: lib/transaction.c:1739 +#: lib/transaction.c:1734 msgid "computing file dispositions\n" msgstr "計算檔案部署\n" -#: lib/transaction.c:1932 +#: lib/transaction.c:1927 msgid "Creating auto-rollback transaction\n" msgstr "產生自動返回異動作æ¥\n" -#: lib/transaction.c:2086 +#: lib/transaction.c:2077 msgid "Add failed. Could not read package header.\n" msgstr "åŠ å…¥å¤±æ•—ã€‚ç„¡æ³•è®€å–套件表é 。\n" -#: lib/transaction.c:2170 +#: lib/transaction.c:2161 msgid "Add failed in rpmpsmStage().\n" msgstr "åŠ å…¥ rpmpsmStage() ä¸å¤±æ•—。\n" -#: lib/transaction.c:2214 +#: lib/transaction.c:2205 msgid "Add failed. Could not get file list.\n" msgstr "åŠ å…¥å¤±æ•—ã€‚ç„¡æ³•å–得檔案清單。\n" -#: lib/transaction.c:2263 +#: lib/transaction.c:2254 msgid "Erase failed failed in rpmpsmStage().\n" msgstr "清除 rpmpsmStage() ä¸æª”案失敗。\n" -#: lib/transaction.c:2324 +#: lib/transaction.c:2315 msgid "running post-transaction scripts\n" msgstr "æ£åœ¨åŸ·è¡Œç•°å‹•ä½œæ¥å¾ŒæœŸå‘½ä»¤ç¨¿\n" @@ -3909,86 +3909,86 @@ msgstr "開啟資料庫索引 %s/%s %s 模å¼=0x%x\n" msgid "======================== active %d empty %d\n" msgstr "======================== ä½œç”¨ä¸ %d 清空 %d\n" -#: rpmio/macro.c:394 +#: rpmio/macro.c:396 #, c-format msgid "%3d>%*s(empty)" msgstr "%3d>%*s(清空)" -#: rpmio/macro.c:437 +#: rpmio/macro.c:439 #, c-format msgid "%3d<%*s(empty)\n" msgstr "%3d<%*s(清空)\n" -#: rpmio/macro.c:664 rpmio/macro.c:705 +#: rpmio/macro.c:608 rpmio/macro.c:1090 rpmio/macro.c:1123 rpmio/macro.c:1863 +msgid "Target buffer overflow\n" +msgstr "目標緩è¡å€æº¢ä½\n" + +#: rpmio/macro.c:671 rpmio/macro.c:712 #, c-format msgid "Macro %%%s has unterminated body\n" msgstr "巨集 %%%s 具有未終çµçš„主體\n" -#: rpmio/macro.c:727 +#: rpmio/macro.c:734 #, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "巨集 %%%s 具有ä¸åˆæ³•çš„å稱 (%%define)\n" -#: rpmio/macro.c:733 +#: rpmio/macro.c:740 #, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "巨集 %%%s 具有未終çµçš„é¸é …\n" -#: rpmio/macro.c:738 +#: rpmio/macro.c:745 #, c-format msgid "Macro %%%s has empty body\n" msgstr "巨集 %%%s 具有清空的主體\n" -#: rpmio/macro.c:744 +#: rpmio/macro.c:751 #, c-format msgid "Macro %%%s failed to expand\n" msgstr "巨集 %%%s 展開時失敗\n" -#: rpmio/macro.c:779 +#: rpmio/macro.c:786 #, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "巨集 %%%s 具有ä¸åˆæ³•çš„å稱 (%%undefine)\n" -#: rpmio/macro.c:897 +#: rpmio/macro.c:904 #, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "巨集 %%%s (%s) 在ç‰ç´š %d 之下未被使用\n" -#: rpmio/macro.c:1024 +#: rpmio/macro.c:1031 #, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "在 %2$s(%3$s) ä¸æœ‰ä¸æ˜Žçš„é¸é … %1$c\n" -#: rpmio/macro.c:1224 +#: rpmio/macro.c:1239 #, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "éžè¿´æ·±åº¦(%d)大於最大值(%d)\n" -#: rpmio/macro.c:1297 rpmio/macro.c:1314 +#: rpmio/macro.c:1312 rpmio/macro.c:1329 #, c-format msgid "Unterminated %c: %s\n" msgstr "未終çµçš„ %c: %s\n" -#: rpmio/macro.c:1355 +#: rpmio/macro.c:1370 #, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "在無法解æžçš„巨集之後跟著一個 %%\n" -#: rpmio/macro.c:1512 +#: rpmio/macro.c:1527 #, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "找ä¸åˆ°å·¨é›† %%%.*s，跳éŽ\n" -#: rpmio/macro.c:1848 -msgid "Target buffer overflow\n" -msgstr "目標緩è¡å€æº¢ä½\n" - -#: rpmio/macro.c:2056 rpmio/macro.c:2062 +#: rpmio/macro.c:2076 rpmio/macro.c:2082 #, c-format msgid "File %s: %s\n" msgstr "檔案 %s: %s\n" -#: rpmio/macro.c:2065 +#: rpmio/macro.c:2085 #, c-format msgid "File %s is smaller than %u bytes\n" msgstr "檔案 %s å°æ–¼ %u ä½å…ƒçµ„\n" diff --git a/python/Makefile.am b/python/Makefile.am index 288661b84..867fc3e8f 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -1,7 +1,5 @@ # Makefile for rpm library. -LINT = splint - if PYTHON pylibdir = @WITH_PYTHON_LIB@ pyincdir = @WITH_PYTHON_INCLUDE@ @@ -25,23 +23,20 @@ noinst_HEADERS = header-py.h \ rpmfi-py.h rpmmi-py.h rpmps-py.h rpmrc-py.h rpmte-py.h rpmts-py.h \ spec-py.h -mylibs= \ +pyrpmdir = `${__PYTHON} -c 'from distutils.sysconfig import *; print get_python_lib(1, prefix="@prefix@")'`/rpm +pyrpm_LTLIBRARIES = _rpmmodule.la +pyrpm_SCRIPTS = rpm/__init__.py + +_rpmmodule_la_LDFLAGS = -module -avoid-version +_rpmmodule_la_LIBADD = \ $(top_builddir)/build/librpmbuild.la \ $(top_builddir)/lib/librpm.la \ $(top_builddir)/rpmdb/librpmdb.la \ $(top_builddir)/rpmio/librpmio.la \ + @WITH_BEECRYPT_LIB@ @WITH_POPT_LIB@ \ @WITH_LIBELF_LIB@ -LDADD = - -pyrpmdir = `${__PYTHON} -c 'from distutils.sysconfig import *; print get_python_lib(1, prefix="@prefix@")'`/rpm -pyrpm_LTLIBRARIES = _rpmmodule.la -pyrpm_SCRIPTS = rpm/__init__.py - -_rpmmodule_la_LDFLAGS = $(mylibs) $(LIBS) -module -avoid-version -_rpmmodule_la_LIBADD = @WITH_BEECRYPT_LIB@ - _rpmmodule_la_SOURCES = rpmmodule.c header-py.c \ rpmal-py.c rpmds-py.c rpmdb-py.c rpmfd-py.c rpmfts-py.c \ rpmfi-py.c rpmmi-py.c rpmps-py.c rpmrc-py.c rpmte-py.c \ @@ -51,13 +46,4 @@ _rpmmodule_la_SOURCES = rpmmodule.c header-py.c \ # rpmal-py.c rpmds-py.c rpmdb-py.c rpmfd-py.c rpmfi-py.c rpmmi-py.c \ # rpmps-py.c rpmrc-py.c rpmte-py.c rpmts-py.c # rpmmodule.c header-py.c -splint_srcs = \ - rpmal-py.c rpmds-py.c rpmdb-py.c rpmfd-py.c rpmfts-py.c \ - rpmfi-py.c rpmmi-py.c rpmps-py.c rpmrc-py.c rpmte-py.c rpmts-py.c \ - spec-py.c - -.PHONY: lint -lint: - $(LINT) $(DEFS) $(AM_CPPFLAGS) $(splint_srcs) - endif diff --git a/python/header-py.c b/python/header-py.c index ff2331693..2c42ba823 100644 --- a/python/header-py.c +++ b/python/header-py.c @@ -5,7 +5,7 @@ #include "system.h" #include "rpmio_internal.h" -#include "rpmcli.h" /* XXX for rpmCheckSig */ +#include "rpmlib.h" #include "legacy.h" #include "misc.h" diff --git a/python/header-py.h b/python/header-py.h index 7c470f0f0..20aa8b1a0 100644 --- a/python/header-py.h +++ b/python/header-py.h @@ -1,6 +1,8 @@ #ifndef RPMPYTHON_HEADER #define RPMPYTHON_HEADER +#include <rpmlib.h> + /** \ingroup py_c * \file python/header-py.h */ diff --git a/python/rpmdebug-py.c b/python/rpmdebug-py.c index 1ddab213a..8a7810791 100644 --- a/python/rpmdebug-py.c +++ b/python/rpmdebug-py.c @@ -6,8 +6,6 @@ extern PyTypeObject PyDictIter_Type; /*@unchecked@*/ extern PyTypeObject PyFrame_Type; -#include <rpmcli.h> /* XXX debug only */ - #include "header-py.h" /* XXX debug only */ #include "rpmal-py.h" /* XXX debug only */ #include "rpmds-py.h" /* XXX debug only */ diff --git a/python/rpmfts-py.c b/python/rpmfts-py.c index 147ecbe10..fcdbcd69f 100644 --- a/python/rpmfts-py.c +++ b/python/rpmfts-py.c @@ -6,11 +6,6 @@ #include "structmember.h" -#ifdef __LCLINT__ -#undef PyObject_HEAD -#define PyObject_HEAD int _PyObjectHead; -#endif - #include <fts.h> #include "rpmfts-py.h" diff --git a/python/rpmmodule.c b/python/rpmmodule.c index 2a0ee11d1..053c8db04 100644 --- a/python/rpmmodule.c +++ b/python/rpmmodule.c @@ -5,7 +5,6 @@ #include "system.h" #include <rpmio_internal.h> -#include <rpmcli.h> /* XXX for rpmCheckSig */ #include <rpmdb.h> #include <rpmsq.h> @@ -28,11 +27,6 @@ #include "debug.h" -#ifdef __LCLINT__ -#undef PyObject_HEAD -#define PyObject_HEAD int _PyObjectHead -#endif - /** \ingroup python * \name Module: rpm */ diff --git a/python/rpmrc-py.c b/python/rpmrc-py.c index 458e827bd..ead1a920d 100644 --- a/python/rpmrc-py.c +++ b/python/rpmrc-py.c @@ -7,10 +7,8 @@ #include "structmember.h" #include "rpmdebug-py.c" - -#include <rpmcli.h> - #include "rpmrc-py.h" +#include "rpmmacro.h" #include "debug.h" diff --git a/python/rpmts-py.c b/python/rpmts-py.c index 16af0a685..d38573d9e 100644 --- a/python/rpmts-py.c +++ b/python/rpmts-py.c @@ -4,7 +4,7 @@ #include "system.h" -#include <rpmcli.h> +#include <rpmlib.h> #include <rpmpgp.h> #include <rpmdb.h> #include <rpmbuild.h> @@ -1186,20 +1186,6 @@ rpmts_Run(rpmtsObject * s, PyObject * args, PyObject * kwds) (void) rpmtsSetNotifyCallback(s->ts, rpmtsCallback, (void *) &cbInfo); } - /* Initialize security context patterns (if not already done). */ - if (!(s->ts->transFlags & RPMTRANS_FLAG_NOCONTEXTS)) { - rpmsx sx = rpmtsREContext(s->ts); - if (sx == NULL) { - const char *fn = rpmGetPath("%{?_install_file_context_path}", NULL); - if (fn != NULL && *fn != '\0') { - sx = rpmsxNew(fn); - (void) rpmtsSetREContext(s->ts, sx); - } - fn = _free(fn); - } - sx = rpmsxFree(sx); - } - if (_rpmts_debug) fprintf(stderr, "*** rpmts_Run(%p) ts %p ignore %x\n", s, s->ts, s->ignoreSet); diff --git a/python/system.h b/python/system.h index b09471c8c..0314962d8 100644 --- a/python/system.h +++ b/python/system.h @@ -11,11 +11,6 @@ #include "Python.h" -#ifdef __LCLINT__ -#undef PyObject_HEAD -#define PyObject_HEAD int _PyObjectHead; -#endif - #include "../system.h" #endif /* H_SYSTEM_PYTHON */ diff --git a/rpmdb/Makefile.am b/rpmdb/Makefile.am index 352e50a1c..683a3a732 100644 --- a/rpmdb/Makefile.am +++ b/rpmdb/Makefile.am @@ -1,7 +1,5 @@ # Makefile for rpm library. -LINT = splint - AM_CPPFLAGS = -I. \ -I$(top_srcdir) \ -I$(top_srcdir)/build \ @@ -48,15 +46,13 @@ librpmdb_la_SOURCES += sqlite.c endif librpmdb_la_LDFLAGS = -release 4.4 \ $(top_builddir)/rpmio/librpmio.la \ + @WITH_BEECRYPT_LIB@ \ @WITH_POPT_LIB@ \ @WITH_SQLITE3_LIB@ \ @WITH_LIBELF_LIB@ librpmdb_la_LIBADD = $(libdb_la) librpmdb_la_DEPENDENCIES = $(libdb_la) -# XXX make sure that db.h symlink is generated -dbconfig.c: db.h - tagtbl.c: Makefile.am $(top_srcdir)/lib/rpmlib.h @echo '/*@-bounds@*/' > $@ @echo '#include "system.h"' >> $@ @@ -76,12 +72,15 @@ tagtbl.c: Makefile.am $(top_srcdir)/lib/rpmlib.h @echo 'const int rpmTagTableSize = sizeof(rpmTagTbl) / sizeof(rpmTagTbl[0]) - 1;' >> $@ @echo '/*@=bounds@*/' >> $@ -db.h: - @ln -sf ../$(WITH_DB_SUBDIR)/db.h $@ +db.h: ../$(WITH_DB_SUBDIR)/db.h + $(LN_S) ../$(WITH_DB_SUBDIR)/db.h $@ +CLEANFILES = db.h # XXX grrr, force noinst libdb.la for db3. -$(libdb_la): - sed -e"/^libdir=/s/^.*$$/libdir=''/" < $(top_builddir)/$(WITH_DB_SUBDIR)/libdb-4.6.la > $(libdb_la) +$(libdb_la): $(top_builddir)/$(WITH_DB_SUBDIR)/libdb-4.6.la + sed -e"/^libdir=/s/^.*$$/libdir=''/" \ + < $(top_builddir)/$(WITH_DB_SUBDIR)/libdb-4.6.la > $(libdb_la) +CLEANFILES += $(libdb_la) rpmdb_archive_SOURCES = rpmdb_archive_LDADD = \ @@ -169,22 +168,8 @@ rpmdb_verify_LDADD = \ $(top_builddir)/$(WITH_DB_SUBDIR)/util_sig.o \ librpmdb.la -clean-local: - rm -f *.o db.h $(libdb_la) - BUILT_SOURCES = tagtbl.c -rpmdb.lcd: Makefile.am ${librpmdb_la_SOURCES} ${pkginc_HEADERS} ${noinst_HEADERS} - -splint ${DEFS} ${AM_CPPFLAGS} ${librpmdb_la_SOURCES} -dump $@ 2>/dev/null - -.PHONY: sources -sources: - @echo $(librpmdb_la_SOURCES:%=rpmdb/%) - -.PHONY: lint -lint: - $(LINT) $(DEFS) $(AM_CPPFLAGS) $(librpmdb_la_SOURCES) - check_PROGRAMS += tdbi tdbi_SOURCES = tdbi.c # tdbi_LDFLAGS = @LDFLAGS_STATIC@ diff --git a/rpmdb/header_internal.h b/rpmdb/header_internal.h index a85a219d1..4a8dbe918 100644 --- a/rpmdb/header_internal.h +++ b/rpmdb/header_internal.h @@ -7,9 +7,7 @@ #include <header.h> -#if !defined(__LCLINT__) #include <netinet/in.h> -#endif /* __LCLINT__ */ #define INDEX_MALLOC_SIZE 8 diff --git a/rpmdb/rpmdb.c b/rpmdb/rpmdb.c index 1b3e3d6bf..307fe841a 100644 --- a/rpmdb/rpmdb.c +++ b/rpmdb/rpmdb.c @@ -12,21 +12,9 @@ /*@-noparams@*/ #include <fnmatch.h> /*@=noparams@*/ -#if defined(__LCLINT__) -/*@-declundef -exportheader -redecl @*/ /* LCL: missing annotation */ -extern int fnmatch (const char *__pattern, const char *__name, int __flags) - /*@*/; -/*@=declundef =exportheader =redecl @*/ -#endif #endif #include <regex.h> -#if defined(__LCLINT__) -/*@-declundef -exportheader @*/ /* LCL: missing modifies (only is bogus) */ -extern void regfree (/*@only@*/ regex_t *preg) - /*@modifies *preg @*/; -/*@=declundef =exportheader @*/ -#endif #include <rpmio_internal.h> #include <rpmmacro.h> diff --git a/rpmio/Makefile.am b/rpmio/Makefile.am index fe46a42af..27b79bda0 100644 --- a/rpmio/Makefile.am +++ b/rpmio/Makefile.am @@ -1,7 +1,5 @@ # Makefile for rpm library. -LINT = splint - AM_CPPFLAGS = -I. \ -I$(top_srcdir) \ @WITH_BEECRYPT_INCLUDE@ \ @@ -9,6 +7,7 @@ AM_CPPFLAGS = -I. \ @WITH_LUA_INCLUDE@ \ @WITH_POPT_INCLUDE@ \ -I$(top_srcdir)/misc +AM_CPPFLAGS += -DRPMCONFIGDIR="\"@RPMCONFIGDIR@\"" pkgincdir = $(pkgincludedir) pkginc_HEADERS = \ @@ -31,22 +30,6 @@ librpmio_la_LDFLAGS = -release 4.4 \ @WITH_ZLIB_LIB@ \ -lpthread -clean-local: - rm -f *.o - -#BUILT_SOURCES = rpmio.lcd - -rpmio.lcd: Makefile.am ${librpmio_la_SOURCES} ${pkginc_HEADERS} ${noinst_HEADERS} - -lclint -load ../beecrypt/beecrypt.lcd $(DEFS) $(AM_CPPFLAGS) $(librpmio_la_SOURCES) -dump $@ 2>/dev/null - -.PHONY: sources -sources: - @echo $(librpmio_la_SOURCES:%=rpmio/%) - -.PHONY: lint -lint: - $(LINT) $(DEFS) $(AM_CPPFLAGS) $(librpmio_la_SOURCES) - check_PROGRAMS = check_PROGRAMS += tax diff --git a/rpmio/macro.c b/rpmio/macro.c index 4f9be0700..462ee74f3 100644 --- a/rpmio/macro.c +++ b/rpmio/macro.c @@ -54,12 +54,6 @@ typedef FILE * FD_t; #include "debug.h" -#if defined(__LCLINT__) -/*@-exportheader@*/ -extern const unsigned short int **__ctype_b_loc (void) /*@*/; -/*@=exportheader@*/ -#endif - /*@access FD_t@*/ /* XXX compared with NULL */ /*@access MacroContext@*/ /*@access MacroEntry@*/ @@ -2014,6 +2008,11 @@ rpmInitMacros(MacroContext mc, const char * macrofiles) /* Read macros from each file. */ for (i = 0; i < ac; i++) { + if (strstr(av[i], ".rpmnew") || + strstr(av[i], ".rpmsave") || + strstr(av[i], ".rpmorig")) { + continue; + } (void) rpmLoadMacroFile(mc, av[i]); av[i] = _free(av[i]); } diff --git a/rpmio/rpmdav.c b/rpmio/rpmdav.c index beafa26f4..93f083a82 100644 --- a/rpmio/rpmdav.c +++ b/rpmio/rpmdav.c @@ -5,7 +5,7 @@ #include "system.h" -#if defined(HAVE_PTHREAD_H) && !defined(__LCLINT__) +#if defined(HAVE_PTHREAD_H) #include <pthread.h> #endif diff --git a/rpmio/rpmio.c b/rpmio/rpmio.c index e2bfec7eb..92306b915 100644 --- a/rpmio/rpmio.c +++ b/rpmio/rpmio.c @@ -26,7 +26,7 @@ #endif /* XXX HP-UX w/o -D_XOPEN_SOURCE needs */ -#if !defined(HAVE_HERRNO) && (defined(__hpux) || defined(__LCLINT__)) +#if !defined(HAVE_HERRNO) && (defined(__hpux)) /*@unchecked@*/ extern int h_errno; #endif diff --git a/rpmio/rpmio.h b/rpmio/rpmio.h index 1913ffc89..50366786e 100644 --- a/rpmio/rpmio.h +++ b/rpmio/rpmio.h @@ -31,7 +31,7 @@ typedef /*@abstract@*/ struct pgpDigParams_s * pgpDigParams; * typedefs to isolate the lossage. */ /*@{*/ -#if !defined(__LCLINT__) && defined(__GLIBC__) && \ +#if defined(__GLIBC__) && \ (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2)) #define USE_COOKIE_SEEK_POINTER 1 typedef _IO_off64_t _libio_off_t; diff --git a/rpmio/rpmio_internal.h b/rpmio/rpmio_internal.h index 2ac020c58..cc67329cf 100644 --- a/rpmio/rpmio_internal.h +++ b/rpmio/rpmio_internal.h @@ -207,13 +207,8 @@ extern int _dav_debug; if ((_rpmio_debug | ((_f) ? ((FD_t)(_f))->flags : 0)) & (_m)) fprintf _x \ /*@=modfilesys@*/ -#if defined(__LCLINT__XXX) -#define DBGIO(_f, _x) -#define DBGREFS(_f, _x) -#else #define DBGIO(_f, _x) DBG((_f), RPMIO_DEBUG_IO, _x) #define DBGREFS(_f, _x) DBG((_f), RPMIO_DEBUG_REFS, _x) -#endif #ifdef __cplusplus extern "C" { diff --git a/rpmio/rpmmalloc.c b/rpmio/rpmmalloc.c index f401c4581..362463c28 100644 --- a/rpmio/rpmmalloc.c +++ b/rpmio/rpmmalloc.c @@ -19,7 +19,7 @@ } /*@=modfilesys@*/ -#if !(HAVE_MCHECK_H && defined(__GNUC__)) && !defined(__LCLINT__) +#if !(HAVE_MCHECK_H && defined(__GNUC__)) /*@out@*/ /*@only@*/ void * xmalloc (size_t size) { diff --git a/rpmio/rpmrpc.c b/rpmio/rpmrpc.c index 0d2bcf37a..a13ab3bb0 100644 --- a/rpmio/rpmrpc.c +++ b/rpmio/rpmrpc.c @@ -4,7 +4,7 @@ #include "system.h" -#if defined(HAVE_PTHREAD_H) && !defined(__LCLINT__) +#if defined(HAVE_PTHREAD_H) #include <pthread.h> #endif diff --git a/rpmio/rpmsq.c b/rpmio/rpmsq.c index 76245aaff..736e2c983 100644 --- a/rpmio/rpmsq.c +++ b/rpmio/rpmsq.c @@ -4,119 +4,6 @@ #include "system.h" -#if defined(__LCLINT__) -#define _BITS_SIGTHREAD_H /* XXX avoid __sigset_t heartburn. */ - -/*@-incondefs -protoparammatch@*/ -/*@-exportheader@*/ -/*@constant int SA_SIGINFO@*/ -extern int sighold(int sig) - /*@globals errno, systemState @*/; -extern int sigignore(int sig) - /*@globals errno, systemState @*/; -extern int sigpause(int sig) - /*@globals errno, systemState @*/; -extern int sigrelse(int sig) - /*@globals errno, systemState @*/; -extern void (*sigset(int sig, void (*disp)(int)))(int) - /*@globals errno, systemState @*/; - -struct qelem; -extern void insque(struct qelem * __elem, struct qelem * __prev) - /*@modifies __elem, __prev @*/; -extern void remque(struct qelem * __elem) - /*@modifies __elem @*/; - -extern pthread_t pthread_self(void) - /*@*/; -extern int pthread_equal(pthread_t t1, pthread_t t2) - /*@*/; - -extern int pthread_create(/*@out@*/ pthread_t *restrict thread, - const pthread_attr_t *restrict attr, - void *(*start_routine)(void*), void *restrict arg) - /*@modifies *thread @*/; -extern int pthread_join(pthread_t thread, /*@out@*/ void **value_ptr) - /*@modifies *value_ptr @*/; - -extern int pthread_setcancelstate(int state, /*@out@*/ int *oldstate) - /*@globals internalState @*/ - /*@modifies *oldstate, internalState @*/; -extern int pthread_setcanceltype(int type, /*@out@*/ int *oldtype) - /*@globals internalState @*/ - /*@modifies *oldtype, internalState @*/; -extern void pthread_testcancel(void) - /*@globals internalState @*/ - /*@modifies internalState @*/; -extern void pthread_cleanup_pop(int execute) - /*@globals internalState @*/ - /*@modifies internalState @*/; -extern void pthread_cleanup_push(void (*routine)(void*), void *arg) - /*@globals internalState @*/ - /*@modifies internalState @*/; -extern void _pthread_cleanup_pop(/*@out@*/ struct _pthread_cleanup_buffer *__buffer, int execute) - /*@globals internalState @*/ - /*@modifies internalState @*/; -extern void _pthread_cleanup_push(/*@out@*/ struct _pthread_cleanup_buffer *__buffer, void (*routine)(void*), /*@out@*/ void *arg) - /*@globals internalState @*/ - /*@modifies internalState @*/; - -extern int pthread_mutexattr_destroy(pthread_mutexattr_t *attr) - /*@globals errno, internalState @*/ - /*@modifies *attr, errno, internalState @*/; -extern int pthread_mutexattr_init(/*@out@*/ pthread_mutexattr_t *attr) - /*@globals errno, internalState @*/ - /*@modifies *attr, errno, internalState @*/; - -int pthread_mutexattr_gettype(const pthread_mutexattr_t *restrict attr, - /*@out@*/ int *restrict type) - /*@modifies *type @*/; -int pthread_mutexattr_settype(pthread_mutexattr_t *attr, int type) - /*@globals errno, internalState @*/ - /*@modifies *attr, errno, internalState @*/; - -extern int pthread_mutex_destroy(pthread_mutex_t *mutex) - /*@modifies *mutex @*/; -extern int pthread_mutex_init(/*@out@*/ pthread_mutex_t *restrict mutex, - /*@null@*/ const pthread_mutexattr_t *restrict attr) - /*@globals errno, internalState @*/ - /*@modifies *mutex, errno, internalState @*/; - -extern int pthread_mutex_lock(pthread_mutex_t *mutex) - /*@globals errno @*/ - /*@modifies *mutex, errno @*/; -extern int pthread_mutex_trylock(pthread_mutex_t *mutex) - /*@globals errno @*/ - /*@modifies *mutex, errno @*/; -extern int pthread_mutex_unlock(pthread_mutex_t *mutex) - /*@globals errno @*/ - /*@modifies *mutex, errno @*/; - -extern int pthread_cond_destroy(pthread_cond_t *cond) - /*@modifies *cond @*/; -extern int pthread_cond_init(/*@out@*/ pthread_cond_t *restrict cond, - const pthread_condattr_t *restrict attr) - /*@globals errno, internalState @*/ - /*@modifies *cond, errno, internalState @*/; - -extern int pthread_cond_timedwait(pthread_cond_t *restrict cond, - pthread_mutex_t *restrict mutex, - const struct timespec *restrict abstime) - /*@modifies *cond, *mutex @*/; -extern int pthread_cond_wait(pthread_cond_t *restrict cond, - pthread_mutex_t *restrict mutex) - /*@modifies *cond, *mutex @*/; -extern int pthread_cond_broadcast(pthread_cond_t *cond) - /*@globals errno, internalState @*/ - /*@modifies *cond, errno, internalState @*/; -extern int pthread_cond_signal(pthread_cond_t *cond) - /*@globals errno, internalState @*/ - /*@modifies *cond, errno, internalState @*/; - -/*@=exportheader@*/ -/*@=incondefs =protoparammatch@*/ -#endif - #include <signal.h> #include <sys/signal.h> #include <sys/wait.h> @@ -370,11 +257,7 @@ int rpmsqEnable(int signum, /*@null@*/ rpmsqAction_t handler) (void) sigemptyset (&sa.sa_mask); sa.sa_flags = SA_SIGINFO; -#if defined(__LCLINT__) /* XXX glibc has union to track handler prototype. */ - sa.sa_handler = (void*)(handler != NULL ? handler : tbl->handler); -#else sa.sa_sigaction = (void*)(handler != NULL ? handler : tbl->handler); -#endif if (sigaction(tbl->signum, &sa, &tbl->oact) < 0) { SUB_REF(tbl); break; diff --git a/rpmio/rpmsw.c b/rpmio/rpmsw.c index e98d3607a..52e3f63b5 100644 --- a/rpmio/rpmsw.c +++ b/rpmio/rpmsw.c @@ -6,15 +6,6 @@ #include <rpmsw.h> #include "debug.h" -#if defined(__LCLINT__) -/*@-exportheader@*/ -extern int nanosleep(const struct timespec *__requested_time, - /*@out@*/ /*@null@*/ struct timespec *__remaining) - /*@globals errno @*/ - /*@modifies *__remaining, errno @*/; -/*@=exportheader@*/ -#endif - /*@unchecked@*/ static rpmtime_t rpmsw_overhead = 0; diff --git a/rpmpopt.in b/rpmpopt.in index f6d86441c..b26ca3181 100644 --- a/rpmpopt.in +++ b/rpmpopt.in @@ -109,14 +109,9 @@ rpm alias --fileclass --qf '[%{FILENAMES}\t%{FILECLASS}\n]' \ rpm alias --filecolor --qf '[%{FILENAMES}\t%{FILECOLORS}\n]' \ --POPTdesc=$"list file names with colors" -rpm alias --filecontext --qf '[%{FILENAMES}\t%{FILECONTEXTS}\n]' \ - --POPTdesc=$"list file names with security context from header" - -rpm alias --fscontext --qf '[%{FILENAMES}\t%{FSCONTEXTS}\n]' \ - --POPTdesc=$"list file names with security context from file system" - -rpm alias --recontext --qf '[%{FILENAMES}\t%{RECONTEXTS}\n]' \ - --POPTdesc=$"list file names with security context from policy RE" +rpm alias --fscontext --qf '[%{FILENAMES}\n]' \ + --pipe "xargs ls --scontext | awk '{printf(\"%s %s\n\", $2, $1)}'" \ + --POPTdesc=$"list file names with security context from file system" rpm alias --fileprovide --qf '[%{FILENAMES}\t%{FILEPROVIDE}\n]' \ --POPTdesc=$"list file names with provides" @@ -489,14 +484,9 @@ rpmquery alias --fileclass --qf '[%{FILENAMES}\t%{FILECLASS}\n]' \ rpmquery alias --filecolor --qf '[%{FILENAMES}\t%{FILECOLORS}\n]' \ --POPTdesc=$"list file names with colors" -rpmquery alias --filecontext --qf '[%{FILENAMES}\t%{FILECONTEXTS}\n]' \ - --POPTdesc=$"list file names with security context" - -rpmquery alias --fscontext --qf '[%{FILENAMES}\t%{FSCONTEXTS}\n]' \ - --POPTdesc=$"list file names with security context from file system" - -rpmquery alias --recontext --qf '[%{FILENAMES}\t%{RECONTEXTS}\n]' \ - --POPTdesc=$"list file names with security context from policy RE" +rpmquery alias --fscontext --qf '[%{FILENAMES}\n]' \ + --pipe "xargs ls --scontext | awk '{printf(\"%s %s\n\", $2, $1)}'" \ + --POPTdesc=$"list file names with security context from file system" rpmquery alias --fileprovide --qf '[%{FILENAMES}\t%{FILEPROVIDE}\n]' \ --POPTdesc=$"list file names with provides" @@ -431,7 +431,5 @@ buildarch_compat: x86_64: noarch buildarch_compat: amd64: x86_64 buildarch_compat: ia32e: x86_64 -macrofiles: @RPMCONFIGDIR@/macros:@RPMCONFIGDIR@/%{_target}/macros:@SYSCONFIGDIR@/macros.*:@SYSCONFIGDIR@/macros:@SYSCONFIGDIR@/%{_target}/macros:~/.rpmmacros - # \endverbatim #*/ diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 41a4883bf..0d08c3889 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -4,19 +4,16 @@ bin_SCRIPTS = gendiff EXTRA_DIST = \ gendiff \ - brp-compress brp-python-bytecompile brp-java-gcjcompile brp-redhat \ + brp-compress brp-python-bytecompile brp-java-gcjcompile \ brp-strip brp-strip-comment-note \ brp-strip-shared brp-strip-static-archive brp-sparc64-linux \ - check-files check-prereqs convertrpmrc.sh cross-build \ + check-files check-prereqs \ check-buildroot check-rpaths check-rpaths-worker \ - find-debuginfo.sh find-lang.sh find-prov.pl find-req.pl \ - cpanflute cpanflute2 Specfile.pm find-provides.perl \ - find-requires.perl freshen.sh get_magic.pl getpo.sh http.req \ - libtool.prov.sh libtool.req.sh pkgconfig.prov.sh pkgconfig.req.sh \ - magic.prov magic.req perldeps.pl perl.prov perl.req pythondeps.sh \ + find-debuginfo.sh find-lang.sh + perldeps.pl perl.prov perl.req pythondeps.sh \ rpmdb_loadcvt rpmdiff rpmdiff.cgi \ rpm.daily rpm.log rpm.xinetd rpm2cpio.sh \ - sql.prov sql.req tcl.req tgpg trpm u_pkg.sh \ + tcl.req tgpg u_pkg.sh \ vpkg-provides.sh vpkg-provides2.sh \ macros.perl.in macros.python.in \ macros.php.in find-requires.php find-provides.php \ @@ -24,23 +21,16 @@ EXTRA_DIST = \ mono-find-requires mono-find-provides \ pkgconfigdeps.sh libtooldeps.sh -installprefix = $(DESTDIR) - -all: - -configdir = ${prefix}/lib/rpm +configdir = @RPMCONFIGDIR@ config_SCRIPTS = \ - brp-compress brp-python-bytecompile brp-java-gcjcompile brp-redhat \ + brp-compress brp-python-bytecompile brp-java-gcjcompile \ brp-strip brp-strip-comment-note \ brp-strip-shared brp-strip-static-archive brp-sparc64-linux \ - check-files check-prereqs convertrpmrc.sh cross-build \ + check-files check-prereqs \ check-buildroot check-rpaths check-rpaths-worker \ - find-debuginfo.sh find-lang.sh find-prov.pl find-req.pl \ - cpanflute cpanflute2 Specfile.pm find-provides.perl \ - find-requires.perl freshen.sh get_magic.pl getpo.sh http.req \ - magic.prov magic.req perldeps.pl perl.prov perl.req pythondeps.sh \ + find-debuginfo.sh find-lang.sh \ + perl.prov perl.req pythondeps.sh \ mono-find-requires mono-find-provides \ rpmdb_loadcvt rpmdiff rpmdiff.cgi \ rpm.daily rpm.log rpm.xinetd rpm2cpio.sh \ - sql.prov sql.req tcl.req tgpg trpm u_pkg.sh \ - vpkg-provides.sh vpkg-provides2.sh + tcl.req tgpg diff --git a/scripts/Specfile.pm b/scripts/Specfile.pm deleted file mode 100644 index f04c68b8c..000000000 --- a/scripts/Specfile.pm +++ /dev/null @@ -1,193 +0,0 @@ -package RPM::Specfile; - -use POSIX; - -use strict; - -use vars qw/$VERSION/; - -$VERSION = '1.02'; - -sub new { - my $class = shift; - - my $self = bless { }, $class; - - return $self; -} - -my @simple_accessors = qw/name version release epoch license group url description prep build clean install summary buildroot buildrequires file_param packager vendor distribution buildarch/; - -foreach my $field (@simple_accessors) { - my $sub = q { - sub RPM::Specfile::[[field]] { - my $self = shift; - if (@_) { - my $value = shift; - $self->{__[[field]]__} = $value; - } - return $self->{__[[field]]__}; - } - }; - - $sub =~ s/\[\[field\]\]/$field/g; - eval $sub; - - if ($@) { - die $@; - } -} - -my @array_accessors = qw/source patch changelog provide require file/; - -foreach my $field (@array_accessors) { - my $sub = q { - sub RPM::Specfile::[[field]] { - my $self = shift; - $self->{__[[field]]__} ||= [ ]; - - if (@_) { - my $index = shift; - if (@_) { - my $value = shift; - $self->{__[[field]]__}->[$index] = $value; - } - return $self->{__[[field]]__}->[$index]; - } - else { - return @{$self->{__[[field]]__}}; - } - } - - sub RPM::Specfile::push_[[field]] { - my $self = shift; - my $entry = shift; - - $self->{__[[field]]__} ||= [ ]; - push @{$self->{__[[field]]__}}, $entry; - } - - sub RPM::Specfile::clear_[[field]] { - my $self = shift; - my $entry = shift; - - $self->{__[[field]]__} = [ ]; - } - - }; - - $sub =~ s/\[\[field\]\]/$field/g; - eval $sub; - - if ($@) { - die $@; - } -} - -sub add_changelog_entry { - my $self = shift; - my $who = shift; - my $entry = shift; - - my $output; - $output .= strftime("* %a %b %d %Y $who\n", localtime time); - $output .= "- $entry\n"; - - $self->push_changelog($output); -} - -sub generate_specfile { - my $self = shift; - - my $output; - - my %defaults = ( buildroot => "%{_tmppath}/%{name}-root" ); - $self->$_($self->$_() || $defaults{$_}) foreach keys %defaults; - - my %proper_names = ( url => "URL", buildroot => "BuildRoot", "buildrequires" => "BuildRequires" ); - - foreach my $tag (qw/name version release epoch packager vendor distribution summary license group url buildroot buildrequires buildarch/) { - my $proper = $proper_names{$tag} || ucfirst $tag; - - next unless defined $self->$tag(); - $output .= "$proper: " . $self->$tag() . "\n"; - } - - my @reqs = $self->require; - for my $i (0 .. $#reqs) { - $output .= "Requires: $reqs[$i]\n"; - } - - my @sources = $self->source; - for my $i (0 .. $#sources) { - $output .= "Source$i: $sources[$i]\n"; - } - - my @patches = $self->patch; - for my $i (0 .. $#patches) { - $output .= "Patch$i: $patches[$i]\n"; - } - - $output .= "\n"; - - foreach my $sect (qw/description prep build clean install/) { - $output .= "%$sect\n"; - $output .= $self->$sect() . "\n"; - } - - if ($self->file_param) { - $output .= "%files " . $self->file_param . "\n"; - } - else { - $output .= "%files\n"; - } - $output .= "$_\n" foreach $self->file; - - $output .= "\n%changelog\n"; - $output .= "$_\n" foreach $self->changelog; - - return $output; -} - -sub write_specfile { - my $self = shift; - my $dest = shift; - - open FH, ">$dest" - or die "Can't open $dest: $!"; - - print FH $self->generate_specfile; - - close FH; -} - -1; - -__END__ -# Below is stub documentation for your module. You better edit it! - -=head1 NAME - -RPM::Specfile - Perl extension for creating RPM Specfiles - -=head1 SYNOPSIS - - use RPM::Specfile; - -=head1 DESCRIPTION - -Simple module for creation of RPM Spec files - -=head2 EXPORT - -None by default. - -=head1 AUTHOR - -Chip Turner <cturner@redhat.com> - -=head1 SEE ALSO - -L<perl>. - -=cut diff --git a/scripts/brp-redhat.in b/scripts/brp-redhat.in deleted file mode 100755 index 9e2e4dddb..000000000 --- a/scripts/brp-redhat.in +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -# These are the build root policies that Red Hat invokes at the end -# of the %install scriptlet. - -# Compress man pages (Red Hat uses GNU gzip) -@RPMCONFIGDIR@/brp-compress - -# Strip ELF binaries (Red Hat uses GNU binutils). -@RPMCONFIGDIR@/brp-strip - -# Strip even more sections (Red Hat uses GNU binutils). -@RPMCONFIGDIR@/brp-strip-comment-note diff --git a/scripts/convertrpmrc.sh b/scripts/convertrpmrc.sh deleted file mode 100644 index 7faa5d376..000000000 --- a/scripts/convertrpmrc.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/bin/sh -# -# Convert per-system configuration in /etc/rpmrc to macros in /etc/rpm/macros. -# -# prereq: awk fileutils textutils sh-utils mktemp -# - -RPMRC=$1 -[ -z "$RPMRC" ] && RPMRC=/etc/rpmrc -MACROS=$2 -[ -z "$MACROS" ] && MACROS=/etc/rpm/macros -# for testing -#RPMRC=/tmp/rpmrc -#MACROS=/tmp/macros - -[ -f $RPMRC ] || exit 0 - -[ -f $MACROS ] && { - echo "$MACROS already exists" 1>&2 - exit 1 -} - -DIRN="`dirname $MACROS`" -[ -d "$DIRN" ] || mkdir -p "$DIRN" -[ -d "$DIRN" ] || { - echo "could not create directory $DIRN" 1>&2 - exit 1 -} - -TMP=$(mktemp /tmp/rpmrc.XXXXXX) || { - echo could not create temp file 1>&2 - exit 1 -} - -awk 'BEGIN { - macros="'"$MACROS"'" - # direct translation except underscore prepended - xlate["builddir"] = "_builddir" - xlate["buildshell"] = "_buildshell" - xlate["bzip2bin"] = "_bzip2bin" - xlate["dbpath"] = "_dbpath" - xlate["defaultdocdir"] = "_defaultdocdir" - xlate["excludedocs"] = "_excludedocs" - xlate["ftpport"] = "_ftpport" - xlate["ftpproxy"] = "_ftpproxy" - xlate["gzipbin"] = "_gzipbin" - xlate["instchangelog"] = "_instchangelog" - xlate["langpatt"] = "_langpatt" - xlate["netsharedpath"] = "_netsharedpath" - xlate["pgp_name"] = "_pgp_name" - xlate["pgp_path"] = "_pgp_path" - xlate["rpmdir"] = "_rpmdir" - xlate["rpmfilename"] = "_rpmfilename" - xlate["signature"] = "_signature" - xlate["sourcedir"] = "_sourcedir" - xlate["specdir"] = "_specdir" - xlate["srcrpmdir"] = "_srcrpmdir" - xlate["timecheck"] = "_timecheck" - xlate["tmppath"] = "_tmppath" - xlate["topdir"] = "_topdir" - - # direct translation with no underscore at all - xlate["buildroot"] = "buildroot" - xlate["distribution"] = "distribution" - xlate["packager"] = "packager" - xlate["vendor"] = "vendor" - - # simply remove - xlate["messagelevel"] = "" - xlate["require_distribution"] = "" - xlate["require_icon"] = "" - xlate["require_vendor"] = "" -} - -{ - for (str in xlate) { - ms = "^" str ":" - if (match($1, ms)) { - if (xlate[str]) { - sub(ms, "%" xlate[str] " ") - print >> macros - } - # else get ignore and thus get rid of obsolete items - next - } - if (match ($1, "^fixperms:")) { - sub("^fixperms:", "%_fixperms chmod -R ") - print >> macros - next - } - } - print - next -} -' < $RPMRC > $TMP || { - echo "could not convert $RPMRC entries to $MACROS entries" 1>&2 - exit 1 -} -if [ -s $TMP ] ; then - # don't mess with timestamp unless we have actually changed something - cat $TMP > $RPMRC && rm -f $TMP - [ -f $TMP ] && { echo "could not overwrite $RPMRC" 1>&2 ; exit 1 ; } -fi -rm -f $TMP - -exit 0 diff --git a/scripts/cpanflute b/scripts/cpanflute deleted file mode 100755 index a95f59789..000000000 --- a/scripts/cpanflute +++ /dev/null @@ -1,173 +0,0 @@ -#!/usr/bin/perl - -# need this for hostname() -use File::Basename; -use Sys::Hostname; -use Getopt::Long; -use strict; - -my $MainDir = '/tmp/cpan'; - -# set default options, then get options -my %options=(); -$options{'email'}=(getpwuid($<))[0] . "\@redhat.com" ; -GetOptions(\%options, "email=s", "n=s", "create") || exit 1; - -my $InputFile = $ARGV[0]; -my $create = ''; - -if ($options{'create'}) { - $create = '-c'; -} - -my $tarball = basename($InputFile); -$tarball =~ /(\S+)\-(\S+)\.tar\.gz/; -my $clm_name=$1; -my $clm_version=$2; - -my $class = dirname($InputFile); -$class =~ s/^\.\/[0-9][0-9]_//; -if ($class ne '.') { - $class = "($class)"; -} else { - $class = ""; -} - -# Change ::'s to -'s -$clm_name =~ s/::/-/g; - -my $clm_changelog = get_changelog(); - -# complain if either parameter is missing -($clm_name eq "") && die "Module name not specified\n"; -($clm_version eq "") && die "Module version not specified\n"; - -# Create and Open file to create SPEC files. -mkdir($MainDir, 0755); -system("cp $InputFile $MainDir"); -my $filename = $clm_name . '.spec'; -open (FILE, "> $MainDir/$filename"); - -# Print the spec file. Lots of substitutions here. -print FILE "Summary: $clm_name module for perl $class -Name: perl-$clm_name -Version: $clm_version -Release: 7 -Copyright: distributable -Group: Applications/CPAN -Source0: $clm_name-$clm_version.tar.gz -Url: http://www.cpan.org -BuildRoot: %{_tmppath}/perl-$clm_name-buildroot/ -BuildRequires: perl >= 0:5.00503 -Requires: perl >= 0:5.00503 - -%description -$clm_name module for perl - -# Provide perl-specific find-{provides,requires}. -%define __find_provides /usr/lib/rpm/find-provides.perl -%define __find_requires /usr/lib/rpm/find-requires.perl - -%prep -%setup -q -n $clm_name-%{version} $create - -%build -CFLAGS=\"\$RPM_OPT_FLAGS\" perl Makefile.PL -make - -%clean -rm -rf \$RPM_BUILD_ROOT - -%install -rm -rf \$RPM_BUILD_ROOT -eval `perl '-V:installarchlib'` -mkdir -p \$RPM_BUILD_ROOT/\$installarchlib -make PREFIX=\$RPM_BUILD_ROOT/usr install - -[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress - -find \$RPM_BUILD_ROOT/usr -type f -print | \ - sed \"s\@^\$RPM_BUILD_ROOT\@\@g\" | \ - grep -v perllocal.pod | \ - grep -v \"\\.packlist\" > $clm_name-$clm_version-filelist -if [ \"\$(cat $clm_name-$clm_version-filelist)X\" = \"X\" ] ; then - echo \"ERROR: EMPTY FILE LIST\" - exit -1 -fi - -%files -f $clm_name-$clm_version-filelist -%defattr(-,root,root) - -%changelog -* $clm_changelog -- Spec file was autogenerated. -"; -close(FILE); - -# Now build the rpm -create_rcfiles(); - -open (LOG, "> $MainDir/LogFile"); -build_rpm(); -close LOG; - -sub cleanup { - unlink "$MainDir/$filename"; - unlink "$MainDir/$tarball"; -} - -sub build_rpm { - my $retval; - - # First, make sure it unpacks cleanely - system("rpm --rcfile $MainDir/rpmrc -bp $MainDir/$filename"); - $retval = $? >> 8; - if ($retval != 0) { - print "RPM test unpacking failed!\n"; - print LOG "PREP failed: $filename\n"; - return; - } - - system("rpm --rcfile $MainDir/rpmrc -bs --rmsource --rmspec --clean $MainDir/$filename"); - $retval = $? >> 8; - if ($retval != 0) { - print "RPM building failed!\n"; - print LOG "SOURCE failed: $filename\n"; - return; - } - cleanup(); -} - -sub create_rcfiles { - open(MACROS, "> $MainDir/macros"); - print MACROS qq{ -%_topdir $MainDir -%_builddir %{_topdir}/junk -%_rpmdir %{_topdir} -%_sourcedir %{_topdir} -%_specdir %{_topdir} -%_srcrpmdir %{_topdir}/temp -}; - close(MACROS); - - open(RPMRC, "> $MainDir/rpmrc"); - print RPMRC qq{ -include: /usr/lib/rpm/rpmrc -macrofiles: /usr/lib/rpm/macros:$MainDir/macros -}; - close(RPMRC); -} - -sub get_changelog { - # generate the changelog entry from available system info - my ($name); - - $name = (getpwuid($<))[6]; - $name = (split(",", $name))[0]; - return ("Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat")[(localtime)[6]] . " " . - ("Jan", "Feb", "Mar", "Apr", "May", "Jun", - "Jul", "Aug", "Sep", "Oct", "Nov", "Dec")[(localtime)[4]] . " " . - (localtime)[3] . " " . (1900+(localtime)[5]) . " " . - $name . " <" . $options{'email'} . ">"; -} - diff --git a/scripts/cpanflute2 b/scripts/cpanflute2 deleted file mode 100755 index 23d6bed9a..000000000 --- a/scripts/cpanflute2 +++ /dev/null @@ -1,160 +0,0 @@ -#!/usr/bin/perl -w -use strict; - -use Getopt::Long; -use File::Basename; -use File::Copy; -use Archive::Tar; - -use lib '/usr/lib/rpm'; -use Specfile; - -my %options; - -GetOptions(\%options, "outdir=s", "tmpdir=s", "email=s", "name=s", "create", "test", "epoch=n", "version=s", "release=s", "perlver=s", "patch=s", "noarch=s") or die_usage(); - -my $fullname = shift; - -die_usage() unless $fullname; - -my $tarball = basename($fullname); -my $create = $options{create} || ''; -my $email = $options{email} || (getpwuid($<))[0] . '@redhat.com'; -my $outdir = $options{outdir} || './'; -my $tmpdir = $options{tmpdir} || '/tmp'; -my $noarch = $options{noarch}; - -$tarball =~ /^(.+)\-([^-]+)\.tar\.gz$/; -my $name = $options{name} || $1; -my $ver = $options{version} || $2; - -die "Module name/version not parsable from $tarball" unless $name and $ver; - -$name =~ s/::/-/g; - -copy($fullname, $tmpdir) - or die "copy: $!"; - -$noarch = $options{noarch}; - -my $patchfile = ''; -if ($options{patch}) { - copy($options{patch}, $tmpdir); - $patchfile = $options{patch}; -} - -my $spec = new RPM::Specfile; - -my $perlver = "0:5.00503"; -if ($options{perlver} and $options{perlver} eq '5.6.1') { - $perlver = "1:5.6.1"; -} - -# some basic spec fields -$spec->name("perl-$name"); -$spec->version($ver); -$spec->release($options{release} || "8"); -$spec->epoch($options{epoch}); -$spec->summary("$name Perl module"); -$spec->description($spec->summary); -$spec->group("Development/Libraries"); -$spec->license("distributable"); -$spec->buildrequires("perl >= $perlver"); -$spec->packager($email); -$spec->add_changelog_entry($email, 'Specfile autogenerated'); - -$spec->buildarch('noarch') if $noarch; - -# $spec->push_require(q|%(perl -MConfig -le 'if (defined $Config{useithreads}) { print "perl(:WITH_ITHREADS)" } else { print "perl(:WITHOUT_ITHREADS)" }')|); -# $spec->push_require(q|%(perl -MConfig -le 'if (defined $Config{usethreads}) { print "perl(:WITH_THREADS)" } else { print "perl(:WITHOUT_THREADS)" }')|); -# $spec->push_require(q|%(perl -MConfig -le 'if (defined $Config{uselargefiles}) { print "perl(:WITH_LARGEFILES)" } else { print "perl(:WITHOUT_LARGEFILES)" }')|); - -$spec->push_source($tarball); -$spec->push_patch(basename($patchfile)) - if $patchfile; - -# make a URL that can actually possibly take you to the right place -my $url_name = $name; -$url_name =~ s/-/::/g; -$url_name =~ s/([^a-zA-Z0-9])/sprintf "%%%x", ord $1/ge; -$spec->url("http://search.cpan.org/search?mode=module&query=$url_name"); - -# now we get into the multiline tags. stolen mostly verbatim from -# cpanflute1 - -my $patch = ''; -if ($patchfile) { - $patch = "%patch0 -p1\n"; -} - -$spec->prep("%setup -q -n $name-%{version} $create\n$patch"); -$spec->file_param("-f $name-$ver-filelist"); -$spec->push_file("%defattr(-,root,root)"); - -my $test_clause = ''; -$test_clause = "make test" if $options{test}; - -$spec->build(<<EOB); -CFLAGS="\$RPM_OPT_FLAGS" perl Makefile.PL -make -$test_clause -EOB - -$spec->clean('rm -rf $RPM_BUILD_ROOT'); -my $inst = q{ -rm -rf $RPM_BUILD_ROOT -eval `perl '-V:installarchlib'` -mkdir -p $RPM_BUILD_ROOT/$installarchlib -make PREFIX=$RPM_BUILD_ROOT/usr install - -[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress - -find $RPM_BUILD_ROOT/usr -type f -print | \ - sed "s@^$RPM_BUILD_ROOT@@g" | \ - grep -v perllocal.pod | \ - grep -v "\.packlist" > $name-$ver-filelist -if [ "$(cat $name-$ver-filelist)X" = "X" ] ; then - echo "ERROR: EMPTY FILE LIST" - exit -1 -fi -}; - -$inst =~ s/\$name/$name/g; -$inst =~ s/\$ver/$ver/g; - -$spec->install($inst); - -# write the spec file. create some macros. -$spec->write_specfile("$tmpdir/perl-$name.spec"); - -open FH, ">$tmpdir/macros" - or die "Can't create $tmpdir/macros: $!"; - -print FH qq{ -%_topdir $tmpdir -%_builddir %{_topdir} -%_rpmdir %{_topdir} -%_sourcedir %{_topdir} -%_specdir %{_topdir} -%_srcrpmdir $outdir -}; - -close FH; - -open FH, ">$tmpdir/rpmrc" - or die "Can't create $tmpdir/rpmrc: $!"; - -print FH qq{ -include: /usr/lib/rpm/rpmrc -macrofiles: /usr/lib/rpm/macros:$tmpdir/macros -}; -close FH; - -# perform the build, die on error -my $retval = system "rpm --rcfile $tmpdir/rpmrc -bs --rmsource --rmspec --clean $tmpdir/perl-$name.spec"; -$retval = $? >> 8; -if ($retval != 0) { - die "RPM building failed!\n"; -} - -unlink "$tmpdir/rpmrc", "$tmpdir/macros"; diff --git a/scripts/cross-build b/scripts/cross-build deleted file mode 100644 index 0a6a2b4b2..000000000 --- a/scripts/cross-build +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh -# -# Example script to cross-build for the platform "sh-linux-gnu". -# -# - -SHMAKE='make CC=sh-linux-gnu-gcc CONFIG_SITE=/usr/lib/rpm/config.site RANLIB=sh-linux-gnu-ranlib LD=sh-linux-gnu-ld AS=sh-linux-gnu-as GAS=sh-linux-gnu-as STRIP=sh-linux-gnu-strip CC_FOR_BUILD=gcc OBJDUMP=sh-linux-gnu-objdump AR="sh-linux-gnu-ar" CXX=sh-linux-g++' - -for pkg in $@ ; do - echo $pkg - if [ ! -r $pkg.log ]; then - $SHMAKE RPMFILE=$pkg 2>&1 | tee $pkg.log - if [ -r /usr/src/redhat/RPMS/sh/`echo $pkg | sed -e "s:/tmp/srpms/::" -e "s/.src.rpm/.sh.rpm/"` ]; then - mv $pkg $pkg.log /tmp/srpms/done - fi - fi -done diff --git a/scripts/find-prov.pl b/scripts/find-prov.pl deleted file mode 100755 index f430c50fb..000000000 --- a/scripts/find-prov.pl +++ /dev/null @@ -1,223 +0,0 @@ -#!/bin/sh - -# This script reads filenames from STDIN and outputs any relevant provides -# information that needs to be included in the package. - -PATH=/usr/bin:/usr/ccs/bin:/usr/sbin:/sbin:/usr/local/bin; -export PATH; - -javadeps_args='--provides --rpmformat --keywords --starprov' - - -IGNORE_DEPS="@" -BUILDROOT="/" - - - -# Loop over all args - -while : -do - -# Break out if there are no more args - case $# in - 0) - break - ;; - esac - -# Get the first arg, and shuffle - option=$1 - shift - -# Make all options have two hyphens - orig_option=$option # Save original for error messages - case $option in - --*) ;; - -*) option=-$option ;; - esac - - - case $option in - --buildroot) - BUILDROOT=$1 - shift - ;; - --ignore_deps) - IGNORE_DEPS=$1 - shift - ;; - --help) - echo $usage - exit 0 - ;; - *) - echo "$0: Unrecognized option: \"$orig_option\"; use --help for usage." >&2 - exit 1 - ;; - esac -done - - - - - - - -for file in `cat -` -do - -# this section is for processing based on the interpreter specified in -# the '#!' line. - -case `get_magic $file` in - -bash) - print_deps --identifier executable $file - print_deps --identifier executable --basename $file -;; - -sh) - print_deps --identifier executable $file - print_deps --identifier executable --basename $file -;; - -perl) - perl.prov $file; -;; - -wish) - print_deps --identifier tcl $file - print_deps --identifier tcl --basename $file -;; - - -esac - - -# this section is for processing based on filename matching. It is -# crude but needed as many library types have no easily identifiable -# '#!' line - -case $file in - -# We can not count on finding a SONAME in third party Libraries though -# they tend to include softlinks with the correct SONMAE name. We -# must assume anything with a *\.so* and is of type 'dynamic lib' is a -# library. This scriptlet works because 'file' follows soft links. - - -*lib*.so*) - /usr/ucb/file -L $file 2>/dev/null | \ - grep "ELF.*dynamic lib" | cut -d: -f1 | \ - xargs -n 1 basename | print_deps --identifier so; - - # keep this for backward compatibility till we have converted - # everything. - - /usr/ucb/file -L $file 2>/dev/null | \ - grep "ELF.*dynamic lib" | cut -d: -f1 | \ - xargs -n 1 basename; -;; - -# Java jar files are just a special kind of zip files. -# Sun OS 5.5.1 does not understand zip archives, it calls them 'data' -# Sun OS 5.6 has this line in /etc/magic -# 0 string PK\003\004 ZIP archive - -*.jar) - - unzip -p $file |\ - javadeps $javadeps_args -; - -;; - -# there are enough jar files out there with zip extensions that we -# need to have a separate entry - -*.zip) - - unzip -p $file |\ - javadeps $javadeps_args -; - -;; - -# Java Class files -# Sun OS 5.6 has this line in /etc/magic -# 0 string \312\376\272\276 java class file - -*.class) - - javadeps $javadeps_args $file; - -;; - - - -# Perl libraries are hard to detect. Use file endings. - -*.pl) - - perl.prov $file; - - # pl files are often required using the .pl extension - # so provide that name as well - - print_deps --identifier perl --basename $file -;; - -*.pm) - - perl.prov $file; -;; - -*.ph) - - # ph files do not use the package name inside the file. - # perlmodlib documentation says: - - # the .ph files made by h2ph will probably end up as - # extension modules made by h2xs. - - # so do not expend much effort on these. - - print_deps --identifier perl --basename $file - -;; - -# tcl libraries are hard to detect. Use file endings. - -*.tcl) - - print_deps --identifier tcl $file - print_deps --identifier tcl --basename $file -;; - - - -*) - - # Dependencies for html documenets are a bit ill defined. Lets try - # using file endings like the browsers do. - # precise globbing is hard so I use egrep instead of the case statement. - -hfile=`basename $file | egrep '\.((cgi)|(ps)|(pdf)|(png)|(jpg)|(gif)|(tiff)|(tif)|(xbm)|(html)|(htm)|(shtml)|(jhtml))$'`; - - if [ "${hfile}" != "" ] - then - print_deps --identifier http --basename $file - fi - - # all files are candidates for being an executable. Let the - # magic.prov script figure out what should be considered - # execuables. - - magic.prov --buildroot=$BUILDROOT $file - -;; - - -esac - -done | sort -u | egrep -v \'$IGNORE_DEPS\' - diff --git a/scripts/find-provides.perl b/scripts/find-provides.perl deleted file mode 100755 index c567baf6d..000000000 --- a/scripts/find-provides.perl +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -exec /usr/lib/rpm/find-provides - diff --git a/scripts/find-req.pl b/scripts/find-req.pl deleted file mode 100755 index 6bf23a1fd..000000000 --- a/scripts/find-req.pl +++ /dev/null @@ -1,211 +0,0 @@ -#!/bin/sh - -# This script reads filenames from STDIN and outputs any relevant provides -# information that needs to be included in the package. - -PATH=/usr/bin:/usr/ccs/bin:/usr/sbin:/sbin:/usr/local/bin; -export PATH; - -javadeps_args='--requires --rpmformat --keywords' - -ulimit -c 0; - - - - - -IGNORE_DEPS="@" -BUILDROOT="/" - - - -# Loop over all args - -while : -do - -# Break out if there are no more args - case $# in - 0) - break - ;; - esac - -# Get the first arg, and shuffle - option=$1 - shift - -# Make all options have two hyphens - orig_option=$option # Save original for error messages - case $option in - --*) ;; - -*) option=-$option ;; - esac - - - case $option in - --buildroot) - BUILDROOT=$1 - shift - ;; - --ignore_deps) - IGNORE_DEPS=$1 - shift - ;; - --help) - echo $usage - exit 0 - ;; - *) - echo "$0: Unrecognized option: \"$orig_option\"; use --help for usage." >&2 - exit 1 - ;; - esac -done - - -for file in `cat -` -do - -# this section is for processing based on the interpreter specified in -# the '#!' line. - -case `get_magic $file` in - -bash) - /usr/local/lib/rpm/bash --rpm-requires $file; -;; - -sh) - /usr/local/lib/rpm/bash --rpm-requires $file; -;; - -perl) - perl.req $file; -;; - -wish) - tcl.req $file; -;; - -python) - python.req $file; -;; - -esac - - -# this section is for processing based on filename matching. It is -# crude but needed as many library types have no easily identifiable -# '#!' line - -case $file in - -# Shared libraries can depend on other shared libraries. - -*lib*.so*) - - ldd $file 2>/dev/null | awk '/\=\>/ { print $1 }' \ - | print_deps --identifier so; - - # keep this for backward compatibility till we have converted - # everything. - - ldd $file 2>/dev/null | awk '/\=\>/ { print $1 }'; - -;; - -# Java jar files are just a special kind of zip files. -# Sun OS 5.5.1 does not understand zip archives, it calls them 'data' -# Sun OS 5.6 has this line in /etc/magic -# 0 string PK\003\004 ZIP archive - -*.jar) - - unzip -p $file |\ - javadeps $javadeps_args -; - -;; - -# there are enough jar files out there with zip extensions that we -# need to have a separate entry - -*.zip) - - unzip -p $file |\ - javadeps $javadeps_args -; - -;; - -# Java Class files -# Sun OS 5.6 has this line in /etc/magic -# 0 string \312\376\272\276 java class file - -*.class) - - javadeps $javadeps_args $file; - -;; - - -# Perl libraries are hard to detect. Need to also Look for #!*perl - -*.pl) - - perl.req $file; - -;; - -*.pm) - - perl.req $file; - -;; - - - -# tcl libraries are hard to detect. Need to also Look for #!*wish #!*tclsh - -*.tcl) - - tcl.req $file; - -;; - -# python libraries are hard to detect. Need to also Look for #!*python - -*.py) - - python.req $file; - -;; - -# Binary executables can have any filename so let file tell us which -# ones are binary filenames. Assume that users do not name ELF binary -# files with names like runme.java - -# Dependencies for html documenets are a bit ill defined. Lets try -# extracting the basename of all strings within "'s -# precise globbing is hard so I use egrep instead of the case statement. - -*) - - /usr/ucb/file -L $file 2>/dev/null | grep executable | cut -d: -f1 |\ - xargs ldd 2>/dev/null | awk '/\=\>/ { print $1 }' | xargs -n 1 basename; - - echo $file | egrep '\.((cgi)|(ps)|(pdf)|(png)|(jpg)|(gif)|(tiff)|(tif)|(xbm)|(html)|(htm)|(shtml)|(jhtml))$' | xargs cat | httprequires - - - # All files are candidates for being an executable. Let the - # magic.req script figure out what should be considered - # execuables. - - magic.req $file - -;; - - -esac - -done | sort -u | egrep -v \'$IGNORE_DEPS\' - diff --git a/scripts/find-requires.perl b/scripts/find-requires.perl deleted file mode 100755 index 06050ddb6..000000000 --- a/scripts/find-requires.perl +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -exec /usr/lib/rpm/find-requires - diff --git a/scripts/freshen.sh b/scripts/freshen.sh deleted file mode 100755 index 78ce4c3f1..000000000 --- a/scripts/freshen.sh +++ /dev/null @@ -1,82 +0,0 @@ -#!/bin/sh - -# Traditionally, and to some extent still, rpm --freshen upgraded -# packages that matched by RPMTAG_NAME, not RPMTAG_PROVIDENAME. -# -# This freshen.sh script illustrates how to revert to the "traditional" -# behavior for doing, say, -# rpm -Fvh kernel-bigmem*.rpm -# so that only kernel-bigmem packages are upgraded, rather than -# upgrading (i.e. erasing) every kernel package that contains -# Provides: kernel = V-R -# -# Copy the freshen.sh script to /usr/lib/rpm, and add the following -# lines to /etc/popt to enable the behavior: -# rpm alias -F --freshen -# rpm exec --freshen /usr/lib/rpm/freshen.sh -# - -dbg= #echo # Do "dbg=echo" for debugging -#set -x -#echo "args: $*" - -# Invoke rpmi from the same directory as freshen.sh. -rpmi="`dirname $0`/rpmi" -rpme="`dirname $0`/rpme" -rpmq="`dirname $0`/rpmq" - -# Parse out any options and add to new arglist. -# Note: this fails for options with arguments, -# and doesn't detect multiple -i/-e/-U/-F options either. -opts="" -while [ $# -gt 0 ]; do - case $1 in - -*) opt="$1" - opts="$opts $opt" && shift - [ "$opt" = "--" ] && break - ;; - *) opts="$opts --" && break - ;; - esac -done -#echo "opts: $opts" - -# $opts has the options with final '--', $* has the package files - -# If no remaining options, just invoke rpm (which will fail). -[ $# = 0 ] && $dbg exec $rpmi -F $opts - -# Split remaining args into erase/install/upgrade invocations -iargs= -eargs= -Fargs= -for fn in $*; do - # If not a file, just pass to freshen. - [ ! -f $fn ] && Fargs="$Fargs $fn" && continue - - # For all occurences of identically named packages installed ... - N="`$rpmq -qp --qf '%{NAME}' $fn`" - NVR="`$rpmq -qa $N`" - - # ... special case kernel packages, ignore packages not installed. - case $N in - kernel*) - # ... if none installed, skip thi kernel package. - [ "$NVR" = "" ] && continue - - # ... else install new package before erasing old package(s). - iargs="$iargs $fn" - eargs="$eargs $NVR" - ;; - *) Fargs="$Fargs $fn";; - esac - -done - -set -e # Exit on any error from here on out. - -# Install before erase to insure deps are provided. -[ "$iargs" != "" ] && $dbg $rpmi -i $opts $iargs -[ "$eargs" != "" ] && $dbg $rpme -e $opts $eargs -# Other, non-kernel, files passed to --freshen as always. -[ "$Fargs" != "" ] && $dbg $rpmi -F $opts $Fargs diff --git a/scripts/get_magic.pl b/scripts/get_magic.pl deleted file mode 100755 index eda5dd535..000000000 --- a/scripts/get_magic.pl +++ /dev/null @@ -1,115 +0,0 @@ -#!/usr/bin/perl - -# Given a filename on the command line or on stdin this script returns -# the (single) interpreter that is required to run the executable. We -# need this information to pick the best dependency parser for this -# file. - -# Usually this is extracted from the #! line of the file -# but we also handle the various 'exec' tricks that people use to -# start the interpreter via an intermediate shell. - - -# These have all been seen on our system or are "recommended" in -# various man pages. - -# Examples: - -# #!/bin/sh -# # the next line restarts using wish \ -# exec wish "$0" "$@" - - -# #!/bin/sh -- # -*- perl -*- -p -# eval 'exec /usr/bin/perl -wS $0 ${1+"$@"}' -# if $running_under_some_shell; - - -# #!/bin/sh -- # -*- perl -*- -p -# eval '(exit $?0)' && eval 'exec /usr/bin/perl -wS $0 ${1+"$@"}' - - -# #!/bin/sh -- # -*- perl -*- -p -# & eval 'exec /usr/bin/perl -wS $0 $argv:q' -# if $running_under_some_shell; - - -# #! /usr/bin/env python - - -use File::Basename; - -if ("@ARGV") { - foreach (@ARGV) { - process_file($_); - } -} else { - - # notice we are passed a list of filenames NOT as common in unix the - # contents of the file. - - foreach (<>) { - process_file($_); - } -} - -foreach $prog (sort keys %require) { - - $prog=basename($prog); - - # ignore variable interpolation and any program whose name is made - # up only of non word characters ('<', '&&', etc). - - ( ( $prog != /\$/ ) || ( $prog =~ /^\W+$/ ) ) && - next; - - print "exectuable($prog)\n"; - -} - -exit 0; - - -sub process_file { - - my ($file) = @_; - chomp $file; - - my ($version, $magic) = (); - - (-f $file) || return ; - - open(FILE, "<$file")|| - die("$0: Could not open file: '$file' : $!\n"); - - my $rc = sysread(FILE,$line,1000); - - $rc =~ s/\#.*\n//g; - - # Ignore all parameter substitution. - # I have no hope of parsing something like: - # exec ${SHELL:-/bin/sh} - - $rc =~ s/\$\{.*\}//g; - $rc =~ s/echo\s+.*[\n;]//g; - - if ( ($rc > 1) && ($line =~ m/^\#\!\s*/) ) { - - if ($line =~ m/\b(exec|env)\s+([\'\"\`\\]+)?([^ \t\n\r]+)/) { - $require{$3} = 1; - last; - } - - # strip off extra lines and any arguments - if ($line =~ m/^\#\!\s*([^ \t\n\r]+)/) { - $require{$1} = 1; - last; - } - - } - - close(FILE) || - die("$0: Could not close file: '$file' : $!\n"); - - return ; -} diff --git a/scripts/getpo.sh b/scripts/getpo.sh deleted file mode 100755 index 62d1e0583..000000000 --- a/scripts/getpo.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh -# - -if [ -z "$1" ] ; then - echo "Usage:" - echo " $0 <rpm>..." - exit 0 -fi - -while [ -n "$1" ] ; do - - [ -f $1 ] || { - echo "$1 could not be found (or is not a file)" - shift - continue - } - - desc=$(rpm -qp $1 --qf "%{DESCRIPTION}" | \ - sed -e 's/\"/\\\\\"/g' -e 's/^/\"/g' -e 's/$/\\\\n\"/g') - - rpm -qp $1 --qf \ -"# ======================================================== -#: %{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}.rpm:1005 %{SOURCERPM}:1005 -msgid \"%{NAME}(Description)\" -msgstr \"\" -$desc - -#: %{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}.rpm:1016 %{SOURCERPM}:1016 -msgid \"%{NAME}(Group)\" -msgstr \"%{GROUP}\" - -#: %{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}.rpm:1004 %{SOURCERPM}:1004 -msgid \"%{NAME}(Summary)\" -msgstr \"%{SUMMARY}\" - -" - # go to the next file - shift -done - diff --git a/scripts/http.req b/scripts/http.req deleted file mode 100755 index 5d04d0c63..000000000 --- a/scripts/http.req +++ /dev/null @@ -1,165 +0,0 @@ -#!/usr/bin/perl - -# This file can find requirements of html and jhtml files (cgi, gif, -# java dependencies). It is a bit of a hack but it turns out to work -# well. We track only dependencies between Relative URLs, absolute -# URL's are assumed to be extenernal to the RPM system. We do not -# parse the HTML but look through the set of strings (text surrounded -# by quotes) for something which looks like a reference. This avoids -# writing a full HTML parsers and tends to work really well. In this -# manner we can track dependencies for: href, src, action and other -# HTML tags which have not been invented yet. - - -# The reference: -# -# href="http://www.perl.org/images/arrow.gif" -# -# does not create a dependency but the reference -# -# href="images/arrow.gif" -# -# will create a dependency. - -# Additionally this program will find the requirements for sun jhtml -# (html with embedded java) since jhtml is deprecated so is this part -# of the code. - -# These references create dependencies: - -# <form action="signup.jhtml" method="POST"> -# -# <img src="images/spacer.gif" width=1> -# -# <A HREF="signup.jhtml"> -# -# adWidget.writeAd(out, "login.html", "expired"); -# -# response.sendRedirect("http://"+request.getServerName()+"/mailcom/login.jhtml"); - - -# Notice how we look for strings WITH the proper ending. This is -# because the java sometimes has really strange double quoting -# conventions. Look at how splitting out the strings in this -# fragment would get you the wrong text. - -# <img src="`c.getImage("bhunterlogo.gif")`" width=217 > - -# Ignore non relative references since these dependencies can not be -# met. (ie, no package you install will ever provide -# 'http://www.yahoo.com'). - -# I use basename since I have seen too many http references which -# begin with '../' and I can not figure out where the document root -# is for the webserver this would just kill the dependnecy tracking -# mechanism. - - - -use File::Basename; - -# this is the pattern of extensions to call requirements - -$DEPS_PAT = '\.((cgi)|(ps)|(pdf)|(png)|(jpg)|(gif)|(tiff)|(tif)|(xbm)|(html)|(htm)|(shtml)|(jhtml))'; #' - -if ("@ARGV") { - foreach (@ARGV) { - process_file($_); - } -} else { - - # notice we are passed a list of filenames NOT as common in unix the - # contents of the file. - - foreach (<>) { - process_file($_); - } -} - - - -foreach $key (sort keys %seen) { - print "$key\n"; -} - - -sub process_file { - - my ($file) = @_; - chomp $file; - - open(FILE, "<$file")|| - die("$0: Could not open file: '$file' : $!\n"); - - # we have to suck in the whole file at once because too many people - # split lines around <java></java> tags. - - my (@file) = <FILE>; - - $_= "@file"; - - # ignore line based comments ( careful although it has two slashes - # 'http://www.yahoo.com' is not a comment! ) - - s!^\s*//.*$!!mg; - s!//\s.*$!!mg; - s!\s//.*$!!mg; - - # ignore multi-line comments - # (use non greedy operators) - - s!/\*.*?\*/!!g; - s/<!--.*?-->//g; - - # Ignore non relative references since these dependencies can not be - # met. (ie, no package you install will ever provide - # 'http://www.yahoo.com'). - - # I use basename since I have seen too many http references which - # begin with '../' and I can not figure out where the document root - # is for the webserver this would just kill the dependnecy tracking - # mechanism. - - - # Notice how we look for strings WITH the proper ending. This is - # because the java sometimes has really strange double quoting - # conventions. Look at how splitting out the strings in this - # fragment would get you the wrong text. - - # <img src="`c.getImage("bhunterlogo.gif")`" width=217 > - - while ( m{\"([^\"]+$DEPS_PAT)\"}g ) { - my $string = $1; - chomp $string; - if ( $string !~ m!http://! ) { - $string = basename($string); - $string =~ s!\s+!!g; - $seen{"http(${string})"} = 1; - } - } - - { - - # This section is only for use with (Sun) jhtml dependencies, and - # since jhtml is deprecated so is this code. - - # java imports in jhtml (may have stars for leaf class) - # these may span several lines - - while ( m!<java type=((import)|(extends))>\s*([^<]+)\s*<!g ) { - my $java_list = $4; - $java_list =~ s/;/ /g; - $java_list =~ s/\n+/ /g; - $java_list =~ s/\s+/ /g; - foreach $java_class ( split(/\s+/, $java_list) ) { - $seen{"java(${java_class})"} = 1; - } - } - - } - - close(FILE)|| - die("$0: Could not close file: '$file' : $!\n"); - - return ; -} diff --git a/scripts/libtool.prov.sh b/scripts/libtool.prov.sh deleted file mode 100644 index 042ab29ef..000000000 --- a/scripts/libtool.prov.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -while read possible ; do - case "$possible" in - *.la) - if grep -iq '^# Generated by ltmain.sh' "$possible" 2> /dev/null ; then - echo "libtool($possible)" - fi - ;; - esac -done diff --git a/scripts/libtool.req.sh b/scripts/libtool.req.sh deleted file mode 100644 index 4d95ddb14..000000000 --- a/scripts/libtool.req.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -while read possible ; do - case "$possible" in - *.la) - for dep in `grep ^dependency_libs= "$possible" 2> /dev/null | \ - sed -r -e "s,^dependency_libs='(.*)',\1,g"` ; do - case "$dep" in - /*.la) - echo "libtool($dep)" - ;; - esac - done - ;; - esac -done diff --git a/scripts/magic.prov b/scripts/magic.prov deleted file mode 100755 index ba3a45c85..000000000 --- a/scripts/magic.prov +++ /dev/null @@ -1,167 +0,0 @@ -#!/usr/bin/perl - -use File::Basename; -use Getopt::Long; - -# this dependency analysis program is the only one which need to know -# the RPM buildroot to do its work. - -# Figuring out what files are really executables via magic numbers is -# hard. Not only is every '#!' an executable of some type (with a -# potentially infinite supply of interpreters) but there are thousands -# of valid binary magic numbers for old OS's and old CPU types. - -# Permissions do not always help discriminate binaries from the rest -# of the files, on Solaris the shared libraries are marked as -# 'executable'. - -# -rwxr-xr-x 1 bin bin 1013248 Jul 1 1998 /lib/libc.so.1 - -# I would like to let the 'file' command take care of the magic -# numbers for us. Alas! under linux file prints different kind of -# messages for each interpreter, there is no common word 'script' to -# look for. - -# ' perl commands text' -# ' Bourne shell script text' -# ' a /usr/bin/wish -f script text' - -# WORSE on solaris there are entries which say: - -# ' current ar archive, not a dynamic executable or shared object' - -# how do I grep for 'executable' when people put a 'not executable' in -# there? I trim off everything after the first comma (if there is -# one) and if the result has the string 'executable' in it then it may -# be one. - - -# so we must also do some magic number processing ourselves, and be -# satisfied with 'good enough'. - -# I look for files which have atleast one of the executable bits set -# and are either labled 'executable' by the file command (see above -# restriction) OR have a '#!' as their first two characters. - - -$is_mode_executable=oct(111); - -# set a known path - -$ENV{'PATH'}= ( - ':/usr/bin'. - ':/bin'. - ''); - -# taint perl requires we clean up these bad environmental variables. - -delete @ENV{'IFS', 'CDPATH', 'ENV', 'BASH_ENV'}; - -$BUILDROOT = ''; -%option_linkage = ( - "buildroot" => \$BUILDROOT, - ); - -if( !GetOptions (\%option_linkage, "buildroot=s") ) { - die("Illegal options in \@ARGV: '@ARGV'\n"); - -} - -if ($BUILDROOT == '/') { - $BUILDROOT = ''; -} - -if ("@ARGV") { - foreach (@ARGV) { - process_file($_); - } -} else { - - # notice we are passed a list of filenames NOT as common in unix the - # contents of the file. - - foreach (<>) { - process_file($_); - } -} - - -foreach $module (sort keys %provides) { - print "executable($module)\n"; -} - -exit 0; - - - - -sub is_file_script { - - my ($file) = @_; - chomp $file; - - my $out = 0; - open(FILE, "<$file")|| - die("$0: Could not open file: '$file' : $!\n"); - - my $rc = sysread(FILE,$line,2); - - if ( ($rc > 1) && ($line =~ m/^\#\!/) ) { - $out = 1; - } - - close(FILE) || - die("$0: Could not close file: '$file' : $!\n"); - - return $out; -} - - - -sub is_file_binary_executable { - my ($file) = @_; - - $file_out=`file $file`; - # trim off any extra descriptions. - $file_out =~ s/\,.*$//; - - my $out = 0; - if ($file_out =~ m/executable/ ) { - $out = 1; - } - return $out; -} - - -sub process_file { - my ($file) = @_; - chomp $file; - - my $prov_name = $file; - $prov_name =~ s!^$BUILDROOT!!; - - # If its a link find the file it points to. Dead links do not - # provide anything. - - while (-l $file) { - my $newfile = readlink($file); - if ($newfile !~ m!^/!) { - $newfile = dirname($file).'/'.$newfile; - } else { - $newfile = $BUILDROOT.$newfile; - } - $file = $newfile; - } - - (-f $file) || return ; - ( (stat($file))[2] & $is_mode_executable ) || return ; - - is_file_script($file) || - is_file_binary_executable($file) || - return ; - - $provides{$prov_name}=1; - $provides{basename($prov_name)}=1; - - return ; -} diff --git a/scripts/magic.req b/scripts/magic.req deleted file mode 100755 index e32532881..000000000 --- a/scripts/magic.req +++ /dev/null @@ -1,143 +0,0 @@ -#!/usr/bin/perl - -# Given a list of filenames on the command line or on stdin this -# script returns the interpreter that is required to run the -# filenames. Usually this is extracted from the #! line of the file -# but we also handle the various 'exec' tricks that people use to -# start the interpreter via an intermediate shell. - -# Also we want to convert: -# /usr/local/bin/perl5.00404 -# /usr/local/bin/tclsh8.0 -# into dependencies with RPM version numbers. - - - - - -# These have all been seen on our system or are "recommended" in -# various man pages. - -# Examples: - -# #!/bin/sh -# # the next line restarts using wish \ -# exec wish "$0" "$@" - - -# #!/bin/sh -- # -*- perl -*- -p -# eval 'exec /usr/bin/perl -wS $0 ${1+"$@"}' -# if $running_under_some_shell; - - -# #!/bin/sh -- # -*- perl -*- -p -# eval '(exit $?0)' && eval 'exec /usr/bin/perl -wS $0 ${1+"$@"}' - - -# #!/bin/sh -- # -*- perl -*- -p -# & eval 'exec /usr/bin/perl -wS $0 $argv:q' -# if $running_under_some_shell; - - -# #! /usr/bin/env python - - -use File::Basename; - -if ("@ARGV") { - foreach (@ARGV) { - process_file($_); - } -} else { - - # notice we are passed a list of filenames NOT as common in unix the - # contents of the file. - - foreach (<>) { - process_file($_); - } -} - - -foreach $prog (sort keys %require) { - - - # ignore variable interpolation and any program whose name is made - # up only of non word characters ('<', '&&', etc). - - ( ( $prog != /\$/ ) || ( $prog =~ /^\W+$/ ) ) && - next; - - # filenames of the form './miniperl' will be reported in canonical - # manner 'miniperl' - - $prog =~ s!^\./!!; - - if ( $prog !~ /\$/ ) { - print "exectuable($prog)\n"; - } - - $prog=basename($prog); - - if ( $prog !~ /\$/ ) { - print "exectuable($prog)\n"; - - # get the correct version dependencies for magic numbers like: - # /usr/local/bin/perl5.00404 - # /usr/local/bin/tclsh8.0 - # these are always PACKAGE versions since typical executables do not - # have versions - - my $version = ""; - if ($module =~ s/([.0-9]+)$//) { - $version = "$1"; - print "$prog>=$version\n"; - } - - } - -} - -exit 0; - - -sub process_file { - - my ($file) = @_; - chomp $file; - - my ($version, $magic) = (); - - (-f $file) || return ; - - open(FILE, "<$file")|| - die("$0: Could not open file: '$file' : $!\n"); - - my $rc = sysread(FILE,$line,1000); - - $rc =~ s/\#.*\n//g; - - # Ignore all parameter substitution. - # I have no hope of parsing something like: - # exec ${SHELL:-/bin/sh} - $rc =~ s/\$\{.*\}//g; - $rc =~ s/echo\s+.*[\n;]//g; - - if ( ($rc > 1) && ($line =~ m/^\#\!\s*/) ) { - - if ($line =~ m/\b(exec|env)\s+([\'\"\`\\]+)?([^ \t\n\r]+)/) { - $require{$3} = 1; - } - - # strip off extra lines and any arguments - if ($line =~ m/^\#\!\s*([^ \t\n\r]+)/) { - $require{$1} = 1; - } - - } - - close(FILE) || - die("$0: Could not close file: '$file' : $!\n"); - - return ; -} diff --git a/scripts/perldeps.pl b/scripts/perldeps.pl index 76c1070e6..bffad674a 100644 --- a/scripts/perldeps.pl +++ b/scripts/perldeps.pl @@ -1,392 +1,1116 @@ -#!/usr/bin/perl -w -use strict; -use 5.006001; +#!/usr/bin/perl -Tw +# +# perldeps.pl -- Analyze dependencies of Perl packages +# +# Michael Jennings +# 7 November 2005 +# +# $Id: perldeps.pl,v 1.6 2006/04/04 20:12:03 mej Exp $ +# +use strict; +use Config; +use File::Basename; +use File::Find; use Getopt::Long; -my ($show_provides, $show_requires, $verbose, @ignores); - -my $result = GetOptions("provides" => \$show_provides, - "requires" => \$show_requires, - "verbose" => \$verbose, - "ignore=s" => \@ignores); -my %ignores = map { $_ => 1 } @ignores; +use POSIX; + +############### Debugging stolen from Mezzanine::Util ############### +my $DEBUG = 0; + +# Debugging output +sub +dprintf(@) +{ + my ($f, $l, $s, $format); + my @params = @_; + + return if (! $DEBUG); + $format = shift @params; + if (!scalar(@params)) { + return dprint($format); + } + (undef, undef, undef, $s) = caller(1); + if (!defined($s)) { + $s = "MAIN"; + } + (undef, $f, $l) = caller(0); + $f =~ s/^.*\/([^\/]+)$/$1/; + $s =~ s/^\w+:://g; + $s .= "()" if ($s =~ /^\w+$/); + $f = "" if (!defined($f)); + $l = "" if (!defined($l)); + $format = "" if (!defined($format)); + for (my $i = 0; $i < scalar(@params); $i++) { + if (!defined($params[$i])) { + $params[$i] = "<undef>"; + } + } + printf("[$f/$l/$s] $format", @params); +} -exit(1) if (not $result); +sub +dprint(@) +{ + my ($f, $l, $s); + my @params = @_; -my $deps = new DependencyParser; -for my $file (grep /^[^-]/, @ARGV) { - $deps->process_file($file); + return if (! $DEBUG); + (undef, undef, undef, $s) = caller(1); + if (!defined($s)) { + $s = "MAIN"; + } + (undef, $f, $l) = caller(0); + $f =~ s/^.*\/([^\/]+)$/$1/; + $s =~ s/\w+:://g; + $s .= "()" if ($s =~ /^\w+$/); + $f = "" if (!defined($f)); + $l = "" if (!defined($l)); + $s = "" if (!defined($s)); + for (my $i = 0; $i < scalar(@params); $i++) { + if (!defined($params[$i])) { + $params[$i] = "<undef>"; + } + } + print "[$f/$l/$s] ", @params; } -if ($show_requires) { - for my $req ($deps->requires) { - my $verbage = ""; - next if (exists $ignores{$req->to_string}); - printf "%s%s\n", $req->to_string, $verbage; - } -} +############### Module::ScanDeps Code ############### +use constant dl_ext => ".$Config{dlext}"; +use constant lib_ext => $Config{lib_ext}; +use constant is_insensitive_fs => ( + -s $0 + and (-s lc($0) || -1) == (-s uc($0) || -1) + and (-s lc($0) || -1) == -s $0 +); + +my $CurrentPackage = ''; +my $SeenTk; + +# Pre-loaded module dependencies +my %Preload = ( + 'AnyDBM_File.pm' => [qw( SDBM_File.pm )], + 'Authen/SASL.pm' => 'sub', + 'Bio/AlignIO.pm' => 'sub', + 'Bio/Assembly/IO.pm' => 'sub', + 'Bio/Biblio/IO.pm' => 'sub', + 'Bio/ClusterIO.pm' => 'sub', + 'Bio/CodonUsage/IO.pm' => 'sub', + 'Bio/DB/Biblio.pm' => 'sub', + 'Bio/DB/Flat.pm' => 'sub', + 'Bio/DB/GFF.pm' => 'sub', + 'Bio/DB/Taxonomy.pm' => 'sub', + 'Bio/Graphics/Glyph.pm' => 'sub', + 'Bio/MapIO.pm' => 'sub', + 'Bio/Matrix/IO.pm' => 'sub', + 'Bio/Matrix/PSM/IO.pm' => 'sub', + 'Bio/OntologyIO.pm' => 'sub', + 'Bio/PopGen/IO.pm' => 'sub', + 'Bio/Restriction/IO.pm' => 'sub', + 'Bio/Root/IO.pm' => 'sub', + 'Bio/SearchIO.pm' => 'sub', + 'Bio/SeqIO.pm' => 'sub', + 'Bio/Structure/IO.pm' => 'sub', + 'Bio/TreeIO.pm' => 'sub', + 'Bio/LiveSeq/IO.pm' => 'sub', + 'Bio/Variation/IO.pm' => 'sub', + 'Crypt/Random.pm' => sub { + _glob_in_inc('Crypt/Random/Provider', 1); + }, + 'Crypt/Random/Generator.pm' => sub { + _glob_in_inc('Crypt/Random/Provider', 1); + }, + 'DBI.pm' => sub { + grep !/\bProxy\b/, _glob_in_inc('DBD', 1); + }, + 'DBIx/SearchBuilder.pm' => 'sub', + 'DBIx/ReportBuilder.pm' => 'sub', + 'Device/ParallelPort.pm' => 'sub', + 'Device/SerialPort.pm' => [ qw( + termios.ph asm/termios.ph sys/termiox.ph sys/termios.ph sys/ttycom.ph + ) ], + 'ExtUtils/MakeMaker.pm' => sub { + grep /\bMM_/, _glob_in_inc('ExtUtils', 1); + }, + 'File/Basename.pm' => [qw( re.pm )], + 'File/Spec.pm' => sub { + require File::Spec; + map { my $name = $_; $name =~ s!::!/!g; "$name.pm" } @File::Spec::ISA; + }, + 'HTTP/Message.pm' => [ qw( + URI/URL.pm URI.pm + ) ], + 'IO.pm' => [ qw( + IO/Handle.pm IO/Seekable.pm IO/File.pm + IO/Pipe.pm IO/Socket.pm IO/Dir.pm + ) ], + 'IO/Socket.pm' => [qw( IO/Socket/UNIX.pm )], + 'LWP/UserAgent.pm' => [ qw( + URI/URL.pm URI/http.pm LWP/Protocol/http.pm + LWP/Protocol/https.pm + ), _glob_in_inc("LWP/Authen", 1) ], + 'Locale/Maketext/Lexicon.pm' => 'sub', + 'Locale/Maketext/GutsLoader.pm' => [qw( Locale/Maketext/Guts.pm )], + 'Mail/Audit.pm' => 'sub', + 'Math/BigInt.pm' => 'sub', + 'Math/BigFloat.pm' => 'sub', + 'Module/Build.pm' => 'sub', + 'Module/Pluggable.pm' => sub { + _glob_in_inc("$CurrentPackage/Plugin", 1); + }, + 'MIME/Decoder.pm' => 'sub', + 'Net/DNS/RR.pm' => 'sub', + 'Net/FTP.pm' => 'sub', + 'Net/SSH/Perl.pm' => 'sub', + 'PDF/API2/Resource/Font.pm' => 'sub', + 'PDF/API2/Basic/TTF/Font.pm' => sub { + _glob_in_inc('PDF/API2/Basic/TTF', 1); + }, + 'PDF/Writer.pm' => 'sub', + 'POE' => [ qw( + POE/Kernel.pm POE/Session.pm + ) ], + 'POE/Kernel.pm' => [ + map "POE/Resource/$_.pm", qw( + Aliases Events Extrefs FileHandles + SIDs Sessions Signals Statistics + ) + ], + 'Parse/AFP.pm' => 'sub', + 'Parse/Binary.pm' => 'sub', + 'Regexp/Common.pm' => 'sub', + 'SOAP/Lite.pm' => sub { + (($] >= 5.008 ? ('utf8.pm') : ()), _glob_in_inc('SOAP/Transport', 1)); + }, + 'SQL/Parser.pm' => sub { + _glob_in_inc('SQL/Dialects', 1); + }, + 'SVN/Core.pm' => sub { + _glob_in_inc('SVN', 1), + map "auto/SVN/$_->{name}", _glob_in_inc('auto/SVN'), + }, + 'SVK/Command.pm' => sub { + _glob_in_inc('SVK', 1); + }, + 'SerialJunk.pm' => [ qw( + termios.ph asm/termios.ph sys/termiox.ph sys/termios.ph sys/ttycom.ph + ) ], + 'Template.pm' => 'sub', + 'Term/ReadLine.pm' => 'sub', + 'Tk.pm' => sub { + $SeenTk = 1; + qw( Tk/FileSelect.pm Encode/Unicode.pm ); + }, + 'Tk/Balloon.pm' => [qw( Tk/balArrow.xbm )], + 'Tk/BrowseEntry.pm' => [qw( Tk/cbxarrow.xbm Tk/arrowdownwin.xbm )], + 'Tk/ColorEditor.pm' => [qw( Tk/ColorEdit.xpm )], + 'Tk/FBox.pm' => [qw( Tk/folder.xpm Tk/file.xpm )], + 'Tk/Toplevel.pm' => [qw( Tk/Wm.pm )], + 'URI.pm' => sub { + grep !/.\b[_A-Z]/, _glob_in_inc('URI', 1); + }, + 'Win32/EventLog.pm' => [qw( Win32/IPC.pm )], + 'Win32/Exe.pm' => 'sub', + 'Win32/TieRegistry.pm' => [qw( Win32API/Registry.pm )], + 'Win32/SystemInfo.pm' => [qw( Win32/cpuspd.dll )], + 'XML/Parser.pm' => sub { + _glob_in_inc('XML/Parser/Style', 1), + _glob_in_inc('XML/Parser/Encodings', 1), + }, + 'XML/Parser/Expat.pm' => sub { + ($] >= 5.008) ? ('utf8.pm') : (); + }, + 'XML/SAX.pm' => [qw( XML/SAX/ParserDetails.ini ) ], + 'XMLRPC/Lite.pm' => sub { + _glob_in_inc('XMLRPC/Transport', 1),; + }, + 'diagnostics.pm' => sub { + _find_in_inc('Pod/perldiag.pod') + ? 'Pod/perldiag.pl' + : 'pod/perldiag.pod'; + }, + 'utf8.pm' => [ + 'utf8_heavy.pl', do { + my $dir = 'unicore'; + my @subdirs = qw( To ); + my @files = map "$dir/lib/$_->{name}", _glob_in_inc("$dir/lib"); + + if (@files) { + # 5.8.x + push @files, (map "$dir/$_.pl", qw( Exact Canonical )); + } + else { + # 5.6.x + $dir = 'unicode'; + @files = map "$dir/Is/$_->{name}", _glob_in_inc("$dir/Is") + or return; + push @subdirs, 'In'; + } + + foreach my $subdir (@subdirs) { + foreach (_glob_in_inc("$dir/$subdir")) { + push @files, "$dir/$subdir/$_->{name}"; + } + } + @files; + } + ], + 'charnames.pm' => [ + _find_in_inc('unicore/Name.pl') ? 'unicore/Name.pl' : 'unicode/Name.pl' + ], +); + +my $Keys = 'files|keys|recurse|rv|skip|first|execute|compile'; +sub scan_deps { + my %args = ( + rv => {}, + (@_ and $_[0] =~ /^(?:$Keys)$/o) ? @_ : (files => [@_], recurse => 1) + ); + + scan_deps_static(\%args); + + if ($args{execute} or $args{compile}) { + scan_deps_runtime( + rv => $args{rv}, + files => $args{files}, + execute => $args{execute}, + compile => $args{compile}, + skip => $args{skip} + ); + } -if ($show_provides) { - for my $prov ($deps->provides) { - my $verbage = ""; - next if (exists $ignores{$prov->to_string}); - printf "%s%s\n", $prov->to_string, $verbage; - } + return ($args{rv}); } -exit(0); +sub scan_deps_static { + my ($args) = @_; + my ($files, $keys, $recurse, $rv, $skip, $first, $execute, $compile) = + @$args{qw( files keys recurse rv skip first execute compile )}; + + $rv ||= {}; + $skip ||= {}; + + foreach my $file (@{$files}) { + my $key = shift @{$keys}; + next if $skip->{$file}++; + next if is_insensitive_fs() + and $file ne lc($file) and $skip->{lc($file)}++; + + local *FH; + open FH, $file or die "Cannot open $file: $!"; + + $SeenTk = 0; + + # Line-by-line scanning + LINE: + while (<FH>) { + chomp(my $line = $_); + foreach my $pm (scan_line($line)) { + last LINE if $pm eq '__END__'; + + if ($pm eq '__POD__') { + while (<FH>) { last if (/^=cut/) } + next LINE; + } + + $pm = 'CGI/Apache.pm' if /^Apache(?:\.pm)$/; + + add_deps( + used_by => $key, + rv => $rv, + modules => [$pm], + skip => $skip + ); + + my $preload = $Preload{$pm} or next; + if ($preload eq 'sub') { + $pm =~ s/\.p[mh]$//i; + $preload = [ _glob_in_inc($pm, 1) ]; + } + elsif (UNIVERSAL::isa($preload, 'CODE')) { + $preload = [ $preload->($pm) ]; + } + + add_deps( + used_by => $key, + rv => $rv, + modules => $preload, + skip => $skip + ); + } + } + close FH; + + # }}} + } -#################### -# Dependency Class # -#################### -package Dependency; -sub new { - my $class = shift; - my $type = shift; - my $value = shift; + # Top-level recursion handling {{{ + while ($recurse) { + my $count = keys %$rv; + my @files = sort grep -T $_->{file}, values %$rv; + scan_deps_static({ + files => [ map $_->{file}, @files ], + keys => [ map $_->{key}, @files ], + rv => $rv, + skip => $skip, + recurse => 0, + }) or ($args->{_deep} and return); + last if $count == keys %$rv; + } + + # }}} - return bless { type => $type, value => $value }, $class; + return $rv; } -sub value { - my $self = shift; +sub scan_deps_runtime { + my %args = ( + perl => $^X, + rv => {}, + (@_ and $_[0] =~ /^(?:$Keys)$/o) ? @_ : (files => [@_], recurse => 1) + ); + my ($files, $rv, $execute, $compile, $skip, $perl) = + @args{qw( files rv execute compile skip perl )}; - if (@_) { - $self->{value} = shift; - } + $files = (ref($files)) ? $files : [$files]; - return $self->{value}; -} + my ($inchash, $incarray, $dl_shared_objects) = ({}, [], []); + if ($compile) { + my $file; -sub filename { - my $self = shift; + foreach $file (@$files) { + ($inchash, $dl_shared_objects, $incarray) = ({}, [], []); + _compile($perl, $file, $inchash, $dl_shared_objects, $incarray); - if (@_) { - $self->{filename} = shift; - } + my $rv_sub = _make_rv($inchash, $dl_shared_objects, $incarray); + _merge_rv($rv_sub, $rv); + } + } + elsif ($execute) { + my $excarray = (ref($execute)) ? $execute : [@$files]; + my $exc; + my $first_flag = 1; + foreach $exc (@$excarray) { + ($inchash, $dl_shared_objects, $incarray) = ({}, [], []); + _execute( + $perl, $exc, $inchash, $dl_shared_objects, $incarray, + $first_flag + ); + $first_flag = 0; + } + + my $rv_sub = _make_rv($inchash, $dl_shared_objects, $incarray); + _merge_rv($rv_sub, $rv); + } - return $self->{filename}; + return ($rv); } -sub type { - my $self = shift; - - if (@_) { - $self->{type} = shift; - } +sub scan_line { + my $line = shift; + my %found; + + return '__END__' if $line =~ /^__(?:END|DATA)__$/; + return '__POD__' if $line =~ /^=\w/; + + $line =~ s/\s*#.*$//; + $line =~ s/[\\\/]+/\//g; + + foreach (split(/;/, $line)) { + if (/^\s*package\s+(\w+);/) { + $CurrentPackage = $1; + $CurrentPackage =~ s{::}{/}g; + return; + } + return if /^\s*(use|require)\s+[\d\._]+/; + + if (my ($libs) = /\b(?:use\s+lib\s+|(?:unshift|push)\W+\@INC\W+)(.+)/) + { + my $archname = + defined($Config{archname}) ? $Config{archname} : ''; + my $ver = defined($Config{version}) ? $Config{version} : ''; + foreach (grep(/\w/, split(/["';() ]/, $libs))) { + unshift(@INC, "$_/$ver") if -d "$_/$ver"; + unshift(@INC, "$_/$archname") if -d "$_/$archname"; + unshift(@INC, "$_/$ver/$archname") if -d "$_/$ver/$archname"; + } + next; + } + + $found{$_}++ for scan_chunk($_); + } - return $self->{type}; + return sort keys %found; } -sub line_number { - my $self = shift; +sub scan_chunk { + my $chunk = shift; + + # Module name extraction heuristics {{{ + my $module = eval { + $_ = $chunk; + + return [ 'base.pm', + map { s{::}{/}g; "$_.pm" } + grep { length and !/^q[qw]?$/ } split(/[^\w:]+/, $1) ] + if /^\s* use \s+ base \s+ (.*)/sx; + + return [ 'Class/Autouse.pm', + map { s{::}{/}g; "$_.pm" } + grep { length and !/^:|^q[qw]?$/ } split(/[^\w:]+/, $1) ] + if /^\s* use \s+ Class::Autouse \s+ (.*)/sx + or /^\s* Class::Autouse \s* -> \s* autouse \s* (.*)/sx; + + return [ 'POE.pm', + map { s{::}{/}g; "POE/$_.pm" } + grep { length and !/^q[qw]?$/ } split(/[^\w:]+/, $1) ] + if /^\s* use \s+ POE \s+ (.*)/sx; + + return [ 'encoding.pm', + map { _find_encoding($_) } + grep { length and !/^q[qw]?$/ } split(/[^\w:]+/, $1) ] + if /^\s* use \s+ encoding \s+ (.*)/sx; + + return $1 if /(?:^|\s)(?:use|no|require)\s+([\w:\.\-\\\/\"\']+)/; + return $1 + if /(?:^|\s)(?:use|no|require)\s+\(\s*([\w:\.\-\\\/\"\']+)\s*\)/; + + if ( s/(?:^|\s)eval\s+\"([^\"]+)\"/$1/ + or s/(?:^|\s)eval\s*\(\s*\"([^\"]+)\"\s*\)/$1/) + { + return $1 if /(?:^|\s)(?:use|no|require)\s+([\w:\.\-\\\/\"\']*)/; + } + + return "File/Glob.pm" if /<[^>]*[^\$\w>][^>]*>/; + return "DBD/$1.pm" if /\b[Dd][Bb][Ii]:(\w+):/; + if (/(?:(:encoding)|\b(?:en|de)code)\(\s*['"]?([-\w]+)/) { + my $mod = _find_encoding($2); + return [ 'PerlIO.pm', $mod ] if $1 and $mod; + return $mod if $mod; + } + return $1 if /(?:^|\s)(?:do|require)\s+[^"]*"(.*?)"/; + return $1 if /(?:^|\s)(?:do|require)\s+[^']*'(.*?)'/; + return $1 if /[^\$]\b([\w:]+)->\w/ and $1 ne 'Tk'; + return $1 if /\b(\w[\w:]*)::\w+\(/; + + if ($SeenTk) { + my @modules; + while (/->\s*([A-Z]\w+)/g) { + push @modules, "Tk/$1.pm"; + } + while (/->\s*Scrolled\W+([A-Z]\w+)/g) { + push @modules, "Tk/$1.pm"; + push @modules, "Tk/Scrollbar.pm"; + } + return \@modules; + } + return; + }; + + # }}} + + return unless defined($module); + return wantarray ? @$module : $module->[0] if ref($module); + + $module =~ s/^['"]//; + return unless $module =~ /^\w/; + + $module =~ s/\W+$//; + $module =~ s/::/\//g; + return if $module =~ /^(?:[\d\._]+|'.*[^']|".*[^"])$/; + + $module .= ".pm" unless $module =~ /\./; + return $module; +} - if (@_) { - $self->{line_number} = shift; - } +sub _find_encoding { + return unless $] >= 5.008 and eval { require Encode; %Encode::ExtModule }; - return $self->{line_number}; + my $mod = $Encode::ExtModule{ Encode::find_encoding($_[0])->name } + or return; + $mod =~ s{::}{/}g; + return "$mod.pm"; } -sub to_string { - my $self = shift; - my $type = $self->type; +sub _add_info { + my ($rv, $module, $file, $used_by, $type) = @_; + return unless defined($module) and defined($file); - if ($type eq 'perl version') { - # we need to convert a perl release version to an rpm package - # version + $rv->{$module} ||= { + file => $file, + key => $module, + type => $type, + }; - my $epoch = 0; - my $version = $self->value; - $version =~ s/_/./g; - $version =~ s/0+$//; + push @{ $rv->{$module}{used_by} }, $used_by + if defined($used_by) + and $used_by ne $module + and !grep { $_ eq $used_by } @{ $rv->{$module}{used_by} }; +} - if ($version =~ /^5.00[1-5]/) { - $epoch = 0; +sub add_deps { + my %args = + ((@_ and $_[0] =~ /^(?:modules|rv|used_by)$/) + ? @_ + : (rv => (ref($_[0]) ? shift(@_) : undef), modules => [@_])); + + my $rv = $args{rv} || {}; + my $skip = $args{skip} || {}; + my $used_by = $args{used_by}; + + foreach my $module (@{ $args{modules} }) { + next if exists $rv->{$module}; + + my $file = _find_in_inc($module) or next; + next if $skip->{$file}; + next if is_insensitive_fs() and $skip->{lc($file)}; + + my $type = 'module'; + $type = 'data' unless $file =~ /\.p[mh]$/i; + _add_info($rv, $module, $file, $used_by, $type); + + if ($module =~ /(.*?([^\/]*))\.p[mh]$/i) { + my ($path, $basename) = ($1, $2); + + foreach (_glob_in_inc("auto/$path")) { + next if $skip->{$_->{file}}; + next if is_insensitive_fs() and $skip->{lc($_->{file})}; + next if $_->{file} =~ m{\bauto/$path/.*/}; # weed out subdirs + next if $_->{name} =~ m/(?:^|\/)\.(?:exists|packlist)$/; + my $ext = lc($1) if $_->{name} =~ /(\.[^.]+)$/; + next if $ext eq lc(lib_ext()); + my $type = 'shared' if $ext eq lc(dl_ext()); + $type = 'autoload' if $ext eq '.ix' or $ext eq '.al'; + $type ||= 'data'; + + _add_info($rv, "auto/$path/$_->{name}", $_->{file}, $module, + $type); + } + } } - elsif ($version =~ /^5.006/ or $version =~ /^5.6/) { - $version =~ s/00//g; - $epoch = 1; - } - elsif ($version =~ /^5.00[7-9]/ or $version =~ /^5.[7-9]/) { - $version =~ s/00//g; - $epoch = 2; - } - $version =~ s/\.$//; - return sprintf "perl >= %d:%s", $epoch, $version; - } - elsif ($type eq 'virtual') { - return $self->value; - } - else { - return sprintf "perl(%s)", $self->value; - } + return $rv; } -package DependencyParser; -sub new { - my $class = shift; - return bless {}, $class; +sub _find_in_inc { + my $file = shift; + + # absolute file names + return $file if -f $file; + + foreach my $dir (grep !/\bBSDPAN\b/, @INC) { + return "$dir/$file" if -f "$dir/$file"; + } + return; } -sub requires { - return @{shift->{requires} || []}; +sub _glob_in_inc { + my $subdir = shift; + my $pm_only = shift; + my @files; + + require File::Find; + + foreach my $dir (map "$_/$subdir", grep !/\bBSDPAN\b/, @INC) { + next unless -d $dir; + File::Find::find({ + "wanted" => sub { + my $name = $File::Find::name; + $name =~ s!^\Q$dir\E/!!; + return if $pm_only and lc($name) !~ /\.p[mh]$/i; + push @files, $pm_only + ? "$subdir/$name" + : { file => $File::Find::name, + name => $name, + } + if -f; + }, + "untaint" => 1, + "untaint_skip" => 1, + "untaint_pattern" => qr|^([-+@\w./]+)$| + }, $dir + ); + } + + return @files; } -sub provides { - return @{shift->{provides} || []}; +# App::Packer compatibility functions + +sub new { + my ($class, $self) = @_; + return bless($self ||= {}, $class); } -sub add_provide { - my $self = shift; - my %params = @_; - die "DependencyParser->add_provide requires -filename, -provide, and -type" - if not exists $params{-filename} or not exists $params{-provide} or not exists $params{-type}; - - # - # Make sure this one has not been added already - $self->{'provides_check'} ||= { }; - return if(exists($self->{'provides_check'}->{$params{'-provide'}})); - - # - # Skip some common false positives - return if $params{'-provide'} eq 'main'; - - # - # Created dependency object - my $dep = new Dependency "provide", $params{-provide}; - $dep->filename($params{-filename}); - $dep->type($params{-type}); - $dep->line_number($params{-line}) if $params{-line}; - - # - # Add to requires check list - $self->{'provides_check'}->{$params{'-provide'}} = 1; - - # - # Add to list - push @{$self->{provides}}, $dep; +sub set_file { + my $self = shift; + foreach my $script (@_) { + my $basename = $script; + $basename =~ s/.*\///; + $self->{main} = { + key => $basename, + file => $script, + }; + } } -sub add_require { - my $self = shift; - my %params = @_; - die "DependencyParser->add_require requires -filename, -require, and -type" - if not exists $params{-filename} or not exists $params{-require} or not exists $params{-type}; - - # - # Make sure this one has not been added already - $self->{'requires_check'} ||= { }; - return if(exists($self->{'requires_check'}->{$params{'-require'}})); - - # - # Create dependency object. - my $dep = new Dependency "require", $params{-require}; - $dep->filename($params{-filename}); - $dep->type($params{-type}); - $dep->line_number($params{-line}) if $params{-line}; - - # - # Add to requires check list - $self->{'requires_check'}->{$params{'-require'}} = 1; - - # - # Add to list - push @{$self->{requires}}, $dep; +sub set_options { + my $self = shift; + my %args = @_; + foreach my $module (@{ $args{add_modules} }) { + $module =~ s/::/\//g; + $module .= '.pm' unless $module =~ /\.p[mh]$/i; + my $file = _find_in_inc($module) or next; + $self->{files}{$module} = $file; + } } -sub process_file { - my $self = shift; - my $filename = shift; +sub calculate_info { + my $self = shift; + my $rv = scan_deps( + keys => [ $self->{main}{key}, sort keys %{ $self->{files} }, ], + files => [ $self->{main}{file}, + map { $self->{files}{$_} } sort keys %{ $self->{files} }, + ], + recurse => 1, + ); + + my $info = { + main => { file => $self->{main}{file}, + store_as => $self->{main}{key}, + }, + }; + + my %cache = ($self->{main}{key} => $info->{main}); + foreach my $key (sort keys %{ $self->{files} }) { + my $file = $self->{files}{$key}; + + $cache{$key} = $info->{modules}{$key} = { + file => $file, + store_as => $key, + used_by => [ $self->{main}{key} ], + }; + } - if (not open FH, "<$filename") { - # XXX: Should be die IMHO...JOO - warn "Can't open $filename: $!"; - return; - } - - while (<FH>) { - next if m(^=(head[1-4]|pod|item)) .. m(^=cut); - next if m(^=over) .. m(^=back); - last if m/^__(DATA|END)__$/; - - if (m/^\s*package\s+([\w\:]+)\s*;/) { - $self->add_provide(-filename => $filename, -provide => $1, -type => "package", -line => $.); - } - if (m/^\s*use\s+base\s+(.*)/) { - # recognize the three main forms: literal string, qw//, and - # qw(). this is incomplete but largely sufficient. - - my @module_list; - my $base_params = $1; - - if ($base_params =~ m[qw\((.*)\)]) { - @module_list = split /\s+/, $1; - } - elsif ($base_params =~ m[qw/(.*)/]) { - @module_list = split /\s+/, $1; - } - elsif ($base_params =~ m/(['"])(.*)\1/) { # close '] to unconfuse emacs cperl-mode - @module_list = ($2); - } - - $self->add_require(-filename => $filename, -require => $_, -type => "base", -line => $.) - for @module_list; - } - elsif (m/^\s*(use|require)\s+(v?[0-9\._]+)/) { - $self->add_require(-filename => $filename, -require => $2, -type => "perl version", -line => $.); - } - elsif (m/^\s*use\s+([\w\:]+)/) { - $self->add_require(-filename => $filename, -require => $1, -type => "use", -line => $.); - } - elsif (m/^require\s+([\w\:]+).*;/) { - $self->add_require(-filename => $filename, -require => $1, -type => "require", -line => $.); - } - # - # Allow for old perl.req Requires. Support: - # - # $RPM_Requires = "x y z"; - # our $RPM_Requires = "x y z"; - # - # where the rvalue is a space delimited list of provides. - elsif (m/^\s*(our\s+)?\$RPM_Requires\s*=\s*["'](.*)['"]/) { - foreach my $require (split(/\s+/, $2)) { - $self->add_require( - -filename => $filename, - -require => $require, - -type => "virtual", - -line => $. - ); - } - } - # - # Allow for old perl.req Provides. Support: - # - # $RPM_Provides = "x y z"; - # our $RPM_Provides = "x y z"; - # - # where the rvalue is a space delimited list of provides. - elsif ( m/^\s*(our\s+)?\$RPM_Provides\s*=\s*["'](.*)['"]/) { - foreach my $provide (split(/\s+/, $2)) { - $self->add_provide( - -filename => $filename, - -provide => $provide, - -type => "virtual", - -line => $. - ); - } + foreach my $key (sort keys %{$rv}) { + my $val = $rv->{$key}; + if ($cache{ $val->{key} }) { + push @{ $info->{ $val->{type} }->{ $val->{key} }->{used_by} }, + @{ $val->{used_by} }; + } + else { + $cache{ $val->{key} } = $info->{ $val->{type} }->{ $val->{key} } = + { file => $val->{file}, + store_as => $val->{key}, + used_by => $val->{used_by}, + }; + } } - } - close(FH); -} + $self->{info} = { main => $info->{main} }; -####### -# POD # -####### -__END__ + foreach my $type (sort keys %{$info}) { + next if $type eq 'main'; -=head1 NAME + my @val; + if (UNIVERSAL::isa($info->{$type}, 'HASH')) { + foreach my $val (sort values %{ $info->{$type} }) { + @{ $val->{used_by} } = map $cache{$_} || "!!$_!!", + @{ $val->{used_by} }; + push @val, $val; + } + } -perldeps.pl - Generate Dependency Sets For a Perl Script + $type = 'modules' if $type eq 'module'; + $self->{info}{$type} = \@val; + } +} -=head1 SYNOPSIS +sub get_files { + my $self = shift; + return $self->{info}; +} - perldeps.pl --provides [--verbose] - [--ignore=(dep) ... --ignore=(depN)] - perldeps.pl --requires [--verbose] - [--ignore=(dep) ... --ignore=(depN)] +# scan_deps_runtime utility functions -=head1 DESCRIPTION +sub _compile { + my ($perl, $file, $inchash, $dl_shared_objects, $incarray) = @_; -This script examines a perl script or library and determines what the -set of provides and requires for that file. Depending on whether you -use the C<--provides> or C<--requires> switch it will print either -the provides or requires it finds. It will print each dependency -on a seperate line simular to: + my $fname = File::Temp::mktemp("$file.XXXXXX"); + my $fhin = FileHandle->new($file) or die "Couldn't open $file\n"; + my $fhout = FileHandle->new("> $fname") or die "Couldn't open $fname\n"; - perl(strict) - perl(warnings) - perl(Cmd) - perl(Dbug) - perl(Fdisk::Cmd) + my $line = do { local $/; <$fhin> }; + $line =~ s/use Module::ScanDeps::DataFeed.*?\n//sg; + $line =~ s/^(.*?)((?:[\r\n]+__(?:DATA|END)__[\r\n]+)|$)/ +use Module::ScanDeps::DataFeed '$fname.out'; +sub { +$1 +} +$2/s; + $fhout->print($line); + $fhout->close; + $fhin->close; -This is the standard output that rpm expects from all of its autodependency -scripts. + system($perl, $fname); -Provides are determined by C<package> lines such as: + _extract_info("$fname.out", $inchash, $dl_shared_objects, $incarray); + unlink("$fname"); + unlink("$fname.out"); +} - package Great::Perl::Lib; +sub _execute { + my ($perl, $file, $inchash, $dl_shared_objects, $incarray, $firstflag) = @_; -Additionally, a script can infrom C<perldeps.pl> that it has additional -provides by creating the variable C<$RPM_Provides>, and setting it to -a space delimited list of provides. For instance: + $DB::single = $DB::single = 1; - $RPM_Provides = "great stuff"; + my $fname = _abs_path(File::Temp::mktemp("$file.XXXXXX")); + my $fhin = FileHandle->new($file) or die "Couldn't open $file"; + my $fhout = FileHandle->new("> $fname") or die "Couldn't open $fname"; -Would tell C<perldeps.pl> that this script provides C<great> and C<stuff>. + my $line = do { local $/; <$fhin> }; + $line =~ s/use Module::ScanDeps::DataFeed.*?\n//sg; + $line = "use Module::ScanDeps::DataFeed '$fname.out';\n" . $line; + $fhout->print($line); + $fhout->close; + $fhin->close; -Requires are picked up from several sources: + File::Path::rmtree( ['_Inline'], 0, 1); # XXX hack + system($perl, $fname) == 0 or die "SYSTEM ERROR in executing $file: $?"; -=over 4 + _extract_info("$fname.out", $inchash, $dl_shared_objects, $incarray); + unlink("$fname"); + unlink("$fname.out"); +} -=item * +sub _make_rv { + my ($inchash, $dl_shared_objects, $inc_array) = @_; -C<use> lines. These can define either libraries to use or the version -of perl required (see C<use> under C<perlfunc(1)). + my $rv = {}; + my @newinc = map(quotemeta($_), @$inc_array); + my $inc = join('|', sort { length($b) <=> length($a) } @newinc); -=item * + require File::Spec; -C<require> lines. Defines libraries to be sourced and evaled. + my $key; + foreach $key (keys(%$inchash)) { + my $newkey = $key; + $newkey =~ s"^(?:(?:$inc)/?)""sg if File::Spec->file_name_is_absolute($newkey); -=item * + $rv->{$newkey} = { + 'used_by' => [], + 'file' => $inchash->{$key}, + 'type' => _gettype($inchash->{$key}), + 'key' => $key + }; + } -C<use base> lines. These define base classes of the libraries and are -thus dependencies. It can parse the following forms: + my $dl_file; + foreach $dl_file (@$dl_shared_objects) { + my $key = $dl_file; + $key =~ s"^(?:(?:$inc)/?)""s; + + $rv->{$key} = { + 'used_by' => [], + 'file' => $dl_file, + 'type' => 'shared', + 'key' => $key + }; + } - use base "somelib"; - use base qw(somelib otherlib); - use base qw/somelib otherlib); + return $rv; +} -=back +sub _extract_info { + my ($fname, $inchash, $dl_shared_objects, $incarray) = @_; -Aditionally, you can define the variable C<$RPM_Requires> to define -additonal non-perl requirments. For instance your script may require -sendmail, in which case might do: + use vars qw(%inchash @dl_shared_objects @incarray); + my $fh = FileHandle->new($fname) or die "Couldn't open $fname"; + my $line = do { local $/; <$fh> }; + $fh->close; - $RPM_Requires = "sendmail"; + eval $line; -=head1 OPTIONS + $inchash->{$_} = $inchash{$_} for keys %inchash; + @$dl_shared_objects = @dl_shared_objects; + @$incarray = @incarray; +} -=over 4 +sub _gettype { + my $name = shift; + my $dlext = quotemeta(dl_ext()); -=item B<--provides> + return 'autoload' if $name =~ /(?:\.ix|\.al|\.bs)$/i; + return 'module' if $name =~ /\.p[mh]$/i; + return 'shared' if $name =~ /\.$dlext$/i; + return 'data'; +} -Print all provides. +sub _merge_rv { + my ($rv_sub, $rv) = @_; + + my $key; + foreach $key (keys(%$rv_sub)) { + my %mark; + if ($rv->{$key} and _not_dup($key, $rv, $rv_sub)) { + warn "different modules for file: $key: were found" . + "(using the version) after the '=>': ". + "$rv->{$key}{file} => $rv_sub->{$key}{file}\n"; + + $rv->{$key}{used_by} = [ + grep (!$mark{$_}++, + @{ $rv->{$key}{used_by} }, + @{ $rv_sub->{$key}{used_by} }) + ]; + @{ $rv->{$key}{used_by} } = grep length, @{ $rv->{$key}{used_by} }; + $rv->{$key}{file} = $rv_sub->{$key}{file}; + } + elsif ($rv->{$key}) { + $rv->{$key}{used_by} = [ + grep (!$mark{$_}++, + @{ $rv->{$key}{used_by} }, + @{ $rv_sub->{$key}{used_by} }) + ]; + @{ $rv->{$key}{used_by} } = grep length, @{ $rv->{$key}{used_by} }; + } + else { + $rv->{$key} = { + used_by => [ @{ $rv_sub->{$key}{used_by} } ], + file => $rv_sub->{$key}{file}, + key => $rv_sub->{$key}{key}, + type => $rv_sub->{$key}{type} + }; + + @{ $rv->{$key}{used_by} } = grep length, @{ $rv->{$key}{used_by} }; + } + } +} -=item B<--requires> +sub _not_dup { + my ($key, $rv1, $rv2) = @_; + (_abs_path($rv1->{$key}{file}) ne _abs_path($rv2->{$key}{file})); +} -Print all requires. +sub _abs_path { + return join( + '/', + Cwd::abs_path(File::Basename::dirname($_[0])), + File::Basename::basename($_[0]), + ); +} -=item B<--ignore=(dep)> +##################################################### +### Actual perldeps.pl code starts here. + +# Print usage information +sub +print_usage_info($) +{ + my $code = shift || 0; + my ($leader, $underbar); + + print "\n"; + $leader = "$0 Usage Information"; + $underbar = $leader; + $underbar =~ s/./-/g; + print "$leader\n$underbar\n"; + print "\n"; + print " Syntax: $0 [ options ] [ path(s)/file(s) ]\n"; + print "\n"; + print " -h --help Show this usage information\n"; + print " -v --version Show version and copyright\n"; + print " -d --debug Turn on debugging\n"; + print " -p --provides Find things provided by path(s)/file(s)\n"; + print " -r --requires Find things required by path(s)/file(s)\n"; + #print " \n"; + print "\nNOTE: Path(s)/file(s) can also be specified on STDIN. Default is \@INC.\n\n"; + exit($code); +} -Ignore this dependency if found. +# Locate perl modules (*.pm) in given locations. +sub +find_perl_modules(@) +{ + my @locations = @_; + my %modules; + + foreach my $loc (@locations) { + if (-f $loc) { + # It's a file. Assume it's a Perl module. + #print "Found module: $loc.\n"; + $modules{$loc} = 1; + } elsif (-d $loc) { + my @tmp; + + # Recurse the directory tree looking for all modules inside it. + &File::Find::find({ + "wanted" => sub { + if ((-s _) && (substr($File::Find::fullname, -3, 3) eq ".pm")) { + push @tmp, $File::Find::fullname; + } + }, + "follow_fast" => 1, + "no_chdir" => 1, + "untaint" => 1, + "untaint_skip" => 1, + "untaint_pattern" => qr|^([-+@\w./]+)$| + }, $loc); + + # @tmp is now a list with all non-empty *.pm files in and under $loc. + # Untaint and save in %modules hash. + foreach my $module (@tmp) { + if ($module =~ /^([-+@\w.\/]+)$/) { + $modules{$1} = 1; + #print "Found module: $1\n"; + } + } + } else { + # Something wicked this way comes. + print STDERR "$0: Error: Don't know what to do with location \"$loc\"\n"; + } + } + return keys(%modules); +} -=back +# Generate an RPM-style "Provides:" list for the given modules. +sub +find_provides(@) +{ + my @modules = @_; + my @prov; + + foreach my $mod (@modules) { + my (@contents, @pkgs); + my $mod_path; + local *MOD; + + $mod_path = dirname($mod); + if (!open(MOD, $mod)) { + warn "Unable to read module $mod -- $!\n"; + next; + } + @contents = <MOD>; + if (!close(MOD)) { + warn "Unable to close module $mod -- $!\n"; + } + + if (!scalar(grep { $_ eq $mod_path } @INC)) { + push @INC, $mod_path; + } + foreach my $line (grep { $_ =~ /^\s*package\s+/ } @contents) { + if ($line =~ /^\s*package\s+([^\;\s]+)\s*\;/) { + push @pkgs, $1; + } + } + + # Now we have a list of packages. Load up the modules and get their versions. + foreach my $pkg (@pkgs) { + my $ret; + local ($SIG{"__WARN__"}, $SIG{"__DIE__"}); + + # Make sure eval() can't display warnings/errors. + $SIG{"__DIE__"} = $SIG{"__WARN__"} = sub {0;}; + $ret = eval("no strict ('vars', 'subs', 'refs'); use $pkg (); return $pkg->VERSION || 0.0;"); + if ($@) { + dprint "Unable to parse version number from $pkg -- $@. Assuming 0.\n"; + $ret = 0; + } + + if (! $ret) { + $ret = 0; + } + push @prov, "perl($pkg) = $ret"; + } + } + printf("Provides: %s\n", join(", ", sort(@prov))); +} -=head1 EXIT STATUS +# Generate an RPM-style "Requires:" list for the given modules. +sub +find_requires(@) +{ + my @modules = @_; + my @reqs; + my $reqs; + + $reqs = &scan_deps("files" => \@modules, "recurse" => 0); + foreach my $key (grep { $reqs->{$_}{"type"} eq "module" } sort(keys(%{$reqs}))) { + if (substr($key, -3, 3) eq ".pm") { + $key = substr($key, 0, -3); + } + $key =~ s!/!::!g; + push @reqs, "perl($key)"; + } + printf("Requires: %s\n", join(", ", @reqs)); +} -0 success, 1 failure +sub +main() +{ + my $VERSION = '1.0'; + my (@locations, @modules); + my %OPTION; + + # For taint checks + delete @ENV{("IFS", "CDPATH", "ENV", "BASH_ENV")}; + $ENV{"PATH"} = "/bin:/usr/bin:/sbin:/usr/sbin:/etc:/usr/ucb"; + foreach my $shell ("/bin/bash", "/usr/bin/ksh", "/bin/ksh", "/bin/sh", "/sbin/sh") { + if (-f $shell) { + $ENV{"SHELL"} = $shell; + last; + } + } -=head1 SEE ALSO + $ENV{"LANG"} = "C" if (! $ENV{"LANG"}); + umask 022; + select STDERR; $| = 1; + select STDOUT; $| = 1; + + Getopt::Long::Configure("no_getopt_compat", "bundling", "no_ignore_case"); + Getopt::Long::GetOptions(\%OPTION, "debug|d!", "help|h", "version|v", "provides|p", "requires|r"); + + # Post-parse the options stuff + select STDOUT; $| = 1; + if ($OPTION{"version"}) { + # Do not edit this variable. It is updated automatically by CVS when you commit + my $rcs_info = 'CVS Revision $Revision: 1.6 $ created on $Date: 2006/04/04 20:12:03 $ by $Author: mej $ '; + + $rcs_info =~ s/\$\s*Revision: (\S+) \$/$1/; + $rcs_info =~ s/\$\s*Date: (\S+) (\S+) \$/$1 at $2/; + $rcs_info =~ s/\$\s*Author: (\S+) \$ /$1/; + print "\n"; + print "perldeps.pl $VERSION by Michael Jennings <mej\@eterm.org>\n"; + print "Copyright (c) 2005-2006, Michael Jennings\n"; + print " ($rcs_info)\n"; + print "\n"; + return 0; + } elsif ($OPTION{"help"}) { + &print_usage_info(0); # Never returns + } -/usr/lib/rpm/macros + push @locations, @ARGV; + if (!scalar(@ARGV) && !(-t STDIN)) { + @locations = <STDIN>; + } + if (!scalar(@locations)) { + @locations = @INC; + } -=head1 BUGS + if (!($OPTION{"provides"} || $OPTION{"requires"})) { + &print_usage_info(-1); # Never returns + } -Does not generate version information on dependencies. + # Catch bogus warning messages like "A thread exited while 2 threads were running" + $SIG{"__DIE__"} = $SIG{"__WARN__"} = sub {0;}; -=head1 AUTHOR + @modules = &find_perl_modules(@locations); + if ($OPTION{"provides"}) { + &find_provides(@modules); + } + if ($OPTION{"requires"}) { + &find_requires(@modules); + } + return 0; +} -Chip Turner <cturner@redhat.com> +exit &main(); diff --git a/scripts/perllocate b/scripts/perllocate deleted file mode 100755 index 227790cef..000000000 --- a/scripts/perllocate +++ /dev/null @@ -1,246 +0,0 @@ -#!/usr/bin/perl - -# perllocate - a perl replacement for GNU locate. This allows perl -# regular expressions instead of shell globs. - -# Written by Ken Estes, Mail.com. - -use Getopt::Long; - - -sub usage { - - my $usage =<<EOF; - -$0 [--version] [--help] - [-d path] [--database=path] pattern... - -Arguments - - ---version Print version information for this program - ---help Show this usage page - --d path ---database=path - Instead of searching the default file name database, - search the file name databases in path, which is a - colon-separated list of database file names. You can - also use the environment variable LOCATE_PATH to set - the list of database files to search. The option over- - rides the environment variable if both are used. If - neither are used the default database file is $DEFAULT_DB. - - -Synopsis - -A perl5 based replacement for GNU locate. The arguments accepted are -identical but the patterns matched are perl5 instead of the -traditional locate glob patterns. This program reads 'LOCATE02' -databases which were first introduced with locate version 4.0. - -For each given pattern, locate searches one or more databases of file -names and displays the file names that contain the pattern. Patterns -that contain metacharacters should be quoted to protect them from -expansion by the shell. - -Patterns are perl5 regular expressions; see perlre(1). The database -entries are a stored as a case-insensitive (lowercase) sorted list. - -The file name databases contain lists of files that were on the system -when the databases were last updated. The system administrator can -choose the file name of the default database, the frequency with -which the databases are updated, and the directories for which they -contain entries; see updatedb(1L). - - - -Environment - - LOCATE_PATH - Colon-separated list of databases to search. - -Usage Example - - -$0 --help -$0 --version - -$0 gcc -$0 perl5 -$0 'rpm$' 'tar$' 'gz$' 'ps$' -$0 '^\s*' -$0 '/RPMS/' - - -EOF - - print $usage; - exit 0; - -} - - - -sub set_static_vars { - -# This functions sets all the static variables which are often -# configuration parameters. Since it only sets variables to static -# quantites it can not fail at run time. Some of these variables are -# adjusted by parse_args() but asside from that none of these -# variables are ever written to. All global variables are defined here -# so we have a list of them and a comment of what they are for. - - $DB_FILE_MAGIC = "\0LOCATE02\0"; - - $DEFAULT_DB = '/usr/local/var/locatedb'; - - $VERSION = (qw$Revision: 1.2 $)[1]; - - # set a known path. - - $ENV{'PATH'}= ( - '/opt/gnu/bin'. - ':/usr/local/bin'. - ':/usr/bin'. - ':/bin'. - ''); - - # taint perl requires we clean up these bad environmental variables. - - delete @ENV{'IFS', 'CDPATH', 'ENV', 'BASH_ENV'}; - - return ; -} - - -sub parse_args{ - - if( !GetOptions("version", "help", "d=s", "database=s",) ) { - print("Illegal options in \@ARGV: '@ARGV'\n"); - usage() ; - exit 1 ; - } - - if($opt_version) { - print "$0: Version: $VERSION\n"; - exit 0; - } - - if ($opt_help) { - usage(); - } - - ($#ARGV == -1) && - die("Must supply a pattern argument.\n"); - - $DB_PATH = ( $opt_database || - $opt_d || - ENV{'LOCATE_PATH'} || - $DEFAULT_DB ); - - return ; -} - - -# read the locatedb file into memory - -sub read_database { - my ($filename) = @_; - - # read whole file into memory - { - open (DBFILE, "<$filename")|| - die("$0: Could not open: $filename for reading. $!\n"); - - # not needed on unix but lets be very clear - binmode (DBFILE); - - # slurp whole file - my $old_irs = $/; - undef $/; - - $FILE = <DBFILE>; - - $/ = $old_irs; - - close(DBFILE)|| - die("$0: Could not close: $filename. $!\n"); - - $FILE =~ m/^$DB_FILE_MAGIC/ || - die("$0: file: $filename is not an GNU locatedb file. ". - "No magic number found.\n"); - } - return ; -} - - -sub parse_database { - my ($pattern) = @_; - - my $file_size = length($FILE); - my $position = length($DB_FILE_MAGIC); - - my ( $new_prefix_size, $new_filename, - $old_prefix_size, $old_filename, ) = (); - - while ($position < $file_size) { - my ($offset, $suffix) = (); - - # read offset - - ($offset) = unpack("c", substr($FILE, $position, 1)); - $position++; - if ($offest == 0x80) { - - # offset is too large to store in one byte, the data we want is - # in the next two bytes. - - ($offset) = unpack("n", substr($FILE, $position, 2)); - $position += 2; - } - - # read suffix - - { - my $null_position = index ($FILE, "\0", $position); - my $length = $null_position - $position; - $suffix = substr($FILE, $position, $length); - $position += $length + 1; - } - - # new values depend on old values and the contents of the database. - - $new_prefix_size = $offset + $old_prefix_size; - - $new_filename = substr($old_filename, 0, $new_prefix_size) - .$suffix; - - if ( $new_filename =~ m/$pattern/ ) { - print "$new_filename\n"; - } - - $old_prefix_size = $new_prefix_size; - $old_filename = $new_filename; - } - - return ; -} - - -# -------------- main -------------- -{ - - set_static_vars(); - parse_args(); - - foreach $file ( split(/:/, $DB_PATH) ) { - read_database($file); - my $pattern = '('.join(')|(', @ARGV).')'; - parse_database($pattern); - } - - exit 0; -} - diff --git a/scripts/perllocate.cgi b/scripts/perllocate.cgi deleted file mode 100755 index 2ae25a77a..000000000 --- a/scripts/perllocate.cgi +++ /dev/null @@ -1,287 +0,0 @@ -#!/usr/bin/perl - -# perllocate.cgi - a web interface to a perl version of the Unix -# locate command. This script makes it easy to query the RPM -# repository and find out what packages are availible using Perl5 -# Patterns. - -# written by Ken Estes kestes@staff.mail.com - -use CGI ':standard'; -use File::Basename; -use File::stat; - - - -sub usage { - - # If they are asking for help then they are clueless so reset all - # their parameters for them, in case they are in a bad state. - - param(-name=>'Defaults', -value=>'on'); - my $rpmdiff_version = `perllocate --version`; - - $usage =<<EOF; - - $0 version: $VERSION - $perllocate_version - -This is a web interface into the perllocate command. - - -EOF - print pre($usage); - - return ; -} - - -sub set_static_vars { - -# This functions sets all the static variables which are often -# configuration parameters. Since it only sets variables to static -# quantites it can not fail at run time. Some of these variables are -# adjusted by parse_args() but asside from that none of these -# variables are ever written to. All global variables are defined here -# so we have a list of them and a comment of what they are for. - - - $VERSION = ( qw$Revision: 1.2 $ )[1]; - - @ORIG_ARGV = @ARGV; - - $LOCATEDB = '/net/master-mm/export/rpms/redhat/rpmarchive.locatedb'; - - # a pattern which matches something inside the rpm archive mount point. - - $MOUNT_DIR_PATTERN = '/redhat/'; - - # a pattern to limit the files which are displayed. - - $FILES_TO_DISPLAY_PATTERN = '/RPMS/'; - - - # set a known path. - - # the correct path has not been finalized yet, but this is close. - - $ENV{'PATH'}= ( - '/usr/local/bin'. - ':/usr/bin'. - ':/bin'. - ':/usr/apache/cgibins/cgi-forms'. - ''); - - # taint perl requires we clean up these bad environmental - # variables. - - delete @ENV{'IFS', 'CDPATH', 'ENV', 'BASH_ENV'}; - - return 1; -} #set_static_vars - - - - -sub get_env { - -# this function sets variables similar to set_static variables. This -# function may fail only if the OS is in a very strange state. after -# we leave this function we should be all set up to give good error -# handling, should things fail. - - umask 0022; - $| = 1; - $PID = $$; - $PROGRAM = basename($0); - $TIME = time(); - $LOCALTIME = localtime($main::TIME); - $START_TIME = $TIME; - - { - - # We show the results as if they were located in the same - # directory as the locatedb appears to the cgi script. The - # directory is exported from the repository machine in a slightly - # different place so that all its outputs would look wrong if we - # displayed it raw. This hack is what $DISPLAY_PREFIX is used - # for, we try and compute it automatically. - - $LOCATEDB =~ m!$MOUNT_DIR_PATTERN! || - die("db file: $LOCATEDB must be located in a '$MOUNT_DIR_PATTERN' directory"); - - $DISPLAY_PREFIX = $LOCATEDB; - $DISPLAY_PREFIX =~ s!$MOUNT_DIR_PATTERN(.*)!$MOUNT_DIR_PATTERN!; - - (-r $LOCATEDB) || - die("The file: $LOCATEDB, must exists and be readable."); - - my ($mtime) = stat($LOCATEDB)->mtime; - - $DB_UPDATE_TIME = localtime($mtime); - } - - return 1; -} # get_env - - -# fatal errors need to be valid HTML - -sub fatal_error { - my @error = @_; - - print header; - - foreach $_ (@error) { - print $_; - } - - print end_html; - print "\n\n\n"; - - die("\n"); -} - - - - -sub print_query_page { - - my @out; - - push @out, start_form; - - push @out, ( - "This page allows you to search for all packages ". - "in the RPM repository which match a particular pattern.", - p(), - ); - - push @out, ( - - h3("Pattern",), - "Enter a valid Perl5 Pattern: ", - textfield(-name=>'pattern', - -size=>30,), - p(), - ); - - - push @out, ( - defaults(-name=>'Defaults'), - submit(-name=>'Submit'), - p(), - ); - - - push @out, ( - "Locate database created at: $DB_UPDATE_TIME\n", - p(), - "The time is now: $LOCALTIME\n", - p(), - ); - - push @out, ( - end_form(), - ); - - print @out; - - return ; -} - - - -# given a pattern remove any "tainted" characters. - -sub clean_pattern { - my ($data) = @_; - my $out = '(none)'; - - # we do not allow single quotes in the pattern because of the way we - # invoke perllocate. If we allowed \' then users could introduce - # strings like "'; rm -rf /' echo 'done". Unfortunatly we can not - # be too strict about other characters because most characters are - # needed to specify regular expressions. - - $data =~ s/\'//g; - - if ( $data =~ m/(.*)/ ) { - $out = $1; - } - return $out; -} - - - -# show the results of running perllocate on the chosen pattern. - -sub print_perllocate { - my($pattern, @args) = @_; - - $pattern =~ s/\'/\\\'/g; - - my $cmd = ( - "perllocate -d $LOCATEDB '$pattern' 2>&1 ". - " | sed -e 's!.*$MOUNT_DIR_PATTERN!$DISPLAY_PREFIX!' ". - " | grep '$FILES_TO_DISPLAY_PATTERN' ". - ""); - - print $cmd, p(); - - my $result = "\n".qx{$cmd}."\n"; - - print pre($result); - - return ; -} - - -# Main -{ - - set_static_vars(); - get_env(); - - my ($pattern) = clean_pattern(param("pattern")); - - my (@perllocate_args) = param("perllocate arguments"); - @perllocate_args = split(/\s+/, - '--'.(join(" --", @perllocate_args))); - push @perllocate_args, '--'; - - - print ( - header(), - start_html(-title=>"perllocate"), - h2({-align=>'CENTER'},"perllocate"), - p(), - ); - - - if (param("Help Screen")) { - - usage(); - - } elsif ( grep {/^(\-\-)((help)|(version))$/} @perllocate_args ) { - - print_perllocate(@perllocate_args); - - } else { - - print_query_page(); - - ($pattern) && - print_perllocate($pattern); - - } - - print ( - end_html(), - "\n\n\n", - ); - - - exit 0; -} - diff --git a/scripts/pkgconfig.prov.sh b/scripts/pkgconfig.prov.sh deleted file mode 100644 index 389bef7e1..000000000 --- a/scripts/pkgconfig.prov.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -pkgconfig=${1:-/usr/bin/pkg-config} -test -x $pkgconfig || exit 0 -while read filename ; do -case "${filename}" in -*.pc) - # Assume that this file doesn't contain useful information. - needs_pkgconfig=false - # Query the dependencies of the package. - $pkgconfig --print-provides "$filename" 2> /dev/null | while read n r v ; do - # We have a dependency. Make a note that we need the pkgconfig - # tool for this package. - echo "pkgconfig($n)" "$r" "$v" - needs_pkgconfig=true - done - # The dependency on the pkgconfig package itself. - if $needs_pkgconfig ; then - echo pkgconfig - fi - ;; -esac -done diff --git a/scripts/pkgconfig.req.sh b/scripts/pkgconfig.req.sh deleted file mode 100644 index ff4f8bd0c..000000000 --- a/scripts/pkgconfig.req.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -pkgconfig=${1:-/usr/bin/pkg-config} -test -x $pkgconfig || exit 0 -while read filename ; do -case "${filename}" in -*.pc) - $pkgconfig --print-requires "$filename" 2> /dev/null | while read n r v ; do - echo "pkgconfig($n)" "$r" "$v" - done -esac -done diff --git a/scripts/print_deps b/scripts/print_deps deleted file mode 100755 index 9e7689718..000000000 --- a/scripts/print_deps +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/perl - -# a glue program for print out dependencies based on filenames -# by Ken Estes kestes@staff.mail.com - -use File::Basename; -use Getopt::Long; - - -GetOptions ( - qw( identifier=s basename! ) - ); - - -if ("@ARGV") { - foreach (@ARGV) { - process_file($_); - } -} else { - - # notice we are passed a list of filenames NOT as common in unix the - # contents of the file. - - foreach (<>) { - process_file($_); - } -} - -sub process_file { - my ($str) = @_; - chomp $str; - - if ($opt_basename) { - $str = basename($str); - } - - if ($opt_identifier) { - print "${opt_identifier}(${str})\n"; - } else { - print "$str\n"; - } - - return ; -} - diff --git a/scripts/sql.prov b/scripts/sql.prov deleted file mode 100755 index 5d2b31860..000000000 --- a/scripts/sql.prov +++ /dev/null @@ -1,115 +0,0 @@ -#!/usr/bin/perl - -# RPM and it's source code are covered under two separate licenses. - -# The entire code base may be distributed under the terms of the GNU -# General Public License (GPL), which appears immediately below. -# Alternatively, all of the source code in the lib subdirectory of the -# RPM source code distribution as well as any code derived from that -# code may instead be distributed under the GNU Library General Public -# License (LGPL), at the choice of the distributor. The complete text -# of the LGPL appears at the bottom of this file. - -# This alternatively is allowed to enable applications to be linked -# against the RPM library (commonly called librpm) without forcing -# such applications to be distributed under the GPL. - -# Any questions regarding the licensing of RPM should be addressed to -# marc@redhat.com and ewt@redhat.com. - - -# sql.prov - a simple script to print the proper name for sql from -# both the sepecification and body files. - - -# by Ken Estes Mail.com kestes@staff.mail.com - -if ("@ARGV") { - foreach (@ARGV) { - process_file($_); - } -} else { - - # notice we are passed a list of filenames NOT as common in unix the - # contents of the file. - - foreach (<>) { - process_file($_); - } -} - - - -foreach $module (sort keys %require) { - print "sql($module)\n"; -} - -exit 0; - - - -sub process_file { - - my ($filename) = @_; - chomp $filename; - - open(FILE, "<$filename")|| - die("$0: Could not open file: '$filename' : $!\n"); - - my ($package, $version) = (); - - my (@file) = <FILE>; - - my ($file) = "@file"; - - close(FILE)|| - die("$0: Could not close file: '$file' : $!\n"); - - # skip the comments - - $file =~ s!/\*(.*?)\*/!!gs; - $file =~ s!\s*--(.*?)\n!\n!gm; - - @file = split(/\n/, $file); - - foreach (@file) { - - # remove strings - - s!\'[^\']*\'!!g; - - - # not everyone puts the package name of the file as the first - # package name so we report all namespaces as if they were - # provided packages (really ugly). - - if (m/\bpackage\s+(body\s*)?(\S+)\s+[ia]s/i) { - $package=$2; - $package=lc($package); - $require{$package}=1; - } - - if (m/((procedure)|(function))\s+(\S+)\s*\(/i) { - my $func = $4; - $func = lc($func); - if ($package) { - $require{"$package.$func"}=1; - } else { - $require{$func}=1; - } - } - - # Each keyword can appear multiple times. Don't - # bother with datastructures to store these strings, - # if we need to print it print it now. - - if ( m/^\s*\$RPM_Provides\s*:=\s*["'](.*)['"]/i) { - foreach $_ (spit(/\s+/, $1)) { - print "$_\n"; - } - } - - } - - return ; -} diff --git a/scripts/sql.req b/scripts/sql.req deleted file mode 100755 index 24fa97278..000000000 --- a/scripts/sql.req +++ /dev/null @@ -1,108 +0,0 @@ -#!/usr/bin/perl - -# RPM and it's source code are covered under two separate licenses. - -# The entire code base may be distributed under the terms of the GNU -# General Public License (GPL), which appears immediately below. -# Alternatively, all of the source code in the lib subdirectory of the -# RPM source code distribution as well as any code derived from that -# code may instead be distributed under the GNU Library General Public -# License (LGPL), at the choice of the distributor. The complete text -# of the LGPL appears at the bottom of this file. - -# This alternatively is allowed to enable applications to be linked -# against the RPM library (commonly called librpm) without forcing -# such applications to be distributed under the GPL. - -# Any questions regarding the licensing of RPM should be addressed to -# marc@redhat.com and ewt@redhat.com. - - -# sql.req - a simple script to print the uses of sql functions. - - -# by Ken Estes Mail.com kestes@staff.mail.com - -if ("@ARGV") { - foreach (@ARGV) { - process_file($_); - } -} else { - - # notice we are passed a list of filenames NOT as common in unix the - # contents of the file. - - foreach (<>) { - process_file($_); - } -} - - - -foreach $module (sort keys %require) { - print "sql($module)\n"; -} - -exit 0; - - - -sub process_file { - - my ($filename) = @_; - chomp $filename; - - open(FILE, "<$filename")|| - die("$0: Could not open file: '$filename' : $!\n"); - - my ($package, $version) = (); - - my (@file) = <FILE>; - - my ($file) = "@file"; - - close(FILE)|| - die("$0: Could not close file: '$file' : $!\n"); - - # skip the comments - - # Suck the whole file in to make removing /* */ (multiple lines - # comments) comments easier - - $file =~ s!/\*(.*?)\*/!!gs; - $file =~ s!^\s*--(.*?)\n!\n!gm; - - @file = split(/\n/, $file); - - foreach (@file) { - - # remove strings - - s!\'[^\']*\'!!g; - - - # we are interested in function names which have a dot in them and - # are followed by an open parenthesis - - foreach ( m/([a-zA-Z0-9._-]+\.[a-zA-Z0-9._-]+)\s*\(/ ) { - my $func = $_; - $func=lc($func); - $func =~ m/\.\./ && - next; - $require{$func}=1; - } - - # Each keyword can appear multiple times. Don't - # bother with datastructures to store these strings, - # if we need to print it print it now. - - if ( m/^\s*\$RPM_Provides\s*:=\s*["'](.*)['"]/i) { - foreach $_ (spit(/\s+/, $1)) { - print "$_\n"; - } - } - - } - - return ; -} diff --git a/scripts/trpm b/scripts/trpm deleted file mode 100755 index 806d08241..000000000 --- a/scripts/trpm +++ /dev/null @@ -1,333 +0,0 @@ -#!/bin/sh - -ulimit -S -c unlimited -dbg= # echo - -rpm=/bin/rpm -#rpm=/X/src/rpm/rpm -#rpmi=mrpm -#rpmi="strace -o xxx /bin/rpm" -rpmi="$rpm" -#rpmi=/usr/lib/rpm/rpmi -rpmb=/usr/bin/rpmbuild -rpmq=/usr/bin/rpmquery -rpmdb=/usr/bin/rpmdb -rpmk=/usr/bin/rpmsign - -pgppubkey="`echo /usr/share/doc/rpm-4*/RPM-PGP-KEY`" -gpgpubkey="`echo /usr/share/doc/rpm-4*/RPM-GPG-KEY`" -betapubkey="`echo /usr/share/doc/rpm-4*/BETA-GPG-KEY`" - -#rpm=/X/src/rpm402/rpm -#rpmb=/X/src/rpm402/rpmb -#rpmq=/X/src/rpm402/rpmq -#rpmdb=/X/src/rpm402/rpmdb - -#rpm=/X/src/rpm307/rpm -#rpmb=$rpm -#rpmq=$rpm -#rpmdb=$rpm - -dist=8.0 -type=min -arch=`$rpm --eval '%{_arch}' | sed -e 's/i686/i386/'` - -top=`pwd` -root=$top/$dist -sudo=sudo -justdb="--justdb --noscripts --notriggers --ignoresize" -dmopts="-l dmalloc.log -i 100 low" -db1= -rc="--rcfile $top/rpmrc-$dist" -sorted= # "| sort" - -min0glob=" -basesystem- -bash-[12] -filesystem- -glibc-common- -glibc-2 -ldconfig- -libtermcap-2 -mktemp- -setup- -termcap- -" - -min1glob=" -$min0glob -bzip2-[01] -bzip2-libs- -chkconfig- -coreutils- -db1-1 -db2-2 -db3-3 -db4-4 -dev- -diffutils- -e2fsprogs-1 -fileutils- -findutils- -gawk- -gdb- -gdbm-1 -grep- -gzip- -info- -less- -libacl-2 -libattr-2 -mount- -ncurses-[45] -pcre- -procps-2 -psmisc- -sed- -shadow-utils- -readline-[24] -rmt- -tar- -textutils- -vim-common- -vim-minimal- -zlib-1 -" - -min2glob=" -$min1glob -cpio- -cracklib- -glib-1 -logrotate- -mingetty- -popt- -pwdb- -slang-[01] -which- -words- -" - -baseglob=" -$min2glob -ash- -bdflush- -console-tools- -cyrus-sasl-[12] -cyrus-sasl-md5- -elfutils-libelf- -glib2-2 -gmp-[234] -initscripts- -iputils- -iproute- -kbd- -kernel-2 -krb5-libs- -libuser- -libelf-* -losetup- -lvm- -mkinitrd- -modutils- -net-tools- -openldap-2 -openssl-0 -pam-0 -pamconfig- -redhat-release- -sh-utils- -sysklogd- -usermode-1 -util-linux- -vixie-cron- -rpm-[34] -rpm-devel-[34] -sash- -SysVinit- -" - -develglob=" -$baseglob -bzip2-devel- -db1-devel- -db2-devel- -db3-devel- -db4-devel- -gdbm-devel- -glibc-devel- -glibc-kernheaders- -gmp-devel- -kernel-headers- -readline-devel-[24] -tcl- -zlib-devel- -" - -buildglob=" -$develglob -autoconf- -automake- -bash2- -binutils- -cpp- -cvs- -db3-utils- -db4-utils- -egcs-1 -egcs-c++-1 -expat-1 -gcc-[23] -gcc-c++-[23] -gettext- -krb5-configs- -libgcc-3 -libgcj-3 -libstdc++- -libtool- -make- -m4- -ncurses-devel- -patch- -perl-5 -perl-CGI- -perl-Filter- -perl-Parse-RecDescent- -python-[12] -rpm-build- -file-3 -tcsh- -zip- -" - -mozillaglob=" -$buildglob -compat-libstdc++-7 -curl- -fontconfig-2 -freetype-2 -gtk+-1 -indexhtml- -libao-0 -libjpeg- -libpng- -libogg- -libvorbis- -mozilla- -ORBit-0 -redhat-menus- -vorbis-tools- -XFree86-Mesa-libGL- -XFree86-libs-[34] -XFree86-libs-data- -" - -classes="min0 min1 min2 base devel build mozilla" -notallpat="(kernel-[^2h])" - -for cmd in $* -do - [ $# -eq 0 ] && break - shift - echo "******** args: $*" - echo "=======> start $cmd `date`" - case $cmd in - debug) dbg=echo ;; - dmalloc) eval `dmalloc -b $dmopts` ;; - db1) db1="--define '%_dbapi 1'" ;; - 5.2|6.2|7.*|8.*) - dist=$cmd - root=$top/$dist - rc="--rcfile $top/rpmrc-$dist $db1" - $dbg mkdir -p $root/{dev,X/RPMS,X/SRPMS} - [ -c $root/dev/null ] || $dbg $sudo mknod $root/dev/null c 1 3 - [ -f $top/rpmrc-$dist ] || cat << EOF > $top/rpmrc-$dist -include: /usr/lib/rpm/rpmrc -macrofiles: /usr/lib/rpm/macros:/usr/lib/rpm/%{_target}/macros:$top/macros:$top/macros-$dist-$arch -EOF - [ -f $top/macros-$dist-$arch ] || cat << EOF > $top/macros-$dist-$arch -%_topdir $root/X -EOF - ;; - config) - [ -f $top/macros ] || cat << EOF > $top/macros -%_ntopdir %{_topdir}/%{name}-%{version}-%{release} -%_builddir %{_ntopdir} -%_sourcedir %{_ntopdir} -%_specdir %{_ntopdir} -%_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm -%_rpmdir %{_topdir}/RPMS -%_srcrpmdir %{_topdir}/SRPMS -EOF - ;; - manifest) - rm -f *-$dist-$arch - pkgs="/$dist/$arch" - ls -1 ${pkgs}/*.rpm | egrep "(noarch|$arch).rpm" > list-$dist-$arch - cat list-$dist-$arch | egrep -v $notallpat > all-$dist-$arch - $dbg $rpmq $rc -qp --qf "/$dist/SRPMS/%{sourcerpm}\\n" \ -`cat all-$dist-$arch` | sort | uniq > all-$dist-$arch-srpms - for l in $classes ; do - glv='$'${l}glob - glist="`eval echo $glv`" - for g in $glist ; do - ls -1 ${pkgs}/${g}*.rpm 2> /dev/null - done | egrep "(noarch|$arch).rpm" $sorted > $l-$dist-$arch - $dbg $rpmq $rc -qp --qf "/$dist/SRPMS/%{sourcerpm}\\n" \ -`cat $l-$dist-$arch` | sort | uniq > $l-$dist-$arch-srpms - done - ;; - clean) - $dbg rm -f $top/{rpmrc-$dist,macros-$dist-$arch,macros} - $dbg $sudo mv $root ${root}-$$ && $dbg $sudo rm -rf ${root}-$$ - ;; - --rebuild) - for srpm in `cat $type-$dist-$arch-srpms` ; do - $dbg $rpmb $rc $cmd $srpm - done - ;; - --initdb) - $dbg $sudo mkdir -p $root/var/lib/rpm - $dbg $sudo mkdir -p $root/etc - $dbg $sudo touch $root/etc/fstab - $dbg $sudo touch $root/etc/mtab - $dbg $sudo $rpmdb $rc --root $root --initdb - if [ X"`$rpm --version`" = X"RPM version 4.2" ]; then - $dbg $sudo $rpmk $rc --root $root --import $pgppubkey - $dbg $sudo $rpmk $rc --root $root --import $gpgpubkey - $dbg $sudo $rpmk $rc --root $root --import $betapubkey - fi - ;; - --savedb) - ( $dbg cd $root/var/lib && $dbg $sudo tar czvf rpmdb.tar.gz rpm ; ) - ;; - --rebuilddb) - $dbg $sudo $rpmdb $rc --root $root --rebuilddb -vv - ;; - --justdb) - [ -f $type-$dist-$arch ] || { - echo $type-$dist-$arch not found - exit 1 - } - $dbg $sudo $rpmi $rc --root $root -Uv $justdb `cat $type-$dist-$arch` - ;; - -U*|-F*) - [ -f $type-$dist-$arch ] || { - echo $type-$dist-$arch not found - exit 1 - } - $dbg $sudo $rpmi $rc --root $root $cmd $* `cat $type-$dist-$arch` - set "" - ;; - -[Vqei]*|--showrc) - $dbg $sudo $rpm $rc --root $root $cmd - ;; - chroot) - $dbg $sudo touch $root/etc/mtab - $dbg $sudo cp /etc/resolv.conf /etc/fstab $root/etc - $dbg $sudo env HOME=/root chroot $root - ;; - *) type=$cmd ;; - esac -done -echo "=======> finish `date`" @@ -11,25 +11,6 @@ #include <sys/types.h> -#if defined(__LCLINT__) -/*@-redef@*/ -typedef unsigned int u_int32_t; -typedef unsigned short u_int16_t; -typedef unsigned char u_int8_t; -/*@-incondefs@*/ /* LCLint 3.0.0.15 */ -typedef int int32_t; -/*@=incondefs@*/ -/* XXX from /usr/include/bits/sigset.h */ -/*@-sizeoftype@*/ -# define _SIGSET_NWORDS (1024 / (8 * sizeof (unsigned long int))) -typedef struct - { - unsigned long int __val[_SIGSET_NWORDS]; - } __sigset_t; -/*@=sizeoftype@*/ -/*@=redef@*/ -#endif - #include <sys/stat.h> #include <stdio.h> @@ -41,14 +22,7 @@ typedef struct of _POSIX_VERSION. */ #ifdef HAVE_UNISTD_H #include <unistd.h> -#if defined(__LCLINT__) -/*@-superuser -declundef -incondefs @*/ /* LCL: modifies clause missing */ -extern int chroot (const char *__path) - /*@globals errno, systemState @*/ - /*@modifies errno, systemState @*/; -/*@=superuser =declundef =incondefs @*/ -#endif -#if !defined(__GLIBC__) && !defined(__LCLINT__) +#if !defined(__GLIBC__) #ifdef __APPLE__ #include <crt_externs.h> #define environ (*_NSGetEnviron()) @@ -122,21 +96,11 @@ extern int errno; /*@=declundef @*/ #endif -#if defined(__LCLINT__) -/*@-declundef @*/ -/*@exits@*/ -extern void error(int status, int errnum, const char *format, ...) - __attribute__ ((__format__ (__printf__, 3, 4))) - /*@globals fileSystem @*/ - /*@modifies fileSystem @*/; -/*@=declundef @*/ -#else #if HAVE_ERROR && HAVE_ERROR_H #include <error.h> #endif -#endif -#if HAVE___SECURE_GETENV && !defined(__LCLINT__) +#if HAVE___SECURE_GETENV #define getenv(_s) __secure_getenv(_s) #endif @@ -148,14 +112,6 @@ extern void error(int status, int errnum, const char *format, ...) #include <stdlib.h> /*@=skipansiheaders@*/ #undef getopt -#if defined(__LCLINT__) -/*@-declundef -incondefs @*/ /* LCL: modifies clause missing */ -extern char * realpath (const char * file_name, /*@out@*/ char * resolved_name) - /*@globals errno, fileSystem @*/ - /*@requires maxSet(resolved_name) >= (PATH_MAX - 1); @*/ - /*@modifies *resolved_name, errno, fileSystem @*/; -/*@=declundef =incondefs @*/ -#endif #else /* not STDC_HEADERS */ char *getenv (const char *name); #if ! HAVE_REALPATH @@ -174,12 +130,12 @@ char *realpath(const char *path, char resolved_path []); #include <sys/file.h> #endif -#if !defined(SEEK_SET) && !defined(__LCLINT__) +#if !defined(SEEK_SET) #define SEEK_SET 0 #define SEEK_CUR 1 #define SEEK_END 2 #endif -#if !defined(F_OK) && !defined(__LCLINT__) +#if !defined(F_OK) #define F_OK 0 #define X_OK 1 #define W_OK 2 @@ -203,14 +159,6 @@ char *realpath(const char *path, char resolved_path []); # endif /* HAVE_NDIR_H */ #endif /* HAVE_DIRENT_H */ -#if defined(__LCLINT__) -/*@-declundef -incondefs @*/ /* LCL: missing annotation */ -/*@only@*/ /*@out@*/ void * alloca (size_t __size) - /*@ensures maxSet(result) == (__size - 1) @*/ - /*@*/; -/*@=declundef =incondefs @*/ -#endif - #ifdef __GNUC__ # undef alloca # define alloca __builtin_alloca @@ -225,34 +173,9 @@ char *alloca (); # endif #endif -#if defined (__GLIBC__) && defined(__LCLINT__) -/*@-declundef@*/ -/*@unchecked@*/ -extern __const __int32_t *__ctype_tolower; -/*@unchecked@*/ -extern __const __int32_t *__ctype_toupper; -/*@=declundef@*/ -#endif - #include <ctype.h> -#if defined (__GLIBC__) && defined(__LCLINT__) -/*@-exportlocal@*/ -extern int isalnum(int) __THROW /*@*/; -extern int iscntrl(int) __THROW /*@*/; -extern int isgraph(int) __THROW /*@*/; -extern int islower(int) __THROW /*@*/; -extern int ispunct(int) __THROW /*@*/; -extern int isxdigit(int) __THROW /*@*/; -extern int isascii(int) __THROW /*@*/; -extern int toascii(int) __THROW /*@*/; -extern int _toupper(int) __THROW /*@*/; -extern int _tolower(int) __THROW /*@*/; -/*@=exportlocal@*/ - -#endif - -#if HAVE_SYS_MMAN_H && !defined(__LCLINT__) +#if HAVE_SYS_MMAN_H #include <sys/mman.h> #endif @@ -287,7 +210,7 @@ extern int _tolower(int) __THROW /*@*/; #include <err.h> #endif -#if HAVE_MALLOC_H && !defined(__LCLINT__) +#if HAVE_MALLOC_H #include <malloc.h> #endif @@ -310,50 +233,11 @@ typedef char * security_context_t; #define is_selinux_enabled() (-1) -#define rpm_execcon(_v, _fn, _av, _envp) (0) -#endif +#define matchpathcon_init(_fn) (-1) +#define matchpathcon_fini() (0) +#define matchpathcon(_fn, _fm, _c) (-1) -#if defined(__LCLINT__) -/*@-incondefs@*/ -extern void freecon(/*@only@*/ security_context_t con) - /*@modifies con @*/; - -extern int getfilecon(const char *path, /*@out@*/ security_context_t *con) - /*@modifies *con @*/; -extern int lgetfilecon(const char *path, /*@out@*/ security_context_t *con) - /*@modifies *con @*/; -extern int fgetfilecon(int fd, /*@out@*/ security_context_t *con) - /*@modifies *con @*/; - -extern int setfilecon(const char *path, security_context_t con) - /*@globals fileSystem @*/ - /*@modifies fileSystem @*/; -extern int lsetfilecon(const char *path, security_context_t con) - /*@globals fileSystem @*/ - /*@modifies fileSystem @*/; -extern int fsetfilecon(int fd, security_context_t con) - /*@globals fileSystem @*/ - /*@modifies fileSystem @*/; - -extern int getcon(/*@out@*/ security_context_t *con) - /*@modifies *con @*/; -extern int getexeccon(/*@out@*/ security_context_t *con) - /*@modifies *con @*/; -extern int setexeccon(security_context_t con) - /*@globals fileSystem @*/ - /*@modifies fileSystem @*/; - -extern int security_check_context(security_context_t con) - /*@globals fileSystem @*/ - /*@modifies fileSystem @*/; -extern int security_getenforce(void) - /*@globals fileSystem @*/ - /*@modifies fileSystem @*/; - -extern int is_selinux_enabled(void) - /*@globals fileSystem @*/ - /*@modifies fileSystem @*/; -/*@=incondefs@*/ +#define rpm_execcon(_v, _fn, _av, _envp) (0) #endif /*@-declundef -incondefs @*/ /* FIX: these are macros */ @@ -391,40 +275,6 @@ extern int is_selinux_enabled(void) #if HAVE_MCHECK_H #include <mcheck.h> -#if defined(__LCLINT__) -/*@-declundef -incondefs @*/ /* LCL: missing annotations */ -#if 0 -enum mcheck_status - { - MCHECK_DISABLED = -1, /* Consistency checking is not turned on. */ - MCHECK_OK, /* Block is fine. */ - MCHECK_FREE, /* Block freed twice. */ - MCHECK_HEAD, /* Memory before the block was clobbered. */ - MCHECK_TAIL /* Memory after the block was clobbered. */ - }; -#endif - -extern int mcheck (void (*__abortfunc) (enum mcheck_status)) - /*@globals internalState@*/ - /*@modifies internalState @*/; -extern int mcheck_pedantic (void (*__abortfunc) (enum mcheck_status)) - /*@globals internalState@*/ - /*@modifies internalState @*/; -extern void mcheck_check_all (void) - /*@globals internalState@*/ - /*@modifies internalState @*/; -extern enum mcheck_status mprobe (void *__ptr) - /*@globals internalState@*/ - /*@modifies internalState @*/; -extern void mtrace (void) - /*@globals internalState@*/ - /*@modifies internalState @*/; -extern void muntrace (void) - /*@globals internalState@*/ - /*@modifies internalState @*/; -/*@=declundef =incondefs @*/ -#endif /* defined(__LCLINT__) */ - /* Memory allocation via macro defs to get meaningful locations from mtrace() */ #if defined(__GNUC__) #define xmalloc(_size) (malloc(_size) ? : vmefail(_size)) @@ -467,7 +317,7 @@ extern const char *__progname; # define setlocale(Category, Locale) /* empty */ #endif -#if ENABLE_NLS && !defined(__LCLINT__) +#if ENABLE_NLS # include <libintl.h> # define _(Text) gettext (Text) #else @@ -484,14 +334,14 @@ extern const char *__progname; /* ============== from misc/miscfn.h */ -#if !defined(USE_GNU_GLOB) || defined(__LCLINT__) +#if !defined(USE_GNU_GLOB) #if HAVE_FNMATCH_H /*@-noparams@*/ #include <fnmatch.h> /*@=noparams@*/ #endif -#if HAVE_GLOB_H || defined(__LCLINT__) +#if HAVE_GLOB_H /*@-noparams@*/ #include <glob.h> /*@=noparams@*/ @@ -503,107 +353,6 @@ extern const char *__progname; /*@=noparams@*/ #endif -#if defined(__LCLINT__) -/*@-declundef -incondefs @*/ /* LCL: missing annotation */ -#if 0 -typedef /*@concrete@*/ struct - { - size_t gl_pathc; - char **gl_pathv; - size_t gl_offs; - int gl_flags; - - void (*gl_closedir) (void *); -#ifdef _GNU_SOURCE - struct dirent *(*gl_readdir) (void *); -#else - void *(*gl_readdir) (void *); -#endif - ptr_t (*gl_opendir) (const char *); -#ifdef _GNU_SOURCE - int (*gl_lstat) (const char *restrict, struct stat *restrict); - int (*gl_stat) (const char *restrict, struct stat *restrict); -#else - int (*gl_lstat) (const char *restrict, void *restrict); - int (*gl_stat) (const char *restrict, void *restrict); -#endif - } glob_t; -#endif - -#if 0 -/*@-constuse@*/ -/*@constant int GLOB_ERR@*/ -/*@constant int GLOB_MARK@*/ -/*@constant int GLOB_NOSORT@*/ -/*@constant int GLOB_DOOFFS@*/ -/*@constant int GLOB_NOCHECK@*/ -/*@constant int GLOB_APPEND@*/ -/*@constant int GLOB_NOESCAPE@*/ -/*@constant int GLOB_PERIOD@*/ - -#ifdef _GNU_SOURCE -/*@constant int GLOB_MAGCHAR@*/ -/*@constant int GLOB_ALTDIRFUNC@*/ -/*@constant int GLOB_BRACE@*/ -/*@constant int GLOB_NOMAGIC@*/ -/*@constant int GLOB_TILDE@*/ -/*@constant int GLOB_ONLYDIR@*/ -/*@constant int GLOB_TILDE_CHECK@*/ -#endif - -/*@constant int GLOB_FLAGS@*/ - -/*@constant int GLOB_NOSPACE@*/ -/*@constant int GLOB_ABORTED@*/ -/*@constant int GLOB_NOMATCH@*/ -/*@constant int GLOB_NOSYS@*/ -#ifdef _GNU_SOURCE -/*@constant int GLOB_ABEND@*/ -#endif -/*@=constuse@*/ -#endif - -/*@-type@*/ /* XXX glob64_t */ -extern int glob (const char *__pattern, int __flags, - int (*__errfunc) (const char *, int), - /*@out@*/ glob_t *__pglob) - /*@globals errno, fileSystem @*/ - /*@modifies *__pglob, errno, fileSystem @*/; - /* XXX only annotation is a white lie */ -extern void globfree (/*@only@*/ glob_t *__pglob) - /*@modifies *__pglob @*/; -/*@=type@*/ -#ifdef _GNU_SOURCE -extern int glob_pattern_p (const char *__pattern, int __quote) - /*@*/; -#endif - -#if 0 -/*@-constuse@*/ -/*@constant int FNM_PATHNAME@*/ -/*@constant int FNM_NOESCAPE@*/ -/*@constant int FNM_PERIOD@*/ - -#ifdef _GNU_SOURCE -/*@constant int FNM_FILE_NAME@*/ /* GNU extension */ -/*@constant int FNM_LEADING_DIR@*/ /* GNU extension */ -/*@constant int FNM_CASEFOLD@*/ /* GNU extension */ -/*@constant int FNM_EXTMATCH@*/ /* GNU extension */ -#endif - -/*@constant int FNM_NOMATCH@*/ - -#ifdef _XOPEN_SOURCE -/*@constant int FNM_NOSYS@*/ /* X/Open */ -#endif -/*@=constuse@*/ -#endif - -extern int fnmatch (const char *__pattern, const char *__name, int __flags) - /*@*/; -/*@=declundef =incondefs @*/ -#endif - #if ! HAVE_S_IFSOCK #define S_IFSOCK (0xc000) #endif @@ -638,7 +387,7 @@ extern void unsetenv(const char *name); #if HAVE_POLL_H #include <poll.h> #else -#if HAVE_SYS_SELECT_H && !defined(__LCLINT__) +#if HAVE_SYS_SELECT_H #include <sys/select.h> #endif #endif @@ -703,13 +452,4 @@ extern void unsetenv(const char *name); #define MOUNTED "/etc/mnttab" #endif -#if defined(__LCLINT__) -#define FILE_RCSID(id) -#else -#define FILE_RCSID(id) \ -static inline const char *rcsid(const char *p) { \ - return rcsid(p = id); \ -} -#endif - #endif /* H_SYSTEM */ diff --git a/tests/Makefile.am b/tests/Makefile.am index f329468af..6d3b658c8 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -21,9 +21,12 @@ EXTRA_DIST += $(TESTSUITE_AT) ## testsuite data EXTRA_DIST += data/SPECS/hello.spec +EXTRA_DIST += data/SPECS/foo.spec EXTRA_DIST += data/SOURCES/hello-1.0.tar.gz +EXTRA_DIST += data/RPMS/foo-1.0-1.noarch.rpm EXTRA_DIST += data/RPMS/hello-1.0-1.i386.rpm EXTRA_DIST += data/RPMS/hello-1.0-1.ppc64.rpm +EXTRA_DIST += data/SRPMS/foo-1.0-1.src.rpm EXTRA_DIST += data/SRPMS/hello-1.0-1.src.rpm # testsuite voodoo @@ -41,13 +44,14 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac echo 'm4_define([AT_PACKAGE_STRING], [@PACKAGE_STRING@])'; \ echo 'm4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \ } >'$(srcdir)/package.m4' +EXTRA_DIST += package.m4 atconfig: ${top_builddir}/config.status (cd ${top_builddir} && ./config.status ${subdir}/atconfig) CLEANFILES += atconfig -atlocal: atlocal.in +atlocal: atlocal.in Makefile @sed \ -e "s,[@]rpmbindir[@],$(rpmbindir)," \ -e "s,[@]usrbindir[@],$(bindir)," \ @@ -68,7 +72,7 @@ rpmrc: $(top_srcdir)/rpmrc.in CLEANFILES += rpmrc rpmrc.tmp ## Create a customized macros -macros.in: $(top_srcdir)/macros.in +macros.in: $(top_srcdir)/macros.in Makefile @sed \ -e "s,[@]RPMCONFIGDIR[@],`pwd`/testing$(RPMCONFIGDIR),g" \ < $(top_srcdir)/macros.in > macros.in @@ -76,24 +80,35 @@ CLEANFILES += macros.in ## Create a customized rpmpopt -rpmpopt.in: $(top_srcdir)/rpmpopt.in +rpmpopt.in: $(top_srcdir)/rpmpopt.in Makefile @sed \ -e "s,[@]RPMCONFIGDIR[@],`pwd`/testing$(RPMCONFIGDIR),g" \ < $(top_srcdir)/rpmpopt.in > rpmpopt.in CLEANFILES += rpmpopt.in -## Create a test-installation directory "testing" -testing@RPMCONFIGDIR@/rpmrc: rpmrc macros.in rpmpopt.in $(top_builddir)/config.status +# Hack: Abusing testing@RPMCONFIGDIR@/rpmb as stamp file +testing@RPMCONFIGDIR@/rpmb: ../rpmb + rm -rf testing (cd ${top_builddir} && \ - $(MAKE) DESTDIR=`pwd`/${subdir}/testing install) + $(MAKE) DESTDIR=`pwd`/${subdir}/testing install) + +testing@RPMCONFIGDIR@/rpmrc: rpmrc testing@RPMCONFIGDIR@/rpmb $(INSTALL_DATA) rpmrc testing$(RPMCONFIGDIR)/rpmrc + +testing@RPMCONFIGDIR@/macros: macros.in testing@RPMCONFIGDIR@/rpmb (cd ${top_builddir} && \ ./config.status --file=${subdir}/testing$(RPMCONFIGDIR)/macros:${subdir}/macros.in) + +testing@RPMCONFIGDIR@/rpmpopt-@VERSION@: rpmpopt.in testing@RPMCONFIGDIR@/rpmb (cd ${top_builddir} && \ ./config.status --file=${subdir}/testing$(RPMCONFIGDIR)/rpmpopt-@VERSION@:${subdir}/rpmpopt.in) -check_DATA = testing@RPMCONFIGDIR@/rpmrc atconfig atlocal $(TESTSUITE) +check_DATA = atconfig atlocal $(TESTSUITE) +check_DATA += testing@RPMCONFIGDIR@/rpmb +check_DATA += testing@RPMCONFIGDIR@/rpmrc +check_DATA += testing@RPMCONFIGDIR@/macros +check_DATA += testing@RPMCONFIGDIR@/rpmpopt-@VERSION@ check-local: $(check_DATA) $(SHELL) '$(TESTSUITE)' $(TESTSUITEFLAGS) diff --git a/tests/atlocal.in b/tests/atlocal.in index 2218432ab..129a93ecc 100644 --- a/tests/atlocal.in +++ b/tests/atlocal.in @@ -1,6 +1,12 @@ -LD_LIBRARY_PATH=`pwd`/testing@usrlibdir@ +LD_LIBRARY_PATH="${abs_builddir}/testing@usrlibdir@" export LD_LIBRARY_PATH -PATH=`pwd`/testing@rpmbindir@:`pwd`/testing@usrbindir@:$PATH +PATH="${abs_builddir}/testing@rpmbindir@:${abs_builddir}/testing@usrbindir@:$PATH" export PATH -RPMRC="${abs_srcdir}/testing@RPMCONFIGDIR@/rpmrc" +# Popt looks into $HOME +HOME="${abs_builddir}/testing" +export HOME + +RPMRC="${abs_builddir}/testing@RPMCONFIGDIR@/rpmrc" + +RPM_XFAIL=${RPM_XFAIL-1} diff --git a/tests/data/RPMS/foo-1.0-1.noarch.rpm b/tests/data/RPMS/foo-1.0-1.noarch.rpm Binary files differnew file mode 100644 index 000000000..98c721b86 --- /dev/null +++ b/tests/data/RPMS/foo-1.0-1.noarch.rpm diff --git a/tests/data/SPECS/foo.spec b/tests/data/SPECS/foo.spec new file mode 100644 index 000000000..986e6dad6 --- /dev/null +++ b/tests/data/SPECS/foo.spec @@ -0,0 +1,26 @@ +Summary: foo +Name: foo +Version: 1.0 +Release: 1 +Group: Utilities +License: GPLv2+ +Distribution: RPM test suite. +Provides: hi +Conflicts: goodbye +Obsoletes: howdy +BuildArch: noarch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +%description +Simple rpm demonstration. + +%prep + +%build + +%install + +%clean +rm -rf $RPM_BUILD_ROOT + +%files diff --git a/tests/data/SRPMS/foo-1.0-1.src.rpm b/tests/data/SRPMS/foo-1.0-1.src.rpm Binary files differnew file mode 100644 index 000000000..4ac36368c --- /dev/null +++ b/tests/data/SRPMS/foo-1.0-1.src.rpm diff --git a/tests/local.at b/tests/local.at index 0ee66b822..24d73200f 100644 --- a/tests/local.at +++ b/tests/local.at @@ -1,12 +1,15 @@ AT_TESTED([rpm rpmbuild rpmquery]) -m4_define([RPM_INIT_DB],[ -DBPATH=`rpm --rcfile=${RPMRC} --eval '%_dbpath'` -rm -rf "${abs_builddir}"/testing"${DBPATH}"/* +m4_define([RPMDB_INIT],[[ rpm \ - --rcfile=${RPMRC} \ + --rcfile="${RPMRC}" \ --root="${abs_builddir}"/testing \ --initdb -]) +]]) + +m4_define([RPMDB_CLEAR],[[ +rm -rf "${abs_builddir}"/testing`rpm --rcfile="${RPMRC}" --eval '%_dbpath'`/* +]]) + AT_INIT diff --git a/tests/rpmbuild.at b/tests/rpmbuild.at index 62f9776e4..61806d27d 100644 --- a/tests/rpmbuild.at +++ b/tests/rpmbuild.at @@ -19,6 +19,7 @@ # ------------------------------ # Check if rpmbuild -ba *.spec works AT_SETUP([rpmbuild -ba *.spec]) +AT_XFAIL_IF([test $RPM_XFAIL -gt 0]) AT_CHECK([ TOPDIR="${abs_builddir}"/testing/build @@ -32,7 +33,7 @@ AS_MKDIR_P(${TOPDIR}/SRPMS) cp "${abs_srcdir}"/data/SOURCES/hello-1.0.tar.gz ${TOPDIR}/SOURCES rpmbuild \ - --rcfile=${RPMRC} \ + --rcfile="${RPMRC}" \ --define "_topdir ${TOPDIR}" \ -ba "${abs_srcdir}"/data/SPECS/hello.spec ], @@ -45,6 +46,7 @@ AT_CLEANUP # Check if rpmbuild -ba *.spec # honours a relative topdir with --root AT_SETUP([rpmbuild --root=... -ba *.spec]) +AT_XFAIL_IF([test $RPM_XFAIL -gt 0]) AT_CHECK([ TOPDIR="${abs_builddir}"/testing/build @@ -58,7 +60,7 @@ AS_MKDIR_P(${TOPDIR}/SRPMS) cp "${abs_srcdir}"/data/SOURCES/hello-1.0.tar.gz ${TOPDIR}/SOURCES rpmbuild \ - --rcfile=${RPMRC} \ + --rcfile="${RPMRC}" \ --define "_topdir build" \ --root="${abs_builddir}"/testing \ -ba "${abs_srcdir}"/data/SPECS/hello.spec @@ -71,6 +73,7 @@ AT_CLEANUP # ------------------------------ # Check if rpmbuild --rebuild *.src.rpm works AT_SETUP([rpmbuild --rebuild]) +AT_XFAIL_IF([test $RPM_XFAIL -gt 0]) AT_CHECK([ TOPDIR="${abs_builddir}"/testing/build @@ -82,7 +85,7 @@ AS_MKDIR_P(${TOPDIR}/RPMS) AS_MKDIR_P(${TOPDIR}/SRPMS) rpmbuild \ - --rcfile=${RPMRC} \ + --rcfile="${RPMRC}" \ --define "_topdir ${TOPDIR}" \ --rebuild "${abs_srcdir}"/data/SRPMS/hello-1.0-1.src.rpm ], @@ -95,6 +98,7 @@ AT_CLEANUP # Check if rpmbuild --rebuild *.src.rpm # honours a relative topdir with --root AT_SETUP([rpmbuild --root=... --rebuild]) +AT_XFAIL_IF([test $RPM_XFAIL -gt 0]) AT_CHECK([ TOPDIR="${abs_builddir}"/testing/build @@ -106,7 +110,7 @@ AS_MKDIR_P(${TOPDIR}/RPMS) AS_MKDIR_P(${TOPDIR}/SRPMS) rpmbuild \ - --rcfile=${RPMRC} \ + --rcfile="${RPMRC}" \ --define "_topdir build" \ --root="${abs_builddir}"/testing \ --rebuild "${abs_srcdir}"/data/SRPMS/hello-1.0-1.src.rpm diff --git a/tests/rpmdb.at b/tests/rpmdb.at index e0dea0b94..d75ca61d3 100644 --- a/tests/rpmdb.at +++ b/tests/rpmdb.at @@ -21,7 +21,8 @@ # Attempt to initialize a rpmdb AT_SETUP([rpm --initdb]) AT_CHECK([ -RPM_INIT_DB +RPMDB_CLEAR +RPMDB_INIT ], [0], [ignore], @@ -32,43 +33,32 @@ AT_CLEANUP # Run rpm -qa on an empty rpmdb AT_SETUP([rpm -qa]) AT_CHECK([ -RPM_INIT_DB +RPMDB_CLEAR +RPMDB_INIT rpm \ - --rcfile=${RPMRC} \ + --rcfile="${RPMRC}" \ --root="${abs_builddir}"/testing \ -qa ], -[0], -[ignore], -[ignore]) +[0]) AT_CLEANUP # ------------------------------ -# install a package into a local rpmdb without --relocate and --nodeps -# * Must fail due to missing deps -# * Use --ignorearch because we don't know the arch -AT_SETUP([rpm -i *.i386.rpm]) -AT_CHECK([ -RPM_INIT_DB -], -[0],[ignore],[ignore]) +# install a noarch package into a local rpmdb without --relocate and --nodeps +# * Should always succeed +AT_SETUP([rpm -i *.noarch.rpm]) AT_CHECK([ +RPMDB_CLEAR +RPMDB_INIT + rpm -i \ - --rcfile=${RPMRC} \ + --rcfile="${RPMRC}" \ --root="${abs_builddir}"/testing \ - --ignorearch \ - "${abs_srcdir}"/data/RPMS/hello-1.0-1.i386.rpm + "${abs_srcdir}"/data/RPMS/foo-1.0-1.noarch.rpm ], -[1], -[ignore], -[error: Failed dependencies: - /bin/sh is needed by hello-1.0-1.i386 - libc.so.6 is needed by hello-1.0-1.i386 - libc.so.6(GLIBC_2.0) is needed by hello-1.0-1.i386 - rtld(GNU_HASH) is needed by hello-1.0-1.i386 -]) +[0]) AT_CLEANUP @@ -79,20 +69,16 @@ AT_CLEANUP # * Use --ignorearch because we don't know the arch AT_SETUP([rpm -i --relocate=.. *.i386.rpm]) AT_CHECK([ -RPM_INIT_DB -], -[0],[ignore],[ignore]) +RPMDB_CLEAR +RPMDB_INIT -AT_CHECK([ rpm -i \ - --rcfile=${RPMRC} \ + --rcfile="${RPMRC}" \ --root="${abs_builddir}"/testing \ --nodeps --ignorearch --relocate=/usr="${abs_builddir}"/testing/check \ "${abs_srcdir}"/data/RPMS/hello-1.0-1.i386.rpm ], -[0], -[ignore], -[ignore]) +[0]) AT_CLEANUP @@ -103,13 +89,11 @@ AT_CLEANUP # * Use --ignorearch because we don't know the arch AT_SETUP([rpm -i --relocate=.. *.ppc64.rpm]) AT_CHECK([ -RPM_INIT_DB -], -[0],[ignore],[ignore]) +RPMDB_CLEAR +RPMDB_INIT -AT_CHECK([ rpm -i \ - --rcfile=${RPMRC} \ + --rcfile="${RPMRC}" \ --root="${abs_builddir}"/testing \ --nodeps --ignorearch --relocate=/usr="${abs_builddir}"/testing/check \ "${abs_srcdir}"/data/RPMS/hello-1.0-1.ppc64.rpm diff --git a/tests/rpmgeneral.at b/tests/rpmgeneral.at index 7a0b924dd..ca2c287ad 100644 --- a/tests/rpmgeneral.at +++ b/tests/rpmgeneral.at @@ -50,7 +50,7 @@ AT_CLEANUP # ------------------------------ AT_SETUP([rpm --showrc]) -AT_CHECK([rpm --rcfile=${RPMRC} --showrc],[0], +AT_CHECK([rpm --rcfile="${RPMRC}" --showrc],[0], [ignore]) AT_CLEANUP @@ -59,6 +59,7 @@ AT_CLEANUP # Check rpm --querytags # * Some versions of rpm append extraneous whitespaces AT_SETUP([rpm --querytags]) +AT_XFAIL_IF([test $RPM_XFAIL -gt 0]) AT_CHECK([rpm --querytags],[0], [ARCH ARCHIVESIZE diff --git a/tests/rpmi.at b/tests/rpmi.at index d55d83fa3..94a1a5a1f 100644 --- a/tests/rpmi.at +++ b/tests/rpmi.at @@ -26,7 +26,7 @@ rm -rf ${TOPDIR} AS_MKDIR_P([${TOPDIR}]) rpmi \ - --rcfile=${RPMRC} \ + --rcfile="${RPMRC}" \ --define "_topdir ${TOPDIR}" \ -U "${abs_srcdir}"/data/SRPMS/hello-1.0-1.src.rpm ], @@ -45,7 +45,7 @@ rm -rf ${TOPDIR} AS_MKDIR_P([${TOPDIR}]) rpmi \ - --rcfile=${RPMRC} \ + --rcfile="${RPMRC}" \ --define "_topdir ${TOPDIR}" \ -i "${abs_srcdir}"/data/SRPMS/hello-1.0-1.src.rpm ], diff --git a/tests/rpmquery.at b/tests/rpmquery.at index 85c5b5dc3..6e182b905 100644 --- a/tests/rpmquery.at +++ b/tests/rpmquery.at @@ -20,7 +20,7 @@ AT_SETUP([rpmquery --qf -p *.i386.rpm]) AT_CHECK([ rpmquery \ - --rcfile=${RPMRC} \ + --rcfile="${RPMRC}" \ --qf "%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n" \ -p "${abs_srcdir}"/data/RPMS/hello-1.0-1.i386.rpm ], @@ -34,7 +34,7 @@ AT_CLEANUP AT_SETUP([rpmquery --qf -p *.src.rpm]) AT_CHECK([ rpmquery \ - --rcfile=${RPMRC} \ + --rcfile="${RPMRC}" \ --qf "%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n" \ -p "${abs_srcdir}"/data/SRPMS/hello-1.0-1.src.rpm ], @@ -48,7 +48,7 @@ AT_CLEANUP AT_SETUP([rpmquery -ql -p *.src.rpm]) AT_CHECK([ rpmquery \ - --rcfile=${RPMRC} \ + --rcfile="${RPMRC}" \ -ql \ -p "${abs_srcdir}"/data/SRPMS/hello-1.0-1.src.rpm ], @@ -63,7 +63,7 @@ AT_CLEANUP AT_SETUP([rpmquery -ql -p *.i386.rpm]) AT_CHECK([ rpmquery \ - --rcfile=${RPMRC} \ + --rcfile="${RPMRC}" \ -ql \ -p "${abs_srcdir}"/data/RPMS/hello-1.0-1.i386.rpm ], @@ -80,9 +80,10 @@ AT_CLEANUP # Try to check "scripts" # * Gets rpmpopt-$(VERSION) involved AT_SETUP([rpm -q --scripts -p *.i386.rpm]) +AT_XFAIL_IF([test $RPM_XFAIL -gt 0]) AT_CHECK([ rpm \ - --rcfile=${RPMRC} \ + --rcfile="${RPMRC}" \ -q --scripts \ -p "${abs_srcdir}"/data/RPMS/hello-1.0-1.i386.rpm ], @@ -101,23 +102,20 @@ AT_CLEANUP # * Shall only work with relocation # * Use --ignorearch because we don't know the arch AT_SETUP([rpm -qil hello]) -AT_CHECK([ -RPM_INIT_DB -], -[0],[ignore],[ignore]) AT_CHECK([ -rpm --rcfile=${RPMRC} \ +RPMDB_CLEAR +RPMDB_INIT + +rpm --rcfile="${RPMRC}" \ --root="${abs_builddir}"/testing \ --nodeps --ignorearch --relocate=/usr="${abs_builddir}"/testing/check \ -i "${abs_srcdir}"/data/RPMS/hello-1.0-1.ppc64.rpm ], -[0], -[ignore], -[ignore]) +[0]) AT_CHECK([ -rpm --rcfile=${RPMRC} \ +rpm --rcfile="${RPMRC}" \ --root="${abs_builddir}"/testing \ -q hello ], @@ -133,7 +131,7 @@ ${abs_builddir}/testing/check/share/doc/hello-1.0/FAQ _ATEOF AT_CHECK([ -rpm --rcfile=${RPMRC} \ +rpm --rcfile="${RPMRC}" \ --root="${abs_builddir}"/testing \ -ql hello ], diff --git a/tools/rpminject.c b/tools/rpminject.c index ddf040200..252731894 100644 --- a/tools/rpminject.c +++ b/tools/rpminject.c @@ -467,9 +467,6 @@ main(int argc, char *argv[]) setprogname(argv[0]); /* Retrofit glibc __progname */ (void)setlocale(LC_ALL, "" ); -#ifdef __LCLINT__ -#define LOCALEDIR "/usr/share/locale" -#endif (void)bindtextdomain(PACKAGE, LOCALEDIR); (void)textdomain(PACKAGE); diff --git a/tools/rpmsort.c b/tools/rpmsort.c index 5169eb949..6ad072ce7 100644 --- a/tools/rpmsort.c +++ b/tools/rpmsort.c @@ -289,9 +289,6 @@ main(int argc, const char *argv[]) setprogname(argv[0]); /* Retrofit glibc __progname */ (void)setlocale(LC_ALL, "" ); -#ifdef __LCLINT__ -#define LOCALEDIR "/usr/share/locale" -#endif (void)bindtextdomain(PACKAGE, LOCALEDIR); (void)textdomain(PACKAGE); |