Accepting request 207997 from network:samba:STABLE

- BuildRequire systemd on post-12.2 systems. - Update to 4.1.2. + s4-dns: dlz_bind9: Create dns-HOSTNAME account disabled; (bso#9091). + dfs_server: Use dsdb_search_one to catch 0 results as well as NO_SUCH_OBJECT errors; (bso#10052). + Missing talloc_free can leak stackframe in error path; (bso#10187). + Fix memset used with constant zero length parameter; (bso#10190). + s4:dsdb/rootdse: report 'dnsHostName' instead of 'dNSHostName'; (bso#10193). + Make offline logon cache updating for cross child domain group membership; (bso#10194). + nsswitch: Fix short writes in winbind_write_sock; (bso#10195). + RW Deny for a specific user is not overriding RW Allow for a group; (bso#10196). + vfs_glusterfs: Fix excessive debug output from vfs_gluster_open(); (bso#10224). + vfs_glusterfs: Implement proper mashalling/unmarshalling of ACLs; (bso#10224). + VFS plugin was sending the actual size of the volume instead of the total number of block units because of which windows was getting the wrong volume capacity; (bso#10224). + libcli/smb: Fix smb2cli_ioctl*() against Windows 2008; (bso#10232). + xattr: Fix listing EAs on *BSD for non-root users; (bso#10247). + Fix the build of vfs_glusterfs; (bso#10253). + s3-winbindd: Fix cache_traverse_validate_fn failure for NDR cache entries; (bso#10264). + util: Remove 32bit macros breaking strict aliasing; (bso#10269). - Let gpg verify execution condition not fail on non SUSE systems. - Add systemd support for post-12.2 systems. OBS-URL: https://build.opensuse.org/request/show/207997 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/samba?expand=0&rev=146
2013-11-23 07:18:02 +00:00 · 2013-11-23 07:18:02 +00:00 · e7a57e0155
commit e7a57e0155
parent 29908e5d3b a91717b7f7
7 changed files with 112 additions and 16 deletions
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:141053b187c423088785a779042debad147b07f15203010bc1036e252e408bb7
-size 25709
+oid sha256:554ca8899ff4627e00a3ecb0fd7d50ca9b4b68b19a4603f2873a9a14f6a6e934
+size 25696
--- a/samba-4.1.1.tar.gz
+++ b/samba-4.1.1.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c70c343f5bcd2bfe3f4b55860e680a6ed70ce30106c8aa16ef89f8a1a85e2628
-size 23152191
--- a/samba-4.1.2.tar.asc
+++ b/samba-4.1.2.tar.asc
@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)

-iD8DBQBSfLhObzORW2Vot+oRAtNfAKCtFzfpibC87ju8uAw76ZHIhlzmRACfRxvL
-NAhsNno8xxRg8dal9rTcmkc=
-=kXtM
+iD8DBQBSjd/KbzORW2Vot+oRApCFAJ4gI4yyrxHL3E42H87ebFv+mgTIBQCgu5lq
+zzw43MQ6yB1CgWLQx2Bw5hg=
+=63p7
 -----END PGP SIGNATURE-----
--- a/samba-4.1.2.tar.gz
+++ b/samba-4.1.2.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d8883b6ada2a3dafc7b238b043c333004910e4d4bdb207fc8734646ee8b1b042
+size 23154809
--- a/samba.changes
+++ b/samba.changes
@ -1,3 +1,48 @@
+-------------------------------------------------------------------
+Fri Nov 22 11:11:42 UTC 2013 - lmuelle@suse.com
+
+- BuildRequire systemd on post-12.2 systems.
+
+-------------------------------------------------------------------
+Fri Nov 22 10:32:30 UTC 2013 - lmuelle@suse.com
+
+- Update to 4.1.2.
+  + s4-dns: dlz_bind9: Create dns-HOSTNAME account disabled; (bso#9091).
+  + dfs_server: Use dsdb_search_one to catch 0 results as well as
+    NO_SUCH_OBJECT errors; (bso#10052).
+  + Missing talloc_free can leak stackframe in error path; (bso#10187).
+  + Fix memset used with constant zero length parameter; (bso#10190).
+  + s4:dsdb/rootdse: report 'dnsHostName' instead of 'dNSHostName';
+    (bso#10193).
+  + Make offline logon cache updating for cross child domain group membership;
+    (bso#10194).
+  + nsswitch: Fix short writes in winbind_write_sock; (bso#10195).
+  + RW Deny for a specific user is not overriding RW Allow for a group;
+    (bso#10196).
+  + vfs_glusterfs: Fix excessive debug output from vfs_gluster_open();
+    (bso#10224).
+  + vfs_glusterfs: Implement proper mashalling/unmarshalling of ACLs;
+    (bso#10224).
+  + VFS plugin was sending the actual size of the volume instead of the total
+    number of block units because of which windows was getting the wrong
+	 volume capacity; (bso#10224).
+  + libcli/smb: Fix smb2cli_ioctl*() against Windows 2008; (bso#10232).
+  + xattr: Fix listing EAs on *BSD for non-root users; (bso#10247).
+  + Fix the build of vfs_glusterfs; (bso#10253).
+  + s3-winbindd: Fix cache_traverse_validate_fn failure for NDR cache entries;
+    (bso#10264).
+  + util: Remove 32bit macros breaking strict aliasing; (bso#10269).
+
+-------------------------------------------------------------------
+Thu Nov 21 17:16:42 UTC 2013 - lmuelle@suse.com
+
+- Let gpg verify execution condition not fail on non SUSE systems.
+
+-------------------------------------------------------------------
+Thu Nov 21 14:13:37 UTC 2013 - lmuelle@suse.com
+
+- Add systemd support for post-12.2 systems.
+
 -------------------------------------------------------------------
 Fri Nov 15 18:04:50 UTC 2013 - lmuelle@suse.com

--- a/samba.spec
+++ b/samba.spec
@ -105,10 +105,11 @@ BuildRequires:  libxslt1
 %if 0%{?suse_version} > 1210
 BuildRequires:  libxslt-tools
 %endif
-%if %suse_version > 1220
+%if 0%{?suse_version} > 1220
 BuildRequires:  gpg-offline
+BuildRequires:  systemd
 %endif
-%define	samba_ver 4.1.1
+%define	samba_ver 4.1.2
 %define	samba_ver_suffix %nil
 %if "%{samba_ver_suffix}" == ""
 %define samba_source_location http://ftp.samba.org/pub/samba/stable/samba-%{version}.tar.gz
@ -119,7 +120,7 @@ BuildRequires:  gpg-offline
 %endif
 %define	samba_ver_full %{samba_ver}%{samba_ver_suffix}
 %if 0%{?suse_version} && 0%{?suse_version} < 1111
-%define	guards_symbols pre_1111
+%define	guards_symbols default_passdb_backend
 %endif
 %if 0%{?suse_version} && 0%{?suse_version} < 1031
 %define libsmbclient_name libsmbclient
@ -135,12 +136,12 @@ BuildRequires:  gpg-offline
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 3113
+%define SOURCE_TIMESTAMP 3122
 %define BRANCH %{version}
 %global with_mitkrb5 1
 %global with_dc 0
 %global with_get_printing_ticket 0
-Version:        4.1.1
+Version:        4.1.2
 Release:        0
 License:        GPL-3.0+
 Url:            http://www.samba.org/
@ -256,6 +257,7 @@ PreReq:         %{?insserv_prereq}
 PreReq:         /sbin/chkconfig
 PreReq:         /sbin/ldconfig
 PreReq:         coreutils
+%{?systemd_requires}
 Requires:       cifs-utils

 %description client
@ -1126,7 +1128,7 @@ Branch:         %{BRANCH}


 %prep
-%if %suse_version > 1220
+%if 0%{?suse_version} > 1220
 gzip -dc %{SOURCE0} >${RPM_SOURCE_DIR}/%{name}-%{samba_ver_full}.tar
 %{?gpg_verify: %gpg_verify --keyring %{SOURCE6} %{SOURCE5}}
 rm ${RPM_SOURCE_DIR}/%{name}-%{samba_ver_full}.tar
@ -1263,7 +1265,11 @@ install -d -m 0755 -p \
 	%{buildroot}/%{_sysconfdir}/security \
 	%{buildroot}/%{_sysconfdir}/slp.reg.d \
 	%{buildroot}/%{CONFIGDIR} \
+%if 0%{?suse_version} > 1220
+	%{buildroot}/%{_unitdir} \
+%else
 	%{buildroot}/%{INITDIR} \
+%endif
 	%{buildroot}/%{_lib}/security \
 	%{buildroot}/sbin \
 	%{buildroot}/%{_includedir} \
@ -1349,11 +1355,21 @@ startScripts="smb nmb winbind"
 %if 0%{?suse_version} && 0%{?suse_version} < 1221
 	startScripts="${startScripts} %{cifs_init_script}"
 %endif
+%if 0%{?suse_version} > 1220
+for srv_name in nmb smb winbind; do
+	sed -e "s@PIDFile=/run/${srv_name}d.pid@PIDFile=/run/samba/${srv_name}d.pid@g" \
+		-e 's@Type=forking@Type=forking\nEnvironment=KRB5CCNAME=/run/samba/krb5cc_samba@g' \
+		../packaging/systemd/${srv_name}.service \
+		>%{buildroot}/%{_unitdir}/${srv_name}.service
+	ln -s %{_unitdir}/${srv_name}.service %{buildroot}/usr/sbin/rc${srv_name}
+done
+%else
 for script in ${startScripts}; do
 	install -m 0755 "init/${script}${scriptSuffix}" \
 		"%{buildroot}/%{INITDIR}/${script}"
 	ln -s "%{INITDIR}/${script}" "%{buildroot}/%{_sbindir}/rc${script}"
 done
+%endif
 for script in ${startScripts}; do
 	SERVICE_NAME=$( echo "${script}" | tr [:lower:] [:upper:])
 	sed \
@ -1487,13 +1503,27 @@ popd

 %pre
 getent group ntadmin >/dev/null || groupadd -g 71 -o -r ntadmin || :
+%if 0%{?suse_version} > 1220
+%service_add_pre nmb.service smb.service
+%endif

 %preun
 %{?stop_on_removal:%{stop_on_removal smb nmb}}
+%if 0%{?suse_version} > 1220
+%service_del_preun nmb.service smb.service
+%endif
+
+%post
+%if 0%{?suse_version} > 1220
+%service_add_post nmb.service smb.service
+%endif

 %postun
 %{?restart_on_update:%{restart_on_update nmb smb}}
 %{?insserv_cleanup:%{insserv_cleanup}}
+%if 0%{?suse_version} > 1220
+%service_del_postun nmb.service smb.service
+%endif

 %pre client
 %if 0%{?suse_version} && 0%{?suse_version} < 1221
@ -1646,6 +1676,9 @@ fi
 # we need this group for squid (ntlmauth)
 # read access to /var/lib/samba/winbindd_privileged
 getent group winbind >/dev/null || groupadd -r winbind || :
+%if 0%{?suse_version} > 1220
+%service_add_pre winbind.service
+%endif

 %post winbind
 /sbin/ldconfig
@ -1660,9 +1693,15 @@ else
 		ln -fs %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/samba-winbindd %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/${if_case}/55-samba-winbindd
 	done
 fi
+%if 0%{?suse_version} > 1220
+%service_add_post winbind.service
+%endif

 %preun winbind
 %{?stop_on_removal:%{stop_on_removal winbind}}
+%if 0%{?suse_version} > 1220
+%service_del_preun winbind.service
+%endif

 %postun winbind
 /sbin/ldconfig
@ -1677,6 +1716,9 @@ fi
 %endif
 %{?restart_on_update:%{restart_on_update winbind}}
 %{?insserv_cleanup:%{insserv_cleanup}}
+%if 0%{?suse_version} > 1220
+%service_del_postun winbind.service
+%endif

 %post -n %{libsmbclient_name} -p /sbin/ldconfig

@ -1694,8 +1736,13 @@ fi

 %files -f filelist-samba
 %defattr(-,root,root)
+%if 0%{?suse_version} < 1221
 %attr(0754,root,root) %config %{INITDIR}/nmb
 %attr(0754,root,root) %config %{INITDIR}/smb
+%else
+%{_unitdir}/nmb.service
+%{_unitdir}/smb.service
+%endif
 %if 0%{?suse_version} && 0%{?suse_version} < 1111
 %attr(0600,root,root) %config(noreplace) %{CONFIGDIR}/smbpasswd
 %else
@ -2084,7 +2131,11 @@ fi
 %files winbind -f filelist-samba-winbind
 %defattr(-,root,root)
 %config(noreplace) %{_sysconfdir}/security/pam_winbind.conf
+%if 0%{?suse_version} < 1221
 %attr(0754,root,root) %config %{INITDIR}/winbind
+%else
+%{_unitdir}/winbind.service
+%endif
 %ghost %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-down.d/55-samba-winbindd
 %ghost %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-up.d/55-samba-winbindd
 %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/samba-winbindd
--- a/vendor-files.tar.bz2
+++ b/vendor-files.tar.bz2
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3ccf61116cb60927934806fcee2b2ad97081e73c9bef2e66ab266d9f75770b4d
-size 54055
+oid sha256:77082a40376f4dcd8bf90c6acfdb9031af09716ff713129c70501a6e3e86c334
+size 54111