CHANGES, release note, README

diff --git a/CHANGES b/CHANGES
index 8a1c31f0651072e02b4859c35fdc01d82b96bc8e..34a487bb88115b1674f9f2543e250ba9276fded4 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,15 @@
+5258.  [func]          Added support for the GeoIP2 API from MaxMind. This
+                       will be compiled in by default if the "libmaxminddb"
+                       library is found at compile time, but can be
+                       suppressed using "configure --without-geoip2".
+                       The legacy GeoIP API can be enabled by using
+                       "configure --with-geoip". This cannot be used
+                       together with GeoIP2.
+
+                       Certain geoip ACL settings that were available with
+                       legacy GeoIP are not available when using GeoIP2.
+                       [GL #182]
+
 5257.  [bug]           Some statistics data was not being displayed.
                        Add shading to the zone tables. [GL #1030]
 

diff --git a/README b/README
index a964b5afb816548708f3000f7f92842958ce8df6..a5655f0dad0f611b54422071b248980b24d591c3 100644 (file)
--- a/README
+++ b/README
@@ -105,7 +105,10 @@ format-patch.
 BIND 9.15 features
 
 BIND 9.15 is the newest development branch of BIND 9. It includes a number
-of changes from BIND 9.14 and earlier releases.
+of changes from BIND 9.14 and earlier releases. New features include:
+
+  * Support for the new GeoIP2 geolocation API
+  * Improved DNSSEC key configuration using dnssec-keys
 
 Building BIND
 
@@ -136,7 +139,7 @@ make depend. If you're using Emacs, you might find make tags helpful.
 Several environment variables that can be set before running configure
 will affect compilation:
 
-   Variable                            Description
+Variable       Description
 CC             The C compiler to use. configure tries to figure out the
                right one for supported systems.
                C compiler flags. Defaults to include -g and/or -O2 as
@@ -243,11 +246,8 @@ default, installation is into /usr/local, but this can be changed with the
 
 You may specify the option --sysconfdir to set the directory where
 configuration files like named.conf go by default, and --localstatedir to
-set the default parent directory of run/named.pid. For backwards
-compatibility with BIND 8, --sysconfdir defaults to /etc and
---localstatedir defaults to /var if no --prefix option is given. If there
-is a --prefix option, sysconfdir defaults to $prefix/etc and localstatedir
-defaults to $prefix/var.
+set the default parent directory of run/named.pid. --sysconfdir defaults
+to $prefix/etc and --localstatedir defaults to $prefix/var.
 
 Automated testing
 
@@ -290,7 +290,7 @@ development BIND 9 is included in the file CHANGES, with the most recent
 changes listed first. Change notes include tags indicating the category of
 the change that was made; these categories are:
 
-   Category                            Description
+Category       Description
 [func]         New feature
 [bug]          General bug fix
 [security]     Fix for a significant security flaw
@@ -341,23 +341,21 @@ Acknowledgments
   * The original development of BIND 9 was underwritten by the following
     organizations:
 
-      Sun Microsystems, Inc.
-      Hewlett Packard
-      Compaq Computer Corporation
-      IBM
-      Process Software Corporation
-      Silicon Graphics, Inc.
-      Network Associates, Inc.
-      U.S. Defense Information Systems Agency
-      USENIX Association
-      Stichting NLnet - NLnet Foundation
-      Nominum, Inc.
+    Sun Microsystems, Inc.
+    Hewlett Packard
+    Compaq Computer Corporation
+    IBM
+    Process Software Corporation
+    Silicon Graphics, Inc.
+    Network Associates, Inc.
+    U.S. Defense Information Systems Agency
+    USENIX Association
+    Stichting NLnet - NLnet Foundation
+    Nominum, Inc.
 
   * This product includes software developed by the OpenSSL Project for
     use in the OpenSSL Toolkit. http://www.OpenSSL.org/
-
   * This product includes cryptographic software written by Eric Young
     (eay@cryptsoft.com)
-
   * This product includes software written by Tim Hudson
     (tjh@cryptsoft.com)

diff --git a/README.md b/README.md
index 4241e3fcb1c40bd261f65eeb360d12f6fcfad262..198303d0cb794fe737a9bb1336dfc0adedfc28b2 100644 (file)
--- a/README.md
+++ b/README.md
@@ -120,7 +120,11 @@ including your patch as an attachment, preferably generated by
 ### <a name="features"/> BIND 9.15 features
 
 BIND 9.15 is the newest development branch of BIND 9. It includes a
-number of changes from BIND 9.14 and earlier releases.
+number of changes from BIND 9.14 and earlier releases. New features
+include:
+
+* Support for the new GeoIP2 geolocation API
+* Improved DNSSEC key configuration using `dnssec-keys`
 
 ### <a name="build"/> Building BIND
 

diff --git a/doc/arm/notes.xml b/doc/arm/notes.xml
index b5db249e82fad6597fa4bd37c5d4713c3caf1df1..6f0deec264d3108788ca4017fad49d324c995a34 100644 (file)
--- a/doc/arm/notes.xml
+++ b/doc/arm/notes.xml
@@ -113,6 +113,37 @@
 
   <section xml:id="relnotes_features"><info><title>New Features</title></info>
     <itemizedlist>
+      <listitem>
+       <para>
+         The GeoIP2 API from MaxMind is now supported. Geolocation support
+         will be compiled in by default if the <command>libmaxminddb</command>
+         library is found at compile time, but can be turned off by using
+         <command>configure --without-geoip2</command>, or by using
+         <command>configure --with-geoip</command>, which will cause
+         the legacy GeoIP API to be used instead.  (Note that the
+         databases for the legacy API are no longer maintained by
+         MaxMind.)
+       </para>
+       <para>
+         The default path to the GeoIP2 databases will be set based
+         on the location of the <command>libmaxminddb</command> library;
+         for example, if it is in <filename>/usr/local/lib</filename>,
+         then the default path will be
+         <filename>/usr/local/share/GeoIP</filename>.
+         This value can be overridden in <filename>named.conf</filename>
+         using the <command>geoip-directory</command> option.
+       </para>
+       <para>
+         Some <command>geoip</command> ACL settings that were available with
+         legacy GeoIP, including searches for <command>netspeed</command>,
+         <command>org</command>, and three-letter ISO country codes, will
+         no longer work when using GeoIP2. Supported GeoIP2 database
+         types are <command>country</command>, <command>city</command>,
+         <command>domain</command>, <command>isp</command>, and
+         <command>as</command>. All of these databases support both IPv4
+         and IPv6 lookups. [GL #182]
+       </para>
+      </listitem>
       <listitem>
        <para>
          In order to clarify the configuration of DNSSEC keys,