diff options
55 files changed, 457 insertions, 508 deletions
diff --git a/package/SDL_ttf/Makefile b/package/SDL_ttf/Makefile index 0afba1946..9d7cdf971 100644 --- a/package/SDL_ttf/Makefile +++ b/package/SDL_ttf/Makefile @@ -23,6 +23,8 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBSDL_TTF,libsdl-ttf,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LIBSDL_TTF_DEV,libsdl-ttf-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBSDL_TTF_DEV},${PKGSC_LIBSDL_TTF_DEV})) +TARGET_LDFLAGS+= -lintl + libsdl-ttf-install: $(INSTALL_DIR) $(IDIR_LIBSDL_TTF)/usr/lib $(CP) $(WRKINST)/usr/lib/libSDL_ttf*so* $(IDIR_LIBSDL_TTF)/usr/lib diff --git a/package/bridge-utils/Makefile b/package/bridge-utils/Makefile index fdf7a805b..21606c2e4 100644 --- a/package/bridge-utils/Makefile +++ b/package/bridge-utils/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 0182fcac3a2b307113bbec34e5f1c673 PKG_DESCR:= Ethernet bridging tools PKG_SECTION:= bridge -PKG_DEPENDS:= kmod-bridge +PKG_DEPENDS:= kmod-bridge kmod-ipv6 PKG_URL:= http://www.linuxfoundation.org/en/Net:Bridge PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=bridge/} diff --git a/package/ccid/Makefile b/package/ccid/Makefile index e11ca53f9..3d8ca72e8 100644 --- a/package/ccid/Makefile +++ b/package/ccid/Makefile @@ -11,7 +11,7 @@ PKG_DESCR:= a generic USB CCID and ICCD driver PKG_SECTION:= crypto PKG_BUILDDEP:= pcsc-lite PKG_URL:= http://pcsclite.alioth.debian.org/ccid.html -PKG_SITES:= http://alioth.debian.org/frs/download.php/3579/ +PKG_SITES:= http://openadk.org/distfiles/ PKG_ARCH_DEPENDS:= !avr32 diff --git a/package/cifs-utils/Makefile b/package/cifs-utils/Makefile index 189a460be..4b718b07d 100644 --- a/package/cifs-utils/Makefile +++ b/package/cifs-utils/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= cifs-utils PKG_VERSION:= 6.0 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 371e007a201be90c16497cd9bd5e2553 PKG_DESCR:= CIFS utilities PKG_SECTION:= net/fs @@ -19,6 +19,10 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,CIFS_UTILS,cifs-utils,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +CONFIGURE_ARGS+= --disable-cifsupcall \ + --disable-cifsidmap \ + --disable-cifsacl + cifs-utils-install: $(INSTALL_DIR) $(IDIR_CIFS_UTILS)/usr/sbin $(INSTALL_BIN) $(WRKINST)/sbin/mount.cifs \ diff --git a/package/cryptodev-linux/Makefile b/package/cryptodev-linux/Makefile index b7b9a6d81..7daada275 100644 --- a/package/cryptodev-linux/Makefile +++ b/package/cryptodev-linux/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= cryptodev-linux -PKG_VERSION:= 1.4 +PKG_VERSION:= 1.6 PKG_RELEASE:= 1 -PKG_MD5SUM:= 7b0ac1c0a88d8fbe7316db02f21666e6 +PKG_MD5SUM:= eade38998313c25fd7934719cdf8a2ea PKG_DESCR:= cryptodev-linux kernel module PKG_SECTION:= crypto PKG_BUILDDEP:= openssl @@ -24,7 +24,7 @@ BUILD_STYLE:= manual INSTALL_STYLE:= manual do-build: - #${MAKE} -C "${WRKBUILD}"/tests check + ${MAKE} -C "${WRKBUILD}"/tests check ${MAKE} -C "${WRKBUILD}" version.h GCC_HONOUR_COPTS=0 LDFLAGS="" ${MAKE} ${KERNEL_MAKE_OPTS} \ M="${WRKBUILD}" modules diff --git a/package/cryptodev-linux/patches/patch-tests_Makefile b/package/cryptodev-linux/patches/patch-tests_Makefile new file mode 100644 index 000000000..4f774260f --- /dev/null +++ b/package/cryptodev-linux/patches/patch-tests_Makefile @@ -0,0 +1,16 @@ +--- cryptodev-linux-1.6.orig/tests/Makefile 2013-03-04 04:59:29.000000000 +0100 ++++ cryptodev-linux-1.6/tests/Makefile 2013-07-17 14:45:18.000000000 +0200 +@@ -20,13 +20,6 @@ example-async-speed-objs := async_speed. + example-hashcrypt-speed-objs := hashcrypt_speed.c + + check: $(hostprogs) +- ./cipher +- ./hmac +- ./async_cipher +- ./async_hmac +- ./cipher-aead-srtp +- ./cipher-gcm +- ./cipher-aead + + clean: + rm -f *.o *~ $(hostprogs) diff --git a/package/daq/Makefile b/package/daq/Makefile new file mode 100644 index 000000000..f6bcd0501 --- /dev/null +++ b/package/daq/Makefile @@ -0,0 +1,28 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= daq +PKG_VERSION:= 2.0.0 +PKG_RELEASE:= 1 +PKG_MD5SUM:= a00855a153647df76d47f1ea454f74ae +PKG_DESCR:= daq +PKG_SECTION:= libs +PKG_DEPENDS:= libpcap +PKG_BUILDDEP:= libpcap +PKG_URL:= http://www.snort.org +PKG_SITES:= http://openadk.org/distfiles/ + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,DAQ,daq,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +daq-install: + $(INSTALL_DIR) $(IDIR_DAQ)/usr/lib/daq + $(CP) $(WRKINST)/usr/lib/daq/*.so \ + $(IDIR_DAQ)/usr/lib/daq + $(CP) $(WRKINST)/usr/lib/*.so* \ + $(IDIR_DAQ)/usr/lib + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/daq/patches/patch-configure b/package/daq/patches/patch-configure new file mode 100644 index 000000000..e23ab323a --- /dev/null +++ b/package/daq/patches/patch-configure @@ -0,0 +1,56 @@ +--- daq-2.0.0.orig/configure 2012-11-05 22:07:56.000000000 +0100 ++++ daq-2.0.0/configure 2013-07-17 11:03:24.000000000 +0200 +@@ -12771,53 +12771,6 @@ fi + echo + exit 1 + fi +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpcap version >= \"1.0.0\"" >&5 +-$as_echo_n "checking for libpcap version >= \"1.0.0\"... " >&6; } +- if test "$cross_compiling" = yes; then : +- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error $? "cannot run test program while cross compiling +-See \`config.log' for more details" "$LINENO" 5; } +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- #include <pcap.h> +- #include <string.h> +- extern char pcap_version[]; +- +-int +-main () +-{ +- +- if (strcmp(pcap_version, "1.0.0") < 0) +- return 1; +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_run "$LINENO"; then : +- libpcap_version_1x="yes" +-else +- libpcap_version_1x="no" +-fi +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +- conftest.$ac_objext conftest.beam conftest.$ac_ext +-fi +- +- if test "x$libpcap_version_1x" = "xno"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +- echo +- echo " ERROR! Libpcap library version >= "1.0.0" not found." +- echo " Get it from http://www.tcpdump.org" +- echo +- exit 1 +- else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +- fi + + if test "$enable_pcap_module" = yes; then + STATIC_LIBS="${STATIC_LIBS} -lpcap" diff --git a/package/forked-daapd/Makefile b/package/forked-daapd/Makefile index ac8a41c64..d9a58ce87 100644 --- a/package/forked-daapd/Makefile +++ b/package/forked-daapd/Makefile @@ -16,7 +16,8 @@ PKG_BUILDDEP:= libunistring zlib confuse avahi sqlite ffmpeg dbus PKG_BUILDDEP+= mxml libevent libavl libantlr3c alsa-lib libgcrypt PKG_SITES:= http://alioth.debian.org/~jblache/forked-daapd/ -PKG_CFLINE_FORKED_DAAPD:= select ADK_KERNEL_INOTIFY_USER +PKG_CFLINE_FORKED_DAAPD:= select ADK_KERNEL_INOTIFY_USER@ +PKG_CFLINE_FORKED_DAAPD+= depends on ADK_BROKEN@ PKG_ARCH_DEPENDS:= !ppc !avr32 # gperf problem PKG_HOST_DEPENDS:= !freebsd diff --git a/package/htpdate/Makefile b/package/htpdate/Makefile index b39f97a8c..ef3a52f4a 100644 --- a/package/htpdate/Makefile +++ b/package/htpdate/Makefile @@ -4,13 +4,13 @@ include ${TOPDIR}/rules.mk PKG_NAME:= htpdate -PKG_VERSION:= 1.0.4 +PKG_VERSION:= 1.0.5 PKG_RELEASE:= 1 -PKG_MD5SUM:= a3da5ad8965345eb734695c765010acf +PKG_MD5SUM:= 40f193e3d7220265f6e6f8d4d7f887da PKG_DESCR:= an HTP (Hypertext Time Protocol) implementation PKG_SECTION:= ntp PKG_URL:= http://www.vervest.org/htp/ -PKG_SITES:= http://www.clevervest.com/htp/archive/c/ +PKG_SITES:= http://www.vervest.org/htp/archive/c/ include ${TOPDIR}/mk/package.mk diff --git a/package/ipsec-tools/patches/patch-configure b/package/ipsec-tools/patches/patch-configure index 87bfb96a4..71ea329fe 100644 --- a/package/ipsec-tools/patches/patch-configure +++ b/package/ipsec-tools/patches/patch-configure @@ -1,5 +1,5 @@ --- ipsec-tools-0.8.0.orig/configure 2011-03-18 14:27:41.000000000 +0100 -+++ ipsec-tools-0.8.0/configure 2011-03-31 13:16:18.091819156 +0200 ++++ ipsec-tools-0.8.0/configure 2013-07-17 14:30:31.000000000 +0200 @@ -11535,7 +11535,7 @@ $as_echo "$ac_cv_path_EGREP" >&6; } @@ -9,6 +9,17 @@ case $host in *netbsd*) +@@ -11627,8 +11627,8 @@ else + fi + + +- as_ac_Header=`$as_echo "ac_cv_header_$KERNEL_INCLUDE/linux/pfkeyv2.h" | $as_tr_sh` +-ac_fn_c_check_header_mongrel "$LINENO" "$KERNEL_INCLUDE/linux/pfkeyv2.h" "$as_ac_Header" "$ac_includes_default" ++ as_ac_Header=`$as_echo "ac_cv_header_$KERNEL_INCLUDE/uapi/linux/pfkeyv2.h" | $as_tr_sh` ++ac_fn_c_check_header_mongrel "$LINENO" "$KERNEL_INCLUDE/uapi/linux/pfkeyv2.h" "$as_ac_Header" "$ac_includes_default" + if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + + else @@ -12286,7 +12286,7 @@ $as_echo "$as_me: WARNING: Using a gener { $as_echo "$as_me:${as_lineno-$LINENO}: checking if printf accepts %z" >&5 $as_echo_n "checking if printf accepts %z... " >&6; } @@ -36,3 +47,21 @@ saved_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $CPPFLAGS_ADD" ac_fn_c_check_header_mongrel "$LINENO" "iconv.h" "ac_cv_header_iconv_h" "$ac_includes_default" +@@ -14253,7 +14253,7 @@ linux*) + # Linux kernel NAT-T check + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-#include <linux/pfkeyv2.h> ++#include <uapi/linux/pfkeyv2.h> + #ifdef SADB_X_EXT_NAT_T_TYPE + yes + #endif +@@ -14440,7 +14440,7 @@ linux*) + # Linux kernel Security Context check + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-#include <linux/pfkeyv2.h> ++#include <uapi/linux/pfkeyv2.h> + #ifdef SADB_X_EXT_SEC_CTX + yes + #endif diff --git a/package/ipsec-tools/patches/patch-src_include-glibc_Makefile_in b/package/ipsec-tools/patches/patch-src_include-glibc_Makefile_in new file mode 100644 index 000000000..f594f5d92 --- /dev/null +++ b/package/ipsec-tools/patches/patch-src_include-glibc_Makefile_in @@ -0,0 +1,24 @@ +--- ipsec-tools-0.8.0.orig/src/include-glibc/Makefile.in 2011-03-18 14:27:40.000000000 +0100 ++++ ipsec-tools-0.8.0/src/include-glibc/Makefile.in 2013-07-17 14:35:36.000000000 +0200 +@@ -183,7 +183,7 @@ EXTRA_DIST = \ + netinet/ipsec.h \ + sys/queue.h + +-DISTCLEANFILES = .includes linux ++DISTCLEANFILES = linux + all: all-am + + .SUFFIXES: +@@ -370,11 +370,7 @@ uninstall-am: + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + + +-.includes: ${top_builddir}/config.status +- ln -sf $(KERNEL_INCLUDE)/linux +- touch .includes +- +-all: .includes ++all: + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/package/ipsec-tools/patches/patch-src_racoon_privsep_c b/package/ipsec-tools/patches/patch-src_racoon_privsep_c index e8f678186..ec4cf4591 100644 --- a/package/ipsec-tools/patches/patch-src_racoon_privsep_c +++ b/package/ipsec-tools/patches/patch-src_racoon_privsep_c @@ -1,5 +1,5 @@ --- ipsec-tools-0.8.0.orig/src/racoon/privsep.c 2011-03-06 09:28:10.000000000 +0100 -+++ ipsec-tools-0.8.0/src/racoon/privsep.c 2011-03-31 13:24:07.981813178 +0200 ++++ ipsec-tools-0.8.0/src/racoon/privsep.c 2013-07-17 14:18:50.000000000 +0200 @@ -359,7 +359,7 @@ privsep_init(void) strerror(errno)); goto out; @@ -18,7 +18,7 @@ /* -@@ -903,7 +903,7 @@ privsep_eay_get_pkcs1privkey(path) +@@ -903,7 +903,7 @@ privsep_eay_get_pkcs1privkey(path) "Cannot allocate memory: %s\n", strerror(errno)); return NULL; } diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile index a4df8b3b4..201c0cb65 100644 --- a/package/mplayer/Makefile +++ b/package/mplayer/Makefile @@ -147,7 +147,7 @@ CONFIGURE_ARGS:= --prefix=/usr \ ${CONFIGURE_DIRECTFB} XAKE_FLAGS+= AR="${TARGET_CROSS}ar" RANLIB="${TARGET_CROSS}ranlib" -TARGET_LDFLAGS+= -lxvidcore -lX11 -lXext -lvorbis +TARGET_LDFLAGS+= -lxvidcore -lX11 -lXext -lvorbis -lintl post-install: ${INSTALL_DIR} ${IDIR_MPLAYER}/usr/bin diff --git a/package/php/Makefile b/package/php/Makefile index 05b97257b..f6c97d2db 100644 --- a/package/php/Makefile +++ b/package/php/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= php PKG_VERSION:= 5.4.17 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= cc698032dcdcb9ad158edcc90fe798d6 PKG_DESCR:= PHP language interpreter PKG_SECTION:= lang @@ -107,7 +107,6 @@ PKG_CONFIGURE_OPTS:= \ --without-pear \ --without-gettext \ --without-iconv \ - --without-libxml-dir \ --with-pcre-regex=no \ --with-kerberos=no @@ -201,7 +200,7 @@ else PKG_CONFIGURE_OPTS+= --disable-xml endif ifneq ($(ADK_PACKAGE_PHP_MOD_SIMPLEXML),) -PKG_CONFIGURE_OPTS+= --enable-simplexml=shared --enable-libxml +PKG_CONFIGURE_OPTS+= --enable-simplexml=shared --enable-libxml --with-libxml-dir="$(STAGING_TARGET_DIR)/usr" else PKG_CONFIGURE_OPTS+= --disable-simplexml --disable-libxml endif diff --git a/package/php/patches/patch-ext_gd_libgd_gd_compat_c b/package/php/patches/patch-ext_gd_libgd_gd_compat_c new file mode 100644 index 000000000..971de9db6 --- /dev/null +++ b/package/php/patches/patch-ext_gd_libgd_gd_compat_c @@ -0,0 +1,10 @@ +--- php-5.4.17.orig/ext/gd/libgd/gd_compat.c 2013-07-03 08:10:53.000000000 +0200 ++++ php-5.4.17/ext/gd/libgd/gd_compat.c 2013-07-17 13:09:52.000000000 +0200 +@@ -5,6 +5,7 @@ + #endif + + #ifdef HAVE_GD_JPG ++# include <stdio.h> + # include <jpeglib.h> + #endif + diff --git a/package/snort/Makefile b/package/snort/Makefile index d8d1fc185..acf778e8a 100644 --- a/package/snort/Makefile +++ b/package/snort/Makefile @@ -4,31 +4,30 @@ include ${TOPDIR}/rules.mk PKG_NAME:= snort -PKG_VERSION:= 2.8.5.2 +PKG_VERSION:= 2.9.5 PKG_RELEASE:= 1 -PKG_MD5SUM:= e6a8bc5aa1ebe4d2100533d7709c4a9e +PKG_MD5SUM:= f5fc0e176afca5989d47509478758fc7 PKG_DESCR:= a flexible Network Intrusion Detection System (NIDS) PKG_SECTION:= net/security -PKG_DEPENDS:= libnet libpcap libpcre -PKG_BUILDDEP:= libnet libpcap pcre +PKG_DEPENDS:= libnet libpcap libpcre libtirpc daq +PKG_BUILDDEP:= libnet libpcap pcre libtirpc daq PKG_URL:= http://www.snort.org/ -PKG_SITES:= http://dl.snort.org/snort-current/ +PKG_SITES:= http://openadk.org/distfiles/ PKG_NOPARALLEL:= 1 include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,SNORT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_ARGS+= --disable-flexresp \ - --with-libnet-includes="${STAGING_TARGET_DIR}/usr/include" \ - --with-libnet-libraries="${STAGING_TARGET_DIR}/usr/lib" \ +TARGET_CPPFLAGS+= -I$(STAGING_DIR)/usr/include/tirpc +TARGET_LDFLAGS+= -ltirpc +CONFIGURE_ARGS+= --disable-static-daq \ --with-libpcap-includes="${STAGING_TARGET_DIR}/usr/include" \ --with-libpcap-libraries="${STAGING_TARGET_DIR}/usr/lib" \ --with-libpcre-includes="${STAGING_TARGET_DIR}/usr/include" \ --with-libpcre-libraries="${STAGING_TARGET_DIR}/usr/lib" \ - --without-mysql \ - --without-postgresql \ - --disable-inline + --with-dnet-includes="${STAGING_TARGET_DIR}/usr/include" \ + --with-dnet-libraries="${STAGING_TARGET_DIR}/usr/lib" post-install: ${INSTALL_DIR} ${IDIR_SNORT}/usr/bin @@ -40,8 +39,6 @@ post-install: ${IDIR_SNORT}/etc/snort ${INSTALL_DATA} ${WRKBUILD}/etc/reference.config \ ${IDIR_SNORT}/etc/snort - ${INSTALL_DATA} ${WRKBUILD}/etc/sid-msg.map \ - ${IDIR_SNORT}/etc/snort ${INSTALL_DATA} ${WRKBUILD}/etc/threshold.conf \ ${IDIR_SNORT}/etc/snort ${INSTALL_DATA} ${WRKBUILD}/etc/unicode.map \ diff --git a/package/snort/patches/patch-configure b/package/snort/patches/patch-configure index 2f5bfde4e..3b197b010 100644 --- a/package/snort/patches/patch-configure +++ b/package/snort/patches/patch-configure @@ -1,25 +1,20 @@ ---- snort-2.8.5.2.orig/configure 2009-10-19 23:18:06.000000000 +0200 -+++ snort-2.8.5.2/configure 2010-01-14 20:16:49.000000000 +0100 -@@ -25882,81 +25882,7 @@ _ACEOF +--- snort-2.9.5.orig/configure 2013-06-04 23:21:55.000000000 +0200 ++++ snort-2.9.5/configure 2013-07-17 11:07:20.000000000 +0200 +@@ -14205,50 +14205,6 @@ _ACEOF fi -# In case INADDR_NONE is not defined (like on Solaris) -have_inaddr_none="no" --{ echo "$as_me:$LINENO: checking for INADDR_NONE" >&5 --echo $ECHO_N "checking for INADDR_NONE... $ECHO_C" >&6; } --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; }; } +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for INADDR_NONE" >&5 +-$as_echo_n "checking for INADDR_NONE... " >&6; } +-if test "$cross_compiling" = yes; then : +- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error $? "cannot run test program while cross compiling +-See \`config.log' for more details" "$LINENO" 5; } -else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#include <sys/types.h> @@ -37,58 +32,108 @@ - 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 +-if ac_fn_c_try_run "$LINENO"; then : - have_inaddr_none="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_inaddr_none="no" +- have_inaddr_none="no" -fi --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +- conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -- --{ echo "$as_me:$LINENO: result: $have_inaddr_none" >&5 --echo "${ECHO_T}$have_inaddr_none" >&6; } +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_inaddr_none" >&5 +-$as_echo "$have_inaddr_none" >&6; } -if test "x$have_inaddr_none" = "xno"; then - --cat >>confdefs.h <<\_ACEOF --#define INADDR_NONE -1 +-$as_echo "#define INADDR_NONE -1" >>confdefs.h +- +-fi + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +@@ -14578,45 +14534,6 @@ if test "x$LPCAP" = "xno"; then + fi + fi + +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pcap_lex_destroy" >&5 +-$as_echo_n "checking for pcap_lex_destroy... " >&6; } +-if test "$cross_compiling" = yes; then : +- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error $? "cannot run test program while cross compiling +-See \`config.log' for more details" "$LINENO" 5; } +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-#include <pcap.h> +- |