[pkg-bacula-commits] [bacula] 05/06: updated description of patch to support kfreebsd, added comment in the code

[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 f56a831186f6aa7fa90597d18cce6434caa8634d
Author: Carsten Leonhardt <leo at debian.org>
Date:   Mon Jan 11 02:35:11 2016 +0100

    updated description of patch to support kfreebsd, added comment in the code
---
 debian/patches/add-basic-kfreebsd-support.patch | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/debian/patches/add-basic-kfreebsd-support.patch b/debian/patches/add-basic-kfreebsd-support.patch
index f162ad7..7f6693f 100644
--- a/debian/patches/add-basic-kfreebsd-support.patch
+++ b/debian/patches/add-basic-kfreebsd-support.patch
@@ -1,8 +1,7 @@
-Description: Add basic GNU/kFreeBSD support
- This is still missing support for xattr and acl
+Description: Fix GNU/kFreeBSD support
 Author: Carsten Leonhardt <leo at debian.org>
-Bug: http://bugs.bacula.org/view.php?id=2156
-Last-Update: 2015-12-08
+Bug: http://bugs.bacula.org/view.php?id=2192
+Last-Update: 2016-01-11
 --- a/autoconf/acconfig.h
 +++ b/autoconf/acconfig.h
 @@ -137,6 +137,7 @@
@@ -42,12 +41,13 @@ Last-Update: 2015-12-08
  #undef HAVE_BSDI_OS
 --- a/src/findlib/fstype.c
 +++ b/src/findlib/fstype.c
-@@ -337,7 +337,39 @@
+@@ -337,7 +337,40 @@
  /* Read mtab entries  */
  bool read_mtab(mtab_handler_t *mtab_handler, void *user_ctx)
  { 
 -#ifdef HAVE_GETMNTENT
-+#ifdef HAVE_GETMNTINFO
++/* Debian stretch GNU/KFreeBSD has both getmntinfo and getmntent, but
++   only the first seems to work, so ordering is important here */
 +   struct stat st;
 +#if defined(ST_NOWAIT)
 +   int flags = ST_NOWAIT;
@@ -83,7 +83,7 @@ Last-Update: 2015-12-08
     FILE *mntfp;
     struct stat st;
   
-@@ -389,39 +421,6 @@
+@@ -389,39 +422,6 @@
  #endif
  
  #endif /* HAVE_GETMNTENT */

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