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: 08-Jul-2003 15:47:59
Branch: HEAD Handle: 2003070814475702
Added files:
openpkg-src/spamassassin
fsl.spamassassin
Modified files:
openpkg-src/spamassassin
rc.spamassassin spamassassin.spec
openpkg-web news.txt
Log:
add fsl support
Summary:
Revision Changes Path
1.1 +16 -0 openpkg-src/spamassassin/fsl.spamassassin
1.3 +17 -0 openpkg-src/spamassassin/rc.spamassassin
1.11 +42 -16 openpkg-src/spamassassin/spamassassin.spec
1.5446 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/spamassassin/fsl.spamassassin
============================================================================
$ cvs diff -u -r0 -r1.1 fsl.spamassassin
--- /dev/null 2003-07-08 15:47:59.000000000 +0200
+++ fsl.spamassassin 2003-07-08 15:47:59.000000000 +0200
@@ -0,0 +1,16 @@
+##
+## fsl.spamassassin -- OSSP fsl configuration
+##
+
+ident (spam[cd])/.+ q{
+ prefix(
+ prefix="%b %d %H:%M:%S %N <%L> $1[%P]: "
+ )
+ -> {
+ debug: file(
+ path="@l_prefix@/var/spamassassin/spamassassin.log",
+ append=1, perm=0644
+ )
+ }
+};
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/spamassassin/rc.spamassassin
============================================================================
$ cvs diff -u -r1.2 -r1.3 rc.spamassassin
--- openpkg-src/spamassassin/rc.spamassassin 24 Jun 2003 12:08:09 -0000 1.2
+++ openpkg-src/spamassassin/rc.spamassassin 8 Jul 2003 13:47:59 -0000 1.3
@@ -7,6 +7,12 @@
spamassassin_enable="yes"
spamassassin_iface="127.0.0.1"
spamassassin_port="783"
+ spamassassin_enable="yes"
+ spamassassin_log_prolog="true"
+ spamassassin_log_epilog="true"
+ spamassassin_log_numfiles="10"
+ spamassassin_log_minsize="1M"
+ spamassassin_log_complevel="9"
%common
spamassassin_pidfile="@l_prefix@/var/spamassassin/spamassassin.pid"
@@ -27,4 +33,15 @@
kill -TERM `cat "${spamassassin_pidfile}"`
fi
fi
+
+%daily -u @l_susr@
+ opServiceEnabled spamassassin || exit 0
+
+ # rotate logfile
+ shtool rotate -f \
+ -n${spamassassin_log_numfiles} -s${spamassassin_log_minsize} -d \
+ -z${spamassassin_log_complevel} [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ -m644
\
+ -P "${spamassassin_log_prolog}" \
+ -E "${spamassassin_log_epilog}" \
+ @l_prefix@/var/spamassassin/spamassassin.log
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/spamassassin/spamassassin.spec
============================================================================
$ cvs diff -u -r1.10 -r1.11 spamassassin.spec
--- openpkg-src/spamassassin/spamassassin.spec 4 Jul 2003 09:41:47 -0000
1.10
+++ openpkg-src/spamassassin/spamassassin.spec 8 Jul 2003 13:47:59 -0000
1.11
@@ -33,18 +33,26 @@
Group: Mail
License: GPL/Artistic
Version: 2.55
-Release: 20030704
+Release: 20030708
+
+# package options
+%option with_fsl yes
# list of sources
Source0:
http://www.spamassassin.org/released/Mail-SpamAssassin-%{version}.tar.gz
Source1: rc.spamassassin
Source2: local.cf
+Source3: fsl.spamassassin
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20030103, perl, perl-xml, perl-openpkg, make
-PreReq: OpenPKG, openpkg >= 20030103, perl, perl-xml
+BuildPreReq: OpenPKG, openpkg >= 20030415, perl, perl-xml, perl-openpkg, make
+PreReq: OpenPKG, openpkg >= 20030415, perl, perl-xml
+%if "%{with_fsl}" == "yes"
+BuildPreReq: fsl
+PreReq: fsl
+%endif
AutoReq: no
AutoReqProv: no
@@ -59,18 +67,26 @@
%prep
%setup -q -n Mail-SpamAssassin-%{version}
+%if "%{with_fsl}" == "yes"
+ %{l_shtool} subst \
+ -e 's/openlog.*(\(.*\),\(.*\),.*)/openlog(\1,\2, LOG_USER)/' \
+ spamd/spamc.c
+%endif
%build
%install
rm -rf $RPM_BUILD_ROOT
+ %{l_shtool} mkdir -f -p -m 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/var/spamassassin
# build & install spamassassin
eval `%{l_prefix}/bin/perl -V:sitelib`
%{l_prefix}/bin/perl-openpkg prolog
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
- LDFLAGS="%{l_ldflags}" \
+ LDFLAGS="%{l_ldflags} %{l_fsl_ldflags}" \
+ LIBS="%{l_fsl_libs}" \
%{l_prefix}/bin/perl-openpkg install \
INST_PREFIX="%{l_prefix}" \
INST_SITELIB="$sitelib" \
@@ -89,16 +105,6 @@
%{SOURCE local.cf} \
$RPM_BUILD_ROOT%{l_prefix}/etc/spamassassin/
- # install 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' \
- -e 's;@l_sgrp@;%{l_sgrp};g' \
- %{SOURCE rc.spamassassin} \
- $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
-
# create directory for PID file
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/var/spamassassin
@@ -107,8 +113,28 @@
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
rm -rf $RPM_BUILD_ROOT%{l_prefix}/man/man3
- # generate file list
- %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
+ # install 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' \
+ -e 's;@l_rusr@;%{l_rusr};g' \
+ -e 's;@l_rgrp@;%{l_rgrp};g' \
+ %{SOURCE rc.spamassassin} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
+
+ # install OSSP fsl configuration
+ %{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.spamassassin} \
+ $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.spamassassin' \
'%config %{l_prefix}/etc/spamassassin/*'
%files -f files
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5445 -r1.5446 news.txt
--- openpkg-web/news.txt 8 Jul 2003 13:41:48 -0000 1.5445
+++ openpkg-web/news.txt 8 Jul 2003 13:47:57 -0000 1.5446
@@ -1,3 +1,4 @@
+08-Jul-2003: Upgraded package: P<spamassassin-2.55-20030708>
08-Jul-2003: New package: P<gcc34-3.4s20030702-20030708>
08-Jul-2003: Upgraded package: P<openvpn-1.4.1-20030708>
08-Jul-2003: Upgraded package: P<dhcp-agent-0.40-20030708>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
