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: 23-Jun-2003 23:01:41
Branch: HEAD Handle: 2003062322013802
Modified files:
openpkg-src/sendmail sendmail.spec
openpkg-web news.txt
Log:
make fsl optional with default yes, as promised for the next release
Summary:
Revision Changes Path
1.71 +19 -14 openpkg-src/sendmail/sendmail.spec
1.4970 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/sendmail/sendmail.spec
============================================================================
$ cvs diff -u -r1.70 -r1.71 sendmail.spec
--- openpkg-src/sendmail/sendmail.spec 12 Jun 2003 18:46:07 -0000 1.70
+++ openpkg-src/sendmail/sendmail.spec 23 Jun 2003 21:01:40 -0000 1.71
@@ -33,9 +33,10 @@
Group: Mail
License: BSD
Version: 8.12.9
-Release: 20030612
+Release: 20030623
# package options
+%option with_fsl yes
%option with_tls no
%option with_sasl no
%option with_milter no
@@ -53,8 +54,12 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20030516, m4, fsl, gcc, make, db >= 4.1.25
-PreReq: OpenPKG, openpkg >= 20030516, m4, fsl, make, perl, procmail
+BuildPreReq: OpenPKG, openpkg >= 20030516, m4, gcc, make, db >= 4.1.25
+PreReq: OpenPKG, openpkg >= 20030516, m4, make, perl, procmail
+%if "%{with_fsl}" == "yes"
+BuildPreReq: fsl
+PreReq: fsl
+%endif
%if "%{with_tls}" == "yes"
BuildPreReq: openssl
%endif
@@ -155,7 +160,7 @@
echo "APPENDDEF(\`confENVDEF', \`-DNEWDB')dnl"
echo "APPENDDEF(\`confINCDIRS', \`-I%{l_prefix}/include')dnl"
echo "APPENDDEF(\`confLIBDIRS', \`-L%{l_prefix}/lib')dnl"
- echo "APPENDDEF(\`confLIBS', \`-lfsl -ldb')dnl"
+ echo "APPENDDEF(\`confLIBS', \`%{l_fsl_libs} -ldb')dnl"
echo "define(\`confSTDIO_TYPE', \`portable')dnl"
echo "APPENDDEF(\`confENVDEF', \`-DDNSMAP')dnl"
%if "%{with_tls}" == "yes"
@@ -237,13 +242,6 @@
$RPM_BUILD_ROOT%{l_prefix}/lib/
%endif
- # 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/
-
# remember the Sendmail M4 stuff for re-configuration
(%{l_tar} cf $RPM_BUILD_ROOT%{l_prefix}/etc/sendmail/cf.tar cf)
compress $RPM_BUILD_ROOT%{l_prefix}/etc/sendmail/cf.tar
@@ -300,6 +298,13 @@
$RPM_BUILD_ROOT%{l_prefix}/var/sendmail/clientmqueue/.hoststat
touch $RPM_BUILD_ROOT%{l_prefix}/var/sendmail/sendmail.log
+ # OSSP fake syslog library
+ %{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.%{name}} \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
+
# adjust installation tree
rm -rf $RPM_BUILD_ROOT%{l_prefix}/man/cat*
rm -f $RPM_BUILD_ROOT%{l_prefix}/etc/sendmail/submit.cf
@@ -307,9 +312,11 @@
strip $RPM_BUILD_ROOT%{l_prefix}/sbin/* 2>/dev/null || true
strip $RPM_BUILD_ROOT%{l_prefix}/libexec/sendmail/* 2>/dev/null || true
- # determine file list
+ # 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.%{name}' \
'%attr(2755,%{l_susr},%{l_rgrp}) %{l_prefix}/sbin/sendmail' \
'%attr(4755,%{l_susr},%{l_mgrp}) %{l_prefix}/bin/hoststat' \
'%attr(4755,%{l_susr},%{l_mgrp}) %{l_prefix}/bin/mailq' \
@@ -322,8 +329,6 @@
'%config %attr(644,%{l_susr},%{l_mgrp}) %{l_prefix}/etc/sendmail/ca.crt' \
'%config %attr(644,%{l_susr},%{l_mgrp})
%{l_prefix}/etc/sendmail/sendmail.crt' \
'%config %attr(600,%{l_susr},%{l_mgrp})
%{l_prefix}/etc/sendmail/sendmail.key' \
- '%config %{l_prefix}/etc/fsl/fsl.sendmail' \
- '%not %dir %{l_prefix}/etc/fsl' \
'%attr(700,%{l_susr},%{l_mgrp}) %{l_prefix}/var/sendmail/mqueue' \
'%attr(700,%{l_susr},%{l_mgrp})
%{l_prefix}/var/sendmail/mqueue/.hoststat' \
'%attr(770,%{l_rusr},%{l_rgrp})
%{l_prefix}/var/sendmail/clientmqueue' \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.4969 -r1.4970 news.txt
--- openpkg-web/news.txt 23 Jun 2003 21:01:28 -0000 1.4969
+++ openpkg-web/news.txt 23 Jun 2003 21:01:38 -0000 1.4970
@@ -1,3 +1,4 @@
+23-Jun-2003: Upgraded package: P<sendmail-8.12.9-20030623>
23-Jun-2003: Upgraded package: P<sasl-2.1.13-20030623>
23-Jun-2003: Upgraded package: P<qpopper-4.0.5-20030623>
23-Jun-2003: Upgraded package: P<powerdns-2.9.8-20030623>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
