summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog5
-rw-r--r--debian/libstrongswan.install20
-rwxr-xr-xdebian/rules2
-rw-r--r--debian/strongswan-ikev2.install3
4 files changed, 24 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog
index a959d3f61..b228f852c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
strongswan (4.4.0-1.1) unstable; urgency=low
- * Force enable-socket-raw configure option, as it doesn't seem to be enabled
- by default anymore.
+ * Force enable-socket-raw configure option and enable fail-missing option
+ for dh_install to make sure that all required plugins get built and
+ installed.
Closes: #587282: plugins missing
* Updated fr debconf translations.
Closes: #587052: strongswan: [INTL:fr] French debconf templates
diff --git a/debian/libstrongswan.install b/debian/libstrongswan.install
index 6445b354e..017e607cc 100644
--- a/debian/libstrongswan.install
+++ b/debian/libstrongswan.install
@@ -2,10 +2,26 @@ usr/lib/libstrongswan.so* usr/lib/
usr/lib/libhydra.so* usr/lib/
usr/lib/libfast.so* usr/lib/
usr/lib/ipsec/plugins/libstrongswan-gmp.so* usr/lib/ipsec/plugins/
+usr/lib/ipsec/plugins/libstrongswan-openssl.so* usr/lib/ipsec/plugins/
usr/lib/ipsec/plugins/libstrongswan-x509.so* usr/lib/ipsec/plugins/
+usr/lib/ipsec/plugins/libstrongswan-pgp.so* usr/lib/ipsec/plugins/
+usr/lib/ipsec/plugins/libstrongswan-pem.so* usr/lib/ipsec/plugins/
+usr/lib/ipsec/plugins/libstrongswan-pkcs1.so* usr/lib/ipsec/plugins/
usr/lib/ipsec/plugins/libstrongswan-pubkey.so* usr/lib/ipsec/plugins/
usr/lib/ipsec/plugins/libstrongswan-hmac.so* usr/lib/ipsec/plugins/
usr/lib/ipsec/plugins/libstrongswan-xcbc.so* usr/lib/ipsec/plugins/
usr/lib/ipsec/plugins/libstrongswan-random.so* usr/lib/ipsec/plugins/
-usr/lib/ipsec/plugins/libstrongswan-openssl.so* usr/lib/ipsec/plugins/
-etc/strongswan.conf etc/
+usr/lib/ipsec/plugins/libstrongswan-aes.so* usr/lib/ipsec/plugins/
+usr/lib/ipsec/plugins/libstrongswan-des.so* usr/lib/ipsec/plugins/
+usr/lib/ipsec/plugins/libstrongswan-xcbc.so* usr/lib/ipsec/plugins/
+usr/lib/ipsec/plugins/libstrongswan-md5.so* usr/lib/ipsec/plugins/
+usr/lib/ipsec/plugins/libstrongswan-sha1.so* usr/lib/ipsec/plugins/
+usr/lib/ipsec/plugins/libstrongswan-sha2.so* usr/lib/ipsec/plugins/
+usr/lib/ipsec/plugins/libstrongswan-dhcp.so* usr/lib/ipsec/plugins/
+usr/lib/ipsec/plugins/libstrongswan-dnskey.so* usr/lib/ipsec/plugins/
+usr/lib/ipsec/plugins/libstrongswan-farp.so* usr/lib/ipsec/plugins/
+usr/lib/ipsec/plugins/libstrongswan-fips-prf.so* usr/lib/ipsec/plugins/
+usr/lib/ipsec/plugins/libstrongswan-resolve.so* usr/lib/ipsec/plugins/
+usr/lib/ipsec/plugins/libstrongswan-sql.so* usr/lib/ipsec/plugins/
+usr/lib/ipsec/plugins/libstrongswan-ha.so* usr/lib/ipsec/plugins/
+etc/strongswan.conf etc/
diff --git a/debian/rules b/debian/rules
index 8599948d9..0d11ddda7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -83,7 +83,7 @@ install: build-stamp
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
# install files from debian/tmp into proper package dirs
- dh_install
+ dh_install --fail-missing
# special handling for padlock, as it is only built on i386
ifeq ($(DEB_BUILD_ARCH_CPU),i386)
install $(CURDIR)/debian/tmp/usr/lib/ipsec/plugins/libstrongswan-padlock.so* $(CURDIR)/debian/libstrongswan/usr/lib/ipsec/plugins/
diff --git a/debian/strongswan-ikev2.install b/debian/strongswan-ikev2.install
index bd466b2ce..5cdfa3e70 100644
--- a/debian/strongswan-ikev2.install
+++ b/debian/strongswan-ikev2.install
@@ -1,10 +1,11 @@
usr/lib/libcharon.so* usr/lib/
usr/lib/ipsec/charon usr/lib/ipsec/
usr/lib/ipsec/plugins/libstrongswan-kernel-netlink.so* usr/lib/ipsec/plugins/
+usr/lib/ipsec/plugins/libstrongswan-socket.so* usr/lib/ipsec/plugins/
usr/lib/ipsec/plugins/libstrongswan-eap*.so* usr/lib/ipsec/plugins/
usr/lib/ipsec/plugins/libstrongswan-agent.so* usr/lib/ipsec/plugins/
usr/lib/ipsec/plugins/libstrongswan-curl.so* usr/lib/ipsec/plugins/
usr/lib/ipsec/plugins/libstrongswan-ldap.so* usr/lib/ipsec/plugins/
usr/lib/ipsec/plugins/libstrongswan-medsrv.so* usr/lib/ipsec/plugins/
usr/lib/ipsec/plugins/libstrongswan-medcli.so* usr/lib/ipsec/plugins/
-usr/lib/ipsec/plugins/libstrongswan-attr.so* usr/lib/ipsec/plugins/
+usr/lib/ipsec/plugins/libstrongswan-attr* usr/lib/ipsec/plugins/