From 74eb4df9c22d8785c5bb23b6142f5ddb830da0db Mon Sep 17 00:00:00 2001 From: Tomas Mraz Date: Tue, 8 Jan 2013 21:21:47 +0100 Subject: [PATCH] new upstream version --- .gitignore | 1 + gnutls-2.12.20-build.patch | 24 ------------------------ gnutls.spec | 20 ++++++++++---------- sources | 2 +- 4 files changed, 12 insertions(+), 35 deletions(-) delete mode 100644 gnutls-2.12.20-build.patch diff --git a/.gitignore b/.gitignore index 1eeccb3..9ab04c0 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ gnutls-2.10.1-nosrp.tar.bz2 /gnutls-2.12.19-nosrp.tar.xz /gnutls-2.12.20-nosrp.tar.xz /gnutls-2.12.21-nosrp.tar.xz +/gnutls-2.12.22-nosrp.tar.xz diff --git a/gnutls-2.12.20-build.patch b/gnutls-2.12.20-build.patch deleted file mode 100644 index 6c20588..0000000 --- a/gnutls-2.12.20-build.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up gnutls-2.12.20/gl/stdio.in.h.build gnutls-2.12.20/gl/stdio.in.h ---- gnutls-2.12.20/gl/stdio.in.h.build 2012-03-01 16:47:48.000000000 +0100 -+++ gnutls-2.12.20/gl/stdio.in.h 2012-06-18 16:50:51.307755234 +0200 -@@ -698,7 +698,7 @@ _GL_WARN_ON_USE (getline, "getline is un - # endif - #endif - --#if @GNULIB_GETS@ -+#if 0 - # if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@ - # if !(defined __cplusplus && defined GNULIB_NAMESPACE) - # undef gets -diff -up gnutls-2.12.20/lib/gl/stdio.in.h.build gnutls-2.12.20/lib/gl/stdio.in.h ---- gnutls-2.12.20/lib/gl/stdio.in.h.build 2012-03-01 16:53:13.000000000 +0100 -+++ gnutls-2.12.20/lib/gl/stdio.in.h 2012-06-18 16:50:22.846115787 +0200 -@@ -698,7 +698,7 @@ _GL_WARN_ON_USE (getline, "getline is un - # endif - #endif - --#if @GNULIB_GETS@ -+#if 0 - # if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@ - # if !(defined __cplusplus && defined GNULIB_NAMESPACE) - # undef gets diff --git a/gnutls.spec b/gnutls.spec index 4e5614a..24042ba 100644 --- a/gnutls.spec +++ b/gnutls.spec @@ -1,7 +1,7 @@ Summary: A TLS protocol implementation Name: gnutls -Version: 2.12.21 -Release: 2%{?dist} +Version: 2.12.22 +Release: 1%{?dist} # The libgnutls library is LGPLv2+, utilities and remaining libraries are GPLv3+ License: GPLv3+ and LGPLv2+ Group: System Environment/Libraries @@ -21,8 +21,6 @@ Patch2: gnutls-2.8.6-link-libgcrypt.patch Patch3: gnutls-2.12.2-nosrp.patch # Skip tests that are expected to fail on libgcrypt build Patch4: gnutls-2.12.7-dsa-skiptests.patch -# Make it build with recent glibc that removed gets -Patch5: gnutls-2.12.20-build.patch # Fix the gnutls-cli-debug manpage Patch6: gnutls-2.12.20-cli-debug-manpage.patch # Use only FIPS approved ciphers in the FIPS mode @@ -97,7 +95,6 @@ This package contains Guile bindings for the library. %patch2 -p1 -b .link %patch3 -p1 -b .nosrp %patch4 -p1 -b .skiptests -%patch5 -p1 -b .build %patch6 -p1 -b .cli-debug %patch7 -p1 -b .fips @@ -201,6 +198,9 @@ fi %{_datadir}/guile/site/gnutls.scm %changelog +* Tue Jan 8 2013 Tomas Mraz 2.12.22-1 +- new upstream version + * Wed Nov 28 2012 Tomas Mraz 2.12.21-2 - use RSA bit sizes supported by libgcrypt in FIPS mode for security levels (#879643) @@ -236,7 +236,7 @@ fi * Fri Jan 13 2012 Fedora Release Engineering - 2.12.14-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild -* Mon Nov 8 2011 Tomas Mraz 2.12.14-1 +* Tue Nov 8 2011 Tomas Mraz 2.12.14-1 - new upstream version * Mon Oct 24 2011 Tomas Mraz 2.12.12-1 @@ -259,7 +259,7 @@ fi * Tue Jun 21 2011 Tomas Mraz 2.12.7-1 - new upstream version -* Wed May 9 2011 Tomas Mraz 2.12.4-1 +* Mon May 9 2011 Tomas Mraz 2.12.4-1 - new upstream version * Tue Apr 26 2011 Tomas Mraz 2.12.3-1 @@ -277,7 +277,7 @@ fi * Wed Dec 8 2010 Tomas Mraz 2.10.4-1 - new upstream version -* Tue Dec 2 2010 Tomas Mraz 2.10.3-2 +* Thu Dec 2 2010 Tomas Mraz 2.10.3-2 - fix buffer overflow in gnutls-serv (#659259) * Fri Nov 19 2010 Tomas Mraz 2.10.3-1 @@ -494,8 +494,8 @@ fi * Thu Jan 17 2002 Nalin Dahyabhai 0.3.2-1 - update to 0.3.2 -* Wed Jan 10 2002 Nalin Dahyabhai 0.3.0-1 +* Thu Jan 10 2002 Nalin Dahyabhai 0.3.0-1 - add a URL -* Wed Dec 20 2001 Nalin Dahyabhai +* Thu Dec 20 2001 Nalin Dahyabhai - initial package diff --git a/sources b/sources index 38e3039..55affa8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -19b4eedf027e0313eff979e5fe391194 gnutls-2.12.21-nosrp.tar.xz +21a57b10b4fe9cd515841974bd8c2cb7 gnutls-2.12.22-nosrp.tar.xz