[Pkg-openldap-devel] [openldap] 01/01: Fix FTBFS on kfreebsd (#845394)

[Ryan Tandy]

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

rtandy-guest pushed a commit to branch master
in repository openldap.

commit 18394424a15a5f5b823065390d45b734b5ecc462
Author: Ryan Tandy <ryan at nardis.ca>
Date:   Wed Dec 28 10:59:26 2016 -0800

    Fix FTBFS on kfreebsd (#845394)
---
 debian/changelog                                   |  6 +++++
 debian/patches/ITS-8554-kFreeBSD-is-like-BSD.patch | 26 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 33 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index bb3d927..882873c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+openldap (2.4.44+dfsg-3) UNRELEASED; urgency=medium
+
+  * Apply upstream patch to fix FTBFS on kFreeBSD. (Closes: #845394)
+
+ -- Ryan Tandy <ryan at nardis.ca>  Wed, 28 Dec 2016 10:58:31 -0800
+
 openldap (2.4.44+dfsg-2) unstable; urgency=medium
 
   [ Ryan Tandy ]
diff --git a/debian/patches/ITS-8554-kFreeBSD-is-like-BSD.patch b/debian/patches/ITS-8554-kFreeBSD-is-like-BSD.patch
new file mode 100644
index 0000000..b127e1c
--- /dev/null
+++ b/debian/patches/ITS-8554-kFreeBSD-is-like-BSD.patch
@@ -0,0 +1,26 @@
+From 74d64d0eb245ce07383abcd444c23e7438e8a083 Mon Sep 17 00:00:00 2001
+From: Howard Chu <hyc at openldap.org>
+Date: Wed, 28 Dec 2016 18:32:14 +0000
+Subject: [PATCH] ITS#8554 kFreeBSD is like BSD
+
+Doesn't have POSIX robust mutexes - GNU userland on BSD kernel
+---
+ libraries/liblmdb/mdb.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c
+index 7a181d4..23c1f00 100644
+--- a/libraries/liblmdb/mdb.c
++++ b/libraries/liblmdb/mdb.c
+@@ -120,7 +120,7 @@ typedef SSIZE_T	ssize_t;
+ #include <resolv.h>	/* defines BYTE_ORDER on HPUX and Solaris */
+ #endif
+ 
+-#if defined(__APPLE__) || defined (BSD)
++#if defined(__APPLE__) || defined (BSD) || defined(__FreeBSD_kernel__)
+ # define MDB_USE_POSIX_SEM	1
+ # define MDB_FDATASYNC		fsync
+ #elif defined(ANDROID)
+-- 
+2.1.4
+
diff --git a/debian/patches/series b/debian/patches/series
index 49adda9..68f6fac 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -23,3 +23,4 @@ switch-to-lt_dlopenadvise-to-get-RTLD_GLOBAL-set.diff
 no-bdb-ABI-second-guessing
 ITS6035-olcauthzregex-needs-restart.patch
 set-maintainer-name
+ITS-8554-kFreeBSD-is-like-BSD.patch

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