CVS commit: pkgsrc/databases/phpmyadmin

["Thomas Merkel" <tm%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tm
Date:           Wed Nov 11 11:56:14 UTC 2020

Modified Files:
        pkgsrc/databases/phpmyadmin: Makefile PLIST distinfo

Log Message:
phpmyadmin: update to 4.9.7

4.9.7 (2020-10-15)
- issue #16397 Fix compatibility problems with older PHP versions (also issue #16399)
- issue #16396 Fix broken two-factor authentication

4.9.6 (2020-10-09)
- issue        [security] Fix XSS vulnerability with the transformation feature (PMASA-2020-5)
- issue        [security] Fix SQL injection vulnerability with search feature (PMASA-2020-6)


To generate a diff of this commit:
cvs rdiff -u -r1.164 -r1.165 pkgsrc/databases/phpmyadmin/Makefile
cvs rdiff -u -r1.51 -r1.52 pkgsrc/databases/phpmyadmin/PLIST
cvs rdiff -u -r1.113 -r1.114 pkgsrc/databases/phpmyadmin/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/phpmyadmin/Makefile
diff -u pkgsrc/databases/phpmyadmin/Makefile:1.164 pkgsrc/databases/phpmyadmin/Makefile:1.165
--- pkgsrc/databases/phpmyadmin/Makefile:1.164  Fri May 22 19:26:38 2020
+++ pkgsrc/databases/phpmyadmin/Makefile        Wed Nov 11 11:56:14 2020
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.164 2020/05/22 19:26:38 rillig Exp $
+# $NetBSD: Makefile,v 1.165 2020/11/11 11:56:14 tm Exp $
 
-DISTNAME=      phpMyAdmin-4.9.5-all-languages
+DISTNAME=      phpMyAdmin-4.9.7-all-languages
 PKGNAME=       ${PHP_PKG_PREFIX}-${DISTNAME:S/-all-languages//:tl}
 CATEGORIES=    databases www
 MASTER_SITES=  https://files.phpmyadmin.net/phpMyAdmin/${PKGVERSION_NOREV}/
@@ -28,6 +28,7 @@ DEPENDS+=     ${PHP_PKG_PREFIX}-mcrypt>=5.3.
 DEPENDS+=      ${PHP_PKG_PREFIX}-pecl-mcrypt>=1.0.1:../../security/php-pecl-mcrypt
 .endif
 
+USE_LANGUAGE=  # none
 USE_TOOLS+=    pax
 
 APACHE_USER?=  www
@@ -46,7 +47,7 @@ FILES_SUBST+= APACHE_GROUP=${APACHE_GROU
 FILES_SUBST+=  PMCONFDIR=${PMCONFDIR} PMVARDIR=${PMVARDIR}
 MESSAGE_SUBST+=        PMCONFDIR=${PMCONFDIR} PMCONFFILE=${PMCONFFILE}
 
-DOC_FILES=     ChangeLog CODE_OF_CONDUCT.md CONTRIBUTING.md DCO LICENSE \
+DOC_FILES=     ChangeLog CONTRIBUTING.md LICENSE \
                README RELEASE-DATE-${PKGVERSION_NOREV}
 
 EXDIR=         ${PREFIX}/share/examples/phpmyadmin

Index: pkgsrc/databases/phpmyadmin/PLIST
diff -u pkgsrc/databases/phpmyadmin/PLIST:1.51 pkgsrc/databases/phpmyadmin/PLIST:1.52
--- pkgsrc/databases/phpmyadmin/PLIST:1.51      Wed Apr  1 08:36:16 2020
+++ pkgsrc/databases/phpmyadmin/PLIST   Wed Nov 11 11:56:14 2020
@@ -1,8 +1,6 @@
-@comment $NetBSD: PLIST,v 1.51 2020/04/01 08:36:16 tm Exp $
-share/doc/phpmyadmin/CODE_OF_CONDUCT.md
+@comment $NetBSD: PLIST,v 1.52 2020/11/11 11:56:14 tm Exp $
 share/doc/phpmyadmin/CONTRIBUTING.md
 share/doc/phpmyadmin/ChangeLog
-share/doc/phpmyadmin/DCO
 share/doc/phpmyadmin/LICENSE
 share/doc/phpmyadmin/README
 share/doc/phpmyadmin/RELEASE-DATE-${PKGVERSION}
@@ -1671,6 +1669,7 @@ share/phpmyadmin/vendor/paragonie/random
 share/phpmyadmin/vendor/paragonie/random_compat/lib/random_bytes_libsodium_legacy.php
 share/phpmyadmin/vendor/paragonie/random_compat/lib/random_bytes_mcrypt.php
 share/phpmyadmin/vendor/paragonie/random_compat/lib/random_int.php
+share/phpmyadmin/vendor/paragonie/random_compat/phpunit-autoload.php
 share/phpmyadmin/vendor/phpmyadmin/motranslator/.github/stale.yml
 share/phpmyadmin/vendor/phpmyadmin/motranslator/CHANGES.md
 share/phpmyadmin/vendor/phpmyadmin/motranslator/CONTRIBUTING.md

Index: pkgsrc/databases/phpmyadmin/distinfo
diff -u pkgsrc/databases/phpmyadmin/distinfo:1.113 pkgsrc/databases/phpmyadmin/distinfo:1.114
--- pkgsrc/databases/phpmyadmin/distinfo:1.113  Wed Apr  1 08:36:16 2020
+++ pkgsrc/databases/phpmyadmin/distinfo        Wed Nov 11 11:56:14 2020
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.113 2020/04/01 08:36:16 tm Exp $
+$NetBSD: distinfo,v 1.114 2020/11/11 11:56:14 tm Exp $
 
-SHA1 (phpMyAdmin-4.9.5-all-languages.tar.xz) = 25b733a5917d2f40df69a39d3719fb8b7204054f
-RMD160 (phpMyAdmin-4.9.5-all-languages.tar.xz) = 7e8eedaa60babe520905298f778f887693b7b971
-SHA512 (phpMyAdmin-4.9.5-all-languages.tar.xz) = 555f07f087d8bcddd114df0b86fa21872f14f45c31e0f63eea499e76fdebdfd8abebcc88662887418e80ddebfea73d6aaac17856cf433d1855423b5145865d1a
-Size (phpMyAdmin-4.9.5-all-languages.tar.xz) = 6138948 bytes
+SHA1 (phpMyAdmin-4.9.7-all-languages.tar.xz) = f96e72f1205abf72a2f5c052a8d85977b584284b
+RMD160 (phpMyAdmin-4.9.7-all-languages.tar.xz) = 77e88cbc1297a9dedefd1e78347aeb00a79932b9
+SHA512 (phpMyAdmin-4.9.7-all-languages.tar.xz) = 15f3e34a626f4ca80a42f015fed89dc5d3d681b4a3bcdb00f1ea6bf52cca1060d61b5c4c8875a697ca20be0f89862bf95edad0a150092d67c273ebddae03f311
+Size (phpMyAdmin-4.9.7-all-languages.tar.xz) = 6147004 bytes
 SHA1 (patch-libraries_vendor__config.php) = b758f5550dd7226d88293fa6614b2283cbd8e3ea