[packages/gnutls] - updated to 3.2.0 (3.1.x left on gnutls-3.1 branch) - updated pl.po-update patch - separated -dane*
qboosh
qboosh at pld-linux.org
Sun May 12 12:47:25 CEST 2013
commit aeb71b0b2ff61500684cf51701db3e5ca03dd9f8
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun May 12 12:47:23 2013 +0200
- updated to 3.2.0 (3.1.x left on gnutls-3.1 branch)
- updated pl.po-update patch
- separated -dane* packages
gnutls-pl.po-update.patch | 52 +++++++++++++++++++-----------
gnutls.spec | 82 +++++++++++++++++++++++++++++++++++++----------
2 files changed, 98 insertions(+), 36 deletions(-)
---
diff --git a/gnutls.spec b/gnutls.spec
index 2877ba2..9b3151a 100644
--- a/gnutls.spec
+++ b/gnutls.spec
@@ -7,12 +7,12 @@
Summary: The GNU Transport Layer Security Library
Summary(pl.UTF-8): Biblioteka GNU TLS (Transport Layer Security)
Name: gnutls
-Version: 3.1.11
+Version: 3.2.0
Release: 1
License: LGPL v3+ (libgnutls), GPL v3+ (openssl library and tools)
Group: Libraries
-Source0: ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1/%{name}-%{version}.tar.lz
-# Source0-md5: 83e71089a58df0a69b295c03c287b2a5
+Source0: ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/%{name}-%{version}.tar.lz
+# Source0-md5: 746cacdc1a1f64b74699109dad4ce47a
Patch0: %{name}-info.patch
Patch1: %{name}-link.patch
Patch2: %{name}-pl.po-update.patch
@@ -29,7 +29,7 @@ BuildRequires: libstdc++-devel
BuildRequires: libtasn1-devel >= 2.14
BuildRequires: libtool >= 2:1.5
BuildRequires: lzip
-%{!?with_gcrypt:BuildRequires: nettle-devel >= 2.5}
+%{!?with_gcrypt:BuildRequires: nettle-devel >= 2.7}
# miniopencdk is included in sources and currently maintained
# as part of gnutls, not external package
#BuildRequires: opencdk-devel >= 0.6.6
@@ -46,7 +46,7 @@ BuildRequires: zlib-devel
Requires(post,postun): /sbin/ldconfig
%{?with_gcrypt:Requires: libgcrypt >= 1.4.0}
Requires: libtasn1 >= 2.14
-%{!?with_gcrypt:Requires: nettle >= 2.5}
+%{!?with_gcrypt:Requires: nettle >= 2.7}
#Requires: opencdk >= 0.6.6
Requires: p11-kit >= 0.11
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -71,11 +71,10 @@ Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
%{?with_gcrypt:Requires: libgcrypt-devel >= 1.4.0}
Requires: libtasn1-devel >= 2.14
-%{!?with_gcrypt:Requires: nettle-devel >= 2.5}
+%{!?with_gcrypt:Requires: nettle-devel >= 2.7}
#Requires: opencdk-devel >= 0.6.6
Requires: p11-kit-devel >= 0.11
%{?with_tpm:Requires: trousers-devel}
-%{?with_dane:Requires: unbound-devel}
Requires: zlib-devel
%description devel
@@ -138,6 +137,44 @@ Static version of libgnutlsxx, a C++ interface to gnutls library.
%description c++-static -l pl.UTF-8
Statyczna wersja libgnutlsxx - interfejsu C++ do biblioteki gnutls.
+%package dane
+Summary: DANE security library
+Summary(pl.UTF-8): Biblioteka bezpieczeństwa DANE
+Group: Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description dane
+DANE security library.
+
+%description dane -l pl.UTF-8
+Biblioteka bezpieczeństwa DANE.
+
+%package dane-devel
+Summary: Header file for DANE security library
+Summary(pl.UTF-8): Plik nagłówkowy biblioteki bezpieczeństwa DANE
+Group: Development/Libraries
+Requires: %{name}-dane = %{version}-%{release}
+Requires: %{name}-devel = %{version}-%{release}
+Requires: unbound-devel
+
+%description dane-devel
+Header file for DANE security library.
+
+%description dane-devel -l pl.UTF-8
+Plik nagłówkowy biblioteki bezpieczeństwa DANE.
+
+%package dane-static
+Summary: Static DANE security library
+Summary(pl.UTF-8): Statyczna biblioteka bezpieczeństwa DANE
+Group: Development/Libraries
+Requires: %{name}-dane-devel = %{version}-%{release}
+
+%description dane-static
+Static DANE security library.
+
+%description dane-static -l pl.UTF-8
+Statyczna biblioteka bezpieczeństwa DANE.
+
%package -n guile-gnutls
Summary: Guile bindings for GnuTLS
Summary(pl.UTF-8): Wiązania Guile do GnuTLS
@@ -218,7 +255,6 @@ rm -rf $RPM_BUILD_ROOT
%doc AUTHORS ChangeLog NEWS README THANKS
%attr(755,root,root) %{_bindir}/certtool
%attr(755,root,root) %{_bindir}/crywrap
-%{?with_dane:%attr(755,root,root) %{_bindir}/danetool}
%attr(755,root,root) %{_bindir}/gnutls-*
%attr(755,root,root) %{_bindir}/ocsptool
%attr(755,root,root) %{_bindir}/p11tool
@@ -227,16 +263,11 @@ rm -rf $RPM_BUILD_ROOT
%{?with_tpm:%attr(755,root,root) %{_bindir}/tpmtool}
%attr(755,root,root) %{_libdir}/libgnutls.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libgnutls.so.28
-%if %{with dane}
-%attr(755,root,root) %{_libdir}/libgnutls-dane.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgnutls-dane.so.0
-%endif
%attr(755,root,root) %{_libdir}/libgnutls-openssl.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libgnutls-openssl.so.27
%attr(755,root,root) %{_libdir}/libgnutls-xssl.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libgnutls-xssl.so.0
%{_mandir}/man1/certtool.1*
-%{?with_dane:%{_mandir}/man1/danetool.1*}
%{_mandir}/man1/gnutls-*.1*
%{_mandir}/man1/ocsptool.1*
%{_mandir}/man1/p11tool.1*
@@ -250,23 +281,20 @@ rm -rf $RPM_BUILD_ROOT
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libgnutls.so
-%{?with_dane:%attr(755,root,root) %{_libdir}/libgnutls-dane.so}
%attr(755,root,root) %{_libdir}/libgnutls-openssl.so
%attr(755,root,root) %{_libdir}/libgnutls-xssl.so
%{_libdir}/libgnutls.la
-%{?with_dane:%{_libdir}/libgnutls-dane.la}
%{_libdir}/libgnutls-openssl.la
%{_libdir}/libgnutls-xssl.la
%{_includedir}/gnutls
+%{?with_dane:%exclude %{_includedir}/gnutls/dane.h}
%exclude %{_includedir}/gnutls/gnutlsxx.h
%{_pkgconfigdir}/gnutls.pc
-%{?with_dane:%{_pkgconfigdir}/gnutls-dane.pc}
%{_mandir}/man3/gnutls_*.3*
%files static
%defattr(644,root,root,755)
%{_libdir}/libgnutls.a
-%{?with_dane:%{_libdir}/libgnutls-dane.a}
%{_libdir}/libgnutls-openssl.a
%{_libdir}/libgnutls-xssl.a
@@ -285,6 +313,26 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%{_libdir}/libgnutlsxx.a
+%if %{with dane}
+%files dane
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/danetool
+%attr(755,root,root) %{_libdir}/libgnutls-dane.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgnutls-dane.so.0
+%{_mandir}/man1/danetool.1*
+
+%files dane-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libgnutls-dane.so
+%{_libdir}/libgnutls-dane.la
+%{_includedir}/gnutls/dane.h
+%{_pkgconfigdir}/gnutls-dane.pc
+
+%files dane-static
+%defattr(644,root,root,755)
+%{_libdir}/libgnutls-dane.a
+%endif
+
%files -n guile-gnutls
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/guile/2.0/guile-gnutls-v-2.so*
diff --git a/gnutls-pl.po-update.patch b/gnutls-pl.po-update.patch
index 64f7929..f8a5e33 100644
--- a/gnutls-pl.po-update.patch
+++ b/gnutls-pl.po-update.patch
@@ -1,5 +1,5 @@
---- gnutls-3.1.11/po/pl.po.orig 2013-05-08 12:43:38.000000000 +0200
-+++ gnutls-3.1.11/po/pl.po 2013-05-12 09:25:33.136222956 +0200
+--- gnutls-3.2.0/po/pl.po.orig 2013-05-10 17:49:32.000000000 +0200
++++ gnutls-3.2.0/po/pl.po 2013-05-12 10:20:56.242750165 +0200
@@ -1,14 +1,14 @@
# Polish translation for gnutls.
# Copyright (C) 2006, 2007, 2008, 2009, 2011, 2012 Free Software Foundation, Inc.
@@ -10,15 +10,24 @@
msgid ""
msgstr ""
-"Project-Id-Version: libgnutls-3.0.12\n"
-+"Project-Id-Version: libgnutls-3.1.11\n"
++"Project-Id-Version: libgnutls-3.2.0\n"
"Report-Msgid-Bugs-To: bug-gnutls at gnu.org\n"
- "POT-Creation-Date: 2013-05-08 12:43+0200\n"
+ "POT-Creation-Date: 2013-05-10 17:49+0200\n"
-"PO-Revision-Date: 2012-01-20 20:45+0100\n"
-+"PO-Revision-Date: 2013-05-12 09:24+0200\n"
++"PO-Revision-Date: 2013-05-12 10:15+0200\n"
"Last-Translator: Jakub Bogusz <qboosh at pld-linux.org>\n"
"Language-Team: Polish <translation-team-pl at lists.sourceforge.net>\n"
"Language: pl\n"
-@@ -217,14 +217,12 @@
+@@ -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
@@ -35,7 +44,7 @@
#: lib/gnutls_errors.c:100
msgid "There is already a crypto algorithm with lower priority."
-@@ -349,9 +347,8 @@
+@@ -353,9 +351,8 @@
msgstr "B��d w certyfikacie."
#: lib/gnutls_errors.c:157
@@ -46,7 +55,7 @@
#: lib/gnutls_errors.c:159
msgid "Unknown Subject Alternative name in X.509 certificate."
-@@ -362,9 +359,8 @@
+@@ -366,9 +363,8 @@
msgstr "Nieobs�ugiwane rozszerzenie krytyczne w certyfikacie X.509."
#: lib/gnutls_errors.c:164
@@ -57,7 +66,7 @@
#: lib/gnutls_errors.c:166
msgid "Key usage violation in certificate has been detected."
-@@ -376,7 +372,7 @@
+@@ -380,7 +376,7 @@
#: lib/gnutls_errors.c:170
msgid "The transmitted packet is too large (EMSGSIZE)."
@@ -66,7 +75,7 @@
#: lib/gnutls_errors.c:172
msgid "Function was interrupted."
-@@ -604,28 +600,27 @@
+@@ -608,28 +604,27 @@
#: lib/gnutls_errors.c:289
msgid "Peer has terminated the connection"
@@ -100,7 +109,7 @@
#: lib/gnutls_errors.c:302
msgid "PKCS #11 error."
-@@ -640,18 +635,16 @@
+@@ -644,18 +639,16 @@
msgstr "B��d w trakcie analizy."
#: lib/gnutls_errors.c:308
@@ -122,7 +131,7 @@
#: lib/gnutls_errors.c:314
msgid "PKCS #11 error in slot"
-@@ -734,17 +727,16 @@
+@@ -738,21 +731,20 @@
"wystawcy)"
#: lib/gnutls_errors.c:352
@@ -141,9 +150,14 @@
-msgstr ""
+msgstr "B��d w systemowym urz�dzeniu danych losowych."
- #: lib/gnutls_errors.c:443
+ #: 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)"
-@@ -1020,59 +1012,59 @@
+@@ -1028,59 +1020,59 @@
msgstr "\t\t\tMetoda dost�pu: %.*s"
#: lib/x509/output.c:428
@@ -225,7 +239,7 @@
#: lib/x509/output.c:539
msgid ""
-@@ -1202,9 +1194,9 @@
+@@ -1210,9 +1202,9 @@
msgstr "%s\t\tU�ycie klucza (%s):\n"
#: lib/x509/output.c:1061
@@ -237,7 +251,7 @@
#: lib/x509/output.c:1076
#, c-format
-@@ -1252,24 +1244,24 @@
+@@ -1260,24 +1252,24 @@
msgstr "%s\t\t\tZrzut hex: "
#: lib/x509/output.c:1237
@@ -270,7 +284,7 @@
#: lib/x509/output.c:1265
#, c-format
-@@ -1282,14 +1274,12 @@
+@@ -1290,14 +1282,12 @@
msgstr "\t\tKrzywa:\t%s\n"
#: lib/x509/output.c:1290
@@ -287,7 +301,7 @@
#: lib/x509/output.c:1299
msgid "\t\tX:\n"
-@@ -1300,29 +1290,25 @@
+@@ -1308,29 +1298,25 @@
msgstr "\t\tY:\n"
#: lib/x509/output.c:1322
@@ -323,7 +337,7 @@
#: lib/x509/output.c:1406
msgid "\tSerial Number (hex): "
-@@ -1476,29 +1462,13 @@
+@@ -1484,29 +1470,13 @@
msgstr "Informacja o ��daniu certyfikatu PKCS #10:\n"
#: lib/x509/output.c:2520
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gnutls.git/commitdiff/aeb71b0b2ff61500684cf51701db3e5ca03dd9f8
More information about the pld-cvs-commit
mailing list