procd: update to latest git HEAD

[openwrt/staging/jogo.git] / package / system / procd / Makefile

diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile
index d35248e66d7252d4851f456876a6eb61002fdb66..4c8f9fefc6389d85d172ed51e97e81546f5e3006 100644 (file)
--- a/package/system/procd/Makefile
+++ b/package/system/procd/Makefile
@@ -12,9 +12,9 @@ PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(LEDE_GIT)/project/procd.git
-PKG_SOURCE_DATE:=2017-07-31
-PKG_SOURCE_VERSION:=f062b305b5ea2c77bb8286f8982f08e4c5b133ae
-PKG_MIRROR_HASH:=419f99b484bc5698c3e096bbc40af768d01361da10ab25d22e95038bfbb2b724
+PKG_SOURCE_DATE:=2017-10-10
+PKG_SOURCE_VERSION:=7aad9409d22dc38b71ec75d2aafcfa32426b5594
+PKG_MIRROR_HASH:=f662492c2727db66b4643fb8a297c55e6c60d29d447706c10ee962e92887ab21
 CMAKE_INSTALL:=1
 
 PKG_LICENSE:=GPL-2.0
@@ -87,9 +87,8 @@ ifdef CONFIG_PACKAGE_procd-ujail
   CMAKE_OPTIONS += -DJAIL_SUPPORT=1
 endif
 
-ifdef CONFIG_PACKAGE_procd-seccomp
-  CMAKE_OPTIONS += -DSECCOMP_SUPPORT=1 -DUTRACE_SUPPORT=1
-endif
+SECCOMP=$(if $(CONFIG_PACKAGE_procd-seccomp),1,0)
+CMAKE_OPTIONS += -DSECCOMP_SUPPORT=$(SECCOMP) -DUTRACE_SUPPORT=$(SECCOMP)
 
 define Package/procd/install
        $(INSTALL_DIR) $(1)/sbin $(1)/etc $(1)/lib/functions
@@ -110,6 +109,7 @@ define Package/procd-seccomp/install
        $(INSTALL_DIR) $(1)/sbin $(1)/lib
        $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libpreload-seccomp.so $(1)/lib
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/utrace $(1)/sbin/
+       $(LN) utrace $(1)/sbin/seccomp-trace
        $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libpreload-trace.so $(1)/lib
 endef