diff options
| author | Alberto Gonzalez Iniesta <agi@inittab.org> | 2017-06-22 15:56:39 +0200 |
|---|---|---|
| committer | Alberto Gonzalez Iniesta <agi@inittab.org> | 2017-06-22 17:00:53 +0200 |
| commit | 2298fa29199090b201b9a2ef188145930528e34f (patch) | |
| tree | 7b4338a4debe4e8311a81aad7c06928936b6eb3f | |
| parent | 23c7ad24e57fa8b5ce5a8d440e732a3bc96c85a4 (diff) | |
Update debian/rules
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rwxr-xr-x | debian/rules | 11 |
2 files changed, 8 insertions, 8 deletions
diff --git a/debian/changelog b/debian/changelog index ca25cb8..43d0dfa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,11 @@ openvpn (2.4.3-1) unstable; urgency=high - CVE-2017-7520 - CVE-2017-7521 - CVE-2017-7522 + * Plugin libs have been moved to /usr/lib/ARCH/openvpn/plugins + * debian/rules: + - Remove obsolete options to configure script (enable-password-save, + with-plugindir (now in ENV_VARS)) + - No need to install upstream's systemd unit files from debian/rules -- Alberto Gonzalez Iniesta <agi@inittab.org> Thu, 22 Jun 2017 13:25:45 +0200 diff --git a/debian/rules b/debian/rules index ad78a94..0f8963f 100755 --- a/debian/rules +++ b/debian/rules @@ -5,7 +5,7 @@ ifeq ($(DEB_HOST_ARCH_OS), kfreebsd) ENV_VARS := IFCONFIG=/sbin/ifconfig ROUTE=/lib/freebsd/route EXTRA_ARGS := else -ENV_VARS := SYSTEMD_ASK_PASSWORD=/bin/systemd-ask-password IFCONFIG=/sbin/ifconfig ROUTE=/sbin/route IPROUTE=/sbin/ip +ENV_VARS := SYSTEMD_ASK_PASSWORD=/bin/systemd-ask-password IFCONFIG=/sbin/ifconfig ROUTE=/sbin/route IPROUTE=/sbin/ip SYSTEMD_UNIT_DIR=/lib/systemd/system TMPFILES_DIR=/etc/tmpfiles.d EXTRA_ARGS := --enable-systemd --enable-iproute2 endif @@ -17,7 +17,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all override_dh_auto_configure: -test -f tests/t_client.sh.not || mv tests/t_client.sh tests/t_client.sh.not - $(ENV_VARS) dh_auto_configure -- $(shell dpkg-buildflags --export=configure) --enable-password-save --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --with-plugindir=\$${prefix}/lib/openvpn --includedir=\$${prefix}/include/openvpn --enable-pkcs11 --enable-x509-alt-username $(EXTRA_ARGS) + $(ENV_VARS) dh_auto_configure -- $(shell dpkg-buildflags --export=configure) --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --includedir=\$${prefix}/include/openvpn --enable-pkcs11 --enable-x509-alt-username $(EXTRA_ARGS) override_dh_auto_build: @@ -52,7 +52,7 @@ override_dh_auto_install: install -m 755 debian/openvpn.if-up.d $(CURDIR)/debian/openvpn/etc/network/if-up.d/openvpn install -m 755 debian/openvpn.if-down.d $(CURDIR)/debian/openvpn/etc/network/if-down.d/openvpn # remove unwanted plugin files - rm -f $(CURDIR)/debian/openvpn/usr/lib/openvpn/*.la + rm -f $(CURDIR)/debian/openvpn/usr/lib/$(DEB_HOST_GNU_TYPE)/openvpn/plugins/*.la # resolvconf script install -m 755 debian/update-resolv-conf $(CURDIR)/debian/openvpn/etc/openvpn/update-resolv-conf # bash completion @@ -65,14 +65,9 @@ override_dh_installexamples: rm -rf $(CURDIR)/debian/openvpn/usr/share/doc/openvpn/sample # remove gitignore file from samples rm -f $(CURDIR)/debian/openvpn/usr/share/doc/openvpn/examples/sample-keys/.gitignore - # clean permissions to make lintian happy - # chmod a-x $(CURDIR)/debian/openvpn/usr/share/doc/openvpn/examples/easy-rsa/2.0/vars - # chmod a-x $(CURDIR)/debian/openvpn/usr/share/doc/openvpn/examples/easy-rsa/2.0/openssl-*.cnf override_dh_installinit: dh_installinit --no-start -- defaults 16 80 - install -m 644 distro/systemd/openvpn-server@.service $(CURDIR)/debian/openvpn/lib/systemd/system - install -m 644 distro/systemd/openvpn-client@.service $(CURDIR)/debian/openvpn/lib/systemd/system override_dh_compress: dh_compress --exclude=.cnf --exclude=pkitool |