OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 15-Nov-2003 16:27:39
Branch: HEAD Handle: 2003111515273702
Modified files:
openpkg-src/openldap openldap.patch openldap.spec
openpkg-web news.txt
Log:
bump up the volume: enable mostly all backends, including optionally
the Perl backend
Summary:
Revision Changes Path
1.4 +16 -1 openpkg-src/openldap/openldap.patch
1.89 +49 -13 openpkg-src/openldap/openldap.spec
1.7410 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/openldap.patch
============================================================================
$ cvs diff -u -r1.3 -r1.4 openldap.patch
--- openpkg-src/openldap/openldap.patch 14 Nov 2003 20:11:11 -0000 1.3
+++ openpkg-src/openldap/openldap.patch 15 Nov 2003 15:27:39 -0000 1.4
@@ -13,7 +13,7 @@
+#######################################################################
+
+# master server configuration
-+#replogfile %LOCALSTATEDIR%/replog
++#replogfile %LOCALSTATEDIR%/openldap-slurp
+#replica-pidfile %LOCALSTATEDIR%/slurpd.pid
+#replica host=slave.example.com:389
+# binddn="cn=admin,dc=example,dc=org"
@@ -23,3 +23,18 @@
+#updatedn "cn=admin,dc=example,dc=org"
+#updateref ldap://master.example.org
+
+Index: configure
+--- configure.orig 2003-11-15 15:39:31.000000000 +0100
++++ configure 2003-11-15 15:44:31.000000000 +0100
+@@ -7809,9 +7809,9 @@
+ else
+ PERL_CPPFLAGS="`$PERLBIN -MExtUtils::Embed -e ccopts`"
+ if test x"$ol_with_perl_module" = "xstatic" ; then
+- SLAPD_PERL_LDFLAGS="`$PERLBIN -MExtUtils::Embed -e ldopts|sed
-e s/-lc//`"
++ SLAPD_PERL_LDFLAGS="`$PERLBIN -MExtUtils::Embed -e ldopts|sed
-e 's/-lc$//' -e 's/-lc / /'`"
+ else
+- MOD_PERL_LDFLAGS="`$PERLBIN -MExtUtils::Embed -e ldopts|sed -e
s/-lc//`"
++ MOD_PERL_LDFLAGS="`$PERLBIN -MExtUtils::Embed -e ldopts|sed -e
's/-lc$//' -e 's/-lc / /'`"
+ fi
+ ol_link_perl=yes
+ fi
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/openldap.spec
============================================================================
$ cvs diff -u -r1.88 -r1.89 openldap.spec
--- openpkg-src/openldap/openldap.spec 14 Nov 2003 20:11:11 -0000 1.88
+++ openpkg-src/openldap/openldap.spec 15 Nov 2003 15:27:39 -0000 1.89
@@ -33,24 +33,26 @@
Group: Database
License: GPL
Version: 2.1.23
-Release: 20031114
+Release: 20031115
# package options
%option with_fsl yes
%option with_sasl no
+%option with_perl no
# list of sources
Source0:
ftp://ftp.openldap.org/pub/openldap/openldap-release/openldap-%{version}.tgz
Source1: rc.openldap
Source2: fsl.openldap
+Patch0: openldap.patch
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20030718, make, gcc
PreReq: OpenPKG, openpkg >= 20030718
-BuildPreReq: openssl, db >= 4.1.24
-PreReq: openssl, db >= 4.1.24
+BuildPreReq: readline, openssl, db >= 4.1.24
+PreReq: readline, openssl, db >= 4.1.24
%if "%{with_fsl}" == "yes"
BuildPreReq: fsl >= 1.2.0
PreReq: fsl >= 1.2.0
@@ -71,14 +73,18 @@
%prep
%setup -q
+ %patch -p0
%build
- # make sure our Berkeley-DB is picked up first
+ # configure toolkit
+ # (1. use hard-links)
+ # (2. make sure our Berkeley-DB is picked up first)
%{l_shtool} subst \
+ -e 's;ln -s;ln;g' \
-e 's;-ldb41;-ldb;g' \
configure
%if "%{with_sasl}" == "yes"
- # hard-code configure to use SASL2 library
+ # (3. hard-code configure to use SASL2 library)
%{l_shtool} subst \
-e '4s/.*/ac_cv_lib_sasl2_sasl_client_init=yes/' \
configure
@@ -92,13 +98,13 @@
LDFLAGS="%{l_ldflags} %{l_fsl_ldflags}" \
LIBS="%{l_fsl_libs}" \
./configure \
+ --cache-file=./config.cache \
--prefix=%{l_prefix} \
--libexecdir=%{l_prefix}/libexec/openldap \
--localstatedir=%{l_prefix}/var/openldap \
- --enable-ldbm \
- --with-ldbm-api=berkeley \
- --with-ldbm-module=static \
- --with-ldbm-type=btree \
+ --enable-syslog \
+ --with-readline \
+ --with-tls \
%if "%{with_sasl}" == "yes"
--with-cyrus-sasl \
--enable-spasswd \
@@ -106,24 +112,54 @@
--without-cyrus-sasl \
--disable-spasswd \
%endif
- --enable-slurpd \
- --disable-shared
+ --disable-dynamic \
+ --disable-shared \
+ --enable-modules \
+ --enable-rewrite \
+ --enable-ldbm \
+ --with-ldbm-module=static \
+ --with-ldbm-api=berkeley \
+ --with-ldbm-type=btree \
+ --enable-bdb \
+ --with-bdb-module=static \
+ --enable-ldap \
+ --with-ldap-module=static \
+ --enable-meta \
+ --with-meta-module=static \
+ --enable-monitor \
+ --with-monitor-module=static \
+ --enable-dnssrv \
+ --with-dnssrv-module=static \
+ --enable-null \
+ --with-null-module=static \
+ --enable-shell \
+ --with-shell-module=static \
+%if "%{with_perl}" == "yes"
+ --enable-perl \
+ --with-perl-module=static \
+%endif
+ --enable-slurpd
+
+ # build toolkit
%{l_make} %{l_mflags}
%install
+ # install toolkit
rm -rf $RPM_BUILD_ROOT
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/var/openldap
%{l_make} %{l_mflags} install DESTDIR="$RPM_BUILD_ROOT"
+
+ # post adjustment: remove extra files
rm -f $RPM_BUILD_ROOT%{l_prefix}/etc/openldap/*.default
rm -f $RPM_BUILD_ROOT%{l_prefix}/etc/openldap/*/*.default
- # remove CVS information from config file
+ # post adjustment: remove CVS information from config file
%{l_shtool} subst \
-e '/\$OpenLDAP: .*slapd\.conf,v/d' \
$RPM_BUILD_ROOT%{l_prefix}/etc/openldap/slapd.conf
- # remove fsl dependency from libtool files
+ # post adjustment: remove OSSP fsl dependency from libtool files
%{l_shtool} subst \
-e 's;-lfsl *;;' \
$RPM_BUILD_ROOT%{l_prefix}/lib/*.la
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.7409 -r1.7410 news.txt
--- openpkg-web/news.txt 15 Nov 2003 08:29:23 -0000 1.7409
+++ openpkg-web/news.txt 15 Nov 2003 15:27:37 -0000 1.7410
@@ -1,3 +1,4 @@
+15-Nov-2003: Upgraded package: P<openldap-2.1.23-20031115>
15-Nov-2003: Upgraded package: P<geoip-1.3.1-20031115>
15-Nov-2003: Upgraded package: P<atool-0.27.0-20031115>
15-Nov-2003: Upgraded package: P<gcrypt-1.1.90-20031115>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
