rpms/gnutls/devel gnutls-2.0.4-nosrp.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 gnutls.spec, 1.29, 1.30 sources, 1.12, 1.13 gnutls-1.4.0-nosrp.patch, 1.1, NONE gnutls-1.4.1-enable-psk.patch, 1.1, NONE gnutls-1.6.3-incompat-pointers.patch, 1.1, NONE

[Tomas Mraz (tmraz)]

Author: tmraz

Update of /cvs/pkgs/rpms/gnutls/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8695

Modified Files:
	.cvsignore gnutls.spec sources 
Added Files:
	gnutls-2.0.4-nosrp.patch 
Removed Files:
	gnutls-1.4.0-nosrp.patch gnutls-1.4.1-enable-psk.patch 
	gnutls-1.6.3-incompat-pointers.patch 
Log Message:
* Tue Dec  4 2007 Tomas Mraz <tmraz at redhat.com> 2.0.4-1
- upgrade to latest upstream


gnutls-2.0.4-nosrp.patch:

--- NEW FILE gnutls-2.0.4-nosrp.patch ---
diff -up gnutls-2.0.4/doc/examples/ex-serv-srp.c.nosrp gnutls-2.0.4/doc/examples/ex-serv-srp.c
--- gnutls-2.0.4/doc/examples/ex-serv-srp.c.nosrp	2007-11-15 16:24:56.000000000 +0100
+++ gnutls-2.0.4/doc/examples/ex-serv-srp.c	2007-11-29 14:50:37.000000000 +0100
@@ -29,6 +29,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;
@@ -57,10 +58,12 @@ initialize_tls_session (void)
 
   return session;
 }
+#endif
 
 int
 main (void)
 {
+#if 0
   int err, listen_sd, i;
   int sd, ret;
   struct sockaddr_in sa_serv;
@@ -173,7 +176,7 @@ main (void)
   gnutls_certificate_free_credentials (cert_cred);
 
   gnutls_global_deinit ();
-
+#endif
   return 0;
 
 }
diff -up gnutls-2.0.4/doc/examples/ex-session-info.c.nosrp gnutls-2.0.4/doc/examples/ex-session-info.c
--- gnutls-2.0.4/doc/examples/ex-session-info.c.nosrp	2007-11-15 16:24:56.000000000 +0100
+++ gnutls-2.0.4/doc/examples/ex-session-info.c	2007-11-29 15:54:12.000000000 +0100
@@ -35,12 +35,12 @@ print_info (gnutls_session_t session)
       printf ("- TLS/IA session\n");
       break;
 
-
+#if 0
     case GNUTLS_CRD_SRP:
       printf ("- SRP session with username %s\n",
 	      gnutls_srp_server_get_username (session));
       break;
-
+#endif
     case GNUTLS_CRD_PSK:
       if (gnutls_psk_server_get_username (session) != NULL)
 	printf ("- PSK authentication. Connected as '%s'\n",
diff -up gnutls-2.0.4/doc/examples/ex-client-srp.c.nosrp gnutls-2.0.4/doc/examples/ex-client-srp.c
--- gnutls-2.0.4/doc/examples/ex-client-srp.c.nosrp	2007-11-15 16:24:56.000000000 +0100
+++ gnutls-2.0.4/doc/examples/ex-client-srp.c	2007-11-29 14:50:37.000000000 +0100
@@ -24,6 +24,7 @@ extern void tcp_close (int sd);
 int
 main (void)
 {
+#if 0
   int ret;
   int sd, ii;
   gnutls_session_t session;
@@ -121,6 +122,6 @@ end:
   gnutls_certificate_free_credentials (cert_cred);
 
   gnutls_global_deinit ();
-
+#endif
   return 0;
 }


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnutls/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	6 Jun 2007 13:26:50 -0000	1.12
+++ .cvsignore	4 Dec 2007 16:48:55 -0000	1.13
@@ -1 +1 @@
-gnutls-1.6.3-nosrp.tar.bz2
+gnutls-2.0.4-nosrp.tar.bz2


Index: gnutls.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnutls/devel/gnutls.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- gnutls.spec	21 Aug 2007 19:44:08 -0000	1.29
+++ gnutls.spec	4 Dec 2007 16:48:55 -0000	1.30
@@ -1,9 +1,9 @@
 Summary: A TLS protocol implementation
 Name: gnutls
-Version: 1.6.3
-Release: 2%{?dist}
+Version: 2.0.4
+Release: 1%{?dist}
 # The libgnutls library is LGPLv2+, utilities and remaining libraries are GPLv2+
-License: GPLv2+ and LGPLv2+ 
+License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
 BuildRequires: libgcrypt-devel >= 1.2.2, gettext
 BuildRequires: zlib-devel, readline-devel
@@ -15,9 +15,7 @@
 # XXX patent tainted SRP code removed.
 Source0: %{name}-%{version}-nosrp.tar.bz2
 Source1: libgnutls-config
-Patch0: gnutls-1.4.0-nosrp.patch
-Patch1: gnutls-1.4.1-enable-psk.patch
-Patch2: gnutls-1.6.3-incompat-pointers.patch
+Patch0: gnutls-2.0.4-nosrp.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: libgcrypt >= 1.2.2
@@ -59,8 +57,6 @@
 %prep
 %setup -q
 %patch0 -p1 -b .nosrp
-%patch1 -p1 -b .enable-psk
-%patch2 -p1 -b .incompat
 
 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
@@ -127,6 +123,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Dec  4 2007 Tomas Mraz <tmraz at redhat.com> 2.0.4-1
+- upgrade to latest upstream
+
 * Tue Aug 21 2007 Tomas Mraz <tmraz at redhat.com> 1.6.3-2
 - license tag fix
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnutls/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	6 Jun 2007 13:26:50 -0000	1.12
+++ sources	4 Dec 2007 16:48:55 -0000	1.13
@@ -1 +1 @@
-2c4372bd1e282f9697f0a3a6b0ea7977  gnutls-1.6.3-nosrp.tar.bz2
+9227132e5e92bcf1e4d674c86779e9ef  gnutls-2.0.4-nosrp.tar.bz2


--- gnutls-1.4.0-nosrp.patch DELETED ---


--- gnutls-1.4.1-enable-psk.patch DELETED ---


--- gnutls-1.6.3-incompat-pointers.patch DELETED ---