From c919062460f7bdd940d601d0725a14c43a9df7f7 Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 23 Aug 2016 15:53:14 +0000 Subject: Update phpmyadmin to 4.6.4. pkgsrc changes: * Overhaul Makefile. - Remove use of INSTALL_DIRS and simplify install process. - Utilize pkgsrc SUBST_*. - Stop other pkglint warninggs. * Drop some dot files from installation. Quote from Changes: 4.6.4 (2016-08-16) - issue [security] Weaknesses with cookie encryption, see PMASA-2016-29 - issue [security] Improve session cookie code for openid.php and signon.php example files - issue [security] Full path disclosure in openid.php and signon.php example files - issue [security] Multiple XSS vulnerabilities, see PMASA-2016-30 - issue [security] Multiple XSS vulnerabilities, see PMASA-2016-31 - issue [security] Unsafe generation of BlowfishSecret (when not supplied by the user) - issue [security] Referrer leak when phpinfo is enabled - issue [security] PHP code injection, see PMASA-2016-32 - issue [security] Full path disclosure, see PMASA-2016-33 - issue [security] SQL injection attack, see PMASA-2016-34 - issue [security] Local file exposure through LOAD DATA LOCAL INFILE, see PMASA-2016-35 - issue [security] Local file exposure through symlinks with UploadDir, see PMASA-2016-36 - issue [security] Path traversal with SaveDir and UploadDir, see PMASA-2016-37 - issue [security] Multiple XSS vulnerabilities, see PMASA-2016-38 - issue [security] SQL injection vulnerability as control user, see PMASA-2016-39 - issue [security] SQL injection vulnerability, see PMASA-2016-40 - issue [security] Denial-of-service attack through transformation feature, see PMASA-2016-41 - issue [security] SQL injection vulnerability as control user, see PMASA-2016-42 - issue [security] Verify data before unserializing, see PMASA-2016-43 - issue [security] Use HTTPS for wiki links - issue Remove Swekey support - issue [security] SSRF in setup script, see PMASA-2016-44 - issue [security] Denial-of-service attack with $cfg['AllowArbitraryServer'] = true and persistent connections, see PMASA-2016-45 - issue [security] Improve SSL certificate handling - issue [security] Fix full path disclosure in debugging code - issue [security] Possible circumvention of IP-based allow/deny rules with IPv6 and proxy server, see PMASA-2016-47 - issue [security] Detect if user is logged in, see PMASA-2016-48 - issue [security] Bypass URL redirection protection, see PMASA-2016-49 - issue [security] Referrer leak, see PMASA-2016-50 - issue [security] Reflected File Download, see PMASA-2016-51 - issue [security] ArbitraryServerRegexp bypass, see PMASA-2016-52 - issue [security] Denial-of-service attack by entering long password, see PMASA-2016-53 - issue [security] Remote code execution vulnerability when running as CGI, see PMASA-2016-054 - issue [security] Administrators could trigger SQL injection attack against users - issue [security] Denial-of-service attack when PHP uses dbase extension, see PMASA-2016-55 - issue [security] Remove tode execution vulnerability when PHP uses dbase extension, see PMASA-2016-56 - issue [security] Denial-of-service attack by using for loops, see PMASA-2016-46 - issue Include X-Robots-Tag header in responses - issue Enforce numeric field length when creating table - issue Fixed invalid Content-Length in some HTTP responses - issue #12394 Create view should require a view name - issue #12391 Message with 'Change password successfully' displayed, but does not take effect - issue Tighten control on PHP sessions and session cookies - issue #12409 Re-enable overhead on server databases view - issue #12414 Fixed rendering of Original theme - issue #12413 Fixed deleting users in non English locales - issue #12416 Fixed replication status output in Databases listing - issue #12303 Avoid typecasting to float when not needed - issue #12425 Duplicate message variable names in messages.inc.php - issue #12399 Adding index to table shows wrong top navigation - issue #12424 Fixed password change on MariaDB without auth plugin - issue #12339 Do not error on unset server port - issue #12422 Improvements to the original theme - issue #12395 Do not try to load old transformation plugins - issue #12423 Fixed replication status in database listing - issue #12433 Copy table with prefix does not copy the indexes - issue #12375 Search in database: Window content is not scrolling down when clicking first time on Browse link - issue #12346 SQL Editor textareas can have their size increased from the top, distorting the page view --- databases/phpmyadmin/MESSAGE | 6 +- databases/phpmyadmin/Makefile | 103 ++++----- databases/phpmyadmin/PLIST | 327 +++++++++++++++++++++++++++-- databases/phpmyadmin/distinfo | 10 +- databases/phpmyadmin/files/phpmyadmin.conf | 12 +- 5 files changed, 376 insertions(+), 82 deletions(-) (limited to 'databases/phpmyadmin') diff --git a/databases/phpmyadmin/MESSAGE b/databases/phpmyadmin/MESSAGE index 33b3d5b167d..e99b875fe14 100644 --- a/databases/phpmyadmin/MESSAGE +++ b/databases/phpmyadmin/MESSAGE @@ -1,5 +1,5 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.13 2011/12/26 16:38:29 tron Exp $ +$NetBSD: MESSAGE,v 1.14 2016/08/23 15:53:14 taca Exp $ Do *not* edit "${CONF_INC_PHP}" to customize this package because it is a link which will removed during upgrades. @@ -9,11 +9,11 @@ You will need to make phpMyAdmin accessible through your HTTP server. If you are running Apache and ap-php, then you can add the following line to httpd.conf: - Include ${EXDIR}/apache.conf + Include ${PKG_SYSCONFDIR}/apache.conf to make phpMyAdmin accessible through: - http://www.domain.com/phpmyadmin/ + http://www.example.com/phpmyadmin/ If you are setting up phpmyadmin for the first time you will need to comment out the configuration block in your apache.conf which denies diff --git a/databases/phpmyadmin/Makefile b/databases/phpmyadmin/Makefile index e6f1ac16a7c..5b0d8f871ff 100644 --- a/databases/phpmyadmin/Makefile +++ b/databases/phpmyadmin/Makefile @@ -1,21 +1,16 @@ -# $NetBSD: Makefile,v 1.149 2016/08/08 09:04:26 nils Exp $ +# $NetBSD: Makefile,v 1.150 2016/08/23 15:53:14 taca Exp $ -# When updating this package, please check there is no -# new INSTALL_DIRS to add. Remember pkg/51364 ;) - -DISTNAME= phpMyAdmin-${DIST_VERSION}-all-languages -PKGNAME= phpmyadmin-${DIST_VERSION:S/-//} +DISTNAME= phpMyAdmin-4.6.4-all-languages +PKGNAME= ${DISTNAME:S/-all-languages//:tl} CATEGORIES= databases www -MASTER_SITES= https://files.phpmyadmin.net/phpMyAdmin/${DIST_VERSION}/ +MASTER_SITES= https://files.phpmyadmin.net/phpMyAdmin/${PKGVERSION_NOREV}/ EXTRACT_SUFX= .tar.xz MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.phpmyadmin.net/ COMMENT= Set of PHP-scripts to adminstrate MySQL over the WWW LICENSE= gnu-gpl-v2 -PKGREVISION= 1 -USE_TOOLS+= pax bash DEPENDS+= ${PHP_PKG_PREFIX}-bz2>=5.3.0:../../archivers/php-bz2 DEPENDS+= ${PHP_PKG_PREFIX}-zip>=5.3.0:../../archivers/php-zip DEPENDS+= ${PHP_PKG_PREFIX}-zlib>=5.3.0:../../archivers/php-zlib @@ -26,25 +21,27 @@ DEPENDS+= ${PHP_PKG_PREFIX}-gd>=5.3.0:../../graphics/php-gd DEPENDS+= ${PHP_PKG_PREFIX}-mcrypt>=5.3.0:../../security/php-mcrypt DEPENDS+= ${PHP_PKG_PREFIX}-json>=5.3.0:../../textproc/php-json +USE_TOOLS+= pax + FILES_SUBST+= APACHE_GROUP=${APACHE_GROUP} APACHE_USER=${APACHE_USER} FILES_SUBST+= PMSETUPDIR=${PMSETUPDIR} PMSETUPFILE=${PMSETUPFILE} -PLIST_SUBST+= DIST_VERSION=${DIST_VERSION:Q} -MESSAGE_SUBST+= CONF_INC_PHP=${CONF_INC_PHP} PMCONFFILE=${PMCONFFILE:Q} \ - EXDIR=${EXDIR:Q} +MESSAGE_SUBST+= CONF_INC_PHP=${CONF_INC_PHP} PMCONFFILE=${PMCONFFILE} CONF_INC_PHP= ${PREFIX}/share/phpmyadmin/config.inc.php -DIST_VERSION= 4.6.3 -DOC_FILES= ChangeLog LICENSE README RELEASE-DATE-${DIST_VERSION} \ - CONTRIBUTING.md DCO +DOC_FILES= CONTRIBUTING.md ChangeLog DCO LICENSE README \ + RELEASE-DATE-${PKGVERSION_NOREV} + +.include "../../mk/bsd.prefs.mk" APACHE_USER?= www APACHE_GROUP?= www + PKG_GROUPS= ${APACHE_GROUP} PKG_USERS= ${APACHE_USER}:${APACHE_GROUP} -BUILD_DEFS+= APACHE_USER APACHE_GROUP +BUILD_DEFS+= APACHE_USER APACHE_GROUP VARBASE -PKG_USERS_VARS+= APACHE_USER -PKG_GROUPS_VARS+= APACHE_GROUP +PKG_USERS_VARS= APACHE_USER +PKG_GROUPS_VARS= APACHE_GROUP EXDIR= ${PREFIX}/share/examples/phpmyadmin PMCONFFILE= ${PKG_SYSCONFDIR}/config.inc.php @@ -52,63 +49,49 @@ PMSETUPDIR= ${VARBASE}/phpmyadmin PMSETUPFILE= ${PMSETUPDIR}/config.inc.php PMDIR= ${PREFIX}/share/phpmyadmin -PKG_SYSCONFSUBDIR?= phpmyadmin +CONF_FILES+= ${EXDIR}/apache.conf ${PKG_SYSCONFDIR}/apache.conf + +SRCS= *.css *.ico *.php *.txt doc/html js libraries locale setup \ + sql templates test themes + +PKG_SYSCONFSUBDIR= phpmyadmin NO_BUILD= yes -CHECK_INTERPRETER_SKIP+= share/phpmyadmin/config.inc.php +CHECK_INTERPRETER_SKIP= share/phpmyadmin/test/install-runkit + +SUBST_CLASSES+= paths +SUBST_FILES.paths+= ${WRKDIR}/phpmyadmin.conf +SUBST_FILES.paths+= ${WRKSRC}/libraries/vendor_config.php +SUBST_SED.paths+= -e "s|@PMDIR@|${PMDIR}|g" +SUBST_SED.paths+= -e 's|@@PMSETUPFILE@@|${PMSETUPFILE}|g' +SUBST_STAGE.paths= post-configure INSTALLATION_DIRS+= ${PREFIX}/share/doc/phpmyadmin \ ${PREFIX}/share/examples/phpmyadmin \ - ${PMDIR} ${PMDIR}/scripts + ${PMDIR}/doc ${PMDIR}/scripts -INSTALL_DIRS= doc/html -INSTALL_DIRS+= js -INSTALL_DIRS+= libraries -INSTALL_DIRS+= locale -INSTALL_DIRS+= setup -INSTALL_DIRS+= templates -INSTALL_DIRS+= themes - -.for dir in $(INSTALL_DIRS) -INSTALLATION_DIRS+= ${PMDIR}/${dir} -.endfor - -REPLACE_INTERPRETER+= bash -REPLACE.bash.old= .*sh[^ ]* -REPLACE.bash.new= ${TOOLS_PATH.bash} -REPLACE_FILES.bash= ${WRKSRC}/libraries/plugins/transformations/*.sh +post-extract: + ${CP} ${FILESDIR}/phpmyadmin.conf ${WRKDIR} do-configure: - ${SED} -e "s|@PMDIR@|${PMDIR}|g" ${FILESDIR}/phpmyadmin.conf \ - >${WRKDIR}/phpmyadmin.conf - cd ${WRKSRC}/libraries; \ - ${SED} -e "s#@@PMSETUPFILE@@#${PMSETUPFILE}#" vendor_config.php \ - >vendor_config.php.pkgsrc + cd ${WRKSRC}/libraries; \ + ${MV} ${WRKSRC}/config.sample.inc.php ${WRKDIR}/config.inc.php -do-install: - ${INSTALL_DATA} ${WRKSRC}/*.css ${DESTDIR}${PMDIR} - ${INSTALL_DATA} ${WRKSRC}/*.ico ${DESTDIR}${PMDIR} - ${INSTALL_DATA} ${WRKSRC}/*.php ${DESTDIR}${PMDIR} - ${INSTALL_DATA} ${WRKSRC}/*.txt ${DESTDIR}${PMDIR} +pre-install: + cd ${WRKSRC}; \ + ${FIND} . -type f \( -name .buildinfo -o -name .jshintrc -o -name '*.orig' \) -exec ${RM} -f -- {} \; - ${MV} ${DESTDIR}${PREFIX}/share/phpmyadmin/config.sample.inc.php \ - ${DESTDIR}${EXDIR}/config.inc.php +do-install: + cd ${WRKSRC} && pax -rw ${SRCS} ${DESTDIR}${PMDIR} + ${INSTALL_DATA} ${WRKDIR}/config.inc.php ${DESTDIR}${EXDIR} ${INSTALL_DATA} ${WRKSRC}/examples/* ${DESTDIR}${EXDIR} ${LN} -fs ${EXDIR} ${DESTDIR}${PREFIX}/share/phpmyadmin/examples - ${RM} -f ${WRKSRC}/libraries/vendor_config.php.orig - - for dir in ${INSTALL_DIRS}; do \ - cd ${WRKSRC}/$$dir && \ - pax -rw -pmp . ${DESTDIR}${PMDIR}/$$dir; \ - done - cd ${WRKSRC} && \ - ${INSTALL_DATA} ${DOC_FILES} ${DESTDIR}${PREFIX}/share/doc/phpmyadmin + ${INSTALL_DATA} ${DOC_FILES} \ + ${DESTDIR}${PREFIX}/share/doc/phpmyadmin ${INSTALL_DATA} ${WRKDIR}/phpmyadmin.conf ${DESTDIR}${EXDIR}/apache.conf - ${LN} -s ${PMCONFFILE} ${DESTDIR}${CONF_INC_PHP} - cd ${DESTDIR}${PREFIX}/share/phpmyadmin/libraries; \ - ${MV} -f vendor_config.php.pkgsrc vendor_config.php + ${LN} -fs ${PMCONFFILE} ${DESTDIR}${CONF_INC_PHP} .include "../../lang/php/phpversion.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/phpmyadmin/PLIST b/databases/phpmyadmin/PLIST index 88b10ca5a4e..05847b8abc5 100644 --- a/databases/phpmyadmin/PLIST +++ b/databases/phpmyadmin/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.43 2016/08/08 09:04:26 nils Exp $ +@comment $NetBSD: PLIST,v 1.44 2016/08/23 15:53:14 taca Exp $ share/doc/phpmyadmin/CONTRIBUTING.md share/doc/phpmyadmin/ChangeLog share/doc/phpmyadmin/DCO @@ -11,7 +11,6 @@ share/examples/phpmyadmin/config.manyhosts.inc.php share/examples/phpmyadmin/openid.php share/examples/phpmyadmin/signon-script.php share/examples/phpmyadmin/signon.php -share/examples/phpmyadmin/swekey.sample.conf share/phpmyadmin/browse_foreigners.php share/phpmyadmin/changelog.php share/phpmyadmin/chk_rel.php @@ -32,7 +31,7 @@ share/phpmyadmin/db_sql_format.php share/phpmyadmin/db_structure.php share/phpmyadmin/db_tracking.php share/phpmyadmin/db_triggers.php -share/phpmyadmin/doc/html/.buildinfo +share/phpmyadmin/doc/html/_images/usergroups.png share/phpmyadmin/doc/html/_sources/config.txt share/phpmyadmin/doc/html/_sources/copyright.txt share/phpmyadmin/doc/html/_sources/credits.txt @@ -161,7 +160,6 @@ 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/.jshintrc 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 @@ -199,7 +197,6 @@ 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/.jshintrc 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 @@ -945,16 +942,14 @@ share/phpmyadmin/libraries/plugins/auth/AuthenticationSignon.php share/phpmyadmin/libraries/plugins/auth/recaptcha/LICENSE share/phpmyadmin/libraries/plugins/auth/recaptcha/ReCaptcha/ReCaptcha.php share/phpmyadmin/libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod.php +share/phpmyadmin/libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod/Curl.php +share/phpmyadmin/libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod/CurlPost.php share/phpmyadmin/libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod/Post.php share/phpmyadmin/libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod/Socket.php share/phpmyadmin/libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod/SocketPost.php share/phpmyadmin/libraries/plugins/auth/recaptcha/ReCaptcha/RequestParameters.php share/phpmyadmin/libraries/plugins/auth/recaptcha/ReCaptcha/Response.php share/phpmyadmin/libraries/plugins/auth/recaptcha/autoload.php -share/phpmyadmin/libraries/plugins/auth/swekey/authentication.inc.php -share/phpmyadmin/libraries/plugins/auth/swekey/musbe-ca.crt -share/phpmyadmin/libraries/plugins/auth/swekey/swekey.auth.lib.php -share/phpmyadmin/libraries/plugins/auth/swekey/swekey.php share/phpmyadmin/libraries/plugins/export/ExportCodegen.php share/phpmyadmin/libraries/plugins/export/ExportCsv.php share/phpmyadmin/libraries/plugins/export/ExportExcel.php @@ -1036,8 +1031,6 @@ share/phpmyadmin/libraries/plugins/transformations/abs/SubstringTransformationsP share/phpmyadmin/libraries/plugins/transformations/abs/TextFileUploadTransformationsPlugin.php share/phpmyadmin/libraries/plugins/transformations/abs/TextImageLinkTransformationsPlugin.php share/phpmyadmin/libraries/plugins/transformations/abs/TextLinkTransformationsPlugin.php -share/phpmyadmin/libraries/plugins/transformations/generator_main_class.sh -share/phpmyadmin/libraries/plugins/transformations/generator_plugin.sh share/phpmyadmin/libraries/plugins/transformations/input/Image_JPEG_Upload.php share/phpmyadmin/libraries/plugins/transformations/input/Text_Plain_FileUpload.php share/phpmyadmin/libraries/plugins/transformations/input/Text_Plain_Iptobinary.php @@ -1263,7 +1256,6 @@ share/phpmyadmin/locale/zh_TW/LC_MESSAGES/phpmyadmin.mo share/phpmyadmin/logout.php share/phpmyadmin/navigation.php share/phpmyadmin/normalization.php -share/phpmyadmin/phpinfo.php share/phpmyadmin/phpmyadmin.css.php share/phpmyadmin/prefs_forms.php share/phpmyadmin/prefs_manage.php @@ -1305,6 +1297,9 @@ share/phpmyadmin/setup/styles.css share/phpmyadmin/setup/validate.php share/phpmyadmin/show_config_errors.php share/phpmyadmin/sql.php +share/phpmyadmin/sql/create_tables.sql +share/phpmyadmin/sql/upgrade_column_info_4_3_0+.sql +share/phpmyadmin/sql/upgrade_tables_mysql_4_1_2+.sql share/phpmyadmin/tbl_addfield.php share/phpmyadmin/tbl_change.php share/phpmyadmin/tbl_chart.php @@ -1452,6 +1447,313 @@ share/phpmyadmin/templates/test/echo.phtml share/phpmyadmin/templates/test/set_helper.phtml share/phpmyadmin/templates/test/static.phtml share/phpmyadmin/templates/test/trim.phtml +share/phpmyadmin/test/.htaccess +share/phpmyadmin/test/AllSeleniumTests.php +share/phpmyadmin/test/Environment_test.php +share/phpmyadmin/test/PMATestCase.php +share/phpmyadmin/test/README.rst +share/phpmyadmin/test/bootstrap-dist.php +share/phpmyadmin/test/classes/AdvisorTest.php +share/phpmyadmin/test/classes/ConfigGeneratorTest.php +share/phpmyadmin/test/classes/ConfigTest.php +share/phpmyadmin/test/classes/DatabaseInterfaceTest.php +share/phpmyadmin/test/classes/DbQbeTest.php +share/phpmyadmin/test/classes/DbSearchTest.php +share/phpmyadmin/test/classes/DisplayResultsTest.php +share/phpmyadmin/test/classes/ErrorHandlerTest.php +share/phpmyadmin/test/classes/ErrorTest.php +share/phpmyadmin/test/classes/FileTest.php +share/phpmyadmin/test/classes/FontTest.php +share/phpmyadmin/test/classes/FooterTest.php +share/phpmyadmin/test/classes/HeaderTest.php +share/phpmyadmin/test/classes/IndexTest.php +share/phpmyadmin/test/classes/LanguageTest.php +share/phpmyadmin/test/classes/LinterTest.php +share/phpmyadmin/test/classes/ListDatabaseTest.php +share/phpmyadmin/test/classes/MenuTest.php +share/phpmyadmin/test/classes/MessageTest.php +share/phpmyadmin/test/classes/PDFTest.php +share/phpmyadmin/test/classes/ScriptsTest.php +share/phpmyadmin/test/classes/ServerStatusDataTest.php +share/phpmyadmin/test/classes/StorageEngineTest.php +share/phpmyadmin/test/classes/SystemDatabaseTest.php +share/phpmyadmin/test/classes/TableTest.php +share/phpmyadmin/test/classes/TemplateTest.php +share/phpmyadmin/test/classes/ThemeManagerTest.php +share/phpmyadmin/test/classes/ThemeTest.php +share/phpmyadmin/test/classes/TrackerTest.php +share/phpmyadmin/test/classes/TypesMySQLTest.php +share/phpmyadmin/test/classes/TypesTest.php +share/phpmyadmin/test/classes/UtilTest.php +share/phpmyadmin/test/classes/VersionInformationTest.php +share/phpmyadmin/test/classes/ZipFileTest.php +share/phpmyadmin/test/classes/_data/gen_version_info/info.inc.php +share/phpmyadmin/test/classes/_data/incorrect_theme/info.inc.php +share/phpmyadmin/test/classes/config/ConfigFileTest.php +share/phpmyadmin/test/classes/config/FormDisplayTest.php +share/phpmyadmin/test/classes/config/FormTest.php +share/phpmyadmin/test/classes/config/PageSettingsTest.php +share/phpmyadmin/test/classes/controllers/DatabaseStructureControllerTest.php +share/phpmyadmin/test/classes/controllers/ServerBinlogControllerTest.php +share/phpmyadmin/test/classes/controllers/ServerCollationsControllerTest.php +share/phpmyadmin/test/classes/controllers/ServerDatabasesControllerTest.php +share/phpmyadmin/test/classes/controllers/ServerEnginesControllerTest.php +share/phpmyadmin/test/classes/controllers/ServerPluginsControllerTest.php +share/phpmyadmin/test/classes/controllers/ServerVariablesControllerTest.php +share/phpmyadmin/test/classes/controllers/TableIndexesControllerTest.php +share/phpmyadmin/test/classes/controllers/TableRelationControllerTest.php +share/phpmyadmin/test/classes/controllers/TableSearchControllerTest.php +share/phpmyadmin/test/classes/controllers/TableStructureControllerTest.php +share/phpmyadmin/test/classes/dbi/DBIMysqlTest.php +share/phpmyadmin/test/classes/dbi/DBIMysqliTest.php +share/phpmyadmin/test/classes/engines/BdbTest.php +share/phpmyadmin/test/classes/engines/BinlogTest.php +share/phpmyadmin/test/classes/engines/InnodbTest.php +share/phpmyadmin/test/classes/engines/MemoryTest.php +share/phpmyadmin/test/classes/engines/Mrg_MyisamTest.php +share/phpmyadmin/test/classes/engines/MyisamTest.php +share/phpmyadmin/test/classes/engines/NdbclusterTest.php +share/phpmyadmin/test/classes/engines/PbxtTest.php +share/phpmyadmin/test/classes/gis/GISFactoryTest.php +share/phpmyadmin/test/classes/gis/GISGeomTest.php +share/phpmyadmin/test/classes/gis/GISGeometryTest.php +share/phpmyadmin/test/classes/gis/GISGeometrycollectionTest.php +share/phpmyadmin/test/classes/gis/GISLinestringTest.php +share/phpmyadmin/test/classes/gis/GISMultilinestringTest.php +share/phpmyadmin/test/classes/gis/GISMultipointTest.php +share/phpmyadmin/test/classes/gis/GISMultipolygonTest.php +share/phpmyadmin/test/classes/gis/GISPointTest.php +share/phpmyadmin/test/classes/gis/GISPolygonTest.php +share/phpmyadmin/test/classes/navigation/NavigationTest.php +share/phpmyadmin/test/classes/navigation/NavigationTreeTest.php +share/phpmyadmin/test/classes/navigation/NodeColumnContainerTest.php +share/phpmyadmin/test/classes/navigation/NodeColumnTest.php +share/phpmyadmin/test/classes/navigation/NodeDatabaseChildTest.php +share/phpmyadmin/test/classes/navigation/NodeDatabaseTest.php +share/phpmyadmin/test/classes/navigation/NodeEventContainerTest.php +share/phpmyadmin/test/classes/navigation/NodeEventTest.php +share/phpmyadmin/test/classes/navigation/NodeFactoryTest.php +share/phpmyadmin/test/classes/navigation/NodeFunctionContainerTest.php +share/phpmyadmin/test/classes/navigation/NodeFunctionTest.php +share/phpmyadmin/test/classes/navigation/NodeIndexContainerTest.php +share/phpmyadmin/test/classes/navigation/NodeIndexTest.php +share/phpmyadmin/test/classes/navigation/NodeProcedureContainerTest.php +share/phpmyadmin/test/classes/navigation/NodeProcedureTest.php +share/phpmyadmin/test/classes/navigation/NodeTableContainerTest.php +share/phpmyadmin/test/classes/navigation/NodeTableTest.php +share/phpmyadmin/test/classes/navigation/NodeTest.php +share/phpmyadmin/test/classes/navigation/NodeTriggerContainerTest.php +share/phpmyadmin/test/classes/navigation/NodeTriggerTest.php +share/phpmyadmin/test/classes/navigation/NodeViewContainerTest.php +share/phpmyadmin/test/classes/navigation/NodeViewTest.php +share/phpmyadmin/test/classes/plugin/auth/AuthenticationConfigTest.php +share/phpmyadmin/test/classes/plugin/auth/AuthenticationCookieTest.php +share/phpmyadmin/test/classes/plugin/auth/AuthenticationHttpTest.php +share/phpmyadmin/test/classes/plugin/auth/AuthenticationSignonTest.php +share/phpmyadmin/test/classes/plugin/export/ExportCodegenTest.php +share/phpmyadmin/test/classes/plugin/export/ExportCsvTest.php +share/phpmyadmin/test/classes/plugin/export/ExportExcelTest.php +share/phpmyadmin/test/classes/plugin/export/ExportHtmlwordTest.php +share/phpmyadmin/test/classes/plugin/export/ExportJsonTest.php +share/phpmyadmin/test/classes/plugin/export/ExportLatexTest.php +share/phpmyadmin/test/classes/plugin/export/ExportMediawikiTest.php +share/phpmyadmin/test/classes/plugin/export/ExportOdsTest.php +share/phpmyadmin/test/classes/plugin/export/ExportOdtTest.php +share/phpmyadmin/test/classes/plugin/export/ExportPdfTest.php +share/phpmyadmin/test/classes/plugin/export/ExportPhparrayTest.php +share/phpmyadmin/test/classes/plugin/export/ExportSqlTest.php +share/phpmyadmin/test/classes/plugin/export/ExportTexytextTest.php +share/phpmyadmin/test/classes/plugin/export/ExportXmlTest.php +share/phpmyadmin/test/classes/plugin/export/ExportYamlTest.php +share/phpmyadmin/test/classes/plugin/export/TablePropertyTest.php +share/phpmyadmin/test/classes/plugin/import/ImportCsvTest.php +share/phpmyadmin/test/classes/plugin/import/ImportLdiTest.php +share/phpmyadmin/test/classes/plugin/import/ImportMediawikiTest.php +share/phpmyadmin/test/classes/plugin/import/ImportOdsTest.php +share/phpmyadmin/test/classes/plugin/import/ImportShpTest.php +share/phpmyadmin/test/classes/plugin/import/ImportSqlTest.php +share/phpmyadmin/test/classes/plugin/import/ImportXmlTest.php +share/phpmyadmin/test/classes/plugin/transformations/TransformationPluginsTest.php +share/phpmyadmin/test/classes/properties/PropertyItemTest.php +share/phpmyadmin/test/classes/properties/options/OptionsPropertyGroupTest.php +share/phpmyadmin/test/classes/properties/options/OptionsPropertyItemTest.php +share/phpmyadmin/test/classes/properties/options/OptionsPropertyOneItemTest.php +share/phpmyadmin/test/classes/properties/options/groups/OptionsPropertyMainGroupTest.php +share/phpmyadmin/test/classes/properties/options/groups/OptionsPropertyRootGroupTest.php +share/phpmyadmin/test/classes/properties/options/groups/OptionsPropertySubgroupTest.php +share/phpmyadmin/test/classes/properties/options/items/PropertyItemsTest.php +share/phpmyadmin/test/classes/properties/plugins/ExportPluginPropertiesTest.php +share/phpmyadmin/test/classes/properties/plugins/ImportPluginPropertiesTest.php +share/phpmyadmin/test/classes/properties/plugins/PluginPropertyItemTest.php +share/phpmyadmin/test/classes/schema/DiaRelationSchemaTest.php +share/phpmyadmin/test/classes/schema/EpsRelationSchemaTest.php +share/phpmyadmin/test/classes/schema/ExportRelationSchemaTest.php +share/phpmyadmin/test/classes/schema/PdfRelationSchemaTest.php +share/phpmyadmin/test/classes/schema/SvgRelationSchemaTest.php +share/phpmyadmin/test/install-browserstack +share/phpmyadmin/test/install-runkit +share/phpmyadmin/test/libraries/Files_test.php +share/phpmyadmin/test/libraries/PMA_FormDisplay_tpl_test.php +share/phpmyadmin/test/libraries/PMA_Form_Processing_test.php +share/phpmyadmin/test/libraries/PMA_GIS_modifyQuery_test.php +share/phpmyadmin/test/libraries/PMA_PMD_common_test.php +share/phpmyadmin/test/libraries/PMA_SetupIndex_test.php +share/phpmyadmin/test/libraries/PMA_bookmark_test.php +share/phpmyadmin/test/libraries/PMA_browse_foreigners_test.php +share/phpmyadmin/test/libraries/PMA_central_columns_test.php +share/phpmyadmin/test/libraries/PMA_charset_conversion_test.php +share/phpmyadmin/test/libraries/PMA_check_user_privileges_test.php +share/phpmyadmin/test/libraries/PMA_config_functions_test.php +share/phpmyadmin/test/libraries/PMA_designer_test.php +share/phpmyadmin/test/libraries/PMA_display_change_password_test.php +share/phpmyadmin/test/libraries/PMA_display_create_table_test.php +share/phpmyadmin/test/libraries/PMA_display_export_test.php +share/phpmyadmin/test/libraries/PMA_escapeJsString_test.php +share/phpmyadmin/test/libraries/PMA_export_test.php +share/phpmyadmin/test/libraries/PMA_generateCommonUrl_test.php +share/phpmyadmin/test/libraries/PMA_iconv_wrapper_test.php +share/phpmyadmin/test/libraries/PMA_import_test.php +share/phpmyadmin/test/libraries/PMA_insert_edit_test.php +share/phpmyadmin/test/libraries/PMA_ip_allow_deny_test.php +share/phpmyadmin/test/libraries/PMA_js_escape_test.php +share/phpmyadmin/test/libraries/PMA_kanji-encoding_test.php +share/phpmyadmin/test/libraries/PMA_mime_test.php +share/phpmyadmin/test/libraries/PMA_mult_submits_test.php +share/phpmyadmin/test/libraries/PMA_mysql_charsets_test.php +share/phpmyadmin/test/libraries/PMA_normalization_test.php +share/phpmyadmin/test/libraries/PMA_operations_test.php +share/phpmyadmin/test/libraries/PMA_relation_cleanup_test.php +share/phpmyadmin/test/libraries/PMA_relation_test.php +share/phpmyadmin/test/libraries/PMA_resultSetHasJustOneTable_test.php +share/phpmyadmin/test/libraries/PMA_sanitize_test.php +share/phpmyadmin/test/libraries/PMA_select_server_test.php +share/phpmyadmin/test/libraries/PMA_server_common_test.php +share/phpmyadmin/test/libraries/PMA_server_privileges_test.php +share/phpmyadmin/test/libraries/PMA_server_replication_test.php +share/phpmyadmin/test/libraries/PMA_server_status_advisor_test.php +share/phpmyadmin/test/libraries/PMA_server_status_monitor_test.php +share/phpmyadmin/test/libraries/PMA_server_status_processes_test.php +share/phpmyadmin/test/libraries/PMA_server_status_queries_test.php +share/phpmyadmin/test/libraries/PMA_server_status_test.php +share/phpmyadmin/test/libraries/PMA_server_status_variables_test.php +share/phpmyadmin/test/libraries/PMA_server_user_groups_test.php +share/phpmyadmin/test/libraries/PMA_server_users_test.php +share/phpmyadmin/test/libraries/PMA_sql_query_form_test.php +share/phpmyadmin/test/libraries/PMA_sql_test.php +share/phpmyadmin/test/libraries/PMA_tbl_tracking_test.php +share/phpmyadmin/test/libraries/PMA_transformation_test.php +share/phpmyadmin/test/libraries/PMA_user_preferences_test.php +share/phpmyadmin/test/libraries/PMA_zip_extension_test.php +share/phpmyadmin/test/libraries/common/PMA_browseUploadFile_test.php +share/phpmyadmin/test/libraries/common/PMA_buildActionTitles_test.php +share/phpmyadmin/test/libraries/common/PMA_cache_test.php +share/phpmyadmin/test/libraries/common/PMA_checkParameters_test.php +share/phpmyadmin/test/libraries/common/PMA_contains_nonprintable_ascii_test.php +share/phpmyadmin/test/libraries/common/PMA_convert_bit_default_value_test.php +share/phpmyadmin/test/libraries/common/PMA_escapeMySqlWildcards_test.php +share/phpmyadmin/test/libraries/common/PMA_expandUserString_test.php +share/phpmyadmin/test/libraries/common/PMA_extractColumnSpec_test.php +share/phpmyadmin/test/libraries/common/PMA_extractValueFromFormattedSize_test.php +share/phpmyadmin/test/libraries/common/PMA_foreignKeySupported_test.php +share/phpmyadmin/test/libraries/common/PMA_formatNumberByteDown_test.php +share/phpmyadmin/test/libraries/common/PMA_formatSql_test.php +share/phpmyadmin/test/libraries/common/PMA_generateHiddenMaxFileSize_test.php +share/phpmyadmin/test/libraries/common/PMA_getCheckbox_test.php +share/phpmyadmin/test/libraries/common/PMA_getDbLink_test.php +share/phpmyadmin/test/libraries/common/PMA_getDivForSliderEffect_test.php +share/phpmyadmin/test/libraries/common/PMA_getDropdown_test.php +share/phpmyadmin/test/libraries/common/PMA_getFormattedMaximumUploadSize_test.php +share/phpmyadmin/test/libraries/common/PMA_getIcon_test.php +share/phpmyadmin/test/libraries/common/PMA_getRadioFields_test.php +share/phpmyadmin/test/libraries/common/PMA_getTitleForTarget_test.php +share/phpmyadmin/test/libraries/common/PMA_localisedDateTimespan_test.php +share/phpmyadmin/test/libraries/common/PMA_pow_test.php +share/phpmyadmin/test/libraries/common/PMA_printableBitValue_test.php +share/phpmyadmin/test/libraries/common/PMA_quoting_slashing_test.php +share/phpmyadmin/test/libraries/common/PMA_showDocu_test.php +share/phpmyadmin/test/libraries/common/PMA_showMessage_test_disabled.php +share/phpmyadmin/test/libraries/common/PMA_showPHPDocu_test.php +share/phpmyadmin/test/libraries/common/PMA_stringOperations_test.php +share/phpmyadmin/test/libraries/common/PMA_unsupportedDatatypes_test.php +share/phpmyadmin/test/libraries/common/PMA_whichCrlf_test.php +share/phpmyadmin/test/libraries/config/PMA_messages_inc_test.php +share/phpmyadmin/test/libraries/core/PMA_array_test.php +share/phpmyadmin/test/libraries/core/PMA_checkPageValidity_test.php +share/phpmyadmin/test/libraries/core/PMA_cleanupPathInfo_test.php +share/phpmyadmin/test/libraries/core/PMA_fatalError_test.php +share/phpmyadmin/test/libraries/core/PMA_getLinks_test.php +share/phpmyadmin/test/libraries/core/PMA_getTableCount_test_dis.php +share/phpmyadmin/test/libraries/core/PMA_get_real_size_test.php +share/phpmyadmin/test/libraries/core/PMA_headerLocation_test.php +share/phpmyadmin/test/libraries/core/PMA_ifSetOr_test.php +share/phpmyadmin/test/libraries/core/PMA_isAllowedDomain_test.php +share/phpmyadmin/test/libraries/core/PMA_isValid_test.php +share/phpmyadmin/test/libraries/core/PMA_safeUnserialize_test.php +share/phpmyadmin/test/libraries/core/PMA_sanitizeMySQLHost_test.php +share/phpmyadmin/test/libraries/core/PMA_securePath_test.php +share/phpmyadmin/test/libraries/core/PMA_warnMissingExtension_test.php +share/phpmyadmin/test/libraries/database_interface_test.php +share/phpmyadmin/test/libraries/php-gettext/Locales_test.php +share/phpmyadmin/test/libraries/php-gettext/PMA_FileReader_test.php +share/phpmyadmin/test/libraries/php-gettext/PMA_StreamReader_test.php +share/phpmyadmin/test/libraries/php-gettext/PMA_StringReader_test.php +share/phpmyadmin/test/libraries/php-gettext/PMA_gettext_test.php +share/phpmyadmin/test/libraries/php-gettext/Parsing_test.php +share/phpmyadmin/test/libraries/rte/PMA_EVN_getDataFromRequest_test.php +share/phpmyadmin/test/libraries/rte/PMA_EVN_getEditorForm_test.php +share/phpmyadmin/test/libraries/rte/PMA_EVN_getQueryFromRequest_test.php +share/phpmyadmin/test/libraries/rte/PMA_RTN_getDataFromRequest_test.php +share/phpmyadmin/test/libraries/rte/PMA_RTN_getEditorForm_test.php +share/phpmyadmin/test/libraries/rte/PMA_RTN_getExecuteForm_test.php +share/phpmyadmin/test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php +share/phpmyadmin/test/libraries/rte/PMA_TRI_getDataFromRequest_test.php +share/phpmyadmin/test/libraries/rte/PMA_TRI_getEditorForm_test.php +share/phpmyadmin/test/libraries/rte/PMA_TRI_getQueryFromRequest_test.php +share/phpmyadmin/test/libraries/stubs/ResponseStub.php +share/phpmyadmin/test/libraries/sysinfo_test.php +share/phpmyadmin/test/php-noprofile.ini +share/phpmyadmin/test/php-runkit.ini +share/phpmyadmin/test/selenium/PmaSeleniumCreateDropDatabaseTest.php +share/phpmyadmin/test/selenium/PmaSeleniumCreateRemoveUserTest.php +share/phpmyadmin/test/selenium/PmaSeleniumDbEventsTest.php +share/phpmyadmin/test/selenium/PmaSeleniumDbOperationsTest.php +share/phpmyadmin/test/selenium/PmaSeleniumDbProceduresTest.php +share/phpmyadmin/test/selenium/PmaSeleniumDbStructureTest.php +share/phpmyadmin/test/selenium/PmaSeleniumDbTriggersTest.php +share/phpmyadmin/test/selenium/PmaSeleniumExportTest.php +share/phpmyadmin/test/selenium/PmaSeleniumImportTest.php +share/phpmyadmin/test/selenium/PmaSeleniumLoginTest.php +share/phpmyadmin/test/selenium/PmaSeleniumNormalizationTest.php +share/phpmyadmin/test/selenium/PmaSeleniumPrivilegesTest.php +share/phpmyadmin/test/selenium/PmaSeleniumServerSettingsTest.php +share/phpmyadmin/test/selenium/PmaSeleniumTableBrowseTest.php +share/phpmyadmin/test/selenium/PmaSeleniumTableCreateTest.php +share/phpmyadmin/test/selenium/PmaSeleniumTableInsertTest.php +share/phpmyadmin/test/selenium/PmaSeleniumTableOperationsTest.php +share/phpmyadmin/test/selenium/PmaSeleniumTableStructureTest.php +share/phpmyadmin/test/selenium/PmaSeleniumTrackingTest.php +share/phpmyadmin/test/selenium/PmaSeleniumXssTest.php +share/phpmyadmin/test/selenium/TestBase.php +share/phpmyadmin/test/start-local-server +share/phpmyadmin/test/test_data/config.inc.php +share/phpmyadmin/test/test_data/db_import.sql +share/phpmyadmin/test/test_data/db_test.csv +share/phpmyadmin/test/test_data/db_test.ods +share/phpmyadmin/test/test_data/db_test_ldi.csv +share/phpmyadmin/test/test_data/dresden_osm.shp.zip +share/phpmyadmin/test/test_data/exploit_test.sql +share/phpmyadmin/test/test_data/phpmyadmin.mediawiki +share/phpmyadmin/test/test_data/phpmyadmin_importXML_For_Testing.xml +share/phpmyadmin/test/test_data/pma_bookmark.sql +share/phpmyadmin/test/test_data/server_import.sql +share/phpmyadmin/test/test_data/table_import.sql +share/phpmyadmin/test/test_data/test.bz2 +share/phpmyadmin/test/test_data/test.file +share/phpmyadmin/test/test_data/test.gz +share/phpmyadmin/test/test_data/test.zip +share/phpmyadmin/test/test_data/timezone.shp.zip +share/phpmyadmin/test/theme.php +share/phpmyadmin/test/wui.php share/phpmyadmin/themes.php share/phpmyadmin/themes/dot.gif share/phpmyadmin/themes/original/css/common.css.php @@ -1925,4 +2227,3 @@ share/phpmyadmin/user_password.php share/phpmyadmin/version_check.php share/phpmyadmin/view_create.php share/phpmyadmin/view_operations.php -@pkgdir share/phpmyadmin/scripts diff --git a/databases/phpmyadmin/distinfo b/databases/phpmyadmin/distinfo index 63aff8dab5e..ff809e3aec1 100644 --- a/databases/phpmyadmin/distinfo +++ b/databases/phpmyadmin/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.104 2016/06/28 13:32:35 taca Exp $ +$NetBSD: distinfo,v 1.105 2016/08/23 15:53:14 taca Exp $ -SHA1 (phpMyAdmin-4.6.3-all-languages.tar.xz) = 08f06598de52051d2431aecff330944618a742fd -RMD160 (phpMyAdmin-4.6.3-all-languages.tar.xz) = 5c56f83cfa0978df3a4091632418978580c1f616 -SHA512 (phpMyAdmin-4.6.3-all-languages.tar.xz) = 6393dc4e03c519dc57bf2b616e5a4ff6efc98feeee84bf864c1d2cc250e19a327967a67497cf0440cec76e9ec11d25c37c61a53f557a867afe53c5a428ad0944 -Size (phpMyAdmin-4.6.3-all-languages.tar.xz) = 6111852 bytes +SHA1 (phpMyAdmin-4.6.4-all-languages.tar.xz) = 9ae9e5a8d917960106f8359ea555e31097e12a77 +RMD160 (phpMyAdmin-4.6.4-all-languages.tar.xz) = 445f08b898ad4255e94abfbc4035db3500114f12 +SHA512 (phpMyAdmin-4.6.4-all-languages.tar.xz) = 80ee0180c283c6ea139410289f9aa6535077f68812014dd8c7e334bdae0f49171a47b50274172a153d81e5f3145f906fdcda52751ba703fed8158482a924c6b2 +Size (phpMyAdmin-4.6.4-all-languages.tar.xz) = 6137016 bytes SHA1 (patch-libraries_vendor_config.php) = af587496e999bf1e92d6c5a9ab8053fe6e92a0f2 diff --git a/databases/phpmyadmin/files/phpmyadmin.conf b/databases/phpmyadmin/files/phpmyadmin.conf index b70072095c7..55e29e8a67b 100644 --- a/databases/phpmyadmin/files/phpmyadmin.conf +++ b/databases/phpmyadmin/files/phpmyadmin.conf @@ -1,4 +1,4 @@ -# $NetBSD: phpmyadmin.conf,v 1.3 2008/05/03 10:46:28 adrianp Exp $ +# $NetBSD: phpmyadmin.conf,v 1.4 2016/08/23 15:53:14 taca Exp $ # # phpmyadmin configuration file fragment for Apache @@ -9,8 +9,13 @@ Options Indexes AllowOverride None + Order allow,deny Allow from all + + + Require all granted + # @@ -21,6 +26,11 @@ # installation. # + Order deny,allow Deny from all + + + Require all denied + -- cgit v1.2.3