From df99a7c712e564a734d38aeff110a897032d17d0 Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Fri, 8 May 2020 16:00:43 -0700
Subject: [PATCH] gerbera: set config file to 600 permissions

Only gerbera needs to read the file.

Added config file to conffiles to fix opkg update support.

Added several extra options to the UCI config. Manual editing is still required.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 multimedia/gerbera/Makefile             |  3 +--
 multimedia/gerbera/files/gerbera.config |  2 ++
 multimedia/gerbera/files/gerbera.init   | 13 ++++++++++---
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/multimedia/gerbera/Makefile b/multimedia/gerbera/Makefile
index c2f4b3d01..ec57f8e72 100644
--- a/multimedia/gerbera/Makefile
+++ b/multimedia/gerbera/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gerbera
 PKG_VERSION:=1.5.0
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/gerbera/gerbera/tar.gz/v$(PKG_VERSION)?
@@ -41,7 +41,6 @@ endef
 
 define Package/gerbera/conffiles
 /etc/config/gerbera
-/etc/gerbera/config.xml
 endef
 
 CMAKE_OPTIONS += \
diff --git a/multimedia/gerbera/files/gerbera.config b/multimedia/gerbera/files/gerbera.config
index f6d7cd8c8..6ada4aa97 100644
--- a/multimedia/gerbera/files/gerbera.config
+++ b/multimedia/gerbera/files/gerbera.config
@@ -1,4 +1,6 @@
 config gerbera config
 	option enabled	'0'
 	option debug	'0'
+	option user	'gerbera'
+	option group	'gerbera'
 	option home	'/tmp/gerbera'
diff --git a/multimedia/gerbera/files/gerbera.init b/multimedia/gerbera/files/gerbera.init
index 59cd171b0..191fb3b60 100644
--- a/multimedia/gerbera/files/gerbera.init
+++ b/multimedia/gerbera/files/gerbera.init
@@ -8,6 +8,8 @@ PROG=/usr/bin/gerbera
 start_service() {
 	local enabled
 	local debug
+	local user
+	local group
 	local home
 
 	config_load 'gerbera'
@@ -19,21 +21,26 @@ start_service() {
 		return 1
 	}
 
+	config_get user config 'user' 'gerbera'
+	config_get group config 'group' 'gerbera'
 	config_get home config 'home' '/tmp/gerbera'
 
 	[ -d "$home" ] || {
 		mkdir -p "$home"
-		chown gerbera:gerbera "$home"
+		chown "$user":"$group" "$home"
 
 		gerbera -m "$home" -f '' --create-config > "$home/config.xml" 2> /dev/null
+		chown "$user":"$group" "$home/config.xml"
+		chmod 600 "$home/config.xml"
+
 		echo "Created default gerbera config at $home/config.xml"
 		echo "Please edit to your liking and restart."
 		return 2
 	}
 
 	procd_open_instance
-	procd_set_param user gerbera
-	procd_set_param group gerbera
+	procd_set_param user "$user"
+	procd_set_param group "$group"
 	procd_set_param command "$PROG" -c "$home/config.xml"
 	procd_set_param stdout "$debug"
 	procd_set_param stderr 1