[pkg-bacula-commits] [bacula] 01/01: fixed debian/patches/add-basic-kfreebsd-support.patch
Carsten Leonhardt
leo at moszumanska.debian.org
Tue Jan 12 14:37:11 UTC 2016
This is an automated email from the git hooks/post-receive script.
leo pushed a commit to branch experimental
in repository bacula.
commit 899a3c647f9e88d1cd64dc29d7b41a153b663e1a
Author: Carsten Leonhardt <leo at debian.org>
Date: Tue Jan 12 15:36:20 2016 +0100
fixed debian/patches/add-basic-kfreebsd-support.patch
---
debian/patches/add-basic-kfreebsd-support.patch | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/debian/patches/add-basic-kfreebsd-support.patch b/debian/patches/add-basic-kfreebsd-support.patch
index 7f6693f..f3bc479 100644
--- a/debian/patches/add-basic-kfreebsd-support.patch
+++ b/debian/patches/add-basic-kfreebsd-support.patch
@@ -41,13 +41,14 @@ Last-Update: 2016-01-11
#undef HAVE_BSDI_OS
--- a/src/findlib/fstype.c
+++ b/src/findlib/fstype.c
-@@ -337,7 +337,40 @@
+@@ -337,7 +337,41 @@
/* 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
+ only the first seems to work, so ordering is important here */
++#ifdef HAVE_GETMNTINFO
+ struct stat st;
+#if defined(ST_NOWAIT)
+ int flags = ST_NOWAIT;
@@ -83,7 +84,7 @@ Last-Update: 2016-01-11
FILE *mntfp;
struct stat st;
-@@ -389,39 +422,6 @@
+@@ -389,39 +423,6 @@
#endif
#endif /* HAVE_GETMNTENT */
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bacula/bacula.git
More information about the pkg-bacula-commits
mailing list