aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRosen Penev <rosenp@gmail.com>2018-09-18 18:32:15 -0700
committerKevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>2018-09-19 09:42:13 +0100
commit5efd080e20f83556c0e3acb4d9c56673ec577d27 (patch)
tree18d1ffbc861cf9dc74a258df9162245dcb0076f3
parent4ad87744fa83e2f75fd4f6e9a46f106aaf7ee2dc (diff)
downloadupstream-5efd080e20f83556c0e3acb4d9c56673ec577d27.tar.gz
upstream-5efd080e20f83556c0e3acb4d9c56673ec577d27.tar.bz2
upstream-5efd080e20f83556c0e3acb4d9c56673ec577d27.zip
mdadm: Install /etc/config file as 600
/etc/config/mdadm is only used by the init script which is ran as root. There is no need for it to be readable by anything else. Added PKG_CPE_ID for proper CVE tracking. Small reorganization for consistency between Makefiles. Signed-off-by: Rosen Penev <rosenp@gmail.com>
-rw-r--r--package/utils/mdadm/Makefile9
1 files changed, 5 insertions, 4 deletions
diff --git a/package/utils/mdadm/Makefile b/package/utils/mdadm/Makefile
index 2b44db284f..ba74997b5e 100644
--- a/package/utils/mdadm/Makefile
+++ b/package/utils/mdadm/Makefile
@@ -9,13 +9,14 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=mdadm
PKG_VERSION:=4.0
-PKG_RELEASE:=4
+PKG_RELEASE:=5
-PKG_SOURCE_URL:=@KERNEL/linux/utils/raid/mdadm
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_SOURCE_URL:=@KERNEL/linux/utils/raid/mdadm
PKG_HASH:=1d6ae7f24ced3a0fa7b5613b32f4a589bb4881e3946a5a2c3724056254ada3a9
PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
+PKG_CPE_ID:=cpe:/a:mdadm_project:mdadm
PKG_BUILD_PARALLEL:=1
@@ -26,7 +27,7 @@ define Package/mdadm
CATEGORY:=Utilities
SUBMENU:=Disc
TITLE:=A tool for managing Soft RAID under Linux
- URL:=http://www.kernel.org/pub/linux/utils/raid/mdadm/
+ URL:=https://www.kernel.org/pub/linux/utils/raid/mdadm/
DEPENDS:=+libpthread +kmod-md-mod +kmod-md-raid0 +kmod-md-raid10 +kmod-md-raid1
endef
@@ -63,7 +64,7 @@ define Package/mdadm/install
$(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_BIN) ./files/mdadm.init $(1)/etc/init.d/mdadm
$(INSTALL_DIR) $(1)/etc/config
- $(INSTALL_DATA) ./files/mdadm.config $(1)/etc/config/mdadm
+ $(INSTALL_CONF) ./files/mdadm.config $(1)/etc/config/mdadm
endef
$(eval $(call BuildPackage,mdadm))