diff options
| -rw-r--r-- | debian/changelog | 11 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/default | 2 | ||||
| -rwxr-xr-x | debian/rules | 114 |
4 files changed, 36 insertions, 93 deletions
diff --git a/debian/changelog b/debian/changelog index 572fa90..ca675a3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +openvpn (2.2.1-4) unstable; urgency=low + + * Use dpkg-buildflags to fill CFLAGS in ./configure. (Closes: #655130) + * debian/rules: Moved to dh. + * debian/rules: Changed DEB_BUILD_ARCH_OS with DEB_HOST_ARCH_OS. + * Removed quilt Build-Depends. + * debian/openvpn.default: Clarify what "vpn name" refers to. + (Closes: #657610) + + -- Alberto Gonzalez Iniesta <agi@inittab.org> Wed, 08 Feb 2012 16:31:32 +0100 + openvpn (2.2.1-3) unstable; urgency=low * The iproute fiasco release. diff --git a/debian/control b/debian/control index 385801f..9895e2b 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: openvpn Section: net Priority: optional Maintainer: Alberto Gonzalez Iniesta <agi@inittab.org> -Build-Depends: debhelper (>= 7), libssl-dev (>> 0.9.8g-9), liblzo2-dev, libpam0g-dev, quilt, libpkcs11-helper1-dev +Build-Depends: debhelper (>= 7.0.50~), libssl-dev (>> 0.9.8g-9), liblzo2-dev, libpam0g-dev, libpkcs11-helper1-dev Standards-Version: 3.9.2 Homepage: http://www.openvpn.net/ diff --git a/debian/default b/debian/default index 21b355d..d601933 100644 --- a/debian/default +++ b/debian/default @@ -4,6 +4,8 @@ # Start only these VPNs automatically via init script. # Allowed values are "all", "none" or space separated list of # names of the VPNs. If empty, "all" is assumed. +# The VPN name refers to the VPN configutation file name. +# i.e. "home" would be /etc/openvpn/home.conf # #AUTOSTART="all" #AUTOSTART="none" diff --git a/debian/rules b/debian/rules index 38c3f68..7e8167c 100755 --- a/debian/rules +++ b/debian/rules @@ -1,81 +1,38 @@ #!/usr/bin/make -f -# Sample debian/rules that uses debhelper. -# GNU copyright 1997 to 1999 by Joey Hess. -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -include /usr/share/quilt/quilt.make - - -# These are used for cross-compiling and for saving the configure script -# from having to guess our platform (since we know it already) -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS) - -CFLAGS:=-g - -ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif -ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) - NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) - MAKEFLAGS += -j$(NUMJOBS) -endif -ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) - INSTALL_PROGRAM += -s -endif - -ifeq ($(DEB_BUILD_ARCH_OS), kfreebsd) +ifeq ($(DEB_HOST_ARCH_OS), kfreebsd) # Avoid the /sbin/route wrapper which doesn't provide FreeBSD CLI as expected ROUTE_PATH := /lib/freebsd/route else ROUTE_PATH := /sbin/route endif -config.status: $(QUILT_STAMPFN) - dh_testdir - # Add here commands to configure the package. - ./configure --enable-pthread --enable-password-save --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --with-ifconfig-path=/sbin/ifconfig --with-route-path=$(ROUTE_PATH) CFLAGS='$(CFLAGS)' +#export DH_VERBOSE=1 + +%: + dh $@ -build: build-stamp +override_dh_auto_configure: + 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-ifconfig-path=/sbin/ifconfig --with-route-path=$(ROUTE_PATH) -build-stamp: config.status - dh_testdir - # Add here commands to compile the package. - $(MAKE) - #make plugins +override_dh_auto_build: + dh_auto_build + # make plugins $(MAKE) -C plugin/auth-pam/ $(MAKE) -C plugin/down-root/ - touch build-stamp - -clean: unpatch - dh_testdir - dh_testroot - rm -f build-stamp - - # Add here commands to clean up after the build process. - [ ! -f Makefile ] || $(MAKE) distclean +# we may not want to run dh_auto_test +#override_dh_auto_test: - #clean plugins +override_dh_auto_clean: + dh_auto_clean + # clean plugins $(MAKE) -C plugin/auth-pam/ clean $(MAKE) -C plugin/down-root/ clean - dh_clean - -install: build - dh_testdir - dh_testroot - dh_prep - dh_installdirs - - # Add here commands to install the package into debian/openvpn - $(MAKE) install prefix=$(CURDIR)/debian/openvpn/usr +override_dh_auto_install: + dh_auto_install install -m 755 sample-scripts/verify-cn $(CURDIR)/debian/openvpn/usr/share/openvpn 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 @@ -91,44 +48,17 @@ install: build # bash completion install -m 644 debian/openvpn.bash_completion $(CURDIR)/debian/openvpn/etc/bash_completion.d/openvpn -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot - dh_installdebconf - dh_installdocs +override_dh_installexamples: dh_installexamples ## remove windoze stuff rm -rf $(CURDIR)/debian/openvpn/usr/share/doc/openvpn/examples/easy-rsa/Windows # 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 - dh_installmenu -# dh_installlogrotate -# dh_installemacsen -# dh_installpam -# dh_installmime + +override_dh_installinit: dh_installinit --no-start -- defaults 16 80 - dh_installcron - dh_installman - dh_installinfo -# dh_undocumented - dh_installchangelogs ChangeLog - dh_link - dh_strip + +override_dh_compress: dh_compress --exclude=.cnf --exclude=pkitool - dh_fixperms -# dh_makeshlibs - dh_installdeb -# dh_perl - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install |