From 2855be31510f7defe99f4c01fb0639b8fdf9c69f Mon Sep 17 00:00:00 2001 From: Hans Dedecker Date: Thu, 30 Apr 2020 21:07:11 +0200 Subject: [PATCH 1/2] uci: update to latest git HEAD ec8d323 file: preserve original file mode after commit Signed-off-by: Hans Dedecker --- package/system/uci/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/system/uci/Makefile b/package/system/uci/Makefile index 5c2b68f00a..8c11f4c576 100644 --- a/package/system/uci/Makefile +++ b/package/system/uci/Makefile @@ -13,9 +13,9 @@ PKG_RELEASE:=3 PKG_SOURCE_URL=$(PROJECT_GIT)/project/uci.git PKG_SOURCE_PROTO:=git -PKG_SOURCE_DATE=2020-01-27 -PKG_SOURCE_VERSION:=e8d83732f9eb571dce71aa915ff38a072579610b -PKG_MIRROR_HASH:=f39f82b71bc1072e4bcadaeb392d51055b2be72c41744bb97897a3ac63ce0805 +PKG_SOURCE_DATE=2020-04-24 +PKG_SOURCE_VERSION:=ec8d3233948603485e1b97384113fac9f1bab5d6 +PKG_MIRROR_HASH:=b3cdc66a8ec4f05a102ce5520a3f8ff69ca4a49930c5bb01065467ef68f0808b PKG_LICENSE:=LGPL-2.1 PKG_LICENSE_FILES:= From ad27c133eb606ee39fa346b7bdb26c1764ee869e Mon Sep 17 00:00:00 2001 From: Hans Dedecker Date: Thu, 30 Apr 2020 21:29:09 +0200 Subject: [PATCH 2/2] base-files: generate config files with correct permissions As touch creates files with permission 0644 use umask to create config files with permission 0600 to be inline with INSTALL_CONF Signed-off-by: Hans Dedecker --- package/base-files/files/bin/config_generate | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/base-files/files/bin/config_generate b/package/base-files/files/bin/config_generate index 3bf48d7216..abb1388ba1 100755 --- a/package/base-files/files/bin/config_generate +++ b/package/base-files/files/bin/config_generate @@ -426,6 +426,8 @@ generate_gpioswitch() { json_init json_load "$(cat ${CFG})" +umask 077 + if [ ! -s /etc/config/network ]; then touch /etc/config/network generate_static_network