Bug 91983
| Summary: | [PATCH] Update openldap23-server to 2.3.18, superceds 88403, 90938, 91353 | ||||||
|---|---|---|---|---|---|---|---|
| Product: | Ports & Packages | Reporter: | Xin LI <delphij> | ||||
| Component: | Individual Port(s) | Assignee: | Vsevolod Stakhov <vsevolod> | ||||
| Status: | Closed FIXED | ||||||
| Severity: | Affects Only Me | CC: | vsevolod | ||||
| Priority: | Normal | ||||||
| Version: | Latest | ||||||
| Hardware: | Any | ||||||
| OS: | Any | ||||||
| Attachments: |
|
||||||
|
Description
Xin LI
2006-01-19 02:00:19 UTC
Responsible Changed From-To: freebsd-ports-bugs->vsevolod Over to maintainer Hi,
It looks like that I have missed a chunk of patch, updated.
Please note that bsd.port.mk should be updated as well, since libldap's
version is bumped. A s/2.3.1/2.3/ would do the trick.
==========================================================================================
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net/openldap23-server/Makefile,v
retrieving revision 1.117
diff -u -p -r1.117 Makefile
--- Makefile 15 Nov 2005 06:50:32 -0000 1.117
+++ Makefile 19 Jan 2006 19:32:28 -0000
@@ -6,7 +6,7 @@
#
PORTNAME= openldap
-DISTVERSION= 2.3.11
+DISTVERSION= 2.3.18
PORTREVISION= ${OPENLDAP_PORTREVISION}
CATEGORIES= net databases
MASTER_SITES= ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \
@@ -87,10 +87,10 @@ OPENLDAP_PORTREVISION= ${PORTREVISION_SE
OPENLDAP_PKGFILESUFX=
.if defined(WITH_SASL) && !defined(WITHOUT_SASL)
-RUN_DEPENDS= ${LOCALBASE}/lib/libldap-2.3.so.1:${PORTSDIR}/net/openldap23-sasl-client
+RUN_DEPENDS= ${LOCALBASE}/lib/libldap-2.3.so.2:${PORTSDIR}/net/openldap23-sasl-client
CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-client-2.*
.else
-RUN_DEPENDS= ${LOCALBASE}/lib/libldap-2.3.so.1:${PORTSDIR}/net/openldap23-client
+RUN_DEPENDS= ${LOCALBASE}/lib/libldap-2.3.so.2:${PORTSDIR}/net/openldap23-client
CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.*
.endif
@@ -258,7 +258,7 @@ PLIST_SUB+= BACK_BDB="@comment " \
BACK_HDB="@comment "
BDBLIB= db3.3
.else
-IGNORE= : WITH_BDB_VER must be 3, 4, 41 or 42
+IGNORE= : WITH_BDB_VER must be 3, 4, 41, 42 or 43
.endif
LIB_DEPENDS+= ${BDBLIB}:${PORTSDIR}/databases/db${WITH_BDB_VER}
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/net/openldap23-server/distinfo,v
retrieving revision 1.56
diff -u -p -r1.56 distinfo
--- distinfo 19 Oct 2005 13:08:10 -0000 1.56
+++ distinfo 18 Jan 2006 15:31:28 -0000
@@ -1,2 +1,3 @@
-MD5 (openldap-2.3.11.tgz) = fbde128a8421b8d2ea587a25057a281e
-SIZE (openldap-2.3.11.tgz) = 3657646
+MD5 (openldap-2.3.18.tgz) = ebef4d924fb6b585f88c75d03c260889
+SHA256 (openldap-2.3.18.tgz) = 1e7070f8c84d9db4310f2a7b87298c82f404f8b07a5f0f08495171c317240116
+SIZE (openldap-2.3.18.tgz) = 3707863
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/net/openldap23-server/pkg-plist,v
retrieving revision 1.32
diff -u -p -r1.32 pkg-plist
--- pkg-plist 15 Sep 2005 11:47:23 -0000 1.32
+++ pkg-plist 26 Dec 2005 19:46:06 -0000
@@ -11,38 +11,38 @@ etc/openldap/DB_CONFIG.example
%%SLAPI%%lib/libslapi.a
%%SLAPI%%lib/libslapi.so
%%SLAPI%%lib/libslapi-2.3.so
-%%SLAPI%%lib/libslapi-2.3.so.1
+%%SLAPI%%lib/libslapi-2.3.so.2
%%MODULES%%@exec mkdir -p %D/libexec/openldap
%%BACK_BDB%%libexec/openldap/back_bdb.so
%%BACK_BDB%%libexec/openldap/back_bdb-2.3.so
-%%BACK_BDB%%libexec/openldap/back_bdb-2.3.so.1
+%%BACK_BDB%%libexec/openldap/back_bdb-2.3.so.2
%%BACK_HDB%%libexec/openldap/back_hdb.so
%%BACK_HDB%%libexec/openldap/back_hdb-2.3.so
-%%BACK_HDB%%libexec/openldap/back_hdb-2.3.so.1
+%%BACK_HDB%%libexec/openldap/back_hdb-2.3.so.2
%%BACKEND%%libexec/openldap/back_ldap.so
%%BACKEND%%libexec/openldap/back_ldap-2.3.so
-%%BACKEND%%libexec/openldap/back_ldap-2.3.so.1
+%%BACKEND%%libexec/openldap/back_ldap-2.3.so.2
%%BACKEND%%libexec/openldap/back_ldbm.so
%%BACKEND%%libexec/openldap/back_ldbm-2.3.so
-%%BACKEND%%libexec/openldap/back_ldbm-2.3.so.1
+%%BACKEND%%libexec/openldap/back_ldbm-2.3.so.2
%%BACKEND%%libexec/openldap/back_meta.so
%%BACKEND%%libexec/openldap/back_meta-2.3.so
-%%BACKEND%%libexec/openldap/back_meta-2.3.so.1
+%%BACKEND%%libexec/openldap/back_meta-2.3.so.2
%%BACKEND%%libexec/openldap/back_monitor.so
%%BACKEND%%libexec/openldap/back_monitor-2.3.so
-%%BACKEND%%libexec/openldap/back_monitor-2.3.so.1
+%%BACKEND%%libexec/openldap/back_monitor-2.3.so.2
%%BACKEND%%libexec/openldap/back_null.so
%%BACKEND%%libexec/openldap/back_null-2.3.so
-%%BACKEND%%libexec/openldap/back_null-2.3.so.1
+%%BACKEND%%libexec/openldap/back_null-2.3.so.2
%%BACK_PERL%%libexec/openldap/back_perl.so
%%BACK_PERL%%libexec/openldap/back_perl-2.3.so
-%%BACK_PERL%%libexec/openldap/back_perl-2.3.so.1
+%%BACK_PERL%%libexec/openldap/back_perl-2.3.so.2
%%BACK_SHELL%%libexec/openldap/back_shell.so
%%BACK_SHELL%%libexec/openldap/back_shell-2.3.so
-%%BACK_SHELL%%libexec/openldap/back_shell-2.3.so.1
+%%BACK_SHELL%%libexec/openldap/back_shell-2.3.so.2
%%BACK_SQL%%libexec/openldap/back_sql.so
%%BACK_SQL%%libexec/openldap/back_sql-2.3.so
-%%BACK_SQL%%libexec/openldap/back_sql-2.3.so.1
+%%BACK_SQL%%libexec/openldap/back_sql-2.3.so.2
libexec/slapd
libexec/slurpd
@unexec rmdir %D/libexec/openldap 2>/dev/null || true
Index: pkg-plist.client
===================================================================
RCS file: /home/ncvs/ports/net/openldap23-server/pkg-plist.client,v
retrieving revision 1.10
diff -u -p -r1.10 pkg-plist.client
--- pkg-plist.client 15 Sep 2005 11:47:23 -0000 1.10
+++ pkg-plist.client 26 Dec 2005 19:46:22 -0000
@@ -22,15 +22,15 @@ include/slapi-plugin.h
lib/liblber.a
lib/liblber.so
lib/liblber-2.3.so
-lib/liblber-2.3.so.1
+lib/liblber-2.3.so.2
lib/libldap.a
lib/libldap.so
lib/libldap-2.3.so
-lib/libldap-2.3.so.1
+lib/libldap-2.3.so.2
lib/libldap_r.a
lib/libldap_r.so
lib/libldap_r-2.3.so
-lib/libldap_r-2.3.so.1
+lib/libldap_r-2.3.so.2
@comment share/openldap/ucdata/case.dat
@comment share/openldap/ucdata/cmbcl.dat
@comment share/openldap/ucdata/comp.dat
==========================================================================================
Cheers,
Sirs, we tried to contact vsevolod@freebsd.org 2 weeks ago, mail bounced with undeliverable message from a russian SMTP server. Maybe maintainer should be contacted by other means. On Fri, 3 Feb 2006 09:20:07 GMT Alessandro Dellavedova <alessandro.dellavedova@ifom-ieo-campus.it> wrote: > > Sirs, > > we tried to contact vsevolod@freebsd.org 2 weeks ago, mail bounced > with undeliverable message from a russian SMTP server. Maybe > maintainer should be contacted by other means. > I'm sorry, I do not control that smtp server. I've tested all patches and send patch to bsd.port.mk to portmgr@ for approvement. Now they are testing that update, after this I'll commit update to openldap23. Dear Sirs, what's exactly the status of this port ? Any hope to see the patches committed in the next few days ? Thanks -- -------------------------------------- Alessandro Dellavedova One amongst many others -------------------------------------- Hi, Alessandro, > what's exactly the status of this port ? Any hope to see the patches > committed in the next few days ? It seems that the bsd.port.mk update was done already. Vsevolod has promised me to update the port to 2.3.19 (the patchset is slightly different than 91983). Please note that because openldap is an essential port, we would have to handle it with care. You can use the patch provided by the PR and see if things goes smoothly, though. Personally I would like to see if openldap23-server would be updated to 2.3.19 before 6.1-RELEASE, because the current version found in the ports collection is not generally stable nor usable. Cheers, -- Xin LI <delphij delphij net> http://www.delphij.net/ On Mon, Feb 20, 2006 at 10:38:25PM +0800, Xin LI wrote:
> Hi, Alessandro,
> > what's exactly the status of this port ? Any hope to see the patches
> > committed in the next few days ?
>
> It seems that the bsd.port.mk update was done already. Vsevolod has
> promised me to update the port to 2.3.19 (the patchset is slightly
> different than 91983).
>
> Please note that because openldap is an essential port, we would have to
> handle it with care. You can use the patch provided by the PR and see
> if things goes smoothly, though.
>
> Personally I would like to see if openldap23-server would be updated to
> 2.3.19 before 6.1-RELEASE, because the current version found in the
> ports collection is not generally stable nor usable.
Sorry, there's no time for that, and the (premature) bsd.port.mk
update will be reverted today.
Kris
On Mon, Feb 20, 2006 at 02:48:52PM -0500, Kris Kennaway wrote:
> On Mon, Feb 20, 2006 at 10:38:25PM +0800, Xin LI wrote:
> > Hi, Alessandro,
> > > what's exactly the status of this port ? Any hope to see the patches
> > > committed in the next few days ?
> >
> > It seems that the bsd.port.mk update was done already. Vsevolod has
> > promised me to update the port to 2.3.19 (the patchset is slightly
> > different than 91983).
> >
> > Please note that because openldap is an essential port, we would have to
> > handle it with care. You can use the patch provided by the PR and see
> > if things goes smoothly, though.
> >
> > Personally I would like to see if openldap23-server would be updated to
> > 2.3.19 before 6.1-RELEASE, because the current version found in the
> > ports collection is not generally stable nor usable.
>
> Sorry, there's no time for that, and the (premature) bsd.port.mk
> update will be reverted today.
On second thoughts, it would be better to move forward with this.
Testing on pointyhat would not achieve anything since this is not used
by default except as a RUN_DEPENDS of a couple of ports. Therefore,
if you promise to fix any problems people may find with the update
during the freeze, and can commit the update today, please proceed.
Kris
State Changed From-To: open->closed Resolved already. |