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

Package-Manager: portage-2.1.8.3/cvs/Linux i686

4 files changed, 79 insertions, 13 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/Manifest b/net-misc/oidentd/Manifest
index 159d65de9b43..d26eafd5a647 100644
--- a/net-misc/oidentd/Manifest
+++ b/net-misc/oidentd/Manifest
@@ -1,19 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX oidentd-2.0.7-confd 67 RMD160 a44ebfb81e75a66a9bb35578e0ffcd3df423545b SHA1 027668c43c36676a71f0863a1abee2a0f4a64594 SHA256 acdd88d817474e392e8f07b0f00579007a71340d00a5520d7a2661ecf4a7e5f4
 AUX oidentd-2.0.7-init 954 RMD160 8b4d2087e2a13a0fc77b43b8b16a995cb0a42eb0 SHA1 a981feb9a7230395272647fede8395296b5f3039 SHA256 23237b6ebf392182e40d6e68ee44f505e379a28d7cbdc8843570c2d11a227729
+AUX oidentd-2.0.8-bind-to-ipv6-too.patch 559 RMD160 e89787b335d8ef41c0e7b0b8ac4c56b03432ce1e SHA1 1d61005fbe6a5bec786de4d75773a9464c85cb85 SHA256 7b1cb031b353b60d14c932c3c7a9f3ce040a47107df857e3b250f12eb0cf34d5
 AUX oidentd-2.0.8-masquerading.patch 1288 RMD160 1c8b7e5718fbfb37c97af05d5bfdd04042b8d613 SHA1 2a5d5f91a6a6014227e33bc1b87e161140a08061 SHA256 a256909b3a608ff224f8eea413313990778f70fc9f7d269c5939e51b9ec2a082
 AUX oidentd.conf 298 RMD160 2694e5e6e2e2eeb4688f7a2e947a7b77dcea0b21 SHA1 15b08fb7a5442c61f4b8bd517e6c8fda115bdcb5 SHA256 fe91a7af10e55c90a8468ba529012f8359507353035d72c669b535c8b84eb9dc
 AUX oidentd_masq.conf 429 RMD160 8da4104bff160102b647a2bc3444c885e4658f6d SHA1 ca15b976c80c237b1ded7eaf36c7632ec72d54c8 SHA256 16b94239221e63abdf38ce59e4b9231622f81bfeca643c8ac8be3a57b01ced28
 DIST oidentd-2.0.8.tar.gz 212354 RMD160 cca63799c01cf10d623f696238e8d0ac450230b1 SHA1 e14f72075612fc04b40119e3784740d9a2300d4b SHA256 a54cbed187281f8d5a301d1d8fd5cb0f30bfb13a5a8e9ab752ace76c1010fb6f
 EBUILD oidentd-2.0.8-r2.ebuild 1194 RMD160 e8253e8307679699a2a34c7f19a857a0d434d24c SHA1 e2355f69309d0315a8944337ef8edcdccfdf318b SHA256 bb5c8ee55d58448b3ee4094d5106e7b7e96e58602762b6e7d73c7c0a98117c80
-MISC ChangeLog 5404 RMD160 8726245c9a823e29d35d9a2d661441cfeb8ec825 SHA1 96c51da40c7586e6a739338ac03f8f464c57f82e SHA256 70dbabb0a86e755f66d8cc1149b255623773026d5a4bbedf3569264289e46e79
+EBUILD oidentd-2.0.8-r3.ebuild 1238 RMD160 bb5114bdb8fc8d2ff437cdb4342b7589254107a5 SHA1 8dd39d11cbf97eeaf595d222addc394d673bda68 SHA256 11f38873e5de92aaa05158cb1c9f34fddef08d80c397a7c9b10a2dbbad383379
+MISC ChangeLog 5592 RMD160 77ff1e16fb525508615d2d2243a5fb647bee2b55 SHA1 759e06499cc041d8ca5916c27ec19ab77198bddf SHA256 5284e216c0d8059e739014d62f94080129a8c6dbf62eca608a9a06f50e19cb42
 MISC metadata.xml 363 RMD160 5ee9f4738967ccba9f72e3a3b72b045df78675a2 SHA1 fe94db628b558bd902ab15b78166d9385d30d35f SHA256 6aae5bc60a157913e31679ce9b6650658a2394d5ce4727cd02d5aa0b13de80da
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
-
-iEYEARECAAYFAkmf2E4ACgkQKhnDs22gwa8icQCgxAgsEs4VVjQ0P149+yrzTHuc
-EBkAnAjh++IbCqZebuB07Gt1hwhptp8F
-=pg2J
------END PGP SIGNATURE-----
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
+}