From: Rosen Penev <rosenp@gmail.com>
Date: Wed, 19 Sep 2018 19:03:29 +0000 (-0700)
Subject: samba36: Install several config files as 600
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=f5ddbd695bcfb8ae8f8c681767beb6ee9770695d;p=openwrt%2Fstaging%2Fansuel.git

samba36: Install several config files as 600

Hotplug is managed by procd, which runs as root. The other files are used
by root as well.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---

diff --git a/package/network/services/samba36/Makefile b/package/network/services/samba36/Makefile
index b4322f04f4..d38e942074 100644
--- a/package/network/services/samba36/Makefile
+++ b/package/network/services/samba36/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=samba
 PKG_VERSION:=3.6.25
-PKG_RELEASE:=12
+PKG_RELEASE:=13
 
 PKG_SOURCE_URL:=https://download.samba.org/pub/samba \
 		https://download.samba.org/pub/samba/stable
@@ -154,7 +154,7 @@ define Package/samba36-server/install
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_CONF) ./files/samba.config $(1)/etc/config/samba
 	$(INSTALL_DIR) $(1)/etc/samba
-	$(INSTALL_DATA) ./files/smb.conf.template $(1)/etc/samba
+	$(INSTALL_CONF) ./files/smb.conf.template $(1)/etc/samba
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/codepages/lowcase.dat $(1)/etc/samba
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/codepages/upcase.dat $(1)/etc/samba
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/codepages/valid.dat $(1)/etc/samba
@@ -169,9 +169,9 @@ endef
 
 define Package/samba36-hotplug/install
 	$(INSTALL_DIR) $(1)/lib/samba
-	$(INSTALL_DATA) ./files/lib/samba.sh $(1)/lib/samba/samba.sh
+	$(INSTALL_CONF) ./files/lib/samba.sh $(1)/lib/samba/samba.sh
 	$(INSTALL_DIR) $(1)/etc/hotplug.d/block
-	$(INSTALL_DATA) ./files/samba.hotplug $(1)/etc/hotplug.d/block/60-samba
+	$(INSTALL_CONF) ./files/samba.hotplug $(1)/etc/hotplug.d/block/60-samba
 endef
 
 define Package/samba36-client/install