From 5cdd3d4a100873172a803cbc02fab5f42f290643 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Mr=C3=A1z?= Date: Wed, 12 May 2010 18:00:20 +0000 Subject: [PATCH] - upgrade to a new upstream version --- .cvsignore | 2 +- ...s-2.8.5-ImplicitDSOLinking_libgcrypt.patch | 80 ------------------- gnutls.spec | 10 +-- remove-srp | 1 + sources | 2 +- 5 files changed, 8 insertions(+), 87 deletions(-) delete mode 100644 gnutls-2.8.5-ImplicitDSOLinking_libgcrypt.patch diff --git a/.cvsignore b/.cvsignore index 2edf44d..576034a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gnutls-2.8.5-nosrp.tar.bz2 +gnutls-2.8.6-nosrp.tar.bz2 diff --git a/gnutls-2.8.5-ImplicitDSOLinking_libgcrypt.patch b/gnutls-2.8.5-ImplicitDSOLinking_libgcrypt.patch deleted file mode 100644 index 25e10bb..0000000 --- a/gnutls-2.8.5-ImplicitDSOLinking_libgcrypt.patch +++ /dev/null @@ -1,80 +0,0 @@ -diff -up gnutls-2.8.5/doc/examples/Makefile.am.ImplicitDSOLinking_libgcrypt gnutls-2.8.5/doc/examples/Makefile.am ---- gnutls-2.8.5/doc/examples/Makefile.am.ImplicitDSOLinking_libgcrypt 2009-06-02 13:59:32.000000000 -0500 -+++ gnutls-2.8.5/doc/examples/Makefile.am 2010-02-15 19:18:55.722180984 -0600 -@@ -30,7 +30,7 @@ LDADD = libexamples.la \ - ../../lib/libgnutls.la \ - ../../libextra/libgnutls-extra.la \ - ../../gl/libgnu.la \ -- $(LIBSOCKET) -+ $(LTLIBGCRYPT) $(LIBSOCKET) - - CXX_LDADD = $(LDADD) \ - ../../lib/libgnutlsxx.la -diff -up gnutls-2.8.5/doc/examples/Makefile.in.ImplicitDSOLinking_libgcrypt gnutls-2.8.5/doc/examples/Makefile.in ---- gnutls-2.8.5/doc/examples/Makefile.in.ImplicitDSOLinking_libgcrypt 2009-11-02 04:36:00.000000000 -0600 -+++ gnutls-2.8.5/doc/examples/Makefile.in 2010-02-15 19:19:46.900440435 -0600 -@@ -810,7 +810,7 @@ LDADD = libexamples.la \ - ../../lib/libgnutls.la \ - ../../libextra/libgnutls-extra.la \ - ../../gl/libgnu.la \ -- $(LIBSOCKET) -+ $(LTLIBGCRYPT) $(LIBSOCKET) - - CXX_LDADD = $(LDADD) \ - ../../lib/libgnutlsxx.la -diff -up gnutls-2.8.5/src/Makefile.am.ImplicitDSOLinking_libgcrypt gnutls-2.8.5/src/Makefile.am ---- gnutls-2.8.5/src/Makefile.am.ImplicitDSOLinking_libgcrypt 2009-06-02 13:59:32.000000000 -0500 -+++ gnutls-2.8.5/src/Makefile.am 2010-02-15 19:22:31.674183953 -0600 -@@ -40,7 +40,7 @@ noinst_LTLIBRARIES = - - gnutls_serv_SOURCES = list.h serv.c common.h common.c certtool-common.h - gnutls_serv_LDADD = ../lib/libgnutls.la ../libextra/libgnutls-extra.la --gnutls_serv_LDADD += libcmd-serv.la ../gl/libgnu.la $(LIBSOCKET) $(GETADDRINFO_LIB) -+gnutls_serv_LDADD += libcmd-serv.la ../gl/libgnu.la $(LTLIBGCRYPT) $(LIBSOCKET) $(GETADDRINFO_LIB) - noinst_LTLIBRARIES += libcmd-serv.la - libcmd_serv_la_CFLAGS = - libcmd_serv_la_SOURCES = serv.gaa serv-gaa.h serv-gaa.c -@@ -61,14 +61,14 @@ libcmd_psk_la_SOURCES = psk.gaa psk-gaa. - - gnutls_cli_SOURCES = cli.c common.h common.c - gnutls_cli_LDADD = ../lib/libgnutls.la ../libextra/libgnutls-extra.la --gnutls_cli_LDADD += libcmd-cli.la ../gl/libgnu.la $(LIBSOCKET) $(GETADDRINFO_LIB) -+gnutls_cli_LDADD += libcmd-cli.la ../gl/libgnu.la $(LTLIBGCRYPT) $(LIBSOCKET) $(GETADDRINFO_LIB) - noinst_LTLIBRARIES += libcmd-cli.la - libcmd_cli_la_CFLAGS = - libcmd_cli_la_SOURCES = cli.gaa cli-gaa.h cli-gaa.c - - gnutls_cli_debug_SOURCES = tls_test.c tests.h tests.c common.h common.c - gnutls_cli_debug_LDADD = ../lib/libgnutls.la libcmd-cli-debug.la --gnutls_cli_debug_LDADD += ../gl/libgnu.la $(LIBSOCKET) $(GETADDRINFO_LIB) -+gnutls_cli_debug_LDADD += ../gl/libgnu.la $(LTLIBGCRYPT) $(LIBSOCKET) $(GETADDRINFO_LIB) - noinst_LTLIBRARIES += libcmd-cli-debug.la - libcmd_cli_debug_la_CFLAGS = - libcmd_cli_debug_la_SOURCES = tls_test.gaa tls_test-gaa.h tls_test-gaa.c -diff -up gnutls-2.8.5/src/Makefile.in.ImplicitDSOLinking_libgcrypt gnutls-2.8.5/src/Makefile.in ---- gnutls-2.8.5/src/Makefile.in.ImplicitDSOLinking_libgcrypt 2010-02-15 19:19:46.894442396 -0600 -+++ gnutls-2.8.5/src/Makefile.in 2010-02-15 19:22:34.146181051 -0600 -@@ -827,7 +827,7 @@ noinst_LTLIBRARIES = libcmd-serv.la $(am - libcmd-certtool.la - gnutls_serv_SOURCES = list.h serv.c common.h common.c certtool-common.h - gnutls_serv_LDADD = ../lib/libgnutls.la ../libextra/libgnutls-extra.la \ -- libcmd-serv.la ../gl/libgnu.la $(LIBSOCKET) $(GETADDRINFO_LIB) -+ libcmd-serv.la ../gl/libgnu.la $(LTLIBGCRYPT) $(LIBSOCKET) $(GETADDRINFO_LIB) - libcmd_serv_la_CFLAGS = - libcmd_serv_la_SOURCES = serv.gaa serv-gaa.h serv-gaa.c - @ENABLE_SRP_TRUE@srptool_SOURCES = crypt.c -@@ -840,12 +840,12 @@ libcmd_psk_la_CFLAGS = - libcmd_psk_la_SOURCES = psk.gaa psk-gaa.h psk-gaa.c - gnutls_cli_SOURCES = cli.c common.h common.c - gnutls_cli_LDADD = ../lib/libgnutls.la ../libextra/libgnutls-extra.la \ -- libcmd-cli.la ../gl/libgnu.la $(LIBSOCKET) $(GETADDRINFO_LIB) -+ libcmd-cli.la ../gl/libgnu.la $(LTLIBGCRYPT) $(LIBSOCKET) $(GETADDRINFO_LIB) - libcmd_cli_la_CFLAGS = - libcmd_cli_la_SOURCES = cli.gaa cli-gaa.h cli-gaa.c - gnutls_cli_debug_SOURCES = tls_test.c tests.h tests.c common.h common.c - gnutls_cli_debug_LDADD = ../lib/libgnutls.la libcmd-cli-debug.la \ -- ../gl/libgnu.la $(LIBSOCKET) $(GETADDRINFO_LIB) -+ ../gl/libgnu.la $(LTLIBGCRYPT) $(LIBSOCKET) $(GETADDRINFO_LIB) - libcmd_cli_debug_la_CFLAGS = - libcmd_cli_debug_la_SOURCES = tls_test.gaa tls_test-gaa.h tls_test-gaa.c - certtool_SOURCES = certtool.c prime.c diff --git a/gnutls.spec b/gnutls.spec index 2ad9ca5..cce3aa8 100644 --- a/gnutls.spec +++ b/gnutls.spec @@ -1,7 +1,7 @@ Summary: A TLS protocol implementation Name: gnutls -Version: 2.8.5 -Release: 4%{?dist} +Version: 2.8.6 +Release: 1%{?dist} # The libgnutls library is LGPLv2+, utilities and remaining libraries are GPLv3+ License: GPLv3+ and LGPLv2+ Group: System Environment/Libraries @@ -16,8 +16,6 @@ URL: http://www.gnutls.org/ Source0: %{name}-%{version}-nosrp.tar.bz2 Source1: libgnutls-config Patch1: gnutls-2.8.5-rpath.patch -# upstreamable patch fixing implicit linking against libgcrypt -Patch2: gnutls-2.8.5-ImplicitDSOLinking_libgcrypt.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: libgcrypt >= 1.2.2 @@ -71,7 +69,6 @@ This package contains Guile bindings for the library. %prep %setup -q %patch1 -p1 -b .rpath -%patch2 -p1 -b .ImplicitDSOLinking_libgcrypt 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 @@ -155,6 +152,9 @@ fi %{_datadir}/guile/site/gnutls.scm %changelog +* Wed May 12 2010 Tomas Mraz 2.8.6-1 +- upgrade to a new upstream version + * Mon Feb 15 2010 Rex Dieter 2.8.5-4 - FTBFS gnutls-2.8.5-3.fc13: ImplicitDSOLinking (#564624) diff --git a/remove-srp b/remove-srp index 5fa366a..6f385bb 100755 --- a/remove-srp +++ b/remove-srp @@ -1,4 +1,5 @@ #!/bin/sh +set -x rm -f lib/auth_srp_sb64.c lib/auth_srp_passwd.c lib/auth_srp_rsa.c rm -f lib/gnutls_srp.c lib/auth_srp.c lib/ext_srp.c diff --git a/sources b/sources index 7b4881e..f786729 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -21b5caa451af00f9a9dd680a0430c00b gnutls-2.8.5-nosrp.tar.bz2 +23f98683d03f6aa332216c55fe288956 gnutls-2.8.6-nosrp.tar.bz2