From 06541447716f022458a2ec12bcf9d2f0499e0e6c Mon Sep 17 00:00:00 2001 From: MCApollo <34170230+MCApollo@users.noreply.github.com> Date: Thu, 25 Apr 2019 18:48:57 +0000 Subject: Updated libnet. TODO: Make -devel package. --- data/libnet/bpf.diff | 48 ------------------------------------ data/libnet/endian.diff | 21 ---------------- data/libnet/libnet-1.1.2.1.tar.gz | Bin 1021236 -> 0 bytes data/libnet/libnet-1.1.6.tar.gz | Bin 0 -> 1202970 bytes data/libnet/make.sh | 4 +-- data/libnet/patch-configure.in.diff | 29 ++++++++++++++++++++++ 6 files changed, 31 insertions(+), 71 deletions(-) delete mode 100644 data/libnet/bpf.diff delete mode 100644 data/libnet/endian.diff delete mode 100644 data/libnet/libnet-1.1.2.1.tar.gz create mode 100644 data/libnet/libnet-1.1.6.tar.gz create mode 100644 data/libnet/patch-configure.in.diff diff --git a/data/libnet/bpf.diff b/data/libnet/bpf.diff deleted file mode 100644 index 21bc25a4d..000000000 --- a/data/libnet/bpf.diff +++ /dev/null @@ -1,48 +0,0 @@ -diff -ru libnet/configure.in libnet+iPhone/configure.in ---- libnet/configure.in 2004-03-01 20:26:11.000000000 +0000 -+++ libnet+iPhone/configure.in 2009-01-20 21:52:24.000000000 +0000 -@@ -67,44 +67,8 @@ - dnl - AC_MSG_CHECKING(link-layer packet interface type) - --if test -r /dev/bpf0 ; then - AC_LIBOBJ([libnet_link_bpf]) - AC_MSG_RESULT(found bpf) --elif test -r /usr/include/net/pfilt.h ; then -- AC_LIBOBJ([libnet_link_pf]) -- AC_MSG_RESULT(found pf) --elif test -r /dev/nit ; then -- AC_LIBOBJ([libnet_link_snit]) -- AC_MSG_RESULT(found snit) --elif test -r /usr/include/sys/net/nit.h ; then -- AC_LIBOBJ([libnet_link_nit]) -- AC_MSG_RESULT(found nit) --elif test -r /usr/include/net/raw.h ; then -- AC_LIBOBJ([libnet_link_snoop]) -- AC_MSG_RESULT(found snoop) --elif test -r /usr/include/sys/dlpi.h ; then -- AC_LIBOBJ([libnet_link_dlpi]) -- AC_MSG_RESULT(found dlpi) -- AC_DEFINE(HAVE_DLPI) --elif test -r /usr/include/linux/socket.h ; then -- AC_LIBOBJ([libnet_link_linux]) -- AC_MSG_RESULT(found linux primitives) -- AC_LIBNET_CHECK_PF_PACKET -- AC_LIBNET_LINUX_PROCFS --elif test -c /dev/bpf0 ; then # check again in case not readable -- AC_LIBOBJ([libnet_link_bpf]) -- AC_MSG_RESULT(found bpf) --elif test -c /dev/nit ; then # check again in case not readable -- AC_LIBOBJ([libnet_link_snit]) -- AC_MSG_RESULT(found snit) --elif test "$target_os" = "cygwin" ; then -- AC_LIBOBJ([libnet_link_win32]) -- AC_MSG_RESULT(found win32 wpcap) --else -- AC_LIBOBJ([libnet_link_none]) -- AC_MSG_WARN(could not find a link-layer packet interface) -- AC_MSG_WARN(link-layer packet injection will not be available) --fi - - dnl - dnl Inform user about the packet builders we've got diff --git a/data/libnet/endian.diff b/data/libnet/endian.diff deleted file mode 100644 index e36f5e271..000000000 --- a/data/libnet/endian.diff +++ /dev/null @@ -1,21 +0,0 @@ -diff -ru libnet/aclocal.m4 libnet+iPhone/aclocal.m4 ---- libnet/aclocal.m4 2004-03-01 20:26:11.000000000 +0000 -+++ libnet+iPhone/aclocal.m4 2009-01-20 21:44:39.000000000 +0000 -@@ -294,6 +294,8 @@ - AC_DEFUN(AC_LIBNET_ENDIAN_CHECK, - [AC_MSG_CHECKING(machine endianess) - -+ if test ! ${ac_cv_libnet_endianess+@}; then -+ - cat > conftest.c << EOF - # include - # include -@@ -346,6 +348,8 @@ - fi - rm -f conftest* core core.conftest - -+ fi -+ - AC_MSG_RESULT($ac_cv_libnet_endianess) - - if test $ac_cv_libnet_endianess = big ; then diff --git a/data/libnet/libnet-1.1.2.1.tar.gz b/data/libnet/libnet-1.1.2.1.tar.gz deleted file mode 100644 index 11f5563d6..000000000 Binary files a/data/libnet/libnet-1.1.2.1.tar.gz and /dev/null differ diff --git a/data/libnet/libnet-1.1.6.tar.gz b/data/libnet/libnet-1.1.6.tar.gz new file mode 100644 index 000000000..5ce5ab904 Binary files /dev/null and b/data/libnet/libnet-1.1.6.tar.gz differ diff --git a/data/libnet/make.sh b/data/libnet/make.sh index c2e0a724c..f2379bc99 100644 --- a/data/libnet/make.sh +++ b/data/libnet/make.sh @@ -1,5 +1,5 @@ pkg:setup -autoconf +autoreconf -fvi pkg:configure ac_cv_libnet_endianess=lil ac_libnet_have_packet_socket=no ac_cv_libnet_linux_procfs=no ac_cv_lbl_unaligned_fail=no -make +pkg:make pkg:install diff --git a/data/libnet/patch-configure.in.diff b/data/libnet/patch-configure.in.diff new file mode 100644 index 000000000..a0ce6fa58 --- /dev/null +++ b/data/libnet/patch-configure.in.diff @@ -0,0 +1,29 @@ +--- a/configure.in.orig 2012-03-30 00:16:23.000000000 +0300 ++++ b/configure.in 2012-07-09 02:15:10.000000000 +0300 +@@ -199,23 +199,9 @@ + *darwin*) + AC_DEFINE(HAVE_SOCKADDR_SA_LEN, 1, + [Define if the sockaddr structure includes a sa_len member.]) +- LIBNET_CONFIG_DEFINES="-DHAVE_SOCKADDR_SA_LEN" +- +-dnl +-dnl Check to see if x86 +-dnl +- +- case "$target" in +- i?86-*-*darwin*) +- AC_DEFINE(LIBNET_BSDISH_OS) +- AC_DEFINE(LIBNET_BSD_BYTE_SWAP) +- LIBNET_CONFIG_DEFINES="$LIBNET_CONFIG_DEFINES -DLIBNET_BSDISH_OS -DLIBNET_BSD_BYTE_SWAP" +- ;; +- +- *) +- ;; +- +- esac ++ AC_DEFINE(LIBNET_BSDISH_OS) ++ AC_DEFINE(LIBNET_BSD_BYTE_SWAP) ++ LIBNET_CONFIG_DEFINES="-DHAVE_SOCKADDR_SA_LEN -DLIBNET_BSDISH_OS -DLIBNET_BSD_BYTE_SWAP" + + ;; + -- cgit v1.2.3