diff --git a/build-source-timestamp b/build-source-timestamp index bcb7b58..0013e02 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -2782 -Branch : 3.6.3.SLE11_SP2 +2784 +Branch : 3.6.4 diff --git a/patches.tar.bz2 b/patches.tar.bz2 index d5f8f38..ecc3365 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:90cb870f4596fb463403d33ea7026ec8c835870e23f9c3f09780528f47d8c0e1 -size 53260 +oid sha256:a1efb1dfdd0d92699498db026a1be99634d70759cd8b641b7537fdc2fc208b31 +size 51029 diff --git a/samba-3.6.3.tar.bz2 b/samba-3.6.3.tar.bz2 deleted file mode 100644 index 502215d..0000000 --- a/samba-3.6.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f0b251f493340f19a653e777688f2ce9667736dd289f0d96954afc799f7b7d61 -size 24448051 diff --git a/samba-3.6.4.tar.bz2 b/samba-3.6.4.tar.bz2 new file mode 100644 index 0000000..130b1af --- /dev/null +++ b/samba-3.6.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f51904d52afb47253863673c78a251b5105301611311baac003f1f845e6b1941 +size 24464368 diff --git a/samba-doc.spec b/samba-doc.spec index d691db1..97678d1 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -1,7 +1,7 @@ # -# spec file for package samba-doc (Version 3.6.3) +# spec file for package samba-doc # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ # norootforbuild -Name: samba-doc +Name: samba-doc %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1140 BuildRequires: autoconf %endif @@ -82,7 +82,7 @@ BuildRequires: pkg-config %else BuildRequires: pkgconfig %endif -%define samba_ver 3.6.3 +%define samba_ver 3.6.4 %define samba_ver_suffix %nil %define samba_ver_full %{samba_ver}%{samba_ver_suffix} %if 0%{?suse_version} && 0%{?suse_version} < 1111 @@ -104,10 +104,10 @@ BuildRequires: pkgconfig %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -Version: 3.6.3 -Release: 0 +Version: 3.6.4 +Release: 1 %define ldapsmb_ver 1.34b -Url: http://www.samba.org/ +Url: http://www.samba.org/ License: GPL-3.0+ Summary: Samba Documentation Group: Documentation/Other @@ -117,7 +117,7 @@ Provides: samba-gplv3-doc = %{version} Obsoletes: samba-gplv3-doc < %{version} Provides: samba-doc-gplv2 = %{version} Obsoletes: samba-doc-gplv2 < %{version} -BuildArch: noarch +BuildArch: noarch Source: http://samba.org/samba/ftp/samba-%{version}%{samba_ver_suffix}.tar.bz2 Source1: vendor-files.tar.bz2 Source2: patches.tar.bz2 @@ -186,6 +186,7 @@ BuildRequires: ccache %define cups_lib_dir %{_libdir}/cups %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build + %prep # samba-doc nowadays is part the main samba spec file %if 0%{?suse_version} && 0%{?suse_version} < 1111 @@ -433,6 +434,7 @@ fi # samba-doc nowadays is part the main samba spec file %if 0%{?suse_version} && 0%{?suse_version} < 1111 + %files -f filelist-samba-doc %defattr(-,root,root) %dir %{DOCDIR} @@ -447,3 +449,7 @@ This package contains all the Samba documentation as it is not part of the man pages. +Source Timestamp: 2784 +Branch : 3.6.4 + +%changelog diff --git a/samba.changes b/samba.changes index 98b0b0a..3038499 100644 --- a/samba.changes +++ b/samba.changes @@ -1,6 +1,7 @@ ------------------------------------------------------------------- Tue Apr 10 16:13:34 UTC 2012 - lmuelle@suse.com +- Update to 3.6.4. - Samba pre-3.6.4 are affected by a vulnerability that allows remote code exe- cution as the "root" user; PIDL based autogenerated code allows overwriting beyond of allocated array; CVE-2012-1182; (bso#8815); (bnc#752797). diff --git a/samba.spec b/samba.spec index 73c83b2..fb79d49 100644 --- a/samba.spec +++ b/samba.spec @@ -1,7 +1,7 @@ # -# spec file for package samba (Version 3.6.3) +# spec file for package samba # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,7 +16,7 @@ # # norootforbuild -# neededforbuild cracklib-devel cups-devel cups-libs e2fsprogs e2fsprogs-devel heimdal-devel heimdal-lib libacl libacl-devel libattr libattr-devel libxml2 libxml2-devel mysql-devel mysql-shared openldap2-client openldap2-devel openssl openssl-devel pam-devel pkgconfig popt popt-devel postgresql-devel postgresql-libs python python-devel readline readline-devel + Name: samba %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1140 @@ -82,7 +82,7 @@ BuildRequires: pkg-config %else BuildRequires: pkgconfig %endif -%define samba_ver 3.6.3 +%define samba_ver 3.6.4 %define samba_ver_suffix %nil %define samba_ver_full %{samba_ver}%{samba_ver_suffix} %if 0%{?suse_version} && 0%{?suse_version} < 1111 @@ -104,8 +104,8 @@ BuildRequires: pkgconfig %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -Version: 3.6.3 -Release: 0 +Version: 3.6.4 +Release: 1 %define ldapsmb_ver 1.34b License: GPL-3.0+ Url: http://www.samba.org/ @@ -211,6 +211,9 @@ binary packages of the most current Samba version, and a bug reporting how to. +Source Timestamp: 2784 +Branch : 3.6.4 + %package client License: GPL-3.0+ Summary: Samba Client Utilities @@ -249,7 +252,11 @@ binary packages of the most current Samba version, and a bug reporting how to. +Source Timestamp: 2784 +Branch : 3.6.4 + %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 + %package devel License: GPL-3.0+ Summary: Libraries and Header Files to Develop Programs with Samba Support @@ -265,6 +272,9 @@ This package contains the static libraries and header files needed to develop programs which make use of Samba. +Source Timestamp: 2784 +Branch : 3.6.4 + %endif %if 0%{?suse_version} && 0%{?suse_version} < 1001 || 0%{?suse_version} > 1110 @@ -287,6 +297,9 @@ This package contains all the Samba documentation as it is not part of the man pages. +Source Timestamp: 2784 +Branch : 3.6.4 + %endif %package krb-printing @@ -306,9 +319,13 @@ Requires: samba-client >= %{version} A wrapper binary to run smbspool with the original calling UID. +Source Timestamp: 2784 +Branch : 3.6.4 + %if %{make_utils} %package utils + Summary: debug tools Group: Productivity/Networking/Samba Provides: samba-gplv3-utils = %{version} @@ -318,6 +335,9 @@ Obsoletes: samba-gplv3-utils < %{version} Some of the debug-tools for developpers. +Source Timestamp: 2784 +Branch : 3.6.4 + %endif %package winbind @@ -347,11 +367,17 @@ PreReq: coreutils This is the winbind-daemon and the wbinfo-tool. +Source Timestamp: 2784 +Branch : 3.6.4 + %if 0%{?suse_version} && 0%{?suse_version} < 1031 + %package -n libsmbclient License: GPL-3.0+ %else + %package -n libsmbclient0 + License: GPL-3.0+ Provides: libsmbclient = %{version} Obsoletes: libsmbclient @@ -364,9 +390,19 @@ Group: System/Libraries PreReq: /sbin/ldconfig %if 0%{?suse_version} && 0%{?suse_version} < 1031 + %description -n libsmbclient + +Source Timestamp: 2784 +Branch : 3.6.4 + %else + %description -n libsmbclient0 + +Source Timestamp: 2784 +Branch : 3.6.4 + %endif This package includes the libsmbclient library. @@ -376,7 +412,6 @@ This entry is required to allow a samba.spec file providing libsmbclient for SUSE version < 11.0 while versions > 10.0 will have libsmbclient0. - %package -n libsmbclient-devel License: GPL-3.0+ Summary: Libraries and Header Files to Develop Programs with smbclient Support @@ -404,6 +439,9 @@ This package contains the static libraries and header files needed to develop programs which make use of the smbclient programming interface. +Source Timestamp: 2784 +Branch : 3.6.4 + %package -n libnetapi0 License: GPL-3.0+ Summary: Samba netapi Library @@ -414,6 +452,9 @@ PreReq: /sbin/ldconfig This package includes the netapi library. +Source Timestamp: 2784 +Branch : 3.6.4 + %package -n libnetapi-devel License: GPL-3.0+ Summary: Libraries and Header Files to Develop Programs with netapi Support @@ -430,11 +471,17 @@ This package contains the static libraries and header files needed to develop programs which make use of the netapi programming interface. +Source Timestamp: 2784 +Branch : 3.6.4 + %if 0%{?suse_version} && 0%{?suse_version} < 1031 + %package -n libsmbsharemodes License: GPL-3.0+ %else + %package -n libsmbsharemodes0 + License: GPL-3.0+ %endif Summary: Samba smbsharemodes Library @@ -442,13 +489,22 @@ Group: System/Libraries PreReq: /sbin/ldconfig %if 0%{?suse_version} && 0%{?suse_version} < 1031 + %description -n libsmbsharemodes + +Source Timestamp: 2784 +Branch : 3.6.4 + %else + %description -n libsmbsharemodes0 + +Source Timestamp: 2784 +Branch : 3.6.4 + %endif This package includes the smbsharemodes library. - %package -n libsmbsharemodes-devel License: GPL-3.0+ Summary: Libraries and Header Files to Develop Programs with smbsharemodes Support @@ -469,6 +525,9 @@ This package contains the static libraries and header files needed to develop programs which make use of the smbsharemodes programming interface. +Source Timestamp: 2784 +Branch : 3.6.4 + %package -n libwbclient0 License: LGPL-3.0+ Summary: Samba libwbclient Library @@ -479,6 +538,9 @@ PreReq: /sbin/ldconfig This package includes the wbclient library. +Source Timestamp: 2784 +Branch : 3.6.4 + %package -n libwbclient-devel License: LGPL-3.0+ Summary: Libraries and Header Files to Develop Programs with wbclient Support @@ -495,8 +557,12 @@ This package contains the static libraries and header files needed to develop programs which make use of the wbclient programming interface. +Source Timestamp: 2784 +Branch : 3.6.4 + %package -n libtalloc2 Version: %{libtalloc_ver} +Release: 5 License: LGPL-3.0+ Summary: Samba talloc Library Group: System/Libraries @@ -506,8 +572,12 @@ PreReq: /sbin/ldconfig This package includes the talloc library. +Source Timestamp: 2784 +Branch : 3.6.4 + %package -n libtalloc-devel Version: %{libtalloc_ver} +Release: 5 License: LGPL-3.0+ Summary: Libraries and Header Files to Develop Programs with talloc Support Group: Development/Libraries/C and C++ @@ -523,8 +593,12 @@ This package contains the static libraries and header files needed to develop programs which make use of the talloc programming interface. +Source Timestamp: 2784 +Branch : 3.6.4 + %package -n libtdb1 Version: %{libtdb_ver} +Release: 5 License: LGPL-3.0+ Summary: Samba tdb Library Group: System/Libraries @@ -534,8 +608,12 @@ PreReq: /sbin/ldconfig This package includes the tdb library. +Source Timestamp: 2784 +Branch : 3.6.4 + %package -n libtdb-devel Version: %{libtdb_ver} +Release: 5 License: LGPL-3.0+ Summary: Libraries and Header Files to Develop Programs with tdb Support Group: Development/Libraries/C and C++ @@ -547,8 +625,12 @@ This package contains the static libraries and header files needed to develop programs which make use of the tdb programming interface. +Source Timestamp: 2784 +Branch : 3.6.4 + %package -n libtevent0 Version: %{libtevent_ver} +Release: 5 License: LGPL-3.0+ Summary: Samba tevent Library Group: System/Libraries @@ -558,8 +640,12 @@ PreReq: /sbin/ldconfig This package includes the tevent library. +Source Timestamp: 2784 +Branch : 3.6.4 + %package -n libtevent-devel Version: %{libtevent_ver} +Release: 5 License: LGPL-3.0+ Summary: Libraries and Header Files to Develop Programs with tevent Support Group: Development/Libraries/C and C++ @@ -576,8 +662,12 @@ This package contains the static libraries and header files needed to develop programs which make use of the tevent programming interface. +Source Timestamp: 2784 +Branch : 3.6.4 + %package -n libldb1 Version: %{libldb_ver} +Release: 5 License: LGPL-3.0+ Summary: Samba ldb Library Group: System/Libraries @@ -588,8 +678,12 @@ PreReq: /sbin/ldconfig This package includes the ldb library. +Source Timestamp: 2784 +Branch : 3.6.4 + %package -n libldb-devel Version: %{libldb_ver} +Release: 5 License: LGPL-3.0+ Summary: Libraries and Header Files to Develop Programs with ldb Support Group: Development/Libraries/C and C++ @@ -606,11 +700,14 @@ This package contains the static libraries and header files needed to develop programs which make use of the tevent programming interface. +Source Timestamp: 2784 +Branch : 3.6.4 + %if %{make_ldapsmb} %package -n ldapsmb Version: 1.34b -Release: 0 +Release: 307 License: GPL-2.0+ Summary: Tool to administer Samba's LDAP backend Group: Productivity/Networking/Samba @@ -621,6 +718,9 @@ This tool aims to simplify the administration of a Samba Domain Controller that uses the ldapsam passdb backend. +Source Timestamp: 2784 +Branch : 3.6.4 + %endif %prep @@ -1274,29 +1374,37 @@ fi %{?insserv_cleanup:%{insserv_cleanup}} %if 0%{?suse_version} && 0%{?suse_version} < 1031 + %post -n libsmbclient %else + %post -n libsmbclient0 %endif /sbin/ldconfig %if 0%{?suse_version} && 0%{?suse_version} < 1031 + %postun -n libsmbclient %else + %postun -n libsmbclient0 %endif /sbin/ldconfig %if 0%{?suse_version} && 0%{?suse_version} < 1031 + %post -n libsmbsharemodes %else + %post -n libsmbsharemodes0 %endif /sbin/ldconfig %if 0%{?suse_version} && 0%{?suse_version} < 1031 + %postun -n libsmbsharemodes %else + %postun -n libsmbsharemodes0 %endif /sbin/ldconfig @@ -1596,8 +1704,10 @@ fi %{_libdir}/pkgconfig/netapi.pc %if 0%{?suse_version} && 0%{?suse_version} < 1031 + %files -n libsmbclient %else + %files -n libsmbclient0 %endif %defattr(-,root,root) @@ -1614,8 +1724,10 @@ fi %{_libdir}/pkgconfig/smbclient.pc %if 0%{?suse_version} && 0%{?suse_version} < 1031 + %files -n libsmbsharemodes %else + %files -n libsmbsharemodes0 %endif %defattr(-,root,root) @@ -1704,3 +1816,4 @@ fi %{_sbindir}/ldapsmb %{_mandir}/man5/ldapsmb.5.* %endif +%changelog diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 4026899..32b721e 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:f03d2b91ee4ec89322cbbe2ad5c022c9f9c083ee60fc6b6aad2736894cb5fc6f -size 52553 +oid sha256:ca8408cb8520914d3e43ab83a0750df8dc10d96d641f3974d5e967bfb48afc15 +size 52510