From e841f2be5a3ca59cb8f331c5a9334b0ac26fc37b Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Sat, 14 Nov 2020 14:12:06 +0800 Subject: [PATCH 1/2] yq: drop upstreamed package --- package/ctcgfw/yq/Makefile | 67 -------------------------------------- 1 file changed, 67 deletions(-) delete mode 100644 package/ctcgfw/yq/Makefile diff --git a/package/ctcgfw/yq/Makefile b/package/ctcgfw/yq/Makefile deleted file mode 100644 index d416aa35ed..0000000000 --- a/package/ctcgfw/yq/Makefile +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright (C) 2020 [CTCGFW] Project OpenWrt -# -# This is a free software, use it under GNU General Public License v3.0. - -include $(TOPDIR)/rules.mk - -PKG_NAME:=yq -PKG_VERSION:=3.4.1 -PKG_RELEASE:=2 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://codeload.github.com/mikefarah/yq/tar.gz/$(PKG_VERSION)? -PKG_HASH:=73259f808d589d11ea7a18e4cd38a2e98b518a6c2c178d1ec57d9c5942277cb1 - -PKG_MAINTAINER:=CN_SZTL -PKG_LICENSE:=MIT -PKG_LICENSE_FILES:=LICENSE - -PKG_BUILD_DEPENDS:=golang/host -PKG_BUILD_PARALLEL:=1 -PKG_USE_MIPS16:=0 - -PKG_CONFIG_DEPENDS:= \ - CONFIG_YQ_COMPRESS_GOPROXY \ - CONFIG_YQ_COMPRESS_UPX - -GO_PKG:=github.com/mikefarah/yq - -include $(INCLUDE_DIR)/package.mk -include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk - -define Package/yq - SECTION:=utils - CATEGORY:=Utilities - TITLE:=Portable command-line YAML processor - URL:=https://mikefarah.gitbook.io/yq/ - DEPENDS:=$(GO_ARCH_DEPENDS) -endef - -define Package/yq/description - The aim of the project is to be the jq or sed of yaml files. -endef - -define Package/yq/config -config YQ_COMPRESS_GOPROXY - bool "Compiling with GOPROXY proxy" - default n - -config YQ_COMPRESS_UPX - bool "Compress executable files with UPX" - default y -endef - -ifeq ($(CONFIG_YQ_COMPRESS_GOPROXY),y) -export GO111MODULE=on -export GOPROXY=https://goproxy.io -endif - -define Build/Compile - $(call GoPackage/Build/Compile) -ifeq ($(CONFIG_YQ_COMPRESS_UPX),y) - $(STAGING_DIR_HOST)/bin/upx --lzma --best $(GO_PKG_BUILD_BIN_DIR)/yq -endif -endef - -$(eval $(call GoBinPackage,yq)) -$(eval $(call BuildPackage,yq)) From 99567630940a053a6df7fca22d76acab69816f6b Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sun, 25 Oct 2020 17:24:03 +0000 Subject: [PATCH 2/2] busybox: make username consistent ntpd in packages feed had already a user 'ntp' with UID 123 declared. Rename the username of busybox-ntpd to be 'ntp' instead of 'ntpd' so it doesn't clash. Reported-by: Etienne Champetier Signed-off-by: Daniel Golle --- package/utils/busybox/Makefile | 2 +- package/utils/busybox/files/sysntpd | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/utils/busybox/Makefile b/package/utils/busybox/Makefile index 62792116b2..8e939f2e20 100644 --- a/package/utils/busybox/Makefile +++ b/package/utils/busybox/Makefile @@ -50,7 +50,7 @@ define Package/busybox/Default TITLE:=Core utilities for embedded Linux URL:=http://busybox.net/ DEPENDS:=+BUSYBOX_CONFIG_PAM:libpam +BUSYBOX_CONFIG_NTPD:jsonfilter - USERID:=ntpd=123:ntpd=123 + USERID:=ntp=123:ntp=123 endef define Package/busybox diff --git a/package/utils/busybox/files/sysntpd b/package/utils/busybox/files/sysntpd index cbc760a48e..db5fc6c034 100755 --- a/package/utils/busybox/files/sysntpd +++ b/package/utils/busybox/files/sysntpd @@ -58,8 +58,8 @@ start_ntpd_instance() { [ -x /sbin/ujail ] && { procd_add_jail ntpd procd_set_param capabilities /etc/capabilities/ntpd.json - procd_set_param user ntpd - procd_set_param group ntpd + procd_set_param user ntp + procd_set_param group ntp procd_set_param no_new_privs 1 } procd_close_instance