[Pkg-swan-devel] [strongswan] 05/08: 0001-charon-systemd-Inherit-all-settings-from-the-charon- dropped as well, a different version was included upstream.

[Yves-Alexis Perez]

This is an automated email from the git hooks/post-receive script.

corsac pushed a commit to branch master
in repository strongswan.

commit d2b61510dd95f32c67944176f55da9d4a7487cdf
Author: Yves-Alexis Perez <corsac at debian.org>
Date:   Thu Mar 24 12:08:04 2016 +0100

    0001-charon-systemd-Inherit-all-settings-from-the-charon- dropped as well, a different version was included upstream.
---
 debian/changelog                                   |  2 ++
 ...emd-Inherit-all-settings-from-the-charon-.patch | 32 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 2 insertions(+), 33 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e1f0106..7c8fb34 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ strongswan (5.4.0-1) UNRELEASED; urgency=medium
   * New upstream release.
   * debian/patches
     - 0001-configure-Support-systemd-209 dropped, included upstream.
+    - 0001-charon-systemd-Inherit-all-settings-from-the-charon- dropped as
+      well, a different version was included upstream.
 
  -- Yves-Alexis Perez <corsac at debian.org>  Thu, 24 Mar 2016 11:59:50 +0100
 
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 043f4d2..0000000
--- 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 at 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 7018244..6d7cc1d 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-swan/strongswan.git