Added patch from bug 90679 when having lines without a colon.

Package-Manager: portage-2.0.53_rc5

diff --git a/sys-apps/ucspi-tcp/ChangeLog b/sys-apps/ucspi-tcp/ChangeLog
index f8796df63577f5007ebbbd9efffd5b91d1a36815..d3d52ddca912ae544ca71871c63ef32d94725f62 100644 (file)
--- 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.39 2005/09/17 11:24:13 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-tcp/ChangeLog,v 1.40 2005/10/15 21:54:54 hansmi Exp $
+
+*ucspi-tcp-0.88-r13 (15 Oct 2005)
+
+  15 Oct 2005; Michael Hanselmann <hansmi@gentoo.org>
+  +files/0.88-tcprules.patch, +ucspi-tcp-0.88-r13.ebuild:
+  Added patch from bug 90679 when having lines without a colon.
 
   11 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
   ucspi-tcp-0.88-r12.ebuild:

diff --git a/sys-apps/ucspi-tcp/Manifest b/sys-apps/ucspi-tcp/Manifest
index bf2422aabeadd0b804b5b817aa77f08b70d71b1d..80f18220a79f46eea739b8d4f8fbcff1e288db8b 100644 (file)
--- a/sys-apps/ucspi-tcp/Manifest
+++ b/sys-apps/ucspi-tcp/Manifest
@@ -1,28 +1,21 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 66ed278686866a3187b68d81fe47fa24 metadata.xml 592
-MD5 38badb1189a3476d5066e21ab764aef1 ucspi-tcp-0.88-r10.ebuild 2341
-MD5 f28315c57485584788c9824481bc7603 ucspi-tcp-0.88-r8.ebuild 2148
-MD5 76034b124658a585b29a772acbf2b798 ucspi-tcp-0.88-r9.ebuild 2246
-MD5 e01f5cc6f4c8c36cde32a1f14dfe8ba0 ucspi-tcp-0.88-r11.ebuild 2427
-MD5 9b7edefc3244d63241311cb3b66b1a44 ucspi-tcp-0.88-r12.ebuild 2574
-MD5 1995e753ca166f8d86e397274e74c122 ChangeLog 5600
+MD5 3a5bc47bf49bc213c5a8d8e3ca06b655 ChangeLog 5812
 MD5 fb41d7c55db5124d7488a923e4223576 files/0.88-bigendian.patch 478
 MD5 0479a09fdd4ce855d35e36563cab4743 files/0.88-errno.patch 239
 MD5 b36e99b422384451ac68b3a9b31b7ed6 files/0.88-head-1.patch 1403
+MD5 a52d1d668b5486fde8f138eaab047e70 files/0.88-limits.patch 12356
 MD5 72b6cd8b1b829a6a6939255fdc0b76a3 files/0.88-rblsmtpd-ignore-on-RELAYCLIENT.patch 462
-MD5 eeca4c38b2ce87ccb59e44f241b3c736 files/digest-ucspi-tcp-0.88-r10 350
+MD5 b260fe81e9593e965ccb539b0dcfc4bd files/0.88-tcprules.patch 463
+MD5 07405ee0d3385bc58a5cc3f2034de90a files/digest-ucspi-tcp-0.88-r10 350
+MD5 07405ee0d3385bc58a5cc3f2034de90a files/digest-ucspi-tcp-0.88-r11 350
+MD5 57161a76734c44c65d46f0f93826aaf3 files/digest-ucspi-tcp-0.88-r12 350
+MD5 280de8eb44681996de47516ea0413be0 files/digest-ucspi-tcp-0.88-r13 350
 MD5 9eab9910e2978160e33f6c4e9b227efa files/digest-ucspi-tcp-0.88-r8 350
 MD5 9eab9910e2978160e33f6c4e9b227efa files/digest-ucspi-tcp-0.88-r9 350
 MD5 64eb2b26c9c0e5d6b4042fd36b74dbb8 files/tcprules-Makefile 168
-MD5 a52d1d668b5486fde8f138eaab047e70 files/0.88-limits.patch 12356
-MD5 eeca4c38b2ce87ccb59e44f241b3c736 files/digest-ucspi-tcp-0.88-r11 350
-MD5 57161a76734c44c65d46f0f93826aaf3 files/digest-ucspi-tcp-0.88-r12 350
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDK/zyKf2g/qXtneoRAseGAJsFDwuhC7vrmU77Wzn8jcjmRlQO6ACgsbRU
-WvDGyGQQQXX+PuTHtq8YjFw=
-=Yj4F
------END PGP SIGNATURE-----
+MD5 66ed278686866a3187b68d81fe47fa24 metadata.xml 592
+MD5 38badb1189a3476d5066e21ab764aef1 ucspi-tcp-0.88-r10.ebuild 2341
+MD5 e01f5cc6f4c8c36cde32a1f14dfe8ba0 ucspi-tcp-0.88-r11.ebuild 2427
+MD5 9b7edefc3244d63241311cb3b66b1a44 ucspi-tcp-0.88-r12.ebuild 2574
+MD5 aecb4bd62f2e8f3c55abdaa9baa9eed0 ucspi-tcp-0.88-r13.ebuild 2612
+MD5 f28315c57485584788c9824481bc7603 ucspi-tcp-0.88-r8.ebuild 2148
+MD5 76034b124658a585b29a772acbf2b798 ucspi-tcp-0.88-r9.ebuild 2246

diff --git a/sys-apps/ucspi-tcp/files/0.88-tcprules.patch b/sys-apps/ucspi-tcp/files/0.88-tcprules.patch
new file mode 100644 (file)
index 0000000..4d448fd
--- /dev/null
+++ b/sys-apps/ucspi-tcp/files/0.88-tcprules.patch
@@ -0,0 +1,12 @@
+--- tcprules.c.orig    2005-09-12 00:44:11.000000000 +0200
++++ tcprules.c 2005-09-12 00:58:11.000000000 +0200
+@@ -127,6 +127,9 @@
+     for (;;) {
+       int tmp;
+       tmp = byte_chr(x + colon,len - colon,':');
++        if(colon == 0 && tmp == len) {
++              strerr_die2x(111, FATAL, "Unable to find colon on non-empty line.");
++        }
+       colon += tmp;
+       if (colon == len) continue;
+       if (byte_equal(x+colon+1,4,"deny") || byte_equal(x+colon+1,5,"allow")) break;

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
index 807f2623b5976982928d004c9e779c51797e91ed..fb21c1db7aca2a7caa9bc5ac23d09a9a4970282d 100644 (file)
--- a/sys-apps/ucspi-tcp/files/digest-ucspi-tcp-0.88-r10
+++ b/sys-apps/ucspi-tcp/files/digest-ucspi-tcp-0.88-r10
@@ -1,5 +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
+MD5 67de66745001ddb48563a1d4e92262c2 ucspi-tcp-0.88-ipv6.diff14.bz2 21917
+MD5 39b619147db54687c4a583a7a94c9163 ucspi-tcp-0.88.tar.gz 53019
+MD5 10d5074c18d00e5c62c76ce69d7c975b ucspi-tcp-ssl-20020705.patch.gz 3084

diff --git a/sys-apps/ucspi-tcp/files/digest-ucspi-tcp-0.88-r11 b/sys-apps/ucspi-tcp/files/digest-ucspi-tcp-0.88-r11
index 807f2623b5976982928d004c9e779c51797e91ed..fb21c1db7aca2a7caa9bc5ac23d09a9a4970282d 100644 (file)
--- a/sys-apps/ucspi-tcp/files/digest-ucspi-tcp-0.88-r11
+++ b/sys-apps/ucspi-tcp/files/digest-ucspi-tcp-0.88-r11
@@ -1,5 +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
+MD5 67de66745001ddb48563a1d4e92262c2 ucspi-tcp-0.88-ipv6.diff14.bz2 21917
+MD5 39b619147db54687c4a583a7a94c9163 ucspi-tcp-0.88.tar.gz 53019
+MD5 10d5074c18d00e5c62c76ce69d7c975b ucspi-tcp-ssl-20020705.patch.gz 3084

diff --git a/sys-apps/ucspi-tcp/files/digest-ucspi-tcp-0.88-r13 b/sys-apps/ucspi-tcp/files/digest-ucspi-tcp-0.88-r13
new file mode 100644 (file)
index 0000000..1e993be
--- /dev/null
+++ b/sys-apps/ucspi-tcp/files/digest-ucspi-tcp-0.88-r13
@@ -0,0 +1,5 @@
+MD5 554ec0eb60f619667efde3fb5325310d ucspi-rss.diff 1828
+MD5 2dfc47b1a142e1021a49c678dfbb7a03 ucspi-tcp-0.88-ipv6-ssl-nm1.patch.bz2 3212
+MD5 355259551301e93c6cd70b6461a78d34 ucspi-tcp-0.88-ipv6.diff17.bz2 22514
+MD5 39b619147db54687c4a583a7a94c9163 ucspi-tcp-0.88.tar.gz 53019
+MD5 10d5074c18d00e5c62c76ce69d7c975b ucspi-tcp-ssl-20020705.patch.gz 3084

diff --git a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r13.ebuild b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r13.ebuild
new file mode 100644 (file)
index 0000000..140a027
--- /dev/null
+++ b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r13.ebuild
@@ -0,0 +1,85 @@
+# 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-r13.ebuild,v 1.1 2005/10/15 21:54:54 hansmi Exp $
+
+inherit eutils toolchain-funcs
+
+# This version of the IPv6 patch contains also errno patch.
+IPV6_PATCH="diff17"
+
+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.${IPV6_PATCH}.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 ~ppc-macos ~ppc64 ~s390 ~sparc ~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.${IPV6_PATCH}
+               # Fixes bug 18892
+               epatch ${FILESDIR}/${PV}-bigendian.patch
+       else
+               # This is already present in ipv6 patch
+               epatch ${FILESDIR}/${PV}-errno.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 ${DISTDIR}/ucspi-rss.diff
+       epatch ${FILESDIR}/${PV}-head-1.patch
+       epatch ${FILESDIR}/${PV}-rblsmtpd-ignore-on-RELAYCLIENT.patch
+       epatch ${FILESDIR}/${PV}-limits.patch
+       epatch ${FILESDIR}/${PV}-tcprules.patch
+
+       tc-export CC
+       echo "${CC} ${CFLAGS}" > conf-cc
+       echo "${CC} ${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
+       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."
+}