Update to version 1.2.1

1 files changed, 60 insertions, 56 deletions

diff --git a/minidlna-custom-icon.patch b/minidlna-custom-icon.patch
index 271aa66b6c7d..efe542828244 100644
--- a/minidlna-custom-icon.patch
+++ b/minidlna-custom-icon.patch
@@ -1,6 +1,7 @@
-diff --new-file -aur a/icons.c b/icons.c
---- a/icons.c	2015-09-10 21:24:09.000000000 +0200
-+++ b/icons.c	2015-11-15 13:42:18.581940515 +0100
+diff --git a/icons.c b/icons.c
+index 0161a2c..6beda67 100644
+--- a/icons.c
++++ b/icons.c
 @@ -21,7 +21,7 @@
  #ifdef NETGEAR
  /* NG_Icon_48x48.png */
@@ -10,7 +11,7 @@ diff --new-file -aur a/icons.c b/icons.c
               "\x08\x06\x00\x00\x00\x57\x02\xf9\x87\x00\x00\x00\x19\x74\x45\x58\x74\x53\x6f\x66\x74\x77\x61\x72"
               "\x65\x00\x41\x64\x6f\x62\x65\x20\x49\x6d\x61\x67\x65\x52\x65\x61\x64\x79\x71\xc9\x65\x3c\x00\x00"
               "\x03\x22\x69\x54\x58\x74\x58\x4d\x4c\x3a\x63\x6f\x6d\x2e\x61\x64\x6f\x62\x65\x2e\x78\x6d\x70\x00"
-@@ -138,7 +138,7 @@
+@@ -138,7 +138,7 @@ png_sm[] =   "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x
  
  /* NG_Icon_120x120.png */
  unsigned char
@@ -19,7 +20,7 @@ diff --new-file -aur a/icons.c b/icons.c
               "\x08\x06\x00\x00\x00\x39\x64\x36\xd2\x00\x00\x00\x19\x74\x45\x58\x74\x53\x6f\x66\x74\x77\x61\x72"
               "\x65\x00\x41\x64\x6f\x62\x65\x20\x49\x6d\x61\x67\x65\x52\x65\x61\x64\x79\x71\xc9\x65\x3c\x00\x00"
               "\x03\x22\x69\x54\x58\x74\x58\x4d\x4c\x3a\x63\x6f\x6d\x2e\x61\x64\x6f\x62\x65\x2e\x78\x6d\x70\x00"
-@@ -355,7 +355,7 @@
+@@ -355,7 +355,7 @@ png_lrg[] =  "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x
  
  /* NG_Icon_48x48.jpg */
  unsigned char
@@ -28,7 +29,7 @@ diff --new-file -aur a/icons.c b/icons.c
               "\x00\x00\x00\x00\xff\xec\x00\x11\x44\x75\x63\x6b\x79\x00\x01\x00\x04\x00\x00\x00\x64\x00\x00\xff"
               "\xe1\x03\x2b\x68\x74\x74\x70\x3a\x2f\x2f\x6e\x73\x2e\x61\x64\x6f\x62\x65\x2e\x63\x6f\x6d\x2f\x78"
               "\x61\x70\x2f\x31\x2e\x30\x2f\x00\x3c\x3f\x78\x70\x61\x63\x6b\x65\x74\x20\x62\x65\x67\x69\x6e\x3d"
-@@ -562,7 +562,7 @@
+@@ -562,7 +562,7 @@ jpeg_sm[] =  "\xff\xd8\xff\xe1\x00\x18\x45\x78\x69\x66\x00\x00\x49\x49\x2a\x00\x
  
  /* NG_Icon_120x120.jpg */
  unsigned char
@@ -37,7 +38,7 @@ diff --new-file -aur a/icons.c b/icons.c
               "\x00\x00\x00\x00\xff\xec\x00\x11\x44\x75\x63\x6b\x79\x00\x01\x00\x04\x00\x00\x00\x64\x00\x00\xff"
               "\xe1\x03\x2b\x68\x74\x74\x70\x3a\x2f\x2f\x6e\x73\x2e\x61\x64\x6f\x62\x65\x2e\x63\x6f\x6d\x2f\x78"
               "\x61\x70\x2f\x31\x2e\x30\x2f\x00\x3c\x3f\x78\x70\x61\x63\x6b\x65\x74\x20\x62\x65\x67\x69\x6e\x3d"
-@@ -1104,7 +1104,7 @@
+@@ -1104,7 +1104,7 @@ jpeg_lrg[] = "\xff\xd8\xff\xe1\x00\x18\x45\x78\x69\x66\x00\x00\x49\x49\x2a\x00\x
  #elif __FreeBSD__
  /* Small Daemon PNG image */
  unsigned char
@@ -46,7 +47,7 @@ diff --new-file -aur a/icons.c b/icons.c
  		"\x08\x06\x00\x00\x00\x8c\xb9\x53\xa5\x00\x00\x00\x01\x73\x52\x47\x42\x00\xae\xce\x1c\xe9\x00\x00"
  		"\x00\x06\x62\x4b\x47\x44\x00\xff\x00\xff\x00\xff\xa0\xbd\xa7\x93\x00\x00\x00\x09\x70\x48\x59\x73"
  		"\x00\x00\x0b\x13\x00\x00\x0b\x13\x01\x00\x9a\x9c\x18\x00\x00\x00\x07\x74\x49\x4d\x45\x07\xdc\x03"
-@@ -1264,7 +1264,7 @@
+@@ -1264,7 +1264,7 @@ png_sm[] =	"\x89\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00
  
  /* Large Daemon PNG image */
  unsigned char
@@ -55,7 +56,7 @@ diff --new-file -aur a/icons.c b/icons.c
  		"\x08\x06\x00\x00\x00\x00\x03\x87\x89\x00\x00\x00\x01\x73\x52\x47\x42\x00\xae\xce\x1c\xe9\x00\x00"
  		"\x00\x06\x62\x4b\x47\x44\x00\xff\x00\xff\x00\xff\xa0\xbd\xa7\x93\x00\x00\x00\x09\x70\x48\x59\x73"
  		"\x00\x00\x0b\x13\x00\x00\x0b\x13\x01\x00\x9a\x9c\x18\x00\x00\x00\x07\x74\x49\x4d\x45\x07\xdc\x03"
-@@ -1932,7 +1932,7 @@
+@@ -1932,7 +1932,7 @@ png_lrg[] =	"\x89\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x0
  
  /* Small Daemon JPEG image */
  unsigned char
@@ -64,7 +65,7 @@ diff --new-file -aur a/icons.c b/icons.c
  		"\x00\x05\x03\x04\x04\x04\x03\x05\x04\x04\x04\x05\x05\x05\x06\x07\x0c\x08\x07\x07\x07\x07\x0f\x0b"
  		"\x0b\x09\x0c\x11\x0f\x12\x12\x11\x0f\x11\x11\x13\x16\x1c\x17\x13\x14\x1a\x15\x11\x11\x18\x21\x18"
  		"\x1a\x1d\x1d\x1f\x1f\x1f\x13\x17\x22\x24\x22\x1e\x24\x1c\x1e\x1f\x1e\xff\xdb\x00\x43\x01\x05\x05"
-@@ -1984,7 +1984,7 @@
+@@ -1984,7 +1984,7 @@ jpeg_sm[] =	"\xff\xd8\xff\xe0\x00\x10\x4a\x46\x49\x46\x00\x01\x01\x01\x00\x48\x0
  
  /* Large Daemon JPEG image */
  unsigned char
@@ -73,7 +74,7 @@ diff --new-file -aur a/icons.c b/icons.c
  		"\x00\x05\x03\x04\x04\x04\x03\x05\x04\x04\x04\x05\x05\x05\x06\x07\x0c\x08\x07\x07\x07\x07\x0f\x0b"
  		"\x0b\x09\x0c\x11\x0f\x12\x12\x11\x0f\x11\x11\x13\x16\x1c\x17\x13\x14\x1a\x15\x11\x11\x18\x21\x18"
  		"\x1a\x1d\x1d\x1f\x1f\x1f\x13\x17\x22\x24\x22\x1e\x24\x1c\x1e\x1f\x1e\xff\xdb\x00\x43\x01\x05\x05"
-@@ -2127,7 +2127,7 @@
+@@ -2127,7 +2127,7 @@ jpeg_lrg[] =	"\xff\xd8\xff\xe0\x00\x10\x4a\x46\x49\x46\x00\x01\x01\x01\x00\x48\x
  #else
  /* Small Tux PNG image */
  unsigned char
@@ -82,7 +83,7 @@ diff --new-file -aur a/icons.c b/icons.c
               "\x08\x06\x00\x00\x00\x8c\xb9\x53\xa5\x00\x00\x00\x01\x73\x52\x47\x42\x00\xae\xce\x1c\xe9\x00\x00"
               "\x08\xf3\x49\x44\x41\x54\x58\xc3\xc5\x99\x7b\x6c\x53\xd7\x19\xc0\x7f\xf7\x5e\x3f\x62\xe7\x69\x02"
               "\x24\x4b\x52\xe2\x84\x24\x24\x24\x83\x50\x5a\x06\x6b\x80\x96\x74\xa5\x1b\x63\xd5\xe8\xd6\x69\x65"
-@@ -2229,7 +2229,7 @@
+@@ -2229,7 +2229,7 @@ png_sm[] =   "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x
  
  /* Large Tux PNG image */
  unsigned char
@@ -91,7 +92,7 @@ diff --new-file -aur a/icons.c b/icons.c
               "\x08\x06\x00\x00\x00\x00\x03\x87\x89\x00\x00\x00\x01\x73\x52\x47\x42\x00\xae\xce\x1c\xe9\x00\x00"
               "\x20\x00\x49\x44\x41\x54\x78\xda\xed\x9d\x79\x78\x64\x55\x9d\xf7\x3f\xe7\xde\x5b\x7b\x65\xdf\xd3"
               "\x7b\xd2\x49\xba\x09\xe9\x25\x0d\x74\xb3\x0c\x8d\xd0\x80\x88\xe0\x23\xa3\x88\x40\x3f\xe0\x20\xca"
-@@ -2588,7 +2588,7 @@
+@@ -2588,7 +2588,7 @@ png_lrg[] =  "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x
  
  /* Small Tux JPEG image */
  unsigned char
@@ -100,7 +101,7 @@ diff --new-file -aur a/icons.c b/icons.c
               "\x00\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x02\x02\x03\x02\x02\x02\x02\x02\x04\x03"
               "\x03\x02\x03\x05\x04\x05\x05\x05\x04\x04\x04\x05\x06\x07\x06\x05\x05\x07\x06\x04\x04\x06\x09\x06"
               "\x07\x08\x08\x08\x08\x08\x05\x06\x09\x0a\x09\x08\x0a\x07\x08\x08\x08\xff\xdb\x00\x43\x01\x01\x01"
-@@ -2673,7 +2673,7 @@
+@@ -2673,7 +2673,7 @@ jpeg_sm[] =  "\xff\xd8\xff\xe0\x00\x10\x4a\x46\x49\x46\x00\x01\x01\x01\x00\x5a\x
  
  /* Large Tux JPEG image */
  unsigned char
@@ -109,7 +110,7 @@ diff --new-file -aur a/icons.c b/icons.c
               "\x00\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x02\x02\x03\x02\x02\x02\x02\x02\x04\x03"
               "\x03\x02\x03\x05\x04\x05\x05\x05\x04\x04\x04\x05\x06\x07\x06\x05\x05\x07\x06\x04\x04\x06\x09\x06"
               "\x07\x08\x08\x08\x08\x08\x05\x06\x09\x0a\x09\x08\x0a\x07\x08\x08\x08\xff\xdb\x00\x43\x01\x01\x01"
-@@ -2929,3 +2929,15 @@
+@@ -2929,3 +2929,15 @@ jpeg_lrg[] = "\xff\xd8\xff\xe0\x00\x10\x4a\x46\x49\x46\x00\x01\x01\x01\x00\x5a\x
               "\x1e\x88\x20\xa8\xd8\xba\xe2\x7e\xdc\x26\x9a\x69\x08\xf7\x22\x22\x02\x82\x28\x82\x29\xe8\x88\x9e"
               "\xda\x69\xa6\x90\x8f\xff\xd9";
  #endif
@@ -125,9 +126,11 @@ diff --new-file -aur a/icons.c b/icons.c
 +
 +char *jpeg_lrg = (char*) _jpeg_lrg;
 +size_t jpeg_lrg_size = sizeof(_jpeg_lrg);
-diff --new-file -aur a/icons.h b/icons.h
---- a/icons.h	1970-01-01 01:00:00.000000000 +0100
-+++ b/icons.h	2015-11-15 13:45:47.882281953 +0100
+diff --git a/icons.h b/icons.h
+new file mode 100644
+index 0000000..af4e3bc
+--- /dev/null
++++ b/icons.h
 @@ -0,0 +1,11 @@
 +extern char *png_sm;
 +extern size_t png_sm_size;
@@ -140,20 +143,21 @@ diff --new-file -aur a/icons.h b/icons.h
 +
 +extern char *jpeg_lrg;
 +extern size_t jpeg_lrg_size;
-diff --new-file -aur a/minidlna.c b/minidlna.c
---- a/minidlna.c	2015-09-10 21:24:09.000000000 +0200
-+++ b/minidlna.c	2015-11-15 13:42:18.581940515 +0100
-@@ -94,6 +94,7 @@
- #include "log.h"
+diff --git a/minidlna.c b/minidlna.c
+index 10b4806..2a27727 100644
+--- a/minidlna.c
++++ b/minidlna.c
+@@ -95,6 +95,7 @@
  #include "tivo_beacon.h"
  #include "tivo_utils.h"
+ #include "avahi.h"
 +#include "icons.h"
  
  #if SQLITE_VERSION_NUMBER < 3005001
  # warning "Your SQLite3 library appears to be too old!  Please use 3.5.1 or newer."
-@@ -738,6 +739,68 @@
- 			if (strtobool(ary_options[i].value))
- 				SETFLAG(MERGE_MEDIA_DIRS_MASK);
+@@ -752,6 +753,68 @@ init(int argc, char **argv)
+ 			if (strcasecmp(ary_options[i].value, "beacon") == 0)
+ 				CLEARFLAG(TIVO_BONJOUR_MASK);
  			break;
 +		case ICON_PNG_SM:
 +		case ICON_PNG_LRG:
@@ -220,12 +224,13 @@ diff --new-file -aur a/minidlna.c b/minidlna.c
  		default:
  			DPRINTF(E_ERROR, L_GENERAL, "Unknown option in file %s\n",
  				optionsfile);
-diff --new-file -aur a/minidlna.conf.5 b/minidlna.conf.5
---- a/minidlna.conf.5	2015-09-10 21:24:09.000000000 +0200
-+++ b/minidlna.conf.5	2015-11-15 13:52:12.405695834 +0100
-@@ -163,6 +163,16 @@
- 
- .fi
+diff --git a/minidlna.conf.5 b/minidlna.conf.5
+index d02fd46..da8ac50 100644
+--- a/minidlna.conf.5
++++ b/minidlna.conf.5
+@@ -171,6 +171,16 @@ force_sort_criteria=+upnp:class,+upnp:originalTrackNumber,+dc:title
+ Set to 'yes' to allow symlinks that point outside user-defined media_dirs.
+ By default, wide symlinks are not followed.
  
 +.IP "\fBicon_[format]_[size]\fP"
 +Set these options to the filepath to your custom icon file.
@@ -240,42 +245,41 @@ diff --new-file -aur a/minidlna.conf.5 b/minidlna.conf.5
  
  
  .SH VERSION
-diff --new-file -aur a/options.c b/options.c
---- a/options.c	2015-09-10 21:24:09.000000000 +0200
-+++ b/options.c	2015-11-15 13:42:18.581940515 +0100
-@@ -64,7 +64,11 @@
- 	{ USER_ACCOUNT, "user" },
- 	{ FORCE_SORT_CRITERIA, "force_sort_criteria" },
- 	{ MAX_CONNECTIONS, "max_connections" },
--	{ MERGE_MEDIA_DIRS, "merge_media_dirs" }
-+	{ MERGE_MEDIA_DIRS, "merge_media_dirs" },
+diff --git a/options.c b/options.c
+index 79e4ffe..6322fa1 100644
+--- a/options.c
++++ b/options.c
+@@ -67,6 +67,10 @@ static const struct {
+ 	{ MERGE_MEDIA_DIRS, "merge_media_dirs" },
+ 	{ WIDE_LINKS, "wide_links" },
+ 	{ TIVO_DISCOVERY, "tivo_discovery" },
 +	{ ICON_PNG_SM, "icon_png_small" },
 +	{ ICON_PNG_LRG, "icon_png_large" },
 +	{ ICON_JPEG_SM, "icon_jpeg_small" },
-+	{ ICON_JPEG_LRG, "icon_jpeg_large" }
++	{ ICON_JPEG_LRG, "icon_jpeg_large" },
  };
  
  int
-diff --new-file -aur a/options.h b/options.h
---- a/options.h	2015-09-10 21:24:09.000000000 +0200
-+++ b/options.h	2015-11-15 13:42:18.581940515 +0100
-@@ -57,7 +57,11 @@
- 	USER_ACCOUNT,			/* user account to run as */
- 	FORCE_SORT_CRITERIA,		/* force sorting by a given sort criteria */
- 	MAX_CONNECTIONS,		/* maximum number of simultaneous connections */
--	MERGE_MEDIA_DIRS		/* don't add an extra directory level when there are multiple media dirs */
-+	MERGE_MEDIA_DIRS,		/* don't add an extra directory level when there are multiple media dirs */
+diff --git a/options.h b/options.h
+index cb4c3be..f4c5e8f 100644
+--- a/options.h
++++ b/options.h
+@@ -60,6 +60,10 @@ enum upnpconfigoptions {
+ 	MERGE_MEDIA_DIRS,		/* don't add an extra directory level when there are multiple media dirs */
+ 	WIDE_LINKS,			/* allow following symlinks outside the defined media_dirs */
+ 	TIVO_DISCOVERY,			/* TiVo discovery protocol: bonjour or beacon. Defaults to bonjour if supported */
 +	ICON_PNG_SM,			/* path to small png icon */
 +	ICON_PNG_LRG,			/* path to large png icon */
 +	ICON_JPEG_SM,			/* path to small jpeg icon */
-+	ICON_JPEG_LRG			/* path to large jpeg icon */
++	ICON_JPEG_LRG,			/* path to large jpeg icon */
  };
  
  /* readoptionsfile()
-diff --new-file -aur a/upnphttp.c b/upnphttp.c
---- a/upnphttp.c	2015-09-10 21:24:09.000000000 +0200
-+++ b/upnphttp.c	2015-11-15 13:42:18.581940515 +0100
-@@ -1341,28 +1341,32 @@
+diff --git a/upnphttp.c b/upnphttp.c
+index 3b4b58a..2327667 100644
+--- a/upnphttp.c
++++ b/upnphttp.c
+@@ -1390,28 +1390,32 @@ SendResp_icon(struct upnphttp * h, char * icon)
  	{
  		DPRINTF(E_DEBUG, L_HTTP, "Sending small PNG icon\n");
  		data = (char *)png_sm;