- updated to 4.7.4 (fixes CVE-2017-14746,CVE-2017-15275)

- updated server-role patch

diff --git a/samba.spec b/samba.spec
index 7fe003656419ac44c223ee2f947984ba87e7da65..74316bdba6500ccd29e6553d167e7bb5149c88a3 100644 (file)
--- a/samba.spec
+++ b/samba.spec
@@ -14,9 +14,9 @@
 %bcond_with    replace
 
 %if %{with system_libs}
-%define                ldb_ver         1.2.2
+%define                ldb_ver         1.2.3
 %define                talloc_ver      2:2.1.9
-%define                tdb_ver         2:1.3.12
+%define                tdb_ver         2:1.3.14
 %define                tevent_ver      0.9.34
 %endif
 
@@ -32,13 +32,13 @@
 Summary:       Samba Active Directory and SMB server
 Summary(pl.UTF-8):     Serwer Samba Active Directory i SMB
 Name:          samba
-Version:       4.7.2
+Version:       4.7.4
 Release:       1
 Epoch:         1
 License:       GPL v3
 Group:         Networking/Daemons
 Source0:       https://www.samba.org/ftp/samba/samba-%{version}.tar.gz
-# Source0-md5: 9044650a5ff173b9464fd3f6602f976a
+# Source0-md5: 427e7feb988603c51f01c97803305fed
 Source1:       smb.init
 Source2:       samba.pamd
 Source4:       samba.sysconfig
@@ -66,7 +66,7 @@ BuildRequires:        cmocka-devel >= 1.0.0
 BuildRequires: cyrus-sasl-devel >= 2
 BuildRequires: dbus-devel
 %{?with_dmapi:BuildRequires:   dmapi-devel}
-BuildRequires: docbook-style-xsl
+BuildRequires: docbook-style-xsl-nons
 # just FAM API
 BuildRequires: gamin-devel
 BuildRequires: gdbm-devel

diff --git a/server-role.patch b/server-role.patch
index 37077777b57810b8238dca5b48285c3ce07b77b7..9cd2ec010a0e36b6b8165b6a718c762123576d1c 100644 (file)
--- a/server-role.patch
+++ b/server-role.patch
@@ -1,31 +1,31 @@
---- samba-4.1.3/packaging/systemd/smb.service.orig     2013-12-20 19:15:20.885742895 +0100
-+++ samba-4.1.3/packaging/systemd/smb.service  2014-01-01 16:33:29.280076263 +0100
-@@ -7,6 +7,7 @@
+--- samba-4.7.4/packaging/systemd/smb.service.orig     2017-12-26 18:26:31.457609415 +0100
++++ samba-4.7.4/packaging/systemd/smb.service  2017-12-26 18:27:11.460942304 +0100
+@@ -8,6 +8,7 @@
  PIDFile=/run/samba/smbd.pid
  LimitNOFILE=16384
  EnvironmentFile=-/etc/sysconfig/samba
 +ExecStartPre=/bin/sh -c '[ "`samba-tool testparm --parameter-name="server role" 2>/dev/null | tail -1`" != "active directory domain controller" ]'
- ExecStart=/usr/sbin/smbd $SMBDOPTIONS
+ ExecStart=/usr/sbin/smbd --foreground --no-process-group $SMBDOPTIONS
  ExecReload=/usr/bin/kill -HUP $MAINPID
- 
---- samba-4.1.3/packaging/systemd/nmb.service.orig     2013-12-20 19:15:20.885742895 +0100
-+++ samba-4.1.3/packaging/systemd/nmb.service  2014-01-01 16:38:17.089656135 +0100
-@@ -6,6 +6,8 @@
- Type=forking
+ LimitCORE=infinity
+--- samba-4.7.4/packaging/systemd/nmb.service.orig     2017-12-26 18:26:31.457609415 +0100
++++ samba-4.7.4/packaging/systemd/nmb.service  2017-12-26 18:27:32.350942051 +0100
+@@ -7,6 +7,8 @@
+ NotifyAccess=all
  PIDFile=/run/samba/nmbd.pid
  EnvironmentFile=-/etc/sysconfig/samba
 +ExecStartPre=/bin/sh -c '[ "`samba-tool testparm --parameter-name="server role" 2>/dev/null | tail -1`" != "active directory domain controller" ]'
 +ExecStartPre=/bin/sh -c '[ "`testparm -s --parameter-name="disable netbios" 2>/dev/null`" != "Yes" ]'
- ExecStart=/usr/sbin/nmbd $NMBDOPTIONS
+ ExecStart=/usr/sbin/nmbd --foreground --no-process-group $NMBDOPTIONS
  ExecReload=/usr/bin/kill -HUP $MAINPID
- 
---- samba-4.1.3/packaging/systemd/samba.service.orig   2014-01-01 16:44:59.833724642 +0100
-+++ samba-4.1.3/packaging/systemd/samba.service        2014-01-01 16:45:17.763905567 +0100
-@@ -7,6 +7,7 @@
+ LimitCORE=infinity
+--- samba-4.7.4/packaging/systemd/samba.service.orig   2017-12-26 18:26:31.457609415 +0100
++++ samba-4.7.4/packaging/systemd/samba.service        2017-12-26 18:27:52.774275149 +0100
+@@ -8,6 +8,7 @@
  PIDFile=/run/samba/samba.pid
  LimitNOFILE=16384
  EnvironmentFile=-/etc/sysconfig/samba
 +ExecStartPre=/bin/sh -c '[ "`samba-tool testparm --parameter-name="server role" 2>/dev/null | tail -1`" = "active directory domain controller" ]'
- ExecStart=/usr/sbin/samba $SAMBAOPTIONS
+ ExecStart=/usr/sbin/samba --foreground --no-process-group $SAMBAOPTIONS
  ExecReload=/usr/bin/kill -HUP $MAINPID