[pkg-bacula-commits] [bacula] 15/16: Add basic support for GNU/kFreeBSD, still missing xattr and acl submitted to upstream as 2156

[Carsten Leonhardt]

This is an automated email from the git hooks/post-receive script.

leo pushed a commit to branch bacula-fd5.2
in repository bacula.

commit bf9780d59318aa5d5e6ee765189452ece98d3f2e
Author: Carsten Leonhardt <leo at debian.org>
Date:   Wed Jul 29 20:13:10 2015 +0200

    Add basic support for GNU/kFreeBSD, still missing xattr and acl
    submitted to upstream as 2156
---
 debian/patches/add-basic-kfreebsd-support.patch | 95 +++++++++++++++++++++++++
 debian/patches/series                           |  1 +
 2 files changed, 96 insertions(+)

diff --git a/debian/patches/add-basic-kfreebsd-support.patch b/debian/patches/add-basic-kfreebsd-support.patch
new file mode 100644
index 0000000..7850d43
--- /dev/null
+++ b/debian/patches/add-basic-kfreebsd-support.patch
@@ -0,0 +1,95 @@
+Description: Add basic GNU/kFreeBSD support
+ This is still missing support for xattr and acl
+Author: Carsten Leonhardt <leo at debian.org>
+Bug: http://bugs.bacula.org/view.php?id=2156
+Last-Update: 2015-07-29
+--- a/autoconf/acconfig.h
++++ b/autoconf/acconfig.h
+@@ -132,6 +132,7 @@
+ /* OSes */
+ #undef HAVE_LINUX_OS
+ #undef HAVE_FREEBSD_OS
++#undef HAVE_KFREEBSD_OS
+ #undef HAVE_NETBSD_OS
+ #undef HAVE_OPENBSD_OS
+ #undef HAVE_BSDI_OS
+--- a/autoconf/bacula-macros/os.m4
++++ b/autoconf/bacula-macros/os.m4
+@@ -157,6 +157,14 @@
+ else
+     AM_CONDITIONAL(HAVE_DARWIN_OS, $FALSEPRG)
+ fi
++
++if test $HAVE_UNAME=yes -a x`uname -s` = xGNU/kFreeBSD
++then
++    AM_CONDITIONAL(HAVE_KFREEBSD_OS, $TRUEPRG)
++    AC_DEFINE(HAVE_KFREEBSD_OS)
++else
++    AM_CONDITIONAL(HAVE_KFREEBSD_OS, $FALSEPRG)
++fi
+ ])
+ 
+ AC_DEFUN([BA_CHECK_OPSYS_DISTNAME],
+--- a/autoconf/config.h.in
++++ b/autoconf/config.h.in
+@@ -132,6 +132,7 @@
+ /* OSes */
+ #undef HAVE_LINUX_OS
+ #undef HAVE_FREEBSD_OS
++#undef HAVE_KFREEBSD_OS
+ #undef HAVE_NETBSD_OS
+ #undef HAVE_OPENBSD_OS
+ #undef HAVE_BSDI_OS
+--- a/src/filed/backup.c
++++ b/src/filed/backup.c
+@@ -1011,7 +1011,8 @@
+    if ((ff_pkt->flags & FO_SPARSE) || (ff_pkt->flags & FO_OFFSETS)) {
+       rbuf += OFFSET_FADDR_SIZE;
+       rsize -= OFFSET_FADDR_SIZE;
+-#ifdef HAVE_FREEBSD_OS
++#if defined(HAVE_FREEBSD_OS) || \
++    defined(__FreeBSD_kernel__)
+       /**
+        * To read FreeBSD partitions, the read size must be
+        *  a multiple of 512.
+--- a/src/findlib/find_one.c
++++ b/src/findlib/find_one.c
+@@ -752,7 +752,8 @@
+     *  a block device, we do a raw backup of it or if it is
+     *  a fifo, we simply read it.
+     */
+-#ifdef HAVE_FREEBSD_OS
++#if defined(HAVE_FREEBSD_OS) || \
++    defined(__FreeBSD_kernel__)
+    /*
+     * On FreeBSD, all block devices are character devices, so
+     *   to be able to read a raw disk, we need the check for
+--- a/src/findlib/fstype.c
++++ b/src/findlib/fstype.c
+@@ -35,6 +35,7 @@
+ #define SUPPORTEDOSES \
+    "HAVE_DARWIN_OS\n" \
+    "HAVE_FREEBSD_OS\n" \
++   "HAVE_KFREEBSD_OS\n" \
+    "HAVE_HPUX_OS\n" \
+    "HAVE_IRIX_OS\n" \
+    "HAVE_LINUX_OS\n" \
+@@ -59,6 +60,7 @@
+  */
+ #if defined(HAVE_DARWIN_OS) || \
+     defined(HAVE_FREEBSD_OS) || \
++    defined(HAVE_KFREEBSD_OS) || \
+     defined(HAVE_OPENBSD_OS)
+ 
+ #include <sys/param.h>
+--- a/src/version.h
++++ b/src/version.h
+@@ -93,7 +93,7 @@
+  */
+ /* #define USE_LOCKMGR_SAFEKILL */
+ 
+-#if !HAVE_LINUX_OS && !HAVE_SUN_OS && !HAVE_DARWIN_OS && !HAVE_FREEBSD_OS
++#if !HAVE_LINUX_OS && !HAVE_SUN_OS && !HAVE_DARWIN_OS && !HAVE_FREEBSD_OS && !HAVE_KFREEBSD_OS
+ # undef _USE_LOCKMGR
+ #endif
+ 
diff --git a/debian/patches/series b/debian/patches/series
index e7740c5..1e01185 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ fix-scriptdir-examples-devices.patch
 ppc64el-libtoolize.patch
 fix-src-tools-make-clean.patch
 fix-systemd-tmpfiles.d-location.patch
+add-basic-kfreebsd-support.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bacula/bacula.git