samba36: Install several config files as 600
authorRosen Penev <rosenp@gmail.com>
Wed, 19 Sep 2018 19:03:29 +0000 (12:03 -0700)
committerJo-Philipp Wich <jo@mein.io>
Tue, 18 Dec 2018 16:48:05 +0000 (17:48 +0100)
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>
(backported from f5ddbd695bcfb8ae8f8c681767beb6ee9770695d)

package/network/services/samba36/Makefile

index b4322f04f4cb279626a455104346536fc273fa40..d38e9420748daba8ebf646592821153b153ab4fb 100644 (file)
@@ -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