commit 52a1c78757b6114039485d9d84f22abdffc688e7
Author: Jakub Bogusz <[email protected]>
Date: Wed Jun 4 21:07:24 2014 +0200
- updated to 4.1.8 (fixes CVE-2014-0178 CVE-2014-0239, adds more systemd
integration)
- updated pid-dir,link patches
link.patch | 6 +++---
samba.spec | 9 ++++++---
systemd-pid-dir.patch | 40 ++++++++++++++++++++--------------------
3 files changed, 29 insertions(+), 26 deletions(-)
---
diff --git a/samba.spec b/samba.spec
index 5b59a25..a517e0c 100644
--- a/samba.spec
+++ b/samba.spec
@@ -4,6 +4,7 @@
%bcond_without cups # CUPS support
%bcond_without ldap # LDAP support
%bcond_without avahi # Avahi support
+%bcond_without systemd # systemd integration
%bcond_without system_libs # system libraries (talloc,tdb,tevent,ldb,ntdb)
%if %{with system_libs}
@@ -21,13 +22,13 @@
Summary: Samba Active Directory and SMB server
Summary(pl.UTF-8): Serwer Samba Active Directory i SMB
Name: samba
-Version: 4.1.7
+Version: 4.1.8
Release: 1
Epoch: 1
License: GPL v3
Group: Networking/Daemons
Source0: http://www.samba.org/samba/ftp/stable/samba-%{version}.tar.gz
-# Source0-md5: bc44b0a245468c3574ef07644206ede3
+# Source0-md5: 212b7568d44e7668a7dc8a45c5558764
Source1: smb.init
Source2: samba.pamd
Source4: samba.sysconfig
@@ -84,6 +85,8 @@ BuildRequires: rpm-perlprov
BuildRequires: rpm-pythonprov
BuildRequires: rpmbuild(macros) >= 1.647
BuildRequires: sed >= 4.0
+%{?with_systemd:BuildRequires: systemd-devel}
+BuildRequires: xfsprogs-devel
%if %{with system_libs}
BuildRequires: ldb-devel >= %{ldb_ver}
BuildRequires: ntdb-devel >= %{ntdb_ver}
@@ -95,7 +98,6 @@ BuildRequires: talloc-devel >= %{talloc_ver}
BuildRequires: tdb-devel >= %{tdb_ver}
BuildRequires: tevent-devel >= %{tevent_ver}
%endif
-BuildRequires: xfsprogs-devel
BuildConflicts: libbsd-devel
Requires(post,preun): /sbin/chkconfig
Requires: %{name}-common = %{epoch}:%{version}-%{release}
@@ -546,6 +548,7 @@ CPPFLAGS="${CPPFLAGS:-%rpmcppflags}" \
--with-regedit \
--with-sendfile-support \
--with-syslog \
+ %{!?with_systemd:--without-systemd} \
--with-utmp \
--with-winbind \
--%{?with_avahi:en}%{!?with_avahi:dis}able-avahi \
diff --git a/link.patch b/link.patch
index 82da307..6286dcb 100644
--- a/link.patch
+++ b/link.patch
@@ -1,11 +1,11 @@
---- samba-4.1.0/lib/util/wscript_build~ 2013-06-13 11:21:02.000000000
+0200
-+++ samba-4.1.0/lib/util/wscript_build 2013-10-16 14:07:02.360316706 +0200
+--- samba-4.1.8/lib/util/wscript_build.orig 2014-06-04 19:40:22.052755047
+0200
++++ samba-4.1.8/lib/util/wscript_build 2014-06-04 19:41:57.692753054 +0200
@@ -9,7 +9,7 @@
util_str.c util_str_common.c substitute.c ms_fnmatch.c
server_id.c dprintf.c parmlist.c bitmap.c pidfile.c
tevent_debug.c util_process.c''',
- deps='DYNCONFIG',
+ deps='DYNCONFIG ccan-hash',
- public_deps='talloc tevent execinfo uid_wrapper pthread
LIBCRYPTO charset util_setid',
+ public_deps='talloc tevent execinfo uid_wrapper pthread
LIBCRYPTO charset util_setid systemd-daemon',
public_headers='debug.h attr.h byteorder.h data_blob.h
memory.h safe_string.h time.h talloc_stack.h xfile.h dlinklist.h samba_util.h
string_wrappers.h',
header_path= [ ('dlinklist.h samba_util.h', '.'), ('*',
'util') ],
diff --git a/systemd-pid-dir.patch b/systemd-pid-dir.patch
index 086632f..599efe3 100644
--- a/systemd-pid-dir.patch
+++ b/systemd-pid-dir.patch
@@ -1,42 +1,42 @@
---- samba-4.0.5/packaging/systemd/nmb.service~ 2012-10-16 09:33:05.000000000
+0200
-+++ samba-4.0.5/packaging/systemd/nmb.service 2013-04-11 13:13:21.950445513
+0200
-@@ -4,7 +4,7 @@
-
+--- samba-4.1.8/packaging/systemd/nmb.service.orig 2014-06-04
19:33:33.162763572 +0200
++++ samba-4.1.8/packaging/systemd/nmb.service 2014-06-04 19:38:01.579424644
+0200
+@@ -5,7 +5,7 @@
[Service]
- Type=forking
+ Type=notify
+ NotifyAccess=all
-PIDFile=/run/nmbd.pid
+PIDFile=/run/samba/nmbd.pid
EnvironmentFile=-/etc/sysconfig/samba
ExecStart=/usr/sbin/nmbd $NMBDOPTIONS
ExecReload=/usr/bin/kill -HUP $MAINPID
---- samba-4.0.5/packaging/systemd/samba.service~ 2012-10-16
09:33:05.000000000 +0200
-+++ samba-4.0.5/packaging/systemd/samba.service 2013-04-11
13:13:10.947024140 +0200
-@@ -4,7 +4,7 @@
-
+--- samba-4.1.8/packaging/systemd/samba.service.orig 2014-06-04
19:33:33.162763572 +0200
++++ samba-4.1.8/packaging/systemd/samba.service 2014-06-04
19:38:16.252757669 +0200
+@@ -5,7 +5,7 @@
[Service]
- Type=forking
+ Type=notify
+ NotifyAccess=all
-PIDFile=/run/samba.pid
+PIDFile=/run/samba/samba.pid
LimitNOFILE=16384
EnvironmentFile=-/etc/sysconfig/samba
ExecStart=/usr/sbin/samba $SAMBAOPTIONS
---- samba-4.0.5/packaging/systemd/smb.service~ 2012-10-16 09:33:05.000000000
+0200
-+++ samba-4.0.5/packaging/systemd/smb.service 2013-04-11 13:13:04.546972940
+0200
-@@ -4,7 +4,7 @@
-
+--- samba-4.1.8/packaging/systemd/smb.service.orig 2014-06-04
19:33:33.162763572 +0200
++++ samba-4.1.8/packaging/systemd/smb.service 2014-06-04 19:38:34.236090628
+0200
+@@ -5,7 +5,7 @@
[Service]
- Type=forking
+ Type=notify
+ NotifyAccess=all
-PIDFile=/run/smbd.pid
+PIDFile=/run/samba/smbd.pid
LimitNOFILE=16384
EnvironmentFile=-/etc/sysconfig/samba
ExecStart=/usr/sbin/smbd $SMBDOPTIONS
---- samba-4.0.5/packaging/systemd/winbind.service~ 2012-10-16
09:33:05.000000000 +0200
-+++ samba-4.0.5/packaging/systemd/winbind.service 2013-04-11
13:12:56.876911589 +0200
-@@ -4,7 +4,7 @@
-
+--- samba-4.1.8/packaging/systemd/winbind.service.orig 2014-06-04
19:33:33.166096905 +0200
++++ samba-4.1.8/packaging/systemd/winbind.service 2014-06-04
19:38:47.509423687 +0200
+@@ -5,7 +5,7 @@
[Service]
- Type=forking
+ Type=notify
+ NotifyAccess=all
-PIDFile=/run/winbindd.pid
+PIDFile=/run/samba/winbindd.pid
EnvironmentFile=-/etc/sysconfig/samba
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/samba.git/commitdiff/52a1c78757b6114039485d9d84f22abdffc688e7
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
