diff options
| -rw-r--r-- | libs/dtc/Makefile | 14 | ||||
| -rw-r--r-- | libs/elektra/Makefile | 2 | ||||
| -rw-r--r-- | libs/elektra/patches/010-gcc11.patch | 19 | ||||
| -rw-r--r-- | libs/libebml/patches/010-gcc11.patch | 20 | ||||
| -rw-r--r-- | net/dawn/Makefile | 6 | ||||
| -rw-r--r-- | net/linuxptp/Makefile | 4 | ||||
| -rw-r--r-- | net/mwan3/Makefile | 2 | ||||
| -rwxr-xr-x | net/mwan3/files/usr/sbin/mwan3 | 119 | ||||
| -rw-r--r-- | utils/yq/Makefile | 4 |
9 files changed, 162 insertions, 28 deletions
diff --git a/libs/dtc/Makefile b/libs/dtc/Makefile index fe388eca9..97c17c54d 100644 --- a/libs/dtc/Makefile +++ b/libs/dtc/Makefile @@ -8,19 +8,21 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dtc -PKG_VERSION:=1.6.0 -PKG_RELEASE:=1 +PKG_VERSION:=1.6.1 +PKG_RELEASE:=$(AUTORELEASE) + PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz -PKG_HASH:=10503b0217e1b07933e29e8d347a00015b2431bea5f59afe0bed3af30340c82d +PKG_HASH:=65cec529893659a49a89740bb362f507a3b94fc8cd791e76a8d6a2b6f3203473 PKG_SOURCE_URL:=@KERNEL/software/utils/dtc -PKG_LICENSE:=GPL-2.0 + +PKG_MAINTAINER:=Yousong Zhou <yszhou4tech@gmail.com> +PKG_LICENSE:=GPL-2.0-only PKG_LICENSE_FILES:=GPL + PKG_INSTALL:=1 -PKG_MAINTAINER:=Yousong Zhou <yszhou4tech@gmail.com> include $(INCLUDE_DIR)/package.mk - define Package/dtc SECTION:=utils CATEGORY:=Utilities diff --git a/libs/elektra/Makefile b/libs/elektra/Makefile index 6a719c372..7a900e57b 100644 --- a/libs/elektra/Makefile +++ b/libs/elektra/Makefile @@ -15,7 +15,7 @@ PKG_NAME:=elektra PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES:=LICENSE.md PKG_VERSION:=0.9.2 -PKG_RELEASE:=2 +PKG_RELEASE:=3 # Use this for official releasees PKG_HASH:=6f2fcf8aaed8863e1cc323265ca2617751ca50dac974b43a0811bcfd4a511f2e diff --git a/libs/elektra/patches/010-gcc11.patch b/libs/elektra/patches/010-gcc11.patch new file mode 100644 index 000000000..3a91cbe97 --- /dev/null +++ b/libs/elektra/patches/010-gcc11.patch @@ -0,0 +1,19 @@ +From 7b57dc698834937b6913887544c6416e7f39192d Mon Sep 17 00:00:00 2001 +From: Mihael Pranjic <mpranj@limun.org> +Date: Mon, 26 Apr 2021 14:53:21 +0200 +Subject: [PATCH] kdb: add missing <limits> include + +--- + src/tools/kdb/cmdline.cpp | 1 + + 1 file changed, 1 insertion(+) + +--- a/src/tools/kdb/cmdline.cpp ++++ b/src/tools/kdb/cmdline.cpp +@@ -16,6 +16,7 @@ + + #include <cstdio> + #include <iostream> ++#include <limits> + #include <set> + #include <vector> + diff --git a/libs/libebml/patches/010-gcc11.patch b/libs/libebml/patches/010-gcc11.patch new file mode 100644 index 000000000..0631c6dda --- /dev/null +++ b/libs/libebml/patches/010-gcc11.patch @@ -0,0 +1,20 @@ +--- a/src/EbmlString.cpp ++++ b/src/EbmlString.cpp +@@ -34,6 +34,7 @@ + \author Steve Lhomme <robux4 @ users.sf.net> + */ + #include <cassert> ++#include <limits> + + #include "ebml/EbmlString.h" + +--- a/src/EbmlUnicodeString.cpp ++++ b/src/EbmlUnicodeString.cpp +@@ -36,6 +36,7 @@ + */ + + #include <cassert> ++#include <limits> + + #include "ebml/EbmlUnicodeString.h" + diff --git a/net/dawn/Makefile b/net/dawn/Makefile index a33739368..c8bc01e12 100644 --- a/net/dawn/Makefile +++ b/net/dawn/Makefile @@ -5,13 +5,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dawn -PKG_SOURCE_DATE:=2020-12-31 +PKG_SOURCE_DATE:=2021-07-08 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/berlin-open-wireless-lab/DAWN.git -PKG_SOURCE_VERSION:=8ce09d64def9a1ad4bbf57dd3fe724a8a9b93334 -PKG_MIRROR_HASH:=cc33ca6ab1c4bd3e9e2a7a380700c6c15d222b3fd7064a3ce2963abb0965f078 +PKG_SOURCE_VERSION:=555268b91d50b545d99c5bad694566a0b408eecf +PKG_MIRROR_HASH:=a2e49aff4fd0465755526ea696965b2ec726ef95ee11a5b7c0e6f718ab7336b3 PKG_MAINTAINER:=Nick Hainke <vincent@systemli.org> PKG_LICENSE:=GPL-2.0-only diff --git a/net/linuxptp/Makefile b/net/linuxptp/Makefile index e804cf527..2a30c8bb3 100644 --- a/net/linuxptp/Makefile +++ b/net/linuxptp/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=linuxptp -PKG_VERSION:=3.1 +PKG_VERSION:=3.1.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz PKG_SOURCE_URL:=@SF/$(PKG_NAME)/v$(PKG_VERSION) -PKG_HASH:=f58f5b11cf14dc7c4f7c9efdfb27190e43d02cf20c3525f6639edac10528ce7d +PKG_HASH:=94d6855f9b7f2d8e9b0ca6d384e3fae6226ce6fc012dbad02608bdef3be1c0d9 PKG_MAINTAINER:=Wojciech Dubowik <Wojciech.Dubowik@westermo.com> PKG_LICENSE:=GPL-2.0 diff --git a/net/mwan3/Makefile b/net/mwan3/Makefile index e29296653..614c68b0c 100644 --- a/net/mwan3/Makefile +++ b/net/mwan3/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mwan3 -PKG_VERSION:=2.10.10 +PKG_VERSION:=2.10.11 PKG_RELEASE:=1 PKG_MAINTAINER:=Florian Eckert <fe@dev.tdt.de>, \ Aaron Goodman <aaronjg@alumni.stanford.edu> diff --git a/net/mwan3/files/usr/sbin/mwan3 b/net/mwan3/files/usr/sbin/mwan3 index 51f468676..1ba6004bb 100755 --- a/net/mwan3/files/usr/sbin/mwan3 +++ b/net/mwan3/files/usr/sbin/mwan3 @@ -6,27 +6,34 @@ . /lib/mwan3/mwan3.sh . /lib/mwan3/common.sh +command_help() { + local cmd="$1" + local help="$2" + + echo "$(printf "%-25s%s" "${cmd}" "${help}")" +} + help() { cat <<EOF Syntax: mwan3 [command] Available commands: - start Load iptables rules, ip rules and ip routes - stop Unload iptables rules, ip rules and ip routes - restart Reload iptables rules, ip rules and ip routes - ifup <iface> Load rules and routes for specific interface - ifdown <iface> Unload rules and routes for specific interface - interfaces Show interfaces status - policies Show currently active policy - connected Show directly connected networks - rules Show active rules - status Show all status - use <iface> <cmd> Run a command bound to <iface> and avoid mwan3 rules EOF + command_help "start" "Load iptables rules, ip rules and ip routes" + command_help "stop" "Unload iptables rules, ip rules and ip routes" + command_help "restart" "Reload iptables rules, ip rules and ip routes" + command_help "ifup <iface>" "Load rules and routes for specific interface" + command_help "ifdown <iface>" "Unload rules and routes for specific interface" + command_help "interfaces" "Show interfaces status" + command_help "policies" "Show currently active policy" + command_help "connected" "Show directly connected networks" + command_help "rules" "Show active rules" + command_help "status" "Show all status" + command_help "internal <ipv4|ipv6>" "Show internal configuration <default: ipv4>" + command_help "use <iface> <cmd>" "Run a command bound to <iface> and avoid mwan3 rules" } - ifdown() { if [ -z "$1" ]; then echo "Error: Expecting interface. Usage: mwan3 ifdown <interface>" @@ -107,6 +114,92 @@ status() rules } +internal() +{ + local family="$1" + local dash="-------------------------------------------------" + + if [ -f "/etc/openwrt_release" ]; then + . /etc/openwrt_release + fi + + local ipt ip output + + if [ "$family" = "ipv6" ]; then + ipt="$IPT6" + ip="$IP6" + else + ipt="$IPT4" + ip="$IP4" + fi + + echo "Software-Version" + echo "$dash" + + if [ "$DISTRIB_RELEASE" != "" ]; then + echo "OpenWrt - $DISTRIB_RELEASE" + else + echo "OpenWrt - unknown" + fi + + echo "" + echo "Output of \"$ip a show\"" + echo "$dash" + output="$($ip a show)" + if [ "$output" != "" ]; then + echo "$output" + else + echo "No data found" + fi + + echo "" + echo "Output of \"$ip route show\"" + echo "$dash" + output="$($ip route show)" + if [ "$output" != "" ]; then + echo "$output" + else + echo "No data found" + fi + + echo "" + echo "Output of \"$ip rule show\"" + echo "$dash" + output="$($ip rule show)" + if [ "$output" != "" ]; then + echo "$output" + else + echo "No data found" + fi + + echo "" + echo "Output of \"$ip route list table 1-250\"" + echo "$dash" + local dump=0 + for i in $(seq 1 250); do + output=$($ip route list table $i 2>/dev/null) + if [ "$output" != "" ];then + dump=1 + echo "Routing table $i:" + echo "$output" + echo "" + fi + done + if [ "$dump" = "0" ]; then + echo "No data found" + echo "" + fi + + echo "Output of \"$ipt -L -v -n\"" + echo "$dash" + output="$($ipt -L -v -n)" + if [ "$output" != "" ]; then + echo "$output" + else + echo "No data found" + fi +} + start() { /etc/init.d/mwan3 enable /etc/init.d/mwan3 start @@ -148,7 +241,7 @@ use() { } case "$1" in - ifup|ifdown|interfaces|policies|connected|rules|status|start|stop|restart|use) + ifup|ifdown|interfaces|policies|connected|rules|status|start|stop|restart|use|internal) mwan3_init # shellcheck disable=SC2048 $* diff --git a/utils/yq/Makefile b/utils/yq/Makefile index 6fe717c0d..8a1946d0a 100644 --- a/utils/yq/Makefile +++ b/utils/yq/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=yq -PKG_VERSION:=4.9.6 +PKG_VERSION:=4.9.7 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/mikefarah/yq/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=40f549d801826b4a7bdad0b2a924f10b354da1d518759b2974e82dda7563f7ee +PKG_HASH:=1247e7f0de1f66367b1082c62ecf25e704994a34acc7d2280dac3a30052e2348 PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org> PKG_LICENSE:=MIT |