diff options
| author | Alberto Gonzalez Iniesta <agi@inittab.org> | 2011-12-20 07:21:07 +0100 |
|---|---|---|
| committer | Alberto Gonzalez Iniesta <agi@inittab.org> | 2012-02-21 15:53:48 +0100 |
| commit | cce5120ea81fcf7e65d484496a43ad1f61de831a (patch) | |
| tree | 7258bf93021183d9910a293a0a25551d86e48b63 | |
| parent | 3cedd1dd9877a0bae3e69d27c3d1a2fcd98787c0 (diff) | |
Imported Debian patch 2.2.1-2debian/2.2.1-2
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/openvpn.init.d | 4 | ||||
| -rwxr-xr-x | debian/rules | 2 |
3 files changed, 11 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index af5916f..d1d3b2e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +openvpn (2.2.1-2) unstable; urgency=low + + * debian/rules: Force path to 'ip' command so that it's set correctly even + if not present (in the buildd). (Closes: #652702) + * Fix OMIT_SENDSIGS logic on init.d script. (Closes: #652703) + + -- Alberto Gonzalez Iniesta <agi@inittab.org> Tue, 20 Dec 2011 07:21:07 +0100 + openvpn (2.2.1-1) unstable; urgency=low * New upstream release diff --git a/debian/openvpn.init.d b/debian/openvpn.init.d index 2fdf24b..d8e50ae 100644 --- a/debian/openvpn.init.d +++ b/debian/openvpn.init.d @@ -65,12 +65,12 @@ start_vpn () { $DAEMONARG $STATUSARG --cd $CONFIG_DIR \ --config $CONFIG_DIR/$NAME.conf || STATUS=1 - [ "$OMIT_SENDSIGS" -ne 0 ] || ln -s /var/run/openvpn.$NAME.pid /run/sendsigs.omit.d/openvpn.$NAME.pid + [ "$OMIT_SENDSIGS" -ne 1 ] || ln -s /var/run/openvpn.$NAME.pid /run/sendsigs.omit.d/openvpn.$NAME.pid } stop_vpn () { kill `cat $PIDFILE` || true rm -f $PIDFILE - [ "$OMIT_SENDSIGS" -ne 0 ] || rm -f /run/sendsigs.omit.d/openvpn.$NAME.pid + [ "$OMIT_SENDSIGS" -ne 1 ] || rm -f /run/sendsigs.omit.d/openvpn.$NAME.pid rm -f /var/run/openvpn.$NAME.status 2> /dev/null } diff --git a/debian/rules b/debian/rules index 935b9bb..0a19c71 100755 --- a/debian/rules +++ b/debian/rules @@ -39,7 +39,7 @@ endif config.status: $(QUILT_STAMPFN) dh_testdir # Add here commands to configure the package. - ./configure --enable-iproute2 --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)' + ./configure --enable-iproute2 --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-iproute-path=/bin/ip --with-route-path=$(ROUTE_PATH) CFLAGS='$(CFLAGS)' build: build-stamp |