From 1c1d0f30d6fe1e9c94b5f101272d1be178762a5d Mon Sep 17 00:00:00 2001
From: CN_SZTL <cnsztl@gmail.com>
Date: Sat, 30 Nov 2019 20:08:27 +0800
Subject: [PATCH] procd: downgrade to 2019-05-30

---
 package/system/procd/Makefile            | 12 ++++----
 package/system/procd/files/procd.sh      | 39 ++----------------------
 package/system/procd/files/reload_config |  0
 3 files changed, 9 insertions(+), 42 deletions(-)
 mode change 100755 => 100644 package/system/procd/files/procd.sh
 mode change 100755 => 100644 package/system/procd/files/reload_config

diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile
index 27702efc51..437751aadf 100644
--- a/package/system/procd/Makefile
+++ b/package/system/procd/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=procd
-PKG_RELEASE:=3
+PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/procd.git
-PKG_MIRROR_HASH:=5ae16b53f80fd85d367a58da822351d611e9662154b0737ee6ed9531a39f01ce
-PKG_SOURCE_DATE:=2019-09-21
-PKG_SOURCE_VERSION:=8e9fb51fa66e614620a97d371176610e7e1d0010
+PKG_SOURCE_DATE:=2019-05-30
+PKG_SOURCE_VERSION:=ade00ca585a49c8478bf60eb24ce385676be37a4
+PKG_MIRROR_HASH:=1417727ae6fcda01017e1bec3ec66e3e78116f9343cfe0256e40af54c52f2acc
 CMAKE_INSTALL:=1
 
 PKG_LICENSE:=GPL-2.0
@@ -43,7 +43,7 @@ TARGET_LDFLAGS += -flto
 define Package/procd
   SECTION:=base
   CATEGORY:=Base system
-  DEPENDS:=+ubusd +ubus +libjson-script +ubox +USE_GLIBC:librt +libubox +libubus +libblobmsg-json +libjson-c
+  DEPENDS:=+ubusd +ubus +libjson-script +ubox +USE_GLIBC:librt +libubox +libubus
   TITLE:=OpenWrt system process manager
   USERID:=:dialout=20 :audio=29
 endef
@@ -58,7 +58,7 @@ endef
 define Package/procd-seccomp
   SECTION:=base
   CATEGORY:=Base system
-  DEPENDS:=@(arm||armeb||mips||mipsel||i386||powerpc||x86_64) @!TARGET_uml @KERNEL_SECCOMP +libubox +libblobmsg-json
+  DEPENDS:=@arm||@armeb||@mips||@mipsel||@i386||@powerpc||@x86_64 @!TARGET_uml @KERNEL_SECCOMP +libubox +libblobmsg-json
   TITLE:=OpenWrt process seccomp helper + utrace
 endef
 
diff --git a/package/system/procd/files/procd.sh b/package/system/procd/files/procd.sh
old mode 100755
new mode 100644
index b8f9a210f6..a6a8fc12fc
--- a/package/system/procd/files/procd.sh
+++ b/package/system/procd/files/procd.sh
@@ -49,14 +49,6 @@ procd_lock() {
 	local basescript=$(readlink "$initscript")
 	local service_name="$(basename ${basescript:-$initscript})"
 
-	flock -n 1000 &> /dev/null
-	if [ "$?" != "0" ]; then
-		exec 1000>"$IPKG_INSTROOT/var/lock/procd_${service_name}.lock"
-		flock 1000
-		if [ "$?" != "0" ]; then
-			logger "warning: procd flock for $service_name failed"
-		fi
-	fi
 }
 
 _procd_call() {
@@ -407,12 +399,12 @@ _procd_add_instance() {
 
 procd_running() {
 	local service="$1"
-	local instance="${2:-*}"
-	[ "$instance" = "*" ] || instance="'$instance'"
+	local instance="${2:-instance1}"
+	local running
 
 	json_init
 	json_add_string name "$service"
-	local running=$(_procd_ubus_call list | jsonfilter -l 1 -e "@['$service'].instances[$instance].running")
+	running=$(_procd_ubus_call list | jsonfilter -e "@.$service.instances.${instance}.running")
 
 	[ "$running" = "true" ]
 }
@@ -443,31 +435,6 @@ _procd_send_signal() {
 	_procd_ubus_call signal
 }
 
-_procd_status() {
-	local service="$1"
-	local instance="$2"
-	local data
-
-	json_init
-	[ -n "$service" ] && json_add_string name "$service"
-
-	data=$(_procd_ubus_call list | jsonfilter -e '@["'"$service"'"]')
-	[ -z "$data" ] && { echo "inactive"; return 3; }
-
-	data=$(echo "$data" | jsonfilter -e '$.instances')
-	if [ -z "$data" ]; then
-		[ -z "$instance" ] && { echo "active with no instances"; return 0; }
-		data="[]"
-	fi
-
-	[ -n "$instance" ] && instance="\"$instance\"" || instance='*'
-	if [ -z "$(echo "$data" | jsonfilter -e '$['"$instance"']')" ]; then
-		echo "unknown instance $instance"; return 4
-	else
-		echo "running"; return 0
-	fi
-}
-
 procd_open_data() {
 	local name="$1"
 	json_set_namespace procd __procd_old_cb
diff --git a/package/system/procd/files/reload_config b/package/system/procd/files/reload_config
old mode 100755
new mode 100644