OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-web, openpkg-src Date: 11-Sep-2002 16:59:39
Branch: HEAD Handle: 2002091115593800
Modified files:
openpkg-src/postfix postfix.spec
openpkg-web news.txt
Log:
OSSP fsl logic is hard coded into buildconf and no longer conditional.
Summary:
Revision Changes Path
1.81 +5 -35 openpkg-src/postfix/postfix.spec
1.1526 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
Index: openpkg-src/postfix/postfix.spec
============================================================
$ cvs diff -u -r1.80 -r1.81 postfix.spec
--- openpkg-src/postfix/postfix.spec 19 Aug 2002 14:14:44 -0000 1.80
+++ openpkg-src/postfix/postfix.spec 11 Sep 2002 14:59:38 -0000 1.81
@@ -35,9 +35,6 @@
%ifndef with_sasl
%define with_sasl no
%endif
-%ifndef with_fsl
-%define with_fsl no
-%endif
%ifndef with_mysql
%define with_mysql no
%endif
@@ -52,23 +49,22 @@
Group: Mail
License: IPL
Version: %{V_postfix}
-Release: 20020819
+Release: 20020911
# list of sources
Source0:
ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-%{V_postfix}.tar.gz
Source1: ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/pfixtls-%{V_tls}.tar.gz
-Source2: fakesyslog.tar.gz
+Source2: fsl.postfix
Source3: etc.tar
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}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20020206, perl
-PreReq: OpenPKG, openpkg >= 20020206, perl, procmail, perl-time
+BuildPreReq: OpenPKG, openpkg >= 20020206, perl, fsl
+PreReq: OpenPKG, openpkg >= 20020206, perl, fsl, procmail, perl-time
BuildPreReq: db, pcre
%if "%{with_tls}" == "yes"
BuildPreReq: openssl, patch
@@ -77,10 +73,6 @@
BuildPreReq: sasl
PreReq: sasl
%endif
-%if "%{with_fsl}" == "yes"
-BuildPreReq: fsl
-PreReq: fsl
-%endif
%if "%{with_mysql}" == "yes"
BuildPreReq: mysql
PreReq: mysql
@@ -115,7 +107,6 @@
%if "%{with_tls}" == "yes"
%setup1 -q -T -D -a 1
%endif
- %setup2 -q -T -D -a 2
%setup3 -q -T -D -a 3
cd postfix-%{V_postfix}
%if "%{with_tls}" == "yes"
@@ -140,19 +131,6 @@
src/util/sys_defs.h
%build
-
- # build faked syslog(3) library
-%if "%{with_fsl}" != "yes"
- fakesyslogdir="`pwd`/fakesyslog"
- ( cd fakesyslog
- CC="%{l_cc}" \
- CFLAGS="%{l_cflags -O}" \
- ./configure \
- --with-logfile=%{l_prefix}/var/postfix/log/postfix.log
- %{l_make} %{l_mflags}
- )
-%endif
-
# configure Postfix
cd postfix-%{V_postfix}
unset LD_LIBRARY_PATH || true
@@ -181,11 +159,7 @@
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"
@@ -281,15 +255,13 @@
-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"
+ # OSSP fsl support
%{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
@@ -300,10 +272,8 @@
%{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.1525 -r1.1526 news.txt
--- openpkg-web/news.txt 11 Sep 2002 14:26:16 -0000 1.1525
+++ openpkg-web/news.txt 11 Sep 2002 14:59:38 -0000 1.1526
@@ -1,3 +1,4 @@
+11-Sep-2002: Upgraded package: P<postfix-1.1.11-20020911>
11-Sep-2002: Upgraded package: P<inn-2.3.3-20020911>
11-Sep-2002: Upgraded package: P<openssh-3.4p1-20020911>
11-Sep-2002: Upgraded package: P<smtpfeed-1.18-20020911>
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
