diff options
| author | Yves-Alexis Perez <corsac@debian.org> | 2016-03-24 12:08:04 +0100 |
|---|---|---|
| committer | Yves-Alexis Perez <corsac@debian.org> | 2016-03-24 12:08:04 +0100 |
| commit | d2b61510dd95f32c67944176f55da9d4a7487cdf (patch) | |
| tree | b2be4d8fe974980fae6456a9d45e4655eb7c9c6d /debian/patches | |
| parent | ab5260ac4bb05c789292358f65f9f073d2686fb6 (diff) | |
| download | vyos-strongswan-d2b61510dd95f32c67944176f55da9d4a7487cdf.tar.gz vyos-strongswan-d2b61510dd95f32c67944176f55da9d4a7487cdf.zip | |
0001-charon-systemd-Inherit-all-settings-from-the-charon- dropped as well, a different version was included upstream.
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/0001-charon-systemd-Inherit-all-settings-from-the-charon-.patch | 32 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 0 insertions, 33 deletions
diff --git a/debian/patches/0001-charon-systemd-Inherit-all-settings-from-the-charon-.patch b/debian/patches/0001-charon-systemd-Inherit-all-settings-from-the-charon-.patch deleted file mode 100644 index 043f4d27a..000000000 --- a/debian/patches/0001-charon-systemd-Inherit-all-settings-from-the-charon-.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 6727f41be66904c8a38dcabf93a0933e35aaf253 Mon Sep 17 00:00:00 2001 -From: Tobias Brunner <tobias@strongswan.org> -Date: Mon, 8 Feb 2016 17:19:20 +0100 -Subject: [PATCH] charon-systemd: Inherit all settings from the charon section - -Our default config files are very charon specific. So to avoid -confusion when only charon-systemd is installed we just default to all -settings defined for charon. Since charon-systemd probably won't be used -together with charon this should not cause conflicts (settings may still -be overridden via the charon-systemd section). - - #1300 ---- - src/charon-systemd/charon-systemd.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/charon-systemd/charon-systemd.c b/src/charon-systemd/charon-systemd.c -index 4286cde..c6559ce 100644 ---- a/src/charon-systemd/charon-systemd.c -+++ b/src/charon-systemd/charon-systemd.c -@@ -349,6 +349,8 @@ int main(int argc, char *argv[]) - sd_notifyf(0, "STATUS=libstrongswan initialization failed"); - return SS_RC_INITIALIZATION_FAILED; - } -+ /* inherit settings from charon */ -+ lib->settings->add_fallback(lib->settings, lib->ns, "charon"); - if (lib->integrity && - !lib->integrity->check_file(lib->integrity, "charon-systemd", argv[0])) - { --- -2.7.0 - diff --git a/debian/patches/series b/debian/patches/series index 701824446..6d7cc1dfa 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ 01_fix-manpages.patch 03_systemd-service.patch 04_disable-libtls-tests.patch -0001-charon-systemd-Inherit-all-settings-from-the-charon-.patch |