[Pkg-swan-devel] [strongswan] 11/14: remove patch, 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 72b95a360acbd4f0b1e4dcd28ceab43949304b1a
Author: Yves-Alexis Perez <corsac at corsac.net>
Date:   Fri Sep 1 17:26:55 2017 +0200

    remove patch, included upstream
---
 debian/changelog                                   |  4 ----
 .../02_configure-Install-charon-systemd.conf.patch | 25 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 30 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 60ecfcc4..0210278 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,10 +14,6 @@ strongswan (5.6.0-1) UNRELEASED; urgency=medium
   * debian/strongswan-swanctl.install:
     - install the whole /etc/swanctl folder, including (empty) subfolders.
                                                                 closes: #866324
-  * debian/patches:
-    - 02_configure-Install-charon-systemd.conf added, cherry-picked from
-    upstream to install configuration to output logging information to the
-    journal.
   * debian/charon-systemd.install:
     - install charon-systemd.conf files, thanks Gerald Turner.  closes: #866325
   * Add AppArmor profiles for swanctl and charon-system, thanks Gerald Turner.
diff --git a/debian/patches/02_configure-Install-charon-systemd.conf.patch b/debian/patches/02_configure-Install-charon-systemd.conf.patch
deleted file mode 100644
index 80e0d06..0000000
--- a/debian/patches/02_configure-Install-charon-systemd.conf.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 45f45fed1edee3fec951e72ba3d5b826ccdc47f2 Mon Sep 17 00:00:00 2001
-From: Tobias Brunner <tobias at strongswan.org>
-Date: Thu, 29 Jun 2017 08:36:50 +0200
-Subject: [PATCH] configure: Install charon-systemd.conf
-
-Fixes #2370.
----
- configure.ac | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/configure.ac b/configure.ac
-index f01631474..21563f7f3 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1724,6 +1724,7 @@ AM_COND_IF([USE_MEDSRV], [strongswan_options=${strongswan_options}" medsrv"])
- AM_COND_IF([USE_SCEPCLIENT], [strongswan_options=${strongswan_options}" scepclient"])
- AM_COND_IF([USE_PKI], [strongswan_options=${strongswan_options}" pki"])
- AM_COND_IF([USE_SWANCTL], [strongswan_options=${strongswan_options}" swanctl"])
-+AM_COND_IF([USE_SYSTEMD], [strongswan_options=${strongswan_options}" charon-systemd"])
- 
- AC_SUBST(strongswan_options)
- 
--- 
-2.13.2
-
diff --git a/debian/patches/series b/debian/patches/series
index 6fe6217..6d7cc1d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 01_fix-manpages.patch
-02_configure-Install-charon-systemd.conf.patch
 03_systemd-service.patch
 04_disable-libtls-tests.patch

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