diff options
author | salo <salo@pkgsrc.org> | 2006-03-29 14:21:22 +0000 |
---|---|---|
committer | salo <salo@pkgsrc.org> | 2006-03-29 14:21:22 +0000 |
commit | 47d01ee90fa0d930917b71f4c04ee46f5fbf72af (patch) | |
tree | 0da0d9dc3ef6bc546be11cbc4c9d94284ed72635 | |
parent | c869ceef357d55e510ea0c3843ffd23b59aa4d77 (diff) | |
download | pkgsrc-47d01ee90fa0d930917b71f4c04ee46f5fbf72af.tar.gz |
Pullup ticket 1269 - requested by Matthias Scheler
security update for mysqladmin
Patch provided by the submitter.
Module Name: pkgsrc
Committed By: tron
Date: Sun Mar 26 17:55:28 UTC 2006
Modified Files:
pkgsrc/databases/phpmyadmin: Makefile distinfo
Added Files:
pkgsrc/databases/phpmyadmin/patches: patch-aa
Log Message:
Update "phpmyadmin" package to version 2.8.0.2.
Changes since version 2.8.0.1:
- XSS vulnerability (set_theme)
- mysqli problems with zend.ze1_compatibility_mode enabled
- setup script did not save the mysql/mysqli extension
Package source related changes:
- incooperate fix for phpMyAdmin bug #1436279 to make the package usable
with Safari under Mac OS X again
---
Module Name: pkgsrc
Committed By: tron
Date: Wed Mar 29 14:04:48 UTC 2006
Modified Files:
pkgsrc/databases/phpmyadmin: Makefile
Log Message:
Remove ".orig" files from work directory before installation so they
don't get installed. This fixes a package list problem reported by
Lubomir Sedlacik in private e-mail. Bump package revision.
-rw-r--r-- | databases/phpmyadmin/Makefile | 19 | ||||
-rw-r--r-- | databases/phpmyadmin/PLIST | 83 | ||||
-rw-r--r-- | databases/phpmyadmin/distinfo | 9 | ||||
-rw-r--r-- | databases/phpmyadmin/patches/patch-aa | 15 |
4 files changed, 82 insertions, 44 deletions
diff --git a/databases/phpmyadmin/Makefile b/databases/phpmyadmin/Makefile index c7e60e89d56..5ed4828a400 100644 --- a/databases/phpmyadmin/Makefile +++ b/databases/phpmyadmin/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.40 2005/12/09 13:49:21 tron Exp $ +# $NetBSD: Makefile,v 1.40.2.1 2006/03/29 14:21:22 salo Exp $ DISTNAME= phpMyAdmin-${DIST_VERSION} PKGNAME= phpmyadmin-${DIST_VERSION:S/-//} +PKGREVISION= 1 CATEGORIES= databases www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=phpmyadmin/} EXTRACT_SUFX= .tar.bz2 @@ -15,11 +16,12 @@ DEPENDS+= php-mysql{,i}>=4.3.3:../../databases/php-mysql PLIST_SUBST+= CP=${CP:Q} DIST_VERSION=${DIST_VERSION:Q} \ PMCONFFILE=${PMCONFFILE:Q} TEST=${TEST:Q} -MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR} PMCONFFILE=${PMCONFFILE} \ - PMDIR=${PMDIR} EXDIR=${EXDIR} +MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q} \ + PMCONFFILE=${PMCONFFILE:Q} PMDIR=${PMDIR:Q} \ + EXDIR=${EXDIR:Q} CONF_INC_PHP= ${PREFIX}/share/phpmyadmin/config.inc.php -DIST_VERSION= 2.7.0-pl1 +DIST_VERSION= 2.8.0.2 DOC_FILES= CREDITS ChangeLog \ Documentation.txt INSTALL LICENSE README \ RELEASE-DATE-${DIST_VERSION} TODO @@ -37,10 +39,10 @@ PKG_SYSCONFSUBDIR?= phpmyadmin NO_BUILD= yes -INSTALL_DIRS= css lang libraries libraries/auth libraries/dbg \ - libraries/dbi libraries/export libraries/fpdf \ - libraries/fpdf/font libraries/transformations \ - themes themes/darkblue_orange \ +INSTALL_DIRS= css js lang libraries libraries/auth libraries/dbg \ + libraries/dbi libraries/engines libraries/export \ + libraries/fpdf libraries/fpdf/font libraries/import \ + libraries/transformations themes themes/darkblue_orange \ themes/darkblue_orange/css themes/darkblue_orange/img \ themes/original themes/original/css themes/original/img @@ -49,6 +51,7 @@ do-configure: > ${WRKDIR}/phpmyadmin.conf do-install: + ${FIND} ${WRKSRC} -name "*.orig" -print | ${XARGS} ${RM} ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/phpmyadmin ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/phpmyadmin ${INSTALL_DATA_DIR} ${PMDIR} diff --git a/databases/phpmyadmin/PLIST b/databases/phpmyadmin/PLIST index 775fdcec86c..64999b09f00 100644 --- a/databases/phpmyadmin/PLIST +++ b/databases/phpmyadmin/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.13 2005/12/09 13:49:21 tron Exp $ +@comment $NetBSD: PLIST,v 1.13.2.1 2006/03/29 14:21:22 salo Exp $ share/doc/phpmyadmin/CREDITS share/doc/phpmyadmin/ChangeLog share/doc/phpmyadmin/Documentation.txt @@ -14,20 +14,14 @@ share/phpmyadmin/browse_foreigners.php share/phpmyadmin/calendar.php share/phpmyadmin/changelog.php share/phpmyadmin/chk_rel.php -share/phpmyadmin/config.default.php -share/phpmyadmin/config.footer.inc.php -share/phpmyadmin/config.header.inc.php share/phpmyadmin/config.inc.php share/phpmyadmin/css/phpmyadmin.css.php share/phpmyadmin/css/print.css share/phpmyadmin/db_create.php share/phpmyadmin/db_datadict.php share/phpmyadmin/db_details.php -share/phpmyadmin/db_details_common.php -share/phpmyadmin/db_details_db_info.php share/phpmyadmin/db_details_export.php share/phpmyadmin/db_details_importdocsql.php -share/phpmyadmin/db_details_links.php share/phpmyadmin/db_details_qbe.php share/phpmyadmin/db_details_structure.php share/phpmyadmin/db_import.php @@ -37,11 +31,17 @@ share/phpmyadmin/db_search.php share/phpmyadmin/docs.css share/phpmyadmin/error.php share/phpmyadmin/export.php -share/phpmyadmin/footer.inc.php -share/phpmyadmin/header.inc.php -share/phpmyadmin/header_printview.inc.php share/phpmyadmin/import.php share/phpmyadmin/index.php +share/phpmyadmin/js/dom-drag.js +share/phpmyadmin/js/functions.js +share/phpmyadmin/js/indexes.js +share/phpmyadmin/js/keyhandler.js +share/phpmyadmin/js/querywindow.js +share/phpmyadmin/js/server_privileges.js +share/phpmyadmin/js/tbl_change.js +share/phpmyadmin/js/tooltip.js +share/phpmyadmin/js/user_password.js share/phpmyadmin/lang/afrikaans-iso-8859-1.inc.php share/phpmyadmin/lang/afrikaans-utf-8.inc.php share/phpmyadmin/lang/albanian-iso-8859-1.inc.php @@ -160,6 +160,9 @@ share/phpmyadmin/lang/turkish-utf-8.inc.php share/phpmyadmin/lang/ukrainian-utf-8.inc.php share/phpmyadmin/lang/ukrainian-windows-1251.inc.php share/phpmyadmin/left.php +share/phpmyadmin/libraries/Config.class.php +share/phpmyadmin/libraries/Theme.class.php +share/phpmyadmin/libraries/Theme_Manager.class.php share/phpmyadmin/libraries/auth/config.auth.lib.php share/phpmyadmin/libraries/auth/cookie.auth.lib.php share/phpmyadmin/libraries/auth/http.auth.lib.php @@ -168,29 +171,45 @@ share/phpmyadmin/libraries/bookmark.lib.php share/phpmyadmin/libraries/charset_conversion.lib.php share/phpmyadmin/libraries/check_user_privileges.lib.php share/phpmyadmin/libraries/common.lib.php +share/phpmyadmin/libraries/config.default.php share/phpmyadmin/libraries/database_interface.lib.php share/phpmyadmin/libraries/db_config.lib.php +share/phpmyadmin/libraries/db_details_common.inc.php +share/phpmyadmin/libraries/db_details_db_info.inc.php +share/phpmyadmin/libraries/db_details_links.inc.php share/phpmyadmin/libraries/db_table_exists.lib.php share/phpmyadmin/libraries/dbg/profiling.php share/phpmyadmin/libraries/dbg/setup.php share/phpmyadmin/libraries/dbi/mysql.dbi.lib.php share/phpmyadmin/libraries/dbi/mysqli.dbi.lib.php -share/phpmyadmin/libraries/defines.lib.php share/phpmyadmin/libraries/display_create_database.lib.php share/phpmyadmin/libraries/display_create_table.lib.php share/phpmyadmin/libraries/display_export.lib.php share/phpmyadmin/libraries/display_import.lib.php +share/phpmyadmin/libraries/display_select_lang.lib.php share/phpmyadmin/libraries/display_tbl.lib.php share/phpmyadmin/libraries/display_tbl_links.lib.php -share/phpmyadmin/libraries/dom-drag.js +share/phpmyadmin/libraries/engines/bdb.lib.php +share/phpmyadmin/libraries/engines/berkeleydb.lib.php +share/phpmyadmin/libraries/engines/binlog.lib.php +share/phpmyadmin/libraries/engines/innobase.lib.php +share/phpmyadmin/libraries/engines/innodb.lib.php +share/phpmyadmin/libraries/engines/memory.lib.php +share/phpmyadmin/libraries/engines/merge.lib.php +share/phpmyadmin/libraries/engines/mrg_myisam.lib.php +share/phpmyadmin/libraries/engines/myisam.lib.php +share/phpmyadmin/libraries/engines/ndbcluster.lib.php share/phpmyadmin/libraries/export/csv.php share/phpmyadmin/libraries/export/htmlexcel.php share/phpmyadmin/libraries/export/htmlword.php share/phpmyadmin/libraries/export/latex.php +share/phpmyadmin/libraries/export/pdf.php share/phpmyadmin/libraries/export/sql.php share/phpmyadmin/libraries/export/xls.php share/phpmyadmin/libraries/export/xml.php share/phpmyadmin/libraries/file_listing.php +share/phpmyadmin/libraries/footer.inc.php +share/phpmyadmin/libraries/footer_custom.inc.php share/phpmyadmin/libraries/fpdf/README share/phpmyadmin/libraries/fpdf/font/FreeSans.ctg.z share/phpmyadmin/libraries/fpdf/font/FreeSans.php @@ -213,30 +232,35 @@ share/phpmyadmin/libraries/fpdf/font/timesi.php share/phpmyadmin/libraries/fpdf/font/zapfdingbats.php share/phpmyadmin/libraries/fpdf/fpdf.php share/phpmyadmin/libraries/fpdf/ufpdf.php -share/phpmyadmin/libraries/functions.js share/phpmyadmin/libraries/get_foreign.lib.php share/phpmyadmin/libraries/grab_globals.lib.php +share/phpmyadmin/libraries/header.inc.php +share/phpmyadmin/libraries/header_custom.inc.php share/phpmyadmin/libraries/header_http.inc.php share/phpmyadmin/libraries/header_meta_style.inc.php +share/phpmyadmin/libraries/header_printview.inc.php share/phpmyadmin/libraries/import.lib.php -share/phpmyadmin/libraries/indexes.js +share/phpmyadmin/libraries/import/README +share/phpmyadmin/libraries/import/csv.php +share/phpmyadmin/libraries/import/ldi.php +share/phpmyadmin/libraries/import/sql.php share/phpmyadmin/libraries/information_schema_relations.lib.php share/phpmyadmin/libraries/ip_allow_deny.lib.php share/phpmyadmin/libraries/kanji-encoding.lib.php -share/phpmyadmin/libraries/keyhandler.js share/phpmyadmin/libraries/left_header.inc.php share/phpmyadmin/libraries/mcrypt.lib.php +share/phpmyadmin/libraries/mult_submits.inc.php share/phpmyadmin/libraries/mysql_charsets.lib.php share/phpmyadmin/libraries/ob.lib.php -share/phpmyadmin/libraries/querywindow.js +share/phpmyadmin/libraries/plugin_interface.lib.php share/phpmyadmin/libraries/read_dump.lib.php share/phpmyadmin/libraries/relation.lib.php share/phpmyadmin/libraries/relation_cleanup.lib.php share/phpmyadmin/libraries/sanitizing.lib.php share/phpmyadmin/libraries/select_lang.lib.php share/phpmyadmin/libraries/select_server.lib.php -share/phpmyadmin/libraries/select_theme.lib.php -share/phpmyadmin/libraries/server_privileges.js +share/phpmyadmin/libraries/server_common.inc.php +share/phpmyadmin/libraries/server_links.inc.php share/phpmyadmin/libraries/session.inc.php share/phpmyadmin/libraries/sql_query_form.lib.php share/phpmyadmin/libraries/sqlparser.data.php @@ -245,10 +269,13 @@ share/phpmyadmin/libraries/sqlvalidator.class.php share/phpmyadmin/libraries/sqlvalidator.lib.php share/phpmyadmin/libraries/storage_engines.lib.php share/phpmyadmin/libraries/string.lib.php -share/phpmyadmin/libraries/tbl_change.js share/phpmyadmin/libraries/tbl_indexes.lib.php share/phpmyadmin/libraries/tbl_move_copy.php -share/phpmyadmin/libraries/tooltip.js +share/phpmyadmin/libraries/tbl_properties.inc.php +share/phpmyadmin/libraries/tbl_properties_common.php +share/phpmyadmin/libraries/tbl_properties_links.inc.php +share/phpmyadmin/libraries/tbl_properties_table_info.inc.php +share/phpmyadmin/libraries/tbl_replace_fields.inc.php share/phpmyadmin/libraries/transformations.lib.php share/phpmyadmin/libraries/transformations/README share/phpmyadmin/libraries/transformations/TEMPLATE @@ -259,7 +286,6 @@ share/phpmyadmin/libraries/transformations/global.inc.php share/phpmyadmin/libraries/transformations/image_jpeg__inline.inc.php share/phpmyadmin/libraries/transformations/image_jpeg__link.inc.php share/phpmyadmin/libraries/transformations/image_png__inline.inc.php -share/phpmyadmin/libraries/transformations/overview.php share/phpmyadmin/libraries/transformations/text_plain__dateformat.inc.php share/phpmyadmin/libraries/transformations/text_plain__external.inc.php share/phpmyadmin/libraries/transformations/text_plain__formatted.inc.php @@ -269,11 +295,9 @@ share/phpmyadmin/libraries/transformations/text_plain__sql.inc.php share/phpmyadmin/libraries/transformations/text_plain__substr.inc.php share/phpmyadmin/libraries/unzip.lib.php share/phpmyadmin/libraries/url_generating.lib.php -share/phpmyadmin/libraries/user_password.js share/phpmyadmin/libraries/zip.lib.php share/phpmyadmin/license.php share/phpmyadmin/main.php -share/phpmyadmin/mult_submits.inc.php share/phpmyadmin/pdf_pages.php share/phpmyadmin/pdf_schema.php share/phpmyadmin/phpinfo.php @@ -285,12 +309,10 @@ share/phpmyadmin/scripts/create_tables_mysql_4_1_2+.sql share/phpmyadmin/scripts/upgrade_tables_mysql_4_1_2+.sql share/phpmyadmin/server_binlog.php share/phpmyadmin/server_collations.php -share/phpmyadmin/server_common.inc.php share/phpmyadmin/server_databases.php share/phpmyadmin/server_engines.php share/phpmyadmin/server_export.php share/phpmyadmin/server_import.php -share/phpmyadmin/server_links.inc.php share/phpmyadmin/server_privileges.php share/phpmyadmin/server_processlist.php share/phpmyadmin/server_sql.php @@ -305,19 +327,12 @@ share/phpmyadmin/tbl_import.php share/phpmyadmin/tbl_indexes.php share/phpmyadmin/tbl_move_copy.php share/phpmyadmin/tbl_printview.php -share/phpmyadmin/tbl_properties.inc.php share/phpmyadmin/tbl_properties.php -share/phpmyadmin/tbl_properties_common.php share/phpmyadmin/tbl_properties_export.php -share/phpmyadmin/tbl_properties_links.php share/phpmyadmin/tbl_properties_operations.php share/phpmyadmin/tbl_properties_structure.php -share/phpmyadmin/tbl_properties_table_info.php -share/phpmyadmin/tbl_query_box.php share/phpmyadmin/tbl_relation.php -share/phpmyadmin/tbl_rename.php share/phpmyadmin/tbl_replace.php -share/phpmyadmin/tbl_replace_fields.php share/phpmyadmin/tbl_row_action.php share/phpmyadmin/tbl_select.php share/phpmyadmin/themes.php @@ -558,6 +573,7 @@ share/phpmyadmin/themes/original/img/vertical_line.png share/phpmyadmin/themes/original/info.inc.php share/phpmyadmin/themes/original/layout.inc.php share/phpmyadmin/themes/original/screen.png +share/phpmyadmin/transformation_overview.php share/phpmyadmin/transformation_wrapper.php share/phpmyadmin/translators.html share/phpmyadmin/user_password.php @@ -570,14 +586,17 @@ share/phpmyadmin/user_password.php @dirrm share/phpmyadmin/themes @dirrm share/phpmyadmin/scripts @dirrm share/phpmyadmin/libraries/transformations +@dirrm share/phpmyadmin/libraries/import @dirrm share/phpmyadmin/libraries/fpdf/font @dirrm share/phpmyadmin/libraries/fpdf @dirrm share/phpmyadmin/libraries/export +@dirrm share/phpmyadmin/libraries/engines @dirrm share/phpmyadmin/libraries/dbi @dirrm share/phpmyadmin/libraries/dbg @dirrm share/phpmyadmin/libraries/auth @dirrm share/phpmyadmin/libraries @dirrm share/phpmyadmin/lang +@dirrm share/phpmyadmin/js @dirrm share/phpmyadmin/css @dirrm share/phpmyadmin @dirrm share/examples/phpmyadmin diff --git a/databases/phpmyadmin/distinfo b/databases/phpmyadmin/distinfo index 933a7703229..92ea2cc3751 100644 --- a/databases/phpmyadmin/distinfo +++ b/databases/phpmyadmin/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.17 2005/12/09 13:49:22 tron Exp $ +$NetBSD: distinfo,v 1.17.2.1 2006/03/29 14:21:22 salo Exp $ -SHA1 (phpMyAdmin-2.7.0-pl1.tar.bz2) = 9cd8b3b5edc3708a8451a39355851306a39bc8da -RMD160 (phpMyAdmin-2.7.0-pl1.tar.bz2) = beca913be2a139f87e65a8798b9f3378e224d9ec -Size (phpMyAdmin-2.7.0-pl1.tar.bz2) = 1962675 bytes +SHA1 (phpMyAdmin-2.8.0.2.tar.bz2) = fd60fab3ae6609fe54c7edee98192fe7d7002224 +RMD160 (phpMyAdmin-2.8.0.2.tar.bz2) = 8c94abbf9479c053848374cefcf4d8046197c262 +Size (phpMyAdmin-2.8.0.2.tar.bz2) = 2010290 bytes +SHA1 (patch-aa) = 102a2dd335ca453fd764c0b3a5abcdb4023503e8 diff --git a/databases/phpmyadmin/patches/patch-aa b/databases/phpmyadmin/patches/patch-aa new file mode 100644 index 00000000000..8b85ac42093 --- /dev/null +++ b/databases/phpmyadmin/patches/patch-aa @@ -0,0 +1,15 @@ +$NetBSD: patch-aa,v 1.1.2.2 2006/03/29 14:21:22 salo Exp $ + +--- libraries/footer.inc.php.orig 2006-02-13 13:24:24.000000000 +0000 ++++ libraries/footer.inc.php 2006-03-26 18:49:38.000000000 +0100 +@@ -63,7 +63,9 @@ + + // reset content frame name, as querywindow needs to set a unique name + // before submitting form data, and navigation frame needs the original name +-window.parent.frames[1].name = 'frame_content'; ++if (window.parent.frames[1].name != 'frame_content') { ++ window.parent.frames[1].name = 'frame_content'; ++} + //]]> + </script> + <?php |