Bug#866325: charon-systemd: Install charon-systemd.conf

[Gerald Turner]

On Wed, Jun 28 2017, Gerald Turner wrote:
> FYI, I opened a bug with strongSwan upstream that included the inner
> quilt patch.

My patch was accepted upstream verbatim and should be part of 5.5.4.  So
this BTS bug can be mostly ignored *except* that the Debian packaging
would still need to have the two lines added to
debian/charon-systemd.install:

diff --git a/debian/charon-systemd.install
b/debian/charon-systemd.install
index 3b62aade..6ab3af8f 100644
--- a/debian/charon-systemd.install
+++ b/debian/charon-systemd.install
@@ -1,2 +1,4 @@
+etc/strongswan.d/charon-systemd.conf
 lib/systemd/system/strongswan-swanctl.service
 usr/sbin/charon-systemd
+usr/share/strongswan/templates/config/strongswan.d/charon-systemd.conf

-- 
Gerald Turner Encrypted mail preferred!
OpenPGP: 4096R / CA89 B27A 30FA 66C5 1B80  3858 EC94 2276 FDB8 716D


signature.asc
Description: PGP signature

Bug#866325: charon-systemd: Install charon-systemd.conf

[Gerald Turner]

Control: forwarded -1 https://wiki.strongswan.org/issues/2370

FYI, I opened a bug with strongSwan upstream that included the inner
quilt patch.

-- 
Gerald Turner Encrypted mail preferred!
OpenPGP: 4096R / CA89 B27A 30FA 66C5 1B80  3858 EC94 2276 FDB8 716D


signature.asc
Description: PGP signature

Bug#866325: charon-systemd: Install charon-systemd.conf

[Gerald Turner]

Control: tags -1 + patch

On Wed, Jun 28 2017, Gerald Turner wrote:
> Please install this file to /etc/strongswan.d/charon-systemd.conf.

Attached is a patch which installs this file via quilt patch suitable
for upstreaming.

-- 
Gerald Turner Encrypted mail preferred!
OpenPGP: 4096R / CA89 B27A 30FA 66C5 1B80  3858 EC94 2276 FDB8 716D
commit f09f857f6c3fe9d4f648fbcd22603b14612b58ab
Author: Gerald Turner 
Date:   Wed May 10 16:07:00 2017 -0700

Install ‘/etc/strongswan.d/charon-systemd.conf’ with charon-systemd package.

Upstream contains source ‘conf/options/charon-systemd.conf’ which is like
‘conf/options/charon-logging.conf’, however there is a bug with configure that
it is not included in the install target.  Added quilt patch
05_install-charon-systemd-conf.patch which fixes configure.

diff --git a/debian/charon-systemd.install b/debian/charon-systemd.install
index 3b62aade..6ab3af8f 100644
--- a/debian/charon-systemd.install
+++ b/debian/charon-systemd.install
@@ -1,2 +1,4 @@
+etc/strongswan.d/charon-systemd.conf
 lib/systemd/system/strongswan-swanctl.service
 usr/sbin/charon-systemd
+usr/share/strongswan/templates/config/strongswan.d/charon-systemd.conf
diff --git a/debian/patches/05_install-charon-systemd-conf.patch b/debian/patches/05_install-charon-systemd-conf.patch
new file mode 100644
index ..67eb976f
--- /dev/null
+++ b/debian/patches/05_install-charon-systemd-conf.patch
@@ -0,0 +1,10 @@
+--- 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)
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 6d7cc1df..949de693 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 01_fix-manpages.patch
 03_systemd-service.patch
 04_disable-libtls-tests.patch
+05_install-charon-systemd-conf.patch


signature.asc
Description: PGP signature

Bug#866325: charon-systemd: Install charon-systemd.conf

[Gerald Turner]

Package: charon-systemd
Version: 5.5.1-4
Severity: normal

Dear Maintainer,

Upstream contains source ‘conf/options/charon-systemd.conf’ which is
like ‘conf/options/charon-logging.conf’.

Like the discoverability of strongswan-starter logging configuration
that charon-logging.conf provides, this charon-systemd.conf file
documents the ‘charon-systemd.journal’ configuration prefix.

Please install this file to /etc/strongswan.d/charon-systemd.conf.

-- System Information:
Debian Release: 9.0
  APT prefers stable
  APT policy: (601, 'stable'), (500, 'stable-debug')
Architecture: amd64 (x86_64)

Kernel: Linux 4.9.0-3-amd64 (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) (ignored: LC_ALL 
set to en_US.UTF-8), LANGUAGE=en_US.UTF-8 (charmap=UTF-8) (ignored: LC_ALL set 
to en_US.UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

Versions of packages charon-systemd depends on:
ii  init-system-helpers   1.48
ii  libc6 2.24-11+deb9u1
ii  libstrongswan 5.5.1-4
ii  libsystemd0   232-25
ii  strongswan-libcharon  5.5.1-4
ii  strongswan-swanctl5.5.1-4

charon-systemd recommends no packages.

charon-systemd suggests no packages.

-- no debconf information

-- 
Gerald Turner Encrypted mail preferred!
OpenPGP: 4096R / CA89 B27A 30FA 66C5 1B80  3858 EC94 2276 FDB8 716D


signature.asc
Description: PGP signature