head -1 patch

6 files changed, 110 insertions, 3 deletions

diff --git a/sys-apps/ucspi-tcp/ChangeLog b/sys-apps/ucspi-tcp/ChangeLog
index b366bcb6a7e1..12d5b5f6ece8 100644
--- a/sys-apps/ucspi-tcp/ChangeLog
+++ b/sys-apps/ucspi-tcp/ChangeLog
@@ -1,15 +1,26 @@
 # ChangeLog for sys-apps/ucspi-tcp
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-tcp/ChangeLog,v 1.15 2003/08/13 03:17:11 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-tcp/ChangeLog,v 1.16 2003/09/03 14:51:21 vapier Exp $
+
+*ucspi-tcp-0.88-r7 (03 Sep 2003)
+
+  03 Sep 2003; Mike Frysinger <vapier@gentoo.org> :
+  Install manpages and add head -1 patch.
 
 *ucspi-tcp-0.88-r6 (12 Aug 2003)
 
+  03 Sep 2003; Mike Frysinger <vapier@gentoo.org> :
+  Add head -1 patch.
+
   12 Aug 2003; Robin H. Johnson <robbat2@gentoo.org> ucspi-tcp-0.88-r6.ebuild:
   Add support for newer RBL zones and custom error responses, also increase max
   response size
 
 *ucspi-tcp-0.88-r5 (05 Mar 2003)
 
+  03 Sep 2003; Mike Frysinger <vapier@gentoo.org> :
+  Add head -1 patch.
+
   16 Mar 2003; Will Woods <wwoods@gentoo.org> ucspi-tcp-0.88-r5.ebuild:
   Added alpha to KEYWORDS
 
diff --git a/sys-apps/ucspi-tcp/files/0.88-head-1.patch b/sys-apps/ucspi-tcp/files/0.88-head-1.patch
new file mode 100644
index 000000000000..b8b0fd9b38d4
--- /dev/null
+++ b/sys-apps/ucspi-tcp/files/0.88-head-1.patch
@@ -0,0 +1,40 @@
+--- Makefile.orig	2003-09-03 10:42:49.624475128 -0400
++++ Makefile	2003-09-03 10:43:04.950145272 -0400
+@@ -41 +41 @@
+-	./auto-str auto_home `head -1 conf-home` > auto_home.c
++	./auto-str auto_home `head -n 1 conf-home` > auto_home.c
+@@ -152 +152 @@
+-	| sed s}HOME}"`head -1 conf-home`"}g \
++	| sed s}HOME}"`head -n 1 conf-home`"}g \
+@@ -164 +164 @@
+-	echo exec "`head -1 conf-cc`" '-c $${1+"$$@"}' \
++	echo exec "`head -n 1 conf-cc`" '-c $${1+"$$@"}' \
+@@ -171 +171 @@
+-	| sed s}HOME}"`head -1 conf-home`"}g \
++	| sed s}HOME}"`head -n 1 conf-home`"}g \
+@@ -295 +295 @@
+-	| sed s}HOME}"`head -1 conf-home`"}g \
++	| sed s}HOME}"`head -n 1 conf-home`"}g \
+@@ -349 +349 @@
+-	| sed s}HOME}"`head -1 conf-home`"}g \
++	| sed s}HOME}"`head -n 1 conf-home`"}g \
+@@ -392 +392 @@
+-	echo exec "`head -1 conf-ld`" \
++	echo exec "`head -n 1 conf-ld`" \
+@@ -419 +419 @@
+-	| sed s}HOME}"`head -1 conf-home`"}g \
++	| sed s}HOME}"`head -n 1 conf-home`"}g \
+@@ -517 +517 @@
+-	| sed s}HOME}"`head -1 conf-home`"}g \
++	| sed s}HOME}"`head -n 1 conf-home`"}g \
+@@ -674,2 +674,2 @@
+-	echo CC=\'`head -1 conf-cc`\'; \
+-	echo LD=\'`head -1 conf-ld`\'; \
++	echo CC=\'`head -n 1 conf-cc`\'; \
++	echo LD=\'`head -n 1 conf-ld`\'; \
+@@ -718 +718 @@
+-	| sed s}HOME}"`head -1 conf-home`"}g \
++	| sed s}HOME}"`head -n 1 conf-home`"}g \
+@@ -860 +860 @@
+-	| sed s}HOME}"`head -1 conf-home`"}g \
++	| sed s}HOME}"`head -n 1 conf-home`"}g \
diff --git a/sys-apps/ucspi-tcp/files/digest-ucspi-tcp-0.88-r7 b/sys-apps/ucspi-tcp/files/digest-ucspi-tcp-0.88-r7
new file mode 100644
index 000000000000..cb1296621146
--- /dev/null
+++ b/sys-apps/ucspi-tcp/files/digest-ucspi-tcp-0.88-r7
@@ -0,0 +1,4 @@
+MD5 39b619147db54687c4a583a7a94c9163 ucspi-tcp-0.88.tar.gz 53019
+MD5 7a75eda8ccd766570392042f879a0812 ucspi-tcp-0.88-ipv6.diff13.bz2 21965
+MD5 10d5074c18d00e5c62c76ce69d7c975b ucspi-tcp-ssl-20020705.patch.gz 3084
+MD5 554ec0eb60f619667efde3fb5325310d ucspi-rss.diff 1828
diff --git a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r5.ebuild b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r5.ebuild
index 50e373bffb01..b034d4fceaa1 100644
--- a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r5.ebuild
+++ b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r5.ebuild,v 1.4 2003/06/21 21:19:41 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r5.ebuild,v 1.5 2003/09/03 14:51:21 vapier Exp $
 
 inherit eutils
 
@@ -28,6 +28,7 @@ src_unpack() {
 		epatch ${WORKDIR}/ucspi-tcp-ssl-20020705.patch
 	fi
 	epatch ${FILESDIR}/${PV}-errno.patch
+	epatch ${FILESDIR}/${PV}-head-1.patch
 
 	echo "gcc ${CFLAGS}" > conf-cc
 	echo "gcc" > conf-ld
diff --git a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r6.ebuild b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r6.ebuild
index cb57d52f373e..13f5d8344781 100644
--- a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r6.ebuild
+++ b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r6.ebuild,v 1.1 2003/08/13 03:17:11 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r6.ebuild,v 1.2 2003/09/03 14:51:21 vapier Exp $
 
 inherit eutils
 
@@ -29,6 +29,7 @@ src_unpack() {
 	fi
 	epatch ${FILESDIR}/${PV}-errno.patch
 	epatch ${DISTDIR}/ucspi-rss.diff
+	epatch ${FILESDIR}/${PV}-head-1.patch
 
 	echo "${CC} ${CFLAGS}" > conf-cc
 	echo "${CC} ${LDFLAGS}" > conf-ld
diff --git a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r7.ebuild b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r7.ebuild
new file mode 100644
index 000000000000..af452b759dc2
--- /dev/null
+++ b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r7.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r7.ebuild,v 1.1 2003/09/03 14:51:21 vapier Exp $
+
+inherit eutils gcc
+
+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 )
+	ssl? ( http://www.nrg4u.com/qmail/ucspi-tcp-ssl-20020705.patch.gz )
+	mirror://qmail/ucspi-rss.diff"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~sparc ~ppc ~alpha"
+IUSE="ssl ipv6"
+
+DEPEND="virtual/glibc
+	ssl? ( >=dev-libs/openssl-0.9.6g )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	if use ipv6; then 
+		epatch ${WORKDIR}/ucspi-tcp-0.88-ipv6.diff13
+	elif use ssl; then
+		epatch ${WORKDIR}/ucspi-tcp-ssl-20020705.patch
+	fi
+	epatch ${FILESDIR}/${PV}-errno.patch
+	epatch ${DISTDIR}/ucspi-rss.diff
+	epatch ${FILESDIR}/${PV}-head-1.patch
+
+	echo "$(gcc-getCC) ${CFLAGS}" > conf-cc
+	echo "$(gcc-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() {
+	pmake || die
+}
+
+src_install() {
+	dobin tcpserver tcprules tcprulescheck argv0 recordio tcpclient *\@ tcpcat mconnect mconnect-io addcr delcr fixcrio rblsmtpd
+	doman *.[15]
+	dodoc CHANGES FILES README SYSDEPS TARGETS TODO VERSION
+}