From c0c791a4f5de980e80addb5b0cf800bc6c476d02e49591ed26b1e215bc436e35 Mon Sep 17 00:00:00 2001 From: David Disseldorp Date: Thu, 16 Feb 2012 10:08:59 +0000 Subject: [PATCH 1/2] - s3-printing: fix crash in printer_list_set_printer(); (bso#8762); (bnc#746825). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=222 --- build-source-timestamp | 2 +- patches.tar.bz2 | 4 ++-- samba-doc.spec | 2 +- samba.changes | 11 +++++++-- samba.spec | 52 +++++++++++++++++++++--------------------- vendor-files.tar.bz2 | 4 ++-- 6 files changed, 41 insertions(+), 34 deletions(-) diff --git a/build-source-timestamp b/build-source-timestamp index 4b87fd0..bf2736a 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -2757 +2760 Branch : trunk diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 4f6dd19..5702d0e 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7427cace3ec1f73691892e3ac13ba7ded5303332f4ef8be51ac28546bb048063 -size 37215 +oid sha256:30f03f59b6e03d8487b2f0d5416035bbf982787a9f5e778d2741fb3399a222ac +size 37659 diff --git a/samba-doc.spec b/samba-doc.spec index 6c74265..6796904 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -437,7 +437,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2757 +Source Timestamp: 2760 Branch : trunk %changelog diff --git a/samba.changes b/samba.changes index ef7630b..e266051 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 16 11:00:37 CET 2012 - ddiss@suse.de + +- s3-printing: fix crash in printer_list_set_printer(); (bso#8762); + (bnc#746825). + ------------------------------------------------------------------- Mon Feb 6 13:39:48 UTC 2012 - lmuelle@suse.de @@ -57,8 +63,9 @@ Mon Jan 30 15:46:17 CET 2012 - fcrozat@suse.com ------------------------------------------------------------------- Sun Jan 29 21:06:24 UTC 2012 - lmuelle@suse.de -- Fix memory leak in parent smbd on connection; CVE-2012-0817; (bso#8724); - (bnc#743986). +- Update to 3.6.3. + + Fix memory leak in parent smbd on connection; CVE-2012-0817; (bso#8724); + (bnc#743986). ------------------------------------------------------------------- Thu Jan 26 14:15:38 UTC 2012 - lmuelle@suse.de diff --git a/samba.spec b/samba.spec index 109d9c1..d03f907 100644 --- a/samba.spec +++ b/samba.spec @@ -208,7 +208,7 @@ Authors: The Samba Team -Source Timestamp: 2757 +Source Timestamp: 2760 Branch : trunk %package client @@ -252,7 +252,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2757 +Source Timestamp: 2760 Branch : trunk %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -278,7 +278,7 @@ Authors: The Samba Team -Source Timestamp: 2757 +Source Timestamp: 2760 Branch : trunk %endif @@ -308,7 +308,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2757 +Source Timestamp: 2760 Branch : trunk %endif @@ -335,7 +335,7 @@ Authors: -------- Jeremy Allison -Source Timestamp: 2757 +Source Timestamp: 2760 Branch : trunk %if %{make_utils} @@ -356,7 +356,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2757 +Source Timestamp: 2760 Branch : trunk %endif @@ -391,7 +391,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2757 +Source Timestamp: 2760 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -417,14 +417,14 @@ PreReq: /sbin/ldconfig %description -n libsmbclient -Source Timestamp: 2757 +Source Timestamp: 2760 Branch : trunk %else %description -n libsmbclient0 -Source Timestamp: 2757 +Source Timestamp: 2760 Branch : trunk %endif @@ -472,7 +472,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2757 +Source Timestamp: 2760 Branch : trunk %package -n libnetapi0 @@ -490,7 +490,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2757 +Source Timestamp: 2760 Branch : trunk %package -n libnetapi-devel @@ -514,7 +514,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2757 +Source Timestamp: 2760 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -535,14 +535,14 @@ PreReq: /sbin/ldconfig %description -n libsmbsharemodes -Source Timestamp: 2757 +Source Timestamp: 2760 Branch : trunk %else %description -n libsmbsharemodes0 -Source Timestamp: 2757 +Source Timestamp: 2760 Branch : trunk %endif @@ -578,7 +578,7 @@ Authors: The Samba Team -Source Timestamp: 2757 +Source Timestamp: 2760 Branch : trunk %package -n libwbclient0 @@ -596,7 +596,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2757 +Source Timestamp: 2760 Branch : trunk %package -n libwbclient-devel @@ -620,7 +620,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2757 +Source Timestamp: 2760 Branch : trunk %package -n libtalloc2 @@ -640,7 +640,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2757 +Source Timestamp: 2760 Branch : trunk %package -n libtalloc-devel @@ -666,7 +666,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2757 +Source Timestamp: 2760 Branch : trunk %package -n libtdb1 @@ -686,7 +686,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2757 +Source Timestamp: 2760 Branch : trunk %package -n libtdb-devel @@ -708,7 +708,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2757 +Source Timestamp: 2760 Branch : trunk %package -n libtevent0 @@ -728,7 +728,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2757 +Source Timestamp: 2760 Branch : trunk %package -n libtevent-devel @@ -756,7 +756,7 @@ Authors: The Samba Team -Source Timestamp: 2757 +Source Timestamp: 2760 Branch : trunk %package -n libldb1 @@ -778,7 +778,7 @@ Authors: The Samba Team -Source Timestamp: 2757 +Source Timestamp: 2760 Branch : trunk %package -n libldb-devel @@ -805,7 +805,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2757 +Source Timestamp: 2760 Branch : trunk %if %{make_ldapsmb} @@ -828,7 +828,7 @@ Authors: -------- Guenther Deschner -Source Timestamp: 2757 +Source Timestamp: 2760 Branch : trunk %endif diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 7298039..b94b4b3 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:384bc34686b41ca2d07cab2a1da6d302c09843446700f3c5e6b1072233059d79 -size 52719 +oid sha256:fc50e5f2176aed9d0daedafdd1e2356800d1b3de869d9886f45fd80e7ad6a6f9 +size 52543 From 86667d66e0e9ce5d55a52f1223281aaf861d1974a37171f69ed72f6574e2fca6 Mon Sep 17 00:00:00 2001 From: David Disseldorp Date: Fri, 17 Feb 2012 14:55:19 +0000 Subject: [PATCH 2/2] Add SERVERID_UNIQUE_ID_NOT_TO_VERIFY; (bso#8760); (bnc#741854). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=223 --- 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 bf2736a..24fa1b2 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -2760 +2761 Branch : trunk diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 5702d0e..5eb2eff 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:30f03f59b6e03d8487b2f0d5416035bbf982787a9f5e778d2741fb3399a222ac -size 37659 +oid sha256:c9a2d18906c63cbf3b422aabfec73c100e6d307cb5e2079db2649dabfcfddae2 +size 38468 diff --git a/samba-doc.spec b/samba-doc.spec index 6796904..c619705 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -437,7 +437,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2760 +Source Timestamp: 2761 Branch : trunk %changelog diff --git a/samba.changes b/samba.changes index e266051..38853fa 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Feb 17 13:34:23 CET 2012 - ddiss@suse.de + +- Add SERVERID_UNIQUE_ID_NOT_TO_VERIFY; (bso#8760); (bnc#741854). + ------------------------------------------------------------------- Thu Feb 16 11:00:37 CET 2012 - ddiss@suse.de diff --git a/samba.spec b/samba.spec index d03f907..28faba1 100644 --- a/samba.spec +++ b/samba.spec @@ -208,7 +208,7 @@ Authors: The Samba Team -Source Timestamp: 2760 +Source Timestamp: 2761 Branch : trunk %package client @@ -252,7 +252,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2760 +Source Timestamp: 2761 Branch : trunk %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -278,7 +278,7 @@ Authors: The Samba Team -Source Timestamp: 2760 +Source Timestamp: 2761 Branch : trunk %endif @@ -308,7 +308,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2760 +Source Timestamp: 2761 Branch : trunk %endif @@ -335,7 +335,7 @@ Authors: -------- Jeremy Allison -Source Timestamp: 2760 +Source Timestamp: 2761 Branch : trunk %if %{make_utils} @@ -356,7 +356,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2760 +Source Timestamp: 2761 Branch : trunk %endif @@ -391,7 +391,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2760 +Source Timestamp: 2761 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -417,14 +417,14 @@ PreReq: /sbin/ldconfig %description -n libsmbclient -Source Timestamp: 2760 +Source Timestamp: 2761 Branch : trunk %else %description -n libsmbclient0 -Source Timestamp: 2760 +Source Timestamp: 2761 Branch : trunk %endif @@ -472,7 +472,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2760 +Source Timestamp: 2761 Branch : trunk %package -n libnetapi0 @@ -490,7 +490,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2760 +Source Timestamp: 2761 Branch : trunk %package -n libnetapi-devel @@ -514,7 +514,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2760 +Source Timestamp: 2761 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -535,14 +535,14 @@ PreReq: /sbin/ldconfig %description -n libsmbsharemodes -Source Timestamp: 2760 +Source Timestamp: 2761 Branch : trunk %else %description -n libsmbsharemodes0 -Source Timestamp: 2760 +Source Timestamp: 2761 Branch : trunk %endif @@ -578,7 +578,7 @@ Authors: The Samba Team -Source Timestamp: 2760 +Source Timestamp: 2761 Branch : trunk %package -n libwbclient0 @@ -596,7 +596,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2760 +Source Timestamp: 2761 Branch : trunk %package -n libwbclient-devel @@ -620,7 +620,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2760 +Source Timestamp: 2761 Branch : trunk %package -n libtalloc2 @@ -640,7 +640,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2760 +Source Timestamp: 2761 Branch : trunk %package -n libtalloc-devel @@ -666,7 +666,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2760 +Source Timestamp: 2761 Branch : trunk %package -n libtdb1 @@ -686,7 +686,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2760 +Source Timestamp: 2761 Branch : trunk %package -n libtdb-devel @@ -708,7 +708,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2760 +Source Timestamp: 2761 Branch : trunk %package -n libtevent0 @@ -728,7 +728,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2760 +Source Timestamp: 2761 Branch : trunk %package -n libtevent-devel @@ -756,7 +756,7 @@ Authors: The Samba Team -Source Timestamp: 2760 +Source Timestamp: 2761 Branch : trunk %package -n libldb1 @@ -778,7 +778,7 @@ Authors: The Samba Team -Source Timestamp: 2760 +Source Timestamp: 2761 Branch : trunk %package -n libldb-devel @@ -805,7 +805,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2760 +Source Timestamp: 2761 Branch : trunk %if %{make_ldapsmb} @@ -828,7 +828,7 @@ Authors: -------- Guenther Deschner -Source Timestamp: 2760 +Source Timestamp: 2761 Branch : trunk %endif diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index b94b4b3..d92da2c 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:fc50e5f2176aed9d0daedafdd1e2356800d1b3de869d9886f45fd80e7ad6a6f9 -size 52543 +oid sha256:41c3406aa40c98db627b86be9ea402824d5f758889ca0ded33bd3270d1653575 +size 52611