add a search for GeoIP2 libraries in configure

- "--with-geoip" is used to enable the legacy GeoIP library.
- "--with-geoip2" is used to enable the new GeoIP2 library
  (libmaxminddb), and is on by default if the library is found.
- using both "--with-geoip" and "--with-geoip2" at the same time
  is an error.
- an attempt is made to determine the default GeoIP2 database path at
  compile time if pkg-config is able to report the module prefix. if
  this fails, it will be necessary to set the path in named.conf with
  geoip-directory
- Makefiles have been updated, and a stub lib/dns/geoip2.c has been
  added for the eventual GeoIP2 search implementation.

diff --git a/bin/check/Makefile.in b/bin/check/Makefile.in
index 0a99fc2477b04dbbfc9b9320b298bc87886fd627..8d214a90f961605ade38bb7562364bd62ef3e75e 100644 (file)
--- a/bin/check/Makefile.in
+++ b/bin/check/Makefile.in
@@ -22,7 +22,7 @@ CINCLUDES =   ${NS_INCLUDES} ${BIND9_INCLUDES} ${DNS_INCLUDES} ${ISCCFG_INCLUDES}
 CDEFINES =     -DNAMED_CONFFILE=\"${sysconfdir}/named.conf\"
 CWARNINGS =
 
-DNSLIBS =      ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
+DNSLIBS =      ../../lib/dns/libdns.@A@ ${MAXMINDDB_LIBS} @DNS_CRYPTO_LIBS@
 ISCCFGLIBS =   ../../lib/isccfg/libisccfg.@A@
 ISCLIBS =      ../../lib/isc/libisc.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS}
 ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS}

diff --git a/bin/confgen/Makefile.in b/bin/confgen/Makefile.in
index 93c71e4d28d40849051b303e64eb1847b5e3335e..345ff205a93938fdc0cb701f353c03717ad3a97e 100644 (file)
--- a/bin/confgen/Makefile.in
+++ b/bin/confgen/Makefile.in
@@ -29,7 +29,7 @@ ISCCFGLIBS =  ../../lib/isccfg/libisccfg.@A@
 ISCCCLIBS =    ../../lib/isccc/libisccc.@A@
 ISCLIBS =      ../../lib/isc/libisc.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS}
 ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS}
-DNSLIBS =      ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
+DNSLIBS =      ../../lib/dns/libdns.@A@ ${MAXMINDDB_LIBS} @DNS_CRYPTO_LIBS@
 BIND9LIBS =    ../../lib/bind9/libbind9.@A@
 
 ISCCFGDEPLIBS =        ../../lib/isccfg/libisccfg.@A@

diff --git a/bin/delv/Makefile.in b/bin/delv/Makefile.in
index 8c66f2da08e7f639cb1caf67674299c562ffdd1c..035dfbd60a195d5ff2b76bde88da9e3762273f54 100644 (file)
--- a/bin/delv/Makefile.in
+++ b/bin/delv/Makefile.in
@@ -24,7 +24,7 @@ CDEFINES =    -DVERSION=\"${VERSION}\" \
 CWARNINGS =
 
 ISCCFGLIBS =   ../../lib/isccfg/libisccfg.@A@
-DNSLIBS =      ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
+DNSLIBS =      ../../lib/dns/libdns.@A@ ${MAXMINDDB_LIBS} @DNS_CRYPTO_LIBS@
 ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS}
 ISCLIBS =      ../../lib/isc/libisc.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS}
 IRSLIBS =      ../../lib/irs/libirs.@A@

diff --git a/bin/dig/Makefile.in b/bin/dig/Makefile.in
index e74f560bc6679707062c7510d54cb60ee64591dd..ae0f2dbc5370daeec7b492790df964fff1615693 100644 (file)
--- a/bin/dig/Makefile.in
+++ b/bin/dig/Makefile.in
@@ -26,7 +26,7 @@ CDEFINES =    -DVERSION=\"${VERSION}\"
 CWARNINGS =
 
 ISCCFGLIBS =   ../../lib/isccfg/libisccfg.@A@
-DNSLIBS =      ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
+DNSLIBS =      ../../lib/dns/libdns.@A@ ${MAXMINDDB_LIBS} @DNS_CRYPTO_LIBS@
 BIND9LIBS =    ../../lib/bind9/libbind9.@A@
 ISCLIBS =      ../../lib/isc/libisc.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS}
 ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS}

diff --git a/bin/dnssec/Makefile.in b/bin/dnssec/Makefile.in
index 996ad5647f7b9aa59fa11ed3bbd02dc96ad9e803..32d79f429220e2ae0322f9916693b6ac11a8e078 100644 (file)
--- a/bin/dnssec/Makefile.in
+++ b/bin/dnssec/Makefile.in
@@ -21,7 +21,7 @@ CINCLUDES =   ${DNS_INCLUDES} ${ISC_INCLUDES} \
 CDEFINES =     -DVERSION=\"${VERSION}\"
 CWARNINGS =
 
-DNSLIBS =      ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
+DNSLIBS =      ../../lib/dns/libdns.@A@ ${MAXMINDDB_LIBS} @DNS_CRYPTO_LIBS@
 ISCLIBS =      ../../lib/isc/libisc.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS}
 ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS}
 

diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in
index b3b01bd38842a5a51e0accab646e09dc438f7ca0..4b2ab1c8199753507e53dee97a3ce5ccfd035248 100644 (file)
--- a/bin/named/Makefile.in
+++ b/bin/named/Makefile.in
@@ -49,13 +49,14 @@ CINCLUDES = -I${srcdir}/include -I${srcdir}/unix/include -I. \
                ${DBDRIVER_INCLUDES} \
                ${OPENSSL_CFLAGS} \
                ${JSON_C_CFLAGS} \
-               ${LIBXML2_CFLAGS}
+               ${LIBXML2_CFLAGS} \
+               ${MAXMINDDB_CFLAGS}
 
 CDEFINES =      @CONTRIB_DLZ@
 
 CWARNINGS =
 
-DNSLIBS =      ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
+DNSLIBS =      ../../lib/dns/libdns.@A@ ${MAXMINDDB_LIBS} @DNS_CRYPTO_LIBS@
 ISCCFGLIBS =   ../../lib/isccfg/libisccfg.@A@
 ISCCCLIBS =    ../../lib/isccc/libisccc.@A@
 ISCLIBS =      ../../lib/isc/libisc.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS}
@@ -88,9 +89,11 @@ SUBDIRS =    unix
 TARGETS =      named@EXEEXT@
 
 GEOIPLINKOBJS = geoip.@O@
+GEOIP2LINKOBJS = geoip.@O@
 
 OBJS =         builtin.@O@ config.@O@ control.@O@ \
-               controlconf.@O@ fuzz.@O@ @GEOIPLINKOBJS@ \
+               controlconf.@O@ fuzz.@O@ \
+               @GEOIPLINKOBJS@ @GEOIP2LINKOBJS@ \
                log.@O@ logconf.@O@ main.@O@ \
                server.@O@ statschannel.@O@ \
                tkeyconf.@O@ tsigconf.@O@ zoneconf.@O@ \
@@ -101,9 +104,11 @@ UOBJS =            unix/os.@O@ unix/dlz_dlopen_driver.@O@
 SYMOBJS =      symtbl.@O@
 
 GEOIPLINKSRCS = geoip.c
+GEOIP2LINKSRCS = geoip.c
 
 SRCS =         builtin.c config.c control.c \
-               controlconf.c fuzz.c @GEOIPLINKSRCS@ \
+               controlconf.c fuzz.c \
+               @GEOIPLINKSRCS@ @GEOIP2LINKSRCS@ \
                log.c logconf.c main.c \
                server.c statschannel.c \
                tkeyconf.c tsigconf.c zoneconf.c \
@@ -135,6 +140,7 @@ config.@O@: config.c
                -DDYNDB_LIBDIR=\"@libdir@/bind\" \
                -DNAMED_LOCALSTATEDIR=\"${localstatedir}\" \
                -DNAMED_SYSCONFDIR=\"${sysconfdir}\" \
+               -DMAXMINDDB_PREFIX=\"@MAXMINDDB_PREFIX@\" \
                -c ${srcdir}/config.c
 
 server.@O@: server.c

diff --git a/bin/named/config.c b/bin/named/config.c
index 96912b9eee6c6070de51d45331cbf0c607042e16..6f6da2facd7f46cc2907553cef75fbf1a899e1ae 100644 (file)
--- a/bin/named/config.c
+++ b/bin/named/config.c
@@ -64,6 +64,9 @@ options {\n\
 #ifndef WIN32
 "      files unlimited;\n"
 #endif
+#ifdef HAVE_GEOIP2
+"      geoip-directory \"" MAXMINDDB_PREFIX "/share/GeoIP2\";\n"
+#endif
 "\
 #      has-old-clients <obsolete>;\n\
        heartbeat-interval 60;\n\

diff --git a/bin/nsupdate/Makefile.in b/bin/nsupdate/Makefile.in
index d213c39358c37ed2083bfe759e8373ab32afd1e4..f904300584db35aac0912b46c1a6f79e3749d097 100644 (file)
--- a/bin/nsupdate/Makefile.in
+++ b/bin/nsupdate/Makefile.in
@@ -26,7 +26,7 @@ CINCLUDES =   ${DNS_INCLUDES} ${BIND9_INCLUDES} ${ISC_INCLUDES} \
 CDEFINES =     -DVERSION=\"${VERSION}\" @USE_GSSAPI@
 CWARNINGS =
 
-DNSLIBS =      ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
+DNSLIBS =      ../../lib/dns/libdns.@A@ ${MAXMINDDB_LIBS} @DNS_CRYPTO_LIBS@
 BIND9LIBS =    ../../lib/bind9/libbind9.@A@
 ISCLIBS =      ../../lib/isc/libisc.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS}
 ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS}

diff --git a/bin/plugins/Makefile.in b/bin/plugins/Makefile.in
index de99561a95524ac3c324556f6bac832242bec48e..0c4f7695d5290e8e5d70ecb892467674f98af4ac 100644 (file)
--- a/bin/plugins/Makefile.in
+++ b/bin/plugins/Makefile.in
@@ -17,7 +17,7 @@ CINCLUDES =   -I${srcdir}/include -I${srcdir}/unix/include -I. \
                ${NS_INCLUDES} ${DNS_INCLUDES} \
                ${ISCCFG_INCLUDES} ${ISC_INCLUDES}
 
-DNSLIBS =      ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
+DNSLIBS =      ../../lib/dns/libdns.@A@ ${MAXMINDDB_LIBS} @DNS_CRYPTO_LIBS@
 ISCCFGLIBS =   ../../lib/isccfg/libisccfg.@A@
 ISCLIBS =      ../../lib/isc/libisc.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS}
 NSLIBS =       ../../lib/ns/libns.@A@

diff --git a/bin/rndc/Makefile.in b/bin/rndc/Makefile.in
index f6131edc98740765ad91509b22f36b5e376f499b..37f43defbea4c0e6d4e5a5eb59af6b4c488a510e 100644 (file)
--- a/bin/rndc/Makefile.in
+++ b/bin/rndc/Makefile.in
@@ -25,7 +25,7 @@ ISCCFGLIBS =  ../../lib/isccfg/libisccfg.@A@
 ISCCCLIBS =    ../../lib/isccc/libisccc.@A@
 ISCLIBS =      ../../lib/isc/libisc.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS}
 ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS}
-DNSLIBS =      ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
+DNSLIBS =      ../../lib/dns/libdns.@A@ ${MAXMINDDB_LIBS} @DNS_CRYPTO_LIBS@
 BIND9LIBS =    ../../lib/bind9/libbind9.@A@
 
 ISCCFGDEPLIBS =        ../../lib/isccfg/libisccfg.@A@

diff --git a/bin/tests/Makefile.in b/bin/tests/Makefile.in
index a10ad34b95eb91be84d89ff93603f962809c6ed7..ee11902d347077ca67241f4d51f0773cd4fee616 100644 (file)
--- a/bin/tests/Makefile.in
+++ b/bin/tests/Makefile.in
@@ -20,7 +20,7 @@ CDEFINES =
 CWARNINGS =
 BACKTRACECFLAGS = @BACKTRACECFLAGS@
 
-DNSLIBS =      ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
+DNSLIBS =      ../../lib/dns/libdns.@A@ ${MAXMINDDB_LIBS} @DNS_CRYPTO_LIBS@
 ISCLIBS =      ../../lib/isc/libisc.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS}
 ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS}
 ISCCFGLIBS =   ../../lib/isccfg/libisccfg.@A@

diff --git a/bin/tests/optional/Makefile.in b/bin/tests/optional/Makefile.in
index 47065a5bfd57a8277ccdb10462a7cdef6d427133..9d61f4aa7522e9de9f3f3cbe000441ed6eff9869 100644 (file)
--- a/bin/tests/optional/Makefile.in
+++ b/bin/tests/optional/Makefile.in
@@ -22,7 +22,7 @@ CWARNINGS =
 BACKTRACECFLAGS = @BACKTRACECFLAGS@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
 
-DNSLIBS =      ../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
+DNSLIBS =      ../../../lib/dns/libdns.@A@ ${MAXMINDDB_LIBS} @DNS_CRYPTO_LIBS@
 ISCLIBS =      ../../../lib/isc/libisc.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS}
 ISCNOSYMLIBS = ../../../lib/isc/libisc-nosymtbl.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS}
 ISCCFGLIBS =   ../../../lib/isccfg/libisccfg.@A@

diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in
index f13681cb9921e7387984497883c9a7f706158998..eaf81182396e5a7ac2475144bac7787411ee1f31 100644 (file)
--- a/bin/tests/system/conf.sh.in
+++ b/bin/tests/system/conf.sh.in
@@ -118,5 +118,7 @@ LIBXML2_LIBS="@LIBXML2_LIBS@"
 HAVEXMLSTATS=${LIBXML2_LIBS:+1}
 JSON_C_LIBS="@JSON_C_LIBS@"
 HAVEJSONSTATS=${JSON_C_LIBS:+1}
+MAXMINDDB_LIBS="@MAXMINDDB_LIBS@"
+HAVEGEOIP2=${MAXMINDDB_LIBS:+1}
 ZLIB=@ZLIB@
 NZD=@NZD_TOOLS@

diff --git a/bin/tests/system/pipelined/Makefile.in b/bin/tests/system/pipelined/Makefile.in
index 275e4cfb4077984c49031eb0d4650792ad530ba0..23b62e0d86b9c43af65d6777d432c225158fd082 100644 (file)
--- a/bin/tests/system/pipelined/Makefile.in
+++ b/bin/tests/system/pipelined/Makefile.in
@@ -21,7 +21,7 @@ CINCLUDES =   ${DNS_INCLUDES} ${ISC_INCLUDES} \
 CDEFINES =
 CWARNINGS =
 
-DNSLIBS =      ../../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
+DNSLIBS =      ../../../../lib/dns/libdns.@A@ ${MAXMINDDB_LIBS} @DNS_CRYPTO_LIBS@
 ISCLIBS =      ../../../../lib/isc/libisc.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS}
 
 DNSDEPLIBS =   ../../../../lib/dns/libdns.@A@

diff --git a/bin/tests/system/rsabigexponent/Makefile.in b/bin/tests/system/rsabigexponent/Makefile.in
index 5c7abb42d3d452260e7b28365e4182f3783110db..2a240bfded06ccd90fbd3b1fce332915c3886091 100644 (file)
--- a/bin/tests/system/rsabigexponent/Makefile.in
+++ b/bin/tests/system/rsabigexponent/Makefile.in
@@ -21,7 +21,7 @@ CINCLUDES =   ${DNS_INCLUDES} ${ISC_INCLUDES} \
 CDEFINES =
 CWARNINGS =
 
-DNSLIBS =      ../../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
+DNSLIBS =      ../../../../lib/dns/libdns.@A@ ${MAXMINDDB_LIBS} @DNS_CRYPTO_LIBS@
 ISCLIBS =      ../../../../lib/isc/libisc.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS}
 
 DNSDEPLIBS =   ../../../../lib/dns/libdns.@A@

diff --git a/bin/tests/system/tkey/Makefile.in b/bin/tests/system/tkey/Makefile.in
index c02dacc522a24a2664eacb5480f9ee813e6d996f..5a79899193e28aa092b49254674be7bb97bce157 100644 (file)
--- a/bin/tests/system/tkey/Makefile.in
+++ b/bin/tests/system/tkey/Makefile.in
@@ -21,7 +21,7 @@ CINCLUDES =   ${DNS_INCLUDES} ${ISC_INCLUDES} \
 CDEFINES =
 CWARNINGS =
 
-DNSLIBS =      ../../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
+DNSLIBS =      ../../../../lib/dns/libdns.@A@ ${MAXMINDDB_LIBS} @DNS_CRYPTO_LIBS@
 ISCLIBS =      ../../../../lib/isc/libisc.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS}
 
 DNSDEPLIBS =   ../../../../lib/dns/libdns.@A@

diff --git a/bin/tools/Makefile.in b/bin/tools/Makefile.in
index 5d602f9265c7f4dc0fedd7511e77556ee57397b8..ead9df56aea05bc0ccc53db0bb5114df824c4ee5 100644 (file)
--- a/bin/tools/Makefile.in
+++ b/bin/tools/Makefile.in
@@ -17,12 +17,13 @@ VERSION=@BIND9_VERSION@
 
 CINCLUDES =    ${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCFG_INCLUDES} \
                ${BIND9_INCLUDES} \
-               ${OPENSSL_CFLAGS}
+               ${OPENSSL_CFLAGS} \
+               ${MAXMINDDB_CFLAGS}
 
 CDEFINES =     -DVERSION=\"${VERSION}\"
 CWARNINGS =
 
-DNSLIBS =      ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
+DNSLIBS =      ../../lib/dns/libdns.@A@ ${MAXMINDDB_LIBS} @DNS_CRYPTO_LIBS@
 BIND9LIBS =    ../../lib/bind9/libbind9.@A@
 ISCLIBS =      ../../lib/isc/libisc.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS}
 ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS}

diff --git a/config.h.in b/config.h.in
index be91c71e815052ef4afc53794c8080505bedd944..9dd11bc328f4624804d8442b7f81c45785d52399 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -171,6 +171,9 @@
 /* Build with GeoIP support */
 #undef HAVE_GEOIP
 
+/* Build with GeoIP2 support */
+#undef HAVE_GEOIP2
+
 /* Build with GeoIP City IPv6 support */
 #undef HAVE_GEOIP_CITY_V6
 

diff --git a/configure b/configure
index 50c2bacdca1e377116d9665112bb7d45e659edb0..34ae3b34de52a27b2139ef5b1da3a1515ef5b53c 100755 (executable)
--- a/configure
+++ b/configure
@@ -754,6 +754,11 @@ PTHREAD_CC
 ax_pthread_config
 GEOIPLINKOBJS
 GEOIPLINKSRCS
+GEOIP2LINKOBJS
+GEOIP2LINKSRCS
+MAXMINDDB_PREFIX
+MAXMINDDB_LIBS
+MAXMINDDB_CFLAGS
 ISC_PLATFORM_NORETURN_POST
 ISC_PLATFORM_NORETURN_PRE
 expanded_sysconfdir
@@ -900,6 +905,7 @@ enable_kqueue
 enable_epoll
 enable_devpoll
 with_geoip
+with_geoip2
 with_locktype
 with_libtool
 enable_pthread_rwlock
@@ -961,6 +967,9 @@ LT_SYS_LIBRARY_PATH
 PKG_CONFIG
 PKG_CONFIG_PATH
 PKG_CONFIG_LIBDIR
+MAXMINDDB_CFLAGS
+MAXMINDDB_LIBS
+MAXMINDDB_PREFIX
 OPENSSL_CFLAGS
 OPENSSL_LIBS
 LIBXML2_CFLAGS
@@ -1642,7 +1651,9 @@ Optional Packages:
   --with-python=PATH      specify path to Python interpreter
   --with-python-install-dir=PATH
                           installation directory for Python modules
-  --with-geoip=PATH       Build with GeoIP support (yes|no|path)
+  --with-geoip=PATH       Build with legacy GeoIP support (yes|no|path)
+  --with-geoip2=PATH      Build with MaxMind GeoIP2 support (auto|yes|no|path)
+                          [default=$geoip2_default]
   --with-locktype=ARG     Specify mutex lock type (adaptive or standard)
   --with-libtool          use GNU libtool
   --with-openssl=DIR      root of the OpenSSL directory
@@ -1708,6 +1719,12 @@ Some influential environment variables:
               directories to add to pkg-config's search path
   PKG_CONFIG_LIBDIR
               path overriding pkg-config's built-in search path
+  MAXMINDDB_CFLAGS
+              C compiler flags for MAXMINDDB, overriding pkg-config
+  MAXMINDDB_LIBS
+              linker flags for MAXMINDDB, overriding pkg-config
+  MAXMINDDB_PREFIX
+              value of prefix for libmaxminddb, overriding pkg-config
   OPENSSL_CFLAGS
               C compiler flags for OPENSSL, overriding pkg-config
   OPENSSL_LIBS
@@ -14419,17 +14436,415 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
 #
 # GeoIP support?
 #
-GEOIPLINKSRCS=
-GEOIPLINKOBJS=
+geoip2_default="auto"
 
 # Check whether --with-geoip was given.
 if test "${with_geoip+set}" = set; then :
-  withval=$with_geoip; use_geoip="$withval"
+  withval=$with_geoip;
+                            use_geoip="$withval"
+                            geoip2_default="no"
+
 else
   use_geoip="no"
 fi
 
 
+# Check whether --with-geoip2 was given.
+if test "${with_geoip2+set}" = set; then :
+  withval=$with_geoip2;
+else
+  with_geoip2="$geoip2_default"
+fi
+
+
+# --with-geoip2 should be turned on by default if the library exists.
+#
+# --with-geoip is not on by default, but can be turned on if the library
+# exists. if it is turned on, --with-geoip2 is suppressed.
+#
+# specifying both --with-geoip and --with-geoip2 is an error.
+if test "no" != "$with_geoip2" && test "no" != "$use_geoip"; then :
+  as_fn_error $? "--with-geoip and --with-geoip2 are incompatible" "$LINENO" 5
+fi
+
+GEOIP2LINKSRCS=
+GEOIP2LINKOBJS=
+case $with_geoip2 in #(
+  no) :
+     ;; #(
+  auto) :
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libmaxminddb" >&5
+$as_echo_n "checking for libmaxminddb... " >&6; }
+
+if test -n "$MAXMINDDB_CFLAGS"; then
+    pkg_cv_MAXMINDDB_CFLAGS="$MAXMINDDB_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmaxminddb\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libmaxminddb") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_MAXMINDDB_CFLAGS=`$PKG_CONFIG --cflags "libmaxminddb" 2>/dev/null`
+                     test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$MAXMINDDB_LIBS"; then
+    pkg_cv_MAXMINDDB_LIBS="$MAXMINDDB_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmaxminddb\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libmaxminddb") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_MAXMINDDB_LIBS=`$PKG_CONFIG --libs "libmaxminddb" 2>/dev/null`
+                     test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+               MAXMINDDB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmaxminddb" 2>&1`
+        else
+               MAXMINDDB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmaxminddb" 2>&1`
+        fi
+       # Put the nasty error message in config.log where it belongs
+       echo "$MAXMINDDB_PKG_ERRORS" >&5
+
+       :
+elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+       :
+else
+       MAXMINDDB_CFLAGS=$pkg_cv_MAXMINDDB_CFLAGS
+       MAXMINDDB_LIBS=$pkg_cv_MAXMINDDB_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define HAVE_GEOIP2 1" >>confdefs.h
+
+
+if test -n "$MAXMINDDB_PREFIX"; then
+    pkg_cv_MAXMINDDB_PREFIX="$MAXMINDDB_PREFIX"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmaxminddb\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libmaxminddb") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_MAXMINDDB_PREFIX=`$PKG_CONFIG --variable="prefix" "libmaxminddb" 2>/dev/null`
+                     test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+MAXMINDDB_PREFIX=$pkg_cv_MAXMINDDB_PREFIX
+
+if test "x$MAXMINDDB_PREFIX" = x""; then :
+  as_fn_error $? "libmaxminddb prefix not found in pkg-config; set MAXMINDDB_PREFIX in the environment" "$LINENO" 5
+fi
+                                      GEOIP2LINKSRCS='${GEOIP2LINKSRCS}'
+                                      GEOIP2LINKOBJS='${GEOIP2LINKOBJS}'
+
+fi ;; #(
+  yes) :
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libmaxminddb" >&5
+$as_echo_n "checking for libmaxminddb... " >&6; }
+
+if test -n "$MAXMINDDB_CFLAGS"; then
+    pkg_cv_MAXMINDDB_CFLAGS="$MAXMINDDB_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmaxminddb\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libmaxminddb") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_MAXMINDDB_CFLAGS=`$PKG_CONFIG --cflags "libmaxminddb" 2>/dev/null`
+                     test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$MAXMINDDB_LIBS"; then
+    pkg_cv_MAXMINDDB_LIBS="$MAXMINDDB_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmaxminddb\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libmaxminddb") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_MAXMINDDB_LIBS=`$PKG_CONFIG --libs "libmaxminddb" 2>/dev/null`
+                     test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+               MAXMINDDB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmaxminddb" 2>&1`
+        else
+               MAXMINDDB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmaxminddb" 2>&1`
+        fi
+       # Put the nasty error message in config.log where it belongs
+       echo "$MAXMINDDB_PKG_ERRORS" >&5
+
+       as_fn_error $? "Package requirements (libmaxminddb) were not met:
+
+$MAXMINDDB_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables MAXMINDDB_CFLAGS
+and MAXMINDDB_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
+elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+       { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables MAXMINDDB_CFLAGS
+and MAXMINDDB_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
+else
+       MAXMINDDB_CFLAGS=$pkg_cv_MAXMINDDB_CFLAGS
+       MAXMINDDB_LIBS=$pkg_cv_MAXMINDDB_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define HAVE_GEOIP2 1" >>confdefs.h
+
+
+if test -n "$MAXMINDDB_PREFIX"; then
+    pkg_cv_MAXMINDDB_PREFIX="$MAXMINDDB_PREFIX"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmaxminddb\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libmaxminddb") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_MAXMINDDB_PREFIX=`$PKG_CONFIG --variable="prefix" "libmaxminddb" 2>/dev/null`
+                     test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+MAXMINDDB_PREFIX=$pkg_cv_MAXMINDDB_PREFIX
+
+if test "x$MAXMINDDB_PREFIX" = x""; then :
+  as_fn_error $? "libmaxminddb prefix not found in pkg-config; set MAXMINDDB_PREFIX in the environment" "$LINENO" 5
+fi
+                                      GEOIP2LINKSRCS='${GEOIP2LINKSRCS}'
+                                      GEOIP2LINKOBJS='${GEOIP2LINKOBJS}'
+
+fi ;; #(
+  *) :
+     # default
+
+
+  CCASFLAGS_geoip2_ax_save_flags=$CCASFLAGS
+
+
+
+  CFLAGS_geoip2_ax_save_flags=$CFLAGS
+
+
+
+  CPPFLAGS_geoip2_ax_save_flags=$CPPFLAGS
+
+
+
+  CXXFLAGS_geoip2_ax_save_flags=$CXXFLAGS
+
+
+
+  ERLCFLAGS_geoip2_ax_save_flags=$ERLCFLAGS
+
+
+
+  FCFLAGS_geoip2_ax_save_flags=$FCFLAGS
+
+
+
+  FCLIBS_geoip2_ax_save_flags=$FCLIBS
+
+
+
+  FFLAGS_geoip2_ax_save_flags=$FFLAGS
+
+
+
+  FLIBS_geoip2_ax_save_flags=$FLIBS
+
+
+
+  GCJFLAGS_geoip2_ax_save_flags=$GCJFLAGS
+
+
+
+  JAVACFLAGS_geoip2_ax_save_flags=$JAVACFLAGS
+
+
+
+  LDFLAGS_geoip2_ax_save_flags=$LDFLAGS
+
+
+
+  LIBS_geoip2_ax_save_flags=$LIBS
+
+
+
+  OBJCFLAGS_geoip2_ax_save_flags=$OBJCFLAGS
+
+
+
+  OBJCXXFLAGS_geoip2_ax_save_flags=$OBJCXXFLAGS
+
+
+
+  UPCFLAGS_geoip2_ax_save_flags=$UPCFLAGS
+
+
+
+  VALAFLAGS_geoip2_ax_save_flags=$VALAFLAGS
+
+
+
+           MAXMINDDB_CFLAGS="-I$with_geoip2/include"
+           MAXMINDDB_LIBS="-L$with_geoip2/libs"
+           CFLAGS="$CFLAGS $MAXMINDDB_CFLAGS"
+           LDFLAGS="$LDFLAGS $MAXMINDDB_LIBS"
+           { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing MMDB_open" >&5
+$as_echo_n "checking for library containing MMDB_open... " >&6; }
+if ${ac_cv_search_MMDB_open+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char MMDB_open ();
+int
+main ()
+{
+return MMDB_open ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' maxminddb; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_MMDB_open=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_MMDB_open+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_MMDB_open+:} false; then :
+
+else
+  ac_cv_search_MMDB_open=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_MMDB_open" >&5
+$as_echo "$ac_cv_search_MMDB_open" >&6; }
+ac_res=$ac_cv_search_MMDB_open
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+$as_echo "#define HAVE_GEOIP2 1" >>confdefs.h
+
+                           GEOIP2LINKSRCS='${GEOIP2LINKSRCS}'
+                           GEOIP2LINKOBJS='${GEOIP2LINKOBJS}'
+                           MAXMINDDB_LIBS="$MAXMINDDB_LIBS $ac_cv_search_mmdb_open"
+                           { $as_echo "$as_me:${as_lineno-$LINENO}: GeoIP2 default database path set to $with_geoip2/share/GeoIP" >&5
+$as_echo "$as_me: GeoIP2 default database path set to $with_geoip2/share/GeoIP" >&6;}
+                           eval MAXMINDDB_PREFIX=\$$with_geoip2
+
+else
+  as_fn_error $? "GeoIP2 requested, but libmaxminddb not found" "$LINENO" 5
+fi
+
+        ;;
+esac
+
+
+
+
+
+
+GEOIPLINKSRCS=
+GEOIPLINKOBJS=
 if test "yes" = "$use_geoip"
 then
        for d in /usr /usr/local /opt/local
@@ -14444,10 +14859,6 @@ fi
 
 case "$use_geoip" in
        no|'')
-               { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GeoIP support" >&5
-$as_echo_n "checking for GeoIP support... " >&6; }
-               { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
-$as_echo "disabled" >&6; }
                ;;
        *)
                if test -d "$use_geoip" -o -L "$use_geoip"
@@ -25319,7 +25730,8 @@ report() {
     test "large" = "$use_tuning" && echo "    Large-system tuning (--with-tuning)"
     test "no" = "$use_dnstap" || \
            echo "    Allow 'dnstap' packet logging (--enable-dnstap)"
-    test "no" = "$use_geoip" || echo "    GeoIP access control (--with-geoip)"
+    test -z "$MAXMINDDB_LIBS" || echo "    GeoIP2 access control (--with-geoip2)"
+    test "no" = "$use_geoip" || echo "    Legacy GeoIP access control (--with-geoip)"
     test "no" = "$use_gssapi" || echo "    GSS-API (--with-gssapi)"
     if test "yes" = "$enable_full_report" -o "aes" != "$with_cc_alg"; then
        echo "        Algorithm: $with_cc_alg"
@@ -25383,7 +25795,7 @@ report() {
 
     test "no" = "$use_dnstap" && \
            echo "    Allow 'dnstap' packet logging (--enable-dnstap)"
-    test "no" = "$use_geoip" && echo "    GeoIP access control (--with-geoip)"
+    test -z "$MAXMINDDB_LIBS" && echo "    GeoIP2 access control (--with-geoip2)"
     test "no" = "$use_gssapi" && echo "    GSS-API (--with-gssapi)"
 
     test "no" = "$enable_dnsrps" && \

diff --git a/configure.ac b/configure.ac
index 3058a33eb9419bb15873f2094a34c7b78aa2ecca..c268b02a589ae7f052d6aac5eaab8a11a5fe34fe 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -510,13 +510,69 @@ AC_C_BIGENDIAN
 #
 # GeoIP support?
 #
-GEOIPLINKSRCS=
-GEOIPLINKOBJS=
+geoip2_default="auto"
 AC_ARG_WITH(geoip,
            AS_HELP_STRING([--with-geoip=PATH],
-                          [Build with GeoIP support (yes|no|path)]),
-    use_geoip="$withval", use_geoip="no")
+                          [Build with legacy GeoIP support (yes|no|path)]),
+                           [
+                            use_geoip="$withval"
+                            geoip2_default="no"
+                           ],
+                           [use_geoip="no"])
+AC_ARG_WITH([geoip2],
+           [AS_HELP_STRING([--with-geoip2=PATH],
+                           [Build with MaxMind GeoIP2 support (auto|yes|no|path) [default=$geoip2_default]])],
+           [], with_geoip2="$geoip2_default")
+
+# --with-geoip2 should be turned on by default if the library exists.
+#
+# --with-geoip is not on by default, but can be turned on if the library
+# exists. if it is turned on, --with-geoip2 is suppressed.
+#
+# specifying both --with-geoip and --with-geoip2 is an error.
+AS_IF([test "no" != "$with_geoip2" && test "no" != "$use_geoip"],
+      [AC_MSG_ERROR([--with-geoip and --with-geoip2 are incompatible])])
+
+GEOIP2LINKSRCS=
+GEOIP2LINKOBJS=
+AS_CASE([$with_geoip2],
+       [no],[],
+       [auto],[PKG_CHECK_MODULES([MAXMINDDB], [libmaxminddb],
+                                     [AC_DEFINE([HAVE_GEOIP2], [1], [Build with GeoIP2 support])
+                                      PKG_CHECK_VAR([MAXMINDDB_PREFIX], [libmaxminddb], [prefix], [], [AC_MSG_ERROR([libmaxminddb prefix not found in pkg-config; set MAXMINDDB_PREFIX in the environment])])
+                                      GEOIP2LINKSRCS='${GEOIP2LINKSRCS}'
+                                      GEOIP2LINKOBJS='${GEOIP2LINKOBJS}'
+                                     ],[:])],
+       [yes],[PKG_CHECK_MODULES([MAXMINDDB], [libmaxminddb],
+                                     [AC_DEFINE([HAVE_GEOIP2], [1], [Build with GeoIP2 support])
+                                      PKG_CHECK_VAR([MAXMINDDB_PREFIX], [libmaxminddb], [prefix], [], [AC_MSG_ERROR([libmaxminddb prefix not found in pkg-config; set MAXMINDDB_PREFIX in the environment])])
+                                      GEOIP2LINKSRCS='${GEOIP2LINKSRCS}'
+                                      GEOIP2LINKOBJS='${GEOIP2LINKOBJS}'
+                                     ])],
+       [ # default
+           AX_SAVE_FLAGS([geoip2])
+           MAXMINDDB_CFLAGS="-I$with_geoip2/include"
+           MAXMINDDB_LIBS="-L$with_geoip2/libs"
+           CFLAGS="$CFLAGS $MAXMINDDB_CFLAGS"
+           LDFLAGS="$LDFLAGS $MAXMINDDB_LIBS"
+           AC_SEARCH_LIBS([MMDB_open], [maxminddb],
+                          [AC_DEFINE([HAVE_GEOIP2], [1], [Build with GeoIP2 support])
+                           GEOIP2LINKSRCS='${GEOIP2LINKSRCS}'
+                           GEOIP2LINKOBJS='${GEOIP2LINKOBJS}'
+                           MAXMINDDB_LIBS="$MAXMINDDB_LIBS $ac_cv_search_mmdb_open"
+                           AC_MSG_NOTICE([GeoIP2 default database path set to $with_geoip2/share/GeoIP])
+                           AS_VAR_COPY([MAXMINDDB_PREFIX], [$with_geoip2])
+                          ],
+                          [AC_MSG_ERROR([GeoIP2 requested, but libmaxminddb not found])])
+       ])
+AC_ARG_VAR([MAXMINDDB_PREFIX], [value of prefix for MAXMINDDB, overriding pkg-config])
+AC_SUBST([MAXMINDDB_CFLAGS])
+AC_SUBST([MAXMINDDB_LIBS])
+AC_SUBST([GEOIP2LINKSRCS])
+AC_SUBST([GEOIP2LINKOBJS])
 
+GEOIPLINKSRCS=
+GEOIPLINKOBJS=
 if test "yes" = "$use_geoip"
 then
        for d in /usr /usr/local /opt/local
@@ -531,8 +587,6 @@ fi
 
 case "$use_geoip" in
        no|'')
-               AC_MSG_CHECKING([for GeoIP support])
-               AC_MSG_RESULT([disabled])
                ;;
        *)
                if test -d "$use_geoip" -o -L "$use_geoip"
@@ -2955,7 +3009,8 @@ report() {
     test "large" = "$use_tuning" && echo "    Large-system tuning (--with-tuning)"
     test "no" = "$use_dnstap" || \
            echo "    Allow 'dnstap' packet logging (--enable-dnstap)"
-    test "no" = "$use_geoip" || echo "    GeoIP access control (--with-geoip)"
+    test -z "$MAXMINDDB_LIBS" || echo "    GeoIP2 access control (--with-geoip2)"
+    test "no" = "$use_geoip" || echo "    Legacy GeoIP access control (--with-geoip)"
     test "no" = "$use_gssapi" || echo "    GSS-API (--with-gssapi)"
     if test "yes" = "$enable_full_report" -o "aes" != "$with_cc_alg"; then
        echo "        Algorithm: $with_cc_alg"
@@ -3019,7 +3074,7 @@ report() {
 
     test "no" = "$use_dnstap" && \
            echo "    Allow 'dnstap' packet logging (--enable-dnstap)"
-    test "no" = "$use_geoip" && echo "    GeoIP access control (--with-geoip)"
+    test -z "$MAXMINDDB_LIBS" && echo "    GeoIP2 access control (--with-geoip2)"
     test "no" = "$use_gssapi" && echo "    GSS-API (--with-gssapi)"
 
     test "no" = "$enable_dnsrps" && \

diff --git a/fuzz/Makefile.in b/fuzz/Makefile.in
index 5b346a4c4cfc3d1ef94c4d900fa821bd82a77472..5ea1cd5a7683da5b87da06c8ee412f23046daee2 100644 (file)
--- a/fuzz/Makefile.in
+++ b/fuzz/Makefile.in
@@ -11,7 +11,7 @@ CDEFINES =    -DFUZZDIR=\"$(abs_srcdir)\"
 
 ISCLIBS =      ../lib/isc/libisc.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS}
 ISCDEPLIBS =   ../lib/isc/libisc.@A@
-DNSLIBS =      ../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
+DNSLIBS =      ../lib/dns/libdns.@A@ ${MAXMINDDB_LIBS} @DNS_CRYPTO_LIBS@
 DNSDEPLIBS =   ../lib/dns/libdns.@A@
 
 LIBS =         @LIBS@

diff --git a/lib/bind9/Makefile.in b/lib/bind9/Makefile.in
index ab5394517449f2f6f2d7023a8478da062f6bd886..b8a6cf91d0fcd6b5f29c93fa864c1b7b29c8812a 100644 (file)
--- a/lib/bind9/Makefile.in
+++ b/lib/bind9/Makefile.in
@@ -26,7 +26,7 @@ CWARNINGS =
 
 ISCLIBS =      ../../lib/isc/libisc.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS}
 ISCCFGLIBS =    ../../lib/isccfg/libisccfg.@A@
-DNSLIBS =      ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
+DNSLIBS =      ../../lib/dns/libdns.@A@ ${MAXMINDDB_LIBS} @DNS_CRYPTO_LIBS@
 NSLIBS =       ../../lib/ns/libns.@A@
 
 ISCDEPLIBS =   ../../lib/isc/libisc.@A@

diff --git a/lib/dns/Makefile.in b/lib/dns/Makefile.in
index 2e64e7ee02085110f0626110126b0bddfb865e8c..9afdc10dc6e7d0a9cba999294eb2fe90d905823c 100644 (file)
--- a/lib/dns/Makefile.in
+++ b/lib/dns/Makefile.in
@@ -30,7 +30,8 @@ CINCLUDES =   -I. -I${top_srcdir}/lib/dns -Iinclude ${DNS_INCLUDES} \
                ${ISC_INCLUDES} \
                ${OPENSSL_CFLAGS} @DST_GSSAPI_INC@ \
                ${JSON_C_CFLAGS} \
-               ${LIBXML2_CFLAGS}
+               ${LIBXML2_CFLAGS} \
+               ${MAXMINDDB_CFLAGS}
 
 CDEFINES =     @USE_GSSAPI@ ${USE_ISC_SPNEGO}
 
@@ -40,7 +41,7 @@ ISCLIBS =     ../../lib/isc/libisc.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS
 
 ISCDEPLIBS =   ../../lib/isc/libisc.@A@
 
-LIBS =         @LIBS@
+LIBS =         ${MAXMINDDB_LIBS} @LIBS@
 
 # Alphabetically
 
@@ -54,6 +55,7 @@ DSTOBJS =     @DST_EXTRA_OBJS@ \
                key.@O@
 
 GEOIPLINKOBJS = geoip.@O@
+GEOIP2LINKOBJS = geoip2.@O@
 
 DNSTAPOBJS = dnstap.@O@ dnstap.pb-c.@O@
 
@@ -80,7 +82,7 @@ DNSOBJS =     acl.@O@ adb.@O@ badcache.@O@ byaddr.@O@ \
 PORTDNSOBJS =  client.@O@ ecdb.@O@
 
 OBJS=          @DNSTAPOBJS@ ${DNSOBJS} ${OTHEROBJS} ${DSTOBJS} \
-               ${PORTDNSOBJS} @GEOIPLINKOBJS@
+               ${PORTDNSOBJS} @GEOIPLINKOBJS@ @GEOIP2LINKOBJS@
 
 DSTSRCS =      @DST_EXTRA_SRCS@ @PKCS11LINKSRCS@ \
                dst_api.c dst_parse.c \
@@ -92,6 +94,7 @@ DSTSRCS =     @DST_EXTRA_SRCS@ @PKCS11LINKSRCS@ \
                key.c
 
 GEOIPLINKSRCS = geoip.c
+GEOIPL2INKSRCS = geoip2.c
 
 DNSTAPSRCS = dnstap.c dnstap.pb-c.c
 
@@ -114,7 +117,8 @@ DNSSRCS =   acl.c adb.c badcache. byaddr.c \
                zonekey.c zt.c ${OTHERSRCS}
 PORTDNSSRCS =  client.c ecdb.c
 
-SRCS = ${DSTSRCS} ${DNSSRCS} ${PORTDNSSRCS} @DNSTAPSRCS@ @GEOIPLINKSRCS@
+SRCS = ${DSTSRCS} ${DNSSRCS} \
+       ${PORTDNSSRCS} @DNSTAPSRCS@ @GEOIPLINKSRCS@ @GEOIP2LINKSRCS@
 
 SUBDIRS =      include
 TARGETS =      timestamp

diff --git a/lib/dns/geoip2.c b/lib/dns/geoip2.c
new file mode 100644 (file)
index 0000000..029d855
--- /dev/null
+++ b/lib/dns/geoip2.c
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * See the COPYRIGHT file distributed with this work for additional
+ * information regarding copyright ownership.
+ */
+
+/*! \file */
+
+#include <dns/geoip.h>
+
+#include <isc/util.h>
+
+bool
+dns_geoip_match(const isc_netaddr_t *reqaddr,
+               const dns_geoip_databases_t *geoip,
+               const dns_geoip_elem_t *elt)
+{
+       UNUSED(reqaddr);
+       UNUSED(geoip);
+       UNUSED(elt);
+
+       return (false);
+}
+
+void
+dns_geoip_shutdown(void) {
+       return;
+}

diff --git a/lib/dns/tests/Makefile.in b/lib/dns/tests/Makefile.in
index ed1dde5fdf9f9735ae41553b966940e2e8adde6f..a7151afc100bbd95dafdde797b2ac98661d48342 100644 (file)
--- a/lib/dns/tests/Makefile.in
+++ b/lib/dns/tests/Makefile.in
@@ -21,7 +21,7 @@ CDEFINES =    -DTESTS="\"${top_builddir}/lib/dns/tests/\""
 
 ISCLIBS =      ../../isc/libisc.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS}
 ISCDEPLIBS =   ../../isc/libisc.@A@
-DNSLIBS =      ../libdns.@A@ @DNS_CRYPTO_LIBS@
+DNSLIBS =      ../libdns.@A@ ${MAXMINDDB_LIBS} @DNS_CRYPTO_LIBS@
 DNSDEPLIBS =   ../libdns.@A@
 
 LIBS =         @LIBS@ @CMOCKA_LIBS@

diff --git a/lib/irs/tests/Makefile.in b/lib/irs/tests/Makefile.in
index 1ae108db23f889492988521e3b57c01d91c991ad..0d5a142360db120130f194d5040de319c0ec6db1 100644 (file)
--- a/lib/irs/tests/Makefile.in
+++ b/lib/irs/tests/Makefile.in
@@ -20,7 +20,7 @@ CDEFINES =    -DTESTS="\"${top_builddir}/lib/irs/tests/\""
 
 CFGLIBS =      ../../isccfg/libisccfg.@A@
 CFGDEPLIBS =   ../../isccfg/libisccfg.@A@
-DNSLIBS =      ../../dns/libdns.@A@ @DNS_CRYPTO_LIBS@
+DNSLIBS =      ../../dns/libdns.@A@ ${MAXMINDDB_LIBS} @DNS_CRYPTO_LIBS@
 DNSDEPLIBS =   ../../dns/libdns.@A@
 ISCLIBS =      ../../isc/libisc.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS}
 ISCDEPLIBS =   ../../isc/libisc.@A@

diff --git a/lib/isccfg/Makefile.in b/lib/isccfg/Makefile.in
index 8ce9da11512c98c95cb97a090764aeb21f8a7525..a04e88bcaa57c75732297a92a934ed2b88573ede 100644 (file)
--- a/lib/isccfg/Makefile.in
+++ b/lib/isccfg/Makefile.in
@@ -23,7 +23,7 @@ CDEFINES =
 CWARNINGS =
 
 ISCLIBS =      ../../lib/isc/libisc.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS}
-DNSLIBS =      ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
+DNSLIBS =      ../../lib/dns/libdns.@A@ ${MAXMINDDB_LIBS} @DNS_CRYPTO_LIBS@
 ISCCFGLIBS =   ../../lib/cfg/libisccfg.@A@
 
 ISCDEPLIBS =   ../../lib/isc/libisc.@A@

diff --git a/lib/isccfg/tests/Makefile.in b/lib/isccfg/tests/Makefile.in
index eb3b246363d0a2f39c539f24292f2c42ecacdcc8..9e659620982ce2911ac8a6947258518d12dbf756 100644 (file)
--- a/lib/isccfg/tests/Makefile.in
+++ b/lib/isccfg/tests/Makefile.in
@@ -22,7 +22,7 @@ CDEFINES =    -DTESTS="\"${top_builddir}/lib/dns/tests/\""
 
 ISCLIBS =      ../../isc/libisc.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS}
 ISCDEPLIBS =   ../../isc/libisc.@A@
-DNSLIBS =      ../../dns/libdns.@A@ @DNS_CRYPTO_LIBS@
+DNSLIBS =      ../../dns/libdns.@A@ ${MAXMINDDB_LIBS} @DNS_CRYPTO_LIBS@
 DNSDEPLIBS =   ../../dns/libdns.@A@
 ISCCFGLIBS =   ../libisccfg.@A@
 ISCCFGDEPLIBS = ../libisccfg.@A@

diff --git a/lib/ns/Makefile.in b/lib/ns/Makefile.in
index fe75baeb1e916fbba1fd5d1619a7a543b733beab..679e0ba0e94a717a7b0671b9ae98150d729a3685 100644 (file)
--- a/lib/ns/Makefile.in
+++ b/lib/ns/Makefile.in
@@ -36,7 +36,7 @@ ISCLIBS =     ../../lib/isc/libisc.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS
 
 ISCDEPLIBS =   ../../lib/isc/libisc.@A@
 
-DNSLIBS =      ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
+DNSLIBS =      ../../lib/dns/libdns.@A@ ${MAXMINDDB_LIBS} @DNS_CRYPTO_LIBS@
 
 DNSDEPLIBS =   ../../lib/dns/libdns.@A@
 

diff --git a/lib/ns/tests/Makefile.in b/lib/ns/tests/Makefile.in
index 9f2cc6bd3b035841c95ff29a08deae5973dd0af9..8b952a6375ca4a94b2fb3550c7c8a42b41c2f48d 100644 (file)
--- a/lib/ns/tests/Makefile.in
+++ b/lib/ns/tests/Makefile.in
@@ -22,7 +22,7 @@ CDEFINES =    -DTESTS="\"${top_builddir}/lib/ns/tests/\"" -DNAMED_PLUGINDIR=\"${plu
 
 ISCLIBS =      ../../isc/libisc.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS}
 ISCDEPLIBS =   ../../isc/libisc.@A@
-DNSLIBS =      ../../dns/libdns.@A@ @DNS_CRYPTO_LIBS@
+DNSLIBS =      ../../dns/libdns.@A@ ${MAXMINDDB_LIBS} @DNS_CRYPTO_LIBS@
 DNSDEPLIBS =   ../../dns/libdns.@A@
 NSLIBS =       ../libns.@A@
 NSDEPLIBS =    ../libns.@A@

diff --git a/lib/samples/Makefile.in b/lib/samples/Makefile.in
index 78522f27cf4c5be7d06a7a2b9c2dfd5deb1ed2a3..4fb2fe81613b577e695f712bce50044cf1efa965 100644 (file)
--- a/lib/samples/Makefile.in
+++ b/lib/samples/Makefile.in
@@ -26,7 +26,7 @@ CDEFINES =    -DVERSION=\"${VERSION}\" \
 CWARNINGS =
 
 ISCLIBS =      ../isc/libisc.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS}
-DNSLIBS =      ../dns/libdns.@A@ @DNS_CRYPTO_LIBS@
+DNSLIBS =      ../dns/libdns.@A@ ${MAXMINDDB_LIBS} @DNS_CRYPTO_LIBS@
 ISCCFGLIBS =   ../isccfg/libisccfg.@A@
 IRSLIBS =      ../irs/libirs.@A@
 

diff --git a/make/rules.in b/make/rules.in
index 542db6a5cf04cef7d921785c82adfcbecaf9587e..dce80da8315286cd2c4933648331519fee2a1214 100644 (file)
--- a/make/rules.in
+++ b/make/rules.in
@@ -129,6 +129,9 @@ JSON_C_LIBS = @JSON_C_LIBS@
 LIBXML2_CFLAGS = @LIBXML2_CFLAGS@
 LIBXML2_LIBS = @LIBXML2_LIBS@
 
+MAXMINDDB_CFLAGS = @MAXMINDDB_CFLAGS@
+MAXMINDDB_LIBS = @MAXMINDDB_LIBS@
+
 .SUFFIXES:
 .SUFFIXES: .c .@O@
 

diff --git a/util/copyrights b/util/copyrights
index efab14d0a699e3ce50d8110e70f0cc34c18cdd99..7962a5139cd521134f8a3e04350b00897cd7111e 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -1648,6 +1648,7 @@
 ./lib/dns/gen-win32.h                          C       1999,2000,2001,2004,2005,2006,2007,2009,2014,2016,2018,2019
 ./lib/dns/gen.c                                        C       1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2012,2013,2014,2015,2016,2017,2018,2019
 ./lib/dns/geoip.c                              C       2013,2014,2015,2016,2018,2019
+./lib/dns/geoip2.c                             C       2019
 ./lib/dns/gssapi_link.c                                C       2000,2001,2002,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2015,2016,2018,2019
 ./lib/dns/gssapictx.c                          C       2000,2001,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019
 ./lib/dns/hmac_link.c                          C.NAI   1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019