--- rpms/smeserver-smeadmin/contribs10/smeserver-smeadmin.spec 2022/07/29 05:05:46 1.9 +++ rpms/smeserver-smeadmin/contribs10/smeserver-smeadmin.spec 2023/12/18 16:38:35 1.15 @@ -7,7 +7,7 @@ Summary: A graphical monitor, alert rais %define name smeserver-smeadmin Name: %{name} %define version 1.6 -%define release 7 +%define release 11 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -19,6 +19,11 @@ Patch2: smeserver-smeadmin-1.6-locale-20 Patch3: smeserver-smeadmin-1.6-bz10761_real_ssh_port.patch Patch4: smeserver-smeadmin-1.6-bz11642-bz1159-authproxy-errorlog.patch Patch5: smeserver-smeadmin-1.6-locale-2022-07-29.patch +Patch6: smeserver-smeadmin-1.6-bz12023-backup.patch +Patch7: smeserver-smeadmin-1.6-bz11643-services.patch +Patch8: smeserver-smeadmin-1.6-locale-2022-11-11.patch +Patch9: smeserver-smeadmin-1.6-bz12447-auth-qpsmtpd.patch +Patch10: smeserver-smeadmin-1.6-bz10244-bz11754-translation.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArchitectures: noarch @@ -36,11 +41,85 @@ Requires: lm_sensors #Obsoletes: smeserver-sme8admin AutoReqProv: no +%description +The main part of smeadmin is a daemon which gathers informations from logs +and other tools like systat, it then feed a mysql database and create RRD +graphs about your system state. +This daemon can also send periodics mails (with some logs), and alerts mails +based on configurable thresolds. + +A panel is also available in the server-manager, with which you can access gathered +data, display the RRD graphs and configure the service. + +This contrib is a bit inspired by e-smith-sysmon from Shad Lords. + +%prep +%setup +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 +%patch10 -p1 +%build +perl createlinks +%{__mkdir_p} root/etc/e-smith/web/panels/manager/html/smeadmin +%{__mkdir_p} root/usr/share/locale/en_US/LC_MESSAGES + +xgettext --from-code UTF-8 -F --no-wrap -L perl \ + -o root/usr/share/locale/en_US/LC_MESSAGES/smeadmin.po \ + root/etc/e-smith/web/functions/smeadmin \ + root/usr/bin/smeadmind + +/sbin/e-smith/generate-lexicons + +%install +rm -rf $RPM_BUILD_ROOT +(cd root ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT) +rm -f %{name}-%{version}-filelist +/sbin/e-smith/genfilelist $RPM_BUILD_ROOT \ +--file /usr/bin/smeadmind 'attr(755,root,root)' \ +--file /usr/share/doc/smeserver-smeadmin/add_ds_to_rrd.pl 'attr(755,root,root)' \ + > %{name}-%{version}-filelist + +%clean +rm -rf $RPM_BUILD_ROOT + +%pre + +%preun + +%post + +%postun + +%files -f %{name}-%{version}-filelist +%defattr(-,root,root) %changelog +* Mon Dec 18 2023 Jean-Philippe Pialasse 1.6-11.sme +- add accounting of auth_failed [SME: 12447] + adding php8* services +- fix translation [SME: 10244] +- fix translation [SME: 11754] + +* Fri Nov 11 2022 Jean-Philippe Pialasse 1.6-10.sme +- apply locale 2022-11-11 patch + +* Sun Sep 18 2022 Jean-Philippe Pialasse 1.6-9.sme +- fix misisng stopped services [SME: 11643] + +* Sat Jul 30 2022 Brian Read 1.6-8.sme +- Re-build and link to latest devtools [SME: 11997] + * Fri Jul 29 2022 Jean-Philippe Pialasse 1.6-7.sme - apply translation 2022-07-29 -- fix [SME: ] +- add to core backup [SME: 12023] * Mon Jul 18 2022 zsolt vasarhelyi 1.6-6.sme - bz11642 authproxy errorlog [SME: 11642] @@ -56,11 +135,11 @@ AutoReqProv: no - apply locale 2021-08-24 patch * Thu Mar 25 2021 Jean-Philippe Pialasse 1.6-2.sme -- fix mysql not migrating sme9admind [SME: 11062] -- fix config db sme9admind not migrated to smeadmind -- fix /var/lib/sme9admin not migrated +- Re-build and link to latest devtools mysql not migrating sme9admind [SME: 11062] +- Re-build and link to latest devtools config db sme9admind not migrated to smeadmind +- Re-build and link to latest devtools /var/lib/sme9admin not migrated - add smeserver-smeadmin-update event -- fix services diplayed multiple times [SME: 11455] +- Re-build and link to latest devtools services diplayed multiple times [SME: 11455] - systemd unit - review new logs locations - check calls to sysvinit @@ -72,50 +151,50 @@ AutoReqProv: no * Sat Dec 07 2019 SME Translation Server 1.5-30.sme - apply locale 2019-12-07 patch -* Mon Sep 09 2019 Jean-Philipe Pialasse 1.5-29.sme -- fix smeadmind die on mysql connection error [SME: 7683] +* Mon Sep 09 2019 Jean-Philippe Pialasse 1.5-29.sme +- Re-build and link to latest devtools smeadmind die on mysql connection error [SME: 7683] * Sat Dec 02 2017 SME Translation Server 1.5-28.sme - apply locale 2017-12-02 patch -* Mon Aug 14 2017 Jean-Philipe Pialasse 1.5-27.sme +* Mon Aug 14 2017 Jean-Philippe Pialasse 1.5-27.sme - add support for altqmail [SME: 10409] -* Mon Jul 10 2017 Jean-Philipe Pialasse 1.5-26.sme -- fix error after migrating sme8admin db, unable to access mysql db [SME: 10181] +* Mon Jul 10 2017 Jean-Philippe Pialasse 1.5-26.sme +- Re-build and link to latest devtools error after migrating sme8admin db, unable to access mysql db [SME: 10181] -* Sat Mar 25 2017 Jean-Philipe Pialasse 1.5-25.sme +* Sat Mar 25 2017 Jean-Philippe Pialasse 1.5-25.sme - apply locale 2017-03-26 patch -* Wed Feb 01 2017 Jean-Philipe Pialasse 1.5-24.sme +* Wed Feb 01 2017 Jean-Philippe Pialasse 1.5-24.sme - apply locale 2017-02-02.patch -* Sun Jan 01 2017 Jean-Philipe Pialasse 1.5-23.sme -- fix warning related to raid detection code [SME: 9886] -- fix warning related to non existing services removed sinces previous versions [SME: 9889] +* Sun Jan 01 2017 Jean-Philippe Pialasse 1.5-23.sme +- Re-build and link to latest devtools warning related to raid detection code [SME: 9886] +- Re-build and link to latest devtools warning related to non existing services removed sinces previous versions [SME: 9889] -* Tue Dec 20 2016 Jean-Philipe Pialasse 1.5-22.sme +* Tue Dec 20 2016 Jean-Philippe Pialasse 1.5-22.sme - make CGI and pictures utf8 compliant [SME: 9894] - apply smeserver-smeadmin-1.5-locale-2016-12-20.patch -* Sat Dec 17 2016 Jean-Philipe Pialasse 1.5-21.sme +* Sat Dec 17 2016 Jean-Philippe Pialasse 1.5-21.sme - locals smeserver-smeadmin-1.5-locale-2016-12-18.patch -* Sat Dec 17 2016 Jean-Philipe Pialasse 1.5-20.sme -- fix last patch by adding path to called programs +* Sat Dec 17 2016 Jean-Philippe Pialasse 1.5-20.sme +- Re-build and link to latest devtools last patch by adding path to called programs -* Thu Dec 15 2016 Jean-Philipe Pialasse 1.5-19.sme -- fix bad accounting for incoming and outgoing mail [SME: 8818] +* Thu Dec 15 2016 Jean-Philippe Pialasse 1.5-19.sme +- Re-build and link to latest devtools bad accounting for incoming and outgoing mail [SME: 8818] - mail_in alert now account for all queued emails from qpsmtpd and sqpsmtpd - mail_out alert now account for qmail total remote delivery attempts - known issue : on first run will account more than 5 minutes ( whole log) and will alert for exceeding amount - added accounting of qpsmtpd and sqpsmtpd code - TODO: alert on qmail queue too high, alert on too many qpsmtpd connections -* Wed Nov 23 2016 Jean-Philipe Pialasse 1.5-18.sme -- fix limited size in mysql fields for traffic accounting [SME: 8399] +* Wed Nov 23 2016 Jean-Philippe Pialasse 1.5-18.sme +- Re-build and link to latest devtools limited size in mysql fields for traffic accounting [SME: 8399] -* Wed Nov 23 2016 Jean-Philipe Pialasse 1.5-16.sme +* Wed Nov 23 2016 Jean-Philippe Pialasse 1.5-16.sme - add more verbose email alert [SME: 9725] * Fri Aug 21 2015 stephane de Labrusse 1.5-15.sme @@ -155,73 +234,18 @@ AutoReqProv: no * Wed Jun 18 2014 stephane de labrusse 1.5-6.sme - Initial release to sme9 -* Sun Dec 15 2013 JP Pialasse 1.3-4.sme -- fix obsolete missing [SME: 7109] -- fix pppoe and vpn loging [SME: 8061] +* Sun Dec 15 2013 Jean-Philippe Pialasse 1.3-4.sme +- Re-build and link to latest devtools obsolete missing [SME: 7109] +- Re-build and link to latest devtools pppoe and vpn loging [SME: 8061] - added monthly ppoe log -- fix stop on mysql error too many connections [SME: 7683] +- Re-build and link to latest devtools stop on mysql error too many connections [SME: 7683] -* Sun Sep 09 2012 JP Pialasse 1.3-3.sme +* Sun Sep 09 2012 Jean-Philippe Pialasse 1.3-3.sme - startup fix [SME 3022] -* Wed Aug 15 2012 JP Pialasse 1.3-2.sme +* Wed Aug 15 2012 Jean-Philippe Pialasse 1.3-2.sme - 64 bits [SME 7040] -* Sun Jun 10 2012 JP Pialasse 1.3-1.sme +* Sun Jun 10 2012 Jean-Philippe Pialasse 1.3-1.sme - Initial version -%description -The main part of smeadmin is a daemon which gathers informations from logs -and other tools like systat, it then feed a mysql database and create RRD -graphs about your system state. -This daemon can also send periodics mails (with some logs), and alerts mails -based on configurable thresolds. - -A panel is also available in the server-manager, with which you can access gathered -data, display the RRD graphs and configure the service. - -This contrib is a bit inspired by e-smith-sysmon from Shad Lords. - -%prep -%setup -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 - -%build -perl createlinks -%{__mkdir_p} root/etc/e-smith/web/panels/manager/html/smeadmin -%{__mkdir_p} root/usr/share/locale/en_US/LC_MESSAGES - -xgettext --from-code UTF-8 -F --no-wrap -L perl \ - -o root/usr/share/locale/en_US/LC_MESSAGES/smeadmin.po \ - root/etc/e-smith/web/functions/smeadmin \ - root/usr/bin/smeadmind - -/sbin/e-smith/generate-lexicons - -%install -rm -rf $RPM_BUILD_ROOT -(cd root ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT) -rm -f %{name}-%{version}-filelist -/sbin/e-smith/genfilelist $RPM_BUILD_ROOT \ ---file /usr/bin/smeadmind 'attr(755,root,root)' \ ---file /usr/share/doc/smeserver-smeadmin/add_ds_to_rrd.pl 'attr(755,root,root)' \ - > %{name}-%{version}-filelist - -%clean -rm -rf $RPM_BUILD_ROOT - -%pre - -%preun - -%post - -%postun - -%files -f %{name}-%{version}-filelist -%defattr(-,root,root)