minidlna: update to latest master

Fixes several issues relating to IPv6.

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

multimedia/minidlna/files/minidlna.config

@@ -1,11 +1,10 @@
 config minidlna config
-	option 'enabled' '0'
+	option enabled '0'
 	option user 'minidlna'
 	option port '8200'
 	option interface 'br-lan'
 	option friendly_name 'OpenWrt DLNA Server'
 	option db_dir '/var/run/minidlna'
-	option log_dir '/var/log/minidlna'
 	option inotify '1'
 	option enable_tivo '0'
 	option wide_links '0'
@@ -15,5 +14,6 @@ config minidlna config
 	option serial '12345678'
 	option model_number '1'
 	option root_container '.'
+	option uuid ''
 	list media_dir '/mnt'
 	option album_art_names 'Cover.jpg/cover.jpg/AlbumArtSmall.jpg/albumartsmall.jpg/AlbumArt.jpg/albumart.jpg/Album.jpg/album.jpg/Folder.jpg/folder.jpg/Thumb.jpg/thumb.jpg'

multimedia/minidlna/files/minidlna.init

@@ -1,17 +1,13 @@
 #!/bin/sh /etc/rc.common
 # Copyright (C) 2010 OpenWrt.org
 
-START=50
+START=81
 
-SERVICE_USE_PID=1
-SERVICE_PID_FILE=/var/run/minidlna/minidlna.pid
+PROG=/usr/sbin/minidlnad
+USE_PROCD=1
 
 MINIDLNA_CONFIG_FILE="/var/etc/minidlna.conf"
 
-minidlna_cfg_append() {
-	echo "$1" >> "$MINIDLNA_CONFIG_FILE"
-}
-
 minidlna_cfg_addbool() {
 	local cfg="$1"
 	local key="$2"
@@ -20,7 +16,7 @@ minidlna_cfg_addbool() {
 
 	config_get_bool val "$cfg" "$key" "$def"
 	[ "$val" -gt 0 ] && val="yes" || val="no"
-	minidlna_cfg_append "$key=$val"
+	echo "$key=$val"
 }
 
 minidlna_cfg_addstr() {
@@ -30,12 +26,12 @@ minidlna_cfg_addstr() {
 	local val
 
 	config_get val "$cfg" "$key" "$def"
-	[ -n "$val" ] && minidlna_cfg_append "$key=$val"
+	[ -n "$val" ] && echo "$key=$val"
 }
 
 minidlna_cfg_add_media_dir() {
 	local val=$1
-	minidlna_cfg_append "media_dir=$val"
+	echo "media_dir=$val"
 }
 
 minidlna_create_config() {
@@ -46,18 +42,17 @@ minidlna_create_config() {
 	config_get port "$cfg" port
 	config_get interface "$cfg" interface
 
-	[ -z "$interface" -o -t "$port" ] && return 1
+	{ [ -z "$interface" ] || [ -t "$port" ]; } && return 1
 
 	mkdir -p /var/etc
-	echo "# this file is generated automatically, don't edit" > "$MINIDLNA_CONFIG_FILE"
+	echo "# this file is generated automatically, don't edit"
 
-	minidlna_cfg_append "port=$port"
-	minidlna_cfg_append "network_interface=$interface"
+	echo "port=$port"
+	echo "network_interface=$interface"
 
 	minidlna_cfg_addstr "$cfg" friendly_name
 	minidlna_cfg_addstr "$cfg" user
 	minidlna_cfg_addstr "$cfg" db_dir
-	minidlna_cfg_addstr "$cfg" log_dir
 	minidlna_cfg_addstr "$cfg" log_level 'error'
 	minidlna_cfg_addbool "$cfg" inotify '1'
 	minidlna_cfg_addbool "$cfg" enable_tivo '0'
@@ -70,34 +65,41 @@ minidlna_create_config() {
 	minidlna_cfg_addstr "$cfg" model_number '1'
 	minidlna_cfg_addstr "$cfg" minissdpsocket
 	minidlna_cfg_addstr "$cfg" root_container '.'
+	minidlna_cfg_addstr "$cfg" uuid '019f9a56-ff60-44c0-9edc-eae88d09fa05'
 	config_list_foreach "$cfg" "media_dir" minidlna_cfg_add_media_dir
 
 	return 0
-}
+} > "$MINIDLNA_CONFIG_FILE"
 
-start() {
+start_service() {
 	local enabled
 	local db_dir
-	local log_dir
 	local user
+	local val
 
 	config_load 'minidlna'
 	config_get_bool enabled config 'enabled' '0'
 
 	[ "$enabled" -gt 0 ] || return 1
 
+	config_get val "config" uuid
+	[ "$val" = '' ] && uci set minidlna.config.uuid="$(cat /proc/sys/kernel/random/uuid)" && uci commit
+
 	minidlna_create_config config || return 1
-	
+
 	config_get db_dir config 'db_dir' '/var/run/minidlna'
-	config_get log_dir config 'log_dir' '/var/log/minidlna'
-	config_get user config 'user' 'root'
+	config_get user config 'user' 'minidlna'
 
-	mkdir -m 0755 -p "$db_dir" "$log_dir"
-	chown -R "$user" "$db_dir" "$log_dir"
+	[ -d "$db_dir" ] || {
+		mkdir -m 755 -p "$db_dir"
+		chown -R "$user":"$user" "$db_dir"
+	}
 
-	service_start /usr/bin/minidlna -f "$MINIDLNA_CONFIG_FILE"
-}
-
-stop() {
-	service_stop /usr/bin/minidlna
+	procd_open_instance
+	procd_set_param command "$PROG"
+	procd_append_param command -S -f "$MINIDLNA_CONFIG_FILE"
+	procd_set_param stdout 1
+	procd_set_param stderr 1
+	procd_set_param respawn
+	procd_close_instance
 }

multimedia/minidlna/files/minidlna.sysctl

@@ -0,0 +1,2 @@
+# this is the desired value for minidlna
+fs.inotify.max_user_watches=65536