errno patch for #16396 (#16267)

7 files changed, 13 insertions, 79 deletions

diff --git a/net-dns/djbdns/ChangeLog b/net-dns/djbdns/ChangeLog
index 473dedab7c90..1c5c1409cbff 100644
--- a/net-dns/djbdns/ChangeLog
+++ b/net-dns/djbdns/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dns/djbdns
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/ChangeLog,v 1.16 2003/02/18 10:05:34 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/ChangeLog,v 1.17 2003/02/27 06:20:43 vapier Exp $
+
+*djbdns-1.05-r7 (26 Feb 2003)
+
+  26 Feb 2003; Mike Frysinger <vapier@gentoo.org> :
+  errno fix for #16396 (#16267).
 
 *djbdns-1.05-r6 (12 Feb 2003)
 
diff --git a/net-dns/djbdns/djbdns-1.05-r5.ebuild b/net-dns/djbdns/djbdns-1.05-r5.ebuild
deleted file mode 100644
index 1cce9c2b19f8..000000000000
--- a/net-dns/djbdns/djbdns-1.05-r5.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/djbdns-1.05-r5.ebuild,v 1.5 2003/02/13 13:57:09 vapier Exp $
-
-DESCRIPTION="Excellent high-performance DNS services"
-SRC_URI="http://cr.yp.to/djbdns/${P}.tar.gz
-	http://www.skarnet.org/software/djbdns-fwdzone/djbdns-1.04-fwdzone.patch
-	mirror://${P}-ipv6-gentoo.diff.bz2"
-HOMEPAGE="http://cr.yp.to/djbdns.html"
-LICENSE="as-is"
-KEYWORDS="x86 ~sparc "
-SLOT="0"
-IUSE="ipv6 static"
-
-DEPEND="virtual/glibc"
-RDEPEND="${DEPEND}
-	>=sys-apps/daemontools-0.70
-	sys-apps/ucspi-tcp"
-
-S="${WORKDIR}/${P}"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	patch -d ${S} -p1 < ${DISTDIR}/djbdns-1.04-fwdzone.patch
-	if [ `use ipv6` ] ; then
-		bunzip2 -dc ${DISTDIR}/djbdns-1.05-ipv6-gentoo.diff.bz2 |
-		patch -d ${S} -p1 || die "Failed to apply the ipv6 patch"
-	fi
-}
-
-src_compile() {                           
-	LDFLAGS=
-	use static && LDFLAGS="-static"
-	echo "gcc ${CFLAGS}" > conf-cc
-	echo "gcc ${LDFLAGS}" > conf-ld
-	echo "/usr" > conf-home
-	emake || die "emake failed"
-}
-
-src_install() {                               
-	insinto /etc
-	doins dnsroots.global
-	into /usr
-	for i in *-conf dnscache tinydns walldns rbldns pickdns axfrdns *-get *-data *-edit dnsip dnsipq dnsname dnstxt dnsmx dnsfilter random-ip dnsqr dnsq dnstrace dnstracesort
-	do
-		dobin $i
-	done
-	dodoc CHANGES FILES README SYSDEPS TARGETS TODO VERSION
-
-	dobin ${FILESDIR}/dnscache-setup
-	dobin ${FILESDIR}/tinydns-setup
-}
-
-pkg_postinst() {
-	groupadd &>/dev/null nofiles
-	id &>/dev/null dnscache || \
-		useradd -g nofiles -d /nonexistent -s /bin/false dnscache
-	id &>/dev/null dnslog || \
-		useradd -g nofiles -d /nonexistent -s /bin/false dnslog
-	id &>/dev/null tinydns || \
-		useradd -g nofiles -d /nonexistent -s /bin/false tinydns
-
-	einfo "Use dnscache-setup and tinydns-setup to help you configure your nameservers!"
-}
diff --git a/net-dns/djbdns/djbdns-1.05-r6.ebuild b/net-dns/djbdns/djbdns-1.05-r7.ebuild
index a016b78d24bb..29ca89c82a85 100644
--- a/net-dns/djbdns/djbdns-1.05-r6.ebuild
+++ b/net-dns/djbdns/djbdns-1.05-r7.ebuild
@@ -1,18 +1,16 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/djbdns-1.05-r6.ebuild,v 1.5 2003/02/23 20:04:15 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/djbdns-1.05-r7.ebuild,v 1.1 2003/02/27 06:20:43 vapier Exp $
 
 inherit eutils
 
-IUSE="ipv6 static"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Excellent high-performance DNS services."
+DESCRIPTION="Excellent high-performance DNS services"
 HOMEPAGE="http://cr.yp.to/djbdns.html"
 
 SLOT="0"
 LICENSE="as-is"
 KEYWORDS="x86 ~sparc ~ppc ~alpha ~mips ~hppa"
+IUSE="ipv6 static"
 
 RDEPEND=">=sys-apps/daemontools-0.70
 	sys-apps/ucspi-tcp"
@@ -24,11 +22,11 @@ SRC_URI="http://cr.yp.to/djbdns/${P}.tar.gz
 
 src_unpack() {
 	unpack ${A}
-	
 	cd ${S}
-	epatch ${DISTDIR}/djbdns-1.04-fwdzone.patch
-	epatch  ${DISTDIR}/round-robin.patch
 
+	epatch ${DISTDIR}/djbdns-1.04-fwdzone.patch
+	epatch ${DISTDIR}/round-robin.patch
+	epatch ${FILESDIR}/${PV}-errno.patch
 	use ipv6 && epatch ${WORKDIR}/djbdns-1.05-ipv6-gentoo.diff
 }
 
diff --git a/net-dns/djbdns/files/1.05-errno.patch b/net-dns/djbdns/files/1.05-errno.patch
index 41f9e8ed9021..b4650b1a9cfe 100644
--- a/net-dns/djbdns/files/1.05-errno.patch
+++ b/net-dns/djbdns/files/1.05-errno.patch
@@ -5,7 +5,7 @@
  #define ERROR_H
  
 -extern int errno;
-+#include <errno.h>;
++#include <errno.h>
  
  extern int error_intr;
  extern int error_nomem;
diff --git a/net-dns/djbdns/files/digest-djbdns-1.05-r4 b/net-dns/djbdns/files/digest-djbdns-1.05-r4
deleted file mode 100644
index 0bd36a7b35c2..000000000000
--- a/net-dns/djbdns/files/digest-djbdns-1.05-r4
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 3147c5cd56832aa3b41955c7a51cbeb2 djbdns-1.05.tar.gz 85648
-MD5 ac799440bacc9d283e1c228f84cf99d4 djbdns-1.04-fwdzone.patch 6479
diff --git a/net-dns/djbdns/files/digest-djbdns-1.05-r5 b/net-dns/djbdns/files/digest-djbdns-1.05-r5
deleted file mode 100644
index 966c652b4166..000000000000
--- a/net-dns/djbdns/files/digest-djbdns-1.05-r5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3147c5cd56832aa3b41955c7a51cbeb2 djbdns-1.05.tar.gz 85648
-MD5 ac799440bacc9d283e1c228f84cf99d4 djbdns-1.04-fwdzone.patch 6479
-MD5 dea62d98ea9c521d678fe4939873cb56 djbdns-1.05-ipv6-gentoo.diff.bz2 19047
diff --git a/net-dns/djbdns/files/digest-djbdns-1.05-r6 b/net-dns/djbdns/files/digest-djbdns-1.05-r7
index 30f335e3cf90..30f335e3cf90 100644
--- a/net-dns/djbdns/files/digest-djbdns-1.05-r6
+++ b/net-dns/djbdns/files/digest-djbdns-1.05-r7