From 85a9746bea01c142bcbf105c18f1abd9c5151548ef1a4fe96868d3f261a867ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Thu, 31 Jan 2013 17:41:16 +0000 Subject: [PATCH] - Update to 3.6.12. + Address SWAT security issues CVE-2013-0213 and CVE-2013-0214 which both don't apply to any SUSE Samba post-3.6.10 as it isn't longer built. + Don't build and package static libraries. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=291 --- patches.tar.bz2 | 4 ++-- samba-3.6.11.tar.bz2 | 3 --- samba-3.6.12.tar.bz2 | 3 +++ samba-doc.spec | 17 +++-------------- samba.changes | 8 ++++++++ samba.spec | 34 +++------------------------------- vendor-files.tar.bz2 | 4 ++-- 7 files changed, 21 insertions(+), 52 deletions(-) delete mode 100644 samba-3.6.11.tar.bz2 create mode 100644 samba-3.6.12.tar.bz2 diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 18fcb98..6cc48ea 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c620a5d6b123e09413aba62c31e3408f445855745943ad7f0ba1959e4fde7d0d -size 32553 +oid sha256:78c1cc7e98b421d6e7a87456ede6228c888eb32522cd0f24b53239e7c83f4208 +size 32536 diff --git a/samba-3.6.11.tar.bz2 b/samba-3.6.11.tar.bz2 deleted file mode 100644 index 7ac0466..0000000 --- a/samba-3.6.11.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5f1ac4aa61ef4c94dc7fde83ddb5191d841ecbd80bc60db2be2624e1557eed09 -size 29474702 diff --git a/samba-3.6.12.tar.bz2 b/samba-3.6.12.tar.bz2 new file mode 100644 index 0000000..7d74940 --- /dev/null +++ b/samba-3.6.12.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:77db9493a32984f990f7f4ed0ee7df38400af61c73bc48be65cdebd86e88539d +size 29483495 diff --git a/samba-doc.spec b/samba-doc.spec index e125269..d38b632 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -89,7 +89,7 @@ BuildRequires: libtalloc-devel BuildRequires: libtdb-devel BuildRequires: libtevent-devel %endif -%define samba_ver 3.6.11 +%define samba_ver 3.6.12 %define samba_ver_suffix %nil %define samba_ver_full %{samba_ver}%{samba_ver_suffix} %if 0%{?suse_version} && 0%{?suse_version} < 1111 @@ -126,9 +126,9 @@ BuildRequires: libtevent-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 2922 +%define SOURCE_TIMESTAMP 2924 %define BRANCH %{version} -Version: 3.6.11 +Version: 3.6.12 Release: 0 %define ldapsmb_ver 1.34b Url: http://www.samba.org/ @@ -145,7 +145,6 @@ BuildArch: noarch Source: http://samba.org/samba/ftp/samba-%{version}%{samba_ver_suffix}.tar.bz2 Source1: vendor-files.tar.bz2 Source2: patches.tar.bz2 -Source3: build-source-timestamp Source4: baselibs.conf Source11: http://www.samba.org/~gd/ldapsmb/ldapsmb-%{ldapsmb_ver}.tar.bz2 # Choose some features / extra packages here @@ -165,11 +164,6 @@ BuildRequires: ccache %define cifs_init_script smbfs %endif %if 0%{?suse_version} && 0%{?suse_version} < 1111 -%define link_static_libs 1 -%else -%define link_static_libs 0 -%endif -%if 0%{?suse_version} && 0%{?suse_version} < 1111 # pre-11.2 doesn't know the python_* macros %define python_sitelib %py_sitedir %define python_sitearch %py_sitedir @@ -318,11 +312,7 @@ CONFIGURE_OPTIONS="\ --with-nmbdsocketdir=%{LOCKDIR} \ --enable-cups \ --enable-debug \ -%if %{link_static_libs} - --enable-static \ -%else --disable-static \ -%endif --with-acl-support \ --with-automount \ --with-dnsupdate \ @@ -335,7 +325,6 @@ CONFIGURE_OPTIONS="\ --with-profiling-data \ %endif --with-quotas \ - --with-swatdir=%{SWATDIR} \ --with-syslog \ --with-utmp \ --with-winbind \ diff --git a/samba.changes b/samba.changes index e8be24b..cd3a706 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Jan 31 16:51:30 UTC 2013 - lmuelle@suse.com + +- Update to 3.6.12. + + Address SWAT security issues CVE-2013-0213 and CVE-2013-0214 which both + don't apply to any SUSE Samba post-3.6.10 as it isn't longer built. + + Don't build and package static libraries. + ------------------------------------------------------------------- Thu Jan 31 16:14:06 UTC 2013 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index 75ceb44..960c4ed 100644 --- a/samba.spec +++ b/samba.spec @@ -89,7 +89,7 @@ BuildRequires: libtalloc-devel BuildRequires: libtdb-devel BuildRequires: libtevent-devel %endif -%define samba_ver 3.6.11 +%define samba_ver 3.6.12 %define samba_ver_suffix %nil %define samba_ver_full %{samba_ver}%{samba_ver_suffix} %if 0%{?suse_version} && 0%{?suse_version} < 1111 @@ -126,9 +126,9 @@ BuildRequires: libtevent-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 2922 +%define SOURCE_TIMESTAMP 2924 %define BRANCH %{version} -Version: 3.6.11 +Version: 3.6.12 Release: 0 %define ldapsmb_ver 1.34b License: GPL-3.0+ @@ -148,7 +148,6 @@ Summary: A SMB/CIFS File, Print, and Authentication Server Source: http://samba.org/samba/ftp/samba-%{version}%{samba_ver_suffix}.tar.bz2 Source1: vendor-files.tar.bz2 Source2: patches.tar.bz2 -Source3: build-source-timestamp Source4: baselibs.conf Source11: http://www.samba.org/~gd/ldapsmb/ldapsmb-%{ldapsmb_ver}.tar.bz2 PreReq: /usr/bin/getent @@ -172,11 +171,6 @@ BuildRequires: ccache %define cifs_init_script smbfs %endif %if 0%{?suse_version} && 0%{?suse_version} < 1111 -%define link_static_libs 1 -%else -%define link_static_libs 0 -%endif -%if 0%{?suse_version} && 0%{?suse_version} < 1111 # pre-11.2 doesn't know the python_* macros %define python_sitelib %py_sitedir %define python_sitearch %py_sitedir @@ -785,11 +779,7 @@ CONFIGURE_OPTIONS="\ --with-nmbdsocketdir=%{LOCKDIR} \ --enable-cups \ --enable-debug \ -%if %{link_static_libs} - --enable-static \ -%else --disable-static \ -%endif --with-acl-support \ --with-automount \ --with-dnsupdate \ @@ -802,7 +792,6 @@ CONFIGURE_OPTIONS="\ --with-profiling-data \ %endif --with-quotas \ - --with-swatdir=%{SWATDIR} \ --with-syslog \ --with-utmp \ --with-winbind \ @@ -1600,9 +1589,6 @@ fi %files -n libnetapi-devel %defattr(-,root,root) %{_includedir}/netapi.h -%if %{link_static_libs} -%attr(0644,root,root) %{_libdir}/libnetapi.a -%endif %{_libdir}/libnetapi.so %{_libdir}/pkgconfig/netapi.pc @@ -1614,9 +1600,6 @@ fi %files -n libsmbclient-devel %defattr(-,root,root) %{_includedir}/libsmbclient.h -%if %{link_static_libs} -%attr(0644,root,root) %{_libdir}/libsmbclient.a -%endif %{_libdir}/libsmbclient.so %{_libdir}/pkgconfig/smbclient.pc @@ -1627,9 +1610,6 @@ fi %files -n libsmbsharemodes-devel %defattr(-,root,root) %{_includedir}/smb_share_modes.h -%if %{link_static_libs} -%attr(0644,root,root) %{_libdir}/libsmbsharemodes.a -%endif %{_libdir}/libsmbsharemodes.so %{_libdir}/pkgconfig/smbsharemodes.pc @@ -1644,9 +1624,6 @@ fi %defattr(-,root,root) %{_includedir}/pytalloc.h %{_includedir}/talloc.h -%if %{link_static_libs} -%attr(0644,root,root) %{_libdir}/libtalloc.a -%endif %{_libdir}/libpytalloc-util.so %{_libdir}/libtalloc.so %{_libdir}/pkgconfig/pytalloc-util.pc @@ -1659,9 +1636,6 @@ fi %files -n libtdb-devel %defattr(-,root,root) %{_includedir}/tdb.h -%if %{link_static_libs} -%attr(0644,root,root) %{_libdir}/libtdb.a -%endif %{_libdir}/libtdb.so %{_libdir}/pkgconfig/tdb.pc @@ -1674,8 +1648,6 @@ fi %files -n libwbclient-devel %defattr(-,root,root) %{_includedir}/wbclient.h -%if %{link_static_libs} -%endif %{_libdir}/libwbclient.so %{_libdir}/pkgconfig/wbclient.pc diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 988b4ba..307f4a3 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:8182b05ea978291bca5148790e93ab71d1735f02377a11799d771cb2963cbeba -size 53379 +oid sha256:77e320eabd5b4fd2535282db926055dd4763456c10bc978a97642809238e6115 +size 53370