- updated to 4.1.7

- readline patch applied upstream

diff --git a/samba-readline.patch b/samba-readline.patch
deleted file mode 100644 (file)
index 7cdedc3..0000000
--- a/samba-readline.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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)

diff --git a/samba.spec b/samba.spec
index ce69b1b15668dd6fe00b0da9452fc8389cb3fbaa..5b59a25bd8153e073f49a4f568508665cf0ee749 100644 (file)
--- 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.6
+Version:       4.1.7
 Release:       1
 Epoch:         1
 License:       GPL v3
 Group:         Networking/Daemons
 Source0:       http://www.samba.org/samba/ftp/stable/samba-%{version}.tar.gz
-# Source0-md5: 9dc64658c0cc81e7637f9b975c19638c
+# Source0-md5: bc44b0a245468c3574ef07644206ede3
 Source1:       smb.init
 Source2:       samba.pamd
 Source4:       samba.sysconfig
@@ -45,7 +45,6 @@ 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}
@@ -496,7 +495,6 @@ 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