From 8f9b21cdf0dcf4162d3585adbd32a37c7311fd1757df6d1dd8de5c0f60e588d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Fri, 21 Mar 2014 19:48:32 +0000 Subject: [PATCH 1/3] Default with the cache and lock directory to the same path to have both non-persistent and persistent data at one location; (bnc#846586). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=393 --- patches.tar.bz2 | 4 ++-- samba.changes | 6 ++++++ samba.spec | 5 ++--- vendor-files.tar.bz2 | 4 ++-- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 3cb764d..5360df1 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d9133532eefe939f08556f7200db6260d148726b27c6c0cffe9827a8f5e5d714 -size 188023 +oid sha256:d051c5e2589f5a5d74dbd3a606e82d51916d5c0fb25442a3fcf4c0696e436fe9 +size 188134 diff --git a/samba.changes b/samba.changes index b071f91..2f467c7 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 21 18:59:29 UTC 2014 - lmuelle@suse.com + +- Default with the cache and lock directory to the same path to have both + non-persistent and persistent data at one location; (bnc#846586). + ------------------------------------------------------------------- Wed Mar 12 13:57:29 UTC 2014 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index b71ea74..f23943f 100644 --- a/samba.spec +++ b/samba.spec @@ -144,7 +144,7 @@ BuildRequires: systemd %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3208 +%define SOURCE_TIMESTAMP 3211 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 @@ -1210,6 +1210,7 @@ CONFIGURE_OPTIONS="\ --sysconfdir=%{CONFIGDIR} \ --with-configdir=%{CONFIGDIR} \ --libdir=%{_libdir} \ + --with-cachedir=%{LOCKDIR} \ --with-lockdir=%{LOCKDIR} \ --with-logfilebase=%{LOGDIR} \ --mandir=%{_mandir} \ @@ -1277,7 +1278,6 @@ install -d -m 0755 -p \ %{buildroot}/%{_datadir}/omc/svcinfo.d \ %{buildroot}/%{_datadir}/samba/{LDAP,templates} \ %{buildroot}/%{_localstatedir}/adm \ - %{buildroot}/%{_localstatedir}/cache/samba \ %{buildroot}/%{LOCKDIR}/{netlogon,drivers/{WIN40,W32X86,W32MIPS,W32ALPHA,W32PPC,IA64,x64},printing,profiles,winbindd_privileged} \ %{buildroot}/%{LOGDIR} \ %{buildroot}/%{PIDDIR} \ @@ -1968,7 +1968,6 @@ fi %doc %{DOCDIR}/README.%{VENDOR} %{_localstatedir}/adm/fillup-templates/samba-client-dhcp.conf %{_localstatedir}/adm/fillup-templates/sysconfig.dhcp-samba-client -%dir %{_localstatedir}/cache/samba %dir %{LOCKDIR} %attr(0750,root,root) %dir %{LOGDIR} %ghost %dir %{PIDDIR} diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 8259d3d..41e88db 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:b6f2ab5fbae5a9e84ddafac2bb8d1946f3657a3430b8eee17248bec98331e5b8 -size 53896 +oid sha256:f6e78fa95b2ffd9cb5ec1652b91b130dff35b12867021b257d5d5263c5842029 +size 53994 From c2912973ff7a4e2b11857d9520e1de38fa55d2ff0236e003925c1469feee0ee8 Mon Sep 17 00:00:00 2001 From: David Disseldorp Date: Thu, 27 Mar 2014 12:45:10 +0000 Subject: [PATCH 2/3] - Fix RPC server handling of fragmented requests; (bso#10481); (bnc#869707). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=394 --- patches.tar.bz2 | 4 +- samba.changes | 5 ++ samba.spec | 144 +++++++++++++++++++++---------------------- vendor-files.tar.bz2 | 4 +- 4 files changed, 81 insertions(+), 76 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 5360df1..019ef0a 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d051c5e2589f5a5d74dbd3a606e82d51916d5c0fb25442a3fcf4c0696e436fe9 -size 188134 +oid sha256:2660373809aacbaf58c2e2d6899196fdf6d50e581bd0e17e8c9d17f4e34a8530 +size 190064 diff --git a/samba.changes b/samba.changes index 2f467c7..08d4799 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Mar 26 14:36:34 UTC 2014 - ddiss@suse.com + +- Fix RPC server handling of fragmented requests; (bso#10481); (bnc#869707). + ------------------------------------------------------------------- Fri Mar 21 18:59:29 UTC 2014 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index f23943f..b064bb7 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 @@ -45,8 +46,8 @@ BuildRequires: popt-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 @@ -98,8 +99,8 @@ BuildRequires: libtalloc-devel BuildRequires: pytalloc-devel #!BuildIgnore: libtdb BuildRequires: libtdb-devel -BuildRequires: python-tdb BuildRequires: libtevent-devel +BuildRequires: python-tdb BuildRequires: python-tevent # to generate the man pages BuildRequires: docbook-xsl-stylesheets @@ -110,8 +111,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 @@ -144,16 +145,14 @@ BuildRequires: systemd %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3211 +%define SOURCE_TIMESTAMP 3212 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 %global with_get_printing_ticket 0 Version: 4.1.6 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} @@ -162,6 +161,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 @@ -251,8 +252,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 @@ -291,8 +292,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 @@ -308,8 +309,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 @@ -333,8 +334,8 @@ Branch: %{BRANCH} %if %with_get_printing_ticket %package krb-printing -License: GPL-3.0+ Summary: Wrapper binary for kerberized printing +License: GPL-3.0+ Group: Productivity/Networking/Samba PreReq: coreutils Provides: samba-gplv3-krb-printing = %{version} @@ -351,10 +352,9 @@ Source Timestamp: %{SOURCE_TIMESTAMP} 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 @@ -368,8 +368,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 @@ -385,14 +385,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 @@ -403,8 +403,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} @@ -419,8 +419,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 @@ -432,8 +432,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} @@ -463,8 +463,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 @@ -476,8 +476,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} @@ -493,8 +493,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 @@ -504,8 +504,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 @@ -515,8 +515,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} @@ -529,8 +529,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 @@ -546,11 +546,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 @@ -569,8 +569,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 @@ -580,8 +580,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} @@ -595,8 +595,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 @@ -606,8 +606,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} @@ -621,8 +621,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 @@ -632,8 +632,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} @@ -647,8 +647,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 @@ -658,8 +658,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} @@ -673,8 +673,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 @@ -686,8 +686,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} @@ -704,8 +704,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 @@ -715,11 +715,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 @@ -731,8 +731,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 @@ -742,8 +742,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} @@ -757,8 +757,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 @@ -768,8 +768,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} @@ -782,8 +782,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 @@ -793,8 +793,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} @@ -808,8 +808,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 @@ -819,8 +819,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} @@ -833,8 +833,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 @@ -844,8 +844,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} @@ -859,8 +859,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 @@ -870,8 +870,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} @@ -884,8 +884,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 @@ -895,8 +895,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} @@ -910,8 +910,8 @@ Branch: %{BRANCH} %package -n libsmbconf0 -License: GPL-3.0+ Summary: Samba3 configuration library +License: GPL-3.0+ Group: System/Libraries %description -n libsmbconf0 @@ -923,8 +923,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} @@ -940,8 +940,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 @@ -952,8 +952,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 @@ -971,8 +971,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 @@ -984,8 +984,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} @@ -1003,12 +1003,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 @@ -1022,12 +1022,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 @@ -1038,8 +1038,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 @@ -1051,8 +1051,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} @@ -1066,12 +1066,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 @@ -1083,8 +1083,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} @@ -1098,8 +1098,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 @@ -1111,8 +1111,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 41e88db..e321be4 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:f6e78fa95b2ffd9cb5ec1652b91b130dff35b12867021b257d5d5263c5842029 -size 53994 +oid sha256:e32d4bfa77b3930b0b6b81bd54237d7ef65613b796cf8050a9aa859c05eb71b3 +size 53827 From a9de609af9ba901837422e8e3f2ee0b3150d23edcb3dbb14a1418c8b2a99a583 Mon Sep 17 00:00:00 2001 From: David Disseldorp Date: Fri, 28 Mar 2014 12:23:08 +0000 Subject: [PATCH 3/3] - Extend vfs_snapper man page to cover permissions; (bnc#870570). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=395 --- patches.tar.bz2 | 4 +- samba.changes | 5 ++ samba.spec | 144 +++++++++++++++++++++---------------------- vendor-files.tar.bz2 | 4 +- 4 files changed, 81 insertions(+), 76 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 019ef0a..426d6b7 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2660373809aacbaf58c2e2d6899196fdf6d50e581bd0e17e8c9d17f4e34a8530 -size 190064 +oid sha256:ebd63d3e39f8d47ec9924b51b6a37de6d7b76f155969ea7ef497a5351a3ae6ac +size 190179 diff --git a/samba.changes b/samba.changes index 08d4799..901b4fd 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Mar 28 11:45:03 UTC 2014 - ddiss@suse.com + +- Extend vfs_snapper man page to cover permissions; (bnc#870570). + ------------------------------------------------------------------- Wed Mar 26 14:36:34 UTC 2014 - ddiss@suse.com diff --git a/samba.spec b/samba.spec index b064bb7..4c67082 100644 --- a/samba.spec +++ b/samba.spec @@ -15,19 +15,18 @@ # 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: cups-devel -BuildRequires: cyrus-sasl-devel -BuildRequires: e2fsprogs-devel BuildRequires: gcc BuildRequires: make BuildRequires: patch +BuildRequires: cups-devel +BuildRequires: cyrus-sasl-devel +BuildRequires: e2fsprogs-devel %if 0%{?suse_version} > 1300 BuildRequires: libarchive-devel %endif @@ -46,8 +45,8 @@ BuildRequires: popt-devel BuildRequires: readline-devel %if 0%{?suse_version} BuildRequires: cracklib-devel -BuildRequires: libopenssl-devel BuildRequires: openldap2-devel +BuildRequires: libopenssl-devel %endif %if 0%{?suse_version} > 1030 BuildRequires: gdbm-devel @@ -99,8 +98,8 @@ BuildRequires: libtalloc-devel BuildRequires: pytalloc-devel #!BuildIgnore: libtdb BuildRequires: libtdb-devel -BuildRequires: libtevent-devel BuildRequires: python-tdb +BuildRequires: libtevent-devel BuildRequires: python-tevent # to generate the man pages BuildRequires: docbook-xsl-stylesheets @@ -111,8 +110,8 @@ BuildRequires: libxslt BuildRequires: libxslt1 %endif %if 0%{?suse_version} > 1210 -BuildRequires: dbus-1-devel BuildRequires: libxslt-tools +BuildRequires: dbus-1-devel %endif %if 0%{?suse_version} > 1220 BuildRequires: gpg-offline @@ -145,14 +144,16 @@ BuildRequires: systemd %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3212 +%define SOURCE_TIMESTAMP 3213 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 %global with_get_printing_ticket 0 Version: 4.1.6 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} @@ -161,8 +162,6 @@ 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 +251,8 @@ Branch: %{BRANCH} %package client -Summary: Samba Client Utilities License: GPL-3.0+ +Summary: Samba Client Utilities Group: Productivity/Networking/Samba Provides: samba-gplv3-client = %{version} Provides: smbfs @@ -292,8 +291,8 @@ Branch: %{BRANCH} %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 %package core-devel -Summary: Development files shared by Samba subpackages License: GPL-3.0+ +Summary: Development files shared by Samba subpackages Group: Development/Libraries/C and C++ Conflicts: samba-devel @@ -309,8 +308,8 @@ Branch: %{BRANCH} %if 0%{?suse_version} && 0%{?suse_version} < 1001 || 0%{?suse_version} > 1110 %package doc -Summary: Samba Documentation License: GPL-3.0+ +Summary: Samba Documentation Group: Documentation/Other PreReq: coreutils PreReq: findutils @@ -334,8 +333,8 @@ Branch: %{BRANCH} %if %with_get_printing_ticket %package krb-printing -Summary: Wrapper binary for kerberized printing License: GPL-3.0+ +Summary: Wrapper binary for kerberized printing Group: Productivity/Networking/Samba PreReq: coreutils Provides: samba-gplv3-krb-printing = %{version} @@ -352,9 +351,10 @@ Source Timestamp: %{SOURCE_TIMESTAMP} Branch: %{BRANCH} %endif + %package libs -Summary: Samba libraries License: GPL-3.0+ +Summary: Samba libraries Group: Development/Libraries/C and C++ Requires: krb5 PreReq: /sbin/ldconfig @@ -368,8 +368,8 @@ Branch: %{BRANCH} %package pidl -Summary: Perl IDL compiler License: GPL-3.0+ +Summary: Perl IDL compiler Group: Development/Tools %if 0%{?suse_version} > 0 Requires: perl-base @@ -385,14 +385,14 @@ Branch: %{BRANCH} %package python -Summary: Samba Python libraries License: GPL-3.0+ +Summary: Samba Python libraries 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 @@ -403,8 +403,8 @@ Branch: %{BRANCH} %package test -Summary: Testing tools for Samba servers and clients License: GPL-3.0+ +Summary: Testing tools for Samba servers and clients Group: Applications/System Requires: samba = %{version} Requires: samba-winbind = %{version} @@ -419,8 +419,8 @@ Branch: %{BRANCH} %package test-devel -Summary: Testing devel files for Samba servers and clients License: GPL-3.0+ +Summary: Testing devel files for Samba servers and clients Group: Development/Libraries/C and C++ %description test-devel @@ -432,8 +432,8 @@ Branch: %{BRANCH} %package winbind -Summary: Winbind Daemon and Tool License: GPL-3.0+ +Summary: Winbind Daemon and Tool Group: Productivity/Networking/Samba Provides: samba-gplv3-winbind = %{version} Obsoletes: samba-gplv3-winbind < %{version} @@ -463,8 +463,8 @@ Branch: %{BRANCH} %package -n libdcerpc-atsvc0 -Summary: DCE/RPC AT scheduler service library License: GPL-3.0+ +Summary: DCE/RPC AT scheduler service library Group: System/Libraries %description -n libdcerpc-atsvc0 @@ -476,8 +476,8 @@ Branch: %{BRANCH} %package -n libdcerpc-atsvc-devel -Summary: Development files for the DCE/RPC ATSVC library License: GPL-3.0+ +Summary: Development files for the DCE/RPC ATSVC library Group: Development/Libraries/C and C++ Requires: libdcerpc-atsvc0 = %{version} @@ -493,8 +493,8 @@ Branch: %{BRANCH} %package -n libdcerpc-binding0 -Summary: Some samba library License: GPL-3.0+ +Summary: Some samba library Group: System/Libraries %description -n libdcerpc-binding0 @@ -504,8 +504,8 @@ Branch: %{BRANCH} %package -n libdcerpc-samr0 -Summary: Security Account Manager (SAM) Remote Protocol library License: GPL-3.0+ +Summary: Security Account Manager (SAM) Remote Protocol library Group: System/Libraries %description -n libdcerpc-samr0 @@ -515,8 +515,8 @@ Branch: %{BRANCH} %package -n libdcerpc-samr-devel -Summary: Development files for the SAMR protocol library License: GPL-3.0+ +Summary: Development files for the SAMR protocol library Group: Development/Libraries/C and C++ Requires: libdcerpc-samr0 = %{version} @@ -529,8 +529,8 @@ Branch: %{BRANCH} %package -n libdcerpc0 -Summary: Distributed Computing Environment Remote Procedure Calls library License: GPL-3.0+ +Summary: Distributed Computing Environment Remote Procedure Calls library Group: System/Libraries %description -n libdcerpc0 @@ -546,11 +546,11 @@ Branch: %{BRANCH} %package -n libdcerpc-devel -Summary: Development files for the DCE/RPC library License: GPL-3.0+ +Summary: Development files for the DCE/RPC library Group: Development/Libraries/C and C++ -Requires: libdcerpc-binding0 = %{version} Requires: libdcerpc0 = %{version} +Requires: libdcerpc-binding0 = %{version} Requires: samba-core-devel = %{version} %description -n libdcerpc-devel @@ -569,8 +569,8 @@ Branch: %{BRANCH} %package -n libgensec0 -Summary: Samba generic security library License: GPL-3.0+ +Summary: Samba generic security library Group: System/Libraries %description -n libgensec0 @@ -580,8 +580,8 @@ Branch: %{BRANCH} %package -n libgensec-devel -Summary: Development files for Samba's generic security library License: GPL-3.0+ +Summary: Development files for Samba's generic security library Group: Development/Libraries/C and C++ Requires: libgensec0 = %{version} Requires: samba-core-devel = %{version} @@ -595,8 +595,8 @@ Branch: %{BRANCH} %package -n libndr-krb5pac0 -Summary: NDR marshallers for the KRB5 PAC formats License: GPL-3.0+ +Summary: NDR marshallers for the KRB5 PAC formats Group: System/Libraries %description -n libndr-krb5pac0 @@ -606,8 +606,8 @@ Branch: %{BRANCH} %package -n libndr-krb5pac-devel -Summary: Development files for the ndr-krb5pac library License: GPL-3.0+ +Summary: Development files for the ndr-krb5pac library Group: Development/Libraries/C and C++ Requires: libndr-krb5pac0 = %{version} Requires: samba-core-devel = %{version} @@ -621,8 +621,8 @@ Branch: %{BRANCH} %package -n libndr-nbt0 -Summary: NDR marshallers for NBT formats License: GPL-3.0+ +Summary: NDR marshallers for NBT formats Group: System/Libraries %description -n libndr-nbt0 @@ -632,8 +632,8 @@ Branch: %{BRANCH} %package -n libndr-nbt-devel -Summary: Development files for the ndr-nbt library License: GPL-3.0+ +Summary: Development files for the ndr-nbt library Group: Development/Libraries/C and C++ Requires: libndr-nbt0 = %{version} Requires: samba-core-devel = %{version} @@ -647,8 +647,8 @@ Branch: %{BRANCH} %package -n libndr-standard0 -Summary: NDR marshallers for the standard set of DCE/RPC interfaces License: GPL-3.0+ +Summary: NDR marshallers for the standard set of DCE/RPC interfaces Group: System/Libraries %description -n libndr-standard0 @@ -658,8 +658,8 @@ Branch: %{BRANCH} %package -n libndr-standard-devel -Summary: Development files for the libndr-standard library License: GPL-3.0+ +Summary: Development files for the libndr-standard library Group: Development/Libraries/C and C++ Requires: libndr-standard0 = %{version} Requires: samba-core-devel = %{version} @@ -673,8 +673,8 @@ Branch: %{BRANCH} %package -n libndr0 -Summary: Network Data Representation library License: GPL-3.0+ +Summary: Network Data Representation library Group: System/Libraries %description -n libndr0 @@ -686,8 +686,8 @@ Branch: %{BRANCH} %package -n libndr-devel -Summary: Development files for the Network Data Representation library License: GPL-3.0+ +Summary: Development files for the Network Data Representation library Group: Development/Libraries/C and C++ Requires: libndr0 = %{version} Requires: samba-core-devel = %{version} @@ -704,8 +704,8 @@ Branch: %{BRANCH} %package -n libpdb0 -Summary: Samba3 password database library License: GPL-3.0+ +Summary: Samba3 password database library Group: System/Libraries %description -n libpdb0 @@ -715,11 +715,11 @@ Branch: %{BRANCH} %package -n libpdb-devel -Summary: Development files for the Samba3 password database library License: GPL-3.0+ +Summary: Development files for the Samba3 password database library Group: Development/Libraries/C and C++ -Requires: libndr-standard-devel = %{version} Requires: libpdb0 = %{version} +Requires: libndr-standard-devel = %{version} Requires: libtevent-devel %description -n libpdb-devel @@ -731,8 +731,8 @@ Branch: %{BRANCH} %package -n libregistry0 -Summary: Windows-style registry library License: GPL-3.0+ +Summary: Windows-style registry library Group: System/Libraries %description -n libregistry0 @@ -742,8 +742,8 @@ Branch: %{BRANCH} %package -n libregistry-devel -Summary: Development files for the Samba Windows-style registry library License: GPL-3.0+ +Summary: Development files for the Samba Windows-style registry library Group: Development/Libraries/C and C++ Requires: libregistry0 = %{version} Requires: samba-core-devel = %{version} @@ -757,8 +757,8 @@ Branch: %{BRANCH} %package -n libsamba-credentials0 -Summary: Samba credential management library License: GPL-3.0+ +Summary: Samba credential management library Group: System/Libraries %description -n libsamba-credentials0 @@ -768,8 +768,8 @@ Branch: %{BRANCH} %package -n libsamba-credentials-devel -Summary: Development files for the Samba credential management library License: GPL-3.0+ +Summary: Development files for the Samba credential management library Group: Development/Libraries/C and C++ Requires: libsamba-credentials0 = %{version} @@ -782,8 +782,8 @@ Branch: %{BRANCH} %package -n libsamba-hostconfig0 -Summary: Host-wide Samba configuration library License: GPL-3.0+ +Summary: Host-wide Samba configuration library Group: System/Libraries %description -n libsamba-hostconfig0 @@ -793,8 +793,8 @@ Branch: %{BRANCH} %package -n libsamba-hostconfig-devel -Summary: Development files for the host-wide Samba configuration library License: GPL-3.0+ +Summary: Development files for the host-wide Samba configuration library Group: Development/Libraries/C and C++ Requires: libsamba-hostconfig0 = %{version} Requires: samba-core-devel = %{version} @@ -808,8 +808,8 @@ Branch: %{BRANCH} %package -n libsamba-policy0 -Summary: Active Directory Group Policy library License: GPL-3.0+ +Summary: Active Directory Group Policy library Group: System/Libraries %description -n libsamba-policy0 @@ -819,8 +819,8 @@ Branch: %{BRANCH} %package -n libsamba-policy-devel -Summary: Development files for the Samba AD Group Policy library License: GPL-3.0+ +Summary: Development files for the Samba AD Group Policy library Group: Development/Libraries/C and C++ Requires: libsamba-policy0 = %{version} @@ -833,8 +833,8 @@ Branch: %{BRANCH} %package -n libsamba-util0 -Summary: Samba utility function library License: GPL-3.0+ +Summary: Samba utility function library Group: System/Libraries %description -n libsamba-util0 @@ -844,8 +844,8 @@ Branch: %{BRANCH} %package -n libsamba-util-devel -Summary: Development files for the Samba utility function library License: GPL-3.0+ +Summary: Development files for the Samba utility function library Group: Development/Libraries/C and C++ Requires: libsamba-util0 = %{version} Requires: samba-core-devel = %{version} @@ -859,8 +859,8 @@ Branch: %{BRANCH} %package -n libsamdb0 -Summary: Samba's SAM database library License: GPL-3.0+ +Summary: Samba's SAM database library Group: System/Libraries %description -n libsamdb0 @@ -870,8 +870,8 @@ Branch: %{BRANCH} %package -n libsamdb-devel -Summary: Development files for Samba's SAM database library License: GPL-3.0+ +Summary: Development files for Samba's SAM database library Group: Development/Libraries/C and C++ Requires: libsamdb0 = %{version} @@ -884,8 +884,8 @@ Branch: %{BRANCH} %package -n libsmbclient-raw0 -Summary: Samba4's raw SMB client library License: GPL-3.0+ +Summary: Samba4's raw SMB client library Group: System/Libraries %description -n libsmbclient-raw0 @@ -895,8 +895,8 @@ Branch: %{BRANCH} %package -n libsmbclient-raw-devel -Summary: Development files for Samba4's raw SMB client library License: GPL-3.0+ +Summary: Development files for Samba4's raw SMB client library Group: Development/Libraries/C and C++ Requires: libsmbclient-raw0 = %{version} Requires: samba-core-devel = %{version} @@ -910,8 +910,8 @@ Branch: %{BRANCH} %package -n libsmbconf0 -Summary: Samba3 configuration library License: GPL-3.0+ +Summary: Samba3 configuration library Group: System/Libraries %description -n libsmbconf0 @@ -923,8 +923,8 @@ Branch: %{BRANCH} %package -n libsmbconf-devel -Summary: Development files for the Samba3 configuration library License: GPL-3.0+ +Summary: Development files for the Samba3 configuration library Group: Development/Libraries/C and C++ Requires: libsmbconf0 = %{version} @@ -940,8 +940,8 @@ Branch: %{BRANCH} %package -n libsmbldap0 -Summary: Samba LDAP protocol helper function library License: GPL-3.0+ +Summary: Samba LDAP protocol helper function library Group: System/Libraries %description -n libsmbldap0 @@ -952,8 +952,8 @@ Branch: %{BRANCH} %package -n libsmbldap-devel -Summary: Development files for the smbldap library License: GPL-3.0+ +Summary: Development files for the smbldap library Group: Development/Libraries/C and C++ Requires: libsmbldap0 = %{version} Requires: libtalloc-devel @@ -971,8 +971,8 @@ Branch: %{BRANCH} %package -n libtevent-util0 -Summary: tevent <-> system status code conversion utility library License: GPL-3.0+ +Summary: tevent <-> system status code conversion utility library Group: System/Libraries %description -n libtevent-util0 @@ -984,8 +984,8 @@ Branch: %{BRANCH} %package -n libtevent-util-devel -Summary: Development files for the Samba tevent utility library 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} @@ -1003,12 +1003,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 @@ -1022,12 +1022,12 @@ Branch: %{BRANCH} %package -n libsmbclient-devel -Summary: Libraries and Header Files to Develop Programs with smbclient Support License: GPL-3.0+ +Summary: Libraries and Header Files to Develop Programs with smbclient Support Group: Development/Libraries/C and C++ BuildRequires: %{pkgconfig_req} -Requires: %{libsmbclient_name} = %{version} Requires: krb5-devel +Requires: %{libsmbclient_name} = %{version} %description -n libsmbclient-devel This package contains the static libraries and header files needed to @@ -1038,8 +1038,8 @@ Branch: %{BRANCH} %package -n %{libnetapi_name} -Summary: Samba netapi Library License: GPL-3.0+ +Summary: Samba netapi Library Group: System/Libraries PreReq: /sbin/ldconfig @@ -1051,8 +1051,8 @@ Branch: %{BRANCH} %package -n libnetapi-devel -Summary: Libraries and Header Files to Develop Programs with netapi Support 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} @@ -1066,12 +1066,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 @@ -1083,8 +1083,8 @@ Branch: %{BRANCH} %package -n libsmbsharemodes-devel -Summary: Libraries and Header Files to Develop Programs with smbsharemodes Support 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} @@ -1098,8 +1098,8 @@ Branch: %{BRANCH} %package -n %{libwbclient_name} -Summary: Samba libwbclient Library License: LGPL-3.0+ +Summary: Samba libwbclient Library Group: System/Libraries PreReq: /sbin/ldconfig @@ -1111,8 +1111,8 @@ Branch: %{BRANCH} %package -n libwbclient-devel -Summary: Libraries and Header Files to Develop Programs with wbclient Support 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} diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index e321be4..ad46d6b 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:e32d4bfa77b3930b0b6b81bd54237d7ef65613b796cf8050a9aa859c05eb71b3 -size 53827 +oid sha256:2335b2c8d99e62bc5c42684d5e233802ca77d48d0cc468cb10bc0a20fec0412c +size 53913