>Number:         20810
>Category:       pkg
>Synopsis:       net/host patch fuzz, missing MASTER SITES, and conflicts
>Confidential:   yes
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Wed Mar 19 14:32:00 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     
>Release:        NetBSD 1.6
>Organization:
http://bsd.reedmedia.net/
>Environment:
	
	
System: NetBSD rainier.reedmedia.net 1.6 NetBSD 1.6 (JCR-20020927) #3: Sat Sep 28 13:40:20 PDT 2002 reed@rainier.reedmedia.net:/usr/src/sys/arch/i386/compile/JCR-20020927 i386
Architecture: i386
Machine: i386
>Description:
With patch 2.5.4, I was getting fuzz 1 with a few patches for
pkgsrc/net/host. The provide diff below should fix this.

Also, the MASTER SITE doesn't have the download anymore.
(Another mirror ftp://ftp.is.co.za/networking/ip/dns/host/ also doesn't
have it anymore.) I know the FTP server has it... but does anyone know
the official download site?

Maybe Greg Wood's version should be used instead. 
http://www.weird.com/~woods/projects/

And it should conflict with the bind* packages  (since have
bin/host and host.1). I did not provide patch for that.

(Note that some users may want a dns lookup tool without installing
a complete bind).
>How-To-Repeat:
>Fix:

Index: net/host/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/net/host/distinfo,v
retrieving revision 1.2
diff -b -u -r1.2 distinfo
--- net/host/distinfo	2001/04/21 11:23:17	1.2
+++ net/host/distinfo	2003/03/19 22:24:57
@@ -2,7 +2,7 @@
 
 SHA1 (host_991529.tar.Z) = 28097ee01a94bb82cec69a3be556a869ea236b5f
 Size (host_991529.tar.Z) = 184455 bytes
-SHA1 (patch-aa) = c81d805bd1648bf25c92687f4eecc5b514ec61ea
+SHA1 (patch-aa) = 140c7edf106ec48626153c12d03a36c644731728
 SHA1 (patch-ab) = 471a67439f2e5847b510f0e73bb857226c79c450
-SHA1 (patch-ac) = d7e72221a45b82c4454cb8d00aaae50a0340aad6
-SHA1 (patch-ad) = 44a38670f2557b1b7812aee98e300c760584e1a5
+SHA1 (patch-ac) = 28593b09071bfea35d43e402120327938b8bb885
+SHA1 (patch-ad) = 2065e38df1567db7564456f6008b1c9603f10dab
Index: net/host/patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/net/host/patches/patch-aa,v
retrieving revision 1.1.1.1
diff -b -u -r1.1.1.1 patch-aa
--- net/host/patches/patch-aa	2001/03/10 17:06:37	1.1.1.1
+++ net/host/patches/patch-aa	2003/03/19 22:24:57
@@ -1,7 +1,5 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/03/10 17:06:37 wiz Exp $
-
---- Makefile.orig	Wed Mar 15 22:51:39 2000
-+++ Makefile
+--- Makefile~	2000-03-15 13:51:39.000000000 -0800
++++ Makefile	2003-03-19 14:15:48.000000000 -0800
 @@ -4,11 +4,13 @@
  # Adapt the installation directories to your local standards.
  # ----------------------------------------------------------------------
@@ -18,14 +16,13 @@
  
  BINDIR = $(DESTBIN)
  MANDIR = $(DESTMAN)/man1
-@@ -38,7 +40,10 @@
- SYSDEFS = -DNO_YP_LOOKUP
- #endif
+@@ -40,6 +42,9 @@
  
  SYSDEFS =
-+
+ 
 +#if defined(NetBSD) && you have not removed support for $HOSTALIASES
 +SYSDEFS = ${ALLOW_HOSTALIASES}
- 
++
  # ----------------------------------------------------------------------
  # Configuration definitions.
+ # See also the header file conf.h for more configuration definitions.
Index: net/host/patches/patch-ac
===================================================================
RCS file: /cvsroot/pkgsrc/net/host/patches/patch-ac,v
retrieving revision 1.1.1.1
diff -b -u -r1.1.1.1 patch-ac
--- net/host/patches/patch-ac	2001/03/10 17:06:37	1.1.1.1
+++ net/host/patches/patch-ac	2003/03/19 22:24:57
@@ -1,9 +1,6 @@
-$NetBSD: patch-ac,v 1.1.1.1 2001/03/10 17:06:37 wiz Exp $
-
---- mxlookup.orig	Sun Jan  8 01:07:04 1995
-+++ mxlookup
-@@ -26,10 +26,10 @@
- # Setup environment.
+--- mxlookup~	1995-01-07 16:07:04.000000000 -0800
++++ mxlookup	2003-03-19 14:17:45.000000000 -0800
+@@ -27,9 +27,9 @@
  # ----------------------------------------------------------------------
  
  # This is where the ``host'' executable lives.
Index: net/host/patches/patch-ad
===================================================================
RCS file: /cvsroot/pkgsrc/net/host/patches/patch-ad,v
retrieving revision 1.1.1.1
diff -b -u -r1.1.1.1 patch-ad
--- net/host/patches/patch-ad	2001/03/10 17:06:37	1.1.1.1
+++ net/host/patches/patch-ad	2003/03/19 22:24:58
@@ -1,7 +1,5 @@
-$NetBSD: patch-ad,v 1.1.1.1 2001/03/10 17:06:37 wiz Exp $
-
---- rblookup.orig	Wed Jan 27 01:50:22 1999
-+++ rblookup
+--- rblookup~	1999-01-26 16:50:22.000000000 -0800
++++ rblookup	2003-03-19 14:18:44.000000000 -0800
 @@ -12,8 +12,8 @@
  # of the Mail Abuse Prevention System. See: http://maps.vix.com/rbl
  #
@@ -13,8 +11,7 @@
  #
  #	Returns:
  #		zero if the given host was found on the blacklist.
-@@ -44,25 +44,72 @@
- # Setup environment.
+@@ -45,24 +45,71 @@
  # ----------------------------------------------------------------------
  
  # This is where the ``host'' executable lives.
@@ -93,7 +90,7 @@
  # ----------------------------------------------------------------------
  
  EX_OK=0
-@@ -85,8 +134,11 @@
+@@ -85,8 +132,11 @@
  # ----------------------------------------------------------------------
  
  verbose=
@@ -107,7 +104,7 @@
  
  skip=
  for i
-@@ -95,7 +147,9 @@
+@@ -95,7 +145,9 @@
  
  	case "$i" in
  	-orbs)	orbs=true ;;
@@ -118,7 +115,7 @@
  	-i)	reverse=true ;;
  	-v)	verbose="-v" ;;
  	-d)	exec=echo ;;
-@@ -105,28 +159,10 @@
+@@ -105,28 +157,10 @@
  	shift
  done
  
@@ -149,7 +146,7 @@
  # ----------------------------------------------------------------------
  
  invalid ()
-@@ -180,20 +216,42 @@
+@@ -180,20 +214,42 @@
  
  exitstat=$EX_UNAVAILABLE
  
>Release-Note:
>Audit-Trail:
>Unformatted: