Fixed bug 18892

4 files changed, 98 insertions, 2 deletions

diff --git a/sys-apps/ucspi-tcp/ChangeLog b/sys-apps/ucspi-tcp/ChangeLog
index ef1410fd101a..7274b323b8f4 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.29 2005/01/02 23:54:45 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-tcp/ChangeLog,v 1.30 2005/01/06 20:10:25 hansmi Exp $
+
+*ucspi-tcp-0.88-r9 (06 Jan 2005)
+
+  06 Jan 2005; Michael Hanselmann <hansmi@gentoo.org>
+  +ucspi-tcp-0.88-r9.ebuild:
+  Fixed bug 18892 which affected big endian systems.
 
   02 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
@@ -24,7 +30,7 @@
   ucspi-tcp-0.88-r7.ebuild, ucspi-tcp-0.88-r8.ebuild:
   virtual/glibc -> virtual/libc
 
-  11 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> ucspi-tcp-0.88-r8.ebuild:
+  11 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> ucspi-tcp-0.88-r8.ebuild:
   Stable on alpha.
 
   09 Apr 2004; Joshua Kinard <kumba@gentoo.org> ucspi-tcp-0.88-r8.ebuild:
diff --git a/sys-apps/ucspi-tcp/files/0.88-bigendian.patch b/sys-apps/ucspi-tcp/files/0.88-bigendian.patch
new file mode 100644
index 000000000000..026fbc62d01b
--- /dev/null
+++ b/sys-apps/ucspi-tcp/files/0.88-bigendian.patch
@@ -0,0 +1,14 @@
+--- ucspi-tcp-0.88.orig/tcpserver.c	2005-01-06 20:51:16.590777128 +0100
++++ ucspi-tcp-0.88/tcpserver.c	2005-01-06 20:52:34.075997584 +0100
+@@ -422,7 +422,11 @@
+     se = getservbyname(x,"tcp");
+     if (!se)
+       strerr_die3x(111,FATAL,"unable to figure out port number for ",x);
++#if __BYTE_ORDER == __BIG_ENDIAN || BYTE_ORDER == BIG_ENDIAN
++	localport = ntohs(se->s_port);
++#else
+     uint16_unpack_big((char*)&se->s_port,&localport);
++#endif
+   }
+ 
+   if (!*argv) usage();
diff --git a/sys-apps/ucspi-tcp/files/digest-ucspi-tcp-0.88-r9 b/sys-apps/ucspi-tcp/files/digest-ucspi-tcp-0.88-r9
new file mode 100644
index 000000000000..aee701c64d95
--- /dev/null
+++ b/sys-apps/ucspi-tcp/files/digest-ucspi-tcp-0.88-r9
@@ -0,0 +1,5 @@
+MD5 39b619147db54687c4a583a7a94c9163 ucspi-tcp-0.88.tar.gz 53019
+MD5 7a75eda8ccd766570392042f879a0812 ucspi-tcp-0.88-ipv6.diff13.bz2 21965
+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-r9.ebuild b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r9.ebuild
new file mode 100644
index 000000000000..919a07c0c9a2
--- /dev/null
+++ b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r9.ebuild
@@ -0,0 +1,71 @@
+# 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-r9.ebuild,v 1.1 2005/01/06 20:10:25 hansmi 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.diff13.bz2 )
+	mirror://qmail/ucspi-rss.diff
+	ssl? ( http://www.nrg4u.com/qmail/ucspi-tcp-ssl-20020705.patch.gz
+		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"
+
+DEPEND="virtual/libc
+	ssl? ( >=dev-libs/openssl-0.9.6g )"
+RDEPEND="${DEPEND}
+	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.diff13
+	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
+	# Fixes bug 18892
+	epatch ${FILESDIR}/${PV}-bigendian.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."
+}