From 6a802b35e118ad3fd13c84a058664e8cadc7def8 Mon Sep 17 00:00:00 2001 From: Thomas Lotterer Date: Mon, 23 Jun 2003 20:47:37 +0000 Subject: [PATCH] make fsl optional with default yes, as promised for the next release --- arpd/arpd.spec | 15 ++++++++++----- honeyd/honeyd.spec | 28 +++++++++++++++++++++------- imapd/imapd.spec | 31 +++++++++++++++++++------------ inn/inn.spec | 25 ++++++++++++++++--------- monit/monit.spec | 34 +++++++++++++++++++++------------- nsd/nsd.spec | 23 ++++++++++++++++------- openssh/openssh.spec | 33 ++++++++++++++++++++------------- petidomo/petidomo.spec | 36 ++++++++++++++++++++++++------------ pks/pks.spec | 33 +++++++++++++++++++++------------ portfwd/portfwd.spec | 29 ++++++++++++++++++++--------- postfix/postfix.spec | 32 ++++++++++++++++++-------------- pound/pound.spec | 27 +++++++++++++++++---------- 12 files changed, 223 insertions(+), 123 deletions(-) diff --git a/arpd/arpd.spec b/arpd/arpd.spec index 14bf08c51b..208bda83ee 100644 --- a/arpd/arpd.spec +++ b/arpd/arpd.spec @@ -37,10 +37,10 @@ Distribution: OpenPKG [EVAL] Group: Network License: GNU Version: 0.2 -Release: 20030613 +Release: 20030623 # package options -%option with_fsl yes +%option with_fsl yes # list of sources Source0: http://www.citi.umich.edu/u/provos/honeyd/arpd-%{version}.tar.gz @@ -96,7 +96,6 @@ AutoReqProv: no rm -rf $RPM_BUILD_ROOT %{l_shtool} mkdir -f -p -m 755 \ $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \ - $RPM_BUILD_ROOT%{l_prefix}/etc/fsl \ $RPM_BUILD_ROOT%{l_prefix}/sbin \ $RPM_BUILD_ROOT%{l_prefix}/man/man8 \ $RPM_BUILD_ROOT%{l_prefix}/var/arpd @@ -108,12 +107,18 @@ AutoReqProv: no -e 's;@l_prefix@;%{l_prefix};g' \ -e 's;@l_susr@;%{l_susr};g' \ %{SOURCE rc.arpd} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/ + + # 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.arpd} $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/ + %{SOURCE fsl.%{name}} \ + $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/ + %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \ %{l_files_std} \ - '%not %dir %{l_prefix}/etc/fsl' + '%not %dir %{l_prefix}/etc/fsl' \ + '%config %{l_prefix}/etc/fsl/fsl.%{name}' %files -f files diff --git a/honeyd/honeyd.spec b/honeyd/honeyd.spec index 52dcf6caf0..7decabb560 100644 --- a/honeyd/honeyd.spec +++ b/honeyd/honeyd.spec @@ -33,7 +33,10 @@ Distribution: OpenPKG [EVAL] Group: Language License: BSD License Version: 0.5a -Release: 20030505 +Release: 20030623 + +# package options +%option with_fsl yes # list of sources Source0: http://niels.xtdnet.nl/honeyd/honeyd-%{version}.tar.gz @@ -44,8 +47,12 @@ Patch0: honeyd.patch # build information Prefix: %{l_prefix} BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20030211, fsl, libdnet, libpcap, libevent -PreReq: OpenPKG, openpkg >= 20030211, fsl +BuildPreReq: OpenPKG, openpkg >= 20030415, libdnet, libpcap, libevent +PreReq: OpenPKG, openpkg >= 20030415 +%if "%{with_fsl}" == "yes" +BuildPreReq: fsl +PreReq: fsl +%endif AutoReq: no AutoReqProv: no @@ -76,7 +83,7 @@ AutoReqProv: no --with-libpcap=%{l_prefix} \ --with-libevent=%{l_prefix} %{l_shtool} subst \ - -e "s;^\\(honeyd_LDADD.*\\)$;\\1 `%{l_prefix}/bin/fsl-config --all --ldflags --libs`;" \ + -e "s;^\\(honeyd_LDADD.*\\)$;\\1 %{l_fsl_ldflags} %{l_fsl_libs};" \ Makefile %{l_make} %{l_mflags} @@ -85,7 +92,6 @@ AutoReqProv: no %{l_shtool} mkdir -f -p -m 755 \ $RPM_BUILD_ROOT%{l_prefix}/etc/honeyd \ $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \ - $RPM_BUILD_ROOT%{l_prefix}/etc/fsl \ $RPM_BUILD_ROOT%{l_prefix}/sbin \ $RPM_BUILD_ROOT%{l_prefix}/man/man8 \ $RPM_BUILD_ROOT%{l_prefix}/lib/honeyd \ @@ -115,10 +121,18 @@ AutoReqProv: no -e 's;@l_prefix@;%{l_prefix};g' \ -e 's;@l_susr@;%{l_susr};g' \ %{SOURCE rc.honeyd} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/ + + # 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.honeyd} $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/ - %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} + %{SOURCE fsl.%{name}} \ + $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/ + + %{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}' %files -f files diff --git a/imapd/imapd.spec b/imapd/imapd.spec index dd258b67e7..4b2e8fa591 100644 --- a/imapd/imapd.spec +++ b/imapd/imapd.spec @@ -33,9 +33,10 @@ Distribution: OpenPKG [EVAL] Group: Mail License: BSD Version: 2.1.13 -Release: 20030617 +Release: 20030623 # package options +%option with_fsl yes %option with_vhost_hack no # list of sources @@ -50,8 +51,12 @@ Patch1: vhosthack.patch # build information Prefix: %{l_prefix} BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20030103, sasl, db >= 4.1.24, openssl, make, perl, perl-openpkg, fsl -PreReq: OpenPKG, openpkg >= 20030103, sasl, openssl, perl, MTA, fsl +BuildPreReq: OpenPKG, openpkg >= 20030415, sasl, db >= 4.1.24, openssl, make, perl, perl-openpkg +PreReq: OpenPKG, openpkg >= 20030415, sasl, openssl, perl, MTA +%if "%{with_fsl}" == "yes" +BuildPreReq: fsl +PreReq: fsl +%endif AutoReq: no AutoReqProv: no Provides: IMAP @@ -114,7 +119,7 @@ Provides: IMAP %build cflags="%{l_cppflags}" - ldflags="%{l_ldflags} `%{l_prefix}/bin/fsl-config --all --ldflags`" + ldflags="%{l_ldflags} %{l_fsl_ldflags}" case "%{l_target}" in *-solaris* ) ldflags="$ldflags -lsocket -lnsl" ;; esac @@ -122,7 +127,7 @@ Provides: IMAP CPPFLAGS="$cflags" \ CFLAGS="%{l_cflags -O} $cflags" \ LDFLAGS="$ldflags" \ - LIBS="`%{l_prefix}/bin/fsl-config --all --libs`" \ + LIBS="%{l_fsl_libs}" \ ./configure \ --cache-file=./cache.config \ --prefix=%{l_prefix} \ @@ -173,7 +178,6 @@ Provides: IMAP %{l_shtool} mkdir -f -p -m 755 \ $RPM_BUILD_ROOT%{l_prefix}/etc/imapd \ $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \ - $RPM_BUILD_ROOT%{l_prefix}/etc/fsl \ $RPM_BUILD_ROOT%{l_prefix}/var/imapd/spool \ $RPM_BUILD_ROOT%{l_prefix}/bin @@ -200,10 +204,6 @@ Provides: IMAP -e 's;@l_susr@;%{l_susr};g' -e 's;@l_sgrp@;%{l_sgrp};g' \ %{SOURCE rc.imapd} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/ - # install fsl configuration - %{l_shtool} install -c -m 644 -e 's;@l_prefix@;%{l_prefix};g' \ - %{SOURCE fsl.imapd} $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/ - # use mkimap to create many directories for us tools/mkimap imapd.conf-mkimap $RPM_BUILD_ROOT%{l_prefix}/var/imapd/sieve @@ -219,16 +219,23 @@ Provides: IMAP tools/mkimap \ $RPM_BUILD_ROOT%{l_prefix}/bin/ + # 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/ + # strip binaries strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true # determine 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}' \ '%config %{l_prefix}/etc/imapd/imapd.conf' \ '%config %{l_prefix}/etc/imapd/cyrus.conf' \ - '%config %{l_prefix}/etc/fsl/fsl.imapd' \ - '%not %dir %{l_prefix}/etc/fsl' \ '%dir %attr(0750,%{l_rusr},%{l_mgrp}) %{l_prefix}/var/imapd' \ '%dir %attr(0750,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/imapd/*' \ '%dir %attr(0770,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/imapd/*/*' \ diff --git a/inn/inn.spec b/inn/inn.spec index 4a068d94c0..76b5cf0a8d 100644 --- a/inn/inn.spec +++ b/inn/inn.spec @@ -33,7 +33,10 @@ Distribution: OpenPKG [BASE] Group: News License: ISC Version: 2.4.0 -Release: 20030527 +Release: 20030623 + +# package options +%option with_fsl yes # list of sources Source0: ftp://ftp.isc.org/isc/inn/inn-%{version}.tar.gz @@ -44,8 +47,12 @@ Patch0: inn.patch # build information Prefix: %{l_prefix} BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20020206, fsl, gzip, make, perl, db, openssl, bison, flex -PreReq: OpenPKG, openpkg >= 20020206, fsl, gzip, perl, MTA +BuildPreReq: OpenPKG, openpkg >= 20030415, gzip, make, perl, db, openssl, bison, flex +PreReq: OpenPKG, openpkg >= 20030415, gzip, perl, MTA +%if "%{with_fsl}" == "yes" +BuildPreReq: fsl +PreReq: fsl +%endif AutoReq: no AutoReqProv: no @@ -73,8 +80,8 @@ AutoReqProv: no # configure the source tree CC="%{l_cc}" \ CFLAGS="%{l_cflags -O} %{l_cppflags}" \ - LDFLAGS="%{l_ldflags} `%{l_prefix}/bin/fsl-config --ldflags --all`" \ - LIBS="`%{l_prefix}/bin/fsl-config --libs --all`" \ + LDFLAGS="%{l_ldflags} %{l_fsl_ldflags}" \ + LIBS="%{l_fsl_libs}" \ ./configure \ --prefix=%{l_prefix} \ --bindir=%{l_prefix}/libexec/inn \ @@ -176,11 +183,11 @@ AutoReqProv: no %{SOURCE rc.inn} \ $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/ - # OSSP fsl support + # 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.inn} \ + %{SOURCE fsl.%{name}} \ $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/ # strip binaries @@ -194,9 +201,9 @@ AutoReqProv: no # determine file list %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \ %{l_files_std} \ - '%config %{l_prefix}/etc/inn/*' \ - '%config %{l_prefix}/etc/fsl/fsl.inn' \ '%not %dir %{l_prefix}/etc/fsl' \ + '%config %{l_prefix}/etc/fsl/fsl.%{name}' \ + '%config %{l_prefix}/etc/inn/*' \ '%attr(4550,root,%{l_mgrp}) %{l_prefix}/bin/rnews' \ '%attr(4755,root,%{l_mgrp}) %{l_prefix}/libexec/inn/inndstart' \ '%attr(4755,root,%{l_mgrp}) %{l_prefix}/libexec/inn/startinnfeed' \ diff --git a/monit/monit.spec b/monit/monit.spec index e43d152a17..25271c6930 100644 --- a/monit/monit.spec +++ b/monit/monit.spec @@ -36,6 +36,7 @@ Version: 3.2 Release: 20030623 # package options +%option with_fsl yes %option with_ssl no # list of sources @@ -47,8 +48,12 @@ Patch0: monit.patch # build information Prefix: %{l_prefix} BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20030103, make, gcc, bison, flex, fsl -PreReq: OpenPKG, openpkg >= 20030103, fsl +BuildPreReq: OpenPKG, openpkg >= 20030415, make, gcc, bison, flex +PreReq: OpenPKG, openpkg >= 20030415 +%if "%{with_fsl}" == "yes" +BuildPreReq: fsl +PreReq: fsl +%endif %if "%{with_ssl}" == "yes" BuildPreReq: openssl %endif @@ -74,8 +79,8 @@ AutoReqProv: no CC="%{l_cc}" \ CFLAGS="%{l_cflags -O}" \ CPPFLAGS="%{l_cppflags}" \ - LDFLAGS="%{l_ldflags} `%{l_prefix}/bin/fsl-config --all --ldflags`" \ - LIBS="`%{l_prefix}/bin/fsl-config --all --libs`" \ + LDFLAGS="%{l_ldflags} %{l_fsl_ldflags}" \ + LIBS="%{l_fsl_libs}" \ piddir="%{l_prefix}/var/monit" \ ./configure \ --prefix=%{l_prefix} \ @@ -98,11 +103,6 @@ AutoReqProv: no -e 's;@l_sgrp@;%{l_sgrp};g' \ %{SOURCE rc.monit} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/ - %{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.monit} $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/ - %{l_shtool} mkdir -f -p -m 700 \ $RPM_BUILD_ROOT%{l_prefix}/etc/monit %{l_shtool} install -c -m 600 \ @@ -112,12 +112,20 @@ AutoReqProv: no %{l_shtool} mkdir -f -p -m 700 \ $RPM_BUILD_ROOT%{l_prefix}/var/monit - %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \ + # 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/ + + %{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}' \ '%config %attr(0600,%{l_susr},%{l_mgrp}) %{l_prefix}/etc/monit/*' \ '%dir %attr(0700,%{l_susr},%{l_mgrp}) %{l_prefix}/etc/monit' \ - '%dir %attr(0700,%{l_susr},%{l_mgrp}) %{l_prefix}/var/monit' \ - '%config %{l_prefix}/etc/fsl/fsl.monit' \ - '%not %dir %{l_prefix}/etc/fsl' + '%dir %attr(0700,%{l_susr},%{l_mgrp}) %{l_prefix}/var/monit' %files -f files diff --git a/nsd/nsd.spec b/nsd/nsd.spec index 571910d595..e644a9ae79 100644 --- a/nsd/nsd.spec +++ b/nsd/nsd.spec @@ -25,6 +25,7 @@ # FIXME rse: optional AXFR support via BIND8 named-xfer? # FIXME rse: optional libwrap support via {tcp,socket}_wrappers for AXFR +# FIXME thl: libwrap can be (mis-)used for fsl, but the right side of the assignment must never be empty. this requires an "if" # package information Name: nsd @@ -36,7 +37,7 @@ Distribution: OpenPKG [EVAL] Group: DNS License: GPL Version: 1.1.0b -Release: 20030416 +Release: 20030623 # package option %option with_fsl yes @@ -52,8 +53,12 @@ Source5: fsl.nsd # build information Prefix: %{l_prefix} BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20030415, fsl, make -PreReq: OpenPKG, openpkg >= 20030415, fsl +BuildPreReq: OpenPKG, openpkg >= 20030415, make +PreReq: OpenPKG, openpkg >= 20030415 +%if "%{with_fsl}" == "yes" +BuildPreReq: fsl +PreReq: fsl +%endif AutoReq: no AutoReqProv: no @@ -82,7 +87,9 @@ AutoReqProv: no --with-dbfile=%{l_prefix}/var/nsd/nsd.db \ --with-user="%{l_ruid}.%{l_rgid}" \ --with-namedxfer=%{l_prefix}/libexec/bind/named-xfer \ +%if "%{with_fsl}" == "yes" --with-libwrap="%{l_fsl_ldflags} %{l_fsl_libs}" \ +%endif --enable-bind8-stats \ --disable-shared \ --disable-nls @@ -96,7 +103,6 @@ AutoReqProv: no # pre-create installation hierarchy %{l_shtool} mkdir -f -p -m 755 \ $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \ - $RPM_BUILD_ROOT%{l_prefix}/etc/fsl \ $RPM_BUILD_ROOT%{l_prefix}/etc/nsd/nsd.db \ $RPM_BUILD_ROOT%{l_prefix}/sbin \ $RPM_BUILD_ROOT%{l_prefix}/man/man8 \ @@ -133,10 +139,12 @@ AutoReqProv: no -e 's;@l_susr@;%{l_susr};g' \ %{SOURCE rc.nsd} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/ - # install fsl configuration file + # 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.nsd} $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/ + %{SOURCE fsl.%{name}} \ + $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/ # strip installation strip $RPM_BUILD_ROOT%{l_prefix}/sbin/* >/dev/null 2>&1 || true @@ -144,9 +152,10 @@ AutoReqProv: no # 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}' \ '%config %{l_prefix}/etc/nsd/*' \ '%not %dir %{l_prefix}/etc/rc.d' \ - '%not %dir %{l_prefix}/etc/fsl' \ '%attr(755,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/nsd' %files -f files diff --git a/openssh/openssh.spec b/openssh/openssh.spec index 58542958f7..8dce822917 100644 --- a/openssh/openssh.spec +++ b/openssh/openssh.spec @@ -38,9 +38,10 @@ Distribution: OpenPKG [CORE] Group: Security License: BSD Version: %{V_base}%{V_portable} -Release: 20030530 +Release: 20030623 # package options +%option with_fsl yes %option with_pam no %option with_pcre no %option with_skey no @@ -62,12 +63,16 @@ Source9: http://chrootssh.sourceforge.net/download/osshChroot-%{V_chroot}.d # build information Prefix: %{l_prefix} BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20030103, fsl, perl, openssl, zlib -PreReq: OpenPKG, openpkg >= 20030103, fsl +BuildPreReq: OpenPKG, openpkg >= 20030415, perl, openssl, zlib +PreReq: OpenPKG, openpkg >= 20030415 %if "%{with_pam}" == "yes" BuildPreReq: PAM PreReq: PAM %endif +%if "%{with_fsl}" == "yes" +BuildPreReq: fsl +PreReq: fsl +%endif %if "%{with_pcre}" == "yes" BuildPreReq: pcre %endif @@ -116,8 +121,8 @@ AutoReqProv: no %endif CC="%{l_cc}" \ CFLAGS="%{l_cflags -O} $inc" \ - LDFLAGS="%{l_ldflags} `%{l_prefix}/bin/fsl-config --all --ldflags` $lib" \ - LIBS="`%{l_prefix}/bin/fsl-config --all --libs`" \ + LDFLAGS="%{l_ldflags} %{l_fsl_ldflags} $lib" \ + LIBS="%{l_fsl_libs}" \ ./configure \ --prefix=%{l_prefix} \ --sbindir=%{l_prefix}/bin \ @@ -196,11 +201,6 @@ AutoReqProv: no -e 's;@l_musr@;%{l_musr};g' -e 's;@l_mgrp@;%{l_mgrp};g' \ %{SOURCE rc.openssh} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/ - # install fsl configuration file - %{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.openssh} $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/ - # install reasonable ssh server and client configuration files %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/openssh %{l_shtool} install -c -m 644 \ @@ -210,14 +210,21 @@ AutoReqProv: no %{l_shtool} install -c -m 644 -e 's;@l_prefix@;%{l_prefix};g' \ %{SOURCE ssh_config} $RPM_BUILD_ROOT%{l_prefix}/etc/openssh/ + # 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/ + # 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}' \ '%config %{l_prefix}/etc/openssh/*' \ '%attr(4711,%{l_susr},%{l_mgrp}) %{l_prefix}/libexec/openssh/ssh-keysign' \ - '%dir %attr(700,%{l_susr},%{l_sgrp}) %{l_prefix}/var/openssh/empty' \ - '%config %{l_prefix}/etc/fsl/fsl.openssh' \ - '%not %dir %{l_prefix}/etc/fsl' + '%dir %attr(700,%{l_susr},%{l_sgrp}) %{l_prefix}/var/openssh/empty' %files -f files diff --git a/petidomo/petidomo.spec b/petidomo/petidomo.spec index 645d783d3e..2d54e603d2 100644 --- a/petidomo/petidomo.spec +++ b/petidomo/petidomo.spec @@ -33,7 +33,10 @@ Distribution: OpenPKG [EVAL] Group: Mail License: GPL Version: 4.0b1 -Release: 20030530 +Release: 20030623 + +# package options +%option with_fsl yes # list of sources Source0: ftp://ftp.ossp.org/pkg/tool/petidomo/petidomo-%{version}.tar.gz @@ -43,8 +46,12 @@ Source2: fsl.petidomo # build information Prefix: %{l_prefix} BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20020206, fsl, bison, flex -PreReq: OpenPKG, openpkg >= 20020206, fsl, MTA +BuildPreReq: OpenPKG, openpkg >= 20030415, bison, flex +PreReq: OpenPKG, openpkg >= 20030415, MTA +%if "%{with_fsl}" == "yes" +BuildPreReq: fsl +PreReq: fsl +%endif AutoReq: no AutoReqProv: no @@ -64,8 +71,8 @@ AutoReqProv: no CC="%{l_cc}" \ CFLAGS="%{l_cflags}" \ CPPFLAGS="%{l_cppflags}" \ - LDFLAGS="%{l_ldflags} `%{l_prefix}/bin/fsl-config --all --ldflags`" \ - LIBS="`%{l_prefix}/bin/fsl-config --all --libs`" \ + LDFLAGS="%{l_ldflags} %{l_fsl_ldflags}" \ + LIBS="%{l_fsl_libs}" \ ./configure \ --prefix=%{l_prefix} \ --sysconfdir=%{l_prefix}/etc/petidomo @@ -82,12 +89,9 @@ AutoReqProv: no rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/petidomo %{l_shtool} mkdir -f -p -m 755 \ $RPM_BUILD_ROOT%{l_prefix}/var/petidomo \ - $RPM_BUILD_ROOT%{l_prefix}/etc/petidomo \ - $RPM_BUILD_ROOT%{l_prefix}/etc/fsl + $RPM_BUILD_ROOT%{l_prefix}/etc/petidomo %{l_shtool} install -c -m 644 \ /dev/null $RPM_BUILD_ROOT%{l_prefix}/var/petidomo/petidomo.log - %{l_shtool} install -c -m 644 -e 's;@l_prefix@;%{l_prefix};g' \ - %{SOURCE fsl.petidomo} $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/ ( cd etc.petidomo l_hostname=`%{l_shtool} echo -e '%h%d'` %{l_shtool} install -c -m - \ @@ -95,12 +99,20 @@ AutoReqProv: no -e 's;@l_prefix@;%{l_prefix};g' \ * $RPM_BUILD_ROOT%{l_prefix}/etc/petidomo/ ) + + # 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/ + %{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}' \ '%config %{l_prefix}/etc/petidomo/*' \ - '%attr(6755,%{l_musr},%{l_mgrp}) %{l_prefix}/bin/petidomo' \ - '%config %{l_prefix}/etc/fsl/fsl.petidomo' \ - '%not %dir %{l_prefix}/etc/fsl' + '%attr(6755,%{l_musr},%{l_mgrp}) %{l_prefix}/bin/petidomo' %files -f files diff --git a/pks/pks.spec b/pks/pks.spec index 82f477d4c9..19e136c1de 100644 --- a/pks/pks.spec +++ b/pks/pks.spec @@ -33,7 +33,10 @@ Distribution: OpenPKG [EVAL] Group: Cryptography License: GPL Version: 0.9.6 -Release: 20030525 +Release: 20030623 + +# package options +%option with_fsl yes # list of sources Source0: http://osdn.dl.sourceforge.net/sourceforge/pks/pks-%{version}.tar.gz @@ -47,8 +50,12 @@ Source6: pks-apache.conf # build information Prefix: %{l_prefix} BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20030103, fsl -PreReq: OpenPKG, openpkg >= 20030103, fsl, MTA +BuildPreReq: OpenPKG, openpkg >= 20030415 +PreReq: OpenPKG, openpkg >= 20030415, MTA +%if "%{with_fsl}" == "yes" +BuildPreReq: fsl +PreReq: fsl +%endif AutoReq: no AutoReqProv: no @@ -65,7 +72,7 @@ AutoReqProv: no CC="%{l_cc}" \ CFLAGS="%{l_cflags -O}" \ CPPFLAGS="%{l_cppflags}" \ - LDFLAGS="%{l_ldflags} `%{l_prefix}/bin/fsl-config --ldflags --libs`" \ + LDFLAGS="%{l_ldflags} %{l_fsl_ldflags}" \ ./configure \ --cache-file=./config.cache \ --prefix=%{l_prefix} \ @@ -73,7 +80,7 @@ AutoReqProv: no --localstatedir=%{l_prefix}/var/%{name} \ --datadir=%{l_prefix}/share/%{name} %{l_make} %{l_mflags} \ - LDFLAGS="%{l_ldflags} `%{l_prefix}/bin/fsl-config --ldflags --libs`" + LDFLAGS="%{l_ldflags} %{l_fsl_ldflags}" # build suid wrapper for pks-mail %{l_cc} %{l_cflags} %{l_ldflags} '-DL_PREFIX="%{l_prefix}"' \ @@ -110,13 +117,6 @@ AutoReqProv: no %{l_shtool} install -c -s -m 755 \ pks-mail $RPM_BUILD_ROOT%{l_prefix}/bin/ - # 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.pks} $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/ - # install run-command script %{l_shtool} mkdir -f -p -m 755 \ $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d @@ -133,9 +133,18 @@ AutoReqProv: no -e 's;@l_prefix@;%{l_prefix};g' \ %{SOURCE pks-apache.conf} $RPM_BUILD_ROOT%{l_prefix}/etc/%{name}/ + # 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/ + # 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}' \ '%config %{l_prefix}/etc/%{name}/pksd.conf' \ '%attr(4755,%{l_rusr},%{l_mgrp}) %{l_prefix}/bin/pks-mail' \ '%dir %attr(755,%{l_rusr},%{l_mgrp}) %{l_prefix}/var/%{name}' \ diff --git a/portfwd/portfwd.spec b/portfwd/portfwd.spec index 42eabf12c5..62ae56b889 100644 --- a/portfwd/portfwd.spec +++ b/portfwd/portfwd.spec @@ -33,7 +33,10 @@ Distribution: OpenPKG [PLUS] Group: Network License: GPL Version: 0.26rc6 -Release: 20030217 +Release: 20030623 + +# package options +%option with_fsl yes # list of sources Source0: http://osdn.dl.sourceforge.net/sourceforge/portfwd/portfwd-%{version}.tar.gz @@ -44,8 +47,12 @@ Source3: fsl.portfwd # build information Prefix: %{l_prefix} BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20021204, fsl, gcc, make, flex -PreReq: OpenPKG, openpkg >= 20021204, fsl +BuildPreReq: OpenPKG, openpkg >= 20030415, gcc, make, flex +PreReq: OpenPKG, openpkg >= 20030415 +%if "%{with_fsl}" == "yes" +BuildPreReq: fsl +PreReq: fsl +%endif AutoReq: no AutoReqProv: no @@ -70,7 +77,7 @@ AutoReqProv: no CFLAGS="%{l_cflags -O}" \ CXXFLAGS="%{l_cxxflags -O}" \ CPPFLAGS="%{l_cppflags}" \ - LDFLAGS="%{l_ldflags} `%{l_prefix}/bin/fsl-config --all --ldflags --libs`" \ + LDFLAGS="%{l_ldflags} %{l_fsl_ldflags} %{l_fsl_libs}" \ ./configure \ --prefix=%{l_prefix} \ --sysconfdir=%{l_prefix}/etc/portfwd @@ -82,7 +89,6 @@ AutoReqProv: no $RPM_BUILD_ROOT%{l_prefix}/sbin \ $RPM_BUILD_ROOT%{l_prefix}/etc/portfwd \ $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \ - $RPM_BUILD_ROOT%{l_prefix}/etc/fsl \ $RPM_BUILD_ROOT%{l_prefix}/man/man8 \ $RPM_BUILD_ROOT%{l_prefix}/man/man5 %{l_shtool} install -c -s -m 755 \ @@ -101,14 +107,19 @@ AutoReqProv: no %{l_shtool} install -c -m 644 \ -e 's;@l_prefix@;%{l_prefix};g' \ %{SOURCE rc.portfwd} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/ + + # 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.portfwd} $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/ + %{SOURCE fsl.%{name}} \ + $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/ + %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \ %{l_files_std} \ - '%config %{l_prefix}/etc/portfwd/portfwd.cfg' \ - '%config %{l_prefix}/etc/fsl/fsl.portfwd' \ - '%not %dir %{l_prefix}/etc/fsl' + '%not %dir %{l_prefix}/etc/fsl' \ + '%config %{l_prefix}/etc/fsl/fsl.%{name}' \ + '%config %{l_prefix}/etc/portfwd/portfwd.cfg' %files -f files diff --git a/postfix/postfix.spec b/postfix/postfix.spec index e8d9388b73..ad30d6451b 100644 --- a/postfix/postfix.spec +++ b/postfix/postfix.spec @@ -39,9 +39,10 @@ Distribution: OpenPKG [BASE] Group: Mail License: IPL Version: %{V_postfix} -Release: 20030620 +Release: 20030623 # package options +%option with_fsl yes %option with_tls no %option with_sasl no %option with_mysql no @@ -62,8 +63,12 @@ Patch2: ftp://victor.teaser.fr/pub/lwa/postfix/postfix-%{V_whoson}-whoson. # build information Prefix: %{l_prefix} BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20030103, perl, fsl, pcre, db -PreReq: OpenPKG, openpkg >= 20030103, perl, fsl, procmail, perl-time +BuildPreReq: OpenPKG, openpkg >= 20030415, perl, pcre, db +PreReq: OpenPKG, openpkg >= 20030415, perl, procmail, perl-time +%if "%{with_fsl}" == "yes" +BuildPreReq: fsl +PreReq: fsl +%endif %if "%{with_tls}" == "yes" BuildPreReq: openssl %endif @@ -171,7 +176,7 @@ Conflicts: sendmail, ssmtp, exim CCARGS="$CCARGS -DHAS_LDAP" AUXLIBS="$AUXLIBS -lldap -llber -lssl -lcrypto" %endif - AUXLIBS="$AUXLIBS `%{l_prefix}/bin/fsl-config --all --ldflags --libs`" + AUXLIBS="$AUXLIBS %{l_fsl_ldflags} %{l_fsl_libs}" %{l_make} %{l_mflags} makefiles \ CC="%{l_cc}" CCARGS="$CCARGS" AUXLIBS="$AUXLIBS" @@ -272,24 +277,23 @@ Conflicts: sendmail, ssmtp, exim -e 's;@l_mgrp@;%{l_mgrp};g' \ %{SOURCE rc.postfix} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/ - # 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/ - # adjust installation to avoid file name conflicts ( cd $RPM_BUILD_ROOT%{l_prefix}/man/man8 mv master.8 postfix_master.8 ) + # 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/ + # generate file list %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \ %{l_files_std} \ - '%attr(-,root,%{l_mgrp}) %{l_prefix}/etc/postfix' \ - '%config %{l_prefix}/etc/fsl/fsl.postfix' \ '%not %dir %{l_prefix}/etc/fsl' \ + '%config %{l_prefix}/etc/fsl/fsl.%{name}' \ + '%attr(-,root,%{l_mgrp}) %{l_prefix}/etc/postfix' \ '%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}' \ diff --git a/pound/pound.spec b/pound/pound.spec index 1b73a7e967..bf9c748653 100644 --- a/pound/pound.spec +++ b/pound/pound.spec @@ -33,7 +33,10 @@ Distribution: OpenPKG [EVAL] Group: Web License: GPL Version: 1.4 -Release: 20030530 +Release: 20030623 + +# package options +%option with_fsl yes # list of sources Source0: http://www.apsis.ch/pound/Pound-%{version}.tgz @@ -45,8 +48,12 @@ Source4: fsl.pound # build information Prefix: %{l_prefix} BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20020206, fsl, openssl, openssl::with_threads = yes, pth, pth::with_pthread = yes, pcre -PreReq: OpenPKG, openpkg >= 20020206, fsl +BuildPreReq: OpenPKG, openpkg >= 20030415, openssl, openssl::with_threads = yes, pth, pth::with_pthread = yes, pcre +PreReq: OpenPKG, openpkg >= 20030415 +%if "%{with_fsl}" == "yes" +BuildPreReq: fsl +PreReq: fsl +%endif AutoReq: no AutoReqProv: no @@ -84,7 +91,7 @@ AutoReqProv: no CC="%{l_cc}" \ CFLAGS="%{l_cflags -O} `%{l_prefix}/bin/pthread-config --all --cflags`" \ LDFLAGS="%{l_ldflags} `%{l_prefix}/bin/pthread-config --all --ldflags`" \ - LIBS="`%{l_prefix}/bin/pthread-config --all --libs` `%{l_prefix}/bin/fsl-config --all --libs` -lpcreposix -lpcre" \ + LIBS="`%{l_prefix}/bin/pthread-config --all --libs` %{l_fsl_libs} -lpcreposix -lpcre" \ ./configure \ --prefix=%{l_prefix} \ --sysconfdir=%{l_prefix}/etc/pound \ @@ -99,7 +106,6 @@ AutoReqProv: no # create installation hierarchy %{l_shtool} mkdir -f -p -m 755 \ $RPM_BUILD_ROOT%{l_prefix}/sbin \ - $RPM_BUILD_ROOT%{l_prefix}/etc/fsl \ $RPM_BUILD_ROOT%{l_prefix}/etc/pound \ $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \ $RPM_BUILD_ROOT%{l_prefix}/man/man8 \ @@ -120,17 +126,18 @@ AutoReqProv: no %{l_shtool} install -c -m 644 \ %{SOURCE pound.pem} $RPM_BUILD_ROOT%{l_prefix}/etc/pound/ - # install run-command and fsl configuration - %{l_shtool} install -c -m 644 \ - -e 's;@l_prefix@;%{l_prefix};g' \ - %{SOURCE rc.pound} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/ + # 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.pound} $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/ + %{SOURCE fsl.%{name}} \ + $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/ # 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}' \ '%config %{l_prefix}/etc/pound/*' %files -f files