[pkg-bacula-commits] [bacula] 04/06: updated patch to support kfreebsd

[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 76a681aa18d0fbb68934c33cb85378d63f8aea43
Author: Carsten Leonhardt <leo at debian.org>
Date:   Mon Jan 11 01:43:01 2016 +0100

    updated patch to support kfreebsd
---
 debian/patches/add-basic-kfreebsd-support.patch | 57 +++----------------------
 1 file changed, 5 insertions(+), 52 deletions(-)

diff --git a/debian/patches/add-basic-kfreebsd-support.patch b/debian/patches/add-basic-kfreebsd-support.patch
index f0b5e75..f162ad7 100644
--- a/debian/patches/add-basic-kfreebsd-support.patch
+++ b/debian/patches/add-basic-kfreebsd-support.patch
@@ -40,49 +40,13 @@ Last-Update: 2015-12-08
  #undef HAVE_NETBSD_OS
  #undef HAVE_OPENBSD_OS
  #undef HAVE_BSDI_OS
---- a/src/filed/backup.c
-+++ b/src/filed/backup.c
-@@ -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__)
-       /**
-        * 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
-@@ -765,7 +765,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
-@@ -103,6 +103,7 @@
-  */
- #if defined(HAVE_DARWIN_OS) \
-    || defined(HAVE_FREEBSD_OS ) \
-+   || defined(HAVE_KFREEBSD_OS ) \
-    || defined(HAVE_OPENBSD_OS)
- 
- #include <sys/param.h>
-@@ -336,8 +337,42 @@
- 
+@@ -337,7 +337,39 @@
  /* Read mtab entries  */
  bool read_mtab(mtab_handler_t *mtab_handler, void *user_ctx)
--{ 
+ { 
 -#ifdef HAVE_GETMNTENT
-+{
-+/* Debian stretch GNU/KFreeBSD has both getmntinfo and getmntent, but
-+   the first works better, so ordering is important here */
 +#ifdef HAVE_GETMNTINFO
 +   struct stat st;
 +#if defined(ST_NOWAIT)
@@ -119,7 +83,7 @@ Last-Update: 2015-12-08
     FILE *mntfp;
     struct stat st;
   
-@@ -389,39 +424,6 @@
+@@ -389,39 +421,6 @@
  #endif
  
  #endif /* HAVE_GETMNTENT */
@@ -153,20 +117,9 @@ Last-Update: 2015-12-08
 -            mntinfo->f_mntonname, mntinfo->f_fstypename, NULL);
 -         mntinfo++;
 -      }
--   }
+-   } 
 -   V(mutex);
 -#endif /* HAVE_GETMNTINFO */
     return true;
  } 
- 
---- a/src/version.h
-+++ b/src/version.h
-@@ -95,7 +95,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
- 
+  

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