From 3b4ac7cf38911107f4993857728e12bbf39bc4af Mon Sep 17 00:00:00 2001 From: christos Date: Sat, 26 Mar 2005 05:19:20 +0000 Subject: Switch to the host program from Greg Woods. This one is supported and more featurefull. --- net/host/Makefile | 40 ++------- net/host/PLIST | 3 +- net/host/distinfo | 12 +-- net/host/patches/patch-aa | 42 +++------- net/host/patches/patch-ab | 20 ----- net/host/patches/patch-ac | 16 ---- net/host/patches/patch-ad | 203 ---------------------------------------------- 7 files changed, 28 insertions(+), 308 deletions(-) delete mode 100644 net/host/patches/patch-ab delete mode 100644 net/host/patches/patch-ac delete mode 100644 net/host/patches/patch-ad (limited to 'net/host') diff --git a/net/host/Makefile b/net/host/Makefile index 076a5ba0daa..c8a0e407bcf 100644 --- a/net/host/Makefile +++ b/net/host/Makefile @@ -1,42 +1,20 @@ -# $NetBSD: Makefile,v 1.8 2004/01/20 12:22:19 agc Exp $ +# $NetBSD: Makefile,v 1.9 2005/03/26 05:19:20 christos Exp $ -DISTNAME= host_991529 -PKGNAME= host-991529 +DISTNAME= host-20040812 CATEGORIES= net -MASTER_SITES= ${MASTER_SITE_BACKUP} -EXTRACT_SUFX= .tar.Z +MASTER_SITES= ftp://ftp.weird.com/pub/local/ MAINTAINER= tech-pkg@NetBSD.org -HOMEPAGE= http://www.nikhef.nl/user/e07/ -COMMENT= Powerful DNS query and testing tool - -CONFLICTS+= bind-[0-9]* - -WRKSRC= ${WRKDIR} +HOMEPAGE= http://www.weird.com/~woods/projects/host.html +COMMENT= A powerful DNS query and testing tool .include "../../mk/bsd.prefs.mk" -# If you've removed $HOSTALIASES support from your system then -# you won't have the hostalias() function in libc.... -.if !defined(NO_HOSTALIASES) -MAKE_ENV+= ALLOW_HOSTALIASES=-DALLOW_HOSTALIASES -.endif - -NO_CONFIGURE= yes - -# MAKE_ENV will have the right effect... -MAKEFLAGS+= -e +NO_CONFIGURE = yes +NO_PATCH = yes -post-build: - ${SED} -e 's,@PREFIX@,${PREFIX},g' ${WRKSRC}/mxlookup \ - > ${WRKDIR}/mxlookup.out - ${SED} -e 's,@PREFIX@,${PREFIX},g' ${WRKSRC}/rblookup \ - > ${WRKDIR}/rblookup.out +MAKEFILE= Makefile.BSD -do-install: - ${INSTALL_PROGRAM} ${WRKDIR}/host ${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKDIR}/mxlookup.out ${PREFIX}/bin/mxlookup - ${INSTALL_SCRIPT} ${WRKDIR}/rblookup.out ${PREFIX}/bin/rblookup - ${INSTALL_MAN} ${WRKDIR}/host.1 ${PREFIX}/man/man1/host.1 +MAKE_FLAGS+= __NetBSD__=1 .include "../../mk/bsd.pkg.mk" diff --git a/net/host/PLIST b/net/host/PLIST index c26f1dd90a7..78d50362eba 100644 --- a/net/host/PLIST +++ b/net/host/PLIST @@ -1,5 +1,6 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:55:36 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2005/03/26 05:19:20 christos Exp $ bin/host bin/mxlookup +bin/nscheck bin/rblookup man/man1/host.1 diff --git a/net/host/distinfo b/net/host/distinfo index 9710c0ecedf..3e9d6147c1d 100644 --- a/net/host/distinfo +++ b/net/host/distinfo @@ -1,9 +1,5 @@ -$NetBSD: distinfo,v 1.4 2005/02/24 12:13:49 agc Exp $ +$NetBSD: distinfo,v 1.5 2005/03/26 05:19:20 christos Exp $ -SHA1 (host_991529.tar.Z) = 28097ee01a94bb82cec69a3be556a869ea236b5f -RMD160 (host_991529.tar.Z) = 52b734d567b4a474f5cac94a5e44580a9eee7281 -Size (host_991529.tar.Z) = 184455 bytes -SHA1 (patch-aa) = f9b4e0668419adb2223b315bb7facd03f1fa7e83 -SHA1 (patch-ab) = 471a67439f2e5847b510f0e73bb857226c79c450 -SHA1 (patch-ac) = b03893231b796f70412025eca7b8fb0884348e3a -SHA1 (patch-ad) = 5440b41333d829e8522fb85189c8fe3159f74166 +SHA1 (host-20040812.tar.gz) = 02027effe88a851e6cecf133cef8ba096af48258 +Size (host-20040812.tar.gz) = 147758 bytes +SHA1 (patch-aa) = bf2d0b44271feed9a1e595d78e34304052e34ab5 diff --git a/net/host/patches/patch-aa b/net/host/patches/patch-aa index 2d26f406071..fe4c2a9f38f 100644 --- a/net/host/patches/patch-aa +++ b/net/host/patches/patch-aa @@ -1,30 +1,14 @@ -$NetBSD: patch-aa,v 1.2 2003/10/11 14:18:58 grant Exp $ +$NetBSD: patch-aa,v 1.3 2005/03/26 05:19:20 christos Exp $ ---- Makefile.orig 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. - # ---------------------------------------------------------------------- - -+PREFIX?= /usr/local -+ - # This is where the host executable will go. --DESTBIN = /usr/local/bin -+DESTBIN = ${PREFIX}/bin - - # This is where the host manual page will go. --DESTMAN = /usr/local/man -+DESTMAN = ${PREFIX}/man - - BINDIR = $(DESTBIN) - MANDIR = $(DESTMAN)/man1 -@@ -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. +--- port.h.orig 2003-06-04 21:00:07.000000000 -0400 ++++ port.h 2005-03-24 16:00:55.000000000 -0500 +@@ -154,7 +154,8 @@ + */ + #if defined(__NAMESER) && (!defined(__GLIBC__) || ((__RES - 0) > 19991006)) && \ + ((__NAMESER - 0) >= 19991006 || \ +- (defined(__FreeBSD__) && (__NAMESER - 0) >= 19961001)) ++ (defined(__FreeBSD__) && (__NAMESER - 0) >= 19961001)) && \ ++ !defined(__NetBSD__) + # define HAVE_GETIPNODEBYNAME 1 + # define HAVE_GETIPNODEBYADDR 1 + # define HAVE_FREEHOSTENT 1 diff --git a/net/host/patches/patch-ab b/net/host/patches/patch-ab deleted file mode 100644 index 93a080dd269..00000000000 --- a/net/host/patches/patch-ab +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2001/03/10 17:06:37 wiz Exp $ - ---- info.c.orig Mon Mar 27 12:59:11 2000 -+++ info.c -@@ -85,6 +85,7 @@ - if (*cp == '.') - dot++; - -+#ifdef ALLOW_HOSTALIASES - /* - * Check for aliases of single name. - * Note that the alias is supposed to be fully qualified. -@@ -97,6 +98,7 @@ - result = get_domaininfo(cp, (char *)NULL); - return(result); - } -+#endif - - /* - * Trailing dot means absolute (fully qualified) address. diff --git a/net/host/patches/patch-ac b/net/host/patches/patch-ac deleted file mode 100644 index 7ac0d52f560..00000000000 --- a/net/host/patches/patch-ac +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ac,v 1.2 2003/10/11 14:18:58 grant Exp $ - ---- mxlookup.orig 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. --BINDIR=/usr/local/bin -+BINDIR=@PREFIX@/bin - --PATH=${BINDIR}:/bin:/usr/bin:/usr/ucb ; export PATH -+PATH=${BINDIR}:/bin:/usr/bin ; export PATH - - cmd=`basename $0` - diff --git a/net/host/patches/patch-ad b/net/host/patches/patch-ad deleted file mode 100644 index 8480a606ca0..00000000000 --- a/net/host/patches/patch-ad +++ /dev/null @@ -1,203 +0,0 @@ -$NetBSD: patch-ad,v 1.2 2003/10/11 14:18:58 grant Exp $ - ---- rblookup.orig 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 - # - # Syntax: --# rblookup hostname --# rblookup -i dottedquad -+# rblookup hostname ... -+# rblookup -i dottedquad ... - # - # Returns: - # zero if the given host was found on the blacklist. -@@ -45,24 +45,71 @@ - # ---------------------------------------------------------------------- - - # This is where the ``host'' executable lives. --BINDIR=/usr/local/bin -+BINDIR=@PREFIX@/bin - --PATH=${BINDIR}:/bin:/usr/bin:/usr/ucb ; export PATH -+PATH=${BINDIR}:/bin:/usr/bin ; export PATH - - cmd=`basename $0` - --options="[-maps] [-orbs] [-i] [-v]" --usage="Usage: $cmd $options hostname" -+options="[-dul] [-maps] [-orbs] [-relays] [-i] [-v]" -+usage="Usage: $cmd $options hostname|IP# ..." - - # ---------------------------------------------------------------------- --# Configuration. -+# RBLs: - # ---------------------------------------------------------------------- - --MAPSROOT="rbl.maps.vix.com" -+# MAPS RBL: Mail Abuse Protection System Realtime Blackhole List -+# -+# -+# This listing is human-operated, and is one of the most popular -+# blacklists of spam-originating systems. Originally started by Paul -+# Vixie, this is the original "RBL" system. -+# -+MAPSROOT="blackholes.mail-abuse.org" -+ALLRBLS="${MAPSROOT} ${ALLRBLS}" -+ -+# MAPS DUL: Mail Abuse Protection System Dial-up User List -+# -+# -+# This list was started from a list compiled by "Afterburner" (the -+# head-honcho abuse guy at Erols Internet), and extended to be easily -+# added to over time. This service was originally called the ORCA -+# DUL, and was operated at "dul.orca.bc.ca". The MAPS project invited -+# Al Iverson, the then-current DUL maintainer, to host it on their -+# systems. -+# -+DULROOT="dialups.mail-abuse.org" -+ALLRBLS="${DULROOT} ${ALLRBLS}" -+ -+# ORBS: Open Relay Behaviour-modification System -+# -+# -+# This is an listing of IP addresses that have been submitted by spam -+# victims and others and have been automatically tested and proven to -+# be the output ports of SMTP servers that will transmit at least one -+# message to any system for anyone (an "open email relay"). -+# Administrators of listed servers can request re-testing and -+# automated systems will remove those that have proven to close their -+# relays. Input points of multi-level relays can be submitted too, -+# but only the output point is listed in the DNS RBL. -+# - ORBSROOT="relays.orbs.org" -+ALLRBLS="${ORBSROOT} ${ALLRBLS}" -+ -+# RSS: MAPS Relay Spam Stopper -+# -+# -+# This is a list of e-mail relays which have been verified to have -+# been used to send spam. They supposedly have archives of the spam -+# they received through these relays. They do not list multi-level -+# relays (and thus miss a vast number of the actively exploited -+# systems out there -- I really hope they change this policy)! -+# -+RELAYSROOT="relays.mail-abuse.org" -+ALLRBLS="${RELAYSROOT} ${ALLRBLS}" - - # ---------------------------------------------------------------------- --# Exit codes from -+# Exit codes from , just in case we are called from a mailer - # ---------------------------------------------------------------------- - - EX_OK=0 -@@ -85,8 +132,11 @@ - # ---------------------------------------------------------------------- - - verbose= --reverse= --orbs= -+reverse=false -+orbs=false -+dul=false -+maps=false -+relays=false - - skip= - for i -@@ -95,7 +145,9 @@ - - case "$i" in - -orbs) orbs=true ;; -- -maps) orbs= ;; -+ -dul) dul=true ;; -+ -maps) maps=true ;; -+ -relays) relays=true ;; - -i) reverse=true ;; - -v) verbose="-v" ;; - -d) exec=echo ;; -@@ -105,28 +157,10 @@ - shift - done - --# ---------------------------------------------------------------------- --# Process arguments. --# ---------------------------------------------------------------------- -- --name="$1" -- --[ "X$name" = "X" ] && fatal "$usage" -- --# Remove trailing dots. --name=`echo $name | sed 's/\.*$//'` -- --if [ $reverse ] --then -- # Assume this is already a dotted quad. -- addresslist="$name" --else -- # Try to resolve domain name into dotted quad. -- addresslist=`host "$name" | awk '$2 == "A" {print $3}'` --fi -+[ $# -lt 1 ] && fatal "$usage" - - # ---------------------------------------------------------------------- --# Auxiliary routines. -+# More routines. - # ---------------------------------------------------------------------- - - invalid () -@@ -180,20 +214,42 @@ - - exitstat=$EX_UNAVAILABLE - --for address in $addresslist -+for name in ${1+$@} - do -+ # Remove trailing dots. -+ name=`echo $name | sed 's/\.*$//'` -+ -+ if $reverse -+ then -+ # Assume this is already a dotted quad. -+ address="$name" -+ else -+ # Try to resolve domain name into dotted quad. -+ address=`host "$name" | awk '$2 == "A" {print $3}'` -+ fi -+ - # Swap dotted quad labels. - invert - -- # Construct proper name in map. -- [ $orbs ] && map="$ORBSROOT" || map="$MAPSROOT" -- name="$reversed.$map" -- -- echo "--- $name ---" -- $exec host $verbose -t A $name -- found=$? -- [ $found -eq $EX_OK ] && exitstat=$EX_OK -- [ $found -eq $EX_OK ] && $exec host $verbose -t TXT $name -+ rbllist="" -+ $orbs && rbllist="$ORBSROOT $rbllist" -+ $dul && rbllist="$DULROOT $rbllist" -+ $maps && rbllist="$MAPSROOT $rbllist" -+ $relays && rbllist="$RELAYSROOT $rbllist" -+ -+ [ -z "$rbllist" ] && rbllist="$ALLRBLS" -+ -+ for rbl in $rbllist -+ do -+ # Construct proper name in map. -+ name="$reversed.$rbl" -+ -+ echo "--- $name ---" -+ $exec host $verbose -t A $name -+ found=$? -+ [ $found -eq $EX_OK ] && exitstat=$EX_OK -+ [ $found -eq $EX_OK ] && $exec host $verbose -t TXT $name -+ done - done - - exit $exitstat -- cgit v1.2.3