packages: gnutls/gnutls-info.patch, gnutls/gnutls.spec, gnutls/gnutls-notes...

qboosh qboosh at pld-linux.org
Sat Apr 2 08:39:42 CEST 2011 

Author: qboosh                       Date: Sat Apr  2 06:39:42 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 2.12.0 (note: new libgnutls-openssl and libgnutlsxx sonames)
- updated info patch
- added notestsuite patch (no test/suite dir in distribution)

---- Files affected:
packages/gnutls:
   gnutls-info.patch (1.5 -> 1.6) , gnutls.spec (1.118 -> 1.119) , gnutls-notestsuite.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/gnutls/gnutls-info.patch
diff -u packages/gnutls/gnutls-info.patch:1.5 packages/gnutls/gnutls-info.patch:1.6
--- packages/gnutls/gnutls-info.patch:1.5	Thu Jul  1 09:24:57 2010
+++ packages/gnutls/gnutls-info.patch	Sat Apr  2 08:39:36 2011
@@ -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
  
 - at 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
  
 - at 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 @@
 + at node srptool
  @section Invoking srptool
 - at anchor{srptool}
++ at anchor{Invoking srptool}
  @cindex srptool
  
  The @file{srptool} is a very simple program that emulates the programs
+@@ -856,9 +856,9 @@
+ 
+ @end itemize
+ 
+- at node Invoking p11tool
++ at node p11tool
+ @section Invoking p11tool
+- at anchor{p11tool}
++ at anchor{Invoking p11tool}
+ @cindex p11tool
+ 
+ The @file{p11tool} is a program that helps with accessing tokens

================================================================
Index: packages/gnutls/gnutls.spec
diff -u packages/gnutls/gnutls.spec:1.118 packages/gnutls/gnutls.spec:1.119
--- packages/gnutls/gnutls.spec:1.118	Sat Mar  5 11:23:44 2011
+++ packages/gnutls/gnutls.spec	Sat Apr  2 08:39:36 2011
@@ -2,14 +2,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
@@ -17,7 +18,7 @@
 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
@@ -25,13 +26,14 @@
 # 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)
@@ -54,11 +56,13 @@
 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.
@@ -138,6 +142,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -152,6 +157,8 @@
 %{__automake}
 cd ..
 %configure \
+	--disable-silent-rules \
+	--with-libgcrypt \
 	--with-lzo
 
 %{__make}
@@ -189,6 +196,7 @@
 %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.*.*.*
@@ -196,13 +204,15 @@
 %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)
@@ -227,7 +237,7 @@
 %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)
@@ -257,6 +267,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.119  2011/04/02 06:39:36  qboosh
+- updated to 2.12.0 (note: new libgnutls-openssl and libgnutlsxx sonames)
+- updated info patch
+- added notestsuite patch (no test/suite dir in distribution)
+
 Revision 1.118  2011/03/05 10:23:44  qboosh
 - updated to 2.10.5
 

================================================================
Index: packages/gnutls/gnutls-notestsuite.patch
diff -u /dev/null packages/gnutls/gnutls-notestsuite.patch:1.1
--- /dev/null	Sat Apr  2 08:39:42 2011
+++ packages/gnutls/gnutls-notestsuite.patch	Sat Apr  2 08:39:36 2011
@@ -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
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gnutls/gnutls-info.patch?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gnutls/gnutls.spec?r1=1.118&r2=1.119&f=u

More information about the pld-cvs-commit mailing list