errno patch for #16396 (#16267)

7 files changed, 9 insertions, 125 deletions

diff --git a/sys-apps/daemontools/ChangeLog b/sys-apps/daemontools/ChangeLog
index 7c0017bdc47f..0e3f8329c120 100644
--- a/sys-apps/daemontools/ChangeLog
+++ b/sys-apps/daemontools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/daemontools
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/daemontools/ChangeLog,v 1.9 2003/02/27 02:44:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/daemontools/ChangeLog,v 1.10 2003/02/27 06:24:48 vapier Exp $
+
+*daemontools-0.76-r3 (26 Feb 2003)
+
+  26 Feb 2003; Mike Frysinger <vapier@gentoo.org> :
+  Added patch to fix new glibc errno issues #16396 (#16267).
 
 *daemontools-0.76-r2 (15 Jan 2003)
 
diff --git a/sys-apps/daemontools/daemontools-0.76-r2.ebuild b/sys-apps/daemontools/daemontools-0.76-r2.ebuild
deleted file mode 100644
index 674a4485a612..000000000000
--- a/sys-apps/daemontools/daemontools-0.76-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/daemontools/daemontools-0.76-r2.ebuild,v 1.4 2003/02/27 02:44:30 vapier Exp $
-
-inherit eutils
-
-DESCRIPTION="Collection of tools for managing UNIX services"
-SRC_URI="http://cr.yp.to/daemontools/${P}.tar.gz"
-HOMEPAGE="http://cr.yp.to/daemontools.html"
-
-KEYWORDS="~x86 ~ppc ~sparc "
-SLOT="0"
-LICENSE="freedist"
-
-DEPEND="virtual/glibc"
-
-S=${WORKDIR}/admin/${P}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PV}-errno.patch
-
-	use static && LDFLAGS="${LDFLAGS} -static"
-
-	echo "gcc ${CFLAGS}" > src/conf-cc
-	echo "gcc ${LDFLAGS}" > src/conf-ld
-	echo ${S} > src/home
-}
-
-src_compile() {
-	cd ${S}/src
-	emake || die "make failed"
-}
-
-src_install() {
-	einfo "Creating service directory ..."
-	dodir /service
-	touch ${D}/service/.keep
-
-	einfo "Installing package ..."
-	cd ${S}/src
-	exeinto /usr/bin
-	for x in `cat ../package/commands`
-	do
-		doexe $x
-	done
-
-	dodoc CHANGES ../package/README TODO
-
-	einfo "Installing the svscan startup file ..."
-	insinto /etc/init.d
-	insopts -m755
-	newins ${FILESDIR}/svscan-r2 svscan
-}
diff --git a/sys-apps/daemontools/daemontools-0.76-r1.ebuild b/sys-apps/daemontools/daemontools-0.76-r3.ebuild
index c87ebc63bf33..b40506af4b1d 100644
--- a/sys-apps/daemontools/daemontools-0.76-r1.ebuild
+++ b/sys-apps/daemontools/daemontools-0.76-r3.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/daemontools/daemontools-0.76-r1.ebuild,v 1.13 2003/02/27 02:44:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/daemontools/daemontools-0.76-r3.ebuild,v 1.1 2003/02/27 06:25:28 vapier Exp $
 
 inherit eutils
 
@@ -48,8 +48,6 @@ src_install() {
 
 	dodoc CHANGES ../package/README TODO
 
-	einfo "Installing the svscan startup file ..."
-	insinto /etc/init.d
-	insopts -m755
-	doins ${FILESDIR}/svscan
+	exeinto /etc/init.d
+	doexe ${FILESDIR}/svscan svscan
 }
diff --git a/sys-apps/daemontools/files/digest-daemontools-0.76-r2 b/sys-apps/daemontools/files/digest-daemontools-0.76-r2
deleted file mode 100644
index 0d344babc47a..000000000000
--- a/sys-apps/daemontools/files/digest-daemontools-0.76-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1871af2453d6e464034968a0fbcb2bfc daemontools-0.76.tar.gz 36975
diff --git a/sys-apps/daemontools/files/digest-daemontools-0.76-r1 b/sys-apps/daemontools/files/digest-daemontools-0.76-r3
index 0d344babc47a..0d344babc47a 100644
--- a/sys-apps/daemontools/files/digest-daemontools-0.76-r1
+++ b/sys-apps/daemontools/files/digest-daemontools-0.76-r3
diff --git a/sys-apps/daemontools/files/svscan b/sys-apps/daemontools/files/svscan
deleted file mode 100644
index 74389b5e7577..000000000000
--- a/sys-apps/daemontools/files/svscan
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/daemontools/files/svscan,v 1.5 2003/02/14 23:12:11 vapier Exp $
-
-depend() {
-    need net
-}
-
-start() {
-    ebegin "Starting service scan..."
-    PATH="/usr/bin:$PATH"
-    start-stop-daemon --start --quiet --exec /usr/bin/svscan --pidfile /var/run/svscan.pid -- /service &
-    echo $! > /var/run/svscan.pid
-    eend $?
-}
-
-stop() {
-    ebegin "Stopping service scan..."
-    start-stop-daemon --stop --quiet --pidfile /var/run/svscan.pid
-    eend $?
-    ebegin "Stopping services..."
-    svc -dx /service/*
-    eend $?
-    ebegin "Stopping service logging..."
-    svc -dx /service/*/log
-    eend $?
-}
-
diff --git a/sys-apps/daemontools/files/svscan-r2 b/sys-apps/daemontools/files/svscan-r2
deleted file mode 100644
index a029dc608e6f..000000000000
--- a/sys-apps/daemontools/files/svscan-r2
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/daemontools/files/svscan-r2,v 1.2 2003/02/14 23:12:17 vapier Exp $
-
-depend() {
-    need net
-    after net
-    before ntpd
-    before spamd
-    before apache
-    before apache2
-}
-
-start() {
-    ebegin "Starting service scan..."
-    PATH="/usr/bin:$PATH"
-    start-stop-daemon --start --quiet --exec /usr/bin/svscan --pidfile /var/run/svscan.pid -- /service &
-    echo $! > /var/run/svscan.pid
-    eend $?
-}
-
-stop() {
-    ebegin "Stopping service scan..."
-    start-stop-daemon --stop --quiet --pidfile /var/run/svscan.pid
-    eend $?
-    ebegin "Stopping services..."
-    svc -dx /service/*
-    eend $?
-    ebegin "Stopping service logging..."
-    svc -dx /service/*/log
-    eend $?
-}
-