rpms/gnutls/devel gnutls-1.4.0-enable-psk.patch, NONE, 1.1 gnutls-1.4.0-nosrp.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 gnutls.spec, 1.20, 1.21 sources, 1.8, 1.9 gnutls-1.2.9-nosrp.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Jun 14 12:43:45 UTC 2006
Author: tmraz
Update of /cvs/dist/rpms/gnutls/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32674
Modified Files:
.cvsignore gnutls.spec sources
Added Files:
gnutls-1.4.0-enable-psk.patch gnutls-1.4.0-nosrp.patch
Removed Files:
gnutls-1.2.9-nosrp.patch
Log Message:
* Wed Jun 14 2006 Tomas Mraz <tmraz at redhat.com> - 1.4.0-1
- upgrade to new upstream version (#192070), rebuild
of dependent packages required
gnutls-1.4.0-enable-psk.patch:
configure | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE gnutls-1.4.0-enable-psk.patch ---
--- gnutls-1.4.0/configure.enable-psk 2006-06-14 13:03:22.000000000 +0200
+++ gnutls-1.4.0/configure 2006-06-14 14:01:30.000000000 +0200
@@ -9896,9 +9896,9 @@
# Check whether --enable-psk-authentication or --disable-psk-authentication was given.
if test "${enable_psk_authentication+set}" = set; then
enableval="$enable_psk_authentication"
- ac_enable_srp=no
+ ac_enable_psk=no
fi;
-if test x$ac_enable_srp != xno; then
+if test x$ac_enable_psk != xno; then
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
gnutls-1.4.0-nosrp.patch:
ex-client-srp.c | 5 ++++-
ex-serv-srp.c | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
--- NEW FILE gnutls-1.4.0-nosrp.patch ---
--- 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;
}
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnutls/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 13 Feb 2006 08:10:43 -0000 1.8
+++ .cvsignore 14 Jun 2006 12:43:43 -0000 1.9
@@ -1 +1 @@
-gnutls-1.2.10-nosrp.tar.bz2
+gnutls-1.4.0-nosrp.tar.bz2
Index: gnutls.spec
===================================================================
RCS file: /cvs/dist/rpms/gnutls/devel/gnutls.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- gnutls.spec 16 May 2006 15:43:52 -0000 1.20
+++ gnutls.spec 14 Jun 2006 12:43:43 -0000 1.21
@@ -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 @@
# 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 @@
%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}/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 @@
/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 @@
%files utils
%defattr(-,root,root)
%{_bindir}/certtool
+%{_bindir}/psktool
%{_bindir}/gnutls*
%{_mandir}/man1/*
%changelog
+* Wed Jun 14 2006 Tomas Mraz <tmraz at redhat.com> - 1.4.0-1
+- upgrade to new upstream version (#192070), rebuild
+ of dependent packages required
+
* Tue May 16 2006 Tomas Mraz <tmraz at redhat.com> - 1.2.10-2
- added missing buildrequires
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnutls/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 13 Feb 2006 08:10:43 -0000 1.8
+++ sources 14 Jun 2006 12:43:43 -0000 1.9
@@ -1 +1 @@
-04ab0b4386d5996cf7c725f11ff8b801 gnutls-1.2.10-nosrp.tar.bz2
+89be8819c829f48a32bdf7a9f267e698 gnutls-1.4.0-nosrp.tar.bz2
--- gnutls-1.2.9-nosrp.patch DELETED ---
More information about the fedora-cvs-commits
mailing list