diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 714290d..d194a6a 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6f038746898bb8f43d8865e11a324a155ce551f5d13dbe2e24c8b83f2c5a1fa8 -size 278105 +oid sha256:78b1326aaf76f0bd983f7a6bbafe62549515d22f3418f8f60af818d8b40e6f4c +size 277716 diff --git a/samba.changes b/samba.changes index 7b71fa6..a45248b 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jun 25 11:52:17 UTC 2014 - ddiss@suse.com + +- Prevent file truncation on an open that fails with share mode violation; + (bso#10671); (bnc#884056). + ------------------------------------------------------------------- Mon Jun 23 09:43:53 UTC 2014 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index 3c3b5ed..ec6510d 100644 --- a/samba.spec +++ b/samba.spec @@ -15,18 +15,19 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %{!?_tmpfilesdir:%global _tmpfilesdir /usr/lib/tmpfiles.d} Name: samba %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1140 BuildRequires: autoconf %endif -BuildRequires: gcc -BuildRequires: make -BuildRequires: patch BuildRequires: cups-devel BuildRequires: cyrus-sasl-devel BuildRequires: e2fsprogs-devel +BuildRequires: gcc +BuildRequires: make +BuildRequires: patch %if 0%{?suse_version} > 1300 BuildRequires: libarchive-devel %endif @@ -51,8 +52,8 @@ BuildRequires: python-devel BuildRequires: readline-devel %if 0%{?suse_version} BuildRequires: cracklib-devel -BuildRequires: openldap2-devel BuildRequires: libopenssl-devel +BuildRequires: openldap2-devel %endif %if 0%{?suse_version} > 1030 BuildRequires: gdbm-devel @@ -112,8 +113,8 @@ BuildRequires: libxslt BuildRequires: libxslt1 %endif %if 0%{?suse_version} > 1210 -BuildRequires: libxslt-tools BuildRequires: dbus-1-devel +BuildRequires: libxslt-tools %endif %if 0%{?suse_version} > 1220 BuildRequires: gpg-offline @@ -146,15 +147,13 @@ BuildRequires: systemd %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3256 +%define SOURCE_TIMESTAMP 3258 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 Version: 4.1.9 Release: 0 -License: GPL-3.0+ Url: http://www.samba.org/ -Group: Productivity/Networking/Samba Provides: samba-gplv3 = %{version} Obsoletes: samba-gplv3 < %{version} Requires: samba-client >= %{version} @@ -163,6 +162,8 @@ Recommends: cron Recommends: logrotate %endif Summary: A SMB/CIFS File, Print, and Authentication Server +License: GPL-3.0+ +Group: Productivity/Networking/Samba Source: %{samba_source_location} Source5: %{samba_source_signature_location} Source6: http://www.samba.org/samba/ftp/samba-pubkey_6568B7EA.asc @@ -252,8 +253,8 @@ Branch: %{BRANCH} %package client -License: GPL-3.0+ Summary: Samba Client Utilities +License: GPL-3.0+ Group: Productivity/Networking/Samba Provides: samba-gplv3-client = %{version} Provides: smbfs @@ -292,8 +293,8 @@ Branch: %{BRANCH} %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 %package core-devel -License: GPL-3.0+ Summary: Development files shared by Samba subpackages +License: GPL-3.0+ Group: Development/Libraries/C and C++ Conflicts: samba-devel @@ -309,8 +310,8 @@ Branch: %{BRANCH} %if 0%{?suse_version} && 0%{?suse_version} < 1001 || 0%{?suse_version} > 1110 %package doc -License: GPL-3.0+ Summary: Samba Documentation +License: GPL-3.0+ Group: Documentation/Other PreReq: coreutils PreReq: findutils @@ -332,10 +333,9 @@ Branch: %{BRANCH} %endif - %package libs -License: GPL-3.0+ Summary: Samba libraries +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: krb5 PreReq: /sbin/ldconfig @@ -349,8 +349,8 @@ Branch: %{BRANCH} %package pidl -License: GPL-3.0+ Summary: Perl IDL compiler +License: GPL-3.0+ Group: Development/Tools %if 0%{?suse_version} > 0 Requires: perl-base @@ -366,14 +366,14 @@ Branch: %{BRANCH} %package python -License: GPL-3.0+ Summary: Samba Python libraries +License: GPL-3.0+ Group: Applications/System Requires: %{name} = %{version} -Requires: python-tevent -Requires: python-tdb Requires: pyldb Requires: pytalloc +Requires: python-tdb +Requires: python-tevent %description python The samba-python package contains the Python libraries needed by programs @@ -384,8 +384,8 @@ Branch: %{BRANCH} %package test -License: GPL-3.0+ Summary: Testing tools for Samba servers and clients +License: GPL-3.0+ Group: Applications/System Requires: samba = %{version} Requires: samba-winbind = %{version} @@ -400,8 +400,8 @@ Branch: %{BRANCH} %package test-devel -License: GPL-3.0+ Summary: Testing devel files for Samba servers and clients +License: GPL-3.0+ Group: Development/Libraries/C and C++ %description test-devel @@ -413,8 +413,8 @@ Branch: %{BRANCH} %package winbind -License: GPL-3.0+ Summary: Winbind Daemon and Tool +License: GPL-3.0+ Group: Productivity/Networking/Samba Provides: samba-gplv3-winbind = %{version} Obsoletes: samba-gplv3-winbind < %{version} @@ -443,8 +443,8 @@ Branch: %{BRANCH} %package -n libdcerpc-atsvc0 -License: GPL-3.0+ Summary: DCE/RPC AT scheduler service library +License: GPL-3.0+ Group: System/Libraries %description -n libdcerpc-atsvc0 @@ -456,8 +456,8 @@ Branch: %{BRANCH} %package -n libdcerpc-atsvc-devel -License: GPL-3.0+ Summary: Development files for the DCE/RPC ATSVC library +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: libdcerpc-atsvc0 = %{version} @@ -473,8 +473,8 @@ Branch: %{BRANCH} %package -n libdcerpc-binding0 -License: GPL-3.0+ Summary: Some samba library +License: GPL-3.0+ Group: System/Libraries %description -n libdcerpc-binding0 @@ -484,8 +484,8 @@ Branch: %{BRANCH} %package -n libdcerpc-samr0 -License: GPL-3.0+ Summary: Security Account Manager (SAM) Remote Protocol library +License: GPL-3.0+ Group: System/Libraries %description -n libdcerpc-samr0 @@ -495,8 +495,8 @@ Branch: %{BRANCH} %package -n libdcerpc-samr-devel -License: GPL-3.0+ Summary: Development files for the SAMR protocol library +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: libdcerpc-samr0 = %{version} @@ -509,8 +509,8 @@ Branch: %{BRANCH} %package -n libdcerpc0 -License: GPL-3.0+ Summary: Distributed Computing Environment Remote Procedure Calls library +License: GPL-3.0+ Group: System/Libraries %description -n libdcerpc0 @@ -526,11 +526,11 @@ Branch: %{BRANCH} %package -n libdcerpc-devel -License: GPL-3.0+ Summary: Development files for the DCE/RPC library +License: GPL-3.0+ Group: Development/Libraries/C and C++ -Requires: libdcerpc0 = %{version} Requires: libdcerpc-binding0 = %{version} +Requires: libdcerpc0 = %{version} Requires: samba-core-devel = %{version} %description -n libdcerpc-devel @@ -549,8 +549,8 @@ Branch: %{BRANCH} %package -n libgensec0 -License: GPL-3.0+ Summary: Samba generic security library +License: GPL-3.0+ Group: System/Libraries %description -n libgensec0 @@ -560,8 +560,8 @@ Branch: %{BRANCH} %package -n libgensec-devel -License: GPL-3.0+ Summary: Development files for Samba's generic security library +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: libgensec0 = %{version} Requires: samba-core-devel = %{version} @@ -575,8 +575,8 @@ Branch: %{BRANCH} %package -n libndr-krb5pac0 -License: GPL-3.0+ Summary: NDR marshallers for the KRB5 PAC formats +License: GPL-3.0+ Group: System/Libraries %description -n libndr-krb5pac0 @@ -586,8 +586,8 @@ Branch: %{BRANCH} %package -n libndr-krb5pac-devel -License: GPL-3.0+ Summary: Development files for the ndr-krb5pac library +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: libndr-krb5pac0 = %{version} Requires: samba-core-devel = %{version} @@ -601,8 +601,8 @@ Branch: %{BRANCH} %package -n libndr-nbt0 -License: GPL-3.0+ Summary: NDR marshallers for NBT formats +License: GPL-3.0+ Group: System/Libraries %description -n libndr-nbt0 @@ -612,8 +612,8 @@ Branch: %{BRANCH} %package -n libndr-nbt-devel -License: GPL-3.0+ Summary: Development files for the ndr-nbt library +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: libndr-nbt0 = %{version} Requires: samba-core-devel = %{version} @@ -627,8 +627,8 @@ Branch: %{BRANCH} %package -n libndr-standard0 -License: GPL-3.0+ Summary: NDR marshallers for the standard set of DCE/RPC interfaces +License: GPL-3.0+ Group: System/Libraries %description -n libndr-standard0 @@ -638,8 +638,8 @@ Branch: %{BRANCH} %package -n libndr-standard-devel -License: GPL-3.0+ Summary: Development files for the libndr-standard library +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: libndr-standard0 = %{version} Requires: samba-core-devel = %{version} @@ -653,8 +653,8 @@ Branch: %{BRANCH} %package -n libndr0 -License: GPL-3.0+ Summary: Network Data Representation library +License: GPL-3.0+ Group: System/Libraries %description -n libndr0 @@ -666,8 +666,8 @@ Branch: %{BRANCH} %package -n libndr-devel -License: GPL-3.0+ Summary: Development files for the Network Data Representation library +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: libndr0 = %{version} Requires: samba-core-devel = %{version} @@ -684,8 +684,8 @@ Branch: %{BRANCH} %package -n libpdb0 -License: GPL-3.0+ Summary: Samba3 password database library +License: GPL-3.0+ Group: System/Libraries %description -n libpdb0 @@ -695,11 +695,11 @@ Branch: %{BRANCH} %package -n libpdb-devel -License: GPL-3.0+ Summary: Development files for the Samba3 password database library +License: GPL-3.0+ Group: Development/Libraries/C and C++ -Requires: libpdb0 = %{version} Requires: libndr-standard-devel = %{version} +Requires: libpdb0 = %{version} Requires: libtevent-devel %description -n libpdb-devel @@ -711,8 +711,8 @@ Branch: %{BRANCH} %package -n libregistry0 -License: GPL-3.0+ Summary: Windows-style registry library +License: GPL-3.0+ Group: System/Libraries %description -n libregistry0 @@ -722,8 +722,8 @@ Branch: %{BRANCH} %package -n libregistry-devel -License: GPL-3.0+ Summary: Development files for the Samba Windows-style registry library +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: libregistry0 = %{version} Requires: samba-core-devel = %{version} @@ -737,8 +737,8 @@ Branch: %{BRANCH} %package -n libsamba-credentials0 -License: GPL-3.0+ Summary: Samba credential management library +License: GPL-3.0+ Group: System/Libraries %description -n libsamba-credentials0 @@ -748,8 +748,8 @@ Branch: %{BRANCH} %package -n libsamba-credentials-devel -License: GPL-3.0+ Summary: Development files for the Samba credential management library +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: libsamba-credentials0 = %{version} @@ -762,8 +762,8 @@ Branch: %{BRANCH} %package -n libsamba-hostconfig0 -License: GPL-3.0+ Summary: Host-wide Samba configuration library +License: GPL-3.0+ Group: System/Libraries %description -n libsamba-hostconfig0 @@ -773,8 +773,8 @@ Branch: %{BRANCH} %package -n libsamba-hostconfig-devel -License: GPL-3.0+ Summary: Development files for the host-wide Samba configuration library +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: libsamba-hostconfig0 = %{version} Requires: samba-core-devel = %{version} @@ -788,8 +788,8 @@ Branch: %{BRANCH} %package -n libsamba-policy0 -License: GPL-3.0+ Summary: Active Directory Group Policy library +License: GPL-3.0+ Group: System/Libraries %description -n libsamba-policy0 @@ -799,8 +799,8 @@ Branch: %{BRANCH} %package -n libsamba-policy-devel -License: GPL-3.0+ Summary: Development files for the Samba AD Group Policy library +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: libsamba-policy0 = %{version} @@ -813,8 +813,8 @@ Branch: %{BRANCH} %package -n libsamba-util0 -License: GPL-3.0+ Summary: Samba utility function library +License: GPL-3.0+ Group: System/Libraries %description -n libsamba-util0 @@ -824,8 +824,8 @@ Branch: %{BRANCH} %package -n libsamba-util-devel -License: GPL-3.0+ Summary: Development files for the Samba utility function library +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: libsamba-util0 = %{version} Requires: samba-core-devel = %{version} @@ -839,8 +839,8 @@ Branch: %{BRANCH} %package -n libsamdb0 -License: GPL-3.0+ Summary: Samba's SAM database library +License: GPL-3.0+ Group: System/Libraries %description -n libsamdb0 @@ -850,8 +850,8 @@ Branch: %{BRANCH} %package -n libsamdb-devel -License: GPL-3.0+ Summary: Development files for Samba's SAM database library +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: libsamdb0 = %{version} @@ -864,8 +864,8 @@ Branch: %{BRANCH} %package -n libsmbclient-raw0 -License: GPL-3.0+ Summary: Samba4's raw SMB client library +License: GPL-3.0+ Group: System/Libraries %description -n libsmbclient-raw0 @@ -875,8 +875,8 @@ Branch: %{BRANCH} %package -n libsmbclient-raw-devel -License: GPL-3.0+ Summary: Development files for Samba4's raw SMB client library +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: libsmbclient-raw0 = %{version} Requires: samba-core-devel = %{version} @@ -890,8 +890,8 @@ Branch: %{BRANCH} %package -n libsmbconf0 -License: GPL-3.0+ Summary: Samba3 configuration library +License: GPL-3.0+ Group: System/Libraries %description -n libsmbconf0 @@ -903,8 +903,8 @@ Branch: %{BRANCH} %package -n libsmbconf-devel -License: GPL-3.0+ Summary: Development files for the Samba3 configuration library +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: libsmbconf0 = %{version} @@ -920,8 +920,8 @@ Branch: %{BRANCH} %package -n libsmbldap0 -License: GPL-3.0+ Summary: Samba LDAP protocol helper function library +License: GPL-3.0+ Group: System/Libraries %description -n libsmbldap0 @@ -932,8 +932,8 @@ Branch: %{BRANCH} %package -n libsmbldap-devel -License: GPL-3.0+ Summary: Development files for the smbldap library +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: libsmbldap0 = %{version} Requires: libtalloc-devel @@ -951,8 +951,8 @@ Branch: %{BRANCH} %package -n libtevent-util0 -License: GPL-3.0+ Summary: tevent <-> system status code conversion utility library +License: GPL-3.0+ Group: System/Libraries %description -n libtevent-util0 @@ -964,8 +964,8 @@ Branch: %{BRANCH} %package -n libtevent-util-devel -License: GPL-3.0+ Summary: Development files for the Samba tevent utility library +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: libtevent-devel Requires: libtevent-util0 = %{version} @@ -983,12 +983,12 @@ Branch: %{BRANCH} %package -n %{libsmbclient_name} -License: GPL-3.0+ %if 0%{?suse_version} > 1030 Provides: libsmbclient = %{version} Obsoletes: libsmbclient %endif Summary: Samba Client Library +License: GPL-3.0+ Group: System/Libraries PreReq: /sbin/ldconfig @@ -1002,12 +1002,12 @@ Branch: %{BRANCH} %package -n libsmbclient-devel -License: GPL-3.0+ Summary: Libraries and Header Files to Develop Programs with smbclient Support +License: GPL-3.0+ Group: Development/Libraries/C and C++ BuildRequires: %{pkgconfig_req} -Requires: krb5-devel Requires: %{libsmbclient_name} = %{version} +Requires: krb5-devel %description -n libsmbclient-devel This package contains the static libraries and header files needed to @@ -1018,8 +1018,8 @@ Branch: %{BRANCH} %package -n %{libnetapi_name} -License: GPL-3.0+ Summary: Samba netapi Library +License: GPL-3.0+ Group: System/Libraries PreReq: /sbin/ldconfig @@ -1031,8 +1031,8 @@ Branch: %{BRANCH} %package -n libnetapi-devel -License: GPL-3.0+ Summary: Libraries and Header Files to Develop Programs with netapi Support +License: GPL-3.0+ Group: Development/Libraries/C and C++ BuildRequires: %{pkgconfig_req} Requires: %{libnetapi_name} = %{version} @@ -1046,12 +1046,12 @@ Branch: %{BRANCH} %package -n %{libsmbsharemodes_name} -License: GPL-3.0+ %if 0%{?suse_version} > 1030 Provides: libsmbsharemodes = %{version} Obsoletes: libsmbsharemodes %endif Summary: Samba smbsharemodes Library +License: GPL-3.0+ Group: System/Libraries PreReq: /sbin/ldconfig @@ -1063,8 +1063,8 @@ Branch: %{BRANCH} %package -n libsmbsharemodes-devel -License: GPL-3.0+ Summary: Libraries and Header Files to Develop Programs with smbsharemodes Support +License: GPL-3.0+ Group: Development/Libraries/C and C++ BuildRequires: %{pkgconfig_req} Requires: %{libsmbsharemodes_name} = %{version} @@ -1078,8 +1078,8 @@ Branch: %{BRANCH} %package -n %{libwbclient_name} -License: LGPL-3.0+ Summary: Samba libwbclient Library +License: LGPL-3.0+ Group: System/Libraries PreReq: /sbin/ldconfig @@ -1091,8 +1091,8 @@ Branch: %{BRANCH} %package -n libwbclient-devel -License: LGPL-3.0+ Summary: Libraries and Header Files to Develop Programs with wbclient Support +License: LGPL-3.0+ Group: Development/Libraries/C and C++ BuildRequires: %{pkgconfig_req} Requires: %{libwbclient_name} = %{version} diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 27a2e8b..c7fb8ee 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:90c740f94c570c3d90f56d08e3510a52f0988df0ea877888846b5bf364f3b5d2 -size 54695 +oid sha256:0382e8fcb71d00cdd2fa19f0708ad1cf6ed467f4c0a1ecab2f89d164979cfad8 +size 54607