From 5fe31427a56b843ff15cc60dcece3fb66e3cb79b Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Fri, 5 Jan 2024 17:37:25 +0100
Subject: [PATCH] restore installing /var/lib/samba empty folders [release
 4.16.1-2mamba;Mon May 16 2022]

---
 samba.spec | 81 ++++++++----------------------------------------------
 1 file changed, 11 insertions(+), 70 deletions(-)

diff --git a/samba.spec b/samba.spec
index 757a2d7..008f2dc 100644
--- a/samba.spec
+++ b/samba.spec
@@ -7,7 +7,7 @@
 
 Name:          samba
 Version:       4.16.1
-Release:       1mamba
+Release:       2mamba
 Summary:       Samba provides seamless file and print services to SMB/CIFS clients
 Group:         System/Servers
 Vendor:        openmamba
@@ -301,7 +301,7 @@ PATH=/usr/bin:$PATH \
 
 install -d %{buildroot}/var/lib/samba/{netlogon,profiles,profdata,drivers}
 install -d %{buildroot}/var/log/samba
-#install -d %{buildroot}/var/run/samba
+install -d %{buildroot}/var/lock/samba/msg.lock
 install -d %{buildroot}/var/spool/samba
 
 install -d %{buildroot}%{_sysconfdir}/samba/private
@@ -340,42 +340,11 @@ install -D -m 0644 examples/LDAP/samba.schema \
 install -d %{buildroot}%{_prefix}/lib/cups/backend
 ln -s %{_bindir}/smbspool %{buildroot}%{_prefix}/lib/cups/backend/smb
 
-## install smb-ldap scripts
-#pushd examples/LDAP/smbldap-tools-%{smbldap_tools_ver}
-##sed -i "s|/etc/opt/IDEALX/|/etc/samba/|" smbldap_tools.pm
-#
-#make install \
-#   sbindir=%{buildroot}/usr/lib/samba/sbin \
-#   sysconfdir=%{buildroot}%{_sysconfdir}/samba
-#
-#install -m 0755 configure.pl \
-#   %{buildroot}/usr/lib/samba/sbin/configure.pl
-#install -m 0755 %{S:6} \
-#   %{buildroot}/usr/lib/samba/sbin/qilinux_smbldap_conf.sh
-#install -m 0640 %{S:9} \
-#   %{buildroot}%{_sysconfdir}/samba/smbldap-tools/smbldap.conf
-#install -m 0755 %{S:10} \
-#   %{buildroot}%{_libdir}/samba/sbin/mkhomedir.sh
-#
-##install -m 0640 %{S:9} %{buildroot}/usr/lib/samba/sbin/smbldap_conf.pm
-#popd
-
-## fix a problem with language files
-#ln -s it.msg %{buildroot}%{_libdir}/samba/it_IT.msg
-
-## create swat KDE menu entry
-#install -D -m 0644 %{S:11} \
-#   %{buildroot}%{_datadir}/applications/samba-swat.desktop
-
 install -D -m0755 %{S:13} %{buildroot}%{_sysconfdir}/NetworkManager/dispatcher.d/10_winbind
 
 # cifs.upcall is installed in arm build; --without-cisupcall seems uneffective
 rm -f %{buildroot}%{_sbindir}/cifs.upcall
 
-#install -d %{buildroot}/var/lib/samba/winbindd_privileged
-#%find_lang pam_winbind
-#%find_lang net
-
 install -D -m0644 examples/pam_winbind/pam_winbind.conf %{buildroot}%{_sysconfdir}/security/pam_winbind.conf
 
 install -d %{buildroot}%{_presetdir}
@@ -394,12 +363,6 @@ if [ $1 -ge 1 ]; then
    getent group filesharing >/dev/null || \
       groupadd filesharing -g %{filesharing_gid}
 fi
-#if [ $1 -gt 1 ]; then
-## update
-#   # since samba 3.0.11 smbldap tools have changed, 
-#   # and configuration must be fixed accordingly
-#   sed  -i "s|\(smbldap[^ ]*\).pl|\1|" /etc/samba/smb.conf
-#fi
 :
 
 %pre server
@@ -440,13 +403,6 @@ exit 0
 %preun server
 %systemd_preun smb
 %systemd_preun nmb
-#erase
-#if [ $1 -eq 0 ]; then
-#   if [ -f /etc/openldap/slapd.conf ]; then
-#      sed -i '/include.*samba.schema/d' /etc/openldap/slapd.conf
-#      chgrp ldap /etc/openldap/slapd.conf
-#   fi
-#fi
 :
 
 %postun server
@@ -454,25 +410,6 @@ exit 0
 %systemd_postun_with_restart smb
 :
 
-#%post swat
-## new install
-#if [ $1 -eq 1 ]; then
-#   grep -q swat /etc/services || cat >> /etc/services << _EOF
-#sw
-#at		901/tcp			# samba web interface admin tool
-#_EOF
-#   service xinetd reload
-#   exit 0
-#fi
-#exit 0
-
-#%preun swat
-## erase
-#if [ $1 -eq 0 ]; then
-#   /sbin/service xinetd reload || exit 0
-#fi
-#exit 0
-
 %post winbind
 %systemd_post winbind
 if [ $1 -ge 1 ]; then
@@ -690,13 +627,14 @@ fi
 %{_sbindir}/nmbd
 %{_sbindir}/smbd
 %{_prefix}/lib/cups/backend/smb
-#%dir %attr(755,root,root) /var/lib/samba/netlogon
-#%dir %attr(2775,root,users) /var/lib/samba/profiles
-#%dir %attr(755,root,root) /var/lib/samba/profdata
-#%dir %attr(755,root,root) /var/lib/samba/drivers
-#%dir %attr(755,root,root) /usr/lib/samba/sbin
+%dir %attr(755,root,root) /var/lib/samba/netlogon
+%dir %attr(2775,root,users) /var/lib/samba/profiles
+%dir %attr(755,root,root) /var/lib/samba/profdata
+%dir %attr(755,root,root) /var/lib/samba/drivers
 %dir /var/cache/samba
 %dir %attr(1777,root,root) /var/spool/samba
+%dir %attr(755,root,root) /var/lock/samba
+%dir %attr(755,root,root) /var/lock/samba/msg.lock
 #/%{_lib}/security/pam_smbpass.so
 %{_tmpfilesdir}/samba.conf
 %{_unitdir}/nmb.service
@@ -824,6 +762,9 @@ fi
 %{_mandir}/man8/winbindd.*
 
 %changelog
+* Mon May 16 2022 Silvan Calarco <silvan.calarco@mambasoft.it> 4.16.1-2mamba
+- restore installing /var/lib/samba empty folders
+
 * Tue May 03 2022 Automatic Build System <autodist@mambasoft.it> 4.16.1-1mamba
 - automatic version update by autodist