From 43dd92f5feb2cdbead0342e1922e590f38836958 Mon Sep 17 00:00:00 2001 From: Thierry Thomas Date: Sat, 27 Mar 2004 08:37:14 +0000 Subject: [PATCH] - Update to version 2.5.6 Release notes are at http://www.phpmyadmin.net/home_page/relnotes.php?rel=0 This release fixes the vulnerability described in: http://marc.theaimsgroup.com/?l=bugtraq&m=107582619125932&w=2 http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-0129 - Take maintainership - No more support for php3 PR: ports/64568 Submitted by: Matthew Seaman Approved by: mat (mentor) --- databases/phpmyadmin/Makefile | 28 +- databases/phpmyadmin/distinfo | 4 +- .../files/fix-libraries::display_tbl.lib.php | 11 - .../files/fix-libraries::display_tbl.lib.php3 | 11 - .../phpmyadmin/files/fix-tbl_relation.php | 36 -- .../phpmyadmin/files/fix-tbl_relation.php3 | 36 -- databases/phpmyadmin/pkg-plist | 475 +++++++++--------- databases/phpmyadmin211/Makefile | 28 +- databases/phpmyadmin211/distinfo | 4 +- .../files/fix-libraries::display_tbl.lib.php | 11 - .../files/fix-libraries::display_tbl.lib.php3 | 11 - .../phpmyadmin211/files/fix-tbl_relation.php | 36 -- .../phpmyadmin211/files/fix-tbl_relation.php3 | 36 -- databases/phpmyadmin211/pkg-plist | 475 +++++++++--------- 14 files changed, 492 insertions(+), 710 deletions(-) delete mode 100644 databases/phpmyadmin/files/fix-libraries::display_tbl.lib.php delete mode 100644 databases/phpmyadmin/files/fix-libraries::display_tbl.lib.php3 delete mode 100644 databases/phpmyadmin/files/fix-tbl_relation.php delete mode 100644 databases/phpmyadmin/files/fix-tbl_relation.php3 delete mode 100644 databases/phpmyadmin211/files/fix-libraries::display_tbl.lib.php delete mode 100644 databases/phpmyadmin211/files/fix-libraries::display_tbl.lib.php3 delete mode 100644 databases/phpmyadmin211/files/fix-tbl_relation.php delete mode 100644 databases/phpmyadmin211/files/fix-tbl_relation.php3 diff --git a/databases/phpmyadmin/Makefile b/databases/phpmyadmin/Makefile index 9cf0eaf18c28..1b3d2fc8dd10 100644 --- a/databases/phpmyadmin/Makefile +++ b/databases/phpmyadmin/Makefile @@ -6,40 +6,24 @@ # PORTNAME= phpMyAdmin -PORTVERSION= 2.5.4 +PORTVERSION= 2.5.6 CATEGORIES= databases www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= phpmyadmin -DISTFILES= ${DISTNAME}-${PHP_SUFX}${EXTRACT_SUFX} -MAINTAINER= ports@FreeBSD.org -COMMENT= A set of PHP-scripts to adminstrate MySQL over the web - -FORBIDDEN= http://people.freebsd.org/~eik/portaudit/cc0fb686-6550-11d8-80e3-0020ed76ef5a.html - -.if defined(WITH_PHP3) -RUN_DEPENDS+= ${LOCALBASE}/libexec/apache/libphp3.so:${PORTSDIR}/www/mod_php3 -.endif +MAINTAINER= m.seaman@infracaninophile.co.uk +COMMENT= A set of PHP-scripts to adminster MySQL over the web USE_BZIP2= yes +USE_PHP= yes NO_BUILD= yes MYADMDIR?= www/data/phpMyAdmin -.if defined(WITH_PHP3) -PHP_SUFX= php3 -EXTRA_PATCHES= files/fix-libraries::display_tbl.lib.php3 files/fix-tbl_relation.php3 -.else -USE_PHP= yes -PHP_SUFX= php -EXTRA_PATCHES= files/fix-libraries::display_tbl.lib.php files/fix-tbl_relation.php -.endif - -PLIST_SUB+= MYADMDIR=${MYADMDIR} PHP_SUFX=${PHP_SUFX} +PLIST_SUB+= MYADMDIR=${MYADMDIR} post-patch: - @${MV} ${WRKSRC}/config.inc.${PHP_SUFX} ${WRKSRC}/config.inc.${PHP_SUFX}.sample - @${RM} ${WRKSRC}/*.orig ${WRKSRC}/libraries/*.orig + @${MV} ${WRKSRC}/config.inc.php ${WRKSRC}/config.inc.php.sample do-install: @${MKDIR} ${PREFIX}/${MYADMDIR} diff --git a/databases/phpmyadmin/distinfo b/databases/phpmyadmin/distinfo index 288086ed65a7..77b9dde164f8 100644 --- a/databases/phpmyadmin/distinfo +++ b/databases/phpmyadmin/distinfo @@ -1,2 +1,2 @@ -MD5 (phpMyAdmin-2.5.4-php3.tar.bz2) = 7b6b5dcb9071ebfcd71f5db7785db865 -MD5 (phpMyAdmin-2.5.4-php.tar.bz2) = c3a8d771c9846dd95b7283c7ce0f20dd +MD5 (phpMyAdmin-2.5.6.tar.bz2) = b62afe98600eacc2a3300c9856b349f7 +SIZE (phpMyAdmin-2.5.6.tar.bz2) = 1111512 diff --git a/databases/phpmyadmin/files/fix-libraries::display_tbl.lib.php b/databases/phpmyadmin/files/fix-libraries::display_tbl.lib.php deleted file mode 100644 index 03fff8091d19..000000000000 --- a/databases/phpmyadmin/files/fix-libraries::display_tbl.lib.php +++ /dev/null @@ -1,11 +0,0 @@ ---- libraries/display_tbl.lib.php.orig Sat Oct 18 23:32:07 2003 -+++ libraries/display_tbl.lib.php Mon Nov 3 15:32:22 2003 -@@ -541,7 +541,7 @@ - echo '' . "\n"; - echo $GLOBALS['strSortByKey'] . ': ' . "\n"; - echo $GLOBALS['strSortByKey'] . ': ' . "\n"; - echo $GLOBALS['strSortByKey'] . ': ' . "\n"; - echo $GLOBALS['strSortByKey'] . ':