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: 09-Sep-2002 20:06:58
Branch: HEAD Handle: 2002090919065701
Modified files:
openpkg-src/sendmail sendmail.spec
openpkg-web news.txt
Log:
Fixed fsl inclusion and related build logic.
Summary:
Revision Changes Path
1.38 +10 -48 openpkg-src/sendmail/sendmail.spec
1.1514 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
Index: openpkg-src/sendmail/sendmail.spec
============================================================
$ cvs diff -u -r1.37 -r1.38 sendmail.spec
--- openpkg-src/sendmail/sendmail.spec 29 Aug 2002 10:09:37 -0000 1.37
+++ openpkg-src/sendmail/sendmail.spec 9 Sep 2002 18:06:58 -0000 1.38
@@ -35,11 +35,6 @@
# README file in the mail.local directory. You can force
# the install using 'Build force-install'.
-# package options
-%ifndef with_fsl
-%define with_fsl no
-%endif
-
# package information
Name: sendmail
Summary: Mail Transfer Agent
@@ -54,21 +49,16 @@
# list of sources
Source0: ftp://ftp.sendmail.org/pub/sendmail/sendmail.%{version}.tar.gz
-Source1: ftp://ftp.openpkg.org/DST/inn/fakesyslog.tar.gz
-Source2: fsl.sendmail
-Source3: etc.sendmail.tar
-Source4: cf.tar
-Source5: rc.sendmail
+Source1: etc.sendmail.tar
+Source2: cf.tar
+Source3: fsl.sendmail
+Source4: rc.sendmail
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20020206, m4, gcc, make, db, openssl
-PreReq: OpenPKG, openpkg >= 20020206, m4, make, perl
-%if "%{with_fsl}" == "yes"
-BuildPreReq: fsl
-PreReq: fsl
-%endif
+BuildPreReq: OpenPKG, openpkg >= 20020206, m4, fsl, tar, gcc, make, db, openssl
+PreReq: OpenPKG, openpkg >= 20020206, m4, fsl, make, perl
AutoReq: no
AutoReqProv: no
Provides: MTA
@@ -79,16 +69,10 @@
features specific to the OpenPKG distribution including fsl(3) logging
rather than syslog(3) and STARTTLS support by default.
- Options:
- with_fsl=%{with_fsl}
-
%prep
# unpack standard tarballs
%setup0 -q -c
-%if "%{with_fsl}" != "yes"
%setup1 -q -T -D -a 1
-%endif
- %setup3 -q -T -D -a 3
# add own M4 stuff to Sendmail configuration set
( cd sendmail-%{version}
@@ -96,18 +80,6 @@
)
%build
- # build faked syslog(3) library
-%if "%{with_fsl}" != "yes"
- fakesyslogdir="`pwd`/fakesyslog"
- ( cd fakesyslog
- CC="%{l_cc}" \
- CFLAGS="%{l_cflags -O} -I%{l_prefix}/include" \
- ./configure \
- --with-logfile=%{l_prefix}/var/sendmail/sendmail.log
- %{l_make} %{l_mflags}
- )
-%endif
-
# build Sendmail
( cd sendmail-%{version}
@@ -117,11 +89,9 @@
-e 's;\(Version\[\][^"]*\)"[^"]*";\1"%{version}+";' \
sendmail/version.c
- # conditionally add linker flag defs for fsl(3)
- %if "%{with_fsl}" == "yes"
- LDFLAGS="`%{l_prefix}/bin/fsl-config --ldflags --all`" \
- LIBS="`%{l_prefix}/bin/fsl-config --libs --all`" \
- %endif
+ # add linker flag defs for fsl(3)
+ LDFLAGS="`%{l_prefix}/bin/fsl-config --ldflags --all`" \
+ LIBS="`%{l_prefix}/bin/fsl-config --libs --all`" \
# configure Sendmail
( echo "define(\`confMAPDEF', \`-DMAP_REGEX')dnl"
@@ -151,11 +121,7 @@
echo "APPENDDEF(\`confENVDEF',
\`-D_PATH_SENDMAILPID=\\\"%{l_prefix}/var/sendmail/sendmail.pid\\\"')dnl"
echo "APPENDDEF(\`confINCDIRS', \`-I%{l_prefix}/include')dnl"
echo "APPENDDEF(\`confLIBDIRS', \`-L%{l_prefix}/lib')dnl"
-%if "%{with_fsl}" == "yes"
echo "APPENDDEF(\`confLIBS', \`-lfsl -ldb')dnl"
-%else
- echo "APPENDDEF(\`confLIBS', \`-ldb')dnl"
-%endif
echo "define(\`confSTDIO_TYPE', \`portable')dnl"
echo "APPENDDEF(\`conf_sendmail_ENVDEF', \`-DSTARTTLS')dnl"
echo "APPENDDEF(\`conf_sendmail_LIBS', \`-lssl -lcrypto')dnl"
@@ -221,14 +187,12 @@
mv $RPM_BUILD_ROOT%{l_prefix}/bin/rmail \
$RPM_BUILD_ROOT%{l_prefix}/sbin/rmail
- # install optional OSSP fsl support
-%if "%{with_fsl}" == "yes"
+ # install 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.sendmail} \
$RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
-%endif
# remember the Sendmail M4 stuff for re-configuration
(%{l_tar} cf $RPM_BUILD_ROOT%{l_prefix}/etc/sendmail/cf.tar cf)
@@ -302,10 +266,8 @@
'%config %attr(644,root,%{l_mgrp}) %{l_prefix}/etc/sendmail/ca.crt' \
'%config %attr(644,root,%{l_mgrp}) %{l_prefix}/etc/sendmail/sendmail.crt' \
'%config %attr(600,root,%{l_mgrp}) %{l_prefix}/etc/sendmail/sendmail.key' \
-%if "%{with_fsl}" == "yes"
'%config %{l_prefix}/etc/fsl/fsl.sendmail' \
'%not %dir %{l_prefix}/etc/fsl' \
-%endif
'%attr(700,root,%{l_mgrp}) %{l_prefix}/var/sendmail/mqueue' \
'%attr(700,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/sendmail/clientmqueue' \
'%attr(644,root,%{l_mgrp}) %{l_prefix}/var/sendmail/sendmail.log' \
Index: openpkg-web/news.txt
============================================================
$ cvs diff -u -r1.1513 -r1.1514 news.txt
--- openpkg-web/news.txt 9 Sep 2002 17:53:18 -0000 1.1513
+++ openpkg-web/news.txt 9 Sep 2002 18:06:57 -0000 1.1514
@@ -1,3 +1,4 @@
+09-Sep-2002: Upgraded package: P<sendmail-8.12.6-20020829>
09-Sep-2002: Upgraded package: P<openpkg-20020909-20020909>
09-Sep-2002: Upgraded package: P<smtpfeed-1.18-20020909>
09-Sep-2002: Upgraded package: P<integrit-3.02.00-20020909>
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
