[Pkg-swan-devel] [strongswan] 09/12: Install configuration files for all plugins
Yves-Alexis Perez
corsac at moszumanska.debian.org
Sun Mar 16 14:49:38 UTC 2014
This is an automated email from the git hooks/post-receive script.
corsac pushed a commit to branch master
in repository strongswan.
commit 0932ba90885dd077017853610c42b49b125f68ba
Author: Yves-Alexis Perez <corsac at debian.org>
Date: Wed Mar 12 10:27:38 2014 +0100
Install configuration files for all plugins
* debian/rules, debian/*.install:
- install default configuration files for all plugins.
---
debian/changelog | 2 +
debian/libcharon-extra-plugins.install | 31 +++++++++++++--
debian/libstrongswan-extra-plugins.install | 19 ++++++++-
debian/libstrongswan-standard-plugins.install | 9 ++++-
debian/libstrongswan.install | 57 ++++++++++++++++++++++++++-
debian/rules | 43 +++++++++++++++-----
debian/strongswan-charon.install | 4 ++
debian/strongswan-libcharon.install | 2 +
debian/strongswan-starter.install | 8 ++++
9 files changed, 158 insertions(+), 17 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 8232087..d7a4cb2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ strongswan (5.1.2-1) UNRELEASED; urgency=medium
- 01_fix-manpages refreshed for new upstream.
- 02_include-strongswan.conf.d removed, strongswan.d is now supported
upstream.
+ * debian/rules, debian/*.install:
+ - install default configuration files for all plugins.
-- Yves-Alexis Perez <corsac at debian.org> Tue, 11 Mar 2014 20:48:54 +0100
diff --git a/debian/libcharon-extra-plugins.install b/debian/libcharon-extra-plugins.install
index 8a7080f..0292297 100644
--- a/debian/libcharon-extra-plugins.install
+++ b/debian/libcharon-extra-plugins.install
@@ -10,9 +10,34 @@ usr/lib/ipsec/plugins/libstrongswan-medsrv.so
usr/lib/ipsec/plugins/libstrongswan-medcli.so
usr/lib/ipsec/plugins/libstrongswan-tnc-tnccs.so
usr/lib/ipsec/plugins/libstrongswan-unity.so
-usr/lib/ipsec/plugins/libstrongswan-xauth-eap.so
-usr/lib/ipsec/plugins/libstrongswan-xauth-generic.so
-usr/lib/ipsec/plugins/libstrongswan-xauth-pam.so
+usr/lib/ipsec/plugins/libstrongswan-xauth-*.so
+# standard configuration files
+usr/share/strongswan/templates/config/plugins/addrblock.conf
+usr/share/strongswan/templates/config/plugins/certexpire.conf
+usr/share/strongswan/templates/config/plugins/eap-*.conf
+usr/share/strongswan/templates/config/plugins/error-notify.conf
+usr/share/strongswan/templates/config/plugins/ha.conf
+usr/share/strongswan/templates/config/plugins/led.conf
+usr/share/strongswan/templates/config/plugins/lookip.conf
+usr/share/strongswan/templates/config/plugins/medsrv.conf
+usr/share/strongswan/templates/config/plugins/medcli.conf
+usr/share/strongswan/templates/config/plugins/tnc-tnccs.conf
+usr/share/strongswan/templates/config/plugins/unity.conf
+usr/share/strongswan/templates/config/plugins/xauth-*.conf
+usr/share/strongswan/templates/config/strongswan.d/tnc.conf
+etc/strongswan.d/tnc.conf
+etc/strongswan.d/charon/addrblock.conf
+etc/strongswan.d/charon/certexpire.conf
+etc/strongswan.d/charon/eap-*.conf
+etc/strongswan.d/charon/error-notify.conf
+etc/strongswan.d/charon/ha.conf
+etc/strongswan.d/charon/led.conf
+etc/strongswan.d/charon/lookip.conf
+etc/strongswan.d/charon/medsrv.conf
+etc/strongswan.d/charon/medcli.conf
+etc/strongswan.d/charon/tnc-tnccs.conf
+etc/strongswan.d/charon/unity.conf
+etc/strongswan.d/charon/xauth-*.conf
# support libs
usr/lib/ipsec/libfast.so*
usr/lib/ipsec/libpttls.so*
diff --git a/debian/libstrongswan-extra-plugins.install b/debian/libstrongswan-extra-plugins.install
index db196e3..2a7c209 100644
--- a/debian/libstrongswan-extra-plugins.install
+++ b/debian/libstrongswan-extra-plugins.install
@@ -1,4 +1,4 @@
-# libstrongswan
+# libstrongswan plugins
usr/lib/ipsec/plugins/libstrongswan-ccm.so
usr/lib/ipsec/plugins/libstrongswan-cmac.so
usr/lib/ipsec/plugins/libstrongswan-ctr.so
@@ -7,3 +7,20 @@ usr/lib/ipsec/plugins/libstrongswan-gcrypt.so
usr/lib/ipsec/plugins/libstrongswan-ldap.so
usr/lib/ipsec/plugins/libstrongswan-pkcs11.so
usr/lib/ipsec/plugins/libstrongswan-test-vectors.so
+# default configuration files
+usr/share/strongswan/templates/config/plugins/ccm.conf
+usr/share/strongswan/templates/config/plugins/cmac.conf
+usr/share/strongswan/templates/config/plugins/ctr.conf
+usr/share/strongswan/templates/config/plugins/curl.conf
+usr/share/strongswan/templates/config/plugins/gcrypt.conf
+usr/share/strongswan/templates/config/plugins/ldap.conf
+usr/share/strongswan/templates/config/plugins/pkcs11.conf
+usr/share/strongswan/templates/config/plugins/test-vectors.conf
+etc/strongswan.d/charon/ccm.conf
+etc/strongswan.d/charon/cmac.conf
+etc/strongswan.d/charon/ctr.conf
+etc/strongswan.d/charon/curl.conf
+etc/strongswan.d/charon/gcrypt.conf
+etc/strongswan.d/charon/ldap.conf
+etc/strongswan.d/charon/pkcs11.conf
+etc/strongswan.d/charon/test-vectors.conf
diff --git a/debian/libstrongswan-standard-plugins.install b/debian/libstrongswan-standard-plugins.install
index e1c3e31..d97a36a 100644
--- a/debian/libstrongswan-standard-plugins.install
+++ b/debian/libstrongswan-standard-plugins.install
@@ -1,4 +1,11 @@
-# libstrongswan
+# libstrongswan plugins
usr/lib/ipsec/plugins/libstrongswan-agent.so
usr/lib/ipsec/plugins/libstrongswan-gcm.so
usr/lib/ipsec/plugins/libstrongswan-openssl.so
+# config file
+usr/share/strongswan/templates/config/plugins/agent.conf
+usr/share/strongswan/templates/config/plugins/gcm.conf
+usr/share/strongswan/templates/config/plugins/openssl.conf
+etc/strongswan.d/charon/agent.conf
+etc/strongswan.d/charon/gcm.conf
+etc/strongswan.d/charon/openssl.conf
diff --git a/debian/libstrongswan.install b/debian/libstrongswan.install
index 69a1c72..576bfd5 100644
--- a/debian/libstrongswan.install
+++ b/debian/libstrongswan.install
@@ -1,4 +1,4 @@
-# libstrongswan
+# libstrongswan plugins
usr/lib/ipsec/libstrongswan.so*
usr/lib/ipsec/plugins/libstrongswan-aes.so
usr/lib/ipsec/plugins/libstrongswan-constraints.so
@@ -23,8 +23,61 @@ usr/lib/ipsec/plugins/libstrongswan-sha2.so
usr/lib/ipsec/plugins/libstrongswan-sshkey.so
usr/lib/ipsec/plugins/libstrongswan-x509.so
usr/lib/ipsec/plugins/libstrongswan-xcbc.so
-# libhydra
+# config files
+usr/share/strongswan/templates/config/plugins/aes.conf
+usr/share/strongswan/templates/config/plugins/constraints.conf
+usr/share/strongswan/templates/config/plugins/dnskey.conf
+usr/share/strongswan/templates/config/plugins/fips-prf.conf
+usr/share/strongswan/templates/config/plugins/gmp.conf
+usr/share/strongswan/templates/config/plugins/hmac.conf
+usr/share/strongswan/templates/config/plugins/md5.conf
+usr/share/strongswan/templates/config/plugins/nonce.conf
+usr/share/strongswan/templates/config/plugins/pgp.conf
+usr/share/strongswan/templates/config/plugins/pem.conf
+usr/share/strongswan/templates/config/plugins/pkcs1.conf
+usr/share/strongswan/templates/config/plugins/pkcs7.conf
+usr/share/strongswan/templates/config/plugins/pkcs8.conf
+usr/share/strongswan/templates/config/plugins/pkcs12.conf
+usr/share/strongswan/templates/config/plugins/pubkey.conf
+usr/share/strongswan/templates/config/plugins/random.conf
+usr/share/strongswan/templates/config/plugins/rc2.conf
+usr/share/strongswan/templates/config/plugins/revocation.conf
+usr/share/strongswan/templates/config/plugins/sha1.conf
+usr/share/strongswan/templates/config/plugins/sha2.conf
+usr/share/strongswan/templates/config/plugins/sshkey.conf
+usr/share/strongswan/templates/config/plugins/x509.conf
+usr/share/strongswan/templates/config/plugins/xcbc.conf
+etc/strongswan.d/charon/aes.conf
+etc/strongswan.d/charon/constraints.conf
+etc/strongswan.d/charon/dnskey.conf
+etc/strongswan.d/charon/fips-prf.conf
+etc/strongswan.d/charon/gmp.conf
+etc/strongswan.d/charon/hmac.conf
+etc/strongswan.d/charon/md5.conf
+etc/strongswan.d/charon/nonce.conf
+etc/strongswan.d/charon/pgp.conf
+etc/strongswan.d/charon/pem.conf
+etc/strongswan.d/charon/pkcs1.conf
+etc/strongswan.d/charon/pkcs7.conf
+etc/strongswan.d/charon/pkcs8.conf
+etc/strongswan.d/charon/pkcs12.conf
+etc/strongswan.d/charon/pubkey.conf
+etc/strongswan.d/charon/random.conf
+etc/strongswan.d/charon/rc2.conf
+etc/strongswan.d/charon/revocation.conf
+etc/strongswan.d/charon/sha1.conf
+etc/strongswan.d/charon/sha2.conf
+etc/strongswan.d/charon/sshkey.conf
+etc/strongswan.d/charon/x509.conf
+etc/strongswan.d/charon/xcbc.conf
+# libhydra plugins
usr/lib/ipsec/libhydra.so*
usr/lib/ipsec/plugins/libstrongswan-attr.so
usr/lib/ipsec/plugins/libstrongswan-resolve.so
+# config files
+usr/share/strongswan/templates/config/strongswan.conf
+usr/share/strongswan/templates/config/plugins/attr.conf
+usr/share/strongswan/templates/config/plugins/resolve.conf
+etc/strongswan.d/charon/attr.conf
+etc/strongswan.d/charon/resolve.conf
etc/strongswan.conf
diff --git a/debian/rules b/debian/rules
index d7ad51a..cc42d93 100755
--- a/debian/rules
+++ b/debian/rules
@@ -85,37 +85,60 @@ override_dh_install:
ifeq ($(DEB_BUILD_ARCH_OS),linux)
# handle Linux-only plugins
dh_install -p libcharon-extra-plugins usr/lib/ipsec/plugins/libstrongswan-dhcp.so
+ dh_install -p libcharon-extra-plugins usr/share/strongswan/templates/config/plugins/dhcp.conf
+ dh_install -p libcharon-extra-plugins etc/strongswan.d/charon/dhcp.conf
+
dh_install -p libcharon-extra-plugins usr/lib/ipsec/plugins/libstrongswan-farp.so
+ dh_install -p libcharon-extra-plugins usr/share/strongswan/templates/config/plugins/farp.conf
+ dh_install -p libcharon-extra-plugins etc/strongswan.d/charon/farp.conf
+
dh_install -p libstrongswan usr/lib/ipsec/plugins/libstrongswan-kernel-netlink.so
- dh_install -p libstrongswan-extras-plugins usr/lib/ipsec/plugins/libstrongswan-af-alg.so
+ dh_install -p libstrongswan usr/share/strongswan/templates/config/plugins/kernel-netlink.conf
+ dh_install -p libstrongswan etc/strongswan.d/charon/kernel-netlink.conf
+
+ dh_install -p libstrongswan-extra-plugins usr/lib/ipsec/plugins/libstrongswan-af-alg.so
+ dh_install -p libstrongswan-extra-plugins usr/share/strongswan/templates/config/plugins/af-alg.conf
+ dh_install -p libstrongswan-extra-plugins etc/strongswan.d/charon/af-alg.conf
endif
ifeq ($(DEB_BUILD_ARCH_OS),kfreebsd)
# handle FreeBSD-only plugins
dh_install -p libstrongswan usr/lib/ipsec/plugins/libstrongswan-kernel-pfkey.so
+ dh_install -p libstrongswan usr/share/strongswan/templates/config/plugins/kernel-pfkey.conf
+ dh_install -p libstrongswan etc/strongswan.d/charon/kernel-pfkey.conf
+
dh_install -p libstrongswan usr/lib/ipsec/plugins/libstrongswan-kernel-pfroute.so
+ dh_install -p libstrongswan usr/share/strongswan/templates/config/plugins/kernel-pfroute.conf
+ dh_install -p libstrongswan etc/strongswan.d/charon/kernel-pfroute.conf
endif
ifeq ($(DEB_BUILD_ARCH_CPU),i386)
# special handling for padlock, as it is only built on i386
- dh_install -p libstrongswan-extras-plugins usr/lib/ipsec/plugins/libstrongswan-padlock.so
- dh_install -p libstrongswan-extras-plugins usr/lib/ipsec/plugins/libstrongswan-rdrand.so
+ dh_install -p libstrongswan-extra-plugins usr/lib/ipsec/plugins/libstrongswan-padlock.so
+ dh_install -p libstrongswan-extra-plugins usr/share/strongswan/templates/config/plugins/padlock.conf
+ dh_install -p libstrongswan-extra-plugins etc/strongswan.d/charon/padlock.conf
+
+ dh_install -p libstrongswan-extra-plugins usr/lib/ipsec/plugins/libstrongswan-rdrand.so
+ dh_install -p libstrongswan-extra-plugins usr/share/strongswan/templates/config/plugins/rdrand.conf
+ dh_install -p libstrongswan-extra-plugins etc/strongswan.d/charon/rdrand.conf
endif
ifeq ($(DEB_BUILD_ARCH_CPU), amd64)
- dh_install -p libstrongswan-extras-plugins usr/lib/ipsec/plugins/libstrongswan-rdrand.so
+ dh_install -p libstrongswan-extra-plugins usr/lib/ipsec/plugins/libstrongswan-rdrand.so
+ dh_install -p libstrongswan-extra-plugins usr/share/strongswan/templates/config/plugins/rdrand.conf
+ dh_install -p libstrongswan-extra-plugins etc/strongswan.d/charon/rdrand.conf
endif
# then install the rest, ignoring the above
dh_install --fail-missing \
-X\.la -X\.a \
-Xmedsrv -Xman3 \
- -Xlibstrongswan-kernel \
- -Xlibstrongswan-dhcp.so \
- -Xlibstrongswan-farp.so \
- -Xlibstrongswan-padlock.so \
- -Xlibstrongswan-rdrand.so \
- -Xlibstrongswan-af-alg.so
+ -Xlibstrongswan-kernel- -X kernel- \
+ -Xlibstrongswan-dhcp.so -X dhcp.conf \
+ -Xlibstrongswan-farp.so -X farp.conf \
+ -Xlibstrongswan-padlock.so -X padlock.conf \
+ -Xlibstrongswan-rdrand.so -X rdrand.conf \
+ -Xlibstrongswan-af-alg.so -X af-alg.conf
# add additional files not covered by upstream makefile...
install --mode=0600 $(CURDIR)/debian/ipsec.secrets.proto $(CURDIR)/debian/strongswan-starter/etc/ipsec.secrets
diff --git a/debian/strongswan-charon.install b/debian/strongswan-charon.install
index 761aea5..c1bdaf3 100644
--- a/debian/strongswan-charon.install
+++ b/debian/strongswan-charon.install
@@ -1 +1,5 @@
usr/lib/ipsec/charon
+usr/share/strongswan/templates/config/strongswan.d/charon.conf
+usr/share/strongswan/templates/config/strongswan.d/charon-logging.conf
+etc/strongswan.d/charon-logging.conf
+etc/strongswan.d/charon.conf
diff --git a/debian/strongswan-libcharon.install b/debian/strongswan-libcharon.install
index 084db38..15d63ed 100644
--- a/debian/strongswan-libcharon.install
+++ b/debian/strongswan-libcharon.install
@@ -1,2 +1,4 @@
usr/lib/ipsec/libcharon*
usr/lib/ipsec/plugins/libstrongswan-socket-default.so
+usr/share/strongswan/templates/config/plugins/socket-default.conf
+etc/strongswan.d/charon/socket-default.conf
diff --git a/debian/strongswan-starter.install b/debian/strongswan-starter.install
index feb578b..9567bed 100644
--- a/debian/strongswan-starter.install
+++ b/debian/strongswan-starter.install
@@ -1,5 +1,7 @@
#starter
usr/lib/ipsec/starter
+usr/share/strongswan/templates/config/strongswan.d/starter.conf
+etc/strongswan.d/starter.conf
usr/lib/ipsec/_copyright
usr/sbin/ipsec
etc/ipsec.d
@@ -10,6 +12,8 @@ usr/share/man/man5/ipsec.secrets.5
usr/share/man/man5/strongswan.conf.5
#updown
usr/lib/ipsec/plugins/libstrongswan-updown.so
+usr/share/strongswan/templates/config/plugins/updown.conf
+etc/strongswan.d/charon/updown.conf
usr/lib/ipsec/_updown
usr/lib/ipsec/_updown_espmark
usr/share/man/man8/_updown.8
@@ -31,6 +35,10 @@ usr/share/man/man1/pki---self.1
usr/share/man/man1/pki---signcrl.1
usr/share/man/man1/pki---verify.1
usr/share/man/man1/pki.1
+usr/share/strongswan/templates/config/strongswan.d/tools.conf
+etc/strongswan.d/tools.conf
#stroke
usr/lib/ipsec/stroke
usr/lib/ipsec/plugins/libstrongswan-stroke.so
+usr/share/strongswan/templates/config/plugins/stroke.conf
+etc/strongswan.d/charon/stroke.conf
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-swan/strongswan.git
More information about the Pkg-swan-devel
mailing list