diff options
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/libstrongswan.install | 88 | ||||
| -rw-r--r-- | debian/libstrongswan.lintian-overrides | 28 | ||||
| -rwxr-xr-x | debian/rules | 18 | ||||
| -rw-r--r-- | debian/strongswan-ikev1.install | 6 | ||||
| -rw-r--r-- | debian/strongswan-ikev2.install | 14 | ||||
| -rw-r--r-- | debian/strongswan-ikev2.lintian-overrides | 4 | ||||
| -rw-r--r-- | debian/strongswan-nm.install | 2 | ||||
| -rw-r--r-- | debian/strongswan-starter.install | 22 |
9 files changed, 97 insertions, 92 deletions
diff --git a/debian/changelog b/debian/changelog index faf00fb3e..90e71dbb7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ strongswan (4.6.4-5) UNRELEASED; urgency=low + [ Yves-Alexis Perez ] * debian/control: - and finally libcap-dev linux-any too... - make -ikev1 linux-any since pluto can't be build on FreeBSD. @@ -14,7 +15,11 @@ strongswan (4.6.4-5) UNRELEASED; urgency=low * debian/po - add turkish translation, thanks Atila KOÇ. closes: #659879 - -- Yves-Alexis Perez <corsac@debian.org> Sun, 01 Jul 2012 13:17:17 +0200 + [ Laurent Bigonville ] + * Do not use multi-arch paths, this makes no sense as only one instance of + the daemon can be run and all libraries are private. + + -- Laurent Bigonville <bigon@debian.org> Mon, 02 Jul 2012 16:17:38 +0200 strongswan (4.6.4-4) unstable; urgency=low diff --git a/debian/libstrongswan.install b/debian/libstrongswan.install index 9a46a1cf3..c69727d69 100644 --- a/debian/libstrongswan.install +++ b/debian/libstrongswan.install @@ -1,45 +1,45 @@ -usr/lib/*/ipsec/libstrongswan.so* -usr/lib/*/ipsec/libhydra.so* -usr/lib/*/ipsec/libfast.so* -usr/lib/*/ipsec/libchecksum.so* -usr/lib/*/ipsec/libsimaka.so* -usr/lib/*/ipsec/libtnccs.so* -usr/lib/*/ipsec/libradius.so* -usr/lib/*/ipsec/libtls.so* -usr/lib/*/ipsec/plugins/libstrongswan-gmp.so -usr/lib/*/ipsec/plugins/libstrongswan-openssl.so -usr/lib/*/ipsec/plugins/libstrongswan-x509.so -usr/lib/*/ipsec/plugins/libstrongswan-pkcs11.so -usr/lib/*/ipsec/plugins/libstrongswan-pgp.so -usr/lib/*/ipsec/plugins/libstrongswan-pem.so -usr/lib/*/ipsec/plugins/libstrongswan-pkcs1.so -usr/lib/*/ipsec/plugins/libstrongswan-pubkey.so -usr/lib/*/ipsec/plugins/libstrongswan-hmac.so -usr/lib/*/ipsec/plugins/libstrongswan-xcbc.so -usr/lib/*/ipsec/plugins/libstrongswan-random.so -usr/lib/*/ipsec/plugins/libstrongswan-aes.so -usr/lib/*/ipsec/plugins/libstrongswan-xcbc.so -usr/lib/*/ipsec/plugins/libstrongswan-ctr.so -usr/lib/*/ipsec/plugins/libstrongswan-ccm.so -usr/lib/*/ipsec/plugins/libstrongswan-gcm.so -usr/lib/*/ipsec/plugins/libstrongswan-led.so -usr/lib/*/ipsec/plugins/libstrongswan-addrblock.so -usr/lib/*/ipsec/plugins/libstrongswan-md5.so -usr/lib/*/ipsec/plugins/libstrongswan-sha1.so -usr/lib/*/ipsec/plugins/libstrongswan-sha2.so -usr/lib/*/ipsec/plugins/libstrongswan-dnskey.so -usr/lib/*/ipsec/plugins/libstrongswan-fips-prf.so -usr/lib/*/ipsec/plugins/libstrongswan-resolve.so -usr/lib/*/ipsec/plugins/libstrongswan-sql.so -usr/lib/*/ipsec/plugins/libstrongswan-ha.so -usr/lib/*/ipsec/plugins/libstrongswan-revocation.so -usr/lib/*/ipsec/plugins/libstrongswan-constraints.so -usr/lib/*/ipsec/plugins/libstrongswan-test-vectors.so -usr/lib/*/ipsec/plugins/libstrongswan-tnc-tnccs.so -usr/lib/*/ipsec/plugins/libstrongswan-pkcs8.so -usr/lib/*/ipsec/plugins/libstrongswan-cmac.so -usr/lib/*/ipsec/plugins/libstrongswan-ldap.so -usr/lib/*/ipsec/plugins/libstrongswan-attr*.so -usr/lib/*/ipsec/plugins/libstrongswan-curl.so -usr/lib/*/ipsec/plugins/libstrongswan-gcrypt.so +usr/lib/ipsec/libstrongswan.so* +usr/lib/ipsec/libhydra.so* +usr/lib/ipsec/libfast.so* +usr/lib/ipsec/libchecksum.so* +usr/lib/ipsec/libsimaka.so* +usr/lib/ipsec/libtnccs.so* +usr/lib/ipsec/libradius.so* +usr/lib/ipsec/libtls.so* +usr/lib/ipsec/plugins/libstrongswan-gmp.so +usr/lib/ipsec/plugins/libstrongswan-openssl.so +usr/lib/ipsec/plugins/libstrongswan-x509.so +usr/lib/ipsec/plugins/libstrongswan-pkcs11.so +usr/lib/ipsec/plugins/libstrongswan-pgp.so +usr/lib/ipsec/plugins/libstrongswan-pem.so +usr/lib/ipsec/plugins/libstrongswan-pkcs1.so +usr/lib/ipsec/plugins/libstrongswan-pubkey.so +usr/lib/ipsec/plugins/libstrongswan-hmac.so +usr/lib/ipsec/plugins/libstrongswan-xcbc.so +usr/lib/ipsec/plugins/libstrongswan-random.so +usr/lib/ipsec/plugins/libstrongswan-aes.so +usr/lib/ipsec/plugins/libstrongswan-xcbc.so +usr/lib/ipsec/plugins/libstrongswan-ctr.so +usr/lib/ipsec/plugins/libstrongswan-ccm.so +usr/lib/ipsec/plugins/libstrongswan-gcm.so +usr/lib/ipsec/plugins/libstrongswan-led.so +usr/lib/ipsec/plugins/libstrongswan-addrblock.so +usr/lib/ipsec/plugins/libstrongswan-md5.so +usr/lib/ipsec/plugins/libstrongswan-sha1.so +usr/lib/ipsec/plugins/libstrongswan-sha2.so +usr/lib/ipsec/plugins/libstrongswan-dnskey.so +usr/lib/ipsec/plugins/libstrongswan-fips-prf.so +usr/lib/ipsec/plugins/libstrongswan-resolve.so +usr/lib/ipsec/plugins/libstrongswan-sql.so +usr/lib/ipsec/plugins/libstrongswan-ha.so +usr/lib/ipsec/plugins/libstrongswan-revocation.so +usr/lib/ipsec/plugins/libstrongswan-constraints.so +usr/lib/ipsec/plugins/libstrongswan-test-vectors.so +usr/lib/ipsec/plugins/libstrongswan-tnc-tnccs.so +usr/lib/ipsec/plugins/libstrongswan-pkcs8.so +usr/lib/ipsec/plugins/libstrongswan-cmac.so +usr/lib/ipsec/plugins/libstrongswan-ldap.so +usr/lib/ipsec/plugins/libstrongswan-attr*.so +usr/lib/ipsec/plugins/libstrongswan-curl.so +usr/lib/ipsec/plugins/libstrongswan-gcrypt.so etc/strongswan.conf diff --git a/debian/libstrongswan.lintian-overrides b/debian/libstrongswan.lintian-overrides index fca4f734a..ea5e91468 100644 --- a/debian/libstrongswan.lintian-overrides +++ b/debian/libstrongswan.lintian-overrides @@ -1,17 +1,17 @@ libstrongswan: possible-gpl-code-linked-with-openssl # we do pass hardening flags -libstrongswan: hardening-no-fortify-functions usr/lib/*/ipsec/libradius.so.0.0.0 -libstrongswan: hardening-no-fortify-functions usr/lib/*/ipsec/libsimaka.so.0.0.0 -libstrongswan: hardening-no-fortify-functions usr/lib/*/ipsec/libtls.so.0.0.0 -libstrongswan: hardening-no-fortify-functions usr/lib/*/ipsec/plugins/libstrongswan-ccm.so -libstrongswan: hardening-no-fortify-functions usr/lib/*/ipsec/plugins/libstrongswan-cmac.so -libstrongswan: hardening-no-fortify-functions usr/lib/*/ipsec/plugins/libstrongswan-ctr.so -libstrongswan: hardening-no-fortify-functions usr/lib/*/ipsec/plugins/libstrongswan-farp.so -libstrongswan: hardening-no-fortify-functions usr/lib/*/ipsec/plugins/libstrongswan-gcm.so -libstrongswan: hardening-no-fortify-functions usr/lib/*/ipsec/plugins/libstrongswan-gmp.so -libstrongswan: hardening-no-fortify-functions usr/lib/*/ipsec/plugins/libstrongswan-hmac.so -libstrongswan: hardening-no-fortify-functions usr/lib/*/ipsec/plugins/libstrongswan-random.so -libstrongswan: hardening-no-fortify-functions usr/lib/*/ipsec/plugins/libstrongswan-tnc-tnccs.so -libstrongswan: hardening-no-fortify-functions usr/lib/*/ipsec/plugins/libstrongswan-xcbc.so -libstrongswan: hardening-no-fortify-functions usr/lib/*/ipsec/plugins/libstrongswan-gcrypt.so +libstrongswan: hardening-no-fortify-functions usr/lib/ipsec/libradius.so.0.0.0 +libstrongswan: hardening-no-fortify-functions usr/lib/ipsec/libsimaka.so.0.0.0 +libstrongswan: hardening-no-fortify-functions usr/lib/ipsec/libtls.so.0.0.0 +libstrongswan: hardening-no-fortify-functions usr/lib/ipsec/plugins/libstrongswan-ccm.so +libstrongswan: hardening-no-fortify-functions usr/lib/ipsec/plugins/libstrongswan-cmac.so +libstrongswan: hardening-no-fortify-functions usr/lib/ipsec/plugins/libstrongswan-ctr.so +libstrongswan: hardening-no-fortify-functions usr/lib/ipsec/plugins/libstrongswan-farp.so +libstrongswan: hardening-no-fortify-functions usr/lib/ipsec/plugins/libstrongswan-gcm.so +libstrongswan: hardening-no-fortify-functions usr/lib/ipsec/plugins/libstrongswan-gmp.so +libstrongswan: hardening-no-fortify-functions usr/lib/ipsec/plugins/libstrongswan-hmac.so +libstrongswan: hardening-no-fortify-functions usr/lib/ipsec/plugins/libstrongswan-random.so +libstrongswan: hardening-no-fortify-functions usr/lib/ipsec/plugins/libstrongswan-tnc-tnccs.so +libstrongswan: hardening-no-fortify-functions usr/lib/ipsec/plugins/libstrongswan-xcbc.so +libstrongswan: hardening-no-fortify-functions usr/lib/ipsec/plugins/libstrongswan-gcrypt.so diff --git a/debian/rules b/debian/rules index 6bb408ecb..4daf950c1 100755 --- a/debian/rules +++ b/debian/rules @@ -2,7 +2,7 @@ #export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed -Wl,-O1 -Wl,-z,defs export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow -CONFIGUREARGS := --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ +CONFIGUREARGS := --libdir=/usr/lib --libexecdir=/usr/lib \ --enable-ldap --enable-curl \ --enable-smartcard --enable-pkcs11 \ --with-default-pkcs11=/usr/lib/$(DEB_HOST_MULTIARCH)/opensc-pkcs11.so \ @@ -75,21 +75,21 @@ override_dh_install: # first special cases ifeq ($(DEB_BUILD_ARCH_OS),linux) # handle Linux-only plugins - dh_install -p libstrongswan usr/lib/$(DEB_HOST_MULTIARCH)/ipsec/plugins/libstrongswan-dhcp.so - dh_install -p libstrongswan usr/lib/$(DEB_HOST_MULTIARCH)/ipsec/plugins/libstrongswan-farp.so - dh_install -p libstrongswan usr/lib/$(DEB_HOST_MULTIARCH)/ipsec/plugins/libstrongswan-xauth.so - dh_install -p libstrongswan usr/lib/$(DEB_HOST_MULTIARCH)/ipsec/plugins/libstrongswan-kernel-netlink.so + dh_install -p libstrongswan usr/lib/ipsec/plugins/libstrongswan-dhcp.so + dh_install -p libstrongswan usr/lib/ipsec/plugins/libstrongswan-farp.so + dh_install -p libstrongswan usr/lib/ipsec/plugins/libstrongswan-xauth.so + dh_install -p libstrongswan usr/lib/ipsec/plugins/libstrongswan-kernel-netlink.so endif ifeq ($(DEB_BUILD_ARCH_OS),kfreebsd) # handle FreeBSD-only plugins - dh_install -p libstrongswan usr/lib/$(DEB_HOST_MULTIARCH)/ipsec/plugins/libstrongswan-kernel-pfkey.so - dh_install -p libstrongswan usr/lib/$(DEB_HOST_MULTIARCH)/ipsec/plugins/libstrongswan-kernel-pfroute.so + dh_install -p libstrongswan usr/lib/ipsec/plugins/libstrongswan-kernel-pfkey.so + dh_install -p libstrongswan usr/lib/ipsec/plugins/libstrongswan-kernel-pfroute.so endif ifeq ($(DEB_BUILD_ARCH_CPU),i386) # special handling for padlock, as it is only built on i386 - dh_install -p libstrongswan usr/lib/$(DEB_HOST_MULTIARCH)/ipsec/plugins/libstrongswan-padlock.so + dh_install -p libstrongswan usr/lib/ipsec/plugins/libstrongswan-padlock.so endif # then install the rest, ignoring the above @@ -140,7 +140,7 @@ override_dh_fixperms: dh_fixperms -X etc/ipsec.secrets -X etc/ipsec.d -X var/lib/strongswan override_dh_makeshlibs: - dh_makeshlibs -n -X usr/lib/$(DEB_HOST_MULTIARCH)/ipsec/plugins + dh_makeshlibs -n -X usr/lib/ipsec/plugins override_dh_installlogcheck: dh_installlogcheck --name strongswan diff --git a/debian/strongswan-ikev1.install b/debian/strongswan-ikev1.install index 5fd5d14e1..5f91e1b7c 100644 --- a/debian/strongswan-ikev1.install +++ b/debian/strongswan-ikev1.install @@ -1,4 +1,4 @@ -usr/lib/*/ipsec/pluto -usr/lib/*/ipsec/_pluto_adns -usr/lib/*/ipsec/whack +usr/lib/ipsec/pluto +usr/lib/ipsec/_pluto_adns +usr/lib/ipsec/whack usr/share/man/man8/pluto.8 diff --git a/debian/strongswan-ikev2.install b/debian/strongswan-ikev2.install index 8c11bbd34..0b7bb0e94 100644 --- a/debian/strongswan-ikev2.install +++ b/debian/strongswan-ikev2.install @@ -1,7 +1,7 @@ -usr/lib/*/ipsec/libcharon.so* -usr/lib/*/ipsec/charon -usr/lib/*/ipsec/plugins/libstrongswan-socket*.so -usr/lib/*/ipsec/plugins/libstrongswan-eap*.so -usr/lib/*/ipsec/plugins/libstrongswan-agent.so -usr/lib/*/ipsec/plugins/libstrongswan-medsrv.so -usr/lib/*/ipsec/plugins/libstrongswan-medcli.so +usr/lib/ipsec/libcharon.so* +usr/lib/ipsec/charon +usr/lib/ipsec/plugins/libstrongswan-socket*.so +usr/lib/ipsec/plugins/libstrongswan-eap*.so +usr/lib/ipsec/plugins/libstrongswan-agent.so +usr/lib/ipsec/plugins/libstrongswan-medsrv.so +usr/lib/ipsec/plugins/libstrongswan-medcli.so diff --git a/debian/strongswan-ikev2.lintian-overrides b/debian/strongswan-ikev2.lintian-overrides index 4ca21a72f..56c239da4 100644 --- a/debian/strongswan-ikev2.lintian-overrides +++ b/debian/strongswan-ikev2.lintian-overrides @@ -1,3 +1,3 @@ # we do pass hardening flags -strongswan-ikev2: hardening-no-fortify-functions usr/lib/x86_64-linux-gnu/ipsec/plugins/libstrongswan-agent.so -strongswan-ikev2: hardening-no-fortify-functions usr/lib/x86_64-linux-gnu/ipsec/plugins/libstrongswan-socket-raw.so +strongswan-ikev2: hardening-no-fortify-functions usr/lib/ipsec/plugins/libstrongswan-agent.so +strongswan-ikev2: hardening-no-fortify-functions usr/lib/ipsec/plugins/libstrongswan-socket-raw.so diff --git a/debian/strongswan-nm.install b/debian/strongswan-nm.install index 043221cc0..4cd32661e 100644 --- a/debian/strongswan-nm.install +++ b/debian/strongswan-nm.install @@ -1 +1 @@ -usr/lib/*/ipsec/plugins/libstrongswan-nm.so +usr/lib/ipsec/plugins/libstrongswan-nm.so diff --git a/debian/strongswan-starter.install b/debian/strongswan-starter.install index e182397c7..7254d11a4 100644 --- a/debian/strongswan-starter.install +++ b/debian/strongswan-starter.install @@ -1,6 +1,6 @@ #starter -usr/lib/*/ipsec/starter -usr/lib/*/ipsec/_copyright +usr/lib/ipsec/starter +usr/lib/ipsec/_copyright usr/sbin/ipsec etc/ipsec.d etc/ipsec.conf @@ -9,18 +9,18 @@ usr/share/man/man5/ipsec.conf.5 usr/share/man/man5/ipsec.secrets.5 usr/share/man/man5/strongswan.conf.5 #updown -usr/lib/*/ipsec/plugins/libstrongswan-updown.so -usr/lib/*/ipsec/_updown -usr/lib/*/ipsec/_updown_espmark +usr/lib/ipsec/plugins/libstrongswan-updown.so +usr/lib/ipsec/_updown +usr/lib/ipsec/_updown_espmark usr/share/man/man8/_updown.8 usr/share/man/man8/_updown_espmark.8 #tools -usr/lib/*/ipsec/scepclient -usr/lib/*/ipsec/openac -usr/lib/*/ipsec/pki -usr/lib/*/ipsec/pool +usr/lib/ipsec/scepclient +usr/lib/ipsec/openac +usr/lib/ipsec/pki +usr/lib/ipsec/pool usr/share/man/man8/scepclient.8 usr/share/man/man8/openac.8 #stroke -usr/lib/*/ipsec/stroke -usr/lib/*/ipsec/plugins/libstrongswan-stroke.so +usr/lib/ipsec/stroke +usr/lib/ipsec/plugins/libstrongswan-stroke.so |