From 6d496145edad996c52156e52834fc76df33308f5 Mon Sep 17 00:00:00 2001
From: lean <coolsnowwolf@gmail.com>
Date: Thu, 3 Jun 2021 21:15:18 +0800
Subject: [PATCH] rpcd: iwinfo add 802.11ax HE support

---
 package/system/rpcd/Makefile                           | 8 +++++---
 package/system/rpcd/files/50-migrate-rpcd-ubus-sock.sh | 8 ++++++++
 package/system/rpcd/files/rpcd.config                  | 2 +-
 3 files changed, 14 insertions(+), 4 deletions(-)
 create mode 100755 package/system/rpcd/files/50-migrate-rpcd-ubus-sock.sh

diff --git a/package/system/rpcd/Makefile b/package/system/rpcd/Makefile
index 20ec3bf17..7c99267b6 100644
--- a/package/system/rpcd/Makefile
+++ b/package/system/rpcd/Makefile
@@ -12,10 +12,10 @@ PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/rpcd.git
-PKG_SOURCE_DATE:=2020-05-26
-PKG_SOURCE_VERSION:=078bb57e0769c987c05244abe1f7d8d53e0e323e
+PKG_SOURCE_DATE:=2021-05-05
+PKG_SOURCE_VERSION:=7a560a1a5769146ab072f8e0165940459d3e16f7
 PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
-PKG_MIRROR_HASH:=7f626efd95eccc7b8262a7e533341e17fe765d99cfa2fafde978190cb834fced
+PKG_MIRROR_HASH:=69d9588a5a910676252eabcd2815af318806cae8316777e8b6eb00b26bdc42cb
 
 PKG_LICENSE:=ISC
 PKG_LICENSE_FILES:=
@@ -63,6 +63,8 @@ define Package/rpcd/install
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/unauthenticated.json $(1)/usr/share/rpcd/acl.d/unauthenticated.json
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_CONF) ./files/rpcd.config $(1)/etc/config/rpcd
+	$(INSTALL_DIR) $(1)/etc/uci-defaults
+	$(INSTALL_BIN) ./files/50-migrate-rpcd-ubus-sock.sh $(1)/etc/uci-defaults
 endef
 
 
diff --git a/package/system/rpcd/files/50-migrate-rpcd-ubus-sock.sh b/package/system/rpcd/files/50-migrate-rpcd-ubus-sock.sh
new file mode 100755
index 000000000..609b0f983
--- /dev/null
+++ b/package/system/rpcd/files/50-migrate-rpcd-ubus-sock.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+[ "$(uci get rpcd.@rpcd[0].socket)" = "/var/run/ubus.sock" ] || exit 0
+
+uci set rpcd.@rpcd[0].socket='/var/run/ubus/ubus.sock'
+uci commit rpcd
+
+exit 0
diff --git a/package/system/rpcd/files/rpcd.config b/package/system/rpcd/files/rpcd.config
index faaed7f53..176c643f1 100644
--- a/package/system/rpcd/files/rpcd.config
+++ b/package/system/rpcd/files/rpcd.config
@@ -1,5 +1,5 @@
 config rpcd
-	option socket /var/run/ubus.sock
+	option socket /var/run/ubus/ubus.sock
 	option timeout 30
 
 config login