@@ -1,3 +1,9 @@

+Wed Sep 10 20:05:27 CEST 2008 (tk)

+----------------------------------

+  * configure: use getaddrinfo() whenever available (can be disabled

+	       with --disable-getaddrinfo); --disable-ipv6 now only

+	       disables support for IPv6 addresses in getaddrinfo() (bb#1165)

+

 Wed Sep 10 18:10:47 CEST 2008 (acab)

 ------------------------------------

   * build system: libtool updated to 2.2.6 

@@ -129,6 +129,9 @@

 /* Define to 1 if fseeko (and presumably ftello) exists and is declared. */

 #undef HAVE_FSEEKO

+/* have getaddrinfo() */

+#undef HAVE_GETADDRINFO

+

 /* gethostbyname_r takes 3 arguments */

 #undef HAVE_GETHOSTBYNAME_R_3

@@ -371,7 +374,7 @@

 /* Define to 1 if you have the ANSI C header files. */

 #undef STDC_HEADERS

-/* Use IPv6 aware code */

+/* Support for IPv6 */

 #undef SUPPORT_IPv6

 /* use syslog */

@@ -1527,6 +1527,7 @@ Optional Features:

   --disable-bzip2	  disable bzip2 support

   --disable-rpath         do not hardcode runtime library paths

   --disable-unrar	  don't build libclamunrar and libclamunrar_iface

+  --disable-getaddrinfo          disable support for getaddrinfo

   --disable-ipv6          disable IPv6 support

   --disable-dns           disable support for database verification through

                           DNS

@@ -4759,13 +4760,13 @@ if test "${lt_cv_nm_interface+set}" = set; then

 else

   lt_cv_nm_interface="BSD nm"

   echo "int some_variable = 0;" > conftest.$ac_ext

-  (eval echo "\"\$as_me:4762: $ac_compile\"" >&5)

+  (eval echo "\"\$as_me:4763: $ac_compile\"" >&5)

   (eval "$ac_compile" 2>conftest.err)

   cat conftest.err >&5

-  (eval echo "\"\$as_me:4765: $NM \\\"conftest.$ac_objext\\\"\"" >&5)

+  (eval echo "\"\$as_me:4766: $NM \\\"conftest.$ac_objext\\\"\"" >&5)

   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)

   cat conftest.err >&5

-  (eval echo "\"\$as_me:4768: output\"" >&5)

+  (eval echo "\"\$as_me:4769: output\"" >&5)

   cat conftest.out >&5

   if $GREP 'External.*some_variable' conftest.out > /dev/null; then

     lt_cv_nm_interface="MS dumpbin"

@@ -5976,7 +5977,7 @@ ia64-*-hpux*)

   ;;

 *-*-irix6*)

   # Find out which ABI we are using.

-  echo '#line 5979 "configure"' > conftest.$ac_ext

+  echo '#line 5980 "configure"' > conftest.$ac_ext

   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5

   ac_status=$?

@@ -7827,11 +7828,11 @@ else

    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

    -e 's:$: $lt_compiler_flag:'`

-   (eval echo "\"\$as_me:7830: $lt_compile\"" >&5)

+   (eval echo "\"\$as_me:7831: $lt_compile\"" >&5)

    (eval "$lt_compile" 2>conftest.err)

    ac_status=$?

    cat conftest.err >&5

-   echo "$as_me:7834: \$? = $ac_status" >&5

+   echo "$as_me:7835: \$? = $ac_status" >&5

    if (exit $ac_status) && test -s "$ac_outfile"; then

      # The compiler can only warn and ignore the option if not recognized

      # So say no if there are warnings other than the usual output.

@@ -8166,11 +8167,11 @@ else

    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

    -e 's:$: $lt_compiler_flag:'`

-   (eval echo "\"\$as_me:8169: $lt_compile\"" >&5)

+   (eval echo "\"\$as_me:8170: $lt_compile\"" >&5)

    (eval "$lt_compile" 2>conftest.err)

    ac_status=$?

    cat conftest.err >&5

-   echo "$as_me:8173: \$? = $ac_status" >&5

+   echo "$as_me:8174: \$? = $ac_status" >&5

    if (exit $ac_status) && test -s "$ac_outfile"; then

      # The compiler can only warn and ignore the option if not recognized

      # So say no if there are warnings other than the usual output.

@@ -8271,11 +8272,11 @@ else

    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

    -e 's:$: $lt_compiler_flag:'`

-   (eval echo "\"\$as_me:8274: $lt_compile\"" >&5)

+   (eval echo "\"\$as_me:8275: $lt_compile\"" >&5)

    (eval "$lt_compile" 2>out/conftest.err)

    ac_status=$?

    cat out/conftest.err >&5

-   echo "$as_me:8278: \$? = $ac_status" >&5

+   echo "$as_me:8279: \$? = $ac_status" >&5

    if (exit $ac_status) && test -s out/conftest2.$ac_objext

    then

      # The compiler can only warn and ignore the option if not recognized

@@ -8326,11 +8327,11 @@ else

    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

    -e 's:$: $lt_compiler_flag:'`

-   (eval echo "\"\$as_me:8329: $lt_compile\"" >&5)

+   (eval echo "\"\$as_me:8330: $lt_compile\"" >&5)

    (eval "$lt_compile" 2>out/conftest.err)

    ac_status=$?

    cat out/conftest.err >&5

-   echo "$as_me:8333: \$? = $ac_status" >&5

+   echo "$as_me:8334: \$? = $ac_status" >&5

    if (exit $ac_status) && test -s out/conftest2.$ac_objext

    then

      # The compiler can only warn and ignore the option if not recognized

@@ -11082,7 +11083,7 @@ else

   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

   lt_status=$lt_dlunknown

   cat > conftest.$ac_ext <<_LT_EOF

-#line 11085 "configure"

+#line 11086 "configure"

 #include "confdefs.h"

 #if HAVE_DLFCN_H

@@ -11178,7 +11179,7 @@ else

   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

   lt_status=$lt_dlunknown

   cat > conftest.$ac_ext <<_LT_EOF

-#line 11181 "configure"

+#line 11182 "configure"

 #include "confdefs.h"

 #if HAVE_DLFCN_H

@@ -15956,15 +15957,20 @@ else

 fi

-# Check whether --enable-ipv6 was given.

-if test "${enable_ipv6+set}" = set; then

-  enableval=$enable_ipv6; want_ipv6=$enableval

+# Check whether --enable-getaddrinfo was given.

+if test "${enable_getaddrinfo+set}" = set; then

+  enableval=$enable_getaddrinfo; want_getaddrinfo=$enableval

 else

-  want_ipv6="yes"

+  want_getaddrinfo="yes"

 fi

-if test "$want_ipv6" = "yes"

+

+cat >>confdefs.h <<\_ACEOF

+#define HAVE_GETHOSTBYNAME_R_6 1

+_ACEOF

+

+if test "$want_getaddrinfo" = "yes"

 then

     { echo "$as_me:$LINENO: checking for getaddrinfo" >&5

 echo $ECHO_N "checking for getaddrinfo... $ECHO_C" >&6; }

@@ -15989,13 +15995,16 @@ cat >>conftest.$ac_ext <<_ACEOF

 		    #include <sys/types.h>

 		    #include <sys/socket.h>

 		    #include <netdb.h>

+		    #include <unistd.h>

 		    int main(int argc, char **argv)

 		    {

 			    struct addrinfo *res;

+			    int sd;

 			if(getaddrinfo("127.0.0.1", NULL, NULL, &res) < 0)

 			    return 1;

 			freeaddrinfo(res);

+

 			return 0;

 		    }

@@ -16041,6 +16050,97 @@ echo "${ECHO_T}$have_gai" >&6; }

     if test "$have_gai" = yes; then

 cat >>confdefs.h <<\_ACEOF

+#define HAVE_GETADDRINFO 1

+_ACEOF

+

+    fi

+fi

+

+# Check whether --enable-ipv6 was given.

+if test "${enable_ipv6+set}" = set; then

+  enableval=$enable_ipv6; want_ipv6=$enableval

+else

+  want_ipv6="yes"

+fi

+

+

+if test "$want_ipv6" = "yes"

+then

+    { echo "$as_me:$LINENO: checking for IPv6 support" >&5

+echo $ECHO_N "checking for IPv6 support... $ECHO_C" >&6; }

+    if test "${have_ipv6+set}" = set; then

+  echo $ECHO_N "(cached) $ECHO_C" >&6

+else

+

+		if test "$cross_compiling" = yes; then

+  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling

+See \`config.log' for more details." >&5

+echo "$as_me: error: cannot run test program while cross compiling

+See \`config.log' for more details." >&2;}

+   { (exit 1); exit 1; }; }

+else

+  cat >conftest.$ac_ext <<_ACEOF

+/* confdefs.h.  */

+_ACEOF

+cat confdefs.h >>conftest.$ac_ext

+cat >>conftest.$ac_ext <<_ACEOF

+/* end confdefs.h.  */

+

+		    #include <sys/types.h>

+		    #include <sys/socket.h>

+		    #include <unistd.h>

+		    int main(int argc, char **argv)

+		    {

+			    int sd;

+

+			if((sd = socket(AF_INET6, SOCK_STREAM, 0)) < 0)

+			    return 1;

+			close(sd);

+			return 0;

+		    }

+

+_ACEOF

+rm -f conftest$ac_exeext

+if { (ac_try="$ac_link"

+case "(($ac_try" in

+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

+  *) ac_try_echo=$ac_try;;

+esac

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

+  (eval "$ac_link") 2>&5

+  ac_status=$?

+  echo "$as_me:$LINENO: \$? = $ac_status" >&5

+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

+  { (case "(($ac_try" in

+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

+  *) ac_try_echo=$ac_try;;

+esac

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

+  (eval "$ac_try") 2>&5

+  ac_status=$?

+  echo "$as_me:$LINENO: \$? = $ac_status" >&5

+  (exit $ac_status); }; }; then

+  have_ipv6=yes

+else

+  echo "$as_me: program exited with status $ac_status" >&5

+echo "$as_me: failed program was:" >&5

+sed 's/^/| /' conftest.$ac_ext >&5

+

+( exit $ac_status )

+have_ipv6=no

+fi

+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

+fi

+

+

+

+fi

+

+    { echo "$as_me:$LINENO: result: $have_ipv6" >&5

+echo "${ECHO_T}$have_ipv6" >&6; }

+    if test "$have_ipv6" = yes; then

+

+cat >>confdefs.h <<\_ACEOF

 #define SUPPORT_IPv6 1

 _ACEOF

@@ -491,11 +491,12 @@ AC_ARG_ENABLE([unrar],

 [  --disable-unrar	  don't build libclamunrar and libclamunrar_iface ],

 want_unrar=$enableval, want_unrar="yes")

-AC_ARG_ENABLE([ipv6],

-[  --disable-ipv6          disable IPv6 support],

-want_ipv6=$enableval, want_ipv6="yes")

+AC_ARG_ENABLE([getaddrinfo],

+[  --disable-getaddrinfo          disable support for getaddrinfo],

+want_getaddrinfo=$enableval, want_getaddrinfo="yes")

-if test "$want_ipv6" = "yes"

+	AC_DEFINE([HAVE_GETHOSTBYNAME_R_6],1,[gethostbyname_r takes 6 arguments])

+if test "$want_getaddrinfo" = "yes"

 then

     AC_MSG_CHECKING([for getaddrinfo])

     AC_CACHE_VAL([have_gai],[

@@ -503,13 +504,16 @@ then

 		    #include <sys/types.h>

 		    #include <sys/socket.h>

 		    #include <netdb.h>

+		    #include <unistd.h>

 		    int main(int argc, char **argv)

 		    {

 			    struct addrinfo *res;

+			    int sd;

 			if(getaddrinfo("127.0.0.1", NULL, NULL, &res) < 0)

 			    return 1;

 			freeaddrinfo(res);

+

 			return 0;

 		    }

 		],

@@ -518,7 +522,38 @@ then

 		])

     AC_MSG_RESULT([$have_gai])

     if test "$have_gai" = yes; then

-	AC_DEFINE(SUPPORT_IPv6, 1, [Use IPv6 aware code])

+	AC_DEFINE(HAVE_GETADDRINFO, 1, [have getaddrinfo()])

+    fi

+fi

+

+AC_ARG_ENABLE([ipv6],

+[  --disable-ipv6          disable IPv6 support],

+want_ipv6=$enableval, want_ipv6="yes")

+

+if test "$want_ipv6" = "yes"

+then

+    AC_MSG_CHECKING([for IPv6 support])

+    AC_CACHE_VAL([have_ipv6],[

+		AC_TRY_RUN([

+		    #include <sys/types.h>

+		    #include <sys/socket.h>

+		    #include <unistd.h>

+		    int main(int argc, char **argv)

+		    {

+			    int sd;

+

+			if((sd = socket(AF_INET6, SOCK_STREAM, 0)) < 0)

+			    return 1;

+			close(sd);

+			return 0;

+		    }

+		],

+		[have_ipv6=yes],

+		[have_ipv6=no])

+		])

+    AC_MSG_RESULT([$have_ipv6])

+    if test "$have_ipv6" = yes; then

+	AC_DEFINE(SUPPORT_IPv6, 1, [Support for IPv6])

     fi

 fi

@@ -89,7 +89,7 @@

 	if(chdir(x) == -1)			\

 	    logg("!Can't chdir to %s\n", x);

-#ifndef SUPPORT_IPv6

+#ifndef HAVE_GETADDRINFO

 static const char *ghbn_err(int err) /* hstrerror() */

 {

     switch(err) {

@@ -115,7 +115,7 @@ static int getclientsock(const char *localip, int prot)

 {

 	int socketfd = -1;

-#ifdef SUPPORT_IPv6

+#ifdef HAVE_GETADDRINFO

     if(prot == PF_INET6)

 	socketfd = socket(PF_INET6, SOCK_STREAM, 0);

     else

@@ -130,7 +130,7 @@ static int getclientsock(const char *localip, int prot)

     }

     if(localip) {

-#ifdef SUPPORT_IPv6

+#ifdef HAVE_GETADDRINFO

 	    struct addrinfo *res;

 	    int ret;

@@ -191,7 +191,7 @@ static int wwwconnect(const char *server, const char *proxy, int pport, char *ip

 {

 	int socketfd, port, ret;

 	unsigned int ips = 0, ignored = 0;

-#ifdef SUPPORT_IPv6

+#ifdef HAVE_GETADDRINFO

 	struct addrinfo hints, *res = NULL, *rp, *loadbal_rp = NULL;

 	char port_s[6], loadbal_ipaddr[46];

 	uint32_t loadbal = 1, minsucc = 0xffffffff, minfail = 0xffffffff;

@@ -229,9 +229,13 @@ static int wwwconnect(const char *server, const char *proxy, int pport, char *ip

 	port = 80;

     }

-#ifdef SUPPORT_IPv6

+#ifdef HAVE_GETADDRINFO

     memset(&hints, 0, sizeof(hints));

+#ifdef SUPPORT_IPv6

     hints.ai_family = AF_UNSPEC;

+#else

+    hints.ai_family = AF_INET;

+#endif

     hints.ai_socktype = SOCK_STREAM;

     snprintf(port_s, sizeof(port_s), "%d", port);

     port_s[sizeof(port_s) - 1] = 0;

@@ -1374,7 +1378,7 @@ int downloadmanager(const struct cfgstruct *copt, const struct optstruct *opt, c

     time(&currtime);

     logg("ClamAV update process started at %s", ctime(&currtime));

-#ifdef SUPPORT_IPv6

+#ifdef HAVE_GETADDRINFO

     logg("*Using IPv6 aware code\n");

 #endif

@@ -56,7 +56,7 @@

 #define O_BINARY    0

 #endif

-#ifndef SUPPORT_IPv6

+#ifndef HAVE_GETADDRINFO

 #ifndef AF_INET6

 #define AF_INET6    0xbeef  /* foo */

 #endif

@@ -222,7 +222,7 @@ void mirman_list(const struct mirdat *mdat)

     for(i = 0; i < mdat->num; i++) {

 	printf("Mirror #%u\n", i + 1);

-#ifdef SUPPORT_IPv6

+#ifdef HAVE_GETADDRINFO

 	if(mdat->mirtab[i].ip4)

 	    printf("IP: %s\n", inet_ntop(AF_INET, &mdat->mirtab[i].ip4, ip, sizeof(ip)));

 	else

@@ -55,7 +55,7 @@ int notify(const char *cfgfile)

 #ifndef	C_WINDOWS

 	struct sockaddr_un server;

 #endif

-#ifdef SUPPORT_IPv6

+#ifdef HAVE_GETADDRINFO

 	struct addrinfo hints, *res;

 	char port[6];

 	const char *addr;

@@ -102,9 +102,13 @@ int notify(const char *cfgfile)

     if((cpt = cfgopt(copt, "TCPSocket"))->enabled) {

 	socktype = "TCP";

-#ifdef SUPPORT_IPv6

+#ifdef HAVE_GETADDRINFO

 	memset(&hints, 0, sizeof(hints));

+#ifdef SUPPORT_IPv6

 	hints.ai_family = AF_UNSPEC;

+#else

+	hints.ai_family = AF_INET;

+#endif

 	hints.ai_socktype = SOCK_STREAM;

 	snprintf(port, 5, "%d", cpt->numarg);

 	port[5] = 0;