bird2: add test.sh for bird

Signed-off-by: Bradford Zhang <zyc@zyc.name>

diff --git a/bird2/Makefile b/bird2/Makefile
index d692c326f2407bb8d8b1cc4a36ef8f1ee506d375..26a3ee5e158b7b79f8c7bc09f6b8dfbc033886b0 100644 (file)
--- a/bird2/Makefile
+++ b/bird2/Makefile
@@ -7,12 +7,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bird2
-PKG_VERSION:=2.14
+PKG_VERSION:=2.15.1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=bird-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://bird.network.cz/pub/bird
-PKG_HASH:=b0b9f6f8566541b9be4af1f0cac675c5a3785601a55667a7ec3d7de29735a786
+PKG_HASH:=48e85c622de164756c132ea77ad1a8a95cc9fd0137ffd0d882746589ce75c75d
 
 PKG_MAINTAINER:=Toke Høiland-Jørgensen <toke@toke.dk>
 PKG_LICENSE:=GPL-2.0-or-later

diff --git a/bird2/test.sh b/bird2/test.sh
new file mode 100644 (file)
index 0000000..0fab5cd
--- /dev/null
+++ b/bird2/test.sh
@@ -0,0 +1 @@
+bird --version 2>&1 | grep "$PKG_VERSION" 

diff --git a/bmx7/Makefile b/bmx7/Makefile
index 7813856dc08af08cee1f94a26e4027dd5fd30ab2..3b6c8030da64bca241f45e10ebd6a9c45df13942 100644 (file)
--- a/bmx7/Makefile
+++ b/bmx7/Makefile
@@ -1,14 +1,21 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bmx7
-PKG_VERSION:=7.1.1
-PKG_RELEASE:=5
+#  PKG_VERSION:=7.1.1
+PKG_VERSION:=r2024051906
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://codeload.github.com/bmx-routing/bmx7/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=5f88df1c95e5cb842a6016bb1604e3e7f6097c63c5c9916edc3c84e96d4f5f65
+# PKG_SOURCE_URL:=https://codeload.github.com/bmx-routing/bmx7/tar.gz/v$(PKG_VERSION)?
+# PKG_HASH:=5f88df1c95e5cb842a6016bb1604e3e7f6097c63c5c9916edc3c84e96d4f5f65
 
-PKG_MAINTAINER:=Axel Neumann <neumann@cgws.de>
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/bmx-routing/bmx7.git
+PKG_SOURCE_VERSION:=9020896f89006bc5d3487222eefc7ddea9e8b2bd
+PKG_MIRROR_HASH:=skip
+HASH:=skip
+
+PKG_MAINTAINER:=Axel Neumann <axel@notmail.org>
 PKG_LICENSE:=GPL-2.0-or-later
 PKG_LICENSE_FILES:=LICENSE
 
@@ -21,7 +28,6 @@ TARGET_CFLAGS += $(FPIC)
 MAKE_ARGS += EXTRA_CFLAGS="$(TARGET_CFLAGS) \
                                -I. \
                                -I$(STAGING_DIR)/usr/include \
-                               -DCRYPTLIB=MBEDTLS_2_8_0 \
                                -DCORE_LIMIT=20000 \
                                -DTRAFFIC_DUMP \
                                -DNO_TRACE_FUNCTION_CALLS \

diff --git a/bmx7/patches/010-gcc10.patch b/bmx7/patches/010-gcc10.patch
deleted file mode 100644 (file)
index d2b9fcb..0000000
--- a/bmx7/patches/010-gcc10.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/bmx.h
-+++ b/src/bmx.h
-@@ -290,7 +290,7 @@ enum ADGSN {
- #define SUCCESS 0
- #define FAILURE -1
- 
--const void* FAILURE_PTR;
-+extern const void* FAILURE_PTR;
- 
- 
- #define MAX_SELECT_TIMEOUT_MS 1100 /* MUST be smaller than (1000/2) to fit into max tv_usec */

diff --git a/luci-app-olsrd2/Makefile b/luci-app-olsrd2/Makefile
index f18d4728f9e66c5f0afd0af8fc692afb9a4ebb96..a14543ecf24281d1400b2a4c8323d06422d1af70 100644 (file)
--- a/luci-app-olsrd2/Makefile
+++ b/luci-app-olsrd2/Makefile
@@ -3,7 +3,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-olsrd2
 PKG_VERSION:=0.2.6
-PKG_RELEASE:=15
+PKG_RELEASE:=16
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
@@ -42,8 +42,8 @@ define Package/$(PKG_NAME)/install
        $(INSTALL_DATA) ./htdocs/luci-static/resources/view/olsrd2/* $(1)/www/luci-static/resources/view/olsrd2
        $(INSTALL_DIR) $(1)/etc/config
        $(INSTALL_DATA) ./root/etc/config/* $(1)/etc/config
-       $(INSTALL_DIR) $(1)/etc/uci-defaults
-       $(INSTALL_DATA) ./root/etc/uci-defaults/* $(1)/etc/uci-defaults
+       $(INSTALL_DIR) $(1)/usr/share/ucitrack
+       $(INSTALL_DATA) ./root/usr/share/ucitrack/luci-app-olsrd2.json $(1)/usr/share/ucitrack
        $(INSTALL_DIR) $(1)/usr/libexec/rpcd
        $(INSTALL_BIN) ./root/usr/libexec/rpcd/status.olsrd2 $(1)/usr/libexec/rpcd/status.olsrd2
        $(INSTALL_DIR) $(1)/usr/share/luci/menu.d

diff --git a/luci-app-olsrd2/root/etc/uci-defaults/41_luci-olsrd2 b/luci-app-olsrd2/root/etc/uci-defaults/41_luci-olsrd2
deleted file mode 100755 (executable)
index 094970a..0000000
--- a/luci-app-olsrd2/root/etc/uci-defaults/41_luci-olsrd2
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-uci -q batch <<-EOF >/dev/null
-       delete ucitrack.@olsrd2[-1]
-       add ucitrack olsrd2
-       set ucitrack.@olsrd2[-1].init=olsrd2
-       commit ucitrack
-EOF
-
-rm -f /tmp/luci-indexcache
-rm -f /tmp/luci-modulecache/*
-
-exit 0

diff --git a/luci-app-olsrd2/root/usr/share/ucitrack/luci-app-olsrd2.json b/luci-app-olsrd2/root/usr/share/ucitrack/luci-app-olsrd2.json
new file mode 100644 (file)
index 0000000..05dbbd8
--- /dev/null
+++ b/luci-app-olsrd2/root/usr/share/ucitrack/luci-app-olsrd2.json
@@ -0,0 +1,4 @@
+{
+       "config": "olsrd2",
+       "init": "olsrd2"
+}

diff --git a/mesh11sd/Makefile b/mesh11sd/Makefile
index d932a5cb3e86b27a9425f26acc217715547f3dab..ffebb56b5bcbae1fe0b2434fd8a5cfc1fddcd068 100644 (file)
--- a/mesh11sd/Makefile
+++ b/mesh11sd/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mesh11sd
-PKG_VERSION:=3.1.1
+PKG_VERSION:=4.0.1
 PKG_RELEASE:=1
 
 PKG_MAINTAINER:=Rob White <rob@blue-wave.net>
@@ -17,7 +17,7 @@ PKG_LICENSE_FILES:=LICENSE
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/opennds/mesh11sd/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=98f6c00a510dc102822a75916eb9fbbf97008e34f7226e8d555bc31c46fba187
+PKG_HASH:=8029a0e41487d322b1bb20df05fc3ef2073b1239977f2b430b20fe7cabfe71de
 PKG_BUILD_DIR:=$(BUILD_DIR)/mesh11sd-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
@@ -37,11 +37,12 @@ define Package/mesh11sd/description
   This is the open source version and it enables easy and automated mesh network operation with multiple mesh nodes.
   It allows all mesh parameters supported by the wireless driver to be set in the uci config file.
   Settings take effect immediately without having to restart the wireless network.
+  Mesh paths are stabilised when node coverage areas overlap and rssi thresholds and tx power can be dynamically adjusted.
   Default settings give rapid and reliable layer 2 mesh convergence.
   Without mesh11sd, many mesh parameters cannot be set in the uci wireless config file as the mesh interface must be up before the parameters can be set.
   Some of those that are supported, would fail to be implemented when the network is (re)started resulting in errors or dropped nodes.
-  The mesh11sd daemon dynamically checks configured parameters and sets them as required.
-  Upstream wan connectivity is checked (eg Internet feed) and when not present, layer 2 peer mode is autonomously enabled,
+  The mesh11sd daemon can dynamically check configured parameters and set them as required.
+  In auto_config mode, upstream wan connectivity is checked (eg Internet feed) and when not present, layer 2 peer mode is autonomously enabled,
   and when it is present, layer 3 portal mode is enabled. This allows the same simple router configuration to be used on all meshnodes in the layer 2 mesh.
   Remote terminal sessions and remote file transfers are supported using the meshnode mac address as an identifier.
   This version does not require a Captive Portal to be running.