From fdc8fa7283202087fc9bc9c235206e6fded8798a3ef10bc7f7ac4ebfc2122576 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20M=C3=BCller?= <lmuelle@suse.com>
Date: Tue, 13 Jan 2015 14:23:25 +0000
Subject: [PATCH 1/2] - Update to 4.1.15.   + pam_winbind: Fix warn_pwd_expire
 implementation; (bso#9056).   + nsswitch: Fix soname of linux nss_*.so.2
 modules; (bso#9299).   + Fix profiles tool; (bso#9629).   + s3-lib: Do not
 require a password with --use-ccache; (bso#10279).   + s4:dsdb/rootdse:
 Expand extended dn values with the AS_SYSTEM control;     (bso#10949).   +
 s4-rpc: dnsserver: Fix enumeration of IPv4 and IPv6 addresses; (bso#10952).  
 + s3:smb2_server: Allow reauthentication without signing; (bso#10958).   +
 s3-smbclient: Return success if we listed the shares; (bso#10960).   +
 s3-smbstatus: Fix exit code of profile output; (bso#10961).   + libcli: SMB2:
 Pure SMB2-only negprot fix to make us behave as a Windows     client does;
 (bso#10966).   + s3: smbd/modules: Fix *allocate* calls to follow POSIX error
 return     convention; (bso#10982).   + Fix 'domain join' by adding
 'drsuapi.DsBindInfoFallBack' attribute     'supported_extensions';
 (bso#11006).   + idl:drsuapi: Manage all possible lengths of
 drsuapi_DsBindInfo;     (bso#11006).   + winbind: Retry LogonControl RPC in
 ping-dc after session expiration;     (bso#11034).

- yast2-samba-client should be able to specify osName and osVer on
  AD domain join; (bnc#873922).

- Fix spoolss error response marshalling; (bso#10984).

- Fix spoolss EnumJobs and GetJob responses; (bso#10905); (bnc#898031).
  + Fix handling of bad EnumJobs levels; (bso#10898).

- Prune idle or hung connections older than "winbind request timeout";
  (bso#3204); (bnc#872912).

OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=446
---
 patches.tar.bz2      |  4 ++--
 samba-4.1.14.tar.asc |  7 -------
 samba-4.1.14.tar.gz  |  3 ---
 samba-4.1.15.tar.asc |  7 +++++++
 samba-4.1.15.tar.gz  |  3 +++
 samba.changes        | 48 ++++++++++++++++++++++++++++++++++++++++++++
 samba.spec           |  6 +++---
 vendor-files.tar.bz2 |  4 ++--
 8 files changed, 65 insertions(+), 17 deletions(-)
 delete mode 100644 samba-4.1.14.tar.asc
 delete mode 100644 samba-4.1.14.tar.gz
 create mode 100644 samba-4.1.15.tar.asc
 create mode 100644 samba-4.1.15.tar.gz

diff --git a/patches.tar.bz2 b/patches.tar.bz2
index e772fc8..2bf3f0a 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5e879e69cfe8dc27e76b87f10bd299622107ad80a70a3be222566081dfcc062b
-size 326032
+oid sha256:c73596b6d2f31cac1469e56359424526f342e4f4dc23cd1613f4235db92666d9
+size 329066
diff --git a/samba-4.1.14.tar.asc b/samba-4.1.14.tar.asc
deleted file mode 100644
index 4bdade7..0000000
--- a/samba-4.1.14.tar.asc
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iEYEABECAAYFAlR8ZBUACgkQbzORW2Vot+p0PwCgvyXdMLJ0ZckIA1zDhu1rvmYJ
-gwcAnRYaBDQYAO8sh7ulQVWIdCZyIMYE
-=X3e+
------END PGP SIGNATURE-----
diff --git a/samba-4.1.14.tar.gz b/samba-4.1.14.tar.gz
deleted file mode 100644
index 1cf099f..0000000
--- a/samba-4.1.14.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5ea14baaca997292355d368918879e3d639def92b54efef2279cf5abe8db2cba
-size 19527260
diff --git a/samba-4.1.15.tar.asc b/samba-4.1.15.tar.asc
new file mode 100644
index 0000000..836ec35
--- /dev/null
+++ b/samba-4.1.15.tar.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iEYEABECAAYFAlSze44ACgkQbzORW2Vot+puPQCePxfVfx8zsExKxh3CFg1t2s7Z
+Ls4AnirSogO7nhbk2ixYeRzYa6k7k8go
+=p+KL
+-----END PGP SIGNATURE-----
diff --git a/samba-4.1.15.tar.gz b/samba-4.1.15.tar.gz
new file mode 100644
index 0000000..b0b5383
--- /dev/null
+++ b/samba-4.1.15.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9d84112124512428ddc9cc0d9975524bab730b9a598a9ff90458666afb3f42f4
+size 19530544
diff --git a/samba.changes b/samba.changes
index 14fcf35..9efa601 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,34 @@
+-------------------------------------------------------------------
+Tue Jan 13 13:01:11 UTC 2015 - lmuelle@suse.com
+
+- Update to 4.1.15.
+  + pam_winbind: Fix warn_pwd_expire implementation; (bso#9056).
+  + nsswitch: Fix soname of linux nss_*.so.2 modules; (bso#9299).
+  + Fix profiles tool; (bso#9629).
+  + s3-lib: Do not require a password with --use-ccache; (bso#10279).
+  + s4:dsdb/rootdse: Expand extended dn values with the AS_SYSTEM control;
+    (bso#10949).
+  + s4-rpc: dnsserver: Fix enumeration of IPv4 and IPv6 addresses; (bso#10952).
+  + s3:smb2_server: Allow reauthentication without signing; (bso#10958).
+  + s3-smbclient: Return success if we listed the shares; (bso#10960).
+  + s3-smbstatus: Fix exit code of profile output; (bso#10961).
+  + libcli: SMB2: Pure SMB2-only negprot fix to make us behave as a Windows
+    client does; (bso#10966).
+  + s3: smbd/modules: Fix *allocate* calls to follow POSIX error return
+    convention; (bso#10982).
+  + Fix 'domain join' by adding 'drsuapi.DsBindInfoFallBack' attribute
+    'supported_extensions'; (bso#11006).
+  + idl:drsuapi: Manage all possible lengths of drsuapi_DsBindInfo;
+    (bso#11006).
+  + winbind: Retry LogonControl RPC in ping-dc after session expiration;
+    (bso#11034).
+
+-------------------------------------------------------------------
+Tue Jan  6 10:33:44 CET 2015 - nopower@suse.de
+
+- yast2-samba-client should be able to specify osName and osVer on
+  AD domain join; (bnc#873922).
+
 -------------------------------------------------------------------
 Mon Dec  8 12:01:35 UTC 2014 - ddiss@suse.com
 
@@ -10,6 +41,11 @@ Fri Dec  5 13:12:47 UTC 2014 - ddiss@suse.com
 - Specify soft dependency for network-online.target in Winbind systemd service
   file; (bnc#889175).
 
+-------------------------------------------------------------------
+Thu Dec  4 19:08:11 UTC 2014 - ddiss@suse.com
+
+- Fix spoolss error response marshalling; (bso#10984).
+
 -------------------------------------------------------------------
 Tue Dec  2 10:19:26 UTC 2014 - lmuelle@suse.de
 
@@ -51,6 +87,12 @@ Wed Nov  5 13:02:57 CET 2014 - nopower@suse.de
 
 - Fix leak when closing file descriptor returned from dirfd; (bso#10918).
 
+-------------------------------------------------------------------
+Thu Oct 30 10:29:04 UTC 2014 - ddiss@suse.com
+
+- Fix spoolss EnumJobs and GetJob responses; (bso#10905); (bnc#898031).
+  + Fix handling of bad EnumJobs levels; (bso#10898).
+
 -------------------------------------------------------------------
 Tue Oct 28 16:13:45 UTC 2014 - lmuelle@suse.com
 
@@ -172,6 +214,12 @@ Thu Sep 18 16:59:49 UDT 2014 - jmcdonough@suse.com
 - Wait for network-online.target to prevent caching of
   pre-network failures; (bnc#889175).
 
+-------------------------------------------------------------------
+Thu Sep 11 17:26:26 UTC 2014 - ddiss@suse.com
+
+- Prune idle or hung connections older than "winbind request timeout";
+  (bso#3204); (bnc#872912).
+
 -------------------------------------------------------------------
 Thu Aug 28 10:03:21 UTC 2014 - ddiss@suse.com
 
diff --git a/samba.spec b/samba.spec
index 3cb5ca9..2d2bf82 100644
--- a/samba.spec
+++ b/samba.spec
@@ -121,7 +121,7 @@ BuildRequires:  libxslt-tools
 BuildRequires:  systemd
 BuildRequires:  systemd-devel
 %endif
-%define	samba_ver 4.1.14
+%define	samba_ver 4.1.15
 %define	samba_ver_suffix %nil
 %if "%{samba_ver_suffix}" == ""
 %define samba_source_location http://ftp.samba.org/pub/samba/stable/samba-%{version}.tar.gz
@@ -145,11 +145,11 @@ BuildRequires:  systemd-devel
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 3339
+%define SOURCE_TIMESTAMP 3345
 %define BRANCH %{version}
 %global with_mitkrb5 1
 %global with_dc 0
-Version:        4.1.14
+Version:        4.1.15
 Release:        0
 Url:            http://www.samba.org/
 Provides:       samba-gplv3 = %{version}
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index beea896..4d0ccde 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:a32b0a67e6bfaadfb0b108d6bd4babac04acac16d4e8d84d43846da8131b1b50
-size 54379
+oid sha256:383f692e69f35e528a544964c13016b91639c53425f657a928376a090d7eb310
+size 54565

From a7b3ca17ccfe391c06839bbaf774c2ea49e48b761b300d91d30a63e12ef92781 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20M=C3=BCller?= <lmuelle@suse.com>
Date: Wed, 14 Jan 2015 12:38:58 +0000
Subject: [PATCH 2/2] Enable avahi support on post-12.2 systems.

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

diff --git a/patches.tar.bz2 b/patches.tar.bz2
index 2bf3f0a..430a1fe 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c73596b6d2f31cac1469e56359424526f342e4f4dc23cd1613f4235db92666d9
-size 329066
+oid sha256:a1d19f1357be061cd1176364f2e6c5f7716d3ed5311d0f26d17db2c4286af84e
+size 328975
diff --git a/samba.changes b/samba.changes
index 9efa601..f9a57b6 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jan 13 13:28:31 UTC 2015 - mpluskal@suse.com
+
+- Enable avahi support on post-12.2 systems.
+
 -------------------------------------------------------------------
 Tue Jan 13 13:01:11 UTC 2015 - lmuelle@suse.com
 
diff --git a/samba.spec b/samba.spec
index 2d2bf82..71a9e95 100644
--- a/samba.spec
+++ b/samba.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package samba
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -118,6 +118,7 @@ BuildRequires:  dbus-1-devel
 BuildRequires:  libxslt-tools
 %endif
 %if 0%{?suse_version} > 1220
+BuildRequires:  libavahi-devel
 BuildRequires:  systemd
 BuildRequires:  systemd-devel
 %endif
@@ -145,7 +146,7 @@ BuildRequires:  systemd-devel
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 3345
+%define SOURCE_TIMESTAMP 3346
 %define BRANCH %{version}
 %global with_mitkrb5 1
 %global with_dc 0
@@ -1200,6 +1201,7 @@ CONFIGURE_OPTIONS="\
 	--with-quotas \
 	--with-syslog \
 %if 0%{?suse_version} > 1220
+	--enable-avahi \
 	--with-systemd \
 %endif
 	--with-utmp \
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index 4d0ccde..df939de 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:383f692e69f35e528a544964c13016b91639c53425f657a928376a090d7eb310
-size 54565
+oid sha256:866a645731f364b4ebde5efeadd60801850b306abd4a5570cbabef29f33cb2d3
+size 54529