From 109ee1c76914d46e4518d5a8e4fa8d2f545560e3 Mon Sep 17 00:00:00 2001
From: Tomáš Mráz <tmraz@fedoraproject.org>
Date: Jun 14 2006 12:43:43 +0000
Subject: - upgrade to new upstream version (#192070), rebuild of dependent packages

    required

---

diff --git a/.cvsignore b/.cvsignore
index 770a540..2b05b27 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnutls-1.2.10-nosrp.tar.bz2
+gnutls-1.4.0-nosrp.tar.bz2
diff --git a/gnutls-1.4.0-nosrp.patch b/gnutls-1.4.0-nosrp.patch
new file mode 100644
index 0000000..bca8061
--- /dev/null
+++ b/gnutls-1.4.0-nosrp.patch
@@ -0,0 +1,59 @@
+--- gnutls-1.2.9/doc/examples/ex-client-srp.c.nosrp	2005-08-10 11:13:30.000000000 +0200
++++ gnutls-1.2.9/doc/examples/ex-client-srp.c	2005-11-23 11:58:46.000000000 +0100
+@@ -17,13 +17,16 @@
+ #define SA struct sockaddr
+ #define MSG "GET / HTTP/1.0\r\n\r\n"
+ 
++#if 0
+ const int kx_priority[] = { GNUTLS_KX_SRP, GNUTLS_KX_SRP_DSS,
+   GNUTLS_KX_SRP_RSA, 0
+ };
++#endif
+ 
+ int
+ main (void)
+ {
++#if 0
+   int ret;
+   int sd, ii;
+   gnutls_session_t session;
+@@ -122,6 +125,6 @@
+   gnutls_certificate_free_credentials (cert_cred);
+ 
+   gnutls_global_deinit ();
+-
++#endif
+   return 0;
+ }
+--- gnutls-1.2.9/doc/examples/ex-serv-srp.c.nosrp	2005-09-23 00:40:19.000000000 +0200
++++ gnutls-1.2.9/doc/examples/ex-serv-srp.c	2005-11-23 12:02:44.000000000 +0100
+@@ -26,6 +26,7 @@
+ #define MAX_BUF 1024
+ #define PORT 5556		/* listen to 5556 port */
+ 
++#if 0
+ /* These are global */
+ gnutls_srp_server_credentials_t srp_cred;
+ gnutls_certificate_credentials_t cert_cred;
+@@ -54,10 +55,12 @@
+ 
+   return session;
+ }
++#endif
+ 
+ int
+ main (void)
+ {
++#if 0
+   int err, listen_sd, i;
+   int sd, ret;
+   struct sockaddr_in sa_serv;
+@@ -170,7 +173,7 @@
+   gnutls_certificate_free_credentials (cert_cred);
+ 
+   gnutls_global_deinit ();
+-
++#endif
+   return 0;
+ 
+ }
diff --git a/gnutls.spec b/gnutls.spec
index e042665..08d15a3 100644
--- a/gnutls.spec
+++ b/gnutls.spec
@@ -1,10 +1,10 @@
 Summary: A TLS protocol implementation.
 Name: gnutls
-Version: 1.2.10
-Release: 2
+Version: 1.4.0
+Release: 1
 License: LGPL
 Group: System Environment/Libraries
-BuildRequires: libgcrypt-devel >= 1.2.2
+BuildRequires: libgcrypt-devel >= 1.2.2, gettext
 BuildRequires: zlib-devel, readline-devel, libtermcap-devel
 #BuildPrereq: libtasn1-devel
 #BuildPrereq: opencdk-devel
@@ -14,7 +14,8 @@ URL: http://www.gnutls.org/
 # XXX patent tainted SRP code removed.
 Source0: %{name}-%{version}-nosrp.tar.bz2
 Source1: libgnutls-config
-Patch0: gnutls-1.2.9-nosrp.patch
+Patch0: gnutls-1.4.0-nosrp.patch
+Patch1: gnutls-1.4.0-enable-psk.patch
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: libgcrypt >= 1.2.2
 
@@ -52,6 +53,7 @@ manipulation tools.
 %prep
 %setup -q
 %patch0 -p1 -b .nosrp
+%patch1 -p1 -b .enable-psk
 
 for i in auth_srp_rsa.c auth_srp_sb64.c auth_srp_passwd.c auth_srp.c gnutls_srp.c ext_srp.c; do
     touch lib/$i
@@ -72,6 +74,7 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/man1/srptool.1
 rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*srp*
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+%find_lang %{name}
 
 %check
 make check
@@ -93,7 +96,7 @@ if [ $1 = 0 -a -f %{_infodir}/gnutls.info.gz ]; then
    /sbin/install-info --delete %{_infodir}/gnutls.info.gz %{_infodir}/dir
 fi
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root)
 %{_libdir}/*.so.*
 
@@ -111,10 +114,15 @@ fi
 %files utils
 %defattr(-,root,root)
 %{_bindir}/certtool
+%{_bindir}/psktool
 %{_bindir}/gnutls*
 %{_mandir}/man1/*
 
 %changelog
+* Wed Jun 14 2006 Tomas Mraz <tmraz@redhat.com> - 1.4.0-1
+- upgrade to new upstream version (#192070), rebuild
+  of dependent packages required
+
 * Tue May 16 2006 Tomas Mraz <tmraz@redhat.com> - 1.2.10-2
 - added missing buildrequires
 
diff --git a/sources b/sources
index 2efe82b..898a7bc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-04ab0b4386d5996cf7c725f11ff8b801  gnutls-1.2.10-nosrp.tar.bz2
+89be8819c829f48a32bdf7a9f267e698  gnutls-1.4.0-nosrp.tar.bz2