commit 7645ba9928782c2c49b2d7e877486613dc128412
Author: Jakub Bogusz <qbo...@pld-linux.org>
Date: Wed Mar 12 21:50:40 2014 +0100
- updated to 4.1.6 (fixes CVE-2013-4496 CVE-2013-6442)
- added readline patch (fixes build with readline 6.3)
samba-readline.patch | 11 +++++++++++
samba.spec | 16 +++++++++-------
2 files changed, 20 insertions(+), 7 deletions(-)
---
diff --git a/samba.spec b/samba.spec
index 452b93c..ce69b1b 100644
--- a/samba.spec
+++ b/samba.spec
@@ -21,13 +21,13 @@
Summary: Samba Active Directory and SMB server
Summary(pl.UTF-8): Serwer Samba Active Directory i SMB
Name: samba
-Version: 4.1.4
-Release: 4
+Version: 4.1.6
+Release: 1
Epoch: 1
License: GPL v3
Group: Networking/Daemons
Source0: http://www.samba.org/samba/ftp/stable/samba-%{version}.tar.gz
-# Source0-md5: c7871012ac40b8c74afff42bbd873bd7
+# Source0-md5: 9dc64658c0cc81e7637f9b975c19638c
Source1: smb.init
Source2: samba.pamd
Source4: samba.sysconfig
@@ -39,12 +39,13 @@ Source9: samba.init
Source10:
https://github.com/downloads/fumiyas/samba-virusfilter/samba-virusfilter-%{virusfilter_version}.tar.bz2
# Source10-md5: a3a30d5fbf309d356e8c5833db680c17
Patch0: system-heimdal.patch
-Patch1: samba-c++-nofail.patch
-Patch2: samba-lprng-no-dot-printers.patch
+Patch1: %{name}-c++-nofail.patch
+Patch2: %{name}-lprng-no-dot-printers.patch
Patch3: systemd-pid-dir.patch
Patch4: unicodePwd-nthash-values-over-LDAP.patch
Patch5: link.patch
Patch6: server-role.patch
+Patch7: %{name}-readline.patch
URL: http://www.samba.org/
BuildRequires: acl-devel
%{?with_avahi:BuildRequires: avahi-devel}
@@ -495,9 +496,10 @@ Ten pakiet zawiera schemat Samby (samba.schema) dla
OpenLDAP-a.
%patch4 -p1
%patch5 -p1
%patch6 -p1
+%patch7 -p1
-sed -i -e 's|#!/usr/bin/env python|#!/usr/bin/python|'
source4/scripting/bin/samba*
-sed -i -e 's|#!/usr/bin/env perl|#!/usr/bin/perl|' pidl/pidl
+%{__sed} -i -e 's|#!/usr/bin/env python|#!/usr/bin/python|'
source4/scripting/bin/samba*
+%{__sed} -i -e 's|#!/usr/bin/env perl|#!/usr/bin/perl|' pidl/pidl
%build
LDFLAGS="${LDFLAGS:-%rpmldflags}" \
diff --git a/samba-readline.patch b/samba-readline.patch
new file mode 100644
index 0000000..7cdedc3
--- /dev/null
+++ b/samba-readline.patch
@@ -0,0 +1,11 @@
+--- samba-4.1.6/libcli/smbreadline/smbreadline.c.orig 2013-06-13
11:21:02.000000000 +0200
++++ samba-4.1.6/libcli/smbreadline/smbreadline.c 2014-03-12
20:41:16.503527437 +0100
+@@ -141,7 +141,7 @@
+
+ #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)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/samba.git/commitdiff/7645ba9928782c2c49b2d7e877486613dc128412
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
