icecast: update dependencies and update for DSM7

cross/ezstream/Makefile

@@ -1,16 +1,19 @@
 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.
 LICENSE  = GPLv2
 
 GNU_CONFIGURE = 1
+ADDITIONAL_CFLAGS = -O
 
 include ../../mk/spksrc.cross-cc.mk

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

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

cross/icecast/Makefile

@@ -12,7 +12,13 @@ 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
+ADDITIONAL_CFLAGS = -O
 
 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

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

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

cross/libcheck/PLIST

@@ -0,0 +1,2 @@
+lnk:lib/libcheck.so.0
+lib:lib/libcheck.so.0.0.0

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

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

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

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

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

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

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

cross/taglib/Makefile

@@ -1,17 +1,16 @@
 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/
 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

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

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

spk/icecast/Makefile

@@ -1,38 +1,36 @@
 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."
-ADMIN_PORT = 8000
-CHANGELOG = "Update openssl to 1.1."
+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 = Icecast2
 
-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_PORT = 8000
+ADMIN_PORT = $(SERVICE_PORT)
+SERVICE_URL = /admin/
+STARTABLE = yes
 SERVICE_USER = auto
 SERVICE_SETUP = src/service-setup.sh
-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
+	install -m 644 src/mime.types  $(STAGING_DIR)/var/mime.types

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>-->
@@ -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>/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/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/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 +217,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 +239,8 @@
         <chroot>0</chroot>
         <!--
         <changeowner>
-            <user>icecast</user>
-            <group>root</group>
+            <user>nobody</user>
+            <group>nogroup</group>
         </changeowner>
         -->
     </security>