diff --git a/build-source-timestamp b/build-source-timestamp deleted file mode 100644 index 4fdd3ef..0000000 --- a/build-source-timestamp +++ /dev/null @@ -1 +0,0 @@ -SOURCE_TIMESTAMP="2915" diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 7a0885d..6cc48ea 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0e5714878ae4dba0b16076a9a2911681bf0107cbc5f5624d564777eba23219ce -size 32906 +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 aa42a1b..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 2915 +%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 \ @@ -430,7 +419,7 @@ rm -f \ This package contains all the Samba documentation as it is not part of the man pages. -Source timestamp: %{SOURCE_TIMESTAMP} +Source Timestamp: %{SOURCE_TIMESTAMP} Branch: %{BRANCH} diff --git a/samba.changes b/samba.changes index 3ef97f7..cd3a706 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +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 + +- Drop separate build-source-timestamp file as it led to a second, incorrect + Source Timestamp line. + ------------------------------------------------------------------- Wed Jan 23 12:10:57 UTC 2013 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index ceb7d6f..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 2915 +%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 @@ -233,7 +227,7 @@ Samba as part of SUSE Linux Enterprise or openSUSE products, links to binary packages of the most current Samba version, and a bug reporting how to. -Source timestamp: %{SOURCE_TIMESTAMP} +Source Timestamp: %{SOURCE_TIMESTAMP} Branch: %{BRANCH} @@ -274,7 +268,7 @@ Samba as part of SUSE Linux Enterprise or openSUSE products, links to binary packages of the most current Samba version, and a bug reporting how to. -Source timestamp: %{SOURCE_TIMESTAMP} +Source Timestamp: %{SOURCE_TIMESTAMP} Branch: %{BRANCH} @@ -293,7 +287,7 @@ Obsoletes: samba-devel-64bit This package contains the static libraries and header files needed to develop programs which make use of Samba. -Source timestamp: %{SOURCE_TIMESTAMP} +Source Timestamp: %{SOURCE_TIMESTAMP} Branch: %{BRANCH} @@ -318,7 +312,7 @@ BuildArch: noarch This package contains all the Samba documentation as it is not part of the man pages. -Source timestamp: %{SOURCE_TIMESTAMP} +Source Timestamp: %{SOURCE_TIMESTAMP} Branch: %{BRANCH} @@ -339,7 +333,7 @@ Requires: samba-client >= %{version} %description krb-printing A wrapper binary to run smbspool with the original calling UID. -Source timestamp: %{SOURCE_TIMESTAMP} +Source Timestamp: %{SOURCE_TIMESTAMP} Branch: %{BRANCH} @@ -354,7 +348,7 @@ Obsoletes: samba-gplv3-utils < %{version} %description utils Some of the debug-tools for developpers. -Source timestamp: %{SOURCE_TIMESTAMP} +Source Timestamp: %{SOURCE_TIMESTAMP} Branch: %{BRANCH} @@ -390,7 +384,7 @@ PreReq: coreutils %description winbind This is the winbind-daemon and the wbinfo-tool. -Source timestamp: %{SOURCE_TIMESTAMP} +Source Timestamp: %{SOURCE_TIMESTAMP} Branch: %{BRANCH} @@ -416,7 +410,7 @@ This entry is required to allow a samba.spec file providing libsmbclient for SUSE version < 11.0 while versions > 10.0 will have libsmbclient0. -Source timestamp: %{SOURCE_TIMESTAMP} +Source Timestamp: %{SOURCE_TIMESTAMP} Branch: %{BRANCH} @@ -432,7 +426,7 @@ Requires: %{libsmbclient_name} = %{version} This package contains the static libraries and header files needed to develop programs which make use of the smbclient programming interface. -Source timestamp: %{SOURCE_TIMESTAMP} +Source Timestamp: %{SOURCE_TIMESTAMP} Branch: %{BRANCH} @@ -445,7 +439,7 @@ PreReq: /sbin/ldconfig %description -n %{libnetapi_name} This package includes the netapi library. -Source timestamp: %{SOURCE_TIMESTAMP} +Source Timestamp: %{SOURCE_TIMESTAMP} Branch: %{BRANCH} @@ -460,7 +454,7 @@ Requires: %{libnetapi_name} = %{version} This package contains the static libraries and header files needed to develop programs which make use of the netapi programming interface. -Source timestamp: %{SOURCE_TIMESTAMP} +Source Timestamp: %{SOURCE_TIMESTAMP} Branch: %{BRANCH} @@ -477,7 +471,7 @@ PreReq: /sbin/ldconfig %description -n %{libsmbsharemodes_name} This package includes the smbsharemodes library. -Source timestamp: %{SOURCE_TIMESTAMP} +Source Timestamp: %{SOURCE_TIMESTAMP} Branch: %{BRANCH} @@ -492,7 +486,7 @@ Requires: %{libsmbsharemodes_name} = %{version} This package contains the static libraries and header files needed to develop programs which make use of the smbsharemodes programming interface. -Source timestamp: %{SOURCE_TIMESTAMP} +Source Timestamp: %{SOURCE_TIMESTAMP} Branch: %{BRANCH} @@ -505,7 +499,7 @@ PreReq: /sbin/ldconfig %description -n %{libwbclient_name} This package includes the wbclient library. -Source timestamp: %{SOURCE_TIMESTAMP} +Source Timestamp: %{SOURCE_TIMESTAMP} Branch: %{BRANCH} @@ -520,7 +514,7 @@ Requires: %{libwbclient_name} = %{version} This package contains the static libraries and header files needed to develop programs which make use of the wbclient programming interface. -Source timestamp: %{SOURCE_TIMESTAMP} +Source Timestamp: %{SOURCE_TIMESTAMP} Branch: %{BRANCH} @@ -536,7 +530,7 @@ PreReq: /sbin/ldconfig %description -n %{libtalloc_name} This package includes the talloc library. -Source timestamp: %{SOURCE_TIMESTAMP} +Source Timestamp: %{SOURCE_TIMESTAMP} Branch: %{BRANCH} @@ -552,7 +546,7 @@ Requires: %{libtalloc_name} = %{libtalloc_ver} This package contains the static libraries and header files needed to develop programs which make use of the talloc programming interface. -Source timestamp: %{SOURCE_TIMESTAMP} +Source Timestamp: %{SOURCE_TIMESTAMP} Branch: %{BRANCH} @@ -566,7 +560,7 @@ PreReq: /sbin/ldconfig %description -n %{libtdb_name} This package includes the tdb library. -Source timestamp: %{SOURCE_TIMESTAMP} +Source Timestamp: %{SOURCE_TIMESTAMP} Branch: %{BRANCH} @@ -582,7 +576,7 @@ Requires: %{libtdb_name} = %{libtdb_ver} This package contains the static libraries and header files needed to develop programs which make use of the tdb programming interface. -Source timestamp: %{SOURCE_TIMESTAMP} +Source Timestamp: %{SOURCE_TIMESTAMP} Branch: %{BRANCH} @@ -596,7 +590,7 @@ PreReq: /sbin/ldconfig %description -n %{libtevent_name} This package includes the tevent library. -Source timestamp: %{SOURCE_TIMESTAMP} +Source Timestamp: %{SOURCE_TIMESTAMP} Branch: %{BRANCH} @@ -613,7 +607,7 @@ Requires: %{libtevent_name} = %{libtevent_ver} This package contains the static libraries and header files needed to develop programs which make use of the tevent programming interface. -Source timestamp: %{SOURCE_TIMESTAMP} +Source Timestamp: %{SOURCE_TIMESTAMP} Branch: %{BRANCH} @@ -628,7 +622,7 @@ PreReq: /sbin/ldconfig %description -n %{libldb_name} This package includes the ldb library. -Source timestamp: %{SOURCE_TIMESTAMP} +Source Timestamp: %{SOURCE_TIMESTAMP} Branch: %{BRANCH} @@ -645,7 +639,7 @@ Requires: libtalloc-devel This package contains the static libraries and header files needed to develop programs which make use of the tevent programming interface. -Source timestamp: %{SOURCE_TIMESTAMP} +Source Timestamp: %{SOURCE_TIMESTAMP} Branch: %{BRANCH} %endif @@ -664,7 +658,7 @@ Requires: perl-ldap This tool aims to simplify the administration of a Samba Domain Controller that uses the ldapsam passdb backend. -Source timestamp: %{SOURCE_TIMESTAMP} +Source Timestamp: %{SOURCE_TIMESTAMP} Branch: %{BRANCH} @@ -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 d22921c..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:22f081fe713c980e77f3796660591f0c43c3bb7686005907bad9b61a6be2b4b9 -size 54026 +oid sha256:77e320eabd5b4fd2535282db926055dd4763456c10bc978a97642809238e6115 +size 53370