include $(TOPDIR)/rules.mk
PKG_NAME:=procd
-PKG_RELEASE:=1
+PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=$(PROJECT_GIT)/project/procd.git
-PKG_MIRROR_HASH:=fb745fd02a12c97adc99668b498dd4d960acded3340ab811eee730e0c34669c1
-PKG_SOURCE_DATE:=2019-09-04
-PKG_SOURCE_VERSION:=34ac88cb873ad81f1510e2207c34b6abaa1ae16a
+PKG_SOURCE_DATE:=2021-05-05
+PKG_SOURCE_VERSION:=021ece84de430fca988acd6934f6046ea59d8c37
+PKG_MIRROR_HASH:=edbe464cadbae000f4a48a6f1e6a0f5d27ae3ad521e308205252ad89639b6f9d
CMAKE_INSTALL:=1
PKG_LICENSE:=GPL-2.0
PKG_MAINTAINER:=John Crispin <john@phrozen.org>
+PKG_ASLR_PIE_REGULAR:=1
PKG_CONFIG_DEPENDS:= \
CONFIG_TARGET_INIT_PATH CONFIG_KERNEL_SECCOMP \
CONFIG_PROCD_SHOW_BOOT CONFIG_PROCD_ZRAM_TMPFS \
TARGET_CFLAGS += -flto
TARGET_LDFLAGS += -flto
-define Package/procd
+define Package/procd/Default
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 +libblobmsg-json +libjson-c +jshn
TITLE:=OpenWrt system process manager
USERID:=:dialout=20 :audio=29
endef
+define Package/procd
+ $(call Package/procd/Default)
+ VARIANT:=default
+ CONFLICTS:=procd-selinux
+endef
+
+define Package/procd-selinux
+ $(call Package/procd/Default)
+ DEPENDS += +libselinux
+ TITLE += with SELinux support
+ PROVIDES:=procd
+ VARIANT:=selinux
+endef
+
define Package/procd-ujail
SECTION:=base
CATEGORY:=Base system
- DEPENDS:=@KERNEL_NAMESPACES +@KERNEL_UTS_NS +@KERNEL_IPC_NS +@KERNEL_PID_NS +libubox +libblobmsg-json
+ DEPENDS:=@KERNEL_NAMESPACES +@KERNEL_UTS_NS +@KERNEL_IPC_NS +@KERNEL_PID_NS \
+ +libubox +libubus +libblobmsg-json
TITLE:=OpenWrt process jail helper
endef
+define Package/procd-ujail-console
+ SECTION:=base
+ CATEGORY:=Base system
+ DEPENDS:=+procd-ujail +libubus +libubox
+ TITLE:=OpenWrt process jail console
+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:=@(aarch64||arm||armeb||mips||mipsel||i386||powerpc||x86_64) @!TARGET_uml \
+ @KERNEL_SECCOMP +libubox +libblobmsg-json
TITLE:=OpenWrt process seccomp helper + utrace
endef
+define Package/uxc
+ SECTION:=base
+ CATEGORY:=Base system
+ DEPENDS:=+procd-ujail +libubus +libubox +libblobmsg-json
+ TITLE:=OpenWrt container management
+ MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
+endef
+
define Package/procd/config
menu "Configuration"
- depends on PACKAGE_procd
+ depends on PACKAGE_procd || PACKAGE_procd-selinux
config PROCD_SHOW_BOOT
bool
endmenu
endef
+ifeq ($(BUILD_VARIANT),selinux)
+ CMAKE_OPTIONS += -DSELINUX=1
+endif
ifeq ($(CONFIG_PROCD_SHOW_BOOT),y)
CMAKE_OPTIONS += -DSHOW_BOOT_ON_CONSOLE=1
$(INSTALL_DATA) ./files/procd.sh $(1)/lib/functions/
endef
+Package/procd-selinux/install = $(Package/procd/install)
+
define Package/procd-ujail/install
$(INSTALL_DIR) $(1)/sbin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ujail $(1)/sbin/
endef
+define Package/procd-ujail-console/install
+ $(INSTALL_DIR) $(1)/sbin
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ujail-console $(1)/sbin/
+endef
+
define Package/procd-seccomp/install
$(INSTALL_DIR) $(1)/sbin $(1)/lib
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libpreload-seccomp.so $(1)/lib
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libpreload-trace.so $(1)/lib
endef
+define Package/uxc/conffiles
+/etc/uxc
+endef
+
+define Package/uxc/install
+ $(INSTALL_DIR) $(1)/sbin
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/uxc $(1)/sbin/
+ $(INSTALL_DIR) $(1)/etc/init.d
+ $(INSTALL_BIN) ./files/uxc.init $(1)/etc/init.d/uxc
+endef
+
$(eval $(call BuildPackage,procd))
+$(eval $(call BuildPackage,procd-selinux))
$(eval $(call BuildPackage,procd-ujail))
+$(eval $(call BuildPackage,procd-ujail-console))
$(eval $(call BuildPackage,procd-seccomp))
+$(eval $(call BuildPackage,uxc))