summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorAlberto Gonzalez Iniesta <agi@inittab.org>2012-11-06 13:05:23 +0100
committerAlberto Gonzalez Iniesta <agi@inittab.org>2013-01-10 17:55:36 +0100
commitd44c69f98c6e28d6eda945a46161dca8823896ad (patch)
treefc2bcd2137431bcd3544cb5fa5276f4ec67fc903 /debian
parent75222d7ed84a6a763d10b30ed5f4b4b4580dcc57 (diff)
More 2.3 adjustments
Diffstat (limited to 'debian')
-rw-r--r--debian/NEWS4
-rw-r--r--debian/TODO1
-rw-r--r--debian/changelog2
-rwxr-xr-xdebian/rules13
4 files changed, 7 insertions, 13 deletions
diff --git a/debian/NEWS b/debian/NEWS
index bbf0054..493b7f2 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,6 +1,6 @@
openvpn (2.1~rc15-1) unstable; urgency=low
- * The openvpn utility changed its handling of pkcs11 certificates when it
+ The openvpn utility changed its handling of pkcs11 certificates when it
switched from built-in code to the pkcs11-helper library (package
libpkcs11-helper1 on Debian). This means that you will have to update your
openvpn configuration files if you are using such certificates. For
@@ -52,7 +52,7 @@ openvpn (2.1~rc15-1) unstable; urgency=low
openvpn (2.1~rc9-3) unstable; urgency=low
- * Calling of external commands/scripts
+ Calling of external commands/scripts
Starting with version 2.1~rc9, openvpn has a new option to control the
ability to execute external commands (--script-security).
diff --git a/debian/TODO b/debian/TODO
deleted file mode 100644
index dbabcd4..0000000
--- a/debian/TODO
+++ /dev/null
@@ -1 +0,0 @@
-Apply use-dpkg-buildflags.patch to 2.3
diff --git a/debian/changelog b/debian/changelog
index 64bc2a3..228272a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-openvpn (2.3~rc1-9) experimental; urgency=low
+openvpn (2.3~rc1-1) experimental; urgency=low
* Upload to experimental
diff --git a/debian/rules b/debian/rules
index f8b271c..0a2fc75 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
dh $@
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)
+ 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) --with-plugindir=\$${prefix}/lib/openvpn --includedir=\$${prefix}/include/openvpn --sampledir=\$${prefix}/share/doc/openvpn/examples
override_dh_auto_build:
@@ -45,16 +45,11 @@ override_dh_clean:
override_dh_auto_install:
dh_auto_install
- # install -m 755 sample/sample-scripts/verify-cn $(CURDIR)/debian/openvpn/usr/share/openvpn
+ install -m 755 sample/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
- # #install plugins
- # install -m 644 plugin/auth-pam/openvpn-auth-pam.so $(CURDIR)/debian/openvpn/usr/lib/openvpn
- # install -m 644 plugin/down-root/openvpn-down-root.so $(CURDIR)/debian/openvpn/usr/lib/openvpn
- # install -m 644 plugin/auth-pam/README $(CURDIR)/debian/openvpn/usr/share/doc/openvpn/README.auth-pam
- # install -m 644 plugin/down-root/README $(CURDIR)/debian/openvpn/usr/share/doc/openvpn/README.down-root
- # # intall plugin headers
- # install -m 644 openvpn-plugin.h $(CURDIR)/debian/openvpn/usr/include/openvpn/openvpn-plugin.h
+ # remove unwanted plugin files
+ rm -f $(CURDIR)/debian/openvpn/usr/lib/openvpn/*.la
# resolvconf script
install -m 755 debian/update-resolv-conf $(CURDIR)/debian/openvpn/etc/openvpn/update-resolv-conf
# bash completion