[gentoo-commits] repo/gentoo:master commit in: net-nntp/leafnode/files/, net-nntp/leafnode/

[gentoo-commits] repo/gentoo:master commit in: net-nntp/leafnode/files/, net-nntp/leafnode/

[Hans de Graaff]

commit:     69fbd014af79f123df033a959eef8cb616d8b048
Author:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 15 06:54:12 2017 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Sat Jul 15 06:56:23 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69fbd014

net-nntp/leafnode: fix compilation with USE=-ipv6, bug 579948

Thanks to David Haller in bug 579948 for providing the patch.

Add myself as maintainer.

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 .../leafnode-1.11.11-checkpeerlocal_ipv6_fix.patch    | 19 +++++++++++++++++++
 net-nntp/leafnode/leafnode-1.11.11.ebuild             |  8 +++++++-
 net-nntp/leafnode/metadata.xml                        |  4 +++-
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/net-nntp/leafnode/files/leafnode-1.11.11-checkpeerlocal_ipv6_fix.patch b/net-nntp/leafnode/files/leafnode-1.11.11-checkpeerlocal_ipv6_fix.patch
new file mode 100644
index 00000000000..ef215e4c185
--- /dev/null
+++ b/net-nntp/leafnode/files/leafnode-1.11.11-checkpeerlocal_ipv6_fix.patch
@@ -0,0 +1,19 @@
+diff -x '*~' -purN a/checkpeerlocal.c b/checkpeerlocal.c
+--- a/checkpeerlocal.c	2015-08-25 00:03:26.000000000 +0200
++++ b/checkpeerlocal.c	2017-07-14 20:12:26.109653383 +0200
+@@ -208,6 +208,7 @@ int checkpeerlocal(int sock)
+     }
+ #endif
+ 
++#ifdef HAVE_IPV6
+     if (IN6_IS_ADDR_V4MAPPED(&addr.sin6.sin6_addr)) {
+ 	    /* map to IPv4 */
+ 	    struct sockaddr_in si;
+@@ -216,6 +217,7 @@ int checkpeerlocal(int sock)
+ 	    memcpy(&addr.sin, &si, sizeof(struct sockaddr_in));
+ 	    D(pat(&addr.sa));
+     }
++#endif
+ 
+     if (getifaddrs(&ifap) != 0) {
+ 	D(printf("getifaddrs failed: %s\n", strerror(errno)));

diff --git a/net-nntp/leafnode/leafnode-1.11.11.ebuild b/net-nntp/leafnode/leafnode-1.11.11.ebuild
index 73932cee5d7..96ffa3587ad 100644
--- a/net-nntp/leafnode/leafnode-1.11.11.ebuild
+++ b/net-nntp/leafnode/leafnode-1.11.11.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
+inherit epatch
+
 DESCRIPTION="A USENET software package designed for small sites"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 HOMEPAGE="http://leafnode.sourceforge.net/"
@@ -16,6 +18,10 @@ RDEPEND="${DEPEND}
 	virtual/inetd"
 DOCS=( CREDITS ChangeLog FAQ.txt FAQ.pdf INSTALL NEWS README-daemontools UNINSTALL-daemontools README README-MAINTAINER README-FQDN )
 
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-${PV}-checkpeerlocal_ipv6_fix.patch"
+}
+
 src_configure() {
 	econf \
 		--sysconfdir=/etc/leafnode \

diff --git a/net-nntp/leafnode/metadata.xml b/net-nntp/leafnode/metadata.xml
index 00ea967af8c..f1a24c0e134 100644
--- a/net-nntp/leafnode/metadata.xml
+++ b/net-nntp/leafnode/metadata.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+  <maintainer type="person">
+    <email>graaff@gentoo.org</email>
+  </maintainer>
 	<upstream>
 		<remote-id type="sourceforge">leafnode</remote-id>
 	</upstream>