ports/146214: fix bug; fix needed php version

Vasiliy P. Melnik basil at vpm.net.ua
Sat May 1 09:30:32 UTC 2010 

>Number:         146214
>Category:       ports
>Synopsis:       fix bug; fix needed php version
>Confidential:   no
>Severity:       non-critical
>Priority:       high
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat May 01 09:30:14 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Vasiliy P. Melnik
>Release:        8.0-RELEASE-p2
>Organization:
na
>Environment:
FreeBSD monkey.home 8.0-RELEASE-p2 FreeBSD 8.0-RELEASE-p2 #0: Sat Mar 27 03:57:42 EET 2010     root at monkey.home:/usr/obj/usr/src/sys/monkey  i386
>Description:
- fix bug "Samba 3 domain SID is invalid!" when creating domain record
- add checking php port - work only with lang/php52
>How-To-Repeat:

>Fix:
===> Generating patch
===> Viewing diff with more
diff -ruN --exclude=CVS /usr/ports/sysutils/ldap-account-manager/Makefile /root/ldap-account-manager/Makefile
--- /usr/ports/sysutils/ldap-account-manager/Makefile	2010-03-28 00:15:00.000000000 +0200
+++ /root/ldap-account-manager/Makefile	2010-04-30 21:09:40.000000000 +0300
@@ -7,6 +7,7 @@
 
 PORTNAME=	ldap-account-manager
 PORTVERSION=	3.0.0
+PORTREVISION=	1
 CATEGORIES=	sysutils www
 MASTER_SITES=	SF/${PNAME}/LAM/${PORTVERSION}
 DISTNAME=	${PORTNAME:L}-${PORTVERSION}
@@ -22,7 +23,8 @@
 USE_PERL5=	yes
 USE_PHP=	gettext hash iconv ldap mcrypt pcre session simplexml spl xml
 WANT_PHP_WEB=	yes
-DEFAULT_PHP_VER=	5
+PHP_VER=	52
+BROKEN_WITH_PHP=	4 5
 
 PNAME=		lam
 PORTDOCS=	docs COPYING HISTORY README copyright
diff -ruN --exclude=CVS /usr/ports/sysutils/ldap-account-manager/files/patch-account.inc /root/ldap-account-manager/files/patch-account.inc
--- /usr/ports/sysutils/ldap-account-manager/files/patch-account.inc	1970-01-01 03:00:00.000000000 +0300
+++ /root/ldap-account-manager/files/patch-account.inc	2010-05-01 11:34:31.000000000 +0300
@@ -0,0 +1,42 @@
+--- lib/account.inc.orig	2010-03-24 20:22:38.000000000 +0200
++++ lib/account.inc	2010-05-01 11:21:49.000000000 +0300
+@@ -1,6 +1,6 @@
+ <?php
+ /*
+-$Id: account.inc,v 1.247 2010/02/14 18:01:19 gruberroland Exp $
++$Id: account.inc,v 1.250 2010/04/30 21:07:47 gruberroland Exp $
+ 
+   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
+   Copyright (C) 2003 - 2006  Tilo Lutz
+@@ -39,10 +39,10 @@
+ * @return array list of shell names
+ */
+ function getshells() {
+-	if (!isset($_SESSION['lampath'])) return array();
++	$shellPath = dirname(__FILE__) . '/../config/shells';
+ 	// Load shells from file
+-	if (file_exists($_SESSION['lampath'] . 'config/shells')) {
+-		$shells = file($_SESSION['lampath'] . 'config/shells');
++	if (file_exists($shellPath)) {
++		$shells = file($shellPath);
+ 		$i = 0;
+ 		while (count($shells) > $i) {
+ 			// remove whitespaces
+@@ -386,6 +386,9 @@
+ 		case 'hostname':	
+ 					$pregexpr = '/^([[:alnum:]@\\.\\ \\_\\$-])+$/u';
+ 					break;
++		case 'hostObject':
++					$pregexpr = '/^[!]?([[:alnum:]@\\.\\ \\_\\$\\*-])+$/u';
++					break;
+ 		case 'usernameList':	// comma separated list of user names
+ 		case 'groupnameList':	// comma separated list of group names
+ 					$pregexpr = '/^([[:alnum:]@\\.\\ \\_-])+(,([[:alnum:]@\\.\\ \\_-])+)*$/u';
+@@ -467,6 +470,7 @@
+ 					break;
+ 		case 'domainSID': // Samba domain SID
+ 					$pregexpr = "/^S\\-[0-9]\\-[0-9]\\-[0-9]{2,2}\\-[0-9]+\\-[0-9]+\\-[0-9]+$/";
++					break;
+ 		case 'ip': // IP address
+ 					$pregexpr = '/^[0-9]{1,3}[.][0-9]{1,3}[.][0-9]{1,3}[.][0-9]{1,3}$/';
+ 					break;
diff -ruN --exclude=CVS /usr/ports/sysutils/ldap-account-manager/pkg-plist /root/ldap-account-manager/pkg-plist
--- /usr/ports/sysutils/ldap-account-manager/pkg-plist	2010-04-30 17:58:13.000000000 +0300
+++ /root/ldap-account-manager/pkg-plist	2010-05-01 12:11:01.000000000 +0300
@@ -137,6 +137,7 @@
 %%WWWDIR%%/lib/.htaccess
 %%WWWDIR%%/lib/tools.inc
 %%WWWDIR%%/lib/account.inc
+%%WWWDIR%%/lib/account.inc.orig
 %%WWWDIR%%/lib/baseModule.inc
 %%WWWDIR%%/lib/baseType.inc
 %%WWWDIR%%/lib/cache.inc
===> Done

Patch attached with submission follows:

===> Generating patch
===> Viewing diff with more
diff -ruN --exclude=CVS /usr/ports/sysutils/ldap-account-manager/Makefile /root/ldap-account-manager/Makefile
--- /usr/ports/sysutils/ldap-account-manager/Makefile	2010-03-28 00:15:00.000000000 +0200
+++ /root/ldap-account-manager/Makefile	2010-04-30 21:09:40.000000000 +0300
@@ -7,6 +7,7 @@
 
 PORTNAME=	ldap-account-manager
 PORTVERSION=	3.0.0
+PORTREVISION=	1
 CATEGORIES=	sysutils www
 MASTER_SITES=	SF/${PNAME}/LAM/${PORTVERSION}
 DISTNAME=	${PORTNAME:L}-${PORTVERSION}
@@ -22,7 +23,8 @@
 USE_PERL5=	yes
 USE_PHP=	gettext hash iconv ldap mcrypt pcre session simplexml spl xml
 WANT_PHP_WEB=	yes
-DEFAULT_PHP_VER=	5
+PHP_VER=	52
+BROKEN_WITH_PHP=	4 5
 
 PNAME=		lam
 PORTDOCS=	docs COPYING HISTORY README copyright
diff -ruN --exclude=CVS /usr/ports/sysutils/ldap-account-manager/files/patch-account.inc /root/ldap-account-manager/files/patch-account.inc
--- /usr/ports/sysutils/ldap-account-manager/files/patch-account.inc	1970-01-01 03:00:00.000000000 +0300
+++ /root/ldap-account-manager/files/patch-account.inc	2010-05-01 11:34:31.000000000 +0300
@@ -0,0 +1,42 @@
+--- lib/account.inc.orig	2010-03-24 20:22:38.000000000 +0200
++++ lib/account.inc	2010-05-01 11:21:49.000000000 +0300
+@@ -1,6 +1,6 @@
+ <?php
+ /*
+-$Id: account.inc,v 1.247 2010/02/14 18:01:19 gruberroland Exp $
++$Id: account.inc,v 1.250 2010/04/30 21:07:47 gruberroland Exp $
+ 
+   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
+   Copyright (C) 2003 - 2006  Tilo Lutz
+@@ -39,10 +39,10 @@
+ * @return array list of shell names
+ */
+ function getshells() {
+-	if (!isset($_SESSION['lampath'])) return array();
++	$shellPath = dirname(__FILE__) . '/../config/shells';
+ 	// Load shells from file
+-	if (file_exists($_SESSION['lampath'] . 'config/shells')) {
+-		$shells = file($_SESSION['lampath'] . 'config/shells');
++	if (file_exists($shellPath)) {
++		$shells = file($shellPath);
+ 		$i = 0;
+ 		while (count($shells) > $i) {
+ 			// remove whitespaces
+@@ -386,6 +386,9 @@
+ 		case 'hostname':	
+ 					$pregexpr = '/^([[:alnum:]@\\.\\ \\_\\$-])+$/u';
+ 					break;
++		case 'hostObject':
++					$pregexpr = '/^[!]?([[:alnum:]@\\.\\ \\_\\$\\*-])+$/u';
++					break;
+ 		case 'usernameList':	// comma separated list of user names
+ 		case 'groupnameList':	// comma separated list of group names
+ 					$pregexpr = '/^([[:alnum:]@\\.\\ \\_-])+(,([[:alnum:]@\\.\\ \\_-])+)*$/u';
+@@ -467,6 +470,7 @@
+ 					break;
+ 		case 'domainSID': // Samba domain SID
+ 					$pregexpr = "/^S\\-[0-9]\\-[0-9]\\-[0-9]{2,2}\\-[0-9]+\\-[0-9]+\\-[0-9]+$/";
++					break;
+ 		case 'ip': // IP address
+ 					$pregexpr = '/^[0-9]{1,3}[.][0-9]{1,3}[.][0-9]{1,3}[.][0-9]{1,3}$/';
+ 					break;
diff -ruN --exclude=CVS /usr/ports/sysutils/ldap-account-manager/pkg-plist /root/ldap-account-manager/pkg-plist
--- /usr/ports/sysutils/ldap-account-manager/pkg-plist	2010-04-30 17:58:13.000000000 +0300
+++ /root/ldap-account-manager/pkg-plist	2010-05-01 12:11:01.000000000 +0300
@@ -137,6 +137,7 @@
 %%WWWDIR%%/lib/.htaccess
 %%WWWDIR%%/lib/tools.inc
 %%WWWDIR%%/lib/account.inc
+%%WWWDIR%%/lib/account.inc.orig
 %%WWWDIR%%/lib/baseModule.inc
 %%WWWDIR%%/lib/baseType.inc
 %%WWWDIR%%/lib/cache.inc
===> Done


>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list