diff options
| author | René Mayrhofer <rene@mayrhofer.eu.org> | 2011-05-25 10:06:09 +0200 |
|---|---|---|
| committer | René Mayrhofer <rene@mayrhofer.eu.org> | 2011-05-25 10:06:09 +0200 |
| commit | 231adad58f22e62109da3c6672d8f5f6a8092d7c (patch) | |
| tree | cab954e0866e010ee408494ed22d805f7f853310 /debian | |
| parent | 0a601d33853c05129b6b9670ab7c711c2512fdf6 (diff) | |
| download | vyos-strongswan-231adad58f22e62109da3c6672d8f5f6a8092d7c.tar.gz vyos-strongswan-231adad58f22e62109da3c6672d8f5f6a8092d7c.zip | |
Install additional plugins and fail if we miss to install some files for future tracking
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/libstrongswan.install | 6 | ||||
| -rwxr-xr-x | debian/rules | 2 |
3 files changed, 13 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 640148ab6..5bb256aeb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,7 +9,12 @@ strongswan (4.5.2-1) unstable; urgency=low Closes: #614105: strongswan-ikev2: charon continually respawns * Fix typo in debian/rules that precluded --enable-nm from being passed to configure (LP: #771778). - Closes: #627775 + Closes: #627775: strongswan-nm package is missing nm module + * Make sure to install all newly added plugins (and generally files created + by make install) by calling dh_install with --fail-missing. Install some + newly enabled crypto plugins in the libstrongswan package. + Closes: #627783: Please disable modules that are not installed in package + at build time -- Rene Mayrhofer <rmayr@debian.org> Thu, 19 May 2011 13:42:21 +0200 diff --git a/debian/libstrongswan.install b/debian/libstrongswan.install index 9b6a10b3e..8366298d6 100644 --- a/debian/libstrongswan.install +++ b/debian/libstrongswan.install @@ -5,6 +5,7 @@ usr/lib/ipsec/libchecksum.so* usr/lib/ipsec/ 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-pkcs11.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/ @@ -15,6 +16,11 @@ usr/lib/ipsec/plugins/libstrongswan-random.so* usr/lib/ipsec/plugins/ 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-ctr.so* usr/lib/ipsec/plugins/ +usr/lib/ipsec/plugins/libstrongswan-ccm.so* usr/lib/ipsec/plugins/ +usr/lib/ipsec/plugins/libstrongswan-gcm.so* usr/lib/ipsec/plugins/ +usr/lib/ipsec/plugins/libstrongswan-led.so* usr/lib/ipsec/plugins/ +usr/lib/ipsec/plugins/libstrongswan-addrblock.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/ diff --git a/debian/rules b/debian/rules index 01b0724de..c03f49c35 100755 --- a/debian/rules +++ b/debian/rules @@ -94,7 +94,7 @@ install: build-stamp $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp # install files from debian/tmp into proper package dirs - dh_install --list-missing + 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/ |