From db284388acd455d3f6bf42db3bb3b399e3f395e0 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Thu, 1 Jan 2015 23:19:16 +0000 Subject: phpmyadmin: update to 4.3.4 Drop patches merged upstream. Signed-off-by: Paul Eggleton --- .../0001-Bug-4544-additional-fix-for-4.2.x.patch | 29 --------------- ...ug-4504-security-Self-XSS-in-query-charts.patch | 29 --------------- ...4505-security-XSS-in-view-operations-page.patch | 43 ---------------------- .../recipes-php/phpmyadmin/phpmyadmin_4.2.7.bb | 37 ------------------- .../recipes-php/phpmyadmin/phpmyadmin_4.3.4.bb | 34 +++++++++++++++++ 5 files changed, 34 insertions(+), 138 deletions(-) delete mode 100644 meta-webserver/recipes-php/phpmyadmin/phpmyadmin/0001-Bug-4544-additional-fix-for-4.2.x.patch delete mode 100644 meta-webserver/recipes-php/phpmyadmin/phpmyadmin/0001-bug-4504-security-Self-XSS-in-query-charts.patch delete mode 100644 meta-webserver/recipes-php/phpmyadmin/phpmyadmin/0001-bug-4505-security-XSS-in-view-operations-page.patch delete mode 100644 meta-webserver/recipes-php/phpmyadmin/phpmyadmin_4.2.7.bb create mode 100644 meta-webserver/recipes-php/phpmyadmin/phpmyadmin_4.3.4.bb diff --git a/meta-webserver/recipes-php/phpmyadmin/phpmyadmin/0001-Bug-4544-additional-fix-for-4.2.x.patch b/meta-webserver/recipes-php/phpmyadmin/phpmyadmin/0001-Bug-4544-additional-fix-for-4.2.x.patch deleted file mode 100644 index e23f94b73f..0000000000 --- a/meta-webserver/recipes-php/phpmyadmin/phpmyadmin/0001-Bug-4544-additional-fix-for-4.2.x.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 304fb2b645b36a39e03b954fdbd567173ebe6448 Mon Sep 17 00:00:00 2001 -From: Marc Delisle -Date: Wed, 1 Oct 2014 08:09:12 -0400 -Subject: [PATCH] Bug 4544: additional fix for 4.2.x - -Upstream-Status: Backport - -Signed-off-by: Marc Delisle ---- - libraries/TableSearch.class.php | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/libraries/TableSearch.class.php b/libraries/TableSearch.class.php -index a0b3fa4..b7eb42f 100644 ---- a/libraries/TableSearch.class.php -+++ b/libraries/TableSearch.class.php -@@ -992,7 +992,8 @@ EOT; - $html_output .= '' . $properties['collation'] . ''; - $html_output .= '' . $properties['func'] . ''; - // here, the data-type attribute is needed for a date/time picker -- $html_output .= '' . $properties['value'] . ''; - $html_output .= ''; - //Displays hidden fields --- -1.7.10.4 - diff --git a/meta-webserver/recipes-php/phpmyadmin/phpmyadmin/0001-bug-4504-security-Self-XSS-in-query-charts.patch b/meta-webserver/recipes-php/phpmyadmin/phpmyadmin/0001-bug-4504-security-Self-XSS-in-query-charts.patch deleted file mode 100644 index 27eac77629..0000000000 --- a/meta-webserver/recipes-php/phpmyadmin/phpmyadmin/0001-bug-4504-security-Self-XSS-in-query-charts.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 90ddeecf60fc029608b972e490b735f3a65ed0cb Mon Sep 17 00:00:00 2001 -From: Madhura Jayaratne -Date: Sun, 17 Aug 2014 08:52:05 -0400 -Subject: [PATCH] bug #4504 [security] Self-XSS in query charts - -Upstream-status: Backport - -Signed-off-by: Marc Delisle ---- - js/tbl_chart.js | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - - 4.2.7.0 (2014-07-31) -diff --git a/js/tbl_chart.js b/js/tbl_chart.js -index 943d4ae..04c9c40 100644 ---- a/js/tbl_chart.js -+++ b/js/tbl_chart.js -@@ -47,7 +47,7 @@ function PMA_queryChart(data, columnNames, settings) { - }, - axes : { - xaxis : { -- label : settings.xaxisLabel -+ label : escapeHtml(settings.xaxisLabel) - }, - yaxis : { - label : settings.yaxisLabel --- -1.7.10.4 - diff --git a/meta-webserver/recipes-php/phpmyadmin/phpmyadmin/0001-bug-4505-security-XSS-in-view-operations-page.patch b/meta-webserver/recipes-php/phpmyadmin/phpmyadmin/0001-bug-4505-security-XSS-in-view-operations-page.patch deleted file mode 100644 index 164a072ef8..0000000000 --- a/meta-webserver/recipes-php/phpmyadmin/phpmyadmin/0001-bug-4505-security-XSS-in-view-operations-page.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 0cd293f5e13aa245e4a57b8d373597cc0e421b6f Mon Sep 17 00:00:00 2001 -From: Madhura Jayaratne -Date: Sun, 17 Aug 2014 08:41:57 -0400 -Subject: [PATCH] bug #4505 [security] XSS in view operations page - -Upstream-Status: Backport - -Signed-off-by: Marc Delisle ---- - ChangeLog | 3 +++ - js/functions.js | 2 +- - 2 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/ChangeLog b/ChangeLog -index 7afac1a..cec9d77 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,6 +1,9 @@ - phpMyAdmin - ChangeLog - ====================== - -+4.2.7.1 (2014-08-17) -+- bug #4505 [security] XSS in view operations page -+ - 4.2.7.0 (2014-07-31) - - bug Broken links on home page - - bug #4494 Overlap in navigation panel -diff --git a/js/functions.js b/js/functions.js -index 09bfeda..a970a81 100644 ---- a/js/functions.js -+++ b/js/functions.js -@@ -3585,7 +3585,7 @@ AJAX.registerOnload('functions.js', function () { - var question = PMA_messages.strDropTableStrongWarning + ' '; - question += $.sprintf( - PMA_messages.strDoYouReally, -- 'DROP VIEW ' + PMA_commonParams.get('table') -+ 'DROP VIEW ' + escapeHtml(PMA_commonParams.get('table')) - ); - - $(this).PMA_confirm(question, $(this).attr('href'), function (url) { --- -1.7.10.4 - diff --git a/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_4.2.7.bb b/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_4.2.7.bb deleted file mode 100644 index 7cc3604c8c..0000000000 --- a/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_4.2.7.bb +++ /dev/null @@ -1,37 +0,0 @@ -SUMMARY = "Web-based MySQL administration interface" -HOMEPAGE = "http://www.phpmyadmin.net" -# Main code is GPLv2, libraries/tcpdf is under LGPLv3, js/jquery is under MIT -LICENSE = "GPLv2 & LGPLv3 & MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=eb723b61539feef013de476e68b5c50a \ - file://libraries/tcpdf/LICENSE.TXT;md5=5c87b66a5358ebcc495b03e0afcd342c" - -SRC_URI = "${SOURCEFORGE_MIRROR}/phpmyadmin/phpMyAdmin/${PV}/phpMyAdmin-${PV}-all-languages.tar.xz \ - file://0001-bug-4504-security-Self-XSS-in-query-charts.patch \ - file://0001-bug-4505-security-XSS-in-view-operations-page.patch \ - file://0001-Bug-4544-additional-fix-for-4.2.x.patch \ - file://apache.conf" - -SRC_URI[md5sum] = "0dcd755450dac819f33502590c88ad29" -SRC_URI[sha256sum] = "5d101dd88a99a869bc0c684a7f687cf290abc4bf306daac73337cbde2d7743e4" - -S = "${WORKDIR}/phpMyAdmin-${PV}-all-languages" - -inherit allarch - -do_install() { - install -d ${D}${datadir}/${BPN} - cp -a * ${D}${datadir}/${BPN} - # Don't install patches to target - rm -rf ${D}${datadir}/${BPN}/patches - - install -d ${D}${sysconfdir}/apache2/conf.d - install -m 0644 ${WORKDIR}/apache.conf ${D}${sysconfdir}/apache2/conf.d/phpmyadmin.conf - - # Remove a few scripts that explicitly require bash (!) - rm -f ${D}${datadir}/phpmyadmin/libraries/transformations/*.sh -} - -FILES_${PN} = "${datadir}/${BPN} \ - ${sysconfdir}/apache2/conf.d" - -RDEPENDS_${PN} += "bash" diff --git a/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_4.3.4.bb b/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_4.3.4.bb new file mode 100644 index 0000000000..76068e2cf6 --- /dev/null +++ b/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_4.3.4.bb @@ -0,0 +1,34 @@ +SUMMARY = "Web-based MySQL administration interface" +HOMEPAGE = "http://www.phpmyadmin.net" +# Main code is GPLv2, libraries/tcpdf is under LGPLv3, js/jquery is under MIT +LICENSE = "GPLv2 & LGPLv3 & MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=eb723b61539feef013de476e68b5c50a \ + file://libraries/tcpdf/LICENSE.TXT;md5=5c87b66a5358ebcc495b03e0afcd342c" + +SRC_URI = "${SOURCEFORGE_MIRROR}/phpmyadmin/phpMyAdmin/${PV}/phpMyAdmin-${PV}-all-languages.tar.xz \ + file://apache.conf" + +SRC_URI[md5sum] = "f811243e241ee81defb97e014ca713ef" +SRC_URI[sha256sum] = "91258e07e04e25c5e49284b194ebff8ffa807ad38832fbe802cc6af3f7cb96d3" + +S = "${WORKDIR}/phpMyAdmin-${PV}-all-languages" + +inherit allarch + +do_install() { + install -d ${D}${datadir}/${BPN} + cp -a * ${D}${datadir}/${BPN} + # Don't install patches to target + rm -rf ${D}${datadir}/${BPN}/patches + + install -d ${D}${sysconfdir}/apache2/conf.d + install -m 0644 ${WORKDIR}/apache.conf ${D}${sysconfdir}/apache2/conf.d/phpmyadmin.conf + + # Remove a few scripts that explicitly require bash (!) + rm -f ${D}${datadir}/phpmyadmin/libraries/transformations/*.sh +} + +FILES_${PN} = "${datadir}/${BPN} \ + ${sysconfdir}/apache2/conf.d" + +RDEPENDS_${PN} += "bash" -- cgit 1.2.3-korg