/[smeserver]/rpms/e-smith-packetfilter/sme10/e-smith-packetfilter.spec
ViewVC logotype

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

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

Revision 1.7 by jpp, Thu Mar 4 21:43:34 2021 UTC Revision 1.14 by jpp, Wed Apr 7 20:07:51 2021 UTC
# Line 1  Line 1 
1  # $Id: e-smith-packetfilter.spec,v 1.6 2021/03/03 20:29:35 jpp Exp $  # $Id: e-smith-packetfilter.spec,v 1.13 2021/03/05 07:03:44 jpp Exp $
2    
3  Summary: e-smith server and gateway - packetfilter add-on  Summary: e-smith server and gateway - packetfilter add-on
4  %define name e-smith-packetfilter  %define name e-smith-packetfilter
5  Name: %{name}  Name: %{name}
6  %define version 2.6.0  %define version 2.6.0
7  %define release 6  %define release 7
8  Version: %{version}  Version: %{version}
9  Release: %{release}%{?dist}  Release: %{release}%{?dist}
10  License: GPL  License: GPL
# Line 14  Patch0: e-smith-packetfilter-2.6.0-bz111 Line 14  Patch0: e-smith-packetfilter-2.6.0-bz111
14  Patch1: e-smith-packetfilter-2.6.0-bz11251-drop-pptpd.patch  Patch1: e-smith-packetfilter-2.6.0-bz11251-drop-pptpd.patch
15  Patch2: e-smith-packetfilter-2.6.0-bz11420.patch  Patch2: e-smith-packetfilter-2.6.0-bz11420.patch
16  Patch3: e-smith-packetfilter-2.6.0bz11426-ulogd.patch  Patch3: e-smith-packetfilter-2.6.0bz11426-ulogd.patch
17    Patch4: e-smith-packetfilter-2.6.0-bz11528-bz11451.patch
18    
19  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
20  BuildArchitectures: noarch  BuildArchitectures: noarch
21  Requires: e-smith-base >= 5.8.0-49  Requires: e-smith-base >= 5.8.0-49
22  Requires: ulogd >= 1.24  Requires: ulogd >= 2
23  Requires: daemontools  Requires: daemontools
24  Requires: iptables  Requires: iptables
25  BuildRequires: e-smith-devtools  BuildRequires: e-smith-devtools
26  Obsoletes: e-smith-ipmasq  Obsoletes: e-smith-ipmasq
27  AutoReqProv: no  AutoReqProv: no
28    Requires(pre): /usr/sbin/useradd
29    
30  %description  %description
31  e-smith server and gateway software - packetfilter add-on  e-smith server and gateway software - packetfilter add-on
32    
33  %changelog  %changelog
34    * Wed Apr 07 2021 Jean-Philippe Pialasse <tests@pialasse.com> 2.6.0-7.sme
35    - fix dropin file not expanded on initial installation [SME: 11528]
36    - fix noise on logrotate, doing a restart instead of reload [SME: 11451]
37    
38  * Thu Mar 04 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-6.sme  * Thu Mar 04 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-6.sme
39  - move ulogd to systemd [SME: 11426]  - move ulogd to systemd [SME: 11426]
40  - require ulogd 2 [SME: 11426]  - require ulogd 2 [SME: 11426]
# Line 843  e-smith server and gateway software - pa Line 849  e-smith server and gateway software - pa
849  %patch2 -p1  %patch2 -p1
850  %patch3 -p1  %patch3 -p1
851  rm -rf root/var/service/ulogd  rm -rf root/var/service/ulogd
852    mkdir -p root/run/ulog
853    %patch4 -p1
854    
855    
856  %build  %build
857  perl createlinks  perl createlinks
# Line 862  mkdir -p $RPM_BUILD_ROOT/var/log/iptable Line 871  mkdir -p $RPM_BUILD_ROOT/var/log/iptable
871  mkdir -p $RPM_BUILD_ROOT/service  mkdir -p $RPM_BUILD_ROOT/service
872  #ln -s /var/service/ulogd $RPM_BUILD_ROOT/service/ulogd  #ln -s /var/service/ulogd $RPM_BUILD_ROOT/service/ulogd
873  /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \  /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
874      --dir /var/log/iptables 'attr(0755,smelog,smelog)' \      --dir /var/log/iptables 'attr(0755,ulog,ulog)' \
875        --dir /run/ulog 'attr(2755,ulog,ulog)' \
876   > e-smith-%{version}-filelist   > e-smith-%{version}-filelist
877  echo "%doc COPYING"          >> e-smith-%{version}-filelist  echo "%doc COPYING"          >> e-smith-%{version}-filelist
878  #    --dir /var/service/ulogd 'attr(1755,root,root)' \  #    --dir /var/service/ulogd 'attr(1755,root,root)' \
# Line 881  if [ $1 -gt 1 ] ; then Line 891  if [ $1 -gt 1 ] ; then
891    fi    fi
892  fi  fi
893    
894    /usr/sbin/groupadd \
895      -g 1010 -o ulog 2>/dev/null || :
896    
897    /usr/sbin/useradd \
898      -u 1010 -g 1010 -c 'ulogd user' -d /var/log/ulogd \
899      -M -s /bin/false ulog  || :
900    
901  %files -f e-smith-%{version}-filelist  %files -f e-smith-%{version}-filelist
902  %defattr(-,root,root)  %defattr(-,root,root)

Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed