From 3115950c122b488f8fc744890bbd8f7f826f08e79fe04916dd0df52ad38d7b43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20M=C3=BCller?= <lmuelle@suse.com>
Date: Fri, 10 Jan 2014 17:37:33 +0000
Subject: [PATCH 1/4] - Update to 4.1.4.   + Fix segfault in smbd; (bso#10284).
   + Fix SMB2 server panic when a smb2 brlock times out; (bso#10311).

OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=366
---
 patches.tar.bz2                            | 4 ++--
 samba-4.1.3.tar.gz                         | 3 ---
 samba-4.1.3.tar.asc => samba-4.1.4.tar.asc | 6 +++---
 samba-4.1.4.tar.gz                         | 3 +++
 samba.changes                              | 7 +++++++
 samba.spec                                 | 6 +++---
 vendor-files.tar.bz2                       | 4 ++--
 7 files changed, 20 insertions(+), 13 deletions(-)
 delete mode 100644 samba-4.1.3.tar.gz
 rename samba-4.1.3.tar.asc => samba-4.1.4.tar.asc (50%)
 create mode 100644 samba-4.1.4.tar.gz

diff --git a/patches.tar.bz2 b/patches.tar.bz2
index 6c9a68c..9f36c34 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a648c41caa84afa1bc7a1a6e7f35f5607718e6693b6db8bbff32bff02708f577
-size 86424
+oid sha256:1a7122d56d83b1f8d4c6ac763da5e5a870388518b8bf25475add66b7d1db6d24
+size 71366
diff --git a/samba-4.1.3.tar.gz b/samba-4.1.3.tar.gz
deleted file mode 100644
index 8842976..0000000
--- a/samba-4.1.3.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:71da208d412b8d15ee26d2a76b2247df357242177d995fe5d9320355432e24db
-size 23161646
diff --git a/samba-4.1.3.tar.asc b/samba-4.1.4.tar.asc
similarity index 50%
rename from samba-4.1.3.tar.asc
rename to samba-4.1.4.tar.asc
index e4e3f86..023ee1b 100644
--- a/samba-4.1.3.tar.asc
+++ b/samba-4.1.4.tar.asc
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
-iD8DBQBSohxebzORW2Vot+oRArlMAKCpy3Q89zh5+0NgkRCPZZJm9JpqygCdElz+
-lBN5bia7y0sqvBtZuLMinC0=
-=FoPj
+iD8DBQBSz6uYbzORW2Vot+oRAgdAAJ9n0GQ8ZwsizWM6CIr5lmJXxo7zpwCfTMpg
+1eF2oc0zDz1/27DkBouoLvk=
+=tpG3
 -----END PGP SIGNATURE-----
diff --git a/samba-4.1.4.tar.gz b/samba-4.1.4.tar.gz
new file mode 100644
index 0000000..74f78a1
--- /dev/null
+++ b/samba-4.1.4.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1733e1aaa37b4fcb0fc781b07fc6f20831023ce971d8bcd97940c3fbe35766a7
+size 23169480
diff --git a/samba.changes b/samba.changes
index c563101..a2c7e83 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Jan 10 17:02:40 UTC 2014 - lmuelle@suse.com
+
+- Update to 4.1.4.
+  + Fix segfault in smbd; (bso#10284).
+  + Fix SMB2 server panic when a smb2 brlock times out; (bso#10311).
+
 -------------------------------------------------------------------
 Wed Jan  8 15:36:42 UTC 2014 - lmuelle@suse.com
 
diff --git a/samba.spec b/samba.spec
index 402aeaa..1797585 100644
--- a/samba.spec
+++ b/samba.spec
@@ -112,7 +112,7 @@ BuildRequires:  dbus-1-devel
 BuildRequires:  gpg-offline
 BuildRequires:  systemd
 %endif
-%define	samba_ver 4.1.3
+%define	samba_ver 4.1.4
 %define	samba_ver_suffix %nil
 %if "%{samba_ver_suffix}" == ""
 %define samba_source_location http://ftp.samba.org/pub/samba/stable/samba-%{version}.tar.gz
@@ -139,12 +139,12 @@ BuildRequires:  systemd
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 3144
+%define SOURCE_TIMESTAMP 3145
 %define BRANCH %{version}
 %global with_mitkrb5 1
 %global with_dc 0
 %global with_get_printing_ticket 0
-Version:        4.1.3
+Version:        4.1.4
 Release:        0
 License:        GPL-3.0+
 Url:            http://www.samba.org/
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index f377623..93e0478 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:ded4d51dcbc430c440ae6886451317c842615a0eaa77c748b5cb6db7ddf59fd4
-size 53841
+oid sha256:508431313985d70d104344906f7b4bc0b959756dd141b914d6e7917ddf7d2f86
+size 54014

From 9f7b22931c285d7ecdba84cad1775cbabab36176109549fab046dcfc7e8eadda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20M=C3=BCller?= <lmuelle@suse.com>
Date: Mon, 13 Jan 2014 13:12:27 +0000
Subject: [PATCH 2/4] Correct sysconfig varibale names by adding the missing D
 char; (bnc#857454).

OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=367
---
 patches.tar.bz2      | 4 ++--
 samba.changes        | 5 +++++
 samba.spec           | 4 ++--
 vendor-files.tar.bz2 | 4 ++--
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/patches.tar.bz2 b/patches.tar.bz2
index 9f36c34..d32724c 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1a7122d56d83b1f8d4c6ac763da5e5a870388518b8bf25475add66b7d1db6d24
-size 71366
+oid sha256:c05dd863d649adda9ec18e0a6df826d357860f4f39a7c86de889d266cf89fbd7
+size 71164
diff --git a/samba.changes b/samba.changes
index a2c7e83..5ce9b6a 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jan 13 13:04:53 UTC 2014 - lmuelle@suse.com
+
+- Correct sysconfig varibale names by adding the missing D char; (bnc#857454).
+
 -------------------------------------------------------------------
 Fri Jan 10 17:02:40 UTC 2014 - lmuelle@suse.com
 
diff --git a/samba.spec b/samba.spec
index 1797585..da11fc9 100644
--- a/samba.spec
+++ b/samba.spec
@@ -139,7 +139,7 @@ BuildRequires:  systemd
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 3145
+%define SOURCE_TIMESTAMP 3146
 %define BRANCH %{version}
 %global with_mitkrb5 1
 %global with_dc 0
@@ -1365,7 +1365,7 @@ for srv_name in nmb smb winbind; do
 	echo -en "## Type:           string
 ## Default:        \"\"
 ## ServiceRestart:·${srv_name}
-${srv_name^^}OPTIONS=\"\"\n" >>SUSE.sysconfig.${srv_name}
+${srv_name^^}DOPTIONS=\"\"\n" >>SUSE.sysconfig.${srv_name}
 	ln -s ../../%{_sbindir}/service %{buildroot}/%{_sbindir}/rc${srv_name}
 done
 head -n 2 ../packaging/systemd/samba.sysconfig > \
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index 93e0478..a591869 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:508431313985d70d104344906f7b4bc0b959756dd141b914d6e7917ddf7d2f86
-size 54014
+oid sha256:8043485f794e0a9025b2f439dc4158367ea56a6191b07d911d5a994ed3434f48
+size 53919

From 9ee43dc393bb1878b92b4d32dba4d74c92870049d61a3a1777c814633c7d762b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20M=C3=BCller?= <lmuelle@suse.com>
Date: Mon, 13 Jan 2014 13:45:33 +0000
Subject: [PATCH 3/4] Fix typo in the previous commit.

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

diff --git a/patches.tar.bz2 b/patches.tar.bz2
index d32724c..d43b12b 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c05dd863d649adda9ec18e0a6df826d357860f4f39a7c86de889d266cf89fbd7
-size 71164
+oid sha256:4ce2405a5073ed2d9903b4217505fec9610fb1b23f72f81e1875f04dc037260c
+size 71222
diff --git a/samba.changes b/samba.changes
index 5ce9b6a..cc9eb8d 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,7 +1,7 @@
 -------------------------------------------------------------------
 Mon Jan 13 13:04:53 UTC 2014 - lmuelle@suse.com
 
-- Correct sysconfig varibale names by adding the missing D char; (bnc#857454).
+- Correct sysconfig variable names by adding the missing D char; (bnc#857454).
 
 -------------------------------------------------------------------
 Fri Jan 10 17:02:40 UTC 2014 - lmuelle@suse.com
diff --git a/samba.spec b/samba.spec
index da11fc9..d26bb9d 100644
--- a/samba.spec
+++ b/samba.spec
@@ -139,7 +139,7 @@ BuildRequires:  systemd
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 3146
+%define SOURCE_TIMESTAMP 3147
 %define BRANCH %{version}
 %global with_mitkrb5 1
 %global with_dc 0
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index a591869..cee768a 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:8043485f794e0a9025b2f439dc4158367ea56a6191b07d911d5a994ed3434f48
-size 53919
+oid sha256:dbb3937659544844917911e2ef78807f40f9928490b267771493238fcc3a235b
+size 53842

From 930725ece3649b139ada8830907ca3d4673f38244ed45f09711fab9aba7939f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20M=C3=BCller?= <lmuelle@suse.com>
Date: Tue, 14 Jan 2014 22:13:47 +0000
Subject: [PATCH 4/4] Really add the WINBINDDOPTIONS sysconfig variable on
 install; (bnc#857454).

OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=369
---
 patches.tar.bz2      | 4 ++--
 samba.changes        | 5 +++++
 samba.spec           | 4 ++--
 vendor-files.tar.bz2 | 4 ++--
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/patches.tar.bz2 b/patches.tar.bz2
index d43b12b..da53752 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4ce2405a5073ed2d9903b4217505fec9610fb1b23f72f81e1875f04dc037260c
-size 71222
+oid sha256:5e644442795539e95b7172924fb8bbd8d1430ab9f3d8700cbe56c94896337d40
+size 71127
diff --git a/samba.changes b/samba.changes
index cc9eb8d..798b91e 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jan 14 21:57:32 UTC 2014 - lmuelle@suse.com
+
+- Really add the WINBINDDOPTIONS sysconfig variable on install; (bnc#857454).
+
 -------------------------------------------------------------------
 Mon Jan 13 13:04:53 UTC 2014 - lmuelle@suse.com
 
diff --git a/samba.spec b/samba.spec
index d26bb9d..70202b1 100644
--- a/samba.spec
+++ b/samba.spec
@@ -139,7 +139,7 @@ BuildRequires:  systemd
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 3147
+%define SOURCE_TIMESTAMP 3148
 %define BRANCH %{version}
 %global with_mitkrb5 1
 %global with_dc 0
@@ -1713,7 +1713,7 @@ fi
 %if 0%{?suse_version} > 1220
 %service_add_post winbind.service
 %{_bindir}/systemd-tmpfiles --create %{_prefix}/lib/tmpfiles.d/samba.conf
-%fillup_only -a
+%{fillup_only -ans samba winbind}
 %endif
 
 %preun winbind
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index cee768a..448d0ea 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:dbb3937659544844917911e2ef78807f40f9928490b267771493238fcc3a235b
-size 53842
+oid sha256:ad0ebee279c031494c8fca6b30e7ccc2927a014fad9f7d5db06929dea9549121
+size 53903