/[smeserver]/rpms/e-smith-samba/sme10/e-smith-samba.spec

Diff of /rpms/e-smith-samba/sme10/e-smith-samba.spec

Parent Directory | Revision Log | View Revision Graph Revision Graph | View Patch Patch

-Revision 1.10 by jpp,
Wed Jun 24 03:45:25 2020 UTC
+Revision 1.19 by jpp,
Mon Feb 22 04:52:16 2021 UTC
 Line 1
- # $Id: e-smith-samba.spec,v 1.9 2020/06/23 18:03:15 jpp Exp $
+ # $Id: e-smith-samba.spec,v 1.18 2021/02/15 06:38:19 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 9
+ %define release 18
  Version: %{version}
  Release: %{release}%{?dist}
  License: GPL
 Line 15 
 Patch1: e-smith-samba-2.6.0.bz9398.Depre
  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
  Obsoletes: e-smith-netlogon
  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
-Line 44 
 Requires: /usr/bin/tdbbackup
+Line 51 
 Requires: /usr/bin/tdbbackup
  AutoReqProv: no
  %changelog
+ * Sun Feb 21 2021 Jean-Philipe Pialasse <tests@pialasse.com> 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 <tests@pialasse.com> 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 <tests@pialasse.com> 2.6.0-16.sme
+ - fix log noise for smb.service [SME: 11157]
+ * Sat Jan 02 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-15.sme
+ - add Restart=always [SME: 11118]
+ - add Restart=always [SME: 11117]
+ * Fri Jan 01 2021 Jean-Philipe Pialasse <tests@pialasse.com> 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 <jcrisp@safeandsoundit.co.uk> 2.6.0-13.sme
+ - Fix mutex locking [SME: 11199]
+ * Thu Nov 26 2020 John Crisp <jcrisp@safeandsoundit.co.uk> 2.6.0-12.sme
+ - Fix pid directory [SME: 11198]
+ * Mon Nov 16 2020 John Crisp <jcrisp@safeansoundit.co.uk> 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 <tests@pialasse.com> 2.6.0-10.sme
+ - remove win98pwdcache.reg from server-resources [SME: 9060]
  * Tue Jun 23 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-9.sme
  - set min server and client protocol SMB2 [SME: 10576]
    add check so max always greater than min
-Line 1258 
 Configuration files and templates for th
+Line 1297 
 Configuration files and templates for th
  %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
  %build
  perl createlinks
-Line 1266 
 perl createlinks
+Line 1313 
 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 '/sbin/e-smith/systemd/nmbd-prepare' 'attr(0554,root,root)' \
-     --file '/var/service/smbd/down' 'attr(0644,root,root)' \
+     --file '/sbin/e-smith/systemd/smbd-prepare' 'attr(0554,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)' \
      --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

 Legend:



Removed lines/characters
 


Changed lines/characters


 
Added lines/characters
 Legend:



Removed lines/characters
 


Changed lines/characters


 
Added lines/characters
-Removed lines/characters
+Added lines/characters

admin@koozali.org	ViewVC Help
Powered by ViewVC 1.2.1