remove acountry from built tools as nerd.dk is gone (#554)

The acountry utility required a third party DNSBL service from nerd.dk in order to operate. That service has been offline for about a year and there is no other comparable service offering. We are keeping the code in the repository as an example, but no longer building it.

Fixes: #537
Fix By: Brad House (@bradh352)

INSTALL.md

@@ -406,7 +406,7 @@ After installing OpenWatcom, open a new command prompt and execute the following
   wmake -u -f Makefile.Watcom
 ```
 
-After running wmake, you should get acountry.exe, adig.exe, ahost.exe, and the static and dynamic versions of libcares.
+After running wmake, you should get adig.exe, ahost.exe, and the static and dynamic versions of libcares.
 
 PORTS
 =====

Makefile.Watcom

@@ -19,7 +19,7 @@ LIBNAME = $(%libname)
 LIBNAME	= cares
 !endif
 TARGETS = $(LIBNAME).dll $(LIBNAME)_imp.lib $(LIBNAME).lib
-DEMOS   = adig.exe ahost.exe acountry.exe
+DEMOS   = adig.exe ahost.exe
 
 CC = wcc386
 LD = wlink
@@ -120,10 +120,6 @@ ahost.exe: $(OBJ_BASE)\tools\ares_getopt.obj $(LIBNAME).lib
 	$(CC) $(CFLAGS) src\tools\ahost.c -fo=$(OBJ_BASE)\tools\ahost.obj
 	$(LD) name $^@ system nt $(LFLAGS) file { $(OBJ_BASE)\tools\ahost.obj $[@ } library $]@, ws2_32.lib, iphlpapi.lib
 
-acountry.exe: $(OBJ_BASE)\tools\ares_getopt.obj $(LIBNAME).lib
-	$(CC) $(CFLAGS) src\tools\acountry.c -fo=$(OBJ_BASE)\tools\acountry.obj
-	$(LD) name $^@ system nt $(LFLAGS) file { $(OBJ_BASE)\tools\acountry.obj $[@ } library $]@, ws2_32.lib, iphlpapi.lib
-
 clean: .SYMBOLIC
 	-$(RM) $(OBJS_STAT)
 	-$(RM) $(OBJS_DYN)

Makefile.dj

@@ -47,7 +47,7 @@ OBJECTS = $(addprefix $(OBJ_DIR)/, \
 GENERATED = src/lib/ares_config.h \
             include/ares_build.h
 
-TARGETS = libcares.a acountry.exe adig.exe ahost.exe
+TARGETS = libcares.a adig.exe ahost.exe
 
 .SECONDARY: $(OBJ_DIR)/ares_getopt.o
 

Makefile.m32

@@ -36,7 +36,7 @@ $(LIB): $(OBJLIB)
 
 all: $(LIB) demos
 
-demos: src/tools/adig.exe src/tools/ahost.exe src/tools/acountry.exe
+demos: src/tools/adig.exe src/tools/ahost.exe
 
 tags:
 	etags *.[ch]
@@ -70,7 +70,7 @@ install:
 	done)
 
 clean:
-	$(RM) src/tools/ares_getopt.o $(OBJLIB) $(LIB) src/tools/adig.exe src/tools/ahost.exe src/tools/acountry.exe
+	$(RM) src/tools/ares_getopt.o $(OBJLIB) $(LIB) src/tools/adig.exe src/tools/ahost.exe
 
 distclean: clean
 	$(RM) config.cache config.log config.status Makefile

Makefile.msvc

@@ -22,7 +22,7 @@
 # Usage: nmake /f makefile.msvc CFG=<config> <target>
 #
 # <config> must be one of: [ lib-release | lib-debug | dll-release | dll-debug }
-# <target> must be one of: [ ALL | c-ares | acountry | adig | ahost | clean }
+# <target> must be one of: [ ALL | c-ares | adig | ahost | clean }
 #
 # If a <target> other than ALL or clean is given, <config> becomes mandatory.
 #
@@ -132,7 +132,7 @@ VALID_CFGSET = TRUE
 !  MESSAGE Usage: nmake /f makefile.msvc CFG=<config> <target>
 !  MESSAGE
 !  MESSAGE <config> must be one of: [ lib-release | lib-debug | dll-release | dll-debug }
-!  MESSAGE <target> must be one of: [ ALL | c-ares | acountry | adig | ahost | clean }
+!  MESSAGE <target> must be one of: [ ALL | c-ares | adig | ahost | clean }
 !  MESSAGE
 !  MESSAGE If a <target> other than ALL or clean is given, <config> becomes mandatory.
 !  MESSAGE
@@ -147,7 +147,6 @@ VALID_CFGSET = TRUE
 # --------------------------------------------------------
 
 CARES_DIR = $(BASE_DIR)\cares
-PROG1_DIR = $(BASE_DIR)\acountry
 PROG2_DIR = $(BASE_DIR)\adig
 PROG3_DIR = $(BASE_DIR)\ahost
 
@@ -158,20 +157,16 @@ PROG3_DIR = $(BASE_DIR)\ahost
 
 !IF "$(VALID_CFGSET)" == "TRUE"
 CARES_OUTDIR = $(CARES_DIR)\$(CFG)
-PROG1_OUTDIR = $(PROG1_DIR)\$(CFG)
 PROG2_OUTDIR = $(PROG2_DIR)\$(CFG)
 PROG3_OUTDIR = $(PROG3_DIR)\$(CFG)
 CARES_OBJDIR = $(CARES_OUTDIR)\obj
-PROG1_OBJDIR = $(PROG1_OUTDIR)\obj
 PROG2_OBJDIR = $(PROG2_OUTDIR)\obj
 PROG3_OBJDIR = $(PROG3_OUTDIR)\obj
 !ELSE
 !UNDEF CARES_OUTDIR
-!UNDEF PROG1_OUTDIR
 !UNDEF PROG2_OUTDIR
 !UNDEF PROG3_OUTDIR
 !UNDEF CARES_OBJDIR
-!UNDEF PROG1_OBJDIR
 !UNDEF PROG2_OBJDIR
 !UNDEF PROG3_OBJDIR
 !ENDIF
@@ -303,17 +298,6 @@ CARES_OBJS = $(CARES_OBJS:.c=.obj)
 CARES_OBJS = $(CARES_OBJS) $(CARES_OBJDIR)\cares.res
 !ENDIF
 
-!IF [ECHO PROG1_OBJS=^$(PROG1_OBJDIR)\$(SAMPLESOURCES: = $(PROG1_OBJDIR^)\) > .\prog1_objs.inc] == 0
-!INCLUDE .\prog1_objs.inc
-!IF [DEL .\prog1_objs.inc]
-!ENDIF
-!ELSE
-!ERROR Problem generating PROG1_OBJS list.
-!ENDIF
-PROG1_OBJS = $(PROG1_OBJS:.c=.obj)
-PROG1_OBJS = $(PROG1_OBJS:/=\)
-PROG1_OBJS = $(PROG1_OBJS) $(PROG1_OBJDIR)\acountry.obj
-
 !IF [ECHO PROG2_OBJS=^$(PROG2_OBJDIR)\$(SAMPLESOURCES: = $(PROG2_OBJDIR^)\) > .\prog2_objs.inc] == 0
 !INCLUDE .\prog2_objs.inc
 !IF [DEL .\prog2_objs.inc]
@@ -352,9 +336,6 @@ PROG3_OBJS = $(PROG3_OBJS) $(PROG3_OBJDIR)\ahost.obj
 {$(SRCDIR)\src\lib}.c{$(CARES_OBJDIR)}.obj:
     $(CC_CMD) $(CC_CFLAGS) $(CARES_CFLAGS) /Fo$@ /Fd$(@D)\ /c $<
 
-{$(SRCDIR)\src\tools}.c{$(PROG1_OBJDIR)}.obj:
-    $(CC_CMD) $(CC_CFLAGS) $(SPROG_CFLAGS) /Fo$@ /Fd$(@D)\ /c $<
-
 {$(SRCDIR)\src\tools}.c{$(PROG2_OBJDIR)}.obj:
     $(CC_CMD) $(CC_CFLAGS) $(SPROG_CFLAGS) /Fo$@ /Fd$(@D)\ /c $<
 
@@ -364,9 +345,6 @@ PROG3_OBJS = $(PROG3_OBJS) $(PROG3_OBJDIR)\ahost.obj
 # Hack Alert! we reference ../lib/ files in the Makefile.inc for tools as they
 # share some files with the library itself.  We need to hack around that here.
 
-{$(SRCDIR)\src\lib}.c{$(PROG1_OBJDIR)\..\lib}.obj:
-    $(CC_CMD) $(CC_CFLAGS) $(SPROG_CFLAGS) /Fo$(PROG1_OBJDIR)\$(@F) /Fd$(PROG1_OBJDIR)\ /c $<
-
 {$(SRCDIR)\src\lib}.c{$(PROG2_OBJDIR)\..\lib}.obj:
     $(CC_CMD) $(CC_CFLAGS) $(SPROG_CFLAGS) /Fo$(PROG2_OBJDIR)\$(@F) /Fd$(PROG2_OBJDIR)\ /c $<
 
@@ -405,7 +383,7 @@ install:
 
 !IF "$(VALID_CFGSET)" == "TRUE"
 
-ALL: c-ares acountry adig ahost
+ALL: c-ares adig ahost
     @
 
 # $(HHEADERS) $(CSOURCES)
@@ -415,11 +393,6 @@ c-ares: $(CARES_OBJDIR) $(CARES_OBJS) $(CARES_OUTDIR)
     @if exist $(CARES_OUTDIR)\$(CARES_TARGET).manifest mt -nologo -manifest $(CARES_OUTDIR)\$(CARES_TARGET).manifest -outputresource:$(CARES_OUTDIR)\$(CARES_TARGET);2
 !   ENDIF
 
-# acountry.c $(SAMPLESOURCES) $(SAMPLEHEADERS)
-acountry: c-ares $(PROG1_OBJDIR) $(PROG1_OBJS) $(PROG1_OUTDIR)
-    $(SPROG_LINK) $(SPROG_LFLAGS) /out:$(PROG1_OUTDIR)\acountry.exe $(PROG1_OBJS:..\lib=)
-    @if exist $(PROG1_OUTDIR)\acountry.exe.manifest mt -nologo -manifest $(PROG1_OUTDIR)\acountry.exe.manifest -outputresource:$(PROG1_OUTDIR)\acountry.exe;1
-
 # adig.c $(SAMPLESOURCES) $(SAMPLEHEADERS)
 adig: c-ares  $(PROG2_OBJDIR) $(PROG2_OBJS) $(PROG2_OUTDIR)
     $(SPROG_LINK) $(SPROG_LFLAGS) /out:$(PROG2_OUTDIR)\adig.exe $(PROG2_OBJS:..\lib=)
@@ -433,9 +406,6 @@ ahost: c-ares $(PROG3_OBJDIR) $(PROG3_OBJS) $(PROG3_OUTDIR)
 $(CARES_OUTDIR): $(CARES_DIR)
     @if not exist $(CARES_OUTDIR) mkdir $(CARES_OUTDIR)
 
-$(PROG1_OUTDIR): $(PROG1_DIR)
-    @if not exist $(PROG1_OUTDIR) mkdir $(PROG1_OUTDIR)
-
 $(PROG2_OUTDIR): $(PROG2_DIR)
     @if not exist $(PROG2_OUTDIR) mkdir $(PROG2_OUTDIR)
 
@@ -445,9 +415,6 @@ $(PROG3_OUTDIR): $(PROG3_DIR)
 $(CARES_OBJDIR): $(CARES_OUTDIR)
     @if not exist $(CARES_OBJDIR) mkdir $(CARES_OBJDIR)
 
-$(PROG1_OBJDIR): $(PROG1_OUTDIR)
-    @if not exist $(PROG1_OBJDIR) mkdir $(PROG1_OBJDIR)
-
 $(PROG2_OBJDIR): $(PROG2_OUTDIR)
     @if not exist $(PROG2_OBJDIR) mkdir $(PROG2_OBJDIR)
 
@@ -456,7 +423,6 @@ $(PROG3_OBJDIR): $(PROG3_OUTDIR)
 
 clean:
     @-RMDIR /S /Q $(CARES_OUTDIR) >NUL 2>&1
-    @-RMDIR /S /Q $(PROG1_OUTDIR) >NUL 2>&1
     @-RMDIR /S /Q $(PROG2_OUTDIR) >NUL 2>&1
     @-RMDIR /S /Q $(PROG3_OUTDIR) >NUL 2>&1
 
@@ -481,9 +447,6 @@ $(BASE_DIR):
 $(CARES_DIR): $(BASE_DIR)
     @if not exist $(CARES_DIR) mkdir $(CARES_DIR)
 
-$(PROG1_DIR): $(BASE_DIR)
-    @if not exist $(PROG1_DIR) mkdir $(PROG1_DIR)
-
 $(PROG2_DIR): $(BASE_DIR)
     @if not exist $(PROG2_DIR) mkdir $(PROG2_DIR)
 

Makefile.netware

@@ -18,7 +18,7 @@ INSTDIR	= ../ares-$(LIBCARES_VERSION_STR)-bin-nw
 endif
 
 # Edit the vars below to change NLM target settings.
-TARGETS = adig.nlm ahost.nlm acountry.nlm
+TARGETS = adig.nlm ahost.nlm
 LTARGET = libcares.$(LIBEXT)
 VERSION	= $(LIBCARES_VERSION)
 COPYR	= $(LIBCARES_COPYRIGHT_STR)

README.msvc

@@ -28,7 +28,7 @@
   depends on the MSVC compiler version being used to build c-ares.
 
   Below the MSVCXX folder there will exist four folders named 'cares',
-  'ahost', 'acountry', and 'adig'. The 'cares' folder is the one that
+  'ahost', and 'adig'. The 'cares' folder is the one that
   holds the c-ares libraries you have just generated, the other three
   hold sample programs that use the libraries.
 

appveyor.yml

@@ -94,13 +94,11 @@ test_script:
   - if "%BUILDTOOL%" == "MAKE" .\dnsdump.exe fuzzinput\answer_a fuzzinput\answer_aaaa
   - if "%BUILDTOOL%" == "CMAKE" cd C:\projects\build-cares\bin
   - if "%BUILDTOOL%" == "CMAKE" .\adig.exe www.google.com
-  - if "%BUILDTOOL%" == "CMAKE" .\acountry.exe www.google.com
   - if "%BUILDTOOL%" == "CMAKE" .\ahost.exe www.google.com
   - if "%BUILDTOOL%" == "CMAKE" .\arestest.exe -4 -v
   - if "%BUILDTOOL%" == "CMAKE" .\dnsdump.exe "%APPVEYOR_BUILD_FOLDER%\test\fuzzinput\answer_a" "%APPVEYOR_BUILD_FOLDER%\test\fuzzinput\answer_aaaa"
   - if "%BUILDTOOL%" == "CMAKESTATIC" cd C:\projects\build-cares\bin
   - if "%BUILDTOOL%" == "CMAKESTATIC" .\adig.exe www.google.com
-  - if "%BUILDTOOL%" == "CMAKESTATIC" .\acountry.exe www.google.com
   - if "%BUILDTOOL%" == "CMAKESTATIC" .\ahost.exe www.google.com
   - if "%BUILDTOOL%" == "CMAKESTATIC" .\arestest.exe -4 -v
   - if "%BUILDTOOL%" == "CMAKESTATIC" .\dnsdump.exe "%APPVEYOR_BUILD_FOLDER%\test\fuzzinput\answer_a" "%APPVEYOR_BUILD_FOLDER%\test\fuzzinput\answer_aaaa"

ci/test.sh

@@ -31,7 +31,6 @@ else
 fi
 
 $TEST_WRAP "${TOOLSBIN}/adig" www.google.com
-$TEST_WRAP "${TOOLSBIN}/acountry" www.google.com
 $TEST_WRAP "${TOOLSBIN}/ahost" www.google.com
 cd "${TESTSBIN}"
 $TEST_WRAP ./arestest -4 -v $TEST_FILTER

docs/Makefile.am

@@ -7,4 +7,4 @@ include Makefile.inc
 
 man_MANS = $(MANPAGES)
 
-EXTRA_DIST = $(MANPAGES) ahost.1 adig.1 acountry.1 Makefile.inc CMakeLists.txt
+EXTRA_DIST = $(MANPAGES) ahost.1 adig.1 Makefile.inc CMakeLists.txt

src/tools/CMakeLists.txt

@@ -37,21 +37,4 @@ IF (CARES_BUILD_TOOLS)
 	IF (CARES_INSTALL)
 		INSTALL (TARGETS adig COMPONENT Tools ${TARGETS_INST_DEST})
 	ENDIF ()
-
-
-	# Build acountry
-	ADD_EXECUTABLE (acountry acountry.c ${SAMPLESOURCES})
-	TARGET_INCLUDE_DIRECTORIES (acountry
-		PUBLIC "$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}>"
-		       "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}>"
-		       "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src/lib>"
-		       "$<BUILD_INTERFACE:${CARES_TOPLEVEL_DIR}/include>"
-		       "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
-		PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}"
-	)
-	TARGET_COMPILE_DEFINITIONS (acountry PRIVATE HAVE_CONFIG_H=1)
-	TARGET_LINK_LIBRARIES (acountry PRIVATE ${PROJECT_NAME})
-	IF (CARES_INSTALL)
-		INSTALL (TARGETS acountry COMPONENT Tools ${TARGETS_INST_DEST})
-	ENDIF ()
 ENDIF ()

src/tools/Makefile.am

@@ -1,7 +1,7 @@
 # Copyright (C) The c-ares project and its contributors
 # SPDX-License-Identifier: MIT
 AUTOMAKE_OPTIONS = foreign subdir-objects nostdinc 1.9.6
-PROGS = ahost adig acountry
+PROGS = ahost adig
 
 EXTRA_DIST = CMakeLists.txt Makefile.inc
 
@@ -34,7 +34,3 @@ ahost_CPPFLAGS = $(AM_CPPFLAGS)
 adig_SOURCES = adig.c $(SAMPLESOURCES) $(SAMPLEHEADERS)
 adig_CFLAGS = $(AM_CFLAGS)
 adig_CPPFLAGS = $(AM_CPPFLAGS)
-
-acountry_SOURCES = acountry.c $(SAMPLESOURCES) $(SAMPLEHEADERS)
-acountry_CFLAGS = $(AM_CFLAGS)
-acountry_CPPFLAGS = $(AM_CPPFLAGS)

src/tools/acountry.c

@@ -1,3 +1,6 @@
+/* NOTE: As of late 2022, nerd.dk has been down, and is still down as of 10/2023.
+ *       As there is no similar service.  This file remains for historic purposes.
+ *       It is no longer built or tested. */
 /*
  *
  * IP-address/hostname to country converter.