--- embedaddon/arping/configure.ac	2016/10/18 13:16:10	1.1.1.3
+++ embedaddon/arping/configure.ac	2021/03/16 23:40:57	1.1.1.4
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.61)
-AC_INIT(arping, 2.15, thomas@habets.se)
+AC_INIT(arping, 2.21, thomas@habets.se)
 AC_CANONICAL_SYSTEM
 AC_CONFIG_SRCDIR([src/arping.c])
 AM_INIT_AUTOMAKE
@@ -15,6 +15,12 @@ AC_PROG_CC
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
 
+# Required to define __USE_MISC, which in turn typedefs uint, which
+# is used by libnet headers.
+# This "just works" until running GCC with -std=c99, where uint is
+# no longer defined by default.
+CPPFLAGS="$CPPFLAGS -D_DEFAULT_SOURCE=1"
+
 # Checks for libraries.
 AC_CHECK_LIB([m], [sqrt])
 AC_CHECK_LIB([socket], [socket])
@@ -22,7 +28,7 @@ AC_CHECK_LIB([nsl], [gethostbyname])
 AC_CHECK_LIB([cap], [cap_init])
 AC_CHECK_LIB([rt], [clock_gettime])
 AC_CHECK_LIB([net], [libnet_name_resolve],
-      [AC_MSG_ERROR([libnet 1.0.x found. Arping 2.x requires libnet 1.1.x])])
+      [AC_MSG_ERROR([libnet 1.0.x found. Arping 2.x requires libnet 1.1 or newer])])
 AC_CHECK_LIB([net], [libnet_init], ,[AC_MSG_ERROR([libnet 1.1.x not found])])
 AC_CHECK_LIB([pcap], [pcap_open_live], ,[AC_MSG_ERROR([libpcap not found])])
 AC_SEARCH_LIBS([clock_gettime], [rt])
@@ -34,13 +40,17 @@ arpa/inet.h \
 netinet/in.h \
 stdlib.h \
 sys/socket.h \
+getopt.h \
 time.h \
+grp.h \
 sys/time.h \
 sys/types.h \
+sys/param.h \
 sys/capability.h \
 stdint.h \
 libnet.h \
 win32/libnet.h \
+sys/random.h \
 net/bpf.h \
 pwd.h \
 unistd.h])
@@ -65,7 +75,8 @@ AC_FUNC_SELECT_ARGTYPES
 AC_FUNC_SETVBUF_REVERSED
 AC_TYPE_SIGNAL
 AC_CHECK_FUNCS([gettimeofday memset select strchr strdup strerror strstr \
-getifaddrs cap_init pcap_create pcap_list_tstamp_types pcap_set_immediate_mode])
+getifaddrs cap_init pcap_create pcap_list_tstamp_types pcap_set_immediate_mode \
+pledge unveil pcap_findalldevs getrandom])
 
 if test x$ac_cv_func_getifaddrs = xyes; then
     AC_LIBOBJ([findif_getifaddrs])
@@ -86,28 +97,50 @@ else
     esac
 fi
 
+AC_CACHE_CHECK([for libnet_init signature has const],
+		    ac_cv_have_libnet_init_const, [
+		    AC_TRY_LINK([#include<libnet.h>],
+[libnet_t*libnet_init(int a,const char* b,char* c);],
+  [ ac_cv_have_libnet_init_const="yes" ],
+  [ ac_cv_have_libnet_init_const="no" ])
+])
+if test x$ac_cv_have_libnet_init_const = xyes; then
+   AC_DEFINE([HAVE_LIBNET_INIT_CONST], [1], [Libnet init takes const char device])
+fi
 
+AC_CACHE_CHECK([for libnet_name2addr4 signature has const],
+		    ac_cv_have_libnet_name2addr4_const, [
+		    AC_TRY_LINK([#include<libnet.h>],
+[uint32_t libnet_name2addr4(libnet_t*a, const char* b,uint8_t c);],
+  [ ac_cv_have_libnet_name2addr4_const="yes" ],
+  [ ac_cv_have_libnet_name2addr4_const="no" ])
+])
+if test x$ac_cv_have_libnet_name2addr4_const = xyes; then
+   AC_DEFINE([HAVE_LIBNET_NAME2ADDR4_CONST], [1], [Libnet name2addr4 takes const char* addr])
+fi
 
+
 # check for CLOCK_MONOTONIC
-AC_CACHE_CHECK([for CLOCK_MONOTONIC],
-                                  ac_cv_have_clock_monotonic, [
-                                  AC_TRY_RUN(
-                                        [
-#include <time.h>
-#include <sys/time.h>
-int main() {
-struct timespec ts;
-exit(!!clock_gettime(CLOCK_MONOTONIC, &ts));
-}
-                ],
-                        [ ac_cv_have_clock_monotonic="yes" ],
-                        [ ac_cv_have_clock_monotonic="no" ]
-                          )
-])
-AM_CONDITIONAL(HAVE_CLOCK_MONOTONIC, test x$ac_cv_have_clock_monotonic = xyes)
-if test x$ac_cv_have_clock_monotonic = xyes; then
+AC_CHECK_DECL([CLOCK_MONOTONIC], [], [],
+              [
+                #include <time.h>
+                #include <sys/time.h>
+              ]
+)
+AM_CONDITIONAL(HAVE_CLOCK_MONOTONIC, test x$ac_cv_have_decl_CLOCK_MONOTONIC = xyes)
+if test x$ac_cv_have_decl_CLOCK_MONOTONIC = xyes; then
    AC_DEFINE([HAVE_CLOCK_MONOTONIC], [1], [Monotonic clock])
 fi
+
+AC_ARG_ENABLE(hardened, AS_HELP_STRING([--enable-hardened], [Enable security build options]),
+                        [
+                          CFLAGS+=" -pie -fPIE -fstack-protector-all --param ssp-buffer-size=1 -D_FORTIFY_SOURCE=2"
+                          LDFLAGS+=" -pie -fPIE -Wl,-z,relro -Wl,-z,now -Wl,-z,noexecstack"
+                        ])
+AC_ARG_ENABLE(warnings, AS_HELP_STRING([--enable-warnings], [Enable build warnings]),
+                        [
+                          CFLAGS+=" -Wall -Wpedantic -Wextra -Wformat -Wstack-protector -Wformat-security -Werror=format-security"
+                        ])
 
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([src/Makefile])