From: Jakub Bogusz Date: Thu, 3 Jan 2013 15:57:18 +0000 (+0100) Subject: - updated to 3.1.6 X-Git-Tag: auto/th/gnutls-3.1.7-1~1 X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=cc933e6af609f6727e5e3b9141069076f2d29191;p=packages%2Fgnutls.git - updated to 3.1.6 - updated pl.po-update patch - added am patch (fixes build with automake 1.13) - disable tpm by default (it makes libgnutls incompatible with GPL programs) --- diff --git a/gnutls-am.patch b/gnutls-am.patch new file mode 100644 index 0000000..39c3b7e --- /dev/null +++ b/gnutls-am.patch @@ -0,0 +1,11 @@ +--- gnutls-3.1.6/configure.ac.orig 2013-01-02 21:14:55.491355416 +0100 ++++ gnutls-3.1.6/configure.ac 2013-01-02 21:23:27.598011407 +0100 +@@ -27,7 +27,7 @@ + + AM_INIT_AUTOMAKE([1.11.3 no-dist-gzip dist-xz dist-lzip -Wall -Wno-override]) + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + + AC_MSG_RESULT([*** + *** Checking for compilation programs... diff --git a/gnutls-pl.po-update.patch b/gnutls-pl.po-update.patch index ba3877e..2d3ac4c 100644 --- a/gnutls-pl.po-update.patch +++ b/gnutls-pl.po-update.patch @@ -1,15 +1,20 @@ ---- gnutls-3.1.5/po/pl.po.orig 2012-11-24 18:06:01.000000000 +0100 -+++ gnutls-3.1.5/po/pl.po 2012-11-25 17:05:46.901906105 +0100 -@@ -5,10 +5,10 @@ +--- gnutls-3.1.6/po/pl.po.orig 2013-01-01 21:05:59.000000000 +0100 ++++ gnutls-3.1.6/po/pl.po 2013-01-02 21:14:16.388022896 +0100 +@@ -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.1.5\n" ++"Project-Id-Version: libgnutls-3.1.6\n" "Report-Msgid-Bugs-To: bug-gnutls@gnu.org\n" - "POT-Creation-Date: 2012-11-24 18:05+0100\n" + "POT-Creation-Date: 2013-01-01 21:05+0100\n" -"PO-Revision-Date: 2012-01-20 20:45+0100\n" -+"PO-Revision-Date: 2012-11-25 17:02+0100\n" ++"PO-Revision-Date: 2013-01-02 21:12+0100\n" "Last-Translator: Jakub Bogusz \n" "Language-Team: Polish \n" "Language: pl\n" @@ -326,12 +331,12 @@ msgid "Public Key Information:\n" -msgstr "Inne informacje:\n" - --#~ msgid "\tSubject Public Key Algorithm: %s\n" --#~ msgstr "\tAlgorytm klucza publicznego: %s\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 0a680fe..88eadf4 100644 --- a/gnutls.spec +++ b/gnutls.spec @@ -2,19 +2,21 @@ # Conditional build: %bcond_with gcrypt # use gcrypt crypto backend instead of nettle (withdrawn?) %bcond_without dane # libdane (DANE with DNSSEC certificate verification) +%bcond_with tpm # TPM support in gnutls (cannot be used with GPL programs) # Summary: The GNU Transport Layer Security Library Summary(pl.UTF-8): Biblioteka GNU TLS (Transport Layer Security) Name: gnutls -Version: 3.1.5 +Version: 3.1.6 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: 0bc1a96efe34fe7adca7318664ca2922 +# Source0-md5: 770d3ed5adfb67b075b5b398f13f484c Patch0: %{name}-info.patch Patch1: %{name}-link.patch Patch2: %{name}-pl.po-update.patch +Patch3: %{name}-am.patch URL: http://www.gnutls.org/ BuildRequires: autoconf >= 2.61 BuildRequires: automake >= 1:1.11.3 @@ -39,7 +41,7 @@ BuildRequires: rpmbuild(macros) >= 1.383 BuildRequires: sed >= 4.0 BuildRequires: tar >= 1:1.22 BuildRequires: texinfo >= 4.8 -BuildRequires: trousers-devel +%{?with_tpm:BuildRequires: trousers-devel} %{?with_dane:BuildRequires: unbound-devel} BuildRequires: zlib-devel Requires(post,postun): /sbin/ldconfig @@ -73,6 +75,7 @@ Requires: libtasn1-devel >= 2.14 %{!?with_gcrypt:Requires: nettle-devel >= 2.5} #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 @@ -155,6 +158,7 @@ Wiązania Guile do GnuTLS. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %{__rm} po/stamp-po @@ -171,7 +175,8 @@ Wiązania Guile do GnuTLS. %configure \ --disable-silent-rules \ --with-default-trust-store-file=/etc/certs/ca-certificates.crt \ - %{?with_gcrypt:--with-libgcrypt} + %{?with_gcrypt:--with-libgcrypt} \ + %{?with_tpm:--with-tpm} # docs build is broken with -jN %{__make} -j1 @@ -220,7 +225,7 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_bindir}/p11tool %attr(755,root,root) %{_bindir}/psktool %attr(755,root,root) %{_bindir}/srptool -%attr(755,root,root) %{_bindir}/tpmtool +%{?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}