From d11e916363f8b97fdb687dcf2d470705aab06e6025f684207221780394dfc943 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20M=C3=BCller?= <lmuelle@suse.com>
Date: Fri, 26 Oct 2012 18:07:36 +0000
Subject: [PATCH 1/7] Warn via the smbd log if AppArmor and "wide links" are in
 use; (bnc#783719).

OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=257
---
 build-source-timestamp |  2 +-
 patches.tar.bz2        |  4 ++--
 samba-doc.spec         |  2 +-
 samba.changes          |  5 ++++
 samba.spec             | 52 +++++++++++++++++++++---------------------
 vendor-files.tar.bz2   |  4 ++--
 6 files changed, 37 insertions(+), 32 deletions(-)

diff --git a/build-source-timestamp b/build-source-timestamp
index 26ecd32..726b337 100644
--- a/build-source-timestamp
+++ b/build-source-timestamp
@@ -1,2 +1,2 @@
-2843
+2845
 Branch      : 3.6.8
diff --git a/patches.tar.bz2 b/patches.tar.bz2
index e5e98af..4a4fe64 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:68dd9006858b2f601cc8c614e4ea035ed1edbcc262aa6f28eb395bc5114c9d29
-size 33754
+oid sha256:24577162ec3c3c82bc8e271a6b544b5b9ca655432a9fada4daa0a25013462558
+size 33760
diff --git a/samba-doc.spec b/samba-doc.spec
index 0f6a694..d9b0cba 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: 2843
+Source Timestamp: 2845
 Branch      : 3.6.8
 
 %changelog
diff --git a/samba.changes b/samba.changes
index 9d1d274..179d1f4 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Oct 26 17:40:15 UTC 2012 - lmuelle@suse.com
+
+- Warn via the smbd log if AppArmor and "wide links" are in use; (bnc#783719).
+
 -------------------------------------------------------------------
 Wed Sep 26 18:07:49 UTC 2012 - lmuelle@suse.com
 
diff --git a/samba.spec b/samba.spec
index d010adf..36a2a87 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: 2843
+Source Timestamp: 2845
 Branch      : 3.6.8
 
 %package client
@@ -265,7 +265,7 @@ binary packages of the most current Samba version, and a bug reporting
 how to.
 
 
-Source Timestamp: 2843
+Source Timestamp: 2845
 Branch      : 3.6.8
 
 %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: 2843
+Source Timestamp: 2845
 Branch      : 3.6.8
 
 %endif
@@ -310,7 +310,7 @@ This package contains all the Samba documentation as it is not part of
 the man pages.
 
 
-Source Timestamp: 2843
+Source Timestamp: 2845
 Branch      : 3.6.8
 
 %endif
@@ -331,7 +331,7 @@ Requires:       samba-client >= %{version}
 A wrapper binary to run smbspool with the original calling UID.
 
 
-Source Timestamp: 2843
+Source Timestamp: 2845
 Branch      : 3.6.8
 
 %if %{make_utils}
@@ -347,7 +347,7 @@ Obsoletes:      samba-gplv3-utils < %{version}
 Some of the debug-tools for developpers.
 
 
-Source Timestamp: 2843
+Source Timestamp: 2845
 Branch      : 3.6.8
 
 %endif
@@ -380,7 +380,7 @@ PreReq:         coreutils
 This is the winbind-daemon and the wbinfo-tool.
 
 
-Source Timestamp: 2843
+Source Timestamp: 2845
 Branch      : 3.6.8
 
 %if 0%{?suse_version} && 0%{?suse_version} < 1031
@@ -406,14 +406,14 @@ PreReq:         /sbin/ldconfig
 
 %description -n libsmbclient
 
-Source Timestamp: 2843
+Source Timestamp: 2845
 Branch      : 3.6.8
 
 %else
 
 %description -n libsmbclient0
 
-Source Timestamp: 2843
+Source Timestamp: 2845
 Branch      : 3.6.8
 
 %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: 2843
+Source Timestamp: 2845
 Branch      : 3.6.8
 
 %package -n libnetapi0
@@ -465,7 +465,7 @@ PreReq:         /sbin/ldconfig
 This package includes the netapi library.
 
 
-Source Timestamp: 2843
+Source Timestamp: 2845
 Branch      : 3.6.8
 
 %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: 2843
+Source Timestamp: 2845
 Branch      : 3.6.8
 
 %if 0%{?suse_version} && 0%{?suse_version} < 1031
@@ -505,14 +505,14 @@ PreReq:         /sbin/ldconfig
 
 %description -n libsmbsharemodes
 
-Source Timestamp: 2843
+Source Timestamp: 2845
 Branch      : 3.6.8
 
 %else
 
 %description -n libsmbsharemodes0
 
-Source Timestamp: 2843
+Source Timestamp: 2845
 Branch      : 3.6.8
 
 %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: 2843
+Source Timestamp: 2845
 Branch      : 3.6.8
 
 %package -n libwbclient0
@@ -551,7 +551,7 @@ PreReq:         /sbin/ldconfig
 This package includes the wbclient library.
 
 
-Source Timestamp: 2843
+Source Timestamp: 2845
 Branch      : 3.6.8
 
 %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: 2843
+Source Timestamp: 2845
 Branch      : 3.6.8
 
 %if 0%{?suse_version} && 0%{?suse_version} < 1211
@@ -587,7 +587,7 @@ PreReq:         /sbin/ldconfig
 This package includes the talloc library.
 
 
-Source Timestamp: 2843
+Source Timestamp: 2845
 Branch      : 3.6.8
 
 %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: 2843
+Source Timestamp: 2845
 Branch      : 3.6.8
 
 %package -n libtdb1
@@ -623,7 +623,7 @@ PreReq:         /sbin/ldconfig
 This package includes the tdb library.
 
 
-Source Timestamp: 2843
+Source Timestamp: 2845
 Branch      : 3.6.8
 
 %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: 2843
+Source Timestamp: 2845
 Branch      : 3.6.8
 
 %package -n libtevent0
@@ -655,7 +655,7 @@ PreReq:         /sbin/ldconfig
 This package includes the tevent library.
 
 
-Source Timestamp: 2843
+Source Timestamp: 2845
 Branch      : 3.6.8
 
 %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: 2843
+Source Timestamp: 2845
 Branch      : 3.6.8
 
 %package -n libldb1
@@ -693,7 +693,7 @@ PreReq:         /sbin/ldconfig
 This package includes the ldb library.
 
 
-Source Timestamp: 2843
+Source Timestamp: 2845
 Branch      : 3.6.8
 
 %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: 2843
+Source Timestamp: 2845
 Branch      : 3.6.8
 
 %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: 2843
+Source Timestamp: 2845
 Branch      : 3.6.8
 
 %endif
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index dca0a76..6294d9a 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:b9ef778ec3968aabf3676a67a586f99b6657aa3eb4d1f539ba77f66d8fced267
-size 53305
+oid sha256:87a998e2529c93a71e575567ccdb7ee4282d5d6efbf60a8fef8b0191744dc1ff
+size 53444

From 3929065d7e08947cb902437726eddfe8e54a31f89d757bf702a58f56f7425016 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20M=C3=BCller?= <lmuelle@suse.com>
Date: Mon, 29 Oct 2012 13:38:14 +0000
Subject: [PATCH 2/7] - Update to 3.6.9.   + When setting a non-default ACL,
 don't forget to apply masks to     SMB_ACL_USER and SMB_ACL_GROUP entries;
 (bso#9236).   + Winbind can't fetch user or group info from AD via LDAP;
 (bso#9147).   + Fix segfault in smbd if user specified ports out for range;
 (bso#9218). - quota: Don't force the block size to 512; (bso#3272). - Fix
 poll replacement to become a msleep replacement; (bso#8107). - 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). -
 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). - Connection to outbound trusted domain
 goes offline; (bso#9016). - Increase debug level for info that the db is
 empty; (bso#9112). - 'smbclient' can't connect to a Windows 7 server using
 NTLMv2; (bso#9117). - Winbind can't fetch user or group info from AD via
 LDAP; (bso#9147). - Open printers with the right access mask; (bso#9154). -
 Fix makerpms.sh on RHEL; (bso#9165). - Remove non-existent option '-Y' from
 winbindd manpage; (bso#9171). - Add quota support for gfs2; (bso#9172). -
 Make SMB2 compound request create/delete_on_close/close work as Windows;  
 (bso#9173). - 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). - SMB2 Create doesn't
 return correct MAX ACCESS access mask in blob;   (bso#9189). - Fix service
 control for non-internal services; (bso#9192). - Don't take 'state->te' as
 indication for "was_deferred"; (bso#9196). - Parse of invalid SMB2 create
 blob can cause smbd crash; (bso#9209). - Bad ASN.1 NegTokenInit packet can
 cause invalid free; (bso#9213). - Fix segfault in smbd if user specified
 ports out for range; (bso#9218). - Signing cannot be disabled for SMB2 by
 design, so fix the documentation   instead; (bso#9222). - Fix
 NT_STATUS_IO_TIMEOUT during slow import of printers into registry;  
 (bso#9231). - When setting a non-default ACL, don't forget to apply masks to
 SMB_ACL_USER   and SMB_ACL_GROUP entries; (bso#9236). - lib-addns: ensure
 that allocated buffer are pre set to 0; (bso#9259). - Make tdb robust against
 shrinking tdbs and improper CLEAR_IF_FIRST restart;   (bso#9268). - Add
 support for reloading systemd services; (bso#9280).

OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=258
---
 build-source-timestamp |   4 +-
 patches.tar.bz2        |   4 +-
 samba-3.6.9.tar.bz2    |   3 ++
 samba-doc.spec         |  10 ++--
 samba.changes          |  53 ++++++++++++++++++++
 samba.spec             | 110 ++++++++++++++++++++---------------------
 vendor-files.tar.bz2   |   4 +-
 7 files changed, 122 insertions(+), 66 deletions(-)
 create mode 100644 samba-3.6.9.tar.bz2

diff --git a/build-source-timestamp b/build-source-timestamp
index 726b337..fea20de 100644
--- a/build-source-timestamp
+++ b/build-source-timestamp
@@ -1,2 +1,2 @@
-2845
-Branch      : 3.6.8
+2846
+Branch      : 3.6.9
diff --git a/patches.tar.bz2 b/patches.tar.bz2
index 4a4fe64..6e49c76 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:24577162ec3c3c82bc8e271a6b544b5b9ca655432a9fada4daa0a25013462558
-size 33760
+oid sha256:4e085390a47162deba08f47463c36a2b66238cd81464744d554ec17ddf704549
+size 33772
diff --git a/samba-3.6.9.tar.bz2 b/samba-3.6.9.tar.bz2
new file mode 100644
index 0000000..7be29bc
--- /dev/null
+++ b/samba-3.6.9.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2334793a8cce439638499754ffaee3dad04417cdcd50bc653715157af480e68b
+size 29486630
diff --git a/samba-doc.spec b/samba-doc.spec
index d9b0cba..07c9a4a 100644
--- a/samba-doc.spec
+++ b/samba-doc.spec
@@ -93,7 +93,7 @@ BuildRequires:  libtalloc-devel
 BuildRequires:  libtdb-devel
 BuildRequires:  libtevent-devel
 %endif
-%define	samba_ver 3.6.8
+%define	samba_ver 3.6.9
 %define	samba_ver_suffix %nil
 %define	samba_ver_full %{samba_ver}%{samba_ver_suffix}
 %if 0%{?suse_version} && 0%{?suse_version} < 1111
@@ -117,7 +117,7 @@ BuildRequires:  libtevent-devel
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-Version:        3.6.8
+Version:        3.6.9
 Release:        1
 %define	ldapsmb_ver 1.34b
 Url:            http://www.samba.org/
@@ -267,7 +267,7 @@ test "%{_build_arch}" != "" && \
 	product_suffix="${product_suffix}-%{_build_arch}"
 # Set SAMBA_VERSION_VENDOR_SUFFIX in the VERSION file
 mv VERSION VERSION.orig
-sed -e s/^SAMBA_VERSION_VENDOR_SUFFIX=$/SAMBA_VERSION_VENDOR_SUFFIX=\"${vendor_tag}%{VENDOR}${product_suffix}\"/ VERSION.orig >VERSION
+sed -e "s/^SAMBA_VERSION_VENDOR_SUFFIX=$/SAMBA_VERSION_VENDOR_SUFFIX=\"${vendor_tag}%{VENDOR}${product_suffix}\"/" VERSION.orig >VERSION
 %endif
 
 %build samba-%{samba_ver_full}
@@ -462,7 +462,7 @@ This package contains all the Samba documentation as it is not part of
 the man pages.
 
 
-Source Timestamp: 2845
-Branch      : 3.6.8
+Source Timestamp: 2846
+Branch      : 3.6.9
 
 %changelog
diff --git a/samba.changes b/samba.changes
index 179d1f4..8640a5e 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,56 @@
+-------------------------------------------------------------------
+Mon Oct 29 12:10:41 UTC 2012 - lmuelle@suse.com
+
+- Update to 3.6.9.
+  + When setting a non-default ACL, don't forget to apply masks to
+    SMB_ACL_USER and SMB_ACL_GROUP entries; (bso#9236).
+  + Winbind can't fetch user or group info from AD via LDAP; (bso#9147).
+  + Fix segfault in smbd if user specified ports out for range; (bso#9218).
+
+-------------------------------------------------------------------
+Mon Oct 29 12:03:21 UTC 2012 - lmuelle@suse.com
+
+- quota: Don't force the block size to 512; (bso#3272).
+- Fix poll replacement to become a msleep replacement; (bso#8107).
+- 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).
+- 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).
+- Connection to outbound trusted domain goes offline; (bso#9016).
+- Increase debug level for info that the db is empty; (bso#9112).
+- 'smbclient' can't connect to a Windows 7 server using NTLMv2; (bso#9117).
+- Winbind can't fetch user or group info from AD via LDAP; (bso#9147).
+- Open printers with the right access mask; (bso#9154).
+- Fix makerpms.sh on RHEL; (bso#9165).
+- Remove non-existent option '-Y' from winbindd manpage; (bso#9171).
+- Add quota support for gfs2; (bso#9172).
+- Make SMB2 compound request create/delete_on_close/close work as Windows;
+  (bso#9173).
+- 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).
+- SMB2 Create doesn't return correct MAX ACCESS access mask in blob;
+  (bso#9189).
+- Fix service control for non-internal services; (bso#9192).
+- Don't take 'state->te' as indication for "was_deferred"; (bso#9196).
+- Parse of invalid SMB2 create blob can cause smbd crash; (bso#9209).
+- Bad ASN.1 NegTokenInit packet can cause invalid free; (bso#9213).
+- Fix segfault in smbd if user specified ports out for range; (bso#9218).
+- Signing cannot be disabled for SMB2 by design, so fix the documentation
+  instead; (bso#9222).
+- Fix NT_STATUS_IO_TIMEOUT during slow import of printers into registry;
+  (bso#9231).
+- When setting a non-default ACL, don't forget to apply masks to SMB_ACL_USER
+  and SMB_ACL_GROUP entries; (bso#9236).
+- lib-addns: ensure that allocated buffer are pre set to 0; (bso#9259).
+- Make tdb robust against shrinking tdbs and improper CLEAR_IF_FIRST restart;
+  (bso#9268).
+- Add support for reloading systemd services; (bso#9280).
+
 -------------------------------------------------------------------
 Fri Oct 26 17:40:15 UTC 2012 - lmuelle@suse.com
 
diff --git a/samba.spec b/samba.spec
index 36a2a87..2165569 100644
--- a/samba.spec
+++ b/samba.spec
@@ -93,7 +93,7 @@ BuildRequires:  libtalloc-devel
 BuildRequires:  libtdb-devel
 BuildRequires:  libtevent-devel
 %endif
-%define	samba_ver 3.6.8
+%define	samba_ver 3.6.9
 %define	samba_ver_suffix %nil
 %define	samba_ver_full %{samba_ver}%{samba_ver_suffix}
 %if 0%{?suse_version} && 0%{?suse_version} < 1111
@@ -117,7 +117,7 @@ BuildRequires:  libtevent-devel
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-Version:        3.6.8
+Version:        3.6.9
 Release:        1
 %define	ldapsmb_ver 1.34b
 License:        GPL-3.0+
@@ -224,8 +224,8 @@ binary packages of the most current Samba version, and a bug reporting
 how to.
 
 
-Source Timestamp: 2845
-Branch      : 3.6.8
+Source Timestamp: 2846
+Branch      : 3.6.9
 
 %package client
 License:        GPL-3.0+
@@ -265,8 +265,8 @@ binary packages of the most current Samba version, and a bug reporting
 how to.
 
 
-Source Timestamp: 2845
-Branch      : 3.6.8
+Source Timestamp: 2846
+Branch      : 3.6.9
 
 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020
 
@@ -285,8 +285,8 @@ This package contains the static libraries and header files needed to
 develop programs which make use of Samba.
 
 
-Source Timestamp: 2845
-Branch      : 3.6.8
+Source Timestamp: 2846
+Branch      : 3.6.9
 
 %endif
 %if 0%{?suse_version} && 0%{?suse_version} < 1001 || 0%{?suse_version} > 1110
@@ -310,8 +310,8 @@ This package contains all the Samba documentation as it is not part of
 the man pages.
 
 
-Source Timestamp: 2845
-Branch      : 3.6.8
+Source Timestamp: 2846
+Branch      : 3.6.9
 
 %endif
 
@@ -331,8 +331,8 @@ Requires:       samba-client >= %{version}
 A wrapper binary to run smbspool with the original calling UID.
 
 
-Source Timestamp: 2845
-Branch      : 3.6.8
+Source Timestamp: 2846
+Branch      : 3.6.9
 
 %if %{make_utils}
 
@@ -347,8 +347,8 @@ Obsoletes:      samba-gplv3-utils < %{version}
 Some of the debug-tools for developpers.
 
 
-Source Timestamp: 2845
-Branch      : 3.6.8
+Source Timestamp: 2846
+Branch      : 3.6.9
 
 %endif
 
@@ -380,8 +380,8 @@ PreReq:         coreutils
 This is the winbind-daemon and the wbinfo-tool.
 
 
-Source Timestamp: 2845
-Branch      : 3.6.8
+Source Timestamp: 2846
+Branch      : 3.6.9
 
 %if 0%{?suse_version} && 0%{?suse_version} < 1031
 
@@ -406,15 +406,15 @@ PreReq:         /sbin/ldconfig
 
 %description -n libsmbclient
 
-Source Timestamp: 2845
-Branch      : 3.6.8
+Source Timestamp: 2846
+Branch      : 3.6.9
 
 %else
 
 %description -n libsmbclient0
 
-Source Timestamp: 2845
-Branch      : 3.6.8
+Source Timestamp: 2846
+Branch      : 3.6.9
 
 %endif
 This package includes the libsmbclient library.
@@ -452,8 +452,8 @@ This package contains the static libraries and header files needed to
 develop programs which make use of the smbclient programming interface.
 
 
-Source Timestamp: 2845
-Branch      : 3.6.8
+Source Timestamp: 2846
+Branch      : 3.6.9
 
 %package -n libnetapi0
 License:        GPL-3.0+
@@ -465,8 +465,8 @@ PreReq:         /sbin/ldconfig
 This package includes the netapi library.
 
 
-Source Timestamp: 2845
-Branch      : 3.6.8
+Source Timestamp: 2846
+Branch      : 3.6.9
 
 %package -n libnetapi-devel
 License:        GPL-3.0+
@@ -484,8 +484,8 @@ This package contains the static libraries and header files needed to
 develop programs which make use of the netapi programming interface.
 
 
-Source Timestamp: 2845
-Branch      : 3.6.8
+Source Timestamp: 2846
+Branch      : 3.6.9
 
 %if 0%{?suse_version} && 0%{?suse_version} < 1031
 
@@ -505,15 +505,15 @@ PreReq:         /sbin/ldconfig
 
 %description -n libsmbsharemodes
 
-Source Timestamp: 2845
-Branch      : 3.6.8
+Source Timestamp: 2846
+Branch      : 3.6.9
 
 %else
 
 %description -n libsmbsharemodes0
 
-Source Timestamp: 2845
-Branch      : 3.6.8
+Source Timestamp: 2846
+Branch      : 3.6.9
 
 %endif
 This package includes the smbsharemodes library.
@@ -538,8 +538,8 @@ This package contains the static libraries and header files needed to
 develop programs which make use of the smbsharemodes programming interface.
 
 
-Source Timestamp: 2845
-Branch      : 3.6.8
+Source Timestamp: 2846
+Branch      : 3.6.9
 
 %package -n libwbclient0
 License:        LGPL-3.0+
@@ -551,8 +551,8 @@ PreReq:         /sbin/ldconfig
 This package includes the wbclient library.
 
 
-Source Timestamp: 2845
-Branch      : 3.6.8
+Source Timestamp: 2846
+Branch      : 3.6.9
 
 %package -n libwbclient-devel
 License:        LGPL-3.0+
@@ -570,8 +570,8 @@ This package contains the static libraries and header files needed to
 develop programs which make use of the wbclient programming interface.
 
 
-Source Timestamp: 2845
-Branch      : 3.6.8
+Source Timestamp: 2846
+Branch      : 3.6.9
 
 %if 0%{?suse_version} && 0%{?suse_version} < 1211
 
@@ -587,8 +587,8 @@ PreReq:         /sbin/ldconfig
 This package includes the talloc library.
 
 
-Source Timestamp: 2845
-Branch      : 3.6.8
+Source Timestamp: 2846
+Branch      : 3.6.9
 
 %package -n libtalloc-devel
 Version:        %{libtalloc_ver}
@@ -608,8 +608,8 @@ This package contains the static libraries and header files needed to
 develop programs which make use of the talloc programming interface.
 
 
-Source Timestamp: 2845
-Branch      : 3.6.8
+Source Timestamp: 2846
+Branch      : 3.6.9
 
 %package -n libtdb1
 Version:        %{libtdb_ver}
@@ -623,8 +623,8 @@ PreReq:         /sbin/ldconfig
 This package includes the tdb library.
 
 
-Source Timestamp: 2845
-Branch      : 3.6.8
+Source Timestamp: 2846
+Branch      : 3.6.9
 
 %package -n libtdb-devel
 Version:        %{libtdb_ver}
@@ -640,8 +640,8 @@ This package contains the static libraries and header files needed to
 develop programs which make use of the tdb programming interface.
 
 
-Source Timestamp: 2845
-Branch      : 3.6.8
+Source Timestamp: 2846
+Branch      : 3.6.9
 
 %package -n libtevent0
 Version:        %{libtevent_ver}
@@ -655,8 +655,8 @@ PreReq:         /sbin/ldconfig
 This package includes the tevent library.
 
 
-Source Timestamp: 2845
-Branch      : 3.6.8
+Source Timestamp: 2846
+Branch      : 3.6.9
 
 %package -n libtevent-devel
 Version:        %{libtevent_ver}
@@ -677,8 +677,8 @@ This package contains the static libraries and header files needed to
 develop programs which make use of the tevent programming interface.
 
 
-Source Timestamp: 2845
-Branch      : 3.6.8
+Source Timestamp: 2846
+Branch      : 3.6.9
 
 %package -n libldb1
 Version:        %{libldb_ver}
@@ -693,8 +693,8 @@ PreReq:         /sbin/ldconfig
 This package includes the ldb library.
 
 
-Source Timestamp: 2845
-Branch      : 3.6.8
+Source Timestamp: 2846
+Branch      : 3.6.9
 
 %package -n libldb-devel
 Version:        %{libldb_ver}
@@ -714,8 +714,8 @@ 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: 2845
-Branch      : 3.6.8
+Source Timestamp: 2846
+Branch      : 3.6.9
 
 %endif
 
@@ -734,8 +734,8 @@ This tool aims to simplify the administration of a Samba Domain
 Controller that uses the ldapsam passdb backend.
 
 
-Source Timestamp: 2845
-Branch      : 3.6.8
+Source Timestamp: 2846
+Branch      : 3.6.9
 
 %endif
 
@@ -815,7 +815,7 @@ test "%{_build_arch}" != "" && \
 	product_suffix="${product_suffix}-%{_build_arch}"
 # Set SAMBA_VERSION_VENDOR_SUFFIX in the VERSION file
 mv VERSION VERSION.orig
-sed -e s/^SAMBA_VERSION_VENDOR_SUFFIX=$/SAMBA_VERSION_VENDOR_SUFFIX=\"${vendor_tag}%{VENDOR}${product_suffix}\"/ VERSION.orig >VERSION
+sed -e "s/^SAMBA_VERSION_VENDOR_SUFFIX=$/SAMBA_VERSION_VENDOR_SUFFIX=\"${vendor_tag}%{VENDOR}${product_suffix}\"/" VERSION.orig >VERSION
 
 %build
 %if 0%{?suse_version} && 0%{?suse_version} < 911
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index 6294d9a..2abb450 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:87a998e2529c93a71e575567ccdb7ee4282d5d6efbf60a8fef8b0191744dc1ff
-size 53444
+oid sha256:62fdf8363bd493681cd406a2657bcab3aafb0856f5ca07f0eb8dc6ce517b92b4
+size 53442

From 348fac2d7c59c15d4073f99893661684d43229be2c41eba3586f767f599bb64c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20M=C3=BCller?= <lmuelle@suse.com>
Date: Mon, 29 Oct 2012 17:13:29 +0000
Subject: [PATCH 3/7] Create ntadmin group only if it doesn't yet exist.

OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=259
---
 build-source-timestamp |  2 +-
 patches.tar.bz2        |  4 ++--
 samba-doc.spec         |  2 +-
 samba.changes          |  5 ++++
 samba.spec             | 54 +++++++++++++++++++++---------------------
 vendor-files.tar.bz2   |  4 ++--
 6 files changed, 38 insertions(+), 33 deletions(-)

diff --git a/build-source-timestamp b/build-source-timestamp
index fea20de..f4c554c 100644
--- a/build-source-timestamp
+++ b/build-source-timestamp
@@ -1,2 +1,2 @@
-2846
+2847
 Branch      : 3.6.9
diff --git a/patches.tar.bz2 b/patches.tar.bz2
index 6e49c76..cbbf5ad 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4e085390a47162deba08f47463c36a2b66238cd81464744d554ec17ddf704549
-size 33772
+oid sha256:566892b97876697de0e1ad4f959793d4920139f3c8d698d42ba394f198a5af9b
+size 33787
diff --git a/samba-doc.spec b/samba-doc.spec
index 07c9a4a..92cbdd0 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: 2846
+Source Timestamp: 2847
 Branch      : 3.6.9
 
 %changelog
diff --git a/samba.changes b/samba.changes
index 8640a5e..4a99166 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Oct 29 16:59:09 UTC 2012 - lmuelle@suse.com
+
+- Create ntadmin group only if it doesn't yet exist.
+
 -------------------------------------------------------------------
 Mon Oct 29 12:10:41 UTC 2012 - lmuelle@suse.com
 
diff --git a/samba.spec b/samba.spec
index 2165569..8381faf 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: 2846
+Source Timestamp: 2847
 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: 2846
+Source Timestamp: 2847
 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: 2846
+Source Timestamp: 2847
 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: 2846
+Source Timestamp: 2847
 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: 2846
+Source Timestamp: 2847
 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: 2846
+Source Timestamp: 2847
 Branch      : 3.6.9
 
 %endif
@@ -380,7 +380,7 @@ PreReq:         coreutils
 This is the winbind-daemon and the wbinfo-tool.
 
 
-Source Timestamp: 2846
+Source Timestamp: 2847
 Branch      : 3.6.9
 
 %if 0%{?suse_version} && 0%{?suse_version} < 1031
@@ -406,14 +406,14 @@ PreReq:         /sbin/ldconfig
 
 %description -n libsmbclient
 
-Source Timestamp: 2846
+Source Timestamp: 2847
 Branch      : 3.6.9
 
 %else
 
 %description -n libsmbclient0
 
-Source Timestamp: 2846
+Source Timestamp: 2847
 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: 2846
+Source Timestamp: 2847
 Branch      : 3.6.9
 
 %package -n libnetapi0
@@ -465,7 +465,7 @@ PreReq:         /sbin/ldconfig
 This package includes the netapi library.
 
 
-Source Timestamp: 2846
+Source Timestamp: 2847
 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: 2846
+Source Timestamp: 2847
 Branch      : 3.6.9
 
 %if 0%{?suse_version} && 0%{?suse_version} < 1031
@@ -505,14 +505,14 @@ PreReq:         /sbin/ldconfig
 
 %description -n libsmbsharemodes
 
-Source Timestamp: 2846
+Source Timestamp: 2847
 Branch      : 3.6.9
 
 %else
 
 %description -n libsmbsharemodes0
 
-Source Timestamp: 2846
+Source Timestamp: 2847
 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: 2846
+Source Timestamp: 2847
 Branch      : 3.6.9
 
 %package -n libwbclient0
@@ -551,7 +551,7 @@ PreReq:         /sbin/ldconfig
 This package includes the wbclient library.
 
 
-Source Timestamp: 2846
+Source Timestamp: 2847
 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: 2846
+Source Timestamp: 2847
 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: 2846
+Source Timestamp: 2847
 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: 2846
+Source Timestamp: 2847
 Branch      : 3.6.9
 
 %package -n libtdb1
@@ -623,7 +623,7 @@ PreReq:         /sbin/ldconfig
 This package includes the tdb library.
 
 
-Source Timestamp: 2846
+Source Timestamp: 2847
 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: 2846
+Source Timestamp: 2847
 Branch      : 3.6.9
 
 %package -n libtevent0
@@ -655,7 +655,7 @@ PreReq:         /sbin/ldconfig
 This package includes the tevent library.
 
 
-Source Timestamp: 2846
+Source Timestamp: 2847
 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: 2846
+Source Timestamp: 2847
 Branch      : 3.6.9
 
 %package -n libldb1
@@ -693,7 +693,7 @@ PreReq:         /sbin/ldconfig
 This package includes the ldb library.
 
 
-Source Timestamp: 2846
+Source Timestamp: 2847
 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: 2846
+Source Timestamp: 2847
 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: 2846
+Source Timestamp: 2847
 Branch      : 3.6.9
 
 %endif
@@ -1264,7 +1264,7 @@ popd
 %endif
 
 %pre
-/usr/sbin/groupadd -g 71 -o -r ntadmin 2>/dev/null || :
+getent group ntadmin >/dev/null || groupadd -g 71 -o -r ntadmin || :
 
 %preun
 %{?stop_on_removal:%{stop_on_removal smb nmb}}
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index 2abb450..dfaf9ec 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:62fdf8363bd493681cd406a2657bcab3aafb0856f5ca07f0eb8dc6ce517b92b4
-size 53442
+oid sha256:dadc7a7f87e9f1db0337f3b15033b1d1a6d08cdfeae08fced9c8873913ea5172
+size 53461

From df7833d392269d3a7304105400e7761b106053e1c3b000374069568ca6b0f58d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20M=C3=BCller?= <lmuelle@suse.com>
Date: Mon, 29 Oct 2012 19:53:57 +0000
Subject: [PATCH 4/7] Ensure adding the winbind group never can fail.

OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=260
---
 build-source-timestamp |  2 +-
 patches.tar.bz2        |  4 +--
 samba-doc.spec         |  2 +-
 samba.changes          |  5 ++++
 samba.spec             | 55 +++++++++++++++++++++---------------------
 vendor-files.tar.bz2   |  4 +--
 6 files changed, 38 insertions(+), 34 deletions(-)

diff --git a/build-source-timestamp b/build-source-timestamp
index f4c554c..6356f98 100644
--- a/build-source-timestamp
+++ b/build-source-timestamp
@@ -1,2 +1,2 @@
-2847
+2848
 Branch      : 3.6.9
diff --git a/patches.tar.bz2 b/patches.tar.bz2
index cbbf5ad..f24dd17 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:566892b97876697de0e1ad4f959793d4920139f3c8d698d42ba394f198a5af9b
-size 33787
+oid sha256:3a04ea7d592271ff83db652ba93696bf8ce51eb971ca2655588095a300f78a26
+size 33783
diff --git a/samba-doc.spec b/samba-doc.spec
index 92cbdd0..ddbd0fe 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: 2847
+Source Timestamp: 2848
 Branch      : 3.6.9
 
 %changelog
diff --git a/samba.changes b/samba.changes
index 4a99166..9fc3c88 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Oct 29 19:48:51 UTC 2012 - lmuelle@suse.com
+
+- Ensure adding the winbind group never can fail.
+
 -------------------------------------------------------------------
 Mon Oct 29 16:59:09 UTC 2012 - lmuelle@suse.com
 
diff --git a/samba.spec b/samba.spec
index 8381faf..47ce9db 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: 2847
+Source Timestamp: 2848
 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: 2847
+Source Timestamp: 2848
 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: 2847
+Source Timestamp: 2848
 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: 2847
+Source Timestamp: 2848
 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: 2847
+Source Timestamp: 2848
 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: 2847
+Source Timestamp: 2848
 Branch      : 3.6.9
 
 %endif
@@ -380,7 +380,7 @@ PreReq:         coreutils
 This is the winbind-daemon and the wbinfo-tool.
 
 
-Source Timestamp: 2847
+Source Timestamp: 2848
 Branch      : 3.6.9
 
 %if 0%{?suse_version} && 0%{?suse_version} < 1031
@@ -406,14 +406,14 @@ PreReq:         /sbin/ldconfig
 
 %description -n libsmbclient
 
-Source Timestamp: 2847
+Source Timestamp: 2848
 Branch      : 3.6.9
 
 %else
 
 %description -n libsmbclient0
 
-Source Timestamp: 2847
+Source Timestamp: 2848
 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: 2847
+Source Timestamp: 2848
 Branch      : 3.6.9
 
 %package -n libnetapi0
@@ -465,7 +465,7 @@ PreReq:         /sbin/ldconfig
 This package includes the netapi library.
 
 
-Source Timestamp: 2847
+Source Timestamp: 2848
 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: 2847
+Source Timestamp: 2848
 Branch      : 3.6.9
 
 %if 0%{?suse_version} && 0%{?suse_version} < 1031
@@ -505,14 +505,14 @@ PreReq:         /sbin/ldconfig
 
 %description -n libsmbsharemodes
 
-Source Timestamp: 2847
+Source Timestamp: 2848
 Branch      : 3.6.9
 
 %else
 
 %description -n libsmbsharemodes0
 
-Source Timestamp: 2847
+Source Timestamp: 2848
 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: 2847
+Source Timestamp: 2848
 Branch      : 3.6.9
 
 %package -n libwbclient0
@@ -551,7 +551,7 @@ PreReq:         /sbin/ldconfig
 This package includes the wbclient library.
 
 
-Source Timestamp: 2847
+Source Timestamp: 2848
 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: 2847
+Source Timestamp: 2848
 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: 2847
+Source Timestamp: 2848
 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: 2847
+Source Timestamp: 2848
 Branch      : 3.6.9
 
 %package -n libtdb1
@@ -623,7 +623,7 @@ PreReq:         /sbin/ldconfig
 This package includes the tdb library.
 
 
-Source Timestamp: 2847
+Source Timestamp: 2848
 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: 2847
+Source Timestamp: 2848
 Branch      : 3.6.9
 
 %package -n libtevent0
@@ -655,7 +655,7 @@ PreReq:         /sbin/ldconfig
 This package includes the tevent library.
 
 
-Source Timestamp: 2847
+Source Timestamp: 2848
 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: 2847
+Source Timestamp: 2848
 Branch      : 3.6.9
 
 %package -n libldb1
@@ -693,7 +693,7 @@ PreReq:         /sbin/ldconfig
 This package includes the ldb library.
 
 
-Source Timestamp: 2847
+Source Timestamp: 2848
 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: 2847
+Source Timestamp: 2848
 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: 2847
+Source Timestamp: 2848
 Branch      : 3.6.9
 
 %endif
@@ -1393,8 +1393,7 @@ fi
 %pre winbind
 # we need this group for squid (ntlmauth)
 # read access to /var/lib/samba/winbindd_privileged
-%{_bindir}/getent group winbind >/dev/null || \
-	%{_sbindir}/groupadd -r winbind
+getent group winbind >/dev/null || groupadd -r winbind || :
 
 %post winbind
 /sbin/ldconfig
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index dfaf9ec..e46b73c 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:dadc7a7f87e9f1db0337f3b15033b1d1a6d08cdfeae08fced9c8873913ea5172
-size 53461
+oid sha256:d1c84cced76913bea4dfc381b7b0e465bb6d1e01b537f31b6561287494aef963
+size 53504

From d7a45950ee1cd608e735deb8ef9ae17295c60a522f3526884076f5ece61323fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20M=C3=BCller?= <lmuelle@suse.com>
Date: Mon, 29 Oct 2012 22:02:24 +0000
Subject: [PATCH 5/7] Remove obsoleted 3.6.8 tar ball.

OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=261
---
 samba-3.6.8.tar.bz2 | 3 ---
 1 file changed, 3 deletions(-)
 delete mode 100644 samba-3.6.8.tar.bz2

diff --git a/samba-3.6.8.tar.bz2 b/samba-3.6.8.tar.bz2
deleted file mode 100644
index 83588f6..0000000
--- a/samba-3.6.8.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:48e23dc08764860a5f58284dfe6a069fb59de86735f7dc9224ec500a7f2c9a96
-size 29485054

From dde8165540db6124c206a654b4fa5a413672e2592ea45d319be6c6c4f138e8db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20M=C3=BCller?= <lmuelle@suse.com>
Date: Wed, 31 Oct 2012 14:29:06 +0000
Subject: [PATCH 6/7] Bump build source time stamp to satisfy the broken
 factory-auto check.

OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=262
---
 build-source-timestamp |  2 +-
 patches.tar.bz2        |  4 ++--
 samba-doc.spec         |  2 +-
 samba.spec             | 52 +++++++++++++++++++++---------------------
 vendor-files.tar.bz2   |  4 ++--
 5 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/build-source-timestamp b/build-source-timestamp
index 6356f98..6d0eea0 100644
--- a/build-source-timestamp
+++ b/build-source-timestamp
@@ -1,2 +1,2 @@
-2848
+2850
 Branch      : 3.6.9
diff --git a/patches.tar.bz2 b/patches.tar.bz2
index f24dd17..2c44950 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3a04ea7d592271ff83db652ba93696bf8ce51eb971ca2655588095a300f78a26
-size 33783
+oid sha256:3f21663dcd19ad9a22e572367401317c77418f98a4d6a66e333da3bcdee7163e
+size 33793
diff --git a/samba-doc.spec b/samba-doc.spec
index ddbd0fe..1b978d0 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: 2848
+Source Timestamp: 2850
 Branch      : 3.6.9
 
 %changelog
diff --git a/samba.spec b/samba.spec
index 47ce9db..9f7b318 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: 2848
+Source Timestamp: 2850
 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: 2848
+Source Timestamp: 2850
 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: 2848
+Source Timestamp: 2850
 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: 2848
+Source Timestamp: 2850
 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: 2848
+Source Timestamp: 2850
 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: 2848
+Source Timestamp: 2850
 Branch      : 3.6.9
 
 %endif
@@ -380,7 +380,7 @@ PreReq:         coreutils
 This is the winbind-daemon and the wbinfo-tool.
 
 
-Source Timestamp: 2848
+Source Timestamp: 2850
 Branch      : 3.6.9
 
 %if 0%{?suse_version} && 0%{?suse_version} < 1031
@@ -406,14 +406,14 @@ PreReq:         /sbin/ldconfig
 
 %description -n libsmbclient
 
-Source Timestamp: 2848
+Source Timestamp: 2850
 Branch      : 3.6.9
 
 %else
 
 %description -n libsmbclient0
 
-Source Timestamp: 2848
+Source Timestamp: 2850
 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: 2848
+Source Timestamp: 2850
 Branch      : 3.6.9
 
 %package -n libnetapi0
@@ -465,7 +465,7 @@ PreReq:         /sbin/ldconfig
 This package includes the netapi library.
 
 
-Source Timestamp: 2848
+Source Timestamp: 2850
 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: 2848
+Source Timestamp: 2850
 Branch      : 3.6.9
 
 %if 0%{?suse_version} && 0%{?suse_version} < 1031
@@ -505,14 +505,14 @@ PreReq:         /sbin/ldconfig
 
 %description -n libsmbsharemodes
 
-Source Timestamp: 2848
+Source Timestamp: 2850
 Branch      : 3.6.9
 
 %else
 
 %description -n libsmbsharemodes0
 
-Source Timestamp: 2848
+Source Timestamp: 2850
 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: 2848
+Source Timestamp: 2850
 Branch      : 3.6.9
 
 %package -n libwbclient0
@@ -551,7 +551,7 @@ PreReq:         /sbin/ldconfig
 This package includes the wbclient library.
 
 
-Source Timestamp: 2848
+Source Timestamp: 2850
 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: 2848
+Source Timestamp: 2850
 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: 2848
+Source Timestamp: 2850
 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: 2848
+Source Timestamp: 2850
 Branch      : 3.6.9
 
 %package -n libtdb1
@@ -623,7 +623,7 @@ PreReq:         /sbin/ldconfig
 This package includes the tdb library.
 
 
-Source Timestamp: 2848
+Source Timestamp: 2850
 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: 2848
+Source Timestamp: 2850
 Branch      : 3.6.9
 
 %package -n libtevent0
@@ -655,7 +655,7 @@ PreReq:         /sbin/ldconfig
 This package includes the tevent library.
 
 
-Source Timestamp: 2848
+Source Timestamp: 2850
 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: 2848
+Source Timestamp: 2850
 Branch      : 3.6.9
 
 %package -n libldb1
@@ -693,7 +693,7 @@ PreReq:         /sbin/ldconfig
 This package includes the ldb library.
 
 
-Source Timestamp: 2848
+Source Timestamp: 2850
 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: 2848
+Source Timestamp: 2850
 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: 2848
+Source Timestamp: 2850
 Branch      : 3.6.9
 
 %endif
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index e46b73c..bb8312d 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:d1c84cced76913bea4dfc381b7b0e465bb6d1e01b537f31b6561287494aef963
-size 53504
+oid sha256:eb4ed8a727ffaac60e408ad5c38fdba88267ad3e6e339eb6b029cd58ac47ee3a
+size 53424

From f8e2f1e500a296442c2f52db72625449f862766b7a5b7d6037849f3d4252a9e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20M=C3=BCller?= <lmuelle@suse.com>
Date: Wed, 31 Oct 2012 17:02:04 +0000
Subject: [PATCH 7/7] Only execute the run_permissions macro on pre-12.3
 systems.

OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=263
---
 build-source-timestamp |  2 +-
 patches.tar.bz2        |  4 ++--
 samba-doc.spec         |  2 +-
 samba.changes          |  5 ++++
 samba.spec             | 54 ++++++++++++++++++++++--------------------
 vendor-files.tar.bz2   |  4 ++--
 6 files changed, 39 insertions(+), 32 deletions(-)

diff --git a/build-source-timestamp b/build-source-timestamp
index 6d0eea0..4c51387 100644
--- a/build-source-timestamp
+++ b/build-source-timestamp
@@ -1,2 +1,2 @@
-2850
+2851
 Branch      : 3.6.9
diff --git a/patches.tar.bz2 b/patches.tar.bz2
index 2c44950..ecf7e3b 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3f21663dcd19ad9a22e572367401317c77418f98a4d6a66e333da3bcdee7163e
-size 33793
+oid sha256:ccd8b0c67806f439428db83bbefc6eb6d17d654a67f80169dd8b96a0744561b9
+size 33795
diff --git a/samba-doc.spec b/samba-doc.spec
index 1b978d0..8dea0cb 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: 2850
+Source Timestamp: 2851
 Branch      : 3.6.9
 
 %changelog
diff --git a/samba.changes b/samba.changes
index 9fc3c88..681deb7 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Oct 31 16:48:12 UTC 2012 - lmuelle@suse.com
+
+- Only execute the run_permissions macro on pre-12.3 systems.
+
 -------------------------------------------------------------------
 Mon Oct 29 19:48:51 UTC 2012 - lmuelle@suse.com
 
diff --git a/samba.spec b/samba.spec
index 9f7b318..c63c0e4 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: 2850
+Source Timestamp: 2851
 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: 2850
+Source Timestamp: 2851
 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: 2850
+Source Timestamp: 2851
 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: 2850
+Source Timestamp: 2851
 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: 2850
+Source Timestamp: 2851
 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: 2850
+Source Timestamp: 2851
 Branch      : 3.6.9
 
 %endif
@@ -380,7 +380,7 @@ PreReq:         coreutils
 This is the winbind-daemon and the wbinfo-tool.
 
 
-Source Timestamp: 2850
+Source Timestamp: 2851
 Branch      : 3.6.9
 
 %if 0%{?suse_version} && 0%{?suse_version} < 1031
@@ -406,14 +406,14 @@ PreReq:         /sbin/ldconfig
 
 %description -n libsmbclient
 
-Source Timestamp: 2850
+Source Timestamp: 2851
 Branch      : 3.6.9
 
 %else
 
 %description -n libsmbclient0
 
-Source Timestamp: 2850
+Source Timestamp: 2851
 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: 2850
+Source Timestamp: 2851
 Branch      : 3.6.9
 
 %package -n libnetapi0
@@ -465,7 +465,7 @@ PreReq:         /sbin/ldconfig
 This package includes the netapi library.
 
 
-Source Timestamp: 2850
+Source Timestamp: 2851
 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: 2850
+Source Timestamp: 2851
 Branch      : 3.6.9
 
 %if 0%{?suse_version} && 0%{?suse_version} < 1031
@@ -505,14 +505,14 @@ PreReq:         /sbin/ldconfig
 
 %description -n libsmbsharemodes
 
-Source Timestamp: 2850
+Source Timestamp: 2851
 Branch      : 3.6.9
 
 %else
 
 %description -n libsmbsharemodes0
 
-Source Timestamp: 2850
+Source Timestamp: 2851
 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: 2850
+Source Timestamp: 2851
 Branch      : 3.6.9
 
 %package -n libwbclient0
@@ -551,7 +551,7 @@ PreReq:         /sbin/ldconfig
 This package includes the wbclient library.
 
 
-Source Timestamp: 2850
+Source Timestamp: 2851
 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: 2850
+Source Timestamp: 2851
 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: 2850
+Source Timestamp: 2851
 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: 2850
+Source Timestamp: 2851
 Branch      : 3.6.9
 
 %package -n libtdb1
@@ -623,7 +623,7 @@ PreReq:         /sbin/ldconfig
 This package includes the tdb library.
 
 
-Source Timestamp: 2850
+Source Timestamp: 2851
 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: 2850
+Source Timestamp: 2851
 Branch      : 3.6.9
 
 %package -n libtevent0
@@ -655,7 +655,7 @@ PreReq:         /sbin/ldconfig
 This package includes the tevent library.
 
 
-Source Timestamp: 2850
+Source Timestamp: 2851
 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: 2850
+Source Timestamp: 2851
 Branch      : 3.6.9
 
 %package -n libldb1
@@ -693,7 +693,7 @@ PreReq:         /sbin/ldconfig
 This package includes the ldb library.
 
 
-Source Timestamp: 2850
+Source Timestamp: 2851
 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: 2850
+Source Timestamp: 2851
 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: 2850
+Source Timestamp: 2851
 Branch      : 3.6.9
 
 %endif
@@ -1379,7 +1379,9 @@ 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
 %{?run_permissions:%{run_permissions}}
+%endif
 
 %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 bb8312d..0892653 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:eb4ed8a727ffaac60e408ad5c38fdba88267ad3e6e339eb6b029cd58ac47ee3a
-size 53424
+oid sha256:72b349c61801c05dde9475de0dbd151320bc5c1bdf7fc4abd78d7b8fbfcce48f
+size 53392