[after explaining in IRC how I ended up with a year-old repository...] On 16 January 2014 22:33, Yves-Alexis Perez <[email protected]> wrote: > On Thu, Jan 16, 2014 at 10:30:26PM +0100, Yves-Alexis Perez wrote: >> That looks like something we can do, yes. > > Can you rebase the patch against master though?
Done in attached mbox. Cheers, -- Raphael Geissert - Debian Developer www.debian.org - get.debian.net
From a2431a1cdab1a5fa72df9c4ca734d2ea75dcba1d Mon Sep 17 00:00:00 2001 From: Raphael Geissert <[email protected]> Date: Tue, 14 Jan 2014 14:51:01 +0100 Subject: [PATCH] Support configuration via /etc/strongswan.conf.d/ Upstream's position on this is that packages should ship this configuration, instead of modifying it upstream. See: https://wiki.strongswan.org/issues/475 --- debian/changelog | 4 ++++ debian/libstrongswan.dirs | 1 + debian/patches/02_include-strongswan.conf.d.patch | 10 ++++++++++ debian/patches/series | 1 + 4 files changed, 16 insertions(+) create mode 100644 debian/patches/02_include-strongswan.conf.d.patch diff --git a/debian/changelog b/debian/changelog index e7368a0..8d36606 100644 --- a/debian/changelog +++ b/debian/changelog @@ -49,6 +49,10 @@ strongswan (5.1.1-1) UNRELEASED; urgency=low * debian/strongswan-starter.install: - 'ipsec pool' is no longer built, remove. + [ Raphael Geissert ] + * Allow the configuration of strongswan.conf to be stored in snippets + in /etc/strongswan.conf.d/ + -- Romain Francoise <[email protected]> Tue, 29 Oct 2013 20:01:37 +0100 strongswan (5.1.0-3) unstable; urgency=high diff --git a/debian/libstrongswan.dirs b/debian/libstrongswan.dirs index 3550fea..ed957af 100644 --- a/debian/libstrongswan.dirs +++ b/debian/libstrongswan.dirs @@ -2,5 +2,6 @@ /etc/logcheck/ignore.d.server /etc/logcheck/ignore.d.workstation /etc/logcheck/violations.ignore.d +/etc/strongswan.conf.d /usr/share/lintian/overrides /usr/lib/ipsec/plugins diff --git a/debian/patches/02_include-strongswan.conf.d.patch b/debian/patches/02_include-strongswan.conf.d.patch new file mode 100644 index 0000000..45d95fb --- /dev/null +++ b/debian/patches/02_include-strongswan.conf.d.patch @@ -0,0 +1,10 @@ +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 2cf256b..a004656 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 01_fix-manpages.patch +02_include-strongswan.conf.d.patch -- 1.7.10.4
