X-Git-Url: http://git.pld-linux.org/?p=packages%2Fsamba.git;a=blobdiff_plain;f=samba.spec;h=507b81ec06f3dfbcf971b5c824722c485fb2348d;hp=0d7df0a24d7d280f1b18681d0500d90eebffa915;hb=0ecf198;hpb=a3afb33496b0ed8868cc2a5c0fd81890786efb13

diff --git a/samba.spec b/samba.spec
index 0d7df0a..507b81e 100644
--- a/samba.spec
+++ b/samba.spec
@@ -1,6 +1,6 @@
 # TODO:
-# - tracker support (--enable-spotlight)?
-# - ressurect ceph
+# - bcond/subpackage for Spotlight tracker backend (BR: glib2-devel tracker-devel >= 2.0)?
+# - gpfs.h (nfs-ganesha?)
 #
 # Note:
 # - unpredictible build failures:
@@ -9,8 +9,9 @@
 #
 # Conditional build:
 %bcond_without	ads		# ActiveDirectory support
-%bcond_with	ceph		# Ceph (RADOS) storage 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
@@ -24,10 +25,10 @@
 %bcond_with	replace
 
 %if %{with system_libs}
-%define		ldb_ver		2.1.1
-%define		talloc_ver	2:2.3.0
-%define		tdb_ver		2:1.4.2
-%define		tevent_ver	0.10.0
+%define		ldb_ver		2.2.1
+%define		talloc_ver	2:2.3.1
+%define		tdb_ver		2:1.4.3
+%define		tevent_ver	0.10.2
 %endif
 
 # dmapi-devel with xfsprogs-devel >= 4.11(?) needs largefile (64bit off_t) that isn't detected properly
@@ -41,13 +42,13 @@
 Summary:	Samba Active Directory and SMB server
 Summary(pl.UTF-8):	Serwer Samba Active Directory i SMB
 Name:		samba
-Version:	4.12.0
+Version:	4.13.8
 Release:	1
 Epoch:		1
 License:	GPL v3
 Group:		Networking/Daemons
 Source0:	https://download.samba.org/pub/samba/stable/%{name}-%{version}.tar.gz
-# Source0-md5:	387dd6b03bd01ac17534e439562af3f5
+# Source0-md5:	d260ca47f3046f9a8cb37d7ad94a0ded
 Source1:	smb.init
 Source2:	samba.pamd
 Source4:	samba.sysconfig
@@ -61,7 +62,6 @@ 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
-
 Patch4:		unicodePwd-nthash-values-over-LDAP.patch
 Patch5:		%{name}-heimdal.patch
 Patch6:		server-role.patch
@@ -70,7 +70,8 @@ Patch8:		%{name}-no_libbsd.patch
 URL:		https://www.samba.org/
 BuildRequires:	acl-devel
 %{?with_avahi:BuildRequires:	avahi-devel}
-%{?with_ceph:BuildRequires:	ceph-devel >= 0.73}
+BuildRequires:	bison
+%{?with_ceph:BuildRequires:	ceph-devel >= 11}
 BuildRequires:	cmocka-devel >= 1.1.3
 %if %{with winexe}
 BuildRequires:	crossmingw32-gcc
@@ -81,28 +82,39 @@ BuildRequires:	cyrus-sasl-devel >= 2
 BuildRequires:	dbus-devel
 %{?with_dmapi:BuildRequires:	dmapi-devel}
 BuildRequires:	docbook-style-xsl-nons
+BuildRequires:	flex
 # just FAM API
 BuildRequires:	gamin-devel
-BuildRequires:	gdbm-devel
 BuildRequires:	gettext-tools
-BuildRequires:	glusterfs-devel
+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
@@ -117,17 +129,21 @@ 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:	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 < 2.3
 BuildRequires:	python3-ldb-devel >= %{ldb_ver}
 BuildRequires:	python3-talloc-devel >= %{talloc_ver}
 BuildRequires:	python3-tdb >= %{tdb_ver}
@@ -149,38 +165,38 @@ 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
@@ -214,6 +230,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.
@@ -247,8 +264,8 @@ Group:		Networking/Daemons
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 # for samba-tool script
 Requires:	python3-samba = %{epoch}:%{version}-%{release}
-Obsoletes:	samba3-common
-Obsoletes:	samba4-common
+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
@@ -267,8 +284,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
@@ -290,10 +307,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
@@ -310,7 +327,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.
@@ -324,7 +341,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
@@ -339,7 +356,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.
@@ -361,7 +378,7 @@ Requires:	tevent >= %{tevent_ver}
 %endif
 # samba 4.11+ dropped support for python2
 Obsoletes:	python-samba < 1:4.11
-Obsoletes:	samba-vfs-notify_fam
+Obsoletes:	samba-vfs-notify_fam < 1:4.4.4
 
 %description libs
 Samba shared libraries.
@@ -374,8 +391,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.
@@ -387,7 +404,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
@@ -427,9 +444,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
@@ -443,7 +460,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
@@ -458,8 +475,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.
@@ -473,10 +490,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.
@@ -544,7 +559,6 @@ wyeksportowania do PMCD.
 %{?with_system_heimdal:%patch0 -p1}
 %patch1 -p1
 %patch2 -p1
-
 %patch4 -p1
 %{?with_system_heimdal:%patch5 -p1}
 %patch6 -p1
@@ -619,6 +633,7 @@ CPPFLAGS="${CPPFLAGS:-%rpmcppflags}" \
 	--with-winbind \
 	--%{?with_avahi:en}%{!?with_avahi:dis}able-avahi \
 	--enable-cups \
+	%{__enable_disable glusterfs} \
 	--enable-iprint
 
 %{__make} V=1
@@ -739,6 +754,19 @@ 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
@@ -747,15 +775,6 @@ fi
 %{_bindir}/net groupmap add sid=S-1-5-32-546 unixgroup=nobody type=builtin || :
 
 %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
 
 %triggerprein common -- samba4
 cp -a %{_sysconfdir}/samba/smb.conf %{_sysconfdir}/samba/smb.conf.samba4
@@ -864,6 +883,8 @@ fi
 %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}
@@ -912,8 +933,6 @@ 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
@@ -979,8 +998,13 @@ fi
 %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 %{_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*
@@ -1034,6 +1058,7 @@ fi
 %{_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
@@ -1056,14 +1081,16 @@ fi
 
 %files vfs-glusterfs
 %defattr(644,root,root,755)
+%if %{with glusterfs}
 %attr(755,root,root) %{_libdir}/samba/vfs/glusterfs.so
-%attr(755,root,root) %{_libdir}/samba/vfs/glusterfs_fuse.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 BUILD_SYSTEMS.txt PFIF.txt README.cifs-utils README.Coding README.contributing README.md 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
@@ -1125,6 +1152,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
@@ -1351,7 +1381,6 @@ 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
@@ -1434,7 +1463,6 @@ 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
@@ -1546,6 +1574,9 @@ fi
 %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__
@@ -1576,6 +1607,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)
@@ -1648,6 +1680,7 @@ fi
 %{_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