From 27ee0f2ccd6e00307c2ebc1b2e7a4d69ac25ca8d21afce758554f348a345943c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Fri, 22 Nov 2013 10:54:01 +0000 Subject: [PATCH 1/2] - Update to 4.1.2. See WHATSNEW.txt from the main tar ball or the samba.changes file for more details. - 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/package/show/network:samba:STABLE/samba?expand=0&rev=349 --- patches.tar.bz2 | 4 +- samba-4.1.1.tar.gz | 3 -- samba-4.1.1.tar.asc => samba-4.1.2.tar.asc | 6 +-- samba-4.1.2.tar.gz | 3 ++ samba.changes | 40 ++++++++++++++ samba.spec | 62 +++++++++++++++++++--- vendor-files.tar.bz2 | 4 +- 7 files changed, 106 insertions(+), 16 deletions(-) delete mode 100644 samba-4.1.1.tar.gz rename samba-4.1.1.tar.asc => samba-4.1.2.tar.asc (50%) create mode 100644 samba-4.1.2.tar.gz diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 3e91f62..2a3fc1b 100644 --- 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:a6f33ab08d0afffaaede3882daad74b5622bfafbd6b77b7b7c3991f9791ecefd +size 25714 diff --git a/samba-4.1.1.tar.gz b/samba-4.1.1.tar.gz deleted file mode 100644 index f907df1..0000000 --- a/samba-4.1.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c70c343f5bcd2bfe3f4b55860e680a6ed70ce30106c8aa16ef89f8a1a85e2628 -size 23152191 diff --git a/samba-4.1.1.tar.asc b/samba-4.1.2.tar.asc similarity index 50% rename from samba-4.1.1.tar.asc rename to samba-4.1.2.tar.asc index 0752c79..26c87b8 100644 --- a/samba-4.1.1.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----- diff --git a/samba-4.1.2.tar.gz b/samba-4.1.2.tar.gz new file mode 100644 index 0000000..f919d68 --- /dev/null +++ b/samba-4.1.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d8883b6ada2a3dafc7b238b043c333004910e4d4bdb207fc8734646ee8b1b042 +size 23154809 diff --git a/samba.changes b/samba.changes index 08a0c45..2896132 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,43 @@ +------------------------------------------------------------------- +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 diff --git a/samba.spec b/samba.spec index 257d8de..8f1e5f6 100644 --- a/samba.spec +++ b/samba.spec @@ -105,10 +105,10 @@ BuildRequires: libxslt1 %if 0%{?suse_version} > 1210 BuildRequires: libxslt-tools %endif -%if %suse_version > 1220 +%if 0%{?suse_version} > 1220 BuildRequires: gpg-offline %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 +119,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 +135,12 @@ BuildRequires: gpg-offline %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3113 +%define SOURCE_TIMESTAMP 3121 %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 +256,7 @@ PreReq: %{?insserv_prereq} PreReq: /sbin/chkconfig PreReq: /sbin/ldconfig PreReq: coreutils +%{?systemd_requires} Requires: cifs-utils %description client @@ -1126,7 +1127,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 +1264,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 +1354,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 +1502,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 +1675,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 +1692,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 +1715,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 +1735,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 +2130,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 diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index be283b9..cd3f28f 100644 --- 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:d91afa9969839426aace9f2ba19c8f8bc1175a4a12fe7e5fe9346f4bffa02576 +size 54078 From a91717b7f76b8ac2fd1816bb2c9e31f806d761f38c723a0ce95e31e50e03e04f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Fri, 22 Nov 2013 11:18:46 +0000 Subject: [PATCH 2/2] BuildRequire systemd on post-12.2 systems. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=350 --- patches.tar.bz2 | 4 ++-- samba.changes | 5 +++++ samba.spec | 3 ++- vendor-files.tar.bz2 | 4 ++-- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 2a3fc1b..02bd9f1 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a6f33ab08d0afffaaede3882daad74b5622bfafbd6b77b7b7c3991f9791ecefd -size 25714 +oid sha256:554ca8899ff4627e00a3ecb0fd7d50ca9b4b68b19a4603f2873a9a14f6a6e934 +size 25696 diff --git a/samba.changes b/samba.changes index 2896132..569199f 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/samba.spec b/samba.spec index 8f1e5f6..4992f04 100644 --- a/samba.spec +++ b/samba.spec @@ -107,6 +107,7 @@ BuildRequires: libxslt-tools %endif %if 0%{?suse_version} > 1220 BuildRequires: gpg-offline +BuildRequires: systemd %endif %define samba_ver 4.1.2 %define samba_ver_suffix %nil @@ -135,7 +136,7 @@ BuildRequires: gpg-offline %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3121 +%define SOURCE_TIMESTAMP 3122 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index cd3f28f..5db8cef 100644 --- a/vendor-files.tar.bz2 +++ b/vendor-files.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d91afa9969839426aace9f2ba19c8f8bc1175a4a12fe7e5fe9346f4bffa02576 -size 54078 +oid sha256:77082a40376f4dcd8bf90c6acfdb9031af09716ff713129c70501a6e3e86c334 +size 54111