OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 08-Jul-2003 15:02:52
Branch: HEAD Handle: 2003070814025200
Added files:
openpkg-src/exim fsl.exim
Modified files:
openpkg-src/exim exim.spec rc.exim
Log:
add fsl support; package was previously was and still is broken
Summary:
Revision Changes Path
1.40 +31 -5 openpkg-src/exim/exim.spec
1.1 +16 -0 openpkg-src/exim/fsl.exim
1.6 +13 -0 openpkg-src/exim/rc.exim
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/exim/exim.spec
============================================================================
$ cvs diff -u -r1.39 -r1.40 exim.spec
--- openpkg-src/exim/exim.spec 7 Jul 2003 10:14:24 -0000 1.39
+++ openpkg-src/exim/exim.spec 8 Jul 2003 13:02:52 -0000 1.40
@@ -33,20 +33,28 @@
Group: Mail
License: GPL
Version: 4.20
-Release: 20030707
+Release: 20030708
+
+# package options
+%option with_fsl yes
# list of sources
Source0:
ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/exim-%{version}.tar.bz2
Source1: exim-man.tar.gz
Source2: rc.exim
+Source3: fsl.exim
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20020206, perl, gzip, tar
-PreReq: OpenPKG, openpkg >= 20020206, perl, gzip
+BuildPreReq: OpenPKG, openpkg >= 20030415, perl, gzip, tar
+PreReq: OpenPKG, openpkg >= 20030415, perl, gzip
BuildPreReq: openssl, db >= 4.1.24
PreReq: openssl, db >= 4.1.24
+%if "%{with_fsl}" == "yes"
+BuildPreReq: fsl
+PreReq: fsl
+%endif
AutoReq: no
AutoReqProv: no
Provides: MTA
@@ -70,6 +78,8 @@
cp src/EDITME Local/Makefile
( echo "CC=%{l_cc}"
echo "CFLAGS=%{l_cflags -O}"
+ echo "LDFLAGS=%{l_fsl_ldflags}"
+ echo "LIBS=%{l_fsl_libs}"
echo "EXIM_UID=%{l_muid}"
echo "EXIM_GID=%{l_mgid}"
echo "EXIM_USER=%{l_nusr}"
@@ -117,6 +127,7 @@
$RPM_BUILD_ROOT%{l_prefix}/bin \
$RPM_BUILD_ROOT%{l_prefix}/sbin \
$RPM_BUILD_ROOT%{l_prefix}/etc/exim \
+ $RPM_BUILD_ROOT%{l_prefix}/var/exim \
$RPM_BUILD_ROOT%{l_prefix}/var/exim/run \
$RPM_BUILD_ROOT%{l_prefix}/var/exim/log \
$RPM_BUILD_ROOT%{l_prefix}/man/man8
@@ -150,13 +161,28 @@
) >$RPM_BUILD_ROOT%{l_prefix}/sbin/newaliases
chmod 755 $RPM_BUILD_ROOT%{l_prefix}/sbin/newaliases
+ # 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_susr@;%{l_susr};g' \
-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.exim} $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.exim} \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
+
+ # determine installation files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
- %{l_files_std} \
+ %{l_files_std} \
+ '%not %dir %{l_prefix}/etc/fsl' \
+ '%config %{l_prefix}/etc/fsl/fsl.exim' \
'%attr(4755,root,%{l_mgrp}) %{l_prefix}/bin/exim'
%files -f files
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/exim/fsl.exim
============================================================================
$ cvs diff -u -r0 -r1.1 fsl.exim
--- /dev/null 2003-07-08 15:02:52.000000000 +0200
+++ fsl.exim 2003-07-08 15:02:52.000000000 +0200
@@ -0,0 +1,16 @@
+##
+## fsl.exim -- OSSP fsl configuration
+##
+
+ident (.+)/mail q{
+ prefix(
+ prefix="%b %d %H:%M:%S %N <%L> $1[%P]: "
+ )
+ -> {
+ debug: file(
+ path="@l_prefix@/var/exim/exim.log",
+ append=1, perm=0644
+ )
+ }
+};
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/exim/rc.exim
============================================================================
$ cvs diff -u -r1.5 -r1.6 rc.exim
--- openpkg-src/exim/rc.exim 24 Jun 2003 12:17:35 -0000 1.5
+++ openpkg-src/exim/rc.exim 8 Jul 2003 13:02:52 -0000 1.6
@@ -9,6 +9,11 @@
mta_aliases_update="true"
exim_enable="yes"
exim_flags="-bd -q30m"
+ exim_log_prolog="true"
+ exim_log_epilog="true"
+ exim_log_numfiles="10"
+ exim_log_minsize="1M"
+ exim_log_complevel="9"
%start -p 200 -u @l_susr@
opServiceEnabled exim || exit 0
@@ -39,4 +44,12 @@
%daily -u @l_susr@
opServiceEnabled exim || exit 0
+
+ # rotate logfile
+ shtool rotate -f \
+ -n${exim_log_numfiles} -s${exim_log_minsize} -d \
+ -z${exim_log_complevel} [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ -m644 \
+ -P "${exim_log_prolog}" \
+ -E "${exim_log_epilog}" \
+ @l_prefix@/var/exim/exim.log
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
