From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Dec 3 09:50:09 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 2C0941065675 for ; Sat, 3 Dec 2011 09:50:09 +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 04F348FC14 for ; Sat, 3 Dec 2011 09:50:09 +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 pB39o8Ob067259 for ; Sat, 3 Dec 2011 09:50:08 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id pB39o81E067258; Sat, 3 Dec 2011 09:50:08 GMT (envelope-from gnats) Resent-Date: Sat, 3 Dec 2011 09:50:08 GMT Resent-Message-Id: <201112030950.pB39o81E067258@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, Valery Komaorv Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DAD0C106564A for ; Sat, 3 Dec 2011 09:49:49 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id C9F558FC17 for ; Sat, 3 Dec 2011 09:49:49 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.4/8.14.4) with ESMTP id pB39nncq007509 for ; Sat, 3 Dec 2011 09:49:49 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.4/8.14.4/Submit) id pB39nnBK007508; Sat, 3 Dec 2011 09:49:49 GMT (envelope-from nobody) Message-Id: <201112030949.pB39nnBK007508@red.freebsd.org> Date: Sat, 3 Dec 2011 09:49:49 GMT From: Valery Komaorv To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/163035: [update] net/openldap24-server Update to 2.4.28 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Dec 2011 09:50:09 -0000 >Number: 163035 >Category: ports >Synopsis: [update] net/openldap24-server Update to 2.4.28 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sat Dec 03 09:50:08 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Valery Komaorv >Release: FreeBSD 8.2-STABLE amd64 >Organization: >Environment: >Description: [update] net/openldap24-server Update to 2.4.28 >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ruN ./openldap24-server.orig/Makefile ./openldap24-server/Makefile --- ./openldap24-server.orig/Makefile 2011-09-24 05:53:54.000000000 +0400 +++ ./openldap24-server/Makefile 2011-12-02 14:55:18.000000000 +0400 @@ -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%/ \ @@ -210,6 +210,7 @@ .endif CONFIGURE_ARGS+= --localstatedir=${LOCALSTATEDIR} \ + --disable-mdb \ --enable-crypt \ --enable-lmpasswd \ --enable-ldap=${BACKEND_ENABLE} \ @@ -319,7 +320,7 @@ BACK_HDB="@comment " .else -WITH_BDB_VER?= 46 +WITH_BDB_VER?= 48 INVALID_BDB_VER= 42 USE_BDB= yes diff -ruN ./openldap24-server.orig/distinfo ./openldap24-server/distinfo --- ./openldap24-server.orig/distinfo 2011-07-05 12:54:05.000000000 +0400 +++ ./openldap24-server/distinfo 2011-12-02 13:02:56.000000000 +0400 @@ -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 diff -ruN ./openldap24-server.orig/files/extrapatch-Makefile.in ./openldap24-server/files/extrapatch-Makefile.in --- ./openldap24-server.orig/files/extrapatch-Makefile.in 2005-05-05 04:53:44.000000000 +0400 +++ ./openldap24-server/files/extrapatch-Makefile.in 2011-12-02 13:02:56.000000000 +0400 @@ -1,5 +1,5 @@ ---- Makefile.in.orig Mon Apr 7 22:23:24 2003 -+++ Makefile.in Thu Jul 10 17:43:35 2003 +--- ./Makefile.in.orig 2011-11-25 22:52:29.000000000 +0400 ++++ ./Makefile.in 2011-12-02 10:24:52.000000000 +0400 @@ -13,9 +13,11 @@ ## top-level directory of the distribution or, alternatively, at ## . diff -ruN ./openldap24-server.orig/files/patch-servers__slapd__inet_ntoa.diff ./openldap24-server/files/patch-servers__slapd__inet_ntoa.diff --- ./openldap24-server.orig/files/patch-servers__slapd__inet_ntoa.diff 2011-05-02 23:22:41.000000000 +0400 +++ ./openldap24-server/files/patch-servers__slapd__inet_ntoa.diff 1970-01-01 03:00:00.000000000 +0300 @@ -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); diff -ruN ./openldap24-server.orig/files/patch-shlib-version ./openldap24-server/files/patch-shlib-version --- ./openldap24-server.orig/files/patch-shlib-version 2011-07-05 12:54:05.000000000 +0400 +++ ./openldap24-server/files/patch-shlib-version 2011-12-02 14:58:27.000000000 +0400 @@ -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 22:52:29.000000000 +0400 ++++ build/version.var 2011-12-02 14:56:06.000000000 +0400 +@@ -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" >Release-Note: >Audit-Trail: >Unformatted: