Re: Bug#646221: Uploading openvpn to stable
On Mon, Feb 20, 2012 at 02:59:07PM +0100, Cyril Brulebois wrote:
> Hi!
>
> Alberto Gonzalez Iniesta <agi@inittab.org> (20/02/2012):
> > I'd like to upload openvpn to stable in order to fix #646221. This bug
> > makes the package almost nonfunctional in kfreebsd archs. The patch (in
> > the bug report) is trivial and it's been already tested in sid and
> > wheezy.
>
> I like the sound of trivial and tested in sid+wheezy; please send us a
> source debdiff against the version in stable, so that we can review it.
Sure, find it attached.
Thanks,
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 14:28:50.000000000 +0000
@@ -1,3 +1,10 @@
+openvpn (2.1.3-3) 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 14:29:56.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_BUILD_ARCH_OS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
CFLAGS:=-g
@@ -28,10 +29,17 @@
INSTALL_PROGRAM += -s
endif
+ifeq ($(DEB_BUILD_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: