Bug #34983, finally a fix from upstream to deal with IPv4-in-IPv6 addresses!.

(Portage version: 2.0.51.16)

4 files changed, 93 insertions, 5 deletions

diff --git a/sys-apps/ucspi-tcp/ChangeLog b/sys-apps/ucspi-tcp/ChangeLog
index 0cd410f459d4..df02646dd1da 100644
--- a/sys-apps/ucspi-tcp/ChangeLog
+++ b/sys-apps/ucspi-tcp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/ucspi-tcp
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-tcp/ChangeLog,v 1.31 2005/01/07 08:55:50 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-tcp/ChangeLog,v 1.32 2005/02/14 06:13:56 robbat2 Exp $
+
+*ucspi-tcp-0.88-r10 (13 Feb 2005)
+
+  13 Feb 2005; Robin H. Johnson <robbat2@gentoo.org>
+  +ucspi-tcp-0.88-r10.ebuild:
+  Bug #34983, finally a fix from upstream to deal with IPv4-in-IPv6 addresses!.
 
   07 Jan 2005; Michael Hanselmann <hansmi@gentoo.org>
   ucspi-tcp-0.88-r9.ebuild:
diff --git a/sys-apps/ucspi-tcp/Manifest b/sys-apps/ucspi-tcp/Manifest
index ca55aea6370a..8af9291297e3 100644
--- a/sys-apps/ucspi-tcp/Manifest
+++ b/sys-apps/ucspi-tcp/Manifest
@@ -1,10 +1,12 @@
+MD5 76034b124658a585b29a772acbf2b798 ucspi-tcp-0.88-r9.ebuild 2246
 MD5 579193432ca084eb245c1c6b36ca85fc ChangeLog 4675
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 76034b124658a585b29a772acbf2b798 ucspi-tcp-0.88-r9.ebuild 2246
+MD5 b9cc1cce5e26b26cd26a185693d452d3 ucspi-tcp-0.88-r10.ebuild 2275
 MD5 f28315c57485584788c9824481bc7603 ucspi-tcp-0.88-r8.ebuild 2148
-MD5 0479a09fdd4ce855d35e36563cab4743 files/0.88-errno.patch 239
+MD5 eeca4c38b2ce87ccb59e44f241b3c736 files/digest-ucspi-tcp-0.88-r10 350
 MD5 b36e99b422384451ac68b3a9b31b7ed6 files/0.88-head-1.patch 1403
-MD5 fb41d7c55db5124d7488a923e4223576 files/0.88-bigendian.patch 478
-MD5 9eab9910e2978160e33f6c4e9b227efa files/digest-ucspi-tcp-0.88-r9 350
 MD5 9eab9910e2978160e33f6c4e9b227efa files/digest-ucspi-tcp-0.88-r8 350
+MD5 9eab9910e2978160e33f6c4e9b227efa files/digest-ucspi-tcp-0.88-r9 350
+MD5 fb41d7c55db5124d7488a923e4223576 files/0.88-bigendian.patch 478
 MD5 64eb2b26c9c0e5d6b4042fd36b74dbb8 files/tcprules-Makefile 168
+MD5 0479a09fdd4ce855d35e36563cab4743 files/0.88-errno.patch 239
diff --git a/sys-apps/ucspi-tcp/files/digest-ucspi-tcp-0.88-r10 b/sys-apps/ucspi-tcp/files/digest-ucspi-tcp-0.88-r10
new file mode 100644
index 000000000000..807f2623b597
--- /dev/null
+++ b/sys-apps/ucspi-tcp/files/digest-ucspi-tcp-0.88-r10
@@ -0,0 +1,5 @@
+MD5 39b619147db54687c4a583a7a94c9163 ucspi-tcp-0.88.tar.gz 53019
+MD5 67de66745001ddb48563a1d4e92262c2 ucspi-tcp-0.88-ipv6.diff14.bz2 21917
+MD5 554ec0eb60f619667efde3fb5325310d ucspi-rss.diff 1828
+MD5 10d5074c18d00e5c62c76ce69d7c975b ucspi-tcp-ssl-20020705.patch.gz 3084
+MD5 2dfc47b1a142e1021a49c678dfbb7a03 ucspi-tcp-0.88-ipv6-ssl-nm1.patch.bz2 3212
diff --git a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r10.ebuild b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r10.ebuild
new file mode 100644
index 000000000000..3c6415ca8211
--- /dev/null
+++ b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r10.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r10.ebuild,v 1.1 2005/02/14 06:13:56 robbat2 Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Collection of tools for managing UNIX services"
+HOMEPAGE="http://cr.yp.to/ucspi-tcp.html"
+SRC_URI="http://cr.yp.to/${PN}/${P}.tar.gz
+	ipv6? ( http://www.fefe.de/ucspi/ucspi-tcp-0.88-ipv6.diff14.bz2 )
+	mirror://qmail/ucspi-rss.diff
+	ssl? (
+		!ipv6? ( http://www.nrg4u.com/qmail/ucspi-tcp-ssl-20020705.patch.gz )
+		ipv6? ( http://www.netmonks.ca/gentoo/patches/ucspi-tcp-0.88-ipv6-ssl-nm1.patch.bz2 )
+		)"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 ~ppc-macos sparc s390 x86"
+IUSE="ssl ipv6 selinux doc"
+
+DEPEND="virtual/libc
+		ssl? ( >=dev-libs/openssl-0.9.6g )"
+RDEPEND="${DEPEND}
+		doc? ( app-doc/ucspi-tcp-man )
+		selinux? ( sec-policy/selinux-ucspi-tcp )"
+PROVIDE="virtual/inetd"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	if use ipv6; then
+		epatch ${WORKDIR}/ucspi-tcp-0.88-ipv6.diff14
+		# Fixes bug 18892
+		epatch ${FILESDIR}/${PV}-bigendian.patch
+	fi
+	if use ssl; then
+		# this is a merged thingy. Thanks to Stephen Olesen <slepp.netmonks.ca>
+		# (bug #32007)
+		if use ipv6 ; then
+			epatch ${WORKDIR}/ucspi-tcp-0.88-ipv6-ssl-nm1.patch
+		else
+			epatch ${WORKDIR}/ucspi-tcp-ssl-20020705.patch
+		fi
+	fi
+	epatch ${FILESDIR}/${PV}-errno.patch
+	epatch ${DISTDIR}/ucspi-rss.diff
+	epatch ${FILESDIR}/${PV}-head-1.patch
+
+	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
+	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
+	echo "/usr/" > conf-home
+
+	# allow larger responses
+	sed -i 's|if (text.len > 200) text.len = 200;|if (text.len > 500) text.len = 500;|g' ${S}/rblsmtpd.c
+}
+
+src_compile() {
+	emake || die
+}
+
+src_install() {
+	dobin tcpserver tcprules tcprulescheck argv0 recordio tcpclient *\@ tcpcat mconnect mconnect-io addcr delcr fixcrio rblsmtpd || die
+	doman *.[15]
+	dodoc CHANGES FILES README SYSDEPS TARGETS TODO VERSION
+	insinto /etc/tcprules.d/
+	newins ${FILESDIR}/tcprules-Makefile Makefile
+}
+
+pkg_postinst() {
+	einfo "We have started a move to get all tcprules files into"
+	einfo "/etc/tcprules.d/, where we have provided a Makefile to"
+	einfo "easily update the CDB file."
+}