--- rpms/e-smith-lib/sme10/e-smith-lib.spec 2016/07/23 06:15:43 1.5 +++ rpms/e-smith-lib/sme10/e-smith-lib.spec 2023/06/28 08:24:32 1.19 @@ -1,10 +1,12 @@ -# $Id: e-smith-lib.spec,v 1.4 2016/07/18 07:53:38 unnilennium Exp $ +# $Id: e-smith-lib.spec,v 1.18 2022/11/23 22:07:12 jpp Exp $ + +%define copykooz 2013-2021 Summary: e-smith server and gateway - library module %define name e-smith-lib Name: %{name} %define version 2.6.0 -%define release 4 +%define release 17 Version: %{version} Release: %{release}%{?dist} License: Artistic @@ -13,12 +15,20 @@ Source: %{name}-%{version}.tar.xz Patch0: e-smith-lib-2.6.0.bz9660.serviceControlSystemd.patch Patch1: e-smith-lib-2.6.0-mariadb.patch Patch2: e-smith-lib-2.6.0.bz9691.syslof.patch +Patch3: e-smith-lib-2.6.0.bz9585.fix_startup_display.patch +Patch4: e-smith-lib-2.6.0.bz9478.patch +Patch5: e-smith-lib-2.6.0.bz10848.systemctl-reload-or-restart.patch +Patch6: e-smith-lib-2.6.0-bz11177-systemd.patch +Patch7: e-smith-lib-2.6.0-bz11177-signals.patch +Patch8: e-smith-lib-2.6.0-bz11570-copyrights.patch +Patch9: e-smith-lib-2.6.0-bz11723.patch +Patch10: e-smith-lib-2.6.0-bz12194-allowSystemctlAliases.patch + BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArchitectures: noarch BuildRequires: e-smith-devtools >= 1.6.3-01 Obsoletes: %{name}-Tai64n Obsoletes: whiptail -Requires(pre): e-smith Requires: dialog Requires: perl, perl(Text::Template) Requires: perl(Time::HiRes), perl(MIME::Base64) @@ -32,6 +42,54 @@ Requires: pciutils e-smith server and gateway software - library module. %changelog +* Wed Jun 28 2023 Trevor Batley 2.6.0-17.sme +- add in user and group adds from e-smith package [SME: 12369] + +* Wed Nov 23 2022 Jean-Philippe Pialasse 2.6.0-16.sme +- allow call to systemctl aliases in etc [SME: 12194] + fix network=>networking service is not restarted. + +* Thu Oct 28 2021 Jean-Philippe Pialasse 2.6.0-15.sme +- add support for service with instances [SME: 11723] + +* Mon Apr 19 2021 Jean-Philippe Pialasse 2.6.0-14.sme +- update copyright dates, and make it easier to change from spec file [SME: 11570] + +* Sat Jan 02 2021 Jean-Philipe Pialasse 2.6.0-13.sme +- partial revert of signals [SME: 11177] + signal s not passed to runit services (dnscache*, qmail, qpsmtpd...) + services handled by systemd crash if they do not have Restart=always defined + +* Fri Jan 01 2021 Jean-Philipe Pialasse 2.6.0-12.sme +- add support for signals SIG* with systemd [SME: 11177] + fix typo for reload-or-try-restart + unsupervised services: really stop when disabled and start stopped enabled ones + +* Thu Nov 26 2020 Jean-Philipe Pialasse 2.6.0-11.sme +- remove error when sending sighup event [SME: 11177] + +* Tue Nov 17 2020 Jean-Philipe Pialasse 2.6.0-10.sme +- allow more systemctl controls [SME: 11177] + convert unrecognized signals from service2adjust in events for systemd + handle unsupervised services the same way supervised were in adjust-services +- create e-smith-lib-event [SME: 11141] + +* Thu Dec 12 2019 Jean-Philipe Pialasse 2.6.0-9.sme +- add support for systemctl reload-or-restart, try-restart, enable -now [SME: 10848] + +* Wed Oct 25 2017 Daniel Berteaud 2.6.0-8.sme +- Revert prev change regarding tap_soft, as it's not needed [SME: 10445] + +* Mon Oct 23 2017 Daniel Berteaud 2.6.0-7.sme +- Skip tap_soft interfaces (eg SoftEther, code from Hsing-Foo Wang) + [SME: 10445] + +* Wed Apr 12 2017 Jean-Philipe Pialasse 2.6.0-6.sme +- remove reference to smtpd in configuration.conf [SME: 9478] + +* Thu Aug 04 2016 Jean-Philipe Pialasse 2.6.0-5.sme +- fix console startup display [SME: 9352] + * Sat Jul 23 2016 Jean-Philipe Pialasse 2.6.0-4.sme - fix service name syslog to rsyslog [SME: 9691] @@ -821,9 +879,48 @@ e-smith server and gateway software - li %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +# creating an event that do nothing. db init is done every time by yum already. +mkdir root/etc/e-smith/events/e-smith-lib-update +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 +%patch10 -p1 %pre - +#-------------------------------------------------- +# add admin, public and www user accounts +#-------------------------------------------------- +/usr/sbin/groupadd \ + -g 500 shared 2>/dev/null || : +/usr/sbin/groupadd \ + -g 102 -o www 2>/dev/null || : +/usr/sbin/useradd \ + -u 102 -g 102 -o -c 'SME Server web server' -d /home/e-smith \ + -G shared -M -s /bin/false www || : +/usr/sbin/groupadd \ + -g 102 -o apache 2>/dev/null || : +/usr/sbin/useradd \ + -u 102 -g 102 -o -c 'Apache' -d /var/www \ + -M -s /sbin/nologin apache || : +/usr/sbin/groupadd \ + -g 101 -o admin 2>/dev/null || : +/usr/sbin/useradd \ + -u 101 -g 101 -c 'SME Server administrator' -d /home/e-smith \ + -G shared,root,www -M -s /sbin/e-smith/console admin || : +/usr/sbin/groupadd \ + -g 103 -o public 2>/dev/null || : +/usr/sbin/useradd \ + -u 103 -g 103 -c 'SME Server guest' -d /home/e-smith \ + -G shared -M -s /bin/false public || : +/usr/sbin/groupadd \ + -g 1002 -o smelog 2>/dev/null || : +/usr/sbin/useradd \ + -u 1002 -g 1002 -c 'SME Server log user' -d /var/log/smelog \ + -M -s /bin/false smelog || : %post @@ -833,6 +930,7 @@ do mkdir -p root/etc/e-smith/events/$event done perl createlinks +find root/ -type f | xargs grep -l ____COPYYEARS____ | xargs sed -i -e 's/____COPYYEARS____/%{copykooz}/g' %install rm -rf $RPM_BUILD_ROOT