diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 86ab68f..b5ebaaa 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8a929e9e23b0cb919fe6784c766384ff0e1a9417bba38beca1ac18da834e22d6 -size 284989 +oid sha256:ab1fb8f0db4cd139c7485b10912cd639abfcd5a3344262dab38cf33fe787f802 +size 288674 diff --git a/samba.changes b/samba.changes index f29322c..d0873d6 100644 --- a/samba.changes +++ b/samba.changes @@ -92,6 +92,13 @@ Mon Jul 28 10:12:04 UTC 2014 - lmuelle@suse.com (bso#10706). + s3: Fix missing braces in nfs4_acls.c. +------------------------------------------------------------------- +Wed Jul 9 22:59:09 UTC 2014 - ddiss@suse.com + +- Reduce printer_list.tdb lock contention during printcap update; + (bso#10652); (bnc#883870). + + Only update the printer share inventory when needed. + ------------------------------------------------------------------- Tue Jul 8 12:35:25 UTC 2014 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index e8046c2..3ae2799 100644 --- a/samba.spec +++ b/samba.spec @@ -148,7 +148,7 @@ BuildRequires: systemd-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3276 +%define SOURCE_TIMESTAMP 3277 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 962d608..bad0ed3 100644 --- a/vendor-files.tar.bz2 +++ b/vendor-files.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2e1b94b046a138dce9e38a2b9e812668abbd3e30b6fa36386b6ae35b3fb27b80 -size 54885 +oid sha256:74d5a1a18fed17bda536ceb06f8f6b33648d5fb595bdedbf53ff34c7507342b0 +size 54103