From 98c7f2828ad778817137badef215906c49c7a611 Mon Sep 17 00:00:00 2001 From: Jamie Nguyen Date: Mon, 15 Jul 2013 15:31:03 +0100 Subject: [PATCH] Patch to change 'ipsec _updown' to 'strongswan _updown' --- ...ge-ipsec-updown-to-strongswan-updown.patch | 25 +++++++++++++++++++ strongswan.spec | 5 ++++ 2 files changed, 30 insertions(+) create mode 100644 strongswan-Change-ipsec-updown-to-strongswan-updown.patch diff --git a/strongswan-Change-ipsec-updown-to-strongswan-updown.patch b/strongswan-Change-ipsec-updown-to-strongswan-updown.patch new file mode 100644 index 0000000..2f62d39 --- /dev/null +++ b/strongswan-Change-ipsec-updown-to-strongswan-updown.patch @@ -0,0 +1,25 @@ +From daa81c04068956ff34fb0efb72956401969a8d9b Mon Sep 17 00:00:00 2001 +From: Jamie Nguyen +Date: Mon, 15 Jul 2013 13:42:14 +0100 +Subject: [PATCH] Change 'ipsec _updown' to 'strongswan _updown' + +--- + src/starter/confread.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/starter/confread.c b/src/starter/confread.c +index f0f05b0..ffd44c0 100644 +--- a/src/starter/confread.c ++++ b/src/starter/confread.c +@@ -38,7 +38,7 @@ + static const char ike_defaults[] = "aes128-sha1-modp2048,3des-sha1-modp1536"; + static const char esp_defaults[] = "aes128-sha1,3des-sha1"; + +-static const char firewall_defaults[] = "ipsec _updown iptables"; ++static const char firewall_defaults[] = "strongswan _updown iptables"; + + static bool daemon_exists(char *daemon, char *path) + { +-- +1.8.3.1 + diff --git a/strongswan.spec b/strongswan.spec index 104cb79..9bbdf8d 100644 --- a/strongswan.spec +++ b/strongswan.spec @@ -14,6 +14,8 @@ Patch2: libstrongswan-plugin.patch Patch3: libstrongswan-settings-debug.patch Patch4: strongswan.git-71d740cac68f83c77d981368a4c041eb620310ed.patch Patch5: libimcv-attestatiom-imv-crash.patch +Patch6: strongswan-Change-ipsec-updown-to-strongswan-updown.patch + BuildRequires: gmp-devel BuildRequires: libcurl-devel BuildRequires: openldap-devel @@ -67,6 +69,7 @@ implementation possessing a standard IF-IMC/IMV interface. %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 @@ -297,6 +300,8 @@ fi - use new systemd scriptlet macros - NetworkManager subpackage should have a copy of the license (#984490) - enable hardened_build as this package meets the PIE criteria (#984429) +- invocation of "ipsec _updown iptables" is broken as ipsec is renamed + to strongswan in this package (#948306) * Fri Jun 28 2013 Avesh Agarwal - 5.0.4-3 - Patch to fix a major crash issue when Freeradius loads