git: fa8a46b47d4e - main - audio/logitechmediaserver: update to 8.4.0

From: Rodrigo Osorio <rodrigo_at_FreeBSD.org>
Date: Wed, 13 Mar 2024 17:17:59 UTC
The branch main has been updated by rodrigo:

URL: https://cgit.FreeBSD.org/ports/commit/?id=fa8a46b47d4ee72181a46034aea2b39c230c8e5c

commit fa8a46b47d4ee72181a46034aea2b39c230c8e5c
Author:     Rodrigo Osorio <rodrigo@FreeBSD.org>
AuthorDate: 2024-03-13 15:26:53 +0000
Commit:     Rodrigo Osorio <rodrigo@FreeBSD.org>
CommitDate: 2024-03-13 17:16:59 +0000

    audio/logitechmediaserver: update to 8.4.0
    
    Changelog: https://github.com/Logitech/slimserver/blob/8.4.0/Changelog8.html
    
    Major changes:
        * Additional plugins, views
        * The ability to import playlists from other services
    
    Port changes:
        since mysqueezebox.com is going to close down imminently, add
        the --nomysqueezebox to the server invocation to make life easier
        https://lms-community.github.io/getting-started/changelog-lms8/#version-850
    
    PR:             277299
    Reported by:    Trenton Schulz <trueos@norwegianrockcat.com> (maintainer)
---
 audio/logitechmediaserver/Makefile                 |  31 +-
 audio/logitechmediaserver/distinfo                 |  10 +-
 .../files/logitechmediaserver.in                   |   2 +-
 .../files/vendorpatch-CPAN_buildme.sh              |  11 -
 audio/logitechmediaserver/pkg-plist                |  59 +++-
 audio/logitechmediaserver/pkg-plist.i386           | 387 ++++++++++++---------
 6 files changed, 287 insertions(+), 213 deletions(-)

diff --git a/audio/logitechmediaserver/Makefile b/audio/logitechmediaserver/Makefile
index 8b153ec2373d..ee1d256e41a8 100644
--- a/audio/logitechmediaserver/Makefile
+++ b/audio/logitechmediaserver/Makefile
@@ -1,7 +1,6 @@
 
 PORTNAME=	logitechmediaserver
-DISTVERSION=	8.3.1
-PORTREVISION=	1
+DISTVERSION=	8.4.0
 CATEGORIES=	audio
 
 MAINTAINER=	trueos@norwegianrockcat.com
@@ -24,8 +23,8 @@ RUN_DEPENDS=	p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL
 
 USES=		gettext-runtime gmake perl5 shebangfix
 USE_GITHUB=	yes
-GH_TUPLE=	Logitech:slimserver:026019b \
-		Logitech:slimserver-vendor:947eb3a:vendor
+GH_TUPLE=	Logitech:slimserver:e225575 \
+		Logitech:slimserver-vendor:5bb7355:vendor
 USE_RC_SUBR=	logitechmediaserver
 SHEBANG_FILES=	Bin/darwin/check-update.pl \
 		CPAN/Log/Log4perl/Layout/PatternLayout/Multiline.pm \
@@ -39,8 +38,6 @@ SHEBANG_FILES=	Bin/darwin/check-update.pl \
 		slimserver.pl \
 		${WRKSRC_vendor}/CPAN/hints/darwin.pl
 
-EXTRA_PATCHES=	${FILESDIR}/vendorpatch-CPAN_buildme.sh
-
 SUB_FILES=	Custom.pm \
 		custom-convert.conf \
 		logitechmediaserver.conf
@@ -53,13 +50,6 @@ SUB_LIST=	PERL=${PERL} \
 		SLIMGROUP=${SLIMGROUP} \
 		CONFFILES="${CONFFILES}"
 
-PLIST_SUB=	SLIMDIR=${SLIMDIR} \
-		SLIMDBDIR=${SLIMDBDIR} \
-		OPSYS=${OPSYS:tl} \
-		ARCH=${ARCH} \
-		ARCHNAME=${ARCHNAME}
-
-EXTRA_PATCHES=	${FILESDIR}/vendorpatch-CPAN_buildme.sh
 SUB_FILES=	Custom.pm \
 		custom-convert.conf \
 		logitechmediaserver.conf
@@ -72,6 +62,15 @@ SUB_LIST=	PERL=${PERL} \
 		SLIMGROUP=${SLIMGROUP} \
 		CONFFILES="${CONFFILES}"
 
+USERS=		${SLIMUSER}
+GROUPS=		${SLIMGROUP}
+
+PLIST_SUB=	SLIMDIR=${SLIMDIR} \
+		SLIMDBDIR=${SLIMDBDIR} \
+		OPSYS=${OPSYS:tl} \
+		ARCH=${ARCH} \
+		ARCHNAME=${ARCHNAME}
+
 # Defaults support playback of relativly unrestricted formats on SB2 or
 # SB3 devices and wired SB1 devices.
 OPTIONS_DEFINE=	APE FAAD FLAC LAME SOX TEST DOCS
@@ -84,9 +83,6 @@ LAME_RUN_DEPENDS=	lame:audio/lame
 SOX_RUN_DEPENDS=	sox:audio/sox
 TEST_VARS_OFF=		CONTRIB_FLAGS=-t
 
-USERS=		${SLIMUSER}
-GROUPS=		${SLIMGROUP}
-
 DOCFILES=	Changelog*.html License*.txt
 CONFFILES=	convert.conf types.conf
 
@@ -117,8 +113,6 @@ do-build:
 
 do-install:
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${SLIMDIR})
-	chmod +x ${STAGEDIR}${PREFIX}/${SLIMDIR}/scanner.pl \
-	    ${STAGEDIR}${PREFIX}/${SLIMDIR}/slimserver.pl
 	(cd ${WRKSRC_vendor}/CPAN/build && \
 		${COPYTREE_SHARE} arch ${STAGEDIR}${PREFIX}/${SLIMDIR}/CPAN)
 	(cd ${WRKSRC_vendor}/CPAN/build/${PERL_VER}/lib/perl5 && \
@@ -143,6 +137,7 @@ do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d
 	${INSTALL_DATA} ${WRKDIR}/logitechmediaserver.conf \
 	    ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d/
+	@${MKDIR} ${STAGEDIR}${SLIMDBDIR}
 	@${LN} -s ${SLIMDBDIR}/cache ${STAGEDIR}${PREFIX}/${SLIMDIR}/Cache
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/audio/logitechmediaserver/distinfo b/audio/logitechmediaserver/distinfo
index 896e3680b092..9d9206adf295 100644
--- a/audio/logitechmediaserver/distinfo
+++ b/audio/logitechmediaserver/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1679831207
-SHA256 (Logitech-slimserver-8.3.1-026019b_GH0.tar.gz) = 9b5c801cf765d204d08d64f6420ee1fe368eb2182d811c2bb50cbe98383c761d
-SIZE (Logitech-slimserver-8.3.1-026019b_GH0.tar.gz) = 147326126
-SHA256 (Logitech-slimserver-vendor-947eb3a_GH0.tar.gz) = 8d356bf7f22fa9f427b71f074c9be4c13322f6e201c69cc62f3f2779221aeb71
-SIZE (Logitech-slimserver-vendor-947eb3a_GH0.tar.gz) = 170625563
+TIMESTAMP = 1708239484
+SHA256 (Logitech-slimserver-8.4.0-e225575_GH0.tar.gz) = 81753397b57c51688c9a5d45db3597cc28303c556b2f0c68eaeb3d912562a439
+SIZE (Logitech-slimserver-8.4.0-e225575_GH0.tar.gz) = 157658424
+SHA256 (Logitech-slimserver-vendor-5bb7355_GH0.tar.gz) = 65694923ec667ed484619e6ca6826250ebe35ba4d1307e7b7d282fbfb2585352
+SIZE (Logitech-slimserver-vendor-5bb7355_GH0.tar.gz) = 184535648
diff --git a/audio/logitechmediaserver/files/logitechmediaserver.in b/audio/logitechmediaserver/files/logitechmediaserver.in
index c79c2d23c2f8..386c5d6f9f8d 100644
--- a/audio/logitechmediaserver/files/logitechmediaserver.in
+++ b/audio/logitechmediaserver/files/logitechmediaserver.in
@@ -27,7 +27,7 @@ prefsdir=${statedir}/prefs
 playlistdir=${statedir}/playlists
 u=%%SLIMUSER%%
 g=%%SLIMGROUP%%
-command_args="--daemon --pidfile=${pidfile} --user=${u} --group=${g}"
+command_args="--daemon --pidfile=${pidfile} --user=${u} --group=${g} --nomysqueezebox"
 %%PORTNAME%%_user=${u}
 %%PORTNAME%%_group=${g}
 
diff --git a/audio/logitechmediaserver/files/vendorpatch-CPAN_buildme.sh b/audio/logitechmediaserver/files/vendorpatch-CPAN_buildme.sh
deleted file mode 100644
index 4d3c2e34c59c..000000000000
--- a/audio/logitechmediaserver/files/vendorpatch-CPAN_buildme.sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../slimserver-vendor-947eb3a/CPAN/buildme.sh.orig	2018-04-11 08:51:55.360230000 +0100
-+++ ../slimserver-vendor-947eb3a/CPAN/buildme.sh	2018-04-11 08:52:15.289491000 +0100
-@@ -657,7 +657,7 @@
-                 tar_wrapper zxf icu4c-58_2-src.tgz
-                 cd icu/source
-                 # Need to patch ICU to adapt to removal of xlocale.h on some platforms.
--                patch -p0 < ../../icu58_patches/digitlst.cpp.patch
-+                # DONT DO THIS patch -p0 < ../../icu58_patches/digitlst.cpp.patch
-                 . ../../update-config.sh
-                 if [ "$OS" = 'Darwin' ]; then
-                     ICUFLAGS="$FLAGS $OSX_ARCH $OSX_FLAGS -DU_USING_ICU_NAMESPACE=0 -DU_CHARSET_IS_UTF8=1" # faster code for native UTF-8 systems
diff --git a/audio/logitechmediaserver/pkg-plist b/audio/logitechmediaserver/pkg-plist
index 7b91752812e0..985d233ca123 100644
--- a/audio/logitechmediaserver/pkg-plist
+++ b/audio/logitechmediaserver/pkg-plist
@@ -39,7 +39,7 @@ etc/newsyslog.conf.d/logitechmediaserver.conf
 %%SLIMDIR%%/CPAN/Archive/Zip/StringMember.pm
 %%SLIMDIR%%/CPAN/Archive/Zip/Tree.pm
 %%SLIMDIR%%/CPAN/Archive/Zip/ZipFileMember.pm
-%%SLIMDIR%%/CPAN/Async/Util.pm
+%%SLIMDIR%%/lib/Async/Util.pm
 %%SLIMDIR%%/CPAN/Bundle/LWP.pm
 %%SLIMDIR%%/CPAN/Cache/BaseCache.pm
 %%SLIMDIR%%/CPAN/Cache/Cache.pm
@@ -206,15 +206,21 @@ etc/newsyslog.conf.d/logitechmediaserver.conf
 %%SLIMDIR%%/CPAN/File/Spec/Win32.pm
 %%SLIMDIR%%/CPAN/File/Temp.pm
 %%SLIMDIR%%/CPAN/File/Which.pm
+%%SLIMDIR%%/CPAN/HTML/AsSubs.pm
+%%SLIMDIR%%/CPAN/HTML/Element.pm
+%%SLIMDIR%%/CPAN/HTML/Element/traverse.pm
 %%SLIMDIR%%/CPAN/HTML/Entities.pm
 %%SLIMDIR%%/CPAN/HTML/Filter.pm
 %%SLIMDIR%%/CPAN/HTML/Form.pm
 %%SLIMDIR%%/CPAN/HTML/Formatter.pm
 %%SLIMDIR%%/CPAN/HTML/HeadParser.pm
 %%SLIMDIR%%/CPAN/HTML/LinkExtor.pm
+%%SLIMDIR%%/CPAN/HTML/Parse.pm
 %%SLIMDIR%%/CPAN/HTML/Parser.pm
 %%SLIMDIR%%/CPAN/HTML/PullParser.pm
+%%SLIMDIR%%/CPAN/HTML/Tagset.pm
 %%SLIMDIR%%/CPAN/HTML/TokeParser.pm
+%%SLIMDIR%%/CPAN/HTML/Tree.pm
 %%SLIMDIR%%/CPAN/HTML/TreeBuilder.pm
 %%SLIMDIR%%/CPAN/HTTP/Config.pm
 %%SLIMDIR%%/CPAN/HTTP/Cookies.pm
@@ -1797,6 +1803,8 @@ etc/newsyslog.conf.d/logitechmediaserver.conf
 %%SLIMDIR%%/SQL/SQLite/schema_20_up.sql
 %%SLIMDIR%%/SQL/SQLite/schema_21_down.sql
 %%SLIMDIR%%/SQL/SQLite/schema_21_up.sql
+%%SLIMDIR%%/SQL/SQLite/schema_22_down.sql
+%%SLIMDIR%%/SQL/SQLite/schema_22_up.sql
 %%SLIMDIR%%/SQL/SQLite/schema_2_down.sql
 %%SLIMDIR%%/SQL/SQLite/schema_2_up.sql
 %%SLIMDIR%%/SQL/SQLite/schema_3_down.sql
@@ -1841,6 +1849,8 @@ etc/newsyslog.conf.d/logitechmediaserver.conf
 %%SLIMDIR%%/SQL/mysql/schema_20_up.sql
 %%SLIMDIR%%/SQL/mysql/schema_21_down.sql
 %%SLIMDIR%%/SQL/mysql/schema_21_up.sql
+%%SLIMDIR%%/SQL/mysql/schema_22_down.sql
+%%SLIMDIR%%/SQL/mysql/schema_22_up.sql
 %%SLIMDIR%%/SQL/mysql/schema_2_down.sql
 %%SLIMDIR%%/SQL/mysql/schema_2_up.sql
 %%SLIMDIR%%/SQL/mysql/schema_3_down.sql
@@ -1859,7 +1869,6 @@ etc/newsyslog.conf.d/logitechmediaserver.conf
 %%SLIMDIR%%/SQL/mysql/schema_9_up.sql
 %%SLIMDIR%%/SQL/mysql/schema_clear.sql
 %%SLIMDIR%%/SQL/mysql/schema_optimize.sql
-%%SLIMDIR%%/SQL/slimservice/slimservice-sqlite.sql
 %%SLIMDIR%%/Slim/Buttons/Alarm.pm
 %%SLIMDIR%%/Slim/Buttons/Block.pm
 %%SLIMDIR%%/Slim/Buttons/Common.pm
@@ -1944,6 +1953,7 @@ etc/newsyslog.conf.d/logitechmediaserver.conf
 %%SLIMDIR%%/Slim/Menu/AlbumInfo.pm
 %%SLIMDIR%%/Slim/Menu/ArtistInfo.pm
 %%SLIMDIR%%/Slim/Menu/Base.pm
+%%SLIMDIR%%/Slim/Menu/BrowseLibrary/Releases.pm
 %%SLIMDIR%%/Slim/Menu/BrowseLibrary.pm
 %%SLIMDIR%%/Slim/Menu/FolderInfo.pm
 %%SLIMDIR%%/Slim/Menu/GenreInfo.pm
@@ -1956,6 +1966,7 @@ etc/newsyslog.conf.d/logitechmediaserver.conf
 %%SLIMDIR%%/Slim/Music/Import.pm
 %%SLIMDIR%%/Slim/Music/Info.pm
 %%SLIMDIR%%/Slim/Music/PlaylistFolderScan.pm
+%%SLIMDIR%%/Slim/Music/ReleaseTypes.pm
 %%SLIMDIR%%/Slim/Music/TitleFormatter.pm
 %%SLIMDIR%%/Slim/Music/VirtualLibraries.pm
 %%SLIMDIR%%/Slim/Networking/Async.pm
@@ -1971,7 +1982,6 @@ etc/newsyslog.conf.d/logitechmediaserver.conf
 %%SLIMDIR%%/Slim/Networking/Discovery/Players.pm
 %%SLIMDIR%%/Slim/Networking/Discovery/Server.pm
 %%SLIMDIR%%/Slim/Networking/IO/Select.pm
-%%SLIMDIR%%/Slim/Networking/Repositories.pm
 %%SLIMDIR%%/Slim/Networking/Select.pm
 %%SLIMDIR%%/Slim/Networking/SimpleAsyncHTTP.pm
 %%SLIMDIR%%/Slim/Networking/SimpleHTTP/Base.pm
@@ -1984,6 +1994,7 @@ etc/newsyslog.conf.d/logitechmediaserver.conf
 %%SLIMDIR%%/Slim/Networking/SqueezeNetwork/Players.pm
 %%SLIMDIR%%/Slim/Networking/SqueezeNetwork/PrefSync.pm
 %%SLIMDIR%%/Slim/Networking/SqueezeNetwork/Sync.pm
+%%SLIMDIR%%/Slim/Networking/SqueezeNetwork/Time.pm
 %%SLIMDIR%%/Slim/Networking/UDP.pm
 %%SLIMDIR%%/Slim/Player/Boom.pm
 %%SLIMDIR%%/Slim/Player/CapabilitiesHelper.pm
@@ -2026,6 +2037,12 @@ etc/newsyslog.conf.d/logitechmediaserver.conf
 %%SLIMDIR%%/Slim/Plugin/AppGallery/Plugin.pm
 %%SLIMDIR%%/Slim/Plugin/AppGallery/install.xml
 %%SLIMDIR%%/Slim/Plugin/AppGallery/strings.txt
+%%SLIMDIR%%/Slim/Plugin/AudioAddict/API.pm
+%%SLIMDIR%%/Slim/Plugin/AudioAddict/HTML/EN/plugins/AudioAddict/settings.html
+%%SLIMDIR%%/Slim/Plugin/AudioAddict/Plugin.pm
+%%SLIMDIR%%/Slim/Plugin/AudioAddict/Settings.pm
+%%SLIMDIR%%/Slim/Plugin/AudioAddict/install.xml
+%%SLIMDIR%%/Slim/Plugin/AudioAddict/strings.txt
 %%SLIMDIR%%/Slim/Plugin/AudioScrobbler/HTML/EN/plugins/AudioScrobbler/settings/basic.html
 %%SLIMDIR%%/Slim/Plugin/AudioScrobbler/HTML/EN/plugins/AudioScrobbler/settings/player.html
 %%SLIMDIR%%/Slim/Plugin/AudioScrobbler/PlayerSettings.pm
@@ -2045,6 +2062,10 @@ etc/newsyslog.conf.d/logitechmediaserver.conf
 %%SLIMDIR%%/Slim/Plugin/Classical/ProtocolHandler.pm
 %%SLIMDIR%%/Slim/Plugin/Classical/install.xml
 %%SLIMDIR%%/Slim/Plugin/Classical/strings.txt
+%%SLIMDIR%%/Slim/Plugin/ClassicalRadio/HTML/EN/plugins/ClassicalRadio/html/icon.png
+%%SLIMDIR%%/Slim/Plugin/ClassicalRadio/Plugin.pm
+%%SLIMDIR%%/Slim/Plugin/ClassicalRadio/install.xml
+%%SLIMDIR%%/Slim/Plugin/ClassicalRadio/strings.txt
 %%SLIMDIR%%/Slim/Plugin/DateTime/HTML/EN/plugins/DateTime/settings/basic.html
 %%SLIMDIR%%/Slim/Plugin/DateTime/Plugin.pm
 %%SLIMDIR%%/Slim/Plugin/DateTime/Settings.pm
@@ -2059,6 +2080,10 @@ etc/newsyslog.conf.d/logitechmediaserver.conf
 %%SLIMDIR%%/Slim/Plugin/Deezer/ProtocolHandler.pm
 %%SLIMDIR%%/Slim/Plugin/Deezer/install.xml
 %%SLIMDIR%%/Slim/Plugin/Deezer/strings.txt
+%%SLIMDIR%%/Slim/Plugin/DIfm/HTML/EN/plugins/DIfm/html/icon.png
+%%SLIMDIR%%/Slim/Plugin/DIfm/Plugin.pm
+%%SLIMDIR%%/Slim/Plugin/DIfm/install.xml
+%%SLIMDIR%%/Slim/Plugin/DIfm/strings.txt
 %%SLIMDIR%%/Slim/Plugin/DigitalInput/HTML/EN/plugins/DigitalInput/html/images/icon.png
 %%SLIMDIR%%/Slim/Plugin/DigitalInput/HTML/EN/plugins/DigitalInput/html/images/icon_40x40_m.png
 %%SLIMDIR%%/Slim/Plugin/DigitalInput/HTML/EN/plugins/DigitalInput/list.html
@@ -2141,6 +2166,10 @@ etc/newsyslog.conf.d/logitechmediaserver.conf
 %%SLIMDIR%%/Slim/Plugin/InternetRadio/TuneIn/Settings.pm
 %%SLIMDIR%%/Slim/Plugin/InternetRadio/install.xml
 %%SLIMDIR%%/Slim/Plugin/InternetRadio/strings.txt
+%%SLIMDIR%%/Slim/Plugin/JazzRadio/HTML/EN/plugins/JazzRadio/html/icon.png
+%%SLIMDIR%%/Slim/Plugin/JazzRadio/Plugin.pm
+%%SLIMDIR%%/Slim/Plugin/JazzRadio/install.xml
+%%SLIMDIR%%/Slim/Plugin/JazzRadio/strings.txt
 %%SLIMDIR%%/Slim/Plugin/JiveExtras/HTML/EN/plugins/JiveExtras/settings/basic.html
 %%SLIMDIR%%/Slim/Plugin/JiveExtras/Plugin.pm
 %%SLIMDIR%%/Slim/Plugin/JiveExtras/Settings.pm
@@ -2250,6 +2279,14 @@ etc/newsyslog.conf.d/logitechmediaserver.conf
 %%SLIMDIR%%/Slim/Plugin/PreventStandby/Win32.pm
 %%SLIMDIR%%/Slim/Plugin/PreventStandby/install.xml
 %%SLIMDIR%%/Slim/Plugin/PreventStandby/strings.txt
+%%SLIMDIR%%/Slim/Plugin/RadioTunes/HTML/EN/plugins/RadioTunes/html/icon.png
+%%SLIMDIR%%/Slim/Plugin/RadioTunes/Plugin.pm
+%%SLIMDIR%%/Slim/Plugin/RadioTunes/install.xml
+%%SLIMDIR%%/Slim/Plugin/RadioTunes/strings.txt
+%%SLIMDIR%%/Slim/Plugin/RockRadio/HTML/EN/plugins/RockRadio/html/icon.png
+%%SLIMDIR%%/Slim/Plugin/RockRadio/Plugin.pm
+%%SLIMDIR%%/Slim/Plugin/RockRadio/install.xml
+%%SLIMDIR%%/Slim/Plugin/RockRadio/strings.txt
 %%SLIMDIR%%/Slim/Plugin/RS232/HTML/EN/plugins/RS232/settings/basic.html
 %%SLIMDIR%%/Slim/Plugin/RS232/Plugin.pm
 %%SLIMDIR%%/Slim/Plugin/RS232/Settings.pm
@@ -2359,6 +2396,12 @@ etc/newsyslog.conf.d/logitechmediaserver.conf
 %%SLIMDIR%%/Slim/Plugin/UPnP/t/MediaServer.t
 %%SLIMDIR%%/Slim/Plugin/UPnP/t/UPnP.t
 %%SLIMDIR%%/Slim/Plugin/UPnP/t/lib/GENA.pm
+%%SLIMDIR%%/Slim/Plugin/ViewTags/Common.pm
+%%SLIMDIR%%/Slim/Plugin/ViewTags/HTML/EN/plugins/ViewTags/settings.html
+%%SLIMDIR%%/Slim/Plugin/ViewTags/Plugin.pm
+%%SLIMDIR%%/Slim/Plugin/ViewTags/Settings.pm
+%%SLIMDIR%%/Slim/Plugin/ViewTags/install.xml
+%%SLIMDIR%%/Slim/Plugin/ViewTags/strings.txt
 %%SLIMDIR%%/Slim/Plugin/Visualizer/Plugin.pm
 %%SLIMDIR%%/Slim/Plugin/Visualizer/install.xml
 %%SLIMDIR%%/Slim/Plugin/Visualizer/strings.txt
@@ -2370,6 +2413,10 @@ etc/newsyslog.conf.d/logitechmediaserver.conf
 %%SLIMDIR%%/Slim/Plugin/WiMP/ProtocolHandler.pm
 %%SLIMDIR%%/Slim/Plugin/WiMP/install.xml
 %%SLIMDIR%%/Slim/Plugin/WiMP/strings.txt
+%%SLIMDIR%%/Slim/Plugin/ZenRadio/HTML/EN/plugins/ZenRadio/html/icon.png
+%%SLIMDIR%%/Slim/Plugin/ZenRadio/Plugin.pm
+%%SLIMDIR%%/Slim/Plugin/ZenRadio/install.xml
+%%SLIMDIR%%/Slim/Plugin/ZenRadio/strings.txt
 %%SLIMDIR%%/Slim/Plugin/iTunes/Common.pm
 %%SLIMDIR%%/Slim/Plugin/iTunes/HTML/EN/plugins/iTunes/settings/itunes.html
 %%SLIMDIR%%/Slim/Plugin/iTunes/Importer.pm
@@ -2452,6 +2499,7 @@ etc/newsyslog.conf.d/logitechmediaserver.conf
 %%SLIMDIR%%/Slim/Utils/OS/Synology.pm
 %%SLIMDIR%%/Slim/Utils/OS/Unix.pm
 %%SLIMDIR%%/Slim/Utils/OS/Win32.pm
+%%SLIMDIR%%/Slim/Utils/OS/Win64.pm
 %%SLIMDIR%%/Slim/Utils/OSDetect.pm
 %%SLIMDIR%%/Slim/Utils/PerfMon.pm
 %%SLIMDIR%%/Slim/Utils/PerlRunTime.pm
@@ -2590,8 +2638,8 @@ etc/newsyslog.conf.d/logitechmediaserver.conf
 %%SLIMDIR%%/lib/Template/Provider.pm
 %%SLIMDIR%%/lib/Tie/IxHash.pm
 %%SLIMDIR%%/modules.conf
-%%SLIMDIR%%/scanner.pl
-%%SLIMDIR%%/slimserver.pl
+@(,,755) %%SLIMDIR%%/scanner.pl
+@(,,755) %%SLIMDIR%%/slimserver.pl
 %%SLIMDIR%%/strings.txt
 %%SLIMDIR%%/t/00_smoketest.sh
 @sample %%SLIMDIR%%/types.conf.sample %%SLIMDIR%%/types.conf
@@ -2607,3 +2655,4 @@ etc/newsyslog.conf.d/logitechmediaserver.conf
 @dir %%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/auto/Tree/DAG_Node
 @dir %%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/auto/YAML/LibYAML
 @dir %%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/auto/common/sense
+@dir(%%SLIMUSER%%,%%SLIMGROUP%%) %%SLIMDBDIR%%
diff --git a/audio/logitechmediaserver/pkg-plist.i386 b/audio/logitechmediaserver/pkg-plist.i386
index 4feec1e22f73..9e1a1c326923 100644
--- a/audio/logitechmediaserver/pkg-plist.i386
+++ b/audio/logitechmediaserver/pkg-plist.i386
@@ -39,7 +39,6 @@ etc/newsyslog.conf.d/logitechmediaserver.conf
 %%SLIMDIR%%/CPAN/Archive/Zip/StringMember.pm
 %%SLIMDIR%%/CPAN/Archive/Zip/Tree.pm
 %%SLIMDIR%%/CPAN/Archive/Zip/ZipFileMember.pm
-%%SLIMDIR%%/CPAN/Async/Util.pm
 %%SLIMDIR%%/CPAN/Bundle/LWP.pm
 %%SLIMDIR%%/CPAN/Cache/BaseCache.pm
 %%SLIMDIR%%/CPAN/Cache/Cache.pm
@@ -206,15 +205,21 @@ etc/newsyslog.conf.d/logitechmediaserver.conf
 %%SLIMDIR%%/CPAN/File/Spec/Win32.pm
 %%SLIMDIR%%/CPAN/File/Temp.pm
 %%SLIMDIR%%/CPAN/File/Which.pm
+%%SLIMDIR%%/CPAN/HTML/AsSubs.pm
+%%SLIMDIR%%/CPAN/HTML/Element.pm
+%%SLIMDIR%%/CPAN/HTML/Element/traverse.pm
 %%SLIMDIR%%/CPAN/HTML/Entities.pm
 %%SLIMDIR%%/CPAN/HTML/Filter.pm
 %%SLIMDIR%%/CPAN/HTML/Form.pm
 %%SLIMDIR%%/CPAN/HTML/Formatter.pm
 %%SLIMDIR%%/CPAN/HTML/HeadParser.pm
 %%SLIMDIR%%/CPAN/HTML/LinkExtor.pm
+%%SLIMDIR%%/CPAN/HTML/Parse.pm
 %%SLIMDIR%%/CPAN/HTML/Parser.pm
 %%SLIMDIR%%/CPAN/HTML/PullParser.pm
+%%SLIMDIR%%/CPAN/HTML/Tagset.pm
 %%SLIMDIR%%/CPAN/HTML/TokeParser.pm
+%%SLIMDIR%%/CPAN/HTML/Tree.pm
 %%SLIMDIR%%/CPAN/HTML/TreeBuilder.pm
 %%SLIMDIR%%/CPAN/HTTP/Config.pm
 %%SLIMDIR%%/CPAN/HTTP/Cookies.pm
@@ -725,6 +730,106 @@ etc/newsyslog.conf.d/logitechmediaserver.conf
 %%SLIMDIR%%/CPAN/YAML/Loader/Syck.pm
 %%SLIMDIR%%/CPAN/YAML/XS.pm
 %%SLIMDIR%%/CPAN/YAML/XS/LibYAML.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/Audio/Scan.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/Bundle/DBI.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/Class/XSAccessor.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/Class/XSAccessor/Array.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/Class/XSAccessor/Heavy.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBD/DBM.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBD/ExampleP.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBD/File.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBD/File/Developers.pod
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBD/File/HowTo.pod
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBD/File/Roadmap.pod
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBD/Gofer.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBD/Gofer/Policy/Base.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBD/Gofer/Policy/classic.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBD/Gofer/Policy/pedantic.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBD/Gofer/Policy/rush.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBD/Gofer/Transport/Base.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBD/Gofer/Transport/corostream.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBD/Gofer/Transport/null.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBD/Gofer/Transport/pipeone.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBD/Gofer/Transport/stream.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBD/NullP.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBD/Proxy.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBD/SQLite.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBD/SQLite/Constants.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBD/SQLite/Cookbook.pod
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBD/SQLite/Fulltext_search.pod
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBD/SQLite/VirtualTable.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBD/SQLite/VirtualTable/FileContent.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBD/SQLite/VirtualTable/PerlData.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBD/Sponge.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBI.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBI/Changes.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBI/Const/GetInfo/ANSI.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBI/Const/GetInfo/ODBC.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBI/Const/GetInfoReturn.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBI/Const/GetInfoType.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBI/DBD.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBI/DBD/Metadata.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBI/DBD/SqlEngine.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBI/DBD/SqlEngine/Developers.pod
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBI/DBD/SqlEngine/HowTo.pod
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBI/FAQ.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBI/Gofer/Execute.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBI/Gofer/Request.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBI/Gofer/Response.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBI/Gofer/Serializer/Base.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBI/Gofer/Serializer/DataDumper.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBI/Gofer/Serializer/Storable.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBI/Gofer/Transport/Base.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBI/Gofer/Transport/pipeone.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBI/Gofer/Transport/stream.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBI/Profile.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBI/ProfileData.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBI/ProfileDumper.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBI/ProfileDumper/Apache.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBI/ProfileSubs.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBI/ProxyServer.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBI/PurePerl.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBI/SQL/Nano.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBI/Util/CacheMemory.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBI/Util/_accessor.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBI/W32ODBC.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/Digest/SHA1.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/EV.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/EV/EVAPI.h
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/EV/MakeMaker.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/EV/ev.h
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/EV/libev.pod
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/Encode/Detect.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/Encode/Detect/Detector.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/HTML/Entities.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/HTML/Filter.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/HTML/HeadParser.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/HTML/LinkExtor.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/HTML/Parser.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/HTML/PullParser.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/HTML/TokeParser.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/Win32/DBIODBC.pm
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/auto/Audio/Scan/Scan.so
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/auto/Class/XSAccessor/XSAccessor.so
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/auto/DBD/SQLite/SQLite.so
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/auto/DBI/DBI.so
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/auto/DBI/DBIXS.h
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/auto/DBI/Driver.xst
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/auto/DBI/Driver_xst.h
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/auto/DBI/dbd_xsh.h
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/auto/DBI/dbi_sql.h
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/auto/DBI/dbipport.h
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/auto/DBI/dbivport.h
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/auto/DBI/dbixs_rev.h
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/auto/Digest/SHA1/SHA1.so
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/auto/EV/EV.so
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/auto/Encode/Detect/Detector/Detector.so
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/auto/HTML/Parser/Parser.so
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/auto/share/dist/DBD-SQLite/sqlite3.c
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/auto/share/dist/DBD-SQLite/sqlite3.h
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/auto/share/dist/DBD-SQLite/sqlite3ext.h
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/dbixs_rev.pl
+%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/perllocal.pod
 %%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/Audio/Scan.pm
 %%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/Class/XSAccessor.pm
 %%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/Class/XSAccessor/Array.pm
@@ -834,120 +939,12 @@ etc/newsyslog.conf.d/logitechmediaserver.conf
 %%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/Test/Warn.pm
 %%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/Tree/DAG_Node.pm
 %%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/common/sense.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/Audio/Scan.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/Bundle/DBI.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/Class/XSAccessor.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/Class/XSAccessor/Array.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/Class/XSAccessor/Heavy.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBD/DBM.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBD/ExampleP.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBD/File.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBD/File/Developers.pod
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBD/File/HowTo.pod
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBD/File/Roadmap.pod
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBD/Gofer.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBD/Gofer/Policy/Base.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBD/Gofer/Policy/classic.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBD/Gofer/Policy/pedantic.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBD/Gofer/Policy/rush.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBD/Gofer/Transport/Base.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBD/Gofer/Transport/corostream.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBD/Gofer/Transport/null.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBD/Gofer/Transport/pipeone.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBD/Gofer/Transport/stream.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBD/NullP.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBD/Proxy.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBD/SQLite.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBD/SQLite/Constants.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBD/SQLite/Cookbook.pod
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBD/SQLite/Fulltext_search.pod
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBD/SQLite/VirtualTable.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBD/SQLite/VirtualTable/FileContent.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBD/SQLite/VirtualTable/PerlData.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBD/Sponge.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBI.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBI/Changes.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBI/Const/GetInfo/ANSI.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBI/Const/GetInfo/ODBC.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBI/Const/GetInfoReturn.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBI/Const/GetInfoType.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBI/DBD.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBI/DBD/Metadata.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBI/DBD/SqlEngine.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBI/DBD/SqlEngine/Developers.pod
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBI/DBD/SqlEngine/HowTo.pod
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBI/FAQ.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBI/Gofer/Execute.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBI/Gofer/Request.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBI/Gofer/Response.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBI/Gofer/Serializer/Base.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBI/Gofer/Serializer/DataDumper.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBI/Gofer/Serializer/Storable.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBI/Gofer/Transport/Base.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBI/Gofer/Transport/pipeone.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBI/Gofer/Transport/stream.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBI/Profile.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBI/ProfileData.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBI/ProfileDumper.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBI/ProfileDumper/Apache.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBI/ProfileSubs.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBI/ProxyServer.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBI/PurePerl.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBI/SQL/Nano.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBI/Util/CacheMemory.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBI/Util/_accessor.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/DBI/W32ODBC.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/Digest/SHA1.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/EV.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/EV/EVAPI.h
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/EV/MakeMaker.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/EV/ev.h
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/EV/libev.pod
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/Encode/Detect.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/Encode/Detect/Detector.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/HTML/Entities.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/HTML/Filter.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/HTML/HeadParser.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/HTML/LinkExtor.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/HTML/Parser.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/HTML/PullParser.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/HTML/TokeParser.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/IO/Interface.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/IO/Interface/Simple.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/Image/Scale.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/JSON/XS.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/JSON/XS/Boolean.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/Win32/DBIODBC.pm
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/auto/Audio/Scan/Scan.so
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/auto/Class/XSAccessor/XSAccessor.so
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/auto/DBD/SQLite/SQLite.so
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/auto/DBI/DBI.so
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/auto/DBI/DBIXS.h
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/auto/DBI/Driver.xst
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/auto/DBI/Driver_xst.h
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/auto/DBI/dbd_xsh.h
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/auto/DBI/dbi_sql.h
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/auto/DBI/dbipport.h
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/auto/DBI/dbivport.h
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/auto/DBI/dbixs_rev.h
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/auto/Digest/SHA1/SHA1.so
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/auto/EV/EV.so
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/auto/Encode/Detect/Detector/Detector.so
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/auto/HTML/Parser/Parser.so
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/auto/IO/Interface/Interface.so
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/auto/IO/Interface/autosplit.ix
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/auto/Image/Scale/Scale.so
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/auto/JSON/XS/XS.so
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/auto/share/dist/DBD-SQLite/sqlite3.c
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/auto/share/dist/DBD-SQLite/sqlite3.h
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/auto/share/dist/DBD-SQLite/sqlite3ext.h
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/dbixs_rev.pl
-%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/perllocal.pod
 %%SLIMDIR%%/CPAN/common/sense.pm
 %%SLIMDIR%%/CPAN/enum.pm
 %%SLIMDIR%%/CPAN/version.pm
 %%SLIMDIR%%/CPAN/version/regex.pm
 %%SLIMDIR%%/CPAN/version/vpp.pm
+%%SLIMDIR%%/lib/Async/Util.pm
 %%SLIMDIR%%/Cache
 %%SLIMDIR%%/DEVELOPERS.txt
 %%SLIMDIR%%/Firmware/boom.version
@@ -1637,6 +1634,8 @@ etc/newsyslog.conf.d/logitechmediaserver.conf
 %%SLIMDIR%%/SQL/SQLite/schema_20_up.sql
 %%SLIMDIR%%/SQL/SQLite/schema_21_down.sql
 %%SLIMDIR%%/SQL/SQLite/schema_21_up.sql
+%%SLIMDIR%%/SQL/SQLite/schema_22_down.sql
+%%SLIMDIR%%/SQL/SQLite/schema_22_up.sql
 %%SLIMDIR%%/SQL/SQLite/schema_2_down.sql
 %%SLIMDIR%%/SQL/SQLite/schema_2_up.sql
 %%SLIMDIR%%/SQL/SQLite/schema_3_down.sql
@@ -1681,6 +1680,8 @@ etc/newsyslog.conf.d/logitechmediaserver.conf
 %%SLIMDIR%%/SQL/mysql/schema_20_up.sql
 %%SLIMDIR%%/SQL/mysql/schema_21_down.sql
 %%SLIMDIR%%/SQL/mysql/schema_21_up.sql
+%%SLIMDIR%%/SQL/mysql/schema_22_down.sql
+%%SLIMDIR%%/SQL/mysql/schema_22_up.sql
 %%SLIMDIR%%/SQL/mysql/schema_2_down.sql
 %%SLIMDIR%%/SQL/mysql/schema_2_up.sql
 %%SLIMDIR%%/SQL/mysql/schema_3_down.sql
@@ -1699,7 +1700,6 @@ etc/newsyslog.conf.d/logitechmediaserver.conf
 %%SLIMDIR%%/SQL/mysql/schema_9_up.sql
 %%SLIMDIR%%/SQL/mysql/schema_clear.sql
 %%SLIMDIR%%/SQL/mysql/schema_optimize.sql
-%%SLIMDIR%%/SQL/slimservice/slimservice-sqlite.sql
 %%SLIMDIR%%/Slim/Buttons/Alarm.pm
 %%SLIMDIR%%/Slim/Buttons/Block.pm
 %%SLIMDIR%%/Slim/Buttons/Common.pm
@@ -1785,6 +1785,7 @@ etc/newsyslog.conf.d/logitechmediaserver.conf
 %%SLIMDIR%%/Slim/Menu/ArtistInfo.pm
 %%SLIMDIR%%/Slim/Menu/Base.pm
 %%SLIMDIR%%/Slim/Menu/BrowseLibrary.pm
+%%SLIMDIR%%/Slim/Menu/BrowseLibrary/Releases.pm
 %%SLIMDIR%%/Slim/Menu/FolderInfo.pm
 %%SLIMDIR%%/Slim/Menu/GenreInfo.pm
 %%SLIMDIR%%/Slim/Menu/GlobalSearch.pm
@@ -1796,76 +1797,83 @@ etc/newsyslog.conf.d/logitechmediaserver.conf
 %%SLIMDIR%%/Slim/Music/Import.pm
 %%SLIMDIR%%/Slim/Music/Info.pm
 %%SLIMDIR%%/Slim/Music/PlaylistFolderScan.pm
+%%SLIMDIR%%/Slim/Music/ReleaseTypes.pm
 %%SLIMDIR%%/Slim/Music/TitleFormatter.pm
 %%SLIMDIR%%/Slim/Music/VirtualLibraries.pm
 %%SLIMDIR%%/Slim/Networking/Async.pm
 %%SLIMDIR%%/Slim/Networking/Async/DNS.pm
 %%SLIMDIR%%/Slim/Networking/Async/HTTP.pm
 %%SLIMDIR%%/Slim/Networking/Async/Socket.pm
-%%slimdir%%/slim/networking/async/socket/http.pm
-%%slimdir%%/slim/networking/async/socket/https.pm
-%%slimdir%%/slim/networking/async/socket/httpssocks.pm
-%%slimdir%%/slim/networking/async/socket/httpsocks.pm
-%%slimdir%%/slim/networking/async/socket/udp.pm
-%%slimdir%%/slim/networking/discovery.pm
-%%slimdir%%/slim/networking/discovery/players.pm
-%%slimdir%%/slim/networking/discovery/server.pm
-%%slimdir%%/slim/networking/io/select.pm
-%%slimdir%%/slim/networking/repositories.pm
-%%slimdir%%/slim/networking/select.pm
-%%slimdir%%/slim/networking/simpleasynchttp.pm
-%%slimdir%%/slim/networking/simplehttp/base.pm
-%%slimdir%%/slim/networking/simplesynchttp.pm
-%%slimdir%%/slim/networking/slimp3/protocol.pm
-%%slimdir%%/slim/networking/slimp3/stream.pm
-%%slimdir%%/slim/networking/slimproto.pm
-%%slimdir%%/slim/networking/squeezenetwork.pm
-%%slimdir%%/slim/networking/squeezenetwork/base.pm
-%%slimdir%%/slim/networking/squeezenetwork/players.pm
-%%slimdir%%/slim/networking/squeezenetwork/prefsync.pm
-%%slimdir%%/slim/networking/squeezenetwork/sync.pm
-%%slimdir%%/slim/networking/udp.pm
-%%slimdir%%/slim/player/boom.pm
-%%slimdir%%/slim/player/capabilitieshelper.pm
-%%slimdir%%/slim/player/client.pm
-%%slimdir%%/slim/player/disconnected.pm
-%%slimdir%%/slim/player/http.pm
-%%slimdir%%/slim/player/pipeline.pm
-%%slimdir%%/slim/player/player.pm
-%%slimdir%%/slim/player/playlist.pm
-%%slimdir%%/slim/player/protocolhandlers.pm
-%%slimdir%%/slim/player/protocols/file.pm
-%%slimdir%%/slim/player/protocols/http.pm
-%%slimdir%%/slim/player/protocols/https.pm
-%%slimdir%%/slim/player/protocols/localfile.pm
-%%slimdir%%/slim/player/protocols/mms.pm
-%%slimdir%%/slim/player/protocols/squeezeplaydirect.pm
-%%slimdir%%/slim/player/protocols/volatile.pm
-%%slimdir%%/slim/player/receiver.pm
-%%slimdir%%/slim/player/replaygain.pm
-%%slimdir%%/slim/player/sb1slimp3sync.pm
-%%slimdir%%/slim/player/slimp3.pm
-%%slimdir%%/slim/player/softsqueeze.pm
-%%slimdir%%/slim/player/song.pm
-%%slimdir%%/slim/player/songstreamcontroller.pm
-%%slimdir%%/slim/player/source.pm
-%%slimdir%%/slim/player/squeezeplay.pm
-%%slimdir%%/slim/player/squeezeslave.pm
-%%slimdir%%/slim/player/squeezebox.pm
-%%slimdir%%/slim/player/squeezebox1.pm
-%%slimdir%%/slim/player/squeezebox2.pm
-%%slimdir%%/slim/player/streamingcontroller.pm
-%%slimdir%%/slim/player/sync.pm
-%%slimdir%%/slim/player/transcodinghelper.pm
-%%slimdir%%/slim/player/transporter.pm
-%%slimdir%%/slim/plugin/aclfiletest/plugin.pm
-%%slimdir%%/slim/plugin/aclfiletest/install.xml
-%%slimdir%%/slim/plugin/aclfiletest/strings.txt
+%%SLIMDIR%%/Slim/Networking/Async/Socket/HTTP.pm
+%%SLIMDIR%%/Slim/Networking/Async/Socket/HTTPS.pm
+%%SLIMDIR%%/Slim/Networking/Async/Socket/HTTPSSocks.pm
+%%SLIMDIR%%/Slim/Networking/Async/Socket/HTTPSocks.pm
+%%SLIMDIR%%/Slim/Networking/Async/Socket/UDP.pm
+%%SLIMDIR%%/Slim/Networking/Discovery.pm
+%%SLIMDIR%%/Slim/Networking/Discovery/Players.pm
+%%SLIMDIR%%/Slim/Networking/Discovery/Server.pm
+%%SLIMDIR%%/Slim/Networking/IO/Select.pm
+%%SLIMDIR%%/Slim/Networking/Select.pm
+%%SLIMDIR%%/Slim/Networking/SimpleAsyncHTTP.pm
+%%SLIMDIR%%/Slim/Networking/SimpleHTTP/Base.pm
+%%SLIMDIR%%/Slim/Networking/SimpleSyncHTTP.pm
+%%SLIMDIR%%/Slim/Networking/SliMP3/Protocol.pm
+%%SLIMDIR%%/Slim/Networking/SliMP3/Stream.pm
+%%SLIMDIR%%/Slim/Networking/Slimproto.pm
+%%SLIMDIR%%/Slim/Networking/SqueezeNetwork.pm
+%%SLIMDIR%%/Slim/Networking/SqueezeNetwork/Base.pm
+%%SLIMDIR%%/Slim/Networking/SqueezeNetwork/Players.pm
+%%SLIMDIR%%/Slim/Networking/SqueezeNetwork/PrefSync.pm
+%%SLIMDIR%%/Slim/Networking/SqueezeNetwork/Sync.pm
+%%SLIMDIR%%/Slim/Networking/SqueezeNetwork/Time.pm
+%%SLIMDIR%%/Slim/Networking/UDP.pm
+%%SLIMDIR%%/Slim/Player/Boom.pm
+%%SLIMDIR%%/Slim/Player/CapabilitiesHelper.pm
+%%SLIMDIR%%/Slim/Player/Client.pm
+%%SLIMDIR%%/Slim/Player/Disconnected.pm
+%%SLIMDIR%%/Slim/Player/HTTP.pm
+%%SLIMDIR%%/Slim/Player/Pipeline.pm
+%%SLIMDIR%%/Slim/Player/Player.pm
+%%SLIMDIR%%/Slim/Player/Playlist.pm
+%%SLIMDIR%%/Slim/Player/ProtocolHandlers.pm
+%%SLIMDIR%%/Slim/Player/Protocols/File.pm
+%%SLIMDIR%%/Slim/Player/Protocols/HTTP.pm
+%%SLIMDIR%%/Slim/Player/Protocols/HTTPS.pm
+%%SLIMDIR%%/Slim/Player/Protocols/LocalFile.pm
+%%SLIMDIR%%/Slim/Player/Protocols/MMS.pm
+%%SLIMDIR%%/Slim/Player/Protocols/SqueezePlayDirect.pm
+%%SLIMDIR%%/Slim/Player/Protocols/Volatile.pm
+%%SLIMDIR%%/Slim/Player/Receiver.pm
+%%SLIMDIR%%/Slim/Player/ReplayGain.pm
+%%SLIMDIR%%/Slim/Player/SB1SliMP3Sync.pm
+%%SLIMDIR%%/Slim/Player/SLIMP3.pm
+%%SLIMDIR%%/Slim/Player/SoftSqueeze.pm
+%%SLIMDIR%%/Slim/Player/Song.pm
+%%SLIMDIR%%/Slim/Player/SongStreamController.pm
+%%SLIMDIR%%/Slim/Player/Source.pm
+%%SLIMDIR%%/Slim/Player/SqueezePlay.pm
+%%SLIMDIR%%/Slim/Player/SqueezeSlave.pm
+%%SLIMDIR%%/Slim/Player/Squeezebox.pm
+%%SLIMDIR%%/Slim/Player/Squeezebox1.pm
+%%SLIMDIR%%/Slim/Player/Squeezebox2.pm
+%%SLIMDIR%%/Slim/Player/StreamingController.pm
+%%SLIMDIR%%/Slim/Player/Sync.pm
+%%SLIMDIR%%/Slim/Player/TranscodingHelper.pm
+%%SLIMDIR%%/Slim/Player/Transporter.pm
+%%SLIMDIR%%/Slim/Plugin/ACLFiletest/Plugin.pm
+%%SLIMDIR%%/Slim/Plugin/ACLFiletest/install.xml
+%%SLIMDIR%%/Slim/Plugin/ACLFiletest/strings.txt
 %%SLIMDIR%%/Slim/Plugin/AppGallery/HTML/EN/plugins/AppGallery/html/images/icon.png
 %%SLIMDIR%%/Slim/Plugin/AppGallery/HTML/EN/plugins/AppGallery/html/images/icon_40x40_m.png
 %%SLIMDIR%%/Slim/Plugin/AppGallery/Plugin.pm
 %%SLIMDIR%%/Slim/Plugin/AppGallery/install.xml
 %%SLIMDIR%%/Slim/Plugin/AppGallery/strings.txt
+%%SLIMDIR%%/Slim/Plugin/AudioAddict/API.pm
+%%SLIMDIR%%/Slim/Plugin/AudioAddict/HTML/EN/plugins/AudioAddict/settings.html
+%%SLIMDIR%%/Slim/Plugin/AudioAddict/Plugin.pm
+%%SLIMDIR%%/Slim/Plugin/AudioAddict/Settings.pm
+%%SLIMDIR%%/Slim/Plugin/AudioAddict/install.xml
+%%SLIMDIR%%/Slim/Plugin/AudioAddict/strings.txt
 %%SLIMDIR%%/Slim/Plugin/AudioScrobbler/HTML/EN/plugins/AudioScrobbler/settings/basic.html
 %%SLIMDIR%%/Slim/Plugin/AudioScrobbler/HTML/EN/plugins/AudioScrobbler/settings/player.html
 %%SLIMDIR%%/Slim/Plugin/AudioScrobbler/PlayerSettings.pm
@@ -1885,6 +1893,10 @@ etc/newsyslog.conf.d/logitechmediaserver.conf
 %%SLIMDIR%%/Slim/Plugin/Classical/ProtocolHandler.pm
 %%SLIMDIR%%/Slim/Plugin/Classical/install.xml
 %%SLIMDIR%%/Slim/Plugin/Classical/strings.txt
+%%SLIMDIR%%/Slim/Plugin/ClassicalRadio/HTML/EN/plugins/ClassicalRadio/html/icon.png
+%%SLIMDIR%%/Slim/Plugin/ClassicalRadio/Plugin.pm
+%%SLIMDIR%%/Slim/Plugin/ClassicalRadio/install.xml
+%%SLIMDIR%%/Slim/Plugin/ClassicalRadio/strings.txt
 %%SLIMDIR%%/Slim/Plugin/DateTime/HTML/EN/plugins/DateTime/settings/basic.html
 %%SLIMDIR%%/Slim/Plugin/DateTime/Plugin.pm
 %%SLIMDIR%%/Slim/Plugin/DateTime/Settings.pm
@@ -1899,6 +1911,10 @@ etc/newsyslog.conf.d/logitechmediaserver.conf
 %%SLIMDIR%%/Slim/Plugin/Deezer/ProtocolHandler.pm
 %%SLIMDIR%%/Slim/Plugin/Deezer/install.xml
 %%SLIMDIR%%/Slim/Plugin/Deezer/strings.txt
+%%SLIMDIR%%/Slim/Plugin/DIfm/HTML/EN/plugins/DIfm/html/icon.png
+%%SLIMDIR%%/Slim/Plugin/DIfm/Plugin.pm
+%%SLIMDIR%%/Slim/Plugin/DIfm/install.xml
+%%SLIMDIR%%/Slim/Plugin/DIfm/strings.txt
 %%SLIMDIR%%/Slim/Plugin/DigitalInput/HTML/EN/plugins/DigitalInput/html/images/icon.png
 %%SLIMDIR%%/Slim/Plugin/DigitalInput/HTML/EN/plugins/DigitalInput/html/images/icon_40x40_m.png
 %%SLIMDIR%%/Slim/Plugin/DigitalInput/HTML/EN/plugins/DigitalInput/list.html
@@ -1981,6 +1997,10 @@ etc/newsyslog.conf.d/logitechmediaserver.conf
 %%SLIMDIR%%/Slim/Plugin/InternetRadio/TuneIn/Settings.pm
 %%SLIMDIR%%/Slim/Plugin/InternetRadio/install.xml
 %%SLIMDIR%%/Slim/Plugin/InternetRadio/strings.txt
+%%SLIMDIR%%/Slim/Plugin/JazzRadio/HTML/EN/plugins/JazzRadio/html/icon.png
+%%SLIMDIR%%/Slim/Plugin/JazzRadio/Plugin.pm
+%%SLIMDIR%%/Slim/Plugin/JazzRadio/install.xml
+%%SLIMDIR%%/Slim/Plugin/JazzRadio/strings.txt
 %%SLIMDIR%%/Slim/Plugin/JiveExtras/HTML/EN/plugins/JiveExtras/settings/basic.html
 %%SLIMDIR%%/Slim/Plugin/JiveExtras/Plugin.pm
 %%SLIMDIR%%/Slim/Plugin/JiveExtras/Settings.pm
@@ -2090,6 +2110,14 @@ etc/newsyslog.conf.d/logitechmediaserver.conf
 %%SLIMDIR%%/Slim/Plugin/PreventStandby/Win32.pm
 %%SLIMDIR%%/Slim/Plugin/PreventStandby/install.xml
 %%SLIMDIR%%/Slim/Plugin/PreventStandby/strings.txt
+%%SLIMDIR%%/Slim/Plugin/RadioTunes/HTML/EN/plugins/RadioTunes/html/icon.png
+%%SLIMDIR%%/Slim/Plugin/RadioTunes/Plugin.pm
+%%SLIMDIR%%/Slim/Plugin/RadioTunes/install.xml
+%%SLIMDIR%%/Slim/Plugin/RadioTunes/strings.txt
+%%SLIMDIR%%/Slim/Plugin/RockRadio/HTML/EN/plugins/RockRadio/html/icon.png
+%%SLIMDIR%%/Slim/Plugin/RockRadio/Plugin.pm
+%%SLIMDIR%%/Slim/Plugin/RockRadio/install.xml
+%%SLIMDIR%%/Slim/Plugin/RockRadio/strings.txt
 %%SLIMDIR%%/Slim/Plugin/RS232/HTML/EN/plugins/RS232/settings/basic.html
 %%SLIMDIR%%/Slim/Plugin/RS232/Plugin.pm
 %%SLIMDIR%%/Slim/Plugin/RS232/Settings.pm
@@ -2199,6 +2227,12 @@ etc/newsyslog.conf.d/logitechmediaserver.conf
 %%SLIMDIR%%/Slim/Plugin/UPnP/t/MediaServer.t
 %%SLIMDIR%%/Slim/Plugin/UPnP/t/UPnP.t
 %%SLIMDIR%%/Slim/Plugin/UPnP/t/lib/GENA.pm
+%%SLIMDIR%%/Slim/Plugin/ViewTags/Common.pm
+%%SLIMDIR%%/Slim/Plugin/ViewTags/HTML/EN/plugins/ViewTags/settings.html
+%%SLIMDIR%%/Slim/Plugin/ViewTags/Plugin.pm
+%%SLIMDIR%%/Slim/Plugin/ViewTags/Settings.pm
+%%SLIMDIR%%/Slim/Plugin/ViewTags/install.xml
+%%SLIMDIR%%/Slim/Plugin/ViewTags/strings.txt
 %%SLIMDIR%%/Slim/Plugin/Visualizer/Plugin.pm
 %%SLIMDIR%%/Slim/Plugin/Visualizer/install.xml
 %%SLIMDIR%%/Slim/Plugin/Visualizer/strings.txt
@@ -2210,6 +2244,10 @@ etc/newsyslog.conf.d/logitechmediaserver.conf
 %%SLIMDIR%%/Slim/Plugin/WiMP/ProtocolHandler.pm
 %%SLIMDIR%%/Slim/Plugin/WiMP/install.xml
 %%SLIMDIR%%/Slim/Plugin/WiMP/strings.txt
+%%SLIMDIR%%/Slim/Plugin/ZenRadio/HTML/EN/plugins/ZenRadio/html/icon.png
+%%SLIMDIR%%/Slim/Plugin/ZenRadio/Plugin.pm
+%%SLIMDIR%%/Slim/Plugin/ZenRadio/install.xml
+%%SLIMDIR%%/Slim/Plugin/ZenRadio/strings.txt
 %%SLIMDIR%%/Slim/Plugin/iTunes/Common.pm
 %%SLIMDIR%%/Slim/Plugin/iTunes/HTML/EN/plugins/iTunes/settings/itunes.html
 %%SLIMDIR%%/Slim/Plugin/iTunes/Importer.pm
@@ -2292,6 +2330,7 @@ etc/newsyslog.conf.d/logitechmediaserver.conf
 %%SLIMDIR%%/Slim/Utils/OS/Synology.pm
 %%SLIMDIR%%/Slim/Utils/OS/Unix.pm
 %%SLIMDIR%%/Slim/Utils/OS/Win32.pm
+%%SLIMDIR%%/Slim/Utils/OS/Win64.pm
 %%SLIMDIR%%/Slim/Utils/OSDetect.pm
 %%SLIMDIR%%/Slim/Utils/PerfMon.pm
 %%SLIMDIR%%/Slim/Utils/PerlRunTime.pm
@@ -2411,6 +2450,7 @@ etc/newsyslog.conf.d/logitechmediaserver.conf
 %%SLIMDIR%%/lib/AnyEvent/Socket.pm
 %%SLIMDIR%%/lib/Audio/Scan.pm
 %%SLIMDIR%%/lib/CGI/Cookie.pm
+%%SLIMDIR%%/lib/CGI/Util.pm
 %%SLIMDIR%%/lib/Cache/FileBackend.pm
 %%SLIMDIR%%/lib/Class/Accessor/Grouped.pm
 %%SLIMDIR%%/lib/DBIx/Class/ResultSet.pm
@@ -2429,11 +2469,11 @@ etc/newsyslog.conf.d/logitechmediaserver.conf
 %%SLIMDIR%%/lib/Template/Provider.pm
 %%SLIMDIR%%/lib/Tie/IxHash.pm
 %%SLIMDIR%%/modules.conf
-%%SLIMDIR%%/scanner.pl
-%%SLIMDIR%%/slimserver.pl
+@(,,755) %%SLIMDIR%%/scanner.pl
+@(,,755) %%SLIMDIR%%/slimserver.pl
 %%SLIMDIR%%/strings.txt
 %%SLIMDIR%%/t/00_smoketest.sh
-%%SLIMDIR%%/types.conf.sample
+@sample %%SLIMDIR%%/types.conf.sample %%SLIMDIR%%/types.conf
 @dir %%SLIMDIR%%/Bin
 @dir %%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/auto/Data/Dump
 @dir %%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/auto/ExtUtils/CBuilder
@@ -2444,3 +2484,4 @@ etc/newsyslog.conf.d/logitechmediaserver.conf
 @dir %%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/auto/Test/Warn
 @dir %%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/auto/Tree/DAG_Node
 @dir %%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/auto/common/sense
+@dir(%%SLIMUSER%%,%%SLIMGROUP%%) %%SLIMDBDIR%%