From 7d6c256a98c1066a2112a62c6d57f594366d1356c1e54d0a3627eb5b2e0b7225 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Thu, 9 Apr 2015 12:42:54 +0000 Subject: [PATCH 1/4] - Add sparse file support for samba; (fate#318424). - Enable building of the get_printing_ticket binary (samba-krb-printing) with waf; (bnc#921530). - Use domain name if search by domain SID fails to send SIDHistory lookups to correct idmap backend; (bnc#773464). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=458 --- patches.tar.bz2 | 4 ++-- samba.changes | 19 +++++++++++++++++- samba.spec | 46 +++++++++++++++++++++++++++++++++++++++++--- vendor-files.tar.bz2 | 4 ++-- 4 files changed, 65 insertions(+), 8 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 5394501..6d176a2 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:93c6f796612ee2fd3b5b8b6163e91711496e2142edfa5e77d22cbc631d8e2303 -size 86482 +oid sha256:d61d42d59a8decd3086d15bd857877b55f7e79890496cd2de467bba8fcbd19a7 +size 93441 diff --git a/samba.changes b/samba.changes index ec59e27..dfa5bb0 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Apr 9 12:02:25 UTC 2015 - noel.power@suse.com + +- Add sparse file support for samba; (fate#318424). + +------------------------------------------------------------------- +Wed Apr 8 18:11:20 UTC 2015 - lmuelle@suse.com + +- Enable building of the get_printing_ticket binary (samba-krb-printing) with + waf; (bnc#921530). + ------------------------------------------------------------------- Fri Mar 20 13:21:43 UTC 2015 - ddiss@suse.com @@ -431,11 +442,17 @@ Tue Sep 23 12:02:16 UTC 2014 - lmuelle@suse.com read; (bso#10794). ------------------------------------------------------------------- -Thu Sep 18 16:59:49 UDT 2014 - jmcdonough@suse.com +Thu Sep 18 16:59:49 UTC 2014 - jmcdonough@suse.com - Wait for network-online.target to prevent caching of pre-network failures; (bnc#889175). +------------------------------------------------------------------- +Thu Sep 18 08:54:38 UTC 2014 - jmcdonough@suse.com + +- Use domain name if search by domain SID fails to send SIDHistory + lookups to correct idmap backend; (bnc#773464). + ------------------------------------------------------------------- Thu Sep 11 17:26:26 UTC 2014 - ddiss@suse.com diff --git a/samba.spec b/samba.spec index 6c1a840..0dbb776 100644 --- a/samba.spec +++ b/samba.spec @@ -143,7 +143,7 @@ BuildRequires: systemd-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3386 +%define SOURCE_TIMESTAMP 3391 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 @@ -329,6 +329,25 @@ Branch: %{BRANCH} %endif +%package krb-printing +Summary: Wrapper binary for kerberized printing +License: GPL-3.0+ +Group: Productivity/Networking/Samba +PreReq: coreutils +Provides: samba-gplv3-krb-printing = %{version} +Obsoletes: samba-gplv3-krb-printing < %{version} +%if 0%{?suse_version} > 1000 +PreReq: permissions +%endif +Requires: samba-client >= %{version} + +%description krb-printing +A wrapper binary to run smbspool with the original calling UID. + +Source Timestamp: %{SOURCE_TIMESTAMP} +Branch: %{BRANCH} + + %package libs Summary: Samba libraries License: GPL-3.0+ @@ -1085,6 +1104,7 @@ for patch in $( patches/tools/guards %{guards_symbols} 1220 %{fillup_only -ans samba client} %endif @@ -1519,6 +1542,16 @@ fi /sbin/ldconfig %{?insserv_cleanup:%{insserv_cleanup}} +%post krb-printing +if test ${1:-0} -eq 1 -a -d %{cups_lib_dir}/backend; then + ln -fs %{_bindir}/get_printing_ticket %{cups_lib_dir}/backend/smb +fi + +%postun krb-printing +if test ${1:-0} -eq 0 -a -e %{_bindir}/smbspool -a -d %{cups_lib_dir}/backend; then + ln -fs %{_bindir}/smbspool %{cups_lib_dir}/backend/smb +fi + %post -n libdcerpc-atsvc0 -p /sbin/ldconfig %postun -n libdcerpc-atsvc0 -p /sbin/ldconfig %post -n libdcerpc-binding0 -p /sbin/ldconfig @@ -1797,7 +1830,7 @@ fi %{_bindir}/testparm %dir %{cups_lib_dir} %dir %{cups_lib_dir}/backend -%{cups_lib_dir}/backend/smb +%ghost %{cups_lib_dir}/backend/smb %{_libdir}/libnss_wins.so.* %dir %{_libdir}/samba %{_libdir}/samba/charset @@ -2099,6 +2132,13 @@ fi %doc %{_datadir}/susehelp %endif +%files krb-printing +%defattr(-,root,root) +%attr(0700,root,root) %{_bindir}/get_printing_ticket +%dir %{cups_lib_dir} +%dir %{cups_lib_dir}/backend +%ghost %{cups_lib_dir}/backend/smb + %files -n libdcerpc-atsvc0 %defattr(-,root,root) %_libdir/libdcerpc-atsvc.so.0* diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 68daa3e..be1cec1 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:414d189b5f16218f53348bcf53df0faba665355ae7f1dde595176f3b6a840193 -size 53966 +oid sha256:d07624fd6c8d5c509da49c7a35963749c87507416acdd8667e510cf3be5bb351 +size 54414 From 09475dd5097b4de0fec3766472b0ab32d8857d3fe65c6be18cbe01046849bf78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Fri, 10 Apr 2015 16:52:07 +0000 Subject: [PATCH 2/4] Partial revert of r458 Enable building of the get_printing_ticket binary (samba-krb-printing) with waf; (bnc#921530). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=459 --- patches.tar.bz2 | 4 ++-- samba.changes | 6 ------ samba.spec | 46 +++----------------------------------------- vendor-files.tar.bz2 | 4 ++-- 4 files changed, 7 insertions(+), 53 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 6d176a2..c4db941 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d61d42d59a8decd3086d15bd857877b55f7e79890496cd2de467bba8fcbd19a7 -size 93441 +oid sha256:e0ccffa6a015ef05259ad7ff1452c920a1daa07117b556ef8cd74713869cfaf2 +size 104391 diff --git a/samba.changes b/samba.changes index dfa5bb0..1acb5b6 100644 --- a/samba.changes +++ b/samba.changes @@ -3,12 +3,6 @@ Thu Apr 9 12:02:25 UTC 2015 - noel.power@suse.com - Add sparse file support for samba; (fate#318424). -------------------------------------------------------------------- -Wed Apr 8 18:11:20 UTC 2015 - lmuelle@suse.com - -- Enable building of the get_printing_ticket binary (samba-krb-printing) with - waf; (bnc#921530). - ------------------------------------------------------------------- Fri Mar 20 13:21:43 UTC 2015 - ddiss@suse.com diff --git a/samba.spec b/samba.spec index 0dbb776..0a0b8be 100644 --- a/samba.spec +++ b/samba.spec @@ -143,7 +143,7 @@ BuildRequires: systemd-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3391 +%define SOURCE_TIMESTAMP 3395 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 @@ -329,25 +329,6 @@ Branch: %{BRANCH} %endif -%package krb-printing -Summary: Wrapper binary for kerberized printing -License: GPL-3.0+ -Group: Productivity/Networking/Samba -PreReq: coreutils -Provides: samba-gplv3-krb-printing = %{version} -Obsoletes: samba-gplv3-krb-printing < %{version} -%if 0%{?suse_version} > 1000 -PreReq: permissions -%endif -Requires: samba-client >= %{version} - -%description krb-printing -A wrapper binary to run smbspool with the original calling UID. - -Source Timestamp: %{SOURCE_TIMESTAMP} -Branch: %{BRANCH} - - %package libs Summary: Samba libraries License: GPL-3.0+ @@ -1104,7 +1085,6 @@ for patch in $( patches/tools/guards %{guards_symbols} 1220 %{fillup_only -ans samba client} %endif @@ -1542,16 +1519,6 @@ fi /sbin/ldconfig %{?insserv_cleanup:%{insserv_cleanup}} -%post krb-printing -if test ${1:-0} -eq 1 -a -d %{cups_lib_dir}/backend; then - ln -fs %{_bindir}/get_printing_ticket %{cups_lib_dir}/backend/smb -fi - -%postun krb-printing -if test ${1:-0} -eq 0 -a -e %{_bindir}/smbspool -a -d %{cups_lib_dir}/backend; then - ln -fs %{_bindir}/smbspool %{cups_lib_dir}/backend/smb -fi - %post -n libdcerpc-atsvc0 -p /sbin/ldconfig %postun -n libdcerpc-atsvc0 -p /sbin/ldconfig %post -n libdcerpc-binding0 -p /sbin/ldconfig @@ -1830,7 +1797,7 @@ fi %{_bindir}/testparm %dir %{cups_lib_dir} %dir %{cups_lib_dir}/backend -%ghost %{cups_lib_dir}/backend/smb +%{cups_lib_dir}/backend/smb %{_libdir}/libnss_wins.so.* %dir %{_libdir}/samba %{_libdir}/samba/charset @@ -2132,13 +2099,6 @@ fi %doc %{_datadir}/susehelp %endif -%files krb-printing -%defattr(-,root,root) -%attr(0700,root,root) %{_bindir}/get_printing_ticket -%dir %{cups_lib_dir} -%dir %{cups_lib_dir}/backend -%ghost %{cups_lib_dir}/backend/smb - %files -n libdcerpc-atsvc0 %defattr(-,root,root) %_libdir/libdcerpc-atsvc.so.0* diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index be1cec1..1df27fe 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:d07624fd6c8d5c509da49c7a35963749c87507416acdd8667e510cf3be5bb351 -size 54414 +oid sha256:df9497d1ac62cc685894d37b2653cb692ca3b402fb7dcbc2cbf36fc707a78d4b +size 54431 From 4eb58754d2a02646dea695339bfed81789bd745eb8cd968fe4f1aedff5663cfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Fri, 10 Apr 2015 17:03:11 +0000 Subject: [PATCH 3/4] Remove missing file from series OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=460 --- patches.tar.bz2 | 4 ++-- samba.spec | 2 +- vendor-files.tar.bz2 | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index c4db941..7aba7d5 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e0ccffa6a015ef05259ad7ff1452c920a1daa07117b556ef8cd74713869cfaf2 -size 104391 +oid sha256:2ab5537bb6d69894c1bcd8038a85d703eb13ec12809419cdfa0957b3459c348d +size 104193 diff --git a/samba.spec b/samba.spec index 0a0b8be..f80e89c 100644 --- a/samba.spec +++ b/samba.spec @@ -143,7 +143,7 @@ BuildRequires: systemd-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3395 +%define SOURCE_TIMESTAMP 3396 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 1df27fe..63a3817 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:df9497d1ac62cc685894d37b2653cb692ca3b402fb7dcbc2cbf36fc707a78d4b -size 54431 +oid sha256:acec56bfb63e09ed3cf709c724ea14916e53f37f8f43612c88221fc1c373aeb8 +size 54362 From d300fc003c14225449f31203b7072fc45a26e9d760ee74cc3341ba2b44cb99cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Thu, 16 Apr 2015 12:28:14 +0000 Subject: [PATCH 4/4] - Update to 4.2.1. Check WHATSNEW.txt from the main tar ball, the web page, or the samba package change log for a detailed list of changes. - Prevent samba package updates from disabling samba kerberos printing. - Purge printer name cache on spoolss SetPrinter change; (bso#11210); (bnc#901813). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=461 --- patches.tar.bz2 | 4 ++-- samba-4.2.0.tar.asc | 7 ------- samba-4.2.0.tar.gz | 3 --- samba-4.2.1.tar.asc | 7 +++++++ samba-4.2.1.tar.gz | 3 +++ samba.changes | 49 ++++++++++++++++++++++++++++++++++++++++++++ samba.spec | 13 +++++++----- vendor-files.tar.bz2 | 4 ++-- 8 files changed, 71 insertions(+), 19 deletions(-) delete mode 100644 samba-4.2.0.tar.asc delete mode 100644 samba-4.2.0.tar.gz create mode 100644 samba-4.2.1.tar.asc create mode 100644 samba-4.2.1.tar.gz diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 7aba7d5..4ccf085 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2ab5537bb6d69894c1bcd8038a85d703eb13ec12809419cdfa0957b3459c348d -size 104193 +oid sha256:e546e49be077b61b88e2aa88c91c3eaad8dc859a0f1672afb87a838a7ddbfef1 +size 103790 diff --git a/samba-4.2.0.tar.asc b/samba-4.2.0.tar.asc deleted file mode 100644 index 6823595..0000000 --- a/samba-4.2.0.tar.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iEYEABECAAYFAlT3YnAACgkQbzORW2Vot+q1SACfcI+5whPJ5jPwMV2lNMJILZbp -p1EAoK90ECwS9PtnskIsXm9jprNkhJMC -=EFxp ------END PGP SIGNATURE----- diff --git a/samba-4.2.0.tar.gz b/samba-4.2.0.tar.gz deleted file mode 100644 index 3eecf7f..0000000 --- a/samba-4.2.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:66a6057815a971fee64fbe936ff6cbad542421a4bd52cba8d8d41afc9abc490f -size 20682204 diff --git a/samba-4.2.1.tar.asc b/samba-4.2.1.tar.asc new file mode 100644 index 0000000..8fe5ba3 --- /dev/null +++ b/samba-4.2.1.tar.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iEYEABECAAYFAlUup4MACgkQbzORW2Vot+obkgCffvK5FUhnuYVSa+xke4gppTkW +aMgAn3rjyLofe55IX5xkHrZX5iWypB02 +=ngCD +-----END PGP SIGNATURE----- diff --git a/samba-4.2.1.tar.gz b/samba-4.2.1.tar.gz new file mode 100644 index 0000000..86d6752 --- /dev/null +++ b/samba-4.2.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:37eaa239c116dc2c22c29c5a2931eb178ed22e48b594687247446703119b4ac3 +size 20701467 diff --git a/samba.changes b/samba.changes index 1acb5b6..58ad6e4 100644 --- a/samba.changes +++ b/samba.changes @@ -1,8 +1,57 @@ +------------------------------------------------------------------- +Thu Apr 16 11:32:55 UTC 2015 - lmuelle@suse.com + +- Update to 4.2.1. + + s3:winbind:grent: Don't stop group enumeration when a group has no gid; + (bso#8905). + + Initialize dwFlags field of DNS_RPC_NODE structure; (bso#9791). + + s3: lib: ntlmssp: If NTLMSSP_NEGOTIATE_TARGET_INFO isn't set, cope with + servers that don't send the 2 unused fields; (bso#10016). + + build:wafadmin: Fix use of spaces instead of tabs; (bso#10476). + + waf: Fix the build on openbsd; (bso#10476). + + s3: client: "client use spnego principal = yes" code checks wrong name; + (bso#10888). + + spoolss: Retrieve published printer GUID if not in registry; (bso#11018). + + s3: lib: libsmbclient: If reusing a server struct, check every cli->timout + miliseconds if it's still valid before use; (bso#11079). + + vfs_fruit: Enhance handling of malformed AppleDouble files; (bso#11125). + + backupkey: Explicitly link to gnutls and gcrypt; (bso#11135). + + replace: Remove superfluous check for gcrypt header; (bso#11135). + + Backport subunit changes; (bso#11137). + + libcli/auth: Match Declaration of netlogon_creds_cli_context_tmp with + implementation; (bso#11140). + + s3-winbind: Fix cached user group lookup of trusted domains; (bso#11143). + + talloc: Version 2.1.2; (bso#11144). + + Update libwbclient version to 0.12; (bso#11149). + + brlock: Use 0 instead of empty initializer list; (bso#11153). + + s4:auth/gensec_gssapi: Let gensec_gssapi_update() return + NT_STATUS_LOGON_FAILURE for unknown errors; (bso#11164). + + docs/idmap_rid: Remove deprecated base_rid from example; (bso#11169); + (bnc#913304). + + s3: libcli: smb1: Ensure we correctly finish a tevent req if the writev + fails in the SMB1 case; (bso#11173). + + backupkey: Use ndr_pull_struct_blob_all(); (bso#11174). + + Fix lots of winbindd zombie processes on Solaris platform; (bso#11175). + + s3: libsmbclient: Add missing talloc stackframe; (bso#11177). + + s4-process_model: Do not close random fds while forking; (bso#11180). + + s3-passdb: Fix 'force user' with winbind default domain; (bso#11185). + +------------------------------------------------------------------- +Thu Apr 16 10:20:52 UTC 2015 - lmuelle@suse.com + +- Prevent samba package updates from disabling samba kerberos printing. + ------------------------------------------------------------------- Thu Apr 9 12:02:25 UTC 2015 - noel.power@suse.com - Add sparse file support for samba; (fate#318424). +------------------------------------------------------------------- +Tue Mar 31 23:21:12 UTC 2015 - ddiss@suse.com + +- Purge printer name cache on spoolss SetPrinter change; (bso#11210); + (bnc#901813). + ------------------------------------------------------------------- Fri Mar 20 13:21:43 UTC 2015 - ddiss@suse.com diff --git a/samba.spec b/samba.spec index f80e89c..93a3545 100644 --- a/samba.spec +++ b/samba.spec @@ -121,7 +121,7 @@ BuildRequires: libavahi-devel BuildRequires: systemd BuildRequires: systemd-devel %endif -%define samba_ver 4.2.0 +%define samba_ver 4.2.1 %define samba_ver_suffix %nil %if "%{samba_ver_suffix}" == "" %define samba_source_location http://ftp.samba.org/pub/samba/stable/samba-%{version}.tar.gz @@ -143,11 +143,11 @@ BuildRequires: systemd-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3396 +%define SOURCE_TIMESTAMP 3400 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 -Version: 4.2.0 +Version: 4.2.1 Release: 0 Url: http://www.samba.org/ Provides: samba-gplv3 = %{version} @@ -1384,7 +1384,7 @@ for file in winbindd.h winbindd_proto.h; do done # cups SMB support mkdir -p %{buildroot}/%{cups_lib_dir}/backend/ -ln -s %{_bindir}/smbspool %{buildroot}/%{cups_lib_dir}/backend/smb +touch %{buildroot}/%{cups_lib_dir}/backend/smb # pam_smbpass is missing cp -a source3/pam_smbpass/samples examples/pam_smbpass install -m 0644 source3/pam_smbpass/CHANGELOG examples/pam_smbpass/CHANGELOG @@ -1510,6 +1510,9 @@ if [ ${1:-0} -gt 1 -a -f /var/adm/backup/etc_samba_smbfstab-move ]; then fi fi %endif +if ! test -e %{_bindir}/get_printing_ticket; then + ln -fs %{_bindir}/smbspool %{cups_lib_dir}/backend/smb +fi %if 0%{?suse_version} > 1220 %{fillup_only -ans samba client} %endif @@ -1797,7 +1800,7 @@ fi %{_bindir}/testparm %dir %{cups_lib_dir} %dir %{cups_lib_dir}/backend -%{cups_lib_dir}/backend/smb +%ghost %{cups_lib_dir}/backend/smb %{_libdir}/libnss_wins.so.* %dir %{_libdir}/samba %{_libdir}/samba/charset diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 63a3817..aecb37f 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:acec56bfb63e09ed3cf709c724ea14916e53f37f8f43612c88221fc1c373aeb8 -size 54362 +oid sha256:1e216db3228a520c8491727319c8ffb5c92a47813f0b97131308ecdd43346661 +size 52927