Mon Apr 28 10:41:30 2008 UTC ()
pullup ticket #2352 - requested by tron
update for security problem

Revisions pulled up:
- pkgsrc/databases/phpmyadmin/Makefile	1.68
- pkgsrc/databases/phpmyadmin/distinfo	1.33

   Module Name:	pkgsrc
   Committed By:	tron
   Date:		Sun Apr 27 14:59:10 UTC 2008

   Modified Files:
   	pkgsrc/databases/phpmyadmin: Makefile distinfo

   Log Message:
   Update "phpmyadmin" package to version 2.11.5.2. This update fixes the
   security problem reported in PMASA-2008-3 (CVE-2008-1924).


(rtr)
diff -r1.67 -r1.67.2.1 pkgsrc/databases/phpmyadmin/Makefile
diff -r1.32 -r1.32.2.1 pkgsrc/databases/phpmyadmin/distinfo
cvs diff -r1.67 -r1.67.2.1 pkgsrc/databases/phpmyadmin/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/phpmyadmin/Makefile 2008/04/01 16:21:29 1.67
+++ pkgsrc/databases/phpmyadmin/Makefile 2008/04/28 10:41:30 1.67.2.1
@@ -1,38 +1,38 @@ @@ -1,38 +1,38 @@
1# $NetBSD: Makefile,v 1.67 2008/04/01 16:21:29 obache Exp $ 1# $NetBSD: Makefile,v 1.67.2.1 2008/04/28 10:41:30 rtr Exp $
2 2
3DISTNAME= phpMyAdmin-${DIST_VERSION}-all-languages 3DISTNAME= phpMyAdmin-${DIST_VERSION}-all-languages
4PKGNAME= phpmyadmin-${DIST_VERSION:S/-//} 4PKGNAME= phpmyadmin-${DIST_VERSION:S/-//}
5CATEGORIES= databases www 5CATEGORIES= databases www
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=phpmyadmin/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=phpmyadmin/}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= tron@NetBSD.org 9MAINTAINER= tron@NetBSD.org
10HOMEPAGE= http://www.phpmyadmin.net/ 10HOMEPAGE= http://www.phpmyadmin.net/
11COMMENT= Set of PHP-scripts to adminstrate MySQL over the WWW 11COMMENT= Set of PHP-scripts to adminstrate MySQL over the WWW
12 12
13DEPENDS+= ${PHP_PKG_PREFIX}-mbstring>=4.3.3:../../misc/php-mbstring 13DEPENDS+= ${PHP_PKG_PREFIX}-mbstring>=4.3.3:../../misc/php-mbstring
14DEPENDS+= ${PHP_PKG_PREFIX}-mysql{,i}>=4.3.3:../../databases/php-mysql 14DEPENDS+= ${PHP_PKG_PREFIX}-mysql{,i}>=4.3.3:../../databases/php-mysql
15 15
16PKG_DESTDIR_SUPPORT= user-destdir 16PKG_DESTDIR_SUPPORT= user-destdir
17 17
18FILES_SUBST+= CONF_INC_PHP=${CONF_INC_PHP:Q} PMCONFFILE=${PMCONFFILE:Q} 18FILES_SUBST+= CONF_INC_PHP=${CONF_INC_PHP:Q} PMCONFFILE=${PMCONFFILE:Q}
19PLIST_SUBST+= DIST_VERSION=${DIST_VERSION:Q} 19PLIST_SUBST+= DIST_VERSION=${DIST_VERSION:Q}
20MESSAGE_SUBST+= CONF_INC_PHP=${CONF_INC_PHP} PMCONFFILE=${PMCONFFILE:Q} \ 20MESSAGE_SUBST+= CONF_INC_PHP=${CONF_INC_PHP} PMCONFFILE=${PMCONFFILE:Q} \
21 EXDIR=${EXDIR:Q} 21 EXDIR=${EXDIR:Q}
22USE_TOOLS+= perl:run 22USE_TOOLS+= perl:run
23 23
24CONF_INC_PHP= ${PREFIX}/share/phpmyadmin/config.inc.php 24CONF_INC_PHP= ${PREFIX}/share/phpmyadmin/config.inc.php
25DIST_VERSION= 2.11.5.1 25DIST_VERSION= 2.11.5.2
26DOC_FILES= CREDITS ChangeLog \ 26DOC_FILES= CREDITS ChangeLog \
27 Documentation.txt INSTALL LICENSE README \ 27 Documentation.txt INSTALL LICENSE README \
28 RELEASE-DATE-${DIST_VERSION} TODO 28 RELEASE-DATE-${DIST_VERSION} TODO
29 29
30APACHE_USER?= www 30APACHE_USER?= www
31APACHE_GROUP?= www 31APACHE_GROUP?= www
32PKG_GROUPS= ${APACHE_GROUP} 32PKG_GROUPS= ${APACHE_GROUP}
33PKG_USERS= ${APACHE_USER}:${APACHE_GROUP} 33PKG_USERS= ${APACHE_USER}:${APACHE_GROUP}
34BUILD_DEFS+= APACHE_USER APACHE_GROUP 34BUILD_DEFS+= APACHE_USER APACHE_GROUP
35 35
36PKG_USERS_VARS+= APACHE_USER 36PKG_USERS_VARS+= APACHE_USER
37PKG_GROUPS_VARS+= APACHE_GROUP 37PKG_GROUPS_VARS+= APACHE_GROUP
38 38
cvs diff -r1.32 -r1.32.2.1 pkgsrc/databases/phpmyadmin/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/phpmyadmin/distinfo 2008/04/01 16:11:21 1.32
+++ pkgsrc/databases/phpmyadmin/distinfo 2008/04/28 10:41:30 1.32.2.1
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
1$NetBSD: distinfo,v 1.32 2008/04/01 16:11:21 tron Exp $ 1$NetBSD: distinfo,v 1.32.2.1 2008/04/28 10:41:30 rtr Exp $
2 2
3SHA1 (phpMyAdmin-2.11.5.1-all-languages.tar.bz2) = f6fd9e7ef6e469fa850903efa156e11b2be8f7f8 3SHA1 (phpMyAdmin-2.11.5.2-all-languages.tar.bz2) = 13eae6eb086da00ff64720f473fe2ed9fcfd874b
4RMD160 (phpMyAdmin-2.11.5.1-all-languages.tar.bz2) = 4a72fb1c7becb6d0ffa7d0d69f3c735d3277d6af 4RMD160 (phpMyAdmin-2.11.5.2-all-languages.tar.bz2) = 5b034c1c75da11cb05f4e9a5e9109f8383787cd7
5Size (phpMyAdmin-2.11.5.1-all-languages.tar.bz2) = 3092857 bytes 5Size (phpMyAdmin-2.11.5.2-all-languages.tar.bz2) = 3093323 bytes