--- rpms/e-smith-base/sme10/e-smith-base.spec	2021/06/04 14:48:44	1.119
+++ rpms/e-smith-base/sme10/e-smith-base.spec	2021/06/06 20:34:02	1.120
@@ -1,87 +1,15 @@
-# $Id: e-smith-base.spec,v 1.118 2021/06/04 14:42:00 jpp Exp $
+# $Id: e-smith-base.spec,v 1.119 2021/06/04 14:48:44 jpp Exp $
 
 Summary: e-smith server and gateway - base module
 %define name e-smith-base
 Name: %{name}
-%define version 5.8.0
-%define release 99
+%define version 5.8.1
+%define release 0
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.xz
-Patch0: e-smith-base-5.8.0-cpuspeed.patch
-Patch1: e-smith-base-5.8.0-remove_obsolete_services.patch
-Patch2: e-smith-base-5.8.0-remove_ctrlaltdel.patch
-Patch3: e-smith-base-5.8.0-movese_services_to_systemd.patch
-Patch4: e-smith-base-5.8.0-LOCALE.patch
-Patch5: e-smith-base-5.8.0-install_on_every_reboot.patch
-Patch6: e-smith-base-5.8.0-PasswordSet.patch
-Patch7: e-smith-base-5.8.0-console_wrapper.patch
-Patch8: e-smith-base-5.8.0-postinstall.patch
-Patch9: e-smith-base-5.8.0-fix_forward_field_display.patch
-Patch10: e-smith-base-5.8.0.bz9631.SetHostnameByHostnamectl.patch
-Patch11: e-smith-base-5.8.0.bz9398.DeprecatedRsyslogSyntax.patch
-Patch12: e-smith-base-5.8.0.bz9641.fix-startup-path.patch
-Patch13: e-smith-base-5.8.0-mariadb.patch
-Patch14: e-smith-base-5.8.0.bz9687.local-link.patch
-Patch15: e-smith-base-5.8.0-bz9688.skipredirect.patch
-Patch16: e-smith-base-5.8.0-bz9672.servicesystemd.patch
-Patch17: e-smith-base-5.8.0.bz9724.locale_sysconfig.patch
-Patch18: e-smith-base-5.8.0-allow_32bits_mask.patch
-Patch19: e-smith-base-5.8.0-ip_route_syntax.patch
-Patch20: e-smith-base-5.8.0.bz9550.fixconsolerestore.patch
-Patch21: e-smith-base-5.8.0.bz10121-moretranslationlinks.patch
-Patch22: e-smith-base-5.8.0.bz9478-move-smtpd-to-qpsmtpd.patch
-Patch23: e-smith-base-5.8.0-expand_route_bond0.patch
-Patch24: e-smith-base-5.8.0.bz10519.xinet-cleaning.patch
-Patch25: e-smith-base-5.8.0-modify-default-city.patch
-Patch26: e-smith-base-5.8.0.bz8876-set-system-name.patch
-Patch27: e-smith-base-5.8.0-bz9677-suid_wrapper.patch
-Patch28: e-smith-base-5.8.0-enable_smartd.patch
-Patch29: e-smith-base-5.8.0.bz8156.wildcard-certificate-and-subjaltname.patch
-Patch30: e-smith-base-5.8.0-bz9590-cleanup.patch
-Patch31: e-smith-base-5.8.0-bz6536-bz10974-validate_subnet.patch
-Patch32: e-smith-base-5.8.0-bz11012-update-event.patch
-Patch33: e-smith-base-5.8.0-bz10957.sme-server.target.patch
-Patch34: e-smith-base-5.8.0-bz10957-service-status.patch
-Patch35: e-smith-base-5.8.0-bz11090-networking.service.patch
-Patch36: e-smith-base-5.8.0-bz11091-wan.service.patch
-Patch37: e-smith-base-5.8.0-bz11094-raidmonitor.service.patch
-Patch38: e-smith-base-5.8.0-bz11174-preset.patch
-Patch39: e-smith-base-5.8.0-bz11177-systemd.patch
-Patch40: e-smith-base-5.8.0-bz2408-bz11100-dhcpd-systemd-and-log.patch
-Patch41: e-smith-base-5.8.0-fix_raid_detection.patch
-Patch42: e-smith-base-5.8.0-noconfirm_first_config.patch
-Patch43: e-smith-base-5.8.0.bz11228.systemd-reload.patch
-Patch44: e-smith-base-5.8.0-bz11229.patch
-Patch45: e-smith-base-5.8.0-bz11006-lpdexcludeandfewservices.patch
-Patch46: e-smith-base-5.8.0-bz11231-systemd-preset-all-workaround.patch
-Patch47: e-smith-base-5.8.0-bz11119-local2systemd.patch
-Patch48: e-smith-base-5.8.0-bz11250-drop-pptpd.patch
-Patch49: e-smith-base-5.8.0-bz11252-validate-certfiles-exists.patch
-Patch50: e-smith-base-5.8.0-bz9642-init-accounts.patch
-Patch51: e-smith-base-5.8.0-rewrite_manageraid.patch
-Patch52: e-smith-base-5.8.0-bz11247-wants.patch
-Patch53: e-smith-base-5.8.0-bz11309-pwauth-fix.patch
-Patch54: e-smith-base-5.8.0-bz10958-bz11246.patch
-Patch55: e-smith-base-5.8.0-bz11318-runlevel7.patch
-Patch56: e-smith-base-5.8.0-bz9155-rsshgroup.patch
-Patch57: e-smith-base-5.8.0-bz11350-post-install.patch
-Patch58: e-smith-base-5.8.0-bz11356-bz11358-bz11355.patch
-Patch59: e-smith-base-5.8.0-bz11415-dropDyndns.patch
-Patch60: e-smith-base-5.8.0-bz11363-klogd.patch
-Patch61: e-smith-base-5.8.0-bz11374-pptp2vpn.patch
-Patch62: e-smith-base-5.8.0-bz9692-cleanup.patch
-Patch63: e-smith-base-5.8.0-bz11345-systemctlWrapper.patch
-Patch64: e-smith-base-5.8.0-bz11470.patch
-Patch65: e-smith-base-5.8.0-bz11479-BeforeMasq.patch
-Patch66: e-smith-base-5.8.0-bz10657-dhcpmanagerFragmentMerge.patch
-Patch67: e-smith-base-5.8.0-bz11508-remove-templates-custom-ownedbyrpm.patch
-Patch68: e-smith-base-5.8.0-bz11537.patch
-Patch69: e-smith-base-5.8.0-bz11569.patch
-Patch70: e-smith-base-5.8.0-bz11552-renewkey.patch
-Patch71: e-smith-base-5.8.0-bz11607-add-ldap-user-fix.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: pwauth
@@ -141,97 +69,9 @@ e-smith server and gateway software - ba
 
 %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/supervise
-%patch63 -p1
-%patch64 -p1
-%patch65 -p1
-%patch66 -p1
-%patch67 -p1
-%patch68 -p1
-%patch69 -p1
-%patch70 -p1
-%patch71 -p1
+#%patch0 -p1
+#%patch1 -p1
+#%patch2 -p1
 
 %build