[Pkg-samba-maint] [samba] 02/02: ctdb: Fix detection of gnukfreebsd (Closes: #802621)

[Mathieu Parent]

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

sathieu pushed a commit to branch master
in repository samba.

commit ce41f24a8ad37a85ee86d91fc9e9259b97075c05
Author: Steven Chamberlain <steven at pyro.eu.org>
Date:   Thu Feb 11 02:27:29 2016 +0000

    ctdb: Fix detection of gnukfreebsd (Closes: #802621)
    
    GNU/kFreeBSD's platform name is 'gnukfreebsd', not just 'kfreebsd'.
---
 ctdb/wscript                                       |  2 +-
 .../ctdb-Fix-detection-of-gnukfreebsd.patch        | 34 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/ctdb/wscript b/ctdb/wscript
index 055c853..6e07aed 100755
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -306,7 +306,7 @@ def build(bld):
         CTDB_SYSTEM_SRC = bld.SUBDIR('common', 'system_aix.c')
     elif sys.platform.startswith('freebsd'):
         CTDB_SYSTEM_SRC = bld.SUBDIR('common', 'system_freebsd.c')
-    elif sys.platform == 'kfreebsd':
+    elif sys.platform.startswith('gnukfreebsd'):
         CTDB_SYSTEM_SRC = bld.SUBDIR('common', 'system_kfreebsd.c')
     elif sys.platform == 'gnu':
         CTDB_SYSTEM_SRC = bld.SUBDIR('common', 'system_gnu.c')
diff --git a/debian/patches/ctdb-Fix-detection-of-gnukfreebsd.patch b/debian/patches/ctdb-Fix-detection-of-gnukfreebsd.patch
new file mode 100644
index 0000000..fa6a22b
--- /dev/null
+++ b/debian/patches/ctdb-Fix-detection-of-gnukfreebsd.patch
@@ -0,0 +1,34 @@
+From: Steven Chamberlain <steven at pyro.eu.org>
+Date: Thu, 11 Feb 2016 02:27:29 +0000
+Subject: [PATCH] ctdb: Fix detection of gnukfreebsd
+
+GNU/kFreeBSD's platform name is 'gnukfreebsd', not just 'kfreebsd'.
+
+Reviewed-by: Andrew Bartlett <abartlet at samba.org>
+Reviewed-by: Garming Sam <garming at catalyst.net.nz>
+
+Autobuild-User(master): Garming Sam <garming at samba.org>
+Autobuild-Date(master): Tue Mar  1 05:42:23 CET 2016 on sn-devel-144
+
+Bug: https://github.com/samba-team/samba/pull/55
+Debian-Bug: https://bugs.debian.org/802621
+---
+ ctdb/wscript | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ctdb/wscript b/ctdb/wscript
+index 055c853..6e07aed 100755
+--- a/ctdb/wscript
++++ b/ctdb/wscript
+@@ -306,7 +306,7 @@ def build(bld):
+         CTDB_SYSTEM_SRC = bld.SUBDIR('common', 'system_aix.c')
+     elif sys.platform.startswith('freebsd'):
+         CTDB_SYSTEM_SRC = bld.SUBDIR('common', 'system_freebsd.c')
+-    elif sys.platform == 'kfreebsd':
++    elif sys.platform.startswith('gnukfreebsd'):
+         CTDB_SYSTEM_SRC = bld.SUBDIR('common', 'system_kfreebsd.c')
+     elif sys.platform == 'gnu':
+         CTDB_SYSTEM_SRC = bld.SUBDIR('common', 'system_gnu.c')
+-- 
+2.8.0.rc3
+
diff --git a/debian/patches/series b/debian/patches/series
index 8c53e0a..a56334f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,3 +14,4 @@ heimdal-rfc3454.txt
 Fix-privacy-breach-on-google.com.patch
 fix-cluster-build.diff
 disable-socketwrapper.diff
+ctdb-Fix-detection-of-gnukfreebsd.patch

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