[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: r...@openpkg.org Module: openpkg-src Date: 21-Dec-2009 17:43:45 Branch: HEAD Handle: 2009122116434400 Modified files: openpkg-src/openldapopenldap.spec Log: upgrading package: openldap 2.4.20 -> 2.4.21 Summary: RevisionChanges Path 1.234 +2 -2 openpkg-src/openldap/openldap.spec patch -p0 <<'@@ .' Index: openpkg-src/openldap/openldap.spec $ cvs diff -u -r1.233 -r1.234 openldap.spec --- openpkg-src/openldap/openldap.spec28 Nov 2009 15:02:28 - 1.233 +++ openpkg-src/openldap/openldap.spec21 Dec 2009 16:43:44 - 1.234 @@ -31,8 +31,8 @@ Class:BASE Group:LDAP License: GPL -Version: 2.4.20 -Release: 20091128 +Version: 2.4.21 +Release: 20091221 # package options %option with_server yes @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: r...@openpkg.org Module: openpkg-src Date: 28-Nov-2009 16:02:29 Branch: HEAD Handle: 2009112815022800 Modified files: openpkg-src/openldapopenldap.spec Log: upgrading package: openldap 2.4.19 -> 2.4.20 Summary: RevisionChanges Path 1.233 +2 -2 openpkg-src/openldap/openldap.spec patch -p0 <<'@@ .' Index: openpkg-src/openldap/openldap.spec $ cvs diff -u -r1.232 -r1.233 openldap.spec --- openpkg-src/openldap/openldap.spec6 Oct 2009 17:59:10 - 1.232 +++ openpkg-src/openldap/openldap.spec28 Nov 2009 15:02:28 - 1.233 @@ -31,8 +31,8 @@ Class:BASE Group:LDAP License: GPL -Version: 2.4.19 -Release: 20091006 +Version: 2.4.20 +Release: 20091128 # package options %option with_server yes @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 06-Oct-2009 19:59:10
Branch: HEAD Handle: 2009100618591000
Modified files:
openpkg-src/openldapopenldap.spec
Log:
modifying package: openldap-2.4.19 20091006 again
Summary:
RevisionChanges Path
1.232 +2 -1 openpkg-src/openldap/openldap.spec
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/openldap.spec
$ cvs diff -u -r1.231 -r1.232 openldap.spec
--- openpkg-src/openldap/openldap.spec6 Oct 2009 17:52:01 -
1.231
+++ openpkg-src/openldap/openldap.spec6 Oct 2009 17:59:10 -
1.232
@@ -239,7 +239,8 @@
# post adjustment: enable and correct slapd.pid
%if "%{with_server}" == "yes"
%{l_shtool} subst \
--e 's;^[ #]*\(pidfile \).*$;\1
%{l_prefix}/var/openldap/run/slapd.pid;' \
+-e 's;^\(pidfile\).*$;\1 %{l_prefix}/var/openldap/run/slapd.pid;' \
+-e 's;^\(argsfile\).*$;\1 %{l_prefix}/var/openldap/run/slapd.args;' \
$RPM_BUILD_ROOT%{l_prefix}/etc/openldap/slapd.conf
%endif
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: r...@openpkg.org Module: openpkg-src Date: 06-Oct-2009 19:52:02 Branch: HEAD Handle: 2009100618520100 Modified files: openpkg-src/openldapopenldap.spec Log: upgrading package: openldap 2.4.18 -> 2.4.19 Summary: RevisionChanges Path 1.231 +2 -2 openpkg-src/openldap/openldap.spec patch -p0 <<'@@ .' Index: openpkg-src/openldap/openldap.spec $ cvs diff -u -r1.230 -r1.231 openldap.spec --- openpkg-src/openldap/openldap.spec6 Sep 2009 21:14:51 - 1.230 +++ openpkg-src/openldap/openldap.spec6 Oct 2009 17:52:01 - 1.231 @@ -31,8 +31,8 @@ Class:BASE Group:LDAP License: GPL -Version: 2.4.18 -Release: 20090906 +Version: 2.4.19 +Release: 20091006 # package options %option with_server yes @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: r...@openpkg.org Module: openpkg-src Date: 06-Sep-2009 23:14:51 Branch: HEAD Handle: 2009090622145100 Modified files: openpkg-src/openldapopenldap.spec Log: upgrading package: openldap 2.4.17 -> 2.4.18 Summary: RevisionChanges Path 1.230 +2 -2 openpkg-src/openldap/openldap.spec patch -p0 <<'@@ .' Index: openpkg-src/openldap/openldap.spec $ cvs diff -u -r1.229 -r1.230 openldap.spec --- openpkg-src/openldap/openldap.spec14 Jul 2009 18:49:01 - 1.229 +++ openpkg-src/openldap/openldap.spec6 Sep 2009 21:14:51 - 1.230 @@ -31,8 +31,8 @@ Class:BASE Group:LDAP License: GPL -Version: 2.4.17 -Release: 20090714 +Version: 2.4.18 +Release: 20090906 # package options %option with_server yes @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: r...@openpkg.org Module: openpkg-src Date: 14-Jul-2009 20:49:01 Branch: HEAD Handle: 2009071419490100 Modified files: openpkg-src/openldapopenldap.spec Log: upgrading package: openldap 2.4.16 -> 2.4.17 Summary: RevisionChanges Path 1.229 +2 -2 openpkg-src/openldap/openldap.spec patch -p0 <<'@@ .' Index: openpkg-src/openldap/openldap.spec $ cvs diff -u -r1.228 -r1.229 openldap.spec --- openpkg-src/openldap/openldap.spec14 Jun 2009 17:46:37 - 1.228 +++ openpkg-src/openldap/openldap.spec14 Jul 2009 18:49:01 - 1.229 @@ -31,8 +31,8 @@ Class:BASE Group:LDAP License: GPL -Version: 2.4.16 -Release: 20090614 +Version: 2.4.17 +Release: 20090714 # package options %option with_server yes @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 14-Jun-2009 19:46:38
Branch: HEAD Handle: 2009061418463700
Modified files:
openpkg-src/openldapopenldap.spec
Log:
modifying package: openldap-2.4.16 20090516 -> 20090614
Summary:
RevisionChanges Path
1.228 +3 -1 openpkg-src/openldap/openldap.spec
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/openldap.spec
$ cvs diff -u -r1.227 -r1.228 openldap.spec
--- openpkg-src/openldap/openldap.spec16 May 2009 11:07:25 -
1.227
+++ openpkg-src/openldap/openldap.spec14 Jun 2009 17:46:37 -
1.228
@@ -32,7 +32,7 @@
Group:LDAP
License: GPL
Version: 2.4.16
-Release: 20090516
+Release: 20090614
# package options
%option with_server yes
@@ -116,6 +116,8 @@
export LIBS=""
export ARGS=""
ARGS="$ARGS --prefix=%{l_prefix}"
+ARGS="$ARGS --mandir=%{l_prefix}/man"
+ARGS="$ARGS --infodir=%{l_prefix}/info"
ARGS="$ARGS --libexecdir=%{l_prefix}/libexec/openldap"
ARGS="$ARGS --localstatedir=%{l_prefix}/var/openldap"
ARGS="$ARGS --enable-syslog"
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 16-May-2009 13:07:25
Branch: HEAD Handle: 2009051612072500
Modified files:
openpkg-src/openldapopenldap.spec
Log:
do not pickup Kerberos' GSS stuff
Summary:
RevisionChanges Path
1.227 +2 -1 openpkg-src/openldap/openldap.spec
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/openldap.spec
$ cvs diff -u -r1.226 -r1.227 openldap.spec
--- openpkg-src/openldap/openldap.spec18 Apr 2009 13:13:28 -
1.226
+++ openpkg-src/openldap/openldap.spec16 May 2009 11:07:25 -
1.227
@@ -32,7 +32,7 @@
Group:LDAP
License: GPL
Version: 2.4.16
-Release: 20090406
+Release: 20090516
# package options
%option with_server yes
@@ -121,6 +121,7 @@
ARGS="$ARGS --enable-syslog"
ARGS="$ARGS --with-tls"
ARGS="$ARGS --without-fetch"
+ARGS="$ARGS --without-gssapi"
ARGS="$ARGS --disable-dynamic"
ARGS="$ARGS --disable-shared"
%if "%{with_server}" == "yes"
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: r...@openpkg.org Module: openpkg-src Date: 06-Apr-2009 22:32:18 Branch: HEAD Handle: 2009040621321800 Modified files: openpkg-src/openldapopenldap.spec Log: upgrading package: openldap 2.4.15 -> 2.4.16 Summary: RevisionChanges Path 1.225 +2 -2 openpkg-src/openldap/openldap.spec patch -p0 <<'@@ .' Index: openpkg-src/openldap/openldap.spec $ cvs diff -u -r1.224 -r1.225 openldap.spec --- openpkg-src/openldap/openldap.spec24 Feb 2009 08:52:47 - 1.224 +++ openpkg-src/openldap/openldap.spec6 Apr 2009 20:32:18 - 1.225 @@ -31,8 +31,8 @@ Class:BASE Group:LDAP License: GPL -Version: 2.4.15 -Release: 20090224 +Version: 2.4.16 +Release: 20090406 # package options %option with_server yes @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: r...@openpkg.org Module: openpkg-src Date: 24-Feb-2009 09:52:48 Branch: HEAD Handle: 2009022408524700 Modified files: openpkg-src/openldapopenldap.spec Log: upgrading package: openldap 2.4.14 -> 2.4.15 Summary: RevisionChanges Path 1.224 +2 -2 openpkg-src/openldap/openldap.spec patch -p0 <<'@@ .' Index: openpkg-src/openldap/openldap.spec $ cvs diff -u -r1.223 -r1.224 openldap.spec --- openpkg-src/openldap/openldap.spec14 Feb 2009 13:23:51 - 1.223 +++ openpkg-src/openldap/openldap.spec24 Feb 2009 08:52:47 - 1.224 @@ -31,8 +31,8 @@ Class:BASE Group:LDAP License: GPL -Version: 2.4.14 -Release: 20090214 +Version: 2.4.15 +Release: 20090224 # package options %option with_server yes @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: r...@openpkg.org Module: openpkg-src Date: 14-Feb-2009 14:23:52 Branch: HEAD Handle: 2009021413235100 Modified files: openpkg-src/openldapopenldap.spec Log: upgrading package: openldap 2.4.13 -> 2.4.14 Summary: RevisionChanges Path 1.223 +2 -2 openpkg-src/openldap/openldap.spec patch -p0 <<'@@ .' Index: openpkg-src/openldap/openldap.spec $ cvs diff -u -r1.222 -r1.223 openldap.spec --- openpkg-src/openldap/openldap.spec25 Nov 2008 07:11:28 - 1.222 +++ openpkg-src/openldap/openldap.spec14 Feb 2009 13:23:51 - 1.223 @@ -31,8 +31,8 @@ Class:BASE Group:LDAP License: GPL -Version: 2.4.13 -Release: 20081125 +Version: 2.4.14 +Release: 20090214 # package options %option with_server yes @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 25-Nov-2008 08:11:28 Branch: HEAD Handle: 2008112507112800 Modified files: openpkg-src/openldapopenldap.spec Log: upgrading package: openldap 2.4.12 -> 2.4.13 Summary: RevisionChanges Path 1.222 +2 -2 openpkg-src/openldap/openldap.spec patch -p0 <<'@@ .' Index: openpkg-src/openldap/openldap.spec $ cvs diff -u -r1.221 -r1.222 openldap.spec --- openpkg-src/openldap/openldap.spec13 Oct 2008 09:51:43 - 1.221 +++ openpkg-src/openldap/openldap.spec25 Nov 2008 07:11:28 - 1.222 @@ -31,8 +31,8 @@ Class:BASE Group:LDAP License: GPL -Version: 2.4.12 -Release: 20081013 +Version: 2.4.13 +Release: 20081125 # package options %option with_server yes @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 17-Jul-2008 23:55:01 Branch: HEAD Handle: 2008071722550100 Modified files: openpkg-src/openldapopenldap.spec Log: upgrading package: openldap 2.4.10 -> 2.4.11 Summary: RevisionChanges Path 1.219 +2 -2 openpkg-src/openldap/openldap.spec patch -p0 <<'@@ .' Index: openpkg-src/openldap/openldap.spec $ cvs diff -u -r1.218 -r1.219 openldap.spec --- openpkg-src/openldap/openldap.spec9 Jun 2008 06:55:05 - 1.218 +++ openpkg-src/openldap/openldap.spec17 Jul 2008 21:55:01 - 1.219 @@ -31,8 +31,8 @@ Class:BASE Group:LDAP License: GPL -Version: 2.4.10 -Release: 20080609 +Version: 2.4.11 +Release: 20080717 # package options %option with_server yes @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 08-May-2008 08:39:34 Branch: HEAD Handle: 2008050807393300 Modified files: openpkg-src/openldapopenldap.spec Log: upgrading package: openldap 2.4.8 -> 2.4.9 Summary: RevisionChanges Path 1.217 +2 -2 openpkg-src/openldap/openldap.spec patch -p0 <<'@@ .' Index: openpkg-src/openldap/openldap.spec $ cvs diff -u -r1.216 -r1.217 openldap.spec --- openpkg-src/openldap/openldap.spec20 Feb 2008 07:00:50 - 1.216 +++ openpkg-src/openldap/openldap.spec8 May 2008 06:39:33 - 1.217 @@ -31,8 +31,8 @@ Class:BASE Group:LDAP License: GPL -Version: 2.4.8 -Release: 20080220 +Version: 2.4.9 +Release: 20080508 # package options %option with_server yes @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 20-Feb-2008 08:00:50 Branch: HEAD Handle: 2008022007005000 Modified files: openpkg-src/openldapopenldap.spec Log: upgrading package: openldap 2.4.7 -> 2.4.8 Summary: RevisionChanges Path 1.216 +2 -2 openpkg-src/openldap/openldap.spec patch -p0 <<'@@ .' Index: openpkg-src/openldap/openldap.spec $ cvs diff -u -r1.215 -r1.216 openldap.spec --- openpkg-src/openldap/openldap.spec1 Jan 2008 15:00:40 - 1.215 +++ openpkg-src/openldap/openldap.spec20 Feb 2008 07:00:50 - 1.216 @@ -31,8 +31,8 @@ Class:BASE Group:LDAP License: GPL -Version: 2.4.7 -Release: 20080101 +Version: 2.4.8 +Release: 20080220 # package options %option with_server yes @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 22-Dec-2007 17:29:41
Branch: HEAD Handle: 2007122216294100
Modified files:
openpkg-src/openldapopenldap.spec
Log:
disable the use of epoll(2) under Linux and /dev/poll under Solaris in
case GNU Pth is used as GNU Pth doesn't provide wrappers for those
Summary:
RevisionChanges Path
1.214 +6 -1 openpkg-src/openldap/openldap.spec
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/openldap.spec
$ cvs diff -u -r1.213 -r1.214 openldap.spec
--- openpkg-src/openldap/openldap.spec22 Dec 2007 16:14:14 -
1.213
+++ openpkg-src/openldap/openldap.spec22 Dec 2007 16:29:41 -
1.214
@@ -107,6 +107,8 @@
configure
%build
+cp /dev/null config.cache
+
# configuration: standard build flags
export CC="%{l_cc}"
export CFLAGS="%{l_cflags -O}"
@@ -155,6 +157,9 @@
LDFLAGS="$LDFLAGS `%{l_prefix}/bin/pth-config --ldflags`"
LIBS="`%{l_prefix}/bin/pth-config --libs` $LIBS"
ARGS="$ARGS --with-threads=pth"
+( echo "ac_cv_header_sys_devpoll_h=no"
+ echo "ac_cv_header_sys_epoll_h=no"
+) >>config.cache
%else
%if "%{with_pthreads}" == "yes"
ARGS="$ARGS --with-threads=posix"
@@ -172,7 +177,7 @@
# configuration: optional SASL support
%if "%{with_sasl}" == "yes"
( echo "ac_cv_lib_sasl2_sasl_client_init=yes"
-) >config.cache
+) >>config.cache
CPPFLAGS="%{l_cppflags sasl} $CPPFLAGS"
ARGS="$ARGS --with-cyrus-sasl --enable-spasswd"
%else
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 22-Dec-2007 17:14:14 Branch: HEAD Handle: 2007122216141400 Modified files: openpkg-src/openldapopenldap.spec Log: LDBM storage was removed from OpenLDAP 2.4 at all Summary: RevisionChanges Path 1.213 +1 -4 openpkg-src/openldap/openldap.spec patch -p0 <<'@@ .' Index: openpkg-src/openldap/openldap.spec $ cvs diff -u -r1.212 -r1.213 openldap.spec --- openpkg-src/openldap/openldap.spec22 Dec 2007 16:12:27 - 1.212 +++ openpkg-src/openldap/openldap.spec22 Dec 2007 16:14:14 - 1.213 @@ -126,12 +126,9 @@ ARGS="$ARGS --enable-slapd" ARGS="$ARGS --disable-modules" ARGS="$ARGS --enable-local" -ARGS="$ARGS --enable-ldbm" -ARGS="$ARGS --enable-ldbm-api=berkeley" -ARGS="$ARGS --enable-ldbm-type=btree" ARGS="$ARGS --enable-bdb" -ARGS="$ARGS --enable-rewrite" ARGS="$ARGS --enable-hdb" +ARGS="$ARGS --enable-rewrite" ARGS="$ARGS --enable-ldap" ARGS="$ARGS --enable-meta" ARGS="$ARGS --enable-monitor" @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 22-Dec-2007 17:02:04
Branch: HEAD Handle: 2007122216020400
Modified files:
openpkg-src/openldapopenldap.spec
Log:
readline is no longer used by OpenLDAP
Summary:
RevisionChanges Path
1.211 +3 -4 openpkg-src/openldap/openldap.spec
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/openldap.spec
$ cvs diff -u -r1.210 -r1.211 openldap.spec
--- openpkg-src/openldap/openldap.spec14 Dec 2007 09:05:45 -
1.210
+++ openpkg-src/openldap/openldap.spec22 Dec 2007 16:02:04 -
1.211
@@ -33,7 +33,7 @@
Group:LDAP
License: GPL
Version: 2.4.7
-Release: 20071214
+Release: 20071222
# package options
%option with_server yes
@@ -58,8 +58,8 @@
BuildRoot:%{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20060823, make, gcc
PreReq: OpenPKG, openpkg >= 20060823
-BuildPreReq: readline, openssl, db >= 4.5
-PreReq: readline, openssl, db >= 4.5
+BuildPreReq: openssl, db >= 4.5
+PreReq: openssl, db >= 4.5
%if "%{with_server}" == "yes" && "%{with_fsl}" == "yes"
BuildPreReq: fsl
PreReq: fsl
@@ -118,7 +118,6 @@
ARGS="$ARGS --libexecdir=%{l_prefix}/libexec/openldap"
ARGS="$ARGS --localstatedir=%{l_prefix}/var/openldap"
ARGS="$ARGS --enable-syslog"
-ARGS="$ARGS --with-readline"
ARGS="$ARGS --with-tls"
ARGS="$ARGS --without-fetch"
ARGS="$ARGS --disable-dynamic"
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 14-Dec-2007 10:05:45 Branch: HEAD Handle: 2007121409054500 Modified files: openpkg-src/openldapopenldap.spec Log: upgrading package: openldap 2.4.6 -> 2.4.7 Summary: RevisionChanges Path 1.210 +2 -2 openpkg-src/openldap/openldap.spec patch -p0 <<'@@ .' Index: openpkg-src/openldap/openldap.spec $ cvs diff -u -r1.209 -r1.210 openldap.spec --- openpkg-src/openldap/openldap.spec3 Nov 2007 11:40:35 - 1.209 +++ openpkg-src/openldap/openldap.spec14 Dec 2007 09:05:45 - 1.210 @@ -32,8 +32,8 @@ Class:BASE Group:LDAP License: GPL -Version: 2.4.6 -Release: 20071103 +Version: 2.4.7 +Release: 20071214 # package options %option with_server yes @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 03-Nov-2007 12:40:36
Branch: HEAD Handle: 2007110311403500
Modified files:
openpkg-src/openldapopenldap.spec
Log:
allow one to build OpenLDAP against system/vendor Pthreads API, too
(with_pth=no is required for this or GNU Pth still takes preference)
Summary:
RevisionChanges Path
1.209 +13 -3 openpkg-src/openldap/openldap.spec
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/openldap.spec
$ cvs diff -u -r1.208 -r1.209 openldap.spec
--- openpkg-src/openldap/openldap.spec3 Nov 2007 11:25:35 -
1.208
+++ openpkg-src/openldap/openldap.spec3 Nov 2007 11:40:35 -
1.209
@@ -41,6 +41,7 @@
%option with_cryptyes
%option with_overlays yes
%option with_pth yes
+%option with_pthreads no
%option with_sasl no
%option with_perl no
%option with_odbc no
@@ -63,6 +64,10 @@
BuildPreReq: fsl
PreReq: fsl
%endif
+%if "%{with_server}" == "yes" && "%{with_pthreads}" == "yes"
+BuildPreReq: db::with_pthreads = yes
+PreReq: db::with_pthreads = yes
+%endif
%if "%{with_server}" == "yes" && "%{with_pth}" == "yes"
BuildPreReq: pth
PreReq: pth
@@ -149,16 +154,21 @@
%endif
# configuration: force to use GNU pth if enabled
-%if "%{with_server}" == "yes" && "%{with_pth}" == "yes"
+%if "%{with_server}" == "yes"
+%if "%{with_pth}" == "yes"
CFLAGS="$CFLAGS `%{l_prefix}/bin/pth-config --cflags`"
CPPFLAGS="$CPPFLAGS -I`%{l_prefix}/bin/pth-config --includedir`"
LDFLAGS="$LDFLAGS `%{l_prefix}/bin/pth-config --ldflags`"
LIBS="`%{l_prefix}/bin/pth-config --libs` $LIBS"
ARGS="$ARGS --with-threads=pth"
-%endif
-%if "%{with_server}" == "yes" && "%{with_pth}" != "yes"
+%else
+%if "%{with_pthreads}" == "yes"
+ARGS="$ARGS --with-threads=posix"
+%else
ARGS="$ARGS --with-threads=no"
%endif
+%endif
+%endif
# configuration: optional overlay support
%if "%{with_server}" == "yes" && "%{with_overlays}" == "yes"
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 03-Nov-2007 12:25:35
Branch: HEAD Handle: 2007110311253500
Modified files:
openpkg-src/openldapopenldap.spec
Log:
if OpenLDAP is not built with GNU Pth, we have to disable threading at
all for now as the use of Pthreads causes potential problems as long
as our Berkeley-DB is not also built with Pthreads mutexes
Summary:
RevisionChanges Path
1.208 +3 -0 openpkg-src/openldap/openldap.spec
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/openldap.spec
$ cvs diff -u -r1.207 -r1.208 openldap.spec
--- openpkg-src/openldap/openldap.spec3 Nov 2007 11:11:09 -
1.207
+++ openpkg-src/openldap/openldap.spec3 Nov 2007 11:25:35 -
1.208
@@ -156,6 +156,9 @@
LIBS="`%{l_prefix}/bin/pth-config --libs` $LIBS"
ARGS="$ARGS --with-threads=pth"
%endif
+%if "%{with_server}" == "yes" && "%{with_pth}" != "yes"
+ARGS="$ARGS --with-threads=no"
+%endif
# configuration: optional overlay support
%if "%{with_server}" == "yes" && "%{with_overlays}" == "yes"
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 03-Nov-2007 09:50:12
Branch: HEAD Handle: 2007110308501200
Modified files:
openpkg-src/openldapopenldap.spec
Log:
I don't know why DB 4.6 still breaks slapd(8), but as it still
segfaults switch back to DB 4.5 again
Summary:
RevisionChanges Path
1.206 +6 -6 openpkg-src/openldap/openldap.spec
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/openldap.spec
$ cvs diff -u -r1.205 -r1.206 openldap.spec
--- openpkg-src/openldap/openldap.spec31 Oct 2007 16:43:29 -
1.205
+++ openpkg-src/openldap/openldap.spec3 Nov 2007 08:50:12 -
1.206
@@ -33,7 +33,7 @@
Group:LDAP
License: GPL
Version: 2.4.6
-Release: 20071031
+Release: 20071103
# package options
%option with_server yes
@@ -57,8 +57,8 @@
BuildRoot:%{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20060823, make, gcc
PreReq: OpenPKG, openpkg >= 20060823
-BuildPreReq: readline, openssl, db >= 4.5
-PreReq: readline, openssl, db >= 4.5
+BuildPreReq: readline, openssl, db45
+PreReq: readline, openssl, db45
%if "%{with_server}" == "yes" && "%{with_fsl}" == "yes"
BuildPreReq: fsl
PreReq: fsl
@@ -105,8 +105,8 @@
# configuration: standard build flags
export CC="%{l_cc}"
export CFLAGS="%{l_cflags -O}"
-export CPPFLAGS="%{l_cppflags}"
-export LDFLAGS="%{l_ldflags}"
+export CPPFLAGS="%{l_cppflags db45 .}"
+export LDFLAGS="%{l_ldflags db45 .}"
export LIBS=""
export ARGS=""
ARGS="$ARGS --prefix=%{l_prefix}"
@@ -195,7 +195,7 @@
# configuration: use hard-links and make sure our Berkeley-DB is
picked up first
%{l_shtool} subst \
-e 's;ln -s;ln;g' \
--e 's;-ldb4[1-9];%{l_prefix}/lib/libdb.a;g' \
+-e 's;-ldb4[1-9];%{l_prefix}/lib/db45/libdb.a;g' \
-e 's;;"db.h";g' \
configure
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 31-Oct-2007 17:43:29
Branch: HEAD Handle: 2007103116432900
Modified files:
openpkg-src/openldapopenldap.spec
Log:
switch back to using DB 4.6 as this version is officially supported by
OpenLDAP 2.4
Summary:
RevisionChanges Path
1.205 +5 -5 openpkg-src/openldap/openldap.spec
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/openldap.spec
$ cvs diff -u -r1.204 -r1.205 openldap.spec
--- openpkg-src/openldap/openldap.spec31 Oct 2007 16:34:54 -
1.204
+++ openpkg-src/openldap/openldap.spec31 Oct 2007 16:43:29 -
1.205
@@ -57,8 +57,8 @@
BuildRoot:%{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20060823, make, gcc
PreReq: OpenPKG, openpkg >= 20060823
-BuildPreReq: readline, openssl, db45
-PreReq: readline, openssl, db45
+BuildPreReq: readline, openssl, db >= 4.5
+PreReq: readline, openssl, db >= 4.5
%if "%{with_server}" == "yes" && "%{with_fsl}" == "yes"
BuildPreReq: fsl
PreReq: fsl
@@ -105,8 +105,8 @@
# configuration: standard build flags
export CC="%{l_cc}"
export CFLAGS="%{l_cflags -O}"
-export CPPFLAGS="%{l_cppflags db45 .}"
-export LDFLAGS="%{l_ldflags db45 .}"
+export CPPFLAGS="%{l_cppflags}"
+export LDFLAGS="%{l_ldflags}"
export LIBS=""
export ARGS=""
ARGS="$ARGS --prefix=%{l_prefix}"
@@ -195,7 +195,7 @@
# configuration: use hard-links and make sure our Berkeley-DB is
picked up first
%{l_shtool} subst \
-e 's;ln -s;ln;g' \
--e 's;-ldb4[1-9];%{l_prefix}/lib/db45/libdb.a;g' \
+-e 's;-ldb4[1-9];%{l_prefix}/lib/libdb.a;g' \
-e 's;;"db.h";g' \
configure
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 18-Oct-2007 14:53:36
Branch: HEAD Handle: 2007101813533600
Modified files:
openpkg-src/openldapopenldap.spec
Log:
OpenLDAP 2.3.x is incompatible with Berkeley-DB >= 4.6. Also 2.3.39
and higher will not solve the problem. Only OpenLDAP 2.4.x were x >= 5
will be compatible with Berkeley-DB 4.6, so until this OpenLDAP
version is available we have to use Berkeley-DB 4.5 :-(
Summary:
RevisionChanges Path
1.201 +5 -5 openpkg-src/openldap/openldap.spec
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/openldap.spec
$ cvs diff -u -r1.200 -r1.201 openldap.spec
--- openpkg-src/openldap/openldap.spec18 Oct 2007 09:55:15 -
1.200
+++ openpkg-src/openldap/openldap.spec18 Oct 2007 12:53:36 -
1.201
@@ -57,8 +57,8 @@
BuildRoot:%{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20060823, make, gcc
PreReq: OpenPKG, openpkg >= 20060823
-BuildPreReq: readline, openssl, db >= 4.2
-PreReq: readline, openssl, db >= 4.2
+BuildPreReq: readline, openssl, db45
+PreReq: readline, openssl, db45
%if "%{with_server}" == "yes" && "%{with_fsl}" == "yes"
BuildPreReq: fsl >= 1.2.0
PreReq: fsl >= 1.2.0
@@ -105,8 +105,8 @@
# configuration: standard build flags
export CC="%{l_cc}"
export CFLAGS="%{l_cflags -O}"
-export CPPFLAGS="%{l_cppflags}"
-export LDFLAGS="%{l_ldflags}"
+export CPPFLAGS="%{l_cppflags db45 .}"
+export LDFLAGS="%{l_ldflags db45 .}"
export LIBS=""
export ARGS=""
ARGS="$ARGS --prefix=%{l_prefix}"
@@ -195,7 +195,7 @@
# configuration: use hard-links and make sure our Berkeley-DB is
picked up first
%{l_shtool} subst \
-e 's;ln -s;ln;g' \
--e 's;-ldb4[1-9];%{l_prefix}/lib/libdb.a;g' \
+-e 's;-ldb4[1-9];%{l_prefix}/lib/db45/libdb.a;g' \
-e 's;;"db.h";g' \
configure
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Kolab Konsortium via Gunnar
Wro$
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 12-Oct-2007 10:32:20
Branch: HEAD Handle: 2007101209321900
Modified files:
openpkg-src/openldapopenldap.spec
Log:
Just extended a comment for a diff so that the package gets uploaded.
Summary:
RevisionChanges Path
1.199 +1 -1 openpkg-src/openldap/openldap.spec
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/openldap.spec
$ cvs diff -u -r1.198 -r1.199 openldap.spec
--- openpkg-src/openldap/openldap.spec12 Oct 2007 07:02:56 -
1.198
+++ openpkg-src/openldap/openldap.spec12 Oct 2007 08:32:19 -
1.199
@@ -148,7 +148,7 @@
LIBS="$LIBS %{l_fsl_libs}"
%endif
-# configuration: force to use GNU pth
+# configuration: force to use GNU pth if enabled
%if "%{with_server}" == "yes" && "%{with_pth}" == "yes"
CFLAGS="$CFLAGS `%{l_prefix}/bin/pth-config --cflags`"
CPPFLAGS="$CPPFLAGS -I`%{l_prefix}/bin/pth-config --includedir`"
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Kolab Konsortium via Gunnar Wro$ Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 12-Oct-2007 09:02:57 Branch: HEAD Handle: 2007101208025600 Modified files: openpkg-src/openldapopenldap.spec Log: Hm, the package from yesterday didn't make it on the ftp server. let's try again by bumping the release number. Summary: RevisionChanges Path 1.198 +1 -1 openpkg-src/openldap/openldap.spec patch -p0 <<'@@ .' Index: openpkg-src/openldap/openldap.spec $ cvs diff -u -r1.197 -r1.198 openldap.spec --- openpkg-src/openldap/openldap.spec11 Oct 2007 17:16:20 - 1.197 +++ openpkg-src/openldap/openldap.spec12 Oct 2007 07:02:56 - 1.198 @@ -33,7 +33,7 @@ Group:LDAP License: GPL Version: 2.3.38 -Release: 20071011 +Release: 20071012 # package options %option with_server yes @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Kolab Konsortium via Gunnar
Wro$
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 11-Oct-2007 19:16:20
Branch: HEAD Handle: 2007101118162000
Modified files:
openpkg-src/openldapopenldap.spec
Log:
Add with_pth to openldap so that this can also be build without using
pth. Patch provided by Thomas A. Hein.
Summary:
RevisionChanges Path
1.197 +10 -5 openpkg-src/openldap/openldap.spec
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/openldap.spec
$ cvs diff -u -r1.196 -r1.197 openldap.spec
--- openpkg-src/openldap/openldap.spec5 Oct 2007 07:59:24 -
1.196
+++ openpkg-src/openldap/openldap.spec11 Oct 2007 17:16:20 -
1.197
@@ -33,13 +33,14 @@
Group:LDAP
License: GPL
Version: 2.3.38
-Release: 20071005
+Release: 20071011
# package options
%option with_server yes
%option with_fsl yes
%option with_cryptyes
%option with_overlays yes
+%option with_pth yes
%option with_sasl no
%option with_perl no
%option with_odbc no
@@ -56,12 +57,16 @@
BuildRoot:%{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20060823, make, gcc
PreReq: OpenPKG, openpkg >= 20060823
-BuildPreReq: readline, openssl, db >= 4.2, pth
-PreReq: readline, openssl, db >= 4.2, pth
+BuildPreReq: readline, openssl, db >= 4.2
+PreReq: readline, openssl, db >= 4.2
%if "%{with_server}" == "yes" && "%{with_fsl}" == "yes"
BuildPreReq: fsl >= 1.2.0
PreReq: fsl >= 1.2.0
%endif
+%if "%{with_server}" == "yes" && "%{with_pth}" == "yes"
+BuildPreReq: pth
+PreReq: pth
+%endif
%if "%{with_sasl}" == "yes"
BuildPreReq: sasl
PreReq: sasl
@@ -144,7 +149,7 @@
%endif
# configuration: force to use GNU pth
-%if "%{with_server}" == "yes"
+%if "%{with_server}" == "yes" && "%{with_pth}" == "yes"
CFLAGS="$CFLAGS `%{l_prefix}/bin/pth-config --cflags`"
CPPFLAGS="$CPPFLAGS -I`%{l_prefix}/bin/pth-config --includedir`"
LDFLAGS="$LDFLAGS `%{l_prefix}/bin/pth-config --ldflags`"
@@ -190,7 +195,7 @@
# configuration: use hard-links and make sure our Berkeley-DB is
picked up first
%{l_shtool} subst \
-e 's;ln -s;ln;g' \
--e 's;-ldb4[234];%{l_prefix}/lib/libdb.a;g' \
+-e 's;-ldb4[1-9];%{l_prefix}/lib/libdb.a;g' \
-e 's;;"db.h";g' \
configure
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 05-Oct-2007 09:59:24 Branch: HEAD Handle: 2007100508592400 Modified files: openpkg-src/openldapopenldap.spec Log: enable local transport support, too Summary: RevisionChanges Path 1.196 +2 -1 openpkg-src/openldap/openldap.spec patch -p0 <<'@@ .' Index: openpkg-src/openldap/openldap.spec $ cvs diff -u -r1.195 -r1.196 openldap.spec --- openpkg-src/openldap/openldap.spec22 Sep 2007 17:30:21 - 1.195 +++ openpkg-src/openldap/openldap.spec5 Oct 2007 07:59:24 - 1.196 @@ -33,7 +33,7 @@ Group:LDAP License: GPL Version: 2.3.38 -Release: 20070922 +Release: 20071005 # package options %option with_server yes @@ -117,6 +117,7 @@ ARGS="$ARGS --enable-slapd" ARGS="$ARGS --enable-slurpd" ARGS="$ARGS --disable-modules" +ARGS="$ARGS --enable-local" ARGS="$ARGS --enable-ldbm" ARGS="$ARGS --enable-ldbm-api=berkeley" ARGS="$ARGS --enable-ldbm-type=btree" @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 22-Sep-2007 19:30:22
Branch: HEAD Handle: 2007092218302100
Modified files:
openpkg-src/openldapopenldap.spec
Log:
DB_CONFIG has to be in the database dir
Summary:
RevisionChanges Path
1.195 +3 -4 openpkg-src/openldap/openldap.spec
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/openldap.spec
$ cvs diff -u -r1.194 -r1.195 openldap.spec
--- openpkg-src/openldap/openldap.spec22 Sep 2007 17:22:25 -
1.194
+++ openpkg-src/openldap/openldap.spec22 Sep 2007 17:30:21 -
1.195
@@ -210,9 +210,10 @@
rm -f $RPM_BUILD_ROOT%{l_prefix}/etc/openldap/*/*.default
# post adjustment: move files
+rm -f $RPM_BUILD_ROOT%{l_prefix}/etc/openldap/DB_CONFIG.example
%if "%{with_server}" == "yes"
-mv $RPM_BUILD_ROOT%{l_prefix}/etc/openldap/DB_CONFIG.example \
-$RPM_BUILD_ROOT%{l_prefix}/etc/openldap/DB_CONFIG
+mv
$RPM_BUILD_ROOT%{l_prefix}/var/openldap/openldap-data/DB_CONFIG.example \
+$RPM_BUILD_ROOT%{l_prefix}/var/openldap/openldap-data/DB_CONFIG
%endif
# post adjustment: enable and correct slurpd.pid (slapd.pid as a
precaution, too)
@@ -264,7 +265,6 @@
%if "%{with_server}" != "yes"
rm -rf $RPM_BUILD_ROOT%{l_prefix}/etc/openldap/schema
rm -f $RPM_BUILD_ROOT%{l_prefix}/etc/openldap/slapd.conf
-rm -f $RPM_BUILD_ROOT%{l_prefix}/etc/openldap/DB_CONFIG
rm -rf $RPM_BUILD_ROOT%{l_prefix}/sbin
rm -rf $RPM_BUILD_ROOT%{l_prefix}/libexec/openldap
rm -f $RPM_BUILD_ROOT%{l_prefix}/include/slapi-plugin.h
@@ -280,7 +280,6 @@
'%config %{l_prefix}/etc/fsl/fsl.openldap' \
'%config %{l_prefix}/etc/openldap/schema/*.schema' \
'%config %{l_prefix}/etc/openldap/schema/*.ldif' \
-'%config %{l_prefix}/etc/openldap/DB_CONFIG' \
%endif
'%config %{l_prefix}/etc/openldap/*.conf'
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 16-Sep-2007 20:21:29
Branch: HEAD Handle: 2007091619212700
Modified files:
openpkg-src/openldapopenldap.spec
Log:
allow one to build OpenLDAP as a client-only package, too
Summary:
RevisionChanges Path
1.193 +57 -9 openpkg-src/openldap/openldap.spec
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/openldap.spec
$ cvs diff -u -r1.192 -r1.193 openldap.spec
--- openpkg-src/openldap/openldap.spec21 Aug 2007 14:59:09 -
1.192
+++ openpkg-src/openldap/openldap.spec16 Sep 2007 18:21:27 -
1.193
@@ -33,9 +33,10 @@
Group:LDAP
License: GPL
Version: 2.3.38
-Release: 20070821
+Release: 20070916
# package options
+%option with_server yes
%option with_fsl yes
%option with_cryptyes
%option with_overlays yes
@@ -57,7 +58,7 @@
PreReq: OpenPKG, openpkg >= 20060823
BuildPreReq: readline, openssl, db >= 4.2, pth
PreReq: readline, openssl, db >= 4.2, pth
-%if "%{with_fsl}" == "yes"
+%if "%{with_server}" == "yes" && "%{with_fsl}" == "yes"
BuildPreReq: fsl >= 1.2.0
PreReq: fsl >= 1.2.0
%endif
@@ -65,7 +66,7 @@
BuildPreReq: sasl
PreReq: sasl
%endif
-%if "%{with_odbc}" == "yes"
+%if "%{with_server}" == "yes" && "%{with_odbc}" == "yes"
BuildPreReq: ODBC
PreReq: ODBC
%endif
@@ -112,6 +113,9 @@
ARGS="$ARGS --without-fetch"
ARGS="$ARGS --disable-dynamic"
ARGS="$ARGS --disable-shared"
+%if "%{with_server}" == "yes"
+ARGS="$ARGS --enable-slapd"
+ARGS="$ARGS --enable-slurpd"
ARGS="$ARGS --disable-modules"
ARGS="$ARGS --enable-ldbm"
ARGS="$ARGS --enable-ldbm-api=berkeley"
@@ -126,21 +130,29 @@
ARGS="$ARGS --enable-null"
ARGS="$ARGS --enable-shell"
ARGS="$ARGS --with-proxycache"
-ARGS="$ARGS --enable-slurpd"
+%else
+ARGS="$ARGS --disable-slapd"
+ARGS="$ARGS --disable-slurpd"
+ARGS="$ARGS --disable-modules"
+%endif
# configuration: force to use OSSP fsl
+%if "%{with_server}" == "yes"
LDFLAGS="$LDFLAGS %{l_fsl_ldflags}"
LIBS="$LIBS %{l_fsl_libs}"
+%endif
# configuration: force to use GNU pth
+%if "%{with_server}" == "yes"
CFLAGS="$CFLAGS `%{l_prefix}/bin/pth-config --cflags`"
CPPFLAGS="$CPPFLAGS -I`%{l_prefix}/bin/pth-config --includedir`"
LDFLAGS="$LDFLAGS `%{l_prefix}/bin/pth-config --ldflags`"
LIBS="`%{l_prefix}/bin/pth-config --libs` $LIBS"
ARGS="$ARGS --with-threads=pth"
+%endif
# configuration: optional overlay support
-%if "%{with_overlays}" == "yes"
+%if "%{with_server}" == "yes" && "%{with_overlays}" == "yes"
ARGS="$ARGS --enable-overlays=yes"
%endif
@@ -160,12 +172,12 @@
%endif
# configuration: optional Perl support
-%if "%{with_perl}" == "yes"
+%if "%{with_server}" == "yes" && "%{with_perl}" == "yes"
ARGS="$ARGS --enable-perl"
%endif
# configuration: optional ODBC-based RDBMS support
-%if "%{with_odbc}" == "yes"
+%if "%{with_server}" == "yes" && "%{with_odbc}" == "yes"
ARGS="$ARGS --enable-sql"
%endif
@@ -197,29 +209,43 @@
rm -f $RPM_BUILD_ROOT%{l_prefix}/etc/openldap/*.default
rm -f $RPM_BUILD_ROOT%{l_prefix}/etc/openldap/*/*.default
+# post adjustment: move files
+%if "%{with_server}" == "yes"
+mv $RPM_BUILD_ROOT%{l_prefix}/etc/openldap/DB_CONFIG.example \
+$RPM_BUILD_ROOT%{l_prefix}/etc/openldap/DB_CONFIG
+%endif
+
# post adjustment: enable and correct slurpd.pid (slapd.pid as a
precaution, too)
+%if "%{with_server}" == "yes"
%{l_shtool} subst \
-e 's;^[ #]*\(pidfile \).*$;\1
%{l_prefix}/var/openldap/run/slapd.pid;' \
-e 's;^[ #]*\(replica-pidfile \).*$;\1
%{l_prefix}/var/openldap/run/slurpd.pid;' \
$RPM_BUILD_ROOT%{l_prefix}/etc/openldap/slapd.conf
+%endif
# post adjustment: remove OSSP fsl dependency from libtool files
+%if "%{with_server}" == "yes"
%{l_shtool} subst \
-e 's;-lfsl *;;' \
$RPM_BUILD_ROOT%{l_prefix}/lib/*.la
+%endif
# install run-command script
+%if "%{with_server}" == "yes"
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
%{l_shtool} install -c -m 755 %{l
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Christoph Schug Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 21-Aug-2007 16:59:09 Branch: HEAD Handle: 2007082115590900 Modified files: openpkg-src/openldapopenldap.spec Log: upgrading package: openldap 2.3.37 -> 2.3.38 Summary: RevisionChanges Path 1.192 +2 -2 openpkg-src/openldap/openldap.spec patch -p0 <<'@@ .' Index: openpkg-src/openldap/openldap.spec $ cvs diff -u -r1.191 -r1.192 openldap.spec --- openpkg-src/openldap/openldap.spec21 Jul 2007 07:54:45 - 1.191 +++ openpkg-src/openldap/openldap.spec21 Aug 2007 14:59:09 - 1.192 @@ -32,8 +32,8 @@ Class:BASE Group:LDAP License: GPL -Version: 2.3.37 -Release: 20070721 +Version: 2.3.38 +Release: 20070821 # package options %option with_fsl yes @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 21-Jul-2007 09:54:46 Branch: HEAD Handle: 2007072108544500 Modified files: openpkg-src/openldapopenldap.spec Log: upgrading package: openldap 2.3.36 -> 2.3.37 Summary: RevisionChanges Path 1.191 +2 -2 openpkg-src/openldap/openldap.spec patch -p0 <<'@@ .' Index: openpkg-src/openldap/openldap.spec $ cvs diff -u -r1.190 -r1.191 openldap.spec --- openpkg-src/openldap/openldap.spec20 Jul 2007 20:17:39 - 1.190 +++ openpkg-src/openldap/openldap.spec21 Jul 2007 07:54:45 - 1.191 @@ -32,8 +32,8 @@ Class:BASE Group:LDAP License: GPL -Version: 2.3.36 -Release: 20070720 +Version: 2.3.37 +Release: 20070721 # package options %option with_fsl yes @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 18-Jun-2007 13:43:44 Branch: HEAD Handle: 2007061812434400 Modified files: openpkg-src/openldapopenldap.spec Log: upgrading package: openldap 2.3.35 -> 2.3.36 Summary: RevisionChanges Path 1.189 +2 -2 openpkg-src/openldap/openldap.spec patch -p0 <<'@@ .' Index: openpkg-src/openldap/openldap.spec $ cvs diff -u -r1.188 -r1.189 openldap.spec --- openpkg-src/openldap/openldap.spec30 May 2007 08:42:31 - 1.188 +++ openpkg-src/openldap/openldap.spec18 Jun 2007 11:43:44 - 1.189 @@ -32,8 +32,8 @@ Class:BASE Group:LDAP License: GPL -Version: 2.3.35 -Release: 20070530 +Version: 2.3.36 +Release: 20070618 # package options %option with_fsl yes @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 30-May-2007 10:42:31
Branch: HEAD Handle: 2007053009423100
Modified files:
openpkg-src/openldapopenldap.spec
Log:
more ensurance our Berkeley-DB is picked up first
Summary:
RevisionChanges Path
1.188 +2 -2 openpkg-src/openldap/openldap.spec
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/openldap.spec
$ cvs diff -u -r1.187 -r1.188 openldap.spec
--- openpkg-src/openldap/openldap.spec10 Apr 2007 07:01:47 -
1.187
+++ openpkg-src/openldap/openldap.spec30 May 2007 08:42:31 -
1.188
@@ -33,7 +33,7 @@
Group:LDAP
License: GPL
Version: 2.3.35
-Release: 20070410
+Release: 20070530
# package options
%option with_fsl yes
@@ -177,7 +177,7 @@
# configuration: use hard-links and make sure our Berkeley-DB is
picked up first
%{l_shtool} subst \
-e 's;ln -s;ln;g' \
--e 's;-ldb4[234];-ldb;g' \
+-e 's;-ldb4[234];%{l_prefix}/lib/libdb.a;g' \
-e 's;;"db.h";g' \
configure
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 10-Apr-2007 09:01:48 Branch: HEAD Handle: 2007041008014700 Modified files: openpkg-src/openldapopenldap.spec Log: upgrading package: openldap 2.3.34 -> 2.3.35 Summary: RevisionChanges Path 1.187 +2 -2 openpkg-src/openldap/openldap.spec patch -p0 <<'@@ .' Index: openpkg-src/openldap/openldap.spec $ cvs diff -u -r1.186 -r1.187 openldap.spec --- openpkg-src/openldap/openldap.spec17 Feb 2007 08:12:16 - 1.186 +++ openpkg-src/openldap/openldap.spec10 Apr 2007 07:01:47 - 1.187 @@ -32,8 +32,8 @@ Class:BASE Group:LDAP License: GPL -Version: 2.3.34 -Release: 20070217 +Version: 2.3.35 +Release: 20070410 # package options %option with_fsl yes @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 17-Feb-2007 09:12:16 Branch: HEAD Handle: 2007021708121600 Modified files: openpkg-src/openldapopenldap.spec Log: upgrading package: openldap 2.3.33 -> 2.3.34 Summary: RevisionChanges Path 1.186 +2 -2 openpkg-src/openldap/openldap.spec patch -p0 <<'@@ .' Index: openpkg-src/openldap/openldap.spec $ cvs diff -u -r1.185 -r1.186 openldap.spec --- openpkg-src/openldap/openldap.spec17 Jan 2007 17:23:23 - 1.185 +++ openpkg-src/openldap/openldap.spec17 Feb 2007 08:12:16 - 1.186 @@ -32,8 +32,8 @@ Class:BASE Group:LDAP License: GPL -Version: 2.3.33 -Release: 20070117 +Version: 2.3.34 +Release: 20070217 # package options %option with_fsl yes @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Christoph Schug Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 17-Jan-2007 18:23:23 Branch: HEAD Handle: 2007011717232300 Modified files: openpkg-src/openldapopenldap.spec Log: upgrading package: openldap 2.3.32 -> 2.3.33 Summary: RevisionChanges Path 1.185 +2 -2 openpkg-src/openldap/openldap.spec patch -p0 <<'@@ .' Index: openpkg-src/openldap/openldap.spec $ cvs diff -u -r1.184 -r1.185 openldap.spec --- openpkg-src/openldap/openldap.spec14 Jan 2007 18:56:35 - 1.184 +++ openpkg-src/openldap/openldap.spec17 Jan 2007 17:23:23 - 1.185 @@ -32,8 +32,8 @@ Class:BASE Group:LDAP License: GPL -Version: 2.3.32 -Release: 20070114 +Version: 2.3.33 +Release: 20070117 # package options %option with_fsl yes @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 14-Jan-2007 19:56:35
Branch: HEAD Handle: 2007011418563500
Modified files:
openpkg-src/openldapopenldap.spec
Log:
allow iodbc to be used, too
Summary:
RevisionChanges Path
1.184 +3 -3 openpkg-src/openldap/openldap.spec
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/openldap.spec
$ cvs diff -u -r1.183 -r1.184 openldap.spec
--- openpkg-src/openldap/openldap.spec5 Jan 2007 07:50:34 -
1.183
+++ openpkg-src/openldap/openldap.spec14 Jan 2007 18:56:35 -
1.184
@@ -33,7 +33,7 @@
Group:LDAP
License: GPL
Version: 2.3.32
-Release: 20070105
+Release: 20070114
# package options
%option with_fsl yes
@@ -66,8 +66,8 @@
PreReq: sasl
%endif
%if "%{with_odbc}" == "yes"
-BuildPreReq: unixodbc
-PreReq: unixodbc
+BuildPreReq: ODBC
+PreReq: ODBC
%endif
AutoReq: no
AutoReqProv: no
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 05-Jan-2007 08:50:34 Branch: HEAD Handle: 2007010507503400 Modified files: openpkg-src/openldapopenldap.spec Log: upgrading package: openldap 2.3.31 -> 2.3.32 Summary: RevisionChanges Path 1.183 +2 -2 openpkg-src/openldap/openldap.spec patch -p0 <<'@@ .' Index: openpkg-src/openldap/openldap.spec $ cvs diff -u -r1.182 -r1.183 openldap.spec --- openpkg-src/openldap/openldap.spec1 Jan 2007 17:40:17 - 1.182 +++ openpkg-src/openldap/openldap.spec5 Jan 2007 07:50:34 - 1.183 @@ -32,8 +32,8 @@ Class:BASE Group:LDAP License: GPL -Version: 2.3.31 -Release: 20061218 +Version: 2.3.32 +Release: 20070105 # package options %option with_fsl yes @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 18-Dec-2006 08:46:49 Branch: HEAD Handle: 2006121807464800 Modified files: openpkg-src/openldapopenldap.spec Log: upgrading package: openldap 2.3.30 -> 2.3.31 Summary: RevisionChanges Path 1.181 +2 -2 openpkg-src/openldap/openldap.spec patch -p0 <<'@@ .' Index: openpkg-src/openldap/openldap.spec $ cvs diff -u -r1.180 -r1.181 openldap.spec --- openpkg-src/openldap/openldap.spec14 Nov 2006 07:46:59 - 1.180 +++ openpkg-src/openldap/openldap.spec18 Dec 2006 07:46:48 - 1.181 @@ -32,8 +32,8 @@ Class:BASE Group:LDAP License: GPL -Version: 2.3.30 -Release: 20061114 +Version: 2.3.31 +Release: 20061218 # package options %option with_fsl yes @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 14-Nov-2006 08:46:59 Branch: HEAD Handle: 2006111407465900 Modified files: openpkg-src/openldapopenldap.spec Log: upgrading package: openldap 2.3.29 -> 2.3.30 Summary: RevisionChanges Path 1.180 +2 -2 openpkg-src/openldap/openldap.spec patch -p0 <<'@@ .' Index: openpkg-src/openldap/openldap.spec $ cvs diff -u -r1.179 -r1.180 openldap.spec --- openpkg-src/openldap/openldap.spec10 Nov 2006 11:00:35 - 1.179 +++ openpkg-src/openldap/openldap.spec14 Nov 2006 07:46:59 - 1.180 @@ -32,8 +32,8 @@ Class:BASE Group:LDAP License: GPL -Version: 2.3.29 -Release: 20061110 +Version: 2.3.30 +Release: 20061114 # package options %option with_fsl yes @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 10-Nov-2006 12:00:36 Branch: HEAD Handle: 2006111011003500 Modified files: openpkg-src/openldapopenldap.spec Log: upgrading package: openldap 2.3.28 -> 2.3.29 Summary: RevisionChanges Path 1.179 +2 -2 openpkg-src/openldap/openldap.spec patch -p0 <<'@@ .' Index: openpkg-src/openldap/openldap.spec $ cvs diff -u -r1.178 -r1.179 openldap.spec --- openpkg-src/openldap/openldap.spec22 Oct 2006 09:45:26 - 1.178 +++ openpkg-src/openldap/openldap.spec10 Nov 2006 11:00:35 - 1.179 @@ -32,8 +32,8 @@ Class:BASE Group:LDAP License: GPL -Version: 2.3.28 -Release: 20061022 +Version: 2.3.29 +Release: 20061110 # package options %option with_fsl yes @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 22-Oct-2006 11:45:26 Branch: HEAD Handle: 2006102210452600 Modified files: openpkg-src/openldapopenldap.spec Log: upgrading package: openldap 2.3.27 -> 2.3.28 Summary: RevisionChanges Path 1.178 +2 -2 openpkg-src/openldap/openldap.spec patch -p0 <<'@@ .' Index: openpkg-src/openldap/openldap.spec $ cvs diff -u -r1.177 -r1.178 openldap.spec --- openpkg-src/openldap/openldap.spec13 Oct 2006 17:30:53 - 1.177 +++ openpkg-src/openldap/openldap.spec22 Oct 2006 09:45:26 - 1.178 @@ -32,8 +32,8 @@ Class:BASE Group:LDAP License: GPL -Version: 2.3.27 -Release: 20061013 +Version: 2.3.28 +Release: 20061022 # package options %option with_fsl yes @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 12-Oct-2006 20:37:54
Branch: HEAD Handle: 2006101219375400
Modified files:
openpkg-src/openldapopenldap.spec
Log:
fix building under SUSE Linux where a vendor libdb-4* exists
Summary:
RevisionChanges Path
1.176 +7 -1 openpkg-src/openldap/openldap.spec
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/openldap.spec
$ cvs diff -u -r1.175 -r1.176 openldap.spec
--- openpkg-src/openldap/openldap.spec4 Oct 2006 10:23:24 -
1.175
+++ openpkg-src/openldap/openldap.spec12 Oct 2006 18:37:54 -
1.176
@@ -33,7 +33,7 @@
Group:LDAP
License: GPL
Version: 2.3.27
-Release: 20061004
+Release: 20061012
# package options
%option with_fsl yes
@@ -88,6 +88,12 @@
%prep
%setup -q
%patch -p0
+%{l_shtool} subst \
+-e 's;-ldb-4\.[1-9];-ldb;g' \
+-e 's;-ldb-4-[1-9];-ldb;g' \
+-e 's;-ldb-4[1-9];-ldb;g' \
+-e 's;-ldb-4;-ldb;g' \
+configure
%build
# configuration: standard build flags
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 04-Oct-2006 12:23:25 Branch: HEAD Handle: 2006100411232400 Modified files: openpkg-src/openldapopenldap.spec Log: be more consistent across platforms and disable libfetch under FreeBSD Summary: RevisionChanges Path 1.175 +2 -1 openpkg-src/openldap/openldap.spec patch -p0 <<'@@ .' Index: openpkg-src/openldap/openldap.spec $ cvs diff -u -r1.174 -r1.175 openldap.spec --- openpkg-src/openldap/openldap.spec23 Sep 2006 12:08:39 - 1.174 +++ openpkg-src/openldap/openldap.spec4 Oct 2006 10:23:24 - 1.175 @@ -33,7 +33,7 @@ Group:LDAP License: GPL Version: 2.3.27 -Release: 20060923 +Release: 20061004 # package options %option with_fsl yes @@ -103,6 +103,7 @@ ARGS="$ARGS --enable-syslog" ARGS="$ARGS --with-readline" ARGS="$ARGS --with-tls" +ARGS="$ARGS --without-fetch" ARGS="$ARGS --disable-dynamic" ARGS="$ARGS --disable-shared" ARGS="$ARGS --disable-modules" @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 20-Aug-2006 18:45:23 Branch: HEAD Handle: 2006082017452300 Modified files: openpkg-src/openldapopenldap.spec Log: upgrading package: openldap 2.3.26 -> 2.3.27 Summary: RevisionChanges Path 1.172 +2 -2 openpkg-src/openldap/openldap.spec patch -p0 <<'@@ .' Index: openpkg-src/openldap/openldap.spec $ cvs diff -u -r1.171 -r1.172 openldap.spec --- openpkg-src/openldap/openldap.spec18 Aug 2006 16:21:02 - 1.171 +++ openpkg-src/openldap/openldap.spec20 Aug 2006 16:45:23 - 1.172 @@ -32,8 +32,8 @@ Class:BASE Group:Database License: GPL -Version: 2.3.26 -Release: 20060818 +Version: 2.3.27 +Release: 20060820 # package options %option with_fsl yes @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 18-Aug-2006 18:21:03 Branch: HEAD Handle: 2006081817210200 Modified files: openpkg-src/openldapopenldap.spec Log: upgrading package: openldap 2.3.25 -> 2.3.26 Summary: RevisionChanges Path 1.171 +2 -2 openpkg-src/openldap/openldap.spec patch -p0 <<'@@ .' Index: openpkg-src/openldap/openldap.spec $ cvs diff -u -r1.170 -r1.171 openldap.spec --- openpkg-src/openldap/openldap.spec10 Aug 2006 21:10:48 - 1.170 +++ openpkg-src/openldap/openldap.spec18 Aug 2006 16:21:02 - 1.171 @@ -32,8 +32,8 @@ Class:BASE Group:Database License: GPL -Version: 2.3.25 -Release: 20060810 +Version: 2.3.26 +Release: 20060818 # package options %option with_fsl yes @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 10-Aug-2006 23:10:49
Branch: HEAD Handle: 2006081022104800
Modified files:
openpkg-src/openldapopenldap.spec
Log:
instead of a single overlay (dyngroup) allow all overlays to be built
and do this by default, too
Summary:
RevisionChanges Path
1.170 +12 -7 openpkg-src/openldap/openldap.spec
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/openldap.spec
$ cvs diff -u -r1.169 -r1.170 openldap.spec
--- openpkg-src/openldap/openldap.spec4 Aug 2006 07:32:55 -
1.169
+++ openpkg-src/openldap/openldap.spec10 Aug 2006 21:10:48 -
1.170
@@ -33,14 +33,15 @@
Group:Database
License: GPL
Version: 2.3.25
-Release: 20060804
+Release: 20060810
# package options
-%option with_fsl yes
-%option with_crypt yes
-%option with_sasl no
-%option with_perl no
-%option with_odbc no
+%option with_fsl yes
+%option with_cryptyes
+%option with_overlays yes
+%option with_sasl no
+%option with_perl no
+%option with_odbc no
# list of sources
Source0:
ftp://ftp.openldap.org/pub/openldap/openldap-release/openldap-%{version}.tgz
@@ -117,7 +118,6 @@
ARGS="$ARGS --enable-dnssrv"
ARGS="$ARGS --enable-null"
ARGS="$ARGS --enable-shell"
-ARGS="$ARGS --with-dyngroup"
ARGS="$ARGS --with-proxycache"
ARGS="$ARGS --enable-slurpd"
@@ -132,6 +132,11 @@
LIBS="`%{l_prefix}/bin/pth-config --libs` $LIBS"
ARGS="$ARGS --with-threads=pth"
+# configuration: optional overlay support
+%if "%{with_overlays}" == "yes"
+ARGS="$ARGS --enable-overlays=yes"
+%endif
+
# configuration: optional SASL support
%if "%{with_sasl}" == "yes"
( echo "ac_cv_lib_sasl2_sasl_client_init=yes"
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 04-Aug-2006 09:32:58
Branch: HEAD Handle: 2006080408325500
Modified files:
openpkg-src/openldapopenldap.spec
Log:
workaround conflicts between OpenLDAP avl.h and the Solaris 10 avl.h
-- occurring at least under newer Solaris 10 06/06
Summary:
RevisionChanges Path
1.169 +2 -2 openpkg-src/openldap/openldap.spec
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/openldap.spec
$ cvs diff -u -r1.168 -r1.169 openldap.spec
--- openpkg-src/openldap/openldap.spec1 Aug 2006 18:57:27 -
1.168
+++ openpkg-src/openldap/openldap.spec4 Aug 2006 07:32:55 -
1.169
@@ -33,7 +33,7 @@
Group:Database
License: GPL
Version: 2.3.25
-Release: 20060801
+Release: 20060804
# package options
%option with_fsl yes
@@ -159,7 +159,7 @@
# configuration: special platform support
case "%{l_platform -t}" in
-*-sunos* ) LIBS="$LIBS -lrt" ;;
+*-sunos* ) CFLAGS="$CFLAGS -D_AVL_H"; LIBS="$LIBS -lrt" ;;
esac
# configuration: use hard-links and make sure our Berkeley-DB is
picked up first
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 01-Aug-2006 20:57:27 Branch: HEAD Handle: 2006080119572700 Modified files: openpkg-src/openldapopenldap.spec Log: upgrading package: openldap 2.3.24 -> 2.3.25 Summary: RevisionChanges Path 1.168 +2 -2 openpkg-src/openldap/openldap.spec patch -p0 <<'@@ .' Index: openpkg-src/openldap/openldap.spec $ cvs diff -u -r1.167 -r1.168 openldap.spec --- openpkg-src/openldap/openldap.spec30 May 2006 13:13:35 - 1.167 +++ openpkg-src/openldap/openldap.spec1 Aug 2006 18:57:27 - 1.168 @@ -32,8 +32,8 @@ Class:BASE Group:Database License: GPL -Version: 2.3.24 -Release: 20060530 +Version: 2.3.25 +Release: 20060801 # package options %option with_fsl yes @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 30-May-2006 15:13:35 Branch: HEAD Handle: 2006053014133500 Modified files: openpkg-src/openldapopenldap.spec Log: upgrading package: openldap 2.3.23 -> 2.3.24 Summary: RevisionChanges Path 1.167 +2 -2 openpkg-src/openldap/openldap.spec patch -p0 <<'@@ .' Index: openpkg-src/openldap/openldap.spec $ cvs diff -u -r1.166 -r1.167 openldap.spec --- openpkg-src/openldap/openldap.spec18 May 2006 07:13:58 - 1.166 +++ openpkg-src/openldap/openldap.spec30 May 2006 13:13:35 - 1.167 @@ -32,8 +32,8 @@ Class:BASE Group:Database License: GPL -Version: 2.3.23 -Release: 20060518 +Version: 2.3.24 +Release: 20060530 # package options %option with_fsl yes @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 18-May-2006 09:13:58 Branch: HEAD Handle: 2006051808135800 Modified files: openpkg-src/openldapopenldap.spec Log: upgrading package: openldap 2.3.22 -> 2.3.23 Summary: RevisionChanges Path 1.166 +2 -2 openpkg-src/openldap/openldap.spec patch -p0 <<'@@ .' Index: openpkg-src/openldap/openldap.spec $ cvs diff -u -r1.165 -r1.166 openldap.spec --- openpkg-src/openldap/openldap.spec17 May 2006 06:49:14 - 1.165 +++ openpkg-src/openldap/openldap.spec18 May 2006 07:13:58 - 1.166 @@ -32,8 +32,8 @@ Class:BASE Group:Database License: GPL -Version: 2.3.22 -Release: 20060517 +Version: 2.3.23 +Release: 20060518 # package options %option with_fsl yes @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 17-May-2006 08:49:14 Branch: HEAD Handle: 2006051707491400 Modified files: openpkg-src/openldapopenldap.spec Log: upgrading package: openldap 2.3.21 -> 2.3.22 Summary: RevisionChanges Path 1.165 +2 -2 openpkg-src/openldap/openldap.spec patch -p0 <<'@@ .' Index: openpkg-src/openldap/openldap.spec $ cvs diff -u -r1.164 -r1.165 openldap.spec --- openpkg-src/openldap/openldap.spec10 May 2006 06:55:54 - 1.164 +++ openpkg-src/openldap/openldap.spec17 May 2006 06:49:14 - 1.165 @@ -32,8 +32,8 @@ Class:BASE Group:Database License: GPL -Version: 2.3.21 -Release: 20060510 +Version: 2.3.22 +Release: 20060517 # package options %option with_fsl yes @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 10-May-2006 08:55:54
Branch: HEAD Handle: 2006051007555400
Modified files:
openpkg-src/openldapopenldap.spec
Log:
as long as the schema/ldif files are located under etc/ it is
reasonable to flag them as %config although they are not really
intended for editing
Summary:
RevisionChanges Path
1.164 +4 -2 openpkg-src/openldap/openldap.spec
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/openldap.spec
$ cvs diff -u -r1.163 -r1.164 openldap.spec
--- openpkg-src/openldap/openldap.spec9 Apr 2006 20:02:58 -
1.163
+++ openpkg-src/openldap/openldap.spec10 May 2006 06:55:54 -
1.164
@@ -33,7 +33,7 @@
Group:Database
License: GPL
Version: 2.3.21
-Release: 20060409
+Release: 20060510
# package options
%option with_fsl yes
@@ -228,7 +228,9 @@
'%not %dir %{l_prefix}/etc/fsl' \
'%not %dir %{l_prefix}/lib/pkgconfig' \
'%config %{l_prefix}/etc/fsl/fsl.openldap' \
-'%config %{l_prefix}/etc/openldap/*.conf'
+'%config %{l_prefix}/etc/openldap/*.conf' \
+'%config %{l_prefix}/etc/openldap/schema/*.schema' \
+'%config %{l_prefix}/etc/openldap/schema/*.ldif'
%files -f files
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 09-Apr-2006 22:02:58 Branch: HEAD Handle: 2006040921025800 Modified files: openpkg-src/openldapopenldap.spec Log: upgrading package: openldap 2.3.20 -> 2.3.21 Summary: RevisionChanges Path 1.163 +2 -2 openpkg-src/openldap/openldap.spec patch -p0 <<'@@ .' Index: openpkg-src/openldap/openldap.spec $ cvs diff -u -r1.162 -r1.163 openldap.spec --- openpkg-src/openldap/openldap.spec20 Mar 2006 18:28:01 - 1.162 +++ openpkg-src/openldap/openldap.spec9 Apr 2006 20:02:58 - 1.163 @@ -32,8 +32,8 @@ Class:BASE Group:Database License: GPL -Version: 2.3.20 -Release: 20060320 +Version: 2.3.21 +Release: 20060409 # package options %option with_fsl yes @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec rc.openldap
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 20-Mar-2006 19:28:01 Branch: HEAD Handle: 2006032018280100 Modified files: openpkg-src/openldapopenldap.spec rc.openldap Log: check for daemon error conditions Summary: RevisionChanges Path 1.162 +1 -1 openpkg-src/openldap/openldap.spec 1.25+2 -2 openpkg-src/openldap/rc.openldap patch -p0 <<'@@ .' Index: openpkg-src/openldap/openldap.spec $ cvs diff -u -r1.161 -r1.162 openldap.spec --- openpkg-src/openldap/openldap.spec19 Feb 2006 07:24:31 - 1.161 +++ openpkg-src/openldap/openldap.spec20 Mar 2006 18:28:01 - 1.162 @@ -33,7 +33,7 @@ Group:Database License: GPL Version: 2.3.20 -Release: 20060219 +Release: 20060320 # package options %option with_fsl yes @@ . patch -p0 <<'@@ .' Index: openpkg-src/openldap/rc.openldap $ cvs diff -u -r1.24 -r1.25 rc.openldap --- openpkg-src/openldap/rc.openldap 7 Dec 2004 19:57:36 - 1.24 +++ openpkg-src/openldap/rc.openldap 20 Mar 2006 18:28:01 - 1.25 @@ -48,12 +48,12 @@ if [ $? -ne 0 -a ".$openldap_url" != . ]; then flags="$flags -h \"$openldap_url\"" fi -eval @l_prefix@/libexec/openldap/slapd $flags +eval @l_prefix@/libexec/openldap/slapd $flags || exit $? fi openldap_slurpd_needed || exit 0 openldap_slurpd_signal 0 if [ $? -ne 0 ]; then -@l_prefix@/libexec/openldap/slurpd +@l_prefix@/libexec/openldap/slurpd || exit $? fi %stop -p 700 -u @l_susr@ @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 19-Feb-2006 08:24:32 Branch: HEAD Handle: 2006021907243100 Modified files: openpkg-src/openldapopenldap.spec Log: upgrading package: openldap 2.3.19 -> 2.3.20 Summary: RevisionChanges Path 1.161 +2 -2 openpkg-src/openldap/openldap.spec patch -p0 <<'@@ .' Index: openpkg-src/openldap/openldap.spec $ cvs diff -u -r1.160 -r1.161 openldap.spec --- openpkg-src/openldap/openldap.spec26 Jan 2006 07:41:28 - 1.160 +++ openpkg-src/openldap/openldap.spec19 Feb 2006 07:24:31 - 1.161 @@ -32,8 +32,8 @@ Class:BASE Group:Database License: GPL -Version: 2.3.19 -Release: 20060126 +Version: 2.3.20 +Release: 20060219 # package options %option with_fsl yes @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 26-Jan-2006 08:41:28 Branch: HEAD Handle: 2006012607412800 Modified files: openpkg-src/openldapopenldap.spec Log: upgrading package: openldap 2.3.18 -> 2.3.19 Summary: RevisionChanges Path 1.160 +2 -2 openpkg-src/openldap/openldap.spec patch -p0 <<'@@ .' Index: openpkg-src/openldap/openldap.spec $ cvs diff -u -r1.159 -r1.160 openldap.spec --- openpkg-src/openldap/openldap.spec18 Jan 2006 07:28:12 - 1.159 +++ openpkg-src/openldap/openldap.spec26 Jan 2006 07:41:28 - 1.160 @@ -32,8 +32,8 @@ Class:BASE Group:Database License: GPL -Version: 2.3.18 -Release: 20060118 +Version: 2.3.19 +Release: 20060126 # package options %option with_fsl yes @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 18-Jan-2006 08:28:12 Branch: HEAD Handle: 2006011807281200 Modified files: openpkg-src/openldapopenldap.spec Log: upgrading package: openldap 2.3.17 -> 2.3.18 Summary: RevisionChanges Path 1.159 +2 -2 openpkg-src/openldap/openldap.spec patch -p0 <<'@@ .' Index: openpkg-src/openldap/openldap.spec $ cvs diff -u -r1.158 -r1.159 openldap.spec --- openpkg-src/openldap/openldap.spec11 Jan 2006 15:25:59 - 1.158 +++ openpkg-src/openldap/openldap.spec18 Jan 2006 07:28:12 - 1.159 @@ -32,8 +32,8 @@ Class:BASE Group:Database License: GPL -Version: 2.3.17 -Release: 20060111 +Version: 2.3.18 +Release: 20060118 # package options %option with_fsl yes @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 11-Jan-2006 16:26:00 Branch: HEAD Handle: 200605255900 Modified files: openpkg-src/openldapopenldap.spec Log: upgrading package: openldap 2.3.16 -> 2.3.17 Summary: RevisionChanges Path 1.158 +2 -2 openpkg-src/openldap/openldap.spec patch -p0 <<'@@ .' Index: openpkg-src/openldap/openldap.spec $ cvs diff -u -r1.157 -r1.158 openldap.spec --- openpkg-src/openldap/openldap.spec9 Jan 2006 20:07:07 - 1.157 +++ openpkg-src/openldap/openldap.spec11 Jan 2006 15:25:59 - 1.158 @@ -32,8 +32,8 @@ Class:BASE Group:Database License: GPL -Version: 2.3.16 -Release: 20060109 +Version: 2.3.17 +Release: 20060111 # package options %option with_fsl yes @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 09-Jan-2006 21:07:07 Branch: HEAD Handle: 2006010920070700 Modified files: openpkg-src/openldapopenldap.spec Log: upgrading package: openldap 2.3.15 -> 2.3.16 Summary: RevisionChanges Path 1.157 +2 -2 openpkg-src/openldap/openldap.spec patch -p0 <<'@@ .' Index: openpkg-src/openldap/openldap.spec $ cvs diff -u -r1.156 -r1.157 openldap.spec --- openpkg-src/openldap/openldap.spec5 Jan 2006 19:05:03 - 1.156 +++ openpkg-src/openldap/openldap.spec9 Jan 2006 20:07:07 - 1.157 @@ -32,8 +32,8 @@ Class:BASE Group:Database License: GPL -Version: 2.3.15 -Release: 20060105 +Version: 2.3.16 +Release: 20060109 # package options %option with_fsl yes @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 05-Jan-2006 20:05:04 Branch: HEAD Handle: 2006010519050300 Modified files: openpkg-src/openldapopenldap.spec Log: upgrading package: openldap 2.3.14 -> 2.3.15 Summary: RevisionChanges Path 1.156 +2 -2 openpkg-src/openldap/openldap.spec patch -p0 <<'@@ .' Index: openpkg-src/openldap/openldap.spec $ cvs diff -u -r1.155 -r1.156 openldap.spec --- openpkg-src/openldap/openldap.spec1 Jan 2006 13:17:45 - 1.155 +++ openpkg-src/openldap/openldap.spec5 Jan 2006 19:05:03 - 1.156 @@ -32,8 +32,8 @@ Class:BASE Group:Database License: GPL -Version: 2.3.14 -Release: 20051226 +Version: 2.3.15 +Release: 20060105 # package options %option with_fsl yes @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 26-Dec-2005 00:02:01
Branch: HEAD Handle: 2005122523015800
Modified files:
openpkg-src/openldapopenldap.spec
Log:
provide optional ODBC-based RDBMS support
Summary:
RevisionChanges Path
1.154 +11 -1 openpkg-src/openldap/openldap.spec
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/openldap.spec
$ cvs diff -u -r1.153 -r1.154 openldap.spec
--- openpkg-src/openldap/openldap.spec25 Dec 2005 22:41:24 -
1.153
+++ openpkg-src/openldap/openldap.spec25 Dec 2005 23:01:58 -
1.154
@@ -33,13 +33,14 @@
Group:Database
License: GPL
Version: 2.3.14
-Release: 20051225
+Release: 20051226
# package options
%option with_fsl yes
%option with_crypt yes
%option with_sasl no
%option with_perl no
+%option with_odbc no
# list of sources
Source0:
ftp://ftp.openldap.org/pub/openldap/openldap-release/openldap-%{version}.tgz
@@ -63,6 +64,10 @@
BuildPreReq: sasl
PreReq: sasl
%endif
+%if "%{with_odbc}" == "yes"
+BuildPreReq: unixodbc
+PreReq: unixodbc
+%endif
AutoReq: no
AutoReqProv: no
@@ -147,6 +152,11 @@
ARGS="$ARGS --enable-perl"
%endif
+# configuration: optional ODBC-based RDBMS support
+%if "%{with_odbc}" == "yes"
+ARGS="$ARGS --enable-sql"
+%endif
+
# configuration: special platform support
case "%{l_platform -t}" in
*-sunos* ) LIBS="$LIBS -lrt" ;;
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 25-Dec-2005 23:41:24
Branch: HEAD Handle: 2005122522412400
Modified files:
openpkg-src/openldapopenldap.spec
Log:
make build procedure more modular and cleanup some parts of the
packaging
Summary:
RevisionChanges Path
1.153 +71 -64 openpkg-src/openldap/openldap.spec
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/openldap.spec
$ cvs diff -u -r1.152 -r1.153 openldap.spec
--- openpkg-src/openldap/openldap.spec24 Dec 2005 08:38:09 -
1.152
+++ openpkg-src/openldap/openldap.spec25 Dec 2005 22:41:24 -
1.153
@@ -33,7 +33,7 @@
Group:Database
License: GPL
Version: 2.3.14
-Release: 20051224
+Release: 20051225
# package options
%option with_fsl yes
@@ -84,74 +84,83 @@
%patch -p0
%build
-# 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;-ldb42;-ldb;g' \
--e 's;-ldb43;-ldb;g' \
--e 's;;"db.h";g' \
-configure
+# configuration: standard build flags
+export CC="%{l_cc}"
+export CFLAGS="%{l_cflags -O}"
+export CPPFLAGS="%{l_cppflags}"
+export LDFLAGS="%{l_ldflags}"
+export LIBS=""
+export ARGS=""
+ARGS="$ARGS --prefix=%{l_prefix}"
+ARGS="$ARGS --libexecdir=%{l_prefix}/libexec/openldap"
+ARGS="$ARGS --localstatedir=%{l_prefix}/var/openldap"
+ARGS="$ARGS --enable-syslog"
+ARGS="$ARGS --with-readline"
+ARGS="$ARGS --with-tls"
+ARGS="$ARGS --disable-dynamic"
+ARGS="$ARGS --disable-shared"
+ARGS="$ARGS --disable-modules"
+ARGS="$ARGS --enable-ldbm"
+ARGS="$ARGS --enable-ldbm-api=berkeley"
+ARGS="$ARGS --enable-ldbm-type=btree"
+ARGS="$ARGS --enable-bdb"
+ARGS="$ARGS --enable-rewrite"
+ARGS="$ARGS --enable-hdb"
+ARGS="$ARGS --enable-ldap"
+ARGS="$ARGS --enable-meta"
+ARGS="$ARGS --enable-monitor"
+ARGS="$ARGS --enable-dnssrv"
+ARGS="$ARGS --enable-null"
+ARGS="$ARGS --enable-shell"
+ARGS="$ARGS --with-dyngroup"
+ARGS="$ARGS --with-proxycache"
+ARGS="$ARGS --enable-slurpd"
+
+# configuration: force to use OSSP fsl
+LDFLAGS="$LDFLAGS %{l_fsl_ldflags}"
+LIBS="$LIBS %{l_fsl_libs}"
+
+# configuration: force to use GNU pth
+CFLAGS="$CFLAGS `%{l_prefix}/bin/pth-config --cflags`"
+CPPFLAGS="$CPPFLAGS -I`%{l_prefix}/bin/pth-config --includedir`"
+LDFLAGS="$LDFLAGS `%{l_prefix}/bin/pth-config --ldflags`"
+LIBS="`%{l_prefix}/bin/pth-config --libs` $LIBS"
+ARGS="$ARGS --with-threads=pth"
+
+# configuration: optional SASL support
%if "%{with_sasl}" == "yes"
-# hard-code use of SASL2 library
( echo "ac_cv_lib_sasl2_sasl_client_init=yes"
) >config.cache
-cf="%{l_cppflags sasl}"
-%else
-cf="%{l_cppflags}"
-%endif
-LOCLIBS=""
-case "%{l_platform -t}" in
-*-sunos* )
-LOCLIBS="-lrt"
-;;
-esac
-CC="%{l_cc}" \
-CFLAGS="%{l_cflags -O} `%{l_prefix}/bin/pth-config --cflags`" \
-CPPFLAGS="$cf -I`%{l_prefix}/bin/pth-config --includedir`" \
-LDFLAGS="%{l_ldflags} `%{l_prefix}/bin/pth-config --ldflags`
%{l_fsl_ldflags}" \
-LIBS="`%{l_prefix}/bin/pth-config --libs` %{l_fsl_libs} $LOCLIBS" \
-./configure \
---cache-file=./config.cache \
---prefix=%{l_prefix} \
---libexecdir=%{l_prefix}/libexec/openldap \
---localstatedir=%{l_prefix}/var/openldap \
---enable-syslog \
---with-readline \
---with-tls \
-%if "%{with_sasl}" == "yes"
---with-cyrus-sasl \
---enable-spasswd \
+CPPFLAGS="%{l_cppflags sasl} $CPPFLAGS"
+ARGS="$ARGS --with-cyrus-sasl --enable-spasswd"
%else
---without-cyrus-sasl \
---disable-spasswd \
+ARGS="$ARGS --without-cyrus-sasl --disable-spasswd"
%endif
+
+# configuration: optional crypt(3) support
%if "%{with_crypt}" == "yes"
---enable-crypt \
+ARGS="$ARGS --enable-crypt"
%endif
---disable-dynamic \
---disable-shared \
---disable-modules \
---enable-rewrite \
---enable-ldbm \
---enable-ldbm-api=b
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 24-Dec-2005 09:38:09 Branch: HEAD Handle: 2005122408380900 Modified files: openpkg-src/openldapopenldap.spec Log: upgrading package: openldap 2.3.13 -> 2.3.14 Summary: RevisionChanges Path 1.152 +2 -2 openpkg-src/openldap/openldap.spec patch -p0 <<'@@ .' Index: openpkg-src/openldap/openldap.spec $ cvs diff -u -r1.151 -r1.152 openldap.spec --- openpkg-src/openldap/openldap.spec20 Dec 2005 08:05:25 - 1.151 +++ openpkg-src/openldap/openldap.spec24 Dec 2005 08:38:09 - 1.152 @@ -32,8 +32,8 @@ Class:BASE Group:Database License: GPL -Version: 2.3.13 -Release: 20051220 +Version: 2.3.14 +Release: 20051224 # package options %option with_fsl yes @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 20-Dec-2005 09:05:25
Branch: HEAD Handle: 2005122008052500
Modified files:
openpkg-src/openldapopenldap.spec
Log:
adjust build flags to latest OpenLDAP autoconf environment
Summary:
RevisionChanges Path
1.151 +3 -13 openpkg-src/openldap/openldap.spec
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/openldap.spec
$ cvs diff -u -r1.150 -r1.151 openldap.spec
--- openpkg-src/openldap/openldap.spec30 Nov 2005 20:25:25 -
1.150
+++ openpkg-src/openldap/openldap.spec20 Dec 2005 08:05:25 -
1.151
@@ -33,7 +33,7 @@
Group:Database
License: GPL
Version: 2.3.13
-Release: 20051130
+Release: 20051220
# package options
%option with_fsl yes
@@ -135,28 +135,18 @@
--disable-modules \
--enable-rewrite \
--enable-ldbm \
---with-ldbm-module=static \
---with-ldbm-api=berkeley \
---with-ldbm-type=btree \
+--enable-ldbm-api=berkeley \
+--enable-ldbm-type=btree \
--enable-bdb \
---with-bdb-module=static \
--enable-hdb \
---with-hdb-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
--with-dyngroup \
--with-proxycache \
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 30-Nov-2005 21:25:25 Branch: HEAD Handle: 2005113020252500 Modified files: openpkg-src/openldapopenldap.spec Log: upgrading package: openldap 2.3.12 -> 2.3.13 Summary: RevisionChanges Path 1.150 +2 -2 openpkg-src/openldap/openldap.spec patch -p0 <<'@@ .' Index: openpkg-src/openldap/openldap.spec $ cvs diff -u -r1.149 -r1.150 openldap.spec --- openpkg-src/openldap/openldap.spec19 Nov 2005 08:40:40 - 1.149 +++ openpkg-src/openldap/openldap.spec30 Nov 2005 20:25:25 - 1.150 @@ -32,8 +32,8 @@ Class:BASE Group:Database License: GPL -Version: 2.3.12 -Release: 20051119 +Version: 2.3.13 +Release: 20051130 # package options %option with_fsl yes @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 19-Nov-2005 09:40:41 Branch: HEAD Handle: 2005111908404000 Modified files: openpkg-src/openldapopenldap.spec Log: upgrading package: openldap 2.3.11 -> 2.3.12 Summary: RevisionChanges Path 1.149 +2 -2 openpkg-src/openldap/openldap.spec patch -p0 <<'@@ .' Index: openpkg-src/openldap/openldap.spec $ cvs diff -u -r1.148 -r1.149 openldap.spec --- openpkg-src/openldap/openldap.spec13 Oct 2005 06:22:40 - 1.148 +++ openpkg-src/openldap/openldap.spec19 Nov 2005 08:40:40 - 1.149 @@ -32,8 +32,8 @@ Class:BASE Group:Database License: GPL -Version: 2.3.11 -Release: 20051013 +Version: 2.3.12 +Release: 20051119 # package options %option with_fsl yes @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 13-Oct-2005 08:22:40 Branch: HEAD Handle: 2005101307224000 Modified files: openpkg-src/openldapopenldap.spec Log: upgrading package: openldap 2.3.10 -> 2.3.11 Summary: RevisionChanges Path 1.148 +2 -2 openpkg-src/openldap/openldap.spec patch -p0 <<'@@ .' Index: openpkg-src/openldap/openldap.spec $ cvs diff -u -r1.147 -r1.148 openldap.spec --- openpkg-src/openldap/openldap.spec11 Oct 2005 06:32:39 - 1.147 +++ openpkg-src/openldap/openldap.spec13 Oct 2005 06:22:40 - 1.148 @@ -32,8 +32,8 @@ Class:BASE Group:Database License: GPL -Version: 2.3.10 -Release: 20051011 +Version: 2.3.11 +Release: 20051013 # package options %option with_fsl yes @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 11-Oct-2005 08:32:39 Branch: HEAD Handle: 2005101107323900 Modified files: openpkg-src/openldapopenldap.spec Log: upgrading package: openldap 2.3.9 -> 2.3.10 Summary: RevisionChanges Path 1.147 +2 -2 openpkg-src/openldap/openldap.spec patch -p0 <<'@@ .' Index: openpkg-src/openldap/openldap.spec $ cvs diff -u -r1.146 -r1.147 openldap.spec --- openpkg-src/openldap/openldap.spec8 Oct 2005 07:28:18 - 1.146 +++ openpkg-src/openldap/openldap.spec11 Oct 2005 06:32:39 - 1.147 @@ -32,8 +32,8 @@ Class:BASE Group:Database License: GPL -Version: 2.3.9 -Release: 20051008 +Version: 2.3.10 +Release: 20051011 # package options %option with_fsl yes @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 08-Oct-2005 09:28:18 Branch: HEAD Handle: 2005100808281800 Modified files: openpkg-src/openldapopenldap.spec Log: upgrading package: openldap 2.3.8 -> 2.3.9 Summary: RevisionChanges Path 1.146 +2 -2 openpkg-src/openldap/openldap.spec patch -p0 <<'@@ .' Index: openpkg-src/openldap/openldap.spec $ cvs diff -u -r1.145 -r1.146 openldap.spec --- openpkg-src/openldap/openldap.spec7 Oct 2005 08:16:47 - 1.145 +++ openpkg-src/openldap/openldap.spec8 Oct 2005 07:28:18 - 1.146 @@ -32,8 +32,8 @@ Class:BASE Group:Database License: GPL -Version: 2.3.8 -Release: 20051007 +Version: 2.3.9 +Release: 20051008 # package options %option with_fsl yes @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 06-Oct-2005 08:40:19 Branch: HEAD Handle: 2005100607401900 Modified files: openpkg-src/openldapopenldap.spec Log: upgrading package: openldap 2.3.7 -> 2.3.8 Summary: RevisionChanges Path 1.144 +2 -2 openpkg-src/openldap/openldap.spec patch -p0 <<'@@ .' Index: openpkg-src/openldap/openldap.spec $ cvs diff -u -r1.143 -r1.144 openldap.spec --- openpkg-src/openldap/openldap.spec4 Oct 2005 20:14:28 - 1.143 +++ openpkg-src/openldap/openldap.spec6 Oct 2005 06:40:19 - 1.144 @@ -32,8 +32,8 @@ Class:BASE Group:Database License: GPL -Version: 2.3.7 -Release: 20051004 +Version: 2.3.8 +Release: 20051006 # package options %option with_fsl yes @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 04-Oct-2005 22:14:28
Branch: HEAD Handle: 2005100421142800
Modified files:
openpkg-src/openldapopenldap.spec
Log:
remove obsolete security fix
Summary:
RevisionChanges Path
1.143 +1 -2 openpkg-src/openldap/openldap.spec
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/openldap.spec
$ cvs diff -u -r1.142 -r1.143 openldap.spec
--- openpkg-src/openldap/openldap.spec2 Sep 2005 07:06:23 -
1.142
+++ openpkg-src/openldap/openldap.spec4 Oct 2005 20:14:28 -
1.143
@@ -33,7 +33,7 @@
Group:Database
License: GPL
Version: 2.3.7
-Release: 20050902
+Release: 20051004
# package options
%option with_fsl yes
@@ -82,7 +82,6 @@
%prep
%setup -q
%patch -p0
-cp %{l_shtool} ./build/shtool
%build
# configure toolkit
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 02-Sep-2005 09:06:25 Branch: HEAD Handle: 2005090208062300 Modified files: openpkg-src/openldapopenldap.spec Log: upgrading package: openldap 2.3.6 -> 2.3.7 Summary: RevisionChanges Path 1.142 +2 -2 openpkg-src/openldap/openldap.spec patch -p0 <<'@@ .' Index: openpkg-src/openldap/openldap.spec $ cvs diff -u -r1.141 -r1.142 openldap.spec --- openpkg-src/openldap/openldap.spec20 Aug 2005 06:49:41 - 1.141 +++ openpkg-src/openldap/openldap.spec2 Sep 2005 07:06:23 - 1.142 @@ -32,8 +32,8 @@ Class:BASE Group:Database License: GPL -Version: 2.3.6 -Release: 20050820 +Version: 2.3.7 +Release: 20050902 # package options %option with_fsl yes @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 20-Aug-2005 08:49:42 Branch: HEAD Handle: 2005082007494100 Modified files: openpkg-src/openldapopenldap.spec Log: upgrading package: openldap 2.3.5 -> 2.3.6 Summary: RevisionChanges Path 1.141 +2 -2 openpkg-src/openldap/openldap.spec patch -p0 <<'@@ .' Index: openpkg-src/openldap/openldap.spec $ cvs diff -u -r1.140 -r1.141 openldap.spec --- openpkg-src/openldap/openldap.spec14 Aug 2005 07:35:27 - 1.140 +++ openpkg-src/openldap/openldap.spec20 Aug 2005 06:49:41 - 1.141 @@ -32,8 +32,8 @@ Class:BASE Group:Database License: GPL -Version: 2.3.5 -Release: 20050814 +Version: 2.3.6 +Release: 20050820 # package options %option with_fsl yes @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 14-Aug-2005 09:35:28 Branch: HEAD Handle: 2005081408352700 Modified files: openpkg-src/openldapopenldap.spec Log: upgrading package: openldap 2.3.4 -> 2.3.5 Summary: RevisionChanges Path 1.140 +2 -2 openpkg-src/openldap/openldap.spec patch -p0 <<'@@ .' Index: openpkg-src/openldap/openldap.spec $ cvs diff -u -r1.139 -r1.140 openldap.spec --- openpkg-src/openldap/openldap.spec25 Jun 2005 11:02:04 - 1.139 +++ openpkg-src/openldap/openldap.spec14 Aug 2005 07:35:27 - 1.140 @@ -32,8 +32,8 @@ Class:BASE Group:Database License: GPL -Version: 2.3.4 -Release: 20050625 +Version: 2.3.5 +Release: 20050814 # package options %option with_fsl yes @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 11-Jun-2005 09:52:38 Branch: HEAD Handle: 2005061108523800 Modified files: openpkg-src/openldapopenldap.spec Log: upgrading package: openldap 2.2.26 -> 2.2.27 Summary: RevisionChanges Path 1.137 +2 -2 openpkg-src/openldap/openldap.spec patch -p0 <<'@@ .' Index: openpkg-src/openldap/openldap.spec $ cvs diff -u -r1.136 -r1.137 openldap.spec --- openpkg-src/openldap/openldap.spec26 May 2005 20:06:18 - 1.136 +++ openpkg-src/openldap/openldap.spec11 Jun 2005 07:52:38 - 1.137 @@ -32,8 +32,8 @@ Class:BASE Group:Database License: GPL -Version: 2.2.26 -Release: 20050526 +Version: 2.2.27 +Release: 20050611 # package options %option with_fsl yes @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 26-May-2005 22:06:18
Branch: HEAD Handle: 2005052621061800
Modified files:
openpkg-src/openldapopenldap.spec
Log:
DB 4.3 already exists, so disable the check for it, too
Summary:
RevisionChanges Path
1.136 +2 -1 openpkg-src/openldap/openldap.spec
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/openldap.spec
$ cvs diff -u -r1.135 -r1.136 openldap.spec
--- openpkg-src/openldap/openldap.spec28 Apr 2005 09:59:08 -
1.135
+++ openpkg-src/openldap/openldap.spec26 May 2005 20:06:18 -
1.136
@@ -33,7 +33,7 @@
Group:Database
License: GPL
Version: 2.2.26
-Release: 20050428
+Release: 20050526
# package options
%option with_fsl yes
@@ -90,6 +90,7 @@
%{l_shtool} subst \
-e 's;ln -s;ln;g' \
-e 's;-ldb42;-ldb;g' \
+-e 's;-ldb43;-ldb;g' \
-e 's;;"db.h";g' \
configure
%if "%{with_sasl}" == "yes"
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Torsten Homeyer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 28-Apr-2005 11:59:08 Branch: HEAD Handle: 2005042810590800 Modified files: openpkg-src/openldapopenldap.spec Log: upgrading package: openldap 2.2.25 -> 2.2.26 Summary: RevisionChanges Path 1.135 +2 -2 openpkg-src/openldap/openldap.spec patch -p0 <<'@@ .' Index: openpkg-src/openldap/openldap.spec $ cvs diff -u -r1.134 -r1.135 openldap.spec --- openpkg-src/openldap/openldap.spec22 Apr 2005 19:55:22 - 1.134 +++ openpkg-src/openldap/openldap.spec28 Apr 2005 09:59:08 - 1.135 @@ -32,8 +32,8 @@ Class:BASE Group:Database License: GPL -Version: 2.2.25 -Release: 20050422 +Version: 2.2.26 +Release: 20050428 # package options %option with_fsl yes @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 22-Apr-2005 21:55:22 Branch: HEAD Handle: 2005042220552200 Modified files: openpkg-src/openldapopenldap.spec Log: upgrading package: openldap 2.2.24 -> 2.2.25 Summary: RevisionChanges Path 1.134 +2 -2 openpkg-src/openldap/openldap.spec patch -p0 <<'@@ .' Index: openpkg-src/openldap/openldap.spec $ cvs diff -u -r1.133 -r1.134 openldap.spec --- openpkg-src/openldap/openldap.spec24 Mar 2005 11:19:43 - 1.133 +++ openpkg-src/openldap/openldap.spec22 Apr 2005 19:55:22 - 1.134 @@ -32,8 +32,8 @@ Class:BASE Group:Database License: GPL -Version: 2.2.24 -Release: 20050316 +Version: 2.2.25 +Release: 20050422 # package options %option with_fsl yes @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 16-Mar-2005 10:27:17 Branch: HEAD Handle: 2005031609271700 Modified files: openpkg-src/openldapopenldap.spec Log: upgrading package: openldap 2.2.23 -> 2.2.24 Summary: RevisionChanges Path 1.132 +2 -2 openpkg-src/openldap/openldap.spec patch -p0 <<'@@ .' Index: openpkg-src/openldap/openldap.spec $ cvs diff -u -r1.131 -r1.132 openldap.spec --- openpkg-src/openldap/openldap.spec25 Jan 2005 08:52:07 - 1.131 +++ openpkg-src/openldap/openldap.spec16 Mar 2005 09:27:17 - 1.132 @@ -33,8 +33,8 @@ Class:BASE Group:Database License: GPL -Version: 2.2.23 -Release: 20050125 +Version: 2.2.24 +Release: 20050316 # package options %option with_fsl yes @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Herbert Schmid Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 25-Jan-2005 09:52:07 Branch: HEAD Handle: 2005012508520700 Modified files: openpkg-src/openldapopenldap.spec Log: upgrade package: openldap 2.2.22 -> 2.2.23 Summary: RevisionChanges Path 1.131 +2 -2 openpkg-src/openldap/openldap.spec patch -p0 <<'@@ .' Index: openpkg-src/openldap/openldap.spec $ cvs diff -u -r1.130 -r1.131 openldap.spec --- openpkg-src/openldap/openldap.spec24 Jan 2005 17:47:32 - 1.130 +++ openpkg-src/openldap/openldap.spec25 Jan 2005 08:52:07 - 1.131 @@ -33,8 +33,8 @@ Class:BASE Group:Database License: GPL -Version: 2.2.22 -Release: 20050124 +Version: 2.2.23 +Release: 20050125 # package options %option with_fsl yes @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.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: 24-Jan-2005 18:47:33
Branch: HEAD Handle: 2005012417473200
Modified files:
openpkg-src/openldapopenldap.spec
Log:
fdatasync(3) is in librt on Solaris platforms, so don't mistakenly
look in libc
Summary:
RevisionChanges Path
1.130 +8 -2 openpkg-src/openldap/openldap.spec
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/openldap.spec
$ cvs diff -u -r1.129 -r1.130 openldap.spec
--- openpkg-src/openldap/openldap.spec23 Jan 2005 19:22:46 -
1.129
+++ openpkg-src/openldap/openldap.spec24 Jan 2005 17:47:32 -
1.130
@@ -34,7 +34,7 @@
Group:Database
License: GPL
Version: 2.2.22
-Release: 20050123
+Release: 20050124
# package options
%option with_fsl yes
@@ -101,11 +101,17 @@
%else
cf="%{l_cppflags}"
%endif
+LOCLIBS=""
+case "%{l_platform -t}" in
+*-sunos* )
+LOCLIBS="-lrt"
+;;
+esac
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O} `%{l_prefix}/bin/pth-config --cflags`" \
CPPFLAGS="$cf -I`%{l_prefix}/bin/pth-config --includedir`" \
LDFLAGS="%{l_ldflags} `%{l_prefix}/bin/pth-config --ldflags`
%{l_fsl_ldflags}" \
-LIBS="`%{l_prefix}/bin/pth-config --libs` %{l_fsl_libs}" \
+LIBS="`%{l_prefix}/bin/pth-config --libs` %{l_fsl_libs} $LOCLIBS" \
./configure \
--cache-file=./config.cache \
--prefix=%{l_prefix} \
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
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 Date: 23-Jan-2005 20:22:47 Branch: HEAD Handle: 2005012319224600 Modified files: openpkg-src/openldapopenldap.spec Log: upgrading package: openldap 2.2.21 -> 2.2.22 Summary: RevisionChanges Path 1.129 +2 -2 openpkg-src/openldap/openldap.spec patch -p0 <<'@@ .' Index: openpkg-src/openldap/openldap.spec $ cvs diff -u -r1.128 -r1.129 openldap.spec --- openpkg-src/openldap/openldap.spec21 Jan 2005 20:14:01 - 1.128 +++ openpkg-src/openldap/openldap.spec23 Jan 2005 19:22:46 - 1.129 @@ -33,8 +33,8 @@ Class:BASE Group:Database License: GPL -Version: 2.2.21 -Release: 20050121 +Version: 2.2.22 +Release: 20050123 # package options %option with_fsl yes @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
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 Date: 21-Jan-2005 21:14:01 Branch: HEAD Handle: 2005012120140100 Modified files: openpkg-src/openldapopenldap.spec Log: upgrading package: openldap 2.2.20 -> 2.2.21 Summary: RevisionChanges Path 1.128 +2 -2 openpkg-src/openldap/openldap.spec patch -p0 <<'@@ .' Index: openpkg-src/openldap/openldap.spec $ cvs diff -u -r1.127 -r1.128 openldap.spec --- openpkg-src/openldap/openldap.spec1 Jan 2005 10:53:04 - 1.127 +++ openpkg-src/openldap/openldap.spec21 Jan 2005 20:14:01 - 1.128 @@ -33,8 +33,8 @@ Class:BASE Group:Database License: GPL -Version: 2.2.20 -Release: 20041231 +Version: 2.2.21 +Release: 20050121 # package options %option with_fsl yes @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
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 Date: 31-Dec-2004 09:26:19 Branch: HEAD Handle: 2004123108261900 Modified files: openpkg-src/openldapopenldap.spec Log: upgrading package: openldap 2.2.19 -> 2.2.20 Summary: RevisionChanges Path 1.126 +2 -2 openpkg-src/openldap/openldap.spec patch -p0 <<'@@ .' Index: openpkg-src/openldap/openldap.spec $ cvs diff -u -r1.125 -r1.126 openldap.spec --- openpkg-src/openldap/openldap.spec7 Dec 2004 19:57:36 - 1.125 +++ openpkg-src/openldap/openldap.spec31 Dec 2004 08:26:19 - 1.126 @@ -33,8 +33,8 @@ Class:BASE Group:Database License: GPL -Version: 2.2.19 -Release: 20041207 +Version: 2.2.20 +Release: 20041231 # package options %option with_fsl yes @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
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 Date: 24-Oct-2004 21:41:37
Branch: HEAD Handle: 2004102420413700
Modified files:
openpkg-src/openldapopenldap.spec
Log:
comitt the missing pieces for the installation of the pkgconfig file
Summary:
RevisionChanges Path
1.122 +17 -1 openpkg-src/openldap/openldap.spec
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/openldap.spec
$ cvs diff -u -r1.121 -r1.122 openldap.spec
--- openpkg-src/openldap/openldap.spec24 Oct 2004 16:10:39 - 1.121
+++ openpkg-src/openldap/openldap.spec24 Oct 2004 19:41:37 - 1.122
@@ -46,6 +46,7 @@
Source0:
ftp://ftp.openldap.org/pub/openldap/openldap-release/openldap-%{version}.tgz
Source1: rc.openldap
Source2: fsl.openldap
+Source3: openldap.pc
Patch0: openldap.patch
# build information
@@ -189,15 +190,30 @@
%{SOURCE rc.openldap} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
# install OSSP fsl configuration
-%{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
+%{l_shtool} mkdir -f -p -m 755 \
+$RPM_BUILD_ROOT%{l_prefix}/etc/fsl
%{l_shtool} install -c -m 644 %{l_value -s -a} \
%{SOURCE fsl.openldap} \
$RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
+# install pkg-config configuration
+%{l_shtool} mkdir -f -p -m 755 \
+$RPM_BUILD_ROOT%{l_prefix}/lib/pkgconfig
+libs="-lldap -llber"
+%if "%{with_sasl}" == "yes"
+libs="$libs -lsasl2"
+%endif
+%{l_shtool} install -c -m 644 %{l_value -s -a} \
+-e 's;@version@;%{version};' \
+-e "s;@libs@;$libs;" \
+%{SOURCE openldap.pc} \
+$RPM_BUILD_ROOT%{l_prefix}/lib/pkgconfig/
+
# determine installation files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
'%not %dir %{l_prefix}/etc/fsl' \
+'%not %dir %{l_prefix}/lib/pkgconfig' \
'%config %{l_prefix}/etc/fsl/fsl.openldap' \
'%config %{l_prefix}/etc/openldap/*.conf'
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
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 Date: 14-Sep-2004 09:45:52 Branch: HEAD Handle: 2004091408455200 Modified files: openpkg-src/openldapopenldap.spec Log: upgrading package: openldap 2.2.16 -> 2.2.17 Summary: RevisionChanges Path 1.119 +2 -2 openpkg-src/openldap/openldap.spec patch -p0 <<'@@ .' Index: openpkg-src/openldap/openldap.spec $ cvs diff -u -r1.118 -r1.119 openldap.spec --- openpkg-src/openldap/openldap.spec11 Sep 2004 07:48:54 - 1.118 +++ openpkg-src/openldap/openldap.spec14 Sep 2004 07:45:52 - 1.119 @@ -33,8 +33,8 @@ Class:BASE Group:Database License: GPL -Version: 2.2.16 -Release: 20040911 +Version: 2.2.17 +Release: 20040914 # package options %option with_fsl yes @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
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 Date: 11-Sep-2004 09:48:54 Branch: HEAD Handle: 2004091108485400 Modified files: openpkg-src/openldapopenldap.spec Log: upgrading package: openldap 2.2.15 -> 2.2.16 Summary: RevisionChanges Path 1.118 +2 -2 openpkg-src/openldap/openldap.spec patch -p0 <<'@@ .' Index: openpkg-src/openldap/openldap.spec $ cvs diff -u -r1.117 -r1.118 openldap.spec --- openpkg-src/openldap/openldap.spec25 Aug 2004 16:18:33 - 1.117 +++ openpkg-src/openldap/openldap.spec11 Sep 2004 07:48:54 - 1.118 @@ -33,8 +33,8 @@ Class:BASE Group:Database License: GPL -Version: 2.2.15 -Release: 20040825 +Version: 2.2.16 +Release: 20040911 # package options %option with_fsl yes @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
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 Date: 25-Aug-2004 18:18:33
Branch: HEAD Handle: 2004082517183300
Modified files:
openpkg-src/openldapopenldap.spec
Log:
fix building of slurpd(8) according to Thomas
Summary:
RevisionChanges Path
1.117 +1 -1 openpkg-src/openldap/openldap.spec
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/openldap.spec
$ cvs diff -u -r1.116 -r1.117 openldap.spec
--- openpkg-src/openldap/openldap.spec25 Aug 2004 12:08:49 - 1.116
+++ openpkg-src/openldap/openldap.spec25 Aug 2004 16:18:33 - 1.117
@@ -102,7 +102,7 @@
%endif
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O} `%{l_prefix}/bin/pth-config --cflags`" \
-CPPFLAGS="$cf" \
+CPPFLAGS="$cf -I`%{l_prefix}/bin/pth-config --includedir`" \
LDFLAGS="%{l_ldflags} `%{l_prefix}/bin/pth-config --ldflags` %{l_fsl_ldflags}" \
LIBS="`%{l_prefix}/bin/pth-config --libs` %{l_fsl_libs}" \
./configure \
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 25-Aug-2004 14:08:50
Branch: HEAD Handle: 2004082513084900
Modified files:
openpkg-src/openldapopenldap.spec
Log:
Enforce use of GNU pth for OpenLDAP. This fixes crashes that occur
under heavy parallel load in preemtive threading enviroments (Solaris)
where slapd(8C) incorrectly assumes underlying libraries like db are
being built threading aware and take care of appropriate locking. This
is not the case in OpenPKG because db is using non-Pthread mutex. As a
side effect our test setup not only passes a stress test where it broke
previously but also indicates a performance boost by factor 3.5 on
Solaris 8 and factor 4 on Solaris 9. There's neither gain nor pain in
reliability and performance for FreeBSD4. Others were not tested.
Summary:
RevisionChanges Path
1.116 +6 -5 openpkg-src/openldap/openldap.spec
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/openldap.spec
$ cvs diff -u -r1.115 -r1.116 openldap.spec
--- openpkg-src/openldap/openldap.spec25 Aug 2004 09:58:27 - 1.115
+++ openpkg-src/openldap/openldap.spec25 Aug 2004 12:08:49 - 1.116
@@ -53,8 +53,8 @@
BuildRoot:%{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20040130, make, gcc
PreReq: OpenPKG, openpkg >= 20040130
-BuildPreReq: readline, openssl, db >= 4.2
-PreReq: readline, openssl, db >= 4.2
+BuildPreReq: readline, openssl, db >= 4.2, pth
+PreReq: readline, openssl, db >= 4.2, pth
%if "%{with_fsl}" == "yes"
BuildPreReq: fsl >= 1.2.0
PreReq: fsl >= 1.2.0
@@ -101,10 +101,10 @@
cf="%{l_cppflags}"
%endif
CC="%{l_cc}" \
-CFLAGS="%{l_cflags -O}" \
+CFLAGS="%{l_cflags -O} `%{l_prefix}/bin/pth-config --cflags`" \
CPPFLAGS="$cf" \
-LDFLAGS="%{l_ldflags} %{l_fsl_ldflags}" \
-LIBS="%{l_fsl_libs}" \
+LDFLAGS="%{l_ldflags} `%{l_prefix}/bin/pth-config --ldflags` %{l_fsl_ldflags}" \
+LIBS="`%{l_prefix}/bin/pth-config --libs` %{l_fsl_libs}" \
./configure \
--cache-file=./config.cache \
--prefix=%{l_prefix} \
@@ -153,6 +153,7 @@
%endif
--with-dyngroup \
--with-proxycache \
+--with-threads=pth \
--enable-slurpd
# build toolkit
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
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 Date: 25-Aug-2004 11:58:28
Branch: HEAD Handle: 2004082510582700
Modified files:
openpkg-src/openldapopenldap.spec
Log:
cleanup packaging
Summary:
RevisionChanges Path
1.115 +5 -6 openpkg-src/openldap/openldap.spec
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/openldap.spec
$ cvs diff -u -r1.114 -r1.115 openldap.spec
--- openpkg-src/openldap/openldap.spec28 Jul 2004 06:46:52 - 1.114
+++ openpkg-src/openldap/openldap.spec25 Aug 2004 09:58:27 - 1.115
@@ -34,7 +34,7 @@
Group:Database
License: GPL
Version: 2.2.15
-Release: 20040728
+Release: 20040825
# package options
%option with_fsl yes
@@ -68,10 +68,9 @@
%description
OpenLDAP is an open source implementation of the Lightweight
-Directory Access Protocol. The suite includes: slapd: stand-alone
-LDAP server; slurpd:- stand-alone LDAP replication server; libraries
-implementing the LDAP protocol, and utilities, tools, and sample
-clients.
+Directory Access Protocol (LDAP). The suite includes libraries
+implementing the LDAP protocol plus a stand-alone LDAP server
+slapd(8) and a stand-alone LDAP replication server slurpd(8).
%track
prog openldap = {
@@ -164,7 +163,7 @@
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"
+%{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
# post adjustment: remove extra files
rm -f $RPM_BUILD_ROOT%{l_prefix}/etc/openldap/*.default
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 20-Jun-2004 21:09:13 Branch: HEAD Handle: -NONE- Modified files: openpkg-src/openldapopenldap.spec Log: upgrading package: openldap 2.2.13 -> 2.2.14 Summary: RevisionChanges Path 1.112 +0 -0 openpkg-src/openldap/openldap.spec patch -p0 <<'@@ .' Index: openpkg-src/openldap/openldap.spec $ cvs diff -u -r1.111 -r1.112 openldap.spec --- openpkg-src/openldap/openldap.spec11 Jun 2004 06:37:27 - 1.111 +++ openpkg-src/openldap/openldap.spec20 Jun 2004 19:09:12 - 1.112 @@ -33,8 +33,8 @@ Class:BASE Group:Database License: GPL -Version: 2.2.13 -Release: 20040611 +Version: 2.2.14 +Release: 20040620 # package options %option with_fsl yes @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
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 Date: 11-Jun-2004 08:37:27 Branch: HEAD Handle: -NONE- Modified files: openpkg-src/openldapopenldap.spec Log: upgrading package: openldap 2.2.12 -> 2.2.13 Summary: RevisionChanges Path 1.111 +0 -0 openpkg-src/openldap/openldap.spec patch -p0 <<'@@ .' Index: openpkg-src/openldap/openldap.spec $ cvs diff -u -r1.110 -r1.111 openldap.spec --- openpkg-src/openldap/openldap.spec6 Jun 2004 18:31:01 - 1.110 +++ openpkg-src/openldap/openldap.spec11 Jun 2004 06:37:27 - 1.111 @@ -33,8 +33,8 @@ Class:BASE Group:Database License: GPL -Version: 2.2.12 -Release: 20040606 +Version: 2.2.13 +Release: 20040611 # package options %option with_fsl yes @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
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 Date: 06-Jun-2004 20:31:02 Branch: HEAD Handle: 2004060619310100 Modified files: openpkg-src/openldapopenldap.spec Log: upgrading package: openldap 2.2.11 -> 2.2.12 Summary: RevisionChanges Path 1.110 +2 -2 openpkg-src/openldap/openldap.spec patch -p0 <<'@@ .' Index: openpkg-src/openldap/openldap.spec $ cvs diff -u -r1.109 -r1.110 openldap.spec --- openpkg-src/openldap/openldap.spec24 Apr 2004 21:34:42 - 1.109 +++ openpkg-src/openldap/openldap.spec6 Jun 2004 18:31:01 - 1.110 @@ -33,8 +33,8 @@ Class:BASE Group:Database License: GPL -Version: 2.2.11 -Release: 20040424 +Version: 2.2.12 +Release: 20040606 # package options %option with_fsl yes @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec rc.openldap
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 24-Apr-2004 23:34:44
Branch: HEAD Handle: 2004042422344201
Modified files:
openpkg-src/openldapopenldap.spec rc.openldap
Log:
try to improve rc handling with regard to slapd/slurpd independence;
start and stop both independent of the others state; status show
active when either is running; in all those cases, handle slurpd only
if configured
Summary:
RevisionChanges Path
1.109 +1 -1 openpkg-src/openldap/openldap.spec
1.22+17 -7 openpkg-src/openldap/rc.openldap
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/openldap.spec
$ cvs diff -u -r1.108 -r1.109 openldap.spec
--- openpkg-src/openldap/openldap.spec23 Apr 2004 11:33:41 - 1.108
+++ openpkg-src/openldap/openldap.spec24 Apr 2004 21:34:42 - 1.109
@@ -34,7 +34,7 @@
Group:Database
License: GPL
Version: 2.2.11
-Release: 20040423
+Release: 20040424
# package options
%option with_fsl yes
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/rc.openldap
$ cvs diff -u -r1.21 -r1.22 rc.openldap
--- openpkg-src/openldap/rc.openldap 19 Apr 2004 13:46:46 - 1.21
+++ openpkg-src/openldap/rc.openldap 24 Apr 2004 21:34:43 - 1.22
@@ -23,26 +23,36 @@
openldap_slurpd_signal () {
[ -f $openldap_slurpd_pidfile ] && kill -$1 `cat $openldap_slurpd_pidfile`
}
+openldap_slurpd_needed () {
+[ ".`grep '^replogfile' $openldap_slapd_cfgfile`" != . ] && return 0
+return 1
+}
%status -u @l_susr@ -o
openldap_usable="unknown"
openldap_active="no"
rcService openldap enable yes && \
openldap_slapd_signal 0 && openldap_active="yes"
+rcService openldap enable yes && openldap_slurpd_needed && \
+openldap_slurpd_signal 0 && openldap_active="yes"
echo "openldap_enable=\"$openldap_enable\""
echo "openldap_usable=\"$openldap_usable\""
echo "openldap_active=\"$openldap_active\""
%start -p 300 -u @l_susr@
rcService openldap enable yes || exit 0
-rcService openldap active yes && exit 0
-flags="$openldap_flags"
-echo $flags | grep -- -h >/dev/null
-if [ $? -ne 0 -a ".$openldap_url" != . ]; then
-flags="$flags -h \"$openldap_url\""
+openldap_slapd_signal 0
+if [ $? -ne 0 ]; then
+flags="$openldap_flags"
+echo $flags | grep -- -h >/dev/null
+if [ $? -ne 0 -a ".$openldap_url" != . ]; then
+flags="$flags -h \"$openldap_url\""
+fi
+eval @l_prefix@/libexec/openldap/slapd $flags
fi
-eval @l_prefix@/libexec/openldap/slapd $flags
-if [ ".`grep '^replogfile' $openldap_slapd_cfgfile`" != . ]; then
+openldap_slurpd_needed || exit 0
+openldap_slurpd_signal 0
+if [ $? -ne 0 ]; then
@l_prefix@/libexec/openldap/slurpd
fi
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
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 Date: 23-Apr-2004 13:33:41
Branch: HEAD Handle: 2004042312334100
Modified files:
openpkg-src/openldapopenldap.spec
Log:
This provides an option for enabling Unix crypt(3) password handling in
OpenLDAP's slapd(8).
When migrating from traditional user authentication to OpenLDAP one
mostly have an user database using crypt(3)'ed passwords. Using this
data to populate an OpenLDAP server requires crypt(3) handling, which
is disabled by default. For the sake of simplicity and convinience (and
it doesn't harm because OpenLDAP used Autoconf to check for -lcrypt and
uses the stuff only for its daemon part), the option is defaulted to
yes.
Submitted by: Birger Kraegelin <[EMAIL PROTECTED]>
Summary:
RevisionChanges Path
1.108 +8 -4 openpkg-src/openldap/openldap.spec
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/openldap.spec
$ cvs diff -u -r1.107 -r1.108 openldap.spec
--- openpkg-src/openldap/openldap.spec22 Apr 2004 07:25:35 - 1.107
+++ openpkg-src/openldap/openldap.spec23 Apr 2004 11:33:41 - 1.108
@@ -34,12 +34,13 @@
Group:Database
License: GPL
Version: 2.2.11
-Release: 20040422
+Release: 20040423
# package options
-%option with_fsl yes
-%option with_sasl no
-%option with_perl no
+%option with_fsl yes
+%option with_crypt yes
+%option with_sasl no
+%option with_perl no
# list of sources
Source0:
ftp://ftp.openldap.org/pub/openldap/openldap-release/openldap-%{version}.tgz
@@ -119,6 +120,9 @@
%else
--without-cyrus-sasl \
--disable-spasswd \
+%endif
+%if "%{with_crypt}" == "yes"
+--enable-crypt \
%endif
--disable-dynamic \
--disable-shared \
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/openldap/ openldap.spec
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 Date: 22-Apr-2004 09:25:35 Branch: HEAD Handle: 2004042208253500 Modified files: openpkg-src/openldapopenldap.spec Log: upgrading package: openldap 2.2.10 -> 2.2.11 Summary: RevisionChanges Path 1.107 +2 -2 openpkg-src/openldap/openldap.spec patch -p0 <<'@@ .' Index: openpkg-src/openldap/openldap.spec $ cvs diff -u -r1.106 -r1.107 openldap.spec --- openpkg-src/openldap/openldap.spec19 Apr 2004 13:46:46 - 1.106 +++ openpkg-src/openldap/openldap.spec22 Apr 2004 07:25:35 - 1.107 @@ -33,8 +33,8 @@ Class:BASE Group:Database License: GPL -Version: 2.2.10 -Release: 20040419 +Version: 2.2.11 +Release: 20040422 # package options %option with_fsl yes @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]
