--- rpms/e-smith-packetfilter/sme10/e-smith-packetfilter.spec 2021/03/04 21:43:34 1.7 +++ rpms/e-smith-packetfilter/sme10/e-smith-packetfilter.spec 2021/03/05 06:49:34 1.12 @@ -1,4 +1,4 @@ -# $Id: e-smith-packetfilter.spec,v 1.6 2021/03/03 20:29:35 jpp Exp $ +# $Id: e-smith-packetfilter.spec,v 1.11 2021/03/05 06:28:44 jpp Exp $ Summary: e-smith server and gateway - packetfilter add-on %define name e-smith-packetfilter @@ -18,12 +18,13 @@ Patch3: e-smith-packetfilter-2.6.0bz1142 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArchitectures: noarch Requires: e-smith-base >= 5.8.0-49 -Requires: ulogd >= 1.24 +Requires: ulogd >= 2 Requires: daemontools Requires: iptables BuildRequires: e-smith-devtools Obsoletes: e-smith-ipmasq AutoReqProv: no +Requires(pre): /usr/sbin/useradd %description e-smith server and gateway software - packetfilter add-on @@ -860,9 +861,11 @@ done (cd root ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT) mkdir -p $RPM_BUILD_ROOT/var/log/iptables mkdir -p $RPM_BUILD_ROOT/service +mkdir -p $RPM_BUILD_ROOT/var/run/ulog #ln -s /var/service/ulogd $RPM_BUILD_ROOT/service/ulogd /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \ - --dir /var/log/iptables 'attr(0755,smelog,smelog)' \ + --dir /var/log/iptables 'attr(0755,ulog,ulog)' \ + --dir /var/run/ulog 'attr(0755,ulog,ulog)' \ > e-smith-%{version}-filelist echo "%doc COPYING" >> e-smith-%{version}-filelist # --dir /var/service/ulogd 'attr(1755,root,root)' \ @@ -881,6 +884,12 @@ if [ $1 -gt 1 ] ; then fi fi +/usr/sbin/groupadd \ + -g 1010 -o ulog 2>/dev/null || : + +/usr/sbin/useradd \ + -u 1010 -g 1010 -c 'ulogd user' -d /var/log/ulogd \ + -M -s /bin/false ulog || : %files -f e-smith-%{version}-filelist %defattr(-,root,root)