Update to Samba 4.1.20

If fedpkg adds files to the git history, sometimes git doesn't add them
to the commit.

.gitignore

@@ -40,3 +40,10 @@ samba-3.6.0pre1.tar.gz
 /samba-4.1.8.tar.xz
 /samba-4.1.9.tar.xz
 /samba-4.1.11.tar.gz
+/samba-4.1.11.tar.xz
+/samba-4.1.12.tar.xz
+/samba-4.1.13.tar.xz
+/samba-4.1.14.tar.xz
+/samba-4.1.15.tar.xz
+/samba-4.1.17.tar.xz
+/samba-4.1.20.tar.xz

samba.spec

@@ -1,9 +1,14 @@
-# Set --with testsuite or %bcond_without to run the Samba torture testsuite.
+# rpmbuild --rebuild --with testsuite --without clustering samba.src.rpm
+#
+# The testsuite is disabled by default. Set --with testsuite or %bcond_without
+# to run the Samba torture testsuite.
 %bcond_with testsuite
+# ctdb is enabled by default, you can disable it with: --without clustering
+%bcond_without clustering
 
 %define main_release 1
 
-%define samba_version 4.1.11
+%define samba_version 4.1.20
 %define talloc_version 2.0.8
 %define ntdb_version 0.9
 %define tdb_version 1.2.12
@@ -38,6 +43,11 @@
 %endif
 %endif
 
+%global libwbc_alternatives_suffix %nil
+%if 0%{?__isa_bits} == 64
+%global libwbc_alternatives_suffix -64
+%endif
+
 %global with_mitkrb5 1
 %global with_dc 0
 
@@ -47,7 +57,11 @@
 %global with_dc 1
 %endif
 
+%global with_clustering_support 0
+
+%if %{with clustering}
 %global with_clustering_support 1
+%endif
 
 %{!?python_libdir: %define python_libdir %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1,1)")}
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
@@ -73,7 +87,7 @@ License:        GPLv3+ and LGPLv3+
 Group:          System Environment/Daemons
 URL:            http://www.samba.org/
 
-Source0:        http://ftp.samba.org/pub/samba/stable/samba-%{version}%{pre_release}.tar.gz
+Source0:        samba-%{version}%{pre_release}.tar.xz
 
 # Red Hat specific replacement-files
 Source1: samba.log
@@ -408,7 +422,7 @@ packages of Samba.
 
 ### TEST-LIBS
 %package test-libs
-Summary: Libraries need by teh testing tools for Samba servers and clients
+Summary: Libraries need by the testing tools for Samba servers and clients
 Group: Applications/System
 Requires: %{name}-libs = %{samba_depver}
 
@@ -420,6 +434,7 @@ Requires: %{name}-libs = %{samba_depver}
 Summary: Testing devel files for Samba servers and clients
 Group: Applications/System
 Requires: %{name}-libs = %{samba_depver}
+Requires: %{name}-test-libs = %{samba_depver}
 
 %description test-devel
 samba-test-devel provides testing devel files for both the server and client
@@ -555,7 +570,6 @@ LDFLAGS="-Wl,-z,relro,-z,now" \
         --with-pammodulesdir=%{_libdir}/security \
         --with-lockdir=/var/lib/samba \
         --with-cachedir=/var/lib/samba \
-        --with-perl-lib-install-dir=%{perl_vendorlib} \
         --disable-gnutls \
         --disable-rpath-install \
         --with-shared-modules=%{_samba4_modules} \
@@ -609,6 +623,11 @@ install -d -m 0755 %{buildroot}/var/run/winbindd
 install -d -m 0755 %{buildroot}/%{_libdir}/samba
 install -d -m 0755 %{buildroot}/%{_libdir}/pkgconfig
 
+# Move libwbclient.so* into private directory, it cannot be just libdir/samba
+# because samba uses rpath with this directory.
+install -d -m 0755 %{buildroot}/%{_libdir}/samba/wbclient
+mv %{buildroot}/%{_libdir}/libwbclient.so* %{buildroot}/%{_libdir}/samba/wbclient
+
 # Install other stuff
 install -d -m 0755 %{buildroot}%{_sysconfdir}/logrotate.d
 install -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/samba
@@ -706,9 +725,33 @@ fi
 %endif # with_libsmbclient
 
 %if %with_libwbclient
-%post -n libwbclient -p /sbin/ldconfig
+%posttrans -n libwbclient
+# It has to be posttrans here to make sure all files of a previous version
+# without alternatives support are removed
+%{_sbindir}/update-alternatives --install %{_libdir}/libwbclient.so.0.11 \
+                                libwbclient.so.0.11%{libwbc_alternatives_suffix} %{_libdir}/samba/wbclient/libwbclient.so.0.11 10
+/sbin/ldconfig
+
+%preun -n libwbclient
+%{_sbindir}/update-alternatives --remove libwbclient.so.0.11%{libwbc_alternatives_suffix} %{_libdir}/samba/wbclient/libwbclient.so.0.11
+/sbin/ldconfig
+
+%posttrans -n libwbclient-devel
+%{_sbindir}/update-alternatives --install %{_libdir}/libwbclient.so \
+                                libwbclient.so%{libwbc_alternatives_suffix} %{_libdir}/samba/wbclient/libwbclient.so 10
+
+%preun -n libwbclient-devel
+# alternatives checks if the file which should be removed is a link or not, but
+# not if it points to the /etc/alternatives directory or to some other place.
+# When downgrading to a version where alternatives is not used and
+# libwbclient.so is a link and not a file it will be removed. The following
+# check removes the alternatives files manually if that is the case.
+if [ "`readlink %{_libdir}/libwbclient.so`" == "libwbclient.so.0.11" ]; then
+    /bin/rm -f /etc/alternatives/libwbclient.so%{libwbc_alternatives_suffix} /var/lib/alternatives/libwbclient.so%{libwbc_alternatives_suffix} 2> /dev/null
+else
+    %{_sbindir}/update-alternatives --remove libwbclient.so%{libwbc_alternatives_suffix} %{_libdir}/samba/wbclient/libwbclient.so
+fi
 
-%postun -n libwbclient -p /sbin/ldconfig
 %endif # with_libwbclient
 
 %post test -p /sbin/ldconfig
@@ -879,7 +922,6 @@ rm -rf %{buildroot}
 %{_bindir}/smbta-util
 %{_bindir}/smbtar
 %{_bindir}/smbtree
-%{_libdir}/samba/libldb-cmdline.so
 %{_mandir}/man1/dbwrap_tool.1*
 %{_mandir}/man1/nmblookup.1*
 %{_mandir}/man1/oLschema2ldif.1*
@@ -1073,6 +1115,7 @@ rm -rf %{buildroot}
 %{_libdir}/samba/service
 %{_libdir}/libdcerpc-server.so.*
 %{_libdir}/samba/libdfs_server_ad.so
+%{_libdir}/samba/libdnsserver_common.so
 %{_libdir}/samba/libdsdb-module.so
 %{_libdir}/samba/libntvfs.so
 %{_libdir}/samba/libposix_eadb.so
@@ -1080,6 +1123,7 @@ rm -rf %{buildroot}
 %else
 %doc packaging/README.dc-libs
 %exclude %{_libdir}/samba/libdfs_server_ad.so
+%exclude %{_libdir}/samba/libdnsserver_common.so
 %endif # with_dc
 
 ### DEVEL
@@ -1251,6 +1295,7 @@ rm -rf %{buildroot}
 %if %{with_vfs_glusterfs}
 %files vfs-glusterfs
 %{_libdir}/samba/vfs/glusterfs.so
+%{_mandir}/man8/vfs_glusterfs.8.gz
 %endif
 
 ### LIBS
@@ -1436,14 +1481,14 @@ rm -rf %{buildroot}
 %if %with_libwbclient
 %files -n libwbclient
 %defattr(-,root,root)
-%{_libdir}/libwbclient.so.*
+%{_libdir}/samba/wbclient/libwbclient.so.*
 %{_libdir}/samba/libwinbind-client.so
 
 ### LIBWBCLIENT-DEVEL
 %files -n libwbclient-devel
 %defattr(-,root,root)
 %{_includedir}/samba-4.0/wbclient.h
-%{_libdir}/libwbclient.so
+%{_libdir}/samba/wbclient/libwbclient.so
 %{_libdir}/pkgconfig/wbclient.pc
 %endif # with_libwbclient
 
@@ -1572,6 +1617,46 @@ rm -rf %{buildroot}
 %{_mandir}/man8/pam_winbind.8*
 
 %changelog
+* Mon Sep 14 2015 Andreas Schneider <asn@redhat.com> - 4.1.20-1
+- Update to Samba 4.1.20
+- resolves: #1261080 - Fix memleak in libsmbclient
+
+* Mon Feb 23 2015 Andreas Schneider <asn@redhat.com> - 4.1.17-1
+- Update to Samba 4.1.17
+- Fix CVE-2015-0240 - RCE in netlogon
+
+* Tue Jan 13 2015 - Andreas Schneider <asn@redhat.com> - 4.1.15-1
+- Update to Samba 4.1.14.
+- resolves: #1175710 - Fix auth with long hostnames.
+
+* Wed Jan 07 2015 - Andreas Schneider <asn@redhat.com> - 4.1.14-2
+- Add missing requires to libwbclient.
+
+* Wed Dec 10 2014 - Andreas Schneider <asn@redhat.com> - 4.1.14-1
+- Update to Samba 4.1.14.
+
+* Wed Nov 26 2014 - Andreas Schneider <asn@redhat.com> - 4.1.13-1
+- Update to Samba 4.1.12.
+- Use alternatives for libwbclient.
+
+* Tue Oct 07 2014 - Andreas Schneider <asn@redhat.com> - 4.1.12-5
+- resolves: #1033595 - Fix segfault in winbind.
+
+* Wed Sep 24 2014 - Andreas Schneider <asn@redhat.com> - 4.1.12-1
+- Update to Samba 4.1.12.
+
+* Tue Sep 09 2014 Jitka Plesnikova <jplesnik@redhat.com> - 2:4.1.11-1.4
+- Perl 5.20 mass
+
+* Wed Aug 27 2014 Jitka Plesnikova <jplesnik@redhat.com> - 2:4.1.11-1.3
+- Perl 5.20 rebuild
+
+* Wed Aug 20 2014 Kalev Lember <kalevlember@gmail.com> - 2:4.1.11-1.2
+- Rebuilt for rpm dependency generator failure (#1131892)
+
+* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:4.1.11-1.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
 * Fri Aug 1 2014 - Jared Smith <jsmith@fedoraproject.org> - 4.1.11-1
 - Update to upstream Samba 4.1.11 release
 - resolves: #1126015 - Fix CVE-2014-3560

sources

@@ -1 +1 @@
-d7377e7247ad16f6b15363727b91b761  samba-4.1.11.tar.gz
+7fde41cca34d23caf467ff353446e112  samba-4.1.20.tar.xz

swat.desktop

@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=Samba Configuration
-Name[de]=Samba Konfiguration
-Type=Application
-Comment=Configure Samba with a web based interface
-Exec=htmlview http://127.0.0.1:901/
-Terminal=false
-Categories=X-Red-Hat-Extra;Application;System;X-Red-Hat-ServerConfig;