From ab58c6daefdb5339126651e7904f89d074e061e05f8132273403aa7e14040a28 Mon Sep 17 00:00:00 2001 From: Samuel Cabrero Date: Mon, 22 Apr 2019 17:11:02 +0000 Subject: [PATCH] Accepting request 696786 from network:samba:TESTING - Update to samba-4.10.2: + CVE-2019-3870 (World writable files in Samba AD DC private/ dir); (bso#13834). + CVE-2019-3880 (Save registry file outside share as unprivileged user); (bso#13851). + py/kcc_utils: py2.6 compatibility; (bso#13837). + libcli: permit larger values of DataLength in SMB2_ENCRYPTION_CAPABILITIES of negotiate response; (bso#13869). + regfio: Improve handling of malformed registry hive files; (bso#13840). + ctdb-version: Simplify version string usage; (bso#13789). + lib: Make fd_load work for non-regular files; (bso#13859). + dbcheck: in the middle of the tombstone garbage collection causes replication failures, dbcheck: add --selftest-check-expired-tombstones cmdline option; (bso#13816). + ndr_spoolss_buf: Fix out of scope use of stack variable in NDR_SPOOLSS_PUSH_ENUM_OUT(); (bso#13818). + s4/messaging: Fix undefined reference in linking libMESSAGING-samba4.so; (bso#13854). + acl_read: Fix regression for empty lists; (bso#13836). + s4:dlz make b9_has_soa check dc=@ node; (bso#13841). + s3:client: Fix printing via smbspool backend with kerberos auth; (bso#13832). + s4:librpc: Fix installation of Samba; (bso#13847). + s3:lib: Fix the debug message for adding cache entries; (bso#13848). + s3:utils: Add 'smbstatus -L --resolve-uids' to show username; (bso#13793). + s3:lib: Fix the debug message for adding cache entries; (bso#13848). + s3:waf: Fix the detection of makdev() macro on Linux; (bso#13853). * ctdb-build: Drop creation of .distversion in tarball; (bso#13789). * ctdb-packaging: Test package requires tcpdump, ctdb package should not own system library directory; (bso#13838). - Update to samba-4.10.1: + py/kcc_utils: py2.6 compatibility; (bso#13837); + libcli: permit larger values of DataLength in SMB2_ENCRYPTION_CAPABILITIES of negotiate response; (bso#13869); + regfio: Improve handling of malformed registry hive files; (bso#13840); + ctdb-version: Simplify version string usage; (bso#13789); + lib: Make fd_load work for non-regular files; (bso#13859); + dbcheck in the middle of the tombstone garbage collection causes replication failures, dbcheck: add --selftest-check-expired-tombstones cmdline option; (bso#13816); + ndr_spoolss_buf: Fix out of scope use of stack variable in NDR_SPOOLSS_PUSH_ENUM_OUT(); (bso#13818); + s4/messaging: Fix undefined reference in linking libMESSAGING-samba4.so; (bso#13854); + acl_read: Fix regression for empty lists; (bso#13836); + s4:dlz make b9_has_soa check dc=@ node; (bso#13841); + s3:client: Fix printing via smbspool backend with kerberos auth; (bso#13832); + s4:librpc: Fix installation of Samba; (bso#13847); + s3:lib: Fix the debug message for adding cache entries; (bso#13848); + s3:utils: Add 'smbstatus -L --resolve-uids' to show username; (bso#13793); + s3:lib: Fix the debug message for adding cache entries; (bso#13848); + s3:waf: Fix the detection of makdev() macro on Linux; (bso#13853); + ctdb-build: Drop creation of .distversion in tarball; (bso#13789); + ctdb-packaging: Test package requires tcpdump, ctdb package should not own system library directory; (bso#13838); - Update to samba-4.10.0: + s4-server: Open and close a transaction on sam.ldb at startup; (bso#13760); + access_check_max_allowed() doesn't process "Owner Rights" ACEs; (bso#13812); + s4/scripting/bin: Open unicode files with utf8 encoding and write + unicode string. + sambaundoguididx: Use the right escaped oder unescaped sam ldb files; (bso#13759); + Fix idmap cache pollution with S-1-22- IDs on winbind hickup; (bso#13813); + passdb: Update ABI to 0.27.2. + lib/winbind_util: Add winbind_xid_to_sid for --without-winbind; (bso#13813); + lib:util: Move debug message for mkdir failing to log level 1; (bso#13823); OBS-URL: https://build.opensuse.org/request/show/696786 OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=615 --- _service | 2 +- baselibs.conf | 2 - samba-4.10.2+git.78.0c89af72312.tar.bz2 | 3 + samba-4.9.4+git.138.e50f45d83ad.tar.bz2 | 3 - samba.changes | 145 ++++++++++++++++++ samba.spec | 186 ++++++------------------ 6 files changed, 195 insertions(+), 146 deletions(-) create mode 100644 samba-4.10.2+git.78.0c89af72312.tar.bz2 delete mode 100644 samba-4.9.4+git.138.e50f45d83ad.tar.bz2 diff --git a/_service b/_service index 6015c83..5f10721 100644 --- a/_service +++ b/_service @@ -2,7 +2,7 @@ https://gitlab.suse.de/samba/suse-samba.git/ git - factory-4-9-stable + factory-4-10-stable @PARENT_TAG@+git.@TAG_OFFSET@.%h samba(.*) \1 diff --git a/baselibs.conf b/baselibs.conf index 4914135..92b6e07 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -12,7 +12,6 @@ libsamba-hostconfig0 libsamba-passdb0 obsoletes "libpdb0- < " libsamba-policy0-python3 -libsamba-policy0 libsamba-util0 libsamdb0 libsmbclient0 @@ -29,5 +28,4 @@ samba-client -/usr/lib/samba samba-libs samba-libs-python3 -samba-libs-python samba-ad-dc diff --git a/samba-4.10.2+git.78.0c89af72312.tar.bz2 b/samba-4.10.2+git.78.0c89af72312.tar.bz2 new file mode 100644 index 0000000..10dc84b --- /dev/null +++ b/samba-4.10.2+git.78.0c89af72312.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2e389527a89ab02245ea40f32b18db7539a6a1a0e6b1f1cf167303f34fbae4f9 +size 24772325 diff --git a/samba-4.9.4+git.138.e50f45d83ad.tar.bz2 b/samba-4.9.4+git.138.e50f45d83ad.tar.bz2 deleted file mode 100644 index 7355909..0000000 --- a/samba-4.9.4+git.138.e50f45d83ad.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dec0073da9276782df53bed1e6606c332aee089c6ee435522ddb439c07347687 -size 24657384 diff --git a/samba.changes b/samba.changes index 91d943e..ff99dff 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,148 @@ +------------------------------------------------------------------- +Wed Apr 17 11:20:32 UTC 2019 - npower + +- Update to samba-4.10.2: + + CVE-2019-3870 (World writable files in + Samba AD DC private/ dir); (bso#13834). + + CVE-2019-3880 (Save registry file outside share as + unprivileged user); (bso#13851). + + py/kcc_utils: py2.6 compatibility; (bso#13837). + + libcli: permit larger values of DataLength in + SMB2_ENCRYPTION_CAPABILITIES of negotiate response; + (bso#13869). + + regfio: Improve handling of malformed registry hive files; + (bso#13840). + + ctdb-version: Simplify version string usage; (bso#13789). + + lib: Make fd_load work for non-regular files; (bso#13859). + + dbcheck: in the middle of the tombstone garbage collection + causes replication failures, + dbcheck: add --selftest-check-expired-tombstones cmdline + option; (bso#13816). + + ndr_spoolss_buf: Fix out of scope use of stack variable in + NDR_SPOOLSS_PUSH_ENUM_OUT(); (bso#13818). + + s4/messaging: Fix undefined reference in linking + libMESSAGING-samba4.so; (bso#13854). + + acl_read: Fix regression for empty lists; (bso#13836). + + s4:dlz make b9_has_soa check dc=@ node; (bso#13841). + + s3:client: Fix printing via smbspool backend with kerberos + auth; (bso#13832). + + s4:librpc: Fix installation of Samba; (bso#13847). + + s3:lib: Fix the debug message for adding cache entries; + (bso#13848). + + s3:utils: Add 'smbstatus -L --resolve-uids' to show username; + (bso#13793). + + s3:lib: Fix the debug message for adding cache entries; + (bso#13848). + + s3:waf: Fix the detection of makdev() macro on Linux; + (bso#13853). + * ctdb-build: Drop creation of .distversion in tarball; + (bso#13789). + * ctdb-packaging: Test package requires tcpdump, ctdb package + should not own system library directory; (bso#13838). +- Update to samba-4.10.1: + + py/kcc_utils: py2.6 compatibility; (bso#13837); + + libcli: permit larger values of DataLength in + SMB2_ENCRYPTION_CAPABILITIES of negotiate response; (bso#13869); + + regfio: Improve handling of malformed registry hive files; (bso#13840); + + ctdb-version: Simplify version string usage; (bso#13789); + + lib: Make fd_load work for non-regular files; (bso#13859); + + dbcheck in the middle of the tombstone garbage collection causes + replication failures, dbcheck: add --selftest-check-expired-tombstones + cmdline option; (bso#13816); + + ndr_spoolss_buf: Fix out of scope use of stack variable in + NDR_SPOOLSS_PUSH_ENUM_OUT(); (bso#13818); + + s4/messaging: Fix undefined reference in linking + libMESSAGING-samba4.so; (bso#13854); + + acl_read: Fix regression for empty lists; (bso#13836); + + s4:dlz make b9_has_soa check dc=@ node; (bso#13841); + + s3:client: Fix printing via smbspool backend with kerberos auth; (bso#13832); + + s4:librpc: Fix installation of Samba; (bso#13847); + + s3:lib: Fix the debug message for adding cache entries; (bso#13848); + + s3:utils: Add 'smbstatus -L --resolve-uids' to show username; (bso#13793); + + s3:lib: Fix the debug message for adding cache entries; (bso#13848); + + s3:waf: Fix the detection of makdev() macro on Linux; (bso#13853); + + ctdb-build: Drop creation of .distversion in tarball; (bso#13789); + + ctdb-packaging: Test package requires tcpdump, ctdb package + should not own system library directory; (bso#13838); +- Update to samba-4.10.0: + + s4-server: Open and close a transaction on sam.ldb at startup; (bso#13760); + + access_check_max_allowed() doesn't process "Owner Rights" ACEs; (bso#13812); + + s4/scripting/bin: Open unicode files with utf8 encoding and write + + unicode string. + + sambaundoguididx: Use the right escaped oder unescaped sam ldb + files; (bso#13759); + + Fix idmap cache pollution with S-1-22- IDs on winbind hickup; (bso#13813); + + passdb: Update ABI to 0.27.2. + + lib/winbind_util: Add winbind_xid_to_sid for --without-winbind; (bso#13813); + + lib:util: Move debug message for mkdir failing to log level 1; (bso#13823); + +------------------------------------------------------------------- +Wed Mar 27 18:47:07 UTC 2019 - David Mulder + +- Update to samba-4.9.5 + + audit_logging: Remove debug log header and JSON Authentication: + prefix; (bso#13714); + + Fix upgrade from 4.7 (or earlier) to 4.9; (bso#13760); + + s3: lib: nmbname: Ensure we limit the NetBIOS name correctly; (bso# + CID: 1433607; (bso#11495); + + smbd: uid: Don't crash if 'force group' is added to an existing + share connection; (bso#13690); + + s3: VFS: vfs_fruit. Fix the NetAtalk deny mode compatibility + code; (bso#13770); + + s3: SMB1 POSIX mkdir does case insensitive name lookup; (bso#13803); + + s3:utils/smbget fix recursive download with empty source + directories; (bso#13199); + + samba-tool drs showrepl: Do not crash if no dnsHostName found; (bso#13716); + + s3:libsmb: cli_smb2_list() can sometimes fail initially on a + connection; (bso#13736); + + join: Throw CommandError instead of Exception for simple errors; (bso#13747); + + ldb: Avoid inefficient one-level searches; (bso#13762); + + s3: libsmb: use smb2cli_conn_max_trans_size() in + cli_smb2_list(); (bso#13736); + + tldap: Avoid use after free errors; (bso#13776); + + Fix idmap xid2sid cache churn; (bso#13802); + + access_check_max_allowed() doesn't process "Owner Rights" ACEs; (bso#13812); + + s3-smbd: Avoid assuming fsp is always intact after close_file + call; (bso#13720); + + s3-vfs-fruit: Add close call; (bso#13725); + + s3-smbd: Use fruit:model string for mDNS registration; (bso#13746); + + s3-vfs: add glusterfs_fuse vfs module; (bso#13774); + + printing: Check lp_load_printers() prior to pcap cache update; (bso#13766); + + vfs_ceph: vfs_ceph strict_allocate_ftruncate calls (local FS) + ftruncate and fallocate; (bso#13807); + + lib/audit_logging: Actually create talloc; (bso#13737); + + netcmd/user: python[3]-gpgme unsupported and replaced by + python[3]-gpg; (bso#13728); + + dns: Changing onelevel search for wildcard to subtree; (bso#13738); + + samba-tool: Don't print backtrace on simple DNS errors; (bso#13721); + + sambaundoguididx: Use the right escaped oder unescaped sam ldb + files; (bso#13759); + + ctdb: Print locks latency in machinereadable stats; (bso#13742); + + messages_dgm: Messaging gets stuck when pids are recycled; (bso#13786); + + audit_logging: auth_json_audit required auth_json; (bso#13715); + + man pages: Document prefork process model; (bso#13765); + + CVE-2019-3824 ldb: Release ldb 1.4.6; (bso#13773); + + s3:auth: ignore create_builtin_guests() failing without a valid + idmap configuration; (bso#13697); + + s3:auth_winbind: Ignore a missing winbindd as NT4 PDC/BDC + without trusts; (bso#13722); + + s3:auth_winbind: return NT_STATUS_NO_LOGON_SERVERS if winbindd + is not available; (bso#13723); + + s4:server: Add support for 'smbcontrol samba shutdown' and + 'smbcontrol debug/debuglevel'; (bso#13752); + + Python: Ensure ldb.Dn can doesn't rencoded str with py2; (bso#13616); + + vfs_glusterfs: Adapt to changes in libgfapi signatures; (bso#13330); + + s3-vfs: Use ENOATTR in errno comparison for getxattr; (bso#13774); + + notifyd: Fix SIGBUS on sparc; (bso#13704); + + waf: Check for libnscd; (bso#13787); + + s3:vfs: Correctly check if OFD locks should be enabled or not; (bso#13770); + + lib/util: Count a trailing line that doesn't end in a newline; (bso#13717); + + Recovery lock bug fixes; (bso#13800); + + s3: net: Do not set NET_FLAGS_ANONYMOUS with -k; (bso#13726); + + s3:libsmb: Honor disable_netbios option in smbsock_connect_send; (bso#13727); + + vfs_fileid: Fix get_connectpath_ino; (bso#13741); + + vfs_fileid: Fix fsname_norootdir algorithm; (bso#13744); + ------------------------------------------------------------------- Mon Mar 4 12:42:36 UTC 2019 - David Disseldorp diff --git a/samba.spec b/samba.spec index 6cea1b8..3d63e68 100644 --- a/samba.spec +++ b/samba.spec @@ -1,7 +1,7 @@ # # spec file for package samba # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -12,17 +12,12 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %{!?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 -%endif #Compat macro for new _fillupdir macro introduced in Nov 2017 %if ! %{defined _fillupdir} @@ -31,7 +26,20 @@ %{!?_tmpfilesdir:%global _tmpfilesdir /usr/lib/tmpfiles.d} -%define with_python 1 +# mscat only builds with libgnutls >= 3.5.6 and libtasn1 >= 3.8 both +# of which are unavailable prior to SLE15sp1 and Leap15.1. Excluding +# these requires libtasn1 be bundled in older versions (otherwise +# configure fails), but mscat still can't build due to the libgnutls +# dependency. +%if 0%{?sle_version} <= 120300 +%define with_mscat 0 +%else +%if 0%{?suse_version} < 1500 +%define with_mscat 0 +%else +%define with_mscat 1 +%endif +%endif %if 0%{?sle_version} >= 150000 && !0%{?is_opensuse} # SLE15 dropped perl-Parse-Yapp @@ -49,10 +57,10 @@ %endif %endif -%define talloc_version 2.1.10 -%define tevent_version 0.9.34 -%define tdb_version 1.3.15 -%define ldb_version 1.4.3 +%define talloc_version 2.1.16 +%define tevent_version 0.9.39 +%define tdb_version 1.3.18 +%define ldb_version 1.5.4 %global with_mitkrb5 1 %global with_dc 0 @@ -100,12 +108,8 @@ BuildRequires: openldap2-devel BuildRequires: pam-devel BuildRequires: popt-devel BuildRequires: pwdutils -BuildRequires: python-devel -BuildRequires: python-xml -%if %{with_python3} BuildRequires: python3-devel BuildRequires: python3-xml -%endif BuildRequires: readline-devel %if 0%{?suse_version} >= 1330 BuildRequires: rpcgen @@ -119,16 +123,10 @@ BuildRequires: libldb-devel >= %{ldb_version} BuildRequires: libtalloc-devel >= %{talloc_version} BuildRequires: libtdb-devel >= %{tdb_version} BuildRequires: libtevent-devel >= %{tevent_version} -BuildRequires: python-ldb-devel >= %{ldb_version} -BuildRequires: python-talloc-devel -BuildRequires: python-tdb -BuildRequires: python-tevent -%if %{with_python3} BuildRequires: python3-ldb-devel >= %{ldb_version} BuildRequires: python3-talloc-devel BuildRequires: python3-tdb BuildRequires: python3-tevent -%endif # to generate the man pages BuildRequires: docbook-xsl-stylesheets BuildRequires: libxslt @@ -155,10 +153,14 @@ BuildRequires: krb5-devel >= 1.15.1 BuildRequires: krb5-server >= 1.15.1 BuildRequires: libgnutls-devel >= 3.4.7 BuildRequires: libjansson-devel -BuildRequires: python-gpgme +BuildRequires: python3-gpgme %else BuildRequires: krb5-devel %endif +%if %{with_mscat} +BuildRequires: libgnutls-devel >= 3.5.6 +BuildRequires: libtasn1-devel >= 3.8 +%endif %define libsmbclient_name libsmbclient0 %define libnetapi_name libnetapi0 @@ -168,7 +170,7 @@ BuildRequires: krb5-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -Version: 4.9.4+git.138.e50f45d83ad +Version: 4.10.2+git.78.0c89af72312 Release: 0 Url: https://www.samba.org/ Obsoletes: samba-32bit < %{version} @@ -196,15 +198,6 @@ Requires: samba-client >= %{version} %else %define cifs_init_script smbfs %endif -%if 0%{?suse_version} < 1111 -# pre-11.2 doesn't know the python_* macros -%define python_sitelib %py_sitedir -%define python_sitearch %py_sitedir -%else -# CentOS and RHEL pre-6 don't know them either -%define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; import sys; sys.stdout.write(get_python_lib())") -%define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; import sys; sys.stdout.write(get_python_lib(1))") -%endif # Define some global directories ################################ %define DOCDIR %{_defaultdocdir}/samba @@ -318,7 +311,7 @@ Requires: krb5 %if 0%{?suse_version} > 1210 && 0%{?suse_version} < 1315 Requires: libfam0-gamin %endif -Requires: samba-libs-python = %{version} +Requires: samba-libs-python3 = %{version} %description libs The samba-libs package contains the libraries needed by programs that @@ -329,20 +322,10 @@ Summary: Python3 dependencies of samba-libs License: GPL-3.0-or-later Group: Development/Libraries/C and C++ Requires: python3 -Provides: samba-libs-python %description libs-python3 Dependencies of samba-libs that require python3. -%package libs-python -Summary: Python2 dependencies of samba-libs -License: GPL-3.0-or-later -Group: Development/Libraries/C and C++ -Requires: python - -%description libs-python -Dependencies of samba-libs that require python2. - %package pidl Summary: Perl IDL compiler License: GPL-3.0-or-later @@ -355,33 +338,16 @@ Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) The samba-pidl package contains the Perl IDL compiler used by Samba and Wireshark to parse IDL and similar protocols -%package python -Summary: Samba Python libraries -License: GPL-3.0-or-later -Group: Development/Libraries/Python -%if %{with_python} -Requires: %{name} = %{version} -Requires: python-ldb -Requires: python-talloc -Requires: python-tdb -Requires: python-tevent -Requires: libsamba-policy0 = %{version} -%endif - -%description python -The samba-python package contains the Python libraries needed by programs -that use SMB, RPC and other Samba provided protocols in Python programs. - %package python3 Summary: Samba Python3 libraries License: GPL-3.0-or-later Group: Development/Libraries/Python Requires: %{name} = %{version} +Requires: libsamba-policy0-python3 = %{version} Requires: python3-ldb Requires: python3-talloc Requires: python3-tdb Requires: python3-tevent -Requires: libsamba-policy0-python3 = %{version} %description python3 The samba-python3 package contains the Python libraries needed by programs @@ -415,8 +381,8 @@ Requires: %{?insserv_prereq} %endif Requires(pre): /usr/sbin/groupadd Requires: coreutils -Requires: samba-client >= %{version} Requires: libtevent-util0 >= %{version} +Requires: samba-client >= %{version} Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig @@ -719,14 +685,6 @@ This subpackage contains libraries and header files for developing applications that want to make use of libsamba-passdb. -%package -n libsamba-policy0 -Summary: Active Directory Group Policy library -License: GPL-3.0-or-later -Group: System/Libraries - -%description -n libsamba-policy0 -This subpackage contains the python2 library for policy management. - %package -n libsamba-policy0-python3 Summary: Active Directory Group Policy library License: GPL-3.0-or-later @@ -739,7 +697,7 @@ This subpackage contains the python3 library for policy management. Summary: Development files for the Samba AD Group Policy library License: GPL-3.0-or-later Group: Development/Libraries/C and C++ -Requires: libsamba-policy-python-devel = %{version} +Requires: libsamba-policy-python3-devel = %{version} %description -n libsamba-policy-devel This subpackage contains libraries and header files for developing @@ -750,22 +708,11 @@ Summary: Development files for the Samba AD Group Policy library License: GPL-3.0-or-later Group: Development/Libraries/C and C++ Requires: libsamba-policy0-python3 = %{version} -Provides: libsamba-policy-python-devel %description -n libsamba-policy-python3-devel This subpackage contains libraries and header files for developing applications that want to make use of libsamba-policy. -%package -n libsamba-policy-python-devel -Summary: Development files for the Samba AD Group Policy library -License: GPL-3.0-or-later -Group: Development/Libraries/C and C++ -Requires: libsamba-policy0 = %{version} - -%description -n libsamba-policy-python-devel -This subpackage contains libraries and header files for developing -applications that want to make use of libsamba-policy. - %package -n libsamba-util0 Summary: Samba utility function library License: GPL-3.0-or-later @@ -982,7 +929,7 @@ Group: Productivity/Networking/Samba Requires: samba = %{version} Requires: samba-dsdb-modules = %{version} Recommends: krb5-server >= 1.15.1 -Requires: samba-python = %{version} +Requires: samba-python3 = %{version} Recommends: samba-winbind = %{version} Recommends: tdb-tools >= %{tdb_version} Provides: samba-kdc = %{version} @@ -1057,6 +1004,9 @@ export LDFLAGS="-ltirpc" %if 0%{?suse_version} < 1111 bundled_libraries_extra="libarchive" %endif +%if ! 0%{?with_mscat} +bundled_libraries_extra+=",libtasn1" +%endif CONFIGURE_OPTIONS="\ --prefix=%{_prefix} \ --localstatedir=%{_localstatedir} \ @@ -1070,7 +1020,6 @@ CONFIGURE_OPTIONS="\ --disable-rpath \ --disable-rpath-install \ --enable-debug \ - --with-profiling-data \ %if 0%{?build_ctdb_pmda} --enable-pmda \ %endif @@ -1094,20 +1043,14 @@ CONFIGURE_OPTIONS="\ %endif %if ! %{with_dc} --without-ad-dc \ - --without-json-audit \ + --without-json \ --without-gpgme \ %else %if %{with_mitkrb5} --with-experimental-mit-ad-dc \ %endif -%endif -%if ! %{with_python} - --disable-python \ %endif --bundled-libraries=NONE,socket_wrapper,cmocka,${bundled_libraries_extra} \ -%if %{with_python3} - --extra-python=/usr/bin/python3 \ -%endif " ./configure ${CONFIGURE_OPTIONS} make %{build_make_smp_mflags} \ @@ -1170,11 +1113,6 @@ rm \ %{buildroot}/%{_libdir}/samba/ldb/ildap.so \ %{buildroot}/%{_libdir}/samba/ldb/ldbsamba_extensions.so \ %endif -%if ! %{with_python} -# seems easiest to just delete these so the samba-python package is -# truely empty -find %{buildroot} -name ".py" -delete -%endif # CTDB install -m 0644 packaging/SuSE/config/sysconfig.ctdb %{buildroot}/%{_fillupdir} @@ -1336,7 +1274,7 @@ done # cups SMB support mkdir -p %{buildroot}/%{cups_lib_dir}/backend/ touch %{buildroot}/%{cups_lib_dir}/backend/smb -mv COPYING README WHATSNEW.txt %{buildroot}/%{DOCDIR}/ +mv COPYING README.md WHATSNEW.txt %{buildroot}/%{DOCDIR}/ cp -a docs/* %{buildroot}/%{DOCDIR} rmdir "%{buildroot}/%{DOCBOOKDIR}" cp -a examples/ %{buildroot}/%{DOCDIR} @@ -1558,8 +1496,6 @@ fi %postun -n libsamba-passdb0 -p /sbin/ldconfig %post -n libsamba-policy0-python3 -p /sbin/ldconfig %postun -n libsamba-policy0-python3 -p /sbin/ldconfig -%post -n libsamba-policy0 -p /sbin/ldconfig -%postun -n libsamba-policy0 -p /sbin/ldconfig %post -n libsamba-util0 -p /sbin/ldconfig %postun -n libsamba-util0 -p /sbin/ldconfig %post -n libsamdb0 -p /sbin/ldconfig @@ -1865,6 +1801,9 @@ exit 0 %dir %{_tmpfilesdir} %{_tmpfilesdir}/samba.conf %endif +%if %{with_mscat} +%{_bindir}/dumpmscat +%endif %files core-devel %defattr(-,root,root) @@ -2026,18 +1965,14 @@ exit 0 %{_libdir}/samba/pdb/ldapsam.so %{_libdir}/samba/pdb/smbpasswd.so %{_libdir}/samba/pdb/tdbsam.so +%{_libdir}/samba/libclidns-samba4.so +%if %{with_mscat} +%{_libdir}/samba/libmscat-samba4.so +%endif %files libs-python3 -%if %{with_python3} %{_libdir}/samba/libsamba-net.%{py3_soflags_dash}-samba4.so %{_libdir}/samba/libsamba-python.%{py3_soflags_dash}-samba4.so -%endif - -%files libs-python -%if %{with_python} -%{_libdir}/samba/libsamba-python-samba4.so -%{_libdir}/samba/libsamba-net-samba4.so -%endif %if %{with_pidl} %files pidl @@ -2062,19 +1997,9 @@ exit 0 %exclude %{perl_vendorlib}/Parse/Yapp/Driver.pm %endif -%files python -%defattr(-,root,root) -%if %{with_python} -%{python_sitearch}/* -%else -%exclude %{python_sitearch}/* -%endif - -%if %{with_python3} %files python3 %defattr(-,root,root) %{python3_sitearch}/* -%endif %files test %defattr(-,root,root) @@ -2082,12 +2007,10 @@ exit 0 %{_bindir}/locktest %{_bindir}/masktest %{_bindir}/ndrdump -%if %{with_python} %{_bindir}/smbtorture %{_mandir}/man1/smbtorture.1.* %{_mandir}/man7/traffic_learner.7.* %{_mandir}/man7/traffic_replay.7.* -%endif %{_bindir}/vfstest %{_mandir}/man1/gentest.1.* %{_mandir}/man1/locktest.1.* @@ -2251,6 +2174,7 @@ exit 0 %{_mandir}/man7/ctdb.7.* %doc %{_defaultdocdir}/ctdb %{_sysconfdir}/ctdb/config_migrate.sh +%{_bindir}/ctdb_local_daemons %if 0%{?build_ctdb_pmda} %files -n ctdb-pcp-pmda @@ -2422,36 +2346,19 @@ 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 - %files -n libsamba-policy0-python3 %defattr(-,root,root) -%if %{with_python3} %_libdir/libsamba-policy.%{py3_soflags_dash}.so.0* -%endif %files -n libsamba-policy-devel %defattr(-,root,root) %dir %_includedir/samba-4.0/ %_includedir/samba-4.0/policy.h -%files -n libsamba-policy-python-devel -%defattr(-,root,root) -%if %{with_python} -%_libdir/libsamba-policy.so -%_libdir/pkgconfig/samba-policy.pc -%endif - %files -n libsamba-policy-python3-devel %defattr(-,root,root) -%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) @@ -2466,13 +2373,11 @@ exit 0 %_includedir/samba-4.0/util/byteorder.h %_includedir/samba-4.0/util/data_blob.h %_includedir/samba-4.0/util/debug.h +%_includedir/samba-4.0/util/discard.h %_includedir/samba-4.0/util/fault.h -%_includedir/samba-4.0/util/memory.h -%_includedir/samba-4.0/util/safe_string.h %_includedir/samba-4.0/util/signal.h %_includedir/samba-4.0/util/string_wrappers.h %_includedir/samba-4.0/util/substitute.h -%_includedir/samba-4.0/util/talloc_stack.h %_includedir/samba-4.0/util/time.h %_libdir/libsamba-util.so %_libdir/pkgconfig/samba-util.pc @@ -2735,6 +2640,7 @@ exit 0 %{_libdir}/samba/ldb/wins_ldb.so %{_libdir}/samba/ldb/audit_log.so %{_libdir}/samba/ldb/group_audit_log.so +%{_libdir}/samba/ldb/paged_results.so %endif %changelog