summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYves-Alexis Perez <corsac@debian.org>2014-03-11 21:11:27 +0100
committerYves-Alexis Perez <corsac@debian.org>2014-03-11 21:11:27 +0100
commit5bbe04fa6812ef21055e8be1b7e33bae295beea5 (patch)
tree4445fb4dbbd291f2780e8facdfd3734bd87204e8
parent6cb9269193edd17fcb6b405745e23417f21cedf3 (diff)
downloadvyos-strongswan-5bbe04fa6812ef21055e8be1b7e33bae295beea5.tar.gz
vyos-strongswan-5bbe04fa6812ef21055e8be1b7e33bae295beea5.zip
02_include-strongswan.conf.d removed, strongswan.d is now supported upstream.
-rw-r--r--debian/changelog2
-rw-r--r--debian/patches/02_include-strongswan.conf.d.patch10
-rw-r--r--debian/patches/series1
3 files changed, 2 insertions, 11 deletions
diff --git a/debian/changelog b/debian/changelog
index 41e129f45..823208721 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ strongswan (5.1.2-1) UNRELEASED; urgency=medium
- stop lying about ipsec showhostkey command. closes: #600382
* debian/patches:
- 01_fix-manpages refreshed for new upstream.
+ - 02_include-strongswan.conf.d removed, strongswan.d is now supported
+ upstream.
-- Yves-Alexis Perez <corsac@debian.org> Tue, 11 Mar 2014 20:48:54 +0100
diff --git a/debian/patches/02_include-strongswan.conf.d.patch b/debian/patches/02_include-strongswan.conf.d.patch
deleted file mode 100644
index 45d95fbac..000000000
--- a/debian/patches/02_include-strongswan.conf.d.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Index: strongswan/src/strongswan.conf
-===================================================================
---- strongswan.orig/src/strongswan.conf 2014-01-14 13:45:31.898298701 +0100
-+++ strongswan/src/strongswan.conf 2014-01-14 14:43:30.936346911 +0100
-@@ -32,3 +32,5 @@
- # set to no, the DH exponent size is optimized
- # dh_exponent_ansi_x9_42 = no
- }
-+
-+include /etc/strongswan.conf.d/*.conf
diff --git a/debian/patches/series b/debian/patches/series
index a004656ee..2cf256b6c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
01_fix-manpages.patch
-02_include-strongswan.conf.d.patch