Bind to IPv6 as well as IPv4 (bug #308843)

(Portage version: 2.1.8.3/cvs/Linux i686)

3 files changed, 76 insertions, 2 deletions

diff --git a/net-misc/oidentd/ChangeLog b/net-misc/oidentd/ChangeLog
index 089c2ebe05c8..5481504c6695 100644
--- a/net-misc/oidentd/ChangeLog
+++ b/net-misc/oidentd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/oidentd
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/oidentd/ChangeLog,v 1.46 2009/02/21 10:32:37 angelos Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/oidentd/ChangeLog,v 1.47 2010/03/21 17:42:28 angelos Exp $
+
+*oidentd-2.0.8-r3 (21 Mar 2010)
+
+  21 Mar 2010; <angelos@gentoo.org> +oidentd-2.0.8-r3.ebuild,
+  +files/oidentd-2.0.8-bind-to-ipv6-too.patch:
+  Bind to IPv6 as well as IPv4 (bug #308843)
 
   21 Feb 2009; Christoph Mende <angelos@gentoo.org>
   -oidentd-2.0.8-r1.ebuild:
diff --git a/net-misc/oidentd/files/oidentd-2.0.8-bind-to-ipv6-too.patch b/net-misc/oidentd/files/oidentd-2.0.8-bind-to-ipv6-too.patch
new file mode 100644
index 000000000000..b3b0e5100337
--- /dev/null
+++ b/net-misc/oidentd/files/oidentd-2.0.8-bind-to-ipv6-too.patch
@@ -0,0 +1,17 @@
+Patch to bind to ipv6 socket as well
+Patch supplied by Fabian Knittel <fabian.knittel@avona.com>
+--- oidentd-2.0.8//src/oidentd_inet_util.c	2006-05-22 02:31:19.000000000 +0200
++++ oidentd-2.0.8.new//src/oidentd_inet_util.c	2010-03-01 20:26:11.000000000 +0100
+@@ -60,6 +60,12 @@
+ #ifdef WANT_IPV6
+ 		case AF_INET6:
+ 			SIN6(ai->ai_addr)->sin6_port = listen_port;
++
++			if (setsockopt(listenfd, IPPROTO_IPV6, IPV6_V6ONLY, &one,
++							sizeof(one)) != 0) {
++				debug("setsockopt IPV6_V6ONLY: %s", strerror(errno));
++				return (-1);
++			}
+ 			break;
+ #endif
+ 
diff --git a/net-misc/oidentd/oidentd-2.0.8-r3.ebuild b/net-misc/oidentd/oidentd-2.0.8-r3.ebuild
new file mode 100644
index 000000000000..ffa3b3b0f842
--- /dev/null
+++ b/net-misc/oidentd/oidentd-2.0.8-r3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/oidentd/oidentd-2.0.8-r3.ebuild,v 1.1 2010/03/21 17:42:28 angelos Exp $
+
+inherit eutils
+
+DESCRIPTION="Another (RFC1413 compliant) ident daemon"
+HOMEPAGE="http://dev.ojnk.net"
+SRC_URI="mirror://sourceforge/ojnk/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="debug ipv6 masquerade"
+
+RDEPEND=""
+DEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-masquerading.patch" \
+		"${FILESDIR}/${P}-bind-to-ipv6-too.patch"
+}
+
+src_compile() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable ipv6) \
+		$(use_enable masquerade masq) \
+		$(use_enable masquerade nat) \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed!"
+
+	dodoc AUTHORS ChangeLog README TODO NEWS \
+		"${FILESDIR}"/${PN}_masq.conf "${FILESDIR}"/${PN}.conf
+
+	newinitd "${FILESDIR}"/${PN}-2.0.7-init ${PN}
+	newconfd "${FILESDIR}"/${PN}-2.0.7-confd ${PN}
+}
+
+pkg_postinst() {
+	echo
+	elog "Example configuration files are in /usr/share/doc/${PF}"
+	echo
+}