socat: Upgrade to version 1.7.1.2

Upgrade socat to the latest available version

5 files changed, 945 insertions, 101 deletions

diff --git a/recipes/socat/files/compile.patch b/recipes/socat/files/compile.patch
new file mode 100644
index 0000000000..35a1e3188f
--- /dev/null
+++ b/recipes/socat/files/compile.patch
@@ -0,0 +1,939 @@
+Index: socat-1.7.1.2/configure.in
+===================================================================
+--- socat-1.7.1.2.orig/configure.in	2010-03-17 10:10:07.431327912 +0800
++++ socat-1.7.1.2/configure.in	2010-03-17 11:30:56.010077501 +0800
+@@ -86,7 +86,7 @@
+ 
+ 
+ dnl Check for extra socket library (for Solaris)
+-AC_CHECK_FUNC(hstrerror,  , AC_CHECK_LIB(resolv, hstrerror, [LIBS="$LIBS -lresolv"; AC_DEFINE(HAVE_HSTRERROR)]))
++AC_CHECK_FUNC(hstrerror,  , AC_CHECK_LIB(resolv, hstrerror, [LIBS="$LIBS -lresolv"; AC_DEFINE(HAVE_HSTRERROR, [1], [STRERROR])]))
+ AC_CHECK_FUNC(gethostent, , AC_CHECK_LIB(nsl, gethostent))
+ AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt))
+ 
+@@ -100,7 +100,7 @@
+  [sc_cv_have_prototype_hstrerror=yes]);
+  CFLAGS="$CFLAGS1"])
+ if test $sc_cv_have_prototype_hstrerror = yes; then
+-   AC_DEFINE(HAVE_PROTOTYPE_HSTRERROR)
++   AC_DEFINE(HAVE_PROTOTYPE_HSTRERROR, [1], [Has Strerror])
+ fi
+ AC_MSG_RESULT($sc_cv_have_prototype_hstrerror)
+ 
+@@ -109,83 +109,83 @@
+ AC_ARG_ENABLE(help, [  --disable-help          disable help],
+ 	      [case "$enableval" in
+ 	       no) AC_MSG_RESULT(no);;
+-	       *) AC_DEFINE(WITH_HELP) AC_MSG_RESULT(yes);;
++	       *) AC_DEFINE(WITH_HELP, [1], [With help]) AC_MSG_RESULT(yes);;
+ 	       esac],
+-	       [AC_DEFINE(WITH_HELP) AC_MSG_RESULT(yes)])
++	       [AC_DEFINE(WITH_HELP, [1], [With help]) AC_MSG_RESULT(yes)])
+ 
+ AC_MSG_CHECKING(whether to include STDIO support)
+ AC_ARG_ENABLE(stdio, [  --disable-stdio         disable STDIO support],
+ 	      [case "$enableval" in
+ 	       no) AC_MSG_RESULT(no);;
+-	       *) AC_DEFINE(WITH_STDIO) AC_MSG_RESULT(yes);;
++	       *) AC_DEFINE(WITH_STDIO, [1], [With stdio]) AC_MSG_RESULT(yes);;
+ 	       esac],
+-	       [AC_DEFINE(WITH_STDIO) AC_MSG_RESULT(yes)])
++	       [AC_DEFINE(WITH_STDIO, [1], [With stdio]) AC_MSG_RESULT(yes)])
+ 
+ AC_MSG_CHECKING(whether to include FD-number support)
+ AC_ARG_ENABLE(fdnum, [  --disable-fdnum         disable FD-number support],
+ 	      [case "$enableval" in
+ 	       no) AC_MSG_RESULT(no);;
+-	       *) AC_DEFINE(WITH_FDNUM) AC_MSG_RESULT(yes);;
++	       *) AC_DEFINE(WITH_FDNUM, [1], [With fdnum]) AC_MSG_RESULT(yes);;
+ 	       esac],
+-	       [AC_DEFINE(WITH_FDNUM) AC_MSG_RESULT(yes)])
++	       [AC_DEFINE(WITH_FDNUM, [1], [With fdnum]) AC_MSG_RESULT(yes)])
+ 
+ AC_MSG_CHECKING(whether to include direct file support)
+ AC_ARG_ENABLE(file, [  --disable-file          disable direct file support],
+ 	      [case "$enableval" in
+ 	       no) AC_MSG_RESULT(no);;
+-	       *) AC_DEFINE(WITH_FILE) AC_MSG_RESULT(yes);;
++	       *) AC_DEFINE(WITH_FILE, [1], [With file]) AC_MSG_RESULT(yes);;
+ 	       esac],
+-	       [AC_DEFINE(WITH_FILE) AC_MSG_RESULT(yes)])
++	       [AC_DEFINE(WITH_FILE, [1], [With file]) AC_MSG_RESULT(yes)])
+ 
+ AC_MSG_CHECKING(whether to include direct create support)
+ AC_ARG_ENABLE(creat, [  --disable-creat         disable direct create support],
+ 	      [case "$enableval" in
+ 	       no) AC_MSG_RESULT(no);;
+-	       *) AC_DEFINE(WITH_CREAT) AC_MSG_RESULT(yes);;
++	       *) AC_DEFINE(WITH_CREAT, [1], [With creat]) AC_MSG_RESULT(yes);;
+ 	       esac],
+-	       [AC_DEFINE(WITH_CREAT) AC_MSG_RESULT(yes)])
++	       [AC_DEFINE(WITH_CREAT, [1], [With creat]) AC_MSG_RESULT(yes)])
+ 
+ AC_MSG_CHECKING(whether to include gopen support)
+ AC_ARG_ENABLE(gopen, [  --disable-gopen         disable open for UNIX socket support],
+ 	      [case "$enableval" in
+ 	       no) AC_MSG_RESULT(no);;
+-	       *) AC_DEFINE(WITH_GOPEN) AC_MSG_RESULT(yes);;
++	       *) AC_DEFINE(WITH_GOPEN, [1], [With gopen]) AC_MSG_RESULT(yes);;
+ 	       esac],
+-	       [AC_DEFINE(WITH_GOPEN) AC_MSG_RESULT(yes)])
++	       [AC_DEFINE(WITH_GOPEN, [1], [With gopen]) AC_MSG_RESULT(yes)])
+ 
+ AC_MSG_CHECKING(whether to include explicit pipe support)
+ AC_ARG_ENABLE(pipe, [  --disable-pipe          disable pipe support],
+ 	      [case "$enableval" in
+ 	       no) AC_MSG_RESULT(no);;
+-	       *) AC_DEFINE(WITH_PIPE) AC_MSG_RESULT(yes);;
++	       *) AC_DEFINE(WITH_PIPE, [1], [With pipe]) AC_MSG_RESULT(yes);;
+ 	       esac],
+-	       [AC_DEFINE(WITH_PIPE) AC_MSG_RESULT(yes)])
++	       [AC_DEFINE(WITH_PIPE, [1], [With pipe]) AC_MSG_RESULT(yes)])
+ 
+ AC_MSG_CHECKING(whether to include explicit termios support)
+ AC_ARG_ENABLE(termios, [  --disable-termios       disable termios support],
+ 	      [case "$enableval" in
+ 	       no) AC_MSG_RESULT(no);;
+-	       *) AC_DEFINE(WITH_TERMIOS) AC_MSG_RESULT(yes);;
++	       *) AC_DEFINE(WITH_TERMIOS, [1], [With termios]) AC_MSG_RESULT(yes);;
+ 	       esac],
+-	       [AC_DEFINE(WITH_TERMIOS) AC_MSG_RESULT(yes)])
++	       [AC_DEFINE(WITH_TERMIOS, [1], [With termios]) AC_MSG_RESULT(yes)])
+ 
+ AC_MSG_CHECKING(whether to include UNIX socket support)
+ AC_ARG_ENABLE(unix, [  --disable-unix          disable UNIX domain socket support],
+ 	      [case "$enableval" in
+ 	       no) AC_MSG_RESULT(no);;
+-	       *) AC_DEFINE(WITH_UNIX) AC_MSG_RESULT(yes);;
++	       *) AC_DEFINE(WITH_UNIX, [1], [With unix]) AC_MSG_RESULT(yes);;
+ 	       esac],
+-	       [AC_DEFINE(WITH_UNIX) AC_MSG_RESULT(yes)])
++	       [AC_DEFINE(WITH_UNIX, [1], [With unix]) AC_MSG_RESULT(yes)])
+ 
+ AC_MSG_CHECKING(whether to include abstract UNIX socket support)
+ AC_ARG_ENABLE(abstract_unixsocket, [  --disable-abstract-unixsocket   disable abstract UNIX domain socket support],
+ 	      [case "$enableval" in
+ 	       no) AC_MSG_RESULT(no);;
+-	       *) AC_DEFINE(WITH_ABSTRACT_UNIXSOCKET) AC_MSG_RESULT(yes);;
++	       *) AC_DEFINE(WITH_ABSTRACT_UNIXSOCKET, [1], [With abstract unix socket]) AC_MSG_RESULT(yes);;
+ 	       esac],
+ 	      [ case "`uname`" in
+ 	        Linux)
+-		    AC_DEFINE(WITH_ABSTRACT_UNIXSOCKET) AC_MSG_RESULT(yes);;
++		    AC_DEFINE(WITH_ABSTRACT_UNIXSOCKET, [1], [With abstract unix socket]) AC_MSG_RESULT(yes);;
+ 		*)
+ 		    AC_MSG_RESULT(no);;
+ 		esac])
+@@ -194,9 +194,9 @@
+ AC_ARG_ENABLE(ip4, [  --disable-ip4           disable IPv4 support],
+ 	      [case "$enableval" in
+ 	       no) AC_MSG_RESULT(no);;
+-	       *) AC_DEFINE(WITH_IP4) AC_MSG_RESULT(yes);;
++	       *) AC_DEFINE(WITH_IP4, [1], [with ipv4]) AC_MSG_RESULT(yes);;
+ 	       esac],
+-	       [AC_DEFINE(WITH_IP4) AC_MSG_RESULT(yes)])
++	       [AC_DEFINE(WITH_IP4, [1], [with ipv4]) AC_MSG_RESULT(yes)])
+ 
+ AC_MSG_CHECKING(whether to include IPv6 support)
+ AC_ARG_ENABLE(ip6, [  --disable-ip6           disable IPv6 support],
+@@ -207,7 +207,7 @@
+ 	      [ AC_MSG_RESULT(yes);  WITH_IP6=1 ])
+ if test "$WITH_IP6"; then
+   AC_CHECK_HEADERS([netinet/ip6.h],
+-    [AC_DEFINE(HAVE_NETINET_IP6_H) AC_DEFINE(WITH_IP6)],
++    [AC_DEFINE(HAVE_NETINET_IP6_H) AC_DEFINE(WITH_IP6, [1], [with ipv6])],
+     [AC_MSG_WARN([include file netinet/ip6.h not found, disabling IP6])],
+     [AC_INCLUDES_DEFAULT
+      #ifdef HAVE_NETINET_IN_H
+@@ -219,17 +219,17 @@
+ AC_ARG_ENABLE(rawip, [  --disable-rawip         disable raw IP support],
+ 	      [case "$enableval" in
+ 	       no) AC_MSG_RESULT(no);;
+-	       *) AC_DEFINE(WITH_RAWIP) AC_MSG_RESULT(yes);;
++	       *) AC_DEFINE(WITH_RAWIP, [1], [With reawip]) AC_MSG_RESULT(yes);;
+ 	       esac],
+-	       [AC_DEFINE(WITH_RAWIP) AC_MSG_RESULT(yes)])
++	       [AC_DEFINE(WITH_RAWIP, [1], [With rawip]) AC_MSG_RESULT(yes)])
+ 
+ AC_MSG_CHECKING(whether to include generic socket support)
+ AC_ARG_ENABLE(rawsocket, [  --disable-genericsocket disable generic socket support],
+ 	      [case "$enableval" in
+ 	       no) AC_MSG_RESULT(no);;
+-	       *) AC_DEFINE(WITH_GENERICSOCKET) AC_MSG_RESULT(yes);;
++	       *) AC_DEFINE(WITH_GENERICSOCKET, [1], [With genericsocket]) AC_MSG_RESULT(yes);;
+ 	       esac],
+-	       [AC_DEFINE(WITH_GENERICSOCKET) AC_MSG_RESULT(yes)])
++	       [AC_DEFINE(WITH_GENERICSOCKET, [1], [With genericsocket]) AC_MSG_RESULT(yes)])
+ AC_MSG_CHECKING(whether to include raw network interface support)
+ AC_ARG_ENABLE(interface, [  --disable-interface  disable network interface support],
+ 	      [case "$enableval" in
+@@ -239,35 +239,35 @@
+ 	       [AC_MSG_RESULT(yes);  WITH_INTERFACE=1 ])
+ if test "$WITH_INTERFACE"; then
+   AC_CHECK_HEADER(netpacket/packet.h,
+-    AC_DEFINE(HAVE_NETPACKET_PACKET_H),
++    AC_DEFINE(HAVE_NETPACKET_PACKET_H, [1], [Has packet.h]),
+     [WITH_INTERFACE=;
+      AC_MSG_WARN([include file netpacket/packet.h not found, disabling interface])])
+ fi
+ if test "$WITH_INTERFACE"; then
+   AC_CHECK_HEADER(netinet/if_ether.h,
+-    AC_DEFINE(HAVE_NETINET_IF_ETHER_H),
++    AC_DEFINE(HAVE_NETINET_IF_ETHER_H, [1], [Has if_ether.h]),
+     [WITH_INTERFACE=;
+      AC_MSG_WARN([include file netinet/if_ether.h not found, disabling interface])])
+ fi
+ if test "$WITH_INTERFACE"; then
+-   AC_DEFINE(WITH_INTERFACE)
++   AC_DEFINE(WITH_INTERFACE, [1], [Wither interface])
+ fi
+ 
+ AC_MSG_CHECKING(whether to include TCP support)
+ AC_ARG_ENABLE(tcp, [  --disable-tcp           disable TCP support],
+ 	      [case "$enableval" in
+ 	       no) AC_MSG_RESULT(no);;
+-	       *) AC_DEFINE(WITH_TCP) AC_MSG_RESULT(yes);;
++	       *) AC_DEFINE(WITH_TCP, [1], [With TCP]) AC_MSG_RESULT(yes);;
+ 	       esac],
+-	       [AC_DEFINE(WITH_TCP) AC_MSG_RESULT(yes)])
++	       [AC_DEFINE(WITH_TCP, [1], [With TCP]) AC_MSG_RESULT(yes)])
+ 
+ AC_MSG_CHECKING(whether to include UDP support)
+ AC_ARG_ENABLE(udp, [  --disable-udp           disable UDP support],
+ 	      [case "$enableval" in
+ 	       no) AC_MSG_RESULT(no);;
+-	       *) AC_DEFINE(WITH_UDP) AC_MSG_RESULT(yes);;
++	       *) AC_DEFINE(WITH_UDP, [1], [With UDP]) AC_MSG_RESULT(yes);;
+ 	       esac],
+-	       [AC_DEFINE(WITH_UDP) AC_MSG_RESULT(yes)])
++	       [AC_DEFINE(WITH_UDP, [1], [With UDP]) AC_MSG_RESULT(yes)])
+ 
+ AC_MSG_CHECKING(whether to include SCTP support)
+ AC_ARG_ENABLE(sctp, [  --disable-sctp           disable SCTP support],
+@@ -287,7 +287,7 @@
+ [sc_cv_define_ipproto_sctp=no])])
+ AC_MSG_RESULT($sc_cv_define_ipproto_sctp)
+ if test $sc_cv_define_ipproto_sctp = yes; then
+-   AC_DEFINE(WITH_SCTP)
++   AC_DEFINE(WITH_SCTP, [1], [With SCTP])
+ else
+    AC_MSG_WARN([IPPROTO_SCTP undefined, disabling SCTP support])
+ fi
+@@ -297,65 +297,65 @@
+ AC_ARG_ENABLE(listen, [  --disable-listen        disable listen support],
+ 	      [case "$enableval" in
+ 	       no) AC_MSG_RESULT(no);;
+-	       *) AC_DEFINE(WITH_LISTEN) AC_MSG_RESULT(yes);;
++	       *) AC_DEFINE(WITH_LISTEN, [1], [With listen]) AC_MSG_RESULT(yes);;
+ 	       esac],
+-	       [AC_DEFINE(WITH_LISTEN) AC_MSG_RESULT(yes)])
++	       [AC_DEFINE(WITH_LISTEN, [1], [With listen]) AC_MSG_RESULT(yes)])
+ 
+ AC_MSG_CHECKING(whether to include socks4 support)
+ AC_ARG_ENABLE(socks4, [  --disable-socks4        disable socks4 support],
+ 	      [case "$enableval" in
+ 	       no) AC_MSG_RESULT(no);;
+-	       *) AC_DEFINE(WITH_SOCKS4) AC_MSG_RESULT(yes);;
++	       *) AC_DEFINE(WITH_SOCKS4, [1], [With socks]) AC_MSG_RESULT(yes);;
+ 	       esac],
+-	       [AC_DEFINE(WITH_SOCKS4) AC_MSG_RESULT(yes)])
++	       [AC_DEFINE(WITH_SOCKS4, [1], [With socks]) AC_MSG_RESULT(yes)])
+ 
+ AC_MSG_CHECKING(whether to include socks4a support)
+ AC_ARG_ENABLE(socks4a, [  --disable-socks4a       disable socks4a support],
+ 	      [case "$enableval" in
+ 	       no) AC_MSG_RESULT(no);;
+-	       *) AC_DEFINE(WITH_SOCKS4A) AC_MSG_RESULT(yes);;
++	       *) AC_DEFINE(WITH_SOCKS4A, [1], [With socks4a]) AC_MSG_RESULT(yes);;
+ 	       esac],
+-	       [AC_DEFINE(WITH_SOCKS4A) AC_MSG_RESULT(yes)])
++	       [AC_DEFINE(WITH_SOCKS4A, [1], [With socks4a]) AC_MSG_RESULT(yes)])
+ 
+ AC_MSG_CHECKING(whether to include proxy connect support)
+ AC_ARG_ENABLE(proxy, [  --disable-proxy         disable proxy connect support],
+ 	      [case "$enableval" in
+ 	       no) AC_MSG_RESULT(no);;
+-	       *) AC_DEFINE(WITH_PROXY) AC_MSG_RESULT(yes);;
++	       *) AC_DEFINE(WITH_PROXY, [1], [With proxy]) AC_MSG_RESULT(yes);;
+ 	       esac],
+-	       [AC_DEFINE(WITH_PROXY) AC_MSG_RESULT(yes)])
++	       [AC_DEFINE(WITH_PROXY, [1], [With proxy]) AC_MSG_RESULT(yes)])
+ 
+ AC_MSG_CHECKING(whether to include exec support)
+ AC_ARG_ENABLE(exec, [  --disable-exec          disable exec support],
+ 	      [case "$enableval" in
+ 	       no) AC_MSG_RESULT(no);;
+-	       *) AC_DEFINE(WITH_EXEC) AC_MSG_RESULT(yes);;
++	       *) AC_DEFINE(WITH_EXEC, [1], [With exec]) AC_MSG_RESULT(yes);;
+ 	       esac],
+-	       [AC_DEFINE(WITH_EXEC) AC_MSG_RESULT(yes)])
++	       [AC_DEFINE(WITH_EXEC, [1], [With exec]) AC_MSG_RESULT(yes)])
+ 
+ AC_MSG_CHECKING([whether to include system (shell) support])
+ AC_ARG_ENABLE(system, [  --disable-system        disable system (shell) support],
+ 	      [case "$enableval" in
+ 	       no) AC_MSG_RESULT(no);;
+-	       *) AC_DEFINE(WITH_SYSTEM) AC_MSG_RESULT(yes);;
++	       *) AC_DEFINE(WITH_SYSTEM, [1], [With system]) AC_MSG_RESULT(yes);;
+ 	       esac],
+-	       [AC_DEFINE(WITH_SYSTEM) AC_MSG_RESULT(yes)])
++	       [AC_DEFINE(WITH_SYSTEM, [1], [With system]) AC_MSG_RESULT(yes)])
+ 
+ AC_MSG_CHECKING(whether to include pty address support)
+ AC_ARG_ENABLE(pty, [  --disable-pty           disable pty support],
+ 	      [case "$enableval" in
+ 	       no) AC_MSG_RESULT(no);;
+-	       *) AC_DEFINE(WITH_PTY) AC_MSG_RESULT(yes);;
++	       *) AC_DEFINE(WITH_PTY, [1], [With pty]) AC_MSG_RESULT(yes);;
+ 	       esac],
+-	       [AC_DEFINE(WITH_PTY) AC_MSG_RESULT(yes)])
++	       [AC_DEFINE(WITH_PTY, [1], [With pty]) AC_MSG_RESULT(yes)])
+ 
+ AC_MSG_CHECKING(whether to include ext2 fs attributes support)
+ AC_ARG_ENABLE(ext2, [  --disable-ext2          disable ext2 fs attributes support],
+ 	      [case "$enableval" in
+ 	       no) AC_MSG_RESULT(no);;
+-	       *) AC_DEFINE(WITH_EXT2) AC_MSG_RESULT(yes);;
++	       *) AC_DEFINE(WITH_EXT2, [1], [With ext2]) AC_MSG_RESULT(yes);;
+ 	       esac],
+-	       [AC_DEFINE(WITH_EXT2) AC_MSG_RESULT(yes)])
++	       [AC_DEFINE(WITH_EXT2, [1], [With ext2]) AC_MSG_RESULT(yes)])
+ 
+ AC_MSG_CHECKING(whether to include readline support)
+ AC_ARG_ENABLE(readline, [  --disable-readline      disable readline support],
+@@ -400,10 +400,10 @@
+     
+     if test -n "$sc_usable_readline_found"; then
+       AC_MSG_RESULT(yes)
+-      AC_DEFINE(HAVE_READLINE_READLINE_H,1)
+-      AC_DEFINE(HAVE_READLINE_HISTORY_H,1)
+-      AC_DEFINE(HAVE_LIBREADLINE,1)
+-      AC_DEFINE(WITH_READLINE,1)
++      AC_DEFINE(HAVE_READLINE_READLINE_H,1, [have readline])
++      AC_DEFINE(HAVE_READLINE_HISTORY_H,1, [have history])
++      AC_DEFINE(HAVE_LIBREADLINE,1, [have readline])
++      AC_DEFINE(WITH_READLINE,1, [with readline])
+       break
+     else
+       AC_MSG_RESULT(no)
+@@ -446,7 +446,7 @@
+       done])
+   ])
+   if test "$sc_cv_have_openssl_ssl_h" = "yes"; then
+-    AC_DEFINE(HAVE_OPENSSL_SSL_H)
++    AC_DEFINE(HAVE_OPENSSL_SSL_H, [1], [have openssl.h])
+   fi
+   AC_MSG_NOTICE(checked for openssl/ssl.h... $sc_cv_have_openssl_ssl_h)
+ fi	# end checking for openssl/ssl.h
+@@ -478,7 +478,7 @@
+     ]
+   )
+   if test "$sc_cv_have_libssl" = 'yes'; then
+-    AC_DEFINE(HAVE_LIBSSL)
++    AC_DEFINE(HAVE_LIBSSL, [1], [libssl])
+   fi
+   AC_MSG_RESULT($sc_cv_have_libssl)
+ fi
+@@ -506,7 +506,7 @@
+ #fi
+ if test -n "$WITH_OPENSSL"; then
+   if test "$sc_cv_have_openssl_ssl_h" = "yes" -a "$sc_cv_have_libssl" = "yes"; then
+-    AC_DEFINE(WITH_OPENSSL)
++    AC_DEFINE(WITH_OPENSSL, [1], [With openssl])
+   else
+     AC_MSG_WARN([not all components of OpenSSL found, disabling it]);
+   fi
+@@ -552,7 +552,7 @@
+     )]
+   )
+   if test "$sv_cv_have_openssl_fips_h" = "yes"; then
+-    AC_DEFINE(HAVE_OPENSSL_FIPS_H)
++    AC_DEFINE(HAVE_OPENSSL_FIPS_H, [1], [OpenSSL fips.h])
+   fi
+   AC_MSG_NOTICE(checked for openssl/fips.h... $sc_cv_have_openssl_ssl_h)
+ fi
+@@ -583,15 +583,15 @@
+     ]
+   )
+   if test "$sc_cv_have_libcrypto" = 'yes'; then
+-    AC_DEFINE(HAVE_LIBCRYPTO)
++    AC_DEFINE(HAVE_LIBCRYPTO, [1], [libcrypto])
+   fi
+   AC_MSG_RESULT($sc_cv_have_libcrypto)
+ fi
+ 
+ if test -n "$WITH_FIPS"; then
+   if test "$sc_cv_have_openssl_fips_h" = 'yes' -a "$sc_cv_have_libcrypto" = 'yes'; then
+-    AC_DEFINE(WITH_FIPS)
+-    AC_DEFINE(OPENSSL_FIPS)
++    AC_DEFINE(WITH_FIPS, [1], [With fips])
++    AC_DEFINE(OPENSSL_FIPS, [1], [openssl fips])
+   else
+     AC_MSG_WARN([not all components of OpenSSL FIPS found, disabling it]);
+   fi
+@@ -612,17 +612,17 @@
+ fi
+ #
+ if test -n "$WITH_TUN"; then
+-  AC_DEFINE(WITH_TUN)
++  AC_DEFINE(WITH_TUN, [1], [with tun])
+ fi
+ 
+ AC_MSG_CHECKING(whether to include system call tracing)
+ AC_ARG_ENABLE(sycls, [  --disable-sycls         disable system call tracing],
+ 	      [case "$enableval" in
+ 	       no) SYCLS=""; SSLCLS=""; AC_MSG_RESULT(no);;
+-	       *) AC_DEFINE(WITH_SYCLS)
++	       *) AC_DEFINE(WITH_SYCLS, [1], [syscls])
+ 		 SYCLS="sycls.c"; SSLCLS="sslcls.c"; AC_MSG_RESULT(yes);;
+ 	       esac],
+-	       [AC_DEFINE(WITH_SYCLS)
++	       [AC_DEFINE(WITH_SYCLS, [1], [syscls])
+ 		 SYCLS="sycls.c"; SSLCLS="sslcls.c"; AC_MSG_RESULT(yes)])
+ AC_SUBST(SYCLS)
+ AC_SUBST(SSLCLS)
+@@ -631,31 +631,31 @@
+ AC_ARG_ENABLE(filan, [  --disable-filan         disable file descriptor analyzer],
+ 	      [case "$enableval" in
+ 	       no) FILAN=""; AC_MSG_RESULT(no);;
+-	       *) AC_DEFINE(WITH_FILAN) FILAN="filan.c"; AC_MSG_RESULT(yes);;
++	       *) AC_DEFINE(WITH_FILAN, [1], [filan]) FILAN="filan.c"; AC_MSG_RESULT(yes);;
+ 	       esac],
+-	       [AC_DEFINE(WITH_FILAN) FILAN="filan.c"; AC_MSG_RESULT(yes)])
++	       [AC_DEFINE(WITH_FILAN, [1], [filan]) FILAN="filan.c"; AC_MSG_RESULT(yes)])
+ AC_SUBST(FILAN)
+ 
+ AC_MSG_CHECKING(whether to include retry support)
+ AC_ARG_ENABLE(retry, [  --disable-retry         disable retry support],
+ 	      [case "$enableval" in
+ 	       no) AC_MSG_RESULT(no);;
+-	       *) AC_DEFINE(WITH_RETRY) AC_MSG_RESULT(yes);;
++	       *) AC_DEFINE(WITH_RETRY, [1], [retry]) AC_MSG_RESULT(yes);;
+ 	       esac],
+-	       [AC_DEFINE(WITH_RETRY) AC_MSG_RESULT(yes)])
++	       [AC_DEFINE(WITH_RETRY, [1], [retry]) AC_MSG_RESULT(yes)])
+ 
+ AC_MSG_CHECKING(included message level)
+ AC_ARG_ENABLE(msglevel, [  --enable-msglevel=N     set max verbosity to debug,info,notice,warn,error,fatal],
+ 	      [case "$enableval" in
+-	       debug) AC_DEFINE(WITH_MSGLEVEL,0) AC_MSG_RESULT(debug);;
+-	       info)  AC_DEFINE(WITH_MSGLEVEL,1) AC_MSG_RESULT(info);;
+-	       notice) AC_DEFINE(WITH_MSGLEVEL,2) AC_MSG_RESULT(notice);;
+-	       warn) AC_DEFINE(WITH_MSGLEVEL,3) AC_MSG_RESULT(warn);;
+-	       error) AC_DEFINE(WITH_MSGLEVEL,4) AC_MSG_RESULT(error);;
+-	       fatal) AC_DEFINE(WITH_MSGLEVEL,5) AC_MSG_RESULT(fatal);;
+-	       *) AC_DEFINE(WITH_MSGLEVEL,0) AC_MSG_RESULT(debug);;
++	       debug) AC_DEFINE(WITH_MSGLEVEL,0, [msglevel]) AC_MSG_RESULT(debug);;
++	       info)  AC_DEFINE(WITH_MSGLEVEL,1, [msglevel]) AC_MSG_RESULT(info);;
++	       notice) AC_DEFINE(WITH_MSGLEVEL,2, [msglevel]) AC_MSG_RESULT(notice);;
++	       warn) AC_DEFINE(WITH_MSGLEVEL,3, [msglevel]) AC_MSG_RESULT(warn);;
++	       error) AC_DEFINE(WITH_MSGLEVEL,4, [msglevel]) AC_MSG_RESULT(error);;
++	       fatal) AC_DEFINE(WITH_MSGLEVEL,5, [msglevel]) AC_MSG_RESULT(fatal);;
++	       *) AC_DEFINE(WITH_MSGLEVEL,0, [msglevel]) AC_MSG_RESULT(debug);;
+ 	       esac],
+-	       [AC_DEFINE(WITH_MSGLEVEL,0) AC_MSG_RESULT(debug)])
++	       [AC_DEFINE(WITH_MSGLEVEL,0, [msglevel]) AC_MSG_RESULT(debug)])
+ 
+ #AC_SUBST(V_INCL)
+ 
+@@ -672,7 +672,7 @@
+ AC_HEADER_TIME
+ 
+ dnl Check for extra realtime library (for Solaris)
+-AC_CHECK_FUNC(nanosleep, AC_DEFINE(HAVE_NANOSLEEP), AC_CHECK_LIB(rt, nanosleep, [LIBS="-lrt $LIBS"; AC_DEFINE(HAVE_NANOSLEEP)]))
++AC_CHECK_FUNC(nanosleep, AC_DEFINE(HAVE_NANOSLEEP, [1], [have nanosleep]), AC_CHECK_LIB(rt, nanosleep, [LIBS="-lrt $LIBS"; AC_DEFINE(HAVE_NANOSLEEP, [1], [have nanosleep])]))
+ #AC_CHECK_FUNC(nanosleep, , AC_CHECK_LIB(rt, nanosleep))
+ 
+ dnl Checks for library functions.
+@@ -694,7 +694,7 @@
+ [sc_cv_type_longlong=yes],
+ [sc_cv_type_longlong=no])])
+ if test $sc_cv_type_longlong = yes; then
+-   AC_DEFINE(HAVE_TYPE_LONGLONG)
++   AC_DEFINE(HAVE_TYPE_LONGLONG, [1], [have type long long])
+ fi
+ AC_MSG_RESULT($sc_cv_type_longlong)
+ 
+@@ -710,7 +710,7 @@
+ [sc_cv_type_socklen=yes],
+ [sc_cv_type_socklen=no])])
+ if test $sc_cv_type_socklen = yes; then
+-   AC_DEFINE(HAVE_TYPE_SOCKLEN)
++   AC_DEFINE(HAVE_TYPE_SOCKLEN, [1], [Has Socklen])
+ fi
+ AC_MSG_RESULT($sc_cv_type_socklen)
+ 
+@@ -720,7 +720,7 @@
+ [sc_cv_type_stat64=yes],
+ [sc_cv_type_stat64=no])])
+ if test $sc_cv_type_stat64 = yes; then
+-   AC_DEFINE(HAVE_TYPE_STAT64)
++   AC_DEFINE(HAVE_TYPE_STAT64, [1], [Has stat64])
+ fi
+ AC_MSG_RESULT($sc_cv_type_stat64)
+ 
+@@ -730,7 +730,7 @@
+ [sc_cv_type_off64=yes],
+ [sc_cv_type_off64=no])])
+ if test $sc_cv_type_off64 = yes; then
+-   AC_DEFINE(HAVE_TYPE_OFF64)
++   AC_DEFINE(HAVE_TYPE_OFF64, [1], [have off64])
+ fi
+ AC_MSG_RESULT($sc_cv_type_off64)
+ 
+@@ -740,7 +740,7 @@
+ [sc_cv_type_sighandler=yes],
+ [sc_cv_type_sighandler=no])])
+ if test $sc_cv_type_sighandler = yes; then
+-   AC_DEFINE(HAVE_TYPE_SIGHANDLER)
++   AC_DEFINE(HAVE_TYPE_SIGHANDLER, [1], [have type sighandler])
+ fi
+ AC_MSG_RESULT($sc_cv_type_socklen)
+ 
+@@ -758,7 +758,7 @@
+ [sc_cv_type_uint8=yes],
+ [sc_cv_type_uint8=no])])
+ if test $sc_cv_type_uint8 = yes; then
+-   AC_DEFINE(HAVE_TYPE_UINT8)
++   AC_DEFINE(HAVE_TYPE_UINT8, [1], [have uint8])
+ fi
+ AC_MSG_RESULT($sc_cv_type_uint8)
+ 
+@@ -776,7 +776,7 @@
+ [sc_cv_type_uint16=yes],
+ [sc_cv_type_uint16=no])])
+ if test $sc_cv_type_uint16 = yes; then
+-   AC_DEFINE(HAVE_TYPE_UINT16)
++   AC_DEFINE(HAVE_TYPE_UINT16, [1], [have uint16t])
+ fi
+ AC_MSG_RESULT($sc_cv_type_uint16)
+ 
+@@ -794,7 +794,7 @@
+ [sc_cv_type_uint32=yes],
+ [sc_cv_type_uint32=no])])
+ if test $sc_cv_type_uint32 = yes; then
+-   AC_DEFINE(HAVE_TYPE_UINT32)
++   AC_DEFINE(HAVE_TYPE_UINT32, [1], [have uint32])
+ fi
+ AC_MSG_RESULT($sc_cv_type_uint32)
+ 
+@@ -812,7 +812,7 @@
+ [sc_cv_type_uint64=yes],
+ [sc_cv_type_uint64=no])])
+ if test $sc_cv_type_uint64 = yes; then
+-   AC_DEFINE(HAVE_TYPE_UINT64)
++   AC_DEFINE(HAVE_TYPE_UINT64, [1], [have uint64] )
+ fi
+ AC_MSG_RESULT($sc_cv_type_uint64)
+ 
+@@ -834,7 +834,7 @@
+ #include <sys/select.h>
+ #endif],
+ [fd_set s; s.fds_bits[0]=0;],
+-[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_FDS_BITS)],
++[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_FDS_BITS, [1], [have fds bits])],
+ [AC_MSG_RESULT(no);])
+ 
+ AC_MSG_CHECKING(for sa_family_t)
+@@ -844,7 +844,7 @@
+ [sc_cv_type_sa_family_t=yes],
+ [sc_cv_type_sa_family_t=no])])
+ if test $sc_cv_type_sa_family_t = yes; then
+-   AC_DEFINE(HAVE_TYPE_SA_FAMILY_T)
++   AC_DEFINE(HAVE_TYPE_SA_FAMILY_T, [1], [have sa family_t type])
+ fi
+ AC_MSG_RESULT($sc_cv_type_sa_family_t)
+ 
+@@ -854,7 +854,7 @@
+ [sc_cv_struct_sigaction_sa_sigaction=yes],
+ [sc_cv_struct_sigaction_sa_sigaction=no])])
+ if test $sc_cv_struct_sigaction_sa_sigaction = yes; then
+-   AC_DEFINE(HAVE_STRUCT_SIGACTION_SA_SIGACTION)
++   AC_DEFINE(HAVE_STRUCT_SIGACTION_SA_SIGACTION, [1], [sigaction])
+ fi
+ AC_MSG_RESULT($sc_cv_struct_sigaction_sa_sigaction)
+ 
+@@ -862,11 +862,11 @@
+ AC_MSG_CHECKING(for termios.c_ispeed)
+ AC_CACHE_VAL(sc_cv_termios_ispeed,
+ [AC_TRY_COMPILE([#include <termios.h>],
+-[struct termios t; t.c_ispeed=0;],
++[struct termios t; t.c_ispeed=ISPEED_OFFSET; t.c_ospeed=OSPEED_OFFSET;],
+ [sc_cv_termios_ispeed=yes],
+ [sc_cv_termios_ispeed=no])])
+ if test $sc_cv_termios_ispeed = yes; then
+-   AC_DEFINE(HAVE_TERMIOS_ISPEED)
++   AC_DEFINE(HAVE_TERMIOS_ISPEED, [1], [have ispeed])
+ fi
+ AC_MSG_RESULT($sc_cv_termios_ispeed)
+ 
+@@ -897,7 +897,7 @@
+ LIBS="$LIBS1"
+ AC_MSG_RESULT($ac_cv_ispeed_offset)
+  if test $ac_cv_ispeed_offset -ge 0; then
+-   AC_DEFINE_UNQUOTED(ISPEED_OFFSET, $ac_cv_ispeed_offset)
++   AC_DEFINE_UNQUOTED(ISPEED_OFFSET, $ac_cv_ispeed_offset, [have ispeed])
+  fi
+ fi
+ 
+@@ -916,7 +916,7 @@
+  )]
+ )])
+ if test $ac_cv_svid3 = yes; then
+-  AC_DEFINE(_SVID3)
++  AC_DEFINE(_SVID3, [1], [svid3])
+ fi
+ AC_MSG_RESULT($ac_cv_svid3)
+ 
+@@ -931,7 +931,7 @@
+ [sc_cv_struct_timespec=yes],
+ [sc_cv_struct_timespec=no])])
+ if test $sc_cv_struct_timespec = yes; then
+-   AC_DEFINE(HAVE_STRUCT_TIMESPEC)
++   AC_DEFINE(HAVE_STRUCT_TIMESPEC, [1], [struct timespec])
+ fi
+ AC_MSG_RESULT($sc_cv_struct_timespec)
+ 
+@@ -944,7 +944,7 @@
+ [sc_cv_struct_linger=yes],
+ [sc_cv_struct_linger=no])])
+ if test $sc_cv_struct_linger = yes; then
+-   AC_DEFINE(HAVE_STRUCT_LINGER)
++   AC_DEFINE(HAVE_STRUCT_LINGER, [1], [struct linger])
+ fi
+ AC_MSG_RESULT($sc_cv_struct_linger)
+ 
+@@ -958,7 +958,7 @@
+ [sc_cv_struct_ip_mreq=yes],
+ [sc_cv_struct_ip_mreq=no])])
+ if test $sc_cv_struct_ip_mreq = yes; then
+-   AC_DEFINE(HAVE_STRUCT_IP_MREQ)
++   AC_DEFINE(HAVE_STRUCT_IP_MREQ, [1], [have struct ip mreq])
+ fi
+ AC_MSG_RESULT($sc_cv_struct_ip_mreq)
+ 
+@@ -971,7 +971,7 @@
+ [sc_cv_struct_ip_mreqn=yes],
+ [sc_cv_struct_ip_mreqn=no])])
+ if test $sc_cv_struct_ip_mreqn = yes; then
+-   AC_DEFINE(HAVE_STRUCT_IP_MREQN)
++   AC_DEFINE(HAVE_STRUCT_IP_MREQN, [1], [have struct ip mreqn])
+ fi
+ AC_MSG_RESULT($sc_cv_struct_ip_mreqn)
+ 
+@@ -984,7 +984,7 @@
+ [sc_cv_struct_ipv6_mreq=yes],
+ [sc_cv_struct_ipv6_mreq=no])])
+ if test $sc_cv_struct_ipv6_mreq = yes; then
+-   AC_DEFINE(HAVE_STRUCT_IPV6_MREQ)
++   AC_DEFINE(HAVE_STRUCT_IPV6_MREQ, [1], [have struct ipv5 mreq])
+ fi
+ AC_MSG_RESULT($sc_cv_struct_ipv6_mreq)
+ 
+@@ -998,7 +998,7 @@
+ [sc_cv_struct_ifreq=yes],
+ [sc_cv_struct_ifreq=no])])
+ if test $sc_cv_struct_ifreq = yes; then
+-   AC_DEFINE(HAVE_STRUCT_IFREQ)
++   AC_DEFINE(HAVE_STRUCT_IFREQ, [1], [have struct ifreq])
+ fi
+ AC_MSG_RESULT($sc_cv_struct_ifreq)
+ 
+@@ -1013,7 +1013,7 @@
+ [sc_cv_struct_ifreq_ifr_index=yes],
+ [sc_cv_struct_ifreq_ifr_index=no])])
+ if test $sc_cv_struct_ifreq_ifr_index = yes; then
+-   AC_DEFINE(HAVE_STRUCT_IFREQ_IFR_INDEX)
++   AC_DEFINE(HAVE_STRUCT_IFREQ_IFR_INDEX, [1], [have struct ifreq ifr])
+ fi
+ AC_MSG_RESULT($sc_cv_struct_ifreq_ifr_index)
+ 
+@@ -1028,7 +1028,7 @@
+ [sc_cv_struct_ifreq_ifr_ifindex=yes],
+ [sc_cv_struct_ifreq_ifr_ifindex=no])])
+ if test $sc_cv_struct_ifreq_ifr_ifindex = yes; then
+-   AC_DEFINE(HAVE_STRUCT_IFREQ_IFR_IFINDEX)
++   AC_DEFINE(HAVE_STRUCT_IFREQ_IFR_IFINDEX, [1], [have struct ifreq ifindex])
+ fi
+ AC_MSG_RESULT($sc_cv_struct_ifreq_ifr_ifindex)
+ 
+@@ -1043,7 +1043,7 @@
+ [sc_cv_struct_sockaddr_salen=yes],
+ [sc_cv_struct_sockaddr_salen=no])])
+ if test $sc_cv_struct_sockaddr_salen = yes; then
+-   AC_DEFINE(HAVE_STRUCT_SOCKADDR_SALEN)
++   AC_DEFINE(HAVE_STRUCT_SOCKADDR_SALEN, [1], [sockaddr salen])
+ fi
+ AC_MSG_RESULT($sc_cv_struct_sockaddr_salen)
+ 
+@@ -1054,31 +1054,31 @@
+ #include <netinet/in.h>],
+ [struct sockaddr_in6 sa6;sa6.sin6_addr.s6_addr[0]=0;],
+ [AC_MSG_RESULT(s6_addr);
+- AC_DEFINE(HAVE_IP6_SOCKADDR, 0)],
++ AC_DEFINE(HAVE_IP6_SOCKADDR, 0, [ip6 sockaddr])],
+ [AC_TRY_COMPILE([#include <sys/types.h>
+ #include <netinet/in.h>],
+  [struct sockaddr_in6 sa6;sa6.sin6_addr.u6_addr.u6_addr16[0]=0;],
+  [AC_MSG_RESULT(u6_addr.u6_addr16);
+-  AC_DEFINE(HAVE_IP6_SOCKADDR, 1)],
++  AC_DEFINE(HAVE_IP6_SOCKADDR, 1, [ip6 sockaddr])],
+  [AC_TRY_COMPILE([#include <sys/types.h>
+ #include <netinet/in.h>],
+   [struct sockaddr_in6 sa6;sa6.sin6_addr.u6_addr16[0]=0;],
+-  [AC_MSG_RESULT(u6_addr16); AC_DEFINE(HAVE_IP6_SOCKADDR, 2)],
++  [AC_MSG_RESULT(u6_addr16); AC_DEFINE(HAVE_IP6_SOCKADDR, 2, [ip6 sockaddr])],
+   [AC_TRY_COMPILE([#include <sys/types.h>
+ #include <netinet/in.h>],
+    [struct sockaddr_in6 sa6;sa6.sin6_addr.in6_u.u6_addr16[0]=0;],
+    [AC_MSG_RESULT(in6_u.u6_addr16);
+-    AC_DEFINE(HAVE_IP6_SOCKADDR, 3)],
++    AC_DEFINE(HAVE_IP6_SOCKADDR, 3, [ip6 sockaddr])],
+    [AC_TRY_COMPILE([#include <sys/types.h>
+ #include <netinet/in.h>],
+     [struct sockaddr_in6 sa6;sa6.sin6_addr._S6_un._S6_u32[0]=0;],
+     [AC_MSG_RESULT(_S6_un._S6_u32);
+-     AC_DEFINE(HAVE_IP6_SOCKADDR, 4)],
++     AC_DEFINE(HAVE_IP6_SOCKADDR, 4, [ip6 sockaddr])],
+     [AC_TRY_COMPILE([#include <sys/types.h>
+ #include <netinet/in.h>],
+      [struct sockaddr_in6 sa6;sa6.sin6_addr.__u6_addr.__u6_addr32[0]=0;],
+      [AC_MSG_RESULT(__u6_addr.__u6_addr32);
+-      AC_DEFINE(HAVE_IP6_SOCKADDR, 5)],
++      AC_DEFINE(HAVE_IP6_SOCKADDR, 5, [ip6 sockaddr])],
+ 
+     [AC_MSG_RESULT([none or unknown])]
+ )])])])])])
+@@ -1090,7 +1090,7 @@
+ [sc_cv_struct_iovec=yes],
+ [sc_cv_struct_iovec=no])])
+ if test $sc_cv_struct_iovec = yes; then
+-   AC_DEFINE(HAVE_STRUCT_IOVEC)
++   AC_DEFINE(HAVE_STRUCT_IOVEC, [1], [have struct iovec])
+ fi
+ AC_MSG_RESULT($sc_cv_struct_iovec)
+ 
+@@ -1103,7 +1103,7 @@
+ [sc_cv_struct_msghdr_msgcontrol=yes],
+ [sc_cv_struct_msghdr_msgcontrol=no])])
+ if test $sc_cv_struct_msghdr_msgcontrol = yes; then
+-   AC_DEFINE(HAVE_STRUCT_MSGHDR_MSGCONTROL)
++   AC_DEFINE(HAVE_STRUCT_MSGHDR_MSGCONTROL, [1], [have struct msgcontrol])
+ fi
+ AC_MSG_RESULT($sc_cv_struct_msghdr_msgcontrol)
+ 
+@@ -1116,7 +1116,7 @@
+ [sc_cv_struct_msghdr_msgcontrollen=yes],
+ [sc_cv_struct_msghdr_msgcontrollen=no])])
+ if test $sc_cv_struct_msghdr_msgcontrollen = yes; then
+-   AC_DEFINE(HAVE_STRUCT_MSGHDR_MSGCONTROLLEN)
++   AC_DEFINE(HAVE_STRUCT_MSGHDR_MSGCONTROLLEN, [1], [have struct msghdr msgcontrollen])
+ fi
+ AC_MSG_RESULT($sc_cv_struct_msghdr_msgcontrollen)
+ 
+@@ -1129,7 +1129,7 @@
+ [sc_cv_struct_msghdr_msgflags=yes],
+ [sc_cv_struct_msghdr_msgflags=no])])
+ if test $sc_cv_struct_msghdr_msgflags = yes; then
+-   AC_DEFINE(HAVE_STRUCT_MSGHDR_MSGFLAGS)
++   AC_DEFINE(HAVE_STRUCT_MSGHDR_MSGFLAGS, [1], [msgflags])
+ fi
+ AC_MSG_RESULT($sc_cv_struct_msghdr_msgflags)
+ 
+@@ -1142,7 +1142,7 @@
+ [sc_cv_struct_cmsghdr=yes],
+ [sc_cv_struct_cmsghdr=no])])
+ if test $sc_cv_struct_cmsghdr = yes; then
+-   AC_DEFINE(HAVE_STRUCT_CMSGHDR)
++   AC_DEFINE(HAVE_STRUCT_CMSGHDR, [1], [have cmshdr])
+ fi
+ AC_MSG_RESULT($sc_cv_struct_cmsghdr)
+ 
+@@ -1155,7 +1155,7 @@
+ [sc_cv_struct_in_pktinfo=yes],
+ [sc_cv_struct_in_pktinfo=no])])
+ if test $sc_cv_struct_in_pktinfo = yes; then
+-   AC_DEFINE(HAVE_STRUCT_IN_PKTINFO)
++   AC_DEFINE(HAVE_STRUCT_IN_PKTINFO, [1], [pktinfo])
+ fi
+ AC_MSG_RESULT($sc_cv_struct_in_pktinfo)
+ 
+@@ -1170,7 +1170,7 @@
+ [sc_cv_struct_ip_ip_hl=yes],
+ [sc_cv_struct_ip_ip_hl=no])])
+ if test $sc_cv_struct_ip_ip_hl = yes; then
+-   AC_DEFINE(HAVE_STRUCT_IP_IP_HL)
++   AC_DEFINE(HAVE_STRUCT_IP_IP_HL, [1], [foo])
+ fi
+ AC_MSG_RESULT($sc_cv_struct_ip_ip_hl)
+ 
+@@ -1178,19 +1178,19 @@
+ dnl Library function checks
+ 
+ dnl Check sigaction()
+-AC_CHECK_FUNC(sigaction, AC_DEFINE(HAVE_SIGACTION))
++AC_CHECK_FUNC(sigaction, AC_DEFINE(HAVE_SIGACTION, [1], [foo]))
+ 
+ dnl Check for 64bit versions of system calls
+-AC_CHECK_FUNC(stat64, AC_DEFINE(HAVE_STAT64))
+-AC_CHECK_FUNC(fstat64, AC_DEFINE(HAVE_FSTAT64))
+-AC_CHECK_FUNC(lstat64, AC_DEFINE(HAVE_LSTAT64))
+-AC_CHECK_FUNC(lseek64, AC_DEFINE(HAVE_LSEEK64))
+-AC_CHECK_FUNC(truncate64, AC_DEFINE(HAVE_TRUNCATE64))
+-AC_CHECK_FUNC(ftruncate64, AC_DEFINE(HAVE_FTRUNCATE64))
+-
+-AC_CHECK_FUNC(strtoll, AC_DEFINE(HAVE_STRTOLL))
+-AC_CHECK_FUNC(hstrerror, AC_DEFINE(HAVE_HSTRERROR))
+-AC_CHECK_FUNC(inet_ntop, AC_DEFINE(HAVE_INET_NTOP))
++AC_CHECK_FUNC(stat64, AC_DEFINE(HAVE_STAT64, [1], [foo]))
++AC_CHECK_FUNC(fstat64, AC_DEFINE(HAVE_FSTAT64, [1], [foo]))
++AC_CHECK_FUNC(lstat64, AC_DEFINE(HAVE_LSTAT64, [1], [foo]))
++AC_CHECK_FUNC(lseek64, AC_DEFINE(HAVE_LSEEK64, [1], [foo]))
++AC_CHECK_FUNC(truncate64, AC_DEFINE(HAVE_TRUNCATE64, [1], [foo]))
++AC_CHECK_FUNC(ftruncate64, AC_DEFINE(HAVE_FTRUNCATE64, [1], [foo]))
++
++AC_CHECK_FUNC(strtoll, AC_DEFINE(HAVE_STRTOLL, [1], [foo]))
++AC_CHECK_FUNC(hstrerror, AC_DEFINE(HAVE_HSTRERROR, [1], [foo]))
++AC_CHECK_FUNC(inet_ntop, AC_DEFINE(HAVE_INET_NTOP, [1], [foo]))
+ 
+ #if test "$ac_cv_func_hstrerror" = "yes"; then
+ #  AC_MSG_CHECKING(if _XOPEN_SOURCE_EXTENDED is helpful)
+@@ -1213,25 +1213,26 @@
+ 
+ dnl Search for openpty()
+ # MacOS
+-AC_CHECK_FUNC(openpty, AC_DEFINE(HAVE_OPENPTY))
++AC_CHECK_FUNC(openpty, AC_DEFINE(HAVE_OPENPTY, [1], [foo]))
+ # AIX
+ AC_CHECK_LIB(bsd, openpty,
+-  [LIBS="-lbsd $LIBS"; AC_DEFINE(HAVE_OPENPTY)])
++  [LIBS="-lbsd $LIBS"; AC_DEFINE(HAVE_OPENPTY, [1], [foo])])
+ # Linux 2.4
+ AC_CHECK_LIB(util, openpty,
+-  [LIBS="-lutil $LIBS"; AC_DEFINE(HAVE_OPENPTY)])
++  [LIBS="-lutil $LIBS"; AC_DEFINE(HAVE_OPENPTY, [1], [foo])])
++
+ 
+ dnl Search for flock()
+ # with Linux it's in libc, with AIX in libbsd
+-AC_CHECK_FUNC(flock, AC_DEFINE(HAVE_FLOCK),
++AC_CHECK_FUNC(flock, AC_DEFINE(HAVE_FLOCK, [1], [have flock]),
+ 	AC_CHECK_LIB(bsd, flock, [LIBS="-lbsd $LIBS"]))
+ 
+ dnl Search for setenv()
+-AC_CHECK_FUNC(setenv, AC_DEFINE(HAVE_SETENV),
++AC_CHECK_FUNC(setenv, AC_DEFINE(HAVE_SETENV, [1], [have setenv]),
+ 	AC_CHECK_LIB(isode, setenv, [LIBS="-lisode $LIBS"]))
+ 
+ dnl Search for unsetenv()
+-AC_CHECK_FUNC(unsetenv, AC_DEFINE(HAVE_UNSETENV))
++AC_CHECK_FUNC(unsetenv, AC_DEFINE(HAVE_UNSETENV, [1], [have unsetenv]))
+ 
+ 
+ dnl Run time checks
+@@ -1250,7 +1251,7 @@
+ [ac_cv_have_z_modifier=no],
+ [ac_cv_have_z_modifier=no])])
+ if test $ac_cv_have_z_modifier = yes; then
+-   AC_DEFINE(HAVE_FORMAT_Z)
++   AC_DEFINE(HAVE_FORMAT_Z, [1], [have format z])
+ fi
+ AC_MSG_RESULT($ac_cv_have_z_modifier)
+ 
+@@ -1289,7 +1290,8 @@
+  [AC_MSG_RESULT(please determine $1_SHIFT manually)]
+ )
+  LIBS="$LIBS1"])
+-AC_DEFINE_UNQUOTED($1_SHIFT, ${$2})
++SHIFT_NAME="$1"_SHIFT
++AC_DEFINE_UNQUOTED($SHIFT_NAME, ${$2}, [foo])
+ ])
+ 
+ AC_SHIFT_OFFSET(CRDLY,  sc_cv_sys_crdly_shift)
+@@ -1326,7 +1328,7 @@
+         [$4="0 /* unknown, taking default */"
+ ]) ]) ]) ]) ]) ]) ]) ])
+  CFLAGS="$CFLAGS1" ])
+-AC_DEFINE_UNQUOTED($3, ${$4})
++AC_DEFINE_UNQUOTED($3, ${$4}, [foo])
+ ])
+ 
+ dnl find what physical type (basic C type) describes the given struct or union
+@@ -1358,7 +1360,7 @@
+        [$5="0 /* unknown, taking default */"
+ ]) ]) ]) ]) ]) ]) ]) ])
+  CFLAGS="$CFLAGS1" ])
+-AC_DEFINE_UNQUOTED($4, ${$5})
++AC_DEFINE_UNQUOTED($4, ${$5}, [foo])
+ ])
+ 
+ AC_BASIC_TYPE([#include <stdlib.h>], size_t, HAVE_BASIC_SIZE_T, sc_cv_type_sizet_basic)
+@@ -1416,13 +1418,13 @@
+ 
+ AC_MSG_CHECKING(for /dev/ptmx)
+ if test -c /dev/ptmx; then
+-  AC_DEFINE(HAVE_DEV_PTMX, 1)
++  AC_DEFINE(HAVE_DEV_PTMX, 1, [ptmx])
+   AC_MSG_RESULT(yes)
+ else
+   AC_MSG_RESULT(no)
+   AC_MSG_CHECKING(for /dev/ptc)
+   if test -c /dev/ptc; then
+-    AC_DEFINE(HAVE_DEV_PTC)
++    AC_DEFINE(HAVE_DEV_PTC, 1, [ptc])
+     AC_MSG_RESULT(yes)
+   else
+     AC_MSG_RESULT(no)
+@@ -1431,7 +1433,7 @@
+ 
+ AC_MSG_CHECKING(for /proc)
+ if test -d /proc; then
+-  AC_DEFINE(HAVE_PROC_DIR, 1)
++  AC_DEFINE(HAVE_PROC_DIR, 1, [procdir])
+   AC_MSG_RESULT(yes)
+ else
+   AC_MSG_RESULT(no)
+@@ -1439,7 +1441,7 @@
+ 
+ AC_MSG_CHECKING(for /proc/*/fd)
+ if test -d /proc/$$/fd; then
+-  AC_DEFINE(HAVE_PROC_DIR_FD, 1)
++  AC_DEFINE(HAVE_PROC_DIR_FD, 1, [procdir fd])
+   AC_MSG_RESULT(yes)
+ else
+   AC_MSG_RESULT(no)
+@@ -1479,7 +1481,7 @@
+       done])
+   ])
+   if test "$sc_cv_have_tcpd_h" = "yes"; then
+-    AC_DEFINE(HAVE_TCPD_H)
++    AC_DEFINE(HAVE_TCPD_H, [1], [have tcpd])
+   fi
+   AC_MSG_NOTICE(checked for tcpd.h... $sc_cv_have_tcpd_h)
+ fi	# end checking for tcpd.h
+@@ -1512,14 +1514,14 @@
+     ]
+   )
+   if test "$sc_cv_have_libwrap" = 'yes'; then
+-    AC_DEFINE(HAVE_LIBWRAP)
++    AC_DEFINE(HAVE_LIBWRAP, [1], [libwrap])
+   fi
+   AC_MSG_RESULT($sc_cv_have_libwrap)
+ fi
+ #
+ if test -n "$WITH_LIBWRAP"; then
+   if test "$sc_cv_have_tcpd_h" = "yes" -a "$sc_cv_have_libwrap" = "yes"; then
+-    AC_DEFINE(WITH_LIBWRAP)
++    AC_DEFINE(WITH_LIBWRAP, [1], [libwrap])
+   else
+     AC_MSG_WARN([not all components of tcp wrappers found, disabling it]);
+   fi
+@@ -1534,7 +1536,7 @@
+       [sc_cv_have_hosts_allow_table=yes],
+       [sc_cv_have_hosts_allow_table=no])])
+   if test $sc_cv_have_hosts_allow_table = yes; then
+-    AC_DEFINE(HAVE_HOSTS_ALLOW_TABLE)
++    AC_DEFINE(HAVE_HOSTS_ALLOW_TABLE, [1], [hosts allow table])
+   fi
+   AC_MSG_RESULT($sc_cv_have_hosts_allow_table)
+ fi # test -n "$WITH_LIBWRAP"
diff --git a/recipes/socat/files/ldflags.patch b/recipes/socat/files/ldflags.patch
deleted file mode 100644
index 6ab4681383..0000000000
--- a/recipes/socat/files/ldflags.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- socat-1.3/Makefile.in~ldflags
-+++ socat-1.3/Makefile.in
-@@ -33,6 +33,7 @@
- 
- 
- CFLAGS = @CFLAGS@ $(CCOPTS) $(DEFS) $(INCLS)
-+LDFLAGS = @LDFLAGS@
- CLIBS = $(LIBS)
- #CLIBS = $(LIBS) -lm -lefence
- XIOSRCS = xioinitialize.c xiohelp.c xioparam.c xiodiag.c xioopen.c xioopts.c xiosigchld.c xioread.c xiowrite.c \
-@@ -78,13 +79,13 @@
- 	makedepend @SYSDEFS@ $(CFILES)
- 
- socat: socat.o libxio.a
--	$(CC) $(CFLAGS) -o $@ socat.o libxio.a $(CLIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ socat.o libxio.a $(CLIBS)
- 
- procan: procan_main.o procan.o error.o sycls.o sysutils.o utils.o
--	$(CC) $(CFLAGS) -o $@ procan_main.o procan.o error.o sycls.o sysutils.o utils.o $(CLIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ procan_main.o procan.o error.o sycls.o sysutils.o utils.o $(CLIBS)
- 
- filan: filan_main.o filan.o fdname.o error.o sycls.o sysutils.o utils.o
--	$(CC) $(CFLAGS) -o $@ filan_main.o filan.o fdname.o error.o sycls.o sysutils.o utils.o $(CLIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ filan_main.o filan.o fdname.o error.o sycls.o sysutils.o utils.o $(CLIBS)
- 
- libxio.a: $(XIOOBJS) $(UTLOBJS)
- 	$(AR) r $@ $(XIOOBJS) $(UTLOBJS)
diff --git a/recipes/socat/files/xioinitialize.patch b/recipes/socat/files/xioinitialize.patch
deleted file mode 100644
index 24e816cfd7..0000000000
--- a/recipes/socat/files/xioinitialize.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -Naur socat-1.3/xioinitialize.c socat-1.3_patched/xioinitialize.c
---- socat-1.3/xioinitialize.c	2003-05-23 08:24:53.000000000 +0200
-+++ socat-1.3_patched/xioinitialize.c	2006-09-09 18:18:19.000000000 +0200
-@@ -19,48 +19,10 @@
-    assert(O_WRONLY==1);
-    assert(O_RDWR==2);
- 
--   /* some assertions about termios */
--#if WITH_TERMIOS
--#ifdef CRDLY
--   assert(3 << opt_crdly.arg3  == CRDLY);
--#endif
--#ifdef TABDLY
--   assert(3 << opt_tabdly.arg3 == TABDLY);
--#endif
--   assert(3 << opt_csize.arg3  == CSIZE);
--   {
--      union {
--	 struct termios termarg;
--	 tcflag_t flags[4];
--#if HAVE_TERMIOS_ISPEED
--	 speed_t speeds[sizeof(struct termios)/sizeof(speed_t)];
--#endif
--      } tdata;
--      tdata.termarg.c_iflag = 0x12345678;
--      tdata.termarg.c_oflag = 0x23456789;
--      tdata.termarg.c_cflag = 0x3456789a;
--      tdata.termarg.c_lflag = 0x456789ab;
--      assert(tdata.termarg.c_iflag == tdata.flags[0]);
--      assert(tdata.termarg.c_oflag == tdata.flags[1]);
--      assert(tdata.termarg.c_cflag == tdata.flags[2]);
--      assert(tdata.termarg.c_lflag == tdata.flags[3]);
--#if HAVE_TERMIOS_ISPEED
--      tdata.termarg.c_ispeed = 0x56789abc;
--      tdata.termarg.c_ospeed = 0x6789abcd;
--      assert(tdata.termarg.c_ispeed == tdata.speeds[ISPEED_OFFSET]);
--      assert(tdata.termarg.c_ospeed == tdata.speeds[OSPEED_OFFSET]);
--#endif
--   }
--#endif
--
-    /* these dependencies required in applyopts() for OFUNC_FCNTL */
-    assert(F_GETFD == F_SETFD-1);
-    assert(F_GETFL == F_SETFL-1);
- 
--   if (Atexit(xioexit) < 0) {
--      Error("atexit(xioexit) failed");
--      return -1;
--   }
-    xioinitialized = 1;
-    return 0;
- }
diff --git a/recipes/socat/files/xioopen.patch b/recipes/socat/files/xioopen.patch
deleted file mode 100644
index 456862653a..0000000000
--- a/recipes/socat/files/xioopen.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur socat-1.3/xioopen.h socat-1.3_patched/xioopen.h
---- socat-1.3/xioopen.h	2003-02-15 15:26:22.000000000 +0100
-+++ socat-1.3_patched/xioopen.h	2006-09-05 10:49:15.000000000 +0200
-@@ -42,7 +42,6 @@
- extern const char *ddirection[];
- extern const char *filetypenames[];
- extern const struct addrname addressnames[];
--extern const char *addressgroupnames[];
- extern const struct optname optionnames[];
- 
- extern int xioopen_makedual(xiofile_t *file);
diff --git a/recipes/socat/socat_1.3.2.1.bb b/recipes/socat/socat_1.7.1.2.bb
index c30fb7a0ec..769d3a73d6 100644
--- a/recipes/socat/socat_1.3.2.1.bb
+++ b/recipes/socat/socat_1.7.1.2.bb
@@ -3,13 +3,13 @@ DEPENDS = "openssl"
 DESCRIPTION = "Socat is a relay for bidirectional data \
 transfer between two independent data channels."
 LICENSE = "GPL"
-PR = "r1"
+PR = "r0"
 
-SRC_URI = "http://www.dest-unreach.org/socat/download/Archive/socat-${PV}.tar.bz2 \
-           file://xioopen.patch;patch=1 \
-           file://ldflags.patch;patch=1 \
-           file://xioinitialize.patch;patch=1"
-S = "${WORKDIR}/socat-1.3"
+SRC_URI = "http://www.dest-unreach.org/socat/download/Archive/socat-${PV}.tar.bz2;name=src \
+           file://compile.patch;patch=1"
+SRC_URI[src.md5sum] = "9c0c5e83ce665f38d4d3aababad275eb"
+SRC_URI[src.sha256sum] = "f7395b154914bdaa49805603aac2a90fb3d60255f95691d7779ab4680615e167"
+EXTRA_OECONF = " --disable-termios "
 
 inherit autotools