--- rpms/e-smith-base/sme10/e-smith-base-5.8.0-bz11250-drop-pptpd.patch 2020/12/11 17:50:15 1.1 +++ rpms/e-smith-base/sme10/e-smith-base-5.8.0-bz11250-drop-pptpd.patch 2020/12/11 17:54:20 1.2 @@ -1,24 +1,3 @@ -diff -Nur e-smith-base-5.8.0.old/createlinks e-smith-base-5.8.0/createlinks ---- e-smith-base-5.8.0.old/createlinks 2020-12-09 22:24:31.760000000 -0500 -+++ e-smith-base-5.8.0/createlinks 2020-12-09 22:33:47.569000000 -0500 -@@ -579,6 +579,7 @@ - #-------------------------------------------------- - - $event = "local"; -+safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/rc-local"); - - #-------------------------------------------------- - # actions for ldap-update event -diff -Nur e-smith-base-5.8.0.old/root/etc/e-smith/db/configuration/defaults/rc-local/status e-smith-base-5.8.0/root/etc/e-smith/db/configuration/defaults/rc-local/status ---- e-smith-base-5.8.0.old/root/etc/e-smith/db/configuration/defaults/rc-local/status 1969-12-31 19:00:00.000000000 -0500 -+++ e-smith-base-5.8.0/root/etc/e-smith/db/configuration/defaults/rc-local/status 2020-12-09 22:30:03.095000000 -0500 -@@ -0,0 +1 @@ -+enabled -diff -Nur e-smith-base-5.8.0.old/root/etc/e-smith/db/configuration/defaults/rc-local/type e-smith-base-5.8.0/root/etc/e-smith/db/configuration/defaults/rc-local/type ---- e-smith-base-5.8.0.old/root/etc/e-smith/db/configuration/defaults/rc-local/type 1969-12-31 19:00:00.000000000 -0500 -+++ e-smith-base-5.8.0/root/etc/e-smith/db/configuration/defaults/rc-local/type 2020-12-09 22:29:53.888000000 -0500 -@@ -0,0 +1 @@ -+configuration diff -Nur e-smith-base-5.8.0.old/root/etc/e-smith/db/configuration/migrate/50RemoveObsoleteServices e-smith-base-5.8.0/root/etc/e-smith/db/configuration/migrate/50RemoveObsoleteServices --- e-smith-base-5.8.0.old/root/etc/e-smith/db/configuration/migrate/50RemoveObsoleteServices 2020-12-09 22:24:31.525000000 -0500 +++ e-smith-base-5.8.0/root/etc/e-smith/db/configuration/migrate/50RemoveObsoleteServices 2020-12-11 12:47:37.190000000 -0500 @@ -93,37 +72,6 @@ diff -Nur e-smith-base-5.8.0.old/root/et -diff -Nur e-smith-base-5.8.0.old/root/usr/lib/systemd/system/local.service e-smith-base-5.8.0/root/usr/lib/systemd/system/local.service ---- e-smith-base-5.8.0.old/root/usr/lib/systemd/system/local.service 2020-12-09 22:24:31.778000000 -0500 -+++ e-smith-base-5.8.0/root/usr/lib/systemd/system/local.service 2020-12-09 22:31:09.422000000 -0500 -@@ -7,7 +7,6 @@ - ExecStartPre=/sbin/e-smith/service-status local - ExecStartPre=/usr/bin/chmod +x /etc/rc.d/rc.local - ExecStart=/sbin/e-smith/signal-event local --ExecStart=/usr/bin/systemctl restart rc-local.service - RemainAfterExit=yes - - [Install] -diff -Nur e-smith-base-5.8.0.old/root/usr/lib/systemd/system-preset/50-koozali.preset e-smith-base-5.8.0/root/usr/lib/systemd/system-preset/50-koozali.preset ---- e-smith-base-5.8.0.old/root/usr/lib/systemd/system-preset/50-koozali.preset 2020-12-09 22:24:31.756000000 -0500 -+++ e-smith-base-5.8.0/root/usr/lib/systemd/system-preset/50-koozali.preset 2020-12-09 22:32:19.660000000 -0500 -@@ -35,6 +35,8 @@ - enable ldap.service - enable ldap.init.service - enable local.service -+enable yum.service -+disable rc-local.service - - #need to change after integration - #enable mariadb.service -@@ -65,7 +67,6 @@ - disable squid.service - disable sshd.service - enable tinydns.service --enable wan.service - disable nut-server.service - disable nut-monitor.service - disable ntpdate.service diff -Nur e-smith-base-5.8.0.old/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/remoteaccess.pm e-smith-base-5.8.0/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/remoteaccess.pm --- e-smith-base-5.8.0.old/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/remoteaccess.pm 2020-12-09 22:24:31.665000000 -0500 +++ e-smith-base-5.8.0/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/remoteaccess.pm 2020-12-11 12:40:27.646000000 -0500