Update "phpmyadmin" package to version 3.4.5. Chances since version 3.4.4:

- bug #3375325 [interface] Page list in navigation frame looks odd
- bug #3313235 [interface] Error div misplaced
- bug #3374802 [interface] Comment on a column breaks inline editing
- patch #3383711 [display] Order by a column in a view doesn't work in
  some cases
- bug #3386434 [interface] Add missing space to server status
- [core] Remove library PHPExcel, due to license issues
- [export] Remove native Excel export modules (xls and xlsx formats)
- [import] Remove native Excel import modules (xls and xlsx formats)
- bug #3392920 [edit] BLOB emptied after editing another column
- [security] Fixed XSS in Inline Edit on save action, see PMASA-2011-14
- [security] Fixed XSS with db/table/column names, see PMASA-2011-14

3 files changed, 7 insertions, 161 deletions

diff --git a/databases/phpmyadmin/Makefile b/databases/phpmyadmin/Makefile
index f40976bf3d3..8ce2a0e66ac 100644
--- a/databases/phpmyadmin/Makefile
+++ b/databases/phpmyadmin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.90 2011/08/25 20:40:24 tron Exp $
+# $NetBSD: Makefile,v 1.91 2011/09/14 22:25:27 tron Exp $
 
 DISTNAME=	phpMyAdmin-${DIST_VERSION}-all-languages
 PKGNAME=	phpmyadmin-${DIST_VERSION:S/-//}
@@ -29,7 +29,7 @@ MESSAGE_SUBST+=	CONF_INC_PHP=${CONF_INC_PHP} PMCONFFILE=${PMCONFFILE:Q} \
 USE_TOOLS+=	perl:run
 
 CONF_INC_PHP=	${PREFIX}/share/phpmyadmin/config.inc.php
-DIST_VERSION=	3.4.4
+DIST_VERSION=	3.4.5
 DOC_FILES=	CREDITS ChangeLog \
 		Documentation.txt INSTALL LICENSE README \
 		RELEASE-DATE-${DIST_VERSION} TODO
diff --git a/databases/phpmyadmin/PLIST b/databases/phpmyadmin/PLIST
index be0a77a614e..dafc6726c0b 100644
--- a/databases/phpmyadmin/PLIST
+++ b/databases/phpmyadmin/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2011/07/29 17:21:20 tron Exp $
+@comment $NetBSD: PLIST,v 1.24 2011/09/14 22:25:27 tron Exp $
 share/doc/phpmyadmin/CREDITS
 share/doc/phpmyadmin/ChangeLog
 share/doc/phpmyadmin/Documentation.txt
@@ -67,156 +67,6 @@ share/phpmyadmin/libraries/Index.class.php
 share/phpmyadmin/libraries/List.class.php
 share/phpmyadmin/libraries/List_Database.class.php
 share/phpmyadmin/libraries/Message.class.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Autoloader.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/CachedObjectStorage/APC.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/CachedObjectStorage/CacheBase.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/CachedObjectStorage/DiscISAM.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/CachedObjectStorage/ICache.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/CachedObjectStorage/Memcache.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/CachedObjectStorage/Memory.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/CachedObjectStorage/MemoryGZip.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/CachedObjectStorage/MemorySerialized.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/CachedObjectStorage/PHPTemp.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/CachedObjectStorage/Wincache.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/CachedObjectStorageFactory.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Calculation.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Calculation/Database.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Calculation/DateTime.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Calculation/Engineering.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Calculation/Exception.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Calculation/ExceptionHandler.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Calculation/Financial.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Calculation/FormulaParser.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Calculation/FormulaToken.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Calculation/Function.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Calculation/Functions.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Calculation/Logical.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Calculation/LookupRef.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Calculation/MathTrig.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Calculation/Statistical.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Calculation/TextData.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Calculation/functionlist.txt
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Cell.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Cell/AdvancedValueBinder.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Cell/DataType.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Cell/DataValidation.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Cell/DefaultValueBinder.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Cell/Hyperlink.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Cell/IValueBinder.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Comment.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/DocumentProperties.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/DocumentSecurity.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/HashTable.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/IComparable.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/IOFactory.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/NamedRange.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Reader/CSV.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Reader/DefaultReadFilter.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Reader/Excel2003XML.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Reader/Excel2007.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Reader/Excel2007/Theme.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Reader/Excel5.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Reader/Excel5/Escher.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Reader/Gnumeric.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Reader/IReadFilter.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Reader/IReader.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Reader/OOCalc.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Reader/SYLK.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/ReferenceHelper.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/RichText.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/RichText/ITextElement.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/RichText/Run.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/RichText/TextElement.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Settings.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Shared/CodePage.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Shared/Date.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Shared/Drawing.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Shared/Escher.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Shared/Escher/DgContainer.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Shared/Escher/DgContainer/SpgrContainer.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Shared/Excel5.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Shared/File.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Shared/Font.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Shared/JAMA/CHANGELOG.TXT
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Shared/JAMA/CholeskyDecomposition.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Shared/JAMA/EigenvalueDecomposition.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Shared/JAMA/LUDecomposition.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Shared/JAMA/Matrix.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Shared/JAMA/QRDecomposition.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Shared/JAMA/SingularValueDecomposition.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Shared/JAMA/utils/Error.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Shared/JAMA/utils/Maths.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Shared/OLE.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Shared/OLE/ChainedBlockStream.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Shared/OLE/PPS.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Shared/OLE/PPS/File.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Shared/OLE/PPS/Root.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Shared/OLERead.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Shared/PCLZip/gnu-lgpl.txt
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Shared/PCLZip/pclzip.lib.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Shared/PCLZip/readme.txt
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Shared/PasswordHasher.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Shared/String.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Shared/XMLWriter.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Shared/ZipArchive.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Shared/ZipStreamWrapper.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Shared/trend/bestFitClass.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Shared/trend/exponentialBestFitClass.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Shared/trend/linearBestFitClass.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Shared/trend/logarithmicBestFitClass.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Shared/trend/polynomialBestFitClass.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Shared/trend/powerBestFitClass.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Shared/trend/trendClass.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Style.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Style/Alignment.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Style/Border.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Style/Borders.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Style/Color.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Style/Conditional.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Style/Fill.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Style/Font.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Style/NumberFormat.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Style/Protection.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Worksheet.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Worksheet/BaseDrawing.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Worksheet/CellIterator.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Worksheet/ColumnDimension.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Worksheet/Drawing.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Worksheet/Drawing/Shadow.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Worksheet/HeaderFooter.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Worksheet/HeaderFooterDrawing.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Worksheet/MemoryDrawing.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Worksheet/PageMargins.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Worksheet/PageSetup.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Worksheet/Protection.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Worksheet/Row.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Worksheet/RowDimension.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Worksheet/RowIterator.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Worksheet/SheetView.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/WorksheetIterator.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Writer/CSV.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Writer/Excel2007.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Comments.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Writer/Excel2007/ContentTypes.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Writer/Excel2007/DocProps.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Drawing.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Rels.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Writer/Excel2007/StringTable.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Style.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Theme.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Workbook.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Worksheet.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Writer/Excel2007/WriterPart.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Writer/Excel5.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Writer/HTML.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Writer/IWriter.php
-share/phpmyadmin/libraries/PHPExcel/PHPExcel/Writer/PDF.php
 share/phpmyadmin/libraries/PMA.php
 share/phpmyadmin/libraries/Partition.class.php
 share/phpmyadmin/libraries/StorageEngine.class.php
@@ -316,8 +166,6 @@ share/phpmyadmin/libraries/export/pdf.php
 share/phpmyadmin/libraries/export/php_array.php
 share/phpmyadmin/libraries/export/sql.php
 share/phpmyadmin/libraries/export/texytext.php
-share/phpmyadmin/libraries/export/xls.php
-share/phpmyadmin/libraries/export/xlsx.php
 share/phpmyadmin/libraries/export/xml.php
 share/phpmyadmin/libraries/export/yaml.php
 share/phpmyadmin/libraries/file_listing.php
@@ -339,8 +187,6 @@ share/phpmyadmin/libraries/import/sql.php
 share/phpmyadmin/libraries/import/upload/apc.php
 share/phpmyadmin/libraries/import/upload/noplugin.php
 share/phpmyadmin/libraries/import/upload/uploadprogress.php
-share/phpmyadmin/libraries/import/xls.php
-share/phpmyadmin/libraries/import/xlsx.php
 share/phpmyadmin/libraries/import/xml.php
 share/phpmyadmin/libraries/information_schema_relations.lib.php
 share/phpmyadmin/libraries/ip_allow_deny.lib.php
diff --git a/databases/phpmyadmin/distinfo b/databases/phpmyadmin/distinfo
index 3cfa423e2e2..49d328c9ded 100644
--- a/databases/phpmyadmin/distinfo
+++ b/databases/phpmyadmin/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.51 2011/08/25 20:40:24 tron Exp $
+$NetBSD: distinfo,v 1.52 2011/09/14 22:25:27 tron Exp $
 
-SHA1 (phpMyAdmin-3.4.4-all-languages.tar.bz2) = 48af9356c9dbeb45b3062560b535de30af9a7dd4
-RMD160 (phpMyAdmin-3.4.4-all-languages.tar.bz2) = f7165df94b9e0449b4758d481ff8e985363c6881
-Size (phpMyAdmin-3.4.4-all-languages.tar.bz2) = 4954436 bytes
+SHA1 (phpMyAdmin-3.4.5-all-languages.tar.bz2) = abf66d2eb3cac8ac98622663fc11100b0fd479d3
+RMD160 (phpMyAdmin-3.4.5-all-languages.tar.bz2) = e3edec81945b886217a8c16a50c4364ebdbe39dc
+Size (phpMyAdmin-3.4.5-all-languages.tar.bz2) = 4592593 bytes