From: Daniel Golle <daniel@makrotopia.org>
Date: Mon, 30 Dec 2019 18:26:24 +0000 (+0200)
Subject: procd: fix running jailed non-root process
X-Git-Tag: v21.02.0-rc1~4214
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=37929ddb7087199d6bac2568268eca6b302b27a2;p=openwrt%2Fstaging%2Fhauke.git

procd: fix running jailed non-root process

Setting user and group for a jailed process caused the jail not to
come up. Fix this by passing user and group to ujail and change
user only once the jail has been setup.
This allows jailing services which refuse to run as root user.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---

diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile
index 641a85915a..73a704bc80 100644
--- a/package/system/procd/Makefile
+++ b/package/system/procd/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=procd
-PKG_RELEASE:=4
+PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/procd.git
-PKG_MIRROR_HASH:=3452cd65ca5765fb9df828f3dba35c5e51ce8c1f4f83c49875e72a5931a9fef5
-PKG_SOURCE_DATE:=2019-11-04
-PKG_SOURCE_VERSION:=3aa051b44177fc1403acab295f9f833451c4b9f0
+PKG_MIRROR_HASH:=ebf1ee3ff0587428cf6b972c0551372c8ccc8982cfa63cbe00b13dfd482859ec
+PKG_SOURCE_DATE:=2019-12-30
+PKG_SOURCE_VERSION:=5ed190aae1b3985719046f4c744e311fc9ef18e3
 CMAKE_INSTALL:=1
 
 PKG_LICENSE:=GPL-2.0