Author: qboosh Date: Wed Feb 22 19:55:13 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- 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)
---- Files affected:
packages/gnutls:
gnutls-info.patch (1.9 -> 1.10) , gnutls-link.patch (1.6 -> 1.7) ,
gnutls-pl.po-update.patch (1.11 -> 1.12) , gnutls.spec (1.145 -> 1.146)
---- Diffs:
================================================================
Index: packages/gnutls/gnutls-info.patch
diff -u packages/gnutls/gnutls-info.patch:1.9
packages/gnutls/gnutls-info.patch:1.10
--- packages/gnutls/gnutls-info.patch:1.9 Thu Dec 15 20:49:04 2011
+++ packages/gnutls/gnutls-info.patch Wed Feb 22 20:55:07 2012
@@ -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
-
================================================================
Index: packages/gnutls/gnutls-link.patch
diff -u packages/gnutls/gnutls-link.patch:1.6
packages/gnutls/gnutls-link.patch:1.7
--- packages/gnutls/gnutls-link.patch:1.6 Mon Jan 23 19:36:45 2012
+++ packages/gnutls/gnutls-link.patch Wed Feb 22 20:55:07 2012
@@ -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
================================================================
Index: packages/gnutls/gnutls-pl.po-update.patch
diff -u packages/gnutls/gnutls-pl.po-update.patch:1.11
packages/gnutls/gnutls-pl.po-update.patch:1.12
--- packages/gnutls/gnutls-pl.po-update.patch:1.11 Mon Jan 23 19:36:45 2012
+++ packages/gnutls/gnutls-pl.po-update.patch Wed Feb 22 20:55:07 2012
@@ -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 <[email protected]>, 2006-2011.
+# Jakub Bogusz <[email protected]>, 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: [email protected]\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 <[email protected]>\n"
"Language-Team: Polish <[email protected]>\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
================================================================
Index: packages/gnutls/gnutls.spec
diff -u packages/gnutls/gnutls.spec:1.145 packages/gnutls/gnutls.spec:1.146
--- packages/gnutls/gnutls.spec:1.145 Mon Jan 23 19:36:45 2012
+++ packages/gnutls/gnutls.spec Wed Feb 22 20:55:07 2012
@@ -6,17 +6,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
@@ -31,7 +33,7 @@
# 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
@@ -44,6 +46,7 @@
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
@@ -68,7 +71,7 @@
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
@@ -152,10 +155,12 @@
%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}
@@ -215,6 +220,7 @@
%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*
@@ -266,6 +272,12 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.146 2012/02/22 19:55:07 qboosh
+- 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)
+
Revision 1.145 2012/01/23 18:36:45 qboosh
- updated to 3.0.12
- updated link,pl.po-update patches
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gnutls/gnutls-info.patch?r1=1.9&r2=1.10&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gnutls/gnutls-link.patch?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gnutls/gnutls-pl.po-update.patch?r1=1.11&r2=1.12&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gnutls/gnutls.spec?r1=1.145&r2=1.146&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
