From 59d25b4cf9fa672296b9aa8c9378ba226747f2e1 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Sat, 20 Jul 2013 06:27:38 +0200 Subject: [PATCH] - updated to 3.2.2 - updated link patch, removed obsolete pl.po-update patch --- gnutls-link.patch | 11 -- gnutls-pl.po-update.patch | 372 -------------------------------------- gnutls.spec | 8 +- 3 files changed, 3 insertions(+), 388 deletions(-) delete mode 100644 gnutls-pl.po-update.patch diff --git a/gnutls-link.patch b/gnutls-link.patch index 1bfd237..292968d 100644 --- a/gnutls-link.patch +++ b/gnutls-link.patch @@ -12,14 +12,3 @@ if test "X$found_so" != "X"; then dnl Linking with a shared library. We attempt to hardcode its dnl directory into the executable's runpath, unless it's the ---- gnutls-3.2.1/lib/Makefile.am.orig 2013-05-31 20:58:51.000000000 +0200 -+++ gnutls-3.2.1/lib/Makefile.am 2013-06-07 22:22:54.017559367 +0200 -@@ -140,7 +140,7 @@ - endif - - if ENABLE_NETTLE --thirdparty_libadd += $(NETTLE_LIBS) $(HOGWEED_LIBS) -+thirdparty_libadd += $(NETTLE_LIBS) $(HOGWEED_LIBS) -lgmp - libgnutls_la_LIBADD += nettle/libcrypto.la - endif - diff --git a/gnutls-pl.po-update.patch b/gnutls-pl.po-update.patch deleted file mode 100644 index c787c80..0000000 --- a/gnutls-pl.po-update.patch +++ /dev/null @@ -1,372 +0,0 @@ ---- gnutls-3.2.1/po/pl.po.orig 2013-06-01 13:13:09.000000000 +0200 -+++ gnutls-3.2.1/po/pl.po 2013-06-07 20:50:47.411007891 +0200 -@@ -1,14 +1,14 @@ - # Polish translation for gnutls. - # Copyright (C) 2006, 2007, 2008, 2009, 2011, 2012 Free Software Foundation, Inc. - # This file is distributed under the same license as the libgnutls package. --# Jakub Bogusz , 2006-2012. -+# Jakub Bogusz , 2006-2013. - # - msgid "" - msgstr "" --"Project-Id-Version: libgnutls-3.0.12\n" -+"Project-Id-Version: libgnutls-3.2.1\n" - "Report-Msgid-Bugs-To: bug-gnutls@gnu.org\n" - "POT-Creation-Date: 2013-05-29 19:03+0200\n" --"PO-Revision-Date: 2012-01-20 20:45+0100\n" -+"PO-Revision-Date: 2013-06-07 20:50+0200\n" - "Last-Translator: Jakub Bogusz \n" - "Language-Team: Polish \n" - "Language: pl\n" -@@ -130,7 +130,7 @@ - - #: lib/gnutls_alert.c:76 - msgid "No supported application protocol could be negotiated" --msgstr "" -+msgstr "Nie uda³o siê wynegocjowaæ obs³ugiwanego protoko³u aplikacji" - - #: lib/gnutls_errors.c:51 - msgid "Success." -@@ -221,14 +221,12 @@ - msgstr "Podany klucz DSA jest niezgodny z wybranym protoko³em TLS." - - #: lib/gnutls_errors.c:96 --#, fuzzy - msgid "A heartbeat pong message was received." --msgstr "Odebrano du¿y pakiet rekordu TLS." -+msgstr "Odebrano komunikat heartbeat pong." - - #: lib/gnutls_errors.c:98 --#, fuzzy - msgid "A heartbeat ping message was received." --msgstr "Odebrano du¿y pakiet rekordu TLS." -+msgstr "Odebrano pakiet heartbeat ping." - - #: lib/gnutls_errors.c:100 - msgid "There is already a crypto algorithm with lower priority." -@@ -353,9 +351,8 @@ - msgstr "B³±d w certyfikacie." - - #: lib/gnutls_errors.c:157 --#, fuzzy - msgid "Could not authenticate peer." --msgstr "Nie uda³o siê uzyskaæ klucza OpenPGP." -+msgstr "Nie uda³o siê uwierzytelniæ drugiej strony." - - #: lib/gnutls_errors.c:159 - msgid "Unknown Subject Alternative name in X.509 certificate." -@@ -366,9 +363,8 @@ - msgstr "Nieobs³ugiwane rozszerzenie krytyczne w certyfikacie X.509." - - #: lib/gnutls_errors.c:164 --#, fuzzy - msgid "Unsupported extension in X.509 certificate." --msgstr "Nieobs³ugiwane rozszerzenie krytyczne w certyfikacie X.509." -+msgstr "Nieobs³ugiwane rozszerzenie w certyfikacie X.509." - - #: lib/gnutls_errors.c:166 - msgid "Key usage violation in certificate has been detected." -@@ -380,7 +376,7 @@ - - #: lib/gnutls_errors.c:170 - msgid "The transmitted packet is too large (EMSGSIZE)." --msgstr "" -+msgstr "Przesy³any pakiet jest zbyt du¿y (EMSGSIZE)." - - #: lib/gnutls_errors.c:172 - msgid "Function was interrupted." -@@ -608,28 +604,27 @@ - - #: lib/gnutls_errors.c:289 - msgid "Peer has terminated the connection" --msgstr "" -+msgstr "Druga strona zakoñczy³a po³±czenie" - - #: lib/gnutls_errors.c:291 - msgid "Channel binding data not available" - msgstr "Dane wi±¿±ce kana³ nie s± dostêpne." - - #: lib/gnutls_errors.c:294 --#, fuzzy - msgid "TPM error." --msgstr "B³±d PKCS #11." -+msgstr "B³±d TPM." - - #: lib/gnutls_errors.c:296 - msgid "TPM is not initialized." --msgstr "" -+msgstr "TPM nie zainicjowany." - - #: lib/gnutls_errors.c:298 - msgid "TPM key was not found in persistent storage." --msgstr "" -+msgstr "Nie znaleziono klucza TPM w trwa³ych danych." - - #: lib/gnutls_errors.c:300 - msgid "Cannot initialize a session with the TPM." --msgstr "" -+msgstr "Nie mo¿na zainicjowaæ sesji z TPM." - - #: lib/gnutls_errors.c:302 - msgid "PKCS #11 error." -@@ -644,18 +639,16 @@ - msgstr "B³±d w trakcie analizy." - - #: lib/gnutls_errors.c:308 --#, fuzzy - msgid "Error in provided PIN." --msgstr "B³±d w trakcie analizy." -+msgstr "B³±d w podanym PIN-ie." - - #: lib/gnutls_errors.c:310 --#, fuzzy - msgid "Error in provided SRK password for TPM." --msgstr "B³±d w pliku hase³." -+msgstr "B³±d w podanym ha¶le SRK dla TPM." - - #: lib/gnutls_errors.c:312 - msgid "Error in provided password for key to be loaded in TPM." --msgstr "" -+msgstr "B³±d w podanym ha¶le dla klucza do wczytania w TPM." - - #: lib/gnutls_errors.c:314 - msgid "PKCS #11 error in slot" -@@ -738,21 +731,20 @@ - "wystawcy)" - - #: lib/gnutls_errors.c:352 --#, fuzzy - msgid "The OCSP response is invalid" --msgstr "¯±danie jest nieprawid³owe." -+msgstr "Odpowied¼ OCSP jest nieprawid³owa." - - #: lib/gnutls_errors.c:354 - msgid "There is no certificate status (OCSP)." --msgstr "" -+msgstr "Brak statusu certyfikatu (OCSP)." - - #: lib/gnutls_errors.c:356 - msgid "Error in the system's randomness device." --msgstr "" -+msgstr "B³±d w systemowym urz±dzeniu danych losowych." - - #: lib/gnutls_errors.c:358 - msgid "No common application protocol could be negotiated." --msgstr "" -+msgstr "Nie uda³o siê wynegocjowaæ wspólnego protoko³u aplikacji." - - #: lib/gnutls_errors.c:445 - msgid "(unknown error code)" -@@ -1028,59 +1020,59 @@ - msgstr "\t\t\tMetoda dostêpu: %.*s" - - #: lib/x509/output.c:428 --#, fuzzy, c-format -+#, c-format - msgid "%sDigital signature.\n" --msgstr "%s\t\t\tPodpis cyfrowy.\n" -+msgstr "%sPodpis cyfrowy.\n" - - #: lib/x509/output.c:430 --#, fuzzy, c-format -+#, c-format - msgid "%sNon repudiation.\n" --msgstr "%s\t\t\tBez odmowy.\n" -+msgstr "%sBez odmowy.\n" - - #: lib/x509/output.c:432 --#, fuzzy, c-format -+#, c-format - msgid "%sKey encipherment.\n" --msgstr "%s\t\t\tSzyfrowanie klucza.\n" -+msgstr "%sSzyfrowanie klucza.\n" - - #: lib/x509/output.c:434 --#, fuzzy, c-format -+#, c-format - msgid "%sData encipherment.\n" --msgstr "%s\t\t\tSzyfrowanie danych.\n" -+msgstr "%sSzyfrowanie danych.\n" - - #: lib/x509/output.c:436 --#, fuzzy, c-format -+#, c-format - msgid "%sKey agreement.\n" --msgstr "%s\t\t\tUzgodnienie klucza.\n" -+msgstr "%stUzgodnienie klucza.\n" - - #: lib/x509/output.c:438 --#, fuzzy, c-format -+#, c-format - msgid "%sCertificate signing.\n" --msgstr "%s\t\t\tPodpisanie certyfikatu.\n" -+msgstr "%sPodpisanie certyfikatu.\n" - - #: lib/x509/output.c:440 --#, fuzzy, c-format -+#, c-format - msgid "%sCRL signing.\n" --msgstr "%s\t\t\tPodpisanie CRL.\n" -+msgstr "%sPodpisanie CRL.\n" - - #: lib/x509/output.c:442 --#, fuzzy, c-format -+#, c-format - msgid "%sKey encipher only.\n" --msgstr "%s\t\t\tTylko szyfrowanie klucza.\n" -+msgstr "%sTylko szyfrowanie klucza.\n" - - #: lib/x509/output.c:444 --#, fuzzy, c-format -+#, c-format - msgid "%sKey decipher only.\n" --msgstr "%s\t\t\tTylko deszyfrowanie klucza.\n" -+msgstr "%sTylko deszyfrowanie klucza.\n" - - #: lib/x509/output.c:482 --#, fuzzy, c-format -+#, c-format - msgid "\t\t\tNot Before: %s\n" --msgstr "\t\tNie wcze¶niej ni¿: %s\n" -+msgstr "\t\t\tNie wcze¶niej ni¿: %s\n" - - #: lib/x509/output.c:489 --#, fuzzy, c-format -+#, c-format - msgid "\t\t\tNot After: %s\n" --msgstr "\t\tNie pó¼niej ni¿: %s\n" -+msgstr "\t\t\tNie pó¼niej ni¿: %s\n" - - #: lib/x509/output.c:539 - msgid "" -@@ -1210,9 +1202,9 @@ - msgstr "%s\t\tU¿ycie klucza (%s):\n" - - #: lib/x509/output.c:1061 --#, fuzzy, c-format -+#, c-format - msgid "%s\t\tPrivate Key Usage Period (%s):\n" --msgstr "%s\t\tU¿ycie klucza (%s):\n" -+msgstr "%s\t\tOkres u¿ycia klucza prywatnego (%s):\n" - - #: lib/x509/output.c:1076 - #, c-format -@@ -1260,24 +1252,24 @@ - msgstr "%s\t\t\tZrzut hex: " - - #: lib/x509/output.c:1237 --#, fuzzy, c-format -+#, c-format - msgid "\t%sPublic Key Algorithm: %s\n" --msgstr "\tAlgorytm klucza publicznego: %s\n" -+msgstr "\t%sAlgorytm klucza publicznego: %s\n" - - #: lib/x509/output.c:1238 --#, fuzzy, c-format -+#, c-format - msgid "\tAlgorithm Security Level: %s (%d bits)\n" --msgstr "\tPoziom bezpieczeñstwa certyfikatu: %s (bitów: %d)\n" -+msgstr "\tPoziom bezpieczeñstwa algorytmu: %s (bitów: %d)\n" - - #: lib/x509/output.c:1254 --#, fuzzy, c-format -+#, c-format - msgid "\t\tModulus (bits %d): " --msgstr "\t\tReszta (bitów: %d):\n" -+msgstr "\t\tReszta (bitów: %d): " - - #: lib/x509/output.c:1257 --#, fuzzy, c-format -+#, c-format - msgid "\t\tExponent (bits %d): " --msgstr "\t\tWyk³adnik (bitów: %d):\n" -+msgstr "\t\tWyk³adnik (bitów: %d): " - - #: lib/x509/output.c:1265 - #, c-format -@@ -1290,14 +1282,12 @@ - msgstr "\t\tKrzywa:\t%s\n" - - #: lib/x509/output.c:1290 --#, fuzzy - msgid "\t\tX: " --msgstr "\t\tX:\n" -+msgstr "\t\tX: " - - #: lib/x509/output.c:1293 --#, fuzzy - msgid "\t\tY: " --msgstr "\t\tY:\n" -+msgstr "\t\tY: " - - #: lib/x509/output.c:1299 - msgid "\t\tX:\n" -@@ -1308,29 +1298,25 @@ - msgstr "\t\tY:\n" - - #: lib/x509/output.c:1322 --#, fuzzy, c-format -+#, c-format - msgid "\t\tPublic key (bits %d): " --msgstr "\t\tKlucz publiczny (bitów: %d):\n" -+msgstr "\t\tKlucz publiczny (bitów: %d): " - - #: lib/x509/output.c:1325 --#, fuzzy - msgid "\t\tP: " --msgstr "\t\tP:\n" -+msgstr "\t\tP: " - - #: lib/x509/output.c:1328 --#, fuzzy - msgid "\t\tQ: " --msgstr "\t\tQ:\n" -+msgstr "\t\tQ: " - - #: lib/x509/output.c:1331 --#, fuzzy - msgid "\t\tG: " --msgstr "\t\tG:\n" -+msgstr "\t\tG: " - - #: lib/x509/output.c:1375 lib/x509/output.c:2234 --#, fuzzy - msgid "Subject " --msgstr "\tPrzedmiot: %s\n" -+msgstr "Przedmiot " - - #: lib/x509/output.c:1406 - msgid "\tSerial Number (hex): " -@@ -1484,29 +1470,13 @@ - msgstr "Informacja o ¿±daniu certyfikatu PKCS #10:\n" - - #: lib/x509/output.c:2520 --#, fuzzy - msgid "Public Key Usage:\n" --msgstr "" --"\tIdentyfikator klucza publicznego:\n" --"\t\t" -+msgstr "U¿ycie klucza publicznego:\n" - - #: lib/x509/output.c:2531 --#, fuzzy - msgid "Public Key ID: " --msgstr "" --"\tIdentyfikator klucza publicznego:\n" --"\t\t" -+msgstr "Identyfikator klucza publicznego: " - - #: lib/x509/output.c:2565 --#, fuzzy - msgid "Public Key Information:\n" --msgstr "Inne informacje:\n" -- --#~ msgid "PKCS #11 error in PIN." --#~ msgstr "B³±d PKCS #11 w PIN-ie." -- --#~ msgid "PKCS #11 PIN should be saved." --#~ msgstr "PIN PKCS #11 powinien byæ zapisany." -- --#~ msgid "\tSubject Public Key Algorithm: %s\n" --#~ msgstr "\tAlgorytm klucza publicznego: %s\n" -+msgstr "Informacje o kluczu publicznym:\n" diff --git a/gnutls.spec b/gnutls.spec index f0d2074..c52c5d3 100644 --- a/gnutls.spec +++ b/gnutls.spec @@ -7,18 +7,17 @@ Summary: The GNU Transport Layer Security Library Summary(pl.UTF-8): Biblioteka GNU TLS (Transport Layer Security) Name: gnutls -Version: 3.2.1 +Version: 3.2.2 Release: 1 License: LGPL v3+ (libgnutls), GPL v3+ (openssl library and tools) Group: Libraries Source0: ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/%{name}-%{version}.tar.lz -# Source0-md5: 157386119a90f458fecf8303584f9417 +# Source0-md5: 6e075496bd626306ab7e089bcc2ad4d7 Patch0: %{name}-info.patch Patch1: %{name}-link.patch -Patch2: %{name}-pl.po-update.patch URL: http://www.gnutls.org/ BuildRequires: autoconf >= 2.61 -BuildRequires: automake >= 1:1.11.3 +BuildRequires: automake >= 1:1.12.2 BuildRequires: gettext-devel >= 0.18 BuildRequires: gtk-doc >= 1.1 BuildRequires: guile-devel >= 5:2.0 @@ -206,7 +205,6 @@ Wiązania Guile do GnuTLS. %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 %{__rm} po/stamp-po -- 2.44.0