[Pkg-samba-maint] [samba] 01/02: Backport fix for readline 6.3 from master

[Ivo De Decker]

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

ivodd pushed a commit to branch master
in repository samba.

commit 48a9c52caee5925a3ce6c396606d2bf09a01ced2
Author: Ivo De Decker <ivo.dedecker at ugent.be>
Date:   Fri Mar 14 18:47:48 2014 +0100

    Backport fix for readline 6.3 from master
---
 debian/changelog                |  1 +
 debian/patches/readline63.patch | 35 +++++++++++++++++++++++++++++++++++
 debian/patches/series           |  1 +
 3 files changed, 37 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 7dfa1a8..960d700 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ samba (2:4.1.6+dfsg-1) UNRELEASED; urgency=medium
   * New upstream security release. Fixes:
     - CVE-2013-4496: password lockout not enforced for SAMR password changes
     - CVE-2013-6442: smbcacls can remove a file or directory ACL by mistake
+  * Backport fix for readline 6.3 from master
 
  -- Ivo De Decker <ivo.dedecker at ugent.be>  Fri, 14 Mar 2014 17:26:23 +0100
 
diff --git a/debian/patches/readline63.patch b/debian/patches/readline63.patch
new file mode 100644
index 0000000..56a9348
--- /dev/null
+++ b/debian/patches/readline63.patch
@@ -0,0 +1,35 @@
+commit 29d779c7029f89e530994c45ae065707ffd62c43
+Author: Gustavo Zacarias <gustavo at zacarias.com.ar>
+Date:   Thu Mar 6 18:57:40 2014 -0300
+
+    smbreadline: switch to new-style readline typedef
+    
+    Function, CPFunction, CPPFunction and VFunction typedefs are considered
+    old-style (deprecated) starting from readline 4.2 (circa 2001).
+    Compatibility typedefs have been in place up to readline 6.2 but were
+    removed with the 6.3 release thus causing builds to break.
+    Switch to the new-style specific prototyped typedef.
+    
+    Return value is unused so the callback should still be void (see
+    readline/input.c around line 456 in version 6.3).
+    
+    Signed-off-by: Gustavo Zacarias <gustavo at zacarias.com.ar>
+    Reviewed-by: Jeremy Allison <jra at samba.org>
+    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
+    
+    Autobuild-User(master): Jeremy Allison <jra at samba.org>
+    Autobuild-Date(master): Thu Mar 13 00:21:47 CET 2014 on sn-devel-104
+
+diff --git a/libcli/smbreadline/smbreadline.c b/libcli/smbreadline/smbreadline.c
+index cff25a7..80e10b0 100644
+--- a/libcli/smbreadline/smbreadline.c
++++ b/libcli/smbreadline/smbreadline.c
+@@ -141,7 +141,7 @@ char *smb_readline(const char *prompt, void (*callback)(void),
+ 
+ #if HAVE_DECL_RL_EVENT_HOOK
+ 	if (callback)
+-		rl_event_hook = (Function *)callback;
++		rl_event_hook = (rl_hook_func_t *)callback;
+ #endif
+ 	ret = readline(prompt);
+ 	if (ret && *ret)
diff --git a/debian/patches/series b/debian/patches/series
index c8eec44..c276141 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,4 @@ VERSION.patch
 waf_smbpasswd_location
 add-so-version-to-private-libraries
 do-not-install-smbclient4-and-nmbclient4
+readline63.patch

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