- updated to 3.1.0

- updated pl.po-update patch

diff --git a/gnutls-pl.po-update.patch b/gnutls-pl.po-update.patch
index 06c95c51e98cfac96ca64539593a9bfcceafd3ed..6d34d12672a72e3a417cd92f08ce9d7bad8941bb 100644 (file)
--- a/gnutls-pl.po-update.patch
+++ b/gnutls-pl.po-update.patch
@@ -1,15 +1,15 @@
---- gnutls-3.0.22/po/pl.po.orig        2012-08-04 20:54:29.000000000 +0200
-+++ gnutls-3.0.22/po/pl.po     2012-08-29 18:59:04.228639320 +0200
+--- gnutls-3.1.0/po/pl.po.orig 2012-08-05 11:56:22.000000000 +0200
++++ gnutls-3.1.0/po/pl.po      2012-09-01 20:25:59.383128083 +0200
 @@ -5,10 +5,10 @@
  #
  msgid ""
  msgstr ""
 -"Project-Id-Version: libgnutls-3.0.12\n"
-+"Project-Id-Version: libgnutls-3.0.22\n"
++"Project-Id-Version: libgnutls-3.1.0\n"
  "Report-Msgid-Bugs-To: bug-gnutls@gnu.org\n"
- "POT-Creation-Date: 2012-08-04 20:54+0200\n"
+ "POT-Creation-Date: 2012-08-05 11:56+0200\n"
 -"PO-Revision-Date: 2012-01-20 20:45+0100\n"
-+"PO-Revision-Date: 2012-08-29 18:58+0200\n"
++"PO-Revision-Date: 2012-09-01 20:35+0200\n"
  "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
  "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
  "Language: pl\n"
@@ -33,7 +33,7 @@
  
  #: lib/gnutls_errors.c:167
  msgid "Function was interrupted."
-@@ -589,7 +588,7 @@
+@@ -589,28 +588,27 @@
  
  #: lib/gnutls_errors.c:284
  msgid "Peer has terminated the connection"
@@ -42,7 +42,54 @@
  
  #: lib/gnutls_errors.c:286
  msgid "Channel binding data not available"
-@@ -1015,14 +1014,14 @@
+ msgstr "Dane wi±¿±ce kana³ nie s± dostêpne."
+ 
+ #: lib/gnutls_errors.c:289
+-#, fuzzy
+ msgid "TPM error."
+-msgstr "B³±d PKCS #11."
++msgstr "B³±d TPM."
+ 
+ #: lib/gnutls_errors.c:291
+ msgid "TPM is not initialized."
+-msgstr ""
++msgstr "TPM nie zainicjowany."
+ 
+ #: lib/gnutls_errors.c:293
+ msgid "TPM key was not found in persistent storage."
+-msgstr ""
++msgstr "Nie znaleziono klucza TPM w trwa³ych danych."
+ 
+ #: lib/gnutls_errors.c:295
+ msgid "Cannot initialize a session with the TPM."
+-msgstr ""
++msgstr "Nie mo¿na zainicjowaæ sesji z TPM."
+ 
+ #: lib/gnutls_errors.c:297
+ msgid "PKCS #11 error."
+@@ -625,18 +623,16 @@
+ msgstr "B³±d w trakcie analizy."
+ 
+ #: lib/gnutls_errors.c:303
+-#, fuzzy
+ msgid "Error in provided PIN."
+-msgstr "B³±d w trakcie analizy."
++msgstr "B³±d w podanym PIN-ie."
+ 
+ #: lib/gnutls_errors.c:305
+-#, 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:307
+ 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:309
+ msgid "PKCS #11 error in slot"
+@@ -1038,14 +1034,14 @@
  msgstr "%s\t\t\tTylko deszyfrowanie klucza.\n"
  
  #: lib/x509/output.c:470
@@ -61,7 +108,7 @@
  
  #: lib/x509/output.c:527
  msgid ""
-@@ -1150,9 +1149,9 @@
+@@ -1173,9 +1169,9 @@
  msgstr "%s\t\tU¿ycie klucza (%s):\n"
  
  #: lib/x509/output.c:1004
@@ -73,10 +120,16 @@
  
  #: lib/x509/output.c:1019
  #, c-format
-@@ -1377,6 +1376,3 @@
+@@ -1400,12 +1396,3 @@
  #: lib/x509/output.c:2421
  msgid "PKCS #10 Certificate Request Information:\n"
  msgstr "Informacja o ¿±daniu certyfikatu PKCS #10:\n"
 -
 -#~ msgid "A large TLS record packet was received."
 -#~ msgstr "Odebrano du¿y pakiet rekordu TLS."
+-
+-#~ 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."

diff --git a/gnutls.spec b/gnutls.spec
index 3d5f179888eeeb211c37a02d360bd1bf9c2ca9f3..cd1eea476422315f3b9e220005c02239844c85e0 100644 (file)
--- a/gnutls.spec
+++ b/gnutls.spec
@@ -1,16 +1,16 @@
 #
 # Conditional build:
-%bcond_with    gcrypt  # use gcrypt crypto backend instead of nettle (broken or withdrawn?)
+%bcond_with    gcrypt  # use gcrypt crypto backend instead of nettle (withdrawn?)
 #
 Summary:       The GNU Transport Layer Security Library
 Summary(pl.UTF-8):     Biblioteka GNU TLS (Transport Layer Security)
 Name:          gnutls
-Version:       3.0.22
+Version:       3.1.0
 Release:       1
 License:       LGPL v3+ (libgnutls), GPL v3+ (openssl library and tools)
 Group:         Libraries
 Source0:       ftp://ftp.gnutls.org/pub/gnutls/%{name}-%{version}.tar.lz
-# Source0-md5: 129bd38ad023c599df4d4b5dd359a445
+# Source0-md5: 902f120ae7eabf00154281236ff3695f
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-link.patch
 Patch2:                %{name}-pl.po-update.patch
@@ -27,7 +27,7 @@ BuildRequires:        libstdc++-devel
 BuildRequires: libtasn1-devel >= 2.12
 BuildRequires: libtool >= 2:1.5
 BuildRequires: lzip
-%{!?with_gcrypt:BuildRequires: nettle-devel >= 2.4}
+%{!?with_gcrypt:BuildRequires: nettle-devel >= 2.5}
 # miniopencdk is included in sources and currently maintained
 # as part of gnutls, not external package
 #BuildRequires:        opencdk-devel >= 0.6.6
@@ -38,11 +38,12 @@ BuildRequires:      rpmbuild(macros) >= 1.383
 BuildRequires: sed >= 4.0
 BuildRequires: tar >= 1:1.22
 BuildRequires: texinfo >= 4.8
+BuildRequires: trousers-devel
 BuildRequires: zlib-devel
 Requires(post,postun): /sbin/ldconfig
 %{?with_gcrypt:Requires:       libgcrypt >= 1.4.0}
 Requires:      libtasn1 >= 2.12
-%{!?with_gcrypt:Requires:      nettle >= 2.4}
+%{!?with_gcrypt:Requires:      nettle >= 2.5}
 #Requires:     opencdk >= 0.6.6
 Requires:      p11-kit >= 0.11
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -67,7 +68,7 @@ Group:                Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 %{?with_gcrypt:Requires:       libgcrypt-devel >= 1.4.0}
 Requires:      libtasn1-devel >= 2.12
-%{!?with_gcrypt:Requires:      nettle-devel >= 2.4}
+%{!?with_gcrypt:Requires:      nettle-devel >= 2.5}
 #Requires:     opencdk-devel >= 0.6.6
 Requires:      p11-kit-devel >= 0.11
 Requires:      zlib-devel
@@ -166,6 +167,7 @@ Wiązania Guile do GnuTLS.
 %{__automake}
 %configure \
        --disable-silent-rules \
+       --with-default-trust-store-file=/etc/certs/ca-certificates.crt \
        %{?with_gcrypt:--with-libgcrypt}
 
 # docs build is broken with -jN
@@ -214,6 +216,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
 %attr(755,root,root) %{_libdir}/libgnutls.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libgnutls.so.28
 %attr(755,root,root) %{_libdir}/libgnutls-openssl.so.*.*.*
@@ -224,6 +227,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/p11tool.1*
 %{_mandir}/man1/psktool.1*
 %{_mandir}/man1/srptool.1*
+%{_mandir}/man1/tpmtool.1*
 %{_infodir}/gnutls.info*
 %{_infodir}/gnutls-*.png
 %{_infodir}/pkcs11-vision.png