4 files changed, 5 insertions, 137 deletions
diff --git a/app-admin/socklog/ChangeLog b/app-admin/socklog/ChangeLog
index 4ebcc7de4d57..600117c34611 100644
--- a/app-admin/socklog/ChangeLog
+++ b/app-admin/socklog/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/socklog
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/socklog/ChangeLog,v 1.9 2011/06/15 02:43:32 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/socklog/ChangeLog,v 1.10 2011/06/15 02:47:18 jer Exp $
+
+  15 Jun 2011; Jeroen Roovers <jer@gentoo.org> -socklog-2.0.2.ebuild,
+  -socklog-2.0.2-r1.ebuild, -files/socklog-2.0.2-tryto-race-fix.patch:
+  [Look up, it is all happening up there, not here.]
 
 *socklog-2.1.0 (15 Jun 2011)
 
diff --git a/app-admin/socklog/files/socklog-2.0.2-tryto-race-fix.patch b/app-admin/socklog/files/socklog-2.0.2-tryto-race-fix.patch
deleted file mode 100644
index 8547b075efde..000000000000
--- a/app-admin/socklog/files/socklog-2.0.2-tryto-race-fix.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-http://bugs.gentoo.org/122784
-
-Index: src/tryto.c
-===================================================================
-RCS file: /var/lib/cvs/socklog/src/tryto.c,v
-retrieving revision 1.8
-diff -u -r1.8 tryto.c
---- admin/socklog-2.0.2/src/tryto.c	6 Feb 2005 11:36:50 -0000	1.8
-+++ admin/socklog-2.0.2/src/tryto.c	14 Feb 2006 12:34:04 -0000
-@@ -104,6 +104,7 @@
-   taia_now(&now);
-   taia_uint(&deadline, timeout);
-   taia_add(&deadline, &now, &deadline);
-+  timeout =0;
- 
-   for (;;) {
-     int iopausefds;
-@@ -163,16 +164,16 @@
-       int i;
-       char *s;
- 
--      if (wait_nohang(&rc) == pid) break;
--      taia_now(&now);
--      if ((timeout =taia_less(&deadline, &now))) break;
--
-       sig_unblock(sig_child);
-       iopause(x, iopausefds, &deadline, &now);
-       sig_block(sig_child);
-       
-       while (read(selfpipe[0], &ch, 1) == 1) {}
- 
-+      taia_now(&now);
-+      if ((timeout =taia_less(&deadline, &now))) break;
-+      if (wait_nohang(&rc) == pid) break;
-+
-       r = buffer_feed(&buffer_x);
-       if (r < 0) {
- 	if ((errno == error_intr) || (errno == error_again)) continue;
-@@ -201,6 +202,7 @@
-     close(cpipe[1]);
- 
-     if (timeout) {
-+      if (wait_nohang(&rc) == pid) break;
-       /* child not finished */
-       strerr_warn4(WARNING,
- 		   "child \"", *argv, "\" timed out. sending TERM...", 0);
diff --git a/app-admin/socklog/socklog-2.0.2-r1.ebuild b/app-admin/socklog/socklog-2.0.2-r1.ebuild
deleted file mode 100644
index bee9c4b53c7c..000000000000
--- a/app-admin/socklog/socklog-2.0.2-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/socklog/socklog-2.0.2-r1.ebuild,v 1.2 2011/04/07 07:51:02 ultrabug Exp $
-
-inherit eutils toolchain-funcs flag-o-matic
-
-DESCRIPTION="small secure replacement for syslogd with automatic log rotation"
-HOMEPAGE="http://smarden.org/socklog/"
-SRC_URI="http://smarden.org/socklog/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="static"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	>=sys-process/runit-0.13.1"
-
-S=${WORKDIR}/admin/${P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-tryto-race-fix.patch #122784
-	use static && append-ldflags -static
-	echo "$(tc-getCC) ${CFLAGS}" > src/conf-cc
-	echo "$(tc-getCC) ${LDFLAGS}" > src/conf-ld
-}
-
-src_compile() {
-	cd src
-	emake || die "make failed"
-}
-
-src_install() {
-	cd src
-	dobin tryto uncat socklog-check || die "dobin"
-	dosbin socklog socklog-conf || die "dosbin"
-
-	cd "${S}"
-	dodoc package/{CHANGES,README}
-	dohtml doc/*.html
-	doman man/*
-}
diff --git a/app-admin/socklog/socklog-2.0.2.ebuild b/app-admin/socklog/socklog-2.0.2.ebuild
deleted file mode 100644
index 1b95bb1f7209..000000000000
--- a/app-admin/socklog/socklog-2.0.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/socklog/socklog-2.0.2.ebuild,v 1.3 2011/04/07 07:51:02 ultrabug Exp $
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="small secure replacement for syslogd with automatic log rotation"
-HOMEPAGE="http://smarden.org/socklog/"
-SRC_URI="http://smarden.org/socklog/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="static"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	>=sys-process/runit-0.13.1"
-
-S="${WORKDIR}"/admin/${P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	use static && append-ldflags -static
-	echo "$(tc-getCC) ${CFLAGS}" > src/conf-cc
-	echo "$(tc-getCC) ${LDFLAGS}" > src/conf-ld
-}
-
-src_compile() {
-	cd src
-	emake || die "make failed"
-}
-
-src_install() {
-	cd src
-	dobin tryto uncat socklog-check || die "dobin"
-	dosbin socklog socklog-conf || die "dosbin"
-
-	cd "${S}"
-	dodoc package/{CHANGES,README}
-	dohtml doc/*.html
-	doman man/*
-}