--- rpms/e-smith-samba/sme10/e-smith-samba.spec 2016/02/05 17:16:29 1.1 +++ rpms/e-smith-samba/sme10/e-smith-samba.spec 2021/11/01 01:08:54 1.25 @@ -1,15 +1,30 @@ -# $Id: e-smith-samba.spec,v 1.24 2015/11/30 19:20:37 stephdl Exp $ +# $Id: e-smith-samba.spec,v 1.24 2021/04/21 17:35:18 jpp Exp $ Summary: e-smith specific Samba configuration files and templates %define name e-smith-samba Name: %{name} %define version 2.6.0 -%define release 1 +%define release 24 Version: %{version} Release: %{release}%{?dist} License: GPL Group: Networking/Daemons Source: %{name}-%{version}.tar.xz +Patch0: e-smith-samba-2.6.0-displayCharset.patch +Patch1: e-smith-samba-2.6.0.bz9398.DeprecatedRsyslogSyntaxSamba.patch +Patch2: e-smith-samba-2.6.0-bz9688.skipredirect.patch +Patch3: e-smith-samba-2.6.0.bz10169.outlook2016domainmember.patch +Patch4: e-smith-samba-2.6.0-bz10963-bz10576-minprot-SMB2.patch +Patch5: e-smith-samba-2.6.0-bz9060-remove-win98-reg.patch +Patch6: e-smith-samba-2.6.0-bz11093-add-krb5-template.patch +Patch7: e-smith-samba-2.6.0-bz11198-fix-pid-dir.patch +Patch8: e-smith-samba-2.6.0-bz11199-fix-mutex-locking.patch +Patch9: e-smith-samba-2.6.0-bz11118-bz11117-bz11157-systemd-update.patch +Patch10: e-smith-samba-2.6.0-bz11348-user-create-profiledir.patch +Patch11: e-smith-samba-2.6.0-bz11349-logging.patch +Patch12: e-smith-samba-2.6.0-bz11555.patch +Patch13: e-smith-samba-2.6.0.bz11725.create_v6_profile_dir.patch + Obsoletes: e-smith-netlogon BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArchitectures: noarch @@ -38,6 +53,78 @@ Requires: /usr/bin/tdbbackup AutoReqProv: no %changelog +* Mon Nov 01 2021 Terry Fage 2.6.0-24.sme +- samba create v6 profile dir win10 [SME: 11725] + +* Mon Apr 19 2021 Jean-Philippe Pialasse 2.6.0-23.sme +- netlogon.bat +x [SME: 11566] + +* Fri Apr 16 2021 Jean-Philippe Pialasse 2.6.0-21.sme +- add possibility to reenable allow execute always on ibays homes or everywhere [SME: 11555] + +* Fri Apr 16 2021 Jean-Philippe Pialasse 2.6.0-20.sme +- fix double entries for min protocol [SME: 11558] + +* Tue Mar 16 2021 Jean-Philippe Pialasse 2.6.0-19.sme +- clean rsyslog syntax for smbd and nmbd [SME: 11422] + +* Sun Feb 21 2021 Jean-Philipe Pialasse 2.6.0-18.sme +- fix noise in message log from nmbd and smbd redirected to dedicated logs [SME: 11349] + +* Mon Feb 15 2021 Jean-Philipe Pialasse 2.6.0-17.sme +- allow using user-create-profiledir action with temp or package-update events [SME: 11348] + +* Sun Jan 03 2021 Jean-Philipe Pialasse 2.6.0-16.sme +- fix log noise for smb.service [SME: 11157] + +* Sat Jan 02 2021 Jean-Philipe Pialasse 2.6.0-15.sme +- add Restart=always [SME: 11118] +- add Restart=always [SME: 11117] + +* Fri Jan 01 2021 Jean-Philipe Pialasse 2.6.0-14.sme +- migrate nmbd to systemd [SME: 11118] +- migrate smbd to systemd [SME: 11117] + create generik smb.service service +- create e-smith-samba-update event [SME: 11157] + +* Wed Dec 16 2020 John Crisp 2.6.0-13.sme +- Fix mutex locking [SME: 11199] + +* Thu Nov 26 2020 John Crisp 2.6.0-12.sme +- Fix pid directory [SME: 11198] + +* Mon Nov 16 2020 John Crisp 2.6.0-11.sme +- Add /etc/krb5.conf as template using templates from smeserver-samba +- [SME: 11093] + +* Sat Jun 27 2020 Jean-Philipe Pialasse 2.6.0-10.sme +- remove win98pwdcache.reg from server-resources [SME: 9060] + +* Tue Jun 23 2020 Jean-Philipe Pialasse 2.6.0-9.sme +- set min server and client protocol SMB2 [SME: 10576] + add check so max always greater than min +- add port 445 if min server protocol is SMB2 or SMB3 [SME: 10963] + +* Fri Feb 09 2018 Jean-Philipe Pialasse 2.6.0-7.sme +- fix typo in /server-resources/regedit/win10samba.reg [SME: 10515] + +* Fri Mar 24 2017 Jean-Philipe Pialasse 2.6.0-6.sme +- fix outlook error code 0x8004011c [SME: 10169] +- when setting up and email account on a win10 computer joined to a domain (with roaming profiles) + +* Fri Jul 22 2016 Jean-Philipe Pialasse 2.6.0-5.sme +- add systemd skip redirect [SME: 9688] + +* Thu Jul 14 2016 stephane de Labrusse 2.6.0-4.sme +- Fix deprecated syntax '~' in rsyslog [SME: 9398] +- added e-smith-samba-2.6.0.bz9398.DeprecatedRsyslogSyntaxSamba.patch + +* Thu May 12 2016 Daniel Berteaud 2.6.0-3.sme +- Rebuild for [SME: 9393] + +* Tue Apr 12 2016 Jean-Philipe Pialasse 2.6.0-2.sme +- dropped display charset option [SME: 9440] + * Fri Feb 05 2016 stephane de Labrusse 2.6.0-1.sme - Initial release to sme10 @@ -1222,6 +1309,21 @@ Configuration files and templates for th %prep %setup +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 +rm -rf root/service root/var/service root/etc/rc.d +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 +%patch13 -p1 %build perl createlinks @@ -1230,25 +1332,30 @@ perl createlinks rm -rf $RPM_BUILD_ROOT (cd root ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT) /sbin/e-smith/genfilelist \ - --dir '/var/service/smbd' 'attr(1755,root,root)' \ - --file '/var/service/smbd/down' 'attr(0644,root,root)' \ - --file '/var/service/smbd/run' 'attr(0755,root,root)' \ - --dir '/var/service/smbd/supervise' 'attr(0700,root,root)' \ - --dir '/var/service/smbd/log' 'attr(1755,root,root)' \ - --file '/var/service/smbd/log/run' 'attr(0755,root,root)' \ + --file '/sbin/e-smith/systemd/nmbd-prepare' 'attr(0554,root,root)' \ + --file '/sbin/e-smith/systemd/smbd-prepare' 'attr(0554,root,root)' \ --dir '/var/log/smbd' 'attr(2750,smelog,smelog)' \ - --dir '/var/service/nmbd' 'attr(1755,root,root)' \ - --file '/var/service/nmbd/down' 'attr(0644,root,root)' \ - --file '/var/service/nmbd/run' 'attr(0755,root,root)' \ - --dir '/var/service/nmbd/supervise' 'attr(0700,root,root)' \ - --dir '/var/service/nmbd/log' 'attr(1755,root,root)' \ - --file '/var/service/nmbd/log/run' 'attr(0755,root,root)' \ --dir '/var/log/nmbd' 'attr(2750,smelog,smelog)' \ --file '/sbin/e-smith/samba_check_password' 'attr(0555,root,root)' \ $RPM_BUILD_ROOT \ > %{name}-%{version}-filelist echo "%doc COPYING" >> %{name}-%{version}-filelist +%pre +if [ $1 -gt 1 ] ; then + if [ -e /var/service/smbd/run ] ; then + /usr/bin/sv d smbd + /usr/bin/sv d smbd/log + fi +fi +if [ $1 -gt 1 ] ; then + if [ -e /var/service/nmbd/run ] ; then + /usr/bin/sv d nmbd + /usr/bin/sv d nmbd/log + fi +fi + + %clean rm -rf $RPM_BUILD_ROOT