53 files changed, 2416 insertions, 980 deletions

diff --git a/am/ipv6.m4 b/am/ipv6.m4
new file mode 100644
index 000000000..2357314b9
--- /dev/null
+++ b/am/ipv6.m4
@@ -0,0 +1,56 @@
+dnl This file is part of GNU Mailutils.  -*- autoconf -*-
+dnl Copyright (C) 2011 Free Software Foundation, Inc.
+dnl
+dnl GNU Mailutils is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 3 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl GNU Mailutils is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>.
+
+AC_DEFUN([MU_ENABLE_IPV6],
+   [AC_ARG_ENABLE(ipv6,                     
+     [AC_HELP_STRING([--enable-ipv6], [enable IPv6 support])],
+     [status_ipv6=$enableval],
+     [status_ipv6=maybe])
+     
+    if test $status_ipv6 != no; then
+      working_ipv6=no
+      AC_EGREP_CPP(MAILUTILS_AF_INET6_DEFINED,[
+#include <sys/socket.h>
+#if defined(AF_INET6)
+MAILUTILS_AF_INET6_DEFINED
+#endif
+],[working_ipv6=yes])
+
+      AC_CHECK_TYPE([struct sockaddr_storage],
+                    [working_ipv6=yes], [working_ipv6=no],
+                    [#include <sys/socket.h>])
+      AC_CHECK_TYPE([struct sockaddr_in6],
+                    [working_ipv6=yes], [working_ipv6=no],
+                    [#include <sys/types.h>
+                     #include <netinet/in.h>])
+      AC_CHECK_TYPE([struct addrinfo],
+                    [working_ipv6=yes], [working_ipv6=no],
+                    [#include <netdb.h>])
+      AC_CHECK_FUNC([getnameinfo],
+                    [working_ipv6=yes], [working_ipv6=no],
+                    [#include <netdb.h>])
+
+      if test $working_ipv6 = no; then
+        if test $status_ipv6 = yes; then
+          AC_MSG_ERROR([IPv6 support is required but not available])
+        fi
+      fi
+      status_ipv6=$working_ipv6
+      if test $status_ipv6 = yes; then
+        AC_DEFINE_UNQUOTED([MAILUTILS_IPV6],1,
+                           [Define to 1 if IPv6 support is enabled])
+      fi
+    fi])
\ No newline at end of file
diff --git a/configure.ac b/configure.ac
index e03a4c3b3..2edb49459 100644
--- a/configure.ac
+++ b/configure.ac
@@ -541,6 +541,10 @@ AH_BOTTOM([
 ])
 
 
+# IPv6 support
+MU_ENABLE_IPV6
+
+
 ## FriBidi support
 
 AC_CHECK_FUNCS(wcwidth)
@@ -1285,6 +1289,8 @@ LDAP support .................. $status_ldap
 Radius support ................ $status_radius
 Support for virtual domains ... $status_virtual_domains
 
+IPv6 support .................. $status_ipv6
+
 Interfaces:
 
 Guile ......................... $status_guile
@@ -1332,6 +1338,7 @@ status_mh=$mu_cv_enable_mh
 status_maildir=$mu_cv_enable_maildir
 status_smtp=$mu_cv_enable_smtp
 status_sendmail=$mu_cv_enable_sendmail
+status_ipv6=$status_ipv6
 ])
 
 dnl Output Makefiles
@@ -1382,6 +1389,8 @@ AC_CONFIG_FILES([
  libmailutils/auth/Makefile
  libmailutils/base/Makefile
  libmailutils/address/Makefile
+ libmailutils/sockaddr/Makefile
+ libmailutils/cidr/Makefile
  libmailutils/cfg/Makefile
  libmailutils/diag/Makefile
  libmailutils/filter/Makefile
diff --git a/examples/.gitignore b/examples/.gitignore
index af4156be3..890812aae 100644
--- a/examples/.gitignore
+++ b/examples/.gitignore
@@ -11,6 +11,7 @@ iconv
 listop
 lsf
 mailcap
+mblconv
 mimetest
 msg-send
 mta
@@ -20,5 +21,6 @@ muemail
 murun
 musocio
 nntpclient
+sa
 sfrom
 url-parse
diff --git a/examples/Makefile.am b/examples/Makefile.am
index e22a8d355..9df91ea62 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -43,6 +43,7 @@ noinst_PROGRAMS = \
  murun\
  musocio\
  $(NNTPCLIENT)\
+ sa\
  sfrom
 
 EXTRA_PROGRAMS = nntpclient
diff --git a/examples/aclck.c b/examples/aclck.c
index 57f5c0388..033c444b1 100644
--- a/examples/aclck.c
+++ b/examples/aclck.c
@@ -28,35 +28,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-struct sockaddr *target_sa;
-int target_salen;
+struct mu_sockaddr *target_sa;
 mu_acl_t acl;
 
-struct sockaddr *
-parse_address (int *psalen, char *str)
-{
-  struct sockaddr_in in;
-  struct sockaddr *sa;
-  
-  in.sin_family = AF_INET;