From owner-svn-ports-all@FreeBSD.ORG Sat May 3 07:16:51 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 357355D2; Sat, 3 May 2014 07:16:51 +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 21F661C91; Sat, 3 May 2014 07:16:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s437Gobf011169; Sat, 3 May 2014 07:16:50 GMT (envelope-from matthew@svn.freebsd.org) Received: (from matthew@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s437GnQi011158; Sat, 3 May 2014 07:16:49 GMT (envelope-from matthew@svn.freebsd.org) Message-Id: <201405030716.s437GnQi011158@svn.freebsd.org> From: Matthew Seaman Date: Sat, 3 May 2014 07:16:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r352866 - in head/net/phpldapadmin: . 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-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 May 2014 07:16:51 -0000 Author: matthew Date: Sat May 3 07:16:49 2014 New Revision: 352866 URL: http://svnweb.freebsd.org/changeset/ports/352866 QAT: https://qat.redports.org/buildarchive/r352866/ Log: Finish off the incomplete conversion from 'password_hash' to 'password_hash_custom' in the previous update. Locally written patches. Added: head/net/phpldapadmin/files/patch-config__config.php.example (contents, props changed) head/net/phpldapadmin/files/patch-lib__TemplateRender.php (contents, props changed) Modified: head/net/phpldapadmin/Makefile head/net/phpldapadmin/files/patch-lib__PageRender.php head/net/phpldapadmin/files/patch-lib__ds_ldap.php head/net/phpldapadmin/files/patch-lib__ds_ldap_pla.php head/net/phpldapadmin/files/patch-lib__functions.php head/net/phpldapadmin/files/patch-tools__po__Makefile Modified: head/net/phpldapadmin/Makefile ============================================================================== --- head/net/phpldapadmin/Makefile Sat May 3 04:51:12 2014 (r352865) +++ head/net/phpldapadmin/Makefile Sat May 3 07:16:49 2014 (r352866) @@ -3,7 +3,7 @@ PORTNAME= phpldapadmin PORTVERSION= 1.2.3 -PORTREVISION= 5 +PORTREVISION= 6 PORTEPOCH= 1 CATEGORIES= net www MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-php5/${PORTVERSION} Added: head/net/phpldapadmin/files/patch-config__config.php.example ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/phpldapadmin/files/patch-config__config.php.example Sat May 3 07:16:49 2014 (r352866) @@ -0,0 +1,20 @@ +--- ./config/config.php.example.orig 2014-05-03 08:00:05.933577117 +0100 ++++ ./config/config.php.example 2014-05-03 08:00:38.259564444 +0100 +@@ -379,7 +379,7 @@ + + /* Default password hashing algorithm. One of md5, ssha, sha, md5crpyt, smd5, + blowfish, crypt or leave blank for now default algorithm. */ +-// $servers->setValue('appearance','password_hash','md5'); ++// $servers->setValue('appearance','password_hash_custom','md5'); + + /* If you specified 'cookie' or 'session' as the auth_type above, you can + optionally specify here an attribute to use when logging in. If you enter +@@ -546,7 +546,7 @@ + $servers->setValue('sasl','authz_id_replacement','$1'); + $servers->setValue('sasl','props',null); + +-$servers->setValue('appearance','password_hash','md5'); ++$servers->setValue('appearance','password_hash_custom','md5'); + $servers->setValue('login','attr','dn'); + $servers->setValue('login','fallback_dn',false); + $servers->setValue('login','class',null); Modified: head/net/phpldapadmin/files/patch-lib__PageRender.php ============================================================================== --- head/net/phpldapadmin/files/patch-lib__PageRender.php Sat May 3 04:51:12 2014 (r352865) +++ head/net/phpldapadmin/files/patch-lib__PageRender.php Sat May 3 07:16:49 2014 (r352866) @@ -1,5 +1,5 @@ --- ./lib/PageRender.php.orig 2012-10-01 07:54:14.000000000 +0100 -+++ ./lib/PageRender.php 2014-04-27 09:42:04.069744333 +0100 ++++ ./lib/PageRender.php 2014-05-03 07:57:44.744575309 +0100 @@ -287,7 +287,7 @@ break; Added: head/net/phpldapadmin/files/patch-lib__TemplateRender.php ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/phpldapadmin/files/patch-lib__TemplateRender.php Sat May 3 07:16:49 2014 (r352866) @@ -0,0 +1,11 @@ +--- ./lib/TemplateRender.php.orig 2014-05-03 07:58:18.076584893 +0100 ++++ ./lib/TemplateRender.php 2014-05-03 07:59:18.859574787 +0100 +@@ -2466,7 +2466,7 @@ + if ($val = $attribute->getValue($i)) + $default = get_enc_type($val); + else +- $default = $this->getServer()->getValue('appearance','password_hash'); ++ $default = $this->getServer()->getValue('appearance','password_hash_custom'); + + if (! $attribute->getPostValue()) + printf('',$attribute->getName(),$i); Modified: head/net/phpldapadmin/files/patch-lib__ds_ldap.php ============================================================================== --- head/net/phpldapadmin/files/patch-lib__ds_ldap.php Sat May 3 04:51:12 2014 (r352865) +++ head/net/phpldapadmin/files/patch-lib__ds_ldap.php Sat May 3 07:16:49 2014 (r352866) @@ -1,5 +1,5 @@ --- ./lib/ds_ldap.php.orig 2012-10-01 07:54:14.000000000 +0100 -+++ ./lib/ds_ldap.php 2014-04-27 09:42:04.087756668 +0100 ++++ ./lib/ds_ldap.php 2014-05-03 07:57:44.746572911 +0100 @@ -1116,13 +1116,24 @@ if (is_array($dn)) { Modified: head/net/phpldapadmin/files/patch-lib__ds_ldap_pla.php ============================================================================== --- head/net/phpldapadmin/files/patch-lib__ds_ldap_pla.php Sat May 3 04:51:12 2014 (r352865) +++ head/net/phpldapadmin/files/patch-lib__ds_ldap_pla.php Sat May 3 07:16:49 2014 (r352866) @@ -1,5 +1,5 @@ --- ./lib/ds_ldap_pla.php.orig 2012-10-01 07:54:14.000000000 +0100 -+++ ./lib/ds_ldap_pla.php 2014-04-27 09:42:04.099743918 +0100 ++++ ./lib/ds_ldap_pla.php 2014-05-03 07:57:44.748572937 +0100 @@ -16,7 +16,7 @@ function __construct($index) { parent::__construct($index); Modified: head/net/phpldapadmin/files/patch-lib__functions.php ============================================================================== --- head/net/phpldapadmin/files/patch-lib__functions.php Sat May 3 04:51:12 2014 (r352865) +++ head/net/phpldapadmin/files/patch-lib__functions.php Sat May 3 07:16:49 2014 (r352866) @@ -1,5 +1,5 @@ --- ./lib/functions.php.orig 2012-10-01 07:54:14.000000000 +0100 -+++ ./lib/functions.php 2014-04-27 09:42:04.122737345 +0100 ++++ ./lib/functions.php 2014-05-03 07:57:44.751570981 +0100 @@ -2127,7 +2127,7 @@ * crypt, ext_des, md5crypt, blowfish, md5, sha, smd5, ssha, sha512, or clear. * @return string The hashed password. Modified: head/net/phpldapadmin/files/patch-tools__po__Makefile ============================================================================== --- head/net/phpldapadmin/files/patch-tools__po__Makefile Sat May 3 04:51:12 2014 (r352865) +++ head/net/phpldapadmin/files/patch-tools__po__Makefile Sat May 3 07:16:49 2014 (r352866) @@ -1,5 +1,5 @@ --- ./tools/po/Makefile.orig 2012-10-01 07:54:14.000000000 +0100 -+++ ./tools/po/Makefile 2014-04-27 09:40:05.269794411 +0100 ++++ ./tools/po/Makefile 2014-05-03 07:57:44.752575636 +0100 @@ -1,4 +1,3 @@ -#!/bin/bash #