--- rpms/e-smith-base/sme10/e-smith-base.spec	2021/03/16 16:33:05	1.105
+++ rpms/e-smith-base/sme10/e-smith-base.spec	2021/03/16 18:15:42	1.106
@@ -1,4 +1,4 @@
-# $Id: e-smith-base.spec,v 1.104 2021/03/06 06:35:18 jpp Exp $
+# $Id: e-smith-base.spec,v 1.105 2021/03/16 16:33:05 jpp Exp $
 
 Summary: e-smith server and gateway - base module
 %define name e-smith-base
@@ -130,6 +130,195 @@ AutoReqProv: no
 %description
 e-smith server and gateway software - base module.
 
+%prep
+%setup
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
+%patch17 -p1
+%patch18 -p1
+%patch19 -p1
+%patch20 -p1
+%patch21 -p1
+%patch22 -p1
+%patch23 -p1
+%patch24 -p1
+%patch25 -p1
+%patch26 -p1
+%patch27 -p1
+%patch28 -p1
+%patch29 -p1
+%patch30 -p1
+rm  -rf root/home/e-smith/web/common/edition/info.txt
+%patch31 -p1
+%patch32 -p1
+%patch33 -p1
+%patch34 -p1
+%patch35 -p1
+%patch36 -p1
+rm -rf root/var/service/raidmonitor root/service/raidmonitor
+%patch37 -p1
+%patch38 -p1
+rm -f root/etc/rc.d/init.d/supervise/wan
+mkdir -p root/etc/systemd/system-preset
+%patch39 -p1
+%patch40 -p1
+mkdir -p root/usr/lib/systemd/system/dhcpd.service.d
+rm root/service/dhcpd
+rm -rf root/var/service/dhcpd
+rm root/etc/rc.d/init.d/supervise/dhcpd
+%patch41 -p1
+%patch42 -p1
+%patch43 -p1
+%patch44 -p1
+%patch45 -p1
+%patch46 -p1
+%patch47 -p1
+rm -rf root/var/service/local root/var/service/syslog
+rm -rf root/etc/rc.d/init.d/local
+%patch48 -p1
+%patch49 -p1
+%patch50 -p1
+%patch51 -p1
+mkdir -p root/usr/lib/systemd/system/sme-server.target.d
+%patch52 -p1
+%patch53 -p1
+%patch54 -p1
+mkdir -p root/usr/lib/systemd/system/basic.target.wants
+%patch55 -p1
+%patch56 -p1
+%patch57 -p1
+%patch58 -p1
+%patch59 -p1
+rm -rf root/etc/e-smith/db/configuration/defaults/DynDNS
+%patch60 -p1
+rm -rf root/var/service/klogd
+rm -rf root/etc/e-smith/db/configuration/defaults/klogd
+%patch61 -p1
+%patch62 -p1
+rm -rf root/etc/rc6.d
+rm -rf root/etc/rc.d/rc1.d
+rm -rf root/etc/rc.d/rc6.d
+rm -rf root/etc/rc.d/init.d
+rm -rf root/etc/rc.d/rc1.d
+
+%build
+
+LEXICONS=$(find root/etc/e-smith/web/functions -type f| grep -v CVS)
+
+for lexicon in $LEXICONS
+do
+    /sbin/e-smith/validate-lexicon $lexicon
+done
+
+/sbin/e-smith/generate-lexicons
+
+xgettext -L perl -o root/usr/share/locale/en_US/LC_MESSAGES/server-console.po root/sbin/e-smith/console.pl
+
+perl createlinks
+/sbin/e-smith/buildtests 10e-smith-base
+
+gcc -o root/sbin/e-smith/console console_wrapper.c
+
+# Force creation of potentially empty directories
+mkdir -p root/etc/e-smith/web/panels/password/cgi-bin
+ln -s ../../../functions/wrapper root/etc/e-smith/web/panels/password/cgi-bin/userpassword
+
+%install
+rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT/etc/selinux
+(cd root   ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)
+/sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
+    --file /sbin/e-smith/systemd/mdmonitor-pre 'attr(0554,root,root)' \
+    --file /etc/cron.daily/conf-mod_ssl 'attr(0544,root,root)' \
+    --dir /var/log/dhcpd 'attr(2750,smelog,smelog)' \
+    --dir /etc/e-smith/pam 'attr(0700,root,root)' \
+    --dir /home/e-smith/ssl.key 'attr(0700,root,root)' \
+    --dir /home/e-smith/ssl.crt 'attr(0700,root,root)' \
+    --dir /home/e-smith/ssl.pem 'attr(0700,root,root)' \
+    --dir /var/service/wan 'attr(1755,root,root)' \
+    --file /var/service/wan/down 'attr(0644,root,root)' \
+    --file /var/service/wan/run 'attr(0750,root,root)' \
+    --file /var/service/wan/run.dhclient 'attr(0750,root,root)' \
+    --file /var/service/wan/run.pppoe 'attr(0750,root,root)' \
+    --file /var/service/wan/run.static 'attr(0750,root,root)' \
+    --file /var/service/wan/run.dialup 'attr(0750,root,root)' \
+    --file /var/service/wan/run.disabled 'attr(0750,root,root)' \
+    --dir /var/service/wan/supervise 'attr(0700,root,root)' \
+    --dir /var/service/wan/log 'attr(1755,root,root)' \
+    --file /var/service/wan/log/run 'attr(0750,root,root)' \
+    --dir /var/service/wan/log/supervise 'attr(0700,root,root)' \
+    --dir /var/log/wan 'attr(2750,smelog,smelog)' \
+    --dir /var/service/ippp 'attr(1755,root,root)' \
+    --file /var/service/ippp/down 'attr(0644,root,root)' \
+    --file /var/service/ippp/run 'attr(0750,root,root)' \
+    --dir /var/service/ippp/supervise 'attr(0700,root,root)' \
+    --dir /var/service/ippp/log 'attr(1755,root,root)' \
+    --file /var/service/ippp/log/run 'attr(0750,root,root)' \
+    --dir /var/service/ippp/log/supervise 'attr(0700,root,root)' \
+    --dir /var/log/ippp 'attr(2750,smelog,smelog)' \
+    --dir /etc/e-smith/skel/user/.ssh 'attr(0700,root,root)' \
+    --file /etc/sysconfig/modules/dummy.modules 'attr(0755,root,root)' \
+    --dir /etc/selinux 'attr(0755,root,root)' \
+    > %{name}-%{version}-%{release}-filelist
+
+mkdir -p $RPM_BUILD_ROOT/home/e-smith/db
+for file in %{dbfiles}
+do
+    # Create ghost file for rpm
+    touch $RPM_BUILD_ROOT/home/e-smith/db/$file
+    echo "%config(noreplace) %attr(0640,root,admin) /home/e-smith/db/$file" \
+        >> %{name}-%{version}-%{release}-filelist
+done
+echo "%doc COPYING"          >> %{name}-%{version}-%{release}-filelist
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files -f %{name}-%{version}-%{release}-filelist
+%defattr(-,root,root)
+
+%pre
+/sbin/e-smith/create-system-user smelastsys 2999 \
+    'sme last system user marker' /tmp /bin/false
+
+%post
+LEXICONS=$(find /etc/e-smith/locale/*/etc/e-smith/web/panels/password/cgi-bin/userpassword -type f 2>/dev/null)
+
+for lexicon in $LEXICONS
+do
+    if [ -f $lexicon ]
+    then
+        cd $(dirname "$lexicon")
+        mv ./userpassword ../../../functions
+    fi
+done
+
+if [ -d "/var/service/dhcpd" ]; then
+        rm -rf /var/service/dhcpd
+fi
+if [ -d "/var/service/raidmonitor" ]; then
+        rm -rf /var/service/raidmonitor
+fi
+if [ -d "/var/service/local" ]; then
+        rm -rf /var/service/local
+fi
+
+
 %changelog
 * Tue Mar 16 2021 Jean-Philippe Pialasse <tests@pialasse.com> 5.8.0-88.sme
 - cleanup /etc/rc.d and /var/service [SME: 9692]
@@ -2133,192 +2322,3 @@ e-smith server and gateway software - ba
 - [4.15.3-01]
 - Roll new development stream - 4.15.3
 
-%prep
-%setup
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1 
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
-%patch26 -p1
-%patch27 -p1
-%patch28 -p1
-%patch29 -p1
-%patch30 -p1
-rm  -rf root/home/e-smith/web/common/edition/info.txt
-%patch31 -p1
-%patch32 -p1
-%patch33 -p1
-%patch34 -p1
-%patch35 -p1
-%patch36 -p1
-rm -rf root/var/service/raidmonitor root/service/raidmonitor
-%patch37 -p1
-%patch38 -p1
-rm -f root/etc/rc.d/init.d/supervise/wan
-mkdir -p root/etc/systemd/system-preset
-%patch39 -p1
-%patch40 -p1
-mkdir -p root/usr/lib/systemd/system/dhcpd.service.d
-rm root/service/dhcpd
-rm -rf root/var/service/dhcpd
-rm root/etc/rc.d/init.d/supervise/dhcpd
-%patch41 -p1
-%patch42 -p1
-%patch43 -p1
-%patch44 -p1
-%patch45 -p1
-%patch46 -p1
-%patch47 -p1
-rm -rf root/var/service/local root/var/service/syslog 
-rm -rf root/etc/rc.d/init.d/local
-%patch48 -p1
-%patch49 -p1
-%patch50 -p1
-%patch51 -p1
-mkdir -p root/usr/lib/systemd/system/sme-server.target.d
-%patch52 -p1
-%patch53 -p1
-%patch54 -p1
-mkdir -p root/usr/lib/systemd/system/basic.target.wants
-%patch55 -p1
-%patch56 -p1
-%patch57 -p1
-%patch58 -p1
-%patch59 -p1
-rm -rf root/etc/e-smith/db/configuration/defaults/DynDNS
-%patch60 -p1
-rm -rf root/var/service/klogd
-rm -rf root/etc/e-smith/db/configuration/defaults/klogd
-%patch61 -p1
-%patch62 -p1
-rm -rf root/etc/rc6.d
-rm -rf root/etc/rc.d/rc1.d
-rm -rf root/etc/rc.d/rc6.d
-rm -rf root/etc/rc.d/init.d 
-rm -rf root/etc/rc.d/rc1.d
-
-%pre
-/sbin/e-smith/create-system-user smelastsys 2999 \
-    'sme last system user marker' /tmp /bin/false
-
-%post
-LEXICONS=$(find /etc/e-smith/locale/*/etc/e-smith/web/panels/password/cgi-bin/userpassword -type f 2>/dev/null)
-
-for lexicon in $LEXICONS
-do
-    if [ -f $lexicon ]
-    then
-        cd $(dirname "$lexicon")
-        mv ./userpassword ../../../functions
-    fi
-done
-
-
-%build
-
-LEXICONS=$(find root/etc/e-smith/web/functions -type f| grep -v CVS)
-
-for lexicon in $LEXICONS
-do
-    /sbin/e-smith/validate-lexicon $lexicon
-done
-
-/sbin/e-smith/generate-lexicons
-
-xgettext -L perl -o root/usr/share/locale/en_US/LC_MESSAGES/server-console.po root/sbin/e-smith/console.pl
-
-perl createlinks
-/sbin/e-smith/buildtests 10e-smith-base
-
-gcc -o root/sbin/e-smith/console console_wrapper.c
-
-# Force creation of potentially empty directories
-mkdir -p root/etc/e-smith/web/panels/password/cgi-bin
-ln -s ../../../functions/wrapper root/etc/e-smith/web/panels/password/cgi-bin/userpassword
-
-%install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/etc/selinux
-(cd root   ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)
-/sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
-    --file /sbin/e-smith/systemd/mdmonitor-pre 'attr(0554,root,root)' \
-    --file /etc/cron.daily/conf-mod_ssl 'attr(0544,root,root)' \
-    --dir /var/log/dhcpd 'attr(2750,smelog,smelog)' \
-    --dir /etc/e-smith/pam 'attr(0700,root,root)' \
-    --dir /home/e-smith/ssl.key 'attr(0700,root,root)' \
-    --dir /home/e-smith/ssl.crt 'attr(0700,root,root)' \
-    --dir /home/e-smith/ssl.pem 'attr(0700,root,root)' \
-    --dir /var/service/wan 'attr(1755,root,root)' \
-    --file /var/service/wan/down 'attr(0644,root,root)' \
-    --file /var/service/wan/run 'attr(0750,root,root)' \
-    --file /var/service/wan/run.dhclient 'attr(0750,root,root)' \
-    --file /var/service/wan/run.pppoe 'attr(0750,root,root)' \
-    --file /var/service/wan/run.static 'attr(0750,root,root)' \
-    --file /var/service/wan/run.dialup 'attr(0750,root,root)' \
-    --file /var/service/wan/run.disabled 'attr(0750,root,root)' \
-    --dir /var/service/wan/supervise 'attr(0700,root,root)' \
-    --dir /var/service/wan/log 'attr(1755,root,root)' \
-    --file /var/service/wan/log/run 'attr(0750,root,root)' \
-    --dir /var/service/wan/log/supervise 'attr(0700,root,root)' \
-    --dir /var/log/wan 'attr(2750,smelog,smelog)' \
-    --dir /var/service/ippp 'attr(1755,root,root)' \
-    --file /var/service/ippp/down 'attr(0644,root,root)' \
-    --file /var/service/ippp/run 'attr(0750,root,root)' \
-    --dir /var/service/ippp/supervise 'attr(0700,root,root)' \
-    --dir /var/service/ippp/log 'attr(1755,root,root)' \
-    --file /var/service/ippp/log/run 'attr(0750,root,root)' \
-    --dir /var/service/ippp/log/supervise 'attr(0700,root,root)' \
-    --dir /var/log/ippp 'attr(2750,smelog,smelog)' \
-    --dir /etc/e-smith/skel/user/.ssh 'attr(0700,root,root)' \
-    --file /etc/sysconfig/modules/dummy.modules 'attr(0755,root,root)' \
-    --dir /etc/selinux 'attr(0755,root,root)' \
-    > %{name}-%{version}-%{release}-filelist
-
-mkdir -p $RPM_BUILD_ROOT/home/e-smith/db
-for file in %{dbfiles}
-do
-    # Create ghost file for rpm
-    touch $RPM_BUILD_ROOT/home/e-smith/db/$file
-    echo "%config(noreplace) %attr(0640,root,admin) /home/e-smith/db/$file" \
-        >> %{name}-%{version}-%{release}-filelist
-done
-echo "%doc COPYING"          >> %{name}-%{version}-%{release}-filelist
-
-%post
-  if [ -d "/var/service/dhcpd" ]; then
-	rm -rf /var/service/dhcpd 
-  fi
-  if [ -d "/var/service/raidmonitor" ]; then
-        rm -rf /var/service/raidmonitor
-  fi
-  if [ -d "/var/service/local" ]; then
-        rm -rf /var/service/local
-  fi
-
-%clean 
-rm -rf $RPM_BUILD_ROOT
-
-%files -f %{name}-%{version}-%{release}-filelist
-%defattr(-,root,root)