From 9f571c62cb7d6d5922a4e52befe23d255aa1acee Mon Sep 17 00:00:00 2001 From: Tomas Mraz Date: Fri, 19 Nov 2010 16:23:46 +0100 Subject: [PATCH] - new upstream version --- .gitignore | 1 + ...2-rpath.patch => gnutls-2.10.3-rpath.patch | 56 +++++++++---------- gnutls.spec | 7 ++- sources | 2 +- 4 files changed, 35 insertions(+), 31 deletions(-) rename gnutls-2.10.2-rpath.patch => gnutls-2.10.3-rpath.patch (67%) diff --git a/.gitignore b/.gitignore index 50f55da..e7277a3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ gnutls-2.8.6-nosrp.tar.bz2 gnutls-2.10.1-nosrp.tar.bz2 /gnutls-2.10.2-nosrp.tar.bz2 +/gnutls-2.10.3-nosrp.tar.bz2 diff --git a/gnutls-2.10.2-rpath.patch b/gnutls-2.10.3-rpath.patch similarity index 67% rename from gnutls-2.10.2-rpath.patch rename to gnutls-2.10.3-rpath.patch index bc2292b..e851dcd 100644 --- a/gnutls-2.10.2-rpath.patch +++ b/gnutls-2.10.3-rpath.patch @@ -1,8 +1,8 @@ -diff -up gnutls-2.10.2/build-aux/config.rpath gnutls-2.10.2/build-aux/config -diff -up gnutls-2.10.2/configure.rpath gnutls-2.10.2/configure ---- gnutls-2.10.2/configure.rpath 2010-09-30 08:43:40.000000000 +0200 -+++ gnutls-2.10.2/configure 2010-09-30 15:56:59.000000000 +0200 -@@ -15112,7 +15112,7 @@ shlibpath_var= +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= shlibpath_overrides_runpath=unknown version_type=none dynamic_linker="$host_os ld.so" @@ -11,16 +11,16 @@ diff -up gnutls-2.10.2/configure.rpath gnutls-2.10.2/configure need_lib_prefix=unknown hardcode_into_libs=no -@@ -15510,7 +15510,7 @@ fi +@@ -15824,7 +15824,7 @@ rm -f core conftest.err conftest.$ac_obj # 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;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;/^$/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 -@@ -18777,7 +18777,7 @@ shlibpath_var= +@@ -18908,7 +18908,7 @@ shlibpath_var= shlibpath_overrides_runpath=unknown version_type=none dynamic_linker="$host_os ld.so" @@ -29,20 +29,20 @@ diff -up gnutls-2.10.2/configure.rpath gnutls-2.10.2/configure need_lib_prefix=unknown hardcode_into_libs=no -@@ -19173,7 +19173,7 @@ fi +@@ -19292,7 +19292,7 @@ rm -f core conftest.err conftest.$ac_obj # 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;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;/^$/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.2/lib/build-aux/config.rpath gnutls-2.10.2/lib/build-aux/config -diff -up gnutls-2.10.2/lib/configure.rpath gnutls-2.10.2/lib/configure ---- gnutls-2.10.2/lib/configure.rpath 2010-09-30 08:42:57.000000000 +0200 -+++ gnutls-2.10.2/lib/configure 2010-09-30 15:58:06.000000000 +0200 -@@ -10839,7 +10839,8 @@ shlibpath_var= +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= shlibpath_overrides_runpath=unknown version_type=none dynamic_linker="$host_os ld.so" @@ -52,16 +52,16 @@ diff -up gnutls-2.10.2/lib/configure.rpath gnutls-2.10.2/lib/configure need_lib_prefix=unknown hardcode_into_libs=no -@@ -11237,7 +11238,7 @@ fi +@@ -11123,7 +11124,7 @@ rm -f core conftest.err conftest.$ac_obj # 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;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;/^$/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 -@@ -25790,7 +25791,8 @@ shlibpath_var= +@@ -26039,7 +26040,8 @@ shlibpath_var= shlibpath_overrides_runpath=unknown version_type=none dynamic_linker="$host_os ld.so" @@ -71,20 +71,20 @@ diff -up gnutls-2.10.2/lib/configure.rpath gnutls-2.10.2/lib/configure need_lib_prefix=unknown hardcode_into_libs=no -@@ -26186,7 +26188,7 @@ fi +@@ -26423,7 +26425,7 @@ rm -f core conftest.err conftest.$ac_obj # 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;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;/^$/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.2/libextra/build-aux/config.rpath gnutls-2.10.2/libextra/build-aux/config -diff -up gnutls-2.10.2/libextra/configure.rpath gnutls-2.10.2/libextra/configure ---- gnutls-2.10.2/libextra/configure.rpath 2010-09-30 08:43:20.000000000 +0200 -+++ gnutls-2.10.2/libextra/configure 2010-09-30 15:58:49.000000000 +0200 -@@ -10013,7 +10013,7 @@ shlibpath_var= +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= shlibpath_overrides_runpath=unknown version_type=none dynamic_linker="$host_os ld.so" @@ -93,10 +93,10 @@ diff -up gnutls-2.10.2/libextra/configure.rpath gnutls-2.10.2/libextra/configure need_lib_prefix=unknown hardcode_into_libs=no -@@ -10411,7 +10411,7 @@ fi +@@ -10304,7 +10304,7 @@ rm -f core conftest.err conftest.$ac_obj # 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;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;/^$/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 c1c5aeb..4a249eb 100644 --- a/gnutls.spec +++ b/gnutls.spec @@ -1,6 +1,6 @@ Summary: A TLS protocol implementation Name: gnutls -Version: 2.10.2 +Version: 2.10.3 Release: 1%{?dist} # The libgnutls library is LGPLv2+, utilities and remaining libraries are GPLv3+ License: GPLv3+ and LGPLv2+ @@ -15,7 +15,7 @@ URL: http://www.gnutls.org/ # XXX patent tainted SRP code removed. Source0: %{name}-%{version}-nosrp.tar.bz2 Source1: libgnutls-config -Patch1: gnutls-2.10.2-rpath.patch +Patch1: gnutls-2.10.3-rpath.patch Patch2: gnutls-2.8.6-link-libgcrypt.patch # Remove nonexisting references from texinfo file Patch3: gnutls-2.10.1-nosrp.patch @@ -160,6 +160,9 @@ fi %{_datadir}/guile/site/gnutls.scm %changelog +* Fri Nov 19 2010 Tomas Mraz 2.10.3-1 +- new upstream version + * Thu Sep 30 2010 Tomas Mraz 2.10.2-1 - new upstream version diff --git a/sources b/sources index 05956fa..6834fe4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4350197362fabfb4a17029c14445dcad gnutls-2.10.2-nosrp.tar.bz2 +8dc7c35c694e4a8de3243a2c284426ff gnutls-2.10.3-nosrp.tar.bz2