- updated to 2.12.0 (note: new libgnutls-openssl and libgnutlsxx sonames)

- updated info patch
- added notestsuite patch (no test/suite dir in distribution)

Changed files:
    gnutls-info.patch -> 1.6
    gnutls-notestsuite.patch -> 1.1
    gnutls.spec -> 1.119

diff --git a/gnutls-info.patch b/gnutls-info.patch
index e9f01b05690db89ab68bf50965a071acd39d8924..6d3a65fcd9b2b8c56a204f4b52187446db849e86 100644 (file)
--- a/gnutls-info.patch
+++ b/gnutls-info.patch
@@ -29,7 +29,9 @@
  @end direntry
  
  @titlepage
-@@ -2841,15 +2841,15 @@
+--- gnutls-2.12.0/doc/cha-programs.texi.orig   2011-03-02 18:39:11.000000000 +0100
++++ gnutls-2.12.0/doc/cha-programs.texi        2011-04-01 20:42:53.813729730 +0200
+@@ -6,16 +6,16 @@
  application.  The applications are discussed in this chapter.
  
  @menu
@@ -39,12 +41,14 @@
 -* Invoking gnutls-serv::
 -* Invoking psktool::
 -* Invoking srptool::
+-* Invoking p11tool::
 +* certtool::
 +* gnutls-cli::
 +* gnutls-cli-debug::
 +* gnutls-serv::
 +* psktool::
 +* srptool::
++* p11tool::
  @end menu
  
 -@node Invoking certtool
@@ -52,8 +56,8 @@
  @section Invoking certtool
  @cindex certtool
  
-@@ -3169,7 +3169,7 @@
- #time_stamping_key
+@@ -338,7 +338,7 @@
+ #ipsec_ike_key
  @end example
  
 -@node Invoking gnutls-cli
@@ -61,7 +65,7 @@
  @section Invoking gnutls-cli
  @cindex gnutls-cli
  
-@@ -3295,7 +3295,7 @@
+@@ -464,7 +464,7 @@
  @code{--pskkey} parameter, it will query only for the password during
  the handshake.
  
@@ -70,7 +74,7 @@
  @section Invoking gnutls-cli-debug
  @cindex gnutls-cli-debug
  
-@@ -3343,7 +3343,7 @@
+@@ -512,7 +512,7 @@
  Checking for OpenPGP authentication support (TLS extension)... no
  @end smallexample
  
@@ -79,7 +83,7 @@
  @section Invoking gnutls-serv
  @cindex gnutls-serv
  
-@@ -3588,7 +3588,7 @@
+@@ -757,7 +757,7 @@
  @cindex PSK server
  
  To set up a PSK server with @code{gnutls-serv} you need to create PSK
@@ -88,7 +92,7 @@
  type @code{password} at the prompt.
  
  @smallexample
-@@ -3612,7 +3612,7 @@
+@@ -781,7 +781,7 @@
  You can now connect to the server using a PSK client (@pxref{Example
  client PSK connection}).
  
@@ -97,7 +101,7 @@
  @section Invoking psktool
  @cindex psktool
  
-@@ -3639,9 +3639,8 @@
+@@ -808,9 +808,9 @@
  @code{--netconf-hint}.  To derive a PSK key from a password with an
  empty PSK identity hint, using @code{--netconf-hint ""}.
  
@@ -105,6 +109,19 @@
 +@node srptool
  @section Invoking srptool
 -@anchor{srptool}
++@anchor{Invoking srptool}
  @cindex srptool
  
  The @file{srptool} is a very simple program that emulates the programs
+@@ -856,9 +856,9 @@
+ 
+ @end itemize
+ 
+-@node Invoking p11tool
++@node p11tool
+ @section Invoking p11tool
+-@anchor{p11tool}
++@anchor{Invoking p11tool}
+ @cindex p11tool
+ 
+ The @file{p11tool} is a program that helps with accessing tokens

diff --git a/gnutls-notestsuite.patch b/gnutls-notestsuite.patch
new file mode 100644 (file)
index 0000000..31c25e1
--- /dev/null
+++ b/gnutls-notestsuite.patch
@@ -0,0 +1,12 @@
+--- gnutls-2.12.0/configure.ac.orig    2011-03-24 17:58:53.000000000 +0100
++++ gnutls-2.12.0/configure.ac 2011-04-01 19:32:39.709736435 +0200
+@@ -293,9 +293,6 @@
+   tests/sha2/Makefile
+   tests/userid/Makefile
+ ])
+-if test -d tests/suite;then
+-AC_CONFIG_FILES([tests/suite/Makefile])
+-fi
+ 
+ AC_OUTPUT
+ 

diff --git a/gnutls.spec b/gnutls.spec
index 6a9040633a4ccad27fc2685de9f462f527b40f09..4c427ce37b22ed5eaeb34750af84c79bbfbf7516 100644 (file)
--- a/gnutls.spec
+++ b/gnutls.spec
@@ -1,14 +1,15 @@
 Summary:       The GNU Transport Layer Security Library
 Summary(pl.UTF-8):     Biblioteka GNU TLS (Transport Layer Security)
 Name:          gnutls
-Version:       2.10.5
+Version:       2.12.0
 Release:       1
 License:       LGPL v2.1+ (libgnutls), GPL v3+ (extra libs and tools)
 Group:         Libraries
 Source0:       ftp://ftp.gnutls.org/pub/gnutls/%{name}-%{version}.tar.bz2
-# Source0-md5: 1b032e07ccd22f71a5df78aa73bd91f2
+# Source0-md5: 15889daca10e7155514eef9053ab5632
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-link.patch
+Patch2:                %{name}-notestsuite.patch
 URL:           http://www.gnu.org/software/gnutls/
 BuildRequires: autoconf >= 2.61
 BuildRequires: automake >= 1:1.10.2-2
@@ -16,7 +17,7 @@ BuildRequires:        gettext-devel >= 0.17
 BuildRequires: gtk-doc >= 1.1
 BuildRequires: guile-devel >= 5:1.8
 BuildRequires: libcfg+-devel
-BuildRequires: libgcrypt-devel >= 1.2.4
+BuildRequires: libgcrypt-devel >= 1.4.0
 BuildRequires: libstdc++-devel
 BuildRequires: libtasn1-devel >= 2.9
 BuildRequires: libtool >= 2:1.5
@@ -24,13 +25,14 @@ BuildRequires:      lzo-devel
 # miniopencdk is included in sources and currently maintained
 # as part of gnutls, not external package
 #BuildRequires:        opencdk-devel >= 0.6.6
+BuildRequires: pakchois-devel
 BuildRequires: pkgconfig
 BuildRequires: readline-devel
 BuildRequires: rpmbuild(macros) >= 1.383
 BuildRequires: texinfo >= 4.8
 BuildRequires: zlib-devel
 Requires(post,postun): /sbin/ldconfig
-Requires:      libgcrypt >= 1.2.4
+Requires:      libgcrypt >= 1.4.0
 Requires:      libtasn1 >= 2.9
 #Requires:     opencdk >= 0.6.6
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -53,11 +55,13 @@ Summary(pl.UTF-8):  Pliki nagłówkowe i inne do gnutls
 License:       LGPL v2.1+ (libgnutls), GPL v3+ (extra libs)
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
-Requires:      libgcrypt-devel >= 1.2.4
+Requires:      libgcrypt-devel >= 1.4.0
 Requires:      libtasn1-devel >= 2.9
 #Requires:     opencdk-devel >= 0.6.6
+Requires:      pakchois-devel
+# lzo-devel for libgnutls-extra only
+Requires:      lzo-devel
 Requires:      zlib-devel
-# libgnutls-extra R: lzo-devel
 
 %description devel
 Header files etc to develop gnutls applications.
@@ -137,6 +141,7 @@ Wiązania Guile do GnuTLS.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -151,6 +156,8 @@ cd lib
 %{__automake}
 cd ..
 %configure \
+       --disable-silent-rules \
+       --with-libgcrypt \
        --with-lzo
 
 %{__make}
@@ -188,6 +195,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS ChangeLog NEWS README THANKS
 %attr(755,root,root) %{_bindir}/certtool
 %attr(755,root,root) %{_bindir}/gnutls-*
+%attr(755,root,root) %{_bindir}/p11tool
 %attr(755,root,root) %{_bindir}/psktool
 %attr(755,root,root) %{_bindir}/srptool
 %attr(755,root,root) %{_libdir}/libgnutls.so.*.*.*
@@ -195,13 +203,15 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libgnutls-extra.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libgnutls-extra.so.26
 %attr(755,root,root) %{_libdir}/libgnutls-openssl.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgnutls-openssl.so.26
+%attr(755,root,root) %ghost %{_libdir}/libgnutls-openssl.so.27
 %{_mandir}/man1/certtool.1*
 %{_mandir}/man1/gnutls-*.1*
+%{_mandir}/man1/p11tool.1*
 %{_mandir}/man1/psktool.1*
 %{_mandir}/man1/srptool.1*
 %{_infodir}/gnutls.info*
 %{_infodir}/gnutls-*.png
+%{_infodir}/pkcs11-vision.png
 
 %files devel
 %defattr(644,root,root,755)
@@ -226,7 +236,7 @@ rm -rf $RPM_BUILD_ROOT
 %files c++
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libgnutlsxx.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgnutlsxx.so.26
+%attr(755,root,root) %ghost %{_libdir}/libgnutlsxx.so.27
 
 %files c++-devel
 %defattr(644,root,root,755)