diff --git a/packages/addons/addon-depends/network-tools-depends/depends/libpcap/package.mk b/packages/addons/addon-depends/network-tools-depends/depends/libpcap/package.mk index 29f0283bb0..bac8a24f88 100644 --- a/packages/addons/addon-depends/network-tools-depends/depends/libpcap/package.mk +++ b/packages/addons/addon-depends/network-tools-depends/depends/libpcap/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libpcap" -PKG_VERSION="1.9.1" -PKG_SHA256="635237637c5b619bcceba91900666b64d56ecb7be63f298f601ec786ce087094" +PKG_VERSION="1.10.0" +PKG_SHA256="8d12b42623eeefee872f123bd0dc85d535b00df4d42e865f993c40f7bfc92b1e" PKG_LICENSE="GPL" PKG_SITE="http://www.tcpdump.org/" PKG_URL="http://www.tcpdump.org/release/libpcap-${PKG_VERSION}.tar.gz" diff --git a/packages/addons/addon-depends/network-tools-depends/depends/libpcap/patches/libpcap-crosscompiling.patch b/packages/addons/addon-depends/network-tools-depends/depends/libpcap/patches/libpcap-crosscompiling.patch deleted file mode 100644 index 6135a55f79..0000000000 --- a/packages/addons/addon-depends/network-tools-depends/depends/libpcap/patches/libpcap-crosscompiling.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur libpcap-1.7.4/configure.ac libpcap-1.7.4.patch/configure.ac ---- libpcap-1.7.4/configure.ac 2015-04-22 22:19:15.000000000 +0200 -+++ libpcap-1.7.4.patch/configure.ac 2016-03-26 10:36:25.193757606 +0100 -@@ -853,7 +853,7 @@ - if test x$with_libnl != xno ; then - have_any_nl="no" - -- incdir=-I/usr/include/libnl3 -+ #incdir=-I/usr/include/libnl3 - libnldir= - case "$with_libnl" in - diff --git a/packages/addons/addon-depends/network-tools-depends/depends/libpcap/patches/remove-manpages.patch b/packages/addons/addon-depends/network-tools-depends/depends/libpcap/patches/remove-manpages.patch index d23593089c..aef4ad67e9 100644 --- a/packages/addons/addon-depends/network-tools-depends/depends/libpcap/patches/remove-manpages.patch +++ b/packages/addons/addon-depends/network-tools-depends/depends/libpcap/patches/remove-manpages.patch @@ -1,6 +1,6 @@ ---- a/CMakeLists.txt.orig 2019-09-30 14:39:22.000000000 +0000 -+++ b/CMakeLists.txt 2021-01-01 12:58:17.181126036 +0000 -@@ -2398,60 +2398,6 @@ +--- libpcap-1.10.0/CMakeLists.txt 2020-12-29 21:16:30.000000000 +0000 ++++ libpcap-1.10.0/CMakeLists.txt 2021-01-02 04:34:31.834695073 +0000 +@@ -2689,70 +2689,6 @@ install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/pcap-config DESTINATION bin) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpcap.pc DESTINATION lib/pkgconfig) @@ -10,54 +10,64 @@ - # For each section of the manual for which we have man pages - # that require macro expansion, do the expansion. - # -- set(MAN1 "") -- foreach(MANPAGE ${MAN1_NOEXPAND}) -- set(MAN1 ${MAN1} ${CMAKE_CURRENT_SOURCE_DIR}/${MANPAGE}) -- endforeach(MANPAGE) -- install(FILES ${MAN1} DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) +- # If this is MinGW, maybe we have a UN*X-style ln command and +- # maybe we don't. (No, we do *NOT* require MSYS!) If we don't +- # have it, don't do the man pages. +- # +- if(MINGW) +- find_program(LINK_EXECUTABLE ln) +- endif(MINGW) +- if(UNIX OR (MINGW AND LINK_EXECUTABLE)) +- set(MAN1 "") +- foreach(MANPAGE ${MAN1_NOEXPAND}) +- set(MAN1 ${MAN1} ${CMAKE_CURRENT_SOURCE_DIR}/${MANPAGE}) +- endforeach(MANPAGE) +- install(FILES ${MAN1} DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) - -- set(MAN3PCAP "") -- foreach(MANPAGE ${MAN3PCAP_NOEXPAND}) -- set(MAN3PCAP ${MAN3PCAP} ${CMAKE_CURRENT_SOURCE_DIR}/${MANPAGE}) -- endforeach(MANPAGE) -- foreach(TEMPLATE_MANPAGE ${MAN3PCAP_EXPAND}) -- string(REPLACE ".in" "" MANPAGE ${TEMPLATE_MANPAGE}) -- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${TEMPLATE_MANPAGE} ${CMAKE_CURRENT_BINARY_DIR}/${MANPAGE} @ONLY) -- set(MAN3PCAP ${MAN3PCAP} ${CMAKE_CURRENT_BINARY_DIR}/${MANPAGE}) -- endforeach(TEMPLATE_MANPAGE) -- install(FILES ${MAN3PCAP} DESTINATION ${CMAKE_INSTALL_MANDIR}/man3) -- install_manpage_symlink(pcap_datalink_val_to_name.3pcap pcap_datalink_val_to_description.3pcap ${CMAKE_INSTALL_MANDIR}/man3) -- install_manpage_symlink(pcap_dump_open.3pcap pcap_dump_fopen.3pcap ${CMAKE_INSTALL_MANDIR}/man3) -- install_manpage_symlink(pcap_findalldevs.3pcap pcap_freealldevs.3pcap ${CMAKE_INSTALL_MANDIR}/man3) -- install_manpage_symlink(pcap_geterr.3pcap pcap_perror.3pcap ${CMAKE_INSTALL_MANDIR}/man3) -- install_manpage_symlink(pcap_inject.3pcap pcap_sendpacket.3pcap ${CMAKE_INSTALL_MANDIR}/man3) -- install_manpage_symlink(pcap_list_datalinks.3pcap pcap_free_datalinks.3pcap ${CMAKE_INSTALL_MANDIR}/man3) -- install_manpage_symlink(pcap_list_tstamp_types.3pcap pcap_free_tstamp_types.3pcap ${CMAKE_INSTALL_MANDIR}/man3) -- install_manpage_symlink(pcap_loop.3pcap pcap_dispatch.3pcap ${CMAKE_INSTALL_MANDIR}/man3) -- install_manpage_symlink(pcap_major_version.3pcap pcap_minor_version.3pcap ${CMAKE_INSTALL_MANDIR}/man3) -- install_manpage_symlink(pcap_next_ex.3pcap pcap_next.3pcap ${CMAKE_INSTALL_MANDIR}/man3) -- install_manpage_symlink(pcap_open_dead.3pcap pcap_open_dead_with_tstamp_precision.3pcap ${CMAKE_INSTALL_MANDIR}/man3) -- install_manpage_symlink(pcap_open_offline.3pcap pcap_open_offline_with_tstamp_precision.3pcap ${CMAKE_INSTALL_MANDIR}/man3) -- install_manpage_symlink(pcap_open_offline.3pcap pcap_fopen_offline.3pcap ${CMAKE_INSTALL_MANDIR}/man3) -- install_manpage_symlink(pcap_open_offline.3pcap pcap_fopen_offline_with_tstamp_precision.3pcap ${CMAKE_INSTALL_MANDIR}/man3) -- install_manpage_symlink(pcap_tstamp_type_val_to_name.3pcap pcap_tstamp_type_val_to_description.3pcap ${CMAKE_INSTALL_MANDIR}/man3) -- install_manpage_symlink(pcap_setnonblock.3pcap pcap_getnonblock.3pcap ${CMAKE_INSTALL_MANDIR}/man3) +- set(MAN3PCAP "") +- foreach(MANPAGE ${MAN3PCAP_NOEXPAND}) +- set(MAN3PCAP ${MAN3PCAP} ${CMAKE_CURRENT_SOURCE_DIR}/${MANPAGE}) +- endforeach(MANPAGE) +- foreach(TEMPLATE_MANPAGE ${MAN3PCAP_EXPAND}) +- string(REPLACE ".in" "" MANPAGE ${TEMPLATE_MANPAGE}) +- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${TEMPLATE_MANPAGE} ${CMAKE_CURRENT_BINARY_DIR}/${MANPAGE} @ONLY) +- set(MAN3PCAP ${MAN3PCAP} ${CMAKE_CURRENT_BINARY_DIR}/${MANPAGE}) +- endforeach(TEMPLATE_MANPAGE) +- install(FILES ${MAN3PCAP} DESTINATION ${CMAKE_INSTALL_MANDIR}/man3) +- install_manpage_symlink(pcap_datalink_val_to_name.3pcap pcap_datalink_val_to_description.3pcap ${CMAKE_INSTALL_MANDIR}/man3) +- install_manpage_symlink(pcap_datalink_val_to_name.3pcap pcap_datalink_val_to_description_or_dlt.3pcap ${CMAKE_INSTALL_MANDIR}/man3) +- install_manpage_symlink(pcap_dump_open.3pcap pcap_dump_fopen.3pcap ${CMAKE_INSTALL_MANDIR}/man3) +- install_manpage_symlink(pcap_findalldevs.3pcap pcap_freealldevs.3pcap ${CMAKE_INSTALL_MANDIR}/man3) +- install_manpage_symlink(pcap_geterr.3pcap pcap_perror.3pcap ${CMAKE_INSTALL_MANDIR}/man3) +- install_manpage_symlink(pcap_inject.3pcap pcap_sendpacket.3pcap ${CMAKE_INSTALL_MANDIR}/man3) +- install_manpage_symlink(pcap_list_datalinks.3pcap pcap_free_datalinks.3pcap ${CMAKE_INSTALL_MANDIR}/man3) +- install_manpage_symlink(pcap_list_tstamp_types.3pcap pcap_free_tstamp_types.3pcap ${CMAKE_INSTALL_MANDIR}/man3) +- install_manpage_symlink(pcap_loop.3pcap pcap_dispatch.3pcap ${CMAKE_INSTALL_MANDIR}/man3) +- install_manpage_symlink(pcap_major_version.3pcap pcap_minor_version.3pcap ${CMAKE_INSTALL_MANDIR}/man3) +- install_manpage_symlink(pcap_next_ex.3pcap pcap_next.3pcap ${CMAKE_INSTALL_MANDIR}/man3) +- install_manpage_symlink(pcap_open_dead.3pcap pcap_open_dead_with_tstamp_precision.3pcap ${CMAKE_INSTALL_MANDIR}/man3) +- install_manpage_symlink(pcap_open_offline.3pcap pcap_open_offline_with_tstamp_precision.3pcap ${CMAKE_INSTALL_MANDIR}/man3) +- install_manpage_symlink(pcap_open_offline.3pcap pcap_fopen_offline.3pcap ${CMAKE_INSTALL_MANDIR}/man3) +- install_manpage_symlink(pcap_open_offline.3pcap pcap_fopen_offline_with_tstamp_precision.3pcap ${CMAKE_INSTALL_MANDIR}/man3) +- install_manpage_symlink(pcap_tstamp_type_val_to_name.3pcap pcap_tstamp_type_val_to_description.3pcap ${CMAKE_INSTALL_MANDIR}/man3) +- install_manpage_symlink(pcap_setnonblock.3pcap pcap_getnonblock.3pcap ${CMAKE_INSTALL_MANDIR}/man3) - -- set(MANFILE "") -- foreach(TEMPLATE_MANPAGE ${MANFILE_EXPAND}) -- string(REPLACE ".manfile.in" ".${MAN_FILE_FORMATS}" MANPAGE ${TEMPLATE_MANPAGE}) -- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${TEMPLATE_MANPAGE} ${CMAKE_CURRENT_BINARY_DIR}/${MANPAGE} @ONLY) -- set(MANFILE ${MANFILE} ${CMAKE_CURRENT_BINARY_DIR}/${MANPAGE}) -- endforeach(TEMPLATE_MANPAGE) -- install(FILES ${MANFILE} DESTINATION ${CMAKE_INSTALL_MANDIR}/man${MAN_FILE_FORMATS}) +- set(MANFILE "") +- foreach(TEMPLATE_MANPAGE ${MANFILE_EXPAND}) +- string(REPLACE ".manfile.in" ".${MAN_FILE_FORMATS}" MANPAGE ${TEMPLATE_MANPAGE}) +- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${TEMPLATE_MANPAGE} ${CMAKE_CURRENT_BINARY_DIR}/${MANPAGE} @ONLY) +- set(MANFILE ${MANFILE} ${CMAKE_CURRENT_BINARY_DIR}/${MANPAGE}) +- endforeach(TEMPLATE_MANPAGE) +- install(FILES ${MANFILE} DESTINATION ${CMAKE_INSTALL_MANDIR}/man${MAN_FILE_FORMATS}) - -- set(MANMISC "") -- foreach(TEMPLATE_MANPAGE ${MANMISC_EXPAND}) -- string(REPLACE ".manmisc.in" ".${MAN_MISC_INFO}" MANPAGE ${TEMPLATE_MANPAGE}) -- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${TEMPLATE_MANPAGE} ${CMAKE_CURRENT_BINARY_DIR}/${MANPAGE} @ONLY) -- set(MANMISC ${MANMISC} ${CMAKE_CURRENT_BINARY_DIR}/${MANPAGE}) -- endforeach(TEMPLATE_MANPAGE) -- install(FILES ${MANMISC} DESTINATION ${CMAKE_INSTALL_MANDIR}/man${MAN_MISC_INFO}) +- set(MANMISC "") +- foreach(TEMPLATE_MANPAGE ${MANMISC_EXPAND}) +- string(REPLACE ".manmisc.in" ".${MAN_MISC_INFO}" MANPAGE ${TEMPLATE_MANPAGE}) +- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${TEMPLATE_MANPAGE} ${CMAKE_CURRENT_BINARY_DIR}/${MANPAGE} @ONLY) +- set(MANMISC ${MANMISC} ${CMAKE_CURRENT_BINARY_DIR}/${MANPAGE}) +- endforeach(TEMPLATE_MANPAGE) +- install(FILES ${MANMISC} DESTINATION ${CMAKE_INSTALL_MANDIR}/man${MAN_MISC_INFO}) +- endif(UNIX OR (MINGW AND LINK_EXECUTABLE)) endif(NOT MSVC) # uninstall target diff --git a/packages/addons/addon-depends/network-tools-depends/ngrep/package.mk b/packages/addons/addon-depends/network-tools-depends/ngrep/package.mk index 00403dbbf4..d11042af2d 100644 --- a/packages/addons/addon-depends/network-tools-depends/ngrep/package.mk +++ b/packages/addons/addon-depends/network-tools-depends/ngrep/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="ngrep" -PKG_VERSION="9b5946822a5c9c617d937245fdc9049c5740ae09" -PKG_SHA256="db3ea041ad490a90d38ce4623ad9f3e7c9798734bdcaf900d3cf319fce16aa81" +PKG_VERSION="2a9603bc67dface9606a658da45e1f5c65170444" # 2019-01-29 +PKG_SHA256="500c29914dd26f5aa6df07446388d49b60249622c9b0fd1f266f62a5706f056c" PKG_LICENSE="GPL" PKG_SITE="https://github.com/jpr5/ngrep" PKG_URL="https://github.com/jpr5/ngrep/archive/${PKG_VERSION}.tar.gz" diff --git a/packages/addons/tools/network-tools/changelog.txt b/packages/addons/tools/network-tools/changelog.txt index 9a53366dd5..7936f0e9b0 100644 --- a/packages/addons/tools/network-tools/changelog.txt +++ b/packages/addons/tools/network-tools/changelog.txt @@ -1,3 +1,7 @@ +107 +- libpcap: update to 1.10.0 +- ngrep: update to 2019-01-29 + 106 - bwm-ng: update to 0.6.2 - iperf: update to 3.9 diff --git a/packages/addons/tools/network-tools/package.mk b/packages/addons/tools/network-tools/package.mk index 444072d5a0..baf13112ef 100644 --- a/packages/addons/tools/network-tools/package.mk +++ b/packages/addons/tools/network-tools/package.mk @@ -3,7 +3,7 @@ PKG_NAME="network-tools" PKG_VERSION="1.0" -PKG_REV="106" +PKG_REV="107" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://libreelec.tv"