Drop IPv6 and SSL patches, add support for UCSPI_TCP_PATCH_DIR variable instead. General cleanup.

Package-Manager: portage-2.1.2

4 files changed, 107 insertions, 6 deletions

diff --git a/sys-apps/ucspi-tcp/ChangeLog b/sys-apps/ucspi-tcp/ChangeLog
index bf69eb4533c0..83557fd7d594 100644
--- a/sys-apps/ucspi-tcp/ChangeLog
+++ b/sys-apps/ucspi-tcp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/ucspi-tcp
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-tcp/ChangeLog,v 1.53 2006/10/16 15:51:51 corsair Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-tcp/ChangeLog,v 1.54 2007/01/15 21:24:20 hansmi Exp $
+
+*ucspi-tcp-0.88-r16 (15 Jan 2007)
+
+  15 Jan 2007; Michael Hanselmann <hansmi@gentoo.org>
+  +ucspi-tcp-0.88-r16.ebuild:
+  Drop IPv6 and SSL patches, add support for UCSPI_TCP_PATCH_DIR variable
+  instead. General cleanup.
 
   16 Oct 2006; Markus Rothe <corsair@gentoo.org> ucspi-tcp-0.88-r15.ebuild:
   Stable on ppc64
diff --git a/sys-apps/ucspi-tcp/Manifest b/sys-apps/ucspi-tcp/Manifest
index 3ee837a25cfc..be5cbbfa15ca 100644
--- a/sys-apps/ucspi-tcp/Manifest
+++ b/sys-apps/ucspi-tcp/Manifest
@@ -39,10 +39,14 @@ EBUILD ucspi-tcp-0.88-r15.ebuild 3044 RMD160 3b10b6a1c6f7a716b010dbdc08d84e272b9
 MD5 4188834d1df6fa02812854b4d6ea398b ucspi-tcp-0.88-r15.ebuild 3044
 RMD160 3b10b6a1c6f7a716b010dbdc08d84e272b997b9a ucspi-tcp-0.88-r15.ebuild 3044
 SHA256 8e3446775b04c607bb6520e80fbd74cf910943838a1cf55961982b6b2dcc0825 ucspi-tcp-0.88-r15.ebuild 3044
-MISC ChangeLog 7715 RMD160 f8dff350502a806ecf1d976b5ed89b513261d8fc SHA1 5ddf6e8cc4fa006dbe42579b522b0dfcba31f9ea SHA256 7ad7945d168ab6c130acc73de5c2d6ddb732f0c683056d10f7e9153b839bd589
-MD5 f590286a174f7d454a874bcd95c00677 ChangeLog 7715
-RMD160 f8dff350502a806ecf1d976b5ed89b513261d8fc ChangeLog 7715
-SHA256 7ad7945d168ab6c130acc73de5c2d6ddb732f0c683056d10f7e9153b839bd589 ChangeLog 7715
+EBUILD ucspi-tcp-0.88-r16.ebuild 2356 RMD160 b0ca4b06089954b21ada6a55c9e60fa99ade0abe SHA1 4eb31d904f975aced6944cd8fd4d7e8841b22bcf SHA256 80e5271266d96201290122e04636b4c8364988ecf50e799557e478c0479227dc
+MD5 211fe6f88139dc8e536546e224e98c88 ucspi-tcp-0.88-r16.ebuild 2356
+RMD160 b0ca4b06089954b21ada6a55c9e60fa99ade0abe ucspi-tcp-0.88-r16.ebuild 2356
+SHA256 80e5271266d96201290122e04636b4c8364988ecf50e799557e478c0479227dc ucspi-tcp-0.88-r16.ebuild 2356
+MISC ChangeLog 7936 RMD160 6fe5e1c5ef1cb8241473fef4d8cd378b9b5c21df SHA1 046ab3eae4edb51d43d1b4f8e2f97e736cf88d5a SHA256 40fd9f6257a6fb5f3ea0eb7a404887cc34873e0193f43cb6ba319dd971791f64
+MD5 8daaf25a87699a18dce1d7239fdf0add ChangeLog 7936
+RMD160 6fe5e1c5ef1cb8241473fef4d8cd378b9b5c21df ChangeLog 7936
+SHA256 40fd9f6257a6fb5f3ea0eb7a404887cc34873e0193f43cb6ba319dd971791f64 ChangeLog 7936
 MISC metadata.xml 592 RMD160 55f62935ff7dc2faf84951259954a3bc51154a51 SHA1 418ead2e6c1e70d8678cd336ed1ea0ab8e50d200 SHA256 1043f71f51803b39959194265e8dc63e009634eaafe5bee91892f359ba4950f4
 MD5 66ed278686866a3187b68d81fe47fa24 metadata.xml 592
 RMD160 55f62935ff7dc2faf84951259954a3bc51154a51 metadata.xml 592
@@ -53,3 +57,6 @@ SHA256 082c9111937c7712373c4fcd27332a6213753c97c363a8835659d628f1016f70 files/di
 MD5 71e4142fc5f0ff226abf84b1d720ff0d files/digest-ucspi-tcp-0.88-r15 1289
 RMD160 76246806e54aa7b4664226289b8ebc25e3de9fed files/digest-ucspi-tcp-0.88-r15 1289
 SHA256 082c9111937c7712373c4fcd27332a6213753c97c363a8835659d628f1016f70 files/digest-ucspi-tcp-0.88-r15 1289
+MD5 d43548dda8f86e99c0009cd5be93641c files/digest-ucspi-tcp-0.88-r16 458
+RMD160 f279db8a533a335692ee173d9c1d094b6aaaed91 files/digest-ucspi-tcp-0.88-r16 458
+SHA256 a2a38da1a240cc29b23440eab566e391c7a46dda1bdb9c69e49dfae2a7cee40b files/digest-ucspi-tcp-0.88-r16 458
diff --git a/sys-apps/ucspi-tcp/files/digest-ucspi-tcp-0.88-r16 b/sys-apps/ucspi-tcp/files/digest-ucspi-tcp-0.88-r16
new file mode 100644
index 000000000000..626a1090f5af
--- /dev/null
+++ b/sys-apps/ucspi-tcp/files/digest-ucspi-tcp-0.88-r16
@@ -0,0 +1,6 @@
+MD5 554ec0eb60f619667efde3fb5325310d ucspi-rss.diff 1828
+RMD160 e65f7317351f45eab70ed7b66d98e3c4b4494389 ucspi-rss.diff 1828
+SHA256 5101354eb86d8e11edefd7b83df4e9c274a55b845f4cb2ce36dda912aced56f4 ucspi-rss.diff 1828
+MD5 39b619147db54687c4a583a7a94c9163 ucspi-tcp-0.88.tar.gz 53019
+RMD160 eb20085ea6ffd5d137a805f7c8768e0312c1f56a ucspi-tcp-0.88.tar.gz 53019
+SHA256 4a0615cab74886f5b4f7e8fd32933a07b955536a3476d74ea087a3ea66a23e9c ucspi-tcp-0.88.tar.gz 53019
diff --git a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r16.ebuild b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r16.ebuild
new file mode 100644
index 000000000000..636dab973cb9
--- /dev/null
+++ b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r16.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2007 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-r16.ebuild,v 1.1 2007/01/15 21:24:20 hansmi Exp $
+
+inherit eutils toolchain-funcs fixheadtails flag-o-matic
+
+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
+	mirror://qmail/ucspi-rss.diff
+"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="selinux doc"
+RESTRICT="test"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	doc? ( app-doc/ucspi-tcp-man )
+	selinux? ( sec-policy/selinux-ucspi-tcp )"
+PROVIDE="virtual/inetd"
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	cd "${S}"
+
+	epatch \
+		"${FILESDIR}"/${PV}-errno.patch \
+		"${DISTDIR}"/ucspi-rss.diff \
+		"${FILESDIR}"/${PV}-rblsmtpd-ignore-on-RELAYCLIENT.patch
+
+	ht_fix_file Makefile
+
+	# gcc-3.4.5 and other several versions contain a bug on some platforms that
+	# cause this error:
+	# tcpserver: fatal: temporarily unable to figure out IP address for 0.0.0.0: file does not exist
+	# To work around this, we use -O1 here instead.
+	replace-flags -O? -O1
+
+	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"
+
+	if [[ -n "${UCSPI_TCP_PATCH_DIR}" && -d "${UCSPI_TCP_PATCH_DIR}" ]]
+	then
+		echo
+		ewarn "You enabled custom patches from ${UCSPI_TCP_PATCH_DIR}."
+		ewarn "Be warned that you won't get any support when using "
+		ewarn "this feature. You're on your own from now!"
+		echo
+		ebeep
+		epatch "${UCSPI_TCP_PATCH_DIR}/"*
+	fi
+}
+
+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
+	dodoc README.tcpserver-limits-patch
+	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."
+}