--- rpms/e-smith-manager/sme10/e-smith-manager.spec	2019/12/20 19:41:05	1.33
+++ rpms/e-smith-manager/sme10/e-smith-manager.spec	2021/03/16 20:08:44	1.37
@@ -1,10 +1,10 @@
-# $Id: e-smith-manager.spec,v 1.32 2019/12/11 03:38:35 jpp Exp $
+# $Id: e-smith-manager.spec,v 1.36 2020/12/11 04:05:59 jpp Exp $
 
 Summary: e-smith manager navigation module
 %define name e-smith-manager
 Name: %{name}
 %define version 2.8.0
-%define release 30
+%define release 33
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -25,6 +25,9 @@ Patch11: e-smith-manager-2.8.0-bz8783-bu
 Patch12: e-smith-manager-2.8.0-bz10170-SME10eol.patch
 Patch13: e-smith-manager-2.8.0-bz9591-iconspath.patch
 Patch14: e-smith-manager-2.8.0-bz9677_password_followsymlinks.patch
+Patch15: e-smith-manager-2.8.0-bz10967-remove-hardcoded-ports.patch
+Patch16: e-smith-manager-2.8.0-bz11144-bz11110-systemd-update.patch
+Patch17: e-smith-manager-2.8.0-bz10448-bugreport.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildRequires: e-smith-devtools
@@ -38,6 +41,16 @@ Provides: server-manager
 AutoReqProv: no
 
 %changelog
+* Tue Mar 16 2021 Jean-Philippe Pialasse <tests@pialasse.com> 2.8.0-33.sme
+- fix wrong system mode reported in bugreport [SME: 10448]
+
+* Thu Dec 10 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.8.0-32.sme
+- create -update event [SME: 11144]
+- migrate httpd-admin to systemd [SME: 11110]
+
+* Sat Jun 27 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.8.0-31.sme
+- removing hardcoded ports [SME: 10967]
+
 * Wed Dec 18 2019 Michel Begue <mab974@gmail.com> 2.8.0-29.sme
 - Add a FollowSymlinks for user-password in password/cgi-bin (perl-suid) [SME: 9677]
 
@@ -779,6 +792,10 @@ This RPM contributes the navigation bars
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
+%patch16 -p1
+rm -rf root/var/service
+%patch17 -p1
 
 %build
 perl createlinks
@@ -806,19 +823,19 @@ mkdir -p root/etc/e-smith/web/panels/pas
 mkdir -p root/etc/httpd/admin-conf
 
 mkdir -p root/service
-mkdir -p root/etc/rc.d/init.d/supervise
-for service in httpd-admin
-do
-  ln -s /var/service/$service root/service/$service
-  mkdir -p root/var/service/$service/supervise
-  touch root/var/service/$service/down
-  if [ -d root/var/service/$service/log ]
-  then
-    mkdir -p root/var/service/$service/log/supervise
-    mkdir -p root/var/log/$service
-  fi
-  ln -s ../daemontools root/etc/rc.d/init.d/supervise/$service
-done
+#mkdir -p root/etc/rc.d/init.d/supervise
+#for service in httpd-admin
+#do
+#  ln -s /var/service/$service root/service/$service
+#  mkdir -p root/var/service/$service/supervise
+#  touch root/var/service/$service/down
+#  if [ -d root/var/service/$service/log ]
+#  then
+#    mkdir -p root/var/service/$service/log/supervise
+#    mkdir -p root/var/log/$service
+#  fi
+#  ln -s ../daemontools root/etc/rc.d/init.d/supervise/$service
+#done
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -828,13 +845,6 @@ rm -f %{name}-%{version}-%{release}-file
     --file /etc/e-smith/web/common/cgi-bin/login 'attr(0755,root,root)' \
     --file /etc/e-smith/web/common/cgi-bin/logout 'attr(0755,root,root)' \
     --file /etc/e-smith/web/functions/wrapper 'attr(4750,root,admin)' \
-    --dir /var/service/httpd-admin 'attr(01755,root,root)' \
-    --file /var/service/httpd-admin/down 'attr(0644,root,root)' \
-    --file /var/service/httpd-admin/run 'attr(0755,root,root)' \
-    --dir /var/service/httpd-admin/log 'attr(0755,root,root)' \
-    --dir /var/service/httpd-admin/log/supervise 'attr(0700,root,root)' \
-    --dir /var/service/httpd-admin/supervise 'attr(0700,root,root)' \
-    --file /var/service/httpd-admin/log/run 'attr(0755,root,root)' \
     --dir /var/log/httpd-admin 'attr(0750,smelog,smelog)' \
     > %{name}-%{version}-%{release}-filelist
 echo "%doc COPYING" >> %{name}-%{version}-%{release}-filelist
@@ -843,6 +853,12 @@ echo "%doc COPYING" >> %{name}-%{version
 rm -rf $RPM_BUILD_ROOT
 
 %pre
+if [ $1 -gt 1 ] ; then
+  if [ -e /var/service/httpd-admin/run ] ; then
+       /usr/bin/sv d httpd-admin
+       /usr/bin/sv d httpd-admin/log
+  fi
+fi
 %preun
 %post
 find /etc/e-smith/web/panels/manager/cgi-bin/ -type f | \
@@ -850,6 +866,10 @@ find /etc/e-smith/web/panels/manager/cgi
     xargs grep -l Persisten | \
     xargs rm -f
 
+if [ -d /var/service/httpd-admin ] ; then
+   rm -rf /var/service/httpd-admin
+fi
+
 %postun
 
 %files -f %{name}-%{version}-%{release}-filelist