diff --git a/_service b/_service index c4e9814..6015c83 100644 --- a/_service +++ b/_service @@ -1,31 +1,37 @@ - - https://gitlab.suse.de/samba/suse-samba.git/ - git - factory-4-8-stable - @PARENT_TAG@+git.@TAG_OFFSET@.%h - samba(.*) - \1 - samba - .git - + + https://gitlab.suse.de/samba/suse-samba.git/ + git + factory-4-9-stable + @PARENT_TAG@+git.@TAG_OFFSET@.%h + samba(.*) + \1 + samba + .git + - - https://gitlab.suse.de/samba/vendor.git/ - git - master - git.%h - vendor-files - vendor-files - + + samba*.tar + samba-*/packaging/SuSE/samba.changes + samba-*/packaging/SuSE/baselibs.conf + samba-*/packaging/SuSE/samba-client-rpmlintrc + samba-*/packaging/SuSE/samba.spec + - - samba - samba.spec - + + samba + ^samba-([^/]+) + samba.spec + - - *.tar - bz2 - + + samba + ^samba-([^/]+) + samba.changes + + + + *.tar + bz2 + diff --git a/samba-4.8.4+git.37.a7a861d7982.tar.bz2 b/samba-4.8.4+git.37.a7a861d7982.tar.bz2 deleted file mode 100644 index d909594..0000000 --- a/samba-4.8.4+git.37.a7a861d7982.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5be8488d6886dee86704fcf6fe9c98b5c711f7662f191c87becbf2f6fadf1c3c -size 24339786 diff --git a/samba-4.9.1+git.46.ff87d06bace.tar.bz2 b/samba-4.9.1+git.46.ff87d06bace.tar.bz2 new file mode 100644 index 0000000..34eb978 --- /dev/null +++ b/samba-4.9.1+git.46.ff87d06bace.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cb8a7730943aaba9e30d3a483b1142c01136ffac3a95c55c0b256d7f4e1abf0b +size 24608604 diff --git a/samba.changes b/samba.changes index 7433ba8..183bbb6 100644 --- a/samba.changes +++ b/samba.changes @@ -1,9 +1,125 @@ +------------------------------------------------------------------- +Mon Sep 24 09:43:08 UTC 2018 - Samuel Cabrero + +- Update to samba-4.9.1 + + s3: nmbd: Stop nmbd network announce storm; (bso#13620); + + s3-rpcclient: Use spoolss_init_spoolss_UserLevel1 in winspool cmds; + (bso#13597); + + CTDB recovery lock has some race conditions; (bso#13617); + + s3-rpc_client: Advertise Windows 7 client info; (bso#13597); + + ctdb-doc: Remove PIDFILE option from ctdbd_wrapper man page; (bso#13610); + +------------------------------------------------------------------- +Thu Sep 13 19:19:34 UTC 2018 - dmulder@suse.com + +- Tumbleweed doesn't define the sle_version macro, so we must + include a check for suse_version also. Otherwise python3 is + disabled on Tumbleweed. + +------------------------------------------------------------------- +Thu Sep 13 13:28:06 UTC 2018 - Samuel Cabrero + +- Update to samba-4.9.0 + + samba_dnsupdate: Honor 'dns zone scavenging' option, only update if + needed; (bso#13605); + + wafsamba: Fix 'make -j'; (bso#13606); + +------------------------------------------------------------------- +Mon Sep 10 20:46:20 UTC 2018 - dmulder@suse.com + +- Update to samba-4.9.0rc5 + + s3: VFS: vfs_full_audit: Ensure smb_fname_str_do_log() only + returns absolute pathnames; (bso#13565); + + s3: util: Do not take over stderr when there is no log file; (bso#13578); + + Durable Reconnect fails because cookie.allow_reconnect is not + set; (bso#13549); + + krb5-samba: Interdomain trust uses different salt principal; (bso#13539); + + vfs_fruit: Don't unlink the main file; (bso#13441); + + smbd: Fix a memleak in async search ask sharemode; (bso#13602); + + Fix Samba GPO issue when Trust is enabled; (bso#11517); + + samba-tool: Add "virtualKerberosSalt" attribute to + 'user getpassword/syncpasswords'; (bso#13539); + + Fix CTDB configuration issues; (bso#13589); + + ctdbd logs an error until it can successfully connect to + eventd; (bso#13592); + +------------------------------------------------------------------- +Wed Aug 29 15:49:29 UTC 2018 - dmulder@suse.com + +- Update to samba-4.9.0rc4 + + s3: smbd: Ensure get_real_filename() copes with empty + pathnames; (bso#13585); + + samba domain backup online/rename commands force user to specify + password on CLI; (bso#13566); + + wafsamba/samba_abi: Always hide ABI symbols which must be + local; (bso#13579); + + Fix a panic if fruit_access_check detects a locking conflict; (bso#13584); + + Fix memory and resource leaks; (bso#13567); + + python: Fix print in dns_invalid.py; (bso#13580); + + Aliasing issue causes incorrect IPv6 checksum; (bso#13588); + + Fix CTDB configuration issues; (bso#13589); + + s3: vfs: time_audit: fix handling of token_blob in + smb_time_audit_offload_read_recv(); (bso#13568); + ------------------------------------------------------------------- Mon Aug 27 09:34:11 UTC 2018 - vcizek@suse.com - Add missing zlib-devel dependency which was previously pulled in by libopenssl-devel +------------------------------------------------------------------- +Tue Aug 21 13:39:49 UTC 2018 - dmulder@suse.com + +- Update to samba-4.9.0rc3+git.22.3fff23ae36e + + CVE-2018-10858: libsmb: Harden smbc_readdir_internal() against + returns from malicious servers; (bso#13453); + + CVE-2018-1140: ldbsearch '(distinguishedName=abc)' and DNS query + with escapes crashes, ldb: Release LDB 1.3.5 for CVE-2018-1140; (bso#13374); + + CVE-2018-10918: cracknames: Fix DoS (NULL pointer de-ref) when + not servicePrincipalName is set on a user; (bso#13552); + + CVE-2018-10919: acl_read: Fix unauthorized attribute access via + searches; (bso#13434); + + ctdb_mutex_ceph_rados_helper: Set SIGINT signal handler; (bso#13540); + + CVE-2018-1139 libcli/auth: Do not allow ntlmv1 over SMB1 when it + is disabled via "ntlm auth"; (bso#13360); + + s3-tldap: do not install test_tldap; (bso#13529); + + ctdb_mutex_ceph_rados_helper: Fix deadlock via lock renewals; (bso#13540); + + CVE-2018-1140 Add NULL check for ldb_dn_get_casefold() in + ltdb_index_dn_attr(); (bso#13374); + + ctdb-eventd: Fix CID 1438155; (bso#13554); + + Fix CIDs 1438243, (Unchecked return value) 1438244 + (Unsigned compared against 0), 1438245 (Dereference before null check) and + 1438246 (Unchecked return value); (bso#13553); + + ctdb: Fix a cut&paste error; (bso#13554); + + systemd: Only start smb when network interfaces are up; (bso#13559); + + Fix quotas don't work with SMB2; (bso#13553); + + s3/smbd: Ensure quota code is only called when quota support + detected; (bso#13563); + + s3/libsmb: Explicitly set delete_on_close token for rmdir; (bso#13204); + + s3:waf: Install eventlogadm to /usr/sbin; (bso#13561); + + Shorten description in vfs_linux_xfs_sgid manual; (bso#13562); + +------------------------------------------------------------------- +Mon Aug 20 15:03:01 MDT 2018 - dmulder@suse.com + +- Update to samba-4.9.0rc2+git.21.a1069afb007 + + s3: smbd: Using "sendfile = yes" with SMB2 can cause CPU spin; (bso#13537); + + s3: smbd: Fix path check in smbd_smb2_create_durable_lease_check(); + (bso#13535); + + samba-tool trust: Support discovery via netr_GetDcName; (bso#13538); + + s4-dsdb: Only build dsdb Python modules for AD DC; (bso#13542); + + Fix portability issues on freebsd; (bso#13520); + + DNS wildcard search does not handle multiple labels correctly; (bso#13536); + + samba-tool domain trust: Fix trust compatibility to Windows + Server 1709 and FreeIPA; (bso#13308); + + Fix portability issues on freebsd; (bso#13520); + + ctdb-protocol: Fix CTDB compilation issues; (bso#13545); + + ctdb-docs: Replace obsolete reference to CTDB_DEBUG_HUNG_SCRIPT + option; (bso#13546); + + ctdb-doc: Provide an example script for migrating old + configuration; (bso#13550); + + ctdb-event: Implement event tool "script list" command; (bso#13551); + ------------------------------------------------------------------- Tue Aug 14 13:06:03 UTC 2018 - nopower@suse.com diff --git a/samba.spec b/samba.spec index 60c7da6..114cba9 100644 --- a/samba.spec +++ b/samba.spec @@ -1,7 +1,7 @@ # # spec file for package samba # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,7 +15,10 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%if 0%{?sle_version} >= 150000 + +%{!?py3_soflags: %global py3_soflags cpython-%{python3_version_nodots}m} +%{!?py3_soflags_dash: %global py3_soflags_dash %(echo %{py3_soflags} | sed "s/_/-/g")} +%if 0%{?sle_version} >= 150000 || 0%{?suse_version} >= 1500 %define with_python3 1 %else %define with_python3 0 @@ -45,12 +48,11 @@ %define build_ceph 1 %endif %endif -%define vendor_files_git_vers git.9335cd1 %define talloc_version 2.1.10 %define tevent_version 0.9.34 %define tdb_version 1.3.15 -%define ldb_version 1.2.2 +%define ldb_version 1.4.2 %global with_mitkrb5 1 %global with_dc 0 @@ -117,12 +119,12 @@ BuildRequires: libldb-devel >= %{ldb_version} BuildRequires: libtalloc-devel >= %{talloc_version} BuildRequires: libtdb-devel >= %{tdb_version} BuildRequires: libtevent-devel >= %{tevent_version} -BuildRequires: python-ldb-devel +BuildRequires: python-ldb-devel >= %{ldb_version} BuildRequires: python-talloc-devel BuildRequires: python-tdb BuildRequires: python-tevent %if %{with_python3} -BuildRequires: python3-ldb-devel +BuildRequires: python3-ldb-devel >= %{ldb_version} BuildRequires: python3-talloc-devel BuildRequires: python3-tdb BuildRequires: python3-tevent @@ -137,8 +139,8 @@ BuildRequires: libxslt-tools %if 0%{?suse_version} > 1220 BuildRequires: libavahi-devel # To only BuildRequire systemd-rpm-macros leads to broken binaries -BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(libsystemd) +BuildRequires: pkgconfig(systemd) %endif %if 0%{?build_ctdb_pmda} BuildRequires: libpcp-devel @@ -148,9 +150,12 @@ BuildRequires: libcephfs-devel BuildRequires: librados-devel %endif %if %{with_dc} +BuildRequires: gpgme-devel BuildRequires: krb5-devel >= 1.15.1 BuildRequires: krb5-server >= 1.15.1 BuildRequires: libgnutls-devel >= 3.4.7 +BuildRequires: libjansson-devel +BuildRequires: python-gpgme %else BuildRequires: krb5-devel %endif @@ -163,7 +168,7 @@ BuildRequires: krb5-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -Version: 4.8.4+git.37.a7a861d7982 +Version: 4.9.1+git.46.ff87d06bace Release: 0 Url: https://www.samba.org/ Obsoletes: samba-32bit < %{version} @@ -171,10 +176,9 @@ Obsoletes: samba-gplv3 < %{version} Recommends: cron Recommends: logrotate Summary: A SMB/CIFS File, Print, and Authentication Server -License: GPL-3.0+ +License: GPL-3.0-or-later Group: Productivity/Networking/Samba Source: samba-%{version}.tar.bz2 -Source1: vendor-files-%{vendor_files_git_vers}.tar.bz2 Source4: baselibs.conf Source100: samba-client-rpmlintrc Requires: /usr/bin/getent @@ -247,7 +251,7 @@ how to. %package client Summary: Samba Client Utilities -License: GPL-3.0+ +License: GPL-3.0-or-later Group: Productivity/Networking/Samba Provides: smbfs Obsoletes: samba-client-gplv2 < %{version} @@ -281,7 +285,7 @@ how to. %package core-devel Summary: Development files shared by Samba subpackages -License: GPL-3.0+ +License: GPL-3.0-or-later Group: Development/Libraries/C and C++ Conflicts: samba-devel @@ -291,7 +295,7 @@ develop programs which make use of Samba. %package doc Summary: Samba Documentation -License: GPL-3.0+ +License: GPL-3.0-or-later Group: Documentation/Other Requires: coreutils Requires: findutils @@ -307,7 +311,7 @@ the man pages. %package libs Summary: Samba libraries -License: GPL-3.0+ +License: GPL-3.0-or-later Group: Development/Libraries/C and C++ Requires: /sbin/ldconfig Requires: krb5 @@ -321,10 +325,10 @@ link against the SMB, RPC and other protocols provided by the Samba suite. %package pidl Summary: Perl IDL compiler -License: GPL-3.0+ +License: GPL-3.0-or-later Group: Development/Tools -Requires: perl-base Requires: perl-Parse-Yapp +Requires: perl-base Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) %description pidl @@ -333,7 +337,7 @@ and Wireshark to parse IDL and similar protocols %package python Summary: Samba Python libraries -License: GPL-3.0+ +License: GPL-3.0-or-later Group: Development/Libraries/Python %if %{with_python} Requires: %{name} = %{version} @@ -349,7 +353,7 @@ that use SMB, RPC and other Samba provided protocols in Python programs. %package python3 Summary: Samba Python3 libraries -License: GPL-3.0+ +License: GPL-3.0-or-later Group: Development/Libraries/Python Requires: %{name} = %{version} Requires: python3-ldb @@ -363,7 +367,7 @@ that use SMB, RPC and other Samba provided protocols in Python3 programs. %package test Summary: Testing tools for Samba servers and clients -License: GPL-3.0+ +License: GPL-3.0-or-later Group: Applications/System Requires: /sbin/ldconfig Requires: samba = %{version} @@ -377,7 +381,7 @@ packages of Samba. %package winbind Summary: Winbind Daemon and Tool -License: GPL-3.0+ +License: GPL-3.0-or-later Group: Productivity/Networking/Samba Obsoletes: samba-gplv3-winbind < %{version} Provides: samba-client:/usr/sbin/winbindd @@ -400,7 +404,7 @@ This is the winbind-daemon and the wbinfo-tool. %package -n ctdb Summary: Clustered TDB -License: GPL-3.0+ +License: GPL-3.0-or-later Group: System/Daemons Requires(pre): %{?fillup_prereq} %if 0%{?suse_version} > 1220 @@ -422,7 +426,7 @@ ctdb is the clustered database used by Samba %package -n ctdb-pcp-pmda Summary: Performance Co-Pilot (PCP) monitoring agent -License: GPL-3.0+ +License: GPL-3.0-or-later Group: System/Monitoring %description -n ctdb-pcp-pmda @@ -432,7 +436,7 @@ one or more cluster nodes. %package -n ctdb-tests Summary: CTDB clustered database test suite -License: GPL-3.0+ +License: GPL-3.0-or-later Group: Development/Tools %description -n ctdb-tests @@ -441,7 +445,7 @@ Test suite for clustered database (CTDB). %package -n libdcerpc-binding0 Summary: Some samba library -License: GPL-3.0+ +License: GPL-3.0-or-later Group: System/Libraries %description -n libdcerpc-binding0 @@ -450,7 +454,7 @@ strings. %package -n libdcerpc-samr0 Summary: Security Account Manager (SAM) Remote Protocol library -License: GPL-3.0+ +License: GPL-3.0-or-later Group: System/Libraries %description -n libdcerpc-samr0 @@ -459,7 +463,7 @@ This subpackage contains NDR marshallers for the SAMR protocol. %package -n libdcerpc-samr-devel Summary: Development files for the SAMR protocol library -License: GPL-3.0+ +License: GPL-3.0-or-later Group: Development/Libraries/C and C++ Requires: libdcerpc-samr0 = %{version} @@ -471,7 +475,7 @@ applications that want to make use of libdcerpc-samr. %package -n libdcerpc0 Summary: Distributed Computing Environment Remote Procedure Calls library -License: GPL-3.0+ +License: GPL-3.0-or-later Group: System/Libraries %description -n libdcerpc0 @@ -486,7 +490,7 @@ network code. %package -n libdcerpc-devel Summary: Development files for the DCE/RPC library -License: GPL-3.0+ +License: GPL-3.0-or-later Group: Development/Libraries/C and C++ Requires: libdcerpc-binding0 = %{version} Requires: libdcerpc0 = %{version} @@ -507,7 +511,7 @@ applications that want to make use of libdcerpc. %package -n libndr-krb5pac0 Summary: NDR marshallers for the KRB5 PAC formats -License: GPL-3.0+ +License: GPL-3.0-or-later Group: System/Libraries %description -n libndr-krb5pac0 @@ -517,7 +521,7 @@ Attribute Certificate Data Structure (PAC). %package -n libndr-krb5pac-devel Summary: Development files for the ndr-krb5pac library -License: GPL-3.0+ +License: GPL-3.0-or-later Group: Development/Libraries/C and C++ Requires: libndr-krb5pac0 = %{version} Requires: samba-core-devel = %{version} @@ -530,7 +534,7 @@ applications that want to make use of libndr-krb5pac. %package -n libndr-nbt0 Summary: NDR marshallers for NBT formats -License: GPL-3.0+ +License: GPL-3.0-or-later Group: System/Libraries %description -n libndr-nbt0 @@ -540,7 +544,7 @@ This subpackage contains NDR marshallers for the NetBIOS protocol. %package -n libndr-nbt-devel Summary: Development files for the ndr-nbt library -License: GPL-3.0+ +License: GPL-3.0-or-later Group: Development/Libraries/C and C++ Requires: libndr-nbt0 = %{version} Requires: samba-core-devel = %{version} @@ -553,7 +557,7 @@ applications that want to make use of libndr-nbt. %package -n libndr-standard0 Summary: NDR marshallers for the standard set of DCE/RPC interfaces -License: GPL-3.0+ +License: GPL-3.0-or-later Group: System/Libraries %description -n libndr-standard0 @@ -564,7 +568,7 @@ DCE/RPC interfaces found on Windows and Samba servers. %package -n libndr-standard-devel Summary: Development files for the libndr-standard library -License: GPL-3.0+ +License: GPL-3.0-or-later Group: Development/Libraries/C and C++ Requires: libndr-standard0 = %{version} Requires: samba-core-devel = %{version} @@ -577,7 +581,7 @@ applications that want to make use of libndr-standard. %package -n libndr0 Summary: Network Data Representation library -License: GPL-3.0+ +License: GPL-3.0-or-later Group: System/Libraries %description -n libndr0 @@ -588,7 +592,7 @@ presentation layer in the OSI model. %package -n libndr-devel Summary: Development files for the Network Data Representation library -License: GPL-3.0+ +License: GPL-3.0-or-later Group: Development/Libraries/C and C++ Requires: libndr0 = %{version} Requires: samba-core-devel = %{version} @@ -604,7 +608,7 @@ applications that want to make use of libndr. %package -n libsamba-credentials0 Summary: Samba credential management library -License: GPL-3.0+ +License: GPL-3.0-or-later Group: System/Libraries %description -n libsamba-credentials0 @@ -613,7 +617,7 @@ This subpackage contains libraries for credentials management. %package -n libsamba-credentials-devel Summary: Development files for the Samba credential management library -License: GPL-3.0+ +License: GPL-3.0-or-later Group: Development/Libraries/C and C++ Requires: libsamba-credentials0 = %{version} @@ -625,7 +629,7 @@ applications that want to make use of libsamba-credentials. %package -n libsamba-errors0 Summary: Samba errors handling library -License: GPL-3.0+ +License: GPL-3.0-or-later Group: System/Libraries %description -n libsamba-errors0 @@ -634,7 +638,7 @@ This subpackage contains libraries to handle and translate NT error codes. %package -n libsamba-errors-devel Summary: Development files for the Samba errors handling library -License: GPL-3.0+ +License: GPL-3.0-or-later Group: Development/Libraries/C and C++ Requires: libsamba-errors0 = %{version} @@ -646,7 +650,7 @@ applications that want to make use of libsamba-errors. %package -n libsamba-hostconfig0 Summary: Host-wide Samba configuration library -License: GPL-3.0+ +License: GPL-3.0-or-later Group: System/Libraries %description -n libsamba-hostconfig0 @@ -656,7 +660,7 @@ configuration files. %package -n libsamba-hostconfig-devel Summary: Development files for the host-wide Samba configuration library -License: GPL-3.0+ +License: GPL-3.0-or-later Group: Development/Libraries/C and C++ Requires: libsamba-hostconfig0 = %{version} Requires: samba-core-devel = %{version} @@ -669,7 +673,7 @@ applications that want to make use of libsamba-hostconfig. %package -n libsamba-passdb0 Summary: Samba3 password database library -License: GPL-3.0+ +License: GPL-3.0-or-later Group: System/Libraries Obsoletes: libpdb0 < %{version} @@ -679,7 +683,7 @@ This subpackage contains libraries to interface the password database. %package -n libsamba-passdb-devel Summary: Development files for the Samba3 password database library -License: GPL-3.0+ +License: GPL-3.0-or-later Group: Development/Libraries/C and C++ Provides: libpdb-devel Obsoletes: libpdb-devel @@ -694,7 +698,7 @@ applications that want to make use of libsamba-passdb. %package -n libsamba-policy0 Summary: Active Directory Group Policy library -License: GPL-3.0+ +License: GPL-3.0-or-later Group: System/Libraries %description -n libsamba-policy0 @@ -704,7 +708,7 @@ This subpackage contains the library for policy management. %package -n libsamba-policy-devel Summary: Development files for the Samba AD Group Policy library -License: GPL-3.0+ +License: GPL-3.0-or-later Group: Development/Libraries/C and C++ Requires: libsamba-policy0 = %{version} @@ -715,7 +719,7 @@ applications that want to make use of libsamba-policy. %package -n libsamba-util0 Summary: Samba utility function library -License: GPL-3.0+ +License: GPL-3.0-or-later Group: System/Libraries %description -n libsamba-util0 @@ -726,7 +730,7 @@ within Samba. %package -n libsamba-util-devel Summary: Development files for the Samba utility function library -License: GPL-3.0+ +License: GPL-3.0-or-later Group: Development/Libraries/C and C++ Requires: libsamba-util0 = %{version} Requires: samba-core-devel = %{version} @@ -739,7 +743,7 @@ applications that want to make use of libsamba-util. %package -n libsamdb0 Summary: Samba's SAM database library -License: GPL-3.0+ +License: GPL-3.0-or-later Group: System/Libraries %description -n libsamdb0 @@ -749,7 +753,7 @@ This subpackage contains libraries for accessing the SAM database. %package -n libsamdb-devel Summary: Development files for Samba's SAM database library -License: GPL-3.0+ +License: GPL-3.0-or-later Group: Development/Libraries/C and C++ Requires: libsamdb0 = %{version} @@ -761,7 +765,7 @@ applications that want to make use of libsamdb. %package -n libsmbconf0 Summary: Samba3 configuration library -License: GPL-3.0+ +License: GPL-3.0-or-later Group: System/Libraries %description -n libsmbconf0 @@ -772,7 +776,7 @@ Samba configuration. %package -n libsmbconf-devel Summary: Development files for the Samba3 configuration library -License: GPL-3.0+ +License: GPL-3.0-or-later Group: Development/Libraries/C and C++ Requires: libsmbconf0 = %{version} @@ -787,7 +791,7 @@ applications that want to make use of libsmbconf. %package -n libsmbldap2 Summary: Samba LDAP protocol helper function library -License: GPL-3.0+ +License: GPL-3.0-or-later Group: System/Libraries %description -n libsmbldap2 @@ -797,7 +801,7 @@ libsmbldap contains LDAP protocol helper functions for Samba. %package -n libsmbldap-devel Summary: Development files for the smbldap library -License: GPL-3.0+ +License: GPL-3.0-or-later Group: Development/Libraries/C and C++ Requires: libsmbldap2 = %{version} Requires: libtalloc-devel @@ -814,7 +818,7 @@ applications that want to make use of libsmbldap. %package -n libtevent-util0 Summary: Samba tevent <-> system status code conversion utility library -License: GPL-3.0+ +License: GPL-3.0-or-later Group: System/Libraries %description -n libtevent-util0 @@ -825,7 +829,7 @@ codes to platform-specific (errno, NTSTATUS, WERROR) ones. %package -n libtevent-util-devel Summary: Development files for the Samba tevent utility library -License: GPL-3.0+ +License: GPL-3.0-or-later Group: Development/Libraries/C and C++ Requires: libtevent-devel Requires: libtevent-util0 = %{version} @@ -843,7 +847,7 @@ applications that want to make use of libtevent-util. %package -n %{libsmbclient_name} Obsoletes: libsmbclient < %{version} Summary: Samba Client Library -License: GPL-3.0+ +License: GPL-3.0-or-later Group: System/Libraries Requires: /sbin/ldconfig @@ -856,7 +860,7 @@ libsmbclient is provided by the libsmbclient0 package. %package -n libsmbclient-devel Summary: Libraries and Header Files to Develop Programs with smbclient Support -License: GPL-3.0+ +License: GPL-3.0-or-later Group: Development/Libraries/C and C++ BuildRequires: %{pkgconfig_req} Requires: %{libsmbclient_name} = %{version} @@ -870,7 +874,7 @@ develop programs which make use of the smbclient programming interface. %package -n %{libnetapi_name} Summary: Samba netapi Library -License: GPL-3.0+ +License: GPL-3.0-or-later Group: System/Libraries Requires: /sbin/ldconfig @@ -881,7 +885,7 @@ This package includes the netapi library. %package -n libnetapi-devel Summary: Libraries and Header Files to Develop Programs with netapi Support -License: GPL-3.0+ +License: GPL-3.0-or-later Group: Development/Libraries/C and C++ BuildRequires: %{pkgconfig_req} Requires: %{libnetapi_name} = %{version} @@ -894,7 +898,7 @@ develop programs which make use of the netapi programming interface. %package -n %{libwbclient_name} Summary: Samba libwbclient Library -License: LGPL-3.0+ +License: LGPL-3.0-or-later Group: System/Libraries Requires: /sbin/ldconfig @@ -905,7 +909,7 @@ This package includes the wbclient library. %package -n libwbclient-devel Summary: Libraries and Header Files to Develop Programs with wbclient Support -License: LGPL-3.0+ +License: LGPL-3.0-or-later Group: Development/Libraries/C and C++ BuildRequires: %{pkgconfig_req} Requires: %{libwbclient_name} = %{version} @@ -916,7 +920,7 @@ develop programs which make use of the wbclient programming interface. %package ceph Summary: Ceph specific add-ons for Samba -License: GPL-3.0+ +License: GPL-3.0-or-later Group: Productivity/Networking/Samba Requires: samba = %{version} @@ -927,7 +931,7 @@ that RADOS locks can be used for CTDB split-brain avoidance. %package kdc Summary: Samba MIT KDC -License: GPL-3.0+ +License: GPL-3.0-or-later Group: Productivity/Networking/Samba Requires: samba = %{version} Requires: samba-dsdb-modules = %{version} @@ -941,7 +945,7 @@ This package contains the KDC %package dsdb-modules Summary: Samba LDB modules -License: GPL-3.0+ +License: GPL-3.0-or-later Group: Productivity/Networking/Samba Requires: libldb1 >= %{ldb_version} @@ -952,8 +956,7 @@ LDB library. %prep %setup -n samba-%{version} -q # vendor-files (config, scripts, tools) -%setup -T -D -a 1 -n samba-%{version} -q -install -m 0644 -p vendor-files-%{vendor_files_git_vers}/docu/rfc3454.txt source4/heimdal/lib/wind/ +install -m 0644 -p packaging/SuSE/docu/rfc3454.txt source4/heimdal/lib/wind/ # Create and add vendor suffix if test "%{_project}" != "openSUSE:Factory"; then vendor_tag_release=$( grep -m 1 ^Release: %{_sourcedir}/samba.spec | \ @@ -1040,6 +1043,8 @@ CONFIGURE_OPTIONS="\ %endif %if ! %{with_dc} --without-ad-dc \ + --without-json-audit \ + --without-gpgme \ %endif %if ! %{with_python} --disable-python \ @@ -1117,7 +1122,7 @@ find %{buildroot} -name ".py" -delete %endif # CTDB -install -m 0644 vendor-files-%{vendor_files_git_vers}/config/sysconfig.ctdb %{buildroot}/%{_fillupdir} +install -m 0644 packaging/SuSE/config/sysconfig.ctdb %{buildroot}/%{_fillupdir} %if 0%{?suse_version} > 1220 install -m 0755 ctdb/config/ctdb.service %{buildroot}%{_unitdir}/ctdb.service ln -s service %{buildroot}/%{_sbindir}/rcctdb @@ -1135,6 +1140,8 @@ done touch %{buildroot}/%{_sysconfdir}/ctdb/nodes # sudo can be used by statd-callout, but is not needed rm %{buildroot}/%{_sysconfdir}/sudoers.d/ctdb +# install the config_migrate.sh script to move to new 4.9+ ctdb configuration +install -m 0744 ctdb/doc/examples/config_migrate.sh %{buildroot}/%{_sysconfdir}/ctdb/config_migrate.sh # utility scripts scripts="creategroup mksmbpasswd.sh" @@ -1143,12 +1150,12 @@ for i in $scripts; do install -m 0755 "source3/script/${i}" examples/scripts/${i} done # configuration files -pushd vendor-files-%{vendor_files_git_vers} +pushd packaging/SuSE/ echo "# smb.conf is the main Samba configuration file. You find a full commented" >config/smb.conf echo "# version at %{DOCDIR}/examples/smb.conf.%{VENDOR} if the" >>config/smb.conf echo "# samba-doc package is installed." >>config/smb.conf grep -v "\(^#\|^;\|^$\)" config/smb.conf.vendor >>config/smb.conf -install -p -m 0644 config/smb.conf.vendor ../examples/smb.conf.%{VENDOR} +install -p -m 0644 config/smb.conf.vendor ../../examples/smb.conf.%{VENDOR} for file in smb.conf lmhosts smbusers smbpasswd smbusers; do install -m 0644 "config/${file}" %{buildroot}/%{CONFIGDIR}/${file} done @@ -1190,7 +1197,7 @@ done ln -s service %{buildroot}/%{_sbindir}/rcsamba-ad-dc %endif install -m 0644 systemd/sysconfig.* %{buildroot}%{_fillupdir} -install -m 0644 -p ../packaging/systemd/samba.conf.tmp %{buildroot}/%{_tmpfilesdir}/samba.conf +install -m 0644 -p ../systemd/samba.conf.tmp %{buildroot}/%{_tmpfilesdir}/samba.conf %else for script in ${startScripts}; do install -m 0755 "init/${script}${scriptSuffix}" \ @@ -1255,9 +1262,9 @@ done install -m 0644 docu/README.SUSE %{buildroot}/%{DOCDIR}/ # SUSEhelp files install -m 0644 docu/Samba.desktop %{buildroot}/%{_datadir}/susehelp/meta/Administration/System/Samba.desktop -install -d -m 0755 -p ../docs/htmldocs -install -m 0644 docu/manpages.html ../docs/htmldocs/manpages.html -install -m 0644 ../docs-xml/output/htmldocs/manpages/* ../docs/htmldocs/ +install -d -m 0755 -p ../../docs/htmldocs +install -m 0644 docu/manpages.html ../../docs/htmldocs/manpages.html +install -m 0644 ../../docs-xml/output/htmldocs/manpages/* ../../docs/htmldocs/ popd # winbind stuff install -m 0644 examples/pam_winbind/pam_winbind.conf %{buildroot}/%{_sysconfdir}/security/pam_winbind.conf @@ -1588,6 +1595,30 @@ if [ -e %{_sysconfdir}/sysconfig/ctdb ] ; then grep CTDB_LOGGING %{_sysconfdir}/sysconfig/ctdb >/dev/null 2>&1 || sed -i s/CTDB_LOGFILE=/CTDB_LOGGING=file:/g %{_sysconfdir}/sysconfig/ctdb fi +if [ ! -f %{_sysconfdir}/ctdb/config_migrate.sh ] ; then + echo "* CTDB Configuration has been redesigned" + echo "" + echo " - Daemon and tool options are now specified in a new ctdb.conf" + echo " Samba-style configuration file. For details, see ctdb.conf(5)." + echo "" + echo " - The event script configuration is no longer specified in the top-level" + echo " configuration file. It can now be specified per event script." + echo " For example, the configuration options for the 50.samba event script" + echo " can be placed alongside the event script in a file called" + echo " 50.samba.options. Script options can also be specified in a new" + echo " script.options file. For details, see ctdb-script.options(5)." + echo "" + echo " - Options that affect CTDB startup should be configured in the" + echo " distribution-specific configuration file. For details, see" + echo " ctdb.sysconfig(5)." + echo "" + echo " - Tunable settings are now loaded from ctdb.tunables. Using" + echo " CTDB_SET_TunableVariable= in the main configuration file is" + echo " no longer supported. For details, see ctdb-tunables(7)." + echo "" + echo " An example script to migrate legacy configurations to the new" + echo " style is available in %{_sysconfdir}/ctdb/config_migrate.sh." +fi %preun -n ctdb %if 0%{?suse_version} > 1220 @@ -1701,7 +1732,7 @@ exit 0 %endif %{_bindir}/cifsdd %{_bindir}/dbwrap_tool -%{_bindir}/eventlogadm +%{_sbindir}/eventlogadm %{_bindir}/findsmb %{_bindir}/net %{_bindir}/nmblookup @@ -1872,7 +1903,9 @@ exit 0 %{_libdir}/samba/libdnsserver-common-samba4.so %endif %{_libdir}/samba/libdsdb-module-samba4.so +%if %{with_dc} %{_libdir}/samba/libdsdb-garbage-collect-tombstones-samba4.so +%endif %{_libdir}/samba/libevents-samba4.so %{_libdir}/samba/libflag-mapping-samba4.so %{_libdir}/samba/libgenrand-samba4.so @@ -1914,6 +1947,10 @@ exit 0 %{_libdir}/samba/libsamba-python-samba4.so %{_libdir}/samba/libsamba-net-samba4.so %endif +%if %{with_python3} +%{_libdir}/samba/libsamba-net.%{py3_soflags_dash}-samba4.so +%{_libdir}/samba/libsamba-python.%{py3_soflags_dash}-samba4.so +%endif %{_libdir}/samba/libsamdb-common-samba4.so %{_libdir}/samba/libsecrets3-samba4.so %{_libdir}/samba/libserver-id-db-samba4.so @@ -1941,6 +1978,9 @@ exit 0 %{_libdir}/samba/libxattr-tdb-samba4.so %{_libdir}/samba/libcmocka-samba4.so %{_libdir}/samba/libcommon-auth-samba4.so +%if %{with_dc} +%{_libdir}/samba/libscavenge-dns-records-samba4.so +%endif %dir %{_libdir}/samba/pdb %{_libdir}/samba/pdb/ldapsam.so %{_libdir}/samba/pdb/smbpasswd.so @@ -2017,18 +2057,20 @@ exit 0 %{_bindir}/wbinfo %{_sbindir}/rcwinbind %{_sbindir}/winbindd -%{_sbindir}/samba_gpoupdate +%{_sbindir}/samba-gpupdate /%{_lib}/security/pam_winbind.so %{_libdir}/libnss_winbind.so.* %{_libdir}/samba/idmap %{_libdir}/samba/nss_info -%{_libdir}/winbind_krb5_locator.so -%{_libdir}/winbind-krb5-localauth.so +%dir %{_libdir}/samba/krb5 +%{_libdir}/samba/krb5/winbind_krb5_locator.so +%{_libdir}/samba/krb5/winbind_krb5_localauth.so %{_mandir}/man1/ntlm_auth.1.* %{_mandir}/man1/wbinfo.1.* -%{_mandir}/man7/winbind_krb5_locator.7.* +%{_mandir}/man8/winbind_krb5_localauth.8.* +%{_mandir}/man8/winbind_krb5_locator.8.* %{_mandir}/man5/pam_winbind.conf.5.* -%{_mandir}/man8/samba_gpoupdate.8.gz +%{_mandir}/man8/samba-gpupdate.8.gz %{_mandir}/man8/idmap_ad.8.* %{_mandir}/man8/idmap_autorid.8.* %{_mandir}/man8/idmap_hash.8.* @@ -2068,7 +2110,6 @@ exit 0 %{_sysconfdir}/ctdb/debug-hung-script.sh %{_sysconfdir}/ctdb/debug_locks.sh %{_sysconfdir}/ctdb/functions -%{_sysconfdir}/ctdb/gcore_trace.sh %{_sysconfdir}/ctdb/nfs-linux-kernel-callout %ghost %{_sysconfdir}/ctdb/nodes %{_sysconfdir}/ctdb/statd-callout @@ -2080,27 +2121,28 @@ exit 0 %else %attr(755,root,root) %{INITDIR}/ctdb %endif -%dir %{_sysconfdir}/ctdb/events.d -%config %{_sysconfdir}/ctdb/events.d/00.ctdb -%config %{_sysconfdir}/ctdb/events.d/01.reclock -%config %{_sysconfdir}/ctdb/events.d/05.system -%config %{_sysconfdir}/ctdb/events.d/06.nfs -%config %{_sysconfdir}/ctdb/events.d/10.external -%config %{_sysconfdir}/ctdb/events.d/10.interface -%config %{_sysconfdir}/ctdb/events.d/11.natgw -%config %{_sysconfdir}/ctdb/events.d/11.routing -%config %{_sysconfdir}/ctdb/events.d/13.per_ip_routing -%config %{_sysconfdir}/ctdb/events.d/20.multipathd -%config %{_sysconfdir}/ctdb/events.d/31.clamd -%config %{_sysconfdir}/ctdb/events.d/40.vsftpd -%config %{_sysconfdir}/ctdb/events.d/41.httpd -%config %{_sysconfdir}/ctdb/events.d/50.samba -%config %{_sysconfdir}/ctdb/events.d/60.nfs -%config %{_sysconfdir}/ctdb/events.d/70.iscsi -%config %{_sysconfdir}/ctdb/events.d/91.lvs -%config %{_sysconfdir}/ctdb/events.d/49.winbind -%config %{_sysconfdir}/ctdb/events.d/99.timeout -%{_sysconfdir}/ctdb/events.d/README +%dir %{_datadir}/ctdb/events +%dir %{_datadir}/ctdb/events/legacy +%{_datadir}/ctdb/events/legacy/00.ctdb.script +%{_datadir}/ctdb/events/legacy/01.reclock.script +%{_datadir}/ctdb/events/legacy/05.system.script +%{_datadir}/ctdb/events/legacy/06.nfs.script +%{_datadir}/ctdb/events/legacy/10.interface.script +%{_datadir}/ctdb/events/legacy/11.natgw.script +%{_datadir}/ctdb/events/legacy/11.routing.script +%{_datadir}/ctdb/events/legacy/13.per_ip_routing.script +%{_datadir}/ctdb/events/legacy/20.multipathd.script +%{_datadir}/ctdb/events/legacy/31.clamd.script +%{_datadir}/ctdb/events/legacy/40.vsftpd.script +%{_datadir}/ctdb/events/legacy/41.httpd.script +%{_datadir}/ctdb/events/legacy/49.winbind.script +%{_datadir}/ctdb/events/legacy/50.samba.script +%{_datadir}/ctdb/events/legacy/60.nfs.script +%{_datadir}/ctdb/events/legacy/70.iscsi.script +%{_datadir}/ctdb/events/legacy/91.lvs.script +%dir %{_sysconfdir}/ctdb/events +%dir %{_sysconfdir}/ctdb/events/notification +%{_sysconfdir}/ctdb/events/notification/README %dir %{_sysconfdir}/ctdb/nfs-checks.d %config %{_sysconfdir}/ctdb/nfs-checks.d/00.portmapper.check %config %{_sysconfdir}/ctdb/nfs-checks.d/10.status.check @@ -2109,8 +2151,6 @@ exit 0 %config %{_sysconfdir}/ctdb/nfs-checks.d/40.mountd.check %config %{_sysconfdir}/ctdb/nfs-checks.d/50.rquotad.check %{_sysconfdir}/ctdb/nfs-checks.d/README -%dir %{_sysconfdir}/ctdb/notify.d -%{_sysconfdir}/ctdb/notify.d/README %{_sbindir}/ctdbd %{_sbindir}/ctdbd_wrapper %{_sbindir}/rcctdb @@ -2122,8 +2162,11 @@ exit 0 %{_bindir}/onnode %{_bindir}/ping_pong %dir %{_libdir}/ctdb -%{_libdir}/ctdb/ctdb_event -%{_libdir}/ctdb/ctdb_eventd +%{_libdir}/ctdb/ctdb-config +%{_libdir}/samba/libctdb-event-client-samba4.so +%{_libdir}/ctdb/ctdb-event +%{_libdir}/ctdb/ctdb-eventd +%{_libdir}/ctdb/ctdb-path %{_libdir}/ctdb/ctdb_lock_helper %{_libdir}/ctdb/ctdb_natgw %{_libdir}/ctdb/ctdb_recovery_helper @@ -2147,11 +2190,14 @@ exit 0 %{_mandir}/man1/ltdbtool.1.gz %{_mandir}/man1/onnode.1.gz %{_mandir}/man1/ping_pong.1.gz -%{_mandir}/man5/ctdbd.conf.5.* +%{_mandir}/man5/ctdb.conf.5.* +%{_mandir}/man5/ctdb-script.options.5.* +%{_mandir}/man5/ctdb.sysconfig.5.* %{_mandir}/man7/ctdb-statistics.7.* %{_mandir}/man7/ctdb-tunables.7.* %{_mandir}/man7/ctdb.7.* %doc %{_defaultdocdir}/ctdb +%{_sysconfdir}/ctdb/config_migrate.sh %if 0%{?build_ctdb_pmda} %files -n ctdb-pcp-pmda @@ -2323,13 +2369,14 @@ exit 0 %_includedir/samba-4.0/passdb.h %_libdir/libsamba-passdb.so - - %files -n libsamba-policy0 %defattr(-,root,root) %if %{with_python} %_libdir/libsamba-policy.so.0* %endif +%if %{with_python3} +%_libdir/libsamba-policy.%{py3_soflags_dash}.so.0* +%endif %files -n libsamba-policy-devel %defattr(-,root,root) @@ -2339,6 +2386,10 @@ exit 0 %_libdir/libsamba-policy.so %_libdir/pkgconfig/samba-policy.pc %endif +%if %{with_python3} +%_libdir/libsamba-policy.%{py3_soflags_dash}.so +%_libdir/pkgconfig/samba-policy.%{py3_soflags}.pc +%endif %files -n libsamba-util0 %defattr(-,root,root) @@ -2619,6 +2670,8 @@ exit 0 %{_libdir}/samba/ldb/update_keytab.so %{_libdir}/samba/ldb/vlv.so %{_libdir}/samba/ldb/wins_ldb.so +%{_libdir}/samba/ldb/audit_log.so +%{_libdir}/samba/ldb/group_audit_log.so %endif %changelog diff --git a/vendor-files-git.9335cd1.tar.bz2 b/vendor-files-git.9335cd1.tar.bz2 deleted file mode 100644 index 527ed07..0000000 --- a/vendor-files-git.9335cd1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c80c00e995cd1c7dcf26d67bf2bb94a7eca45d75c5648fd7170550b34e88ad60 -size 54209