OpenPKG CVS Repository
http://www.openpkg.org/cvsweb/cvsweb.cgi
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-web, openpkg-src Date: 02-Aug-2002 14:24:18
Branch: HEAD Handle: 2002080213241701
Added files:
openpkg-src/postfix fsl.postfix
Modified files:
openpkg-src/postfix postfix.spec
openpkg-web news.txt
Log:
add OSSP fsl support to Postfix
Summary:
Revision Changes Path
1.1 +16 -0 openpkg-src/postfix/fsl.postfix
1.74 +28 -0 openpkg-src/postfix/postfix.spec
1.1090 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
Index: openpkg-src/postfix/fsl.postfix
============================================================
$ cvs update -p -r1.1 fsl.postfix
##
## fsl.postfix -- OSSP fsl configuration for Postfix
##
ident (postfix/.+)/.+ q{
prefix(
prefix="%b %d %H:%M:%S %N <%L> $1[%P]: "
)
-> {
debug: file(
path="@l_prefix@/var/postfix/log/postfix.log",
append=1, perm=0644
)
}
}
Index: openpkg-src/postfix/postfix.spec
============================================================
$ cvs diff -u -r1.73 -r1.74 postfix.spec
--- openpkg-src/postfix/postfix.spec 18 Jul 2002 17:49:54 -0000 1.73
+++ openpkg-src/postfix/postfix.spec 2 Aug 2002 12:24:18 -0000 1.74
@@ -35,6 +35,9 @@
%ifndef with_sasl
%define with_sasl no
%endif
+%ifndef with_fsl
+%define with_fsl no
+%endif
# package information
Name: postfix
@@ -56,6 +59,7 @@
Source4: http://jimsun.linxnet.com/downloads/pflogsumm-%{V_pflogsumm}.pl
Source5: rc.postfix
Source6: postfix-sasl2.patch
+Source7: fsl.postfix
# build information
Prefix: %{l_prefix}
@@ -70,6 +74,10 @@
BuildPreReq: sasl
PreReq: sasl
%endif
+%if "%{with_fsl}" == "yes"
+BuildPreReq: fsl
+PreReq: fsl
+%endif
AutoReq: no
AutoReqProv: no
Provides: MTA
@@ -121,6 +129,7 @@
%build
# build faked syslog(3) library
+%if "%{with_fsl}" != "yes"
fakesyslogdir="`pwd`/fakesyslog"
( cd fakesyslog
CC="%{l_cc}" \
@@ -129,6 +138,7 @@
--with-logfile=%{l_prefix}/var/postfix/log/postfix.log
%{l_make} %{l_mflags}
)
+%endif
# configure Postfix
cd postfix-%{V_postfix}
@@ -154,7 +164,11 @@
AUXLIBS="$AUXLIBS -ldl"
fi
%endif
+%if "%{with_fsl}" == "yes"
+ AUXLIBS="$AUXLIBS `%{l_prefix}/bin/fsl-config --all --ldflags --libs`"
+%else
AUXLIBS="$AUXLIBS -L$fakesyslogdir -lfakesyslog"
+%endif
%{l_make} %{l_mflags} makefiles \
CC="%{l_cc}" CCARGS="$CCARGS" AUXLIBS="$AUXLIBS"
@@ -250,6 +264,16 @@
-e 's;@l_mgrp@;%{l_mgrp};g' \
%{SOURCE rc.postfix} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
+ # optional OSSP fsl support
+%if "%{with_fsl}" == "yes"
+ %{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.postfix} \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
+%endif
+
# adjust installation to avoid file name conflicts
( cd $RPM_BUILD_ROOT%{l_prefix}/man/man8
mv master.8 postfix_master.8
@@ -259,6 +283,10 @@
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
'%attr(-,root,%{l_mgrp}) %{l_prefix}/etc/postfix' \
+%if "%{with_fsl}" == "yes"
+ '%config %{l_prefix}/etc/fsl/fsl.postfix' \
+ '%not %dir %{l_prefix}/etc/fsl' \
+%endif
'%config %attr(-,root,%{l_mgrp}) %{l_prefix}/etc/postfix/*' \
'%attr(-,root,%{l_mgrp}) %{l_prefix}/libexec/postfix/*' \
'%attr(2755,%{l_musr},%{l_rgrp}) %{l_prefix}/sbin/{postdrop,postqueue}' \
Index: openpkg-web/news.txt
============================================================
$ cvs diff -u -r1.1089 -r1.1090 news.txt
--- openpkg-web/news.txt 2 Aug 2002 12:00:23 -0000 1.1089
+++ openpkg-web/news.txt 2 Aug 2002 12:24:17 -0000 1.1090
@@ -1,3 +1,4 @@
+02-Aug-2002: Upgraded package: P<postfix-1.1.11-20020718>
02-Aug-2002: Upgraded package: P<fsl-1.0.1-20020802>
02-Aug-2002: Upgraded package: P<grepmail-4.71-20020802>
01-Aug-2002: Upgraded package: P<fsl-1.0.0-20020801>
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
