fix #135571; use new qmail.eclass; ebuild cleanup

Package-Manager: portage-2.1.4.4

4 files changed, 117 insertions, 5 deletions

diff --git a/sys-apps/ucspi-tcp/ChangeLog b/sys-apps/ucspi-tcp/ChangeLog
index d51499509fa9..e9604a4fa70d 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-tcp/ChangeLog,v 1.58 2008/02/05 11:22:55 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-tcp/ChangeLog,v 1.59 2008/04/06 16:57:17 hollow Exp $
+
+*ucspi-tcp-0.88-r17 (06 Apr 2008)
+
+  06 Apr 2008; Benedikt Böhm <hollow@gentoo.org> +files/0.88-exit.patch,
+  +ucspi-tcp-0.88-r17.ebuild:
+  fix #135571; use new qmail.eclass; ebuild cleanup
 
   05 Feb 2008; Markus Rothe <corsair@gentoo.org> ucspi-tcp-0.88-r16.ebuild:
   Stable on ppc64
diff --git a/sys-apps/ucspi-tcp/Manifest b/sys-apps/ucspi-tcp/Manifest
index be612b3d237a..d5c8bd3d53b3 100644
--- a/sys-apps/ucspi-tcp/Manifest
+++ b/sys-apps/ucspi-tcp/Manifest
@@ -3,6 +3,7 @@ Hash: SHA1
 
 AUX 0.88-bigendian.patch 478 RMD160 65025a0a97e83bf920353c874ae0c484660c7d4b SHA1 91739a44c1993d5d1c66a57c759cb656d1ef96a8 SHA256 843738c0888c3072605dea0c536f5dc0f3ed2779a1cd7e0e959ccd2e4e705b6c
 AUX 0.88-errno.patch 239 RMD160 885fc53d5898d37ac1df95ef05a4a465356e2534 SHA1 2ff3f2b34d04905d85a2922b2161a191f6a40a00 SHA256 731c50fe35f129bc81c7740336fbe17b8e58c733d466d600830f5017bc5abdaa
+AUX 0.88-exit.patch 281 RMD160 893166d3cdcd73f10908f84267673e1effbebbea SHA1 b50167aca1f4227946fd31f536f76131d7390ca1 SHA256 ee2b6ee04e442817dab1716e9996ed0025bd50bfe30a2d3590d45dab31d0803a
 AUX 0.88-head-1.patch 1403 RMD160 911fa03d3400184da738e48adce8767e0a9c0591 SHA1 d8ad050b353214e1a8c0a2a65ef3fcddf324c3f1 SHA256 c39e042333df402e5a9416858991135ae1ea7c04c374cf7ff6dd6cee177c7a78
 AUX 0.88-limits.patch 12356 RMD160 c36d12082ace708372a56c4074f46e3a3e516ede SHA1 82e8a40fa694484d9c89ab70f0f5a5bd671dd460 SHA256 36220e0b33de09bc8320a1755b1f63844ac668d2351948c01d4650e67f6c1e74
 AUX 0.88-rblsmtpd-ignore-on-RELAYCLIENT.patch 462 RMD160 97cb8f2761928b585cae44ef88dbb9e190d176b9 SHA1 25c9bd25e997c304686679673bacfb9f59cde8ad SHA256 6179c0d030f80ddb72423f2c7c88ffaca7b9b05c68708ecbb28500672a1670bd
@@ -11,17 +12,20 @@ AUX tcprules-Makefile 168 RMD160 1feb7a1979490270bdacd56fd17801687207ad42 SHA1 d
 DIST ucspi-rss.diff 1828 RMD160 e65f7317351f45eab70ed7b66d98e3c4b4494389 SHA1 93accc0d827f1656182956ffb215da19b6fd7d12 SHA256 5101354eb86d8e11edefd7b83df4e9c274a55b845f4cb2ce36dda912aced56f4
 DIST ucspi-tcp-0.88-ipv6-ssl-20050405.patch 19411 RMD160 f7c7f36429eef7dd36b691cc3a17805e4947d65b SHA1 99f26610447e021abf6b35d49f7e9e247be16511 SHA256 80d4112de4cb556b0a1bf823cde175d55f1ecd0da2ad80951280adc6a8ab9407
 DIST ucspi-tcp-0.88-ipv6.diff17.bz2 22514 RMD160 ce9bc1cfe8f27f573662d0993aca0ed5318df91e SHA1 f4b4061a15314c894400cf71acd7eb6b47d80be0 SHA256 94c8aa47a34b1afe2ebdc0957a543bda7e03ab200e522eebdbbe964700aac97b
+DIST ucspi-tcp-0.88-man.tar.gz 7562 RMD160 6285882adea8f3c1f700ef82bec0d34078dfa559 SHA1 7b2507ff1b49917b44ee64af5995a94a50effd44 SHA256 09b1dd69ca3722b62c030abb27df9560cb72ff5d6247e4628e0c61e957b408ef
+DIST ucspi-tcp-0.88-rblspp.patch 6565 RMD160 9081c193ffb469adb6c7c74954615331654af75f SHA1 553c0facd0cbffba3664c888f66f2859445acc99 SHA256 68aeeb8482be71d9b7dd15d97a2855af34b6b8401fa598207f8de93ccdbb03e9
 DIST ucspi-tcp-0.88.tar.gz 53019 RMD160 eb20085ea6ffd5d137a805f7c8768e0312c1f56a SHA1 793b4189795b563085602c030dd8aa0d206ddc0e SHA256 4a0615cab74886f5b4f7e8fd32933a07b955536a3476d74ea087a3ea66a23e9c
 DIST ucspi-tcp-ssl-20050405.patch.gz 13173 RMD160 8afbe6362aa23b56731a2e05262fcaf49382058b SHA1 773c50c1007464ce48202398afa93a5612b8e439 SHA256 931ebeb9ca3ceb9394464aca0c4585048d04fc194fc5a9d4bb49bdd8ac249467
 EBUILD ucspi-tcp-0.88-r14.ebuild 2735 RMD160 10d1ba0b101ab37209a13a530cc58e0ea0dc9f13 SHA1 f9de9a470074a61662fd16eef890826f0e0f8e5c SHA256 bfd5135fb52515122349abefd1850176d9cefd4c0db52eab573eae930aa0d7ee
 EBUILD ucspi-tcp-0.88-r15.ebuild 3041 RMD160 6061989c0f21b24757046b25e75c9992b37da22e SHA1 06ac3d8d1e3a2688c53c6123d213a912f0b52f18 SHA256 eaaa9a9c90088c65fb67ed60fa1653daf5dfc3956beb42f8875ee4d04a6f4895
 EBUILD ucspi-tcp-0.88-r16.ebuild 2344 RMD160 9d4a40a900621f4594e276f4f4fe9f204604101a SHA1 873bc0af8d28a6cce55a97b67f4a8618842373e1 SHA256 b3a2f3a808790d39b65f8aba609705d6e087c7c91bd2244983bb633d861e3e74
-MISC ChangeLog 8553 RMD160 69c9e432d3856314a1f3cf3f34cc8752c1dcbfb1 SHA1 2a2e2b2837ed00d79315ae6a734bfd701d6cd859 SHA256 f91a89192ecd5d88a328b6cfd9ac7861bee5cee7ea6c333c24429beeedcddfb5
+EBUILD ucspi-tcp-0.88-r17.ebuild 2563 RMD160 4a40da6d5c9c592a1338075c4f53accec0ff1491 SHA1 ed38982436493474fbbf19680f58bad4f3aa2b65 SHA256 1beab74f33ad9ee0fe45b7f0d2d68d72db8f7a4ae1956a22a3929aa7fae4b97e
+MISC ChangeLog 8744 RMD160 d1fa5dfde6d97388fffc66313c41c37be1bc88ee SHA1 1c93de6301e4f876771dcd67a0559de6a22246dc SHA256 e0b4178d6472b86fa08d1ba39534386a3524cdd9adf9eaa42e7c79310fb6e3bb
 MISC metadata.xml 592 RMD160 55f62935ff7dc2faf84951259954a3bc51154a51 SHA1 418ead2e6c1e70d8678cd336ed1ea0ab8e50d200 SHA256 1043f71f51803b39959194265e8dc63e009634eaafe5bee91892f359ba4950f4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFH3N3Zj9hvisErhMIRArUWAJ4soNlLlcSyoMDGMkQuk0vPlwO/tQCfTOEL
-HY1mVz9cI7QD1b6fIqAMaok=
-=L8Ct
+iD8DBQFH+QDymPFBzbX68WERAkCmAJ0WCoSv5XHB61Bo3xaaX90XRNFRhQCffk91
+I6R9iDMREEsD78R/XHERtp8=
+=/41V
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/ucspi-tcp/files/0.88-exit.patch b/sys-apps/ucspi-tcp/files/0.88-exit.patch
new file mode 100644
index 000000000000..4925441b49d2
--- /dev/null
+++ b/sys-apps/ucspi-tcp/files/0.88-exit.patch
@@ -0,0 +1,10 @@
+Index: ucspi-tcp-0.88/tcprulescheck.c
+===================================================================
+--- ucspi-tcp-0.88.orig/tcprulescheck.c
++++ ucspi-tcp-0.88/tcprulescheck.c
+@@ -1,3 +1,5 @@
++#include <unistd.h>
++
+ #include "byte.h"
+ #include "buffer.h"
+ #include "strerr.h"
diff --git a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r17.ebuild b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r17.ebuild
new file mode 100644
index 000000000000..03ff4abcccaa
--- /dev/null
+++ b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r17.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2008 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-r17.ebuild,v 1.1 2008/04/06 16:57:17 hollow Exp $
+
+inherit eutils fixheadtails flag-o-matic qmail
+
+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
+	http://smarden.org/pape/djb/manpages/${P}-man.tar.gz
+	http://xs3.b92.net/tomislavr/${P}-rblspp.patch
+"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="qmail-spp selinux"
+RESTRICT="test"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	!app-doc/ucspi-tcp-man
+	selinux? ( sec-policy/selinux-ucspi-tcp )"
+PROVIDE="virtual/inetd"
+
+pkg_setup() {
+	if [[ -n "${UCSPI_TCP_PATCH_DIR}" ]]; then
+		eerror
+		eerror "The UCSPI_TCP_PATCH_DIR variable for custom patches"
+		eerror "has been removed from ${PN}. If you need custom patches"
+		eerror "you should create a copy of this ebuild in an overlay."
+		eerror
+		die "UCSPI_TCP_PATCH_DIR is not supported anymore"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${PV}-errno.patch
+	epatch "${FILESDIR}"/${PV}-exit.patch
+	epatch "${DISTDIR}"/ucspi-rss.diff
+	epatch "${FILESDIR}"/${PV}-rblsmtpd-ignore-on-RELAYCLIENT.patch
+	epatch "${DISTDIR}"/${P}-rblspp.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
+
+	qmail_set_cc
+	echo "/usr/" > conf-home
+
+	# allow larger responses
+	sed -i -e 's|if (text.len > 200) text.len = 200;|if (text.len > 500) text.len = 500;|g' \
+		rblsmtpd.c rblspp.c
+}
+
+src_compile() {
+	emake || die
+}
+
+src_install() {
+	dobin tcpserver tcprules tcprulescheck argv0 recordio tcpclient *\@ \
+		tcpcat mconnect mconnect-io addcr delcr fixcrio rblsmtpd || die
+
+	if use qmail-spp; then
+		insinto "${QMAIL_HOME}"/plugins
+		insopts -m 755
+		doins rblspp
+	fi
+
+	doman "${WORKDIR}"/${P}-man/*.[1-8]
+	dodoc CHANGES FILES README SYSDEPS TARGETS TODO VERSION
+
+	insinto /etc/tcprules.d/
+	newins "${FILESDIR}"/tcprules-Makefile Makefile
+}
+
+pkg_postinst() {
+	einfo
+	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."
+	einfo
+}