From 10ae381be8c9976f3959deab3692a61025527cb820960f451f90b8ba27888a3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Tue, 13 Nov 2012 18:20:36 +0000 Subject: [PATCH 01/20] - s4:torture/smb2: improve the smb2.create.blob tes; (bso#9209). - lib/krb5_wrap: request enc_types in the correct order; (bso#9272). - Fix net ads join message for the dns domain; (bso#9326). - docs-xml: fix use of tag; (bso#9345). - s3-aio_pthread: Optimize aio_pthread_handle_completion; (bso#9359). - s3:winbind: Failover if netlogon pipe is not available; (bso#9386). - Execute the run_permissions macro on pre-11.4 systems and else the set_permission one if available. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=264 --- build-source-timestamp | 2 +- patches.tar.bz2 | 4 +-- samba-doc.spec | 2 +- samba.changes | 15 ++++++++++-- samba.spec | 55 +++++++++++++++++++++--------------------- vendor-files.tar.bz2 | 4 +-- 6 files changed, 47 insertions(+), 35 deletions(-) diff --git a/build-source-timestamp b/build-source-timestamp index 4c51387..140ecaf 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -2851 +2853 Branch : 3.6.9 diff --git a/patches.tar.bz2 b/patches.tar.bz2 index ecf7e3b..1ec7070 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ccd8b0c67806f439428db83bbefc6eb6d17d654a67f80169dd8b96a0744561b9 -size 33795 +oid sha256:5470d9ae704154a413335bc0963b6ea79d81c88a17970cba27f9f2de797e08a1 +size 40512 diff --git a/samba-doc.spec b/samba-doc.spec index 8dea0cb..d4243ec 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -462,7 +462,7 @@ This package contains all the Samba documentation as it is not part of the man pages. -Source Timestamp: 2851 +Source Timestamp: 2853 Branch : 3.6.9 %changelog diff --git a/samba.changes b/samba.changes index 681deb7..8442c74 100644 --- a/samba.changes +++ b/samba.changes @@ -1,7 +1,18 @@ ------------------------------------------------------------------- -Wed Oct 31 16:48:12 UTC 2012 - lmuelle@suse.com +Tue Nov 13 17:26:15 UTC 2012 - lmuelle@suse.com -- Only execute the run_permissions macro on pre-12.3 systems. +- s4:torture/smb2: improve the smb2.create.blob tes; (bso#9209). +- lib/krb5_wrap: request enc_types in the correct order; (bso#9272). +- Fix net ads join message for the dns domain; (bso#9326). +- docs-xml: fix use of tag; (bso#9345). +- s3-aio_pthread: Optimize aio_pthread_handle_completion; (bso#9359). +- s3:winbind: Failover if netlogon pipe is not available; (bso#9386). + +------------------------------------------------------------------- +Thu Nov 1 20:26:19 UTC 2012 - lmuelle@suse.com + +- Execute the run_permissions macro on pre-11.4 systems and else the + set_permission one if available. ------------------------------------------------------------------- Mon Oct 29 19:48:51 UTC 2012 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index c63c0e4..21853a3 100644 --- a/samba.spec +++ b/samba.spec @@ -224,7 +224,7 @@ binary packages of the most current Samba version, and a bug reporting how to. -Source Timestamp: 2851 +Source Timestamp: 2853 Branch : 3.6.9 %package client @@ -265,7 +265,7 @@ binary packages of the most current Samba version, and a bug reporting how to. -Source Timestamp: 2851 +Source Timestamp: 2853 Branch : 3.6.9 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -285,7 +285,7 @@ This package contains the static libraries and header files needed to develop programs which make use of Samba. -Source Timestamp: 2851 +Source Timestamp: 2853 Branch : 3.6.9 %endif @@ -310,7 +310,7 @@ This package contains all the Samba documentation as it is not part of the man pages. -Source Timestamp: 2851 +Source Timestamp: 2853 Branch : 3.6.9 %endif @@ -331,7 +331,7 @@ Requires: samba-client >= %{version} A wrapper binary to run smbspool with the original calling UID. -Source Timestamp: 2851 +Source Timestamp: 2853 Branch : 3.6.9 %if %{make_utils} @@ -347,7 +347,7 @@ Obsoletes: samba-gplv3-utils < %{version} Some of the debug-tools for developpers. -Source Timestamp: 2851 +Source Timestamp: 2853 Branch : 3.6.9 %endif @@ -380,7 +380,7 @@ PreReq: coreutils This is the winbind-daemon and the wbinfo-tool. -Source Timestamp: 2851 +Source Timestamp: 2853 Branch : 3.6.9 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -406,14 +406,14 @@ PreReq: /sbin/ldconfig %description -n libsmbclient -Source Timestamp: 2851 +Source Timestamp: 2853 Branch : 3.6.9 %else %description -n libsmbclient0 -Source Timestamp: 2851 +Source Timestamp: 2853 Branch : 3.6.9 %endif @@ -452,7 +452,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the smbclient programming interface. -Source Timestamp: 2851 +Source Timestamp: 2853 Branch : 3.6.9 %package -n libnetapi0 @@ -465,7 +465,7 @@ PreReq: /sbin/ldconfig This package includes the netapi library. -Source Timestamp: 2851 +Source Timestamp: 2853 Branch : 3.6.9 %package -n libnetapi-devel @@ -484,7 +484,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the netapi programming interface. -Source Timestamp: 2851 +Source Timestamp: 2853 Branch : 3.6.9 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -505,14 +505,14 @@ PreReq: /sbin/ldconfig %description -n libsmbsharemodes -Source Timestamp: 2851 +Source Timestamp: 2853 Branch : 3.6.9 %else %description -n libsmbsharemodes0 -Source Timestamp: 2851 +Source Timestamp: 2853 Branch : 3.6.9 %endif @@ -538,7 +538,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the smbsharemodes programming interface. -Source Timestamp: 2851 +Source Timestamp: 2853 Branch : 3.6.9 %package -n libwbclient0 @@ -551,7 +551,7 @@ PreReq: /sbin/ldconfig This package includes the wbclient library. -Source Timestamp: 2851 +Source Timestamp: 2853 Branch : 3.6.9 %package -n libwbclient-devel @@ -570,7 +570,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the wbclient programming interface. -Source Timestamp: 2851 +Source Timestamp: 2853 Branch : 3.6.9 %if 0%{?suse_version} && 0%{?suse_version} < 1211 @@ -587,7 +587,7 @@ PreReq: /sbin/ldconfig This package includes the talloc library. -Source Timestamp: 2851 +Source Timestamp: 2853 Branch : 3.6.9 %package -n libtalloc-devel @@ -608,7 +608,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the talloc programming interface. -Source Timestamp: 2851 +Source Timestamp: 2853 Branch : 3.6.9 %package -n libtdb1 @@ -623,7 +623,7 @@ PreReq: /sbin/ldconfig This package includes the tdb library. -Source Timestamp: 2851 +Source Timestamp: 2853 Branch : 3.6.9 %package -n libtdb-devel @@ -640,7 +640,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the tdb programming interface. -Source Timestamp: 2851 +Source Timestamp: 2853 Branch : 3.6.9 %package -n libtevent0 @@ -655,7 +655,7 @@ PreReq: /sbin/ldconfig This package includes the tevent library. -Source Timestamp: 2851 +Source Timestamp: 2853 Branch : 3.6.9 %package -n libtevent-devel @@ -677,7 +677,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the tevent programming interface. -Source Timestamp: 2851 +Source Timestamp: 2853 Branch : 3.6.9 %package -n libldb1 @@ -693,7 +693,7 @@ PreReq: /sbin/ldconfig This package includes the ldb library. -Source Timestamp: 2851 +Source Timestamp: 2853 Branch : 3.6.9 %package -n libldb-devel @@ -714,7 +714,7 @@ Requires: libtalloc-devel This package contains the static libraries and header files needed to develop programs which make use of the tevent programming interface. -Source Timestamp: 2851 +Source Timestamp: 2853 Branch : 3.6.9 %endif @@ -734,7 +734,7 @@ This tool aims to simplify the administration of a Samba Domain Controller that uses the ldapsam passdb backend. -Source Timestamp: 2851 +Source Timestamp: 2853 Branch : 3.6.9 %endif @@ -1379,9 +1379,10 @@ fi 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 -%if 0%{?suse_version} > 0 && 0%{?suse_version} < 1221 +%if 0%{?suse_version} > 0 && 0%{?suse_version} < 1131 %{?run_permissions:%{run_permissions}} %endif +%{?set_permissions:%{set_permissions}} %postun krb-printing if test ${1:-0} -eq 0 -a -e %{_bindir}/smbspool -a -d %{cups_lib_dir}/backend; then diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 0892653..78903f5 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:72b349c61801c05dde9475de0dbd151320bc5c1bdf7fc4abd78d7b8fbfcce48f -size 53392 +oid sha256:12cf3598c5f2493aeeaafb2b9381ab41a94b276a685c2d1b6dab7746b0c361e9 +size 53416 From d7f7767b74342f65b5cba38edff7b97c5c651f6a7172389b49027a87db33831d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Fri, 16 Nov 2012 19:12:09 +0000 Subject: [PATCH 02/20] - ACL masks incorrectly applied when setting ACLs; (bso#9236). - s3-kerberos: also try with AES keys, when decrypting tickets; (bso#9272). - lib/replace: replace all *printf function if we replace snprintf; (bso#9390). - lib/addns: don't depend on the order in resp->answers[]; (bso#9402). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=265 --- build-source-timestamp | 2 +- patches.tar.bz2 | 4 ++-- samba-doc.spec | 2 +- samba.changes | 8 +++++++ samba.spec | 52 +++++++++++++++++++++--------------------- vendor-files.tar.bz2 | 4 ++-- 6 files changed, 40 insertions(+), 32 deletions(-) diff --git a/build-source-timestamp b/build-source-timestamp index 140ecaf..43cb9ba 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -2853 +2854 Branch : 3.6.9 diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 1ec7070..a799b06 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5470d9ae704154a413335bc0963b6ea79d81c88a17970cba27f9f2de797e08a1 -size 40512 +oid sha256:15daa27b1e9ce9298207125340d336e722596eb679bd34873f8978e7f9e8ba3b +size 44109 diff --git a/samba-doc.spec b/samba-doc.spec index d4243ec..9c0a755 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -462,7 +462,7 @@ This package contains all the Samba documentation as it is not part of the man pages. -Source Timestamp: 2853 +Source Timestamp: 2854 Branch : 3.6.9 %changelog diff --git a/samba.changes b/samba.changes index 8442c74..bb0530f 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Nov 16 18:23:42 UTC 2012 - lmuelle@suse.com + +- ACL masks incorrectly applied when setting ACLs; (bso#9236). +- s3-kerberos: also try with AES keys, when decrypting tickets; (bso#9272). +- lib/replace: replace all *printf function if we replace snprintf; (bso#9390). +- lib/addns: don't depend on the order in resp->answers[]; (bso#9402). + ------------------------------------------------------------------- Tue Nov 13 17:26:15 UTC 2012 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index 21853a3..a3ae020 100644 --- a/samba.spec +++ b/samba.spec @@ -224,7 +224,7 @@ binary packages of the most current Samba version, and a bug reporting how to. -Source Timestamp: 2853 +Source Timestamp: 2854 Branch : 3.6.9 %package client @@ -265,7 +265,7 @@ binary packages of the most current Samba version, and a bug reporting how to. -Source Timestamp: 2853 +Source Timestamp: 2854 Branch : 3.6.9 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -285,7 +285,7 @@ This package contains the static libraries and header files needed to develop programs which make use of Samba. -Source Timestamp: 2853 +Source Timestamp: 2854 Branch : 3.6.9 %endif @@ -310,7 +310,7 @@ This package contains all the Samba documentation as it is not part of the man pages. -Source Timestamp: 2853 +Source Timestamp: 2854 Branch : 3.6.9 %endif @@ -331,7 +331,7 @@ Requires: samba-client >= %{version} A wrapper binary to run smbspool with the original calling UID. -Source Timestamp: 2853 +Source Timestamp: 2854 Branch : 3.6.9 %if %{make_utils} @@ -347,7 +347,7 @@ Obsoletes: samba-gplv3-utils < %{version} Some of the debug-tools for developpers. -Source Timestamp: 2853 +Source Timestamp: 2854 Branch : 3.6.9 %endif @@ -380,7 +380,7 @@ PreReq: coreutils This is the winbind-daemon and the wbinfo-tool. -Source Timestamp: 2853 +Source Timestamp: 2854 Branch : 3.6.9 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -406,14 +406,14 @@ PreReq: /sbin/ldconfig %description -n libsmbclient -Source Timestamp: 2853 +Source Timestamp: 2854 Branch : 3.6.9 %else %description -n libsmbclient0 -Source Timestamp: 2853 +Source Timestamp: 2854 Branch : 3.6.9 %endif @@ -452,7 +452,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the smbclient programming interface. -Source Timestamp: 2853 +Source Timestamp: 2854 Branch : 3.6.9 %package -n libnetapi0 @@ -465,7 +465,7 @@ PreReq: /sbin/ldconfig This package includes the netapi library. -Source Timestamp: 2853 +Source Timestamp: 2854 Branch : 3.6.9 %package -n libnetapi-devel @@ -484,7 +484,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the netapi programming interface. -Source Timestamp: 2853 +Source Timestamp: 2854 Branch : 3.6.9 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -505,14 +505,14 @@ PreReq: /sbin/ldconfig %description -n libsmbsharemodes -Source Timestamp: 2853 +Source Timestamp: 2854 Branch : 3.6.9 %else %description -n libsmbsharemodes0 -Source Timestamp: 2853 +Source Timestamp: 2854 Branch : 3.6.9 %endif @@ -538,7 +538,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the smbsharemodes programming interface. -Source Timestamp: 2853 +Source Timestamp: 2854 Branch : 3.6.9 %package -n libwbclient0 @@ -551,7 +551,7 @@ PreReq: /sbin/ldconfig This package includes the wbclient library. -Source Timestamp: 2853 +Source Timestamp: 2854 Branch : 3.6.9 %package -n libwbclient-devel @@ -570,7 +570,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the wbclient programming interface. -Source Timestamp: 2853 +Source Timestamp: 2854 Branch : 3.6.9 %if 0%{?suse_version} && 0%{?suse_version} < 1211 @@ -587,7 +587,7 @@ PreReq: /sbin/ldconfig This package includes the talloc library. -Source Timestamp: 2853 +Source Timestamp: 2854 Branch : 3.6.9 %package -n libtalloc-devel @@ -608,7 +608,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the talloc programming interface. -Source Timestamp: 2853 +Source Timestamp: 2854 Branch : 3.6.9 %package -n libtdb1 @@ -623,7 +623,7 @@ PreReq: /sbin/ldconfig This package includes the tdb library. -Source Timestamp: 2853 +Source Timestamp: 2854 Branch : 3.6.9 %package -n libtdb-devel @@ -640,7 +640,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the tdb programming interface. -Source Timestamp: 2853 +Source Timestamp: 2854 Branch : 3.6.9 %package -n libtevent0 @@ -655,7 +655,7 @@ PreReq: /sbin/ldconfig This package includes the tevent library. -Source Timestamp: 2853 +Source Timestamp: 2854 Branch : 3.6.9 %package -n libtevent-devel @@ -677,7 +677,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the tevent programming interface. -Source Timestamp: 2853 +Source Timestamp: 2854 Branch : 3.6.9 %package -n libldb1 @@ -693,7 +693,7 @@ PreReq: /sbin/ldconfig This package includes the ldb library. -Source Timestamp: 2853 +Source Timestamp: 2854 Branch : 3.6.9 %package -n libldb-devel @@ -714,7 +714,7 @@ Requires: libtalloc-devel This package contains the static libraries and header files needed to develop programs which make use of the tevent programming interface. -Source Timestamp: 2853 +Source Timestamp: 2854 Branch : 3.6.9 %endif @@ -734,7 +734,7 @@ This tool aims to simplify the administration of a Samba Domain Controller that uses the ldapsam passdb backend. -Source Timestamp: 2853 +Source Timestamp: 2854 Branch : 3.6.9 %endif diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 78903f5..494c365 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:12cf3598c5f2493aeeaafb2b9381ab41a94b276a685c2d1b6dab7746b0c361e9 -size 53416 +oid sha256:b105f85e801a15e9232b6d9e38d1b9f113564cf8769be6cae8928d380e8d4c6f +size 53421 From c9634f78537b71f5e78833d788622fda480baf8729f91a94ec54200dd9c4cdee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Thu, 22 Nov 2012 17:29:54 +0000 Subject: [PATCH 03/20] Add reference to bnc 779269, 787983, and 788159 to the package change log. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=266 --- build-source-timestamp | 2 +- patches.tar.bz2 | 4 ++-- samba-doc.spec | 2 +- samba.changes | 10 ++++---- samba.spec | 52 +++++++++++++++++++++--------------------- vendor-files.tar.bz2 | 4 ++-- 6 files changed, 37 insertions(+), 37 deletions(-) diff --git a/build-source-timestamp b/build-source-timestamp index 43cb9ba..29cc65b 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -2854 +2859 Branch : 3.6.9 diff --git a/patches.tar.bz2 b/patches.tar.bz2 index a799b06..b9ba18d 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:15daa27b1e9ce9298207125340d336e722596eb679bd34873f8978e7f9e8ba3b -size 44109 +oid sha256:17d73d7c2ddd14dcfc21f7bd646ff580f62ce243f0e822d4f1b8b6dce405f4df +size 44163 diff --git a/samba-doc.spec b/samba-doc.spec index 9c0a755..5c3f9e6 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -462,7 +462,7 @@ This package contains all the Samba documentation as it is not part of the man pages. -Source Timestamp: 2854 +Source Timestamp: 2859 Branch : 3.6.9 %changelog diff --git a/samba.changes b/samba.changes index bb0530f..2d1762d 100644 --- a/samba.changes +++ b/samba.changes @@ -66,7 +66,7 @@ Mon Oct 29 12:03:21 UTC 2012 - lmuelle@suse.com - Empty SPNEGO packet can cause smbd to crash; (bso#9174). - pam_winbind: Match more return codes when wbcGetPwnam has failed; (bso#9177). -- Fix crash bug in idmap_hash; (bso#9188). +- Fix crash bug in idmap_hash; (bso#9188); (bnc#788159). - SMB2 Create doesn't return correct MAX ACCESS access mask in blob; (bso#9189). - Fix service control for non-internal services; (bso#9192). @@ -152,7 +152,7 @@ Thu Aug 16 14:18:35 UTC 2012 - lmuelle@suse.com Mon Aug 6 20:41:15 UTC 2012 - lmuelle@suse.com - Update to 3.6.7. - + Fix resolving our own "Domain Local" groups; (bso#9052). + + Fix resolving our own "Domain Local" groups; (bso#9052); (bnc#779269). + Fix migrating printers while upgrading from 3.5.x; (bso#9026). ------------------------------------------------------------------- @@ -172,7 +172,7 @@ Mon Aug 6 19:40:23 UTC 2012 - lmuelle@suse.com (bso#9034). - Using asynchronous IO with SMB2 can return NT_STATUS_FILE_CLOSED in error instead ofNT_STATUS_FILE_LOCK_CONFLICT; (bso#9040). -- Fix resolving our own "Domain Local" groups; (bso#9052). +- Fix resolving our own "Domain Local" groups; (bso#9052); (bnc#779269). - Fix build against CUPS 1.6; (bso#9055). - Fix bugs in SMB2 credit handling code; (bso#9057). - rpcclient: Fix bad call to data_blob_const; (bso#9062). @@ -198,14 +198,14 @@ Mon Jun 25 19:46:31 UTC 2012 - lmuelle@suse.com - Update to 3.6.6. + Fix possible memory leaks in the Samba master process; (bso#8970). + Fix uninitialized memory read in talloc_free(); (bnc#764577). - + Fix joining of XP Pro workstations to 3.6 DCs; (bso#8373). + + Fix joining of XP Pro workstations to 3.6 DCs; (bso#8373); (bnc#787983). ------------------------------------------------------------------- Thu Jun 21 18:05:33 UTC 2012 - lmuelle@suse.com - resolve_ads() code can return zero addresses and miss valid DC IP addresses; (bso#8910). -- Can't join XP Pro workstations to 3.6.1 DC; (bso#8373). +- Can't join XP Pro workstations to 3.6.1 DC; (bso#8373); (bnc#787983). - winbind can hang as nbt_getdc() has no timeout; (bso#8953). - Fix crash bug in dns_create_probe when dns_create_update fails; (bso#8627) - s3-pid: Catch with pid filename's change when config file is not smb.conf; diff --git a/samba.spec b/samba.spec index a3ae020..5f05a50 100644 --- a/samba.spec +++ b/samba.spec @@ -224,7 +224,7 @@ binary packages of the most current Samba version, and a bug reporting how to. -Source Timestamp: 2854 +Source Timestamp: 2859 Branch : 3.6.9 %package client @@ -265,7 +265,7 @@ binary packages of the most current Samba version, and a bug reporting how to. -Source Timestamp: 2854 +Source Timestamp: 2859 Branch : 3.6.9 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -285,7 +285,7 @@ This package contains the static libraries and header files needed to develop programs which make use of Samba. -Source Timestamp: 2854 +Source Timestamp: 2859 Branch : 3.6.9 %endif @@ -310,7 +310,7 @@ This package contains all the Samba documentation as it is not part of the man pages. -Source Timestamp: 2854 +Source Timestamp: 2859 Branch : 3.6.9 %endif @@ -331,7 +331,7 @@ Requires: samba-client >= %{version} A wrapper binary to run smbspool with the original calling UID. -Source Timestamp: 2854 +Source Timestamp: 2859 Branch : 3.6.9 %if %{make_utils} @@ -347,7 +347,7 @@ Obsoletes: samba-gplv3-utils < %{version} Some of the debug-tools for developpers. -Source Timestamp: 2854 +Source Timestamp: 2859 Branch : 3.6.9 %endif @@ -380,7 +380,7 @@ PreReq: coreutils This is the winbind-daemon and the wbinfo-tool. -Source Timestamp: 2854 +Source Timestamp: 2859 Branch : 3.6.9 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -406,14 +406,14 @@ PreReq: /sbin/ldconfig %description -n libsmbclient -Source Timestamp: 2854 +Source Timestamp: 2859 Branch : 3.6.9 %else %description -n libsmbclient0 -Source Timestamp: 2854 +Source Timestamp: 2859 Branch : 3.6.9 %endif @@ -452,7 +452,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the smbclient programming interface. -Source Timestamp: 2854 +Source Timestamp: 2859 Branch : 3.6.9 %package -n libnetapi0 @@ -465,7 +465,7 @@ PreReq: /sbin/ldconfig This package includes the netapi library. -Source Timestamp: 2854 +Source Timestamp: 2859 Branch : 3.6.9 %package -n libnetapi-devel @@ -484,7 +484,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the netapi programming interface. -Source Timestamp: 2854 +Source Timestamp: 2859 Branch : 3.6.9 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -505,14 +505,14 @@ PreReq: /sbin/ldconfig %description -n libsmbsharemodes -Source Timestamp: 2854 +Source Timestamp: 2859 Branch : 3.6.9 %else %description -n libsmbsharemodes0 -Source Timestamp: 2854 +Source Timestamp: 2859 Branch : 3.6.9 %endif @@ -538,7 +538,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the smbsharemodes programming interface. -Source Timestamp: 2854 +Source Timestamp: 2859 Branch : 3.6.9 %package -n libwbclient0 @@ -551,7 +551,7 @@ PreReq: /sbin/ldconfig This package includes the wbclient library. -Source Timestamp: 2854 +Source Timestamp: 2859 Branch : 3.6.9 %package -n libwbclient-devel @@ -570,7 +570,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the wbclient programming interface. -Source Timestamp: 2854 +Source Timestamp: 2859 Branch : 3.6.9 %if 0%{?suse_version} && 0%{?suse_version} < 1211 @@ -587,7 +587,7 @@ PreReq: /sbin/ldconfig This package includes the talloc library. -Source Timestamp: 2854 +Source Timestamp: 2859 Branch : 3.6.9 %package -n libtalloc-devel @@ -608,7 +608,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the talloc programming interface. -Source Timestamp: 2854 +Source Timestamp: 2859 Branch : 3.6.9 %package -n libtdb1 @@ -623,7 +623,7 @@ PreReq: /sbin/ldconfig This package includes the tdb library. -Source Timestamp: 2854 +Source Timestamp: 2859 Branch : 3.6.9 %package -n libtdb-devel @@ -640,7 +640,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the tdb programming interface. -Source Timestamp: 2854 +Source Timestamp: 2859 Branch : 3.6.9 %package -n libtevent0 @@ -655,7 +655,7 @@ PreReq: /sbin/ldconfig This package includes the tevent library. -Source Timestamp: 2854 +Source Timestamp: 2859 Branch : 3.6.9 %package -n libtevent-devel @@ -677,7 +677,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the tevent programming interface. -Source Timestamp: 2854 +Source Timestamp: 2859 Branch : 3.6.9 %package -n libldb1 @@ -693,7 +693,7 @@ PreReq: /sbin/ldconfig This package includes the ldb library. -Source Timestamp: 2854 +Source Timestamp: 2859 Branch : 3.6.9 %package -n libldb-devel @@ -714,7 +714,7 @@ Requires: libtalloc-devel This package contains the static libraries and header files needed to develop programs which make use of the tevent programming interface. -Source Timestamp: 2854 +Source Timestamp: 2859 Branch : 3.6.9 %endif @@ -734,7 +734,7 @@ This tool aims to simplify the administration of a Samba Domain Controller that uses the ldapsam passdb backend. -Source Timestamp: 2854 +Source Timestamp: 2859 Branch : 3.6.9 %endif diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 494c365..fc7528e 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:b105f85e801a15e9232b6d9e38d1b9f113564cf8769be6cae8928d380e8d4c6f -size 53421 +oid sha256:5cb085c5f42add160e2307bbd845681de9d20a6bcf535734233f0cb512dd793c +size 53432 From 4ec00e0e1f2c816565f230a7b41f01c9087f1956efa91e78b481ee319b2c12f7 Mon Sep 17 00:00:00 2001 From: David Disseldorp Date: Thu, 22 Nov 2012 18:44:20 +0000 Subject: [PATCH 04/20] Add bnc#790741 reference for bso#8769: Fix RAW printing for normal users. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=267 --- build-source-timestamp | 2 +- patches.tar.bz2 | 4 ++-- samba.changes | 2 +- vendor-files.tar.bz2 | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build-source-timestamp b/build-source-timestamp index 29cc65b..122517b 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -2859 +2860 Branch : 3.6.9 diff --git a/patches.tar.bz2 b/patches.tar.bz2 index b9ba18d..a13ab5e 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:17d73d7c2ddd14dcfc21f7bd646ff580f62ce243f0e822d4f1b8b6dce405f4df -size 44163 +oid sha256:7f1ba3f9d53c7c2381eeec962016ab1b3e5d4be8bc72fba53e5f017c381063c2 +size 44258 diff --git a/samba.changes b/samba.changes index 2d1762d..64ffa10 100644 --- a/samba.changes +++ b/samba.changes @@ -49,7 +49,7 @@ Mon Oct 29 12:03:21 UTC 2012 - lmuelle@suse.com - Fix wrong test == syntax in configure; (bso#8146). - Fix --with(out)-sendfile-support option handling in autoconf; (bso#8344). - Fix builtin forms order to match Windows again; (bso#8632). -- Fix RAW printing for normal users; (bso#8769). +- Fix RAW printing for normal users; (bso#8769); (bnc#790741). - Initialise ticket to ensure we do not invalid memory; (bso#8788). - Fix 'net rpc share allowedusers' to work with 2008r2; (bso#8966). - Fix crash on null pam change pw response; (bso#9013). diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index fc7528e..5c59a38 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:5cb085c5f42add160e2307bbd845681de9d20a6bcf535734233f0cb512dd793c -size 53432 +oid sha256:5f52a65c1ef22eddf2d8c7a11caef3577c34f6acb7cc294509892e6fa18df2f5 +size 53908 From 89ce03c8c7096963eace9dab4383bd928a0420acbf132d803b8ec4ce49295d61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Fri, 30 Nov 2012 20:34:48 +0000 Subject: [PATCH 05/20] Don't clutter the spec file diff view; (bnc#783384). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=268 --- build-source-timestamp | 3 +- patches.tar.bz2 | 4 +- samba-doc.spec | 12 +-- samba.changes | 5 ++ samba.spec | 196 +++++++++++++++++------------------------ vendor-files.tar.bz2 | 4 +- 6 files changed, 95 insertions(+), 129 deletions(-) diff --git a/build-source-timestamp b/build-source-timestamp index 122517b..37041f8 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1 @@ -2860 -Branch : 3.6.9 +SOURCE_TIMESTAMP="2866" diff --git a/patches.tar.bz2 b/patches.tar.bz2 index a13ab5e..71d4582 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7f1ba3f9d53c7c2381eeec962016ab1b3e5d4be8bc72fba53e5f017c381063c2 -size 44258 +oid sha256:88e41f7812dae00bd6818788c338388a231b0aae5c856c1b140241f185c3bb2a +size 44082 diff --git a/samba-doc.spec b/samba-doc.spec index 5c3f9e6..652ff19 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -17,7 +17,6 @@ # norootforbuild - Name: samba-doc %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1140 BuildRequires: autoconf @@ -117,8 +116,10 @@ BuildRequires: libtevent-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif +%define SOURCE_TIMESTAMP 2866 +%define BRANCH 3.6.9 Version: 3.6.9 -Release: 1 +Release: 0 %define ldapsmb_ver 1.34b Url: http://www.samba.org/ License: GPL-3.0+ @@ -199,7 +200,6 @@ BuildRequires: ccache %define cups_lib_dir %{_libdir}/cups %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build - %prep # samba-doc nowadays is part the main samba spec file %if 0%{?suse_version} && 0%{?suse_version} < 1111 @@ -447,7 +447,6 @@ fi # samba-doc nowadays is part the main samba spec file %if 0%{?suse_version} && 0%{?suse_version} < 1111 - %files -f filelist-samba-doc %defattr(-,root,root) %dir %{DOCDIR} @@ -458,11 +457,12 @@ fi %endif %description +Source timestamp: %{SOURCE_TIMESTAMP} +Branch: %{BRANCH} + This package contains all the Samba documentation as it is not part of the man pages. -Source Timestamp: 2859 -Branch : 3.6.9 %changelog diff --git a/samba.changes b/samba.changes index 64ffa10..3e2e718 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Nov 30 18:14:37 UTC 2012 - lmuelle@suse.com + +- Don't clutter the spec file diff view; (bnc#783384). + ------------------------------------------------------------------- Fri Nov 16 18:23:42 UTC 2012 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index 5f05a50..627bd43 100644 --- a/samba.spec +++ b/samba.spec @@ -17,7 +17,6 @@ # norootforbuild - Name: samba %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1140 BuildRequires: autoconf @@ -117,8 +116,10 @@ BuildRequires: libtevent-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif +%define SOURCE_TIMESTAMP 2866 +%define BRANCH 3.6.9 Version: 3.6.9 -Release: 1 +Release: 0 %define ldapsmb_ver 1.34b License: GPL-3.0+ Url: http://www.samba.org/ @@ -208,6 +209,9 @@ BuildRequires: ccache BuildRoot: %{_tmppath}/%{name}-%{version}-build %description +Source timestamp: %{SOURCE_TIMESTAMP} +Branch: %{BRANCH} + Samba is a suite of programs that allows SMB/CIFS clients to use the Unix file space, printers, and authentication subsystem. @@ -224,9 +228,6 @@ binary packages of the most current Samba version, and a bug reporting how to. -Source Timestamp: 2859 -Branch : 3.6.9 - %package client License: GPL-3.0+ Summary: Samba Client Utilities @@ -249,6 +250,9 @@ PreReq: coreutils Requires: cifs-utils %description client +Source timestamp: %{SOURCE_TIMESTAMP} +Branch: %{BRANCH} + Samba is a suite of programs that allows SMB/CIFS clients to use the Unix file space, printers, and authentication subsystem. @@ -265,11 +269,7 @@ binary packages of the most current Samba version, and a bug reporting how to. -Source Timestamp: 2859 -Branch : 3.6.9 - %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 - %package devel License: GPL-3.0+ Summary: Libraries and Header Files to Develop Programs with Samba Support @@ -281,13 +281,13 @@ Obsoletes: samba-devel-64bit %endif %description devel +Source timestamp: %{SOURCE_TIMESTAMP} +Branch: %{BRANCH} + This package contains the static libraries and header files needed to develop programs which make use of Samba. -Source Timestamp: 2859 -Branch : 3.6.9 - %endif %if 0%{?suse_version} && 0%{?suse_version} < 1001 || 0%{?suse_version} > 1110 @@ -306,13 +306,13 @@ BuildArch: noarch %endif %description doc +Source timestamp: %{SOURCE_TIMESTAMP} +Branch: %{BRANCH} + This package contains all the Samba documentation as it is not part of the man pages. -Source Timestamp: 2859 -Branch : 3.6.9 - %endif %package krb-printing @@ -328,28 +328,27 @@ PreReq: permissions Requires: samba-client >= %{version} %description krb-printing +Source timestamp: %{SOURCE_TIMESTAMP} +Branch: %{BRANCH} + A wrapper binary to run smbspool with the original calling UID. -Source Timestamp: 2859 -Branch : 3.6.9 - %if %{make_utils} %package utils - Summary: debug tools Group: Productivity/Networking/Samba Provides: samba-gplv3-utils = %{version} Obsoletes: samba-gplv3-utils < %{version} %description utils +Source timestamp: %{SOURCE_TIMESTAMP} +Branch: %{BRANCH} + Some of the debug-tools for developpers. -Source Timestamp: 2859 -Branch : 3.6.9 - %endif %package winbind @@ -377,20 +376,17 @@ PreReq: /usr/sbin/groupadd PreReq: coreutils %description winbind +Source timestamp: %{SOURCE_TIMESTAMP} +Branch: %{BRANCH} + This is the winbind-daemon and the wbinfo-tool. -Source Timestamp: 2859 -Branch : 3.6.9 - %if 0%{?suse_version} && 0%{?suse_version} < 1031 - %package -n libsmbclient License: GPL-3.0+ %else - %package -n libsmbclient0 - License: GPL-3.0+ Provides: libsmbclient = %{version} Obsoletes: libsmbclient @@ -403,20 +399,13 @@ Group: System/Libraries PreReq: /sbin/ldconfig %if 0%{?suse_version} && 0%{?suse_version} < 1031 - %description -n libsmbclient - -Source Timestamp: 2859 -Branch : 3.6.9 - %else - %description -n libsmbclient0 - -Source Timestamp: 2859 -Branch : 3.6.9 - %endif +Source timestamp: %{SOURCE_TIMESTAMP} +Branch: %{BRANCH} + This package includes the libsmbclient library. libsmbclient is provided by the libsmbclient0 package. @@ -425,6 +414,7 @@ This entry is required to allow a samba.spec file providing libsmbclient for SUSE version < 11.0 while versions > 10.0 will have libsmbclient0. + %package -n libsmbclient-devel License: GPL-3.0+ Summary: Libraries and Header Files to Develop Programs with smbclient Support @@ -448,13 +438,13 @@ Requires: libsmbclient0 = %{version} %endif %description -n libsmbclient-devel +Source timestamp: %{SOURCE_TIMESTAMP} +Branch: %{BRANCH} + This package contains the static libraries and header files needed to develop programs which make use of the smbclient programming interface. -Source Timestamp: 2859 -Branch : 3.6.9 - %package -n libnetapi0 License: GPL-3.0+ Summary: Samba netapi Library @@ -462,12 +452,12 @@ Group: System/Libraries PreReq: /sbin/ldconfig %description -n libnetapi0 +Source timestamp: %{SOURCE_TIMESTAMP} +Branch: %{BRANCH} + This package includes the netapi library. -Source Timestamp: 2859 -Branch : 3.6.9 - %package -n libnetapi-devel License: GPL-3.0+ Summary: Libraries and Header Files to Develop Programs with netapi Support @@ -480,21 +470,18 @@ BuildRequires: pkgconfig Requires: libnetapi0 = %{version} %description -n libnetapi-devel +Source timestamp: %{SOURCE_TIMESTAMP} +Branch: %{BRANCH} + This package contains the static libraries and header files needed to develop programs which make use of the netapi programming interface. -Source Timestamp: 2859 -Branch : 3.6.9 - %if 0%{?suse_version} && 0%{?suse_version} < 1031 - %package -n libsmbsharemodes License: GPL-3.0+ %else - %package -n libsmbsharemodes0 - License: GPL-3.0+ %endif Summary: Samba smbsharemodes Library @@ -502,22 +489,16 @@ Group: System/Libraries PreReq: /sbin/ldconfig %if 0%{?suse_version} && 0%{?suse_version} < 1031 - %description -n libsmbsharemodes - -Source Timestamp: 2859 -Branch : 3.6.9 - %else - %description -n libsmbsharemodes0 - -Source Timestamp: 2859 -Branch : 3.6.9 - %endif +Source timestamp: %{SOURCE_TIMESTAMP} +Branch: %{BRANCH} + This package includes the smbsharemodes library. + %package -n libsmbsharemodes-devel License: GPL-3.0+ Summary: Libraries and Header Files to Develop Programs with smbsharemodes Support @@ -534,13 +515,13 @@ Requires: libsmbsharemodes0 = %{version} %endif %description -n libsmbsharemodes-devel +Source timestamp: %{SOURCE_TIMESTAMP} +Branch: %{BRANCH} + This package contains the static libraries and header files needed to develop programs which make use of the smbsharemodes programming interface. -Source Timestamp: 2859 -Branch : 3.6.9 - %package -n libwbclient0 License: LGPL-3.0+ Summary: Samba libwbclient Library @@ -548,12 +529,12 @@ Group: System/Libraries PreReq: /sbin/ldconfig %description -n libwbclient0 +Source timestamp: %{SOURCE_TIMESTAMP} +Branch: %{BRANCH} + This package includes the wbclient library. -Source Timestamp: 2859 -Branch : 3.6.9 - %package -n libwbclient-devel License: LGPL-3.0+ Summary: Libraries and Header Files to Develop Programs with wbclient Support @@ -566,33 +547,31 @@ BuildRequires: pkgconfig Requires: libwbclient0 = %{version} %description -n libwbclient-devel +Source timestamp: %{SOURCE_TIMESTAMP} +Branch: %{BRANCH} + This package contains the static libraries and header files needed to develop programs which make use of the wbclient programming interface. -Source Timestamp: 2859 -Branch : 3.6.9 - %if 0%{?suse_version} && 0%{?suse_version} < 1211 %package -n libtalloc2 Version: %{libtalloc_ver} -Release: 5 License: LGPL-3.0+ Summary: Samba talloc Library Group: System/Libraries PreReq: /sbin/ldconfig %description -n libtalloc2 +Source timestamp: %{SOURCE_TIMESTAMP} +Branch: %{BRANCH} + This package includes the talloc library. -Source Timestamp: 2859 -Branch : 3.6.9 - %package -n libtalloc-devel Version: %{libtalloc_ver} -Release: 5 License: LGPL-3.0+ Summary: Libraries and Header Files to Develop Programs with talloc Support Group: Development/Libraries/C and C++ @@ -604,31 +583,29 @@ BuildRequires: pkgconfig Requires: libtalloc2 = %{libtalloc_ver} %description -n libtalloc-devel +Source timestamp: %{SOURCE_TIMESTAMP} +Branch: %{BRANCH} + This package contains the static libraries and header files needed to develop programs which make use of the talloc programming interface. -Source Timestamp: 2859 -Branch : 3.6.9 - %package -n libtdb1 Version: %{libtdb_ver} -Release: 5 License: LGPL-3.0+ Summary: Samba tdb Library Group: System/Libraries PreReq: /sbin/ldconfig %description -n libtdb1 +Source timestamp: %{SOURCE_TIMESTAMP} +Branch: %{BRANCH} + This package includes the tdb library. -Source Timestamp: 2859 -Branch : 3.6.9 - %package -n libtdb-devel Version: %{libtdb_ver} -Release: 5 License: LGPL-3.0+ Summary: Libraries and Header Files to Develop Programs with tdb Support Group: Development/Libraries/C and C++ @@ -636,31 +613,29 @@ Group: Development/Libraries/C and C++ Requires: libtdb1 = %{libtdb_ver} %description -n libtdb-devel +Source timestamp: %{SOURCE_TIMESTAMP} +Branch: %{BRANCH} + This package contains the static libraries and header files needed to develop programs which make use of the tdb programming interface. -Source Timestamp: 2859 -Branch : 3.6.9 - %package -n libtevent0 Version: %{libtevent_ver} -Release: 5 License: LGPL-3.0+ Summary: Samba tevent Library Group: System/Libraries PreReq: /sbin/ldconfig %description -n libtevent0 +Source timestamp: %{SOURCE_TIMESTAMP} +Branch: %{BRANCH} + This package includes the tevent library. -Source Timestamp: 2859 -Branch : 3.6.9 - %package -n libtevent-devel Version: %{libtevent_ver} -Release: 5 License: LGPL-3.0+ Summary: Libraries and Header Files to Develop Programs with tevent Support Group: Development/Libraries/C and C++ @@ -673,16 +648,15 @@ Requires: libtalloc-devel Requires: libtevent0 = %{libtevent_ver} %description -n libtevent-devel +Source timestamp: %{SOURCE_TIMESTAMP} +Branch: %{BRANCH} + This package contains the static libraries and header files needed to develop programs which make use of the tevent programming interface. -Source Timestamp: 2859 -Branch : 3.6.9 - %package -n libldb1 Version: %{libldb_ver} -Release: 5 License: LGPL-3.0+ Summary: Samba ldb Library Group: System/Libraries @@ -690,15 +664,14 @@ BuildRequires: popt-devel PreReq: /sbin/ldconfig %description -n libldb1 +Source timestamp: %{SOURCE_TIMESTAMP} +Branch: %{BRANCH} + This package includes the ldb library. -Source Timestamp: 2859 -Branch : 3.6.9 - %package -n libldb-devel Version: %{libldb_ver} -Release: 5 License: LGPL-3.0+ Summary: Libraries and Header Files to Develop Programs with ldb Support Group: Development/Libraries/C and C++ @@ -711,32 +684,32 @@ Requires: libldb1 = %{libldb_ver} Requires: libtalloc-devel %description -n libldb-devel +Source timestamp: %{SOURCE_TIMESTAMP} +Branch: %{BRANCH} + This package contains the static libraries and header files needed to develop programs which make use of the tevent programming interface. -Source Timestamp: 2859 -Branch : 3.6.9 - %endif %if %{make_ldapsmb} %package -n ldapsmb Version: 1.34b -Release: 307 +Release: 0 License: GPL-2.0+ Summary: Tool to administer Samba's LDAP backend Group: Productivity/Networking/Samba Requires: perl-ldap %description -n ldapsmb +Source timestamp: %{SOURCE_TIMESTAMP} +Branch: %{BRANCH} + This tool aims to simplify the administration of a Samba Domain Controller that uses the ldapsam passdb backend. -Source Timestamp: 2859 -Branch : 3.6.9 - %endif %prep @@ -1421,37 +1394,29 @@ fi %{?insserv_cleanup:%{insserv_cleanup}} %if 0%{?suse_version} && 0%{?suse_version} < 1031 - %post -n libsmbclient %else - %post -n libsmbclient0 %endif /sbin/ldconfig %if 0%{?suse_version} && 0%{?suse_version} < 1031 - %postun -n libsmbclient %else - %postun -n libsmbclient0 %endif /sbin/ldconfig %if 0%{?suse_version} && 0%{?suse_version} < 1031 - %post -n libsmbsharemodes %else - %post -n libsmbsharemodes0 %endif /sbin/ldconfig %if 0%{?suse_version} && 0%{?suse_version} < 1031 - %postun -n libsmbsharemodes %else - %postun -n libsmbsharemodes0 %endif /sbin/ldconfig @@ -1754,10 +1719,8 @@ fi %{_libdir}/pkgconfig/netapi.pc %if 0%{?suse_version} && 0%{?suse_version} < 1031 - %files -n libsmbclient %else - %files -n libsmbclient0 %endif %defattr(-,root,root) @@ -1774,10 +1737,8 @@ fi %{_libdir}/pkgconfig/smbclient.pc %if 0%{?suse_version} && 0%{?suse_version} < 1031 - %files -n libsmbsharemodes %else - %files -n libsmbsharemodes0 %endif %defattr(-,root,root) @@ -1875,4 +1836,5 @@ fi %{_sbindir}/ldapsmb %{_mandir}/man5/ldapsmb.5.* %endif + %changelog diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 5c59a38..5ef4c21 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:5f52a65c1ef22eddf2d8c7a11caef3577c34f6acb7cc294509892e6fa18df2f5 -size 53908 +oid sha256:0e021b431ff73b8c54b13b1ddf2b334c91ef4cbe0984f5d8b40ba18b6cbe29df +size 53424 From ded32954f690e5e415c2c69be9d600e5ac54724af8227587f4334eaf8831b584 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Sat, 1 Dec 2012 20:05:19 +0000 Subject: [PATCH 06/20] Shift 'Source timestamp' and 'Branch' line in the spec file back to the old position. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=269 --- build-source-timestamp | 2 +- patches.tar.bz2 | 4 +- samba-doc.spec | 8 +-- samba.spec | 126 ++++++++++++++++++++--------------------- vendor-files.tar.bz2 | 4 +- 5 files changed, 72 insertions(+), 72 deletions(-) diff --git a/build-source-timestamp b/build-source-timestamp index 37041f8..c0f17c0 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1 +1 @@ -SOURCE_TIMESTAMP="2866" +SOURCE_TIMESTAMP="2868" diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 71d4582..a9b95d1 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:88e41f7812dae00bd6818788c338388a231b0aae5c856c1b140241f185c3bb2a -size 44082 +oid sha256:fec8cc60783970758f56fb17a79e726ae41b53f4f82d809b6f50bced1d8452c2 +size 44086 diff --git a/samba-doc.spec b/samba-doc.spec index 652ff19..4bc20af 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -116,7 +116,7 @@ BuildRequires: libtevent-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 2866 +%define SOURCE_TIMESTAMP 2868 %define BRANCH 3.6.9 Version: 3.6.9 Release: 0 @@ -457,12 +457,12 @@ fi %endif %description -Source timestamp: %{SOURCE_TIMESTAMP} -Branch: %{BRANCH} - This package contains all the Samba documentation as it is not part of the man pages. +Source timestamp: %{SOURCE_TIMESTAMP} +Branch: %{BRANCH} + %changelog diff --git a/samba.spec b/samba.spec index 627bd43..3a95ba4 100644 --- a/samba.spec +++ b/samba.spec @@ -116,7 +116,7 @@ BuildRequires: libtevent-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 2866 +%define SOURCE_TIMESTAMP 2868 %define BRANCH 3.6.9 Version: 3.6.9 Release: 0 @@ -209,9 +209,6 @@ BuildRequires: ccache BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -Source timestamp: %{SOURCE_TIMESTAMP} -Branch: %{BRANCH} - Samba is a suite of programs that allows SMB/CIFS clients to use the Unix file space, printers, and authentication subsystem. @@ -227,6 +224,9 @@ Samba as part of SUSE Linux Enterprise or openSUSE products, links to binary packages of the most current Samba version, and a bug reporting how to. +Source timestamp: %{SOURCE_TIMESTAMP} +Branch: %{BRANCH} + %package client License: GPL-3.0+ @@ -250,9 +250,6 @@ PreReq: coreutils Requires: cifs-utils %description client -Source timestamp: %{SOURCE_TIMESTAMP} -Branch: %{BRANCH} - Samba is a suite of programs that allows SMB/CIFS clients to use the Unix file space, printers, and authentication subsystem. @@ -268,6 +265,9 @@ Samba as part of SUSE Linux Enterprise or openSUSE products, links to binary packages of the most current Samba version, and a bug reporting how to. +Source timestamp: %{SOURCE_TIMESTAMP} +Branch: %{BRANCH} + %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 %package devel @@ -281,12 +281,12 @@ Obsoletes: samba-devel-64bit %endif %description devel -Source timestamp: %{SOURCE_TIMESTAMP} -Branch: %{BRANCH} - This package contains the static libraries and header files needed to develop programs which make use of Samba. +Source timestamp: %{SOURCE_TIMESTAMP} +Branch: %{BRANCH} + %endif %if 0%{?suse_version} && 0%{?suse_version} < 1001 || 0%{?suse_version} > 1110 @@ -306,12 +306,12 @@ BuildArch: noarch %endif %description doc -Source timestamp: %{SOURCE_TIMESTAMP} -Branch: %{BRANCH} - This package contains all the Samba documentation as it is not part of the man pages. +Source timestamp: %{SOURCE_TIMESTAMP} +Branch: %{BRANCH} + %endif @@ -328,11 +328,11 @@ PreReq: permissions Requires: samba-client >= %{version} %description krb-printing +A wrapper binary to run smbspool with the original calling UID. + Source timestamp: %{SOURCE_TIMESTAMP} Branch: %{BRANCH} -A wrapper binary to run smbspool with the original calling UID. - %if %{make_utils} @@ -343,11 +343,11 @@ Provides: samba-gplv3-utils = %{version} Obsoletes: samba-gplv3-utils < %{version} %description utils +Some of the debug-tools for developpers. + Source timestamp: %{SOURCE_TIMESTAMP} Branch: %{BRANCH} -Some of the debug-tools for developpers. - %endif @@ -376,11 +376,11 @@ PreReq: /usr/sbin/groupadd PreReq: coreutils %description winbind +This is the winbind-daemon and the wbinfo-tool. + Source timestamp: %{SOURCE_TIMESTAMP} Branch: %{BRANCH} -This is the winbind-daemon and the wbinfo-tool. - %if 0%{?suse_version} && 0%{?suse_version} < 1031 %package -n libsmbclient @@ -403,9 +403,6 @@ PreReq: /sbin/ldconfig %else %description -n libsmbclient0 %endif -Source timestamp: %{SOURCE_TIMESTAMP} -Branch: %{BRANCH} - This package includes the libsmbclient library. libsmbclient is provided by the libsmbclient0 package. @@ -414,6 +411,9 @@ This entry is required to allow a samba.spec file providing libsmbclient for SUSE version < 11.0 while versions > 10.0 will have libsmbclient0. +Source timestamp: %{SOURCE_TIMESTAMP} +Branch: %{BRANCH} + %package -n libsmbclient-devel License: GPL-3.0+ @@ -438,12 +438,12 @@ Requires: libsmbclient0 = %{version} %endif %description -n libsmbclient-devel -Source timestamp: %{SOURCE_TIMESTAMP} -Branch: %{BRANCH} - This package contains the static libraries and header files needed to develop programs which make use of the smbclient programming interface. +Source timestamp: %{SOURCE_TIMESTAMP} +Branch: %{BRANCH} + %package -n libnetapi0 License: GPL-3.0+ @@ -452,11 +452,11 @@ Group: System/Libraries PreReq: /sbin/ldconfig %description -n libnetapi0 +This package includes the netapi library. + Source timestamp: %{SOURCE_TIMESTAMP} Branch: %{BRANCH} -This package includes the netapi library. - %package -n libnetapi-devel License: GPL-3.0+ @@ -470,12 +470,12 @@ BuildRequires: pkgconfig Requires: libnetapi0 = %{version} %description -n libnetapi-devel -Source timestamp: %{SOURCE_TIMESTAMP} -Branch: %{BRANCH} - This package contains the static libraries and header files needed to develop programs which make use of the netapi programming interface. +Source timestamp: %{SOURCE_TIMESTAMP} +Branch: %{BRANCH} + %if 0%{?suse_version} && 0%{?suse_version} < 1031 %package -n libsmbsharemodes @@ -493,11 +493,11 @@ PreReq: /sbin/ldconfig %else %description -n libsmbsharemodes0 %endif +This package includes the smbsharemodes library. + Source timestamp: %{SOURCE_TIMESTAMP} Branch: %{BRANCH} -This package includes the smbsharemodes library. - %package -n libsmbsharemodes-devel License: GPL-3.0+ @@ -515,12 +515,12 @@ Requires: libsmbsharemodes0 = %{version} %endif %description -n libsmbsharemodes-devel -Source timestamp: %{SOURCE_TIMESTAMP} -Branch: %{BRANCH} - This package contains the static libraries and header files needed to develop programs which make use of the smbsharemodes programming interface. +Source timestamp: %{SOURCE_TIMESTAMP} +Branch: %{BRANCH} + %package -n libwbclient0 License: LGPL-3.0+ @@ -529,11 +529,11 @@ Group: System/Libraries PreReq: /sbin/ldconfig %description -n libwbclient0 +This package includes the wbclient library. + Source timestamp: %{SOURCE_TIMESTAMP} Branch: %{BRANCH} -This package includes the wbclient library. - %package -n libwbclient-devel License: LGPL-3.0+ @@ -547,12 +547,12 @@ BuildRequires: pkgconfig Requires: libwbclient0 = %{version} %description -n libwbclient-devel -Source timestamp: %{SOURCE_TIMESTAMP} -Branch: %{BRANCH} - This package contains the static libraries and header files needed to develop programs which make use of the wbclient programming interface. +Source timestamp: %{SOURCE_TIMESTAMP} +Branch: %{BRANCH} + %if 0%{?suse_version} && 0%{?suse_version} < 1211 @@ -564,11 +564,11 @@ Group: System/Libraries PreReq: /sbin/ldconfig %description -n libtalloc2 +This package includes the talloc library. + Source timestamp: %{SOURCE_TIMESTAMP} Branch: %{BRANCH} -This package includes the talloc library. - %package -n libtalloc-devel Version: %{libtalloc_ver} @@ -583,12 +583,12 @@ BuildRequires: pkgconfig Requires: libtalloc2 = %{libtalloc_ver} %description -n libtalloc-devel -Source timestamp: %{SOURCE_TIMESTAMP} -Branch: %{BRANCH} - This package contains the static libraries and header files needed to develop programs which make use of the talloc programming interface. +Source timestamp: %{SOURCE_TIMESTAMP} +Branch: %{BRANCH} + %package -n libtdb1 Version: %{libtdb_ver} @@ -598,11 +598,11 @@ Group: System/Libraries PreReq: /sbin/ldconfig %description -n libtdb1 +This package includes the tdb library. + Source timestamp: %{SOURCE_TIMESTAMP} Branch: %{BRANCH} -This package includes the tdb library. - %package -n libtdb-devel Version: %{libtdb_ver} @@ -613,12 +613,12 @@ Group: Development/Libraries/C and C++ Requires: libtdb1 = %{libtdb_ver} %description -n libtdb-devel -Source timestamp: %{SOURCE_TIMESTAMP} -Branch: %{BRANCH} - This package contains the static libraries and header files needed to develop programs which make use of the tdb programming interface. +Source timestamp: %{SOURCE_TIMESTAMP} +Branch: %{BRANCH} + %package -n libtevent0 Version: %{libtevent_ver} @@ -628,11 +628,11 @@ Group: System/Libraries PreReq: /sbin/ldconfig %description -n libtevent0 +This package includes the tevent library. + Source timestamp: %{SOURCE_TIMESTAMP} Branch: %{BRANCH} -This package includes the tevent library. - %package -n libtevent-devel Version: %{libtevent_ver} @@ -648,12 +648,12 @@ Requires: libtalloc-devel Requires: libtevent0 = %{libtevent_ver} %description -n libtevent-devel -Source timestamp: %{SOURCE_TIMESTAMP} -Branch: %{BRANCH} - This package contains the static libraries and header files needed to develop programs which make use of the tevent programming interface. +Source timestamp: %{SOURCE_TIMESTAMP} +Branch: %{BRANCH} + %package -n libldb1 Version: %{libldb_ver} @@ -664,11 +664,11 @@ BuildRequires: popt-devel PreReq: /sbin/ldconfig %description -n libldb1 +This package includes the ldb library. + Source timestamp: %{SOURCE_TIMESTAMP} Branch: %{BRANCH} -This package includes the ldb library. - %package -n libldb-devel Version: %{libldb_ver} @@ -684,12 +684,12 @@ Requires: libldb1 = %{libldb_ver} Requires: libtalloc-devel %description -n libldb-devel -Source timestamp: %{SOURCE_TIMESTAMP} -Branch: %{BRANCH} - This package contains the static libraries and header files needed to develop programs which make use of the tevent programming interface. +Source timestamp: %{SOURCE_TIMESTAMP} +Branch: %{BRANCH} + %endif %if %{make_ldapsmb} @@ -703,12 +703,12 @@ Group: Productivity/Networking/Samba Requires: perl-ldap %description -n ldapsmb -Source timestamp: %{SOURCE_TIMESTAMP} -Branch: %{BRANCH} - This tool aims to simplify the administration of a Samba Domain Controller that uses the ldapsam passdb backend. +Source timestamp: %{SOURCE_TIMESTAMP} +Branch: %{BRANCH} + %endif diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 5ef4c21..2a1032c 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:0e021b431ff73b8c54b13b1ddf2b334c91ef4cbe0984f5d8b40ba18b6cbe29df -size 53424 +oid sha256:d146e1dcd09e0dded5c6336d58deca763e5bdb819241dc0de0baef6386a5fe0f +size 53431 From 4d24eeb8bb6273d917deae8ef5cd4dccf05ee9fc06bf02fc117b356ca8a95d26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Sun, 2 Dec 2012 16:24:49 +0000 Subject: [PATCH 07/20] - Define library names and use it instead of libldb1, libnetapi0, libsmbclient0, libsmbsharemodes0, libtalloc2, libtdb1, libtevent0, and libwbclient0. - Provide and obsolete libsmbsharemodes for post-10.3 SUSE systems. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=270 --- build-source-timestamp | 2 +- patches.tar.bz2 | 4 +- samba-doc.spec | 15 +++- samba.changes | 8 ++ samba.spec | 176 ++++++++++++++++------------------------- vendor-files.tar.bz2 | 4 +- 6 files changed, 96 insertions(+), 113 deletions(-) diff --git a/build-source-timestamp b/build-source-timestamp index c0f17c0..de81b39 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1 +1 @@ -SOURCE_TIMESTAMP="2868" +SOURCE_TIMESTAMP="2869" diff --git a/patches.tar.bz2 b/patches.tar.bz2 index a9b95d1..5e86816 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fec8cc60783970758f56fb17a79e726ae41b53f4f82d809b6f50bced1d8452c2 -size 44086 +oid sha256:352a39080a538ff169519e3ecf21a65f1bba37422ef29adddbfabc295172bdbb +size 44090 diff --git a/samba-doc.spec b/samba-doc.spec index 4bc20af..d91a378 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -98,6 +98,19 @@ BuildRequires: libtevent-devel %if 0%{?suse_version} && 0%{?suse_version} < 1111 %define guards_symbols pre_1111 %endif +%if 0%{?suse_version} && 0%{?suse_version} < 1031 +%define libsmbclient_name libsmbclient +%define libsmbsharemodes_name libsmbsharemodes +%else +%define libsmbclient_name libsmbclient0 +%define libsmbsharemodes_name libsmbsharemodes0 +%endif +%define libldb_name libldb1 +%define libnetapi_name libnetapi0 +%define libwbclient_name libwbclient0 +%define libtalloc_name libtalloc2 +%define libtdb_name libtdb1 +%define libtevent_name libtevent0 %if 0%{?suse_version} > 1130 && 0%{?suse_version} < 1211 %define libldb_ver 1.0.2 %define libtalloc_ver 2.0.5 @@ -116,7 +129,7 @@ BuildRequires: libtevent-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 2868 +%define SOURCE_TIMESTAMP 2869 %define BRANCH 3.6.9 Version: 3.6.9 Release: 0 diff --git a/samba.changes b/samba.changes index 3e2e718..6340b2f 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sun Dec 2 15:14:37 UTC 2012 - lmuelle@suse.com + +- Define library names and use it instead of libldb1, libnetapi0, + libsmbclient0, libsmbsharemodes0, libtalloc2, libtdb1, libtevent0, and + libwbclient0. +- Provide and obsolete libsmbsharemodes for post-10.3 SUSE systems. + ------------------------------------------------------------------- Fri Nov 30 18:14:37 UTC 2012 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index 3a95ba4..ff9e784 100644 --- a/samba.spec +++ b/samba.spec @@ -98,6 +98,19 @@ BuildRequires: libtevent-devel %if 0%{?suse_version} && 0%{?suse_version} < 1111 %define guards_symbols pre_1111 %endif +%if 0%{?suse_version} && 0%{?suse_version} < 1031 +%define libsmbclient_name libsmbclient +%define libsmbsharemodes_name libsmbsharemodes +%else +%define libsmbclient_name libsmbclient0 +%define libsmbsharemodes_name libsmbsharemodes0 +%endif +%define libldb_name libldb1 +%define libnetapi_name libnetapi0 +%define libwbclient_name libwbclient0 +%define libtalloc_name libtalloc2 +%define libtdb_name libtdb1 +%define libtevent_name libtevent0 %if 0%{?suse_version} > 1130 && 0%{?suse_version} < 1211 %define libldb_ver 1.0.2 %define libtalloc_ver 2.0.5 @@ -116,7 +129,7 @@ BuildRequires: libtevent-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 2868 +%define SOURCE_TIMESTAMP 2869 %define BRANCH 3.6.9 Version: 3.6.9 Release: 0 @@ -382,12 +395,9 @@ Source timestamp: %{SOURCE_TIMESTAMP} Branch: %{BRANCH} -%if 0%{?suse_version} && 0%{?suse_version} < 1031 -%package -n libsmbclient -License: GPL-3.0+ -%else -%package -n libsmbclient0 +%package -n %{libsmbclient_name} License: GPL-3.0+ +%if 0%{?suse_version} > 1030 Provides: libsmbclient = %{version} Obsoletes: libsmbclient %endif @@ -398,11 +408,7 @@ Summary: Samba Client Library Group: System/Libraries PreReq: /sbin/ldconfig -%if 0%{?suse_version} && 0%{?suse_version} < 1031 -%description -n libsmbclient -%else -%description -n libsmbclient0 -%endif +%description -n %{libsmbclient_name} This package includes the libsmbclient library. libsmbclient is provided by the libsmbclient0 package. @@ -426,15 +432,11 @@ BuildRequires: pkgconfig %endif %if 0%{?suse_version} && 0%{?suse_version} < 921 Requires: heimdal-devel -Requires: libsmbclient = %{version} +Requires: %{libsmbclient_name} = %{version} %else %if 0%{?suse_version} && 0%{?suse_version} < 1031 Requires: krb5-devel -Requires: libsmbclient = %{version} -%else -Requires: krb5-devel -Requires: libsmbclient0 = %{version} -%endif +Requires: %{libsmbclient_name} = %{version} %endif %description -n libsmbclient-devel @@ -445,13 +447,13 @@ Source timestamp: %{SOURCE_TIMESTAMP} Branch: %{BRANCH} -%package -n libnetapi0 +%package -n %{libnetapi_name} License: GPL-3.0+ Summary: Samba netapi Library Group: System/Libraries PreReq: /sbin/ldconfig -%description -n libnetapi0 +%description -n %{libnetapi_name} This package includes the netapi library. Source timestamp: %{SOURCE_TIMESTAMP} @@ -467,7 +469,7 @@ BuildRequires: pkg-config %else BuildRequires: pkgconfig %endif -Requires: libnetapi0 = %{version} +Requires: %{libnetapi_name} = %{version} %description -n libnetapi-devel This package contains the static libraries and header files needed to @@ -477,22 +479,17 @@ Source timestamp: %{SOURCE_TIMESTAMP} Branch: %{BRANCH} -%if 0%{?suse_version} && 0%{?suse_version} < 1031 -%package -n libsmbsharemodes -License: GPL-3.0+ -%else -%package -n libsmbsharemodes0 +%package -n %{libsmbsharemodes_name} License: GPL-3.0+ +%if 0%{?suse_version} > 1030 +Provides: libsmbsharemodes = %{version} +Obsoletes: libsmbsharemodes %endif Summary: Samba smbsharemodes Library Group: System/Libraries PreReq: /sbin/ldconfig -%if 0%{?suse_version} && 0%{?suse_version} < 1031 -%description -n libsmbsharemodes -%else -%description -n libsmbsharemodes0 -%endif +%description -n %{libsmbsharemodes_name} This package includes the smbsharemodes library. Source timestamp: %{SOURCE_TIMESTAMP} @@ -508,10 +505,7 @@ BuildRequires: pkg-config %else BuildRequires: pkgconfig %endif -%if 0%{?suse_version} && 0%{?suse_version} < 1031 -Requires: libsmbsharemodes = %{version} -%else -Requires: libsmbsharemodes0 = %{version} +Requires: %{libsmbsharemodes_name} = %{version} %endif %description -n libsmbsharemodes-devel @@ -522,13 +516,13 @@ Source timestamp: %{SOURCE_TIMESTAMP} Branch: %{BRANCH} -%package -n libwbclient0 +%package -n %{libwbclient_name} License: LGPL-3.0+ Summary: Samba libwbclient Library Group: System/Libraries PreReq: /sbin/ldconfig -%description -n libwbclient0 +%description -n %{libwbclient_name} This package includes the wbclient library. Source timestamp: %{SOURCE_TIMESTAMP} @@ -544,7 +538,7 @@ BuildRequires: pkg-config %else BuildRequires: pkgconfig %endif -Requires: libwbclient0 = %{version} +Requires: %{libwbclient_name} = %{version} %description -n libwbclient-devel This package contains the static libraries and header files needed to @@ -556,14 +550,14 @@ Branch: %{BRANCH} %if 0%{?suse_version} && 0%{?suse_version} < 1211 -%package -n libtalloc2 +%package -n %{libtalloc_name} Version: %{libtalloc_ver} License: LGPL-3.0+ Summary: Samba talloc Library Group: System/Libraries PreReq: /sbin/ldconfig -%description -n libtalloc2 +%description -n %{libtalloc_name} This package includes the talloc library. Source timestamp: %{SOURCE_TIMESTAMP} @@ -580,7 +574,7 @@ BuildRequires: pkg-config %else BuildRequires: pkgconfig %endif -Requires: libtalloc2 = %{libtalloc_ver} +Requires: %{libtalloc_name} = %{libtalloc_ver} %description -n libtalloc-devel This package contains the static libraries and header files needed to @@ -590,14 +584,14 @@ Source timestamp: %{SOURCE_TIMESTAMP} Branch: %{BRANCH} -%package -n libtdb1 +%package -n %{libtdb_name} Version: %{libtdb_ver} License: LGPL-3.0+ Summary: Samba tdb Library Group: System/Libraries PreReq: /sbin/ldconfig -%description -n libtdb1 +%description -n %{libtdb_name} This package includes the tdb library. Source timestamp: %{SOURCE_TIMESTAMP} @@ -610,7 +604,7 @@ License: LGPL-3.0+ Summary: Libraries and Header Files to Develop Programs with tdb Support Group: Development/Libraries/C and C++ #BuildRequires: pkg-config -Requires: libtdb1 = %{libtdb_ver} +Requires: %{libtdb_name} = %{libtdb_ver} %description -n libtdb-devel This package contains the static libraries and header files needed to @@ -620,14 +614,14 @@ Source timestamp: %{SOURCE_TIMESTAMP} Branch: %{BRANCH} -%package -n libtevent0 +%package -n %{libtevent_name} Version: %{libtevent_ver} License: LGPL-3.0+ Summary: Samba tevent Library Group: System/Libraries PreReq: /sbin/ldconfig -%description -n libtevent0 +%description -n %{libtevent_name} This package includes the tevent library. Source timestamp: %{SOURCE_TIMESTAMP} @@ -645,7 +639,7 @@ BuildRequires: pkg-config BuildRequires: pkgconfig %endif Requires: libtalloc-devel -Requires: libtevent0 = %{libtevent_ver} +Requires: %{libtevent_name} = %{libtevent_ver} %description -n libtevent-devel This package contains the static libraries and header files needed to @@ -655,7 +649,7 @@ Source timestamp: %{SOURCE_TIMESTAMP} Branch: %{BRANCH} -%package -n libldb1 +%package -n %{libldb_name} Version: %{libldb_ver} License: LGPL-3.0+ Summary: Samba ldb Library @@ -663,7 +657,7 @@ Group: System/Libraries BuildRequires: popt-devel PreReq: /sbin/ldconfig -%description -n libldb1 +%description -n %{libldb_name} This package includes the ldb library. Source timestamp: %{SOURCE_TIMESTAMP} @@ -680,7 +674,7 @@ BuildRequires: pkg-config %else BuildRequires: pkgconfig %endif -Requires: libldb1 = %{libldb_ver} +Requires: %{libldb_name} = %{libldb_ver} Requires: libtalloc-devel %description -n libldb-devel @@ -1300,35 +1294,31 @@ fi /sbin/ldconfig %{?insserv_cleanup:%{insserv_cleanup}} -%post -n libnetapi0 -p /sbin/ldconfig +%post -n %{libnetapi_name} -p /sbin/ldconfig -%postun -n libnetapi0 -p /sbin/ldconfig +%postun -n %{libnetapi_name} -p /sbin/ldconfig + +%post -n %{libwbclient_name} -p /sbin/ldconfig + +%postun -n %{libwbclient_name} -p /sbin/ldconfig %if 0%{?suse_version} && 0%{?suse_version} < 1211 -%post -n libtalloc2 -p /sbin/ldconfig +%post -n %{libtalloc_name} -p /sbin/ldconfig -%postun -n libtalloc2 -p /sbin/ldconfig +%postun -n %{libtalloc_name} -p /sbin/ldconfig -%endif +%post -n %{libtdb_name} -p /sbin/ldconfig -%post -n libwbclient0 -p /sbin/ldconfig +%postun -n %{libtdb_name} -p /sbin/ldconfig -%postun -n libwbclient0 -p /sbin/ldconfig +%post -n %{libtevent_name} -p /sbin/ldconfig -%if 0%{?suse_version} && 0%{?suse_version} < 1211 +%postun -n %{libtevent_name} -p /sbin/ldconfig -%post -n libtdb1 -p /sbin/ldconfig +%post -n %{libldb_name} -p /sbin/ldconfig -%postun -n libtdb1 -p /sbin/ldconfig - -%post -n libtevent0 -p /sbin/ldconfig - -%postun -n libtevent0 -p /sbin/ldconfig - -%post -n libldb1 -p /sbin/ldconfig - -%postun -n libldb1 -p /sbin/ldconfig +%postun -n %{libldb_name} -p /sbin/ldconfig %endif @@ -1393,33 +1383,13 @@ fi %{?restart_on_update:%{restart_on_update nscd winbind}} %{?insserv_cleanup:%{insserv_cleanup}} -%if 0%{?suse_version} && 0%{?suse_version} < 1031 -%post -n libsmbclient -%else -%post -n libsmbclient0 -%endif -/sbin/ldconfig +%post -n %{libsmbclient_name} -p /sbin/ldconfig -%if 0%{?suse_version} && 0%{?suse_version} < 1031 -%postun -n libsmbclient -%else -%postun -n libsmbclient0 -%endif -/sbin/ldconfig +%postun -n %{libsmbclient_name} -p /sbin/ldconfig -%if 0%{?suse_version} && 0%{?suse_version} < 1031 -%post -n libsmbsharemodes -%else -%post -n libsmbsharemodes0 -%endif -/sbin/ldconfig +%post -n %{libsmbsharemodes_name} -p /sbin/ldconfig -%if 0%{?suse_version} && 0%{?suse_version} < 1031 -%postun -n libsmbsharemodes -%else -%postun -n libsmbsharemodes0 -%endif -/sbin/ldconfig +%postun -n %{libsmbsharemodes_name} -p /sbin/ldconfig %clean [ x"%{buildroot}" = x"/" ] && ( echo "your buildroot is /" && exit 0) || rm -rf "%{buildroot}" @@ -1705,7 +1675,7 @@ fi %dir %{cups_lib_dir}/backend %ghost %{cups_lib_dir}/backend/smb -%files -n libnetapi0 +%files -n %{libnetapi_name} %defattr(-,root,root) %{_libdir}/libnetapi.so.* @@ -1718,11 +1688,7 @@ fi %{_libdir}/libnetapi.so %{_libdir}/pkgconfig/netapi.pc -%if 0%{?suse_version} && 0%{?suse_version} < 1031 -%files -n libsmbclient -%else -%files -n libsmbclient0 -%endif +%files -n %{libsmbclient_name} %defattr(-,root,root) %{_libdir}/libsmbclient.so.* %doc %{_mandir}/man7/libsmbclient.7.* @@ -1736,11 +1702,7 @@ fi %{_libdir}/libsmbclient.so %{_libdir}/pkgconfig/smbclient.pc -%if 0%{?suse_version} && 0%{?suse_version} < 1031 -%files -n libsmbsharemodes -%else -%files -n libsmbsharemodes0 -%endif +%files -n %{libsmbsharemodes_name} %defattr(-,root,root) %{_libdir}/libsmbsharemodes.so.* @@ -1755,7 +1717,7 @@ fi %if 0%{?suse_version} && 0%{?suse_version} < 1211 -%files -n libtalloc2 +%files -n %{libtalloc_name} %defattr(-,root,root) %{_libdir}/libpytalloc-util.so.* %{_libdir}/libtalloc.so.* @@ -1772,7 +1734,7 @@ fi %{_libdir}/pkgconfig/pytalloc-util.pc %{_libdir}/pkgconfig/talloc.pc -%files -n libtdb1 +%files -n %{libtdb_name} %defattr(-,root,root) %{_libdir}/libtdb.so.* @@ -1787,7 +1749,7 @@ fi %endif -%files -n libwbclient0 +%files -n %{libwbclient_name} %defattr(-,root,root) %{_libdir}/libwbclient.so.* @@ -1801,7 +1763,7 @@ fi %if 0%{?suse_version} && 0%{?suse_version} < 1211 -%files -n libtevent0 +%files -n %{libtevent_name} %defattr(-,root,root) %{_libdir}/libtevent.so.* @@ -1811,7 +1773,7 @@ fi %{_libdir}/libtevent.so %{_libdir}/pkgconfig/tevent.pc -%files -n libldb1 +%files -n %{libldb_name} %defattr(-,root,root) %{_libdir}/libldb.so.* %dir %{_libdir}/ldb diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 2a1032c..6466809 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:d146e1dcd09e0dded5c6336d58deca763e5bdb819241dc0de0baef6386a5fe0f -size 53431 +oid sha256:28886d1da8cbf40531cfc7a5e839519b57ad10610f5fa7ba2aae9f2d704dcd31 +size 53445 From 4f0d87b6be6cad4ba5d3d842de71253b88cf2eebce85bb6c4d0f52dbb2f9f3b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Sun, 2 Dec 2012 19:18:36 +0000 Subject: [PATCH 08/20] Add missing reference to bnc#792294 in the package change log OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=271 --- build-source-timestamp | 2 +- patches.tar.bz2 | 4 ++-- samba-doc.spec | 2 +- samba.changes | 2 +- samba.spec | 2 +- vendor-files.tar.bz2 | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build-source-timestamp b/build-source-timestamp index de81b39..4e789b5 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1 +1 @@ -SOURCE_TIMESTAMP="2869" +SOURCE_TIMESTAMP="2870" diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 5e86816..075e225 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:352a39080a538ff169519e3ecf21a65f1bba37422ef29adddbfabc295172bdbb -size 44090 +oid sha256:9a131185ec6513952a58beea0356044eb044565ea185e7156b4a3fe84b828417 +size 44077 diff --git a/samba-doc.spec b/samba-doc.spec index d91a378..730dab3 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -129,7 +129,7 @@ BuildRequires: libtevent-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 2869 +%define SOURCE_TIMESTAMP 2870 %define BRANCH 3.6.9 Version: 3.6.9 Release: 0 diff --git a/samba.changes b/samba.changes index 6340b2f..de5bf48 100644 --- a/samba.changes +++ b/samba.changes @@ -3,7 +3,7 @@ Sun Dec 2 15:14:37 UTC 2012 - lmuelle@suse.com - Define library names and use it instead of libldb1, libnetapi0, libsmbclient0, libsmbsharemodes0, libtalloc2, libtdb1, libtevent0, and - libwbclient0. + libwbclient0; (bnc#792294). - Provide and obsolete libsmbsharemodes for post-10.3 SUSE systems. ------------------------------------------------------------------- diff --git a/samba.spec b/samba.spec index ff9e784..e354781 100644 --- a/samba.spec +++ b/samba.spec @@ -129,7 +129,7 @@ BuildRequires: libtevent-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 2869 +%define SOURCE_TIMESTAMP 2870 %define BRANCH 3.6.9 Version: 3.6.9 Release: 0 diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 6466809..409b91f 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:28886d1da8cbf40531cfc7a5e839519b57ad10610f5fa7ba2aae9f2d704dcd31 -size 53445 +oid sha256:a0aa2790df8ffb075c031b67897334eda32ca636fdd1e0515c88818e11bf868f +size 53451 From daf782f4b6829f861ea7c5f66459484ae8dd300c33189b700c7c8174f0170b53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Sun, 2 Dec 2012 22:09:01 +0000 Subject: [PATCH 09/20] - Remove obsoleted references to pre-9.4 SUSE systems; (bnc#792294). - Add SUSE version depending pkg-config requires macro; (bnc#792294). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=272 --- build-source-timestamp | 2 +- patches.tar.bz2 | 4 +-- samba-doc.spec | 10 +++---- samba.changes | 6 ++++ samba.spec | 66 +++++++++--------------------------------- vendor-files.tar.bz2 | 4 +-- 6 files changed, 28 insertions(+), 64 deletions(-) diff --git a/build-source-timestamp b/build-source-timestamp index 4e789b5..a4a8b1f 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1 +1 @@ -SOURCE_TIMESTAMP="2870" +SOURCE_TIMESTAMP="2871" diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 075e225..77a5d39 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9a131185ec6513952a58beea0356044eb044565ea185e7156b4a3fe84b828417 -size 44077 +oid sha256:289e24e9d11fb3cf2a2ac20f8892a7c7252707283952c6b871d79116cda51b54 +size 44064 diff --git a/samba-doc.spec b/samba-doc.spec index 730dab3..90f3d54 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -56,9 +56,6 @@ BuildRequires: mysql-devel BuildRequires: postgresql-devel BuildRequires: xfsprogs-devel %endif -%if 0%{?suse_version} > 830 && 0%{?suse_version} < 931 -BuildRequires: heimdal-devel -%endif %if 0%{?fedora_version} BuildRequires: cracklib-devel %endif @@ -80,10 +77,11 @@ BuildRequires: ctdb-devel > 1.0.105 BuildRequires: fdupes %endif %if 0%{?suse_version} > 1020 -BuildRequires: pkg-config +%define pkgconfig_req pkg-config %else -BuildRequires: pkgconfig +%define pkgconfig_req pkgconfig %endif +BuildRequires: %{pkgconfig_req} %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1210 BuildRequires: libldb-devel #!BuildIgnore: libtalloc @@ -129,7 +127,7 @@ BuildRequires: libtevent-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 2870 +%define SOURCE_TIMESTAMP 2871 %define BRANCH 3.6.9 Version: 3.6.9 Release: 0 diff --git a/samba.changes b/samba.changes index de5bf48..9772063 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Dec 2 21:47:01 UTC 2012 - lmuelle@suse.com + +- Remove obsoleted references to pre-9.4 SUSE systems; (bnc#792294). +- Add SUSE version depending pkg-config requires macro; (bnc#792294). + ------------------------------------------------------------------- Sun Dec 2 15:14:37 UTC 2012 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index e354781..2733708 100644 --- a/samba.spec +++ b/samba.spec @@ -56,9 +56,6 @@ BuildRequires: mysql-devel BuildRequires: postgresql-devel BuildRequires: xfsprogs-devel %endif -%if 0%{?suse_version} > 830 && 0%{?suse_version} < 931 -BuildRequires: heimdal-devel -%endif %if 0%{?fedora_version} BuildRequires: cracklib-devel %endif @@ -80,10 +77,11 @@ BuildRequires: ctdb-devel > 1.0.105 BuildRequires: fdupes %endif %if 0%{?suse_version} > 1020 -BuildRequires: pkg-config +%define pkgconfig_req pkg-config %else -BuildRequires: pkgconfig +%define pkgconfig_req pkgconfig %endif +BuildRequires: %{pkgconfig_req} %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1210 BuildRequires: libldb-devel #!BuildIgnore: libtalloc @@ -129,7 +127,7 @@ BuildRequires: libtevent-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 2870 +%define SOURCE_TIMESTAMP 2871 %define BRANCH 3.6.9 Version: 3.6.9 Release: 0 @@ -425,19 +423,9 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Libraries and Header Files to Develop Programs with smbclient Support Group: Development/Libraries/C and C++ -%if 0%{?suse_version} > 1020 -BuildRequires: pkg-config -%else -BuildRequires: pkgconfig -%endif -%if 0%{?suse_version} && 0%{?suse_version} < 921 -Requires: heimdal-devel -Requires: %{libsmbclient_name} = %{version} -%else -%if 0%{?suse_version} && 0%{?suse_version} < 1031 +BuildRequires: %{pkgconfig_req} Requires: krb5-devel Requires: %{libsmbclient_name} = %{version} -%endif %description -n libsmbclient-devel This package contains the static libraries and header files needed to @@ -464,11 +452,7 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Libraries and Header Files to Develop Programs with netapi Support Group: Development/Libraries/C and C++ -%if 0%{?suse_version} > 1020 -BuildRequires: pkg-config -%else -BuildRequires: pkgconfig -%endif +BuildRequires: %{pkgconfig_req} Requires: %{libnetapi_name} = %{version} %description -n libnetapi-devel @@ -500,11 +484,7 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Libraries and Header Files to Develop Programs with smbsharemodes Support Group: Development/Libraries/C and C++ -%if 0%{?suse_version} > 1020 -BuildRequires: pkg-config -%else -BuildRequires: pkgconfig -%endif +BuildRequires: %{pkgconfig_req} Requires: %{libsmbsharemodes_name} = %{version} %endif @@ -533,11 +513,7 @@ Branch: %{BRANCH} License: LGPL-3.0+ Summary: Libraries and Header Files to Develop Programs with wbclient Support Group: Development/Libraries/C and C++ -%if 0%{?suse_version} > 1020 -BuildRequires: pkg-config -%else -BuildRequires: pkgconfig -%endif +BuildRequires: %{pkgconfig_req} Requires: %{libwbclient_name} = %{version} %description -n libwbclient-devel @@ -569,11 +545,7 @@ Version: %{libtalloc_ver} License: LGPL-3.0+ Summary: Libraries and Header Files to Develop Programs with talloc Support Group: Development/Libraries/C and C++ -%if 0%{?suse_version} > 1020 -BuildRequires: pkg-config -%else -BuildRequires: pkgconfig -%endif +BuildRequires: %{pkgconfig_req} Requires: %{libtalloc_name} = %{libtalloc_ver} %description -n libtalloc-devel @@ -603,7 +575,7 @@ Version: %{libtdb_ver} License: LGPL-3.0+ Summary: Libraries and Header Files to Develop Programs with tdb Support Group: Development/Libraries/C and C++ -#BuildRequires: pkg-config +#BuildRequires: %{pkgconfig_req} Requires: %{libtdb_name} = %{libtdb_ver} %description -n libtdb-devel @@ -633,11 +605,7 @@ Version: %{libtevent_ver} License: LGPL-3.0+ Summary: Libraries and Header Files to Develop Programs with tevent Support Group: Development/Libraries/C and C++ -%if 0%{?suse_version} > 1020 -BuildRequires: pkg-config -%else -BuildRequires: pkgconfig -%endif +BuildRequires: %{pkgconfig_req} Requires: libtalloc-devel Requires: %{libtevent_name} = %{libtevent_ver} @@ -669,11 +637,7 @@ Version: %{libldb_ver} License: LGPL-3.0+ Summary: Libraries and Header Files to Develop Programs with ldb Support Group: Development/Libraries/C and C++ -%if 0%{?suse_version} > 1020 -BuildRequires: pkg-config -%else -BuildRequires: pkgconfig -%endif +BuildRequires: %{pkgconfig_req} Requires: %{libldb_name} = %{libldb_ver} Requires: libtalloc-devel @@ -1068,11 +1032,7 @@ install -p -m 0755 tools/smbprngenpdf %{buildroot}/%{_bindir}/smbprngenpdf touch %{buildroot}/var/run/%{cifs_init_script} install -m 0644 config/swat.xinetd %{buildroot}/%{_sysconfdir}/xinetd.d/swat install -m 0644 config/samba.reg %{buildroot}/%{_sysconfdir}/slp.reg.d/samba.reg -%if 0%{?suse_version} && 0%{?suse_version} < 921 - install -m 0644 config/samba.pamd %{buildroot}/%{_sysconfdir}/pam.d/samba -%else - install -m 0644 config/samba.pamd-common %{buildroot}/%{_sysconfdir}/pam.d/samba -%endif +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/sysconfig.dhcp-samba-client %{buildroot}/%{_var}/adm/fillup-templates/sysconfig.dhcp-samba-client for script in dhcpcd-hook-samba dhcpcd-hook-samba-functions samba-winbindd %{cifs_init_script}; do diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 409b91f..e22de54 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:a0aa2790df8ffb075c031b67897334eda32ca636fdd1e0515c88818e11bf868f -size 53451 +oid sha256:01bc50088e2226009b8cb20cc1079c5a736e27ada9676231df432fbc78917dab +size 53427 From 3eab906995b6934a4d85e074229ee6761eb3b8f356a938a298627fbb83f58b97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Sun, 2 Dec 2012 22:18:30 +0000 Subject: [PATCH 10/20] Add missing %endif OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=273 --- build-source-timestamp | 2 +- patches.tar.bz2 | 4 ++-- samba-doc.spec | 2 +- samba.spec | 3 +-- vendor-files.tar.bz2 | 4 ++-- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/build-source-timestamp b/build-source-timestamp index a4a8b1f..fb88021 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1 +1 @@ -SOURCE_TIMESTAMP="2871" +SOURCE_TIMESTAMP="2872" diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 77a5d39..5388339 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:289e24e9d11fb3cf2a2ac20f8892a7c7252707283952c6b871d79116cda51b54 -size 44064 +oid sha256:13a2e5deb78639415d3d265ed6e96804d45cf3b7829f01c3ca0823be6cc701e5 +size 44062 diff --git a/samba-doc.spec b/samba-doc.spec index 90f3d54..39e7bff 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -127,7 +127,7 @@ BuildRequires: libtevent-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 2871 +%define SOURCE_TIMESTAMP 2872 %define BRANCH 3.6.9 Version: 3.6.9 Release: 0 diff --git a/samba.spec b/samba.spec index 2733708..a598a64 100644 --- a/samba.spec +++ b/samba.spec @@ -127,7 +127,7 @@ BuildRequires: libtevent-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 2871 +%define SOURCE_TIMESTAMP 2872 %define BRANCH 3.6.9 Version: 3.6.9 Release: 0 @@ -486,7 +486,6 @@ Summary: Libraries and Header Files to Develop Programs with smbsharemode Group: Development/Libraries/C and C++ BuildRequires: %{pkgconfig_req} Requires: %{libsmbsharemodes_name} = %{version} -%endif %description -n libsmbsharemodes-devel This package contains the static libraries and header files needed to diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index e22de54..fbbb0c0 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:01bc50088e2226009b8cb20cc1079c5a736e27ada9676231df432fbc78917dab -size 53427 +oid sha256:961692c3929fb0b4a1e72a5d8bb199474f4bf615b7af0b2a1cbf463e7ebae853 +size 53447 From 13328d4aa323272a429fc7f0bd6892e5fedb1665c38eeca76dd164582d287dbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Mon, 3 Dec 2012 18:11:44 +0000 Subject: [PATCH 11/20] BuildRequire libnscd-devel once. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=274 --- build-source-timestamp | 2 +- patches.tar.bz2 | 4 ++-- samba-doc.spec | 3 +-- samba.changes | 5 +++++ samba.spec | 3 +-- vendor-files.tar.bz2 | 4 ++-- 6 files changed, 12 insertions(+), 9 deletions(-) diff --git a/build-source-timestamp b/build-source-timestamp index fb88021..b87fa77 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1 +1 @@ -SOURCE_TIMESTAMP="2872" +SOURCE_TIMESTAMP="2874" diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 5388339..7909a40 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:13a2e5deb78639415d3d265ed6e96804d45cf3b7829f01c3ca0823be6cc701e5 -size 44062 +oid sha256:a8072ae9b5cb548e03a94c16c42d4d92f8b320600e07ea65a8ce8e09ee8dc2b1 +size 44081 diff --git a/samba-doc.spec b/samba-doc.spec index 39e7bff..e024602 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -50,7 +50,6 @@ BuildRequires: python-devel %endif %if 0%{?suse_version} > 930 && 0%{?suse_version} < 1031 BuildRequires: dmapi-devel -BuildRequires: libnscd-devel BuildRequires: libxml2-devel BuildRequires: mysql-devel BuildRequires: postgresql-devel @@ -127,7 +126,7 @@ BuildRequires: libtevent-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 2872 +%define SOURCE_TIMESTAMP 2874 %define BRANCH 3.6.9 Version: 3.6.9 Release: 0 diff --git a/samba.changes b/samba.changes index 9772063..4787b48 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Dec 3 16:43:51 UTC 2012 - lmuelle@suse.com + +- BuildRequire libnscd-devel once. + ------------------------------------------------------------------- Sun Dec 2 21:47:01 UTC 2012 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index a598a64..6cc09a0 100644 --- a/samba.spec +++ b/samba.spec @@ -50,7 +50,6 @@ BuildRequires: python-devel %endif %if 0%{?suse_version} > 930 && 0%{?suse_version} < 1031 BuildRequires: dmapi-devel -BuildRequires: libnscd-devel BuildRequires: libxml2-devel BuildRequires: mysql-devel BuildRequires: postgresql-devel @@ -127,7 +126,7 @@ BuildRequires: libtevent-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 2872 +%define SOURCE_TIMESTAMP 2874 %define BRANCH 3.6.9 Version: 3.6.9 Release: 0 diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index fbbb0c0..7dbf934 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:961692c3929fb0b4a1e72a5d8bb199474f4bf615b7af0b2a1cbf463e7ebae853 -size 53447 +oid sha256:3e7f5508d0ed76334708189099155ef57ff9b0f5bb559b2137726f8e93519385 +size 53389 From 39a84b9c71edcd3a2cc6d59e86a87a5be6fedf1ef1ef1ee76a092fcf3537cc4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Tue, 4 Dec 2012 21:12:47 +0000 Subject: [PATCH 12/20] On uninstall remove winbind from the pam configuration, invalidate the nscd passwd and group cache and only recommend the install of nscd; (bnc#792340). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=275 --- build-source-timestamp | 2 +- patches.tar.bz2 | 4 ++-- samba-doc.spec | 2 +- samba.changes | 6 ++++++ samba.spec | 18 +++++++++++++++--- vendor-files.tar.bz2 | 4 ++-- 6 files changed, 27 insertions(+), 9 deletions(-) diff --git a/build-source-timestamp b/build-source-timestamp index b87fa77..d39980d 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1 +1 @@ -SOURCE_TIMESTAMP="2874" +SOURCE_TIMESTAMP="2876" diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 7909a40..6e02705 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a8072ae9b5cb548e03a94c16c42d4d92f8b320600e07ea65a8ce8e09ee8dc2b1 -size 44081 +oid sha256:7614cfa477f4cf3386d6d204548babdb1961925ef265c2cb5d57c9540557a062 +size 44085 diff --git a/samba-doc.spec b/samba-doc.spec index e024602..375f6b9 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -126,7 +126,7 @@ BuildRequires: libtevent-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 2874 +%define SOURCE_TIMESTAMP 2876 %define BRANCH 3.6.9 Version: 3.6.9 Release: 0 diff --git a/samba.changes b/samba.changes index 4787b48..40b24e9 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Dec 4 14:29:48 UTC 2012 - lmuelle@suse.com + +- On uninstall remove winbind from the pam configuration, invalidate the nscd + passwd and group cache and only recommend the install of nscd; (bnc#792340). + ------------------------------------------------------------------- Mon Dec 3 16:43:51 UTC 2012 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index 6cc09a0..a049798 100644 --- a/samba.spec +++ b/samba.spec @@ -126,7 +126,7 @@ BuildRequires: libtevent-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 2874 +%define SOURCE_TIMESTAMP 2876 %define BRANCH 3.6.9 Version: 3.6.9 Release: 0 @@ -372,12 +372,15 @@ Provides: samba-client:/usr/sbin/winbindd Obsoletes: samba-winbind-64bit %endif Requires: samba-client >= %{version} +%if 0%{?suse_version} +Requires: pam-config +%endif %if 0%{?suse_version} > 1030 Recommends: cron Recommends: logrotate Recommends: samba-krb-printing %endif -PreReq: /etc/init.d/nscd +Recommends: /usr/sbin/nscd %if 0%{?suse_version} > 0 PreReq: %{?insserv_prereq} %endif @@ -1338,7 +1341,16 @@ fi %postun winbind /sbin/ldconfig -%{?restart_on_update:%{restart_on_update nscd winbind}} +%if 0%{?suse_version} +if [ $1 -eq 0 ]; then +%{_sbindir}/pam-config --delete --winbind +if [ -x %{_sbindir}/nscd ]; then + %{_sbindir}/nscd -i passwd + %{_sbindir}/nscd -i group +fi +fi +%endif +%{?restart_on_update:%{restart_on_update winbind}} %{?insserv_cleanup:%{insserv_cleanup}} %post -n %{libsmbclient_name} -p /sbin/ldconfig diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 7dbf934..c54a4ce 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:3e7f5508d0ed76334708189099155ef57ff9b0f5bb559b2137726f8e93519385 -size 53389 +oid sha256:7c6a898df9c3cde5b3a644bef75bf5f2b1c813e5c16a9f4a4a0d6432ca869a08 +size 53463 From e7ce52cb96ec2e65df86a9fda7985316c2213b52afa1618cd81f012a58e423f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Tue, 4 Dec 2012 21:25:35 +0000 Subject: [PATCH 13/20] Recommends is limited to SUSE based systems. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=276 --- build-source-timestamp | 2 +- patches.tar.bz2 | 4 ++-- samba-doc.spec | 2 +- samba.spec | 4 ++-- vendor-files.tar.bz2 | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build-source-timestamp b/build-source-timestamp index d39980d..72dce72 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1 +1 @@ -SOURCE_TIMESTAMP="2876" +SOURCE_TIMESTAMP="2877" diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 6e02705..38c9cac 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7614cfa477f4cf3386d6d204548babdb1961925ef265c2cb5d57c9540557a062 -size 44085 +oid sha256:081a482ac673b72816fad5d49d0c12b27e4e511617d48a4c62f484a146261693 +size 44090 diff --git a/samba-doc.spec b/samba-doc.spec index 375f6b9..597ccd7 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -126,7 +126,7 @@ BuildRequires: libtevent-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 2876 +%define SOURCE_TIMESTAMP 2877 %define BRANCH 3.6.9 Version: 3.6.9 Release: 0 diff --git a/samba.spec b/samba.spec index a049798..157e529 100644 --- a/samba.spec +++ b/samba.spec @@ -126,7 +126,7 @@ BuildRequires: libtevent-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 2876 +%define SOURCE_TIMESTAMP 2877 %define BRANCH 3.6.9 Version: 3.6.9 Release: 0 @@ -379,8 +379,8 @@ Requires: pam-config Recommends: cron Recommends: logrotate Recommends: samba-krb-printing -%endif Recommends: /usr/sbin/nscd +%endif %if 0%{?suse_version} > 0 PreReq: %{?insserv_prereq} %endif diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index c54a4ce..8f64456 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:7c6a898df9c3cde5b3a644bef75bf5f2b1c813e5c16a9f4a4a0d6432ca869a08 -size 53463 +oid sha256:01d9afb17a7dd5aa0f9ff620843a1c2b1f45f182f47cdc19cfc751118b3558b1 +size 53435 From 23b4019fb441e5ec7d757d0fa20070ac8187782c9ea8d1053836b59643bf800b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Sat, 8 Dec 2012 19:22:39 +0000 Subject: [PATCH 14/20] - Fix MD5 detection in the autoconf build; (bso#9037); (bso#9086); (bso#9094); (bso#9418). - Use work around for 'winbind use default domain' only if it is set; (bso#9367). - Allow smb2.acls torture test to pass against smbd with a POSIX ACLs backend; (bso#9374). - large read requests cause server to issue malformed reply; (bso#9422). - s3-rpc_client: lookup nametype 0x20 in rpc_pipe_open_tcp_port(); (bso#9426). - Fix leaking sockets of SMB connections to a DC; (bso#9436). - Fix ncacn_ip_tcp reconnection code for lsa lookups; (bso#9439). - Allow to force DNS updates using net; (bso#9451). - Respond correctly to FILE_STREAM_INFO requests; (bso#9460). - Fix spoolss segfault when default devmode is disabled; (bso#9433); (bnc#791183). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=277 --- build-source-timestamp | 2 +- patches.tar.bz2 | 4 ++-- samba-doc.spec | 2 +- samba.changes | 22 ++++++++++++++++++++++ samba.spec | 2 +- vendor-files.tar.bz2 | 4 ++-- 6 files changed, 29 insertions(+), 7 deletions(-) diff --git a/build-source-timestamp b/build-source-timestamp index 72dce72..0a220c1 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1 +1 @@ -SOURCE_TIMESTAMP="2877" +SOURCE_TIMESTAMP="2884" diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 38c9cac..23e3bf8 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:081a482ac673b72816fad5d49d0c12b27e4e511617d48a4c62f484a146261693 -size 44090 +oid sha256:55cfd2990039666df3bb93890ec7d812fb59e5f6e8a0ef2234cf703256655634 +size 56860 diff --git a/samba-doc.spec b/samba-doc.spec index 597ccd7..562c5a9 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -126,7 +126,7 @@ BuildRequires: libtevent-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 2877 +%define SOURCE_TIMESTAMP 2884 %define BRANCH 3.6.9 Version: 3.6.9 Release: 0 diff --git a/samba.changes b/samba.changes index 40b24e9..8457d38 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Sat Dec 8 18:57:16 UTC 2012 - lmuelle@suse.com + +- Fix MD5 detection in the autoconf build; (bso#9037); (bso#9086); (bso#9094); + (bso#9418). +- Use work around for 'winbind use default domain' only if it is set; + (bso#9367). +- Allow smb2.acls torture test to pass against smbd with a POSIX ACLs backend; + (bso#9374). +- large read requests cause server to issue malformed reply; (bso#9422). +- s3-rpc_client: lookup nametype 0x20 in rpc_pipe_open_tcp_port(); (bso#9426). +- Fix leaking sockets of SMB connections to a DC; (bso#9436). +- Fix ncacn_ip_tcp reconnection code for lsa lookups; (bso#9439). +- Allow to force DNS updates using net; (bso#9451). +- Respond correctly to FILE_STREAM_INFO requests; (bso#9460). + ------------------------------------------------------------------- Tue Dec 4 14:29:48 UTC 2012 - lmuelle@suse.com @@ -28,6 +44,12 @@ Fri Nov 30 18:14:37 UTC 2012 - lmuelle@suse.com - Don't clutter the spec file diff view; (bnc#783384). +------------------------------------------------------------------- +Tue Nov 27 17:22:58 UTC 2012 - ddiss@suse.com + +- Fix spoolss segfault when default devmode is disabled; (bso#9433); + (bnc#791183). + ------------------------------------------------------------------- Fri Nov 16 18:23:42 UTC 2012 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index 157e529..5708276 100644 --- a/samba.spec +++ b/samba.spec @@ -126,7 +126,7 @@ BuildRequires: libtevent-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 2877 +%define SOURCE_TIMESTAMP 2884 %define BRANCH 3.6.9 Version: 3.6.9 Release: 0 diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 8f64456..6076370 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:01d9afb17a7dd5aa0f9ff620843a1c2b1f45f182f47cdc19cfc751118b3558b1 -size 53435 +oid sha256:eab7df272ebf7ff3cad0025287d83fe1487774cab16259bb44f33d68c001ded0 +size 53407 From 57ca2815bcdcfda31a4120ccebd98ef8fcc255a41566cc38fc5c83e4b142e410 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Sat, 8 Dec 2012 22:47:43 +0000 Subject: [PATCH 15/20] Remove duplicat changelog line for (bso#9436); (bnc#786677). Package change log comment: Fix fd leak causing 100% CPU in winbind on certain dc connection failures; (bso#9436); (bnc#786677). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=278 --- build-source-timestamp | 2 +- patches.tar.bz2 | 4 ++-- samba-doc.spec | 2 +- samba.changes | 7 ++++++- samba.spec | 2 +- vendor-files.tar.bz2 | 4 ++-- 6 files changed, 13 insertions(+), 8 deletions(-) diff --git a/build-source-timestamp b/build-source-timestamp index 0a220c1..140bbe8 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1 +1 @@ -SOURCE_TIMESTAMP="2884" +SOURCE_TIMESTAMP="2885" diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 23e3bf8..dc38617 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:55cfd2990039666df3bb93890ec7d812fb59e5f6e8a0ef2234cf703256655634 -size 56860 +oid sha256:fcf1b5d26f0f4b5fcfbb01e0f6aba4c5f88ccbf996f88b2b5111e9b0ad4ce888 +size 56837 diff --git a/samba-doc.spec b/samba-doc.spec index 562c5a9..07293e0 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -126,7 +126,7 @@ BuildRequires: libtevent-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 2884 +%define SOURCE_TIMESTAMP 2885 %define BRANCH 3.6.9 Version: 3.6.9 Release: 0 diff --git a/samba.changes b/samba.changes index 8457d38..f4aa691 100644 --- a/samba.changes +++ b/samba.changes @@ -9,7 +9,6 @@ Sat Dec 8 18:57:16 UTC 2012 - lmuelle@suse.com (bso#9374). - large read requests cause server to issue malformed reply; (bso#9422). - s3-rpc_client: lookup nametype 0x20 in rpc_pipe_open_tcp_port(); (bso#9426). -- Fix leaking sockets of SMB connections to a DC; (bso#9436). - Fix ncacn_ip_tcp reconnection code for lsa lookups; (bso#9439). - Allow to force DNS updates using net; (bso#9451). - Respond correctly to FILE_STREAM_INFO requests; (bso#9460). @@ -44,6 +43,12 @@ Fri Nov 30 18:14:37 UTC 2012 - lmuelle@suse.com - Don't clutter the spec file diff view; (bnc#783384). +------------------------------------------------------------------- +Wed Nov 28 13:08:20 UTC 2012 - jmcdonough@suse.com + +- Fix fd leak causing 100% CPU in winbind on certain dc connection + failures; (bso#9436); (bnc#786677). + ------------------------------------------------------------------- Tue Nov 27 17:22:58 UTC 2012 - ddiss@suse.com diff --git a/samba.spec b/samba.spec index 5708276..48cd723 100644 --- a/samba.spec +++ b/samba.spec @@ -126,7 +126,7 @@ BuildRequires: libtevent-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 2884 +%define SOURCE_TIMESTAMP 2885 %define BRANCH 3.6.9 Version: 3.6.9 Release: 0 diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 6076370..92532c3 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:eab7df272ebf7ff3cad0025287d83fe1487774cab16259bb44f33d68c001ded0 -size 53407 +oid sha256:5f2d6142906066b778303932a37ef3d57930831f7cb44345ff67ad1e3ab33558 +size 53460 From a94824ca8e3f57ac447601b28c5ca47aee28818d0d757dde27a036b106121b25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Mon, 10 Dec 2012 11:40:59 +0000 Subject: [PATCH 16/20] - Update to 3.6.10. + Respond correctly to FILE_STREAM_INFO requests; (bso#9460). + Fix segfault when "default devmode" is disabled; (bso#9433). + Fix segfaults in "log level = 10" on Solaris; (bso#9390). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=279 --- build-source-timestamp | 2 +- patches.tar.bz2 | 4 ++-- samba-3.6.10.tar.bz2 | 3 +++ samba-3.6.9.tar.bz2 | 3 --- samba-doc.spec | 6 +++--- samba.changes | 8 ++++++++ samba.spec | 6 +++--- vendor-files.tar.bz2 | 4 ++-- 8 files changed, 22 insertions(+), 14 deletions(-) create mode 100644 samba-3.6.10.tar.bz2 delete mode 100644 samba-3.6.9.tar.bz2 diff --git a/build-source-timestamp b/build-source-timestamp index 140bbe8..916ce58 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1 +1 @@ -SOURCE_TIMESTAMP="2885" +SOURCE_TIMESTAMP="2888" diff --git a/patches.tar.bz2 b/patches.tar.bz2 index dc38617..f05bbcd 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fcf1b5d26f0f4b5fcfbb01e0f6aba4c5f88ccbf996f88b2b5111e9b0ad4ce888 -size 56837 +oid sha256:7e5fbe2d2a5e3a74f661dc0c17a58aab8d7b1f4450a4e6a8a8d47b09658fa308 +size 33481 diff --git a/samba-3.6.10.tar.bz2 b/samba-3.6.10.tar.bz2 new file mode 100644 index 0000000..783fe9c --- /dev/null +++ b/samba-3.6.10.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:088a47f77e45475f679bbccf715e126375e2fe490011e86c63e32ee7a24e26d1 +size 29484832 diff --git a/samba-3.6.9.tar.bz2 b/samba-3.6.9.tar.bz2 deleted file mode 100644 index 7be29bc..0000000 --- a/samba-3.6.9.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2334793a8cce439638499754ffaee3dad04417cdcd50bc653715157af480e68b -size 29486630 diff --git a/samba-doc.spec b/samba-doc.spec index 07293e0..ee0727d 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -89,7 +89,7 @@ BuildRequires: libtalloc-devel BuildRequires: libtdb-devel BuildRequires: libtevent-devel %endif -%define samba_ver 3.6.9 +%define samba_ver 3.6.10 %define samba_ver_suffix %nil %define samba_ver_full %{samba_ver}%{samba_ver_suffix} %if 0%{?suse_version} && 0%{?suse_version} < 1111 @@ -126,9 +126,9 @@ BuildRequires: libtevent-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 2885 +%define SOURCE_TIMESTAMP 2888 %define BRANCH 3.6.9 -Version: 3.6.9 +Version: 3.6.10 Release: 0 %define ldapsmb_ver 1.34b Url: http://www.samba.org/ diff --git a/samba.changes b/samba.changes index f4aa691..ab03275 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Dec 10 11:24:52 UTC 2012 - lmuelle@suse.com + +- Update to 3.6.10. + + Respond correctly to FILE_STREAM_INFO requests; (bso#9460). + + Fix segfault when "default devmode" is disabled; (bso#9433). + + Fix segfaults in "log level = 10" on Solaris; (bso#9390). + ------------------------------------------------------------------- Sat Dec 8 18:57:16 UTC 2012 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index 48cd723..2521598 100644 --- a/samba.spec +++ b/samba.spec @@ -89,7 +89,7 @@ BuildRequires: libtalloc-devel BuildRequires: libtdb-devel BuildRequires: libtevent-devel %endif -%define samba_ver 3.6.9 +%define samba_ver 3.6.10 %define samba_ver_suffix %nil %define samba_ver_full %{samba_ver}%{samba_ver_suffix} %if 0%{?suse_version} && 0%{?suse_version} < 1111 @@ -126,9 +126,9 @@ BuildRequires: libtevent-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 2885 +%define SOURCE_TIMESTAMP 2888 %define BRANCH 3.6.9 -Version: 3.6.9 +Version: 3.6.10 Release: 0 %define ldapsmb_ver 1.34b License: GPL-3.0+ diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 92532c3..fba11f9 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:5f2d6142906066b778303932a37ef3d57930831f7cb44345ff67ad1e3ab33558 -size 53460 +oid sha256:061cce9a03ac3f48dd968e141ed6129a3fa8308f8ec83bc6840a20f209fa2350 +size 53384 From 3b155431c0aa75499f184716e3a316487185dc4a85f944e31adfb4850302129c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Mon, 10 Dec 2012 22:35:46 +0000 Subject: [PATCH 17/20] SEGV when using second vfs module; (bso#9471). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=280 --- build-source-timestamp | 2 +- patches.tar.bz2 | 4 ++-- samba-doc.spec | 2 +- samba.changes | 5 +++++ samba.spec | 2 +- vendor-files.tar.bz2 | 4 ++-- 6 files changed, 12 insertions(+), 7 deletions(-) diff --git a/build-source-timestamp b/build-source-timestamp index 916ce58..dbdb59f 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1 +1 @@ -SOURCE_TIMESTAMP="2888" +SOURCE_TIMESTAMP="2889" diff --git a/patches.tar.bz2 b/patches.tar.bz2 index f05bbcd..b198ee7 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7e5fbe2d2a5e3a74f661dc0c17a58aab8d7b1f4450a4e6a8a8d47b09658fa308 -size 33481 +oid sha256:22bcd7590139f93ea4a8faaf7dae25eac746a5303ab6bfe738dc798b9d255ca2 +size 34080 diff --git a/samba-doc.spec b/samba-doc.spec index ee0727d..6c60a1d 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -126,7 +126,7 @@ BuildRequires: libtevent-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 2888 +%define SOURCE_TIMESTAMP 2889 %define BRANCH 3.6.9 Version: 3.6.10 Release: 0 diff --git a/samba.changes b/samba.changes index ab03275..e63b380 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Dec 10 22:25:04 UTC 2012 - lmuelle@suse.com + +- SEGV when using second vfs module; (bso#9471). + ------------------------------------------------------------------- Mon Dec 10 11:24:52 UTC 2012 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index 2521598..6698a71 100644 --- a/samba.spec +++ b/samba.spec @@ -126,7 +126,7 @@ BuildRequires: libtevent-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 2888 +%define SOURCE_TIMESTAMP 2889 %define BRANCH 3.6.9 Version: 3.6.10 Release: 0 diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index fba11f9..bd8f65d 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:061cce9a03ac3f48dd968e141ed6129a3fa8308f8ec83bc6840a20f209fa2350 -size 53384 +oid sha256:2e87bbfc18c3d60bb1e2c86b5352397604b552778a39420950e967f58932d38b +size 53451 From 365e6a296a95224d1c0e832042b56443aefe0dafd2c04bdfd77a77e960e5d083 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Sat, 22 Dec 2012 23:40:34 +0000 Subject: [PATCH 18/20] Use correct branch name. This needs further attention/ enhancement. We better might use %{version} plus the PTF or LTSS suffix if required. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=281 --- build-source-timestamp | 2 +- patches.tar.bz2 | 4 ++-- samba-doc.spec | 4 ++-- samba.spec | 4 ++-- vendor-files.tar.bz2 | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/build-source-timestamp b/build-source-timestamp index dbdb59f..3ea75b4 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1 +1 @@ -SOURCE_TIMESTAMP="2889" +SOURCE_TIMESTAMP="2897" diff --git a/patches.tar.bz2 b/patches.tar.bz2 index b198ee7..7129611 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:22bcd7590139f93ea4a8faaf7dae25eac746a5303ab6bfe738dc798b9d255ca2 -size 34080 +oid sha256:3ce64c1c97c85696a09207b85c80b005b5eb19ddc3dac7d43dbb9bcfbb2b6c05 +size 34100 diff --git a/samba-doc.spec b/samba-doc.spec index 6c60a1d..0cdb53a 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -126,8 +126,8 @@ BuildRequires: libtevent-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 2889 -%define BRANCH 3.6.9 +%define SOURCE_TIMESTAMP 2897 +%define BRANCH 3.6.10 Version: 3.6.10 Release: 0 %define ldapsmb_ver 1.34b diff --git a/samba.spec b/samba.spec index 6698a71..521aa60 100644 --- a/samba.spec +++ b/samba.spec @@ -126,8 +126,8 @@ BuildRequires: libtevent-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 2889 -%define BRANCH 3.6.9 +%define SOURCE_TIMESTAMP 2897 +%define BRANCH 3.6.10 Version: 3.6.10 Release: 0 %define ldapsmb_ver 1.34b diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index bd8f65d..56d9606 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:2e87bbfc18c3d60bb1e2c86b5352397604b552778a39420950e967f58932d38b -size 53451 +oid sha256:5ad141810df26b3a2c11f056558c2b7b70bf3039b74a10f76cc6bc95ba0b1e0b +size 53379 From a201af31f7e7d663d358f43cb885fd4f8a9bb13e23c6a7fd0b0e9e90adb44b24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Sun, 23 Dec 2012 16:03:05 +0000 Subject: [PATCH 19/20] Use the version macro while definition of the branch macro. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=282 --- build-source-timestamp | 2 +- patches.tar.bz2 | 4 ++-- samba-doc.spec | 4 ++-- samba.changes | 5 +++++ samba.spec | 4 ++-- vendor-files.tar.bz2 | 4 ++-- 6 files changed, 14 insertions(+), 9 deletions(-) diff --git a/build-source-timestamp b/build-source-timestamp index 3ea75b4..0831540 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1 +1 @@ -SOURCE_TIMESTAMP="2897" +SOURCE_TIMESTAMP="2899" diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 7129611..e2891e9 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3ce64c1c97c85696a09207b85c80b005b5eb19ddc3dac7d43dbb9bcfbb2b6c05 -size 34100 +oid sha256:11252ded08a2702ffeb829334e49eef4f6048a70450b82d5d6bbcde4e2a0532b +size 34051 diff --git a/samba-doc.spec b/samba-doc.spec index 0cdb53a..3e41a91 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -126,8 +126,8 @@ BuildRequires: libtevent-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 2897 -%define BRANCH 3.6.10 +%define SOURCE_TIMESTAMP 2899 +%define BRANCH %{version} Version: 3.6.10 Release: 0 %define ldapsmb_ver 1.34b diff --git a/samba.changes b/samba.changes index e63b380..41731b7 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Dec 23 14:56:51 UTC 2012 - lmuelle@suse.com + +- Use the version macro while definition of the branch macro. + ------------------------------------------------------------------- Mon Dec 10 22:25:04 UTC 2012 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index 521aa60..0293d79 100644 --- a/samba.spec +++ b/samba.spec @@ -126,8 +126,8 @@ BuildRequires: libtevent-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 2897 -%define BRANCH 3.6.10 +%define SOURCE_TIMESTAMP 2899 +%define BRANCH %{version} Version: 3.6.10 Release: 0 %define ldapsmb_ver 1.34b diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 56d9606..c6f382f 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:5ad141810df26b3a2c11f056558c2b7b70bf3039b74a10f76cc6bc95ba0b1e0b -size 53379 +oid sha256:e63200bcf136fad0da12d7153b3d1d93e901ea9d95edefdc4bd603fc4db5e6a9 +size 53447 From 6bb39e19eef530e65db5954a8095e2875251cc0528cbf51300238dc5b4de6ee7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Wed, 9 Jan 2013 22:15:41 +0000 Subject: [PATCH 20/20] Add the missing get_printing_ticket binary path while calling the set_permissions macro; (bnc#783375). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=283 --- build-source-timestamp | 2 +- patches.tar.bz2 | 4 ++-- samba-doc.spec | 2 +- samba.changes | 6 ++++++ samba.spec | 11 +++++++---- vendor-files.tar.bz2 | 4 ++-- 6 files changed, 19 insertions(+), 10 deletions(-) diff --git a/build-source-timestamp b/build-source-timestamp index 0831540..46351d5 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1 +1 @@ -SOURCE_TIMESTAMP="2899" +SOURCE_TIMESTAMP="2905" diff --git a/patches.tar.bz2 b/patches.tar.bz2 index e2891e9..ab7e2a4 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:11252ded08a2702ffeb829334e49eef4f6048a70450b82d5d6bbcde4e2a0532b -size 34051 +oid sha256:d5e3e511d3bf039aa5d91bc96fdebe3991e70fe7ebcad005c5d09748f9f20ffb +size 34080 diff --git a/samba-doc.spec b/samba-doc.spec index 3e41a91..bdf8cae 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -126,7 +126,7 @@ BuildRequires: libtevent-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 2899 +%define SOURCE_TIMESTAMP 2905 %define BRANCH %{version} Version: 3.6.10 Release: 0 diff --git a/samba.changes b/samba.changes index 41731b7..9a9d368 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jan 9 21:53:11 UTC 2013 - lmuelle@suse.com + +- Add the missing get_printing_ticket binary path while calling the + set_permissions macro; (bnc#783375). + ------------------------------------------------------------------- Sun Dec 23 14:56:51 UTC 2012 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index 0293d79..57de28c 100644 --- a/samba.spec +++ b/samba.spec @@ -126,7 +126,7 @@ BuildRequires: libtevent-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 2899 +%define SOURCE_TIMESTAMP 2905 %define BRANCH %{version} Version: 3.6.10 Release: 0 @@ -1303,10 +1303,13 @@ fi 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 -%if 0%{?suse_version} > 0 && 0%{?suse_version} < 1131 -%{?run_permissions:%{run_permissions}} +%if 0%{?suse_version} > 0 +%if 0%{?suse_version} < 1131 +%{run_permissions} +%else +%{set_permissions} %{_bindir}/get_printing_ticket +%endif %endif -%{?set_permissions:%{set_permissions}} %postun krb-printing if test ${1:-0} -eq 0 -a -e %{_bindir}/smbspool -a -d %{cups_lib_dir}/backend; then diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index c6f382f..6ab1440 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:e63200bcf136fad0da12d7153b3d1d93e901ea9d95edefdc4bd603fc4db5e6a9 -size 53447 +oid sha256:5b78afc2d3007c175a06efb80f5f66a579bec28dcb51e5e8bab84a17468d01a0 +size 53487