patches from Gonéri for KFreeBSD support

diff --git a/debian/changelog b/debian/changelog
index de41c40b198cc2a53d61de83caa14654ca4f6485..18f11302240a382b8cebccb3a293fedc0c26571b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+bup (0.25~git2011.11.04-3) unstable; urgency=low
+
+  * Add two patches from Gonéri Le Bouder to fix building
+    on KFreeBSD. Boy, we have a lot of build failures.
+    Thanks Gonéri! Closes: #651104.
+
+ -- Jon Dowland <jmtd@debian.org>  Wed, 11 Jan 2012 21:34:48 +0000
+
 bup (0.25~git2011.11.04-2) unstable; urgency=low
 
   * Add bloom-unaligned-bufs to the series file. Oops!

diff --git a/debian/patches/0001-drop-the-from-the-OSNAME.patch b/debian/patches/0001-drop-the-from-the-OSNAME.patch
new file mode 100644 (file)
index 0000000..dcbfee7
--- /dev/null
+++ b/debian/patches/0001-drop-the-from-the-OSNAME.patch
@@ -0,0 +1,34 @@
+From 36ffb8b9d426f68267e9f1fabe41f3bd8d5dcb46 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Gon=C3=A9ri=20Le=20Bouder?= <goneri@rulezlan.org>
+Date: Sat, 31 Dec 2011 15:33:42 +0100
+Subject: [PATCH] drop the / from the OSNAME
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+on GNU kFreeBSD, uname -s returns "GNU/kFreeBSD", the / is not
+accepted a macro and the build fails with -Werror
+
+../../config/config.h:9:15: error: missing whitespace after the macro name [-Werror]
+
+Signed-off-by: Gonéri Le Bouder <goneri@rulezlan.org>
+---
+ config/configure.inc |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/config/configure.inc b/config/configure.inc
+index 2bafea0..0a1b4c0 100644
+--- a/config/configure.inc
++++ b/config/configure.inc
+@@ -653,7 +653,7 @@ EOF
+     AC_PROG_CPP
+     AC_PROG_INSTALL
+ 
+-    ac_os=`uname -s | sed 's/[-_].*//'`
++    ac_os=`uname -s | sed 's/[-_].*//' | sed 's,/,,'`
+     _os=`echo $ac_os | tr '[a-z]' '[A-Z]'`
+     AC_DEFINE OS_$_os 1
+     eval OS_${_os}=1
+-- 
+1.7.7.3
+

diff --git a/debian/patches/0001-ignore-utimensat-on-GNU-kFreeBSD.patch b/debian/patches/0001-ignore-utimensat-on-GNU-kFreeBSD.patch
new file mode 100644 (file)
index 0000000..ebb1005
--- /dev/null
+++ b/debian/patches/0001-ignore-utimensat-on-GNU-kFreeBSD.patch
@@ -0,0 +1,36 @@
+From 28098606f545c3904afdc6ef2c0994199de7dca7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Gon=C3=A9ri=20Le=20Bouder?= <goneri@rulezlan.org>
+Date: Sat, 31 Dec 2011 16:14:27 +0100
+Subject: [PATCH] ignore utimensat on GNU/kFreeBSD
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+See: http://bugs.debian.org/651104
+See: http://lists.debian.org/debian-bsd/2011/03/msg00063.html
+
+Signed-off-by: Gonéri Le Bouder <goneri@rulezlan.org>
+---
+ config/configure |    6 +++++-
+ 1 files changed, 5 insertions(+), 1 deletions(-)
+
+diff --git a/config/configure b/config/configure
+index 8841fff..a1272c3 100755
+--- a/config/configure
++++ b/config/configure
+@@ -59,7 +59,11 @@ AC_CHECK_HEADERS unistd.h
+ AC_CHECK_HEADERS linux/fs.h
+ AC_CHECK_HEADERS sys/ioctl.h
+ 
+-AC_CHECK_FUNCS utimensat 
++# on GNU/kFreeBSD utimensat is defined in the GNU libc
++# but won't work
++if [ -z "$OS_GNUKFREEBSD" ]; then
++   AC_CHECK_FUNCS utimensat
++fi
+ AC_CHECK_FUNCS utimes
+ AC_CHECK_FUNCS lutimes
+ 
+-- 
+1.7.7.3
+

diff --git a/debian/patches/series b/debian/patches/series
index 889877c33beb29d7b5f7cae1e566257304399889..50ccf40517bf74f473dcddd9e25c715e191e1daa 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,5 @@
+0001-drop-the-from-the-OSNAME.patch
+0001-ignore-utimensat-on-GNU-kFreeBSD.patch
 bloom-unaligned-bufs
 mangle-version
 excise-tornado