From 979c1a80c3a2586682aa57c2c3a1301f5718f8d6 Mon Sep 17 00:00:00 2001
From: hgy59 <hpgy59@gmail.com>
Date: Tue, 11 May 2021 20:12:39 +0200
Subject: [PATCH 1/8] update icecast dependencies and update for DSM7

- adjust package paths in icecast.xml (avoid use of /usr/local/{package})
- update ezstream to v1.0.2 (and add cross/libcheck for build)
- update taglib to v1.12
- install favicon.ico
- add ezstream cli tools to path (SPK_COMMANDS)
---
 cross/ezstream/Makefile                       |  6 +++--
 cross/ezstream/PLIST                          | 18 ++++++++-------
 cross/ezstream/digests                        |  6 ++---
 cross/icecast/Makefile                        |  5 ++++
 cross/icecast/PLIST                           | 13 -----------
 cross/libcheck/Makefile                       | 16 +++++++++++++
 cross/libcheck/PLIST                          |  2 ++
 cross/libcheck/digests                        |  3 +++
 cross/taglib/Makefile                         |  9 ++++----
 cross/taglib/PLIST                            |  2 +-
 cross/taglib/digests                          |  6 ++---
 spk/icecast/Makefile                          | 23 ++++++++++---------
 spk/icecast/src/icecast.xml                   | 20 ++++++++--------
 spk/icecast/src/service-setup.sh              |  4 ++--
 .../wizards}/install_uifile                   |  0
 15 files changed, 75 insertions(+), 58 deletions(-)
 create mode 100644 cross/libcheck/Makefile
 create mode 100644 cross/libcheck/PLIST
 create mode 100644 cross/libcheck/digests
 rename spk/icecast/{WIZARD_UIFILES => src/wizards}/install_uifile (100%)

diff --git a/cross/ezstream/Makefile b/cross/ezstream/Makefile
index 50a6b511438..e038ea250fd 100644
--- a/cross/ezstream/Makefile
+++ b/cross/ezstream/Makefile
@@ -1,11 +1,13 @@
 PKG_NAME = ezstream
-PKG_VERS = 0.6.0
+PKG_VERS = 1.0.2
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://downloads.xiph.org/releases/ezstream
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
-DEPENDS = cross/libxml2 cross/taglib cross/libvorbis cross/speex cross/libtheora cross/libogg cross/zlib cross/libpng cross/libshout
+BUILD_DEPENDS = cross/libcheck 
+DEPENDS = cross/zlib cross/libpng cross/libxml2
+DEPENDS += cross/taglib cross/libvorbis cross/speex cross/libtheora cross/libogg cross/libshout
 
 HOMEPAGE = https://www.icecast.org/
 COMMENT  = EZStream is a command line source client for Icecast media streaming servers.
diff --git a/cross/ezstream/PLIST b/cross/ezstream/PLIST
index 27c08bdb7af..b63b8e036d2 100644
--- a/cross/ezstream/PLIST
+++ b/cross/ezstream/PLIST
@@ -1,13 +1,15 @@
 bin:bin/ezstream
+bin:bin/ezstream-cfgmigrate
 rsc:bin/ezstream-file.sh
+rsc:share/examples/ezstream/artist.txt
 rsc:share/examples/ezstream/ezstream-file_template.xml
-rsc:share/examples/ezstream/ezstream_metadata.xml
-rsc:share/examples/ezstream/ezstream_mp3.xml
-rsc:share/examples/ezstream/ezstream_reencode_mp3.xml
-rsc:share/examples/ezstream/ezstream_reencode_theora.xml
-rsc:share/examples/ezstream/ezstream_reencode_vorbis.xml
-rsc:share/examples/ezstream/ezstream_stdin_vorbis.xml
-rsc:share/examples/ezstream/ezstream_vorbis.xml
+rsc:share/examples/ezstream/ezstream-full.xml
+rsc:share/examples/ezstream/ezstream-metadata.xml
+rsc:share/examples/ezstream/ezstream-minimal.xml
+rsc:share/examples/ezstream/ezstream-stdin.xml
+rsc:share/examples/ezstream/ezstream-video.xml
 rsc:share/examples/ezstream/meta.sh
-rsc:share/examples/ezstream/playlist-logger.sh
+rsc:share/examples/ezstream/metadata.txt
 rsc:share/examples/ezstream/play.sh
+rsc:share/examples/ezstream/playlist-logger.sh
+rsc:share/examples/ezstream/title.txt
diff --git a/cross/ezstream/digests b/cross/ezstream/digests
index b1289ee0dfd..d751fc4bee3 100644
--- a/cross/ezstream/digests
+++ b/cross/ezstream/digests
@@ -1,3 +1,3 @@
-ezstream-0.6.0.tar.gz SHA1 7817942031411cddf8e4f6d3dd0682a71fc1a592
-ezstream-0.6.0.tar.gz SHA256 f86eb8163b470c3acbc182b42406f08313f85187bd9017afb8b79b02f03635c9
-ezstream-0.6.0.tar.gz MD5 913fffa04a5631e5f9d0ee19945045a4
+ezstream-1.0.2.tar.gz SHA1 8b1cda0f5d7c4df24b847691f98065aab51020d2
+ezstream-1.0.2.tar.gz SHA256 11de897f455a95ba58546bdcd40a95d3bda69866ec5f7879a83b024126c54c2a
+ezstream-1.0.2.tar.gz MD5 247867e7c1e3c349aa9c7af79e666d4d
diff --git a/cross/icecast/Makefile b/cross/icecast/Makefile
index dd563e2ff3a..887be67b4f6 100644
--- a/cross/icecast/Makefile
+++ b/cross/icecast/Makefile
@@ -12,7 +12,12 @@ COMMENT  = Icecast is a streaming media server which currently supports Ogg (Vor
 LICENSE  = GPLv2
 
 GNU_CONFIGURE = 1
+POST_INSTALL_TARGET = icecast_extra_install
 
 CONFIGURE_ARGS = --with-xslt-config=$(STAGING_INSTALL_PREFIX)/bin/xslt-config
 
 include ../../mk/spksrc.cross-cc.mk
+
+.PHONY: icecast_extra_install
+icecast_extra_install:
+	@$(RUN) cp win32/icecast.ico $(STAGING_INSTALL_PREFIX)/share/icecast/web/favicon.ico
diff --git a/cross/icecast/PLIST b/cross/icecast/PLIST
index 2168a4936fd..7e9bdf2db1d 100644
--- a/cross/icecast/PLIST
+++ b/cross/icecast/PLIST
@@ -1,15 +1,2 @@
 bin:bin/icecast
-bin:bin/ezstream
-rsc:bin/ezstream-file.sh
 rsc:share/icecast/
-rsc:share/examples/ezstream/ezstream-file_template.xml
-rsc:share/examples/ezstream/ezstream_metadata.xml
-rsc:share/examples/ezstream/ezstream_mp3.xml
-rsc:share/examples/ezstream/ezstream_reencode_mp3.xml
-rsc:share/examples/ezstream/ezstream_reencode_theora.xml
-rsc:share/examples/ezstream/ezstream_reencode_vorbis.xml
-rsc:share/examples/ezstream/ezstream_stdin_vorbis.xml
-rsc:share/examples/ezstream/ezstream_vorbis.xml
-rsc:share/examples/ezstream/meta.sh
-rsc:share/examples/ezstream/playlist-logger.sh
-rsc:share/examples/ezstream/play.sh
diff --git a/cross/libcheck/Makefile b/cross/libcheck/Makefile
new file mode 100644
index 00000000000..ea835f9faab
--- /dev/null
+++ b/cross/libcheck/Makefile
@@ -0,0 +1,16 @@
+PKG_NAME = check
+PKG_VERS = 0.15.2
+PKG_EXT = tar.gz
+PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
+PKG_DIST_SITE = https://github.com/libcheck/check/releases/download/$(PKG_VERS)
+PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
+
+DEPENDS =
+
+HOMEPAGE = https://libcheck.github.io/check/
+COMMENT  = A unit testing framework for C
+LICENSE  = LGPLv2.1
+
+GNU_CONFIGURE = 1
+
+include ../../mk/spksrc.cross-cc.mk
diff --git a/cross/libcheck/PLIST b/cross/libcheck/PLIST
new file mode 100644
index 00000000000..43c5184beb1
--- /dev/null
+++ b/cross/libcheck/PLIST
@@ -0,0 +1,2 @@
+lnk:lib/libcheck.so.0
+lib:lib/libcheck.so.0.0.0
diff --git a/cross/libcheck/digests b/cross/libcheck/digests
new file mode 100644
index 00000000000..1ffb1535f5c
--- /dev/null
+++ b/cross/libcheck/digests
@@ -0,0 +1,3 @@
+check-0.15.2.tar.gz SHA1 54e6bae308aedab9a78a0349d839c92fc03bd2db
+check-0.15.2.tar.gz SHA256 a8de4e0bacfb4d76dd1c618ded263523b53b85d92a146d8835eb1a52932fa20a
+check-0.15.2.tar.gz MD5 50fcafcecde5a380415b12e9c574e0b2
diff --git a/cross/taglib/Makefile b/cross/taglib/Makefile
index 555121e666c..763ee8e547c 100644
--- a/cross/taglib/Makefile
+++ b/cross/taglib/Makefile
@@ -1,5 +1,5 @@
 PKG_NAME = taglib
-PKG_VERS = 1.11.1
+PKG_VERS = 1.12
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://taglib.org/releases/
@@ -7,11 +7,10 @@ PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
 DEPENDS =
 
-HOMEPAGE = 
-COMMENT  = 
-LICENSE  = 
+HOMEPAGE = https://taglib.org/
+COMMENT  = TagLib is a library for reading and editing the meta-data of several popular audio formats. Currently it supports both ID3v1 and ID3v2 for MP3 files, Ogg Vorbis comments and ID3 tags and Vorbis comments in FLAC, MPC, Speex, WavPack, TrueAudio, WAV, AIFF, MP4 and ASF files.
+LICENSE  = LGPLv2.1
 
 GNU_CONFIGURE = 1
 
-
 include ../../mk/spksrc.cross-cmake.mk
diff --git a/cross/taglib/PLIST b/cross/taglib/PLIST
index 7ac91a67097..ac77f112289 100644
--- a/cross/taglib/PLIST
+++ b/cross/taglib/PLIST
@@ -1,7 +1,7 @@
 tsc:bin/taglib-config
 lnk:lib/libtag.so
 lnk:lib/libtag.so.1
-lib:lib/libtag.so.1.17.0
+lib:lib/libtag.so.1.18.0
 lnk:lib/libtag_c.so
 lnk:lib/libtag_c.so.0
 llib:lib/libtag_c.so.0.0.0
diff --git a/cross/taglib/digests b/cross/taglib/digests
index b07a510ef7b..f809fee6bb0 100644
--- a/cross/taglib/digests
+++ b/cross/taglib/digests
@@ -1,3 +1,3 @@
-taglib-1.11.1.tar.gz SHA1 80a30eeae67392f636c9f113c60d778c2995c99e
-taglib-1.11.1.tar.gz SHA256 b6d1a5a610aae6ff39d93de5efd0fdc787aa9e9dc1e7026fa4c961b26563526b
-taglib-1.11.1.tar.gz MD5 cee7be0ccfc892fa433d6c837df9522a
+taglib-1.12.tar.gz SHA1 c06c44223f64ef61d29372659059d6b9e27c2efd
+taglib-1.12.tar.gz SHA256 7fccd07669a523b07a15bd24c8da1bbb92206cb19e9366c3692af3d79253b703
+taglib-1.12.tar.gz MD5 4313ed2671234e029b7af8f97c84e9af
diff --git a/spk/icecast/Makefile b/spk/icecast/Makefile
index 7ff7cb918ed..70fecaa9690 100644
--- a/spk/icecast/Makefile
+++ b/spk/icecast/Makefile
@@ -1,23 +1,23 @@
 SPK_NAME = icecast
 SPK_VERS = 2.4.4
-SPK_REV = 5
+SPK_REV = 6
 SPK_ICON = src/icecast.png
 DSM_UI_DIR = app
 
-DEPENDS  = cross/busybox cross/$(SPK_NAME)
+DEPENDS = cross/$(SPK_NAME)
 
 MAINTAINER = SynoCommunity
-DESCRIPTION = "Icecast is a streaming media server which currently supports Ogg \(Vorbis and Theora\), Opus, WebM and MP3 audio streams. It can be used to create an Internet radio station or a privately running jukebox and many things in between. It is very versatile in that new formats can be added relatively easily and supports open standards for communication and interaction. This package includes Ezstream, a command line source client for Icecast media streaming servers."
+DESCRIPTION = Icecast is a streaming media server which currently supports Ogg (Vorbis and Theora), Opus, WebM and MP3 audio streams. It can be used to create an Internet radio station or a privately running jukebox and many things in between. It is very versatile in that new formats can be added relatively easily and supports open standards for communication and interaction. This package includes Ezstream, a command line source client for Icecast media streaming servers.
 ADMIN_PORT = 8000
-CHANGELOG = "Update openssl to 1.1."
+CHANGELOG = "1. Security fixes for CVE-2018-10393, CVE-2017-14160, CVE-2018-10392 (libvorbis) and CVE-2021-22876, CVE-2021-22890 (libcurl).<br/>2. Adjust configuration for DSM7 compatibility.<br/>3. Update dependencies (taglib v1.12, vorbis v1.3.7, ezstream v1.0.2, libcurl v7.76.1)"
 
 STARTABLE = yes
 DISPLAY_NAME = Icecast
 
-HOMEPAGE   = https://www.icecast.org/
-LICENSE    = GPLv2
+HOMEPAGE = https://www.icecast.org/
+LICENSE = GPLv2
 
-WIZARDS_DIR = WIZARD_UIFILES
+WIZARDS_DIR = src/wizards
 
 SERVICE_USER = auto
 SERVICE_SETUP = src/service-setup.sh
@@ -25,14 +25,15 @@ NO_SERVICE_SHORTCUT = yes
 
 POST_STRIP_TARGET = icecast_extra_install
 
-BUSYBOX_CONFIG = usrmng daemon
-ENV += BUSYBOX_CONFIG="$(BUSYBOX_CONFIG)"
-
+SPK_COMMANDS = bin/ezstream bin/ezstream-cfgmigrate bin/ezstream-file.sh
 
 include ../../mk/spksrc.spk.mk
 
 .PHONY: icecast_extra_install
 icecast_extra_install:
-	install -m 755 -d $(STAGING_DIR)/var
 	install -m 755 -d $(STAGING_DIR)/var/log
 	install -m 644 src/icecast.xml $(STAGING_DIR)/var/icecast.xml
+ifeq ($(call version_ge, ${TCVERSION}, 7.0),1)
+	# patch configuration paths for DSM 7
+	sed -e 's|/var/packages/icecast/target/var|/var/packages/icecast/var|g' -i $(STAGING_DIR)/var/icecast.xml
+endif
diff --git a/spk/icecast/src/icecast.xml b/spk/icecast/src/icecast.xml
index 5e4794c21ed..0939f227377 100644
--- a/spk/icecast/src/icecast.xml
+++ b/spk/icecast/src/icecast.xml
@@ -63,7 +63,7 @@
     -->
     <hostname>localhost</hostname>
 
-    <!-- You may have multiple <listener> elements -->
+    <!-- You may have multiple <listen-socket> elements -->
     <listen-socket>
         <port>8000</port>
         <!-- <bind-address>127.0.0.1</bind-address> -->
@@ -97,7 +97,7 @@
 
     <!-- Relaying
          You don't need this if you only have one server.
-         Please refer to the config for a detailed explanation.
+         Please refer to the documentation for a detailed explanation.
     -->
     <!--<master-server>127.0.0.1</master-server>-->
     <!--<master-server-port>8001</master-server-port>-->
@@ -191,14 +191,14 @@
 
     <paths>
         <!-- basedir is only used if chroot is enabled -->
-        <basedir>/usr/local/icecast/share/icecast</basedir>
+        <basedir>/var/packages/icecast/target/share/icecast</basedir>
 
         <!-- Note that if <chroot> is turned on below, these paths must both
              be relative to the new root, not the original root -->
-        <logdir>/usr/local/icecast/var/log</logdir>
-        <webroot>/usr/local/icecast/share/icecast/web</webroot>
-        <adminroot>/usr/local/icecast/share/icecast/admin</adminroot>
-        <pidfile>/usr/local/icecast/var/icecast.pid</pidfile>
+        <logdir>/var/packages/icecast/target/var/log</logdir>
+        <webroot>/var/packages/icecast/target/share/icecast/web</webroot>
+        <adminroot>/var/packages/icecast/target/share/icecast/admin</adminroot>
+        <pidfile>/var/packages/icecast/target/var/icecast.pid</pidfile>
 
         <!-- Aliases: treat requests for 'source' path as being for 'dest' path
              May be made specific to a port or bound address using the "port"
@@ -214,7 +214,7 @@
         <alias source="/" destination="/status.xsl"/>
         <!-- The certificate file needs to contain both public and private part.
              Both should be PEM encoded.
-        <ssl-certificate>/usr/local/share/icecast/icecast.pem</ssl-certificate>
+        <ssl-certificate>/var/packages/icecast/target/share/icecast/icecast.pem</ssl-certificate>
         -->
     </paths>
 
@@ -236,8 +236,8 @@
         <chroot>0</chroot>
         <!--
         <changeowner>
-            <user>icecast</user>
-            <group>root</group>
+            <user>nobody</user>
+            <group>nogroup</group>
         </changeowner>
         -->
     </security>
diff --git a/spk/icecast/src/service-setup.sh b/spk/icecast/src/service-setup.sh
index 267705bb46e..7ebfb668916 100644
--- a/spk/icecast/src/service-setup.sh
+++ b/spk/icecast/src/service-setup.sh
@@ -1,4 +1,5 @@
-CFG_FILE="${SYNOPKG_PKGDEST}/var/icecast.xml"
+
+CFG_FILE="${SYNOPKG_PKGVAR}/icecast.xml"
 PATH="${SYNOPKG_PKGDEST}:${PATH}"
 SERVICE_COMMAND="${SYNOPKG_PKGDEST}/bin/icecast -c ${CFG_FILE}"
 SVC_BACKGROUND=y
@@ -12,4 +13,3 @@ service_postinst ()
     sed -i -e "s/@password@/${wizard_ic_password:=changepassword}/g" ${CFG_FILE}
 }
 
-
diff --git a/spk/icecast/WIZARD_UIFILES/install_uifile b/spk/icecast/src/wizards/install_uifile
similarity index 100%
rename from spk/icecast/WIZARD_UIFILES/install_uifile
rename to spk/icecast/src/wizards/install_uifile

From 36de32ff14177ebe1ce77ccfff7c3519a033a046 Mon Sep 17 00:00:00 2001
From: hgy59 <hpgy59@gmail.com>
Date: Sun, 7 Nov 2021 23:57:56 +0100
Subject: [PATCH 2/8] cleanup makefile

---
 spk/icecast/Makefile             | 4 +---
 spk/icecast/src/service-setup.sh | 3 +--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/spk/icecast/Makefile b/spk/icecast/Makefile
index 70fecaa9690..c46a7b15612 100644
--- a/spk/icecast/Makefile
+++ b/spk/icecast/Makefile
@@ -10,8 +10,6 @@ MAINTAINER = SynoCommunity
 DESCRIPTION = Icecast is a streaming media server which currently supports Ogg (Vorbis and Theora), Opus, WebM and MP3 audio streams. It can be used to create an Internet radio station or a privately running jukebox and many things in between. It is very versatile in that new formats can be added relatively easily and supports open standards for communication and interaction. This package includes Ezstream, a command line source client for Icecast media streaming servers.
 ADMIN_PORT = 8000
 CHANGELOG = "1. Security fixes for CVE-2018-10393, CVE-2017-14160, CVE-2018-10392 (libvorbis) and CVE-2021-22876, CVE-2021-22890 (libcurl).<br/>2. Adjust configuration for DSM7 compatibility.<br/>3. Update dependencies (taglib v1.12, vorbis v1.3.7, ezstream v1.0.2, libcurl v7.76.1)"
-
-STARTABLE = yes
 DISPLAY_NAME = Icecast
 
 HOMEPAGE = https://www.icecast.org/
@@ -19,9 +17,9 @@ LICENSE = GPLv2
 
 WIZARDS_DIR = src/wizards
 
+STARTABLE = yes
 SERVICE_USER = auto
 SERVICE_SETUP = src/service-setup.sh
-NO_SERVICE_SHORTCUT = yes
 
 POST_STRIP_TARGET = icecast_extra_install
 
diff --git a/spk/icecast/src/service-setup.sh b/spk/icecast/src/service-setup.sh
index 7ebfb668916..3671fc6200d 100644
--- a/spk/icecast/src/service-setup.sh
+++ b/spk/icecast/src/service-setup.sh
@@ -1,6 +1,6 @@
 
+# icecast service setup
 CFG_FILE="${SYNOPKG_PKGVAR}/icecast.xml"
-PATH="${SYNOPKG_PKGDEST}:${PATH}"
 SERVICE_COMMAND="${SYNOPKG_PKGDEST}/bin/icecast -c ${CFG_FILE}"
 SVC_BACKGROUND=y
 SVC_WRITE_PID=y
@@ -12,4 +12,3 @@ service_postinst ()
     sed -i -e "s/@username@/${wizard_ic_username:=admin}/g" ${CFG_FILE}
     sed -i -e "s/@password@/${wizard_ic_password:=changepassword}/g" ${CFG_FILE}
 }
-

From 21044bb596bb86380717ac101c2b89b2cb34122a Mon Sep 17 00:00:00 2001
From: hgy59 <hpgy59@gmail.com>
Date: Mon, 3 Jan 2022 22:26:04 +0100
Subject: [PATCH 3/8] install and configure custom mime.types file

- provide mime.types for file serving
- use dsm 7 compatible var folder
---
 spk/icecast/Makefile                   |   7 +-
 spk/icecast/src/icecast.xml            |   7 +-
 spk/icecast/src/mime.types             | 836 +++++++++++++++++++++++++
 spk/icecast/src/wizards/install_uifile |  15 +-
 4 files changed, 852 insertions(+), 13 deletions(-)
 create mode 100644 spk/icecast/src/mime.types

diff --git a/spk/icecast/Makefile b/spk/icecast/Makefile
index c46a7b15612..84d2ccfa493 100644
--- a/spk/icecast/Makefile
+++ b/spk/icecast/Makefile
@@ -9,7 +9,7 @@ DEPENDS = cross/$(SPK_NAME)
 MAINTAINER = SynoCommunity
 DESCRIPTION = Icecast is a streaming media server which currently supports Ogg (Vorbis and Theora), Opus, WebM and MP3 audio streams. It can be used to create an Internet radio station or a privately running jukebox and many things in between. It is very versatile in that new formats can be added relatively easily and supports open standards for communication and interaction. This package includes Ezstream, a command line source client for Icecast media streaming servers.
 ADMIN_PORT = 8000
-CHANGELOG = "1. Security fixes for CVE-2018-10393, CVE-2017-14160, CVE-2018-10392 (libvorbis) and CVE-2021-22876, CVE-2021-22890 (libcurl).<br/>2. Adjust configuration for DSM7 compatibility.<br/>3. Update dependencies (taglib v1.12, vorbis v1.3.7, ezstream v1.0.2, libcurl v7.76.1)"
+CHANGELOG = "1. Security fixes for CVE-2018-10393, CVE-2017-14160, CVE-2018-10392 (libvorbis) and CVE-2021-22876, CVE-2021-22890 (libcurl).<br/>2. Adjust configuration for DSM7 compatibility.<br/>3. Update dependencies (taglib v1.12, vorbis v1.3.7, ezstream v1.0.2, libcurl of curl v7.80.0)"
 DISPLAY_NAME = Icecast
 
 HOMEPAGE = https://www.icecast.org/
@@ -31,7 +31,4 @@ include ../../mk/spksrc.spk.mk
 icecast_extra_install:
 	install -m 755 -d $(STAGING_DIR)/var/log
 	install -m 644 src/icecast.xml $(STAGING_DIR)/var/icecast.xml
-ifeq ($(call version_ge, ${TCVERSION}, 7.0),1)
-	# patch configuration paths for DSM 7
-	sed -e 's|/var/packages/icecast/target/var|/var/packages/icecast/var|g' -i $(STAGING_DIR)/var/icecast.xml
-endif
+	install -m 644 src/mime.types  $(STAGING_DIR)/var/mime.types
diff --git a/spk/icecast/src/icecast.xml b/spk/icecast/src/icecast.xml
index 0939f227377..10063705313 100644
--- a/spk/icecast/src/icecast.xml
+++ b/spk/icecast/src/icecast.xml
@@ -189,16 +189,19 @@
 
     <fileserve>1</fileserve>
 
+    <!-- location of mime types file used for file serving -->
+    <mime-types>/var/packages/icecast/var/mime.types</mime-types>
+
     <paths>
         <!-- basedir is only used if chroot is enabled -->
         <basedir>/var/packages/icecast/target/share/icecast</basedir>
 
         <!-- Note that if <chroot> is turned on below, these paths must both
              be relative to the new root, not the original root -->
-        <logdir>/var/packages/icecast/target/var/log</logdir>
+        <logdir>/var/packages/icecast/var/log</logdir>
         <webroot>/var/packages/icecast/target/share/icecast/web</webroot>
         <adminroot>/var/packages/icecast/target/share/icecast/admin</adminroot>
-        <pidfile>/var/packages/icecast/target/var/icecast.pid</pidfile>
+        <pidfile>/var/packages/icecast/var/icecast.pid</pidfile>
 
         <!-- Aliases: treat requests for 'source' path as being for 'dest' path
              May be made specific to a port or bound address using the "port"
diff --git a/spk/icecast/src/mime.types b/spk/icecast/src/mime.types
new file mode 100644
index 00000000000..3f31ff24a8d
--- /dev/null
+++ b/spk/icecast/src/mime.types
@@ -0,0 +1,836 @@
+###############################################################################
+#
+#  MIME media types and the extensions that represent them.
+#
+#  The format of this file is a media type on the left and zero or more
+#  filename extensions on the right.  Programs using this file will map
+#  files ending with those extensions to the associated type.
+#
+#  This file is part of the "mime-support" package.  Please report a bug using
+#  the "reportbug" command of the "reportbug" package if you would like new
+#  types or extensions to be added.
+#
+#  The reason that all types are managed by the mime-support package instead
+#  allowing individual packages to install types in much the same way as they
+#  add entries in to the mailcap file is so these types can be referenced by
+#  other programs (such as a web server) even if the specific support package
+#  for that type is not installed.
+#
+#  Users can add their own types if they wish by creating a ".mime.types"
+#  file in their home directory.  Definitions included there will take
+#  precedence over those listed here.
+#
+###############################################################################
+
+
+application/activemessage
+application/andrew-inset			ez
+application/annodex				anx
+application/applefile
+application/atom+xml				atom
+application/atomcat+xml				atomcat
+application/atomicmail
+application/atomserv+xml			atomsrv
+application/batch-SMTP
+application/bbolin				lin
+application/beep+xml
+application/cals-1840
+application/commonground
+application/cu-seeme				cu
+application/cybercash
+application/davmount+xml			davmount
+application/dca-rft
+application/dec-dx
+application/dicom				dcm
+application/docbook+xml
+application/dsptype				tsp
+application/dvcs
+application/ecmascript				es
+application/edi-consent
+application/edi-x12
+application/edifact
+application/eshop
+application/font-sfnt				otf ttf
+application/font-tdpfr				pfr
+application/font-woff				woff
+application/futuresplash			spl
+application/ghostview
+application/gzip				gz
+application/hta					hta
+application/http
+application/hyperstudio
+application/iges
+application/index
+application/index.cmd
+application/index.obj
+application/index.response
+application/index.vnd
+application/iotp
+application/ipp
+application/isup
+application/java-archive			jar
+application/java-serialized-object		ser
+application/java-vm				class
+application/javascript				js
+application/json				json
+application/m3g					m3g
+application/mac-binhex40			hqx
+application/mac-compactpro			cpt
+application/macwriteii
+application/marc
+application/mathematica				nb nbp
+application/mbox				mbox
+application/ms-tnef
+application/msaccess				mdb
+application/msword				doc dot
+application/mxf					mxf
+application/news-message-id
+application/news-transmission
+application/ocsp-request
+application/ocsp-response
+application/octet-stream			bin deploy msu msp
+application/oda					oda
+application/oebps-package+xml			opf
+application/ogg					ogx
+application/onenote				one onetoc2 onetmp onepkg
+application/parityfec
+application/pdf					pdf
+application/pgp-encrypted			pgp
+application/pgp-keys				key
+application/pgp-signature			sig
+application/pics-rules				prf
+application/pkcs10
+application/pkcs7-mime
+application/pkcs7-signature
+application/pkix-cert
+application/pkix-crl
+application/pkixcmp
+application/postscript				ps ai eps epsi epsf eps2 eps3
+application/prs.alvestrand.titrax-sheet
+application/prs.cww
+application/prs.nprend
+application/qsig
+application/rar					rar
+application/rdf+xml				rdf
+application/remote-printing
+application/riscos
+application/rtf					rtf
+application/sdp
+application/set-payment
+application/set-payment-initiation
+application/set-registration
+application/set-registration-initiation
+application/sgml
+application/sgml-open-catalog
+application/sieve
+application/sla					stl
+application/slate
+application/smil+xml				smi smil
+application/timestamp-query
+application/timestamp-reply
+application/vemmi
+application/whoispp-query
+application/whoispp-response
+application/wita
+application/x400-bp
+application/xhtml+xml				xhtml xht
+application/xml					xml xsd
+application/xml-dtd
+application/xml-external-parsed-entity
+application/xslt+xml				xsl xslt
+application/xspf+xml				xspf
+application/zip					zip
+application/vnd.3M.Post-it-Notes
+application/vnd.accpac.simply.aso
+application/vnd.accpac.simply.imp
+application/vnd.acucobol
+application/vnd.aether.imp
+application/vnd.android.package-archive						apk
+application/vnd.anser-web-certificate-issue-initiation
+application/vnd.anser-web-funds-transfer-initiation
+application/vnd.audiograph
+application/vnd.bmi
+application/vnd.businessobjects
+application/vnd.canon-cpdl
+application/vnd.canon-lips
+application/vnd.cinderella							cdy
+application/vnd.claymore
+application/vnd.commerce-battelle
+application/vnd.commonspace
+application/vnd.comsocaller
+application/vnd.contact.cmsg
+application/vnd.cosmocaller
+application/vnd.ctc-posml
+application/vnd.cups-postscript
+application/vnd.cups-raster
+application/vnd.cups-raw
+application/vnd.cybank
+application/vnd.debian.binary-package						deb ddeb udeb
+application/vnd.dna
+application/vnd.dpgraph
+application/vnd.dxr
+application/vnd.ecdis-update
+application/vnd.ecowin.chart
+application/vnd.ecowin.filerequest
+application/vnd.ecowin.fileupdate
+application/vnd.ecowin.series
+application/vnd.ecowin.seriesrequest
+application/vnd.ecowin.seriesupdate
+application/vnd.enliven
+application/vnd.epson.esf
+application/vnd.epson.msf
+application/vnd.epson.quickanime
+application/vnd.epson.salt
+application/vnd.epson.ssf
+application/vnd.ericsson.quickcall
+application/vnd.eudora.data
+application/vnd.fdf
+application/vnd.ffsns
+application/vnd.flographit
+application/vnd.font-fontforge-sfd						sfd
+application/vnd.framemaker
+application/vnd.fsc.weblaunch
+application/vnd.fujitsu.oasys
+application/vnd.fujitsu.oasys2
+application/vnd.fujitsu.oasys3
+application/vnd.fujitsu.oasysgp
+application/vnd.fujitsu.oasysprs
+application/vnd.fujixerox.ddd
+application/vnd.fujixerox.docuworks
+application/vnd.fujixerox.docuworks.binder
+application/vnd.fut-misnet
+application/vnd.google-earth.kml+xml						kml
+application/vnd.google-earth.kmz						kmz
+application/vnd.grafeq
+application/vnd.groove-account
+application/vnd.groove-identity-message
+application/vnd.groove-injector
+application/vnd.groove-tool-message
+application/vnd.groove-tool-template
+application/vnd.groove-vcard
+application/vnd.hhe.lesson-player
+application/vnd.hp-HPGL
+application/vnd.hp-PCL
+application/vnd.hp-PCLXL
+application/vnd.hp-hpid
+application/vnd.hp-hps
+application/vnd.httphone
+application/vnd.hzn-3d-crossword
+application/vnd.ibm.MiniPay
+application/vnd.ibm.afplinedata
+application/vnd.ibm.modcap
+application/vnd.informix-visionary
+application/vnd.intercon.formnet
+application/vnd.intertrust.digibox
+application/vnd.intertrust.nncp
+application/vnd.intu.qbo
+application/vnd.intu.qfx
+application/vnd.irepository.package+xml
+application/vnd.is-xpr
+application/vnd.japannet-directory-service
+application/vnd.japannet-jpnstore-wakeup
+application/vnd.japannet-payment-wakeup
+application/vnd.japannet-registration
+application/vnd.japannet-registration-wakeup
+application/vnd.japannet-setstore-wakeup
+application/vnd.japannet-verification
+application/vnd.japannet-verification-wakeup
+application/vnd.koan
+application/vnd.lotus-1-2-3
+application/vnd.lotus-approach
+application/vnd.lotus-freelance
+application/vnd.lotus-notes
+application/vnd.lotus-organizer
+application/vnd.lotus-screencam
+application/vnd.lotus-wordpro
+application/vnd.mcd
+application/vnd.mediastation.cdkey
+application/vnd.meridian-slingshot
+application/vnd.mif
+application/vnd.minisoft-hp3000-save
+application/vnd.mitsubishi.misty-guard.trustweb
+application/vnd.mobius.daf
+application/vnd.mobius.dis
+application/vnd.mobius.msl
+application/vnd.mobius.plc
+application/vnd.mobius.txf
+application/vnd.motorola.flexsuite
+application/vnd.motorola.flexsuite.adsi
+application/vnd.motorola.flexsuite.fis
+application/vnd.motorola.flexsuite.gotap
+application/vnd.motorola.flexsuite.kmr
+application/vnd.motorola.flexsuite.ttc
+application/vnd.motorola.flexsuite.wem
+application/vnd.mozilla.xul+xml							xul
+application/vnd.ms-artgalry
+application/vnd.ms-asf
+application/vnd.ms-excel							xls xlb xlt
+application/vnd.ms-excel.addin.macroEnabled.12					xlam
+application/vnd.ms-excel.sheet.binary.macroEnabled.12				xlsb
+application/vnd.ms-excel.sheet.macroEnabled.12					xlsm
+application/vnd.ms-excel.template.macroEnabled.12				xltm
+application/vnd.ms-fontobject							eot
+application/vnd.ms-lrm
+application/vnd.ms-officetheme							thmx
+application/vnd.ms-pki.seccat							cat
+#application/vnd.ms-pki.stl							stl
+application/vnd.ms-powerpoint							ppt pps
+application/vnd.ms-powerpoint.addin.macroEnabled.12				ppam
+application/vnd.ms-powerpoint.presentation.macroEnabled.12			pptm
+application/vnd.ms-powerpoint.slide.macroEnabled.12				sldm
+application/vnd.ms-powerpoint.slideshow.macroEnabled.12				ppsm
+application/vnd.ms-powerpoint.template.macroEnabled.12				potm
+application/vnd.ms-project
+application/vnd.ms-tnef
+application/vnd.ms-word.document.macroEnabled.12				docm
+application/vnd.ms-word.template.macroEnabled.12				dotm
+application/vnd.ms-works
+application/vnd.mseq
+application/vnd.msign
+application/vnd.music-niff
+application/vnd.musician
+application/vnd.netfpx
+application/vnd.noblenet-directory
+application/vnd.noblenet-sealer
+application/vnd.noblenet-web
+application/vnd.novadigm.EDM
+application/vnd.novadigm.EDX
+application/vnd.novadigm.EXT
+application/vnd.oasis.opendocument.chart					odc
+application/vnd.oasis.opendocument.database					odb
+application/vnd.oasis.opendocument.formula					odf
+application/vnd.oasis.opendocument.graphics					odg
+application/vnd.oasis.opendocument.graphics-template				otg
+application/vnd.oasis.opendocument.image					odi
+application/vnd.oasis.opendocument.presentation					odp
+application/vnd.oasis.opendocument.presentation-template			otp
+application/vnd.oasis.opendocument.spreadsheet					ods
+application/vnd.oasis.opendocument.spreadsheet-template				ots
+application/vnd.oasis.opendocument.text						odt
+application/vnd.oasis.opendocument.text-master					odm
+application/vnd.oasis.opendocument.text-template				ott
+application/vnd.oasis.opendocument.text-web					oth
+application/vnd.openxmlformats-officedocument.presentationml.presentation	pptx
+application/vnd.openxmlformats-officedocument.presentationml.slide		sldx
+application/vnd.openxmlformats-officedocument.presentationml.slideshow		ppsx
+application/vnd.openxmlformats-officedocument.presentationml.template		potx
+application/vnd.openxmlformats-officedocument.spreadsheetml.sheet		xlsx
+application/vnd.openxmlformats-officedocument.spreadsheetml.template		xltx
+application/vnd.openxmlformats-officedocument.wordprocessingml.document		docx
+application/vnd.openxmlformats-officedocument.wordprocessingml.template		dotx
+application/vnd.osa.netdeploy
+application/vnd.palm
+application/vnd.pg.format
+application/vnd.pg.osasli
+application/vnd.powerbuilder6
+application/vnd.powerbuilder6-s
+application/vnd.powerbuilder7
+application/vnd.powerbuilder7-s
+application/vnd.powerbuilder75
+application/vnd.powerbuilder75-s
+application/vnd.previewsystems.box
+application/vnd.publishare-delta-tree
+application/vnd.pvi.ptid1
+application/vnd.pwg-xhtml-print+xml
+application/vnd.rapid
+application/vnd.rim.cod								cod
+application/vnd.s3sms
+application/vnd.seemail
+application/vnd.shana.informed.formdata
+application/vnd.shana.informed.formtemplate
+application/vnd.shana.informed.interchange
+application/vnd.shana.informed.package
+application/vnd.smaf								mmf
+application/vnd.sss-cod
+application/vnd.sss-dtf
+application/vnd.sss-ntf
+application/vnd.stardivision.calc						sdc
+application/vnd.stardivision.chart						sds
+application/vnd.stardivision.draw						sda
+application/vnd.stardivision.impress						sdd
+application/vnd.stardivision.math						sdf
+application/vnd.stardivision.writer						sdw
+application/vnd.stardivision.writer-global					sgl
+application/vnd.street-stream
+application/vnd.sun.xml.calc							sxc
+application/vnd.sun.xml.calc.template						stc
+application/vnd.sun.xml.draw							sxd
+application/vnd.sun.xml.draw.template						std
+application/vnd.sun.xml.impress							sxi
+application/vnd.sun.xml.impress.template					sti
+application/vnd.sun.xml.math							sxm
+application/vnd.sun.xml.writer							sxw
+application/vnd.sun.xml.writer.global						sxg
+application/vnd.sun.xml.writer.template						stw
+application/vnd.svd
+application/vnd.swiftview-ics
+application/vnd.symbian.install							sis
+application/vnd.tcpdump.pcap							cap pcap
+application/vnd.triscape.mxs
+application/vnd.trueapp
+application/vnd.truedoc
+application/vnd.tve-trigger
+application/vnd.ufdl
+application/vnd.uplanet.alert
+application/vnd.uplanet.alert-wbxml
+application/vnd.uplanet.bearer-choice
+application/vnd.uplanet.bearer-choice-wbxml
+application/vnd.uplanet.cacheop
+application/vnd.uplanet.cacheop-wbxml
+application/vnd.uplanet.channel
+application/vnd.uplanet.channel-wbxml
+application/vnd.uplanet.list
+application/vnd.uplanet.list-wbxml
+application/vnd.uplanet.listcmd
+application/vnd.uplanet.listcmd-wbxml
+application/vnd.uplanet.signal
+application/vnd.vcx
+application/vnd.vectorworks
+application/vnd.vidsoft.vidconference
+application/vnd.visio								vsd vst vsw vss
+application/vnd.vividence.scriptfile
+application/vnd.wap.sic
+application/vnd.wap.slc
+application/vnd.wap.wbxml							wbxml
+application/vnd.wap.wmlc							wmlc
+application/vnd.wap.wmlscriptc							wmlsc
+application/vnd.webturbo
+application/vnd.wordperfect							wpd
+application/vnd.wordperfect5.1							wp5
+application/vnd.wrq-hp3000-labelled
+application/vnd.wt.stf
+application/vnd.xara
+application/vnd.xfdl
+application/vnd.yellowriver-custom-menu
+application/zlib
+application/x-123				wk
+application/x-7z-compressed			7z
+application/x-abiword				abw
+application/x-apple-diskimage			dmg
+application/x-bcpio				bcpio
+application/x-bittorrent			torrent
+application/x-cab				cab
+application/x-cbr				cbr
+application/x-cbz				cbz
+application/x-cdf				cdf cda
+application/x-cdlink				vcd
+application/x-chess-pgn				pgn
+application/x-comsol				mph
+application/x-core
+application/x-cpio				cpio
+application/x-csh				csh
+application/x-debian-package			deb udeb
+application/x-director				dcr dir dxr
+application/x-dms				dms
+application/x-doom				wad
+application/x-dvi				dvi
+application/x-executable
+application/x-font				pfa pfb gsf
+application/x-font-pcf				pcf pcf.Z
+application/x-freemind				mm
+application/x-futuresplash			spl
+application/x-ganttproject			gan
+application/x-gnumeric				gnumeric
+application/x-go-sgf				sgf
+application/x-graphing-calculator		gcf
+application/x-gtar				gtar
+application/x-gtar-compressed			tgz taz
+application/x-hdf				hdf
+#application/x-httpd-eruby			rhtml
+#application/x-httpd-php			phtml pht php
+#application/x-httpd-php-source			phps
+#application/x-httpd-php3			php3
+#application/x-httpd-php3-preprocessed		php3p
+#application/x-httpd-php4			php4
+#application/x-httpd-php5			php5
+application/x-hwp				hwp
+application/x-ica				ica
+application/x-info				info
+application/x-internet-signup			ins isp
+application/x-iphone				iii
+application/x-iso9660-image			iso
+application/x-jam				jam
+application/x-java-applet
+application/x-java-bean
+application/x-java-jnlp-file			jnlp
+application/x-jmol				jmz
+application/x-kchart				chrt
+application/x-kdelnk
+application/x-killustrator			kil
+application/x-koan				skp skd skt skm
+application/x-kpresenter			kpr kpt
+application/x-kspread				ksp
+application/x-kword				kwd kwt
+application/x-latex				latex
+application/x-lha				lha
+application/x-lyx				lyx
+application/x-lzh				lzh
+application/x-lzx				lzx
+application/x-maker				frm maker frame fm fb book fbdoc
+application/x-mif				mif
+application/x-mpegURL				m3u8
+application/x-ms-application			application
+application/x-ms-manifest			manifest
+application/x-ms-wmd				wmd
+application/x-ms-wmz				wmz
+application/x-msdos-program			com exe bat dll
+application/x-msi				msi
+application/x-netcdf				nc
+application/x-ns-proxy-autoconfig		pac
+application/x-nwc				nwc
+application/x-object				o
+application/x-oz-application			oza
+application/x-pkcs7-certreqresp			p7r
+application/x-pkcs7-crl				crl
+application/x-python-code			pyc pyo
+application/x-qgis				qgs shp shx
+application/x-quicktimeplayer			qtl
+application/x-rdp				rdp
+application/x-redhat-package-manager		rpm
+application/x-rss+xml				rss
+application/x-ruby				rb
+application/x-rx
+application/x-scilab				sci sce
+application/x-scilab-xcos			xcos
+application/x-sh				sh
+application/x-shar				shar
+application/x-shellscript
+application/x-shockwave-flash			swf swfl
+application/x-silverlight			scr
+application/x-sql				sql
+application/x-stuffit				sit sitx
+application/x-sv4cpio				sv4cpio
+application/x-sv4crc				sv4crc
+application/x-tar				tar
+application/x-tcl				tcl
+application/x-tex-gf				gf
+application/x-tex-pk				pk
+application/x-texinfo				texinfo texi
+application/x-trash				~ % bak old sik
+application/x-troff				t tr roff
+application/x-troff-man				man
+application/x-troff-me				me
+application/x-troff-ms				ms
+application/x-ustar				ustar
+application/x-videolan
+application/x-wais-source			src
+application/x-wingz				wz
+application/x-x509-ca-cert			crt
+application/x-xcf				xcf
+application/x-xfig				fig
+application/x-xpinstall				xpi
+application/x-xz				xz
+
+audio/32kadpcm
+audio/3gpp
+audio/amr					amr
+audio/amr-wb					awb
+audio/annodex					axa
+audio/basic					au snd
+audio/csound					csd orc sco
+audio/flac					flac
+audio/g.722.1
+audio/l16
+audio/midi					mid midi kar
+audio/mp4a-latm
+audio/mpa-robust
+audio/mpeg					mpga mpega mp2 mp3 m4a
+audio/mpegurl					m3u
+audio/ogg					oga ogg opus spx
+audio/parityfec
+audio/prs.sid					sid
+audio/telephone-event
+audio/tone
+audio/vnd.cisco.nse
+audio/vnd.cns.anp1
+audio/vnd.cns.inf1
+audio/vnd.digital-winds
+audio/vnd.everad.plj
+audio/vnd.lucent.voice
+audio/vnd.nortel.vbk
+audio/vnd.nuera.ecelp4800
+audio/vnd.nuera.ecelp7470
+audio/vnd.nuera.ecelp9600
+audio/vnd.octel.sbc
+audio/vnd.qcelp
+audio/vnd.rhetorex.32kadpcm
+audio/vnd.vmx.cvsd
+audio/x-aiff					aif aiff aifc
+audio/x-gsm					gsm
+audio/x-mpegurl					m3u
+audio/x-ms-wma					wma
+audio/x-ms-wax					wax
+audio/x-pn-realaudio-plugin
+audio/x-pn-realaudio				ra rm ram
+audio/x-realaudio				ra
+audio/x-scpls					pls
+audio/x-sd2					sd2
+audio/x-wav					wav
+
+chemical/x-alchemy				alc
+chemical/x-cache				cac cache
+chemical/x-cache-csf				csf
+chemical/x-cactvs-binary			cbin cascii ctab
+chemical/x-cdx					cdx
+chemical/x-cerius				cer
+chemical/x-chem3d				c3d
+chemical/x-chemdraw				chm
+chemical/x-cif					cif
+chemical/x-cmdf					cmdf
+chemical/x-cml					cml
+chemical/x-compass				cpa
+chemical/x-crossfire				bsd
+chemical/x-csml					csml csm
+chemical/x-ctx					ctx
+chemical/x-cxf					cxf cef
+#chemical/x-daylight-smiles			smi
+chemical/x-embl-dl-nucleotide			emb embl
+chemical/x-galactic-spc				spc
+chemical/x-gamess-input				inp gam gamin
+chemical/x-gaussian-checkpoint			fch fchk
+chemical/x-gaussian-cube			cub
+chemical/x-gaussian-input			gau gjc gjf
+chemical/x-gaussian-log				gal
+chemical/x-gcg8-sequence			gcg
+chemical/x-genbank				gen
+chemical/x-hin					hin
+chemical/x-isostar				istr ist
+chemical/x-jcamp-dx				jdx dx
+chemical/x-kinemage				kin
+chemical/x-macmolecule				mcm
+chemical/x-macromodel-input			mmd mmod
+chemical/x-mdl-molfile				mol
+chemical/x-mdl-rdfile				rd
+chemical/x-mdl-rxnfile				rxn
+chemical/x-mdl-sdfile				sd sdf
+chemical/x-mdl-tgf				tgf
+#chemical/x-mif					mif
+chemical/x-mmcif				mcif
+chemical/x-mol2					mol2
+chemical/x-molconn-Z				b
+chemical/x-mopac-graph				gpt
+chemical/x-mopac-input				mop mopcrt mpc zmt
+chemical/x-mopac-out				moo
+chemical/x-mopac-vib				mvb
+chemical/x-ncbi-asn1				asn
+chemical/x-ncbi-asn1-ascii			prt ent
+chemical/x-ncbi-asn1-binary			val aso
+chemical/x-ncbi-asn1-spec			asn
+chemical/x-pdb					pdb ent
+chemical/x-rosdal				ros
+chemical/x-swissprot				sw
+chemical/x-vamas-iso14976			vms
+chemical/x-vmd					vmd
+chemical/x-xtel					xtel
+chemical/x-xyz					xyz
+
+image/cgm
+image/g3fax
+image/gif					gif
+image/ief					ief
+image/jp2					jp2 jpg2
+image/jpeg					jpeg jpg jpe
+image/jpm					jpm
+image/jpx					jpx jpf
+image/naplps
+image/pcx					pcx
+image/png					png
+image/prs.btif
+image/prs.pti
+image/svg+xml					svg svgz
+image/tiff					tiff tif
+image/vnd.cns.inf2
+image/vnd.djvu					djvu djv
+image/vnd.dwg
+image/vnd.dxf
+image/vnd.fastbidsheet
+image/vnd.fpx
+image/vnd.fst
+image/vnd.fujixerox.edmics-mmr
+image/vnd.fujixerox.edmics-rlc
+image/vnd.microsoft.icon			ico
+image/vnd.mix
+image/vnd.net-fpx
+image/vnd.svf
+image/vnd.wap.wbmp				wbmp
+image/vnd.xiff
+image/x-canon-cr2				cr2
+image/x-canon-crw				crw
+image/x-cmu-raster				ras
+image/x-coreldraw				cdr
+image/x-coreldrawpattern			pat
+image/x-coreldrawtemplate			cdt
+image/x-corelphotopaint				cpt
+image/x-epson-erf				erf
+image/x-icon
+image/x-jg					art
+image/x-jng					jng
+image/x-ms-bmp					bmp
+image/x-nikon-nef				nef
+image/x-olympus-orf				orf
+image/x-photoshop				psd
+image/x-portable-anymap				pnm
+image/x-portable-bitmap				pbm
+image/x-portable-graymap			pgm
+image/x-portable-pixmap				ppm
+image/x-rgb					rgb
+image/x-xbitmap					xbm
+image/x-xpixmap					xpm
+image/x-xwindowdump				xwd
+
+inode/chardevice
+inode/blockdevice
+inode/directory-locked
+inode/directory
+inode/fifo
+inode/socket
+
+message/delivery-status
+message/disposition-notification
+message/external-body
+message/http
+message/s-http
+message/news
+message/partial
+message/rfc822					eml
+
+model/iges					igs iges
+model/mesh					msh mesh silo
+model/vnd.dwf
+model/vnd.flatland.3dml
+model/vnd.gdl
+model/vnd.gs-gdl
+model/vnd.gtw
+model/vnd.mts
+model/vnd.vtu
+model/vrml					wrl vrml
+model/x3d+vrml					x3dv
+model/x3d+xml					x3d
+model/x3d+binary				x3db
+
+multipart/alternative
+multipart/appledouble
+multipart/byteranges
+multipart/digest
+multipart/encrypted
+multipart/form-data
+multipart/header-set
+multipart/mixed
+multipart/parallel
+multipart/related
+multipart/report
+multipart/signed
+multipart/voice-message
+
+text/cache-manifest				appcache
+text/calendar					ics icz
+text/css					css
+text/csv					csv
+text/directory
+text/english
+text/enriched
+text/h323					323
+text/html					html htm shtml
+text/iuls					uls
+text/mathml					mml
+text/markdown                                   md markdown
+text/parityfec
+text/plain					asc txt text pot brf srt
+text/prs.lines.tag
+text/rfc822-headers
+text/richtext					rtx
+text/rtf
+text/scriptlet					sct wsc
+text/t140
+text/texmacs					tm
+text/tab-separated-values			tsv
+text/turtle					ttl
+text/uri-list
+text/vcard					vcf vcard
+text/vnd.abc
+text/vnd.curl
+text/vnd.debian.copyright
+text/vnd.DMClientScript
+text/vnd.flatland.3dml
+text/vnd.fly
+text/vnd.fmi.flexstor
+text/vnd.in3d.3dml
+text/vnd.in3d.spot
+text/vnd.IPTC.NewsML
+text/vnd.IPTC.NITF
+text/vnd.latex-z
+text/vnd.motorola.reflex
+text/vnd.ms-mediapackage
+text/vnd.sun.j2me.app-descriptor		jad
+text/vnd.wap.si
+text/vnd.wap.sl
+text/vnd.wap.wml				wml
+text/vnd.wap.wmlscript				wmls
+text/x-bibtex					bib
+text/x-boo					boo
+text/x-c++hdr					h++ hpp hxx hh
+text/x-c++src					c++ cpp cxx cc
+text/x-chdr					h
+text/x-component				htc
+text/x-crontab
+text/x-csh					csh
+text/x-csrc					c
+text/x-dsrc					d
+text/x-diff					diff patch
+text/x-haskell					hs
+text/x-java					java
+text/x-lilypond					ly
+text/x-literate-haskell				lhs
+text/x-makefile
+text/x-moc					moc
+text/x-pascal					p pas
+text/x-pcs-gcd					gcd
+text/x-perl					pl pm
+text/x-python					py
+text/x-scala					scala
+text/x-server-parsed-html
+text/x-setext					etx
+text/x-sfv					sfv
+text/x-sh					sh
+text/x-tcl					tcl tk
+text/x-tex					tex ltx sty cls
+text/x-vcalendar				vcs
+
+video/3gpp					3gp
+video/annodex					axv
+video/dl					dl
+video/dv					dif dv
+video/fli					fli
+video/gl					gl
+video/mpeg					mpeg mpg mpe
+video/MP2T					ts
+video/mp4					mp4
+video/quicktime					qt mov
+video/mp4v-es
+video/ogg					ogv
+video/parityfec
+video/pointer
+video/webm					webm
+video/vnd.fvt
+video/vnd.motorola.video
+video/vnd.motorola.videop
+video/vnd.mpegurl				mxu
+video/vnd.mts
+video/vnd.nokia.interleaved-multimedia
+video/vnd.vivo
+video/x-flv					flv
+video/x-la-asf					lsf lsx
+video/x-mng					mng
+video/x-ms-asf					asf asx
+video/x-ms-wm					wm
+video/x-ms-wmv					wmv
+video/x-ms-wmx					wmx
+video/x-ms-wvx					wvx
+video/x-msvideo					avi
+video/x-sgi-movie				movie
+video/x-matroska				mpv mkv
+
+x-conference/x-cooltalk				ice
+
+x-epoc/x-sisx-app				sisx
+x-world/x-vrml					vrm vrml wrl
diff --git a/spk/icecast/src/wizards/install_uifile b/spk/icecast/src/wizards/install_uifile
index 6a838cb736f..ea18c3afcd5 100644
--- a/spk/icecast/src/wizards/install_uifile
+++ b/spk/icecast/src/wizards/install_uifile
@@ -7,15 +7,18 @@
             "key": "wizard_ic_username",
             "desc": "Username",
             "defaultValue": "admin"
-        }]
-    }, {
+          }
+        ]
+      }, {
         "type": "password",
         "desc": "User's password. Defaults to changepassword",
         "subitems": [{
             "key": "wizard_ic_password",
             "desc": "Password",
             "defaultValue": "changepassword"
-        }]
-    }]
-
-}]
+          }
+        ]
+      }
+    ]
+  }
+]

From bc01c7f26d007080840b15c0fd2649d1a0cf927a Mon Sep 17 00:00:00 2001
From: hgy59 <hpgy59@gmail.com>
Date: Sun, 29 May 2022 15:12:10 +0200
Subject: [PATCH 4/8] optimize code

- optimize code of icecast and ezstream
- update changelog as openssl is updated too
---
 cross/ezstream/Makefile | 1 +
 cross/icecast/Makefile  | 1 +
 spk/icecast/Makefile    | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/cross/ezstream/Makefile b/cross/ezstream/Makefile
index e038ea250fd..cfd2bd2d2aa 100644
--- a/cross/ezstream/Makefile
+++ b/cross/ezstream/Makefile
@@ -14,5 +14,6 @@ COMMENT  = EZStream is a command line source client for Icecast media streaming
 LICENSE  = GPLv2
 
 GNU_CONFIGURE = 1
+ADDITIONAL_CFLAGS = -O
 
 include ../../mk/spksrc.cross-cc.mk
diff --git a/cross/icecast/Makefile b/cross/icecast/Makefile
index 887be67b4f6..2aca24af27d 100644
--- a/cross/icecast/Makefile
+++ b/cross/icecast/Makefile
@@ -15,6 +15,7 @@ GNU_CONFIGURE = 1
 POST_INSTALL_TARGET = icecast_extra_install
 
 CONFIGURE_ARGS = --with-xslt-config=$(STAGING_INSTALL_PREFIX)/bin/xslt-config
+ADDITIONAL_CFLAGS = -O
 
 include ../../mk/spksrc.cross-cc.mk
 
diff --git a/spk/icecast/Makefile b/spk/icecast/Makefile
index 84d2ccfa493..5e25011faa3 100644
--- a/spk/icecast/Makefile
+++ b/spk/icecast/Makefile
@@ -9,7 +9,7 @@ DEPENDS = cross/$(SPK_NAME)
 MAINTAINER = SynoCommunity
 DESCRIPTION = Icecast is a streaming media server which currently supports Ogg (Vorbis and Theora), Opus, WebM and MP3 audio streams. It can be used to create an Internet radio station or a privately running jukebox and many things in between. It is very versatile in that new formats can be added relatively easily and supports open standards for communication and interaction. This package includes Ezstream, a command line source client for Icecast media streaming servers.
 ADMIN_PORT = 8000
-CHANGELOG = "1. Security fixes for CVE-2018-10393, CVE-2017-14160, CVE-2018-10392 (libvorbis) and CVE-2021-22876, CVE-2021-22890 (libcurl).<br/>2. Adjust configuration for DSM7 compatibility.<br/>3. Update dependencies (taglib v1.12, vorbis v1.3.7, ezstream v1.0.2, libcurl of curl v7.80.0)"
+CHANGELOG = "1. Security fixes for CVE-2018-10393, CVE-2017-14160, CVE-2018-10392 (libvorbis) and CVE-2021-22876, CVE-2021-22890 (libcurl).<br/>2. Adjust configuration for DSM7 compatibility.<br/>3. Update dependencies (taglib v1.12, vorbis v1.3.7, ezstream v1.0.2, libcurl of curl v7.82.0, openssl v1.1.1o)"
 DISPLAY_NAME = Icecast
 
 HOMEPAGE = https://www.icecast.org/

From 4acfa4d522249e398e7e757359af21f983a339b8 Mon Sep 17 00:00:00 2001
From: hgy59 <hpgy59@gmail.com>
Date: Mon, 30 May 2022 00:42:10 +0200
Subject: [PATCH 5/8] build only shared libraries of cross/speex

- without the build of static libraries the binaries are not built and libogg is not required
---
 cross/speex/Makefile | 4 +++-
 cross/speex/PLIST    | 2 --
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cross/speex/Makefile b/cross/speex/Makefile
index a1969197d52..8c81f8a2c91 100644
--- a/cross/speex/Makefile
+++ b/cross/speex/Makefile
@@ -5,12 +5,14 @@ PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://ftp.osuosl.org/pub/xiph/releases/speex
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
-DEPENDS = cross/libogg
+DEPENDS =
 
 HOMEPAGE = https://speex.org/
 COMMENT  = Speex is an Open Source/Free Software patent-free audio compression format designed for speech. The Speex Project aims to lower the barrier of entry for voice applications by providing a free alternative to expensive proprietary speech codecs. Moreover, Speex is well-adapted to Internet applications and provides useful features that are not present in most other codecs. Finally, Speex is part of the GNU Project and is available under the revised BSD license.
 LICENSE  = BSD
 
 GNU_CONFIGURE = 1
+CONFIGURE_ARGS = --disable-static
+ADDITIONAL_CFLAGS = -O
 
 include ../../mk/spksrc.cross-cc.mk
diff --git a/cross/speex/PLIST b/cross/speex/PLIST
index 59fc493c767..1a689fc5526 100644
--- a/cross/speex/PLIST
+++ b/cross/speex/PLIST
@@ -1,5 +1,3 @@
-bin:bin/speexdec
-bin:bin/speexenc
 lnk:lib/libspeex.so
 lnk:lib/libspeex.so.1
 lib:lib/libspeex.so.1.5.1

From 72e046771d4ada0fa0d84f360a6ef0804b3f624f Mon Sep 17 00:00:00 2001
From: hgy59 <hpgy59@gmail.com>
Date: Mon, 30 May 2022 00:43:20 +0200
Subject: [PATCH 6/8] disable build of static libraries

- static libraries are obsolete here
---
 cross/libogg/Makefile    | 2 +-
 cross/libvorbis/Makefile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cross/libogg/Makefile b/cross/libogg/Makefile
index 1f592c49014..9071ddd08ce 100644
--- a/cross/libogg/Makefile
+++ b/cross/libogg/Makefile
@@ -12,7 +12,7 @@ COMMENT  = Ogg Vorbis is a fully open, non-proprietary, patent-and-royalty-free,
 LICENSE  = BSD
 
 GNU_CONFIGURE = 1
-
+CONFIGURE_ARGS = --disable-static
 ADDITIONAL_CFLAGS = -Os
 
 include ../../mk/spksrc.cross-cc.mk
diff --git a/cross/libvorbis/Makefile b/cross/libvorbis/Makefile
index f106958d81b..e63d9d1bed9 100644
--- a/cross/libvorbis/Makefile
+++ b/cross/libvorbis/Makefile
@@ -12,7 +12,7 @@ COMMENT  = Ogg Vorbis is a fully open, non-proprietary, patent-and-royalty-free,
 LICENSE  = BSD
 
 GNU_CONFIGURE = 1
-
+CONFIGURE_ARGS = --disable-static
 ADDITIONAL_CFLAGS = -Os
 
 include ../../mk/spksrc.cross-cc.mk

From 8562619909774e169940cdaf5fa2bb2b2fb5b17d Mon Sep 17 00:00:00 2001
From: hgy59 <hpgy59@gmail.com>
Date: Mon, 30 May 2022 00:44:17 +0200
Subject: [PATCH 7/8] update cross/libshout

---
 cross/libshout/Makefile | 8 +++++---
 cross/libshout/digests  | 6 +++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/cross/libshout/Makefile b/cross/libshout/Makefile
index 8305e7c973f..31013159a00 100644
--- a/cross/libshout/Makefile
+++ b/cross/libshout/Makefile
@@ -1,16 +1,18 @@
 PKG_NAME = libshout
-PKG_VERS = 2.4.3
+PKG_VERS = 2.4.6
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
-PKG_DIST_SITE = https://ftp.osuosl.org/pub/xiph/releases/$(PKG_NAME)
+PKG_DIST_SITE = https://ftp.osuosl.org/pub/xiph/releases/libshout
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
-DEPENDS = cross/libvorbis cross/libogg cross/openssl
+DEPENDS = cross/openssl cross/libvorbis cross/libogg cross/speex cross/libtheora
 
 HOMEPAGE = https://icecast.org/
 COMMENT  = Libshout is a library for communicating with and sending data to an icecast server.
 LICENSE  = LGPL
 
 GNU_CONFIGURE = 1
+CONFIGURE_ARGS = --disable-static --disable-examples --disable-tools
+ADDITIONAL_CFLAGS = -O
 
 include ../../mk/spksrc.cross-cc.mk
diff --git a/cross/libshout/digests b/cross/libshout/digests
index 957c92f9a01..120cd407094 100644
--- a/cross/libshout/digests
+++ b/cross/libshout/digests
@@ -1,3 +1,3 @@
-libshout-2.4.3.tar.gz SHA1 f14bef3072c81de94b512057bedf4d26cc211ae2
-libshout-2.4.3.tar.gz SHA256 0d8af55d1141bf90710bcd41a768c9cc5adb251502a0af1dd22c8da215d40dfe
-libshout-2.4.3.tar.gz MD5 2623ebf5bdf00517d2a7fd17d70c31aa
+libshout-2.4.6.tar.gz SHA1 14231d7eebee4bb01baa5dd0b964cfad77296241
+libshout-2.4.6.tar.gz SHA256 39cbd4f0efdfddc9755d88217e47f8f2d7108fa767f9d58a2ba26a16d8f7c910
+libshout-2.4.6.tar.gz MD5 4a66a369a01ce790e578221fa2c8ea60

From 96ea1f1330413990916acb14494e959518cf21ef Mon Sep 17 00:00:00 2001
From: hgy59 <hpgy59@gmail.com>
Date: Mon, 30 May 2022 00:46:25 +0200
Subject: [PATCH 8/8] icecast: add service port

- add service port to create firewall rules
- define DSM UI url for admin page
---
 spk/icecast/Makefile | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/spk/icecast/Makefile b/spk/icecast/Makefile
index 5e25011faa3..b82c91390ca 100644
--- a/spk/icecast/Makefile
+++ b/spk/icecast/Makefile
@@ -7,16 +7,18 @@ DSM_UI_DIR = app
 DEPENDS = cross/$(SPK_NAME)
 
 MAINTAINER = SynoCommunity
-DESCRIPTION = Icecast is a streaming media server which currently supports Ogg (Vorbis and Theora), Opus, WebM and MP3 audio streams. It can be used to create an Internet radio station or a privately running jukebox and many things in between. It is very versatile in that new formats can be added relatively easily and supports open standards for communication and interaction. This package includes Ezstream, a command line source client for Icecast media streaming servers.
-ADMIN_PORT = 8000
+DESCRIPTION = Icecast is a streaming media server which currently supports Ogg \(Vorbis and Theora\), Opus, WebM and MP3 audio streams. It can be used to create an Internet radio station or a privately running jukebox and many things in between. It is very versatile in that new formats can be added relatively easily and supports open standards for communication and interaction. This package includes Ezstream, a command line source client for Icecast media streaming servers.
 CHANGELOG = "1. Security fixes for CVE-2018-10393, CVE-2017-14160, CVE-2018-10392 (libvorbis) and CVE-2021-22876, CVE-2021-22890 (libcurl).<br/>2. Adjust configuration for DSM7 compatibility.<br/>3. Update dependencies (taglib v1.12, vorbis v1.3.7, ezstream v1.0.2, libcurl of curl v7.82.0, openssl v1.1.1o)"
-DISPLAY_NAME = Icecast
+DISPLAY_NAME = Icecast2
 
 HOMEPAGE = https://www.icecast.org/
 LICENSE = GPLv2
 
 WIZARDS_DIR = src/wizards
 
+SERVICE_PORT = 8000
+ADMIN_PORT = $(SERVICE_PORT)
+SERVICE_URL = /admin/
 STARTABLE = yes
 SERVICE_USER = auto
 SERVICE_SETUP = src/service-setup.sh