diff --git a/.gitignore b/.gitignore deleted file mode 100644 index bbe468e..0000000 --- a/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/gnutls-3.3.14-hobbled.tar.xz -/gnutls-3.3.15-hobbled.tar.xz -/gnutls-3.3.18-hobbled.tar.xz -/gnutls-3.3.20-hobbled.tar.xz -/gnutls-3.3.21-hobbled.tar.xz diff --git a/compat-gnutls28.spec b/compat-gnutls28.spec deleted file mode 100644 index 2e7b02a..0000000 --- a/compat-gnutls28.spec +++ /dev/null @@ -1,121 +0,0 @@ -Summary: Compat package with gnutls library ABI version 28 -Name: compat-gnutls28 -Version: 3.3.21 -Release: 1%{?dist} -# The libraries are LGPLv2.1+, utilities are GPLv3+ -License: LGPLv2+ -Group: System Environment/Libraries -BuildRequires: p11-kit-devel >= 0.21.3, gettext-devel -BuildRequires: zlib-devel, readline-devel, libtasn1-devel >= 4.3 -BuildRequires: libtool, automake, autoconf, texinfo -BuildRequires: autogen-libopts-devel >= 5.18 autogen -BuildRequires: nettle-devel >= 3.1.1 -BuildRequires: trousers-devel >= 0.3.11.2 -BuildRequires: libidn-devel -BuildRequires: gperf -Requires: crypto-policies >= 20151004 -Requires: p11-kit-trust -Requires: libtasn1 >= 4.3 - -URL: http://www.gnutls.org/ -# XXX patent tainted code removed. -Source0: gnutls-%{version}-hobbled.tar.xz -Source2: hobble-gnutls -Patch1: gnutls-3.2.7-rpath.patch -Patch3: gnutls-3.1.11-nosrp.patch -Patch4: gnutls-3.3.6-default-policy.patch - -# Explicitly conflict with older gnutls packages that ship libraries -# with the same soname as this compat package -Conflicts: gnutls < 3.4 - -# Wildcard bundling exception https://fedorahosted.org/fpc/ticket/174 -Provides: bundled(gnulib) = 20130424 - -%description -Compatibility package with gnutls library ABI version 28. - -%prep -%setup -q -n gnutls-%{version} - -%patch1 -p1 -b .rpath -%patch3 -p1 -b .nosrp -%patch4 -p1 -b .default-policy - -sed 's/gnutls_srp.c//g' -i lib/Makefile.in -sed 's/gnutls_srp.lo//g' -i lib/Makefile.in -rm -f lib/minitasn1/*.c lib/minitasn1/*.h -rm -f src/libopts/*.c src/libopts/*.h src/libopts/compat/*.c src/libopts/compat/*.h -sed -i -e 's|sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spec="/lib /usr/lib %{_libdir}|g' configure - -%{SOURCE2} -e - -%build - -autoreconf -fvi -# this overrides the -znow from hardened builds. -CFLAGS="$RPM_OPT_FLAGS -Wl,-z,lazy" -export CFLAGS - -%configure --with-libtasn1-prefix=%{_prefix} \ - --with-included-libcfg \ - --disable-static \ - --disable-openssl-compatibility \ - --disable-srp-authentication \ - --disable-non-suiteb-curves \ - --with-system-priority-file=%{_sysconfdir}/crypto-policies/back-ends/gnutls28.config \ - --with-default-trust-store-pkcs11="pkcs11:model=p11-kit-trust;manufacturer=PKCS%2311%20Kit" \ - --disable-guile \ - --disable-dane \ - --disable-rpath -make %{?_smp_mflags} V=1 - -%install -make install DESTDIR=$RPM_BUILD_ROOT - -# remove files that shouldn't go in the compat package -rm -rf $RPM_BUILD_ROOT%{_bindir} -rm -rf $RPM_BUILD_ROOT%{_includedir} -rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la -rm -rf $RPM_BUILD_ROOT%{_libdir}/*.so -rm -rf $RPM_BUILD_ROOT%{_libdir}/libgnutls-dane.so* -rm -rf $RPM_BUILD_ROOT%{_libdir}/libgnutlsxx.so* -rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig/ -rm -rf $RPM_BUILD_ROOT%{_datadir} - -%check -make check %{?_smp_mflags} - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - -%files -%{_libdir}/libgnutls.so.28* -%license COPYING COPYING.LESSER - -%changelog -* Mon Feb 15 2016 Nikos Mavrogiannopoulos - 3.3.21-1 -- new upstream release - -* Wed Feb 03 2016 Fedora Release Engineering - 3.3.20-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Mon Jan 11 2016 Nikos Mavrogiannopoulos - 3.3.20-1 -- new upstream release - -* Wed Nov 4 2015 Nikos Mavrogiannopoulos - 3.3.18-2 -- re-added crypto policies support using a special config file (#1277790) - -* Thu Oct 8 2015 Nikos Mavrogiannopoulos - 3.3.18-1 -- updated package to 3.3.18 -- don't read the default priorities file; it is not guarranteed we can parse it (#1269453) - -* Wed Jun 17 2015 Fedora Release Engineering - 3.3.15-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon May 4 2015 Nikos Mavrogiannopoulos - 3.3.15-1 -- updated package and make it depend on nettle 3.1.1 - -* Tue Apr 28 2015 Kalev Lember - 3.3.14-1 -- gnutls ABI version 28 compatibility package (#1215997) diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..efdad7c --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Drop old compatibility package diff --git a/gnutls-3.1.11-nosrp.patch b/gnutls-3.1.11-nosrp.patch deleted file mode 100644 index 29227c0..0000000 --- a/gnutls-3.1.11-nosrp.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 - #include - --#if defined(_WIN32) -+#if defined(_WIN32) || !defined(ENABLE_SRP) - - int main() - { diff --git a/gnutls-3.2.7-rpath.patch b/gnutls-3.2.7-rpath.patch deleted file mode 100644 index 4e6aed3..0000000 --- a/gnutls-3.2.7-rpath.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 - diff --git a/gnutls-3.3.14-sigpipe.patch b/gnutls-3.3.14-sigpipe.patch deleted file mode 100644 index 871b473..0000000 --- a/gnutls-3.3.14-sigpipe.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/tests/mini-loss-time.c b/tests/mini-loss-time.c -index 6a10606..e76ff05 100644 ---- a/tests/mini-loss-time.c -+++ b/tests/mini-loss-time.c -@@ -287,6 +287,7 @@ void doit(void) - time_t tstart, tstop; - - signal(SIGCHLD, ch_handler); -+ signal(SIGPIPE, SIG_IGN); - - tstart = time(0); - start(2, -1); diff --git a/gnutls-3.3.6-default-policy.patch b/gnutls-3.3.6-default-policy.patch deleted file mode 100644 index 855fad2..0000000 --- a/gnutls-3.3.6-default-policy.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/lib/gnutls_priority.c b/lib/gnutls_priority.c -index c71237f..1a6fbef 100644 ---- a/lib/gnutls_priority.c -+++ b/lib/gnutls_priority.c -@@ -1114,6 +1114,7 @@ gnutls_priority_init(gnutls_priority_t * priority_cache, - rmadd_func *fn; - bulk_rmadd_func *bulk_fn; - const cipher_entry_st *centry; -+ unsigned dset = 0; - - if (err_pos) - *err_pos = priorities; -@@ -1133,10 +1134,16 @@ gnutls_priority_init(gnutls_priority_t * priority_cache, - - (*priority_cache)->max_empty_records = DEFAULT_MAX_EMPTY_RECORDS; - -- if (priorities == NULL) -- priorities = "NORMAL"; -+ if (priorities == NULL) { -+ priorities = "@SYSTEM"; -+ dset = 1; -+ } - - darg = resolve_priorities(priorities); -+ if (darg == NULL && dset == 1) { -+ priorities = "NORMAL"; -+ darg = resolve_priorities(priorities); -+ } - if (darg == NULL) { - gnutls_assert(); - goto error; diff --git a/hobble-gnutls b/hobble-gnutls deleted file mode 100755 index 3302104..0000000 --- a/hobble-gnutls +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -set -x - -if [ "$1" = "-e" ] ; then - CMD="cat < /dev/null >" -else - CMD="rm -f" -fi - -# SRP -for f in auth/srp_sb64.c auth/srp_passwd.c auth/srp_rsa.c \ - gnutls_srp.c auth/srp.c ext/srp.c ; do - eval "$CMD lib/$f" -done - diff --git a/sources b/sources deleted file mode 100644 index 81c107e..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -823393bdbe4db4c8ce943b99ebc8bd94 gnutls-3.3.21-hobbled.tar.xz