[Pkg-vsquare-devel] Bug#745430: closed by Ludovico Gardenghi <garden at debian.org> (Bug#745430: fixed in vde2 2.3.2+r586-1)

[Gabriele Giacone]

Control: reopen -1

Since patch submission, build started autoreconf'ing.
Attached refreshed debdiff.

Thanks for considering,
-- 
G..e
-------------- next part --------------
diff -Nru vde2-2.3.2+r586/debian/changelog vde2-2.3.2+r586/debian/changelog
--- vde2-2.3.2+r586/debian/changelog	2014-10-13 10:15:58.000000000 +0000
+++ vde2-2.3.2+r586/debian/changelog	2014-10-13 10:15:59.000000000 +0000
@@ -1,3 +1,9 @@
+vde2 (2.3.2+r586-2) UNRELEASED; urgency=medium
+
+  * Fix FTBFS on hurd-any (Closes: #745430).
+
+ -- Gabriele Giacone <1o5g4r8o at gmail.com>  Mon, 13 Oct 2014 10:07:28 +0000
+
 vde2 (2.3.2+r586-1) unstable; urgency=medium
 
   * No new upstream version, packaging latest SVN revision.
diff -Nru vde2-2.3.2+r586/debian/patches/compile_with_hurd.patch vde2-2.3.2+r586/debian/patches/compile_with_hurd.patch
--- vde2-2.3.2+r586/debian/patches/compile_with_hurd.patch	2014-10-13 10:15:58.000000000 +0000
+++ vde2-2.3.2+r586/debian/patches/compile_with_hurd.patch	2014-10-13 10:15:59.000000000 +0000
@@ -30,7 +30,7 @@
  /*
   * Return the canonical absolute name of file NAME.  A canonical name does not
   * contain any `.', `..' components nor any repeated path separators ('/') or
-@@ -162,7 +180,7 @@ char *vde_realpath(const char *name, cha
+@@ -159,7 +177,7 @@ char *vde_realpath(const char *name, cha
  				{
  					size_t len;
  
@@ -63,7 +63,7 @@
  #endif
 --- a/src/vde_plug2tap.c
 +++ b/src/vde_plug2tap.c
-@@ -242,6 +242,7 @@ static ssize_t vde_plug2tap_recv(void *o
+@@ -265,6 +265,7 @@ static ssize_t vde_plug2tap_recv(void *o
  
  int main(int argc, char **argv)
  {
@@ -71,7 +71,7 @@
  	static char *sockname=NULL;
  	static char *tapname=NULL;
  	int daemonize=0;
-@@ -392,4 +393,5 @@ int main(int argc, char **argv)
+@@ -417,4 +418,5 @@ int main(int argc, char **argv)
  
  	}
  	return(0);
@@ -79,7 +79,7 @@
  }
 --- a/include/config.h.in
 +++ b/include/config.h.in
-@@ -309,6 +309,9 @@
+@@ -312,6 +312,9 @@
  /* If defined, this is a kFreeBSD system */
  #undef VDE_KFREEBSD
  
@@ -89,22 +89,20 @@
  /* If defined, this is a Linux system */
  #undef VDE_LINUX
  
---- a/configure
-+++ b/configure
-@@ -17062,9 +17062,14 @@ $as_echo "#define VDE_KFREEBSD 1" >>conf
- $as_echo "#define VDE_FREEBSD 1" >>confdefs.h
- 
+--- a/configure.ac
++++ b/configure.ac
+@@ -115,9 +115,12 @@ case "$build_os" in
+   freebsd*)
+     AC_DEFINE([VDE_FREEBSD], 1, [If defined, this is a FreeBSD system])
    ;;
 +  gnu*)
-+
-+$as_echo "#define VDE_GNU 1" >>confdefs.h
-+
++    AC_DEFINE([VDE_GNU], 1, [If defined, this is a Hurd system])
 +  ;;
    *)
--    as_fn_error $? "Unsupported OS: $build_os. At the moment, only Linux, Darwin
--and FreeBSD are supported. Contributions are appreciated! :-)" "$LINENO" 5
-+    as_fn_error $? "Unsupported OS: $build_os. At the moment, only Linux, Darwin,
-+FreeBSD and Hurd are supported. Contributions are appreciated! :-)" "$LINENO" 5
+-    AC_MSG_ERROR([Unsupported OS: $build_os. At the moment, only Linux, Darwin
+-and FreeBSD are supported. Contributions are appreciated! :-)])
++    AC_MSG_ERROR([Unsupported OS: $build_os. At the moment, only Linux, Darwin,
++FreeBSD and Hurd are supported. Contributions are appreciated! :-)])
    ;;
  esac