INN commit: trunk (4 files)

[INN Commit]

    Date: Wednesday, September 17, 2014 @ 13:55:11
  Author: iulius
Revision: 9694

Enable IPv6 unconditionally, if available

Modified:
  trunk/configure.ac
  trunk/doc/IPv6-info
  trunk/doc/pod/install.pod
  trunk/doc/pod/news.pod

---------------------+
 configure.ac        |   16 +++++++---------
 doc/IPv6-info       |    3 +++
 doc/pod/install.pod |    8 --------
 doc/pod/news.pod    |    5 +++++
 4 files changed, 15 insertions(+), 17 deletions(-)

Modified: configure.ac
===================================================================
--- configure.ac	2014-09-17 20:13:06 UTC (rev 9693)
+++ configure.ac	2014-09-17 20:55:11 UTC (rev 9694)
@@ -122,15 +122,6 @@
     [AC_DEFINE_UNQUOTED([INND_PORT], [$with_innd_port],
         [Additional permitted low-numbered port for innbind.])])
 
-dnl Whether IPv6 support should be enabled (disabled by default).  Eventually
-dnl this will be automatically detected and always turned on, but it's not
-dnl quite mature enough yet.
-AC_ARG_ENABLE([ipv6],
-    [AS_HELP_STRING([--enable-ipv6], [Enable IPv6 support])],
-    [if test "x$enableval" = xyes ; then
-        AC_DEFINE([HAVE_INET6], [1], [Define to enable IPv6 support.])
-    fi])
-
 dnl Whether to use a different (less tested) history algorithm.  This will
 dnl eventually be a runtime option rather than a compile-time option as soon
 dnl as the #ifdefs can be untangled and put into the history API.  The output
@@ -454,6 +445,13 @@
      #include <sys/ipc.h>
      #include <sys/sem.h>])
 
+dnl Enable IPv6 unconditionally if available.
+AC_CHECK_TYPES([struct sockaddr_in6],
+    [AC_DEFINE([HAVE_INET6], [1],
+        [Define to 1 if IPv6 library interfaces are available.])], [],
+    [#include <sys/types.h>
+     #include <netinet/in.h>])
+
 dnl See if struct sockaddr_storage is available, and if so, how its members
 dnl are named.
 AC_CHECK_TYPES([struct sockaddr_storage],

Modified: doc/IPv6-info
===================================================================
--- doc/IPv6-info	2014-09-17 20:13:06 UTC (rev 9693)
+++ doc/IPv6-info	2014-09-17 20:55:11 UTC (rev 9694)
@@ -2,6 +2,9 @@
 
    This is $Revision$, dated $Date$.
 
+   Note that starting from INN 2.6.0, IPv6 is unconditionally enabled, when
+   available.  The --enable-ipv6 configure flag no longer exists.
+
    This document contains some notes about the status of IPv6 support in
    INN (see also the parts of the code marked FIXME):
 

Modified: doc/pod/install.pod
===================================================================
--- doc/pod/install.pod	2014-09-17 20:13:06 UTC (rev 9693)
+++ doc/pod/install.pod	2014-09-17 20:55:11 UTC (rev 9694)
@@ -441,14 +441,6 @@
 INN will be built with TLS/SSL support unless the B<--without-openssl>
 flag is explicitly passed to configure.
 
-=item B<--enable-ipv6>
-
-Enables support for IPv6 in B<innd>, B<innfeed>, B<nnrpd>, and several of the
-supporting programs.  This option should be considered developmental at
-present.  For more information see F<doc/IPv6-info> (and if you have any
-particularly good or bad news to report, please let us know at
-<inn-workers at lists.isc.org>).
-
 =back
 
 For the most common installation, a standalone news server, a suggested

Modified: doc/pod/news.pod
===================================================================
--- doc/pod/news.pod	2014-09-17 20:13:06 UTC (rev 9693)
+++ doc/pod/news.pod	2014-09-17 20:55:11 UTC (rev 9694)
@@ -28,6 +28,11 @@
 
 =item *
 
+The B<--enable-ipv6> configure flag no longer exists.  IPv6 is now
+unconditionally enabled, if available.
+
+=item *
+
 $HOME is no longer exported as an environment variable by B<innshellvars>,
 B<innshellvars.tcl> and the Perl module C<INN::Config>.  It was previously
 overriding the default user home directory with I<pathnews>.  If you use