[pkg-bacula-commits] [bacula] 13/17: refreshed debian/patches/add-basic-kfreebsd-support.patch

[Carsten Leonhardt]

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

leo pushed a commit to branch experimental
in repository bacula.

commit 070421d062e8e4c3071995ecf35cbe397b721ffb
Author: Carsten Leonhardt <leo at debian.org>
Date:   Tue Dec 8 14:48:58 2015 +0100

    refreshed debian/patches/add-basic-kfreebsd-support.patch
---
 debian/patches/add-basic-kfreebsd-support.patch | 42 ++++++++++---------------
 1 file changed, 17 insertions(+), 25 deletions(-)

diff --git a/debian/patches/add-basic-kfreebsd-support.patch b/debian/patches/add-basic-kfreebsd-support.patch
index 7850d43..f642182 100644
--- a/debian/patches/add-basic-kfreebsd-support.patch
+++ b/debian/patches/add-basic-kfreebsd-support.patch
@@ -2,10 +2,10 @@ 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
+Last-Update: 2015-12-08
 --- a/autoconf/acconfig.h
 +++ b/autoconf/acconfig.h
-@@ -132,6 +132,7 @@
+@@ -137,6 +137,7 @@
  /* OSes */
  #undef HAVE_LINUX_OS
  #undef HAVE_FREEBSD_OS
@@ -15,7 +15,7 @@ Last-Update: 2015-07-29
  #undef HAVE_BSDI_OS
 --- a/autoconf/bacula-macros/os.m4
 +++ b/autoconf/bacula-macros/os.m4
-@@ -157,6 +157,14 @@
+@@ -160,6 +160,14 @@
  else
      AM_CONDITIONAL(HAVE_DARWIN_OS, $FALSEPRG)
  fi
@@ -32,7 +32,7 @@ Last-Update: 2015-07-29
  AC_DEFUN([BA_CHECK_OPSYS_DISTNAME],
 --- a/autoconf/config.h.in
 +++ b/autoconf/config.h.in
-@@ -132,6 +132,7 @@
+@@ -137,6 +137,7 @@
  /* OSes */
  #undef HAVE_LINUX_OS
  #undef HAVE_FREEBSD_OS
@@ -42,19 +42,19 @@ Last-Update: 2015-07-29
  #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;
+@@ -629,7 +629,8 @@
+    if ((bctx.ff_pkt->flags & FO_SPARSE) || (bctx.ff_pkt->flags & FO_OFFSETS)) {
+       bctx.rbuf += OFFSET_FADDR_SIZE;
+       bctx.rsize -= OFFSET_FADDR_SIZE;
 -#ifdef HAVE_FREEBSD_OS
-+#if defined(HAVE_FREEBSD_OS) || \
-+    defined(__FreeBSD_kernel__)
++#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 @@
+@@ -765,7 +765,8 @@
      *  a block device, we do a raw backup of it or if it is
      *  a fifo, we simply read it.
      */
@@ -66,25 +66,17 @@ Last-Update: 2015-07-29
      *   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 @@
+@@ -103,6 +103,7 @@
   */
- #if defined(HAVE_DARWIN_OS) || \
-     defined(HAVE_FREEBSD_OS) || \
-+    defined(HAVE_KFREEBSD_OS) || \
-     defined(HAVE_OPENBSD_OS)
+ #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 @@
+@@ -95,7 +95,7 @@
   */
  /* #define USE_LOCKMGR_SAFEKILL */
  

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