On 02/20/12 17:25, Giovanni Bechis wrote:
> Trivial update fixes XSS in replication setup, see PMASA-2012-1
>
Committed to 5.1-current, ok for those diff for 5.0 and 5.1 ?
Cheers
Giovanni
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/phpmyadmin/Makefile,v
retrieving revision 1.61.2.5
diff -u -p -r1.61.2.5 Makefile
--- Makefile 5 Dec 2011 10:27:47 -0000 1.61.2.5
+++ Makefile 21 Feb 2012 13:59:10 -0000
@@ -2,7 +2,7 @@
COMMENT= tool to handle the administration of MySQL over the web
-V= 3.4.8
+V= 3.4.10.1
DISTNAME= phpMyAdmin-${V}
CATEGORIES= www
HOMEPAGE= http://www.phpmyadmin.net/
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/phpmyadmin/distinfo,v
retrieving revision 1.56.2.5
diff -u -p -r1.56.2.5 distinfo
--- distinfo 5 Dec 2011 10:27:47 -0000 1.56.2.5
+++ distinfo 21 Feb 2012 13:59:10 -0000
@@ -1,5 +1,5 @@
-MD5 (phpMyAdmin-3.4.8-all-languages.tar.gz) = UkMAEcPrNY2tsptEDo61Gw==
-RMD160 (phpMyAdmin-3.4.8-all-languages.tar.gz) = w+s9pJR/7iqYuOpq8lroTzudkWA=
-SHA1 (phpMyAdmin-3.4.8-all-languages.tar.gz) = u97YWPG/Bi+6NyaMMHXhNGqn2rU=
-SHA256 (phpMyAdmin-3.4.8-all-languages.tar.gz) =
BLKskWpDKWg6Gt1IvXrpkCVDCs1ejtw8Lw690//nOVU=
-SIZE (phpMyAdmin-3.4.8-all-languages.tar.gz) = 5709848
+MD5 (phpMyAdmin-3.4.10.1-all-languages.tar.gz) = ePiS1G29Jwc/8bDF6MwrUQ==
+RMD160 (phpMyAdmin-3.4.10.1-all-languages.tar.gz) =
TMFtxPaQbZIbAsbeiB2Xfx6XflM=
+SHA1 (phpMyAdmin-3.4.10.1-all-languages.tar.gz) = dYVTJtc8OE3g9g5RhD6ttnmUYU8=
+SHA256 (phpMyAdmin-3.4.10.1-all-languages.tar.gz) =
SfQaVVYRFPkvpIvK9Z1IS2UXzJh5n2FK6CsZJEPVVq4=
+SIZE (phpMyAdmin-3.4.10.1-all-languages.tar.gz) = 5815556
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/phpmyadmin/pkg/PLIST,v
retrieving revision 1.36.2.2
diff -u -p -r1.36.2.2 PLIST
--- pkg/PLIST 5 Dec 2011 10:27:47 -0000 1.36.2.2
+++ pkg/PLIST 21 Feb 2012 13:59:10 -0000
@@ -270,71 +270,14 @@ phpMyAdmin/libraries/tbl_properties.inc.
phpMyAdmin/libraries/tbl_replace_fields.inc.php
phpMyAdmin/libraries/tbl_triggers.lib.php
phpMyAdmin/libraries/tcpdf/
-phpMyAdmin/libraries/tcpdf/CHANGELOG.TXT
phpMyAdmin/libraries/tcpdf/LICENSE.TXT
phpMyAdmin/libraries/tcpdf/README.TXT
-phpMyAdmin/libraries/tcpdf/cache/
-phpMyAdmin/libraries/tcpdf/cache/chapter_demo_1.txt
-phpMyAdmin/libraries/tcpdf/cache/chapter_demo_2.txt
-phpMyAdmin/libraries/tcpdf/cache/table_data_demo.txt
-phpMyAdmin/libraries/tcpdf/cache/utf8test.txt
phpMyAdmin/libraries/tcpdf/config/
-phpMyAdmin/libraries/tcpdf/config/lang/
-phpMyAdmin/libraries/tcpdf/config/lang/afr.php
-phpMyAdmin/libraries/tcpdf/config/lang/ara.php
-phpMyAdmin/libraries/tcpdf/config/lang/aze.php
-phpMyAdmin/libraries/tcpdf/config/lang/bel.php
-phpMyAdmin/libraries/tcpdf/config/lang/bra.php
-phpMyAdmin/libraries/tcpdf/config/lang/cat.php
-phpMyAdmin/libraries/tcpdf/config/lang/ces.php
-phpMyAdmin/libraries/tcpdf/config/lang/chi.php
-phpMyAdmin/libraries/tcpdf/config/lang/cym.php
-phpMyAdmin/libraries/tcpdf/config/lang/dan.php
-phpMyAdmin/libraries/tcpdf/config/lang/eng.php
-phpMyAdmin/libraries/tcpdf/config/lang/est.php
-phpMyAdmin/libraries/tcpdf/config/lang/eus.php
-phpMyAdmin/libraries/tcpdf/config/lang/fra.php
-phpMyAdmin/libraries/tcpdf/config/lang/ger.php
-phpMyAdmin/libraries/tcpdf/config/lang/gle.php
-phpMyAdmin/libraries/tcpdf/config/lang/glg.php
-phpMyAdmin/libraries/tcpdf/config/lang/hat.php
-phpMyAdmin/libraries/tcpdf/config/lang/heb.php
-phpMyAdmin/libraries/tcpdf/config/lang/hrv.php
-phpMyAdmin/libraries/tcpdf/config/lang/hun.php
-phpMyAdmin/libraries/tcpdf/config/lang/hye.php
-phpMyAdmin/libraries/tcpdf/config/lang/ind.php
-phpMyAdmin/libraries/tcpdf/config/lang/ita.php
-phpMyAdmin/libraries/tcpdf/config/lang/kat.php
-phpMyAdmin/libraries/tcpdf/config/lang/kor.php
-phpMyAdmin/libraries/tcpdf/config/lang/mkd.php
-phpMyAdmin/libraries/tcpdf/config/lang/mlt.php
-phpMyAdmin/libraries/tcpdf/config/lang/msa.php
-phpMyAdmin/libraries/tcpdf/config/lang/nld.php
-phpMyAdmin/libraries/tcpdf/config/lang/nob.php
-phpMyAdmin/libraries/tcpdf/config/lang/pol.php
-phpMyAdmin/libraries/tcpdf/config/lang/por.php
-phpMyAdmin/libraries/tcpdf/config/lang/ron.php
-phpMyAdmin/libraries/tcpdf/config/lang/rus.php
-phpMyAdmin/libraries/tcpdf/config/lang/slv.php
-phpMyAdmin/libraries/tcpdf/config/lang/spa.php
-phpMyAdmin/libraries/tcpdf/config/lang/sqi.php
-phpMyAdmin/libraries/tcpdf/config/lang/srp.php
-phpMyAdmin/libraries/tcpdf/config/lang/swa.php
-phpMyAdmin/libraries/tcpdf/config/lang/swe.php
-phpMyAdmin/libraries/tcpdf/config/lang/urd.php
-phpMyAdmin/libraries/tcpdf/config/lang/yid.php
-phpMyAdmin/libraries/tcpdf/config/lang/zho.php
phpMyAdmin/libraries/tcpdf/config/tcpdf_config.php
-phpMyAdmin/libraries/tcpdf/config/tcpdf_config_alt.php
+phpMyAdmin/libraries/tcpdf/encodings_maps.php
phpMyAdmin/libraries/tcpdf/fonts/
-phpMyAdmin/libraries/tcpdf/fonts/README.TXT
-phpMyAdmin/libraries/tcpdf/fonts/courier.php
-phpMyAdmin/libraries/tcpdf/fonts/courierb.php
-phpMyAdmin/libraries/tcpdf/fonts/courierbi.php
-phpMyAdmin/libraries/tcpdf/fonts/courieri.php
-phpMyAdmin/libraries/tcpdf/fonts/dejavu-fonts-ttf-2.32/
-phpMyAdmin/libraries/tcpdf/fonts/dejavu-fonts-ttf-2.32/LICENSE
-phpMyAdmin/libraries/tcpdf/fonts/dejavu-fonts-ttf-2.32/README
+phpMyAdmin/libraries/tcpdf/fonts/dejavu-fonts-ttf-2.33/
+phpMyAdmin/libraries/tcpdf/fonts/dejavu-fonts-ttf-2.33/LICENSE
phpMyAdmin/libraries/tcpdf/fonts/dejavusans.ctg.z
phpMyAdmin/libraries/tcpdf/fonts/dejavusans.php
phpMyAdmin/libraries/tcpdf/fonts/dejavusans.z
@@ -348,20 +291,7 @@ phpMyAdmin/libraries/tcpdf/fonts/dejavus
phpMyAdmin/libraries/tcpdf/fonts/dejavuserifb.php
phpMyAdmin/libraries/tcpdf/fonts/dejavuserifb.z
phpMyAdmin/libraries/tcpdf/fonts/helvetica.php
-phpMyAdmin/libraries/tcpdf/fonts/helveticab.php
-phpMyAdmin/libraries/tcpdf/fonts/helveticabi.php
-phpMyAdmin/libraries/tcpdf/fonts/helveticai.php
-phpMyAdmin/libraries/tcpdf/fonts/symbol.php
-phpMyAdmin/libraries/tcpdf/fonts/times.php
-phpMyAdmin/libraries/tcpdf/fonts/timesb.php
-phpMyAdmin/libraries/tcpdf/fonts/timesbi.php
-phpMyAdmin/libraries/tcpdf/fonts/timesi.php
-phpMyAdmin/libraries/tcpdf/fonts/zapfdingbats.php
phpMyAdmin/libraries/tcpdf/htmlcolors.php
-phpMyAdmin/libraries/tcpdf/spotcolors.php
-phpMyAdmin/libraries/tcpdf/tcpdf.crt
-phpMyAdmin/libraries/tcpdf/tcpdf.fdf
-phpMyAdmin/libraries/tcpdf/tcpdf.p12
phpMyAdmin/libraries/tcpdf/tcpdf.php
phpMyAdmin/libraries/tcpdf/unicode_data.php
phpMyAdmin/libraries/transformations/
@@ -508,6 +438,9 @@ phpMyAdmin/locale/sv/LC_MESSAGES/phpmyad
phpMyAdmin/locale/tr/
phpMyAdmin/locale/tr/LC_MESSAGES/
phpMyAdmin/locale/tr/LC_MESSAGES/phpmyadmin.mo
+phpMyAdmin/locale/uk/
+phpMyAdmin/locale/uk/LC_MESSAGES/
+phpMyAdmin/locale/uk/LC_MESSAGES/phpmyadmin.mo
phpMyAdmin/locale/uz/
phpMyAdmin/locale/uz/LC_MESSAGES/
phpMyAdmin/locale/uz/LC_MESSAGES/phpmyadmin.mo
@@ -606,6 +539,7 @@ phpMyAdmin/scripts/
phpMyAdmin/scripts/convertcfg.pl
phpMyAdmin/scripts/create_tables.sql
phpMyAdmin/scripts/decode_bug.php
+phpMyAdmin/scripts/lang-cleanup.sh
phpMyAdmin/scripts/openid.php
phpMyAdmin/scripts/remove-incomplete-mo
phpMyAdmin/scripts/signon.php
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/phpmyadmin/Makefile,v
retrieving revision 1.71
diff -u -p -r1.71 Makefile
--- Makefile 29 Dec 2011 15:22:26 -0000 1.71
+++ Makefile 21 Feb 2012 14:24:23 -0000
@@ -2,7 +2,7 @@
COMMENT= tool to handle the administration of MySQL over the web
-V= 3.4.9
+V= 3.4.10.1
DISTNAME= phpMyAdmin-${V}
CATEGORIES= www
HOMEPAGE= http://www.phpmyadmin.net/
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/phpmyadmin/distinfo,v
retrieving revision 1.63
diff -u -p -r1.63 distinfo
--- distinfo 29 Dec 2011 15:22:26 -0000 1.63
+++ distinfo 21 Feb 2012 14:24:23 -0000
@@ -1,5 +1,5 @@
-MD5 (phpMyAdmin-3.4.9-all-languages.tar.gz) = F9Lhtky27KTywVHH3D3YLQ==
-RMD160 (phpMyAdmin-3.4.9-all-languages.tar.gz) = ZMI98vjtcFDaCzCOkE8uXGFIYao=
-SHA1 (phpMyAdmin-3.4.9-all-languages.tar.gz) = 4M0SOm8LWPlAFmS9GyRnBByjqsE=
-SHA256 (phpMyAdmin-3.4.9-all-languages.tar.gz) =
6kFrIj236Cvj/GWnBgfKAueq8+0WhE5ZwSOXYRnzz40=
-SIZE (phpMyAdmin-3.4.9-all-languages.tar.gz) = 5763130
+MD5 (phpMyAdmin-3.4.10.1-all-languages.tar.gz) = ePiS1G29Jwc/8bDF6MwrUQ==
+RMD160 (phpMyAdmin-3.4.10.1-all-languages.tar.gz) =
TMFtxPaQbZIbAsbeiB2Xfx6XflM=
+SHA1 (phpMyAdmin-3.4.10.1-all-languages.tar.gz) = dYVTJtc8OE3g9g5RhD6ttnmUYU8=
+SHA256 (phpMyAdmin-3.4.10.1-all-languages.tar.gz) =
SfQaVVYRFPkvpIvK9Z1IS2UXzJh5n2FK6CsZJEPVVq4=
+SIZE (phpMyAdmin-3.4.10.1-all-languages.tar.gz) = 5815556
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/phpmyadmin/pkg/PLIST,v
retrieving revision 1.38
diff -u -p -r1.38 PLIST
--- pkg/PLIST 29 Dec 2011 15:22:26 -0000 1.38
+++ pkg/PLIST 21 Feb 2012 14:24:24 -0000
@@ -270,71 +270,14 @@ phpMyAdmin/libraries/tbl_properties.inc.
phpMyAdmin/libraries/tbl_replace_fields.inc.php
phpMyAdmin/libraries/tbl_triggers.lib.php
phpMyAdmin/libraries/tcpdf/
-phpMyAdmin/libraries/tcpdf/CHANGELOG.TXT
phpMyAdmin/libraries/tcpdf/LICENSE.TXT
phpMyAdmin/libraries/tcpdf/README.TXT
-phpMyAdmin/libraries/tcpdf/cache/
-phpMyAdmin/libraries/tcpdf/cache/chapter_demo_1.txt
-phpMyAdmin/libraries/tcpdf/cache/chapter_demo_2.txt
-phpMyAdmin/libraries/tcpdf/cache/table_data_demo.txt
-phpMyAdmin/libraries/tcpdf/cache/utf8test.txt
phpMyAdmin/libraries/tcpdf/config/
-phpMyAdmin/libraries/tcpdf/config/lang/
-phpMyAdmin/libraries/tcpdf/config/lang/afr.php
-phpMyAdmin/libraries/tcpdf/config/lang/ara.php
-phpMyAdmin/libraries/tcpdf/config/lang/aze.php
-phpMyAdmin/libraries/tcpdf/config/lang/bel.php
-phpMyAdmin/libraries/tcpdf/config/lang/bra.php
-phpMyAdmin/libraries/tcpdf/config/lang/cat.php
-phpMyAdmin/libraries/tcpdf/config/lang/ces.php
-phpMyAdmin/libraries/tcpdf/config/lang/chi.php
-phpMyAdmin/libraries/tcpdf/config/lang/cym.php
-phpMyAdmin/libraries/tcpdf/config/lang/dan.php
-phpMyAdmin/libraries/tcpdf/config/lang/eng.php
-phpMyAdmin/libraries/tcpdf/config/lang/est.php
-phpMyAdmin/libraries/tcpdf/config/lang/eus.php
-phpMyAdmin/libraries/tcpdf/config/lang/fra.php
-phpMyAdmin/libraries/tcpdf/config/lang/ger.php
-phpMyAdmin/libraries/tcpdf/config/lang/gle.php
-phpMyAdmin/libraries/tcpdf/config/lang/glg.php
-phpMyAdmin/libraries/tcpdf/config/lang/hat.php
-phpMyAdmin/libraries/tcpdf/config/lang/heb.php
-phpMyAdmin/libraries/tcpdf/config/lang/hrv.php
-phpMyAdmin/libraries/tcpdf/config/lang/hun.php
-phpMyAdmin/libraries/tcpdf/config/lang/hye.php
-phpMyAdmin/libraries/tcpdf/config/lang/ind.php
-phpMyAdmin/libraries/tcpdf/config/lang/ita.php
-phpMyAdmin/libraries/tcpdf/config/lang/kat.php
-phpMyAdmin/libraries/tcpdf/config/lang/kor.php
-phpMyAdmin/libraries/tcpdf/config/lang/mkd.php
-phpMyAdmin/libraries/tcpdf/config/lang/mlt.php
-phpMyAdmin/libraries/tcpdf/config/lang/msa.php
-phpMyAdmin/libraries/tcpdf/config/lang/nld.php
-phpMyAdmin/libraries/tcpdf/config/lang/nob.php
-phpMyAdmin/libraries/tcpdf/config/lang/pol.php
-phpMyAdmin/libraries/tcpdf/config/lang/por.php
-phpMyAdmin/libraries/tcpdf/config/lang/ron.php
-phpMyAdmin/libraries/tcpdf/config/lang/rus.php
-phpMyAdmin/libraries/tcpdf/config/lang/slv.php
-phpMyAdmin/libraries/tcpdf/config/lang/spa.php
-phpMyAdmin/libraries/tcpdf/config/lang/sqi.php
-phpMyAdmin/libraries/tcpdf/config/lang/srp.php
-phpMyAdmin/libraries/tcpdf/config/lang/swa.php
-phpMyAdmin/libraries/tcpdf/config/lang/swe.php
-phpMyAdmin/libraries/tcpdf/config/lang/urd.php
-phpMyAdmin/libraries/tcpdf/config/lang/yid.php
-phpMyAdmin/libraries/tcpdf/config/lang/zho.php
phpMyAdmin/libraries/tcpdf/config/tcpdf_config.php
-phpMyAdmin/libraries/tcpdf/config/tcpdf_config_alt.php
+phpMyAdmin/libraries/tcpdf/encodings_maps.php
phpMyAdmin/libraries/tcpdf/fonts/
-phpMyAdmin/libraries/tcpdf/fonts/README.TXT
-phpMyAdmin/libraries/tcpdf/fonts/courier.php
-phpMyAdmin/libraries/tcpdf/fonts/courierb.php
-phpMyAdmin/libraries/tcpdf/fonts/courierbi.php
-phpMyAdmin/libraries/tcpdf/fonts/courieri.php
-phpMyAdmin/libraries/tcpdf/fonts/dejavu-fonts-ttf-2.32/
-phpMyAdmin/libraries/tcpdf/fonts/dejavu-fonts-ttf-2.32/LICENSE
-phpMyAdmin/libraries/tcpdf/fonts/dejavu-fonts-ttf-2.32/README
+phpMyAdmin/libraries/tcpdf/fonts/dejavu-fonts-ttf-2.33/
+phpMyAdmin/libraries/tcpdf/fonts/dejavu-fonts-ttf-2.33/LICENSE
phpMyAdmin/libraries/tcpdf/fonts/dejavusans.ctg.z
phpMyAdmin/libraries/tcpdf/fonts/dejavusans.php
phpMyAdmin/libraries/tcpdf/fonts/dejavusans.z
@@ -348,20 +291,7 @@ phpMyAdmin/libraries/tcpdf/fonts/dejavus
phpMyAdmin/libraries/tcpdf/fonts/dejavuserifb.php
phpMyAdmin/libraries/tcpdf/fonts/dejavuserifb.z
phpMyAdmin/libraries/tcpdf/fonts/helvetica.php
-phpMyAdmin/libraries/tcpdf/fonts/helveticab.php
-phpMyAdmin/libraries/tcpdf/fonts/helveticabi.php
-phpMyAdmin/libraries/tcpdf/fonts/helveticai.php
-phpMyAdmin/libraries/tcpdf/fonts/symbol.php
-phpMyAdmin/libraries/tcpdf/fonts/times.php
-phpMyAdmin/libraries/tcpdf/fonts/timesb.php
-phpMyAdmin/libraries/tcpdf/fonts/timesbi.php
-phpMyAdmin/libraries/tcpdf/fonts/timesi.php
-phpMyAdmin/libraries/tcpdf/fonts/zapfdingbats.php
phpMyAdmin/libraries/tcpdf/htmlcolors.php
-phpMyAdmin/libraries/tcpdf/spotcolors.php
-phpMyAdmin/libraries/tcpdf/tcpdf.crt
-phpMyAdmin/libraries/tcpdf/tcpdf.fdf
-phpMyAdmin/libraries/tcpdf/tcpdf.p12
phpMyAdmin/libraries/tcpdf/tcpdf.php
phpMyAdmin/libraries/tcpdf/unicode_data.php
phpMyAdmin/libraries/transformations/
@@ -609,6 +539,7 @@ phpMyAdmin/scripts/
phpMyAdmin/scripts/convertcfg.pl
phpMyAdmin/scripts/create_tables.sql
phpMyAdmin/scripts/decode_bug.php
+phpMyAdmin/scripts/lang-cleanup.sh
phpMyAdmin/scripts/openid.php
phpMyAdmin/scripts/remove-incomplete-mo
phpMyAdmin/scripts/signon.php
