Added patch to fix new glibc errno issues #16396 (#16267)

4 files changed, 31 insertions, 10 deletions

diff --git a/sys-apps/daemontools/ChangeLog b/sys-apps/daemontools/ChangeLog
index ebe5237d6165..7c0017bdc47f 100644
--- a/sys-apps/daemontools/ChangeLog
+++ b/sys-apps/daemontools/ChangeLog
@@ -1,9 +1,12 @@
 # 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.8 2003/02/12 08:56:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/daemontools/ChangeLog,v 1.9 2003/02/27 02:44:29 vapier Exp $
 
 *daemontools-0.76-r2 (15 Jan 2003)
 
+  26 Feb 2003; Mike Frysinger <vapier@gentoo.org> :
+  Added patch to fix new glibc errno issues #16396 (#16267).
+
   15 Jan 2003; Nick Hadaway <raker@gentoo.org> daemontools-0.76-r2.ebuild,
   files/digest-daemontools-0.76-r2, files/svscan-r2 :
   New svscan which is a work-in-progress so it starts right after net
@@ -13,6 +16,9 @@
  
 *daemontools-0.76-r1 (14 July 2002)
 
+  26 Feb 2003; Mike Frysinger <vapier@gentoo.org> :
+  Added patch to fix new glibc errno issues #16396 (#16267).
+
   23 Sep 2002; Nick Hadaway <raker@gentoo.org>
   daemontools-0.76-r1.ebuild :
   Added support for the static use flag as suggested on bug #8235
diff --git a/sys-apps/daemontools/daemontools-0.76-r1.ebuild b/sys-apps/daemontools/daemontools-0.76-r1.ebuild
index 729a0724ef47..c87ebc63bf33 100644
--- a/sys-apps/daemontools/daemontools-0.76-r1.ebuild
+++ b/sys-apps/daemontools/daemontools-0.76-r1.ebuild
@@ -1,25 +1,27 @@
 # 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.12 2003/02/13 15:51:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/daemontools/daemontools-0.76-r1.ebuild,v 1.13 2003/02/27 02:44:29 vapier Exp $
 
-S=${WORKDIR}/admin/${P}
+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 "
+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
 
-	LDFLAGS=
-	use static && LDFLAGS="-static"
+	use static && LDFLAGS="${LDFLAGS} -static"
 
 	echo "gcc ${CFLAGS}" > src/conf-cc
 	echo "gcc ${LDFLAGS}" > src/conf-ld
diff --git a/sys-apps/daemontools/daemontools-0.76-r2.ebuild b/sys-apps/daemontools/daemontools-0.76-r2.ebuild
index c23fea1a7b0c..674a4485a612 100644
--- a/sys-apps/daemontools/daemontools-0.76-r2.ebuild
+++ b/sys-apps/daemontools/daemontools-0.76-r2.ebuild
@@ -1,8 +1,8 @@
 # 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.3 2003/02/13 15:51:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/daemontools/daemontools-0.76-r2.ebuild,v 1.4 2003/02/27 02:44:30 vapier Exp $
 
-S=${WORKDIR}/admin/${P}
+inherit eutils
 
 DESCRIPTION="Collection of tools for managing UNIX services"
 SRC_URI="http://cr.yp.to/daemontools/${P}.tar.gz"
@@ -14,12 +14,14 @@ LICENSE="freedist"
 
 DEPEND="virtual/glibc"
 
+S=${WORKDIR}/admin/${P}
+
 src_unpack() {
 	unpack ${A}
 	cd ${S}
+	epatch ${FILESDIR}/${PV}-errno.patch
 
-	LDFLAGS=
-	use static && LDFLAGS="-static"
+	use static && LDFLAGS="${LDFLAGS} -static"
 
 	echo "gcc ${CFLAGS}" > src/conf-cc
 	echo "gcc ${LDFLAGS}" > src/conf-ld
diff --git a/sys-apps/daemontools/files/0.76-errno.patch b/sys-apps/daemontools/files/0.76-errno.patch
new file mode 100644
index 000000000000..45c1edb58cc0
--- /dev/null
+++ b/sys-apps/daemontools/files/0.76-errno.patch
@@ -0,0 +1,11 @@
+--- src/error.h	2001-07-12 11:49:49.000000000 -0500
++++ src/error.h	2003-02-26 02:14:06.000000000 -0600
+@@ -3,7 +3,7 @@
+ #ifndef ERROR_H
+ #define ERROR_H
+ 
+-extern int errno;
++int errno;
+ 
+ extern int error_intr;
+ extern int error_nomem;