Re: Bug#646221: Uploading openvpn to stable
On Mon, Feb 20, 2012 at 04:23:15PM +0100, Cyril Brulebois wrote:
> Alberto Gonzalez Iniesta <agi@inittab.org> (20/02/2012):
> > Sure, find it attached.
>
> Looks good to me. One remark though: 2.1.3-2+squeeze1 would be more
> customary, so please use that instead. You might want to wait for a
> confirmation from Adam, but I think you can upload once the version
> number is fixed.
Right. It's been a long time since I did the last upload to stable.
Fixed now. Attaching new debdiff.
> (I thought we ought to be using DEB_HOST_ARCH_OS for that?
Fixed that too. Thanks Cyril and Julien.
I'll wait for the final OK before uploading.
Alberto
--
Alberto Gonzalez Iniesta | Formación, consultoría y soporte técnico
agi@(inittab.org|debian.org)| en GNU/Linux y software libre
Encrypted mail preferred | http://inittab.com
Key fingerprint = 9782 04E7 2B75 405C F5E9 0C81 C514 AF8E 4BA4 01C3
diff -Nru openvpn-2.1.3/debian/changelog openvpn-2.1.3/debian/changelog
--- openvpn-2.1.3/debian/changelog 2010-10-21 10:23:02.000000000 +0000
+++ openvpn-2.1.3/debian/changelog 2012-02-20 17:33:19.000000000 +0000
@@ -1,3 +1,10 @@
+openvpn (2.1.3-2+squeeze1) stable; urgency=low
+
+ * Applied Robert Millan's patch to fix /sbin/route calls on kfreebsd.
+ (Closes: #646221)
+
+ -- Alberto Gonzalez Iniesta <agi@inittab.org> Mon, 20 Feb 2012 12:20:12 +0100
+
openvpn (2.1.3-2) unstable; urgency=low
* Applied upstream patch to solve random routes added when using
diff -Nru openvpn-2.1.3/debian/rules openvpn-2.1.3/debian/rules
--- openvpn-2.1.3/debian/rules 2010-09-29 14:44:56.000000000 +0000
+++ openvpn-2.1.3/debian/rules 2012-02-20 17:35:16.000000000 +0000
@@ -12,6 +12,7 @@
# 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_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
CFLAGS:=-g
@@ -28,10 +29,17 @@
INSTALL_PROGRAM += -s
endif
+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=/sbin/route CFLAGS='$(CFLAGS)'
+ ./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)'
build: build-stamp
Reply to: