Old.

Package-Manager: portage-2.2.0_alpha41/cvs/Linux x86_64

5 files changed, 9 insertions, 145 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/Manifest b/app-admin/socklog/Manifest
index 9bb968dbc2a8..501227e2e3c8 100644
--- a/app-admin/socklog/Manifest
+++ b/app-admin/socklog/Manifest
@@ -1,18 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX socklog-2.0.2-tryto-race-fix.patch 1325 RMD160 4e70c80367f1d1e8806a329ca5fb60ef3a4bf343 SHA1 3d4d6fad7c5c664f2cb6490f770565a5191dc8e2 SHA256 2a69b5c7bde1606d82f7f55e788d36688ccd2d8e8230e6d8c69e0146b9ccf0e3
-DIST socklog-2.0.2.tar.gz 56362 RMD160 6b87bab61c892ebb36e42cb5491f0aa17e5c91b7 SHA1 851c1fbcf96140424f0351ecac95327bfa40db57 SHA256 d11d3cfaca196578bea9145019eeaf004f15b7a83cf5dc6117d7e01806919597
 DIST socklog-2.1.0.tar.gz 56942 RMD160 375c2992dcbc0d3639e3f8c215ef7f13959bdd5b SHA1 27a117eae00105f491e6ef301206f7b92d7438ce SHA256 aa869a787ee004da4e5509b5a0031bcc17a4ab4ac650c2ce8d4e488123acb455
-EBUILD socklog-2.0.2-r1.ebuild 1114 RMD160 50231ea89909d1e9fe63ad555f406db88a4a6e13 SHA1 5703db8da01c5112832768aeeaa45dac63719c80 SHA256 e924eb911a3769217ec49bb70c362faf594a3f0226bd068c77442371a37e699c
-EBUILD socklog-2.0.2.ebuild 1051 RMD160 c00576c5f835211fe3882998ddf482318c70e736 SHA1 faa9ac7a0e7e0ff168bc1441d65d7f80dc27647f SHA256 37ed8fc57ed0418ebf114bd6fdf50fea59a342444ac8d507e8b39435551ecf82
 EBUILD socklog-2.1.0.ebuild 1053 RMD160 65572c31bc781fac9302a0c56be34b65549e0fa7 SHA1 552418f4d38b428c6fdc54860fb5ee7558cd29f7 SHA256 fd76230edbfdc7985fd412bb9689bb61196ae39063c842beff3f3c16e7b571cc
-MISC ChangeLog 1461 RMD160 9e9d275726770099162d315a12d4c41335ea9727 SHA1 bd5a8ccf9788c488d80cc1951d7de27a2370b8d3 SHA256 47e0d8dd4d9c17a7b65173c177eaeddb0b39637a728e4bb78c4fdc48ccbbf3cf
+MISC ChangeLog 1657 RMD160 c275a6fd8b42336aa57256f108cf004bc636f3ba SHA1 4332e19f5a2923d65d51386ae25e7b463fed3c04 SHA256 e924392e892edc1a4026675ce0a30aff300142192743a6517413ded489e37891
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk34HFoACgkQVWmRsqeSphOORACeJ3AxvEgVXsZ+7ZkBMrvWTnvM
-6uEAnjETnzVzQRp38JNE6gBF2iw/C1a2
-=Kzrg
+iEYEARECAAYFAk34HTwACgkQVWmRsqeSphNOhQCeLMtQeiwtg1ekEDNjEcDj60M5
+A9wAn17zYcw76frCtILCZZuDhYfHWE6U
+=/1y7
 -----END PGP SIGNATURE-----
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/*
-}