remove obsolete patches

This commit is contained in:
Pavel Šimerda
2014-03-04 08:07:41 +01:00
parent 1acf1a26e4
commit 624f2dd52e
2 changed files with 2 additions and 25 deletions

View File

@@ -1,22 +0,0 @@
diff -urNp strongswan-5.1.1-patched/configure.ac strongswan-5.1.1-current/configure.ac
--- strongswan-5.1.1-patched/configure.ac 2013-11-01 13:14:29.753922017 -0400
+++ strongswan-5.1.1-current/configure.ac 2013-12-02 15:33:47.530389926 -0500
@@ -20,7 +20,17 @@
# ============================
AC_INIT([strongSwan],[5.1.1])
-AM_INIT_AUTOMAKE([tar-ustar subdir-objects])
+AM_INIT_AUTOMAKE(m4_esyscmd([
+ echo tar-ustar
+ echo subdir-objects
+ case `automake --version | head -n 1` in
+ *" 1.9"*);;
+ *" 1.10"*);;
+ *" 1.11"*);;
+ # don't use parallel test harness in 1.12 and up
+ *) echo serial-tests;;
+ esac
+]))
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
AC_CONFIG_MACRO_DIR([m4/config])
AC_CONFIG_HEADERS([config.h])

View File

@@ -20,7 +20,6 @@ Patch1: strongswan-pts-ecp-disable.patch
Patch2: libstrongswan-plugin.patch
Patch3: libstrongswan-settings-debug.patch
Patch4: libstrongswan-973315.patch
Patch5: strongswan-1036844.patch
Patch6: strongswan-5.1.1-selinux.patch
BuildRequires: gmp-devel autoconf automake
@@ -87,7 +86,6 @@ PT-TLS to support TNC over TLS.
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
echo "For migration from 4.6 to 5.0 see http://wiki.strongswan.org/projects/strongswan/wiki/CharonPlutoIKEv1" > README.Fedora
@@ -348,8 +346,9 @@ fi
%changelog
* Mon Mar 03 2014 Pavel Šimerda <psimerda@redhat.com> - 5.1.2-1
- bump to 5.1.2
- #1071353 - bump to 5.1.2
- #1071338 - strongswan is compiled without xauth-pam plugin
- remove obsolete patches
* Thu Feb 20 2014 Avesh Agarwal <avagarwa@redhat.com> - 5.1.1-6
- Fixed full hardening for strongswan (full relro and PIE).