commit 71f1668a6962bcf43ae15d8c16da176965883322 Author: Jakub Bogusz <qbo...@pld-linux.org> Date: Thu Feb 26 19:53:09 2015 +0100
- updated to 2.0.27 (DoS fix) - updated pl.po-update,am patches gnupg2-am.patch | 8 ++--- gnupg2-pl.po-update.patch | 82 ++++++++--------------------------------------- gnupg2.spec | 6 ++-- 3 files changed, 21 insertions(+), 75 deletions(-) --- diff --git a/gnupg2.spec b/gnupg2.spec index 63fde5c..5ccc549 100644 --- a/gnupg2.spec +++ b/gnupg2.spec @@ -6,12 +6,12 @@ Summary: GNU Privacy Guard - tool for secure communication and data storage - enhanced version Summary(pl.UTF-8): GnuPG - narzędzie do bezpiecznej komunikacji i bezpiecznego przechowywania danych - wersja rozszerzona Name: gnupg2 -Version: 2.0.26 -Release: 2 +Version: 2.0.27 +Release: 1 License: GPL v3+ Group: Applications/File Source0: ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2 -# Source0-md5: fa7e704aad33eb114d1840164455aec1 +# Source0-md5: b35df68881a5ae432b0391b73773c698 Source1: gnupg-agent.sh Patch0: %{name}-info.patch Patch1: %{name}-pth.patch diff --git a/gnupg2-am.patch b/gnupg2-am.patch index 1b347c6..4afedba 100644 --- a/gnupg2-am.patch +++ b/gnupg2-am.patch @@ -1,11 +1,11 @@ ---- gnupg-2.0.20/configure.ac.orig 2013-05-12 17:32:39.674996433 +0200 -+++ gnupg-2.0.20/configure.ac 2013-05-12 17:33:18.451661475 +0200 +--- gnupg-2.0.27/configure.ac.orig 2015-02-26 19:33:04.165415100 +0100 ++++ gnupg-2.0.27/configure.ac 2015-02-26 19:40:14.108730388 +0100 @@ -62,7 +62,7 @@ AC_CONFIG_AUX_DIR(scripts) AC_CONFIG_SRCDIR(sm/gpgsm.c) -AM_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADERS(config.h) - AM_INIT_AUTOMAKE($PACKAGE, $VERSION) ++AC_CONFIG_HEADERS([config.h]) + AM_INIT_AUTOMAKE([serial-tests dist-bzip2 no-dist-gzip]) AC_CANONICAL_HOST AB_INIT diff --git a/gnupg2-pl.po-update.patch b/gnupg2-pl.po-update.patch index 090dd2e..9662bbb 100644 --- a/gnupg2-pl.po-update.patch +++ b/gnupg2-pl.po-update.patch @@ -1,72 +1,18 @@ ---- gnupg-2.0.24/po/pl.po.orig 2014-06-24 15:07:11.000000000 +0200 -+++ gnupg-2.0.24/po/pl.po 2014-06-29 20:30:21.654338043 +0200 -@@ -441,10 +441,8 @@ - msgstr "nie u�ywanie pami�ci PIN-�w przy podpisywaniu" +--- gnupg-2.0.27/po/pl.po.orig 2015-02-26 19:22:43.012107834 +0100 ++++ gnupg-2.0.27/po/pl.po 2015-02-26 19:31:01.692086906 +0100 +@@ -4038,13 +4038,11 @@ - #: agent/gpg-agent.c:189 --#, fuzzy --#| msgid "allow clients to mark keys as \"trusted\"" - msgid "disallow clients to mark keys as \"trusted\"" --msgstr "zezwolenie klientom na oznaczanie kluczy jako \"zaufanych\"" -+msgstr "brak zezwolenia dla klient�w na oznaczanie kluczy jako \"zaufanych\"" - - #: agent/gpg-agent.c:192 - msgid "allow presetting passphrase" -@@ -452,11 +450,11 @@ - - #: agent/gpg-agent.c:193 - msgid "enable ssh support" + #: g10/keyedit.c:3133 + msgid "WARNING: Your encryption subkey expires soon.\n" -msgstr "" -+msgstr "w��czenie obs�ugi ssh" - - #: agent/gpg-agent.c:196 - msgid "enable putty support" --msgstr "" -+msgstr "w��czenie obs�ugi putty" - - #: agent/gpg-agent.c:202 - msgid "|FILE|write environment settings also to FILE" -@@ -2919,14 +2917,13 @@ - msgstr "klucz %s: brak identyfikatora u�ytkownika\n" - - #: g10/import.c:804 --#, fuzzy, c-format --#| msgid "skipped \"%s\": %s\n" -+#, c-format - msgid "key %s: %s\n" --msgstr "pomini�ty ,,%s'': %s\n" -+msgstr "klucz %s: %s\n" ++msgstr "UWAGA: Podklucz szyfrujący wkrótce wygaśnie.\n" - #: g10/import.c:805 g10/import.c:1206 - msgid "rejected by import filter" --msgstr "" -+msgstr "odrzucony przez filtr importu" - - #: g10/import.c:834 - #, c-format -@@ -3049,10 +3046,9 @@ - msgstr "klucz %s: ,,%s'' bez zmian\n" - - #: g10/import.c:1205 --#, fuzzy, c-format --#| msgid "secret key \"%s\" not found: %s\n" -+#, c-format - msgid "secret key %s: %s\n" --msgstr "klucz prywatny ,,%s'' nie zosta� odnaleziony: %s\n" -+msgstr "klucz prywatny %s: %s\n" - - #: g10/import.c:1225 g10/import.c:1248 - msgid "importing secret keys not allowed\n" -@@ -6148,10 +6144,9 @@ - msgstr "UWAGA: klucz podpisuj�cy %s zosta� uniewa�niony\n" - - #: g10/sig-check.c:280 --#, fuzzy, c-format --#| msgid "%s signature, digest algorithm %s\n" -+#, c-format - msgid "Note: signatures using the %s algorithm are rejected\n" --msgstr "podpis %s, skr�t %s\n" -+msgstr "Uwaga: podpisy wykonane algorytmem %s s� odrzucane\n" + #: g10/keyedit.c:3134 +-#, fuzzy +-#| msgid "You can't change the expiration date of a v3 key\n" + msgid "You may want to change its expiration date too.\n" +-msgstr "Nie można zmienić daty ważności klucza w wersji 3.\n" ++msgstr "Można też zmienić jego datę wygaśnięcia.\n" - #: g10/sig-check.c:341 - #, c-format + #: g10/keyedit.c:3195 + msgid "" ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/gnupg2.git/commitdiff/35b4bfec3cde3f52fcdc76c1f6514ed449314cc2 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit