Package: vde2 Version: 2.3.2-4.1 Severity: normal Tags: patch pending Dear maintainer,
I've prepared an NMU for vde2 (versioned as 2.3.2-4.2). The diff is attached to this message. The patch fixes a kfreebsd regression introduced on later upload (NMU). Regards. -- Hector Oron
diff -u vde2-2.3.2/debian/changelog vde2-2.3.2/debian/changelog --- vde2-2.3.2/debian/changelog +++ vde2-2.3.2/debian/changelog @@ -1,3 +1,10 @@ +vde2 (2.3.2-4.2) unstable; urgency=medium + + * Non-maintainer upload. + * Fix FTBFS on kfreebsd, regression due to autoreconf run. + + -- Hector Oron <[email protected]> Thu, 18 Sep 2014 15:50:13 +0000 + vde2 (2.3.2-4.1) unstable; urgency=medium * Non-maintainer upload. diff -u vde2-2.3.2/debian/patches/compile_with_kfreebsd.patch vde2-2.3.2/debian/patches/compile_with_kfreebsd.patch --- vde2-2.3.2/debian/patches/compile_with_kfreebsd.patch +++ vde2-2.3.2/debian/patches/compile_with_kfreebsd.patch @@ -1,7 +1,7 @@ Index: vde2-2.3.2/src/vde_l3/vde_buff.h =================================================================== ---- vde2-2.3.2.orig/src/vde_l3/vde_buff.h 2012-01-20 17:00:16.000000000 +0100 -+++ vde2-2.3.2/src/vde_l3/vde_buff.h 2012-01-20 17:00:33.000000000 +0100 +--- vde2-2.3.2.orig/src/vde_l3/vde_buff.h ++++ vde2-2.3.2/src/vde_l3/vde_buff.h @@ -27,6 +27,7 @@ #define PROTO_UDP 17 @@ -10,7 +10,7 @@ struct iphdr { #if BYTE_ORDER == LITTLE_ENDIAN -@@ -47,6 +48,7 @@ +@@ -47,6 +48,7 @@ struct iphdr u_int32_t daddr; /*The options start here. */ }; @@ -18,28 +18,10 @@ #endif struct -Index: vde2-2.3.2/configure -=================================================================== ---- vde2-2.3.2.orig/configure 2012-01-20 17:00:16.000000000 +0100 -+++ vde2-2.3.2/configure 2012-01-20 17:00:33.000000000 +0100 -@@ -17050,6 +17050,13 @@ - - darwin_gcc=yes - ;; -+ kfreebsd*) -+ -+$as_echo "#define VDE_FREEBSD 1" >>confdefs.h -+ -+$as_echo "#define VDE_KFREEBSD 1" >>confdefs.h -+ -+ ;; - freebsd*) - - $as_echo "#define VDE_FREEBSD 1" >>confdefs.h Index: vde2-2.3.2/include/config.h.in =================================================================== ---- vde2-2.3.2.orig/include/config.h.in 2012-01-20 17:00:16.000000000 +0100 -+++ vde2-2.3.2/include/config.h.in 2012-01-20 17:00:33.000000000 +0100 +--- vde2-2.3.2.orig/include/config.h.in ++++ vde2-2.3.2/include/config.h.in @@ -303,9 +303,12 @@ /* If defined, this is a Darwin system */ #undef VDE_DARWIN @@ -56,8 +38,8 @@ Index: vde2-2.3.2/src/vde_pcapplug.c =================================================================== ---- vde2-2.3.2.orig/src/vde_pcapplug.c 2012-01-20 17:00:16.000000000 +0100 -+++ vde2-2.3.2/src/vde_pcapplug.c 2012-01-20 17:06:24.000000000 +0100 +--- vde2-2.3.2.orig/src/vde_pcapplug.c ++++ vde2-2.3.2/src/vde_pcapplug.c @@ -23,6 +23,10 @@ #include <syslog.h> #include <errno.h> @@ -79,0 +62,24 @@ +Index: vde2-2.3.2/configure.ac +=================================================================== +--- vde2-2.3.2.orig/configure.ac ++++ vde2-2.3.2/configure.ac +@@ -97,6 +97,10 @@ case "$build_os" in + AC_DEFINE([VDE_DARWIN], 1, [If defined, this is a Darwin system]) + darwin_gcc=yes + ;; ++ kfreebsd*) ++ AC_DEFINE([VDE_FREEBSD], 1, [If defined, this is a FreeBSD system]) ++ AC_DEFINE([VDE_KFREEBSD], 1, [If defined, this is a kFreeBSD system]) ++ ;; + freebsd*) + AC_DEFINE([VDE_FREEBSD], 1, [If defined, this is a FreeBSD system]) + ;; +@@ -162,7 +166,7 @@ configuration does work...]) + http://tuntaposx.sourceforge.net/]) + fi + ;; +- freebsd*) ++ kfreebsd*|freebsd*) + AC_CHECK_HEADER([net/if_tun.h], + [AC_DEFINE([HAVE_TUNTAP], 1, [If defined, tuntap support is compiled in])], + [warn_tuntap=yes])
signature.asc
Description: Digital signature
