Merge updates from master

30 files changed, 300 insertions, 72 deletions

diff --git a/dev-db/innotop/Manifest b/dev-db/innotop/Manifest
index 4ed835906f50..214f88cb297d 100644
--- a/dev-db/innotop/Manifest
+++ b/dev-db/innotop/Manifest
@@ -1,3 +1,2 @@
 DIST innotop-1.11.1.tar.gz 178295 SHA256 c93a4fb496ce1749aaaf0a70f0899ed1fa1aa5cd231208b6b3424285c77dc1b7 SHA512 49654e8ed81f5690c7e80fb169ad514caedb8d62e22bddc12cc234701875bc8ca7e2cc79061c10557d63dadbb40f2328a58b38dcf8aa60469c0c1558dbf0bed9 WHIRLPOOL 5b6162973be67821f46d580425a2ee23877687365cd6b87ca55c84d30115e02ce85197eacc80d30690f9523b711d16bcae9d87696eb78c10b8ea5db233948bb9
-DIST innotop-1.9.0.tar.gz 143179 SHA256 bc2669ea88fb728c6c4ed9c695c4d0b7b9ae5df0f158ef23e8853694bf4f240a SHA512 a3fe26b7e9e4a4608f6ef68e8cfefca080fd5799cc7780ffadd0b6bd0a0cfd035561bf6c10436f556b8fc79726304cae408343a231a57d02c74e3bd29b941a17 WHIRLPOOL 76226828f8c91608b03d49802cc082a77b552f7a482ab2186e71a4f9fb56662d17d4ee04c5187df78ca68a733ca4a710b3d6156e0b028375576c8abb9b7effd8
-DIST innotop-1.9.1.tar.gz 147677 SHA256 117e5af58a83af79b6cf99877b25b1479197597be5a7d51b245a0ad9c69f4d3d SHA512 5c19891fc8df2cbf15f0df1af68501624ccb9d79c22a786e3a5fa4aa527be964392131da095a529f628c50528b196070f35009a49c9a87ae9f8bb2f4062e5ab5 WHIRLPOOL b06b4c720333f433408d3f97355ad319aa3897bffa3f71da18462eb74e1d2065a60a0e91f55c26f37bb624530e18cf3e9acf4fdf7bb245e8555987eab3dee617
+DIST innotop-1.11.4.tar.gz 179683 SHA256 fb0d7d2558e2198d9224b44dc4220d4c62e1b5b0069312012306275be39b4ab9 SHA512 678d57074fd4fc87c93032052b87dc187cfe273e99fef8ec8f93131f8d885613bacda7b900f56e7572a6cc51c36c26fe1968e55dd1736b8509fb6e269c9d2aff WHIRLPOOL 7f80d74c0e05a3d1dcc7285714ce97ef4f90c4b978519d2117b1be7fcb590f52c488f041f718016b08e6bf8a87abee99228628d2c0588ef35afe668b2ae22ed1
diff --git a/dev-db/innotop/innotop-1.9.0-r1.ebuild b/dev-db/innotop/innotop-1.11.4.ebuild
index 4de1af02d3e7..0725058e176c 100644
--- a/dev-db/innotop/innotop-1.9.0-r1.ebuild
+++ b/dev-db/innotop/innotop-1.11.4.ebuild
@@ -1,25 +1,27 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI="6"
 
 inherit perl-module
 
 DESCRIPTION="A text-mode MySQL and InnoDB monitor like mytop, but with many more features"
 HOMEPAGE="https://github.com/innotop/innotop"
-SRC_URI="https://innotop.googlecode.com/files/${P}.tar.gz"
+SRC_URI="https://github.com/innotop/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( Artistic GPL-2 )"
 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
 SLOT="0"
 IUSE=""
 
-DEPEND="dev-perl/DBD-mysql
+DEPEND="dev-perl/DBI
+	dev-perl/DBD-mysql
 	dev-perl/TermReadKey
 	virtual/perl-Term-ANSIColor
 	virtual/perl-Time-HiRes"
-SRC_TEST="do"
+
+DIST_TEST="do parallel"
 
 src_install() {
 	perl-module_src_install
diff --git a/dev-db/innotop/innotop-1.9.1.ebuild b/dev-db/innotop/innotop-1.9.1.ebuild
deleted file mode 100644
index 4de1af02d3e7..000000000000
--- a/dev-db/innotop/innotop-1.9.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit perl-module
-
-DESCRIPTION="A text-mode MySQL and InnoDB monitor like mytop, but with many more features"
-HOMEPAGE="https://github.com/innotop/innotop"
-SRC_URI="https://innotop.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="|| ( Artistic GPL-2 )"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-perl/DBD-mysql
-	dev-perl/TermReadKey
-	virtual/perl-Term-ANSIColor
-	virtual/perl-Time-HiRes"
-SRC_TEST="do"
-
-src_install() {
-	perl-module_src_install
-}
diff --git a/dev-db/innotop/metadata.xml b/dev-db/innotop/metadata.xml
index 1b122c01893d..05dc2a7fb700 100644
--- a/dev-db/innotop/metadata.xml
+++ b/dev-db/innotop/metadata.xml
@@ -8,7 +8,6 @@
 	<longdescription>innotop - A text-mode MySQL and InnoDB monitor like mytop,
 but with many more features</longdescription>
 	<upstream>
-		<remote-id type="google-code">innotop</remote-id>
 		<remote-id type="github">innotop/innotop</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index baf1b02e71d2..f83a89f582b5 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -1,3 +1,4 @@
-DIST phpMyAdmin-4.0.10.18-all-languages.tar.xz 4769668 SHA256 7c57c21ccb0d913bdd6ee1d57cfd9887204e1be8546595c5957b7d475c59b6d7 SHA512 f81cf0d952ec9777189072f490e9e1409610353bb29355772890f7f5681fd80da771c546d1109a59068fc120a3408f0d0a6101f6d57724e67cd40b9d648d47be WHIRLPOOL 16d557cf3a0d57f8e36f288a1be50632348b552decf866b6b7abf76203ecdc1839559820ba6550309b31b37cbce4e5774185348be1210f00ca235648de85042b
+DIST phpMyAdmin-4.0.10.19-all-languages.tar.xz 4762856 SHA256 221bfb2d3d001a44e6b19398d927ccf9f71470b3d139e111ffa1ffa62c76b232 SHA512 276c6d807366c461836c1ab70945f7793778a84ff176fcb2860b5aa45f4dd1a34f41c0e96afb491c626f9a8628903d4b181d9a2b7f89f983416dbb0563af6d35 WHIRLPOOL bf9ab4913d797aa1e6474228459472933c09a2b1040aa1475d3357158e5795cae0faccfaf34fd32b6b52dea27856add7a730d631c1ef2c755b09156e8dd58684
 DIST phpMyAdmin-4.6.5.1-all-languages.tar.xz 6162164 SHA256 e163b08b6d1137fd7c48ea97e8e53be415b1937f5e5f7e070936a60c3b9a3df0 SHA512 e6f90af32b77785ff49d9be4033e29e5b64df84d1a37dbe214df9049ef25ecfaee8e443aa9b789c408993541ea85c8e670b350071bd7f3437711462e164afad8 WHIRLPOOL 7e4f5d8e214192c33700b321343510f23f772c5c1a322749c2aded037be9b5743899fd67965743c5498615ae4cf73d0d2d5954ddd11c71b63724e2225ab3f200
-DIST phpMyAdmin-4.6.5.2-all-languages.tar.xz 6136880 SHA256 8cb549c0cd04ecaa3b2a8d9315e7c88528603fa6fe91057b13173f6afba80894 SHA512 10fecd5f313b3685b3d4d7c86b20e9466abc54298267f2ed41cf81096fae5bf8472860ac3ebd5ecba8644b43f69eaf944625a8a12beaba637bcefba0940f3a11 WHIRLPOOL e9de7fcbc50c0b3ea37f7e2dee1290340abd23211248285b36513459dc8c761a95be47a41698de34a4728afd653d87aa214367d162fef820f6a73413ff1ccf9b
+DIST phpMyAdmin-4.6.6-all-languages.tar.xz 6147904 SHA256 b7b9e0f88ca740fcba249e7e3e7d51d1923b038b7742cde72de193a2b0a2654f SHA512 7bd18b83f205604dc653ef2daffb22d0bf99a4e2a7960958fb1687daf2a800a76e34477748c6239394e99ab060e789971b73cf8e66adb3182f1b17002345c054 WHIRLPOOL a18f525b999c855d5dfb48371c40957460bb3a361445d856d05f7348d23cea1392a53f11e99b0199878616e33a529c602639f9ba212f866df89490b32f552f87
+DIST phpMyAdmin-4.7.0-beta1-all-languages.tar.xz 5678136 SHA256 afe5e42e2b60f0a9371e26946a84a02800f2107805bfd615f47aa82d015cc55d SHA512 49c4c1006580b56a379defcbd9ba140557511a06af0b86792ee32383db400bcc5e2050b14f40698735a9972a1ca197ab7678524d1c7ac0dc96d2649b5eb7bba4 WHIRLPOOL caa053dd7da1de834744d4d4b86bf817d4922b0c749ffbf557c1f18032065785af974072f3b575fa58c1ae35a02fb5eb9389ac8abc9e274102532a0c94fbf34d
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.0.10.18.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.0.10.19.ebuild
index e247c8169ca7..98d5fc44f92a 100644
--- a/dev-db/phpmyadmin/phpmyadmin-4.0.10.18.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.0.10.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.6.5.2.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.6.6.ebuild
index 1f26611da40f..f59dcef19d13 100644
--- a/dev-db/phpmyadmin/phpmyadmin-4.6.5.2.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.6.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.7.0_beta1.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.7.0_beta1.ebuild
new file mode 100644
index 000000000000..f59dcef19d13
--- /dev/null
+++ b/dev-db/phpmyadmin/phpmyadmin-4.7.0_beta1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils webapp
+
+MY_PV=${PV/_/-}
+MY_PN="phpMyAdmin"
+MY_P="${MY_PN}-${MY_PV}-all-languages"
+
+DESCRIPTION="Web-based administration for MySQL database in PHP"
+HOMEPAGE="https://www.phpmyadmin.net/"
+SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="setup"
+
+RDEPEND="
+	dev-lang/php[crypt,ctype,filter,json,session,unicode]
+	|| (
+		dev-lang/php[mysqli]
+		dev-lang/php[mysql]
+	)
+	virtual/httpd-php:*
+"
+
+need_httpd_cgi
+
+S="${WORKDIR}"/${MY_P}
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc README RELEASE-DATE-${MY_PV} ChangeLog || die
+	rm -f LICENSE README* RELEASE-DATE-${MY_PV}
+
+	if ! use setup; then
+		rm -rf setup || die "Cannot remove setup utility"
+		elog "The phpMyAdmin setup utility has been removed."
+		elog "It is a regular target of various exploits. If you need it, set USE=setup."
+	else
+		elog "You should consider disabling the setup USE flag"
+		elog "to exclude the setup utility if you don't use it."
+		elog "It regularly is the target of various exploits."
+	fi
+
+	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
+	doins -r .
+
+	webapp_configfile "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
+	webapp_serverowned "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-3.1.txt
+	webapp_src_install
+}
diff --git a/dev-java/ant-core/ant-core-1.9.2.ebuild b/dev-java/ant-core/ant-core-1.9.2.ebuild
index 91372a947bd8..d30cec71f546 100644
--- a/dev-java/ant-core/ant-core-1.9.2.ebuild
+++ b/dev-java/ant-core/ant-core-1.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -22,7 +22,8 @@ SRC_URI="mirror://apache/ant/source/${MY_P}-src.tar.bz2
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc64 x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris 
+~x86-solaris"
 
 DEPEND="|| ( >=virtual/jdk-1.5 dev-java/gcj-jdk )
 	!dev-java/ant-tasks
diff --git a/dev-java/ecj-gcj/ecj-gcj-4.4.2.ebuild b/dev-java/ecj-gcj/ecj-gcj-4.4.2.ebuild
index e10c74481229..4d5bf863f09b 100644
--- a/dev-java/ecj-gcj/ecj-gcj-4.4.2.ebuild
+++ b/dev-java/ecj-gcj/ecj-gcj-4.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -15,7 +15,7 @@ SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/${MY_PN}src
 
 LICENSE="EPL-1.0"
 SLOT="4.4"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="+native"
 
 RDEPEND="sys-devel/gcc:*[gcj]
diff --git a/dev-java/gcj-jdk/gcj-jdk-4.9.4.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.9.4.ebuild
index 54e4b391089b..4573771b7efb 100644
--- a/dev-java/gcj-jdk/gcj-jdk-4.9.4.ebuild
+++ b/dev-java/gcj-jdk/gcj-jdk-4.9.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gentoo.org/"
 SRC_URI=""
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x86-linux"
 SLOT="0"
 IUSE="awt"
 
diff --git a/dev-java/icedtea-web/icedtea-web-1.6.2.ebuild b/dev-java/icedtea-web/icedtea-web-1.6.2.ebuild
index 250c65cc67aa..627a07f1d3b9 100644
--- a/dev-java/icedtea-web/icedtea-web-1.6.2.ebuild
+++ b/dev-java/icedtea-web/icedtea-web-1.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://icedtea.classpath.org"
 SRC_URI="http://icedtea.classpath.org/download/source/${P}.tar.gz"
 LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="doc javascript nsplugin tagsoup test"
 RESTRICT="test"
 
diff --git a/dev-java/icedtea/icedtea-3.2.0.ebuild b/dev-java/icedtea/icedtea-3.2.0.ebuild
index b6afe60e5dad..0d066cb02f7c 100644
--- a/dev-java/icedtea/icedtea-3.2.0.ebuild
+++ b/dev-java/icedtea/icedtea-3.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
@@ -60,7 +60,7 @@ SRC_URI="
 	${DROP_URL}/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}"
 
 LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 IUSE="+alsa cacao +cups doc examples +gtk headless-awt infinality
 	jamvm +jbootstrap kerberos libressl nsplugin pax_kernel +pch
diff --git a/dev-java/icedtea/icedtea-7.2.6.8.ebuild b/dev-java/icedtea/icedtea-7.2.6.8.ebuild
index db17d9d0e3c7..9c4886e47ce3 100644
--- a/dev-java/icedtea/icedtea-7.2.6.8.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.6.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
@@ -53,7 +53,7 @@ SRC_URI="
 	${DROP_URL}/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}"
 
 LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 IUSE="+alsa cacao cjk +cups debug doc examples +gtk headless-awt infinality
 	jamvm javascript +jbootstrap kerberos libressl nsplugin nss pax_kernel
diff --git a/dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild b/dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild
index 0fcd78db1fdf..072f9a50e8ba 100644
--- a/dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild
+++ b/dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 python_prepare_all() {
diff --git a/dev-python/oslo-middleware/files/cve-2017-2592-stable-mitaka.patch b/dev-python/oslo-middleware/files/cve-2017-2592-stable-mitaka.patch
new file mode 100644
index 000000000000..b38cd597c3d4
--- /dev/null
+++ b/dev-python/oslo-middleware/files/cve-2017-2592-stable-mitaka.patch
@@ -0,0 +1,90 @@
+From 095e90929d114e4b6cece67cb405741c14747356 Mon Sep 17 00:00:00 2001
+From: Jamie Lennox <jamielennox@gmail.com>
+Date: Wed, 28 Sep 2016 15:03:53 +1000
+Subject: [PATCH] Filter token data out of catch_errors middleware
+
+If an exception is caught by the catch_errors middleware the entire
+request is dumped into the log including sensitive information like
+tokens. Filter that information before outputting the failed request.
+
+Closes-Bug: #1628031
+Change-Id: I2563403993513c37751576223275350cac2e0937
+---
+ oslo_middleware/catch_errors.py            |  6 +++++-
+ oslo_middleware/tests/test_catch_errors.py | 25 +++++++++++++++++++++++++
+ 2 files changed, 30 insertions(+), 1 deletion(-)
+
+diff --git a/oslo_middleware/catch_errors.py b/oslo_middleware/catch_errors.py
+index 43d085f..0934fc5 100644
+--- a/oslo_middleware/catch_errors.py
++++ b/oslo_middleware/catch_errors.py
+@@ -14,6 +14,7 @@
+ #    under the License.
+ 
+ import logging
++import re
+ 
+ import webob.dec
+ import webob.exc
+@@ -24,6 +25,8 @@ from oslo_middleware import base
+ 
+ LOG = logging.getLogger(__name__)
+ 
++_TOKEN_RE = re.compile('^(X-\w+-Token):.*$', flags=re.MULTILINE)
++
+ 
+ class CatchErrors(base.ConfigurableMiddleware):
+     """Middleware that provides high-level error handling.
+@@ -37,7 +40,8 @@ class CatchErrors(base.ConfigurableMiddleware):
+         try:
+             response = req.get_response(self.application)
+         except Exception:
++            req_str = _TOKEN_RE.sub(r'\1: <removed>', req.as_text())
+             LOG.exception(_LE('An error occurred during '
+-                              'processing the request: %s'), req)
++                              'processing the request: %s'), req_str)
+             response = webob.exc.HTTPInternalServerError()
+         return response
+diff --git a/oslo_middleware/tests/test_catch_errors.py b/oslo_middleware/tests/test_catch_errors.py
+index 920bbe2..0b675e2 100644
+--- a/oslo_middleware/tests/test_catch_errors.py
++++ b/oslo_middleware/tests/test_catch_errors.py
+@@ -13,6 +13,7 @@
+ #    License for the specific language governing permissions and limitations
+ #    under the License.
+ 
++import fixtures
+ import mock
+ from oslotest import base as test_base
+ import webob.dec
+@@ -45,3 +46,27 @@ class CatchErrorsTest(test_base.BaseTestCase):
+             self._test_has_request_id(application,
+                                       webob.exc.HTTPInternalServerError.code)
+             self.assertEqual(1, log_exc.call_count)
++
++    def test_filter_tokens_from_log(self):
++        logger = self.useFixture(fixtures.FakeLogger(nuke_handlers=False))
++
++        @webob.dec.wsgify
++        def application(req):
++            raise Exception()
++
++        app = catch_errors.CatchErrors(application)
++        req = webob.Request.blank('/test',
++                                  text=u'test data',
++                                  method='POST',
++                                  headers={'X-Auth-Token': 'secret1',
++                                           'X-Service-Token': 'secret2',
++                                           'X-Other-Token': 'secret3'})
++        res = req.get_response(app)
++        self.assertEqual(500, res.status_int)
++
++        output = logger.output
++
++        self.assertIn('X-Auth-Token: <removed>', output)
++        self.assertIn('X-Service-Token: <removed>', output)
++        self.assertIn('X-Other-Token: <removed>', output)
++        self.assertIn('test data', output)
+-- 
+2.7.4
+
diff --git a/dev-python/oslo-middleware/files/cve-2017-2592-stable-newton.patch b/dev-python/oslo-middleware/files/cve-2017-2592-stable-newton.patch
new file mode 100644
index 000000000000..b38cd597c3d4
--- /dev/null
+++ b/dev-python/oslo-middleware/files/cve-2017-2592-stable-newton.patch
@@ -0,0 +1,90 @@
+From 095e90929d114e4b6cece67cb405741c14747356 Mon Sep 17 00:00:00 2001
+From: Jamie Lennox <jamielennox@gmail.com>
+Date: Wed, 28 Sep 2016 15:03:53 +1000
+Subject: [PATCH] Filter token data out of catch_errors middleware
+
+If an exception is caught by the catch_errors middleware the entire
+request is dumped into the log including sensitive information like
+tokens. Filter that information before outputting the failed request.
+
+Closes-Bug: #1628031
+Change-Id: I2563403993513c37751576223275350cac2e0937
+---
+ oslo_middleware/catch_errors.py            |  6 +++++-
+ oslo_middleware/tests/test_catch_errors.py | 25 +++++++++++++++++++++++++
+ 2 files changed, 30 insertions(+), 1 deletion(-)
+
+diff --git a/oslo_middleware/catch_errors.py b/oslo_middleware/catch_errors.py
+index 43d085f..0934fc5 100644
+--- a/oslo_middleware/catch_errors.py
++++ b/oslo_middleware/catch_errors.py
+@@ -14,6 +14,7 @@
+ #    under the License.
+ 
+ import logging
++import re
+ 
+ import webob.dec
+ import webob.exc
+@@ -24,6 +25,8 @@ from oslo_middleware import base
+ 
+ LOG = logging.getLogger(__name__)
+ 
++_TOKEN_RE = re.compile('^(X-\w+-Token):.*$', flags=re.MULTILINE)
++
+ 
+ class CatchErrors(base.ConfigurableMiddleware):
+     """Middleware that provides high-level error handling.
+@@ -37,7 +40,8 @@ class CatchErrors(base.ConfigurableMiddleware):
+         try:
+             response = req.get_response(self.application)
+         except Exception:
++            req_str = _TOKEN_RE.sub(r'\1: <removed>', req.as_text())
+             LOG.exception(_LE('An error occurred during '
+-                              'processing the request: %s'), req)
++                              'processing the request: %s'), req_str)
+             response = webob.exc.HTTPInternalServerError()
+         return response
+diff --git a/oslo_middleware/tests/test_catch_errors.py b/oslo_middleware/tests/test_catch_errors.py
+index 920bbe2..0b675e2 100644
+--- a/oslo_middleware/tests/test_catch_errors.py
++++ b/oslo_middleware/tests/test_catch_errors.py
+@@ -13,6 +13,7 @@
+ #    License for the specific language governing permissions and limitations
+ #    under the License.
+ 
++import fixtures
+ import mock
+ from oslotest import base as test_base
+ import webob.dec
+@@ -45,3 +46,27 @@ class CatchErrorsTest(test_base.BaseTestCase):
+             self._test_has_request_id(application,
+                                       webob.exc.HTTPInternalServerError.code)
+             self.assertEqual(1, log_exc.call_count)
++
++    def test_filter_tokens_from_log(self):
++        logger = self.useFixture(fixtures.FakeLogger(nuke_handlers=False))
++
++        @webob.dec.wsgify
++        def application(req):
++            raise Exception()
++
++        app = catch_errors.CatchErrors(application)
++        req = webob.Request.blank('/test',
++                                  text=u'test data',
++                                  method='POST',
++                                  headers={'X-Auth-Token': 'secret1',
++                                           'X-Service-Token': 'secret2',
++                                           'X-Other-Token': 'secret3'})
++        res = req.get_response(app)
++        self.assertEqual(500, res.status_int)
++
++        output = logger.output
++
++        self.assertIn('X-Auth-Token: <removed>', output)
++        self.assertIn('X-Service-Token: <removed>', output)
++        self.assertIn('X-Other-Token: <removed>', output)
++        self.assertIn('test data', output)
+-- 
+2.7.4
+
diff --git a/dev-python/oslo-middleware/oslo-middleware-3.19.0.ebuild b/dev-python/oslo-middleware/oslo-middleware-3.19.0-r1.ebuild
index 7cdf258aa63c..d219a8863020 100644
--- a/dev-python/oslo-middleware/oslo-middleware-3.19.0.ebuild
+++ b/dev-python/oslo-middleware/oslo-middleware-3.19.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -17,6 +17,8 @@ SLOT="0"
 KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 
+PATCHES=( "${FILESDIR}/cve-2017-2592-stable-newton.patch" )
+
 CDEPEND="
 	>=dev-python/pbr-1.6[${PYTHON_USEDEP}]
 	<dev-python/pbr-2.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-middleware/oslo-middleware-3.8.0-r1.ebuild b/dev-python/oslo-middleware/oslo-middleware-3.8.0-r2.ebuild
index 2a4fe067baf3..f266e36921e3 100644
--- a/dev-python/oslo-middleware/oslo-middleware-3.8.0-r1.ebuild
+++ b/dev-python/oslo-middleware/oslo-middleware-3.8.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -17,6 +17,8 @@ SLOT="0"
 KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 
+FILES=( "${FILESDIR}/cve-2017-2592-stable-mitaka.patch" )
+
 CDEPEND="
 	>=dev-python/pbr-1.6[${PYTHON_USEDEP}]
 	<dev-python/pbr-2.0[${PYTHON_USEDEP}]"
diff --git a/dev-util/systemtap/systemtap-2.9.ebuild b/dev-util/systemtap/systemtap-2.9.ebuild
index 66bc1728628f..c4e9a361a6e1 100644
--- a/dev-util/systemtap/systemtap-2.9.ebuild
+++ b/dev-util/systemtap/systemtap-2.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.sourceware.org/${PN}/ftp/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="sqlite"
 
 RDEPEND=">=dev-libs/elfutils-0.142
diff --git a/mail-client/thunderbird/thunderbird-45.7.0.ebuild b/mail-client/thunderbird/thunderbird-45.7.0.ebuild
index d6e98c5b7444..9ff1572c7ef7 100644
--- a/mail-client/thunderbird/thunderbird-45.7.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-45.7.0.ebuild
@@ -38,7 +38,7 @@ inherit flag-o-matic toolchain-funcs mozconfig-v6.45 makeedit autotools pax-util
 DESCRIPTION="Thunderbird Mail Client"
 HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"
 
-KEYWORDS="~alpha amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 SLOT="0"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
 IUSE="bindist crypt hardened ldap lightning +minimal mozdom selinux"
diff --git a/media-libs/libart_lgpl/libart_lgpl-2.3.21-r3.ebuild b/media-libs/libart_lgpl/libart_lgpl-2.3.21-r3.ebuild
index eefa7f7a4b22..2ce64a38a972 100644
--- a/media-libs/libart_lgpl/libart_lgpl-2.3.21-r3.ebuild
+++ b/media-libs/libart_lgpl/libart_lgpl-2.3.21-r3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.levien.com/libart"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index f0e33df2665e..151504aadffb 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -81,7 +81,7 @@ FFMPEG_FLAG_MAP=(
 		# libavfilter options
 		bs2b:libbs2b chromaprint flite:libflite frei0r
 		fribidi:libfribidi fontconfig ladspa libass truetype:libfreetype
-		rubberband:librubberband zimg:libzimg
+		rubberband:librubberband sofalizer:netcdf zimg:libzimg
 		# libswresample options
 		libsoxr
 		# Threads; we only support pthread for now but ffmpeg supports more
@@ -220,6 +220,10 @@ RDEPEND="
 	samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
 	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
 	sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
+	sofalizer? (
+		>=sci-libs/netcdf-4.3.2-r1[hdf5]
+		>=sci-libs/hdf5-1.8.18[hl]
+	)
 	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
 	ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
 	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
@@ -336,7 +340,7 @@ multilib_src_configure() {
 
 	# (temporarily) disable non-multilib deps
 	if ! multilib_is_native_abi; then
-		for i in frei0r ; do
+		for i in frei0r netcdf ; do
 			myconf+=( --disable-${i} )
 		done
 	fi
diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml
index bb1498966a29..85766b4b87da 100644
--- a/media-video/ffmpeg/metadata.xml
+++ b/media-video/ffmpeg/metadata.xml
@@ -49,6 +49,7 @@
 	<flag name="rubberband">Adds time-stretching and pitch-shifting audio filter based on <pkg>media-libs/rubberband</pkg>.</flag>
 	<flag name="schroedinger">Enable Dirac video support (an advanced royalty-free video compression format) via libschroedinger (high-speed implementation in C of the Dirac codec).</flag>
 	<flag name="snappy">Enable <pkg>app-arch/snappy</pkg> support. Required for e.g. Vidvox Hap encoder.</flag>
+	<flag name="sofalizer">Enables Sofalizer filter</flag>
 	<flag name="ssh">Enable SSH/sftp support via <pkg>net-libs/libssh</pkg>.</flag>
 	<flag name="twolame">Enables MP2 encoding via <pkg>media-sound/twolame</pkg> as an alternative to the internal encoder.</flag>
 	<flag name="vpx">Enables vp8 codec support using libvpx: Decoding vp8 does not require this to be enabled but libvpx can also be used for decoding; encoding vp8 requires this useflag to be enabled though.</flag>
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index 4a33cee19853..a4fc45c3ab6a 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -19,7 +19,11 @@ net-misc/curl curl_ssl_axtls curl_ssl_polarssl metalink
 dev-libs/efl physics
 
 # Needs testing.
-sys-devel/gcc gcj graphite regression-test
+sys-devel/gcc graphite regression-test
+
+# Roy Bamford <neddyseagoon@gentoo.org> (26 Jan 2017)
+# gcj-6.3 won't bootstrap icedtea 7
+>=sys-devel/gcc-6 gcj
 
 # Julian Ospald <hasufell@gentoo.org> (04 Jan 2014)
 # no keyword for media-libs/swfdec and media-libs/libtimidity
diff --git a/profiles/arch/arm64/use.mask b/profiles/arch/arm64/use.mask
index f455bf6bc05b..898be9b535e6 100644
--- a/profiles/arch/arm64/use.mask
+++ b/profiles/arch/arm64/use.mask
@@ -194,6 +194,3 @@ clvm
 # Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (22 Aug 2013)
 # virtual/opencl is not keyworded
 opencl
-
-# No arm64 java support yet.
-java
diff --git a/sys-apps/baselayout-java/baselayout-java-0.1.0.ebuild b/sys-apps/baselayout-java/baselayout-java-0.1.0.ebuild
index 22c06fce317c..515ac43605b8 100644
--- a/sys-apps/baselayout-java/baselayout-java-0.1.0.ebuild
+++ b/sys-apps/baselayout-java/baselayout-java-0.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~sera/distfiles/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="!<dev-java/java-config-2.2"
diff --git a/virtual/jdk/jdk-1.7.0-r2.ebuild b/virtual/jdk/jdk-1.7.0-r2.ebuild
index f3f1cda1b9da..fb97cbb421d9 100644
--- a/virtual/jdk/jdk-1.7.0-r2.ebuild
+++ b/virtual/jdk/jdk-1.7.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -6,7 +6,7 @@ EAPI="6"
 
 DESCRIPTION="Virtual for Java Development Kit (JDK)"
 SLOT="1.7"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="|| (
 		dev-java/icedtea-bin:7
diff --git a/virtual/jre/jre-1.7.0-r2.ebuild b/virtual/jre/jre-1.7.0-r2.ebuild
index 7f3cdb34853e..541933784c2a 100644
--- a/virtual/jre/jre-1.7.0-r2.ebuild
+++ b/virtual/jre/jre-1.7.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -6,6 +6,6 @@ EAPI="6"
 
 DESCRIPTION="Virtual for Java Runtime Environment (JRE)"
 SLOT="1.7"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="virtual/jdk:1.7"
diff --git a/virtual/jre/jre-1.8.0-r1.ebuild b/virtual/jre/jre-1.8.0-r1.ebuild
index 2629a7cc614a..5bb0acb66825 100644
--- a/virtual/jre/jre-1.8.0-r1.ebuild
+++ b/virtual/jre/jre-1.8.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -6,7 +6,7 @@ EAPI="6"
 
 DESCRIPTION="Virtual for Java Runtime Environment (JRE)"
 SLOT="1.8"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris"
 
 RDEPEND="|| (
 		virtual/jdk:1.8