[CVS] OpenPKG: openpkg-src/sasl fsl.sasl sasl.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 09-Dec-2002 23:26:41
Branch: HEAD Handle: 2002120922264100
Modified files:
openpkg-src/saslfsl.sasl sasl.spec
Log:
Remove unnecessary rm until Ralf decides it's correct, and fix path in fsl config.
Summary:
RevisionChanges Path
1.4 +1 -1 openpkg-src/sasl/fsl.sasl
1.41+0 -1 openpkg-src/sasl/sasl.spec
Index: openpkg-src/sasl/fsl.sasl
$ cvs diff -u -r1.3 -r1.4 fsl.sasl
--- openpkg-src/sasl/fsl.sasl 12 Nov 2002 13:38:04 - 1.3
+++ openpkg-src/sasl/fsl.sasl 9 Dec 2002 22:26:41 - 1.4
@@ -8,7 +8,7 @@
timezone=local
)
-> {
-debug:file(path="/sw/var/sasl/log/sasl.debug", append=1, perm=0600);
+debug:file(path="@l_prefix@/var/sasl/log/sasl.debug", append=1,
perm=0600);
}
};
Index: openpkg-src/sasl/sasl.spec
$ cvs diff -u -r1.40 -r1.41 sasl.spec
--- openpkg-src/sasl/sasl.spec9 Dec 2002 19:55:24 - 1.40
+++ openpkg-src/sasl/sasl.spec9 Dec 2002 22:26:41 - 1.41
@@ -145,7 +145,6 @@
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
-rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/libsasl*.so* >/dev/null 2>&1 || true
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
%if "%{with_fsl}" == "yes"
'%config %{l_prefix}/etc/fsl/fsl.sasl' \
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/sasl fsl.sasl sasl.spec openpkg-web news.tx...
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-web, openpkg-src Date: 12-Nov-2002 14:38:04
Branch: HEAD Handle: 2002111213380301
Modified files:
openpkg-src/saslfsl.sasl sasl.spec
openpkg-web news.txt
Log:
fsl concatenates all fsl.* files and needs semicolon as separator
Summary:
RevisionChanges Path
1.3 +1 -1 openpkg-src/sasl/fsl.sasl
1.35+1 -1 openpkg-src/sasl/sasl.spec
1.2008 +1 -0 openpkg-web/news.txt
Index: openpkg-src/sasl/fsl.sasl
$ cvs diff -u -r1.2 -r1.3 fsl.sasl
--- openpkg-src/sasl/fsl.sasl 12 Aug 2002 11:33:18 - 1.2
+++ openpkg-src/sasl/fsl.sasl 12 Nov 2002 13:38:04 - 1.3
@@ -10,5 +10,5 @@
-> {
debug:file(path="/sw/var/sasl/log/sasl.debug", append=1, perm=0600);
}
-}
+};
Index: openpkg-src/sasl/sasl.spec
$ cvs diff -u -r1.34 -r1.35 sasl.spec
--- openpkg-src/sasl/sasl.spec28 Oct 2002 13:04:06 - 1.34
+++ openpkg-src/sasl/sasl.spec12 Nov 2002 13:38:04 - 1.35
@@ -41,7 +41,7 @@
Group:Cryptography
License: BSD
Version: 2.1.9
-Release: 20021028
+Release: 20021112
# list of sources
Source0: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-%{version}.tar.gz
Index: openpkg-web/news.txt
$ cvs diff -u -r1.2007 -r1.2008 news.txt
--- openpkg-web/news.txt 12 Nov 2002 13:37:08 - 1.2007
+++ openpkg-web/news.txt 12 Nov 2002 13:38:03 - 1.2008
@@ -1,3 +1,4 @@
+12-Nov-2002: Upgraded package: P
12-Nov-2002: Upgraded package: P
12-Nov-2002: Upgraded package: P
12-Nov-2002: Upgraded package: P
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/sasl fsl.sasl sasl.spec
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/saslfsl.sasl
Modified files:
openpkg-src/saslsasl.spec
Log:
added fsl, config to be defined
Summary:
RevisionChanges 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.spec12 Aug 2002 08:04:38 - 1.27
+++ openpkg-src/sasl/sasl.spec12 Aug 2002 10:28:28 - 1.28
@@ -24,6 +24,9 @@
##
# package options
+%ifndef with_fsl
+%define with_fslno
+%endif
%ifndef with_pam
%define with_pamno
%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 Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
