Merge pull request #4953 from heitbaum/bumpnet

network-tools: update addon to 108
LibreELEC · Jan 14, 2021 · 17df5cd · 17df5cd
2 parents 4c8cbf2 + d0d64e0
commit 17df5cd
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 6 deletions.
diff --git a/packages/addons/addon-depends/network-tools-depends/bwm-ng/package.mk b/packages/addons/addon-depends/network-tools-depends/bwm-ng/package.mk
@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="bwm-ng"
-PKG_VERSION="0.6.2"
-PKG_SHA256="906a2d561f2ec9e0dd68b7f51b302908e99515ea1216d0ecaf14d873ef54ae70"
+PKG_VERSION="0.6.3"
+PKG_SHA256="c1a552b6ff48ea3e4e10110a7c188861abc4750befc67c6caaba8eb3ecf67f46"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.gropp.org/?id=projects&sub=bwm-ng"
 PKG_URL="https://github.com/vgropp/bwm-ng/archive/v$PKG_VERSION.tar.gz"

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
@@ -9,6 +9,8 @@ PKG_SITE="http://www.tcpdump.org/"
 PKG_URL="http://www.tcpdump.org/release/libpcap-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A portable framework for low-level network monitoring."
+# use configure, not cmake. review cmake in future release.
+PKG_TOOLCHAIN="configure"
 
 PKG_CONFIGURE_OPTS_TARGET="LIBS=-lpthread \
                            ac_cv_header_libusb_1_0_libusb_h=no \

diff --git a/packages/addons/addon-depends/network-tools-depends/tcpdump/package.mk b/packages/addons/addon-depends/network-tools-depends/tcpdump/package.mk
@@ -2,13 +2,15 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="tcpdump"
-PKG_VERSION="4.9.3"
-PKG_SHA256="2cd47cb3d460b6ff75f4a9940f594317ad456cfbf2bd2c8e5151e16559db6410"
+PKG_VERSION="4.99.0"
+PKG_SHA256="8cf2f17a9528774a7b41060323be8b73f76024f7778f59c34efa65d49d80b842"
 PKG_SITE="http://www.tcpdump.org/"
 PKG_URL="http://www.tcpdump.org/release/tcpdump-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain libpcap libtirpc"
 PKG_LONGDESC="A program that allows you to dump the traffic on a network."
 PKG_BUILD_FLAGS="-sysroot"
+# use configure, not cmake. review cmake in future release.
+PKG_TOOLCHAIN="configure"
 
 PKG_CONFIGURE_OPTS_TARGET="--with-crypto=no"
 

diff --git a/packages/addons/tools/network-tools/changelog.txt b/packages/addons/tools/network-tools/changelog.txt
@@ -1,3 +1,8 @@
+108
+- bwm-ng: update to 0.6.3
+- tcpdump: update to 4.99.0
+- libpcap: revert to building with configure (107)
+
 107
 - libpcap: update to 1.10.0
 - ngrep: update to 2019-01-29

diff --git 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="107"
+PKG_REV="108"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://libreelec.tv"
@@ -75,7 +75,7 @@ addon() {
     cp -P $(get_install_dir sshfs)/usr/bin/sshfs $ADDON_BUILD/$PKG_ADDON_ID/bin
 
     # tcpdump
-    cp -P $(get_install_dir tcpdump)/usr/sbin/tcpdump $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir tcpdump)/usr/bin/tcpdump $ADDON_BUILD/$PKG_ADDON_ID/bin
 
     # udpxy
     cp -P $(get_install_dir udpxy)/usr/bin/udpxy $ADDON_BUILD/$PKG_ADDON_ID/bin