Merge updates from master

11 files changed, 4 insertions, 38 deletions

diff --git a/dev-embedded/pk2-la/metadata.xml b/dev-embedded/pk2-la/metadata.xml
index a5ce7e443502..6c695c66ddf2 100644
--- a/dev-embedded/pk2-la/metadata.xml
+++ b/dev-embedded/pk2-la/metadata.xml
@@ -5,10 +5,6 @@
 		pk2-la allows the Microchip PICkit2 programmer to be used as a
 		Logic Analyzer and I/O Probe.
 	</longdescription>
-	<maintainer type="person">
-		<email>josejx@gentoo.org</email>
-		<name>Joseph Jezak</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>embedded@gentoo.org</email>
 		<name>Embedded Gentoo</name>
diff --git a/dev-embedded/pk2cmd/metadata.xml b/dev-embedded/pk2cmd/metadata.xml
index bf32d60d1b8c..3435e2a089ff 100644
--- a/dev-embedded/pk2cmd/metadata.xml
+++ b/dev-embedded/pk2cmd/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>josejx@gentoo.org</email>
-</maintainer>
 <maintainer type="project">
   <email>embedded@gentoo.org</email>
   <name>Embedded Gentoo</name>
diff --git a/dev-python/pyusb/metadata.xml b/dev-python/pyusb/metadata.xml
index 36a92ccdbf2b..b547c09ec840 100644
--- a/dev-python/pyusb/metadata.xml
+++ b/dev-python/pyusb/metadata.xml
@@ -4,10 +4,6 @@
 	<longdescription>
 		pyusb is a python wrapper for the libusb user space USB device library.
 	</longdescription>
-	<maintainer type="person">
-		<email>josejx@gentoo.org</email>
-		<name>Joseph Jezak</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
diff --git a/eclass/user.eclass b/eclass/user.eclass
index 29910b51221d..372c76924a5c 100644
--- a/eclass/user.eclass
+++ b/eclass/user.eclass
@@ -5,7 +5,6 @@
 # @ECLASS: user.eclass
 # @MAINTAINER:
 # base-system@gentoo.org (Linux)
-# Joe Jezak <josejx@gmail.com> (OS X)
 # usata@gentoo.org (OS X)
 # Aaron Walker <ka0ttic@gentoo.org> (FreeBSD)
 # @BLURB: user management in ebuilds
diff --git a/net-misc/openssh/files/openssh-7.3_p1-GSSAPI-dns.patch b/net-misc/openssh/files/openssh-7.3_p1-GSSAPI-dns.patch
index d6798e2a8615..806b36d0ca94 100644
--- a/net-misc/openssh/files/openssh-7.3_p1-GSSAPI-dns.patch
+++ b/net-misc/openssh/files/openssh-7.3_p1-GSSAPI-dns.patch
@@ -82,15 +82,16 @@ https://bugzilla.mindrot.org/show_bug.cgi?id=1008
  .Xr ssh 1
 --- a/sshconnect2.c
 +++ b/sshconnect2.c
-@@ -656,6 +656,12 @@
+@@ -656,6 +656,13 @@
  	static u_int mech = 0;
  	OM_uint32 min;
  	int ok = 0;
 +	const char *gss_host;
 +
-+	if (options.gss_trust_dns)
++	if (options.gss_trust_dns) {
++		extern const char *auth_get_canonical_hostname(struct ssh *ssh, int use_dns);
 +		gss_host = auth_get_canonical_hostname(active_state, 1);
-+	else
++	} else
 +		gss_host = authctxt->host;
  
  	/* Try one GSSAPI method at a time, rather than sending them all at
diff --git a/net-wireless/b43-fwcutter/metadata.xml b/net-wireless/b43-fwcutter/metadata.xml
index bfe34f51aa4f..98a4ac2fb77b 100644
--- a/net-wireless/b43-fwcutter/metadata.xml
+++ b/net-wireless/b43-fwcutter/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="person">
-  <email>josejx@gentoo.org</email>
-  <name>Joseph Jezak</name>
-</maintainer>
-<maintainer type="person">
   <email>zerochaos@gentoo.org</email>
   <name>Rick Farina</name>
 </maintainer>
diff --git a/net-wireless/bcm43xx-fwcutter/metadata.xml b/net-wireless/bcm43xx-fwcutter/metadata.xml
index bfe34f51aa4f..98a4ac2fb77b 100644
--- a/net-wireless/bcm43xx-fwcutter/metadata.xml
+++ b/net-wireless/bcm43xx-fwcutter/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="person">
-  <email>josejx@gentoo.org</email>
-  <name>Joseph Jezak</name>
-</maintainer>
-<maintainer type="person">
   <email>zerochaos@gentoo.org</email>
   <name>Rick Farina</name>
 </maintainer>
diff --git a/sys-fs/diskdev_cmds/metadata.xml b/sys-fs/diskdev_cmds/metadata.xml
index 3595d69fbd98..2b0a4b9725c3 100644
--- a/sys-fs/diskdev_cmds/metadata.xml
+++ b/sys-fs/diskdev_cmds/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>josejx@gentoo.org</email>
-<name>Joseph Jezak</name>
-</maintainer>
 <maintainer type="project">
 <email>ppc@gentoo.org</email>
 <name>Gentoo Linux PowerPC Development</name>
diff --git a/sys-fs/dmg2img/metadata.xml b/sys-fs/dmg2img/metadata.xml
index a19993aedc0a..ddd4434d2b60 100644
--- a/sys-fs/dmg2img/metadata.xml
+++ b/sys-fs/dmg2img/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>josejx@gentoo.org</email>
-</maintainer>
 <maintainer type="project">
 	<email>base-system@gentoo.org</email>
 	<name>Gentoo Base System</name>
diff --git a/x11-misc/Xorgautoconfig/metadata.xml b/x11-misc/Xorgautoconfig/metadata.xml
index c26755348dfa..fb932f1acad3 100644
--- a/x11-misc/Xorgautoconfig/metadata.xml
+++ b/x11-misc/Xorgautoconfig/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>josejx@gentoo.org</email>
-<name>Joseph Jezak</name>
-</maintainer>
 <maintainer type="project">
 <email>ppc@gentoo.org</email>
 <name>Gentoo Linux PowerPC Development</name>
diff --git a/x11-misc/xac/metadata.xml b/x11-misc/xac/metadata.xml
index 93ad83413e30..094389d518ae 100644
--- a/x11-misc/xac/metadata.xml
+++ b/x11-misc/xac/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>josejx@gentoo.org</email>
-<name>Joseph Jezak</name>
-</maintainer>
 <longdescription lang="en">
 X.org autoconfiguration tool written in python.
 </longdescription>