[Pkg-cyrus-sasl2-commits] [cyrus-sasl2] 01/02: Fix FTBFS with clang (Closes: #739561

[Roberto C. Sanchez]

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

roberto pushed a commit to branch master
in repository cyrus-sasl2.

commit 9bfae846140c41b8c52775c261f9b09e91fc126c
Author: Roberto C. Sanchez <roberto at connexer.com>
Date:   Fri Feb 21 06:36:49 2014 -0500

    Fix FTBFS with clang (Closes: #739561
---
 debian/changelog                          |  1 +
 debian/patches/0046_fix_void_return.patch | 13 +++++++++++++
 debian/patches/series                     |  1 +
 3 files changed, 15 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index aac0246..d80ce72 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ cyrus-sasl2 (2.1.26.dfsg1-9) UNRELEASED; urgency=low
 
   * saslauthd: refuse to start if debug option (-d) is set in options
     passed to init script (Closes: #558014)
+  * Fix FTBFS with clang (Closes: #739561
 
  -- Roberto C. Sanchez <roberto at connexer.com>  Tue, 18 Feb 2014 19:19:21 -0500
 
diff --git a/debian/patches/0046_fix_void_return.patch b/debian/patches/0046_fix_void_return.patch
new file mode 100644
index 0000000..7091304
--- /dev/null
+++ b/debian/patches/0046_fix_void_return.patch
@@ -0,0 +1,13 @@
+Author: Arthur Marble <arthur at info9.net>
+Description: Eliminate return value in a function specified to return void (Closes: #739561)
+--- cyrus-sasl2.git.orig/lib/common.c
++++ cyrus-sasl2.git/lib/common.c
+@@ -841,7 +841,7 @@
+ 
+   if (!free_mutex || free_mutex == 0x1)
+     free_mutex = sasl_MUTEX_ALLOC();
+-  if (!free_mutex) return SASL_FAIL;
++  if (!free_mutex) return;
+ 
+   result = sasl_MUTEX_LOCK(free_mutex);
+   if (result!=SASL_OK) return;
diff --git a/debian/patches/series b/debian/patches/series
index 35158c3..34c9138 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -27,3 +27,4 @@
 0043_types_h.patch
 0044_debug_log_typo_fix.patch
 0045_revert_upstream_soname_bump.patch
+0046_fix_void_return.patch

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