OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 01-Jul-2003 17:38:43
Branch: HEAD Handle: 2003070116384101
Added files:
openpkg-src/portsentry fsl.portsentry
Modified files:
openpkg-src/portsentry portsentry.spec rc.portsentry
openpkg-web news.txt
Log:
add fsl support
Summary:
Revision Changes Path
1.1 +15 -0 openpkg-src/portsentry/fsl.portsentry
1.27 +35 -4 openpkg-src/portsentry/portsentry.spec
1.6 +15 -0 openpkg-src/portsentry/rc.portsentry
1.5127 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/portsentry/fsl.portsentry
============================================================================
$ cvs diff -u -r0 -r1.1 fsl.portsentry
--- /dev/null 2003-07-01 17:38:43.000000000 +0200
+++ fsl.portsentry 2003-07-01 17:38:43.000000000 +0200
@@ -0,0 +1,15 @@
+##
+## fsl.portsentry -- OSSP fsl configuration
+##
+
+ident (portsentry)/.+ q{
+ prefix(
+ prefix="%b %d %H:%M:%S %N <%L> $1[%P]: "
+ )
+ -> {
+ debug: file(
+ path="@l_prefix@/var/portsentry/portsentry.log",
+ append=1, perm=0644
+ )
+ }
+};
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/portsentry/portsentry.spec
============================================================================
$ cvs diff -u -r1.26 -r1.27 portsentry.spec
--- openpkg-src/portsentry/portsentry.spec 1 May 2003 09:56:37 -0000 1.26
+++ openpkg-src/portsentry/portsentry.spec 1 Jul 2003 15:38:42 -0000 1.27
@@ -33,17 +33,25 @@
Group: Security
License: Open Source
Version: 1.1
-Release: 20030501
+Release: 20030701
+
+# package options
+%option with_fsl yes
# list of sources
Source0: http://www.psionic.com/downloads/portsentry-%{version}.tar.gz
Source1: rc.portsentry
+Source2: fsl.portsentry
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20020206
-PreReq: OpenPKG, openpkg >= 20020206
+BuildPreReq: OpenPKG, openpkg >= 20030415
+PreReq: OpenPKG, openpkg >= 20030415
+%if "%{with_fsl}" == "yes"
+BuildPreReq: fsl
+PreReq: fsl
+%endif
AutoReq: no
AutoReqProv: no
@@ -54,6 +62,9 @@
%prep
%setup -q
+ %{l_shtool} subst \
+ -e 's;portsentry_util.c$;portsentry_util.c $(LIBS);' \
+ Makefile
%build
%{l_shtool} subst \
@@ -71,11 +82,14 @@
%{l_make} %{l_mflags -O} \
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
+ LDFLAGS="%{l_fsl_ldflags}" \
+ LIBS="%{l_fsl_libs}" \
$os
%install
rm -rf $RPM_BUILD_ROOT
%{l_shtool} mkdir -f -p -m 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/var/%{name} \
$RPM_BUILD_ROOT%{l_prefix}/sbin \
$RPM_BUILD_ROOT%{l_prefix}/etc/portsentry \
$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
@@ -89,12 +103,29 @@
/dev/null $RPM_BUILD_ROOT%{l_prefix}/etc/portsentry/portsentry.history
%{l_shtool} install -c -m 644 \
/dev/null $RPM_BUILD_ROOT%{l_prefix}/etc/portsentry/portsentry.blocked
+
+ # Creating run-command script
+ %{l_shtool} mkdir -f -p -m 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
%{l_shtool} install -c -m 755 \
-e 's;@l_prefix@;%{l_prefix};g' \
-e 's;@l_susr@;%{l_susr};g' \
- %{SOURCE rc.portsentry} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
+ -e 's;@l_rusr@;%{l_rusr};g' \
+ -e 's;@l_rgrp@;%{l_rgrp};g' \
+ %{SOURCE rc.%{name}} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
+
+ # OSSP fake syslog library
+ %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
+ %{l_shtool} install -c -m 644 \
+ -e 's;@l_prefix@;%{l_prefix};g' \
+ %{SOURCE fsl.%{name}} \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
+
+ # determine installation files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
+ '%not %dir %{l_prefix}/etc/fsl' \
+ '%config %{l_prefix}/etc/fsl/fsl.%{name}' \
'%config %{l_prefix}/etc/portsentry/portsentry.conf' \
'%config %{l_prefix}/etc/portsentry/portsentry.ignore'
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/portsentry/rc.portsentry
============================================================================
$ cvs diff -u -r1.5 -r1.6 rc.portsentry
--- openpkg-src/portsentry/rc.portsentry 24 Jun 2003 12:08:00 -0000 1.5
+++ openpkg-src/portsentry/rc.portsentry 1 Jul 2003 15:38:42 -0000 1.6
@@ -5,6 +5,11 @@
%config
portsentry_enable="yes"
+ portsentry_log_prolog="true"
+ portsentry_log_epilog="true"
+ portsentry_log_numfiles="10"
+ portsentry_log_minsize="1M"
+ portsentry_log_complevel="9"
%start -p 200 -u @l_susr@
opServiceEnabled portsentry || exit 0
@@ -22,3 +27,13 @@
@l_prefix@/sbin/portsentry -tcp
@l_prefix@/sbin/portsentry -udp
+%daily -u @l_susr@
+ opServiceEnabled portsentry || exit 0
+
+ # rotate logfile
+ shtool rotate -f \
+ -n${portsentry_log_numfiles} -s${portsentry_log_minsize} -d \
+ -z${portsentry_log_complevel} [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ -m644 \
+ -P "${portsentry_log_prolog}" \
+ -E "${portsentry_log_epilog}" \
+ @l_prefix@/var/portsentry/portsentry.log
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5126 -r1.5127 news.txt
--- openpkg-web/news.txt 1 Jul 2003 15:36:58 -0000 1.5126
+++ openpkg-web/news.txt 1 Jul 2003 15:38:41 -0000 1.5127
@@ -1,3 +1,4 @@
+01-Jul-2003: Upgraded package: P<portsentry-1.1-20030701>
01-Jul-2003: Upgraded package: P<postgresql-7.3.3-20030701>
01-Jul-2003: Upgraded package: P<fsl-1.2.0-20030701>
01-Jul-2003: Upgraded package: P<nntpcache-3.0.1-20030701>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
