From f2e1d83e661e8605fedd049fffa06bf9a3509e58 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Wed, 22 Feb 2012 19:55:07 +0000 Subject: [PATCH] - updated to 3.0.13 - updated info,pl.po-update patches - regenerate autogen sources, so we can use stable version of shared libopts (the included ones required some 5.15 prerelease) Changed files: gnutls-info.patch -> 1.10 gnutls-link.patch -> 1.7 gnutls-pl.po-update.patch -> 1.12 gnutls.spec -> 1.146 --- gnutls-info.patch | 59 --------------------------- gnutls-link.patch | 4 +- gnutls-pl.po-update.patch | 86 ++++++++++++++++++++++++--------------- gnutls.spec | 16 +++++--- 4 files changed, 66 insertions(+), 99 deletions(-) diff --git a/gnutls-info.patch b/gnutls-info.patch index 396705e..c3edb95 100644 --- a/gnutls-info.patch +++ b/gnutls-info.patch @@ -29,26 +29,6 @@ @end direntry @titlepage ---- gnutls-3.0.9/doc/cha-programs.texi.orig 2011-11-24 17:38:52.000000000 +0100 -+++ gnutls-3.0.9/doc/cha-programs.texi 2011-12-15 18:36:00.397618719 +0100 -@@ -304,7 +304,7 @@ - @end smallexample - - The next step is to add support for SRP authentication. This requires --an SRP password file (see @ref{Invoking srptool}). -+an SRP password file (see @ref{srptool}). - To start the server with SRP support: - - @smallexample -@@ -314,7 +314,7 @@ - @end smallexample - - Let's also start a server with support for PSK. This would require --a password file created with @code{psktool} (see @ref{Invoking psktool}). -+a password file created with @code{psktool} (see @ref{psktool}). - - @smallexample - gnutls-serv --http \ --- gnutls-3.0.0/doc/gnutls-guile.texi.orig 2011-05-27 18:09:02.000000000 +0200 +++ gnutls-3.0.0/doc/gnutls-guile.texi 2011-08-04 16:39:19.246496322 +0200 @@ -29,9 +29,9 @@ @@ -63,42 +43,3 @@ @end direntry @titlepage ---- gnutls-3.0.9/doc/cha-shared-key.texi.orig 2011-11-14 16:41:38.000000000 +0100 -+++ gnutls-3.0.9/doc/cha-shared-key.texi 2011-12-15 18:37:14.547621201 +0100 -@@ -12,7 +12,7 @@ - - @menu - * Authentication using SRP:: --* Invoking srptool:: -+* srptool:: - @end menu - - @node Authentication using SRP -@@ -69,7 +69,7 @@ - - @showfuncB{gnutls_srp_base64_encode,gnutls_srp_base64_decode} - --@node Invoking srptool -+@node srptool - @subsection Invoking srptool --@anchor{srptool} -+@anchor{Invoking srptool} - @cindex srptool -@@ -109,7 +109,7 @@ - - @menu - * Authentication using PSK:: --* Invoking psktool:: -+* psktool:: - @end menu - - @node Authentication using PSK -@@ -145,7 +145,7 @@ - - @showfuncC{gnutls_key_generate,gnutls_hex_encode,gnutls_hex_decode} - --@node Invoking psktool -+@node psktool - @subsection Invoking psktool - @cindex psktool - diff --git a/gnutls-link.patch b/gnutls-link.patch index 2546cc8..292968d 100644 --- a/gnutls-link.patch +++ b/gnutls-link.patch @@ -1,5 +1,5 @@ ---- gnutls-3.0.12/gl/m4/lib-link.m4.orig 2008-05-17 07:44:04.000000000 +0200 -+++ gnutls-3.0.12/gl/m4/lib-link.m4 2011-04-02 11:29:18.159546509 +0200 +--- gnutls-3.0.13/m4/lib-link.m4.orig 2008-05-17 07:44:04.000000000 +0200 ++++ gnutls-3.0.13/m4/lib-link.m4 2011-04-02 11:29:18.159546509 +0200 @@ -322,7 +322,11 @@ fi if test "X$found_dir" != "X"; then diff --git a/gnutls-pl.po-update.patch b/gnutls-pl.po-update.patch index b32383b..635a853 100644 --- a/gnutls-pl.po-update.patch +++ b/gnutls-pl.po-update.patch @@ -1,8 +1,8 @@ ---- gnutls-3.0.12/po/pl.po.orig 2012-01-20 14:09:22.000000000 +0100 -+++ gnutls-3.0.12/po/pl.po 2012-01-23 18:49:17.033805315 +0100 +--- gnutls-3.0.13/po/pl.po.orig 2012-02-18 14:10:32.000000000 +0100 ++++ gnutls-3.0.13/po/pl.po 2012-02-21 17:14:10.227510923 +0100 @@ -1,14 +1,14 @@ # Polish translation for gnutls. - # Copyright (C) 2006-2009, 2011-2012 Free Software Foundation, Inc. + # Copyright (C) 2006, 2007, 2008, 2009, 2011 Free Software Foundation, Inc. # This file is distributed under the same license as the libgnutls package. -# Jakub Bogusz , 2006-2011. +# Jakub Bogusz , 2006-2012. @@ -10,11 +10,11 @@ msgid "" msgstr "" -"Project-Id-Version: libgnutls-3.0.0\n" -+"Project-Id-Version: libgnutls-3.0.12\n" ++"Project-Id-Version: libgnutls-3.0.13\n" "Report-Msgid-Bugs-To: bug-gnutls@gnu.org\n" - "POT-Creation-Date: 2012-01-20 14:09+0100\n" + "POT-Creation-Date: 2012-02-18 14:10+0100\n" -"PO-Revision-Date: 2011-08-03 18:46+0200\n" -+"PO-Revision-Date: 2012-01-23 18:41+0100\n" ++"PO-Revision-Date: 2012-02-21 17:01+0100\n" "Last-Translator: Jakub Bogusz \n" "Language-Team: Polish \n" "Language: pl\n" @@ -38,27 +38,47 @@ #: lib/gnutls_errors.c:96 msgid "The given DSA key is incompatible with the selected TLS protocol." -@@ -396,9 +395,8 @@ +@@ -352,9 +351,8 @@ + msgstr "Nieobs³ugiwane rozszerzenie krytyczne w certyfikacie X.509." + + #: lib/gnutls_errors.c:161 +-#, 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:163 + msgid "Key usage violation in certificate has been detected." +@@ -401,9 +399,8 @@ msgstr "Odebrano niedozwolony parametr." - #: lib/gnutls_errors.c:180 + #: lib/gnutls_errors.c:182 -#, fuzzy msgid "An illegal parameter was found." -msgstr "Odebrano niedozwolony parametr." +msgstr "Napotkano niedozwolony parametr." - #: lib/gnutls_errors.c:182 + #: lib/gnutls_errors.c:184 msgid "Error while reading file." -@@ -684,7 +682,7 @@ +@@ -591,7 +588,7 @@ + + #: lib/gnutls_errors.c:284 + msgid "Peer has terminated the connection" +-msgstr "" ++msgstr "Druga strona zakoñczy³a po³±czenie" + + #: lib/gnutls_errors.c:286 + msgid "Channel binding data not available" +@@ -693,7 +690,7 @@ msgid "" "The provided X.509 certificate list is not sorted (in subject to issuer " "order)" -msgstr "" +msgstr "Przekazana lista certyfikatów X.509 nie jest posortowana (w kolejno¶ci wystawcy)" - #: lib/gnutls_errors.c:419 + #: lib/gnutls_errors.c:422 msgid "(unknown error code)" -@@ -729,7 +727,7 @@ +@@ -738,7 +735,7 @@ #: lib/openpgp/output.c:130 msgid "\tFingerprint's random art:\n" @@ -67,7 +87,7 @@ #: lib/openpgp/output.c:148 msgid "\tRevoked: True\n" -@@ -878,34 +876,33 @@ +@@ -887,34 +884,33 @@ msgstr "\t\t\tZrzut hex: " #: lib/x509/ocsp_output.c:188 @@ -76,83 +96,83 @@ -msgstr "Inne informacje:\n" +msgstr "Informacje o ¿±daniu OCSP:\n" - #: lib/x509/ocsp_output.c:297 + #: lib/x509/ocsp_output.c:298 -#, fuzzy, c-format +#, c-format msgid "\tResponder ID: %.*s\n" -msgstr "%s\t\t\tOID otherName: %.*s\n" +msgstr "\tID odpowiadaj±cego: %.*s\n" - #: lib/x509/ocsp_output.c:315 + #: lib/x509/ocsp_output.c:316 -#, fuzzy, c-format +#, c-format msgid "\tProduced At: %s\n" -msgstr "\t\tUniewa¿niono: %s\n" +msgstr "\tUtworzono: %s\n" - #: lib/x509/ocsp_output.c:409 + #: lib/x509/ocsp_output.c:410 -#, fuzzy, c-format +#, c-format msgid "\t\tRevocation time: %s\n" -msgstr "\t\tUtworzenie: %s\n" +msgstr "\t\tCzas uniewa¿nienia: %s\n" - #: lib/x509/ocsp_output.c:424 + #: lib/x509/ocsp_output.c:425 -#, fuzzy, c-format +#, c-format msgid "\t\tThis Update: %s\n" -msgstr "\t\tNastêpnie: %s\n" +msgstr "\t\tTo uaktualnienie: %s\n" - #: lib/x509/ocsp_output.c:439 + #: lib/x509/ocsp_output.c:440 -#, fuzzy, c-format +#, c-format msgid "\t\tNext Update: %s\n" -msgstr "\t\tNastêpnie: %s\n" +msgstr "\t\tNastêpne uaktualnienie: %s\n" - #: lib/x509/ocsp_output.c:512 lib/x509/output.c:1307 lib/x509/output.c:1905 + #: lib/x509/ocsp_output.c:514 lib/x509/output.c:1369 lib/x509/output.c:1986 #, c-format -@@ -923,9 +920,8 @@ +@@ -932,9 +928,8 @@ msgstr "\tPodpis:\n" - #: lib/x509/ocsp_output.c:617 + #: lib/x509/ocsp_output.c:614 -#, fuzzy msgid "OCSP Response Information:\n" -msgstr "Inne informacje:\n" +msgstr "Informacje o odpowiedzi OCSP:\n" - #: lib/x509/output.c:103 - #, c-format -@@ -956,7 +952,7 @@ - #: lib/x509/output.c:140 + #: lib/x509/output.c:94 lib/x509/output.c:755 + msgid "warning: altname contains an embedded NUL, replacing with '!'\n" +@@ -969,7 +964,7 @@ + #: lib/x509/output.c:188 #, c-format msgid "\t\t\tAccess Method: %.*s" -msgstr "" +msgstr "\t\t\tMetoda dostêpu: %.*s" - #: lib/x509/output.c:305 + #: lib/x509/output.c:421 #, c-format -@@ -1158,9 +1154,9 @@ +@@ -1167,9 +1162,9 @@ msgstr "%s\t\tInformacja o certyfikacie proxy (%s):\n" - #: lib/x509/output.c:968 + #: lib/x509/output.c:1032 -#, fuzzy, c-format +#, c-format msgid "%s\t\tAuthority Information Access (%s):\n" --msgstr "%s\t\tIdentyfikator klucza autorytetu (%s):\n" +-msgstr "%s\t\tInformacja o certyfikacie proxy (%s):\n" +msgstr "%s\t\tInformacja Authority Information Access (%s):\n" - #: lib/x509/output.c:980 + #: lib/x509/output.c:1044 #, c-format -@@ -1258,9 +1254,8 @@ +@@ -1267,9 +1262,8 @@ "\t\t" - #: lib/x509/output.c:1401 + #: lib/x509/output.c:1463 -#, fuzzy msgid "\tPublic key's random art:\n" -msgstr "\t\tKlucz publiczny (bitów: %d):\n" +msgstr "\tLosowy obrazek klucza publicznego:\n" - #: lib/x509/output.c:1498 + #: lib/x509/output.c:1560 #, c-format diff --git a/gnutls.spec b/gnutls.spec index 916a048..5f062ba 100644 --- a/gnutls.spec +++ b/gnutls.spec @@ -5,17 +5,19 @@ Summary: The GNU Transport Layer Security Library Summary(pl.UTF-8): Biblioteka GNU TLS (Transport Layer Security) Name: gnutls -Version: 3.0.12 +Version: 3.0.13 Release: 1 License: LGPL v3+ (libgnutls), GPL v3+ (openssl library and tools) Group: Libraries Source0: ftp://ftp.gnutls.org/pub/gnutls/%{name}-%{version}.tar.xz -# Source0-md5: 685fe5c00786c04b39e9aac362fa0cac +# Source0-md5: ec549be557f31ea8c1738cb441ef23ec Patch0: %{name}-info.patch Patch1: %{name}-link.patch Patch2: %{name}-pl.po-update.patch URL: http://www.gnu.org/software/gnutls/ BuildRequires: autoconf >= 2.61 +BuildRequires: autogen >= 5.14 +BuildRequires: autogen-devel >= 5.14 BuildRequires: automake >= 1:1.11 BuildRequires: gettext-devel >= 0.18 BuildRequires: gtk-doc >= 1.1 @@ -30,7 +32,7 @@ BuildRequires: libtool >= 2:1.5 # miniopencdk is included in sources and currently maintained # as part of gnutls, not external package #BuildRequires: opencdk-devel >= 0.6.6 -BuildRequires: p11-kit-devel >= 0.4 +BuildRequires: p11-kit-devel >= 0.11 BuildRequires: pkgconfig BuildRequires: readline-devel BuildRequires: rpmbuild(macros) >= 1.383 @@ -43,6 +45,7 @@ Requires(post,postun): /sbin/ldconfig Requires: libtasn1 >= 2.10 %{!?with_gcrypt:Requires: nettle >= 2.4} #Requires: opencdk >= 0.6.6 +Requires: p11-kit >= 0.11 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -67,7 +70,7 @@ Requires: %{name} = %{version}-%{release} Requires: libtasn1-devel >= 2.10 %{!?with_gcrypt:Requires: nettle-devel >= 2.4} #Requires: opencdk-devel >= 0.6.6 -Requires: p11-kit-devel >= 0.4 +Requires: p11-kit-devel >= 0.11 Requires: zlib-devel %description devel @@ -151,10 +154,12 @@ Wiązania Guile do GnuTLS. %patch2 -p1 %{__rm} po/stamp-po +# regenerate autogen stuff +%{__rm} src/{ocsptool-args,p11tool-args,psk-args,cli-debug-args,cli-args,serv-args,srptool-args,certtool-args}.[ch] %build %{__libtoolize} -%{__aclocal} -I m4 -I gl/m4 +%{__aclocal} -I m4 -I gl/m4 -I src/libopts/m4 %{__autoconf} %{__autoheader} %{__automake} @@ -214,6 +219,7 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %ghost %{_libdir}/libgnutls-openssl.so.27 %{_mandir}/man1/certtool.1* %{_mandir}/man1/gnutls-*.1* +%{_mandir}/man1/ocsptool.1* %{_mandir}/man1/p11tool.1* %{_mandir}/man1/psktool.1* %{_mandir}/man1/srptool.1* -- 2.44.0