From owner-svn-ports-head@FreeBSD.ORG Tue Sep 30 00:52:54 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0954E9A6; Tue, 30 Sep 2014 00:52:54 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E8194CA; Tue, 30 Sep 2014 00:52:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8U0qrRb044824; Tue, 30 Sep 2014 00:52:53 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8U0qqNL044820; Tue, 30 Sep 2014 00:52:52 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201409300052.s8U0qqNL044820@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Tue, 30 Sep 2014 00:52:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r369566 - in head/net/openldap24-server: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Sep 2014 00:52:54 -0000 Author: delphij Date: Tue Sep 30 00:52:52 2014 New Revision: 369566 URL: http://svnweb.freebsd.org/changeset/ports/369566 QAT: https://qat.redports.org/buildarchive/r369566/ Log: Update to 2.4.40. Deleted: head/net/openldap24-server/files/patch-ITS7249 Modified: head/net/openldap24-server/Makefile head/net/openldap24-server/distinfo head/net/openldap24-server/pkg-plist head/net/openldap24-server/pkg-plist.client Modified: head/net/openldap24-server/Makefile ============================================================================== --- head/net/openldap24-server/Makefile Mon Sep 29 23:34:30 2014 (r369565) +++ head/net/openldap24-server/Makefile Tue Sep 30 00:52:52 2014 (r369566) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= openldap -DISTVERSION= 2.4.39 +DISTVERSION= 2.4.40 PORTREVISION= ${OPENLDAP_PORTREVISION} CATEGORIES= net databases MASTER_SITES= ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \ @@ -58,9 +58,10 @@ WANT_OPENLDAP_VER?= 24 BROKEN= incompatible OpenLDAP version: ${WANT_OPENLDAP_VER} .endif -PORTREVISION_CLIENT= 2 -PORTREVISION_SERVER= 5 +PORTREVISION_CLIENT= 0 +PORTREVISION_SERVER= 0 OPENLDAP_SHLIB_MAJOR= 2 +OPENLDAP_SHLIB_MINOR= 10.3 OPENLDAP_MAJOR= ${DISTVERSION:R} OPTIONS_DEFINE= FETCH GSSAPI @@ -484,6 +485,7 @@ SUB_LIST+= RC_DIR=${PREFIX} \ PLIST_SUB+= ${SUB_LIST} PLIST_SUB+= SHLIB_MAJOR=${OPENLDAP_SHLIB_MAJOR} +PLIST_SUB+= SHLIB_MINOR=${OPENLDAP_SHLIB_MINOR} PLIST_SUB+= OPENLDAP_MAJOR=${OPENLDAP_MAJOR} post-patch: Modified: head/net/openldap24-server/distinfo ============================================================================== --- head/net/openldap24-server/distinfo Mon Sep 29 23:34:30 2014 (r369565) +++ head/net/openldap24-server/distinfo Tue Sep 30 00:52:52 2014 (r369566) @@ -1,2 +1,2 @@ -SHA256 (openldap-2.4.39.tgz) = 8267c87347103fef56b783b24877c0feda1063d3cb85d070e503d076584bf8a7 -SIZE (openldap-2.4.39.tgz) = 5509060 +SHA256 (openldap-2.4.40.tgz) = d12611a5c25b6499293c2bb7b435dc2b174db73e83f5a8cb7e34f2ce5fa6dadb +SIZE (openldap-2.4.40.tgz) = 5641865 Modified: head/net/openldap24-server/pkg-plist ============================================================================== --- head/net/openldap24-server/pkg-plist Mon Sep 29 23:34:30 2014 (r369565) +++ head/net/openldap24-server/pkg-plist Tue Sep 30 00:52:52 2014 (r369566) @@ -30,65 +30,65 @@ @sample %%ETCDIR%%/slapd.ldif.sample %%BACK_BDB%%%%ETCDIR%%/DB_CONFIG.example %%SLAPI%%lib/libslapi-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%% -%%SLAPI%%lib/libslapi-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.10.2 +%%SLAPI%%lib/libslapi-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% %%SLAPI%%lib/libslapi.a %%SLAPI%%lib/libslapi.la %%SLAPI%%lib/libslapi.so %%MODULES%%@exec mkdir -p %D/libexec/openldap %%BACK_BDB%%libexec/openldap/back_bdb-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%% -%%BACK_BDB%%libexec/openldap/back_bdb-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.10.2 +%%BACK_BDB%%libexec/openldap/back_bdb-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% %%BACK_BDB%%libexec/openldap/back_bdb.la %%BACK_BDB%%libexec/openldap/back_bdb.so %%BACK_HDB%%libexec/openldap/back_hdb-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%% -%%BACK_HDB%%libexec/openldap/back_hdb-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.10.2 +%%BACK_HDB%%libexec/openldap/back_hdb-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% %%BACK_HDB%%libexec/openldap/back_hdb.la %%BACK_HDB%%libexec/openldap/back_hdb.so %%BACKEND%%libexec/openldap/back_ldap-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%% -%%BACKEND%%libexec/openldap/back_ldap-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.10.2 +%%BACKEND%%libexec/openldap/back_ldap-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% %%BACKEND%%libexec/openldap/back_ldap.la %%BACKEND%%libexec/openldap/back_ldap.so %%BACKEND%%libexec/openldap/back_meta-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%% -%%BACKEND%%libexec/openldap/back_meta-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.10.2 +%%BACKEND%%libexec/openldap/back_meta-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% %%BACKEND%%libexec/openldap/back_meta.la %%BACKEND%%libexec/openldap/back_meta.so %%BACKEND%%libexec/openldap/back_monitor-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%% -%%BACKEND%%libexec/openldap/back_monitor-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.10.2 +%%BACKEND%%libexec/openldap/back_monitor-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% %%BACKEND%%libexec/openldap/back_monitor.la %%BACKEND%%libexec/openldap/back_monitor.so %%BACKEND%%libexec/openldap/back_null-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%% -%%BACKEND%%libexec/openldap/back_null-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.10.2 +%%BACKEND%%libexec/openldap/back_null-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% %%BACKEND%%libexec/openldap/back_null.la %%BACKEND%%libexec/openldap/back_null.so %%BACK_DNSSRV%%libexec/openldap/back_dnssrv-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%% -%%BACK_DNSSRV%%libexec/openldap/back_dnssrv-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.10.2 +%%BACK_DNSSRV%%libexec/openldap/back_dnssrv-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% %%BACK_DNSSRV%%libexec/openldap/back_dnssrv.la %%BACK_DNSSRV%%libexec/openldap/back_dnssrv.so %%BACK_MDB%%libexec/openldap/back_mdb-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%% -%%BACK_MDB%%libexec/openldap/back_mdb-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.10.2 +%%BACK_MDB%%libexec/openldap/back_mdb-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% %%BACK_MDB%%libexec/openldap/back_mdb.la %%BACK_MDB%%libexec/openldap/back_mdb.so %%BACK_PASSWD%%libexec/openldap/back_passwd-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%% -%%BACK_PASSWD%%libexec/openldap/back_passwd-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.10.2 +%%BACK_PASSWD%%libexec/openldap/back_passwd-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% %%BACK_PASSWD%%libexec/openldap/back_passwd.la %%BACK_PASSWD%%libexec/openldap/back_passwd.so %%BACK_PERL%%libexec/openldap/back_perl-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%% -%%BACK_PERL%%libexec/openldap/back_perl-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.10.2 +%%BACK_PERL%%libexec/openldap/back_perl-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% %%BACK_PERL%%libexec/openldap/back_perl.la %%BACK_PERL%%libexec/openldap/back_perl.so %%BACK_RELAY%%libexec/openldap/back_relay-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%% -%%BACK_RELAY%%libexec/openldap/back_relay-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.10.2 +%%BACK_RELAY%%libexec/openldap/back_relay-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% %%BACK_RELAY%%libexec/openldap/back_relay.la %%BACK_RELAY%%libexec/openldap/back_relay.so %%BACK_SHELL%%libexec/openldap/back_shell-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%% -%%BACK_SHELL%%libexec/openldap/back_shell-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.10.2 +%%BACK_SHELL%%libexec/openldap/back_shell-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% %%BACK_SHELL%%libexec/openldap/back_shell.la %%BACK_SHELL%%libexec/openldap/back_shell.so %%BACK_SOCK%%libexec/openldap/back_sock-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%% -%%BACK_SOCK%%libexec/openldap/back_sock-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.10.2 +%%BACK_SOCK%%libexec/openldap/back_sock-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% %%BACK_SOCK%%libexec/openldap/back_sock.la %%BACK_SOCK%%libexec/openldap/back_sock.so %%BACK_SQL%%libexec/openldap/back_sql-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%% -%%BACK_SQL%%libexec/openldap/back_sql-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.10.2 +%%BACK_SQL%%libexec/openldap/back_sql-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% %%BACK_SQL%%libexec/openldap/back_sql.la %%BACK_SQL%%libexec/openldap/back_sql.so %%SHA2%%libexec/openldap/pw-sha2.la @@ -163,7 +163,7 @@ sbin/slapindex sbin/slappasswd sbin/slapschema sbin/slaptest -@dirrmtry %%ETCDIR%%/schema -%%MODULES%%@dirrmtry libexec/openldap -@dirrmtry(%%LDAP_USER%%,%%LDAP_GROUP%%,) %%LDAP_RUN_DIR%% -@dirrmtry(%%LDAP_USER%%,%%LDAP_GROUP%%,) %%DATABASEDIR%% +@dir %%ETCDIR%%/schema +%%MODULES%%@dir libexec/openldap +@dir(%%LDAP_USER%%,%%LDAP_GROUP%%,775) %%LDAP_RUN_DIR%% +@dir(%%LDAP_USER%%,%%LDAP_GROUP%%,775) %%DATABASEDIR%% Modified: head/net/openldap24-server/pkg-plist.client ============================================================================== --- head/net/openldap24-server/pkg-plist.client Mon Sep 29 23:34:30 2014 (r369565) +++ head/net/openldap24-server/pkg-plist.client Tue Sep 30 00:52:52 2014 (r369566) @@ -19,17 +19,17 @@ include/ldap_utf8.h include/ldif.h include/slapi-plugin.h lib/liblber-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%% -lib/liblber-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.10.2 +lib/liblber-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% lib/liblber.a lib/liblber.la lib/liblber.so lib/libldap-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%% -lib/libldap-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.10.2 +lib/libldap-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% lib/libldap.a lib/libldap.la lib/libldap.so lib/libldap_r-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%% -lib/libldap_r-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.10.2 +lib/libldap_r-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% lib/libldap_r.a lib/libldap_r.la lib/libldap_r.so @@ -227,4 +227,4 @@ man/man3/ldap_value_free.3.gz man/man3/ldap_value_free_len.3.gz man/man5/ldap.conf.5.gz man/man5/ldif.5.gz -@dirrmtry %%ETCDIR%% +@dir %%ETCDIR%%