diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 5405e8f..3cb764d 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cd332a3353ce26d1aa4849bb9d24dc44251078a8f2fe210bd69938083dfe4914 -size 188269 +oid sha256:d9133532eefe939f08556f7200db6260d148726b27c6c0cffe9827a8f5e5d714 +size 188023 diff --git a/samba-4.1.5.tar.asc b/samba-4.1.5.tar.asc deleted file mode 100644 index 6aa442c..0000000 --- a/samba-4.1.5.tar.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.11 (GNU/Linux) - -iEYEABECAAYFAlMHHEcACgkQbzORW2Vot+pNiwCePohuvj4WvbYp0AmHW7HXkTD0 -ExgAn0Qq3LcJ2KBjX+s8gHk23yGtWA27 -=K+he ------END PGP SIGNATURE----- diff --git a/samba-4.1.5.tar.gz b/samba-4.1.5.tar.gz deleted file mode 100644 index e149019..0000000 --- a/samba-4.1.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d98c1554d6f857053557ff024c243df5d15dd9ca436d5804be4b0546ede94cc8 -size 23177512 diff --git a/samba-4.1.6.tar.asc b/samba-4.1.6.tar.asc new file mode 100644 index 0000000..676e3a8 --- /dev/null +++ b/samba-4.1.6.tar.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.11 (GNU/Linux) + +iEYEABECAAYFAlMe+FYACgkQbzORW2Vot+qW8gCgjsPfEKKZ6HYlyH0tErAUCTjU +wSUAnAou9AL9jlZ3C99q0KTi69Z5tkJU +=aw1W +-----END PGP SIGNATURE----- diff --git a/samba-4.1.6.tar.gz b/samba-4.1.6.tar.gz new file mode 100644 index 0000000..8ea65f1 --- /dev/null +++ b/samba-4.1.6.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6d3b25cb70acbd75352e1a6039093689ded373f6ac755c207635416786532e6b +size 23177462 diff --git a/samba.changes b/samba.changes index ada43c5..b071f91 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,40 @@ +------------------------------------------------------------------- +Wed Mar 12 13:57:29 UTC 2014 - lmuelle@suse.com + +- Depend only on %version with all manual Provides and Requires; (bnc#844307). + +------------------------------------------------------------------- +Tue Mar 11 18:07:47 UTC 2014 - lmuelle@suse.com + +- Update to 4.1.6. + + Password lockout not enforced for SAMR password changes; CVE-2013-4496; + (bnc#849224). + + smbcacls can remove a file or directory ACL by mistake; CVE-2013-6442; + (bnc#855866). + +------------------------------------------------------------------- +Tue Mar 11 13:10:59 UTC 2014 - lmuelle@suse.com + +- Password lockout not enforced for SAMR password changes; + CVE-2013-4496; (bnc#849224). + +------------------------------------------------------------------- +Tue Mar 11 10:21:46 UTC 2014 - lmuelle@suse.com + +- Call update-apparmor-samba-profile via ExecStartPre too; (bnc#867665). + +------------------------------------------------------------------- +Mon Mar 10 16:00:03 UTC 2014 - nopower@suse.com + +- samba4 smbcalcs --chown | --chgrp dacl regression; CVE-2013-6442; + (bnc#855866). + +------------------------------------------------------------------- +Tue Mar 4 17:20:33 UTC 2014 - ddiss@suse.com + +- Retry named pipe open requests on STATUS_PIPE_NOT_AVAILABLE; (bso#10484); + (bnc#865095). + ------------------------------------------------------------------- Thu Feb 27 15:19:56 UTC 2014 - ddiss@suse.com diff --git a/samba.spec b/samba.spec index 921c193..b71ea74 100644 --- a/samba.spec +++ b/samba.spec @@ -117,7 +117,7 @@ BuildRequires: dbus-1-devel BuildRequires: gpg-offline BuildRequires: systemd %endif -%define samba_ver 4.1.5 +%define samba_ver 4.1.6 %define samba_ver_suffix %nil %if "%{samba_ver_suffix}" == "" %define samba_source_location http://ftp.samba.org/pub/samba/stable/samba-%{version}.tar.gz @@ -144,17 +144,17 @@ BuildRequires: systemd %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3193 +%define SOURCE_TIMESTAMP 3208 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 %global with_get_printing_ticket 0 -Version: 4.1.5 +Version: 4.1.6 Release: 0 License: GPL-3.0+ Url: http://www.samba.org/ Group: Productivity/Networking/Samba -Provides: samba-gplv3 = %{version}-%{release} +Provides: samba-gplv3 = %{version} Obsoletes: samba-gplv3 < %{version} Requires: samba-client >= %{version} %if 0%{?suse_version} > 1030 @@ -254,10 +254,10 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Samba Client Utilities Group: Productivity/Networking/Samba -Provides: samba-gplv3-client = %{version}-%{release} +Provides: samba-gplv3-client = %{version} Provides: smbfs Obsoletes: samba-gplv3-client < %{version} -Provides: samba-client-gplv2 = %{version}-%{release} +Provides: samba-client-gplv2 = %{version} Obsoletes: samba-client-gplv2 < %{version} %if 0%{?suse_version} > 0 PreReq: %{?fillup_prereq} @@ -313,9 +313,9 @@ Summary: Samba Documentation Group: Documentation/Other PreReq: coreutils PreReq: findutils -Provides: samba-gplv3-doc = %{version}-%{release} +Provides: samba-gplv3-doc = %{version} Obsoletes: samba-gplv3-doc < %{version} -Provides: samba-doc-gplv2 = %{version}-%{release} +Provides: samba-doc-gplv2 = %{version} Obsoletes: samba-doc-gplv2 < %{version} %if 0%{?suse_version} > 1110 BuildArch: noarch @@ -337,7 +337,7 @@ License: GPL-3.0+ Summary: Wrapper binary for kerberized printing Group: Productivity/Networking/Samba PreReq: coreutils -Provides: samba-gplv3-krb-printing = %{version}-%{release} +Provides: samba-gplv3-krb-printing = %{version} Obsoletes: samba-gplv3-krb-printing < %{version} %if 0%{?suse_version} > 1000 PreReq: permissions @@ -388,7 +388,7 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Samba Python libraries Group: Applications/System -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{version} Requires: python-tevent Requires: python-tdb Requires: pyldb @@ -406,8 +406,8 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Testing tools for Samba servers and clients Group: Applications/System -Requires: samba = %{version}-%{release} -Requires: samba-winbind = %{version}-%{release} +Requires: samba = %{version} +Requires: samba-winbind = %{version} PreReq: /sbin/ldconfig %description test @@ -435,7 +435,7 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Winbind Daemon and Tool Group: Productivity/Networking/Samba -Provides: samba-gplv3-winbind = %{version}-%{release} +Provides: samba-gplv3-winbind = %{version} Obsoletes: samba-gplv3-winbind < %{version} Provides: samba-client:/usr/sbin/winbindd Requires: samba-client >= %{version} @@ -479,7 +479,7 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Development files for the DCE/RPC ATSVC library Group: Development/Libraries/C and C++ -Requires: libdcerpc-atsvc0 = %{version}-%{release} +Requires: libdcerpc-atsvc0 = %{version} %description -n libdcerpc-atsvc-devel ATSVC is a DCE/RPC based protocol used by CIFS hosts to @@ -518,7 +518,7 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Development files for the SAMR protocol library Group: Development/Libraries/C and C++ -Requires: libdcerpc-samr0 = %{version}-%{release} +Requires: libdcerpc-samr0 = %{version} %description -n libdcerpc-samr-devel This subpackage contains libraries and header files for developing @@ -549,9 +549,9 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Development files for the DCE/RPC library Group: Development/Libraries/C and C++ -Requires: libdcerpc0 = %{version}-%{release} -Requires: libdcerpc-binding0 = %{version}-%{release} -Requires: samba-core-devel = %{version}-%{release} +Requires: libdcerpc0 = %{version} +Requires: libdcerpc-binding0 = %{version} +Requires: samba-core-devel = %{version} %description -n libdcerpc-devel DCE/RPC, short for "Distributed Computing Environment / Remote @@ -583,8 +583,8 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Development files for Samba's generic security library Group: Development/Libraries/C and C++ -Requires: libgensec0 = %{version}-%{release} -Requires: samba-core-devel = %{version}-%{release} +Requires: libgensec0 = %{version} +Requires: samba-core-devel = %{version} %description -n libgensec-devel This subpackage contains libraries and header files for developing @@ -609,8 +609,8 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Development files for the ndr-krb5pac library Group: Development/Libraries/C and C++ -Requires: libndr-krb5pac0 = %{version}-%{release} -Requires: samba-core-devel = %{version}-%{release} +Requires: libndr-krb5pac0 = %{version} +Requires: samba-core-devel = %{version} %description -n libndr-krb5pac-devel This subpackage contains libraries and header files for developing @@ -635,8 +635,8 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Development files for the ndr-nbt library Group: Development/Libraries/C and C++ -Requires: libndr-nbt0 = %{version}-%{release} -Requires: samba-core-devel = %{version}-%{release} +Requires: libndr-nbt0 = %{version} +Requires: samba-core-devel = %{version} %description -n libndr-nbt-devel This subpackage contains libraries and header files for developing @@ -661,8 +661,8 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Development files for the libndr-standard library Group: Development/Libraries/C and C++ -Requires: libndr-standard0 = %{version}-%{release} -Requires: samba-core-devel = %{version}-%{release} +Requires: libndr-standard0 = %{version} +Requires: samba-core-devel = %{version} %description -n libndr-standard-devel This subpackage contains libraries and header files for developing @@ -689,8 +689,8 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Development files for the Network Data Representation library Group: Development/Libraries/C and C++ -Requires: libndr0 = %{version}-%{release} -Requires: samba-core-devel = %{version}-%{release} +Requires: libndr0 = %{version} +Requires: samba-core-devel = %{version} %description -n libndr-devel Network Data Representation (NDR) is an implementation of the @@ -718,8 +718,8 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Development files for the Samba3 password database library Group: Development/Libraries/C and C++ -Requires: libpdb0 = %{version}-%{release} -Requires: libndr-standard-devel = %{version}-%{release} +Requires: libpdb0 = %{version} +Requires: libndr-standard-devel = %{version} Requires: libtevent-devel %description -n libpdb-devel @@ -745,8 +745,8 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Development files for the Samba Windows-style registry library Group: Development/Libraries/C and C++ -Requires: libregistry0 = %{version}-%{release} -Requires: samba-core-devel = %{version}-%{release} +Requires: libregistry0 = %{version} +Requires: samba-core-devel = %{version} %description -n libregistry-devel This subpackage contains libraries and header files for developing @@ -771,7 +771,7 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Development files for the Samba credential management library Group: Development/Libraries/C and C++ -Requires: libsamba-credentials0 = %{version}-%{release} +Requires: libsamba-credentials0 = %{version} %description -n libsamba-credentials-devel This subpackage contains libraries and header files for developing @@ -796,8 +796,8 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Development files for the host-wide Samba configuration library Group: Development/Libraries/C and C++ -Requires: libsamba-hostconfig0 = %{version}-%{release} -Requires: samba-core-devel = %{version}-%{release} +Requires: libsamba-hostconfig0 = %{version} +Requires: samba-core-devel = %{version} %description -n libsamba-hostconfig-devel This subpackage contains libraries and header files for developing @@ -822,7 +822,7 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Development files for the Samba AD Group Policy library Group: Development/Libraries/C and C++ -Requires: libsamba-policy0 = %{version}-%{release} +Requires: libsamba-policy0 = %{version} %description -n libsamba-policy-devel This subpackage contains libraries and header files for developing @@ -847,8 +847,8 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Development files for the Samba utility function library Group: Development/Libraries/C and C++ -Requires: libsamba-util0 = %{version}-%{release} -Requires: samba-core-devel = %{version}-%{release} +Requires: libsamba-util0 = %{version} +Requires: samba-core-devel = %{version} %description -n libsamba-util-devel This subpackage contains libraries and header files for developing @@ -873,7 +873,7 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Development files for Samba's SAM database library Group: Development/Libraries/C and C++ -Requires: libsamdb0 = %{version}-%{release} +Requires: libsamdb0 = %{version} %description -n libsamdb-devel This subpackage contains libraries and header files for developing @@ -898,8 +898,8 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Development files for Samba4's raw SMB client library Group: Development/Libraries/C and C++ -Requires: libsmbclient-raw0 = %{version}-%{release} -Requires: samba-core-devel = %{version}-%{release} +Requires: libsmbclient-raw0 = %{version} +Requires: samba-core-devel = %{version} %description -n libsmbclient-raw-devel This subpackage contains libraries and header files for developing @@ -926,7 +926,7 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Development files for the Samba3 configuration library Group: Development/Libraries/C and C++ -Requires: libsmbconf0 = %{version}-%{release} +Requires: libsmbconf0 = %{version} %description -n libsmbconf-devel libsmbconf is a library to read or, based on the backend, modify the @@ -955,7 +955,7 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Development files for the smbldap library Group: Development/Libraries/C and C++ -Requires: libsmbldap0 = %{version}-%{release} +Requires: libsmbldap0 = %{version} Requires: libtalloc-devel Requires: libtevent-devel Requires: openldap2-devel @@ -988,8 +988,8 @@ License: GPL-3.0+ Summary: Development files for the Samba tevent utility library Group: Development/Libraries/C and C++ Requires: libtevent-devel -Requires: libtevent-util0 = %{version}-%{release} -Requires: samba-core-devel = %{version}-%{release} +Requires: libtevent-util0 = %{version} +Requires: samba-core-devel = %{version} %description -n libtevent-util-devel The libtevent-util library contains functions to convert tevent error @@ -1005,7 +1005,7 @@ Branch: %{BRANCH} %package -n %{libsmbclient_name} License: GPL-3.0+ %if 0%{?suse_version} > 1030 -Provides: libsmbclient = %{version}-%{release} +Provides: libsmbclient = %{version} Obsoletes: libsmbclient %endif Summary: Samba Client Library @@ -1027,7 +1027,7 @@ Summary: Libraries and Header Files to Develop Programs with smbclient Su Group: Development/Libraries/C and C++ BuildRequires: %{pkgconfig_req} Requires: krb5-devel -Requires: %{libsmbclient_name} = %{version}-%{release} +Requires: %{libsmbclient_name} = %{version} %description -n libsmbclient-devel This package contains the static libraries and header files needed to @@ -1055,7 +1055,7 @@ License: GPL-3.0+ Summary: Libraries and Header Files to Develop Programs with netapi Support Group: Development/Libraries/C and C++ BuildRequires: %{pkgconfig_req} -Requires: %{libnetapi_name} = %{version}-%{release} +Requires: %{libnetapi_name} = %{version} %description -n libnetapi-devel This package contains the static libraries and header files needed to @@ -1068,7 +1068,7 @@ Branch: %{BRANCH} %package -n %{libsmbsharemodes_name} License: GPL-3.0+ %if 0%{?suse_version} > 1030 -Provides: libsmbsharemodes = %{version}-%{release} +Provides: libsmbsharemodes = %{version} Obsoletes: libsmbsharemodes %endif Summary: Samba smbsharemodes Library @@ -1087,7 +1087,7 @@ License: GPL-3.0+ Summary: Libraries and Header Files to Develop Programs with smbsharemodes Support Group: Development/Libraries/C and C++ BuildRequires: %{pkgconfig_req} -Requires: %{libsmbsharemodes_name} = %{version}-%{release} +Requires: %{libsmbsharemodes_name} = %{version} %description -n libsmbsharemodes-devel This package contains the static libraries and header files needed to @@ -1115,7 +1115,7 @@ License: LGPL-3.0+ Summary: Libraries and Header Files to Develop Programs with wbclient Support Group: Development/Libraries/C and C++ BuildRequires: %{pkgconfig_req} -Requires: %{libwbclient_name} = %{version}-%{release} +Requires: %{libwbclient_name} = %{version} %description -n libwbclient-devel This package contains the static libraries and header files needed to @@ -1366,6 +1366,8 @@ for srv_name in nmb smb winbind; do ${srv_name^^}DOPTIONS=\"-D\"\n" >>SUSE.sysconfig.${srv_name} ln -s ../../%{_sbindir}/service %{buildroot}/%{_sbindir}/rc${srv_name} done +sed -i -e "s@EnvironmentFile=-/etc/sysconfig/samba@EnvironmentFile=-/etc/sysconfig/samba\nExecStartPre=/usr/share/samba/update-apparmor-samba-profile@g" \ + %{buildroot}/%{_unitdir}/smb.service head -n 2 ../packaging/systemd/samba.sysconfig > \ %{buildroot}%_var/adm/fillup-templates/sysconfig.samba cat SUSE.sysconfig.{nmb,smb} >>\ diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 324c7aa..8259d3d 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:646727445d2334c581e07bcd27c600aad3f641475c62948a637a078e4f8940ea -size 54220 +oid sha256:b6f2ab5fbae5a9e84ddafac2bb8d1946f3657a3430b8eee17248bec98331e5b8 +size 53896