From 625590cf3f4f9c39e57da920f5df2d790f183ae1276ef4f664ebe6210f2fd85d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Mon, 11 Aug 2014 17:16:42 +0000 Subject: [PATCH 1/4] Create the cups smb backend as sym link pointing to smbspool; (bnc#891220). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=428 --- patches.tar.bz2 | 4 ++-- samba.changes | 5 +++++ samba.spec | 6 +++--- vendor-files.tar.bz2 | 4 ++-- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index a431ccc..86ab68f 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b1d7aef655bfcf783d078f8dc200c676a435dc91f54b96f519cd61745d141908 -size 280856 +oid sha256:8a929e9e23b0cb919fe6784c766384ff0e1a9417bba38beca1ac18da834e22d6 +size 284989 diff --git a/samba.changes b/samba.changes index 83c30ee..f29322c 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Aug 11 11:55:35 UTC 2014 - lmuelle@suse.com + +- Create the cups smb backend as sym link pointing to smbspool; (bnc#891220). + ------------------------------------------------------------------- Fri Aug 1 16:34:44 UTC 2014 - ddiss@suse.com diff --git a/samba.spec b/samba.spec index c6a50b8..e8046c2 100644 --- a/samba.spec +++ b/samba.spec @@ -148,7 +148,7 @@ BuildRequires: systemd-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3274 +%define SOURCE_TIMESTAMP 3276 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 @@ -1423,7 +1423,7 @@ for file in winbindd.h winbindd_proto.h; do done # cups SMB support mkdir -p %{buildroot}/%{cups_lib_dir}/backend/ -touch %{buildroot}/%{cups_lib_dir}/backend/smb +ln -s %{_bindir}/smbspool %{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 @@ -1853,7 +1853,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 diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index b83577b..962d608 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:07e26efe1f46b9dd9cd561516465f7b79f85f07589d709f647c740cd58dfd0a1 -size 54734 +oid sha256:2e1b94b046a138dce9e38a2b9e812668abbd3e30b6fa36386b6ae35b3fb27b80 +size 54885 From 6910e62c33893a9bcee9cdaed6f45c009f9c82061d072ca27f6c1faf22a2e125 Mon Sep 17 00:00:00 2001 From: David Disseldorp Date: Tue, 12 Aug 2014 12:51:05 +0000 Subject: [PATCH 2/4] - Reduce printer_list.tdb lock contention during printcap update; (bso#10652); (bnc#883870). + Only update the printer share inventory when needed. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=429 --- patches.tar.bz2 | 4 ++-- samba.changes | 7 +++++++ samba.spec | 2 +- vendor-files.tar.bz2 | 4 ++-- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 86ab68f..b5ebaaa 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8a929e9e23b0cb919fe6784c766384ff0e1a9417bba38beca1ac18da834e22d6 -size 284989 +oid sha256:ab1fb8f0db4cd139c7485b10912cd639abfcd5a3344262dab38cf33fe787f802 +size 288674 diff --git a/samba.changes b/samba.changes index f29322c..d0873d6 100644 --- a/samba.changes +++ b/samba.changes @@ -92,6 +92,13 @@ Mon Jul 28 10:12:04 UTC 2014 - lmuelle@suse.com (bso#10706). + s3: Fix missing braces in nfs4_acls.c. +------------------------------------------------------------------- +Wed Jul 9 22:59:09 UTC 2014 - ddiss@suse.com + +- Reduce printer_list.tdb lock contention during printcap update; + (bso#10652); (bnc#883870). + + Only update the printer share inventory when needed. + ------------------------------------------------------------------- Tue Jul 8 12:35:25 UTC 2014 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index e8046c2..3ae2799 100644 --- a/samba.spec +++ b/samba.spec @@ -148,7 +148,7 @@ BuildRequires: systemd-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3276 +%define SOURCE_TIMESTAMP 3277 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 962d608..bad0ed3 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:2e1b94b046a138dce9e38a2b9e812668abbd3e30b6fa36386b6ae35b3fb27b80 -size 54885 +oid sha256:74d5a1a18fed17bda536ceb06f8f6b33648d5fb595bdedbf53ff34c7507342b0 +size 54103 From c2eaea58ab8606e14f1c7d618fc13c381dc4d81231ee760a09c2cd8259b15feb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Wed, 13 Aug 2014 12:08:19 +0000 Subject: [PATCH 3/4] build: disable mmap on s390 systems; (bso#10765); (bnc#886193). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=430 --- patches.tar.bz2 | 4 ++-- samba.changes | 5 +++++ samba.spec | 2 +- vendor-files.tar.bz2 | 4 ++-- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index b5ebaaa..a70dd4e 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ab1fb8f0db4cd139c7485b10912cd639abfcd5a3344262dab38cf33fe787f802 -size 288674 +oid sha256:c5b35f2be4c7e673002ccaa85a273a1973480df687ba3b991ccf9292993da72a +size 290809 diff --git a/samba.changes b/samba.changes index d0873d6..2f9f8b4 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Aug 13 11:44:31 UTC 2014 - lmuelle@suse.com + +- build: disable mmap on s390 systems; (bso#10765); (bnc#886193). + ------------------------------------------------------------------- Mon Aug 11 11:55:35 UTC 2014 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index 3ae2799..5e76feb 100644 --- a/samba.spec +++ b/samba.spec @@ -148,7 +148,7 @@ BuildRequires: systemd-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3277 +%define SOURCE_TIMESTAMP 3278 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index bad0ed3..5457aaf 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:74d5a1a18fed17bda536ceb06f8f6b33648d5fb595bdedbf53ff34c7507342b0 -size 54103 +oid sha256:0100498a5fcd93121cf35fcf5568ca0d6c101c496d51babef6e91b615204c65f +size 54710 From e3dc000626e64272ca39e2861152d2a7bf4402882873966bbd9b70d7ca3c20a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Tue, 19 Aug 2014 14:35:50 +0000 Subject: [PATCH 4/4] Remove pre-11.2 patch which by default uses the smbpasswd passdb backend. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=431 --- patches.tar.bz2 | 4 ++-- samba.changes | 5 +++++ samba.spec | 5 +---- vendor-files.tar.bz2 | 4 ++-- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index a70dd4e..0ff814c 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c5b35f2be4c7e673002ccaa85a273a1973480df687ba3b991ccf9292993da72a -size 290809 +oid sha256:2a81bc72744e0af9c8a1331664eb1b57f26a8789119ab40bd1d185608f965bdd +size 291711 diff --git a/samba.changes b/samba.changes index 2f9f8b4..db963eb 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Aug 19 14:07:53 UTC 2014 - lmuelle@suse.com + +- Remove pre-11.2 patch which by default uses the smbpasswd passdb backend. + ------------------------------------------------------------------- Wed Aug 13 11:44:31 UTC 2014 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index 5e76feb..6a7bf74 100644 --- a/samba.spec +++ b/samba.spec @@ -131,9 +131,6 @@ BuildRequires: systemd-devel %define samba_source_signature_location http://ftp.samba.org/pub/samba/rc/samba-%{version}%{samba_ver_suffix}.tar.asc %endif %define samba_ver_full %{samba_ver}%{samba_ver_suffix} -%if 0%{?suse_version} && 0%{?suse_version} < 1111 -%define guards_symbols default_passdb_backend -%endif %if 0%{?suse_version} && 0%{?suse_version} < 1031 %define libsmbclient_name libsmbclient %define libsmbsharemodes_name libsmbsharemodes @@ -148,7 +145,7 @@ BuildRequires: systemd-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3278 +%define SOURCE_TIMESTAMP 3280 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 5457aaf..d30f622 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:0100498a5fcd93121cf35fcf5568ca0d6c101c496d51babef6e91b615204c65f -size 54710 +oid sha256:155bd6de1016ca8dd384bf800c9bd8394ac40ac508773aff353437fb4075d5f4 +size 54886