diff options
author | Jason Woodward | 2007-06-16 06:41:11 +0000 |
---|---|---|
committer | Jason Woodward | 2007-06-16 06:41:11 +0000 |
commit | 3faba5e19be6cea47ce315e4ee5aca032eea1090 (patch) | |
tree | 6febf3e1591b8067bf6913100d67bde979c2b91b | |
parent | 549fdf52b1b021c0f608e0a5285461f4e5f6d782 (diff) | |
download | slapt-get-3faba5e19be6cea47ce315e4ee5aca032eea1090.tar.gz |
* added GPG signature verification via gpgme (thanks Pat Volkerding for
adding gpgme to -current)
* Updated downloading in libslapt for better notification. This also resulted
in some simplification in code. Removed unused DEBUG ifdefs. Removed
deprecated translation strings. Added error condition strings and
slapt_strerror() function. New translation strings. Bumped to 0.9.12.
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | FAQ | 13 | ||||
-rw-r--r-- | FAQ.html | 13 | ||||
-rw-r--r-- | Makefile | 17 | ||||
-rw-r--r-- | README | 5 | ||||
-rw-r--r-- | TODO | 2 | ||||
-rw-r--r-- | po/bg.po | 78 | ||||
-rw-r--r-- | po/cs.po | 78 | ||||
-rw-r--r-- | po/cz.po | 78 | ||||
-rw-r--r-- | po/de.po | 78 | ||||
-rw-r--r-- | po/el.po | 78 | ||||
-rw-r--r-- | po/en.po | 78 | ||||
-rw-r--r-- | po/es.po | 78 | ||||
-rw-r--r-- | po/es_ES.po | 78 | ||||
-rw-r--r-- | po/fr.po | 78 | ||||
-rw-r--r-- | po/id.po | 78 | ||||
-rw-r--r-- | po/it.po | 78 | ||||
-rw-r--r-- | po/ja.po | 78 | ||||
-rw-r--r-- | po/nl.po | 78 | ||||
-rw-r--r-- | po/no.po | 78 | ||||
-rw-r--r-- | po/pl.po | 78 | ||||
-rw-r--r-- | po/pt_BR.po | 78 | ||||
-rw-r--r-- | po/pt_PT.po | 78 | ||||
-rw-r--r-- | po/ru.po | 78 | ||||
-rw-r--r-- | po/sk.po | 78 | ||||
-rw-r--r-- | po/sl.po | 78 | ||||
-rw-r--r-- | po/slapt-get.pot | 78 | ||||
-rw-r--r-- | po/sv.po | 78 | ||||
-rw-r--r-- | po/tr.po | 79 | ||||
-rw-r--r-- | po/uk.po | 78 | ||||
-rw-r--r-- | po/vi.po | 78 | ||||
-rw-r--r-- | po/zh_CN.po | 78 | ||||
-rw-r--r-- | slack-desc | 2 | ||||
-rw-r--r-- | src/action.c | 29 | ||||
-rw-r--r-- | src/action.h | 3 | ||||
-rw-r--r-- | src/common.c | 61 | ||||
-rw-r--r-- | src/common.h | 18 | ||||
-rw-r--r-- | src/curl.c | 91 | ||||
-rw-r--r-- | src/curl.h | 17 | ||||
-rw-r--r-- | src/gpgme.c | 265 | ||||
-rw-r--r-- | src/gpgme.h | 21 | ||||
-rw-r--r-- | src/main.c | 16 | ||||
-rw-r--r-- | src/main.h | 10 | ||||
-rw-r--r-- | src/package.c | 182 | ||||
-rw-r--r-- | src/package.h | 18 | ||||
-rw-r--r-- | src/transaction.c | 31 | ||||
-rw-r--r-- | t/Makefile | 3 | ||||
-rw-r--r-- | t/test_curl.c | 24 |
48 files changed, 1790 insertions, 1088 deletions
@@ -1,5 +1,11 @@ -0.9.11i Jun 04, 2007 +0.9.12 Jun 16, 2007 + * added GPG signature verification via gpgme (thanks Pat Volkerding for + adding gpgme to -current) + * Updated downloading in libslapt for better notification. This also resulted + in some simplification in code. Removed unused DEBUG ifdefs. Removed + deprecated translation strings. Added error condition strings and + slapt_strerror() function. New translation strings. Bumped to 0.9.12. * Wrapped generated slapt.h in ifndef guard * Added initial unit testing to tree (requires Check from http://check.sourceforge.net) @@ -53,6 +53,7 @@ Frequently Asked Questions: 50. What about mirror fall back / fail-over ? 51. How do I install a kernel rather than upgrade the existing kernel? 52. What are the relationships of CHECKSUMS.md5, PACKAGES.TXT and package_data? +53. Does slapt-get support the GPG/PGP signature verification? @@ -1167,3 +1168,15 @@ Frequently Asked Questions: source and continue. +53. Does slapt-get support the GPG/PGP signature verification? + + Yes, as of 0.9.12 slapt-get can be built with gpgme support that allows + slapt-get to verify the signature of the CHECKSUMS file on each mirror. + This requires the presence of the signature file and the GPG-KEY file on + the package source. The GPG-KEY is imported into the local keychain using + the --add-keys option. When running --update, the signature file for the + CHECKSUMS listing is downloaded and verification is attempted. If the key + is not present slapt-get mentions this and continues on. slapt-get only halts + if verification failed. + + @@ -67,6 +67,7 @@ <a href="#slgFAQ50">50. What about mirror fall back / fail-over ?</a> <a href="#slgFAQ51">51. How do I install a kernel rather than upgrade the existing kernel?</a> <a href="#slgFAQ52">52. What are the relationships of CHECKSUMS.md5, PACKAGES.TXT and package_data?</a> +<a href="#slgFAQ53">53. Does slapt-get support the GPG/PGP signature verification?</a> @@ -1181,6 +1182,18 @@ source and continue. +<a name="slgFAQ53"><b>53. Does slapt-get support the GPG/PGP signature verification?</b></a> + + Yes, as of 0.9.12 slapt-get can be built with gpgme support that allows + slapt-get to verify the signature of the CHECKSUMS file on each mirror. + This requires the presence of the signature file and the GPG-KEY file on + the package source. The GPG-KEY is imported into the local keychain using + the --add-keys option. When running --update, the signature file for the + CHECKSUMS listing is downloaded and verification is attempted. If the key + is not present slapt-get mentions this and continues on. slapt-get only halts + if verification failed. + + </pre> @@ -1,5 +1,5 @@ PACKAGE=slapt-get -VERSION=0.9.11i +VERSION=0.9.12 ARCH=$(shell uname -m | sed -e "s/i[3456]86/i386/") LIBDIR=/usr/lib RELEASE=1 @@ -7,6 +7,7 @@ CC=gcc CURLFLAGS=`curl-config --libs` OBJS=src/common.o src/configuration.o src/package.o src/curl.o src/transaction.o src/action.o src/main.o LIBOBJS=src/common.o src/configuration.o src/package.o src/curl.o src/transaction.o +LIBHEADERS=src/main.h src/common.h src/configuration.h src/package.h src/curl.h src/transaction.h NONLIBOBJS=src/action.o src/main.o RCDEST=/etc/slapt-get/slapt-getrc RCSOURCE=example.slapt-getrc @@ -14,11 +15,19 @@ PACKAGE_LOCALE_DIR=/usr/share/locale SBINDIR=/usr/sbin/ GETTEXT_PACKAGE=$(PACKAGE) DEFINES=-DPACKAGE="\"$(PACKAGE)\"" -DVERSION="\"$(VERSION)\"" -DRC_LOCATION="\"$(RCDEST)\"" -DENABLE_NLS -DPACKAGE_LOCALE_DIR="\"$(PACKAGE_LOCALE_DIR)\"" -DGETTEXT_PACKAGE="\"$(GETTEXT_PACKAGE)\"" -CFLAGS=-W -Werror -Wall -O2 -ansi -pedantic $(DEFINES) -fpic LDFLAGS=$(CURLFLAGS) -lz +HAS_GPGME=$(shell gpgme-config --libs 2>&1 >/dev/null && echo 1) +ifeq ($(HAS_GPGME),1) + DEFINES+=-DSLAPT_HAS_GPGME + OBJS+=src/gpgme.o + LIBOBJS+=src/gpgme.o + LIBHEADERS+=src/gpgme.h + LDFLAGS+=`gpgme-config --libs` +endif +CFLAGS=-W -Werror -Wall -g -ansi -pedantic $(DEFINES) -fpic ifeq ($(ARCH),x86_64) LIBDIR=/usr/lib64 - CFLAGS=-W -Werror -Wall -O2 -ansi -pedantic $(DEFINES) -fPIC + CFLAGS=-W -Werror -Wall -g -ansi -pedantic $(DEFINES) -fPIC endif default: $(PACKAGE) @@ -162,7 +171,7 @@ libs: $(OBJS) ar -r src/libslapt.a $(LIBOBJS) -@echo "#ifndef LIB_SLAPT" > src/slapt.h -@echo "#define LIB_SLAPT 1" >> src/slapt.h - -@cat src/main.h src/common.h src/configuration.h src/package.h src/curl.h src/transaction.h |grep -v '#include \"' >> src/slapt.h + -@cat $(LIBHEADERS) |grep -v '#include \"' >> src/slapt.h -@echo "#endif" >> src/slapt.h test: libs @@ -72,7 +72,10 @@ Table of Contents: The following packages are required to build slapt-get from source: make, gcc, curl, glibc, kernel-headers, binutils, zlib, gettext-tools, - and openssl + and openssl. + + Optionally, if gpgpme is installed, slapt-get can be built with support + for signature verification with gnupg. @@ -2,6 +2,8 @@ slapt-get is pretty feature complete. At the moment, bug fixes are the most imp Future enhancements, fixes, or features: + * test GPG functionality + * write more unit tests (using check) * test test test * more translations (volunteers needed) @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: 0.9.11i\n" +"Project-Id-Version: 0.9.12\n" "POT-Creation-Date: 2003-11-03 14:28+0000\n" -"PO-Revision-Date: 2007-05-20 16:00+0500\n" +"PO-Revision-Date: 2007-06-15 23:10+0500\n" "Last-Translator: Victor Keranov <victor_keranov@mail.bg>\n" "Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n" "MIME-Version: 1.0\n" @@ -135,42 +135,22 @@ msgstr "Failed to opendir %s\n" msgid "Failed to chdir: %s\n" msgstr "Failed to chdir: %s\n" -#, c-format -msgid "unlinking %s\n" -msgstr "unlinking %s\n" - msgid "Failed to get cwd\n" msgstr "Failed to get cwd\n" #, c-format -msgid "\tCurrent working directory: %s\n" -msgstr "\tНастояща работна директория: %s\n" - -#, c-format msgid "Failed to mkdir: %s\n" msgstr "Failed to mkdir: %s\n" #, c-format -msgid "\tCreated directory: %s\n" -msgstr "Създадена директория: %s\n" - -#, c-format msgid "Failed to chdir to %s\n" msgstr "Failed to chdir to %s\n" #, c-format -msgid "\tchdir into %s\n" -msgstr "\tchdir into %s\n" - -#, c-format msgid "\tchdir back into %s\n" msgstr "\tchdir back into %s\n" #, c-format -msgid "Fetching url:[%s]\n" -msgstr "Fetching url:[%s]\n" - -#, c-format msgid "Failed to download: %s\n" msgstr "Неуспех при изтегляне: %s\n" @@ -190,10 +170,6 @@ msgid "Failed to unlink %s\n" msgstr "Failed to unlink %s\n" #, c-format -msgid "md5 sum for %s is not correct, override with --no-md5!\n" -msgstr "md5 сумата на %s е грешна, презапис с --no-md5!\n" - -#, c-format msgid "MD5 found: [%s]\n" msgstr "Намерена MD5 сума: [%s]\n" @@ -416,14 +392,6 @@ msgid "Reading Package Lists..." msgstr "Прочитане на списъците с пакети..." #, c-format -msgid "Download of %s incomplete\n" -msgstr "Изтеглянето на %s е незавършено\n" - -#, c-format -msgid "Could not find MD5 checksum for %s, override with --no-md5\n" -msgstr "MD5 сумата на %s не бе намерена, презапис с --no-md5\n" - -#, c-format msgid "%s, which is required by %s, is excluded\n" msgstr "%s, който се изисква от %s, е изключен\n" @@ -490,3 +458,45 @@ msgstr "Лог на промените" msgid "Retrieving ChangeLog.txt [%s]..." msgstr "Получаване на ChangeLog.txt [%s]..." +msgid "MD5 checksum mismatch, override with --no-md5" +msgstr "MD5 checksum mismatch, override with --no-md5" + +msgid "Missing MD5 checksum, override with --no-md5" +msgstr "Missing MD5 checksum, override with --no-md5" + +msgid "Incomplete download" +msgstr "Incomplete download" + +msgid "GPG key successfully imported" +msgstr "GPG key successfully imported" + +msgid "GPG key could not be imported" +msgstr "GPG key could not be imported" + +msgid "GPG key already present" +msgstr "GPG key already present" + +msgid "Checksums signature successfully verified" +msgstr "Checksums signature successfully verified" + +msgid "Checksums signature could not be verified" +msgstr "Checksums signature could not be verified" + +msgid "Verified" +msgstr "Verified" + +msgid "Not Verified" +msgstr "Not Verified" + +msgid "Retrieving GPG key [%s]..." +msgstr "Retrieving GPG key [%s]..." + +msgid "Retrieving checksum signature [%s]..." +msgstr "Retrieving checksum signature [%s]..." + +msgid "No key for verification" +msgstr "No key for verification" + +msgid "retrieve GPG keys for sources" +msgstr "retrieve GPG keys for sources" + @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: 0.9.11i\n" +"Project-Id-Version: 0.9.12\n" "POT-Creation-Date: 2003-11-03 14:28+0000\n" -"PO-Revision-Date: 2007-05-20 16:00+0500\n" +"PO-Revision-Date: 2007-06-15 23:10+0500\n" "Last-Translator: Oto Petrik <oto.petrik@centrum.cz>\n" "Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n" "MIME-Version: 1.0\n" @@ -135,42 +135,22 @@ msgstr "Nepodailo se otevt adres %s\n" msgid "Failed to chdir: %s\n" msgstr "Nepodailo se zmnit adres: %s\n" -#, c-format -msgid "unlinking %s\n" -msgstr "mau %s\n" - msgid "Failed to get cwd\n" msgstr "Nepodailo se zskat cwd\n" #, c-format -msgid "\tCurrent working directory: %s\n" -msgstr "\tSouasn pracovn adres: %s\n" - -#, c-format msgid "Failed to mkdir: %s\n" msgstr "Nepodailo se vyrobit adres: %s\n" #, c-format -msgid "\tCreated directory: %s\n" -msgstr "\tVyroben adres: %s\n" - -#, c-format msgid "Failed to chdir to %s\n" msgstr "Nepodailo se zmnit adres na: %s\n" #, c-format -msgid "\tchdir into %s\n" -msgstr "\tzmnn adres na %s\n" - -#, c-format msgid "\tchdir back into %s\n" msgstr "\tzmnn adres zpt na %s\n" #, c-format -msgid "Fetching url:[%s]\n" -msgstr "Stahuji url:[%s]\n" - -#, c-format msgid "Failed to download: %s\n" msgstr "Nepodailo se sthnout: %s\n" @@ -190,10 +170,6 @@ msgid "Failed to unlink %s\n" msgstr "Nepodailo se smazat %s\n" #, c-format -msgid "md5 sum for %s is not correct, override with --no-md5!\n" -msgstr "md5 souet pro %s je nesprvn, ignoruj pomoc --no-md5!\n" - -#, c-format msgid "MD5 found: [%s]\n" msgstr "MD5 nalezen: [%s]\n" @@ -416,14 +392,6 @@ msgid "Reading Package Lists..." msgstr "Natm seznam balk..." #, c-format -msgid "Download of %s incomplete\n" -msgstr "Staen %s je nekompletn\n" - -#, c-format -msgid "Could not find MD5 checksum for %s, override with --no-md5\n" -msgstr "Nemohu najt MD5 souet pro %s, ignoruj pomoc --no-md5\n" - -#, c-format msgid "%s, which is required by %s, is excluded\n" msgstr "%s, kter je potebn pro %s, je vylouen\n" @@ -490,3 +458,45 @@ msgstr "Package ChangeLog" msgid "Retrieving ChangeLog.txt [%s]..." msgstr "Retrieving ChangeLog.txt [%s]..." +msgid "MD5 checksum mismatch, override with --no-md5" +msgstr "MD5 checksum mismatch, override with --no-md5" + +msgid "Missing MD5 checksum, override with --no-md5" +msgstr "Missing MD5 checksum, override with --no-md5" + +msgid "Incomplete download" +msgstr "Incomplete download" + +msgid "GPG key successfully imported" +msgstr "GPG key successfully imported" + +msgid "GPG key could not be imported" +msgstr "GPG key could not be imported" + +msgid "GPG key already present" +msgstr "GPG key already present" + +msgid "Checksums signature successfully verified" +msgstr "Checksums signature successfully verified" + +msgid "Checksums signature could not be verified" +msgstr "Checksums signature could not be verified" + +msgid "Verified" +msgstr "Verified" + +msgid "Not Verified" +msgstr "Not Verified" + +msgid "Retrieving GPG key [%s]..." +msgstr "Retrieving GPG key [%s]..." + +msgid "Retrieving checksum signature [%s]..." +msgstr "Retrieving checksum signature [%s]..." + +msgid "No key for verification" +msgstr "No key for verification" + +msgid "retrieve GPG keys for sources" +msgstr "retrieve GPG keys for sources" + @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: 0.9.11i\n" +"Project-Id-Version: 0.9.12\n" "POT-Creation-Date: 2003-11-03 14:28+0000\n" -"PO-Revision-Date: 2007-05-20 16:00+0500\n" +"PO-Revision-Date: 2007-06-15 23:10+0500\n" "Last-Translator: Oto Petrik <oto.petrik@centrum.cz>\n" "Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n" "MIME-Version: 1.0\n" @@ -144,42 +144,22 @@ msgstr "Nepodailo se otevt adres %s\n" msgid "Failed to chdir: %s\n" msgstr "Nepodailo se zmnit adres: %s\n" -#, c-format -msgid "unlinking %s\n" -msgstr "mau %s\n" - msgid "Failed to get cwd\n" msgstr "Nepodailo se zskat cwd\n" #, c-format -msgid "\tCurrent working directory: %s\n" -msgstr "\tSouasn pracovn adres: %s\n" - -#, c-format msgid "Failed to mkdir: %s\n" msgstr "Nepodailo se vyrobit adres: %s\n" #, c-format -msgid "\tCreated directory: %s\n" -msgstr "\tVyroben adres: %s\n" - -#, c-format msgid "Failed to chdir to %s\n" msgstr "Nepodailo se zmnit adres na: %s\n" #, c-format -msgid "\tchdir into %s\n" -msgstr "\tzmnn adres na %s\n" - -#, c-format msgid "\tchdir back into %s\n" msgstr "\tzmnn adres zpt na %s\n" #, c-format -msgid "Fetching url:[%s]\n" -msgstr "Stahuji url:[%s]\n" - -#, c-format msgid "Failed to download: %s\n" msgstr "Nepodailo se sthnout: %s\n" @@ -200,10 +180,6 @@ msgid "Failed to unlink %s\n" msgstr "Nepodailo se smazat %s\n" #, c-format -msgid "md5 sum for %s is not correct, override with --no-md5!\n" -msgstr "md5 souet pro %s je nesprvn, ignoruj pomoc --no-md5!\n" - -#, c-format msgid "MD5 found: [%s]\n" msgstr "MD5 nalezen: [%s]\n" @@ -445,14 +421,6 @@ msgid "Reading Package Lists..." msgstr "Natm seznam balk..." #, c-format -msgid "Download of %s incomplete\n" -msgstr "Staen %s je nekompletn\n" - -#, c-format -msgid "Could not find MD5 checksum for %s, override with --no-md5\n" -msgstr "Nemohu najt MD5 souet pro %s, ignoruj pomoc --no-md5\n" - -#, c-format msgid "%s, which is required by %s, is excluded\n" msgstr "%s, kter je potebn pro %s, je vylouen\n" @@ -499,3 +467,45 @@ msgstr "Package ChangeLog" msgid "Retrieving ChangeLog.txt [%s]..." msgstr "Retrieving ChangeLog.txt [%s]..." +msgid "MD5 checksum mismatch, override with --no-md5" +msgstr "MD5 checksum mismatch, override with --no-md5" + +msgid "Missing MD5 checksum, override with --no-md5" +msgstr "Missing MD5 checksum, override with --no-md5" + +msgid "Incomplete download" +msgstr "Incomplete download" + +msgid "GPG key successfully imported" +msgstr "GPG key successfully imported" + +msgid "GPG key could not be imported" +msgstr "GPG key could not be imported" + +msgid "GPG key already present" +msgstr "GPG key already present" + +msgid "Checksums signature successfully verified" +msgstr "Checksums signature successfully verified" + +msgid "Checksums signature could not be verified" +msgstr "Checksums signature could not be verified" + +msgid "Verified" +msgstr "Verified" + +msgid "Not Verified" +msgstr "Not Verified" + +msgid "Retrieving GPG key [%s]..." +msgstr "Retrieving GPG key [%s]..." + +msgid "Retrieving checksum signature [%s]..." +msgstr "Retrieving checksum signature [%s]..." + +msgid "No key for verification" +msgstr "No key for verification" + +msgid "retrieve GPG keys for sources" +msgstr "retrieve GPG keys for sources" + @@ -6,9 +6,9 @@ # msgid "" msgstr "" -"Project-Id-Version: 0.9.11i\n" +"Project-Id-Version: 0.9.12\n" "POT-Creation-Date: 2003-11-03 14:28+0000\n" -"PO-Revision-Date: 2007-05-20 16:00+0500\n" +"PO-Revision-Date: 2007-06-15 23:10+0500\n" "Last-Translator: Manfred Mueller <nekdesk@nekdesk.de>\n" "Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n" "MIME-Version: 1.0\n" @@ -137,42 +137,22 @@ msgstr "Konnte Verzeichnis %s nicht oeffnen\n" msgid "Failed to chdir: %s\n" msgstr "Konnte nicht in Verzeichnis %s wechseln\n" -#, c-format -msgid "unlinking %s\n" -msgstr "Loese Verknuepfung %s\n" - msgid "Failed to get cwd\n" msgstr "Konnte aktuelles Arbeitsverzeichnis nicht bestimmen.\n" #, c-format -msgid "\tCurrent working directory: %s\n" -msgstr "\tDerzeitiges Arbeitsverzeichnis: %s\n" - -#, c-format msgid "Failed to mkdir: %s\n" msgstr "Konnte Verzeichnis %s nicht erstellen\n" #, c-format -msgid "\tCreated directory: %s\n" -msgstr "\tVerzeichnis %s erstellt\n" - -#, c-format msgid "Failed to chdir to %s\n" msgstr "Konnte nicht nach Verzeichnis %s wechseln\n" #, c-format -msgid "\tchdir into %s\n" -msgstr "\tWechsel Verzeichnis nach %s\n" - -#, c-format msgid "\tchdir back into %s\n" msgstr "\tWechsel Verzeichnis zurueck nach %s\n" #, c-format -msgid "Fetching url:[%s]\n" -msgstr "Hole URL:[%s]\n" - -#, c-format msgid "Failed to download: %s\n" msgstr "Download von %s gescheitert\n" @@ -192,10 +172,6 @@ msgid "Failed to unlink %s\n" msgstr "Konnte die Verknuepfung %s nicht loesen\n" #, c-format -msgid "md5 sum for %s is not correct, override with --no-md5!\n" -msgstr "MD5-Pruefsumme fuer %s ist nicht korrekt, mit --no-md5 uebergehen!\n" - -#, c-format msgid "MD5 found: [%s]\n" msgstr "MD5 gefunden: [ %s]\n" @@ -418,14 +394,6 @@ msgid "Reading Package Lists..." msgstr "Lese Paket-Listen... " #, c-format -msgid "Download of %s incomplete\n" -msgstr "Download von %s unvollstaendig\n" - -#, c-format -msgid "Could not find MD5 checksum for %s, override with --no-md5\n" -msgstr "Konnte MD5-Pruefsumme fr %s nicht finden, mit --no-md5 uebergehen\n" - -#, c-format msgid "%s, which is required by %s, is excluded\n" msgstr "Paket %s, welches von %s benoetigt wird, ist ausgeschlossen\n" @@ -492,3 +460,45 @@ msgstr "Paket-Historie" msgid "Retrieving ChangeLog.txt [%s]..." msgstr "Lade Paket-Historie von [%s]... " +msgid "MD5 checksum mismatch, override with --no-md5" +msgstr "MD5 checksum mismatch, override with --no-md5" + +msgid "Missing MD5 checksum, override with --no-md5" +msgstr "Missing MD5 checksum, override with --no-md5" + +msgid "Incomplete download" +msgstr "Incomplete download" + +msgid "GPG key successfully imported" +msgstr "GPG key successfully imported" + +msgid "GPG key could not be imported" +msgstr "GPG key could not be imported" + +msgid "GPG key already present" +msgstr "GPG key already present" + +msgid "Checksums signature successfully verified" +msgstr "Checksums signature successfully verified" + +msgid "Checksums signature could not be verified" +msgstr "Checksums signature could not be verified" + +msgid "Verified" +msgstr "Verified" + +msgid "Not Verified" +msgstr "Not Verified" + +msgid "Retrieving GPG key [%s]..." +msgstr "Retrieving GPG key [%s]..." + +msgid "Retrieving checksum signature [%s]..." +msgstr "Retrieving checksum signature [%s]..." + +msgid "No key for verification" +msgstr "No key for verification" + +msgid "retrieve GPG keys for sources" +msgstr "retrieve GPG keys for sources" + @@ -5,9 +5,9 @@ msgid ""
msgstr ""
-"Project-Id-Version: 0.9.11i\n"
+"Project-Id-Version: 0.9.12\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2007-05-20 16:00+0500\n"
+"PO-Revision-Date: 2007-06-15 23:10+0500\n"
"Last-Translator: Savvas Eftratiadis <pigouinos@mailworks.org.\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -135,42 +135,22 @@ msgstr " opendir %s\n" msgid "Failed to chdir: %s\n"
msgstr " chdir: %s\n"
-#, c-format
-msgid "unlinking %s\n"
-msgstr "unlinking %s\n"
-
msgid "Failed to get cwd\n"
msgstr " cwd\n"
#, c-format
-msgid "\tCurrent working directory: %s\n"
-msgstr "\t : %s\n"
-
-#, c-format
msgid "Failed to mkdir: %s\n"
msgstr " mkdir: %s\n"
#, c-format
-msgid "\tCreated directory: %s\n"
-msgstr "\t : %s\n"
-
-#, c-format
msgid "Failed to chdir to %s\n"
msgstr " chdir %s\n"
#, c-format
-msgid "\tchdir into %s\n"
-msgstr "\tchdir sto %s\n"
-
-#, c-format
msgid "\tchdir back into %s\n"
msgstr "\tchdir %s\n"
#, c-format
-msgid "Fetching url:[%s]\n"
-msgstr " url:[%s]\n"
-
-#, c-format
msgid "Failed to download: %s\n"
msgstr " download: %s\n"
@@ -190,10 +170,6 @@ msgid "Failed to unlink %s\n" msgstr " unlink %s\n"
#, c-format
-msgid "md5 sum for %s is not correct, override with --no-md5!\n"
-msgstr " md5 %s , --no-md5!\n"
-
-#, c-format
msgid "MD5 found: [%s]\n"
msgstr " MD5: [%s]\n"
@@ -416,14 +392,6 @@ msgid "Reading Package Lists..." msgstr " ..."
#, c-format
-msgid "Download of %s incomplete\n"
-msgstr " download %s \n"
-
-#, c-format
-msgid "Could not find MD5 checksum for %s, override with --no-md5\n"
-msgstr " md5 %s , --no-md5\n"
-
-#, c-format
msgid "%s, which is required by %s, is excluded\n"
msgstr " %s, %s, \n"
@@ -490,3 +458,45 @@ msgstr "Package ChangeLog" msgid "Retrieving ChangeLog.txt [%s]..."
msgstr "Retrieving ChangeLog.txt [%s]..."
+msgid "MD5 checksum mismatch, override with --no-md5"
+msgstr "MD5 checksum mismatch, override with --no-md5"
+
+msgid "Missing MD5 checksum, override with --no-md5"
+msgstr "Missing MD5 checksum, override with --no-md5"
+
+msgid "Incomplete download"
+msgstr "Incomplete download"
+
+msgid "GPG key successfully imported"
+msgstr "GPG key successfully imported"
+
+msgid "GPG key could not be imported"
+msgstr "GPG key could not be imported"
+
+msgid "GPG key already present"
+msgstr "GPG key already present"
+
+msgid "Checksums signature successfully verified"
+msgstr "Checksums signature successfully verified"
+
+msgid "Checksums signature could not be verified"
+msgstr "Checksums signature could not be verified"
+
+msgid "Verified"
+msgstr "Verified"
+
+msgid "Not Verified"
+msgstr "Not Verified"
+
+msgid "Retrieving GPG key [%s]..."
+msgstr "Retrieving GPG key [%s]..."
+
+msgid "Retrieving checksum signature [%s]..."
+msgstr "Retrieving checksum signature [%s]..."
+
+msgid "No key for verification"
+msgstr "No key for verification"
+
+msgid "retrieve GPG keys for sources"
+msgstr "retrieve GPG keys for sources"
+
@@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: 0.9.11i\n" +"Project-Id-Version: 0.9.12\n" "POT-Creation-Date: 2003-11-03 14:28+0000\n" -"PO-Revision-Date: 2007-05-20 16:00+0500\n" +"PO-Revision-Date: 2007-06-15 23:10+0500\n" "Last-Translator: Jason Woodward <woodwardj@jaos.org>\n" "Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n" "MIME-Version: 1.0\n" @@ -135,42 +135,22 @@ msgstr "Failed to opendir %s\n" msgid "Failed to chdir: %s\n" msgstr "Failed to chdir: %s\n" -#, c-format -msgid "unlinking %s\n" -msgstr "unlinking %s\n" - msgid "Failed to get cwd\n" msgstr "Failed to get cwd\n" #, c-format -msgid "\tCurrent working directory: %s\n" -msgstr "\tCurrent working directory: %s\n" - -#, c-format msgid "Failed to mkdir: %s\n" msgstr "Failed to mkdir: %s\n" #, c-format -msgid "\tCreated directory: %s\n" -msgstr "\tCreated directory: %s\n" - -#, c-format msgid "Failed to chdir to %s\n" msgstr "Failed to chdir to %s\n" #, c-format -msgid "\tchdir into %s\n" -msgstr "\tchdir into %s\n" - -#, c-format msgid "\tchdir back into %s\n" msgstr "\tchdir back into %s\n" #, c-format -msgid "Fetching url:[%s]\n" -msgstr "Fetching url:[%s]\n" - -#, c-format msgid "Failed to download: %s\n" msgstr "Failed to download: %s\n" @@ -190,10 +170,6 @@ msgid "Failed to unlink %s\n" msgstr "Failed to unlink %s\n" #, c-format -msgid "md5 sum for %s is not correct, override with --no-md5!\n" -msgstr "md5 sum for %s is not correct, override with --no-md5!\n" - -#, c-format msgid "MD5 found: [%s]\n" msgstr "MD5 found: [%s]\n" @@ -416,14 +392,6 @@ msgid "Reading Package Lists..." msgstr "Reading Package Lists..." #, c-format -msgid "Download of %s incomplete\n" -msgstr "Download of %s incomplete\n" - -#, c-format -msgid "Could not find MD5 checksum for %s, override with --no-md5\n" -msgstr "Could not find MD5 checksum for %s, override with --no-md5\n" - -#, c-format msgid "%s, which is required by %s, is excluded\n" msgstr "%s, which is required by %s, is excluded\n" @@ -490,3 +458,45 @@ msgstr "Package ChangeLog" msgid "Retrieving ChangeLog.txt [%s]..." msgstr "Retrieving ChangeLog.txt [%s]..." +msgid "MD5 checksum mismatch, override with --no-md5" +msgstr "MD5 checksum mismatch, override with --no-md5" + +msgid "Missing MD5 checksum, override with --no-md5" +msgstr "Missing MD5 checksum, override with --no-md5" + +msgid "Incomplete download" +msgstr "Incomplete download" + +msgid "GPG key successfully imported" +msgstr "GPG key successfully imported" + +msgid "GPG key could not be imported" +msgstr "GPG key could not be imported" + +msgid "GPG key already present" +msgstr "GPG key already present" + +msgid "Checksums signature successfully verified" +msgstr "Checksums signature successfully verified" + +msgid "Checksums signature could not be verified" +msgstr "Checksums signature could not be verified" + +msgid "Verified" +msgstr "Verified" + +msgid "Not Verified" +msgstr "Not Verified" + +msgid "Retrieving GPG key [%s]..." +msgstr "Retrieving GPG key [%s]..." + +msgid "Retrieving checksum signature [%s]..." +msgstr "Retrieving checksum signature [%s]..." + +msgid "No key for verification" +msgstr "No key for verification" + +msgid "retrieve GPG keys for sources" +msgstr "retrieve GPG keys for sources" + @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: 0.9.11i\n" +"Project-Id-Version: 0.9.12\n" "POT-Creation-Date: 2003-11-03 14:28+0000\n" -"PO-Revision-Date: 2007-05-20 16:00+0500\n" +"PO-Revision-Date: 2007-06-15 23:10+0500\n" "Last-Translator: Ruben Gutierrez <ruben@snpp.com.ar>\n" "Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n" "MIME-Version: 1.0\n" @@ -135,42 +135,22 @@ msgstr "No se pudo abrir el directorio %s\n" msgid "Failed to chdir: %s\n" msgstr "No se pudo cambiar de directorio: %s\n" -#, c-format -msgid "unlinking %s\n" -msgstr "eliminando (unlinking) %s\n" - msgid "Failed to get cwd\n" msgstr "No se pudo obtener el directorio de trabajo actual\n" #, c-format -msgid "\tCurrent working directory: %s\n" -msgstr "\tDirectorio de trabajo actual: %s\n" - -#, c-format msgid "Failed to mkdir: %s\n" msgstr "No se pudo crear el directorio: %s\n" #, c-format -msgid "\tCreated directory: %s\n" -msgstr "\tDirectorio creado: %s\n" - -#, c-format msgid "Failed to chdir to %s\n" msgstr "No se pudo cambiar el directorio a %s\n" #, c-format -msgid "\tchdir into %s\n" -msgstr "\tse cambi el directorio a %s\n" - -#, c-format msgid "\tchdir back into %s\n" msgstr "\tse volvi a cambiar el directorio a %s\n" #, c-format -msgid "Fetching url:[%s]\n" -msgstr "Obteniendo url:[%s]\n" - -#, c-format msgid "Failed to download: %s\n" msgstr "No se pudo descargar: %s\n" @@ -190,10 +170,6 @@ msgid "Failed to unlink %s\n" msgstr "No se pudo eliminar (unlink) %s\n" #, c-format -msgid "md5 sum for %s is not correct, override with --no-md5!\n" -msgstr "El sum md5 de %s es incorrecto, ignorar con --no-md5!\n" - -#, c-format msgid "MD5 found: [%s]\n" msgstr "MD5 encontr.:[%s]\n" @@ -416,14 +392,6 @@ msgid "Reading Package Lists..." msgstr "Leyendo Listado de Paquetes..." #, c-format -msgid "Download of %s incomplete\n" -msgstr "Descarga de %s incompleta\n" - -#, c-format -msgid "Could not find MD5 checksum for %s, override with --no-md5\n" -msgstr "No se pudo encontrar el checksum MD5 para %s, ignorar con --no-md5\n" - -#, c-format msgid "%s, which is required by %s, is excluded\n" msgstr "se excluye %s, que es requerido por %s\n" @@ -490,3 +458,45 @@ msgstr "Package ChangeLog" msgid "Retrieving ChangeLog.txt [%s]..." msgstr "Retrieving ChangeLog.txt [%s]..." +msgid "MD5 checksum mismatch, override with --no-md5" +msgstr "MD5 checksum mismatch, override with --no-md5" + +msgid "Missing MD5 checksum, override with --no-md5" +msgstr "Missing MD5 checksum, override with --no-md5" + +msgid "Incomplete download" +msgstr "Incomplete download" + +msgid "GPG key successfully imported" +msgstr "GPG key successfully imported" + +msgid "GPG key could not be imported" +msgstr "GPG key could not be imported" + +msgid "GPG key already present" +msgstr "GPG key already present" + +msgid "Checksums signature successfully verified" +msgstr "Checksums signature successfully verified" + +msgid "Checksums signature could not be verified" +msgstr "Checksums signature could not be verified" + +msgid "Verified" +msgstr "Verified" + +msgid "Not Verified" +msgstr "Not Verified" + +msgid "Retrieving GPG key [%s]..." +msgstr "Retrieving GPG key [%s]..." + +msgid "Retrieving checksum signature [%s]..." +msgstr "Retrieving checksum signature [%s]..." + +msgid "No key for verification" +msgstr "No key for verification" + +msgid "retrieve GPG keys for sources" +msgstr "retrieve GPG keys for sources" + diff --git a/po/es_ES.po b/po/es_ES.po index dce8683..4520b79 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: 0.9.11i\n" +"Project-Id-Version: 0.9.12\n" "POT-Creation-Date: 2003-11-03 14:28+0000\n" -"PO-Revision-Date: 2007-05-20 16:00+0500\n" +"PO-Revision-Date: 2007-06-15 23:10+0500\n" "Last-Translator: Ruben Gutierrez <ruben@snpp.com.ar>\n" "Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n" "MIME-Version: 1.0\n" @@ -135,42 +135,22 @@ msgstr "No se pudo abrir el directorio %s\n" msgid "Failed to chdir: %s\n" msgstr "No se pudo cambiar de directorio: %s\n" -#, c-format -msgid "unlinking %s\n" -msgstr "eliminando (unlinking) %s\n" - msgid "Failed to get cwd\n" msgstr "No se pudo obtener el directorio de trabajo actual\n" #, c-format -msgid "\tCurrent working directory: %s\n" -msgstr "\tDirectorio de trabajo actual: %s\n" - -#, c-format msgid "Failed to mkdir: %s\n" msgstr "No se pudo crear el directorio: %s\n" #, c-format -msgid "\tCreated directory: %s\n" -msgstr "\tDirectorio creado: %s\n" - -#, c-format msgid "Failed to chdir to %s\n" msgstr "No se pudo cambiar el directorio a %s\n" #, c-format -msgid "\tchdir into %s\n" -msgstr "\tse cambi el directorio a %s\n" - -#, c-format msgid "\tchdir back into %s\n" msgstr "\tse volvi a cambiar el directorio a %s\n" #, c-format -msgid "Fetching url:[%s]\n" -msgstr "Obteniendo url:[%s]\n" - -#, c-format msgid "Failed to download: %s\n" msgstr "No se pudo descargar: %s\n" @@ -190,10 +170,6 @@ msgid "Failed to unlink %s\n" msgstr "No se pudo eliminar (unlink) %s\n" #, c-format -msgid "md5 sum for %s is not correct, override with --no-md5!\n" -msgstr "El sum md5 de %s es incorrecto, ignorar con --no-md5!\n" - -#, c-format msgid "MD5 found: [%s]\n" msgstr "MD5 encontr.:[%s]\n" @@ -416,14 +392,6 @@ msgid "Reading Package Lists..." msgstr "Leyendo Listado de Paquetes..." #, c-format -msgid "Download of %s incomplete\n" -msgstr "Descarga de %s incompleta\n" - -#, c-format -msgid "Could not find MD5 checksum for %s, override with --no-md5\n" -msgstr "No se pudo encontrar el checksum MD5 para %s, ignorar con --no-md5\n" - -#, c-format msgid "%s, which is required by %s, is excluded\n" msgstr "se excluye %s, que es requerido por %s\n" @@ -490,3 +458,45 @@ msgstr "Package ChangeLog" msgid "Retrieving ChangeLog.txt [%s]..." msgstr "Retrieving ChangeLog.txt [%s]..." +msgid "MD5 checksum mismatch, override with --no-md5" +msgstr "MD5 checksum mismatch, override with --no-md5" + +msgid "Missing MD5 checksum, override with --no-md5" +msgstr "Missing MD5 checksum, override with --no-md5" + +msgid "Incomplete download" +msgstr "Incomplete download" + +msgid "GPG key successfully imported" +msgstr "GPG key successfully imported" + +msgid "GPG key could not be imported" +msgstr "GPG key could not be imported" + +msgid "GPG key already present" +msgstr "GPG key already present" + +msgid "Checksums signature successfully verified" +msgstr "Checksums signature successfully verified" + +msgid "Checksums signature could not be verified" +msgstr "Checksums signature could not be verified" + +msgid "Verified" +msgstr "Verified" + +msgid "Not Verified" +msgstr "Not Verified" + +msgid "Retrieving GPG key [%s]..." +msgstr "Retrieving GPG key [%s]..." + +msgid "Retrieving checksum signature [%s]..." +msgstr "Retrieving checksum signature [%s]..." + +msgid "No key for verification" +msgstr "No key for verification" + +msgid "retrieve GPG keys for sources" +msgstr "retrieve GPG keys for sources" + @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: 0.9.11i\n" +"Project-Id-Version: 0.9.12\n" "POT-Creation-Date: 2003-11-03 14:28+0000\n" -"PO-Revision-Date: 2007-05-20 16:00+0500\n" +"PO-Revision-Date: 2007-06-15 23:10+0500\n" "Last-Translators: Verachten Bruno <gounthar@gmail.com>, solsTiCe d'Hiver <solstice.dhiver@laposte.net>\n" "Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n" "MIME-Version: 1.0\n" @@ -135,42 +135,22 @@ msgstr "chec de l'opendir %s\n" msgid "Failed to chdir: %s\n" msgstr "chec du chdir : %s\n" -#, c-format -msgid "unlinking %s\n" -msgstr "Effacement du lien %s\n" - msgid "Failed to get cwd\n" msgstr "N'a pas obtenu le cwd\n" #, c-format -msgid "\tCurrent working directory: %s\n" -msgstr "\tRpertoire courant de travail: %s\n" - -#, c-format msgid "Failed to mkdir: %s\n" msgstr "chec du mkdir : %s\n" #, c-format -msgid "\tCreated directory: %s\n" -msgstr "\tLe rpertoire %s a t cr\n" - -#, c-format msgid "Failed to chdir to %s\n" msgstr "chec du chdir vers %s\n" #, c-format -msgid "\tchdir into %s\n" -msgstr "\tchdir dans %s\n" - -#, c-format msgid "\tchdir back into %s\n" msgstr "\tchdir de nouveau dans %s\n" #, c-format -msgid "Fetching url:[%s]\n" -msgstr "Rcupration de l'url:[%s]\n" - -#, c-format msgid "Failed to download: %s\n" msgstr "Echec du tlchargement : %s\n" @@ -190,10 +170,6 @@ msgid "Failed to unlink %s\n" msgstr "Echec de l'effacement du lien %s\n" #, c-format -msgid "md5 sum for %s is not correct, override with --no-md5!\n" -msgstr "La somme de vrification md5 pour %s est incorrecte. Pour vous passer de cette vrification, utilisez l'option --no-md5!\n" - -#, c-format msgid "MD5 found: [%s]\n" msgstr "MD5 trouv : [ %s]\n" @@ -416,14 +392,6 @@ msgid "Reading Package Lists..." msgstr "Lecture de la liste des paquets..." #, c-format -msgid "Download of %s incomplete\n" -msgstr "Tlchargement de %s incomplet\n" - -#, c-format -msgid "Could not find MD5 checksum for %s, override with --no-md5\n" -msgstr "Pas de somme de vrification MD5 pour %s. Pour vous passer de cette vrification, utilisez l'option --no-md5\n" - -#, c-format msgid "%s, which is required by %s, is excluded\n" msgstr "%s, qui est requis par %s, est exclu\n" @@ -490,3 +458,45 @@ msgstr "Package ChangeLog" msgid "Retrieving ChangeLog.txt [%s]..." msgstr "Retrieving ChangeLog.txt [%s]..." +msgid "MD5 checksum mismatch, override with --no-md5" +msgstr "MD5 checksum mismatch, override with --no-md5" + +msgid "Missing MD5 checksum, override with --no-md5" +msgstr "Missing MD5 checksum, override with --no-md5" + +msgid "Incomplete download" +msgstr "Incomplete download" + +msgid "GPG key successfully imported" +msgstr "GPG key successfully imported" + +msgid "GPG key could not be imported" +msgstr "GPG key could not be imported" + +msgid "GPG key already present" +msgstr "GPG key already present" + +msgid "Checksums signature successfully verified" +msgstr "Checksums signature successfully verified" + +msgid "Checksums signature could not be verified" +msgstr "Checksums signature could not be verified" + +msgid "Verified" +msgstr "Verified" + +msgid "Not Verified" +msgstr "Not Verified" + +msgid "Retrieving GPG key [%s]..." +msgstr "Retrieving GPG key [%s]..." + +msgid "Retrieving checksum signature [%s]..." +msgstr "Retrieving checksum signature [%s]..." + +msgid "No key for verification" +msgstr "No key for verification" + +msgid "retrieve GPG keys for sources" +msgstr "retrieve GPG keys for sources" + @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: 0.9.11i\n" +"Project-Id-Version: 0.9.12\n" "POT-Creation-Date: 2003-11-03 14:28+0000\n" -"PO-Revision-Date: 2007-05-20 16:00+0500\n" +"PO-Revision-Date: 2007-06-15 23:10+0500\n" "Last-Translator: Kemas Antonius <kyantonius@kyantonius.com>\n" "Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n" "MIME-Version: 1.0\n" @@ -135,42 +135,22 @@ msgstr "Gagal membuka direktori %s\n" msgid "Failed to chdir: %s\n" msgstr "Gagal mengganti direktori: %s\n" -#, c-format -msgid "unlinking %s\n" -msgstr "melepaskan taut %s\n" - msgid "Failed to get cwd\n" msgstr "Gagal mendapatkan cwd\n" #, c-format -msgid "\tCurrent working directory: %s\n" -msgstr "\tDirektori kerja saat ini: %s\n" - -#, c-format msgid "Failed to mkdir: %s\n" msgstr "Gagal membuat direktori: %s\n" #, c-format -msgid "\tCreated directory: %s\n" -msgstr "\tDirektory yang telah dibuat: %s\n" - -#, c-format msgid "Failed to chdir to %s\n" msgstr "Gagal mengganti direktori ke %s\n" #, c-format -msgid "\tchdir into %s\n" -msgstr "\tganti direktori ke %s\n" - -#, c-format msgid "\tchdir back into %s\n" msgstr "\tganti direktori kembali ke %s\n" #, c-format -msgid "Fetching url:[%s]\n" -msgstr "Mengambil url:[%s]\n" - -#, c-format msgid "Failed to download: %s\n" msgstr "Gagal men-download: %s\n" @@ -190,10 +170,6 @@ msgid "Failed to unlink %s\n" msgstr "Gagal melepaskan taut %s\n" #, c-format -msgid "md5 sum for %s is not correct, override with --no-md5!\n" -msgstr "md5 sum untuk %s tidak benar, langkahi dengan --no-md5!\n" - -#, c-format msgid "MD5 found: [%s]\n" msgstr "MD5 diperoleh: [%s]\n" @@ -416,14 +392,6 @@ msgid "Reading Package Lists..." msgstr "Membaca daftar paket..." #, c-format -msgid "Download of %s incomplete\n" -msgstr "Download $s tidak lengkap\n" - -#, c-format -msgid "Could not find MD5 checksum for %s, override with --no-md5\n" -msgstr "Tidak diperoleh MD% checksum untuk %s, langkahi dengan --no-md5\n" - -#, c-format msgid "%s, which is required by %s, is excluded\n" msgstr "%s yang dibutuhkan oleh %s, tidak diikutsertakan\n" @@ -490,3 +458,45 @@ msgstr "Package ChangeLog" msgid "Retrieving ChangeLog.txt [%s]..." msgstr "Retrieving ChangeLog.txt [%s]..." +msgid "MD5 checksum mismatch, override with --no-md5" +msgstr "MD5 checksum mismatch, override with --no-md5" + +msgid "Missing MD5 checksum, override with --no-md5" +msgstr "Missing MD5 checksum, override with --no-md5" + +msgid "Incomplete download" +msgstr "Incomplete download" + +msgid "GPG key successfully imported" +msgstr "GPG key successfully imported" + +msgid "GPG key could not be imported" +msgstr "GPG key could not be imported" + +msgid "GPG key already present" +msgstr "GPG key already present" + +msgid "Checksums signature successfully verified" +msgstr "Checksums signature successfully verified" + +msgid "Checksums signature could not be verified" +msgstr "Checksums signature could not be verified" + +msgid "Verified" +msgstr "Verified" + +msgid "Not Verified" +msgstr "Not Verified" + +msgid "Retrieving GPG key [%s]..." +msgstr "Retrieving GPG key [%s]..." + +msgid "Retrieving checksum signature [%s]..." +msgstr "Retrieving checksum signature [%s]..." + +msgid "No key for verification" +msgstr "No key for verification" + +msgid "retrieve GPG keys for sources" +msgstr "retrieve GPG keys for sources" + @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: 0.9.11i\n" +"Project-Id-Version: 0.9.12\n" "POT-Creation-Date: 2003-11-03 14:28+0000\n" -"PO-Revision-Date: 2007-05-20 16:00+0500\n" +"PO-Revision-Date: 2007-06-15 23:10+0500\n" "Last-Translator: Francesco Gigli <jaramir@slack.it>\n" "Language-Team: Italian <tp@lists.linux.it>\n" "MIME-Version: 1.0\n" @@ -135,42 +135,22 @@ msgstr "Errore in opendir %s\n" msgid "Failed to chdir: %s\n" msgstr "Errore in chdir: %s\n" -#, c-format -msgid "unlinking %s\n" -msgstr "unlinking %s\n" - msgid "Failed to get cwd\n" msgstr "Errore nel trovare cwd\n" #, c-format -msgid "\tCurrent working directory: %s\n" -msgstr "\tCartella corrente di lavoro: %s\n" - -#, c-format msgid "Failed to mkdir: %s\n" msgstr "Errore in mkdir: %s\n" #, c-format -msgid "\tCreated directory: %s\n" -msgstr "\tCreata cartella: %s\n" - -#, c-format msgid "Failed to chdir to %s\n" msgstr "Errore in chdir a %s\n" #, c-format -msgid "\tchdir into %s\n" -msgstr "\tchdir in %s\n" - -#, c-format msgid "\tchdir back into %s\n" msgstr "\tchdir nuovamente in %s\n" #, c-format -msgid "Fetching url:[%s]\n" -msgstr "Recupero url: [%s]\n" - -#, c-format msgid "Failed to download: %s\n" msgstr "Errore nel download: %s\n" @@ -190,10 +170,6 @@ msgid "Failed to unlink %s\n" msgstr "Errore in unlink %s\n" #, c-format -msgid "md5 sum for %s is not correct, override with --no-md5!\n" -msgstr "la somma md5 di %s non corretta, ignorare con --no-md5!\n" - -#, c-format msgid "MD5 found: [%s]\n" msgstr "MD5 trovato: [%s]\n" @@ -416,14 +392,6 @@ msgid "Reading Package Lists..." msgstr "Lettura della lista dei pacchetti..." #, c-format -msgid "Download of %s incomplete\n" -msgstr "Il download di %s non completo\n" - -#, c-format -msgid "Could not find MD5 checksum for %s, override with --no-md5\n" -msgstr "Impossibile trovare la somma MD5 di %s, ignorare con --no-md5\n" - -#, c-format msgid "%s, which is required by %s, is excluded\n" msgstr "%s, il quale richiesto da %s, escluso\n" @@ -490,3 +458,45 @@ msgstr "Package ChangeLog" msgid "Retrieving ChangeLog.txt [%s]..." msgstr "Retrieving ChangeLog.txt [%s]..." +msgid "MD5 checksum mismatch, override with --no-md5" +msgstr "MD5 checksum mismatch, override with --no-md5" + +msgid "Missing MD5 checksum, override with --no-md5" +msgstr "Missing MD5 checksum, override with --no-md5" + +msgid "Incomplete download" +msgstr "Incomplete download" + +msgid "GPG key successfully imported" +msgstr "GPG key successfully imported" + +msgid "GPG key could not be imported" +msgstr "GPG key could not be imported" + +msgid "GPG key already present" +msgstr "GPG key already present" + +msgid "Checksums signature successfully verified" +msgstr "Checksums signature successfully verified" + +msgid "Checksums signature could not be verified" +msgstr "Checksums signature could not be verified" + +msgid "Verified" +msgstr "Verified" + +msgid "Not Verified" +msgstr "Not Verified" + +msgid "Retrieving GPG key [%s]..." +msgstr "Retrieving GPG key [%s]..." + +msgid "Retrieving checksum signature [%s]..." +msgstr "Retrieving checksum signature [%s]..." + +msgid "No key for verification" +msgstr "No key for verification" + +msgid "retrieve GPG keys for sources" +msgstr "retrieve GPG keys for sources" + @@ -6,9 +6,9 @@ # JW <J_W@somewhere.c0.jp>, 2006. msgid "" msgstr "" -"Project-Id-Version: 0.9.11i\n" +"Project-Id-Version: 0.9.12\n" "POT-Creation-Date: 2006-03-08 19:49+0900\n" -"PO-Revision-Date: 2007-05-20 16:00+0500\n" +"PO-Revision-Date: 2007-06-15 23:10+0500\n" "Last-Translator: JW <J_W@somewhere.c0.jp>\n" "Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n" "MIME-Version: 1.0\n" @@ -137,42 +137,22 @@ msgstr "ディレクトリ %sを開くことができませんでした\n" msgid "Failed to chdir: %s\n" msgstr "chdirに失敗しました: %s\n" -#, c-format -msgid "unlinking %s\n" -msgstr "リンク %sを解除\n" - msgid "Failed to get cwd\n" msgstr "Failed to get cwd\n" #, c-format -msgid "\tCurrent working directory: %s\n" -msgstr "\tCurrent working directory: %s\n" - -#, c-format msgid "Failed to mkdir: %s\n" msgstr "ディレクトリ作成に失敗: %s\n" #, c-format -msgid "\tCreated directory: %s\n" -msgstr "\tCreated directory: %s\n" - -#, c-format msgid "Failed to chdir to %s\n" msgstr "Failed to chdir to %s\n" #, c-format -msgid "\tchdir into %s\n" -msgstr "\tchdir into %s\n" - -#, c-format msgid "\tchdir back into %s\n" msgstr "\tchdir back into %s\n" #, c-format -msgid "Fetching url:[%s]\n" -msgstr "url取得中:[%s]\n" - -#, c-format msgid "Failed to download: %s\n" msgstr "ダウンロードに失敗: %s\n" @@ -192,10 +172,6 @@ msgid "Failed to unlink %s\n" msgstr "Failed to unlink %s\n" #, c-format -msgid "md5 sum for %s is not correct, override with --no-md5!\n" -msgstr "%s の md5 sum が不正, --no-md5 オプションを使用して無視\n" - -#, c-format msgid "MD5 found: [%s]\n" msgstr "MD5 found: [%s]\n" @@ -418,14 +394,6 @@ msgid "Reading Package Lists..." msgstr "パッケージリストを読込み中..." #, c-format -msgid "Download of %s incomplete\n" -msgstr "%s のダウンロードが不完全です\n" - -#, c-format -msgid "Could not find MD5 checksum for %s, override with --no-md5\n" -msgstr "%s のMD5 checksumが見つかりません。オプション --no-md5 を付けて無効化してください。\n" - -#, c-format msgid "%s, which is required by %s, is excluded\n" msgstr "%s( %s に必要とされる)は除外されます\n" @@ -492,3 +460,45 @@ msgstr "パッケージ更新履歴 (ChangeLog)" msgid "Retrieving ChangeLog.txt [%s]..." msgstr "ChangeLog.txt [%s] を取得中..." +msgid "MD5 checksum mismatch, override with --no-md5" +msgstr "MD5 checksum mismatch, override with --no-md5" + +msgid "Missing MD5 checksum, override with --no-md5" +msgstr "Missing MD5 checksum, override with --no-md5" + +msgid "Incomplete download" +msgstr "Incomplete download" + +msgid "GPG key successfully imported" +msgstr "GPG key successfully imported" + +msgid "GPG key could not be imported" +msgstr "GPG key could not be imported" + +msgid "GPG key already present" +msgstr "GPG key already present" + +msgid "Checksums signature successfully verified" +msgstr "Checksums signature successfully verified" + +msgid "Checksums signature could not be verified" +msgstr "Checksums signature could not be verified" + +msgid "Verified" +msgstr "Verified" + +msgid "Not Verified" +msgstr "Not Verified" + +msgid "Retrieving GPG key [%s]..." +msgstr "Retrieving GPG key [%s]..." + +msgid "Retrieving checksum signature [%s]..." +msgstr "Retrieving checksum signature [%s]..." + +msgid "No key for verification" +msgstr "No key for verification" + +msgid "retrieve GPG keys for sources" +msgstr "retrieve GPG keys for sources" + @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: 0.9.11i\n" +"Project-Id-Version: 0.9.12\n" "POT-Creation-Date: 2003-11-03 14:28+0000\n" -"PO-Revision-Date: 2007-05-20 16:00+0500\n" +"PO-Revision-Date: 2007-06-15 23:10+0500\n" "Last-Translator: Stefan Koopmanschap <stefan@electronicmusicworld.com>\n" "Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n" "MIME-Version: 1.0\n" @@ -135,42 +135,22 @@ msgstr "Kon niet opendir %s\n" msgid "Failed to chdir: %s\n" msgstr "Kon niet chdir: %s\n" -#, c-format -msgid "unlinking %s\n" -msgstr "koppeling verbreken %s\n" - msgid "Failed to get cwd\n" msgstr "Kon niet cwd\n" #, c-format -msgid "\tCurrent working directory: %s\n" -msgstr "\tMomentele werkdirectory: %s\n" - -#, c-format msgid "Failed to mkdir: %s\n" msgstr "Kon niet mkdir: %s\n" #, c-format -msgid "\tCreated directory: %s\n" -msgstr "\tDirectory gemaakt: %s\n" - -#, c-format msgid "Failed to chdir to %s\n" msgstr "Kon niet chdir naar %s\n" #, c-format -msgid "\tchdir into %s\n" -msgstr "\tchdir naar %s\n" - -#, c-format msgid "\tchdir back into %s\n" msgstr "\tchdir terug naar %s\n" #, c-format -msgid "Fetching url:[%s]\n" -msgstr "Ophalen url:[%s]\n" - -#, c-format msgid "Failed to download: %s\n" msgstr "Kon niet downloaden: %s\n" @@ -190,10 +170,6 @@ msgid "Failed to unlink %s\n" msgstr "Kon koppeling niet vebreken %s\n" #, c-format -msgid "md5 sum for %s is not correct, override with --no-md5!\n" -msgstr "md5 sum voor %s is niet correct, ga tegen met --no-md5!\n" - -#, c-format msgid "MD5 found: [%s]\n" msgstr "MD5 gevonden: [%s]\n" @@ -416,14 +392,6 @@ msgid "Reading Package Lists..." msgstr "Lezen package lijst..." #, c-format -msgid "Download of %s incomplete\n" -msgstr "Download van %s incompleet\n" - -#, c-format -msgid "Could not find MD5 checksum for %s, override with --no-md5\n" -msgstr "Kon MD5 checksum niet vinden voor %s, ga tegen met --no-md5\n" - -#, c-format msgid "%s, which is required by %s, is excluded\n" msgstr "%s, benodigd door %s, is niet opgenomen\n" @@ -490,3 +458,45 @@ msgstr "Package ChangeLog" msgid "Retrieving ChangeLog.txt [%s]..." msgstr "Retrieving ChangeLog.txt [%s]..." +msgid "MD5 checksum mismatch, override with --no-md5" +msgstr "MD5 checksum mismatch, override with --no-md5" + +msgid "Missing MD5 checksum, override with --no-md5" +msgstr "Missing MD5 checksum, override with --no-md5" + +msgid "Incomplete download" +msgstr "Incomplete download" + +msgid "GPG key successfully imported" +msgstr "GPG key successfully imported" + +msgid "GPG key could not be imported" +msgstr "GPG key could not be imported" + +msgid "GPG key already present" +msgstr "GPG key already present" + +msgid "Checksums signature successfully verified" +msgstr "Checksums signature successfully verified" + +msgid "Checksums signature could not be verified" +msgstr "Checksums signature could not be verified" + +msgid "Verified" +msgstr "Verified" + +msgid "Not Verified" +msgstr "Not Verified" + +msgid "Retrieving GPG key [%s]..." +msgstr "Retrieving GPG key [%s]..." + +msgid "Retrieving checksum signature [%s]..." +msgstr "Retrieving checksum signature [%s]..." + +msgid "No key for verification" +msgstr "No key for verification" + +msgid "retrieve GPG keys for sources" +msgstr "retrieve GPG keys for sources" + @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: 0.9.11i\n" +"Project-Id-Version: 0.9.12\n" "POT-Creation-Date: 2003-11-03 14:28+0000\n" -"PO-Revision-Date: 2007-05-20 16:00+0500\n" +"PO-Revision-Date: 2007-06-15 23:10+0500\n" "Last-Translator: Joran Kvalvaag <jk@nerdworks.org>\n" "Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n" "MIME-Version: 1.0\n" @@ -135,42 +135,22 @@ msgstr "Klarte ikke opendir %s\n" msgid "Failed to chdir: %s\n" msgstr "Klarte ikke chdir: %s\n" -#, c-format -msgid "unlinking %s\n" -msgstr "kobler fra %s\n" - msgid "Failed to get cwd\n" msgstr "Klarte ikke finne cwd\n" #, c-format -msgid "\tCurrent working directory: %s\n" -msgstr "\tGjeldende arbeidfolder: %s\n" - -#, c-format msgid "Failed to mkdir: %s\n" msgstr "Klarte ikke mkdir: %s\n" #, c-format -msgid "\tCreated directory: %s\n" -msgstr "\tLagde folder: %s\n" - -#, c-format msgid "Failed to chdir to %s\n" msgstr "Klarte ikke chdir til %s\n" #, c-format -msgid "\tchdir into %s\n" -msgstr "\tchdir til %s\n" - -#, c-format msgid "\tchdir back into %s\n" msgstr "\tchdir tilbake til %s\n" #, c-format -msgid "Fetching url:[%s]\n" -msgstr "Henter url:[%s]\n" - -#, c-format msgid "Failed to download: %s\n" msgstr "Nedlasting feilet : %s\n" @@ -190,10 +170,6 @@ msgid "Failed to unlink %s\n" msgstr "Klarte ikke unlinke %s\n" #, c-format -msgid "md5 sum for %s is not correct, override with --no-md5!\n" -msgstr "md5sum for %s er feil, neglisjer med --no-md5!\n" - -#, c-format msgid "MD5 found: [%s]\n" msgstr "MD5 funnet: [%s]\n" @@ -416,14 +392,6 @@ msgid "Reading Package Lists..." msgstr "Leser pakkelister..." #, c-format -msgid "Download of %s incomplete\n" -msgstr "Nedlasting av %s er ikke komplett\n" - -#, c-format -msgid "Could not find MD5 checksum for %s, override with --no-md5\n" -msgstr "Finner ikke MD5 checksum for %s, neglisjer med --no-md5\n" - -#, c-format msgid "%s, which is required by %s, is excluded\n" msgstr "%s, som kreves av %s er ekskludert\n" @@ -490,3 +458,45 @@ msgstr "Package ChangeLog" msgid "Retrieving ChangeLog.txt [%s]..." msgstr "Retrieving ChangeLog.txt [%s]..." +msgid "MD5 checksum mismatch, override with --no-md5" +msgstr "MD5 checksum mismatch, override with --no-md5" + +msgid "Missing MD5 checksum, override with --no-md5" +msgstr "Missing MD5 checksum, override with --no-md5" + +msgid "Incomplete download" +msgstr "Incomplete download" + +msgid "GPG key successfully imported" +msgstr "GPG key successfully imported" + +msgid "GPG key could not be imported" +msgstr "GPG key could not be imported" + +msgid "GPG key already present" +msgstr "GPG key already present" + +msgid "Checksums signature successfully verified" +msgstr "Checksums signature successfully verified" + +msgid "Checksums signature could not be verified" +msgstr "Checksums signature could not be verified" + +msgid "Verified" +msgstr "Verified" + +msgid "Not Verified" +msgstr "Not Verified" + +msgid "Retrieving GPG key [%s]..." +msgstr "Retrieving GPG key [%s]..." + +msgid "Retrieving checksum signature [%s]..." +msgstr "Retrieving checksum signature [%s]..." + +msgid "No key for verification" +msgstr "No key for verification" + +msgid "retrieve GPG keys for sources" +msgstr "retrieve GPG keys for sources" + @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: 0.9.11i\n" +"Project-Id-Version: 0.9.12\n" "POT-Creation-Date: 2003-11-03 14:28+0000\n" -"PO-Revision-Date: 2007-05-20 16:00+0500\n" +"PO-Revision-Date: 2007-06-15 23:10+0500\n" "Last-Translators: Sajmon <sajmon@tenboard.com>, Paul Blazejowski <paulb@blazebox.homeip.net>, nixon <nixon@klub.chip.pl> and simon <ssiimm@poczta.onet.pl>\n" "Language-Team: polish slapt-get-devel <slapt-get-devel@software.jaos.org>\n" "MIME-Version: 1.0\n" @@ -136,42 +136,22 @@ msgstr "Otworzenie katalogu %s nie powiodo si.\n" msgid "Failed to chdir: %s\n" msgstr "Zmiana katalogu na %s nie powioda si.\n" -#, c-format -msgid "unlinking %s\n" -msgstr "odlinkowanie %s\n" - msgid "Failed to get cwd\n" msgstr "Nie powiodo si pobranie cwd\n" #, c-format -msgid "\tCurrent working directory: %s\n" -msgstr "\tAktualny katalog: %s\n" - -#, c-format msgid "Failed to mkdir: %s\n" msgstr "mkdir nie powiodo si : %s\n" #, c-format -msgid "\tCreated directory: %s\n" -msgstr "Stworzono katalog: %s\n" - -#, c-format msgid "Failed to chdir to %s\n" msgstr "Zmiana katalogu na %s nie powioda si.\n" #, c-format -msgid "\tchdir into %s\n" -msgstr "\tchdir do %s\n" - -#, c-format msgid "\tchdir back into %s\n" msgstr "\tchdir z powrotem do %s\n" #, c-format -msgid "Fetching url:[%s]\n" -msgstr "Pobieram url:[%s]\n" - -#, c-format msgid "Failed to download: %s\n" msgstr "Pobranie nie powiodo si: %s\n" @@ -191,10 +171,6 @@ msgid "Failed to unlink %s\n" msgstr "Nie powiodo si odlinkowanie %s\n" #, c-format -msgid "md5 sum for %s is not correct, override with --no-md5!\n" -msgstr "Suma kontrolna (md5) dla %s jest niepoprawna, uniewaniaj z --no-md5!\n" - -#, c-format msgid "MD5 found: [%s]\n" msgstr "MD5 uzyskane: [%s]\n" @@ -417,14 +393,6 @@ msgid "Reading Package Lists..." msgstr "Wczytuj List Pakietw..." #, c-format -msgid "Download of %s incomplete\n" -msgstr "Pobieranie %s niekompletne\n" - -#, c-format -msgid "Could not find MD5 checksum for %s, override with --no-md5\n" -msgstr "Nie znaleziono sum MD5 do %s, uniewaniaj z --no-md5\n" - -#, c-format msgid "%s, which is required by %s, is excluded\n" msgstr "%s, ktry jest wymagany przez %s, zosta wykluczony\n" @@ -491,3 +459,45 @@ msgstr "Lista zmian pakietu (ChangeLog)" msgid "Retrieving ChangeLog.txt [%s]..." msgstr "Pobieram ChangeLog.txt [%s]..." +msgid "MD5 checksum mismatch, override with --no-md5" +msgstr "MD5 checksum mismatch, override with --no-md5" + +msgid "Missing MD5 checksum, override with --no-md5" +msgstr "Missing MD5 checksum, override with --no-md5" + +msgid "Incomplete download" +msgstr "Incomplete download" + +msgid "GPG key successfully imported" +msgstr "GPG key successfully imported" + +msgid "GPG key could not be imported" +msgstr "GPG key could not be imported" + +msgid "GPG key already present" +msgstr "GPG key already present" + +msgid "Checksums signature successfully verified" +msgstr "Checksums signature successfully verified" + +msgid "Checksums signature could not be verified" +msgstr "Checksums signature could not be verified" + +msgid "Verified" +msgstr "Verified" + +msgid "Not Verified" +msgstr "Not Verified" + +msgid "Retrieving GPG key [%s]..." +msgstr "Retrieving GPG key [%s]..." + +msgid "Retrieving checksum signature [%s]..." +msgstr "Retrieving checksum signature [%s]..." + +msgid "No key for verification" +msgstr "No key for verification" + +msgid "retrieve GPG keys for sources" +msgstr "retrieve GPG keys for sources" + diff --git a/po/pt_BR.po b/po/pt_BR.po index b59d9d9..3e6ea5c 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -5,9 +5,9 @@ #
msgid ""
msgstr ""
-"Project-Id-Version: 0.9.11i\n"
+"Project-Id-Version: 0.9.12\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2007-05-20 16:00+0500\n"
+"PO-Revision-Date: 2007-06-15 23:10+0500\n"
"Last-Translator: Henrique Pinto <henrique.pinto@kdemail.net>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -135,42 +135,22 @@ msgstr "opendir falhou %s\n" msgid "Failed to chdir: %s\n"
msgstr "chdir falhou: %s\n"
-#, c-format
-msgid "unlinking %s\n"
-msgstr "excluindo %s\n"
-
msgid "Failed to get cwd\n"
msgstr "Falha para entender o comando\n"
#, c-format
-msgid "\tCurrent working directory: %s\n"
-msgstr "\tDiretrio de trabalho atual: %s\n"
-
-#, c-format
msgid "Failed to mkdir: %s\n"
msgstr "mkdir falhou: %s\n"
#, c-format
-msgid "\tCreated directory: %s\n"
-msgstr "\tDiretrio criado: %s\n"
-
-#, c-format
msgid "Failed to chdir to %s\n"
msgstr "Falha ao entrar no diretrio %s\n"
#, c-format
-msgid "\tchdir into %s\n"
-msgstr "\tentrar no diretrio %s\n"
-
-#, c-format
msgid "\tchdir back into %s\n"
msgstr "\tvoltando ao diretrio %s\n"
#, c-format
-msgid "Fetching url:[%s]\n"
-msgstr "Puxando url:[%s]\n"
-
-#, c-format
msgid "Failed to download: %s\n"
msgstr "Falha no download de: %s\n"
@@ -190,10 +170,6 @@ msgid "Failed to unlink %s\n" msgstr "Falha ao excluir %s\n"
#, c-format
-msgid "md5 sum for %s is not correct, override with --no-md5!\n"
-msgstr "md5 sum para %s est incorreto, ignore com --no-md5!\n"
-
-#, c-format
msgid "MD5 found: [%s]\n"
msgstr "MD5 encontrado: [%s]\n"
@@ -416,14 +392,6 @@ msgid "Reading Package Lists..." msgstr "Lendo Listas de Pacotes..."
#, c-format
-msgid "Download of %s incomplete\n"
-msgstr "Download de %s incompleto\n"
-
-#, c-format
-msgid "Could not find MD5 checksum for %s, override with --no-md5\n"
-msgstr "No foi possvel encontrar o MD5 checksum para %s, ignore com --no-md5\n"
-
-#, c-format
msgid "%s, which is required by %s, is excluded\n"
msgstr "%s, which is required by %s, is excluded\n"
@@ -490,3 +458,45 @@ msgstr "Package ChangeLog" msgid "Retrieving ChangeLog.txt [%s]..."
msgstr "Retrieving ChangeLog.txt [%s]..."
+msgid "MD5 checksum mismatch, override with --no-md5"
+msgstr "MD5 checksum mismatch, override with --no-md5"
+
+msgid "Missing MD5 checksum, override with --no-md5"
+msgstr "Missing MD5 checksum, override with --no-md5"
+
+msgid "Incomplete download"
+msgstr "Incomplete download"
+
+msgid "GPG key successfully imported"
+msgstr "GPG key successfully imported"
+
+msgid "GPG key could not be imported"
+msgstr "GPG key could not be imported"
+
+msgid "GPG key already present"
+msgstr "GPG key already present"
+
+msgid "Checksums signature successfully verified"
+msgstr "Checksums signature successfully verified"
+
+msgid "Checksums signature could not be verified"
+msgstr "Checksums signature could not be verified"
+
+msgid "Verified"
+msgstr "Verified"
+
+msgid "Not Verified"
+msgstr "Not Verified"
+
+msgid "Retrieving GPG key [%s]..."
+msgstr "Retrieving GPG key [%s]..."
+
+msgid "Retrieving checksum signature [%s]..."
+msgstr "Retrieving checksum signature [%s]..."
+
+msgid "No key for verification"
+msgstr "No key for verification"
+
+msgid "retrieve GPG keys for sources"
+msgstr "retrieve GPG keys for sources"
+
diff --git a/po/pt_PT.po b/po/pt_PT.po index ec83ba0..70f395c 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: 0.9.11i\n" +"Project-Id-Version: 0.9.12\n" "POT-Creation-Date: 2003-11-03 14:28+0000\n" -"PO-Revision-Date: 2007-05-20 16:00+0500\n" +"PO-Revision-Date: 2007-06-15 23:10+0500\n" "Last-Translator: Miguel Santinho <msantinho@simplicidade.com>\n" "Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n" "MIME-Version: 1.0\n" @@ -135,42 +135,22 @@ msgstr "opendir falhou %s\n" msgid "Failed to chdir: %s\n" msgstr "chdir falhou: %s\n" -#, c-format -msgid "unlinking %s\n" -msgstr "a excluir %s\n" - msgid "Failed to get cwd\n" msgstr "Falha ao ler a pasta\n" #, c-format -msgid "\tCurrent working directory: %s\n" -msgstr "\tPasta actual: %s\n" - -#, c-format msgid "Failed to mkdir: %s\n" msgstr "Falha ao remover a pasta: %s\n" #, c-format -msgid "\tCreated directory: %s\n" -msgstr "\tPasta criada: %s\n" - -#, c-format msgid "Failed to chdir to %s\n" msgstr "Falha ao entrar na pasta %s\n" #, c-format -msgid "\tchdir into %s\n" -msgstr "\tentrar na pasta %s\n" - -#, c-format msgid "\tchdir back into %s\n" msgstr "\tvoltar à pasta %s\n" #, c-format -msgid "Fetching url:[%s]\n" -msgstr "A ler o url:[%s]\n" - -#, c-format msgid "Failed to download: %s\n" msgstr "Falha na transferência de: %s\n" @@ -190,10 +170,6 @@ msgid "Failed to unlink %s\n" msgstr "Falha ao remover %s\n" #, c-format -msgid "md5 sum for %s is not correct, override with --no-md5!\n" -msgstr "md5 sum para %s está incorrecto, ignore com --no-md5!\n" - -#, c-format msgid "MD5 found: [%s]\n" msgstr "MD5 encontrado: [%s]\n" @@ -416,14 +392,6 @@ msgid "Reading Package Lists..." msgstr "A ler Listas de Pacotes..." #, c-format -msgid "Download of %s incomplete\n" -msgstr "Transferência de %s incompleta\n" - -#, c-format -msgid "Could not find MD5 checksum for %s, override with --no-md5\n" -msgstr "Não foi possível encontrar o MD5 checksum para %s, ignore com --no-md5\n" - -#, c-format msgid "%s, which is required by %s, is excluded\n" msgstr "%s, que é requerido por %s, está excluído\n" @@ -490,3 +458,45 @@ msgstr "Registo de alterações do Pacote" msgid "Retrieving ChangeLog.txt [%s]..." msgstr "A obter o ficheiro ChangeLog.txt [%s]..." +msgid "MD5 checksum mismatch, override with --no-md5" +msgstr "MD5 checksum mismatch, override with --no-md5" + +msgid "Missing MD5 checksum, override with --no-md5" +msgstr "Missing MD5 checksum, override with --no-md5" + +msgid "Incomplete download" +msgstr "Incomplete download" + +msgid "GPG key successfully imported" +msgstr "GPG key successfully imported" + +msgid "GPG key could not be imported" +msgstr "GPG key could not be imported" + +msgid "GPG key already present" +msgstr "GPG key already present" + +msgid "Checksums signature successfully verified" +msgstr "Checksums signature successfully verified" + +msgid "Checksums signature could not be verified" +msgstr "Checksums signature could not be verified" + +msgid "Verified" +msgstr "Verified" + +msgid "Not Verified" +msgstr "Not Verified" + +msgid "Retrieving GPG key [%s]..." +msgstr "Retrieving GPG key [%s]..." + +msgid "Retrieving checksum signature [%s]..." +msgstr "Retrieving checksum signature [%s]..." + +msgid "No key for verification" +msgstr "No key for verification" + +msgid "retrieve GPG keys for sources" +msgstr "retrieve GPG keys for sources" + @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: 0.9.11i\n" +"Project-Id-Version: 0.9.12\n" "POT-Creation-Date: 2005-09-07 23:24 EEST\n" -"PO-Revision-Date: 2007-05-20 16:00+0500\n" +"PO-Revision-Date: 2007-06-15 23:10+0500\n" "Last-Translators: sin <digitalhunger@gmail.com>\n" "Language-Team: DeepStyle Team <hottab@deepstyle.org.ua>\n" "MIME-Version: 1.0\n" @@ -136,42 +136,22 @@ msgstr " %s\n" msgid "Failed to chdir: %s\n" msgstr " %s.\n" -#, c-format -msgid "unlinking %s\n" -msgstr " : %s\n" - msgid "Failed to get cwd\n" msgstr " cwd\n" #, c-format -msgid "\tCurrent working directory: %s\n" -msgstr "\t : %s\n" - -#, c-format msgid "Failed to mkdir: %s\n" msgstr " : %s\n" #, c-format -msgid "\tCreated directory: %s\n" -msgstr " %s\n" - -#, c-format msgid "Failed to chdir to %s\n" msgstr " %s.\n" #, c-format -msgid "\tchdir into %s\n" -msgstr "\t %s\n" - -#, c-format msgid "\tchdir back into %s\n" msgstr "\t %s\n" #, c-format -msgid "Fetching url:[%s]\n" -msgstr " url:[%s]\n" - -#, c-format msgid "Failed to download: %s\n" msgstr " : %s\n" @@ -191,10 +171,6 @@ msgid "Failed to unlink %s\n" msgstr " %s\n" #, c-format -msgid "md5 sum for %s is not correct, override with --no-md5!\n" -msgstr " (md5) %s , --no-md5!\n" - -#, c-format msgid "MD5 found: [%s]\n" msgstr " MD5: [%s]\n" @@ -417,14 +393,6 @@ msgid "Reading Package Lists..." msgstr " ..." #, c-format -msgid "Download of %s incomplete\n" -msgstr " %s \n" - -#, c-format -msgid "Could not find MD5 checksum for %s, override with --no-md5\n" -msgstr " MD5 %s, --no-md5\n" - -#, c-format msgid "%s, which is required by %s, is excluded\n" msgstr "%s, %s, \n" @@ -491,3 +459,45 @@ msgstr "Package ChangeLog" msgid "Retrieving ChangeLog.txt [%s]..." msgstr "Retrieving ChangeLog.txt [%s]..." +msgid "MD5 checksum mismatch, override with --no-md5" +msgstr "MD5 checksum mismatch, override with --no-md5" + +msgid "Missing MD5 checksum, override with --no-md5" +msgstr "Missing MD5 checksum, override with --no-md5" + +msgid "Incomplete download" +msgstr "Incomplete download" + +msgid "GPG key successfully imported" +msgstr "GPG key successfully imported" + +msgid "GPG key could not be imported" +msgstr "GPG key could not be imported" + +msgid "GPG key already present" +msgstr "GPG key already present" + +msgid "Checksums signature successfully verified" +msgstr "Checksums signature successfully verified" + +msgid "Checksums signature could not be verified" +msgstr "Checksums signature could not be verified" + +msgid "Verified" +msgstr "Verified" + +msgid "Not Verified" +msgstr "Not Verified" + +msgid "Retrieving GPG key [%s]..." +msgstr "Retrieving GPG key [%s]..." + +msgid "Retrieving checksum signature [%s]..." +msgstr "Retrieving checksum signature [%s]..." + +msgid "No key for verification" +msgstr "No key for verification" + +msgid "retrieve GPG keys for sources" +msgstr "retrieve GPG keys for sources" + @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: 0.9.11i\n" +"Project-Id-Version: 0.9.12\n" "POT-Creation-Date: 2005-06-23 21:28+0500\n" -"PO-Revision-Date: 2007-05-20 16:00+0500\n" +"PO-Revision-Date: 2007-06-15 23:10+0500\n" "Last-Translator: Erik Gyepes <depi@depi.sk>\n" "Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n" "MIME-Version: 1.0\n" @@ -135,42 +135,22 @@ msgstr "Nepodarilo sa otvori adresr %s\n" msgid "Failed to chdir: %s\n" msgstr "Nepodarilo sa zmeni adresr: %s\n" -#, c-format -msgid "unlinking %s\n" -msgstr "rozpjam %s\n" - msgid "Failed to get cwd\n" msgstr "Nepodarilo sa zska cwd\n" #, c-format -msgid "\tCurrent working directory: %s\n" -msgstr "\tSasn pracovn adresr: %s\n" - -#, c-format msgid "Failed to mkdir: %s\n" msgstr "Nepodarilo sa vytvori adresr: %s\n" #, c-format -msgid "\tCreated directory: %s\n" -msgstr "\tBol vytvoren adresr: %s\n" - -#, c-format msgid "Failed to chdir to %s\n" msgstr "Nepodarilo sa zmeni adresr na: %s\n" #, c-format -msgid "\tchdir into %s\n" -msgstr "\tadresr zmenen na %s\n" - -#, c-format msgid "\tchdir back into %s\n" msgstr "\tadresr zmenen sp na %s\n" #, c-format -msgid "Fetching url:[%s]\n" -msgstr "Sahujem url:[%s]\n" - -#, c-format msgid "Failed to download: %s\n" msgstr "Nepodarilo sa stiahnu: %s\n" @@ -190,10 +170,6 @@ msgid "Failed to unlink %s\n" msgstr "Nepodarilo sa zmaza %s\n" #, c-format -msgid "md5 sum for %s is not correct, override with --no-md5!\n" -msgstr "md5 set pre %s je nesprvny, ignoruj pomocou --no-md5!\n" - -#, c-format msgid "MD5 found: [%s]\n" msgstr "MD5 njden: [%s]\n" @@ -416,14 +392,6 @@ msgid "Reading Package Lists..." msgstr "Natavam zoznam balkov..." #, c-format -msgid "Download of %s incomplete\n" -msgstr "Stahovanie %s je nekompletn\n" - -#, c-format -msgid "Could not find MD5 checksum for %s, override with --no-md5\n" -msgstr "Nemem njs MD5 set pre %s, ignoruj pomocou --no-md5\n" - -#, c-format msgid "%s, which is required by %s, is excluded\n" msgstr "%s, ktor je potrebn pre %s, je vylen\n" @@ -490,3 +458,45 @@ msgstr "Package ChangeLog" msgid "Retrieving ChangeLog.txt [%s]..." msgstr "Retrieving ChangeLog.txt [%s]..." +msgid "MD5 checksum mismatch, override with --no-md5" +msgstr "MD5 checksum mismatch, override with --no-md5" + +msgid "Missing MD5 checksum, override with --no-md5" +msgstr "Missing MD5 checksum, override with --no-md5" + +msgid "Incomplete download" +msgstr "Incomplete download" + +msgid "GPG key successfully imported" +msgstr "GPG key successfully imported" + +msgid "GPG key could not be imported" +msgstr "GPG key could not be imported" + +msgid "GPG key already present" +msgstr "GPG key already present" + +msgid "Checksums signature successfully verified" +msgstr "Checksums signature successfully verified" + +msgid "Checksums signature could not be verified" +msgstr "Checksums signature could not be verified" + +msgid "Verified" +msgstr "Verified" + +msgid "Not Verified" +msgstr "Not Verified" + +msgid "Retrieving GPG key [%s]..." +msgstr "Retrieving GPG key [%s]..." + +msgid "Retrieving checksum signature [%s]..." +msgstr "Retrieving checksum signature [%s]..." + +msgid "No key for verification" +msgstr "No key for verification" + +msgid "retrieve GPG keys for sources" +msgstr "retrieve GPG keys for sources" + @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: 0.9.11i\n" +"Project-Id-Version: 0.9.12\n" "POT-Creation-Date: 2005-03-09\n" -"PO-Revision-Date: 2007-05-20 16:00+0500\n" +"PO-Revision-Date: 2007-06-15 23:10+0500\n" "Last-Translator: Uros Trsavec <utrsav@walla.com>\n" "Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n" "MIME-Version: 1.0\n" @@ -135,42 +135,22 @@ msgstr "Ni uspelo odpreti mape %s\n" msgid "Failed to chdir: %s\n" msgstr "Napaka pri chdir: %s\n" -#, c-format -msgid "unlinking %s\n" -msgstr "prekinjam povezavo %s\n" - msgid "Failed to get cwd\n" msgstr "Napaka pri pridobitvi cwd\n" #, c-format -msgid "\tCurrent working directory: %s\n" -msgstr "\tTrenutna delovna mapa: %s\n" - -#, c-format msgid "Failed to mkdir: %s\n" msgstr "Napaka pri mkdir: %s\n" #, c-format -msgid "\tCreated directory: %s\n" -msgstr "\tNarejena mapa: %s\n" - -#, c-format msgid "Failed to chdir to %s\n" msgstr "Napak pri chdir na %s\n" #, c-format -msgid "\tchdir into %s\n" -msgstr "\tchdir v %s\n" - -#, c-format msgid "\tchdir back into %s\n" msgstr "\tchdir nazaj v %s\n" #, c-format -msgid "Fetching url:[%s]\n" -msgstr "Iem url:[%s]\n" - -#, c-format msgid "Failed to download: %s\n" msgstr "Napaka pri nalaganju: %s\n" @@ -190,10 +170,6 @@ msgid "Failed to unlink %s\n" msgstr "Napaka pri prekinjanju povezave%s\n" #, c-format -msgid "md5 sum for %s is not correct, override with --no-md5!\n" -msgstr "md5 sum za %s ni pravilen, prepii z --no-md5!\n" - -#, c-format msgid "MD5 found: [%s]\n" msgstr "MD5 najden: [%s]\n" @@ -416,14 +392,6 @@ msgid "Reading Package Lists..." msgstr "Berem seznam paketov..." #, c-format -msgid "Download of %s incomplete\n" -msgstr "%s nedokonanih prenosov\n" - -#, c-format -msgid "Could not find MD5 checksum for %s, override with --no-md5\n" -msgstr "MD5 kontrolna vsota za %s ni bila najdena, prepii z --no-md5\n" - -#, c-format msgid "%s, which is required by %s, is excluded\n" msgstr "%s, ki je potreben s strani %s, je bil izloen\n" @@ -490,3 +458,45 @@ msgstr "Package ChangeLog" msgid "Retrieving ChangeLog.txt [%s]..." msgstr "Retrieving ChangeLog.txt [%s]..." +msgid "MD5 checksum mismatch, override with --no-md5" +msgstr "MD5 checksum mismatch, override with --no-md5" + +msgid "Missing MD5 checksum, override with --no-md5" +msgstr "Missing MD5 checksum, override with --no-md5" + +msgid "Incomplete download" +msgstr "Incomplete download" + +msgid "GPG key successfully imported" +msgstr "GPG key successfully imported" + +msgid "GPG key could not be imported" +msgstr "GPG key could not be imported" + +msgid "GPG key already present" +msgstr "GPG key already present" + +msgid "Checksums signature successfully verified" +msgstr "Checksums signature successfully verified" + +msgid "Checksums signature could not be verified" +msgstr "Checksums signature could not be verified" + +msgid "Verified" +msgstr "Verified" + +msgid "Not Verified" +msgstr "Not Verified" + +msgid "Retrieving GPG key [%s]..." +msgstr "Retrieving GPG key [%s]..." + +msgid "Retrieving checksum signature [%s]..." +msgstr "Retrieving checksum signature [%s]..." + +msgid "No key for verification" +msgstr "No key for verification" + +msgid "retrieve GPG keys for sources" +msgstr "retrieve GPG keys for sources" + diff --git a/po/slapt-get.pot b/po/slapt-get.pot index f1e4242..d6116d0 100644 --- a/po/slapt-get.pot +++ b/po/slapt-get.pot @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: 0.9.11i\n" +"Project-Id-Version: 0.9.12\n" "POT-Creation-Date: 2003-11-03 14:28+0000\n" -"PO-Revision-Date: 2007-05-20 16:00+0500\n" +"PO-Revision-Date: 2007-06-09 23:10+0500\n" "Last-Translator: Jason Woodward <woodwardj@jaos.org>\n" "Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n" "MIME-Version: 1.0\n" @@ -135,42 +135,22 @@ msgstr "" msgid "Failed to chdir: %s\n" msgstr "" -#, c-format -msgid "unlinking %s\n" -msgstr "" - msgid "Failed to get cwd\n" msgstr "" #, c-format -msgid "\tCurrent working directory: %s\n" -msgstr "" - -#, c-format msgid "Failed to mkdir: %s\n" msgstr "" #, c-format -msgid "\tCreated directory: %s\n" -msgstr "" - -#, c-format msgid "Failed to chdir to %s\n" msgstr "" #, c-format -msgid "\tchdir into %s\n" -msgstr "" - -#, c-format msgid "\tchdir back into %s\n" msgstr "" #, c-format -msgid "Fetching url:[%s]\n" -msgstr "" - -#, c-format msgid "Failed to download: %s\n" msgstr "" @@ -190,10 +170,6 @@ msgid "Failed to unlink %s\n" msgstr "" #, c-format -msgid "md5 sum for %s is not correct, override with --no-md5!\n" -msgstr "" - -#, c-format msgid "MD5 found: [%s]\n" msgstr "" @@ -416,14 +392,6 @@ msgid "Reading Package Lists..." msgstr "" #, c-format -msgid "Download of %s incomplete\n" -msgstr "" - -#, c-format -msgid "Could not find MD5 checksum for %s, override with --no-md5\n" -msgstr "" - -#, c-format msgid "%s, which is required by %s, is excluded\n" msgstr "" @@ -490,3 +458,45 @@ msgstr "" msgid "Retrieving ChangeLog.txt [%s]..." msgstr "" +msgid "MD5 checksum mismatch, override with --no-md5" +msgstr "" + +msgid "Missing MD5 checksum, override with --no-md5" +msgstr "" + +msgid "Incomplete download" +msgstr "" + +msgid "GPG key successfully imported" +msgstr "" + +msgid "GPG key could not be imported" +msgstr "" + +msgid "GPG key already present" +msgstr "" + +msgid "Checksums signature successfully verified" +msgstr "" + +msgid "Checksums signature could not be verified" +msgstr "" + +msgid "Verified" +msgstr "" + +msgid "Not Verified" +msgstr "" + +msgid "Retrieving GPG key [%s]..." +msgstr "" + +msgid "Retrieving checksum signature [%s]..." +msgstr "" + +msgid "No key for verification" +msgstr "" + +msgid "retrieve GPG keys for sources" +msgstr "" + @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: 0.9.11i\n" +"Project-Id-Version: 0.9.12\n" "POT-Creation-Date: 2003-11-03 14:28+0000\n" -"PO-Revision-Date: 2007-05-20 16:00+0500\n" +"PO-Revision-Date: 2007-06-15 23:10+0500\n" "Last-Translator: Joel Bjurman <ypolt@lediga.st>\n" "Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n" "MIME-Version: 1.0\n" @@ -135,42 +135,22 @@ msgstr "Misslyckades att ppna katalog %s\n" msgid "Failed to chdir: %s\n" msgstr "Misslyckades att byta till katalog: %s\n" -#, c-format -msgid "unlinking %s\n" -msgstr "Bryter lnk %s\n" - msgid "Failed to get cwd\n" msgstr "Misslyckades att hmta nuvarande katalogsnamn\n" #, c-format -msgid "\tCurrent working directory: %s\n" -msgstr "\tNuvarande katalog r: %s\n" - -#, c-format msgid "Failed to mkdir: %s\n" msgstr "Misslyckades att skapa katalog: %s\n" #, c-format -msgid "\tCreated directory: %s\n" -msgstr "\tSkapade katalog: %s\n" - -#, c-format msgid "Failed to chdir to %s\n" msgstr "Misslyckades att byta katalog till %s\n" #, c-format -msgid "\tchdir into %s\n" -msgstr "\tbyter katalog till %s\n" - -#, c-format msgid "\tchdir back into %s\n" msgstr "\tbyter katalog tillbaka till %s\n" #, c-format -msgid "Fetching url:[%s]\n" -msgstr "Hmtar url:[%s]\n" - -#, c-format msgid "Failed to download: %s\n" msgstr "Misslyckades att ladda hem: %s\n" @@ -190,10 +170,6 @@ msgid "Failed to unlink %s\n" msgstr "Misslyckades att bryta lnk %s\n" #, c-format -msgid "md5 sum for %s is not correct, override with --no-md5!\n" -msgstr "md5 summa fr %s r felaktigt, verskrid med --no-md5!\n" - -#, c-format msgid "MD5 found: [%s]\n" msgstr "MD5 funnen: [%s]\n" @@ -416,14 +392,6 @@ msgid "Reading Package Lists..." msgstr "Lser paketlista..." #, c-format -msgid "Download of %s incomplete\n" -msgstr "Nedladdningen av %s r ej komplett\n" - -#, c-format -msgid "Could not find MD5 checksum for %s, override with --no-md5\n" -msgstr "Kunde inte hitta MD5 checksum fr %s, verskrid med --no-md5\n" - -#, c-format msgid "%s, which is required by %s, is excluded\n" msgstr "%s, som krvs av %s, r exkluderat\n" @@ -490,3 +458,45 @@ msgstr "Package ChangeLog" msgid "Retrieving ChangeLog.txt [%s]..." msgstr "Retrieving ChangeLog.txt [%s]..." +msgid "MD5 checksum mismatch, override with --no-md5" +msgstr "MD5 checksum mismatch, override with --no-md5" + +msgid "Missing MD5 checksum, override with --no-md5" +msgstr "Missing MD5 checksum, override with --no-md5" + +msgid "Incomplete download" +msgstr "Incomplete download" + +msgid "GPG key successfully imported" +msgstr "GPG key successfully imported" + +msgid "GPG key could not be imported" +msgstr "GPG key could not be imported" + +msgid "GPG key already present" +msgstr "GPG key already present" + +msgid "Checksums signature successfully verified" +msgstr "Checksums signature successfully verified" + +msgid "Checksums signature could not be verified" +msgstr "Checksums signature could not be verified" + +msgid "Verified" +msgstr "Verified" + +msgid "Not Verified" +msgstr "Not Verified" + +msgid "Retrieving GPG key [%s]..." +msgstr "Retrieving GPG key [%s]..." + +msgid "Retrieving checksum signature [%s]..." +msgstr "Retrieving checksum signature [%s]..." + +msgid "No key for verification" +msgstr "No key for verification" + +msgid "retrieve GPG keys for sources" +msgstr "retrieve GPG keys for sources" + @@ -4,9 +4,9 @@ # Bekir SONAT <bekirsonat@kde.org.tr>, 2006. msgid "" msgstr "" -"Project-Id-Version: 0.9.11i\n" +"Project-Id-Version: 0.9.12\n" "POT-Creation-Date: 2003-11-03 14:28+0000\n" -"PO-Revision-Date: 2007-05-20 16:00+0500\n" +"PO-Revision-Date: 2007-06-15 23:10+0500\n" "Last-Translator: Bekir SONAT <bekirsonat@kde.org.tr>\n" "Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n" "MIME-Version: 1.0\n" @@ -137,44 +137,23 @@ msgstr "%s dizini açılamıyor\n" msgid "Failed to chdir: %s\n" msgstr "Başarısız chdir: %s\n" -#, c-format -msgid "unlinking %s\n" -msgstr "%s bağlantısı kaldırılıyor\n" - msgid "Failed to get cwd\n" msgstr "Başarısız cwd\n" #, c-format -msgid "\tCurrent working directory: %s\n" -msgstr "\tBulunulan çalışma dizini: %s\n" - -#, c-format msgid "Failed to mkdir: %s\n" msgstr "Başarısız mkdir: %s\n" #, c-format -msgid "\tCreated directory: %s\n" -msgstr "\tOluşturulan dizin: %s\n" - -#, c-format msgid "Failed to chdir to %s\n" msgstr "Başarısız chdir %s\n" #, c-format #, fuzzy -msgid "\tchdir into %s\n" -msgstr "\tchdir %s\n" - -#, c-format -#, fuzzy msgid "\tchdir back into %s\n" msgstr "\tDönülen chdir %s\n" #, c-format -msgid "Fetching url:[%s]\n" -msgstr "Eşleştirilen konum:[%s]\n" - -#, c-format msgid "Failed to download: %s\n" msgstr "Başarısız indirme: %s\n" @@ -194,10 +173,6 @@ msgid "Failed to unlink %s\n" msgstr "Başarısız unlink %s\n" #, c-format -msgid "md5 sum for %s is not correct, override with --no-md5!\n" -msgstr "%s için md5 sağlaması doğru değil, --no-md5 seçeneği ile atlayabilirsiniz!\n" - -#, c-format msgid "MD5 found: [%s]\n" msgstr "Bulunan MD5 imzası: %s]\n" @@ -422,14 +397,6 @@ msgid "Reading Package Lists..." msgstr "Paket Listelerini Okuyor..." #, c-format -msgid "Download of %s incomplete\n" -msgstr "%s indirme yarım kaldı\n" - -#, c-format -msgid "Could not find MD5 checksum for %s, override with --no-md5\n" -msgstr "%s dosyasının MD5 imza dosyası bulunamadı, --no-md5 ile atlayabilirsiniz\n" - -#, c-format #, fuzzy msgid "%s, which is required by %s, is excluded\n" msgstr "%s, %s tarafından gereksiniliyordu,-dışlandı\n" @@ -497,3 +464,45 @@ msgstr "Paket EvrimGüncesi" msgid "Retrieving ChangeLog.txt [%s]..." msgstr "[%s] için ChangeLog.txt EvrimGüncesi alınıyor..." +msgid "MD5 checksum mismatch, override with --no-md5" +msgstr "MD5 checksum mismatch, override with --no-md5" + +msgid "Missing MD5 checksum, override with --no-md5" +msgstr "Missing MD5 checksum, override with --no-md5" + +msgid "Incomplete download" +msgstr "Incomplete download" + +msgid "GPG key successfully imported" +msgstr "GPG key successfully imported" + +msgid "GPG key could not be imported" +msgstr "GPG key could not be imported" + +msgid "GPG key already present" +msgstr "GPG key already present" + +msgid "Checksums signature successfully verified" +msgstr "Checksums signature successfully verified" + +msgid "Checksums signature could not be verified" +msgstr "Checksums signature could not be verified" + +msgid "Verified" +msgstr "Verified" + +msgid "Not Verified" +msgstr "Not Verified" + +msgid "Retrieving GPG key [%s]..." +msgstr "Retrieving GPG key [%s]..." + +msgid "Retrieving checksum signature [%s]..." +msgstr "Retrieving checksum signature [%s]..." + +msgid "No key for verification" +msgstr "No key for verification" + +msgid "retrieve GPG keys for sources" +msgstr "retrieve GPG keys for sources" + @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: 0.9.11i\n" +"Project-Id-Version: 0.9.12\n" "POT-Creation-Date: 2005-09-07 23:24 EEST\n" -"PO-Revision-Date: 2007-05-20 16:00+0500\n" +"PO-Revision-Date: 2007-06-15 23:10+0500\n" "Last-Translators: sin <digitalhunger@gmail.com>\n" "Language-Team: DeepStyle Team <hottab@deepstyle.org.ua>\n" "MIME-Version: 1.0\n" @@ -136,42 +136,22 @@ msgstr " צ %s\n" msgid "Failed to chdir: %s\n" msgstr " %s.\n" -#, c-format -msgid "unlinking %s\n" -msgstr " : %s\n" - msgid "Failed to get cwd\n" msgstr " cwd\n" #, c-format -msgid "\tCurrent working directory: %s\n" -msgstr "\t : %s\n" - -#, c-format msgid "Failed to mkdir: %s\n" msgstr " : %s\n" #, c-format -msgid "\tCreated directory: %s\n" -msgstr " : %s\n" - -#, c-format msgid "Failed to chdir to %s\n" msgstr " %s.\n" #, c-format -msgid "\tchdir into %s\n" -msgstr "\tȦ %s\n" - -#, c-format msgid "\tchdir back into %s\n" msgstr "\t %s\n" #, c-format -msgid "Fetching url:[%s]\n" -msgstr " url:[%s]\n" - -#, c-format msgid "Failed to download: %s\n" msgstr " : %s\n" @@ -191,10 +171,6 @@ msgid "Failed to unlink %s\n" msgstr " %s\n" #, c-format -msgid "md5 sum for %s is not correct, override with --no-md5!\n" -msgstr " (md5) %s צ, --no-md5!\n" - -#, c-format msgid "MD5 found: [%s]\n" msgstr " MD5: [%s]\n" @@ -417,14 +393,6 @@ msgid "Reading Package Lists..." msgstr " ̦ ˦..." #, c-format -msgid "Download of %s incomplete\n" -msgstr " %s \n" - -#, c-format -msgid "Could not find MD5 checksum for %s, override with --no-md5\n" -msgstr " MD5 %s, --no-md5\n" - -#, c-format msgid "%s, which is required by %s, is excluded\n" msgstr "%s, Ȧ %s, \n" @@ -491,3 +459,45 @@ msgstr "Package ChangeLog" msgid "Retrieving ChangeLog.txt [%s]..." msgstr "Retrieving ChangeLog.txt [%s]..." +msgid "MD5 checksum mismatch, override with --no-md5" +msgstr "MD5 checksum mismatch, override with --no-md5" + +msgid "Missing MD5 checksum, override with --no-md5" +msgstr "Missing MD5 checksum, override with --no-md5" + +msgid "Incomplete download" +msgstr "Incomplete download" + +msgid "GPG key successfully imported" +msgstr "GPG key successfully imported" + +msgid "GPG key could not be imported" +msgstr "GPG key could not be imported" + +msgid "GPG key already present" +msgstr "GPG key already present" + +msgid "Checksums signature successfully verified" +msgstr "Checksums signature successfully verified" + +msgid "Checksums signature could not be verified" +msgstr "Checksums signature could not be verified" + +msgid "Verified" +msgstr "Verified" + +msgid "Not Verified" +msgstr "Not Verified" + +msgid "Retrieving GPG key [%s]..." +msgstr "Retrieving GPG key [%s]..." + +msgid "Retrieving checksum signature [%s]..." +msgstr "Retrieving checksum signature [%s]..." + +msgid "No key for verification" +msgstr "No key for verification" + +msgid "retrieve GPG keys for sources" +msgstr "retrieve GPG keys for sources" + @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: 0.9.11i\n" +"Project-Id-Version: 0.9.12\n" "POT-Creation-Date: 2003-11-03 14:28+0000\n" -"PO-Revision-Date: 2007-05-20 16:00+0500\n" +"PO-Revision-Date: 2007-06-15 23:10+0500\n" "Last-Translator: Nguyễn Văn Vũ <vncasper@yahoo.com>\n" "Language-Team: gnome-vi <gnomevi-list@lists.sourceforge.net>\n" "MIME-Version: 1.0\n" @@ -135,42 +135,22 @@ msgstr "Bị lỗi khi mở thư mục %s\n" msgid "Failed to chdir: %s\n" msgstr "Bị lỗi khi chuyển vào thư mục: %s\n" -#, c-format -msgid "unlinking %s\n" -msgstr "xoá liên kết %s\n" - msgid "Failed to get cwd\n" msgstr "Bị lỗi khi xác định thư mục hiện hành\n" #, c-format -msgid "\tCurrent working directory: %s\n" -msgstr "\tThư mục làm việc hiện hành: %s\n" - -#, c-format msgid "Failed to mkdir: %s\n" msgstr "Bị lỗi khi tạo thư mục: %s\n" #, c-format -msgid "\tCreated directory: %s\n" -msgstr "\tThư mục đã được tạo: %s\n" - -#, c-format msgid "Failed to chdir to %s\n" msgstr "Bị lỗi khi chuyển vào thư mục %s\n" #, c-format -msgid "\tchdir into %s\n" -msgstr "\tchuyển vào thư mục %s\n" - -#, c-format msgid "\tchdir back into %s\n" msgstr "\tquay về thư mục %s\n" #, c-format -msgid "Fetching url:[%s]\n" -msgstr "Cập nhật url:[%s]\n" - -#, c-format msgid "Failed to download: %s\n" msgstr "Bị lỗi trong khi lấy dữ liệu: %s\n" @@ -190,10 +170,6 @@ msgid "Failed to unlink %s\n" msgstr "Bị lỗi khi xoá %s\n" #, c-format -msgid "md5 sum for %s is not correct, override with --no-md5!\n" -msgstr "Tổng md5 của %s không đúng, bỏ qua với tuỳ chọn --no-md5!\n" - -#, c-format msgid "MD5 found: [%s]\n" msgstr "MD5 tìm thấy: [%s]\n" @@ -416,14 +392,6 @@ msgid "Reading Package Lists..." msgstr "Cập nhật danh sách gói phần mềm..." #, c-format -msgid "Download of %s incomplete\n" -msgstr "Chưa lấy xong dữ liệu của %s\n" - -#, c-format -msgid "Could not find MD5 checksum for %s, override with --no-md5\n" -msgstr "Không tìm thấy tổng MD5 cho %s, bỏ qua với tuỳ chọn --no-md5\n" - -#, c-format msgid "%s, which is required by %s, is excluded\n" msgstr "%s, do %s yêu cầu, được bỏ qua\n" @@ -492,3 +460,45 @@ msgstr "Package ChangeLog" msgid "Retrieving ChangeLog.txt [%s]..." msgstr "Retrieving ChangeLog.txt [%s]..." +msgid "MD5 checksum mismatch, override with --no-md5" +msgstr "MD5 checksum mismatch, override with --no-md5" + +msgid "Missing MD5 checksum, override with --no-md5" +msgstr "Missing MD5 checksum, override with --no-md5" + +msgid "Incomplete download" +msgstr "Incomplete download" + +msgid "GPG key successfully imported" +msgstr "GPG key successfully imported" + +msgid "GPG key could not be imported" +msgstr "GPG key could not be imported" + +msgid "GPG key already present" +msgstr "GPG key already present" + +msgid "Checksums signature successfully verified" +msgstr "Checksums signature successfully verified" + +msgid "Checksums signature could not be verified" +msgstr "Checksums signature could not be verified" + +msgid "Verified" +msgstr "Verified" + +msgid "Not Verified" +msgstr "Not Verified" + +msgid "Retrieving GPG key [%s]..." +msgstr "Retrieving GPG key [%s]..." + +msgid "Retrieving checksum signature [%s]..." +msgstr "Retrieving checksum signature [%s]..." + +msgid "No key for verification" +msgstr "No key for verification" + +msgid "retrieve GPG keys for sources" +msgstr "retrieve GPG keys for sources" + diff --git a/po/zh_CN.po b/po/zh_CN.po index 5f51985..4b7a6e6 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: 0.9.11i\n" +"Project-Id-Version: 0.9.12\n" "POT-Creation-Date: 2003-11-03 14:28+0000\n" -"PO-Revision-Date: 2007-05-20 16:00+0500\n" +"PO-Revision-Date: 2007-06-15 23:10+0500\n" "Last-Translator: Yang Jinsong <shannleon@gmail.com>\n" "Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n" "MIME-Version: 1.0\n" @@ -135,42 +135,22 @@ msgstr "打开目录 %s 失败\n" msgid "Failed to chdir: %s\n" msgstr "进入目录 %s 失败\n" -#, c-format -msgid "unlinking %s\n" -msgstr "正在删除链接 %s\n" - msgid "Failed to get cwd\n" msgstr "无法获得当前工作目录\n" #, c-format -msgid "\tCurrent working directory: %s\n" -msgstr "\t当前工作目录: %s\n" - -#, c-format msgid "Failed to mkdir: %s\n" msgstr "建立目录 %s 失败\n" #, c-format -msgid "\tCreated directory: %s\n" -msgstr "\t已建立目录: %s\n" - -#, c-format msgid "Failed to chdir to %s\n" msgstr "进入目录 %s 失败\n" #, c-format -msgid "\tchdir into %s\n" -msgstr "\t进入目录 %s\n" - -#, c-format msgid "\tchdir back into %s\n" msgstr "\t回到目录 %s\n" #, c-format -msgid "Fetching url:[%s]\n" -msgstr "下载网址:[%s]\n" - -#, c-format msgid "Failed to download: %s\n" msgstr "下载 %s 失败\n" @@ -190,10 +170,6 @@ msgid "Failed to unlink %s\n" msgstr "删除链接 %s 失败\n" #, c-format -msgid "md5 sum for %s is not correct, override with --no-md5!\n" -msgstr "%s 的 MD5 校验值不正确,使用 --no-md5 选项忽略此问题\n" - -#, c-format msgid "MD5 found: [%s]\n" msgstr "发现的 MD5 校验值: [%s]\n" @@ -416,14 +392,6 @@ msgid "Reading Package Lists..." msgstr "读取软件包列表..." #, c-format -msgid "Download of %s incomplete\n" -msgstr "下载 %s 未完成\n" - -#, c-format -msgid "Could not find MD5 checksum for %s, override with --no-md5\n" -msgstr "无法找到 %s 的 MD5 校验值, 使用 --no-md5 选项忽略此问题\n" - -#, c-format msgid "%s, which is required by %s, is excluded\n" msgstr "%s 为 %s 所需要, 但却被设置为排除\n" @@ -490,3 +458,45 @@ msgstr "Package ChangeLog" msgid "Retrieving ChangeLog.txt [%s]..." msgstr "Retrieving ChangeLog.txt [%s]..." +msgid "MD5 checksum mismatch, override with --no-md5" +msgstr "MD5 checksum mismatch, override with --no-md5" + +msgid "Missing MD5 checksum, override with --no-md5" +msgstr "Missing MD5 checksum, override with --no-md5" + +msgid "Incomplete download" +msgstr "Incomplete download" + +msgid "GPG key successfully imported" +msgstr "GPG key successfully imported" + +msgid "GPG key could not be imported" +msgstr "GPG key could not be imported" + +msgid "GPG key already present" +msgstr "GPG key already present" + +msgid "Checksums signature successfully verified" +msgstr "Checksums signature successfully verified" + +msgid "Checksums signature could not be verified" +msgstr "Checksums signature could not be verified" + +msgid "Verified" +msgstr "Verified" + +msgid "Not Verified" +msgstr "Not Verified" + +msgid "Retrieving GPG key [%s]..." +msgstr "Retrieving GPG key [%s]..." + +msgid "Retrieving checksum signature [%s]..." +msgstr "Retrieving checksum signature [%s]..." + +msgid "No key for verification" +msgstr "No key for verification" + +msgid "retrieve GPG keys for sources" +msgstr "retrieve GPG keys for sources" + @@ -9,7 +9,7 @@ slapt-get: slapt-get (APT like system for Slackware) slapt-get: slapt-get is an APT like system for Slackware package management. slapt-get: -slapt-get: * See /usr/doc/slapt-get-0.9.11i/ for complete documentation. +slapt-get: * See /usr/doc/slapt-get-0.9.12/ for complete documentation. slapt-get: * You will also want to customize /etc/slapt-get/slapt-getrc, slapt-get: using a local mirror. www.slackware.com may be very busy. slapt-get: * Support: diff --git a/src/action.c b/src/action.c index 7e8dfd4..120657e 100644 --- a/src/action.c +++ b/src/action.c @@ -798,3 +798,32 @@ static int cmp_pkg_arch(const char *a,const char *b) return r; } +#ifdef SLAPT_HAS_GPGME +void slapt_pkg_action_add_keys(const slapt_rc_config *global_config) +{ + unsigned int s = 0, compressed = 0; + for(s = 0; s < global_config->sources->count; s++) + { + FILE *gpg_key = NULL; + printf(gettext("Retrieving GPG key [%s]..."), global_config->sources->url[s]); + gpg_key = slapt_get_pkg_source_gpg_key (global_config, + global_config->sources->url[s], + &compressed); + if (gpg_key != NULL) + { + slapt_code_t r = slapt_add_pkg_source_gpg_key(gpg_key); + if (r == SLAPT_GPG_KEY_UNCHANGED) { + printf("%s.\n",gettext("GPG key already present")); + } else if (r == SLAPT_GPG_KEY_IMPORTED) { + printf("%s.\n",gettext("GPG key successfully imported")); + } else { + printf("%s.\n",gettext("GPG key could not be imported")); + } + + fclose(gpg_key); + } + + } + +} +#endif diff --git a/src/action.h b/src/action.h index 337ee27..2415fb5 100644 --- a/src/action.h +++ b/src/action.h @@ -18,3 +18,6 @@ void slapt_pkg_action_search(const char *pattern); void slapt_pkg_action_show(const char *pkg_name); void slapt_pkg_action_upgrade_all(const slapt_rc_config *global_config); +#ifdef SLAPT_HAS_GPGME +void slapt_pkg_action_add_keys(const slapt_rc_config *global_config); +#endif diff --git a/src/common.c b/src/common.c index f1352fd..8ce1f1c 100644 --- a/src/common.c +++ b/src/common.c @@ -130,10 +130,6 @@ void slapt_create_dir_structure(const char *dir_name) if ( cwd == NULL ) { fprintf(stderr,gettext("Failed to get cwd\n")); return; - } else { - #if SLAPT_DEBUG == 1 - fprintf(stderr,gettext("\tCurrent working directory: %s\n"),cwd); - #endif } len = strlen(dir_name); @@ -152,21 +148,14 @@ void slapt_create_dir_structure(const char *dir_name) if ( strcmp(dir_name_buffer,".") != 0 ) { if ( (mkdir(dir_name_buffer,0755)) == -1) { - #if SLAPT_DEBUG == 1 - fprintf(stderr,gettext("Failed to mkdir: %s\n"),dir_name_buffer); - #endif - } else { - #if SLAPT_DEBUG == 1 - fprintf(stderr,gettext("\tCreated directory: %s\n"),dir_name_buffer); - #endif + if (errno != EEXIST) { + fprintf(stderr,gettext("Failed to mkdir: %s\n"),dir_name_buffer); + exit(EXIT_FAILURE); + } } if ( (chdir(dir_name_buffer)) == -1 ) { fprintf(stderr,gettext("Failed to chdir to %s\n"),dir_name_buffer); - return; - } else { - #if SLAPT_DEBUG == 1 - fprintf(stderr,gettext("\tchdir into %s\n"),dir_name_buffer); - #endif + exit(EXIT_FAILURE); } }/* don't create . */ @@ -187,14 +176,14 @@ void slapt_create_dir_structure(const char *dir_name) if ( strcmp(dir_name_buffer,".") != 0 ) { if ( (mkdir(dir_name_buffer,0755)) == -1 ) { - #if SLAPT_DEBUG == 1 - fprintf(stderr,gettext("Failed to mkdir: %s\n"),dir_name_buffer); - #endif + if (errno != EEXIST) { + fprintf(stderr,gettext("Failed to mkdir: %s\n"),dir_name_buffer); + exit(EXIT_FAILURE); + } } if ( (chdir(dir_name_buffer)) == -1 ) { fprintf(stderr,gettext("Failed to chdir to %s\n"),dir_name_buffer); - free(dir_name_buffer); - return; + exit(EXIT_FAILURE); } } /* don't create . */ @@ -288,3 +277,33 @@ __inline void *slapt_calloc(size_t n,size_t s) return p; } +const char *slapt_strerror(slapt_code_t code) +{ + switch (code) { + case SLAPT_OK: + return "No error"; + case SLAPT_MD5_CHECKSUM_MISMATCH: + return gettext("MD5 checksum mismatch, override with --no-md5"); + case SLAPT_MD5_CHECKSUM_MISSING: + return gettext("Missing MD5 checksum, override with --no-md5"); + case SLAPT_DOWNLOAD_INCOMPLETE: + return gettext("Incomplete download"); + #ifdef SLAPT_HAS_GPGME + case SLAPT_GPG_KEY_IMPORTED: + return gettext("GPG key successfully imported"); + case SLAPT_GPG_KEY_NOT_IMPORTED: + return gettext("GPG key could not be imported"); + case SLAPT_GPG_KEY_UNCHANGED: + return gettext("GPG key already present"); + case SLAPT_CHECKSUMS_VERIFIED: + return gettext("Checksums signature successfully verified"); + case SLAPT_CHECKSUMS_NOT_VERIFIED: + return gettext("Checksums signature could not be verified"); + case SLAPT_CHECKSUMS_MISSING_KEY: + return gettext("No key for verification"); + #endif + }; + + return gettext("Unknown error"); +} + diff --git a/src/common.h b/src/common.h index 27afd0e..79b425d 100644 --- a/src/common.h +++ b/src/common.h @@ -11,6 +11,21 @@ SLAPT_FALSE = FALSE, SLAPT_TRUE = TRUE #endif } SLAPT_BOOL_T; +typedef enum { + SLAPT_OK = 0, + SLAPT_MD5_CHECKSUM_MISMATCH, + SLAPT_MD5_CHECKSUM_MISSING, + #ifdef SLAPT_HAS_GPGME + SLAPT_GPG_KEY_IMPORTED, + SLAPT_GPG_KEY_NOT_IMPORTED, + SLAPT_GPG_KEY_UNCHANGED, + SLAPT_CHECKSUMS_VERIFIED, + SLAPT_CHECKSUMS_MISSING_KEY, + SLAPT_CHECKSUMS_NOT_VERIFIED, + #endif + SLAPT_DOWNLOAD_INCOMPLETE +} slapt_code_t; + typedef struct { regmatch_t pmatch[SLAPT_MAX_REGEX_PARTS]; regex_t regex; @@ -35,3 +50,6 @@ char *slapt_str_replace_chr(const char *string,const char find, __inline void *slapt_malloc(size_t s); __inline void *slapt_calloc(size_t n,size_t s); +/* return human readable error */ +const char *slapt_strerror(slapt_code_t code); + @@ -30,15 +30,11 @@ static int slapt_download_data(FILE *fh,const char *url,size_t bytes,long *filet { CURL *ch = NULL; CURLcode response; - char curl_err_buff[1024]; int return_code = 0; struct curl_slist *headers = NULL; struct slapt_progress_data *cb_data = slapt_init_progress_data(); cb_data->bytes = bytes; -#if SLAPT_DEBUG == 1 - printf(gettext("Fetching url:[%s]\n"),url); -#endif ch = curl_easy_init(); curl_easy_setopt(ch, CURLOPT_URL, url); curl_easy_setopt(ch, CURLOPT_WRITEDATA, fh); @@ -71,39 +67,17 @@ static int slapt_download_data(FILE *fh,const char *url,size_t bytes,long *filet curl_easy_setopt(ch, CURLOPT_PROGRESSDATA, cb_data); } - curl_easy_setopt(ch, CURLOPT_ERRORBUFFER, curl_err_buff ); - /* resume */ if (bytes > 0) { fseek(fh,0,SEEK_END); curl_easy_setopt(ch, CURLOPT_RESUME_FROM, bytes); } - if ((response = curl_easy_perform(ch)) != CURLE_OK) { - /* - * this is for proxy servers that can't resume - */ - if ( response == CURLE_HTTP_RANGE_ERROR ) { - return_code = CURLE_HTTP_RANGE_ERROR; - } else if ( response == CURLE_FTP_BAD_DOWNLOAD_RESUME ) { - return_code = CURLE_FTP_BAD_DOWNLOAD_RESUME; - } else if ( response == CURLE_PARTIAL_FILE ) { - return_code = CURLE_PARTIAL_FILE; - /* - * this is a simple hack for all ftp sources that won't have a patches dir - * we don't want an ugly error to confuse the user - */ - } else if ( strstr(url,SLAPT_PATCHES_LIST) != NULL ) { - return_code = 0; - } else { - fprintf(stderr,gettext("Failed to download: %s\n"),curl_err_buff); - return_code = -1; - } - } + if ((response = curl_easy_perform(ch)) != CURLE_OK) + return_code = response; - if ( filetime != NULL ) { + if ( filetime != NULL ) curl_easy_getinfo(ch, CURLINFO_FILETIME, filetime); - } /* * need to use curl_easy_cleanup() so that we don't @@ -185,7 +159,7 @@ char *slapt_head_request(const char *url) } -int slapt_get_mirror_data_from_source(FILE *fh, +const char *slapt_get_mirror_data_from_source(FILE *fh, const slapt_rc_config *global_config, const char *base_url, const char *filename) @@ -207,28 +181,34 @@ int slapt_get_mirror_data_from_source(FILE *fh, /* make sure we are back at the front of the file */ /* DISABLED */ /* rewind(fh); */ - return return_code; + return return_code != 0 + ? curl_easy_strerror(return_code) + : NULL; } -int slapt_download_pkg(const slapt_rc_config *global_config, - slapt_pkg_info_t *pkg) +const char *slapt_download_pkg(const slapt_rc_config *global_config, + slapt_pkg_info_t *pkg) { FILE *fh = NULL; char *file_name = NULL; char *url = NULL; size_t f_size = 0; - int pkg_verify_return = -1; + slapt_code_t verify = SLAPT_OK; int dl_return = -1, dl_total_size = 0; long filetime = 0; - if (pkg == NULL) - return -1; + if (pkg == NULL) { + fprintf(stderr,"slapt_download_pkg() called without a package!\n"); + exit(EXIT_FAILURE); + } - if (slapt_verify_downloaded_pkg(global_config,pkg) == 0) - return 0; + if (slapt_verify_downloaded_pkg(global_config,pkg) == SLAPT_OK) + return NULL; - if (pkg->mirror == NULL || strlen(pkg->mirror) == 0) - return -1; + if (pkg->mirror == NULL || strlen(pkg->mirror) == 0) { + fprintf(stderr,"slapt_download_pkg() called with a package that does not have a mirror!\n"); + exit(EXIT_FAILURE); + } /* chdir(global_config->working_dir); */ /* just in case */ slapt_create_dir_structure(pkg->location); @@ -272,9 +252,7 @@ int slapt_download_pkg(const slapt_rc_config *global_config, /* open the file to write, append if already present */ fh = slapt_open_file(file_name,"a+b"); if (fh == NULL) { - free(file_name); - free(url); - return -1; + exit(EXIT_FAILURE); } /* download the file to our file handle */ @@ -309,16 +287,12 @@ int slapt_download_pkg(const slapt_rc_config *global_config, /* if we set retry, make sure this counts as a retry */ if (global_config->retry > 1) - return -1; + return curl_easy_strerror(dl_return); else return slapt_download_pkg(global_config,pkg); } else { fclose(fh); - #if SLAPT_DEBUG == 1 - printf("Failure: %s-%s from %s %s\n",pkg->name,pkg->version, - pkg->mirror,pkg->location); - #endif #if SLAPT_DO_NOT_UNLINK_BAD_FILES == 0 /* if the d/l fails, unlink the empty file */ if (unlink(file_name) == -1) { @@ -332,7 +306,7 @@ int slapt_download_pkg(const slapt_rc_config *global_config, free(url); free(file_name); - return -1; + return curl_easy_strerror(dl_return); } @@ -348,16 +322,14 @@ int slapt_download_pkg(const slapt_rc_config *global_config, } /* check to make sure we have the complete file */ - pkg_verify_return = slapt_verify_downloaded_pkg(global_config,pkg); - if (pkg_verify_return == 0) { + verify = slapt_verify_downloaded_pkg(global_config,pkg); + if (verify == SLAPT_OK) { free(file_name); - return 0; + return NULL; + + } else { - } else if (pkg_verify_return == SLAPT_MD5_CHECKSUM_FAILED) { - fprintf(stderr, - gettext("md5 sum for %s is not correct, override with --no-md5!\n"), - pkg->name); #if SLAPT_DO_NOT_UNLINK_BAD_FILES == 0 /* if the checksum fails, unlink the bogus file */ if (unlink(file_name) == -1) { @@ -368,14 +340,9 @@ int slapt_download_pkg(const slapt_rc_config *global_config, } #endif - free(file_name); - - return -1; - } else { - printf(gettext("Download of %s incomplete\n"),pkg->name); free(file_name); - return -1; + return slapt_strerror(verify); } } @@ -6,19 +6,18 @@ char *slapt_head_request(const char *url); /* this fills FILE with data from url, used for PACKAGES.TXT and CHECKSUMS - returns 0 on success, on error -1 or CURLE_HTTP_RANGE_ERROR + Returns error on failure. */ -int slapt_get_mirror_data_from_source(FILE *fh, - const slapt_rc_config *global_config, - const char *base_url, - const char *filename); +const char *slapt_get_mirror_data_from_source(FILE *fh, + const slapt_rc_config *global_config, + const char *base_url, + const char *filename); /* - download pkg, calls download_data - returns 0 on success, on error -1 or CURLE_HTTP_RANGE_ERROR + download pkg, calls download_data. returns error on failure. */ -int slapt_download_pkg(const slapt_rc_config *global_config, - slapt_pkg_info_t *pkg); +const char *slapt_download_pkg(const slapt_rc_config *global_config, + slapt_pkg_info_t *pkg); /* this is the default progress callback if global_config->progress_cb == NULL diff --git a/src/gpgme.c b/src/gpgme.c new file mode 100644 index 0000000..068a5bd --- /dev/null +++ b/src/gpgme.c @@ -0,0 +1,265 @@ +/* + * Copyright (C) 2003-2007 Jason Woodward <woodwardj at jaos dot org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Library General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#include "main.h" + +FILE *slapt_get_pkg_source_checksums_signature (const slapt_rc_config *global_config, + const char *url, + unsigned int *compressed) +{ + FILE *tmp_checksum_f = NULL; + char *checksum_head = NULL; + SLAPT_BOOL_T interactive = global_config->progress_cb == NULL && global_config->dl_stats == SLAPT_FALSE + ? SLAPT_TRUE + : SLAPT_FALSE; + char *location_uncompressed = SLAPT_CHECKSUM_ASC_FILE; + char *location_compressed = SLAPT_CHECKSUM_ASC_FILE_GZ; + char *filename = NULL; + char *local_head = NULL; + char *location; + int checksums_compressed = *compressed; + + if (checksums_compressed == 1) { + location = location_compressed; + *compressed = 1; + } else { + location = location_uncompressed; + *compressed = 0; + } + + filename = slapt_gen_filename_from_url(url,location); + local_head = slapt_read_head_cache(filename); + checksum_head = slapt_head_mirror_data(url,location); + + if (checksum_head == NULL) + { + if (interactive == SLAPT_TRUE) + printf(gettext("Not Found\n")); + free(filename); + free(local_head); + if (checksum_head != NULL) + free(checksum_head); + return NULL; + } + + if (checksum_head != NULL && local_head != NULL && + strcmp(checksum_head,local_head) == 0) { + if ((tmp_checksum_f = slapt_open_file(filename,"r")) == NULL) + exit(EXIT_FAILURE); + + if (global_config->progress_cb == NULL) + printf(gettext("Cached\n")); + + } else { + const char *err = NULL; + + if ((tmp_checksum_f = slapt_open_file(filename,"w+b")) == NULL) + exit(EXIT_FAILURE); + + err = slapt_get_mirror_data_from_source(tmp_checksum_f, + global_config,url, + location); + if (!err) { + + if (interactive == SLAPT_TRUE) + printf(gettext("Done\n")); + + } else { + fprintf(stderr,gettext("Failed to download: %s\n"),err); + slapt_clear_head_cache(filename); + fclose(tmp_checksum_f); + free(filename); + free(local_head); + if (checksum_head != NULL) + free(checksum_head); + return NULL; + } + /* make sure we are back at the front of the file */ + rewind(tmp_checksum_f); + + /* if all is good, write it */ + if (checksum_head != NULL) + slapt_write_head_cache(checksum_head,filename); + + } + + free(filename); + free(local_head); + + if (checksum_head != NULL) + free(checksum_head); + + return tmp_checksum_f; +} + +FILE *slapt_get_pkg_source_gpg_key(const slapt_rc_config *global_config, + const char *url, + unsigned int *compressed) +{ + FILE *tmp_key_f = NULL; + char *key_head = NULL; + char *filename = slapt_gen_filename_from_url(url,SLAPT_GPG_KEY); + char *local_head = slapt_read_head_cache(filename); + SLAPT_BOOL_T interactive = global_config->progress_cb == NULL && global_config->dl_stats == SLAPT_FALSE + ? SLAPT_TRUE + : SLAPT_FALSE; + + *compressed = 0; + key_head = slapt_head_mirror_data(url,SLAPT_GPG_KEY); + + if (key_head == NULL) { + if (interactive == SLAPT_TRUE) + printf(gettext("Not Found\n")); + free(filename); + free(local_head); + if (key_head != NULL) + free(key_head); + return NULL; + } + + if (key_head != NULL && local_head != NULL && + strcmp(key_head,local_head) == 0) { + + if ((tmp_key_f = slapt_open_file(filename,"r")) == NULL) + exit(EXIT_FAILURE); + + if (global_config->progress_cb == NULL) + printf(gettext("Cached\n")); + + } else { + const char *err = NULL; + + if ((tmp_key_f = slapt_open_file(filename,"w+b")) == NULL) + exit(EXIT_FAILURE); + + err = slapt_get_mirror_data_from_source(tmp_key_f, + global_config, url, + SLAPT_GPG_KEY); + + if (!err) { + if (interactive == SLAPT_TRUE) + printf(gettext("Done\n")); + } else{ + fprintf(stderr,gettext("Failed to download: %s\n"),err); + slapt_clear_head_cache(filename); + fclose(tmp_key_f); + free(filename); + free(local_head); + if (key_head != NULL) + free(key_head); + return NULL; + } + + rewind(tmp_key_f); + + /* if all is good, write it */ + if (key_head != NULL) + slapt_write_head_cache(key_head, filename); + + } + + free(filename); + free(local_head); + + if (key_head != NULL) + free(key_head); + + return tmp_key_f; +} + +slapt_code_t slapt_add_pkg_source_gpg_key (FILE *key) +{ + gpgme_error_t e; + gpgme_ctx_t ctx; + gpgme_import_result_t import_result; + gpgme_data_t key_data; + slapt_code_t imported = SLAPT_GPG_KEY_NOT_IMPORTED; + + e = gpgme_new (&ctx); + assert (e == GPG_ERR_NO_ERROR); + e = gpgme_set_protocol (ctx, GPGME_PROTOCOL_OpenPGP); + assert (e == GPG_ERR_NO_ERROR); + gpgme_set_armor (ctx, 1); + + e = gpgme_data_new_from_stream (&key_data, key); + assert (e == GPG_ERR_NO_ERROR); + + e = gpgme_op_import(ctx, key_data); + assert (e == GPG_ERR_NO_ERROR); + + import_result = gpgme_op_import_result(ctx); + if (import_result != NULL) + { + if (import_result->unchanged > 0) + imported = SLAPT_GPG_KEY_UNCHANGED; + else if (import_result->imported > 0) + imported = SLAPT_GPG_KEY_IMPORTED; + } + + gpgme_data_release (key_data); + gpgme_release (ctx); + return imported; +} + +slapt_code_t slapt_gpg_verify_checksums(FILE *checksums, + FILE *signature) +{ + gpgme_error_t e; + gpgme_ctx_t ctx; + gpgme_data_t chk_data, asc_data; + slapt_code_t verified = SLAPT_CHECKSUMS_NOT_VERIFIED; + + e = gpgme_new (&ctx); + assert (e == GPG_ERR_NO_ERROR); + e = gpgme_set_protocol (ctx, GPGME_PROTOCOL_OpenPGP); + assert (e == GPG_ERR_NO_ERROR); + gpgme_set_armor (ctx, 1); + + e = gpgme_data_new_from_stream (&chk_data, checksums); + assert (e == GPG_ERR_NO_ERROR); + e = gpgme_data_new_from_stream (&asc_data, signature); + assert (e == GPG_ERR_NO_ERROR); + + e = gpgme_op_verify (ctx, asc_data, chk_data, NULL); + /* assert (e == GPG_ERR_NO_ERROR); */ + + if (e == GPG_ERR_NO_ERROR) + { + gpgme_verify_result_t verify_result = gpgme_op_verify_result (ctx); + if (verify_result != NULL) + { + gpgme_signature_t sig = verify_result->signatures; + gpgme_sigsum_t sum = sig->summary; + gpgme_error_t status = sig->status; + + if (sum & GPGME_SIGSUM_VALID || status == GPG_ERR_NO_ERROR) { + verified = SLAPT_CHECKSUMS_VERIFIED; + } else if (sum & GPGME_SIGSUM_KEY_MISSING) { + verified = SLAPT_CHECKSUMS_MISSING_KEY; + } + + } + } + + gpgme_data_release (chk_data); + gpgme_data_release (asc_data); + gpgme_release (ctx); + + return verified; +} + diff --git a/src/gpgme.h b/src/gpgme.h new file mode 100644 index 0000000..bd12c6d --- /dev/null +++ b/src/gpgme.h @@ -0,0 +1,21 @@ + +#include <gpgme.h> +#include <assert.h> + +#define SLAPT_GPG_KEY "GPG-KEY" +#define SLAPT_CHECKSUM_ASC_FILE "CHECKSUMS.md5.asc" +#define SLAPT_CHECKSUM_ASC_FILE_GZ "CHECKSUMS.md5.gz.asc" + +/* retrieve the signature of the CHECKSUMS.md5 file */ +FILE *slapt_get_pkg_source_checksums_signature (const slapt_rc_config *global_config, + const char *url, + unsigned int *compressed); +/* retrieve the package sources GPG-KEY */ +FILE *slapt_get_pkg_source_gpg_key(const slapt_rc_config *global_config, + const char *url, + unsigned int *compressed); +/* Add the GPG-KEY to the local keyring */ +slapt_code_t slapt_add_pkg_source_gpg_key (FILE *key); +/* Verify the signature is valid for the checksum file */ +slapt_code_t slapt_gpg_verify_checksums(FILE *checksums, FILE *signature); + @@ -71,6 +71,9 @@ int main( int argc, char *argv[] ) {"retry", 1, 0, SLAPT_RETRY_OPT}, {"no-upgrade", 0, 0, SLAPT_NO_UPGRADE_OPT}, {"install-set", 0, 0, SLAPT_INSTALL_DISK_SET_OPT}, + #ifdef SLAPT_HAS_GPGME + {"add-keys", 0, 0, SLAPT_ADD_KEYS_OPT}, + #endif {0, 0, 0, 0}, }; @@ -212,6 +215,11 @@ int main( int argc, char *argv[] ) case SLAPT_INSTALL_DISK_SET_OPT: /* install a disk set */ do_action = INSTALL_DISK_SET; break; + #ifdef SLAPT_HAS_GPGME + case SLAPT_ADD_KEYS_OPT: /* retrieve GPG keys for sources */ + do_action = ADD_KEYS; + break; + #endif default: usage(); slapt_free_rc_config(global_config); @@ -348,6 +356,11 @@ int main( int argc, char *argv[] ) case AVAILABLE: slapt_pkg_action_list(AVAILABLE); break; + #ifdef SLAPT_HAS_GPGME + case ADD_KEYS: + slapt_pkg_action_add_keys(global_config); + break; + #endif case USAGE: default: printf("main.c(l.%d): This should never be reached\n", __LINE__); @@ -380,6 +393,9 @@ void usage(void) printf(" --installed - %s\n",gettext("list installed pkgs")); printf(" --clean - %s\n",gettext("purge cached pkgs")); printf(" --autoclean - %s\n",gettext("only purge cache of older, unreacheable pkgs")); + #ifdef SLAPT_HAS_GPGME + printf(" --add-keys - %s\n",gettext("retrieve GPG keys for sources")); + #endif printf(" --version - %s\n",gettext("print version and license info")); printf("\n"); printf(gettext("Options:\n")); @@ -47,10 +47,16 @@ #include "curl.h" #include "transaction.h" #include "action.h" +#ifdef SLAPT_HAS_GPGME + #include "gpgme.h" +#endif enum slapt_action { USAGE = 0, UPDATE, INSTALL, REMOVE, SHOW, SEARCH, UPGRADE, LIST, INSTALLED, CLEAN, SHOWVERSION, AUTOCLEAN, AVAILABLE, + #ifdef SLAPT_HAS_GPGME + ADD_KEYS, + #endif INSTALL_DISK_SET }; @@ -84,7 +90,9 @@ enum slapt_action { #define SLAPT_AVAILABLE_OPT 'A' #define SLAPT_RETRY_OPT 'R' #define SLAPT_NO_UPGRADE_OPT 'N' +#ifdef SLAPT_HAS_GPGME + #define SLAPT_ADD_KEYS_OPT 'k' +#endif -#define SLAPT_DEBUG 0 #define SLAPT_DO_NOT_UNLINK_BAD_FILES 1 diff --git a/src/package.c b/src/package.c index 4fd3153..6f05a8e 100644 --- a/src/package.c +++ b/src/package.c @@ -1107,11 +1107,6 @@ void slapt_get_md5sums(struct slapt_pkg_list *pkgs, FILE *checksum_file) (slapt_cmp_pkg_versions(pkgs->pkgs[a]->version,version) == 0) && (strcmp(pkgs->pkgs[a]->location,location) == 0) ) { - #if SLAPT_DEBUG == 1 - printf("%s-%s@%s, %s-%s@%s: %s\n", - pkgs->pkgs[a]->name,pkgs->pkgs[a]->version, - pkgs->pkgs[a]->location,name,version,location,sum); - #endif memcpy(pkgs->pkgs[a]->md5, sum,md5sum_regex->pmatch[1].rm_eo - md5sum_regex->pmatch[1].rm_so + 1 ); @@ -1436,10 +1431,6 @@ int slapt_get_pkg_dependencies(const slapt_rc_config *global_config, ) return 1; - #if SLAPT_DEBUG == 1 - printf("Resolving deps for %s, with dep data: %s\n",pkg->name,pkg->required); - #endif - if (deps == NULL) deps = slapt_init_pkg_list(); @@ -1550,10 +1541,6 @@ int slapt_get_pkg_dependencies(const slapt_rc_config *global_config, deps->pkgs[deps->pkg_count - 1] = tmp; } - #if SLAPT_DEBUG == 1 - } else { - printf("%s already exists in dep list\n",tmp_pkg->name); - #endif } /* end already exists in dep check */ @@ -1647,9 +1634,6 @@ static slapt_pkg_info_t *parse_meta_entry(struct slapt_pkg_list *avail_pkgs, /* if the regex failed, just skip out */ if (parse_dep_regex->reg_return != 0) { - #if SLAPT_DEBUG == 1 - printf("regex %s failed on %s\n",SLAPT_REQUIRED_REGEX,dep_entry); - #endif slapt_free_regex(parse_dep_regex); return NULL; } @@ -1673,9 +1657,6 @@ static slapt_pkg_info_t *parse_meta_entry(struct slapt_pkg_list *avail_pkgs, /* if there is no conditional and version, return newest */ if (tmp_cond_len == 0 ) { - #if SLAPT_DEBUG == 1 - printf("no conditional\n"); - #endif if (newest_installed_pkg != NULL) { slapt_free_regex(parse_dep_regex); free(tmp_pkg_name); @@ -2020,7 +2001,7 @@ slapt_pkg_info_t *slapt_get_pkg_by_details(struct slapt_pkg_list *list, /* update package data from mirror url */ int slapt_update_pkg_cache(const slapt_rc_config *global_config) { - unsigned int i,source_dl_failed = 0; + unsigned int i,source_dl_failed = 0, compressed = 0; struct slapt_pkg_list *new_pkgs = slapt_init_pkg_list(); new_pkgs->free_pkgs = SLAPT_TRUE; @@ -2029,13 +2010,18 @@ int slapt_update_pkg_cache(const slapt_rc_config *global_config) struct slapt_pkg_list *available_pkgs = NULL; struct slapt_pkg_list *patch_pkgs = NULL; FILE *tmp_checksum_f = NULL; + #ifdef SLAPT_HAS_GPGME + FILE *tmp_signature_f = NULL; + FILE *tmp_checksum_to_verify_f = NULL; + #endif /* download our SLAPT_PKG_LIST */ printf(gettext("Retrieving package data [%s]..."), global_config->sources->url[i]); available_pkgs = slapt_get_pkg_source_packages(global_config, - global_config->sources->url[i]); + global_config->sources->url[i], + &compressed); if (available_pkgs == NULL) { source_dl_failed = 1; continue; @@ -2046,7 +2032,8 @@ int slapt_update_pkg_cache(const slapt_rc_config *global_config) global_config->sources->url[i]); patch_pkgs = slapt_get_pkg_source_patches(global_config, - global_config->sources->url[i]); + global_config->sources->url[i], + &compressed); /* download checksum file */ @@ -2054,12 +2041,56 @@ int slapt_update_pkg_cache(const slapt_rc_config *global_config) global_config->sources->url[i]); tmp_checksum_f = slapt_get_pkg_source_checksums(global_config, - global_config->sources->url[i]); + global_config->sources->url[i], + &compressed); + + #ifdef SLAPT_HAS_GPGME + printf(gettext("Retrieving checksum signature [%s]..."), global_config->sources->url[i]); + tmp_signature_f = slapt_get_pkg_source_checksums_signature (global_config, + global_config->sources->url[i], + &compressed); + /* if we downloaded the compressed checksums, open it raw (w/o gunzippign) */ + if (compressed == 1) + { + char *filename = slapt_gen_filename_from_url(global_config->sources->url[i], + SLAPT_CHECKSUM_FILE_GZ); + tmp_checksum_to_verify_f = slapt_open_file(filename,"r"); + free(filename); + } else { + tmp_checksum_to_verify_f = tmp_checksum_f; + } - printf(gettext("Retrieving ChangeLog.txt [%s]..."), - global_config->sources->url[i]); - slapt_get_pkg_source_changelog(global_config, - global_config->sources->url[i]); + if (tmp_signature_f != NULL && tmp_checksum_to_verify_f != NULL) { + slapt_code_t verified = SLAPT_CHECKSUMS_NOT_VERIFIED; + printf(gettext("Verifying checksum signature [%s]..."), global_config->sources->url[i]); + verified = slapt_gpg_verify_checksums(tmp_checksum_to_verify_f, tmp_signature_f); + if (verified == SLAPT_CHECKSUMS_VERIFIED) { + printf("%s\n",gettext("Verified")); + } else if (verified == SLAPT_CHECKSUMS_MISSING_KEY) { + printf("%s\n",gettext("No key for verification")); + } else { + printf("%s\n",gettext("Not Verified")); + source_dl_failed = 1; + fclose(tmp_checksum_f); + tmp_checksum_f = NULL; + } + } + + if (tmp_signature_f) + fclose(tmp_signature_f); + + /* if we opened the raw gzipped checksums, close it here */ + if (compressed == 1) + fclose(tmp_checksum_to_verify_f); + #endif + + if (source_dl_failed != 1) { + printf(gettext("Retrieving ChangeLog.txt [%s]..."), + global_config->sources->url[i]); + slapt_get_pkg_source_changelog(global_config, + global_config->sources->url[i], + &compressed); + } if (tmp_checksum_f != NULL) { unsigned int pkg_i; @@ -2280,14 +2311,13 @@ size_t slapt_get_pkg_file_size(const slapt_rc_config *global_config, } /* package is already downloaded and cached, md5sum if applicable is ok */ -int slapt_verify_downloaded_pkg(const slapt_rc_config *global_config, +slapt_code_t slapt_verify_downloaded_pkg(const slapt_rc_config *global_config, slapt_pkg_info_t *pkg) { char *file_name = NULL; FILE *fh_test = NULL; size_t file_size = 0; char md5sum_f[SLAPT_MD5_STR_LEN]; - int is_verified = 0,not_verified = -1; /* check the file size first so we don't run an md5 checksum @@ -2295,17 +2325,15 @@ int slapt_verify_downloaded_pkg(const slapt_rc_config *global_config, */ file_size = slapt_get_pkg_file_size(global_config,pkg); if ((unsigned int)(file_size/1024) != pkg->size_c) { - return not_verified; + return SLAPT_DOWNLOAD_INCOMPLETE; } /* if not checking the md5 checksum and the sizes match, assume its good */ if (global_config->no_md5_check == SLAPT_TRUE) - return is_verified; + return SLAPT_OK; /* check to see that we actually have an md5 checksum */ if (strcmp(pkg->md5,"") == 0) { - printf(gettext("Could not find MD5 checksum for %s, override with --no-md5\n"), - pkg->name); - return not_verified; + return SLAPT_MD5_CHECKSUM_MISSING; } /* build the file name */ @@ -2314,7 +2342,7 @@ int slapt_verify_downloaded_pkg(const slapt_rc_config *global_config, /* return if we can't open the file */ if ((fh_test = fopen(file_name,"r") ) == NULL) { free(file_name); - return not_verified; + return SLAPT_DOWNLOAD_INCOMPLETE; } free(file_name); @@ -2324,9 +2352,9 @@ int slapt_verify_downloaded_pkg(const slapt_rc_config *global_config, /* check to see if the md5sum is correct */ if (strcmp(md5sum_f,pkg->md5) == 0 ) - return is_verified; + return SLAPT_OK; - return SLAPT_MD5_CHECKSUM_FAILED; + return SLAPT_MD5_CHECKSUM_MISMATCH; } @@ -2499,9 +2527,6 @@ void slapt_clean_pkg_dir(const char *dir_name) /* if our regex matches */ if (cached_pkgs_regex->reg_return == 0 ) { - #if SLAPT_DEBUG == 1 - printf(gettext("unlinking %s\n"),file->d_name); - #endif unlink(file->d_name); } } @@ -2704,11 +2729,13 @@ static FILE *slapt_gunzip_file (const char *file_name,FILE *dest_file) } struct slapt_pkg_list *slapt_get_pkg_source_packages (const slapt_rc_config *global_config, - const char *url) + const char *url, unsigned int *compressed) { struct slapt_pkg_list *available_pkgs = NULL; char *pkg_head = NULL; + *compressed = 0; + /* try gzipped package list */ if ((pkg_head = slapt_head_mirror_data(url,SLAPT_PKG_LIST_GZ)) != NULL) { char *pkg_filename = slapt_gen_filename_from_url(url,SLAPT_PKG_LIST_GZ); @@ -2745,6 +2772,7 @@ struct slapt_pkg_list *slapt_get_pkg_source_packages (const slapt_rc_config *glo } else { FILE *tmp_pkg_f = NULL; + const char *err = NULL; if (global_config->progress_cb == NULL && global_config->dl_stats == SLAPT_TRUE) @@ -2754,8 +2782,10 @@ struct slapt_pkg_list *slapt_get_pkg_source_packages (const slapt_rc_config *glo exit(EXIT_FAILURE); /* retrieve the compressed package data */ - if (slapt_get_mirror_data_from_source(tmp_pkg_f,global_config,url, - SLAPT_PKG_LIST_GZ) == 0 ) { + err = slapt_get_mirror_data_from_source(tmp_pkg_f, + global_config,url, + SLAPT_PKG_LIST_GZ); + if (!err) { FILE *tmp_pkg_uncompressed_f = NULL; fclose(tmp_pkg_f); @@ -2793,6 +2823,7 @@ struct slapt_pkg_list *slapt_get_pkg_source_packages (const slapt_rc_config *glo printf(gettext("Done\n")); } else { + fprintf(stderr,gettext("Failed to download: %s\n"),err); fclose(tmp_pkg_f); slapt_clear_head_cache(pkg_filename); free(pkg_filename); @@ -2804,6 +2835,7 @@ struct slapt_pkg_list *slapt_get_pkg_source_packages (const slapt_rc_config *glo free(pkg_filename); free(pkg_local_head); + *compressed = 1; } else { /* fall back to uncompressed package list */ char *pkg_filename = slapt_gen_filename_from_url(url,SLAPT_PKG_LIST); @@ -2830,6 +2862,7 @@ struct slapt_pkg_list *slapt_get_pkg_source_packages (const slapt_rc_config *glo } else { FILE *tmp_pkg_f = NULL; + const char *err = NULL; if (global_config->progress_cb == NULL && global_config->dl_stats == SLAPT_TRUE) @@ -2839,8 +2872,10 @@ struct slapt_pkg_list *slapt_get_pkg_source_packages (const slapt_rc_config *glo exit(EXIT_FAILURE); /* retrieve the uncompressed package data */ - if (slapt_get_mirror_data_from_source(tmp_pkg_f,global_config,url, - SLAPT_PKG_LIST) == 0 ) { + err = slapt_get_mirror_data_from_source(tmp_pkg_f, + global_config,url, + SLAPT_PKG_LIST); + if (!err) { rewind(tmp_pkg_f); /* make sure we are back at the front of the file */ /* parse packages from what we downloaded */ @@ -2871,6 +2906,7 @@ struct slapt_pkg_list *slapt_get_pkg_source_packages (const slapt_rc_config *glo printf(gettext("Done\n")); } else { + fprintf(stderr,gettext("Failed to download: %s\n"),err); slapt_clear_head_cache(pkg_filename); free(pkg_filename); free(pkg_local_head); @@ -2892,10 +2928,11 @@ struct slapt_pkg_list *slapt_get_pkg_source_packages (const slapt_rc_config *glo } struct slapt_pkg_list *slapt_get_pkg_source_patches (const slapt_rc_config *global_config, - const char *url) + const char *url, unsigned int *compressed) { struct slapt_pkg_list *patch_pkgs = NULL; char *patch_head = NULL; + *compressed = 0; if ((patch_head = slapt_head_mirror_data(url,SLAPT_PATCHES_LIST_GZ)) != NULL) { char *patch_filename = slapt_gen_filename_from_url(url,SLAPT_PATCHES_LIST_GZ); @@ -2917,6 +2954,7 @@ struct slapt_pkg_list *slapt_get_pkg_source_patches (const slapt_rc_config *glob } else { FILE *tmp_patch_f = NULL; + const char *err = NULL; if (global_config->progress_cb == NULL && global_config->dl_stats == SLAPT_TRUE) @@ -2925,8 +2963,10 @@ struct slapt_pkg_list *slapt_get_pkg_source_patches (const slapt_rc_config *glob if ((tmp_patch_f = slapt_open_file(patch_filename,"w+b")) == NULL) exit (1); - if (slapt_get_mirror_data_from_source(tmp_patch_f,global_config,url, - SLAPT_PATCHES_LIST_GZ) == 0 ) { + err = slapt_get_mirror_data_from_source(tmp_patch_f, + global_config,url, + SLAPT_PATCHES_LIST_GZ); + if (!err) { FILE *tmp_patch_uncompressed_f = NULL; fclose(tmp_patch_f); @@ -2947,6 +2987,7 @@ struct slapt_pkg_list *slapt_get_pkg_source_patches (const slapt_rc_config *glob fclose(tmp_patch_uncompressed_f); } else { + fprintf(stderr,gettext("Failed to download: %s\n"),err); fclose(tmp_patch_f); /* we don't care if the patch fails, for example current doesn't have patches source_dl_failed = 1; */ @@ -2961,6 +3002,7 @@ struct slapt_pkg_list *slapt_get_pkg_source_patches (const slapt_rc_config *glob free(patch_local_head); free(patch_filename); + *compressed = 1; } else { char *patch_filename = slapt_gen_filename_from_url(url,SLAPT_PATCHES_LIST); @@ -2987,6 +3029,7 @@ struct slapt_pkg_list *slapt_get_pkg_source_patches (const slapt_rc_config *glob fclose(tmp_patch_f); } else { FILE *tmp_patch_f = NULL; + const char *err = NULL; if (global_config->progress_cb == NULL && global_config->dl_stats == SLAPT_TRUE) @@ -2995,8 +3038,10 @@ struct slapt_pkg_list *slapt_get_pkg_source_patches (const slapt_rc_config *glob if ((tmp_patch_f = slapt_open_file(patch_filename,"w+b")) == NULL) exit (1); - if (slapt_get_mirror_data_from_source(tmp_patch_f,global_config,url, - SLAPT_PATCHES_LIST) == 0 ) { + err = slapt_get_mirror_data_from_source(tmp_patch_f, + global_config,url, + SLAPT_PATCHES_LIST); + if (!err) { rewind(tmp_patch_f); /* make sure we are back at the front of the file */ patch_pkgs = slapt_parse_packages_txt(tmp_patch_f); @@ -3031,10 +3076,11 @@ struct slapt_pkg_list *slapt_get_pkg_source_patches (const slapt_rc_config *glob } FILE *slapt_get_pkg_source_checksums (const slapt_rc_config *global_config, - const char *url) + const char *url, unsigned int *compressed) { FILE *tmp_checksum_f = NULL; char *checksum_head = NULL; + *compressed = 0; if ((checksum_head = slapt_head_mirror_data(url,SLAPT_CHECKSUM_FILE_GZ)) != NULL) { char *filename = slapt_gen_filename_from_url(url,SLAPT_CHECKSUM_FILE_GZ); @@ -3052,6 +3098,7 @@ FILE *slapt_get_pkg_source_checksums (const slapt_rc_config *global_config, } else { FILE *working_checksum_f = NULL; + const char *err = NULL; if (global_config->progress_cb == NULL && global_config->dl_stats == SLAPT_TRUE) @@ -3060,8 +3107,10 @@ FILE *slapt_get_pkg_source_checksums (const slapt_rc_config *global_config, if ((working_checksum_f = slapt_open_file(filename,"w+b")) == NULL) exit(EXIT_FAILURE); - if (slapt_get_mirror_data_from_source(working_checksum_f,global_config,url, - SLAPT_CHECKSUM_FILE_GZ) == 0) { + err = slapt_get_mirror_data_from_source(working_checksum_f, + global_config,url, + SLAPT_CHECKSUM_FILE_GZ); + if (!err) { if (global_config->progress_cb == NULL && global_config->dl_stats == SLAPT_TRUE) @@ -3082,6 +3131,7 @@ FILE *slapt_get_pkg_source_checksums (const slapt_rc_config *global_config, slapt_write_head_cache(checksum_head,filename); } else { + fprintf(stderr,gettext("Failed to download: %s\n"),err); slapt_clear_head_cache(filename); tmp_checksum_f = working_checksum_f; working_checksum_f = NULL; @@ -3096,8 +3146,11 @@ FILE *slapt_get_pkg_source_checksums (const slapt_rc_config *global_config, rewind(tmp_checksum_f); } + free(filename); free(local_head); + *compressed = 1; + } else { char *filename = slapt_gen_filename_from_url(url,SLAPT_CHECKSUM_FILE); char *local_head = slapt_read_head_cache(filename); @@ -3117,6 +3170,8 @@ FILE *slapt_get_pkg_source_checksums (const slapt_rc_config *global_config, printf(gettext("Cached\n")); } else { + const char *err = NULL; + if ((tmp_checksum_f = slapt_open_file(filename,"w+b")) == NULL) exit(EXIT_FAILURE); @@ -3124,14 +3179,17 @@ FILE *slapt_get_pkg_source_checksums (const slapt_rc_config *global_config, global_config->dl_stats == SLAPT_TRUE) printf("\n"); - if (slapt_get_mirror_data_from_source(tmp_checksum_f,global_config,url, - SLAPT_CHECKSUM_FILE) == 0) { + err = slapt_get_mirror_data_from_source(tmp_checksum_f, + global_config,url, + SLAPT_CHECKSUM_FILE); + if (!err) { if (global_config->progress_cb == NULL && global_config->dl_stats == SLAPT_FALSE) printf(gettext("Done\n")); } else { + fprintf(stderr,gettext("Failed to download: %s\n"),err); slapt_clear_head_cache(filename); fclose(tmp_checksum_f); free(filename); @@ -3163,7 +3221,7 @@ FILE *slapt_get_pkg_source_checksums (const slapt_rc_config *global_config, } int slapt_get_pkg_source_changelog (const slapt_rc_config *global_config, - const char *url) + const char *url, unsigned int *compressed) { char *changelog_head = NULL; char *filename = NULL; @@ -3172,12 +3230,15 @@ int slapt_get_pkg_source_changelog (const slapt_rc_config *global_config, char *location_uncomp = SLAPT_CHANGELOG_FILE; char *location = location_gz; int success = 0,failure = -1; + *compressed = 0; changelog_head = slapt_head_mirror_data(url,location); if (changelog_head == NULL) { location = location_uncomp; changelog_head = slapt_head_mirror_data(url,location); + } else { + *compressed = 1; } if (changelog_head == NULL) { @@ -3196,6 +3257,7 @@ int slapt_get_pkg_source_changelog (const slapt_rc_config *global_config, } else { FILE *working_changelog_f = NULL; + const char *err = NULL; if (global_config->progress_cb == NULL && global_config->dl_stats == SLAPT_TRUE) @@ -3204,9 +3266,10 @@ int slapt_get_pkg_source_changelog (const slapt_rc_config *global_config, if ((working_changelog_f = slapt_open_file(filename,"w+b")) == NULL) exit(EXIT_FAILURE); - if (slapt_get_mirror_data_from_source(working_changelog_f,global_config,url, - location) == 0) { - + err = slapt_get_mirror_data_from_source(working_changelog_f, + global_config,url, + location); + if (!err) { if (global_config->progress_cb == NULL && global_config->dl_stats == SLAPT_TRUE) printf("\n"); @@ -3230,6 +3293,7 @@ int slapt_get_pkg_source_changelog (const slapt_rc_config *global_config, } } else { + fprintf(stderr,gettext("Failed to download: %s\n"),err); slapt_clear_head_cache(filename); free(filename); free(local_head); diff --git a/src/package.h b/src/package.h index b492dd4..f2dce68 100644 --- a/src/package.h +++ b/src/package.h @@ -16,7 +16,6 @@ #define SLAPT_MD5SUM_REGEX "([a-zA-Z0-9]{1,})[ ]{1,}([a-zA-Z0-9\\/._\\-]{1,})\\/(.*{1,})\\-(.*[\\-].*[\\-].*).t[gbl]z$" #define SLAPT_REQUIRED_REGEX "^[ ]{0,}([a-zA-Z0-9\\+_\\-]+)[ ]{0,}([\\<\\=\\>]+){0,}[ ]{0,}([a-zA-Z0-9\\.\\_\\-]+){0,}[ ]{0,}$" #define SLAPT_MD5_STR_LEN 34 -#define SLAPT_MD5_CHECKSUM_FAILED -100 #define SLAPT_PKG_LIST "PACKAGES.TXT" #define SLAPT_PKG_LIST_GZ "PACKAGES.TXT.gz" #define SLAPT_PKG_LIST_L "package_data" @@ -185,9 +184,9 @@ char *slapt_gen_pkg_url(slapt_pkg_info_t *pkg); int slapt_is_excluded(const slapt_rc_config *,slapt_pkg_info_t *); /* package is already downloaded and cached, md5sum if applicable is ok - returns 0 if download is cached, -1 if not + returns slapt_code_t. */ -int slapt_verify_downloaded_pkg(const slapt_rc_config *global_config, +slapt_code_t slapt_verify_downloaded_pkg(const slapt_rc_config *global_config, slapt_pkg_info_t *pkg); /* fill in the md5sum of the package @@ -261,15 +260,18 @@ int slapt_search_pkg_err_list(struct slapt_pkg_err_list *l, const char *pkg, const char *err); void slapt_free_pkg_err_list(struct slapt_pkg_err_list *l); -/* download the PACKAGES.TXT and CHECKSUMS.md5 files */ +/* + download the PACKAGES.TXT and CHECKSUMS.md5 files + compressed is set to 1 if the compressed version was downloaded. +*/ struct slapt_pkg_list *slapt_get_pkg_source_packages (const slapt_rc_config *global_config, - const char *url); + const char *url, unsigned int *compressed); struct slapt_pkg_list *slapt_get_pkg_source_patches (const slapt_rc_config *global_config, - const char *url); + const char *url, unsigned int *compressed); FILE *slapt_get_pkg_source_checksums (const slapt_rc_config *global_config, - const char *url); + const char *url, unsigned int *compressed); int slapt_get_pkg_source_changelog (const slapt_rc_config *global_config, - const char *url); + const char *url, unsigned int *compressed); /* clean package name from package description */ void slapt_clean_description (char *description, const char *name); diff --git a/src/transaction.c b/src/transaction.c index 06b6193..44ecc8f 100644 --- a/src/transaction.c +++ b/src/transaction.c @@ -356,14 +356,18 @@ int slapt_handle_transaction (const slapt_rc_config *global_config, /* download pkgs */ for (i = 0; i < tran->install_pkgs->pkg_count; ++i) { unsigned int retry_count, failed = 1; + for (retry_count = 0; retry_count < global_config->retry; ++retry_count) { - if (slapt_download_pkg(global_config,tran->install_pkgs->pkgs[i]) != 0) { + const char *err = slapt_download_pkg(global_config,tran->install_pkgs->pkgs[i]); + if (err) { + fprintf(stderr,gettext("Failed to download: %s\n"),err); failed = 1; } else { failed = 0; break; } } + if (failed == 1) exit(EXIT_FAILURE); } @@ -371,7 +375,9 @@ int slapt_handle_transaction (const slapt_rc_config *global_config, for (i = 0; i < tran->upgrade_pkgs->pkg_count; ++i) { unsigned int retry_count, failed = 1; for (retry_count = 0; retry_count < global_config->retry; ++retry_count) { - if (slapt_download_pkg(global_config,tran->upgrade_pkgs->pkgs[i]->upgrade) != 0) { + const char *err = slapt_download_pkg(global_config,tran->upgrade_pkgs->pkgs[i]->upgrade); + if (err) { + fprintf(stderr,gettext("Failed to download: %s\n"),err); failed = 1; } else { failed = 0; @@ -433,11 +439,6 @@ void slapt_add_install_to_transaction(slapt_transaction_t *tran, if (slapt_search_transaction_by_pkg(tran,pkg) == 1) return; - #if SLAPT_DEBUG == 1 - printf("adding install of %s-%s@%s to transaction\n", - pkg->name,pkg->version,pkg->location); - #endif - tmp_list = realloc( tran->install_pkgs->pkgs, sizeof *tran->install_pkgs->pkgs * (tran->install_pkgs->pkg_count + 1) @@ -471,11 +472,6 @@ void slapt_add_remove_to_transaction(slapt_transaction_t *tran, if (slapt_search_transaction_by_pkg(tran,pkg) == 1) return; - #if SLAPT_DEBUG == 1 - printf("adding remove of %s-%s@%s to transaction\n", - pkg->name,pkg->version,pkg->location); - #endif - tmp_list = realloc( tran->remove_pkgs->pkgs, sizeof *tran->remove_pkgs->pkgs * (tran->remove_pkgs->pkg_count + 1) @@ -504,11 +500,6 @@ void slapt_add_exclude_to_transaction(slapt_transaction_t *tran, if (slapt_search_transaction_by_pkg(tran,pkg) == 1) return; - #if SLAPT_DEBUG == 1 - printf("adding exclude of %s-%s@%s to transaction\n", - pkg->name,pkg->version,pkg->location); - #endif - tmp_list = realloc( tran->exclude_pkgs->pkgs, sizeof *tran->exclude_pkgs->pkgs * (tran->exclude_pkgs->pkg_count + 1) @@ -539,12 +530,6 @@ void slapt_add_upgrade_to_transaction(slapt_transaction_t *tran, if (slapt_search_transaction_by_pkg(tran,slapt_upgrade_pkg) == 1) return; - #if SLAPT_DEBUG == 1 - printf("adding upgrade of %s-%s@%s to transaction\n", - slapt_upgrade_pkg->name,slapt_upgrade_pkg->version, - slapt_upgrade_pkg->location); - #endif - tmp_list = realloc( tran->upgrade_pkgs->pkgs, sizeof *tran->upgrade_pkgs->pkgs * (tran->upgrade_pkgs->pkg_count + 1) @@ -1,9 +1,10 @@ TESTOBJS=test.o test_common.o test_configuration.o test_curl.o test_packages.o test_transaction.o CC=gcc CURLFLAGS=`curl-config --libs` +GPGMEFLAGS=`gpgme-config --libs` DEFINES= CFLAGS=-W -Werror -Wall -O2 -ansi -pedantic $(DEFINES) -LDFLAGS=$(CURLFLAGS) -lz +LDFLAGS=$(CURLFLAGS) $(GPGMEFLAGS) -lz CHECKFLAGS=`pkg-config --libs check` test: $(TESTOBJS) diff --git a/t/test_curl.c b/t/test_curl.c index 8dd99bc..115c48b 100644 --- a/t/test_curl.c +++ b/t/test_curl.c @@ -16,7 +16,7 @@ static int _progress_cb(void *clientp, double dltotal, double dlnow, START_TEST (test_slapt_get_mirror_data_from_source) { FILE *f = NULL; - int r = -1; + const char *err = NULL; slapt_rc_config *rc = slapt_read_rc_config("./data/rc1"); const char *url = "http://software.jaos.org/slackpacks/10.0/"; char *packages = "PACKAGES.TXT"; @@ -26,23 +26,23 @@ START_TEST (test_slapt_get_mirror_data_from_source) rc->progress_cb = _progress_cb; /* silence */ f = slapt_open_file("data/PACKAGES.TXT","w+b"); - r = slapt_get_mirror_data_from_source(f, rc, url, packages); - fail_unless (r == 0); + err = slapt_get_mirror_data_from_source(f, rc, url, packages); + fail_if (err); fclose(f); f = slapt_open_file("data/PACKAGES.TXT.gz","w+b"); - r = slapt_get_mirror_data_from_source(f, rc, url, packages_gz); - fail_unless (r == 0); + err = slapt_get_mirror_data_from_source(f, rc, url, packages_gz); + fail_if (err); fclose(f); f = slapt_open_file("data/CHECKSUMS.md5","w+b"); - r = slapt_get_mirror_data_from_source(f, rc, url, checksums); - fail_unless (r == 0); + err = slapt_get_mirror_data_from_source(f, rc, url, checksums); + fail_if (err); fclose(f); f = slapt_open_file("data/CHECKSUMS.md5.gz","w+b"); - r = slapt_get_mirror_data_from_source(f, rc, url, checksums_gz); - fail_unless (r == 0); + err = slapt_get_mirror_data_from_source(f, rc, url, checksums_gz); + fail_if (err); fclose(f); unlink("data/PACKAGES.TXT"); @@ -57,13 +57,13 @@ END_TEST START_TEST (test_slapt_download_pkg) { - int r = -1; + const char *err = NULL; slapt_rc_config *rc = slapt_read_rc_config("./data/rc1"); rc->progress_cb = _progress_cb; /* silence */ slapt_working_dir_init(rc); - r = slapt_download_pkg(rc, &pkg); - fail_unless (r == 0); + err = slapt_download_pkg(rc, &pkg); + fail_if (err); slapt_free_rc_config(rc); } |