From 363add2f7cfcfeb3a308b5a8cd01269468f3a316 Mon Sep 17 00:00:00 2001
From: CN_SZTL <cnsztl@project-openwrt.eu.org>
Date: Thu, 22 Oct 2020 22:54:26 +0800
Subject: [PATCH 1/2] Revert "ubus: prepare to run ubusd as non-root user"

This reverts commit 99f35613e78fabe446b62a9ecfc5c3e0a9958db6.
---
 package/system/ubus/Makefile | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/package/system/ubus/Makefile b/package/system/ubus/Makefile
index a1c35a7c0f..824e71924f 100644
--- a/package/system/ubus/Makefile
+++ b/package/system/ubus/Makefile
@@ -5,9 +5,9 @@ PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/ubus.git
-PKG_SOURCE_DATE:=2020-10-21
-PKG_SOURCE_VERSION:=13a4438b4ebdf85d301999e0a615640ac4c9b0a8
-PKG_MIRROR_HASH:=e9e88bb78993a31a33a1c9579f1facca2949c1a4397b842a9f1b469b170be5da
+PKG_SOURCE_DATE:=2020-02-05
+PKG_SOURCE_VERSION:=171469e3138cce191892e20b6fd35b52c9368064
+PKG_MIRROR_HASH:=b4f1a3d70c2685c2aee2724b980b2ff747f8662f74d04d8be1c5a5e950b0e2ef
 CMAKE_INSTALL:=1
 
 PKG_LICENSE:=LGPL-2.1
@@ -31,7 +31,6 @@ define Package/ubusd
   CATEGORY:=Base system
   TITLE:=OpenWrt RPC daemon
   DEPENDS:=+libubox +libblobmsg-json
-  USERID:=ubus=81:ubus=81
 endef
 
 define Package/libubus

From 60a0a88809b754a2657f0c4576b87b960bb68ac8 Mon Sep 17 00:00:00 2001
From: CN_SZTL <cnsztl@project-openwrt.eu.org>
Date: Thu, 22 Oct 2020 22:54:49 +0800
Subject: [PATCH 2/2] Revert "procd: jail: clean up capability handling and
 non-root ubusd"

This reverts commit bfc67bcc16f3d9be0211a0662c6b19c0b70696e5.
---
 package/system/procd/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile
index d6def205c5..b0c035545e 100644
--- a/package/system/procd/Makefile
+++ b/package/system/procd/Makefile
@@ -12,9 +12,9 @@ PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/procd.git
-PKG_SOURCE_DATE:=2020-10-21
-PKG_SOURCE_VERSION:=6c5233a16a4831c69e3dcf09bf557156bc144b80
-PKG_MIRROR_HASH:=026138c6b9a337f87bb1c8928aa6e0f2b0814b6ab04b1f2d044c284facbde0f5
+PKG_SOURCE_DATE:=2020-08-10
+PKG_SOURCE_VERSION:=fad899769e1411cc273785461f073a0f7931b9a0
+PKG_MIRROR_HASH:=f56b621f78f821f7070d85f63448f684af7e2fe0c85233a8d054683cc34f6d06
 CMAKE_INSTALL:=1
 
 PKG_LICENSE:=GPL-2.0