Use multiarch paths

6 files changed, 74 insertions, 73 deletions

diff --git a/debian/changelog b/debian/changelog
index c89de61da..b59e893df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ strongswan (4.6.4-0.1) UNRELEASED; urgency=low
     - libs are in ipsec folder now
     - add libradius, libtls, libtnccs and libsimaka to libstrongswan.
     - add tnc-tnccs, pkcs8 and cmac plugins to libstrongswan.
+    - use multiarch paths
   * debian/control:
     - update standards version to 3.9.3.
     - add depend on adduser to strongswan-starter for use in maintainer
@@ -18,6 +19,7 @@ strongswan (4.6.4-0.1) UNRELEASED; urgency=low
   * debian/compat bumped to 9.
   * debian/rules:
     - enable hardening flags with PIE and bindnow.
+    - use multiarch paths.
 
  -- Yves-Alexis Perez <corsac@debian.org>  Thu, 28 Jun 2012 21:17:38 +0200
 
diff --git a/debian/libstrongswan.install b/debian/libstrongswan.install
index 22a8e4edb..9b7905d67 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-des.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-dhcp.so*
-usr/lib/ipsec/plugins/libstrongswan-dnskey.so*
-usr/lib/ipsec/plugins/libstrongswan-farp.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-xauth.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/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-des.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-dhcp.so*
+usr/lib/*/ipsec/plugins/libstrongswan-dnskey.so*
+usr/lib/*/ipsec/plugins/libstrongswan-farp.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-xauth.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
 etc/strongswan.conf
diff --git a/debian/rules b/debian/rules
index b8dfb16f6..052355f7c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,11 +11,10 @@ export DH_OPTIONS
 export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow
 
 CONFIGUREARGS := --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-		--libexecdir=/usr/lib \
 		--enable-ldap --enable-curl \
 		--with-capabilities=libcap \
 		--enable-smartcard --enable-pkcs11 \
-		--with-default-pkcs11=/usr/lib/opensc-pkcs11.so \
+		--with-default-pkcs11=/usr/lib/$(DEB_HOST_MULTIARCH)/opensc-pkcs11.so \
 		--enable-mediation --enable-medsrv --enable-medcli \
 		--enable-openssl --enable-agent \
 		--enable-ctr --enable-ccm --enable-gcm --enable-addrblock \
@@ -98,10 +97,10 @@ install: build-stamp
 
 	# 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/
+	  install $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/ipsec/plugins/libstrongswan-padlock.so* $(CURDIR)/debian/libstrongswan/usr/lib/$(DEB_HOST_MULTIARCH)/ipsec/plugins/
 endif
 	# and special handling for network-manager files - only install when built
-	install $(CURDIR)/debian/tmp/usr/lib/ipsec/plugins/libstrongswan-nm.so* $(CURDIR)/debian/strongswan-nm/usr/lib/ipsec/plugins/
+	install $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/ipsec/plugins/libstrongswan-nm.so* $(CURDIR)/debian/strongswan-nm/usr/lib/$(DEB_HOST_MULTIARCH)/ipsec/plugins/
 
 	# and 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-ikev1.install b/debian/strongswan-ikev1.install
index 5f91e1b7c..5fd5d14e1 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 e5970a1f3..e4a80ec84 100644
--- a/debian/strongswan-ikev2.install
+++ b/debian/strongswan-ikev2.install
@@ -1,11 +1,11 @@
-usr/lib/ipsec/libcharon.so*
-usr/lib/ipsec/charon
-usr/lib/ipsec/plugins/libstrongswan-kernel-netlink.so*
-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-curl.so*
-usr/lib/ipsec/plugins/libstrongswan-ldap.so*
-usr/lib/ipsec/plugins/libstrongswan-medsrv.so*
-usr/lib/ipsec/plugins/libstrongswan-medcli.so*
-usr/lib/ipsec/plugins/libstrongswan-attr*.so*
+usr/lib/*/ipsec/libcharon.so*
+usr/lib/*/ipsec/charon
+usr/lib/*/ipsec/plugins/libstrongswan-kernel-netlink.so*
+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-curl.so*
+usr/lib/*/ipsec/plugins/libstrongswan-ldap.so*
+usr/lib/*/ipsec/plugins/libstrongswan-medsrv.so*
+usr/lib/*/ipsec/plugins/libstrongswan-medcli.so*
+usr/lib/*/ipsec/plugins/libstrongswan-attr*.so*
diff --git a/debian/strongswan-starter.install b/debian/strongswan-starter.install
index ca6ecc8e8..4e0e5860c 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*