From 21a3599a9a16bf2e1e6c39123f5d9cc83e74b07b Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Tue, 2 Mar 2021 19:09:11 +0000 Subject: [PATCH 1/9] libubox: update to git HEAD 2e52c7e libubox: fix BLOBMSG_CAST_INT64 (do not override BLOBMSG_TYPE_DOUBLE) Signed-off-by: Daniel Golle (cherry picked from commit c82cc4407adebd683593d8f0b71d10e694ff8804) --- package/libs/libubox/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libs/libubox/Makefile b/package/libs/libubox/Makefile index 4d582eacfd..90e953aa46 100644 --- a/package/libs/libubox/Makefile +++ b/package/libs/libubox/Makefile @@ -5,9 +5,9 @@ PKG_RELEASE=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/libubox.git -PKG_MIRROR_HASH:=97dc4eba01cf2c5d6a6d0db3747e0cdc0d95cb87e51b3115272e7d3e69a8b255 -PKG_SOURCE_DATE:=2020-12-12 -PKG_SOURCE_VERSION:=357877693ca363b12e6e7e14d345639b2440cd07 +PKG_MIRROR_HASH:=042398d1295ac892e09c6d2e8f68861c6f859fc6752e809a114f451834e7a05e +PKG_SOURCE_DATE:=2021-03-02 +PKG_SOURCE_VERSION:=2e52c7e9a90ab7ba1cf9d2986d1505ca5d184698 PKG_ABI_VERSION:=$(call abi_version_str,$(PKG_SOURCE_DATE)) CMAKE_INSTALL:=1 From 5b16484b0da66c3bb7326dc12ce35140a445560c Mon Sep 17 00:00:00 2001 From: Rui Salvaterra Date: Tue, 9 Mar 2021 22:22:09 +0000 Subject: [PATCH 2/9] netifd: add a udhcpc.user placeholder script Document the existence of this feature. This allows the user to execute a script at each DHCPv4 event. This is useful, for example, as an ad-hoc way to update a DDNS entry when (and only when) required. Signed-off-by: Rui Salvaterra (cherry picked from commit 130118f7aa3191a2afd244d49e3057d4c5688676) --- package/network/config/netifd/Makefile | 6 +++++- package/network/config/netifd/files/etc/udhcpc.user | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 package/network/config/netifd/files/etc/udhcpc.user diff --git a/package/network/config/netifd/Makefile b/package/network/config/netifd/Makefile index 7061456b08..3052f43ceb 100644 --- a/package/network/config/netifd/Makefile +++ b/package/network/config/netifd/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=netifd -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/netifd.git @@ -25,6 +25,10 @@ define Package/netifd TITLE:=OpenWrt Network Interface Configuration Daemon endef +define Package/netifd/conffiles +/etc/udhcpc.user +endef + TARGET_CFLAGS += \ -I$(STAGING_DIR)/usr/include/libnl-tiny \ -I$(STAGING_DIR)/usr/include \ diff --git a/package/network/config/netifd/files/etc/udhcpc.user b/package/network/config/netifd/files/etc/udhcpc.user new file mode 100644 index 0000000000..78e2ba5f18 --- /dev/null +++ b/package/network/config/netifd/files/etc/udhcpc.user @@ -0,0 +1 @@ +# This script is sourced by udhcpc's dhcp.script at every DHCP event. From 252660bf3b8c5ad0a22d0b87925342e73adb5d71 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Wed, 31 Mar 2021 01:32:51 +0100 Subject: [PATCH 3/9] netifd: update to git HEAD 09632d4 device: remove left-over comment b22f83d handler: add mechanism to generate external device handler stubs 80bf9d7 extdev: add support for external device handlers 44c0f40 system-linux: reorder sysctl functions c84f3b0 system-linux: add device options used by wpad Signed-off-by: Daniel Golle (cherry picked from commit e62ace0ecf228f3a8bc86cea2252539ac7fd988c) --- package/network/config/netifd/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/network/config/netifd/Makefile b/package/network/config/netifd/Makefile index 3052f43ceb..b5f76362ba 100644 --- a/package/network/config/netifd/Makefile +++ b/package/network/config/netifd/Makefile @@ -5,9 +5,9 @@ PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/netifd.git -PKG_SOURCE_DATE:=2021-01-09 -PKG_SOURCE_VERSION:=c00c8335d6188daa326ecfe5a62da15a9b9987e1 -PKG_MIRROR_HASH:=c740e51e0cec13eec336ba1c7a643db3b64a9a2235f8c1b73a566cb89e841190 +PKG_SOURCE_DATE:=2021-03-31 +PKG_SOURCE_VERSION:=c84f3b02fced9dd6752a90ca466ada0aabb38224 +PKG_MIRROR_HASH:=d50f1a7983e1e7c0cddfa0642778dfc58a8e62a36f58211928c293d74bd0883b PKG_MAINTAINER:=Felix Fietkau PKG_LICENSE:=GPL-2.0 From f3a0f906b58ec3594cf26473405e85baac7fd774 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sat, 3 Apr 2021 19:11:38 +0200 Subject: [PATCH 4/9] netifd: update to Git version 2021-04-03 f8899b9 netifd: bridge: set default value for igmp_snoop 327da98 netifd: add possibility to switch off route config Signed-off-by: Hauke Mehrtens (cherry picked from commit b974293efa24b8e1bf859b1ed253ca0042ab273e) --- package/network/config/netifd/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/network/config/netifd/Makefile b/package/network/config/netifd/Makefile index b5f76362ba..e4720aa821 100644 --- a/package/network/config/netifd/Makefile +++ b/package/network/config/netifd/Makefile @@ -5,9 +5,9 @@ PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/netifd.git -PKG_SOURCE_DATE:=2021-03-31 -PKG_SOURCE_VERSION:=c84f3b02fced9dd6752a90ca466ada0aabb38224 -PKG_MIRROR_HASH:=d50f1a7983e1e7c0cddfa0642778dfc58a8e62a36f58211928c293d74bd0883b +PKG_SOURCE_DATE:=2021-04-03 +PKG_SOURCE_VERSION:=327da9895327bc56b23413ee91a6e6b6e0e4329d +PKG_MIRROR_HASH:=b6b005686aeb45948299113c71f6b806ece794db361594b23e03953c9c830af6 PKG_MAINTAINER:=Felix Fietkau PKG_LICENSE:=GPL-2.0 From ef1491694753291d7d7eb0b212b4250ac9388bfc Mon Sep 17 00:00:00 2001 From: "Leon M. George" Date: Tue, 23 Mar 2021 11:02:36 +0100 Subject: [PATCH 5/9] netifd: read udhcpc user scripts from directory Placeholder DHCP user scripts were added recently. These files make package-based installations of such scripts more difficult. Pull user callbacks from directories instead to allow packages and users to install co-existing scripts more easily. References: 130118f7a netifd: add a udhcpc.user placeholder script Signed-off-by: Leon M. George Signed-off-by: Hans Dedecker [PKG_RELEASE increase] (cherry picked from commit 467c32600cc575fcb67c5f01ad32e02141220ceb) --- package/network/config/netifd/Makefile | 4 +++- package/network/config/netifd/files/lib/netifd/dhcp.script | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/package/network/config/netifd/Makefile b/package/network/config/netifd/Makefile index e4720aa821..7d916b6939 100644 --- a/package/network/config/netifd/Makefile +++ b/package/network/config/netifd/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=netifd -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/netifd.git @@ -27,6 +27,7 @@ endef define Package/netifd/conffiles /etc/udhcpc.user +/etc/udhcpc.user.d/ endef TARGET_CFLAGS += \ @@ -44,6 +45,7 @@ define Package/netifd/install $(INSTALL_DIR) $(1)/sbin $(INSTALL_BIN) $(PKG_BUILD_DIR)/netifd $(1)/sbin/ $(CP) ./files/* $(1)/ + $(INSTALL_DIR) $(1)/etc/udhcpc.user.d/ $(CP) $(PKG_BUILD_DIR)/scripts/* $(1)/lib/netifd/ endef diff --git a/package/network/config/netifd/files/lib/netifd/dhcp.script b/package/network/config/netifd/files/lib/netifd/dhcp.script index 6585b641d6..e46005d84c 100755 --- a/package/network/config/netifd/files/lib/netifd/dhcp.script +++ b/package/network/config/netifd/files/lib/netifd/dhcp.script @@ -112,5 +112,8 @@ esac # user rules [ -f /etc/udhcpc.user ] && . /etc/udhcpc.user "$@" +for f in /etc/udhcpc.user.d/*; do + [ -f "$f" ] && (. "$f" "$@") +done exit 0 From 834167b42e08478f281ca45c973c4115df03208a Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Mon, 17 May 2021 17:58:52 +0200 Subject: [PATCH 6/9] libubox: update to the latest version 870acee325fe tests: cram: test_base64: fix failing tests 4d8995e91d56 tests: cram: test_base64: really fix failing tests 551d75b5662c libubox: tests: add more blobmsg/json test cases a0dbcf8b8f96 tests: add blob-buffer overflow test b36a3a90098d blob: fix exceeding maximum buffer length b8abed749423 utils.h: add fallthrough macro b14c4688612c json_script: fix unannotated fall-through warning Signed-off-by: Felix Fietkau (cherry picked from commit 04d21604fd72f337c8a0410d13b3d878914b7e7e) --- package/libs/libubox/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libs/libubox/Makefile b/package/libs/libubox/Makefile index 90e953aa46..ac4effb6f8 100644 --- a/package/libs/libubox/Makefile +++ b/package/libs/libubox/Makefile @@ -5,9 +5,9 @@ PKG_RELEASE=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/libubox.git -PKG_MIRROR_HASH:=042398d1295ac892e09c6d2e8f68861c6f859fc6752e809a114f451834e7a05e -PKG_SOURCE_DATE:=2021-03-02 -PKG_SOURCE_VERSION:=2e52c7e9a90ab7ba1cf9d2986d1505ca5d184698 +PKG_MIRROR_HASH:=7dd1db1e0074a9c7c722db654cce3111b3bd3cff0bfd791c4497cb0f6c22d3ca +PKG_SOURCE_DATE:=2021-05-16 +PKG_SOURCE_VERSION:=b14c4688612c05c78ce984d7bde633bce8703b1e PKG_ABI_VERSION:=$(call abi_version_str,$(PKG_SOURCE_DATE)) CMAKE_INSTALL:=1 From e78ef584313805e01707dbca379431f0394fd81a Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Tue, 18 May 2021 12:52:31 +0200 Subject: [PATCH 7/9] netifd: update to the latest version 02dd2f2df7cb fix unannotated fall-through warnings 3052f2f67686 extdev: remove unused function 2a97fd006c3b device: add support for configuring devices with external auth handler 87e469be0c08 wireless: fix memory corruption bug when using vlans/station entries in the config 7277764bf817 bridge: rename "ifname" attribute to "ports" Signed-off-by: Felix Fietkau (cherry picked from commit 829b5c2ba32f5ec821eab6762deecdf3522470a9) --- package/network/config/netifd/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/network/config/netifd/Makefile b/package/network/config/netifd/Makefile index 7d916b6939..7a05abb651 100644 --- a/package/network/config/netifd/Makefile +++ b/package/network/config/netifd/Makefile @@ -1,13 +1,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=netifd -PKG_RELEASE:=3 +PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/netifd.git -PKG_SOURCE_DATE:=2021-04-03 -PKG_SOURCE_VERSION:=327da9895327bc56b23413ee91a6e6b6e0e4329d -PKG_MIRROR_HASH:=b6b005686aeb45948299113c71f6b806ece794db361594b23e03953c9c830af6 +PKG_SOURCE_DATE:=2021-05-18 +PKG_SOURCE_VERSION:=7277764bf8173d6961acbacfe31757c9195329e1 +PKG_MIRROR_HASH:=bf3549594dccda31bb9da831823b931ba7cb85e1a60ec6432ed6c09f3ea54510 PKG_MAINTAINER:=Felix Fietkau PKG_LICENSE:=GPL-2.0 From 83d07db2f20d9f3eb3ced1ef6983de4b9f3fb5e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Thu, 20 May 2021 12:22:12 +0200 Subject: [PATCH 8/9] netifd: update to the latest master MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit config: fix ifname->ports compat rename Fixes: 829b5c2ba32f ("netifd: update to the latest version") Signed-off-by: Rafał Miłecki (cherry picked from commit cea6631cdf09c577ae87a21bc3b03273a233c17e) --- package/network/config/netifd/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/network/config/netifd/Makefile b/package/network/config/netifd/Makefile index 7a05abb651..aba1970d35 100644 --- a/package/network/config/netifd/Makefile +++ b/package/network/config/netifd/Makefile @@ -5,9 +5,9 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/netifd.git -PKG_SOURCE_DATE:=2021-05-18 -PKG_SOURCE_VERSION:=7277764bf8173d6961acbacfe31757c9195329e1 -PKG_MIRROR_HASH:=bf3549594dccda31bb9da831823b931ba7cb85e1a60ec6432ed6c09f3ea54510 +PKG_SOURCE_DATE:=2021-05-20 +PKG_SOURCE_VERSION:=42c19303bff5853866292671df30e9cae0fd60d1 +PKG_MIRROR_HASH:=534cd7e700589b0ab042a74368e48ea907234caa795a66944694463f23d69af3 PKG_MAINTAINER:=Felix Fietkau PKG_LICENSE:=GPL-2.0 From bab7a1120cd5dfa3569ac80baa47cb9c5317dd07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Wed, 26 May 2021 07:54:19 +0200 Subject: [PATCH 9/9] netifd: update to the latest master MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 899c2a4 interface: support "device" attribute and deprecate "ifname" 62e3cb5 scripts/netifd-wireless.sh: add support for specifying the operating band Signed-off-by: Rafał Miłecki (cherry picked from commit 5fe549836fefea5ed656d73a0040dd0451f84705) --- package/network/config/netifd/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/network/config/netifd/Makefile b/package/network/config/netifd/Makefile index aba1970d35..2f6b779e6d 100644 --- a/package/network/config/netifd/Makefile +++ b/package/network/config/netifd/Makefile @@ -5,9 +5,9 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/netifd.git -PKG_SOURCE_DATE:=2021-05-20 -PKG_SOURCE_VERSION:=42c19303bff5853866292671df30e9cae0fd60d1 -PKG_MIRROR_HASH:=534cd7e700589b0ab042a74368e48ea907234caa795a66944694463f23d69af3 +PKG_SOURCE_DATE:=2021-05-26 +PKG_SOURCE_VERSION:=899c2a4520526d43113f73cf673f20e2486a40fb +PKG_MIRROR_HASH:=354905192b30af88ea953241ed332555e67cdb7e3b54dd139250bf1e6ad3a709 PKG_MAINTAINER:=Felix Fietkau PKG_LICENSE:=GPL-2.0