[pkgsrc/trunk]: pkgsrc/databases/phpmyadmin Update phpmyadmin to 4.6.3, inclu...

[taca <taca%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/61a8e9110627
branches:  trunk
changeset: 349093:61a8e9110627
user:      taca <taca%pkgsrc.org@localhost>
date:      Tue Jun 28 13:32:35 2016 +0000

description:
Update phpmyadmin to 4.6.3, including security fixes.

pkgsrc change:
* Update MASTER_SITES.
* Now allow php70.

Changes are too many to write here, please refer ChangeLog.

diffstat:

 databases/phpmyadmin/Makefile |    8 +-
 databases/phpmyadmin/PLIST    |  664 +++++++++++++++++++++--------------------
 databases/phpmyadmin/distinfo |   10 +-
 3 files changed, 343 insertions(+), 339 deletions(-)

diffs (truncated from 1318 to 300 lines):

diff -r ec0028dd4eb7 -r 61a8e9110627 databases/phpmyadmin/Makefile
--- a/databases/phpmyadmin/Makefile     Tue Jun 28 13:28:59 2016 +0000
+++ b/databases/phpmyadmin/Makefile     Tue Jun 28 13:32:35 2016 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.147 2015/12/06 12:13:12 taca Exp $
+# $NetBSD: Makefile,v 1.148 2016/06/28 13:32:35 taca Exp $
 
 DISTNAME=      phpMyAdmin-${DIST_VERSION}-all-languages
 PKGNAME=       phpmyadmin-${DIST_VERSION:S/-//}
 CATEGORIES=    databases www
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=phpmyadmin/}
+MASTER_SITES=  https://files.phpmyadmin.net/phpMyAdmin/${DIST_VERSION}/
 EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -21,8 +21,6 @@
 DEPENDS+=      ${PHP_PKG_PREFIX}-mcrypt>=5.3.0:../../security/php-mcrypt
 DEPENDS+=      ${PHP_PKG_PREFIX}-json>=5.3.0:../../textproc/php-json
 
-PHP_VERSIONS_ACCEPTED= 55 56
-
 FILES_SUBST+=  APACHE_GROUP=${APACHE_GROUP} APACHE_USER=${APACHE_USER}
 FILES_SUBST+=  PMSETUPDIR=${PMSETUPDIR} PMSETUPFILE=${PMSETUPFILE}
 PLIST_SUBST+=  DIST_VERSION=${DIST_VERSION:Q}
@@ -30,7 +28,7 @@
                EXDIR=${EXDIR:Q}
 
 CONF_INC_PHP=  ${PREFIX}/share/phpmyadmin/config.inc.php
-DIST_VERSION=  4.3.12
+DIST_VERSION=  4.6.3
 DOC_FILES=     ChangeLog LICENSE README RELEASE-DATE-${DIST_VERSION}
 
 APACHE_USER?=  www
diff -r ec0028dd4eb7 -r 61a8e9110627 databases/phpmyadmin/PLIST
--- a/databases/phpmyadmin/PLIST        Tue Jun 28 13:28:59 2016 +0000
+++ b/databases/phpmyadmin/PLIST        Tue Jun 28 13:32:35 2016 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.41 2015/01/12 08:35:37 tron Exp $
+@comment $NetBSD: PLIST,v 1.42 2016/06/28 13:32:35 taca Exp $
 share/doc/phpmyadmin/ChangeLog
 share/doc/phpmyadmin/LICENSE
 share/doc/phpmyadmin/README
@@ -6,32 +6,27 @@
 share/examples/phpmyadmin/apache.conf
 share/examples/phpmyadmin/config.inc.php
 share/examples/phpmyadmin/config.manyhosts.inc.php
-share/examples/phpmyadmin/create_tables.sql
-share/examples/phpmyadmin/create_tables_drizzle.sql
 share/examples/phpmyadmin/openid.php
 share/examples/phpmyadmin/signon-script.php
 share/examples/phpmyadmin/signon.php
 share/examples/phpmyadmin/swekey.sample.conf
-share/examples/phpmyadmin/upgrade_column_info_4_3_0+.sql
-share/examples/phpmyadmin/upgrade_tables_mysql_4_1_2+.sql
 share/phpmyadmin/browse_foreigners.php
 share/phpmyadmin/changelog.php
 share/phpmyadmin/chk_rel.php
 share/phpmyadmin/config.inc.php
 share/phpmyadmin/db_central_columns.php
-share/phpmyadmin/db_create.php
 share/phpmyadmin/db_datadict.php
 share/phpmyadmin/db_designer.php
 share/phpmyadmin/db_events.php
 share/phpmyadmin/db_export.php
 share/phpmyadmin/db_import.php
 share/phpmyadmin/db_operations.php
-share/phpmyadmin/db_printview.php
 share/phpmyadmin/db_qbe.php
 share/phpmyadmin/db_routines.php
 share/phpmyadmin/db_search.php
 share/phpmyadmin/db_sql.php
 share/phpmyadmin/db_sql_autocomplete.php
+share/phpmyadmin/db_sql_format.php
 share/phpmyadmin/db_structure.php
 share/phpmyadmin/db_tracking.php
 share/phpmyadmin/db_triggers.php
@@ -62,6 +57,7 @@
 share/phpmyadmin/doc/html/faq.html
 share/phpmyadmin/doc/html/genindex.html
 share/phpmyadmin/doc/html/glossary.html
+share/phpmyadmin/doc/html/import_export.html
 share/phpmyadmin/doc/html/index.html
 share/phpmyadmin/doc/html/intro.html
 share/phpmyadmin/doc/html/objects.inv
@@ -83,16 +79,15 @@
 share/phpmyadmin/import.php
 share/phpmyadmin/import_status.php
 share/phpmyadmin/index.php
-share/phpmyadmin/js/OpenStreetMap.js
 share/phpmyadmin/js/ajax.js
 share/phpmyadmin/js/big_ints.js
-share/phpmyadmin/js/canvg/MIT-LICENSE.txt
-share/phpmyadmin/js/canvg/canvg.js
 share/phpmyadmin/js/chart.js
 share/phpmyadmin/js/codemirror/LICENSE
+share/phpmyadmin/js/codemirror/addon/hint/show-hint.css
 share/phpmyadmin/js/codemirror/addon/hint/show-hint.js
 share/phpmyadmin/js/codemirror/addon/hint/sql-hint.js
 share/phpmyadmin/js/codemirror/addon/runmode/runmode.js
+share/phpmyadmin/js/codemirror/lib/codemirror.css
 share/phpmyadmin/js/codemirror/lib/codemirror.js
 share/phpmyadmin/js/codemirror/mode/sql/sql.js
 share/phpmyadmin/js/common.js
@@ -104,6 +99,7 @@
 share/phpmyadmin/js/db_qbe.js
 share/phpmyadmin/js/db_search.js
 share/phpmyadmin/js/db_structure.js
+share/phpmyadmin/js/db_tracking.js
 share/phpmyadmin/js/doclinks.js
 share/phpmyadmin/js/error_report.js
 share/phpmyadmin/js/export.js
@@ -113,7 +109,6 @@
 share/phpmyadmin/js/gis_data_editor.js
 share/phpmyadmin/js/import.js
 share/phpmyadmin/js/indexes.js
-share/phpmyadmin/js/jqplot/excanvas.js
 share/phpmyadmin/js/jqplot/jquery.jqplot.js
 share/phpmyadmin/js/jqplot/plugins/jqplot.barRenderer.js
 share/phpmyadmin/js/jqplot/plugins/jqplot.byteFormatter.js
@@ -126,8 +121,9 @@
 share/phpmyadmin/js/jqplot/plugins/jqplot.pieRenderer.js
 share/phpmyadmin/js/jqplot/plugins/jqplot.pointLabels.js
 share/phpmyadmin/js/jquery/MIT-LICENSE.txt
-share/phpmyadmin/js/jquery/jquery-1.8.3.min.js
-share/phpmyadmin/js/jquery/jquery-ui-1.9.2.custom.min.js
+share/phpmyadmin/js/jquery/additional-methods.js
+share/phpmyadmin/js/jquery/jquery-2.1.4.min.js
+share/phpmyadmin/js/jquery/jquery-ui-1.11.4.min.js
 share/phpmyadmin/js/jquery/jquery-ui-timepicker-addon.js
 share/phpmyadmin/js/jquery/jquery.ba-hashchange-1.3.js
 share/phpmyadmin/js/jquery/jquery.cookie.js
@@ -139,43 +135,50 @@
 share/phpmyadmin/js/jquery/jquery.svg.js
 share/phpmyadmin/js/jquery/jquery.tablesorter.js
 share/phpmyadmin/js/jquery/jquery.uitablefilter.js
+share/phpmyadmin/js/jquery/jquery.validate.js
 share/phpmyadmin/js/jquery/src/README
-share/phpmyadmin/js/jquery/src/jquery-ui/jquery.ui.accordion.js
-share/phpmyadmin/js/jquery/src/jquery-ui/jquery.ui.autocomplete.js
-share/phpmyadmin/js/jquery/src/jquery-ui/jquery.ui.button.js
-share/phpmyadmin/js/jquery/src/jquery-ui/jquery.ui.core.js
-share/phpmyadmin/js/jquery/src/jquery-ui/jquery.ui.datepicker.js
-share/phpmyadmin/js/jquery/src/jquery-ui/jquery.ui.dialog.js
-share/phpmyadmin/js/jquery/src/jquery-ui/jquery.ui.draggable.js
-share/phpmyadmin/js/jquery/src/jquery-ui/jquery.ui.droppable.js
-share/phpmyadmin/js/jquery/src/jquery-ui/jquery.ui.effect-blind.js
-share/phpmyadmin/js/jquery/src/jquery-ui/jquery.ui.effect-bounce.js
-share/phpmyadmin/js/jquery/src/jquery-ui/jquery.ui.effect-clip.js
-share/phpmyadmin/js/jquery/src/jquery-ui/jquery.ui.effect-drop.js
-share/phpmyadmin/js/jquery/src/jquery-ui/jquery.ui.effect-explode.js
-share/phpmyadmin/js/jquery/src/jquery-ui/jquery.ui.effect-fade.js
-share/phpmyadmin/js/jquery/src/jquery-ui/jquery.ui.effect-fold.js
-share/phpmyadmin/js/jquery/src/jquery-ui/jquery.ui.effect-highlight.js
-share/phpmyadmin/js/jquery/src/jquery-ui/jquery.ui.effect-pulsate.js
-share/phpmyadmin/js/jquery/src/jquery-ui/jquery.ui.effect-scale.js
-share/phpmyadmin/js/jquery/src/jquery-ui/jquery.ui.effect-shake.js
-share/phpmyadmin/js/jquery/src/jquery-ui/jquery.ui.effect-slide.js
-share/phpmyadmin/js/jquery/src/jquery-ui/jquery.ui.effect-transfer.js
-share/phpmyadmin/js/jquery/src/jquery-ui/jquery.ui.effect.js
-share/phpmyadmin/js/jquery/src/jquery-ui/jquery.ui.menu.js
-share/phpmyadmin/js/jquery/src/jquery-ui/jquery.ui.mouse.js
-share/phpmyadmin/js/jquery/src/jquery-ui/jquery.ui.position.js
-share/phpmyadmin/js/jquery/src/jquery-ui/jquery.ui.progressbar.js
-share/phpmyadmin/js/jquery/src/jquery-ui/jquery.ui.resizable.js
-share/phpmyadmin/js/jquery/src/jquery-ui/jquery.ui.selectable.js
-share/phpmyadmin/js/jquery/src/jquery-ui/jquery.ui.slider.js
-share/phpmyadmin/js/jquery/src/jquery-ui/jquery.ui.sortable.js
-share/phpmyadmin/js/jquery/src/jquery-ui/jquery.ui.spinner.js
-share/phpmyadmin/js/jquery/src/jquery-ui/jquery.ui.tabs.js
-share/phpmyadmin/js/jquery/src/jquery-ui/jquery.ui.tooltip.js
-share/phpmyadmin/js/jquery/src/jquery-ui/jquery.ui.widget.js
+share/phpmyadmin/js/jquery/src/jquery-ui/accordion.js
+share/phpmyadmin/js/jquery/src/jquery-ui/autocomplete.js
+share/phpmyadmin/js/jquery/src/jquery-ui/button.js
+share/phpmyadmin/js/jquery/src/jquery-ui/core.js
+share/phpmyadmin/js/jquery/src/jquery-ui/datepicker.js
+share/phpmyadmin/js/jquery/src/jquery-ui/dialog.js
+share/phpmyadmin/js/jquery/src/jquery-ui/draggable.js
+share/phpmyadmin/js/jquery/src/jquery-ui/droppable.js
+share/phpmyadmin/js/jquery/src/jquery-ui/effect-blind.js
+share/phpmyadmin/js/jquery/src/jquery-ui/effect-bounce.js
+share/phpmyadmin/js/jquery/src/jquery-ui/effect-clip.js
+share/phpmyadmin/js/jquery/src/jquery-ui/effect-drop.js
+share/phpmyadmin/js/jquery/src/jquery-ui/effect-explode.js
+share/phpmyadmin/js/jquery/src/jquery-ui/effect-fade.js
+share/phpmyadmin/js/jquery/src/jquery-ui/effect-fold.js
+share/phpmyadmin/js/jquery/src/jquery-ui/effect-highlight.js
+share/phpmyadmin/js/jquery/src/jquery-ui/effect-puff.js
+share/phpmyadmin/js/jquery/src/jquery-ui/effect-pulsate.js
+share/phpmyadmin/js/jquery/src/jquery-ui/effect-scale.js
+share/phpmyadmin/js/jquery/src/jquery-ui/effect-shake.js
+share/phpmyadmin/js/jquery/src/jquery-ui/effect-size.js
+share/phpmyadmin/js/jquery/src/jquery-ui/effect-slide.js
+share/phpmyadmin/js/jquery/src/jquery-ui/effect-transfer.js
+share/phpmyadmin/js/jquery/src/jquery-ui/effect.js
+share/phpmyadmin/js/jquery/src/jquery-ui/menu.js
+share/phpmyadmin/js/jquery/src/jquery-ui/mouse.js
+share/phpmyadmin/js/jquery/src/jquery-ui/position.js
+share/phpmyadmin/js/jquery/src/jquery-ui/progressbar.js
+share/phpmyadmin/js/jquery/src/jquery-ui/resizable.js
+share/phpmyadmin/js/jquery/src/jquery-ui/selectable.js
+share/phpmyadmin/js/jquery/src/jquery-ui/selectmenu.js
+share/phpmyadmin/js/jquery/src/jquery-ui/slider.js
+share/phpmyadmin/js/jquery/src/jquery-ui/sortable.js
+share/phpmyadmin/js/jquery/src/jquery-ui/spinner.js
+share/phpmyadmin/js/jquery/src/jquery-ui/tabs.js
+share/phpmyadmin/js/jquery/src/jquery-ui/tooltip.js
+share/phpmyadmin/js/jquery/src/jquery-ui/widget.js
 share/phpmyadmin/js/jquery/src/jquery/ajax.js
 share/phpmyadmin/js/jquery/src/jquery/ajax/jsonp.js
+share/phpmyadmin/js/jquery/src/jquery/ajax/load.js
+share/phpmyadmin/js/jquery/src/jquery/ajax/parseJSON.js
+share/phpmyadmin/js/jquery/src/jquery/ajax/parseXML.js
 share/phpmyadmin/js/jquery/src/jquery/ajax/script.js
 share/phpmyadmin/js/jquery/src/jquery/ajax/xhr.js
 share/phpmyadmin/js/jquery/src/jquery/attributes.js
@@ -187,17 +190,17 @@
 share/phpmyadmin/js/jquery/src/jquery/deprecated.js
 share/phpmyadmin/js/jquery/src/jquery/dimensions.js
 share/phpmyadmin/js/jquery/src/jquery/effects.js
-share/phpmyadmin/js/jquery/src/jquery/event-alias.js
 share/phpmyadmin/js/jquery/src/jquery/event.js
 share/phpmyadmin/js/jquery/src/jquery/intro.js
+share/phpmyadmin/js/jquery/src/jquery/jquery.js
 share/phpmyadmin/js/jquery/src/jquery/manipulation.js
 share/phpmyadmin/js/jquery/src/jquery/offset.js
 share/phpmyadmin/js/jquery/src/jquery/outro.js
 share/phpmyadmin/js/jquery/src/jquery/queue.js
 share/phpmyadmin/js/jquery/src/jquery/selector-native.js
+share/phpmyadmin/js/jquery/src/jquery/selector-sizzle.js
+share/phpmyadmin/js/jquery/src/jquery/selector.js
 share/phpmyadmin/js/jquery/src/jquery/serialize.js
-share/phpmyadmin/js/jquery/src/jquery/sizzle-jquery.js
-share/phpmyadmin/js/jquery/src/jquery/support.js
 share/phpmyadmin/js/jquery/src/jquery/traversing.js
 share/phpmyadmin/js/jquery/src/jquery/wrap.js
 share/phpmyadmin/js/keyhandler.js
@@ -205,6 +208,7 @@
 share/phpmyadmin/js/makegrid.js
 share/phpmyadmin/js/menu-resizer.js
 share/phpmyadmin/js/messages.php
+share/phpmyadmin/js/microhistory.js
 share/phpmyadmin/js/multi_column_sort.js
 share/phpmyadmin/js/navigation.js
 share/phpmyadmin/js/normalization.js
@@ -232,7 +236,6 @@
 share/phpmyadmin/js/openlayers/img/zoom-plus-mini.png
 share/phpmyadmin/js/openlayers/img/zoom-world-mini.png
 share/phpmyadmin/js/openlayers/img/zoombar.png
-share/phpmyadmin/js/openlayers/src/README
 share/phpmyadmin/js/openlayers/src/openlayers/lib/Firebug/errorIcon.png
 share/phpmyadmin/js/openlayers/src/openlayers/lib/Firebug/firebug.css
 share/phpmyadmin/js/openlayers/src/openlayers/lib/Firebug/firebug.html
@@ -242,12 +245,12 @@
 share/phpmyadmin/js/openlayers/src/openlayers/lib/Firebug/license.txt
 share/phpmyadmin/js/openlayers/src/openlayers/lib/Firebug/readme.txt
 share/phpmyadmin/js/openlayers/src/openlayers/lib/Firebug/warningIcon.png
-share/phpmyadmin/js/openlayers/src/openlayers/lib/Gears/gears_init.js
 share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers.js
-share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Ajax.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Animation.js
 share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/BaseTypes.js
 share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/BaseTypes/Bounds.js
 share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/BaseTypes/Class.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/BaseTypes/Date.js
 share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/BaseTypes/Element.js
 share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/BaseTypes/LonLat.js
 share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/BaseTypes/Pixel.js
@@ -257,19 +260,20 @@
 share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/ArgParser.js
 share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/Attribution.js
 share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/Button.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/CacheRead.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/CacheWrite.js
 share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/DragFeature.js
 share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/DragPan.js
 share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/DrawFeature.js
 share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/EditingToolbar.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/Geolocate.js
 share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/GetFeature.js
 share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/Graticule.js
 share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/KeyboardDefaults.js
 share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/LayerSwitcher.js
 share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/Measure.js
 share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/ModifyFeature.js
-share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/MouseDefaults.js
 share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/MousePosition.js
-share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/MouseToolbar.js
 share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/NavToolbar.js
 share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/Navigation.js
 share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/NavigationHistory.js
@@ -280,15 +284,19 @@
 share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/PanZoomBar.js
 share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/Panel.js
 share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/Permalink.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/PinchZoom.js
 share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/SLDSelect.js
 share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/Scale.js
 share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/ScaleLine.js
 share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/SelectFeature.js