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: 01-Jul-2003 17:43:54
Branch: HEAD Handle: 2003070116435301
Added files:
openpkg-src/openldap fsl.openldap
Modified files:
openpkg-src/openldap openldap.spec rc.openldap
openpkg-web news.txt
Log:
add fsl support
Summary:
Revision Changes Path
1.1 +15 -0 openpkg-src/openldap/fsl.openldap
1.71 +33 -8 openpkg-src/openldap/openldap.spec
1.6 +15 -0 openpkg-src/openldap/rc.openldap
1.5128 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/fsl.openldap
============================================================================
$ cvs diff -u -r0 -r1.1 fsl.openldap
--- /dev/null 2003-07-01 17:43:54.000000000 +0200
+++ fsl.openldap 2003-07-01 17:43:54.000000000 +0200
@@ -0,0 +1,15 @@
+##
+## fsl.openldap -- OSSP fsl configuration
+##
+
+ident (slap.*)/.+ q{
+ prefix(
+ prefix="%b %d %H:%M:%S %N <%L> $1[%P]: "
+ )
+ -> {
+ debug: file(
+ path="@l_prefix@/var/openldap/openldap.log",
+ append=1, perm=0644
+ )
+ }
+};
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/openldap.spec
============================================================================
$ cvs diff -u -r1.70 -r1.71 openldap.spec
--- openpkg-src/openldap/openldap.spec 27 Jun 2003 09:24:11 -0000 1.70
+++ openpkg-src/openldap/openldap.spec 1 Jul 2003 15:43:54 -0000 1.71
@@ -33,20 +33,26 @@
Group: Database
License: GPL
Version: 2.1.22
-Release: 20030627
+Release: 20030701
# package options
+%option with_fsl yes
%option with_sasl no
# list of sources
Source0:
ftp://ftp.openldap.org/pub/openldap/openldap-release/openldap-%{version}.tgz
Source1: rc.openldap
+Source2: fsl.openldap
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20020206, openssl, db >= 4.1.24, make, gcc
-PreReq: OpenPKG, openpkg >= 20020206
+BuildPreReq: OpenPKG, openpkg >= 20030415, openssl, db >= 4.1.24, make, gcc
+PreReq: OpenPKG, openpkg >= 20030415
+%if "%{with_fsl}" == "yes"
+BuildPreReq: fsl
+PreReq: fsl
+%endif
%if "%{with_sasl}" == "yes"
BuildPreReq: sasl
PreReq: sasl
@@ -81,7 +87,8 @@
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
CPPFLAGS="$cf" \
- LDFLAGS="%{l_ldflags}" \
+ LDFLAGS="%{l_ldflags} %{l_fsl_ldflags}" \
+ LIBS="%{l_fsl_libs}" \
./configure \
--prefix=%{l_prefix} \
--localstatedir=%{l_prefix}/var/openldap \
@@ -102,16 +109,34 @@
%install
rm -rf $RPM_BUILD_ROOT
+ %{l_shtool} mkdir -f -p -m 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/var/%{name}
%{l_make} %{l_mflags} install DESTDIR="$RPM_BUILD_ROOT"
rm -f $RPM_BUILD_ROOT%{l_prefix}/etc/openldap/*.default
rm -f $RPM_BUILD_ROOT%{l_prefix}/etc/openldap/*/*.default
- %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/var/openldap
- %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
- %{l_shtool} install -c -m 755 -e 's;@l_prefix@;%{l_prefix};g' \
+
+ # Creating run-command script
+ %{l_shtool} mkdir -f -p -m 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
+ %{l_shtool} install -c -m 755 \
+ -e 's;@l_prefix@;%{l_prefix};g' \
-e 's;@l_susr@;%{l_susr};g' \
- %{SOURCE rc.openldap} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
+ -e 's;@l_rusr@;%{l_rusr};g' \
+ -e 's;@l_rgrp@;%{l_rgrp};g' \
+ %{SOURCE rc.%{name}} $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.%{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/openldap/*.conf'
%files -f files
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/rc.openldap
============================================================================
$ cvs diff -u -r1.5 -r1.6 rc.openldap
--- openpkg-src/openldap/rc.openldap 24 Jun 2003 12:07:56 -0000 1.5
+++ openpkg-src/openldap/rc.openldap 1 Jul 2003 15:43:54 -0000 1.6
@@ -5,6 +5,11 @@
%config
openldap_enable="yes"
+ openldap_log_prolog="true"
+ openldap_log_epilog="true"
+ openldap_log_numfiles="10"
+ openldap_log_minsize="1M"
+ openldap_log_complevel="9"
%start -p 200 -u @l_susr@
opServiceEnabled openldap || exit 0
@@ -20,3 +25,13 @@
sleep 2
@l_prefix@/libexec/slapd
+%daily -u @l_susr@
+ opServiceEnabled openldap || exit 0
+
+ # rotate logfile
+ shtool rotate -f \
+ -n${openldap_log_numfiles} -s${openldap_log_minsize} -d \
+ -z${openldap_log_complevel} [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ -m644 \
+ -P "${openldap_log_prolog}" \
+ -E "${openldap_log_epilog}" \
+ @l_prefix@/var/openldap/openldap.log
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5127 -r1.5128 news.txt
--- openpkg-web/news.txt 1 Jul 2003 15:38:41 -0000 1.5127
+++ openpkg-web/news.txt 1 Jul 2003 15:43:53 -0000 1.5128
@@ -1,3 +1,4 @@
+01-Jul-2003: Upgraded package: P<openldap-2.1.22-20030701>
01-Jul-2003: Upgraded package: P<portsentry-1.1-20030701>
01-Jul-2003: Upgraded package: P<postgresql-7.3.3-20030701>
01-Jul-2003: Upgraded package: P<fsl-1.2.0-20030701>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
