summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorspz <spz>2009-12-05 15:10:10 +0000
committerspz <spz>2009-12-05 15:10:10 +0000
commitb1ae5aeb04ada74ffff6eb5f35e36e3e1eb7164c (patch)
treea172721711add60a4e04087b1766035f80d904ee
parent104e24893165b3a940018cc22e2738ed9609b44d (diff)
downloadpkgsrc-b1ae5aeb04ada74ffff6eb5f35e36e3e1eb7164c.tar.gz
Pullup ticket 2944 - requested by tron
security update Revisions pulled up: - pkgsrc/databases/phpmyadmin/Makefile 1.80 - pkgsrc/databases/phpmyadmin/distinfo 1.42 ------------------------------------------------------------------------- Module Name: pkgsrc Committed By: tron Date: Thu Dec 3 12:05:10 UTC 2009 Modified Files: pkgsrc/databases/phpmyadmin: Makefile distinfo Log Message: Update "phpmyadmin" package to version 2.11.9.6. Changes since 2.11.9.5: - [security] XSS and SQL injection, thanks to Herman van Rink To generate a diff of this commit: cvs rdiff -u -r1.79 -r1.80 pkgsrc/databases/phpmyadmin/Makefile cvs rdiff -u -r1.41 -r1.42 pkgsrc/databases/phpmyadmin/distinfo -------------------------------------------------------------------------
-rw-r--r--databases/phpmyadmin/Makefile5
-rw-r--r--databases/phpmyadmin/distinfo8
2 files changed, 7 insertions, 6 deletions
diff --git a/databases/phpmyadmin/Makefile b/databases/phpmyadmin/Makefile
index 43cf559af3d..089062ff716 100644
--- a/databases/phpmyadmin/Makefile
+++ b/databases/phpmyadmin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.79 2009/04/17 09:40:13 tron Exp $
+# $NetBSD: Makefile,v 1.79.4.1 2009/12/05 15:10:10 spz Exp $
DISTNAME= phpMyAdmin-${DIST_VERSION}-all-languages
PKGNAME= phpmyadmin-${DIST_VERSION:S/-//}
@@ -9,6 +9,7 @@ EXTRACT_SUFX= .tar.bz2
OWNER= tron@NetBSD.org
HOMEPAGE= http://www.phpmyadmin.net/
COMMENT= Set of PHP-scripts to adminstrate MySQL over the WWW
+LICENSE= gnu-gpl-v2
DEPENDS+= ${PHP_PKG_PREFIX}-mbstring>=4.3.3:../../misc/php-mbstring
DEPENDS+= ${PHP_PKG_PREFIX}-mysql{,i}>=4.3.3:../../databases/php-mysql
@@ -22,7 +23,7 @@ MESSAGE_SUBST+= CONF_INC_PHP=${CONF_INC_PHP} PMCONFFILE=${PMCONFFILE:Q} \
USE_TOOLS+= perl:run
CONF_INC_PHP= ${PREFIX}/share/phpmyadmin/config.inc.php
-DIST_VERSION= 2.11.9.5
+DIST_VERSION= 2.11.9.6
DOC_FILES= CREDITS ChangeLog \
Documentation.txt INSTALL LICENSE README \
RELEASE-DATE-${DIST_VERSION} TODO
diff --git a/databases/phpmyadmin/distinfo b/databases/phpmyadmin/distinfo
index 6dbf30abd29..2b6cdccb6e3 100644
--- a/databases/phpmyadmin/distinfo
+++ b/databases/phpmyadmin/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.41 2009/04/17 09:40:13 tron Exp $
+$NetBSD: distinfo,v 1.41.4.1 2009/12/05 15:10:10 spz Exp $
-SHA1 (phpMyAdmin-2.11.9.5-all-languages.tar.bz2) = 2415a41c1eb800df494086f963581de3ff5b5e86
-RMD160 (phpMyAdmin-2.11.9.5-all-languages.tar.bz2) = c5d5f54283e1d47e3bd26abad672a533ab40727a
-Size (phpMyAdmin-2.11.9.5-all-languages.tar.bz2) = 3110303 bytes
+SHA1 (phpMyAdmin-2.11.9.6-all-languages.tar.bz2) = 004841bbc1438b7df31f06a645b5d5aaea6c10d5
+RMD160 (phpMyAdmin-2.11.9.6-all-languages.tar.bz2) = c81901044e062b05d1e6931bb55d798110e52576
+Size (phpMyAdmin-2.11.9.6-all-languages.tar.bz2) = 3113128 bytes