]> git.pld-linux.org Git - packages/samba.git/blobdiff - samba.spec
icu rebuild
[packages/samba.git] / samba.spec
index 0bc2c3f404a3c2140a98e629a6262df1a4bcae63..287808cb588bc2bd40ce4c6c0b57ffaf75748047 100644 (file)
@@ -1,23 +1,35 @@
+# TODO:
+# - bcond/subpackage for Spotlight tracker backend (BR: glib2-devel tracker-devel >= 2.0)?
+# - gpfs.h (nfs-ganesha?)
+#
+# Note:
+# - unpredictible build failures:
+#   fail: http://buildlogs.pld-linux.org//index.php?dist=th&arch=i686&ok=0&name=samba&id=8e631f35-f333-464e-b872-135db73f0a67&action=tail
+#   ok: http://buildlogs.pld-linux.org//index.php?dist=th&arch=i686&ok=1&name=samba&id=1188195b-4017-48c5-8c07-f1deb41b5800&action=tail 
 #
 # Conditional build:
 %bcond_without ads             # ActiveDirectory support
 %bcond_without ceph            # Ceph (RADOS) storage support
 %bcond_without cups            # CUPS support
+%bcond_without glusterfs       # GlusterFS storage support
 %bcond_without ldap            # LDAP support
 %bcond_without avahi           # Avahi support
 %bcond_without dmapi           # DMAPI support
 %bcond_without systemd         # systemd integration
+%bcond_without winexe          # winexe tool
 %bcond_with    system_heimdal  # Use system Heimdal libraries [since samba 4.4.x build fails with heimdal 1.5.x/7.x]
-%bcond_without system_libs     # system libraries (talloc,tdb,tevent,ldb)
+%bcond_with    system_libbsd   # system libbsd for MD5 and strl* functions
+%bcond_without system_libs     # system libraries from SAMBA project (talloc,tdb,tevent,ldb)
 %bcond_without ctdb_pcp        # Performance Co-Pilot support for CTDB
 # turn on when https://bugzilla.samba.org/show_bug.cgi?id=11764 is fixed
 %bcond_with    replace
 
 %if %{with system_libs}
-%define                ldb_ver         1.1.29
-%define                talloc_ver      2:2.1.9
-%define                tdb_ver         2:1.3.12
-%define                tevent_ver      0.9.31
+%define                ldb_ver         2.4.1
+%define                ldb_ver_below   2.5
+%define                talloc_ver      2:2.3.3
+%define                tdb_ver         2:1.4.4
+%define                tevent_ver      0.11.0
 %endif
 
 # dmapi-devel with xfsprogs-devel >= 4.11(?) needs largefile (64bit off_t) that isn't detected properly
 %undefine      with_dmapi
 %endif
 
-%include       /usr/lib/rpm/macros.perl
 
 # NOTE: packages order is: server + additions, common, clients, libs+devel, ldap
 %define                virusfilter_version 0.1.4
 Summary:       Samba Active Directory and SMB server
 Summary(pl.UTF-8):     Serwer Samba Active Directory i SMB
 Name:          samba
-Version:       4.6.6
-Release:       1
+Version:       4.15.6
+Release:       4
 Epoch:         1
 License:       GPL v3
 Group:         Networking/Daemons
-Source0:       https://www.samba.org/ftp/samba/samba-%{version}.tar.gz
-# Source0-md5: 04493bbe8d71e52393dffdbba301697d
+Source0:       https://download.samba.org/pub/samba/stable/%{name}-%{version}.tar.gz
+# Source0-md5: cd7023dc78bff281a57b219a48ddcca3
 Source1:       smb.init
 Source2:       samba.pamd
 Source4:       samba.sysconfig
@@ -52,41 +63,62 @@ Source10:   https://bitbucket.org/fumiyas/samba-virusfilter/downloads/samba-virusf
 Patch0:                system-heimdal.patch
 Patch1:                %{name}-c++-nofail.patch
 Patch2:                %{name}-lprng-no-dot-printers.patch
-Patch3:                systemd-pid-dir.patch
 Patch4:                unicodePwd-nthash-values-over-LDAP.patch
 Patch5:                %{name}-heimdal.patch
 Patch6:                server-role.patch
 Patch7:                %{name}-bug-9816.patch
+Patch8:                %{name}-no_libbsd.patch
+Patch9:                format-security.patch
 URL:           https://www.samba.org/
 BuildRequires: acl-devel
 %{?with_avahi:BuildRequires:   avahi-devel}
-%{?with_ceph:BuildRequires:    ceph-devel >= 0.73}
-BuildRequires: cmocka-devel >= 1.0.0
+BuildRequires: bison
+%{?with_ceph:BuildRequires:    ceph-devel >= 11}
+BuildRequires: cmocka-devel >= 1.1.3
+%if %{with winexe}
+BuildRequires: crossmingw32-gcc
+# for string.h
+BuildRequires: crossmingw32-runtime
+BuildRequires: crossmingw64-gcc
+%endif
 %{?with_cups:BuildRequires:    cups-devel >= 1:1.2.0}
 BuildRequires: cyrus-sasl-devel >= 2
 BuildRequires: dbus-devel
 %{?with_dmapi:BuildRequires:   dmapi-devel}
-BuildRequires: docbook-style-xsl
+BuildRequires: docbook-style-xsl-nons
+BuildRequires: flex
 # just FAM API
 BuildRequires: gamin-devel
-BuildRequires: gdbm-devel
 BuildRequires: gettext-tools
-BuildRequires: glusterfs-devel
-BuildRequires: gnutls-devel >= 3.0.0
+BuildRequires: glib2-devel >= 2.0
+%{?with_glusterfs:BuildRequires:       glusterfs-devel >= 4}
+BuildRequires: gnutls-devel >= 3.4.7
+BuildRequires: gpgme-devel
 %{?with_system_heimdal:BuildRequires:  heimdal-devel >= 1.5.3-1}
 BuildRequires: iconv
+BuildRequires: jansson-devel
 BuildRequires: keyutils-devel
 BuildRequires: libaio-devel
 BuildRequires: libarchive-devel >= 3.1.2
+%{?with_system_libbsd:BuildRequires:   libbsd-devel}
 BuildRequires: libcap-devel
 BuildRequires: libcom_err-devel
+BuildRequires: libicu-devel
 BuildRequires: libmagic-devel
 BuildRequires: libnscd-devel
+BuildRequires: libnsl-devel
+BuildRequires: libtasn1-devel >= 3.8
+BuildRequires: libtirpc-devel
+BuildRequires: libunwind-devel
+BuildRequires: liburing-devel
+BuildRequires: lttng-ust-devel
 BuildRequires: make >= 3.81
 BuildRequires: ncurses-devel >= 5.2
 BuildRequires: ncurses-ext-devel >= 5.2
 BuildRequires: nss_wrapper >= 1.0.2
 %{?with_ldap:BuildRequires:    openldap-devel >= 2.3.0}
+# detected and used for linking, but dropped by -Wl,--as-needed
+#BuildRequires:        openssl-devel
 BuildRequires: pam-devel >= 0.99.8.1
 %{?with_ctdb_pcp:BuildRequires:        pcp-devel}
 BuildRequires: perl-ExtUtils-MakeMaker
@@ -94,77 +126,82 @@ BuildRequires:     perl-Parse-Yapp >= 1.05
 BuildRequires: pkgconfig
 BuildRequires: popt-devel
 %{?with_pgsql:BuildRequires:   postgresql-devel}
-BuildRequires: python-devel >= 1:2.5.0
-BuildRequires: python-dns
-BuildRequires: python-modules >= 1:2.5.0
-BuildRequires: python-subunit
-BuildRequires: python-testtools
+BuildRequires: python3-devel >= 1:3.5
+BuildRequires: python3-dns
+BuildRequires: python3-iso8601
+BuildRequires: python3-markdown
+BuildRequires: python3-modules >= 1:3.5
+BuildRequires: python3-subunit
+BuildRequires: python3-testtools
 BuildRequires: readline-devel >= 4.2
+BuildRequires: rpcsvc-proto
+BuildRequires: rpm-build >= 4.6
 BuildRequires: rpm-perlprov
 BuildRequires: rpm-pythonprov
-BuildRequires: rpmbuild(macros) >= 1.647
+BuildRequires: rpmbuild(macros) >= 1.752
 BuildRequires: sed >= 4.0
-BuildRequires: socket_wrapper >= 1.1.2
+BuildRequires: socket_wrapper >= 1.3.3
 BuildRequires: subunit-devel
 %{?with_systemd:BuildRequires: systemd-devel}
+BuildRequires: tracker-devel >= 2.0
 BuildRequires: xfsprogs-devel
 BuildRequires: zlib-devel >= 1.2.3
 %if %{with system_libs}
 BuildRequires: ldb-devel >= %{ldb_ver}
-BuildRequires: ldb-devel < 1.2
-BuildRequires: python-ldb-devel >= %{ldb_ver}
-BuildRequires: python-talloc-devel >= %{talloc_ver}
-BuildRequires: python-tevent >= %{tevent_ver}
+BuildRequires: ldb-devel < %{ldb_ver_below}
+BuildRequires: python3-ldb-devel >= %{ldb_ver}
+BuildRequires: python3-talloc-devel >= %{talloc_ver}
+BuildRequires: python3-tdb >= %{tdb_ver}
+BuildRequires: python3-tevent >= %{tevent_ver}
 BuildRequires: talloc-devel >= %{talloc_ver}
 BuildRequires: tdb-devel >= %{tdb_ver}
 BuildRequires: tevent-devel >= %{tevent_ver}
 %endif
 BuildRequires: uid_wrapper >= 1.1.0
-BuildConflicts:        libbsd-devel
 Requires(post,preun):  /sbin/chkconfig
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
 # for samba_{dnsupdate,kcc,spnupdate,upgradedns} scripts
 Requires:      logrotate >= 3.7-4
 Requires:      pam >= 0.99.8.1
-Requires:      python-samba = %{epoch}:%{version}-%{release}
+Requires:      python3-samba = %{epoch}:%{version}-%{release}
 Requires:      rc-scripts >= 0.4.0.12
 Requires:      setup >= 2.4.6-7
 Requires:      systemd-units >= 38
 # smbd links with libcups
 %{?with_cups:Requires: cups-lib >= 1:1.2.0}
-Obsoletes:     samba-doc-html
-Obsoletes:     samba-doc-pdf
-Obsoletes:     samba-pdb-xml
-Obsoletes:     samba-vfs-audit
-Obsoletes:     samba-vfs-block
-Obsoletes:     samba-vfs-cap
-Obsoletes:     samba-vfs-catia
-Obsoletes:     samba-vfs-default_quota
-Obsoletes:     samba-vfs-expand_msdfs
-Obsoletes:     samba-vfs-fake_perms
-Obsoletes:     samba-vfs-netatalk
-Obsoletes:     samba-vfs-readahead
-Obsoletes:     samba-vfs-readonly
-Obsoletes:     samba-vfs-recycle
-Obsoletes:     samba-vfs-scannedonly
-Obsoletes:     samba-vfs-shadow_copy
-Obsoletes:     samba3
-Obsoletes:     samba3-server
-Obsoletes:     samba3-vfs-audit
-Obsoletes:     samba3-vfs-cap
-Obsoletes:     samba3-vfs-catia
-Obsoletes:     samba3-vfs-default_quota
-Obsoletes:     samba3-vfs-expand_msdfs
-Obsoletes:     samba3-vfs-fake_perms
-Obsoletes:     samba3-vfs-netatalk
-Obsoletes:     samba3-vfs-readahead
-Obsoletes:     samba3-vfs-readonly
-Obsoletes:     samba3-vfs-recycle
-Obsoletes:     samba3-vfs-scannedonly
-Obsoletes:     samba3-vfs-shadow_copy
-Obsoletes:     samba4
-Obsoletes:     samba4-common-server
+Obsoletes:     samba-doc-html < 1:4
+Obsoletes:     samba-doc-pdf < 1:4
+Obsoletes:     samba-pdb-xml < 3.0.23
+Obsoletes:     samba-vfs-audit < 1:4.1.4-3
+Obsoletes:     samba-vfs-block < 1:4.1.4-3
+Obsoletes:     samba-vfs-cap < 1:4.1.4-3
+Obsoletes:     samba-vfs-catia < 1:4.1.4-3
+Obsoletes:     samba-vfs-default_quota < 1:4.1.4-3
+Obsoletes:     samba-vfs-expand_msdfs < 1:4.1.4-3
+Obsoletes:     samba-vfs-fake_perms < 1:4.1.4-3
+Obsoletes:     samba-vfs-netatalk < 1:4.1.4-3
+Obsoletes:     samba-vfs-readahead < 1:4.1.4-3
+Obsoletes:     samba-vfs-readonly < 1:4.1.4-3
+Obsoletes:     samba-vfs-recycle < 1:4.1.4-3
+Obsoletes:     samba-vfs-scannedonly < 1:4.1.4-3
+Obsoletes:     samba-vfs-shadow_copy < 1:4.1.4-3
+Obsoletes:     samba3 < 1:4.1.4-3
+Obsoletes:     samba3-server < 1:4.1.4-3
+Obsoletes:     samba3-vfs-audit < 1:4.1.4-3
+Obsoletes:     samba3-vfs-cap < 1:4.1.4-3
+Obsoletes:     samba3-vfs-catia < 1:4.1.4-3
+Obsoletes:     samba3-vfs-default_quota < 1:4.1.4-3
+Obsoletes:     samba3-vfs-expand_msdfs < 1:4.1.4-3
+Obsoletes:     samba3-vfs-fake_perms < 1:4.1.4-3
+Obsoletes:     samba3-vfs-netatalk < 1:4.1.4-3
+Obsoletes:     samba3-vfs-readahead < 1:4.1.4-3
+Obsoletes:     samba3-vfs-readonly < 1:4.1.4-3
+Obsoletes:     samba3-vfs-recycle < 1:4.1.4-3
+Obsoletes:     samba3-vfs-scannedonly < 1:4.1.4-3
+Obsoletes:     samba3-vfs-shadow_copy < 1:4.1.4-3
+Obsoletes:     samba4 < 1:4.1.4-3
+Obsoletes:     samba4-common-server < 1:4.1.4-3
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _sambahome      /home/services/samba
@@ -198,6 +235,7 @@ Summary:    VFS module to host shares on Ceph file system
 Summary(pl.UTF-8):     Moduł VFS do serwowania zasobów z systemu plików Ceph
 Group:         Networking/Daemons
 Requires:      %{name} = %{epoch}:%{version}-%{release}
+Requires:      ceph-libs >= 11
 
 %description vfs-ceph
 VFS module to host shares on Ceph file system.
@@ -230,9 +268,9 @@ Summary(pl.UTF-8):  Pliki używane przez serwer i klientów Samby
 Group:         Networking/Daemons
 Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
 # for samba-tool script
-Requires:      python-samba = %{epoch}:%{version}-%{release}
-Obsoletes:     samba3-common
-Obsoletes:     samba4-common
+Requires:      python3-samba = %{epoch}:%{version}-%{release}
+Obsoletes:     samba3-common < 1:4.1.4-3
+Obsoletes:     samba4-common < 1:4.1.4-3
 
 %description common
 Samba-common provides files necessary for both the server and client
@@ -251,8 +289,8 @@ Requires:   %{name}-libs = %{epoch}:%{version}-%{release}
 %{?with_system_heimdal:Requires:       heimdal-libs >= 1.5.3-1}
 Requires:      libsmbclient = %{epoch}:%{version}-%{release}
 Suggests:      cifs-utils
-Obsoletes:     samba3-client
-Obsoletes:     samba4-client
+Obsoletes:     samba3-client < 1:4.1.4-3
+Obsoletes:     samba4-client < 1:4.1.4-3
 Obsoletes:     smbfs
 
 %description client
@@ -274,10 +312,10 @@ Requires(post,preun,postun):      systemd-units >= 38
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
 Requires:      systemd-units >= 38
-Obsoletes:     samba3-winbind
-Obsoletes:     samba4-winbind
+Obsoletes:     samba3-winbind < 1:4.1.4-3
+Obsoletes:     samba4-winbind < 1:4.1.4-3
 # pam_winbind is not complete replacement, but pam_smbpass has been removed (in samba 4.4)
-#Obsoletes:    pam-pam_smbpass
+#Obsoletes:    pam-pam_smbpass < 1:4.4
 
 %description winbind
 Provides the winbind daemon and testing tools to allow authentication
@@ -294,7 +332,7 @@ Summary(pl.UTF-8):  Backend CUPS-a drukujący na drukarkach SMB
 Group:         Applications/Printing
 Requires:      %{name}-client = %{epoch}:%{version}-%{release}
 Requires:      cups >= 1:1.2.0
-Obsoletes:     cups-backend-smb3
+Obsoletes:     cups-backend-smb3 < 1:4.1.4-3
 
 %description -n cups-backend-smb
 CUPS backend for printing to SMB printers.
@@ -308,7 +346,7 @@ Summary(pl.UTF-8):  Usługa Name Service Switch dla WINS
 Group:         Base
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
-Obsoletes:     nss_wins3
+Obsoletes:     nss_wins3 < 1:4.1.4-3
 
 %description -n nss_wins
 Provides the libnss_wins shared library which resolves NetBIOS names
@@ -323,7 +361,7 @@ Summary:    A utility for retrieving files using the SMB protocol
 Summary(pl.UTF-8):     Narzędzie do pobierania plików protokołem SMB
 Group:         Applications/Networking
 Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
-Obsoletes:     smbget3
+Obsoletes:     smbget3 < 1:4.1.4-3
 
 %description -n smbget
 wget-like utility for downloading files over SMB.
@@ -336,14 +374,16 @@ używanym w sieciach MS Windows.
 Summary:       Samba shared libraries
 Summary(pl.UTF-8):     Biblioteki współdzielone Samby
 Group:         Libraries
-Requires:      gnutls >= 3.0.0
+Requires:      gnutls >= 3.4.7
 %if %{with system_libs}
 Requires:      ldb >= %{ldb_ver}
 Requires:      talloc >= %{talloc_ver}
 Requires:      tdb >= %{tdb_ver}
 Requires:      tevent >= %{tevent_ver}
 %endif
-Obsoletes:     samba-vfs-notify_fam
+# samba 4.11+ dropped support for python2
+Obsoletes:     python-samba < 1:4.11
+Obsoletes:     samba-vfs-notify_fam < 1:4.4.4
 
 %description libs
 Samba shared libraries.
@@ -356,8 +396,8 @@ Summary:    Header files for Samba
 Summary(pl.UTF-8):     Pliki nagłówkowe Samby
 Group:         Development/Libraries
 Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
-Obsoletes:     samba3-devel
-Obsoletes:     samba4-devel
+Obsoletes:     samba3-devel < 1:4.1.4-3
+Obsoletes:     samba4-devel < 1:4.1.4-3
 
 %description devel
 Header files for Samba.
@@ -369,7 +409,7 @@ Pliki nagłówkowe Samby.
 Summary:       Perl IDL compiler
 Summary(pl.UTF-8):     Kompilator IDL w Perlu
 Group:         Development/Tools
-Obsoletes:     samba4-pidl
+Obsoletes:     samba4-pidl < 1:4.1.4-3
 
 %description pidl
 The samba-pidl package contains the Perl IDL compiler used by Samba
@@ -379,27 +419,27 @@ and Wireshark to parse IDL and similar protocols.
 Ten pakiet zawiera kompilator IDL napisany w Perlu, używany przez
 Sambę oraz Wiresharka to analizy IDL i podobnych protokołów.
 
-%package -n python-samba
-Summary:       Samba modules for Python
-Summary(pl.UTF-8):     Moduły Samby dla Pythona
+%package -n python3-samba
+Summary:       Samba modules for Python 3
+Summary(pl.UTF-8):     Moduły Samby dla Pythona 3
 Group:         Development/Languages/Python
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
-Requires:      python
-Requires:      python-dns
-Requires:      python-modules
+Requires:      python3 >= 1:3.4
+Requires:      python3-dns
+Requires:      python3-iso8601
+Requires:      python3-modules >= 1:3.5
 %if %{with system_libs}
-Requires:      python-ldb >= %{ldb_ver}
-Requires:      python-talloc >= %{talloc_ver}
-Requires:      python-tevent >= %{tevent_ver}
+Requires:      python3-ldb >= %{ldb_ver}
+Requires:      python3-talloc >= %{talloc_ver}
+Requires:      python3-tevent >= %{tevent_ver}
 %endif
-Obsoletes:     python-samba4
 
-%description -n python-samba
-Samba modules for Python.
+%description -n python3-samba
+Samba modules for Python3.
 
-%description -n python-samba -l pl.UTF-8
-Moduły Samby dla Pythona.
+%description -n python3-samba -l pl.UTF-8
+Moduły Samby dla Pythona 3.
 
 %package test
 Summary:       Testing tools for Samba servers and clients
@@ -409,9 +449,9 @@ Requires:   %{name} = %{epoch}:%{version}-%{release}
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
 Requires:      %{name}-winbind = %{epoch}:%{version}-%{release}
-Obsoletes:     samba4-test
-Obsoletes:     samba4-test-devel
-Obsoletes:     samba-test-devel
+Obsoletes:     samba4-test < 1:4.1.4-3
+Obsoletes:     samba4-test-devel < 1:4.1.4-3
+Obsoletes:     samba-test-devel < 1:4.5.1-3
 
 %description test
 samba-test provides testing tools for both the server and client
@@ -425,7 +465,7 @@ Summary:    libsmbclient and libwbclient - Samba client libraries
 Summary(pl.UTF-8):     libsmbclient i libwbclient - biblioteki klienckie Samby
 Group:         Libraries
 Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
-Obsoletes:     samba3-libsmbclient
+Obsoletes:     samba3-libsmbclient < 1:4.1.4-3
 
 %description -n libsmbclient
 libsmbclient and libwbclient - libraries that allow to use Samba
@@ -440,8 +480,8 @@ Summary:    Development files for Samba client libraries
 Summary(pl.UTF-8):     Pliki programistyczne bibliotek klienta Samby
 Group:         Development/Libraries
 Requires:      libsmbclient = %{epoch}:%{version}-%{release}
-Obsoletes:     libsmbclient-static
-Obsoletes:     samba3-libsmbclient-devel
+Obsoletes:     libsmbclient-static < 1:4
+Obsoletes:     samba3-libsmbclient-devel < 1:4.1.4-3
 
 %description -n libsmbclient-devel
 Header files for libsmbclient and libwbclient libraries.
@@ -455,10 +495,8 @@ Summary(pl.UTF-8): Schemat LDAP dla Samby
 Group:         Networking/Daemons
 Requires(post,postun): sed >= 4.0
 Requires:      openldap-servers
-Obsoletes:     openldap-schema-samba3
-%if "%{_rpmversion}" >= "5"
+Obsoletes:     openldap-schema-samba3 < 1:4.1.4-3
 BuildArch:     noarch
-%endif
 
 %description -n openldap-schema-samba
 This package contains samba.schema for OpenLDAP.
@@ -500,7 +538,7 @@ other projects to store temporary data. If an application is already
 using TDB for temporary data it is very easy to convert that
 application to be cluster aware and use CTDB instead.
 
-%description -l pl.UTF-8
+%description -n ctdb -l pl.UTF-8
 CTDB to klastrowa implementacja bazy danych TDB używanej w Sambie oraz
 innych projektach do przechowywania danych tymczasowych. Jeśli jakaś
 aplikacja już wykorzystuje TDB do trzymania danych tymczasowych,
@@ -526,14 +564,17 @@ wyeksportowania do PMCD.
 %{?with_system_heimdal:%patch0 -p1}
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 %patch4 -p1
 %{?with_system_heimdal:%patch5 -p1}
 %patch6 -p1
 %patch7 -p1
+%{!?with_system_libbsd:%patch8 -p1}
+%patch9 -p1
 
-%{__sed} -i -e 's|#!/usr/bin/env python|#!/usr/bin/python|' source4/scripting/bin/samba*
-%{__sed} -i -e 's|#!/usr/bin/env perl|#!/usr/bin/perl|' pidl/pidl
+%{__sed} -i -e '1s|#!/usr/bin/env bash|#!/bin/bash|' ctdb/tools/onnode
+%{__sed} -i -e '1s|#!/usr/bin/env perl|#!/usr/bin/perl|' pidl/pidl
+%{__sed} -i -e '/sed_expr1/ s|/usr/bin/env perl|/usr/bin/perl|' source3/script/wscript_build
+%{__sed} -i -e '1s|#!/usr/bin/env python|#!/usr/bin/python|' source4/scripting/bin/samba*
 
 %if %{with system_heimdal}
 %{__mv} source4/heimdal_build/krb5-types{,-smb}.h
@@ -579,7 +620,6 @@ CPPFLAGS="${CPPFLAGS:-%rpmcppflags}" \
        %{?with_ctdb_pcp:--enable-pmda} \
        --with-automount \
        --with%{!?with_dmapi:out}-dmapi \
-       --with-dnsupdate \
        --with-iconv \
        --with%{!?with_ldap:out}-ldap \
        --with-pam \
@@ -587,11 +627,18 @@ CPPFLAGS="${CPPFLAGS:-%rpmcppflags}" \
        --with-regedit \
        --with-sendfile-support \
        --with-syslog \
-       %{!?with_systemd:--without-systemd} \
+%if %{with systemd}
+       --with-systemd \
+       --systemd-install-services \
+       --with-systemddir=%{systemdunitdir} \
+%else
+       --without-systemd \
+%endif
        --with-utmp \
        --with-winbind \
        --%{?with_avahi:en}%{!?with_avahi:dis}able-avahi \
        --enable-cups \
+       %{__enable_disable glusterfs} \
        --enable-iprint
 
 %{__make} V=1
@@ -601,6 +648,7 @@ CPPFLAGS="${CPPFLAGS:-%rpmcppflags}" \
 cd pidl
 %{__perl} Makefile.PL \
        INSTALLDIRS=vendor
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -614,16 +662,11 @@ install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,pam.d,security,sysconfig
        DESTDIR=$RPM_BUILD_ROOT \
        CONFIGDIR=$RPM_BUILD_ROOT%{_sysconfdir}/samba
 
-# Undo the PIDL install, we want to try again with the right options.
-%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/perl5
-
 # Install PIDL
 %{__make} -C pidl install \
        PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
 
 # Clean out crap left behind by the PIDL install
-%{__rm} $RPM_BUILD_ROOT%{perl_vendorlib}/wscript_build
-%{__rm} -r $RPM_BUILD_ROOT%{perl_vendorlib}/Parse/Yapp
 %{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Parse/Pidl/.packlist
 
 install -p source3/script/mksmbpasswd.sh $RPM_BUILD_ROOT%{_sbindir}
@@ -632,10 +675,6 @@ install -p source3/script/mksmbpasswd.sh $RPM_BUILD_ROOT%{_sbindir}
 
 cp -p packaging/systemd/samba.conf.tmp $RPM_BUILD_ROOT%{systemdtmpfilesdir}/samba.conf
 echo "d /var/run/ctdb 755 root root" > $RPM_BUILD_ROOT%{systemdtmpfilesdir}/ctdb.conf
-cp -p packaging/systemd/nmb.service $RPM_BUILD_ROOT%{systemdunitdir}
-cp -p packaging/systemd/samba.service $RPM_BUILD_ROOT%{systemdunitdir}
-cp -p packaging/systemd/smb.service $RPM_BUILD_ROOT%{systemdunitdir}
-cp -p packaging/systemd/winbind.service $RPM_BUILD_ROOT%{systemdunitdir}
 cp -p ctdb/config/ctdb.service $RPM_BUILD_ROOT%{systemdunitdir}
 
 install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/smb
@@ -651,7 +690,6 @@ echo "LDB_MODULES_PATH=%{_libdir}/samba/ldb" > $RPM_BUILD_ROOT/etc/env.d/LDB_MOD
 
 %{__mv} $RPM_BUILD_ROOT%{_libdir}/libnss_winbind.so* $RPM_BUILD_ROOT/%{_lib}
 %{__mv} $RPM_BUILD_ROOT%{_libdir}/libnss_wins.so* $RPM_BUILD_ROOT/%{_lib}
-install -p bin/vfstest $RPM_BUILD_ROOT%{_bindir}
 
 touch $RPM_BUILD_ROOT/var/lib/samba/{wins.dat,browse.dat}
 
@@ -677,19 +715,14 @@ cp -p examples/LDAP/samba.schema $RPM_BUILD_ROOT%{schemadir}
 
 # remove man pages for not installed commands
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/log2pcap.1*
-%{__rm} $RPM_BUILD_ROOT%{_mandir}/man8/vfs_cacheprime.8*
-%{__rm} $RPM_BUILD_ROOT%{_mandir}/man8/vfs_gpfs.8*
-%{__rm} $RPM_BUILD_ROOT%{_mandir}/man8/vfs_prealloc.8*
-%{__rm} $RPM_BUILD_ROOT%{_mandir}/man8/vfs_tsmsm.8*
-
-# remove tests
-%{__rm} $RPM_BUILD_ROOT%{_bindir}/ctdb*_tests
-%{__rm} -r $RPM_BUILD_ROOT%{_libdir}/ctdb/tests
-%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/ctdb/tests
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man7/traffic_{learner,replay}.7*
+#%{__rm} $RPM_BUILD_ROOT%{_mandir}/man8/vfs_cacheprime.8*
+#%{__rm} $RPM_BUILD_ROOT%{_mandir}/man8/vfs_gpfs.8*
+#%{__rm} $RPM_BUILD_ROOT%{_mandir}/man8/vfs_prealloc.8*
+#%{__rm} $RPM_BUILD_ROOT%{_mandir}/man8/vfs_tsmsm.8*
 
-%py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
-%py_comp $RPM_BUILD_ROOT%{py_sitedir}
-%py_postclean
+%py3_comp $RPM_BUILD_ROOT%{py3_sitedir}
+%py3_ocomp $RPM_BUILD_ROOT%{py3_sitedir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -721,20 +754,25 @@ fi
 %systemd_post smb.service nmb.service
 
 %triggerpostun -- samba4
+### samba4 < 1:4.1.1-1
+# CVE-2013-4476
+if [ -e %{_sysconfdir}/samba/tls/key.pem ]; then
+       PERMS=$(stat -c %a %{_sysconfdir}/samba/tls/key.pem)
+       if [ "$PERMS" != "600" ]; then
+               chmod 600 %{_sysconfdir}/samba/tls/key.pem || :
+               echo "Fixed permissions of private key file %{_sysconfdir}/samba/tls/key.pem from $PERMS to 600"
+               echo "Consider regenerating TLS certificate"
+               echo "Removing all tls .pem files will cause an auto-regeneration with the correct permissions"
+       fi
+fi
+
+### any
 /sbin/chkconfig --add samba
 %service samba restart "Samba AD daemons"
 %systemd_post samba.service
 
-%triggerpostun -- samba4 < 1:4.1.1-1
-# CVE-2013-4476
-[ -e %{_sysconfdir}/samba/tls/key.pem ] || exit 0
-PERMS=$(stat -c %a %{_sysconfdir}/samba/tls/key.pem)
-if [ "$PERMS" != "600" ]; then
-       chmod 600 %{_sysconfdir}/samba/tls/key.pem || :
-       echo "Fixed permissions of private key file %{_sysconfdir}/samba/tls/key.pem from $PERMS to 600"
-       echo "Consider regenerating TLS certificate"
-       echo "Removing all tls .pem files will cause an auto-regeneration with the correct permissions"
-fi
+%triggerpostun -- samba < 1:4.9.2-3
+%{_bindir}/net groupmap add sid=S-1-5-32-546 unixgroup=nobody type=builtin || :
 
 %triggerprein common -- samba4
 cp -a %{_sysconfdir}/samba/smb.conf %{_sysconfdir}/samba/smb.conf.samba4
@@ -775,8 +813,11 @@ fi
 %post  libs -p /sbin/ldconfig
 %postun        libs -p /sbin/ldconfig
 
-%post  -n python-samba -p /sbin/ldconfig
-%postun        -n python-samba -p /sbin/ldconfig
+%triggerpostun libs -- samba-libs < 1:4.15.2-3
+if [ ! -L %{_libdir}/libsmbldap.so.2 ]; then
+       %{__rm} -f %{_libdir}/libsmbldap.so.2
+       /sbin/ldconfig
+fi
 
 %post  -n libsmbclient -p /sbin/ldconfig
 %postun        -n libsmbclient -p /sbin/ldconfig
@@ -822,54 +863,65 @@ fi
 %{systemdunitdir}/smb.service
 %{systemdunitdir}/samba.service
 %{systemdtmpfilesdir}/samba.conf
-%attr(755,root,root) %{_bindir}/eventlogadm
+%attr(755,root,root) %{_bindir}/dumpmscat
 %attr(755,root,root) %{_bindir}/oLschema2ldif
 %attr(755,root,root) %{_bindir}/pdbedit
 %attr(755,root,root) %{_bindir}/profiles
 %attr(755,root,root) %{_bindir}/sharesec
 %attr(755,root,root) %{_bindir}/smbcontrol
 %attr(755,root,root) %{_bindir}/smbstatus
+%attr(755,root,root) %{_sbindir}/eventlogadm
 %attr(755,root,root) %{_sbindir}/mksmbpasswd.sh
 %attr(755,root,root) %{_sbindir}/nmbd
 %attr(755,root,root) %{_sbindir}/samba
 %attr(755,root,root) %{_sbindir}/samba_dnsupdate
+%attr(755,root,root) %{_sbindir}/samba_downgrade_db
+%attr(755,root,root) %{_sbindir}/samba-gpupdate
 %attr(755,root,root) %{_sbindir}/samba_kcc
 %attr(755,root,root) %{_sbindir}/samba_spnupdate
 %attr(755,root,root) %{_sbindir}/samba_upgradedns
 %attr(755,root,root) %{_sbindir}/smbd
 %dir %{_libdir}/samba/bind9
-%attr(755,root,root) %{_libdir}/samba/bind9/dlz_bind9.so
-%attr(755,root,root) %{_libdir}/samba/bind9/dlz_bind9_9.so
 %attr(755,root,root) %{_libdir}/samba/bind9/dlz_bind9_10.so
 %attr(755,root,root) %{_libdir}/samba/bind9/dlz_bind9_11.so
+%attr(755,root,root) %{_libdir}/samba/bind9/dlz_bind9_12.so
+%attr(755,root,root) %{_libdir}/samba/bind9/dlz_bind9_14.so
+%attr(755,root,root) %{_libdir}/samba/bind9/dlz_bind9_16.so
 %dir %{_libdir}/samba/gensec
 %attr(755,root,root) %{_libdir}/samba/gensec/krb5.so
 %if %{with system_heimdal}
 %dir %{_libdir}/samba/hdb
 %attr(755,root,root) %{_libdir}/samba/hdb/hdb_samba4.so
 %endif
+%dir %{_libdir}/samba/krb5
+%attr(755,root,root) %{_libdir}/samba/krb5/async_dns_krb5_locator.so
 %dir %{_libdir}/samba/ldb
 %attr(755,root,root) %{_libdir}/samba/ldb/aclread.so
 %attr(755,root,root) %{_libdir}/samba/ldb/acl.so
 %attr(755,root,root) %{_libdir}/samba/ldb/anr.so
+%attr(755,root,root) %{_libdir}/samba/ldb/audit_log.so
+%attr(755,root,root) %{_libdir}/samba/ldb/count_attrs.so
 %attr(755,root,root) %{_libdir}/samba/ldb/descriptor.so
 %attr(755,root,root) %{_libdir}/samba/ldb/dirsync.so
 %attr(755,root,root) %{_libdir}/samba/ldb/dns_notify.so
 %attr(755,root,root) %{_libdir}/samba/ldb/dsdb_notification.so
+%attr(755,root,root) %{_libdir}/samba/ldb/encrypted_secrets.so
 %attr(755,root,root) %{_libdir}/samba/ldb/extended_dn_in.so
 %attr(755,root,root) %{_libdir}/samba/ldb/extended_dn_out.so
 %attr(755,root,root) %{_libdir}/samba/ldb/extended_dn_store.so
+%attr(755,root,root) %{_libdir}/samba/ldb/group_audit_log.so
 %attr(755,root,root) %{_libdir}/samba/ldb/ildap.so
 %attr(755,root,root) %{_libdir}/samba/ldb/instancetype.so
 %attr(755,root,root) %{_libdir}/samba/ldb/lazy_commit.so
 %attr(755,root,root) %{_libdir}/samba/ldb/ldbsamba_extensions.so
 %attr(755,root,root) %{_libdir}/samba/ldb/linked_attributes.so
-%attr(755,root,root) %{_libdir}/samba/ldb/local_password.so
+#%attr(755,root,root) %{_libdir}/samba/ldb/local_password.so
 %attr(755,root,root) %{_libdir}/samba/ldb/new_partition.so
 %attr(755,root,root) %{_libdir}/samba/ldb/objectclass_attrs.so
 %attr(755,root,root) %{_libdir}/samba/ldb/objectclass.so
 %attr(755,root,root) %{_libdir}/samba/ldb/objectguid.so
 %attr(755,root,root) %{_libdir}/samba/ldb/operational.so
+%attr(755,root,root) %{_libdir}/samba/ldb/paged_results.so
 %attr(755,root,root) %{_libdir}/samba/ldb/partition.so
 %attr(755,root,root) %{_libdir}/samba/ldb/password_hash.so
 %attr(755,root,root) %{_libdir}/samba/ldb/ranged_results.so
@@ -885,15 +937,15 @@ fi
 %attr(755,root,root) %{_libdir}/samba/ldb/schema_load.so
 %attr(755,root,root) %{_libdir}/samba/ldb/secrets_tdb_sync.so
 %attr(755,root,root) %{_libdir}/samba/ldb/show_deleted.so
-%attr(755,root,root) %{_libdir}/samba/ldb/simple_dn.so
-%attr(755,root,root) %{_libdir}/samba/ldb/simple_ldap_map.so
 %attr(755,root,root) %{_libdir}/samba/ldb/subtree_delete.so
 %attr(755,root,root) %{_libdir}/samba/ldb/subtree_rename.so
 %attr(755,root,root) %{_libdir}/samba/ldb/tombstone_reanimate.so
+%attr(755,root,root) %{_libdir}/samba/ldb/unique_object_sids.so
 %attr(755,root,root) %{_libdir}/samba/ldb/update_keytab.so
 %attr(755,root,root) %{_libdir}/samba/ldb/vlv.so
 %attr(755,root,root) %{_libdir}/samba/ldb/wins_ldb.so
 %dir %{_libdir}/samba/process_model
+%attr(755,root,root) %{_libdir}/samba/process_model/prefork.so
 %attr(755,root,root) %{_libdir}/samba/process_model/standard.so
 %dir %{_libdir}/samba/service
 %attr(755,root,root) %{_libdir}/samba/service/cldap.so
@@ -907,19 +959,18 @@ fi
 %attr(755,root,root) %{_libdir}/samba/service/nbtd.so
 %attr(755,root,root) %{_libdir}/samba/service/ntp_signd.so
 %attr(755,root,root) %{_libdir}/samba/service/s3fs.so
-%attr(755,root,root) %{_libdir}/samba/service/web.so
 %attr(755,root,root) %{_libdir}/samba/service/winbindd.so
 %attr(755,root,root) %{_libdir}/samba/service/wrepl.so
 %dir %{_libdir}/samba/vfs
 %attr(755,root,root) %{_libdir}/samba/vfs/acl_tdb.so
 %attr(755,root,root) %{_libdir}/samba/vfs/acl_xattr.so
 %attr(755,root,root) %{_libdir}/samba/vfs/aio_fork.so
-%attr(755,root,root) %{_libdir}/samba/vfs/aio_linux.so
 %attr(755,root,root) %{_libdir}/samba/vfs/aio_pthread.so
 %attr(755,root,root) %{_libdir}/samba/vfs/audit.so
 %attr(755,root,root) %{_libdir}/samba/vfs/btrfs.so
 %attr(755,root,root) %{_libdir}/samba/vfs/cap.so
 %attr(755,root,root) %{_libdir}/samba/vfs/catia.so
+%{?with_ceph:%attr(755,root,root) %{_libdir}/samba/vfs/ceph_snapshots.so}
 %attr(755,root,root) %{_libdir}/samba/vfs/commit.so
 %attr(755,root,root) %{_libdir}/samba/vfs/crossrename.so
 %attr(755,root,root) %{_libdir}/samba/vfs/default_quota.so
@@ -931,9 +982,10 @@ fi
 %attr(755,root,root) %{_libdir}/samba/vfs/fileid.so
 %attr(755,root,root) %{_libdir}/samba/vfs/fruit.so
 %attr(755,root,root) %{_libdir}/samba/vfs/full_audit.so
+%attr(755,root,root) %{_libdir}/samba/vfs/gpfs.so
+%attr(755,root,root) %{_libdir}/samba/vfs/io_uring.so
 %attr(755,root,root) %{_libdir}/samba/vfs/linux_xfs_sgid.so
 %attr(755,root,root) %{_libdir}/samba/vfs/media_harmony.so
-%attr(755,root,root) %{_libdir}/samba/vfs/netatalk.so
 %attr(755,root,root) %{_libdir}/samba/vfs/offline.so
 %attr(755,root,root) %{_libdir}/samba/vfs/posix_eadb.so
 %attr(755,root,root) %{_libdir}/samba/vfs/preopen.so
@@ -949,8 +1001,16 @@ fi
 %attr(755,root,root) %{_libdir}/samba/vfs/syncops.so
 %attr(755,root,root) %{_libdir}/samba/vfs/time_audit.so
 %attr(755,root,root) %{_libdir}/samba/vfs/unityed_media.so
+%attr(755,root,root) %{_libdir}/samba/vfs/virusfilter.so
+%attr(755,root,root) %{_libdir}/samba/vfs/widelinks.so
 %attr(755,root,root) %{_libdir}/samba/vfs/worm.so
 %attr(755,root,root) %{_libdir}/samba/vfs/xattr_tdb.so
+%dir %{_libexecdir}/samba
+%attr(755,root,root) %{_libexecdir}/samba/samba-bgqd
+%dir %{_datadir}/samba/admx
+%{_datadir}/samba/admx/samba.admx
+%lang(en) %{_datadir}/samba/admx/en-US
+%{_datadir}/samba/mdssvc
 %{_datadir}/samba/setup
 %{_mandir}/man1/oLschema2ldif.1*
 %{_mandir}/man1/profiles.1*
@@ -961,17 +1021,20 @@ fi
 %{_mandir}/man8/nmbd.8*
 %{_mandir}/man8/pdbedit.8*
 %{_mandir}/man8/samba.8*
+%{_mandir}/man8/samba-bgqd.8*
+%{_mandir}/man8/samba_downgrade_db.8*
+%{_mandir}/man8/samba-gpupdate.8*
 %{_mandir}/man8/smbd.8*
 %{_mandir}/man8/smbpasswd.8*
 %{_mandir}/man8/vfs_acl_tdb.8*
 %{_mandir}/man8/vfs_acl_xattr.8*
 %{_mandir}/man8/vfs_aio_fork.8*
-%{_mandir}/man8/vfs_aio_linux.8*
 %{_mandir}/man8/vfs_aio_pthread.8*
 %{_mandir}/man8/vfs_audit.8*
 %{_mandir}/man8/vfs_btrfs.8*
 %{_mandir}/man8/vfs_cap.8*
 %{_mandir}/man8/vfs_catia.8*
+%{?with_ceph:%{_mandir}/man8/vfs_ceph_snapshots.8*}
 %{_mandir}/man8/vfs_commit.8*
 %{_mandir}/man8/vfs_crossrename.8*
 %{_mandir}/man8/vfs_default_quota.8*
@@ -981,9 +1044,10 @@ fi
 %{_mandir}/man8/vfs_fileid.8*
 %{_mandir}/man8/vfs_fruit.8*
 %{_mandir}/man8/vfs_full_audit.8*
+%{_mandir}/man8/vfs_gpfs.8*
+%{_mandir}/man8/vfs_io_uring.8*
 %{_mandir}/man8/vfs_linux_xfs_sgid.8*
 %{_mandir}/man8/vfs_media_harmony.8*
-%{_mandir}/man8/vfs_netatalk.8*
 %{_mandir}/man8/vfs_preopen.8*
 %{_mandir}/man8/vfs_readahead.8*
 %{_mandir}/man8/vfs_readonly.8*
@@ -1000,6 +1064,8 @@ fi
 %{_mandir}/man8/vfs_offline.8*
 %{_mandir}/man8/vfs_shell_snap.8*
 %{_mandir}/man8/vfs_unityed_media.8*
+%{_mandir}/man8/vfs_virusfilter.8*
+%{_mandir}/man8/vfs_widelinks.8*
 
 %dir %{_sambahome}
 %dir /var/lib/samba
@@ -1022,12 +1088,16 @@ fi
 
 %files vfs-glusterfs
 %defattr(644,root,root,755)
+%if %{with glusterfs}
 %attr(755,root,root) %{_libdir}/samba/vfs/glusterfs.so
 %{_mandir}/man8/vfs_glusterfs.8*
+%endif
+%attr(755,root,root) %{_libdir}/samba/vfs/glusterfs_fuse.so
+%{_mandir}/man8/vfs_glusterfs_fuse.8*
 
 %files common
 %defattr(644,root,root,755)
-%doc README WHATSNEW.txt
+%doc PFIF.txt README.cifs-utils README.md SECURITY.md WHATSNEW.txt
 %dir %{_sysconfdir}/samba
 %attr(664,root,fileshare) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/samba/smb.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/samba/lmhosts
@@ -1039,16 +1109,13 @@ fi
 %attr(755,root,root) %{_bindir}/samba-tool
 %attr(755,root,root) %{_bindir}/smbpasswd
 %attr(755,root,root) %{_bindir}/testparm
-%attr(755,root,root) %{_bindir}/vfstest
 %dir %{_libdir}/samba/auth
-%attr(755,root,root) %{_libdir}/samba/auth/script.so
 %attr(755,root,root) %{_libdir}/samba/auth/samba4.so
 %dir %{_datadir}/samba
 %{_mandir}/man1/dbwrap_tool.1*
 %{_mandir}/man1/nmblookup.1*
 %{_mandir}/man1/reg*.1*
 %{_mandir}/man1/testparm.1*
-%{_mandir}/man1/vfstest.1*
 %{_mandir}/man5/lmhosts.5*
 %{_mandir}/man5/smb.conf.5*
 %{_mandir}/man5/smbpasswd.5*
@@ -1071,7 +1138,7 @@ fi
 %files client
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/cifsdd
-%attr(755,root,root) %{_bindir}/findsmb
+%attr(755,root,root) %{_bindir}/mdsearch
 %attr(755,root,root) %{_bindir}/mvxattr
 %attr(755,root,root) %{_bindir}/rpcclient
 %attr(755,root,root) %{_bindir}/smbcacls
@@ -1079,7 +1146,10 @@ fi
 %attr(755,root,root) %{_bindir}/smbcquotas
 %attr(755,root,root) %{_bindir}/smbtar
 %attr(755,root,root) %{_bindir}/smbtree
-%{_mandir}/man1/findsmb.1*
+%if %{with winexe}
+%attr(755,root,root) %{_bindir}/winexe
+%endif
+%{_mandir}/man1/mdsearch.1*
 %{_mandir}/man1/mvxattr.1*
 %{_mandir}/man1/rpcclient.1*
 %{_mandir}/man1/smbcacls.1*
@@ -1087,6 +1157,9 @@ fi
 %{_mandir}/man1/smbcquotas.1*
 %{_mandir}/man1/smbtar.1*
 %{_mandir}/man1/smbtree.1*
+%if %{with winexe}
+%attr(755,root,root) %{_mandir}/man1/winexe.1*
+%endif
 %{_mandir}/man8/cifsdd.8*
 
 %files winbind
@@ -1099,7 +1172,8 @@ fi
 %attr(755,root,root) %{_sbindir}/winbindd
 %attr(755,root,root) /%{_lib}/security/pam_winbind.so
 %attr(755,root,root) /%{_lib}/libnss_winbind.so*
-%attr(755,root,root) %{_libdir}/winbind_krb5_locator.so
+%dir %{_libdir}/samba/krb5
+%attr(755,root,root) %{_libdir}/samba/krb5/winbind_krb5_locator.so
 %attr(755,root,root) %{_libdir}/samba/libidmap-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libnss-info-samba4.so
 %dir %{_libdir}/samba/idmap
@@ -1119,7 +1193,6 @@ fi
 %{_mandir}/man1/ntlm_auth.1*
 %{_mandir}/man1/wbinfo*.1*
 %{_mandir}/man5/pam_winbind.conf.5*
-%{_mandir}/man7/winbind_krb5_locator.7*
 %{_mandir}/man8/idmap_ad.8*
 %{_mandir}/man8/idmap_autorid.8*
 %{_mandir}/man8/idmap_hash.8*
@@ -1132,12 +1205,16 @@ fi
 %{_mandir}/man8/idmap_tdb.8*
 %{_mandir}/man8/pam_winbind.8*
 %{_mandir}/man8/winbindd*.8*
+%{_mandir}/man8/winbind_krb5_locator.8*
 
 %if %{with cups}
 %files -n cups-backend-smb
 %defattr(644,root,root,755)
 %attr(755,root,root) %{cups_serverbin}/backend/smb
-%attr(755,root,root) %{_libdir}/samba/smbspool_krb5_wrapper
+%if "%{_libexecdir}" != "%{_libdir}"
+%dir %{_libexecdir}/samba
+%endif
+%attr(755,root,root) %{_libexecdir}/samba/smbspool_krb5_wrapper
 %attr(755,root,root) %{_bindir}/smbspool
 %{_mandir}/man8/smbspool.8*
 %{_mandir}/man8/smbspool_krb5_wrapper.8*
@@ -1166,6 +1243,8 @@ fi
 %attr(755,root,root) %ghost %{_libdir}/libdcerpc-samr.so.0
 %attr(755,root,root) %{_libdir}/libdcerpc-server.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libdcerpc-server.so.0
+%attr(755,root,root) %{_libdir}/libdcerpc-server-core.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libdcerpc-server-core.so.0
 %attr(755,root,root) %{_libdir}/libdcerpc.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libdcerpc.so.0
 %attr(755,root,root) %{_libdir}/libndr-krb5pac.so.*.*.*
@@ -1173,27 +1252,29 @@ fi
 %attr(755,root,root) %{_libdir}/libndr-nbt.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libndr-nbt.so.0
 %attr(755,root,root) %{_libdir}/libndr.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libndr.so.0
+%attr(755,root,root) %ghost %{_libdir}/libndr.so.2
 %attr(755,root,root) %{_libdir}/libndr-standard.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libndr-standard.so.0
 %attr(755,root,root) %{_libdir}/libsamba-credentials.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libsamba-credentials.so.0
+%attr(755,root,root) %ghost %{_libdir}/libsamba-credentials.so.1
 %attr(755,root,root) %{_libdir}/libsamba-errors.so.1
 %attr(755,root,root) %{_libdir}/libsamba-hostconfig.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libsamba-hostconfig.so.0
 %attr(755,root,root) %{_libdir}/libsamba-passdb.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libsamba-passdb.so.0
-%attr(755,root,root) %{_libdir}/libsamba-policy.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libsamba-policy.so.0
+%attr(755,root,root) %{_libdir}/libsamba-policy.cpython-3*so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libsamba-policy.cpython-3*.so.0
 %attr(755,root,root) %{_libdir}/libsamba-util.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libsamba-util.so.0
 %attr(755,root,root) %{_libdir}/libsamdb.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libsamdb.so.0
 %attr(755,root,root) %{_libdir}/libtevent-util.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libtevent-util.so.0
-%attr(755,root,root) %{_libdir}/libnetapi.so.0
+%attr(755,root,root) %{_libdir}/libnetapi.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libnetapi.so.1
 %attr(755,root,root) %{_libdir}/libsmbconf.so.0
-%attr(755,root,root) %{_libdir}/libsmbldap.so.0
+%attr(755,root,root) %{_libdir}/libsmbldap.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libsmbldap.so.2
 %dir %{_libdir}/samba
 
 %if %{without replace}
@@ -1231,10 +1312,10 @@ fi
 %attr(755,root,root) %{_libdir}/samba/libauth4-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libauthkrb5-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libauth-samba4.so
-%attr(755,root,root) %{_libdir}/samba/libauth-sam-reply-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libauth-unix-token-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libCHARSET3-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libcliauth-samba4.so
+%attr(755,root,root) %{_libdir}/samba/libclidns-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libcli-cldap-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libcli-ldap-common-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libcli-ldap-samba4.so
@@ -1242,8 +1323,12 @@ fi
 %attr(755,root,root) %{_libdir}/samba/libcli-smb-common-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libcli-spoolss-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libcluster-samba4.so
-%attr(755,root,root) %{_libdir}/samba/libcmdline-credentials-samba4.so
+%attr(755,root,root) %{_libdir}/samba/libcmdline-contexts-samba4.so
+%attr(755,root,root) %{_libdir}/samba/libcmdline-samba4.so
+%attr(755,root,root) %{_libdir}/samba/libcommon-auth-samba4.so
+%attr(755,root,root) %{_libdir}/samba/libctdb-event-client-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libdb-glue-samba4.so
+%attr(755,root,root) %{_libdir}/samba/libdcerpc-pkt-auth-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libdbwrap-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libdcerpc-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libdcerpc-samba-samba4.so
@@ -1255,6 +1340,7 @@ fi
 %attr(755,root,root) %{_libdir}/samba/libflag-mapping-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libgenrand-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libgensec-samba4.so
+%attr(755,root,root) %{_libdir}/samba/libgpext-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libgpo-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libgse-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libHDB-SAMBA4-samba4.so
@@ -1270,28 +1356,30 @@ fi
 %attr(755,root,root) %{_libdir}/samba/libmessages-dgm-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libmessages-util-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libMESSAGING-samba4.so
+%attr(755,root,root) %{_libdir}/samba/libMESSAGING-SEND-samba4.so
+%attr(755,root,root) %{_libdir}/samba/libmscat-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libmsghdr-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libmsrpc3-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libndr-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libndr-samba-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libnetif-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libnet-keytab-samba4.so
-%attr(755,root,root) %{_libdir}/samba/libnon-posix-acls-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libnpa-tstream-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libpac-samba4.so
-%attr(755,root,root) %{_libdir}/samba/libpopt-samba3-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libposix-eadb-samba4.so
+%attr(755,root,root) %{_libdir}/samba/libprinter-driver-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libprinting-migrate-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libprocess-model-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libregistry-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libsamba3-util-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libsamba-debug-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libsamba-modules-samba4.so
-%attr(755,root,root) %{_libdir}/samba/libsamba-net-samba4.so
-%attr(755,root,root) %{_libdir}/samba/libsamba-python-samba4.so
+%attr(755,root,root) %{_libdir}/samba/libsamba-net.cpython-3*-samba4.so
+%attr(755,root,root) %{_libdir}/samba/libsamba-python.cpython-3*-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libsamba-security-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libsamba-sockets-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libsamdb-common-samba4.so
+%attr(755,root,root) %{_libdir}/samba/libscavenge-dns-records-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libsecrets3-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libserver-id-db-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libserver-role-samba4.so
@@ -1299,18 +1387,17 @@ fi
 %attr(755,root,root) %{_libdir}/samba/libshares-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libsmbclient-raw-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libsmbd-base-samba4.so
-%attr(755,root,root) %{_libdir}/samba/libsmbd-conn-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libsmbd-shim-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libsmbldaphelper-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libsmbpasswdparser-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libsmb-transport-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libsocket-blocking-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libsys-rw-samba4.so
+%attr(755,root,root) %{_libdir}/samba/libtalloc-report-printf-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libtalloc-report-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libtdb-wrap-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libtime-basic-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libtrusts-util-samba4.so
-%attr(755,root,root) %{_libdir}/samba/libutil-cmdline-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libutil-reg-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libutil-setid-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libutil-tdb-samba4.so
@@ -1324,10 +1411,13 @@ fi
 %{_includedir}/samba-4.0/core/error.h
 %{_includedir}/samba-4.0/core/hresult.h
 %{_includedir}/samba-4.0/core/ntstatus.h
+%{_includedir}/samba-4.0/core/ntstatus_gen.h
 %{_includedir}/samba-4.0/core/werror.h
+%{_includedir}/samba-4.0/core/werror_gen.h
 %{_includedir}/samba-4.0/credentials.h
 %{_includedir}/samba-4.0/dcerpc.h
 %{_includedir}/samba-4.0/dcerpc_server.h
+%{_includedir}/samba-4.0/dcesrv_core.h
 %{_includedir}/samba-4.0/domain_credentials.h
 %dir %{_includedir}/samba-4.0/gen_ndr
 %{_includedir}/samba-4.0/gen_ndr/atsvc.h
@@ -1378,22 +1468,19 @@ fi
 %dir %{_includedir}/samba-4.0/util
 %{_includedir}/samba-4.0/util/attr.h
 %{_includedir}/samba-4.0/util/blocking.h
-%{_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/genrand.h
 %{_includedir}/samba-4.0/util/idtree.h
 %{_includedir}/samba-4.0/util/idtree_random.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/tevent_ntstatus.h
 %{_includedir}/samba-4.0/util/tevent_unix.h
 %{_includedir}/samba-4.0/util/tevent_werror.h
+%{_includedir}/samba-4.0/util/tfork.h
 %{_includedir}/samba-4.0/util/time.h
 %{_includedir}/samba-4.0/util_ldb.h
 %{_includedir}/samba-4.0/lookup_sid.h
@@ -1406,6 +1493,7 @@ fi
 %attr(755,root,root) %{_libdir}/libdcerpc-binding.so
 %attr(755,root,root) %{_libdir}/libdcerpc-samr.so
 %attr(755,root,root) %{_libdir}/libdcerpc-server.so
+%attr(755,root,root) %{_libdir}/libdcerpc-server-core.so
 %attr(755,root,root) %{_libdir}/libdcerpc.so
 %attr(755,root,root) %{_libdir}/libndr-krb5pac.so
 %attr(755,root,root) %{_libdir}/libndr-nbt.so
@@ -1416,7 +1504,7 @@ fi
 %attr(755,root,root) %{_libdir}/libsamba-errors.so
 %attr(755,root,root) %{_libdir}/libsamba-hostconfig.so
 %attr(755,root,root) %{_libdir}/libsamba-passdb.so
-%attr(755,root,root) %{_libdir}/libsamba-policy.so
+%attr(755,root,root) %{_libdir}/libsamba-policy.cpython-3*.so
 %attr(755,root,root) %{_libdir}/libsamba-util.so
 %attr(755,root,root) %{_libdir}/libsamdb.so
 %attr(755,root,root) %{_libdir}/libsmbconf.so
@@ -1432,7 +1520,7 @@ fi
 %{_pkgconfigdir}/netapi.pc
 %{_pkgconfigdir}/samba-credentials.pc
 %{_pkgconfigdir}/samba-hostconfig.pc
-%{_pkgconfigdir}/samba-policy.pc
+%{_pkgconfigdir}/samba-policy.cpython-3*.pc
 %{_pkgconfigdir}/samba-util.pc
 %{_pkgconfigdir}/samdb.pc
 
@@ -1443,49 +1531,67 @@ fi
 %{_mandir}/man3/Parse::Pidl*.3*
 %{perl_vendorlib}/Parse/Pidl*
 
-%files -n python-samba
+%files -n python3-samba
 %defattr(644,root,root,755)
-%dir %{py_sitedir}/samba
-%attr(755,root,root) %{py_sitedir}/samba/*.so
-%{py_sitedir}/samba/*.py[co]
-%dir %{py_sitedir}/samba/dcerpc
-%{py_sitedir}/samba/dcerpc/*.py[co]
-%attr(755,root,root) %{py_sitedir}/samba/dcerpc/*.so
-%dir %{py_sitedir}/samba/kcc
-%{py_sitedir}/samba/kcc/*.py[co]
-%dir %{py_sitedir}/samba/netcmd
-%{py_sitedir}/samba/netcmd/*.py[co]
-%dir %{py_sitedir}/samba/provision
-%{py_sitedir}/samba/provision/*.py[co]
-%dir %{py_sitedir}/samba/samba3
-%attr(755,root,root) %{py_sitedir}/samba/samba3/*.so
-%{py_sitedir}/samba/samba3/*.py[co]
-%dir %{py_sitedir}/samba/subunit
-%{py_sitedir}/samba/subunit/*.py[co]
-%dir %{py_sitedir}/samba/tests
-%{py_sitedir}/samba/tests/*.py[co]
-%dir %{py_sitedir}/samba/tests/blackbox
-%{py_sitedir}/samba/tests/blackbox/*.py[co]
-%dir %{py_sitedir}/samba/tests/dcerpc
-%{py_sitedir}/samba/tests/dcerpc/*.py[co]
-%dir %{py_sitedir}/samba/tests/dns_forwarder_helpers
-%{py_sitedir}/samba/tests/dns_forwarder_helpers/*.py[co]
-%dir %{py_sitedir}/samba/tests/kcc
-%{py_sitedir}/samba/tests/kcc/*.py[co]
-%dir %{py_sitedir}/samba/tests/samba_tool
-%{py_sitedir}/samba/tests/samba_tool/*.py[co]
-%dir %{py_sitedir}/samba/third_party
-%{py_sitedir}/samba/third_party/*.py[co]
-%dir %{py_sitedir}/samba/third_party/iso8601
-%{py_sitedir}/samba/third_party/iso8601/*.py[co]
-%dir %{py_sitedir}/samba/web_server
-%{py_sitedir}/samba/web_server/*.py[co]
+%dir %{py3_sitedir}/samba
+%{py3_sitedir}/samba/*.py
+%{py3_sitedir}/samba/__pycache__
+%attr(755,root,root) %{py3_sitedir}/samba/*.so
+%dir %{py3_sitedir}/samba/dcerpc
+%{py3_sitedir}/samba/dcerpc/*.py
+%{py3_sitedir}/samba/dcerpc/__pycache__
+%attr(755,root,root) %{py3_sitedir}/samba/dcerpc/*.so
+%dir %{py3_sitedir}/samba/emulate
+%{py3_sitedir}/samba/emulate/*.py
+%{py3_sitedir}/samba/emulate/__pycache__
+%dir %{py3_sitedir}/samba/gp_parse
+%{py3_sitedir}/samba/gp_parse/*.py
+%{py3_sitedir}/samba/gp_parse/__pycache__
+%dir %{py3_sitedir}/samba/kcc
+%{py3_sitedir}/samba/kcc/*.py
+%{py3_sitedir}/samba/kcc/__pycache__
+%dir %{py3_sitedir}/samba/netcmd
+%{py3_sitedir}/samba/netcmd/*.py
+%{py3_sitedir}/samba/netcmd/__pycache__
+%dir %{py3_sitedir}/samba/provision
+%{py3_sitedir}/samba/provision/*.py
+%{py3_sitedir}/samba/provision/__pycache__
+%dir %{py3_sitedir}/samba/samba3
+%{py3_sitedir}/samba/samba3/*.py
+%{py3_sitedir}/samba/samba3/__pycache__
+%attr(755,root,root) %{py3_sitedir}/samba/samba3/*.so
+%dir %{py3_sitedir}/samba/subunit
+%{py3_sitedir}/samba/subunit/*.py
+%{py3_sitedir}/samba/subunit/__pycache__
+%dir %{py3_sitedir}/samba/tests
+%{py3_sitedir}/samba/tests/*.py
+%{py3_sitedir}/samba/tests/__pycache__
+%dir %{py3_sitedir}/samba/tests/blackbox
+%{py3_sitedir}/samba/tests/blackbox/*.py
+%{py3_sitedir}/samba/tests/blackbox/__pycache__
+%dir %{py3_sitedir}/samba/tests/dcerpc
+%{py3_sitedir}/samba/tests/dcerpc/*.py
+%{py3_sitedir}/samba/tests/dcerpc/__pycache__
+%dir %{py3_sitedir}/samba/tests/dns_forwarder_helpers
+%{py3_sitedir}/samba/tests/dns_forwarder_helpers/*.py
+%{py3_sitedir}/samba/tests/dns_forwarder_helpers/__pycache__
+%dir %{py3_sitedir}/samba/tests/kcc
+%{py3_sitedir}/samba/tests/kcc/*.py
+%{py3_sitedir}/samba/tests/kcc/__pycache__
+%dir %{py3_sitedir}/samba/tests/krb5
+%{py3_sitedir}/samba/tests/krb5/*.py
+%{py3_sitedir}/samba/tests/krb5/__pycache__
+%dir %{py3_sitedir}/samba/tests/samba_tool
+%{py3_sitedir}/samba/tests/samba_tool/*.py
+%{py3_sitedir}/samba/tests/samba_tool/__pycache__
+%dir %{py3_sitedir}/samba/tests/emulate
+%{py3_sitedir}/samba/tests/emulate/*.py
+%{py3_sitedir}/samba/tests/emulate/__pycache__
 %if %{without system_libs}
-%attr(755,root,root) %{py_sitedir}/ldb.so
-%attr(755,root,root) %{py_sitedir}/talloc.so
-%attr(755,root,root) %{py_sitedir}/tdb.so
-%attr(755,root,root) %{py_sitedir}/_tevent.so
-%{py_sitedir}/tevent.py[co]
+%attr(755,root,root) %{py3_sitedir}/ldb.so
+%attr(755,root,root) %{py3_sitedir}/talloc.so
+%attr(755,root,root) %{py3_sitedir}/tdb.so
+%attr(755,root,root) %{py3_sitedir}/_tevent.so
 %endif
 
 %files test
@@ -1502,6 +1608,7 @@ fi
 %{_mandir}/man1/masktest.1*
 %{_mandir}/man1/ndrdump.1*
 %{_mandir}/man1/smbtorture.1*
+%{_mandir}/man1/vfstest.1*
 
 %files -n libsmbclient
 %defattr(644,root,root,755)
@@ -1533,7 +1640,6 @@ fi
 %{_sysconfdir}/ctdb/notify.sh
 %{_sysconfdir}/ctdb/debug-hung-script.sh
 %{_sysconfdir}/ctdb/ctdb-crash-cleanup.sh
-%{_sysconfdir}/ctdb/gcore_trace.sh
 %{_sysconfdir}/ctdb/functions
 %{_sysconfdir}/ctdb/debug_locks.sh
 %dir %{_localstatedir}/lib/ctdb
@@ -1556,29 +1662,31 @@ fi
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sudoers.d/ctdb
 # CTDB scripts, no config files
 # script with executable bit means activated
-%dir %{_sysconfdir}/ctdb/events.d
-%{_sysconfdir}/ctdb/events.d/00.ctdb
-%{_sysconfdir}/ctdb/events.d/01.reclock
-%{_sysconfdir}/ctdb/events.d/05.system
-%{_sysconfdir}/ctdb/events.d/06.nfs
-%{_sysconfdir}/ctdb/events.d/10.external
-%{_sysconfdir}/ctdb/events.d/10.interface
-%{_sysconfdir}/ctdb/events.d/11.natgw
-%{_sysconfdir}/ctdb/events.d/11.routing
-%{_sysconfdir}/ctdb/events.d/13.per_ip_routing
-%{_sysconfdir}/ctdb/events.d/20.multipathd
-%{_sysconfdir}/ctdb/events.d/31.clamd
-%{_sysconfdir}/ctdb/events.d/40.vsftpd
-%{_sysconfdir}/ctdb/events.d/41.httpd
-%{_sysconfdir}/ctdb/events.d/49.winbind
-%{_sysconfdir}/ctdb/events.d/50.samba
-%{_sysconfdir}/ctdb/events.d/60.nfs
-%{_sysconfdir}/ctdb/events.d/70.iscsi
-%{_sysconfdir}/ctdb/events.d/91.lvs
-%{_sysconfdir}/ctdb/events.d/99.timeout
-%{_sysconfdir}/ctdb/events.d/README
-%dir %{_sysconfdir}/ctdb/notify.d
-%{_sysconfdir}/ctdb/notify.d/README
+%dir %{_sysconfdir}/ctdb/events
+%dir %{_sysconfdir}/ctdb/events/legacy
+%dir %{_sysconfdir}/ctdb/events/notification
+%{_sysconfdir}/ctdb/events/notification/README
+%dir %{_datadir}/ctdb
+%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/48.netbios.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
 %{systemdtmpfilesdir}/ctdb.conf
 %attr(755,root,root) %{_sbindir}/ctdbd
 %attr(755,root,root) %{_sbindir}/ctdbd_wrapper
@@ -1587,17 +1695,20 @@ fi
 %attr(755,root,root) %{_bindir}/ltdbtool
 %attr(755,root,root) %{_bindir}/ctdb_diagnostics
 %attr(755,root,root) %{_bindir}/onnode
-%dir %{_libdir}/ctdb
-%{_libdir}/ctdb/ctdb_natgw
-%{_libdir}/ctdb/ctdb_recovery_helper
-%{_libdir}/ctdb/smnotify
-%attr(755,root,root) %{_libdir}/ctdb/ctdb_event
-%attr(755,root,root) %{_libdir}/ctdb/ctdb_eventd
-%attr(755,root,root) %{_libdir}/ctdb/ctdb_killtcp
-%attr(755,root,root) %{_libdir}/ctdb/ctdb_lock_helper
-%attr(755,root,root) %{_libdir}/ctdb/ctdb_lvs
-%attr(755,root,root) %{_libdir}/ctdb/ctdb_mutex_fcntl_helper
-%attr(755,root,root) %{_libdir}/ctdb/ctdb_takeover_helper
+%dir %{_libexecdir}/ctdb
+%{_libexecdir}/ctdb/ctdb_natgw
+%{_libexecdir}/ctdb/ctdb_recovery_helper
+%{_libexecdir}/ctdb/smnotify
+%attr(755,root,root) %{_libexecdir}/ctdb/ctdb-config
+%attr(755,root,root) %{_libexecdir}/ctdb/ctdb-event
+%attr(755,root,root) %{_libexecdir}/ctdb/ctdb-eventd
+%attr(755,root,root) %{_libexecdir}/ctdb/ctdb_killtcp
+%attr(755,root,root) %{_libexecdir}/ctdb/ctdb_lock_helper
+%attr(755,root,root) %{_libexecdir}/ctdb/ctdb_lvs
+%attr(755,root,root) %{_libexecdir}/ctdb/ctdb_mutex_fcntl_helper
+%attr(755,root,root) %{_libexecdir}/ctdb/ctdb-path
+%attr(755,root,root) %{_libexecdir}/ctdb/ctdb_takeover_helper
+%attr(755,root,root) %{_libexecdir}/ctdb/tdb_mutex_check
 
 %{_mandir}/man1/ctdb.1*
 %{_mandir}/man1/ctdb_diagnostics.1*
@@ -1606,7 +1717,9 @@ fi
 %{_mandir}/man1/ltdbtool.1*
 %{_mandir}/man1/ping_pong.1*
 %{_mandir}/man1/ctdbd_wrapper.1*
-%{_mandir}/man5/ctdbd.conf.5*
+%{_mandir}/man5/ctdb-script.options.5*
+%{_mandir}/man5/ctdb.conf.5*
+%{_mandir}/man5/ctdb.sysconfig.5*
 %{_mandir}/man7/ctdb.7*
 %{_mandir}/man7/ctdb-tunables.7*
 %{_mandir}/man7/ctdb-statistics.7*
This page took 0.106991 seconds and 4 git commands to generate.