OpenPKG CVS Repository http://www.openpkg.org/cvsweb/cvsweb.cgi ____________________________________________________________________________
Server: cvs.openpkg.org Name: Christoph Schug Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 12-Aug-2002 12:28:28 Branch: HEAD Handle: 2002081211282800 Added files: openpkg-src/sasl fsl.sasl Modified files: openpkg-src/sasl sasl.spec Log: added fsl, config to be defined Summary: Revision Changes Path 1.1 +19 -0 openpkg-src/sasl/fsl.sasl 1.28 +31 -2 openpkg-src/sasl/sasl.spec ____________________________________________________________________________ Index: openpkg-src/sasl/fsl.sasl ============================================================ $ cvs update -p -r1.1 fsl.sasl ## ## fsl.sasl -- OSSP fsl configuration for Cyrus SASL ## # use OSSP fsl to perform the equivalent of the # following syslog.conf(5) configuration entries: # news.crit @l_prefix@/var/inn/log/news.crit # news.err @l_prefix@/var/inn/log/news.err # news.notice @l_prefix@/var/inn/log/news.notice ident (sasl/.+)/auth q{ prefix( prefix="%b %d %H:%M:%S %N $1: ", timezone=local ) -> { debug: file(path="@l_prefix@/var/sasl/log/sasl.debug", append=1, perm=0600); } } Index: openpkg-src/sasl/sasl.spec ============================================================ $ cvs diff -u -r1.27 -r1.28 sasl.spec --- openpkg-src/sasl/sasl.spec 12 Aug 2002 08:04:38 -0000 1.27 +++ openpkg-src/sasl/sasl.spec 12 Aug 2002 10:28:28 -0000 1.28 @@ -24,6 +24,9 @@ ## # package options +%ifndef with_fsl +%define with_fsl no +%endif %ifndef with_pam %define with_pam no %endif @@ -43,11 +46,16 @@ # list of sources Source0: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-%{version}.tar.gz Source1: rc.sasl +Source2: fsl.sasl # build information Prefix: %{l_prefix} BuildRoot: %{l_buildroot} BuildPreReq: OpenPKG, openpkg >= 20020206, db, openssl +%if "%{with_fsl}" == "yes" +BuildPreReq: fsl +PreReq: fsl +%endif PreReq: OpenPKG, openpkg >= 20020206 AutoReq: no AutoReqProv: no @@ -62,6 +70,7 @@ the connection. Options: + --define 'with_fsl %{with_fsl}' \ --define 'with_pam %{with_pam}' %prep @@ -78,7 +87,13 @@ configure CC="%{l_cc}" \ CFLAGS="%{l_cflags -O} -I%{l_prefix}/include" \ - LDFLAGS="-L%{l_prefix}/lib -ldb" \ +%if "%{with_fsl}" == "yes" + LDFLAGS="-L%{l_prefix}/lib `%{l_prefix}/bin/fsl-config --ldflags`" \ + LIBS="-ldb `%{l_prefix}/bin/fsl-config --libs`" \ +%else + LDFLAGS="-L%{l_prefix}/lib" \ + LIBS="-ldb" \ +%endif ./configure \ --prefix=%{l_prefix} \ --with-plugindir=%{l_prefix}/lib/sasl \ @@ -115,12 +130,26 @@ %endif %{SOURCE rc.sasl} \ $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/ +%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.sasl} \ + $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/ +%endif + %{l_shtool} mkdir -f -p -m 700 \ + $RPM_BUILD_ROOT%{l_prefix}/var/sasl/log %{l_shtool} mkdir -f -p -m 755 \ $RPM_BUILD_ROOT%{l_prefix}/var/sasl/saslauthd mv $RPM_BUILD_ROOT%{l_prefix}/lib/sasl2 \ $RPM_BUILD_ROOT%{l_prefix}/lib/sasl strip $RPM_BUILD_ROOT%{l_prefix}/sbin/* >/dev/null 2>&1 || true - %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} + %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \ +%if "%{with_fsl}" == "yes" + '%config %{l_prefix}/etc/fsl/fsl.sasl' \ + '%not %dir %{l_prefix}/etc/fsl' \ +%endif + '%dir %attr(-,%{l_susr},%{l_sgrp}) %{l_prefix}/var/sasl/log' %files -f files ______________________________________________________________________ The OpenPKG Project www.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]