[PATCH] compat-gnutls: New package

[PATCH] compat-gnutls: New package

[Stefan Schantl]

[-- Attachment #1: Type: text/plain, Size: 4412 bytes --]

This package provides the following libraries:

* libgnutls.so.28
* libgnutlsxx.so.28

Both have been bumped with the gnutls 3.4 and 3.5 series, but
there is still software which is linked against those old libraries.

Fixes #11277.

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
 compat-gnutls/compat-gnutls.nm                  | 83 +++++++++++++++++++++++++
 compat-gnutls/patches/gnutls-3.1.11-nosrp.patch | 12 ++++
 compat-gnutls/patches/gnutls-3.2.7-rpath.patch  | 12 ++++
 3 files changed, 107 insertions(+)
 create mode 100644 compat-gnutls/compat-gnutls.nm
 create mode 100644 compat-gnutls/patches/gnutls-3.1.11-nosrp.patch
 create mode 100644 compat-gnutls/patches/gnutls-3.2.7-rpath.patch

diff --git a/compat-gnutls/compat-gnutls.nm b/compat-gnutls/compat-gnutls.nm
new file mode 100644
index 0000000..51af81d
--- /dev/null
+++ b/compat-gnutls/compat-gnutls.nm
@@ -0,0 +1,83 @@
+###############################################################################
+# IPFire.org    - An Open Source Firewall Solution                            #
+# Copyright (C) - IPFire Development Team <info(a)ipfire.org>                   #
+###############################################################################
+
+name       = compat-gnutls
+version    = %{ver_maj}.%{ver_min}
+ver_maj    = 3.3
+ver_min    = 25
+release    = 1
+thisapp    = gnutls-%{version}
+
+groups     = System/Libraries
+url        = http://www.gnu.org/software/gnutls/
+license    = LGPLv2.1+
+summary    = A general-purpose cryptography library.
+
+description
+	GnuTLS is a project that aims to develop a library which provides
+	a secure layer, over a reliable transport layer. Currently the
+	GnuTLS library implements the proposed standards by the IETF's
+	TLS working group.
+end
+
+source_dl  = ftp://ftp.gnutls.org/gcrypt/gnutls/v%{ver_maj}/
+sources    = %{thisapp}.tar.xz
+
+build
+	requires
+		datefudge
+		gettext
+		libgcrypt-devel
+		libidn-devel
+		libtasn1-devel >= 3.2
+		lzo-devel
+		net-tools
+		nettle-devel >= 3.2
+		perl
+		p11-kit-devel >= 0.23.1
+		readline-devel
+		texinfo
+		zlib-devel
+	end
+
+	# Build library without an executable stack.
+	CFLAGS += -Wa,--noexecstack
+
+	configure_options += \
+		--with-included-libcfg \
+		--disable-openssl-compatibility \
+		--disable-srp-authentication \
+		--disable-non-suiteb-curves \
+		--disable-guile
+
+	# Test suite does not work when srp is disabled.
+	test
+		export LD_LIBRARY_PATH=$(pwd)/lib/.libs
+		make check
+	end
+
+	install
+		# Install just the library and no headers.
+		mkdir -pv %{BUILDROOT}%{libdir}
+		cp -avf lib/.libs/libgnutls.so.* %{BUILDROOT}%{libdir}
+		cp -avf lib/.libs/libgnutlsxx.so.* %{BUILDROOT}%{libdir}
+	end
+end
+
+packages
+	package %{name}
+		provides
+			gnutls = %{thisver}
+		end
+
+		obsoletes
+			gnutls <= %{thisver}
+		end
+	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
+end
diff --git a/compat-gnutls/patches/gnutls-3.1.11-nosrp.patch b/compat-gnutls/patches/gnutls-3.1.11-nosrp.patch
new file mode 100644
index 0000000..29227c0
--- /dev/null
+++ b/compat-gnutls/patches/gnutls-3.1.11-nosrp.patch
@@ -0,0 +1,12 @@
+diff -up gnutls-3.1.10/tests/srp/mini-srp.c.noecc gnutls-3.1.10/tests/srp/mini-srp.c
+--- gnutls-3.1.10/tests/srp/mini-srp.c.noecc	2013-03-21 21:42:28.000000000 +0100
++++ gnutls-3.1.10/tests/srp/mini-srp.c	2013-03-25 13:42:20.753422209 +0100
+@@ -27,7 +27,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ 
+-#if defined(_WIN32)
++#if defined(_WIN32) || !defined(ENABLE_SRP)
+ 
+ int main()
+ {
diff --git a/compat-gnutls/patches/gnutls-3.2.7-rpath.patch b/compat-gnutls/patches/gnutls-3.2.7-rpath.patch
new file mode 100644
index 0000000..4e6aed3
--- /dev/null
+++ b/compat-gnutls/patches/gnutls-3.2.7-rpath.patch
@@ -0,0 +1,12 @@
+diff -ur gnutls-3.2.7.orig/configure gnutls-3.2.7/configure
+--- gnutls-3.2.7.orig/configure	2013-11-23 11:09:49.000000000 +0100
++++ gnutls-3.2.7/configure	2013-11-25 16:53:05.559440656 +0100
+@@ -39652,7 +39652,7 @@
+ 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
+ 
-- 
2.9.3