[pkg-bacula-commits] [bacula] 03/03: Patch for KFreeBSD-support has been applied upstream

[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 7f7b5d2da41071344610c31471b2dbc6ac9c572e
Author: Carsten Leonhardt <leo at debian.org>
Date:   Sun Jan 24 13:29:17 2016 +0100

    Patch for KFreeBSD-support has been applied upstream
---
 debian/changelog                                |   2 +-
 debian/patches/add-basic-kfreebsd-support.patch | 126 ------------------------
 debian/patches/series                           |   1 -
 3 files changed, 1 insertion(+), 128 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f166a30..318bf58 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,7 @@ bacula (7.4.0+dfsg-1) experimental; urgency=low
     - patches removed because they are fixed upstream:
        fix-manpage-bconsole8.patch, ppc64el-libtoolize.patch,
        fix-src-tools-make-clean.patch,
-       debian/patches/fix-update-sqlite3-12to14.patch
+       fix-update-sqlite3-12to14.patch, add-basic-kfreebsd-support.patch
   * updated patch to support kfreebsd
   * now compiles on hurd
   * updated debian/copyright
diff --git a/debian/patches/add-basic-kfreebsd-support.patch b/debian/patches/add-basic-kfreebsd-support.patch
deleted file mode 100644
index f3bc479..0000000
--- a/debian/patches/add-basic-kfreebsd-support.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-Description: Fix GNU/kFreeBSD support
-Author: Carsten Leonhardt <leo at debian.org>
-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 @@
- /* 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
-@@ -160,6 +160,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
-@@ -137,6 +137,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/findlib/fstype.c
-+++ b/src/findlib/fstype.c
-@@ -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;
-+#elif defined(MNT_NOWAIT)
-+   int flags = MNT_NOWAIT;
-+#else
-+   int flags = 0;
-+#endif
-+#if defined(HAVE_NETBSD_OS)
-+   struct statvfs *mntinfo;
-+#else
-+   struct statfs *mntinfo;
-+#endif
-+   int nument;
-+
-+   P(mutex);
-+   if ((nument = getmntinfo(&mntinfo, flags)) > 0) {
-+      while (nument-- > 0) {
-+         if (is_rootfs(mntinfo->f_fstypename)) {
-+            continue;
-+         }
-+         if (stat(mntinfo->f_mntonname, &st) < 0) {
-+            continue;
-+         }
-+         mtab_handler(user_ctx, &st, mntinfo->f_mntfromname,
-+            mntinfo->f_mntonname, mntinfo->f_fstypename, NULL);
-+         mntinfo++;
-+      }
-+   }
-+   V(mutex);
-+/* HAVE_GETMNTINFO */
-+#elif defined(HAVE_GETMNTENT)
-    FILE *mntfp;
-    struct stat st;
-  
-@@ -389,39 +423,6 @@
- #endif
- 
- #endif /* HAVE_GETMNTENT */
--
--#ifdef HAVE_GETMNTINFO
--   struct stat st;
--#if defined(ST_NOWAIT)
--   int flags = ST_NOWAIT;
--#elif defined(MNT_NOWAIT)
--   int flags = MNT_NOWAIT;
--#else
--   int flags = 0;
--#endif
--#if defined(HAVE_NETBSD_OS)
--   struct statvfs *mntinfo;
--#else
--   struct statfs *mntinfo;
--#endif
--   int nument;
--
--   P(mutex);
--   if ((nument = getmntinfo(&mntinfo, flags)) > 0) {
--      while (nument-- > 0) {
--         if (is_rootfs(mntinfo->f_fstypename)) {
--            continue;
--         }
--         if (stat(mntinfo->f_mntonname, &st) < 0) {
--            continue;
--         }
--         mtab_handler(user_ctx, &st, mntinfo->f_mntfromname,
--            mntinfo->f_mntonname, mntinfo->f_fstypename, NULL);
--         mntinfo++;
--      }
--   } 
--   V(mutex);
--#endif /* HAVE_GETMNTINFO */
-    return true;
- } 
-  
diff --git a/debian/patches/series b/debian/patches/series
index 9356469..7adedca 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,5 +8,4 @@ fix-libbaccats-rpath.patch
 fix-mysql-libdir.patch
 fix-scriptdir-examples-devices.patch
 fix-systemd-tmpfiles.d-location.patch
-add-basic-kfreebsd-support.patch
 enable-hardening-for-bat.patch

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