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

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

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

-Revision 1.22 by unnilennium,
Wed Apr  5 14:37:42 2017 UTC
+Revision 1.44 by jpp,
Wed Oct  5 04:25:04 2022 UTC
 Line 1
- # $Id: e-smith-manager.spec,v 1.21 2017/03/27 22:45:57 unnilennium Exp $
+ # $Id: e-smith-manager.spec,v 1.43 2022/10/05 04:24:37 jpp Exp $
  Summary: e-smith manager navigation module
  %define name e-smith-manager
  Name: %{name}
  %define version 2.8.0
- %define release 20
+ %define release 38
  Version: %{version}
  Release: %{release}%{?dist}
  License: GPL
 Line 21 
 Patch7: e-smith-manager-2.8.0-bz9924-bad
  Patch8: e-smith-manager-2.8.0-bz9921-timeout.patch
  Patch9: e-smith-manager-2.8.0-bz10167-emptyback.patch
  Patch10: e-smith-manager-2.8.0-bz10209-unitializedUsername.patch
+ Patch11: e-smith-manager-2.8.0-bz8783-bugreport.patch
+ 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
+ Patch18: e-smith-manager-2.8.0-bz11872-log.patch
+ Patch19: e-smith-manager-2.8.0-bz12129-httpd24.patch
+ Patch20: e-smith-manager-2.8.0-bz12129-httpd24-2.patch
+ Patch21: e-smith-manager-2.8.0-bz12204-reload-httpd-admin.patch
  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
  BuildRequires: e-smith-devtools
  BuildRequires: gettext
-Line 29 
 Requires: e-smith-lib >= 1.18.0-26
+Line 41 
 Requires: e-smith-lib >= 1.18.0-26
  Requires: mod_auth_tkt
  Requires: pwauth
  Requires: perl(Apache::AuthTkt)
+ Requires: e-smith-apache >= 2.6.0-19
  Provides: server-manager
  AutoReqProv: no
  %changelog
+ * Wed Oct 05 2022 Jean-Philippe Pialasse <tests@pialasse.com> 2.8.0-38.sme
+ - fix update via manager panel hangs [SME: 12204]
+ * Fri Jul 29 2022 Jean-Philippe Pialasse <tests@pialasse.com> 2.8.0-37.sme
+ - update to httpd 2.4 access syntax for httpd-admin [SME: 12129]
+ * Mon Jul 25 2022 Jean-Philippe Pialasse <tests@pialasse.com> 2.8.0-36.sme
+ - update to httpd 2.4 access syntax [SME: 12129]
+ * Fri Feb 18 2022 Jean-Philippe Pialasse <tests@pialasse.com> 2.8.0-35.sme
+ - removing reference to old log rotation action [SME: 11872]
+ * Thu Mar 18 2021 Jean-Philippe Pialasse <tests@pialasse.com> 2.8.0-34.sme
+ - take 2 wrong system mode reported in bugreport [SME: 10448]
+ * 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]
+ * Tue Dec 10 2019 Jean-Philipe Pialasse <tests@pialasse.com> 2.8.0-29.sme
+ - update apache icon path [SME: 9591]
+ * Sun Feb 04 2018 Jean-Philipe Pialasse <tests@pialasse.com> 2.8.0-28.sme
+ - add message to indicate EOL after Jun 30 2024 fix [SME: 10170]
+ * Sun Apr 16 2017 Jean-Philipe Pialasse <tests@pialasse.com> 2.8.0-26.sme
+ - add a panel to ease reporting bugs [SME: 8783]
+ - Original work from Mats Schuh m.schuh@neckargeo.net
  * Wed Apr 05 2017 Jean-Philipe Pialasse <tests@pialasse.com> 2.8.0-20.sme
  - fix warning uninitialized value in lc [SME: 10209]
-Line 757 
 This RPM contributes the navigation bars
+Line 808 
 This RPM contributes the navigation bars
  %patch8 -p1
  %patch9 -p1
  %patch10 -p1
+ %patch11 -p1
+ %patch12 -p1
+ %patch13 -p1
+ %patch14 -p1
+ %patch15 -p1
+ %patch16 -p1
+ rm -rf root/var/service
+ %patch17 -p1
+ %patch18 -p1
+ %patch19 -p1
+ %patch20 -p1
+ %patch21 -p1
  %build
  perl createlinks
-Line 785 
 mkdir -p root/etc/e-smith/web/panels/pas
+Line 847 
 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
+ #mkdir -p root/etc/rc.d/init.d/supervise
- for service in httpd-admin
+ #for service in httpd-admin
- do
+ #do
-   ln -s /var/service/$service root/service/$service
+ #  ln -s /var/service/$service root/service/$service
-   mkdir -p root/var/service/$service/supervise
+ #  mkdir -p root/var/service/$service/supervise
-   touch root/var/service/$service/down
+ #  touch root/var/service/$service/down
-   if [ -d root/var/service/$service/log ]
+ #  if [ -d root/var/service/$service/log ]
-   then
+ #  then
-     mkdir -p root/var/service/$service/log/supervise
+ #    mkdir -p root/var/service/$service/log/supervise
-     mkdir -p root/var/log/$service
+ #    mkdir -p root/var/log/$service
-   fi
+ #  fi
-   ln -s ../daemontools root/etc/rc.d/init.d/supervise/$service
+ #  ln -s ../daemontools root/etc/rc.d/init.d/supervise/$service
- done
+ #done
  %install
  rm -rf $RPM_BUILD_ROOT
-Line 807 
 rm -f %{name}-%{version}-%{release}-file
+Line 869 
 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
-Line 822 
 echo "%doc COPYING" >> %{name}-%{version
+Line 877 
 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 | \
-Line 829 
 find /etc/e-smith/web/panels/manager/cgi
+Line 890 
 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

 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