From 1b4312331770410af3f2c953133d2840428a7912e2d96377769f948f63db9185 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Mon, 28 Feb 2011 16:29:13 +0000 Subject: [PATCH 1/2] - Update to 3.5.7 + Protect against possible denial of service caused by memory corruption; CVE-2011-0719; (bso#7949); (bnc#670431). - Protect against possible denial of service caused by memory corruption; CVE-2011-0719; (bso#7949); (bnc#670431). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=159 --- build-source-timestamp | 4 +- patches.tar.bz2 | 4 +- samba-3.5.6.tar.bz2 | 3 -- samba-3.5.7.tar.bz2 | 3 ++ samba-doc.spec | 15 ++++-- samba.changes | 13 +++++ samba.spec | 120 ++++++++++++++++++++--------------------- vendor-files.tar.bz2 | 4 +- 8 files changed, 92 insertions(+), 74 deletions(-) delete mode 100644 samba-3.5.6.tar.bz2 create mode 100644 samba-3.5.7.tar.bz2 diff --git a/build-source-timestamp b/build-source-timestamp index 47b419a..75c36a0 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -2501 -Branch : 3.5.6 +2504 +Branch : 3.5.7 diff --git a/patches.tar.bz2 b/patches.tar.bz2 index a5a4e14..c8575ae 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2581ece364e2c7faa799af88fbc7062e52621ad34e413a2a3a895fc0e776e6bc -size 78819 +oid sha256:6cd5c30a9bfeb64843b9a54d5bd8233cb7b2d96a9f2a233310006ea6427ea0de +size 78683 diff --git a/samba-3.5.6.tar.bz2 b/samba-3.5.6.tar.bz2 deleted file mode 100644 index 3c5769d..0000000 --- a/samba-3.5.6.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cf7d9977e1ba30816a7e5e1d4144312c63ec5f105c64f66e41f6366cf07435fd -size 26780169 diff --git a/samba-3.5.7.tar.bz2 b/samba-3.5.7.tar.bz2 new file mode 100644 index 0000000..c25038c --- /dev/null +++ b/samba-3.5.7.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:afbffc90cb47d602fe5364cd8be8281123287b87184544fd1192669e1ea7d87b +size 26784685 diff --git a/samba-doc.spec b/samba-doc.spec index 140ce4e..ab151ab 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -58,7 +58,7 @@ BuildRequires: pkg-config %else BuildRequires: pkgconfig %endif -%define samba_ver 3.5.6 +%define samba_ver 3.5.7 %define samba_ver_suffix %nil %define samba_ver_full %{samba_ver}%{samba_ver_suffix} %if 0%{?suse_version} && 0%{?suse_version} < 1111 @@ -76,8 +76,8 @@ BuildRequires: pkgconfig %define libtevent_ver %{version} %endif Url: http://www.samba.org/ -Version: 3.5.6 -Release: 7 +Version: 3.5.7 +Release: 1 License: GPLv3+ Summary: Samba Documentation Group: Documentation/Other @@ -154,6 +154,7 @@ BuildRequires: ccache BuildRoot: %{_tmppath}/%{name}-%{version}-build %prep +%if 0%{?suse_version} && 0%{?suse_version} < 1111 %setup -n samba-%{samba_ver_full} -q # patches %setup -T -D -a 2 -n samba-%{samba_ver_full} -q @@ -214,8 +215,11 @@ test "%{_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 +%endif %build samba-%{samba_ver_full} +# samba-doc nowadays is part the main samba spec file +%if 0%{?suse_version} && 0%{?suse_version} < 1111 %if 0%{?suse_version} && 0%{?suse_version} < 911 OPTIMIZATION="-O" %else @@ -294,6 +298,7 @@ CONFIGURE_OPTIONS_DEVEL="--enable-debug --enable-developer" %endif ./configure ${CONFIGURE_OPTIONS} ${CONFIGURE_OPTIONS_DEVEL} ./script/mkversion.sh +%endif %install # samba-doc nowadays is part the main samba spec file @@ -414,7 +419,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2501 -Branch : 3.5.6 +Source Timestamp: 2504 +Branch : 3.5.7 %changelog diff --git a/samba.changes b/samba.changes index 1866480..a105343 100644 --- a/samba.changes +++ b/samba.changes @@ -1,8 +1,21 @@ +------------------------------------------------------------------- +Mon Feb 28 14:36:49 UTC 2011 - lmuelle@suse.de + +- Update to 3.5.7 + + Protect against possible denial of service caused by memory corruption; + CVE-2011-0719; (bso#7949); (bnc#670431). + ------------------------------------------------------------------- Wed Feb 23 11:20:14 UTC 2011 - lmuelle@suse.de - Disable separate build of samba-doc for post-11.1 systems. +------------------------------------------------------------------- +Tue Feb 22 01:07:50 UTC 2011 - lmuelle@suse.de + +- Protect against possible denial of service caused by memory corruption; + CVE-2011-0719; (bso#7949); (bnc#670431). + ------------------------------------------------------------------- Thu Feb 17 13:25:08 CET 2011 - ddiss@suse.de diff --git a/samba.spec b/samba.spec index 2d46bc5..c543f76 100644 --- a/samba.spec +++ b/samba.spec @@ -58,7 +58,7 @@ BuildRequires: pkg-config %else BuildRequires: pkgconfig %endif -%define samba_ver 3.5.6 +%define samba_ver 3.5.7 %define samba_ver_suffix %nil %define samba_ver_full %{samba_ver}%{samba_ver_suffix} %if 0%{?suse_version} && 0%{?suse_version} < 1111 @@ -81,8 +81,8 @@ License: GPLv3+ Group: Productivity/Networking/Samba Url: http://www.samba.org/ AutoReqProv: on -Version: 3.5.6 -Release: 7 +Version: 3.5.7 +Release: 1 Provides: samba-gplv3 = %{version}-%{release} Obsoletes: samba-gplv3 < %{version} %ifarch ppc64 @@ -184,8 +184,8 @@ Authors: The Samba Team -Source Timestamp: 2501 -Branch : 3.5.6 +Source Timestamp: 2504 +Branch : 3.5.7 %package client License: GPLv3+ @@ -230,8 +230,8 @@ Authors: -------- The Samba Team -Source Timestamp: 2501 -Branch : 3.5.6 +Source Timestamp: 2504 +Branch : 3.5.7 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -257,8 +257,8 @@ Authors: The Samba Team -Source Timestamp: 2501 -Branch : 3.5.6 +Source Timestamp: 2504 +Branch : 3.5.7 %endif %if 0%{?suse_version} && 0%{?suse_version} < 1001 || 0%{?suse_version} > 1110 @@ -287,8 +287,8 @@ Authors: -------- The Samba Team -Source Timestamp: 2501 -Branch : 3.5.6 +Source Timestamp: 2504 +Branch : 3.5.7 %endif @@ -314,8 +314,8 @@ Authors: -------- Jeremy Allison -Source Timestamp: 2501 -Branch : 3.5.6 +Source Timestamp: 2504 +Branch : 3.5.7 %if %{make_utils} @@ -364,8 +364,8 @@ Authors: -------- The Samba Team -Source Timestamp: 2501 -Branch : 3.5.6 +Source Timestamp: 2504 +Branch : 3.5.7 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -390,8 +390,8 @@ PreReq: /sbin/ldconfig %description -n libsmbclient -Source Timestamp: 2501 -Branch : 3.5.6 +Source Timestamp: 2504 +Branch : 3.5.7 %else @@ -435,8 +435,8 @@ Authors: -------- The Samba Team -Source Timestamp: 2501 -Branch : 3.5.6 +Source Timestamp: 2504 +Branch : 3.5.7 %package -n libnetapi0 License: GPLv3+ @@ -454,8 +454,8 @@ Authors: -------- The Samba Team -Source Timestamp: 2501 -Branch : 3.5.6 +Source Timestamp: 2504 +Branch : 3.5.7 %package -n libnetapi-devel License: GPLv3+ @@ -474,8 +474,8 @@ Authors: -------- The Samba Team -Source Timestamp: 2501 -Branch : 3.5.6 +Source Timestamp: 2504 +Branch : 3.5.7 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -495,8 +495,8 @@ PreReq: /sbin/ldconfig %description -n libsmbsharemodes -Source Timestamp: 2501 -Branch : 3.5.6 +Source Timestamp: 2504 +Branch : 3.5.7 %else @@ -531,8 +531,8 @@ Authors: The Samba Team -Source Timestamp: 2501 -Branch : 3.5.6 +Source Timestamp: 2504 +Branch : 3.5.7 %package -n libtalloc2 License: LGPLv3+ @@ -540,7 +540,7 @@ Summary: Samba talloc Library Group: System/Libraries AutoReqProv: on Version: %{libtalloc_ver} -Release: 3 +Release: 4 PreReq: /sbin/ldconfig %description -n libtalloc2 @@ -552,8 +552,8 @@ Authors: -------- The Samba Team -Source Timestamp: 2501 -Branch : 3.5.6 +Source Timestamp: 2504 +Branch : 3.5.7 %package -n libtalloc-devel License: LGPLv3+ @@ -561,7 +561,7 @@ Summary: Libraries and Header Files to Develop Programs with talloc Suppo Group: Development/Libraries/C and C++ AutoReqProv: on Version: %{libtalloc_ver} -Release: 3 +Release: 4 Requires: libtalloc2 %description -n libtalloc-devel @@ -574,8 +574,8 @@ Authors: -------- The Samba Team -Source Timestamp: 2501 -Branch : 3.5.6 +Source Timestamp: 2504 +Branch : 3.5.7 %package -n libtdb1 License: LGPLv3+ @@ -583,7 +583,7 @@ Summary: Samba tdb Library Group: System/Libraries AutoReqProv: on Version: %{libtdb_ver} -Release: 3 +Release: 4 PreReq: /sbin/ldconfig %description -n libtdb1 @@ -595,8 +595,8 @@ Authors: -------- The Samba Team -Source Timestamp: 2501 -Branch : 3.5.6 +Source Timestamp: 2504 +Branch : 3.5.7 %package -n libtdb-devel License: LGPLv3+ @@ -604,7 +604,7 @@ Summary: Libraries and Header Files to Develop Programs with tdb Support Group: Development/Libraries/C and C++ AutoReqProv: on Version: %{libtdb_ver} -Release: 3 +Release: 4 Requires: libtdb1 %description -n libtdb-devel @@ -617,8 +617,8 @@ Authors: -------- The Samba Team -Source Timestamp: 2501 -Branch : 3.5.6 +Source Timestamp: 2504 +Branch : 3.5.7 %package -n libwbclient0 License: GPLv3+ @@ -636,8 +636,8 @@ Authors: -------- The Samba Team -Source Timestamp: 2501 -Branch : 3.5.6 +Source Timestamp: 2504 +Branch : 3.5.7 %package -n libwbclient-devel License: GPLv3+ @@ -656,8 +656,8 @@ Authors: -------- The Samba Team -Source Timestamp: 2501 -Branch : 3.5.6 +Source Timestamp: 2504 +Branch : 3.5.7 %package -n libtevent0 License: LGPLv3+ @@ -665,7 +665,7 @@ Summary: Samba tevent Library Group: System/Libraries AutoReqProv: on Version: %{libtevent_ver} -Release: 3 +Release: 4 PreReq: /sbin/ldconfig %description -n libtevent0 @@ -677,8 +677,8 @@ Authors: -------- The Samba Team -Source Timestamp: 2501 -Branch : 3.5.6 +Source Timestamp: 2504 +Branch : 3.5.7 %package -n libtevent-devel License: LGPLv3+ @@ -686,7 +686,7 @@ Summary: Libraries and Header Files to Develop Programs with tevent Suppo Group: Development/Libraries/C and C++ AutoReqProv: on Version: %{libtevent_ver} -Release: 3 +Release: 4 Requires: libtevent0 %description -n libtevent-devel @@ -700,8 +700,8 @@ Authors: The Samba Team -Source Timestamp: 2501 -Branch : 3.5.6 +Source Timestamp: 2504 +Branch : 3.5.7 %package -n libldb0 License: LGPLv3+ @@ -709,7 +709,7 @@ Summary: Samba ldb Library Group: System/Libraries AutoReqProv: on Version: %{libldb_ver} -Release: 3 +Release: 4 PreReq: /sbin/ldconfig %description -n libldb0 @@ -722,8 +722,8 @@ Authors: The Samba Team -Source Timestamp: 2501 -Branch : 3.5.6 +Source Timestamp: 2504 +Branch : 3.5.7 %package -n libldb-devel License: LGPLv3+ @@ -731,7 +731,7 @@ Summary: Libraries and Header Files to Develop Programs with ldb Support Group: Development/Libraries/C and C++ AutoReqProv: on Version: %{libldb_ver} -Release: 3 +Release: 4 Requires: libldb0 %description -n libldb-devel @@ -744,8 +744,8 @@ Authors: -------- The Samba Team -Source Timestamp: 2501 -Branch : 3.5.6 +Source Timestamp: 2504 +Branch : 3.5.7 %if %{make_ldapsmb} @@ -755,7 +755,7 @@ Summary: Tool to administer Samba's LDAP backend Group: Productivity/Networking/Samba AutoReqProv: on Version: 1.34b -Release: 299 +Release: 300 Requires: perl-ldap %description -n ldapsmb @@ -768,8 +768,8 @@ Authors: -------- Guenther Deschner -Source Timestamp: 2501 -Branch : 3.5.6 +Source Timestamp: 2504 +Branch : 3.5.7 %endif %if 0%{?suse_version} > 920 && 0%{?suse_version} < 1121 @@ -791,8 +791,8 @@ Authors: -------- Steve French -Source Timestamp: 2501 -Branch : 3.5.6 +Source Timestamp: 2504 +Branch : 3.5.7 %endif %if %{make_vscan} diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 8b89f43..74c1a58 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:cf282876059bd18cbfe4e9fa6020a04518faeeda9ebb0b4d25da18f6141a16d1 -size 24814 +oid sha256:8e83515bc7350655052700e8eae40d4de786d1698f0c89e77f7676c000b5aeda +size 24698 From aa7d6d25ed6bb7bf73bd8bf3bfce25d14ec5f1f7e01886da7a493a20285283d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Mon, 28 Feb 2011 17:20:27 +0000 Subject: [PATCH 2/2] Add cosmetic comment as we use in the other cases in the samba-doc.spec OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=160 --- build-source-timestamp | 2 +- samba-doc.spec | 3 ++- samba.spec | 48 +++++++++++++++++++++--------------------- vendor-files.tar.bz2 | 4 ++-- 4 files changed, 29 insertions(+), 28 deletions(-) diff --git a/build-source-timestamp b/build-source-timestamp index 75c36a0..3ff6ce4 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -2504 +2505 Branch : 3.5.7 diff --git a/samba-doc.spec b/samba-doc.spec index ab151ab..a987793 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -154,6 +154,7 @@ BuildRequires: ccache BuildRoot: %{_tmppath}/%{name}-%{version}-build %prep +# samba-doc nowadays is part the main samba spec file %if 0%{?suse_version} && 0%{?suse_version} < 1111 %setup -n samba-%{samba_ver_full} -q # patches @@ -419,7 +420,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2504 +Source Timestamp: 2505 Branch : 3.5.7 %changelog diff --git a/samba.spec b/samba.spec index c543f76..0ba826e 100644 --- a/samba.spec +++ b/samba.spec @@ -184,7 +184,7 @@ Authors: The Samba Team -Source Timestamp: 2504 +Source Timestamp: 2505 Branch : 3.5.7 %package client @@ -230,7 +230,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2504 +Source Timestamp: 2505 Branch : 3.5.7 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -257,7 +257,7 @@ Authors: The Samba Team -Source Timestamp: 2504 +Source Timestamp: 2505 Branch : 3.5.7 %endif @@ -287,7 +287,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2504 +Source Timestamp: 2505 Branch : 3.5.7 %endif @@ -314,7 +314,7 @@ Authors: -------- Jeremy Allison -Source Timestamp: 2504 +Source Timestamp: 2505 Branch : 3.5.7 %if %{make_utils} @@ -364,7 +364,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2504 +Source Timestamp: 2505 Branch : 3.5.7 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -390,7 +390,7 @@ PreReq: /sbin/ldconfig %description -n libsmbclient -Source Timestamp: 2504 +Source Timestamp: 2505 Branch : 3.5.7 %else @@ -435,7 +435,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2504 +Source Timestamp: 2505 Branch : 3.5.7 %package -n libnetapi0 @@ -454,7 +454,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2504 +Source Timestamp: 2505 Branch : 3.5.7 %package -n libnetapi-devel @@ -474,7 +474,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2504 +Source Timestamp: 2505 Branch : 3.5.7 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -495,7 +495,7 @@ PreReq: /sbin/ldconfig %description -n libsmbsharemodes -Source Timestamp: 2504 +Source Timestamp: 2505 Branch : 3.5.7 %else @@ -531,7 +531,7 @@ Authors: The Samba Team -Source Timestamp: 2504 +Source Timestamp: 2505 Branch : 3.5.7 %package -n libtalloc2 @@ -552,7 +552,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2504 +Source Timestamp: 2505 Branch : 3.5.7 %package -n libtalloc-devel @@ -574,7 +574,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2504 +Source Timestamp: 2505 Branch : 3.5.7 %package -n libtdb1 @@ -595,7 +595,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2504 +Source Timestamp: 2505 Branch : 3.5.7 %package -n libtdb-devel @@ -617,7 +617,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2504 +Source Timestamp: 2505 Branch : 3.5.7 %package -n libwbclient0 @@ -636,7 +636,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2504 +Source Timestamp: 2505 Branch : 3.5.7 %package -n libwbclient-devel @@ -656,7 +656,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2504 +Source Timestamp: 2505 Branch : 3.5.7 %package -n libtevent0 @@ -677,7 +677,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2504 +Source Timestamp: 2505 Branch : 3.5.7 %package -n libtevent-devel @@ -700,7 +700,7 @@ Authors: The Samba Team -Source Timestamp: 2504 +Source Timestamp: 2505 Branch : 3.5.7 %package -n libldb0 @@ -722,7 +722,7 @@ Authors: The Samba Team -Source Timestamp: 2504 +Source Timestamp: 2505 Branch : 3.5.7 %package -n libldb-devel @@ -744,7 +744,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2504 +Source Timestamp: 2505 Branch : 3.5.7 %if %{make_ldapsmb} @@ -768,7 +768,7 @@ Authors: -------- Guenther Deschner -Source Timestamp: 2504 +Source Timestamp: 2505 Branch : 3.5.7 %endif @@ -791,7 +791,7 @@ Authors: -------- Steve French -Source Timestamp: 2504 +Source Timestamp: 2505 Branch : 3.5.7 %endif diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 74c1a58..c976298 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:8e83515bc7350655052700e8eae40d4de786d1698f0c89e77f7676c000b5aeda -size 24698 +oid sha256:00e9057ac08de73c1ee69c8c11213f2dc64bd6e33c9a668bcacbd661f71882ee +size 24680