[gnutls] - new upstream version

Tomáš Mráz tmraz at fedoraproject.org
Wed Dec 8 20:34:38 UTC 2010 

commit 609ce395690c5c104fde168f4950a0464ec94957
Author: Tomas Mraz <tmraz at fedoraproject.org>
Date:   Wed Dec 8 21:34:28 2010 +0100

    - new upstream version

 gnutls-2.10.3-sprintf.patch                        |  150 --------------------
 ...2.10.3-rpath.patch => gnutls-2.10.4-rpath.patch |   58 ++++----
 gnutls.spec                                        |   12 +-
 3 files changed, 34 insertions(+), 186 deletions(-)
---
diff --git a/gnutls-2.10.3-rpath.patch b/gnutls-2.10.4-rpath.patch
similarity index 68%
rename from gnutls-2.10.3-rpath.patch
rename to gnutls-2.10.4-rpath.patch
index e851dcd..beaa957 100644
--- a/gnutls-2.10.3-rpath.patch
+++ b/gnutls-2.10.4-rpath.patch
@@ -1,8 +1,8 @@
-diff -up gnutls-2.10.3/build-aux/config.rpath gnutls-2.10.3/build-aux/config
-diff -up gnutls-2.10.3/configure.rpath gnutls-2.10.3/configure
---- gnutls-2.10.3/configure.rpath	2010-11-19 13:40:11.000000000 +0100
-+++ gnutls-2.10.3/configure	2010-11-19 16:15:47.000000000 +0100
-@@ -15439,7 +15439,7 @@ shlibpath_var=
+diff -up gnutls-2.10.4/build-aux/config.rpath gnutls-2.10.4/build-aux/config
+diff -up gnutls-2.10.4/configure.rpath gnutls-2.10.4/configure
+--- gnutls-2.10.4/configure.rpath	2010-12-06 14:53:28.000000000 +0100
++++ gnutls-2.10.4/configure	2010-12-08 21:29:22.000000000 +0100
+@@ -15112,7 +15112,7 @@ shlibpath_var=
  shlibpath_overrides_runpath=unknown
  version_type=none
  dynamic_linker="$host_os ld.so"
@@ -11,16 +11,16 @@ diff -up gnutls-2.10.3/configure.rpath gnutls-2.10.3/configure
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -15824,7 +15824,7 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -15510,7 +15510,7 @@ fi
    # Append ld.so.conf contents to the search path
    if test -f /etc/ld.so.conf; then
-     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
 -    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-+    sys_lib_dlsearch_path_spec="/lib /usr/lib /lib64/ /usr/lib64 $lt_ld_extra"
++    sys_lib_dlsearch_path_spec="/lib /usr/lib /lib64 /usr/lib64 $lt_ld_extra"
    fi
  
    # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -18908,7 +18908,7 @@ shlibpath_var=
+@@ -18777,7 +18777,7 @@ shlibpath_var=
  shlibpath_overrides_runpath=unknown
  version_type=none
  dynamic_linker="$host_os ld.so"
@@ -29,62 +29,60 @@ diff -up gnutls-2.10.3/configure.rpath gnutls-2.10.3/configure
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -19292,7 +19292,7 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -19173,7 +19173,7 @@ fi
    # Append ld.so.conf contents to the search path
    if test -f /etc/ld.so.conf; then
-     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
 -    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
 +    sys_lib_dlsearch_path_spec="/lib /usr/lib /lib64 /usr/lib64 $lt_ld_extra"
    fi
  
    # We used to test for /lib/ld.so.1 and disable shared libraries on
-diff -up gnutls-2.10.3/lib/build-aux/config.rpath gnutls-2.10.3/lib/build-aux/config
-diff -up gnutls-2.10.3/lib/configure.rpath gnutls-2.10.3/lib/configure
---- gnutls-2.10.3/lib/configure.rpath	2010-11-19 13:39:14.000000000 +0100
-+++ gnutls-2.10.3/lib/configure	2010-11-19 16:15:22.000000000 +0100
-@@ -10738,7 +10738,8 @@ shlibpath_var=
+diff -up gnutls-2.10.4/lib/build-aux/config.rpath gnutls-2.10.4/lib/build-aux/config
+diff -up gnutls-2.10.4/lib/configure.rpath gnutls-2.10.4/lib/configure
+--- gnutls-2.10.4/lib/configure.rpath	2010-12-06 14:53:11.000000000 +0100
++++ gnutls-2.10.4/lib/configure	2010-12-08 21:30:09.000000000 +0100
+@@ -10839,7 +10839,7 @@ shlibpath_var=
  shlibpath_overrides_runpath=unknown
  version_type=none
  dynamic_linker="$host_os ld.so"
 -sys_lib_dlsearch_path_spec="/lib /usr/lib"
-+
 +sys_lib_dlsearch_path_spec="/lib /usr/lib /lib64 /usr/lib64"
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -11123,7 +11124,7 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -11237,7 +11237,7 @@ fi
    # Append ld.so.conf contents to the search path
    if test -f /etc/ld.so.conf; then
-     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
 -    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
 +    sys_lib_dlsearch_path_spec="/lib /usr/lib /lib64 /usr/lib64 $lt_ld_extra"
    fi
  
    # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -26039,7 +26040,8 @@ shlibpath_var=
+@@ -25790,7 +25790,7 @@ shlibpath_var=
  shlibpath_overrides_runpath=unknown
  version_type=none
  dynamic_linker="$host_os ld.so"
 -sys_lib_dlsearch_path_spec="/lib /usr/lib"
-+
 +sys_lib_dlsearch_path_spec="/lib /usr/lib /lib64 /usr/lib64"
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -26423,7 +26425,7 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -26186,7 +26186,7 @@ fi
    # Append ld.so.conf contents to the search path
    if test -f /etc/ld.so.conf; then
-     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
 -    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
 +    sys_lib_dlsearch_path_spec="/lib /usr/lib /lib64 /usr/lib64 $lt_ld_extra"
    fi
  
    # We used to test for /lib/ld.so.1 and disable shared libraries on
-diff -up gnutls-2.10.3/libextra/build-aux/config.rpath gnutls-2.10.3/libextra/build-aux/config
-diff -up gnutls-2.10.3/libextra/configure.rpath gnutls-2.10.3/libextra/configure
---- gnutls-2.10.3/libextra/configure.rpath	2010-11-19 13:39:44.000000000 +0100
-+++ gnutls-2.10.3/libextra/configure	2010-11-19 16:16:21.000000000 +0100
-@@ -9919,7 +9919,7 @@ shlibpath_var=
+diff -up gnutls-2.10.4/libextra/build-aux/config.rpath gnutls-2.10.4/libextra/build-aux/config
+diff -up gnutls-2.10.4/libextra/configure.rpath gnutls-2.10.4/libextra/configure
+--- gnutls-2.10.4/libextra/configure.rpath	2010-12-06 14:53:20.000000000 +0100
++++ gnutls-2.10.4/libextra/configure	2010-12-08 21:30:27.000000000 +0100
+@@ -10013,7 +10013,7 @@ shlibpath_var=
  shlibpath_overrides_runpath=unknown
  version_type=none
  dynamic_linker="$host_os ld.so"
@@ -93,10 +91,10 @@ diff -up gnutls-2.10.3/libextra/configure.rpath gnutls-2.10.3/libextra/configure
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -10304,7 +10304,7 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -10411,7 +10411,7 @@ fi
    # Append ld.so.conf contents to the search path
    if test -f /etc/ld.so.conf; then
-     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
 -    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
 +    sys_lib_dlsearch_path_spec="/lib /usr/lib /lib64 /usr/lib64 $lt_ld_extra"
    fi
diff --git a/gnutls.spec b/gnutls.spec
index 0462880..283ceb8 100644
--- a/gnutls.spec
+++ b/gnutls.spec
@@ -1,7 +1,7 @@
 Summary: A TLS protocol implementation
 Name: gnutls
-Version: 2.10.3
-Release: 2%{?dist}
+Version: 2.10.4
+Release: 1%{?dist}
 # The libgnutls library is LGPLv2+, utilities and remaining libraries are GPLv3+
 License: GPLv3+ and LGPLv2+
 Group: System Environment/Libraries
@@ -15,14 +15,12 @@ URL: http://www.gnutls.org/
 # XXX patent tainted SRP code removed.
 Source0: %{name}-%{version}-nosrp.tar.bz2
 Source1: libgnutls-config
-Patch1: gnutls-2.10.3-rpath.patch
+Patch1: gnutls-2.10.4-rpath.patch
 Patch2: gnutls-2.8.6-link-libgcrypt.patch
 # Remove nonexisting references from texinfo file
 Patch3: gnutls-2.10.1-nosrp.patch
 # Backport from upstream git
 Patch4: gnutls-2.10.1-handshake-errors.patch
-# Sent to upstream
-Patch5: gnutls-2.10.3-sprintf.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: libgcrypt >= 1.2.2
@@ -79,7 +77,6 @@ This package contains Guile bindings for the library.
 %patch2 -p1 -b .link
 %patch3 -p1 -b .nosrp
 %patch4 -p1 -b .errors
-%patch5 -p1 -b .sprintf
 
 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
@@ -163,6 +160,9 @@ fi
 %{_datadir}/guile/site/gnutls.scm
 
 %changelog
+* Wed Dec  8 2010 Tomas Mraz <tmraz at redhat.com> 2.10.4-1
+- new upstream version
+
 * Tue Dec  2 2010 Tomas Mraz <tmraz at redhat.com> 2.10.3-2
 - fix buffer overflow in gnutls-serv (#659259)

More information about the scm-commits mailing list