From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Dec 2 21:50:06 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C164D1065675 for ; Fri, 2 Dec 2011 21:50:06 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 964C48FC16 for ; Fri, 2 Dec 2011 21:50:06 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id pB2Lo6Gj067080 for ; Fri, 2 Dec 2011 21:50:06 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id pB2Lo66M067079; Fri, 2 Dec 2011 21:50:06 GMT (envelope-from gnats) Resent-Date: Fri, 2 Dec 2011 21:50:06 GMT Resent-Message-Id: <201112022150.pB2Lo66M067079@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Xin LI Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 024801065670 for ; Fri, 2 Dec 2011 21:41:21 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id E4C798FC08 for ; Fri, 2 Dec 2011 21:41:20 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id pB2LfKS8066093 for ; Fri, 2 Dec 2011 21:41:20 GMT (envelope-from delphij@freefall.freebsd.org) Received: (from delphij@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id pB2LfKqs066088; Fri, 2 Dec 2011 21:41:20 GMT (envelope-from delphij) Message-Id: <201112022141.pB2LfKqs066088@freefall.freebsd.org> Date: Fri, 2 Dec 2011 21:41:20 GMT From: Xin LI To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/163029: [MAINTAINER UPDATE] Update net/openldap24-server to 2.4.28 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Xin LI List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Dec 2011 21:50:06 -0000 >Number: 163029 >Category: ports >Synopsis: [MAINTAINER UPDATE] Update net/openldap24-server to 2.4.28 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri Dec 02 21:50:06 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Xin LI >Release: FreeBSD 8.2-STABLE i386 >Organization: iXsystems, Inc. >Environment: System: FreeBSD freefall.freebsd.org 8.2-STABLE FreeBSD 8.2-STABLE #5 r227907: Wed Nov 23 21:55:50 UTC 2011 simon@freefall.freebsd.org:/usr/obj/usr/src/sys/FREEFALL i386 >Description: This update is intentionally held in preparation for FreeBSD 9.0-RELEASE. Put the patchset here so users can do some test and feedback if they are interested. >How-To-Repeat: >Fix: --- openldap24-server.diff begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/net/openldap24-server/Makefile,v retrieving revision 1.193 diff -u -r1.193 Makefile --- Makefile 23 Sep 2011 22:24:34 -0000 1.193 +++ Makefile 28 Nov 2011 10:30:33 -0000 @@ -6,7 +6,7 @@ # PORTNAME= openldap -DISTVERSION= 2.4.26 +DISTVERSION= 2.4.28 PORTREVISION= ${OPENLDAP_PORTREVISION} CATEGORIES= net databases MASTER_SITES= ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \ @@ -38,6 +38,7 @@ LATEST_LINK?= ${UNIQUENAME}${PKGNAMESUFFIX} USE_OPENSSL= yes MAKE_JOBS_SAFE= yes +USE_AUTOTOOLS= libtool WANT_OPENLDAP_VER?= 24 .if ${WANT_OPENLDAP_VER} != 24 @@ -134,8 +135,6 @@ .endif -USE_AUTOTOOLS= libtool - DESCR= ${PKGDIR}/pkg-descr${OPENLDAP_PKGFILESUFX} PLIST= ${PKGDIR}/pkg-plist${OPENLDAP_PKGFILESUFX} @@ -156,6 +155,9 @@ --disable-dependency-tracking \ --enable-dynamic +# XXX FreeBSD does not implement O_DSYNC and fdatasync at this time. +CFLAGS+= -DMDB_DSYNC=O_SYNC -Dfdatasync=fsync + .if defined(WITHOUT_FETCH) CONFIGURE_ARGS+= --without-fetch .endif Index: distinfo =================================================================== RCS file: /home/ncvs/ports/net/openldap24-server/distinfo,v retrieving revision 1.85 diff -u -r1.85 distinfo --- distinfo 5 Jul 2011 08:54:05 -0000 1.85 +++ distinfo 28 Nov 2011 10:30:54 -0000 @@ -1,2 +1,2 @@ -SHA256 (openldap-2.4.26.tgz) = 1f42048cebbcd8647c9c566f8f070946103a15717345915ecd5fccfbe19a7c3d -SIZE (openldap-2.4.26.tgz) = 5250064 +SHA256 (openldap-2.4.28.tgz) = 332ab5b13dbc0f85b1112d7a6f3485069108bfbd4d2603c8b548adbfa9bbc371 +SIZE (openldap-2.4.28.tgz) = 5436340 Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/net/openldap24-server/pkg-plist,v retrieving revision 1.48 diff -u -r1.48 pkg-plist --- pkg-plist 24 Feb 2011 21:50:08 -0000 1.48 +++ pkg-plist 25 Nov 2011 05:58:20 -0000 @@ -1,17 +1,26 @@ @comment $FreeBSD: ports/net/openldap24-server/pkg-plist,v 1.48 2011/02/24 21:50:08 delphij Exp $ @unexec %%RC_DIR%%/etc/rc.d/slapd stop 2>&1 >/dev/null || true -etc/openldap/schema/README -etc/openldap/schema/core.ldif -etc/openldap/schema/cosine.ldif -etc/openldap/schema/dyngroup.ldif -etc/openldap/schema/inetorgperson.ldif -etc/openldap/schema/nis.ldif -etc/openldap/schema/openldap.ldif -etc/openldap/schema/pmi.schema -etc/openldap/schema/pmi.schema.default +etc/openldap/slapd.ldif.default +etc/openldap/slapd.ldif @unexec if cmp -s %D/etc/openldap/slapd.conf %D/etc/openldap/slapd.conf.default; then rm -f %D/etc/openldap/slapd.conf; fi etc/openldap/slapd.conf.default @exec [ -f %B/slapd.conf ] || cp %B/%f %B/slapd.conf +etc/openldap/schema/ppolicy.ldif +etc/openldap/schema/pmi.schema.default +etc/openldap/schema/pmi.schema +etc/openldap/schema/pmi.ldif +etc/openldap/schema/openldap.ldif +etc/openldap/schema/nis.ldif +etc/openldap/schema/misc.ldif +etc/openldap/schema/java.ldif +etc/openldap/schema/inetorgperson.ldif +etc/openldap/schema/dyngroup.ldif +etc/openldap/schema/duaconf.ldif +etc/openldap/schema/cosine.ldif +etc/openldap/schema/core.ldif +etc/openldap/schema/corba.ldif +etc/openldap/schema/collective.ldif +etc/openldap/schema/README etc/openldap/DB_CONFIG.example %%SLAPI%%lib/libslapi.a %%SLAPI%%lib/libslapi.la Index: files/manpages =================================================================== RCS file: /home/ncvs/ports/net/openldap24-server/files/manpages,v retrieving revision 1.26 diff -u -r1.26 manpages --- files/manpages 5 Jul 2011 08:54:05 -0000 1.26 +++ files/manpages 25 Nov 2011 06:04:26 -0000 @@ -206,6 +206,7 @@ slapd-ldap.5 \ slapd-ldbm.5 \ slapd-ldif.5 \ + slapd-mdb.5 \ slapd-meta.5 \ slapd-monitor.5 \ slapd-ndb.5 \ @@ -242,7 +243,8 @@ slapo-unique.5 \ slapo-valsort.5 MLINKS+= \ - slapd-bdb.5 slapd-hdb.5 + slapd-bdb.5 slapd-hdb.5 \ + slapd-sock.5 slapo-sock.5 MAN8+= slapacl.8 \ slapadd.8 \ Index: files/patch-servers__slapd__inet_ntoa.diff =================================================================== RCS file: files/patch-servers__slapd__inet_ntoa.diff diff -N files/patch-servers__slapd__inet_ntoa.diff --- files/patch-servers__slapd__inet_ntoa.diff 2 May 2011 19:22:41 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,70 +0,0 @@ -diff --git servers/slapd/connection.c servers/slapd/connection.c -index aea3b39..65ce576 100644 ---- servers/slapd/connection.c -+++ servers/slapd/connection.c -@@ -1500,12 +1500,21 @@ connection_input( Connection *conn , conn_readinfo *cri ) - #ifdef LDAP_CONNECTIONLESS - if ( conn->c_is_udp ) { - char peername[sizeof("IP=255.255.255.255:65336")]; -+ const char *peeraddr = NULL; - - len = ber_int_sb_read(conn->c_sb, &peeraddr, sizeof(struct sockaddr)); - if (len != sizeof(struct sockaddr)) return 1; - -+#if defined( HAVE_GETADDRINFO ) && defined( HAVE_INET_NTOP ) -+ char addr[INET_ADDRSTRLEN]; -+ inet_ntop( AF_INET, &peeraddr.sa_in_addr.sin_addr, -+ addr, sizeof(addr) ); -+ peeraddr = addr; -+#else /* ! HAVE_GETADDRINFO || ! HAVE_INET_NTOP */ -+ peeraddr = inet_ntoa( peeraddr.sa_in_addr.sin_addr ); -+#endif /* ! HAVE_GETADDRINFO || ! HAVE_INET_NTOP */ - sprintf( peername, "IP=%s:%d", -- inet_ntoa( peeraddr.sa_in_addr.sin_addr ), -+ peeraddr, - (unsigned) ntohs( peeraddr.sa_in_addr.sin_port ) ); - Statslog( LDAP_DEBUG_STATS, - "conn=%lu UDP request from %s (%s) accepted.\n", -diff --git servers/slapd/daemon.c servers/slapd/daemon.c -index 8e8a69d..ccfa2ee 100644 ---- servers/slapd/daemon.c -+++ servers/slapd/daemon.c -@@ -1971,8 +1971,16 @@ slap_listener( - # ifdef LDAP_PF_INET6 - case AF_INET6: - if ( IN6_IS_ADDR_V4MAPPED(&from.sa_in6_addr.sin6_addr) ) { -+#if defined( HAVE_GETADDRINFO ) && defined( HAVE_INET_NTOP ) -+ char addr[INET_ADDRSTRLEN]; -+ inet_ntop( AF_INET, -+ ((struct in_addr *)&from.sa_in6_addr.sin6_addr.s6_addr[12]), -+ addr, sizeof(addr) ); -+ peeraddr = addr; -+#else /* ! HAVE_GETADDRINFO || ! HAVE_INET_NTOP */ - peeraddr = inet_ntoa( *((struct in_addr *) - &from.sa_in6_addr.sin6_addr.s6_addr[12]) ); -+#endif /* ! HAVE_GETADDRINFO || ! HAVE_INET_NTOP */ - sprintf( peername, "IP=%s:%d", - peeraddr != NULL ? peeraddr : SLAP_STRING_UNKNOWN, - (unsigned) ntohs( from.sa_in6_addr.sin6_port ) ); -@@ -1989,12 +1997,19 @@ slap_listener( - break; - # endif /* LDAP_PF_INET6 */ - -- case AF_INET: -+ case AF_INET: { -+#if defined( HAVE_GETADDRINFO ) && defined( HAVE_INET_NTOP ) -+ char addr[INET_ADDRSTRLEN]; -+ inet_ntop( AF_INET, &from.sa_in_addr.sin_addr, -+ addr, sizeof(addr) ); -+ peeraddr = addr; -+#else /* ! HAVE_GETADDRINFO || ! HAVE_INET_NTOP */ - peeraddr = inet_ntoa( from.sa_in_addr.sin_addr ); -+#endif /* ! HAVE_GETADDRINFO || ! HAVE_INET_NTOP */ - sprintf( peername, "IP=%s:%d", - peeraddr != NULL ? peeraddr : SLAP_STRING_UNKNOWN, - (unsigned) ntohs( from.sa_in_addr.sin_port ) ); -- break; -+ } break; - - default: - slapd_close(sfd); Index: files/patch-shlib-version =================================================================== RCS file: /home/ncvs/ports/net/openldap24-server/files/patch-shlib-version,v retrieving revision 1.2 diff -u -r1.2 patch-shlib-version --- files/patch-shlib-version 5 Jul 2011 08:54:05 -0000 1.2 +++ files/patch-shlib-version 28 Nov 2011 10:33:31 -0000 @@ -1,14 +1,14 @@ # I have checked all headers and don't think the shared library # bump is a needed one. We patch it back to prevent large # rebuild need. ---- build/version.var.orig 2011-06-30 08:13:36.000000000 -0700 -+++ build/version.var 2011-07-05 00:27:39.172875169 -0700 -@@ -17,7 +17,7 @@ ol_major=2 +--- build/version.var.orig 2011-11-25 10:52:29.000000000 -0800 ++++ build/version.var 2011-11-28 02:32:41.329947563 -0800 +@@ -17,7 +17,7 @@ ol_minor=4 - ol_patch=26 - ol_api_inc=20426 --ol_api_current=9 + ol_patch=28 + ol_api_inc=20428 +-ol_api_current=10 +ol_api_current=8 ol_api_revision=1 - ol_api_age=7 - ol_release_date="2011/06/30" + ol_api_age=8 + ol_release_date="2011/11/24" --- openldap24-server.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: