merge of '119a1b8e3787f193a0a34391450debc2878897c4'

     and '4f36e4b6e145cb3251f372bb7153308459b7ea41'

12 files changed, 31 insertions, 0 deletions

diff --git a/site/arm-linux b/site/arm-linux
index ce15c881e8..5aa8a4cf5c 100644
--- a/site/arm-linux
+++ b/site/arm-linux
@@ -72,6 +72,7 @@ nano_cv_func_regexec_segv_emptystr=${nano_cv_func_regexec_segv_emptystr=no}
 
 # libnet 
 ac_cv_libnet_endianess=${ac_cv_libnet_endianess=lil}
+ac_libnet_have_packet_socket=${ac_libnet_have_packet_socket=yes}
 
 # screen
 screen_cv_sys_bcopy_overlap=${screen_cv_sys_bcopy_overlap=no}
diff --git a/site/arm-linux-gnueabi b/site/arm-linux-gnueabi
index ce15c881e8..77ce33f338 100644
--- a/site/arm-linux-gnueabi
+++ b/site/arm-linux-gnueabi
@@ -72,6 +72,7 @@ nano_cv_func_regexec_segv_emptystr=${nano_cv_func_regexec_segv_emptystr=no}
 
 # libnet 
 ac_cv_libnet_endianess=${ac_cv_libnet_endianess=lil}
+ac_libnet_have_packet_socket=${ac_libnet_have_packet_socket=yes}
 
 # screen
 screen_cv_sys_bcopy_overlap=${screen_cv_sys_bcopy_overlap=no}
@@ -305,3 +306,16 @@ dpkg_cv___va_copy=${ac_cv___va_copy=yes}
 # enca
 yeti_cv_func_scanf_modif_size_t=yes
 
+# clamav
+clamav_av_func_working_snprintf_long=${clamav_av_func_working_snprintf_long=yes}
+clamav_av_have_in_port_t=${clamav_av_have_in_port_t=yes}
+clamav_av_have_in_addr_t=${clamav_av_have_in_addr_t=yes}
+ac_cv_func_mmap_fixed_mapped=${ac_cv_func_mmap_fixed_mapped=yes}
+
+#dbus
+ac_cv_have_abstract_sockets=${ac_cv_have_abstract_sockets=no}
+
+# p3scan
+ac_cv_func_realloc_0_nonnull=${ac_cv_func_realloc_0_nonnull=yes}
+
+
diff --git a/site/arm-linux-uclibc b/site/arm-linux-uclibc
index 76a93f0f67..f33855f080 100644
--- a/site/arm-linux-uclibc
+++ b/site/arm-linux-uclibc
@@ -57,6 +57,7 @@ nano_cv_func_regexec_segv_emptystr=${nano_cv_func_regexec_segv_emptystr=no}
 
 # libnet 
 ac_cv_libnet_endianess=${ac_cv_libnet_endianess=lil}
+ac_libnet_have_packet_socket=${ac_libnet_have_packet_socket=yes}
 
 # screen
 screen_cv_sys_bcopy_overlap=${screen_cv_sys_bcopy_overlap=no}
diff --git a/site/arm-linux-uclibcgnueabi b/site/arm-linux-uclibcgnueabi
index 76a93f0f67..f33855f080 100644
--- a/site/arm-linux-uclibcgnueabi
+++ b/site/arm-linux-uclibcgnueabi
@@ -57,6 +57,7 @@ nano_cv_func_regexec_segv_emptystr=${nano_cv_func_regexec_segv_emptystr=no}
 
 # libnet 
 ac_cv_libnet_endianess=${ac_cv_libnet_endianess=lil}
+ac_libnet_have_packet_socket=${ac_libnet_have_packet_socket=yes}
 
 # screen
 screen_cv_sys_bcopy_overlap=${screen_cv_sys_bcopy_overlap=no}
diff --git a/site/armeb-linux b/site/armeb-linux
index 3b47d0cd96..d00d9189e4 100644
--- a/site/armeb-linux
+++ b/site/armeb-linux
@@ -60,6 +60,7 @@ nano_cv_func_regexec_segv_emptystr=${nano_cv_func_regexec_segv_emptystr=no}
 
 # libnet 
 ac_cv_libnet_endianess=${ac_cv_libnet_endianess=big}
+ac_libnet_have_packet_socket=${ac_libnet_have_packet_socket=yes}
 
 # screen
 screen_cv_sys_bcopy_overlap=${screen_cv_sys_bcopy_overlap=no}
diff --git a/site/armeb-linux-uclibc b/site/armeb-linux-uclibc
index 54c529b1ff..c399e64f0c 100644
--- a/site/armeb-linux-uclibc
+++ b/site/armeb-linux-uclibc
@@ -60,6 +60,7 @@ nano_cv_func_regexec_segv_emptystr=${nano_cv_func_regexec_segv_emptystr=no}
 
 # libnet 
 ac_cv_libnet_endianess=${ac_cv_libnet_endianess=big}
+ac_libnet_have_packet_socket=${ac_libnet_have_packet_socket=yes}
 
 # screen
 screen_cv_sys_bcopy_overlap=${screen_cv_sys_bcopy_overlap=no}
diff --git a/site/i486-linux b/site/i486-linux
index 6116fde046..114b8d7280 100644
--- a/site/i486-linux
+++ b/site/i486-linux
@@ -178,3 +178,7 @@ ac_cv_func_mmap_fixed_mapped=${ac_cv_func_mmap_fixed_mapped=yes}
 
 # p3scan
 ac_cv_func_realloc_0_nonnull=${ac_cv_func_realloc_0_nonnull=yes}
+
+# libnet 
+ac_cv_lbl_unaligned_fail=${ac_cv_lbl_unaligned_fail=no}
+ac_libnet_have_packet_socket=${ac_libnet_have_packet_socket=yes}
diff --git a/site/powerpc-linux b/site/powerpc-linux
index 806c011f64..75f8998f23 100644
--- a/site/powerpc-linux
+++ b/site/powerpc-linux
@@ -65,6 +65,7 @@ nano_cv_func_regexec_segv_emptystr=${nano_cv_func_regexec_segv_emptystr=no}
 
 # libnet 
 ac_cv_libnet_endianess=${ac_cv_libnet_endianess=big}
+ac_libnet_have_packet_socket=${ac_libnet_have_packet_socket=yes}
 
 # screen
 screen_cv_sys_bcopy_overlap=${screen_cv_sys_bcopy_overlap=no}
diff --git a/site/sh3-linux b/site/sh3-linux
index 8f7998a3de..c83ea6935a 100644
--- a/site/sh3-linux
+++ b/site/sh3-linux
@@ -64,6 +64,7 @@ nano_cv_func_regexec_segv_emptystr=${nano_cv_func_regexec_segv_emptystr=no}
 
 # libnet 
 ac_cv_libnet_endianess=${ac_cv_libnet_endianess=lil}
+ac_libnet_have_packet_socket=${ac_libnet_have_packet_socket=yes}
 
 # screen
 screen_cv_sys_bcopy_overlap=${screen_cv_sys_bcopy_overlap=no}
diff --git a/site/sh4-linux b/site/sh4-linux
index e2c4df0064..1dc9567ea8 100644
--- a/site/sh4-linux
+++ b/site/sh4-linux
@@ -288,3 +288,7 @@ clamav_av_func_working_snprintf_long=${clamav_av_func_working_snprintf_long=yes}
 clamav_av_have_in_port_t=${clamav_av_have_in_port_t=yes}
 clamav_av_have_in_addr_t=${clamav_av_have_in_addr_t=yes}
 ac_cv_func_mmap_fixed_mapped=${ac_cv_func_mmap_fixed_mapped=yes}
+
+# libnet 
+ac_cv_lbl_unaligned_fail=${ac_cv_lbl_unaligned_fail=no}
+ac_libnet_have_packet_socket=${ac_libnet_have_packet_socket=yes}
diff --git a/site/x86_64-linux b/site/x86_64-linux
index dc7cb09069..1a2ea5a42f 100644
--- a/site/x86_64-linux
+++ b/site/x86_64-linux
@@ -11,6 +11,7 @@ ac_cv_func_setvbuf_reversed=${ac_cv_func_setvbuf_reversed=no}
 ac_cv_func_stat_empty_string_bug=${ac_cv_func_stat_empty_string_bug=no}
 ac_cv_func_stat_ignores_trailing_slash=${ac_cv_func_stat_ignores_trailing_slash=no}
 ac_cv_libnet_endianess=${ac_cv_libnet_endianess=lil}
+ac_libnet_have_packet_socket=${ac_libnet_have_packet_socket=yes}
 ac_cv_linux_vers=${ac_cv_linux_vers=2}
 ac_cv_need_trio=${ac_cv_need_trio=no}
 ac_cv_sizeof_char=${ac_cv_sizeof_char=1}
diff --git a/site/x86_64-linux-uclibc b/site/x86_64-linux-uclibc
index ba60564d0d..2bb77f763f 100644
--- a/site/x86_64-linux-uclibc
+++ b/site/x86_64-linux-uclibc
@@ -11,6 +11,7 @@ ac_cv_func_setvbuf_reversed=${ac_cv_func_setvbuf_reversed=no}
 ac_cv_func_stat_empty_string_bug=${ac_cv_func_stat_empty_string_bug=no}
 ac_cv_func_stat_ignores_trailing_slash=${ac_cv_func_stat_ignores_trailing_slash=no}
 ac_cv_libnet_endianess=${ac_cv_libnet_endianess=lil}
+ac_libnet_have_packet_socket=${ac_libnet_have_packet_socket=yes}
 ac_cv_linux_vers=${ac_cv_linux_vers=2}
 ac_cv_need_trio=${ac_cv_need_trio=no}
 ac_cv_sizeof_char=${ac_cv_sizeof_char=1}