Accepting request 546522 from network:samba:STABLE

OBS-URL: https://build.opensuse.org/request/show/546522
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/samba?expand=0&rev=226

samba-4.7.1+git.26.1ac2944c965.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:22af016d4dfea2456a12b6dd2eb1916d60da85417c94ee535c93a3152afd7b6d
-size 21943619

samba-4.7.3+git.30.54c196e5d35.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:06669f7aa8d815863a9d66dfc7158c6ef26c2909115c1581b9b42659ba3312d5
+size 21938717

samba.changes

@@ -1,3 +1,32 @@
+-------------------------------------------------------------------
+Wed Nov 29 16:59:07 UTC 2017 - david.mulder@suse.com
+
+- smbc_opendir should not return EEXIST with invalid login credentials;
+  (bnc#1065868).
+
+-------------------------------------------------------------------
+Tue Nov 28 17:07:26 UTC 2017 - scabrero@suse.com
+
+- Update to 4.7.3; (bsc#1069666);
+  + Non-smbd processes using kernel oplocks can hang smbd;
+    (bso#13121);
+  + python: use communicate to fix Popen deadlock; (bso#13127);
+  + smbd on disk file corruption bug under heavy threaded load;
+    (bso#13130);
+  + tevent: version 0.9.34; (bso#13130);
+  + s3: smbd: Fix delete-on-close after smb2_find; (bso#13118);
+  + CVE-2017-14746: s3: smbd: Fix SMB1 use-after-free crash bug;
+    (bsc#1060427);(bso#13041);
+  + CVE-2017-15275: s3: smbd: Chain code can return uninitialized
+    memory when talloc buffer is grown; (bsc#1063008); (bso#13077);
+- Build with AD DC support only in openSUSE.
+
+-------------------------------------------------------------------
+Mon Nov 27 14:23:09 UTC 2017 - rbrown@suse.com
+
+- Replace references to /var/adm/fillup-templates with new
+  %_fillupdir macro (boo#1069468)
+
 -------------------------------------------------------------------
 Wed Nov 15 17:00:50 UTC 2017 - dmulder@suse.com
 

samba.spec

@@ -16,6 +16,11 @@
 #
 
 
+#Compat macro for new _fillupdir macro introduced in Nov 2017
+%if ! %{defined _fillupdir}
+  %define _fillupdir /var/adm/fillup-templates
+%endif
+
 %{!?_tmpfilesdir:%global _tmpfilesdir /usr/lib/tmpfiles.d}
 
 %if 0%{?suse_version} > 1140 && 0%{?suse_version} != 1315
@@ -29,13 +34,13 @@
 %define		vendor_files_git_vers git.4adce31
 
 %define talloc_version 2.1.10
-%define tevent_version 0.9.33
+%define tevent_version 0.9.34
 %define tdb_version    1.3.15
 %define ldb_version    1.2.2
 
 %global with_mitkrb5 1
 %global with_dc 0
-%if 0%{?suse_version} > 1320
+%if 0%{?suse_version} > 1320 && 0%{?is_opensuse}
 %ifnarch ppc
 %global with_dc 1
 %endif
@@ -126,7 +131,7 @@ BuildRequires:  krb5-devel
 %endif
 %define SOURCE_TIMESTAMP 3761
 %define BRANCH %{version}
-Version:        4.7.1+git.26.1ac2944c965
+Version:        4.7.3+git.30.54c196e5d35
 Release:        0
 Url:            https://www.samba.org/
 Obsoletes:      samba-32bit < %{version}
@@ -1142,7 +1147,7 @@ install -d -m 0755 -p \
 	%{buildroot}/%{LOCKDIR}/{drivers/{WIN40,W32X86,W32MIPS,W32ALPHA,W32PPC,IA64,x64},netlogon,lock/msg.lock,printing,private/msg.sock,profiles,winbindd_privileged} \
 	%{buildroot}/%{LOGDIR} \
 	%{buildroot}/%{PIDDIR} \
-	%{buildroot}/%{_var}/adm/fillup-templates \
+	%{buildroot}/%{_fillupdir} \
 	%{buildroot}/%{_var}/cache/krb5rcache \
 	%{buildroot}/%{_var}/log/ctdb \
 	%{buildroot}/%{DOCDIR} \
@@ -1161,7 +1166,7 @@ rm \
 %endif
 
 # CTDB
-install -m 0644 vendor-files-%{vendor_files_git_vers}/config/sysconfig.ctdb %{buildroot}/%{_var}/adm/fillup-templates
+install -m 0644 vendor-files-%{vendor_files_git_vers}/config/sysconfig.ctdb %{buildroot}/%{_fillupdir}
 %if 0%{?suse_version} > 1220
 install -m 0755 ctdb/config/ctdb.service %{buildroot}%{_unitdir}/ctdb.service
 ln -s service %{buildroot}/%{_sbindir}/rcctdb
@@ -1233,7 +1238,7 @@ done
 	install -m 0644 -p systemd/samba-ad-dc.service %{buildroot}/%{_unitdir}
 	ln -s service %{buildroot}/%{_sbindir}/rcsamba-ad-dc
 %endif
-install -m 0644 systemd/sysconfig.* %{buildroot}%_var/adm/fillup-templates
+install -m 0644 systemd/sysconfig.* %{buildroot}%{_fillupdir}
 install -m 0644 -p ../packaging/systemd/samba.conf.tmp %{buildroot}/%{_tmpfilesdir}/samba.conf
 %else
 for script in ${startScripts}; do
@@ -1258,8 +1263,8 @@ install -m 0755 tools/update-apparmor-samba-profile \
 install -p -m 0755 tools/smbprngenpdf %{buildroot}/%{_bindir}/smbprngenpdf
 install -m 0644 config/samba.reg %{buildroot}/%{_sysconfdir}/slp.reg.d/samba.reg
 install -m 0644 config/samba.pamd-common %{buildroot}/%{_sysconfdir}/pam.d/samba
-install -m 0644 config/dhcp.conf %{buildroot}/%{_var}/adm/fillup-templates/samba-client-dhcp.conf
+install -m 0644 config/dhcp.conf %{buildroot}/%{_fillupdir}/samba-client-dhcp.conf
-install -m 0644 config/sysconfig.dhcp-samba-client %{buildroot}/%{_var}/adm/fillup-templates/sysconfig.dhcp-samba-client
+install -m 0644 config/sysconfig.dhcp-samba-client %{buildroot}/%{_fillupdir}/sysconfig.dhcp-samba-client
 for script in dhcpcd-hook-samba dhcpcd-hook-samba-functions samba-winbindd; do
 	install -m 0755 "tools/${script}" "%{buildroot}/%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/${script}"
 done
@@ -1700,7 +1705,7 @@ fi
 %exclude %{_mandir}/man8/samba-tool.8.*
 %exclude %{_mandir}/man8/samba.8.*
 %if 0%{?suse_version} > 1220
-%{_var}/adm/fillup-templates/sysconfig.samba
+%{_fillupdir}/sysconfig.samba
 %endif
 
 %files client
@@ -1808,8 +1813,8 @@ fi
 %{_datadir}/samba/templates
 %dir %{DOCDIR}
 %doc %{DOCDIR}/README.%{VENDOR}
-%{_localstatedir}/adm/fillup-templates/samba-client-dhcp.conf
+%{_fillupdir}/samba-client-dhcp.conf
-%{_localstatedir}/adm/fillup-templates/sysconfig.dhcp-samba-client
+%{_fillupdir}/sysconfig.dhcp-samba-client
 %dir %{LOCKDIR}
 %dir %{LOCKDIR}/lock
 %dir %{LOCKDIR}/private
@@ -2047,7 +2052,7 @@ fi
 %attr(0644,root,root) %{_datadir}/omc/svcinfo.d/winbind.xml
 %attr(0750,root,winbind) %dir %{LOCKDIR}/winbindd_privileged
 %if 0%{?suse_version} > 1220
-%{_var}/adm/fillup-templates/sysconfig.samba-winbind
+%{_fillupdir}/sysconfig.samba-winbind
 %endif
 %attr(0770,root,root) %{_var}/cache/krb5rcache
 %if 0%{?suse_version} > 1110
@@ -2061,7 +2066,7 @@ fi
 %files -n ctdb
 %defattr(-,root,root)
 %dir %{_sysconfdir}/ctdb
-%{_var}/adm/fillup-templates/sysconfig.ctdb
+%{_fillupdir}/sysconfig.ctdb
 %{_sysconfdir}/ctdb/notify.sh
 %{_sysconfdir}/ctdb/ctdb-crash-cleanup.sh
 %{_sysconfdir}/ctdb/debug-hung-script.sh