--- rpms/e-smith-base/sme10/e-smith-base.spec 2020/11/17 16:57:45 1.65 +++ rpms/e-smith-base/sme10/e-smith-base.spec 2020/11/18 03:58:05 1.66 @@ -1,10 +1,10 @@ -# $Id: e-smith-base.spec,v 1.64 2020/11/17 02:56:01 jpp Exp $ +# $Id: e-smith-base.spec,v 1.65 2020/11/17 16:57:45 jpp Exp $ Summary: e-smith server and gateway - base module %define name e-smith-base Name: %{name} %define version 5.8.0 -%define release 53 +%define release 54 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -50,6 +50,7 @@ Patch36: e-smith-base-5.8.0-bz11091-wan. Patch37: e-smith-base-5.8.0-bz11094-raidmonitor.service.patch Patch38: e-smith-base-5.8.0-bz11174-preset.patch Patch39: e-smith-base-5.8.0-bz11177-systemd.patch +Patch40: e-smith-base-5.8.0-bz2408-bz11100-dhcpd-systemd-and-log.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot Requires: pwauth @@ -100,6 +101,11 @@ AutoReqProv: no e-smith server and gateway software - base module. %changelog +* Tue Nov 17 2020 Jean-Philipe Pialasse 5.8.0-54.sme +- move dhcpd to systemd [SME: 11100] +- get dhcpd log out of message [SME: 2408] + also configure logrotate for /var/log/dhcpd/dhcpd.log and /var/log/dhcpd/current + * Tue Nov 17 2020 Jean-Philipe Pialasse 5.8.0-53.sme - reverte previous changes for service2adjust and util.pm [SME: 11177] files are owned by e-smith-lib @@ -2047,6 +2053,11 @@ rm -rf root/var/service/raidmonitor root rm -f root/etc/rc.d/init.d/supervise/wan mkdir -p root/etc/systemd/system-preset %patch39 -p1 +%patch40 -p1 +mkdir -p root/usr/lib/systemd/system/dhcpd.service.d +rm root/service/dhcpd +rm -rf root/var/service/dhcpd +rm root/etc/rc.d/init.d/supervise/dhcpd %pre /sbin/e-smith/create-system-user smelastsys 2999 \