mympd: Update to version 22.0.4 and work with coreutils-9.8

- Update from version 21.0.1 to 22.0.4
- Add config options to stop doc and man page creation.
- Add patch to fix working with coreutils-9.8
- Update of rootfile
- Changelog
    22.0.4
	- Upd: Restrict sticker names (forbid equal sign)
	- Fix: Really shuffle the playlist #1455
	- Fix: Relax search expression validation #1455
	- Fix: Alpine packaging
	- Fix: Detection of local playback features #1452
    22.0.3
	- Upd: Create cache und workdir in init script
	- Upd: Feature detection for local playback output selection #1452
    22.0.2
	- Fix: MYMPD_API_JUKEBOX_RESTART requires MPD connection #1448
    22.0.1
	- Fix: Respect backgroundImage setting #1446
	- Fix: Alpine packaging
    22.0.0
      Notes
	- This release enables certificate checking for outgoing https connections.
	  The system CA cert store should be autodetected, open an issue if it fails.
	- The startup process of myMPD was reworked. myMPD no longer drops privileges,
	  the included startup scripts are using now the init system to do this.
	- The default listening ports are now 8080 for HTTP and 8443 for HTTPS.
      API changes
	- MYMPD_API_SCRIPT_VERIFY_SIG: new
	- MYMPD_API_HOME_WIDGET_IFRAME_SAVE: new
	- MYMPD_API_HOME_WIDGET_SCRIPT_SAVE: new
	- MYMPD_API_HOME_WIDGET_SAVE: removed
      Scripting changes
	- Feat: `mympd.tblvalue_in_list()` - Checks a Lua table of tags against a comma separated list.
	- Upd: Executing external scripts is now disabled by default.
      Changelog
	- Feat: iFrames for home screen #1429
	- Feat: Feat: Add custom css and js #1428
	- Feat: Use system provided ca store for ssl certificate checking #1427
	- Feat: Sign and verify scripts from mympd-scripts repository #1426
	- Feat: Add trigger `mympd_playlistart`, `mympd_folderart`
	- Feat: Sort list of timers and triggers #1425
	- Feat: Allow changing output device with local playback #1434
	- Upd: Improve "Edit Script"-Layout
	- Upd: Bootstrap v5.3.7
	- Upd: Mongoose 7.18
	- Upd: libmympdclient 1.0.34 (libmpdclient 2.24.0)
	- Upd: Incbin
	- Upd: Replaced mjson with mongoose implementation
	- Fix: Improve MPD search expression validation #1435

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/packages/mympd b/config/rootfiles/packages/mympd
index a07ccb3b325a5402bca46a0ffe99b98da4c432b4..215a55bb293f7f3c1bf366303bb3b4393df24c45 100644 (file)
--- a/config/rootfiles/packages/mympd
+++ b/config/rootfiles/packages/mympd
@@ -5,14 +5,6 @@ usr/bin/mympd-script
 #usr/lib/systemd/system/mympd.service
 #usr/lib/systemd/user
 #usr/lib/systemd/user/mympd.service
-#usr/share/doc/mympd
-#usr/share/doc/mympd/CHANGELOG.md
-#usr/share/doc/mympd/LICENSE.md
-#usr/share/doc/mympd/README.md
-#usr/share/doc/mympd/SECURITY.md
-#usr/share/man/man1/mympd-config.1.gz
-#usr/share/man/man1/mympd-script.1.gz
-#usr/share/man/man1/mympd.1.gz
 var/ipfire/backup/addons/includes/mympd
 var/lib/mympd
 #var/lib/mympd/config

diff --git a/lfs/mympd b/lfs/mympd
index a05cacf50c71d695239190e530d68227a41196b0..a0167ffa8c0118cdf468b2b816d5ae7af1f6e267 100644 (file)
--- a/lfs/mympd
+++ b/lfs/mympd
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = mympd
-PAK_VER    = 14
+PAK_VER    = 15
 
 DEPS       = mpd libmpdclient
 
@@ -81,14 +81,18 @@ $(subst %,%_BLAKE2,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/mympd-22.0.4_Simplify_ending_newline_detection.patch
 
        # Do not try to re-define _FORTIFY_SOURCE
        cd $(DIR_APP) && sed -e "/D_FORTIFY_SOURCE/d" -i CMakeLists.txt
 
        cd $(DIR_APP) && mkdir -p build
        cd $(DIR_APP)/build && cmake -Wno-dev \
-                                       -DCMAKE_INSTALL_PREFIX=/usr \
-                                       -DCMAKE_BUILD_TYPE=Release ..
+                                       -D CMAKE_INSTALL_PREFIX=/usr \
+                                       -D MYMPD_DOC=OFF \
+                                       -D MYMPD_ENABLE_SYSTEMD=OFF \
+                                       -D MYMPD_MANPAGES=OFF \
+                                       -D CMAKE_BUILD_TYPE=Release ..
        cd $(DIR_APP)/build && make $(MAKETUNING)
        cd $(DIR_APP)/build && make install
 

diff --git a/src/patches/mympd-22.0.4_Simplify_ending_newline_detection.patch b/src/patches/mympd-22.0.4_Simplify_ending_newline_detection.patch
new file mode 100644 (file)
index 0000000..f8a5a3c
--- /dev/null
+++ b/src/patches/mympd-22.0.4_Simplify_ending_newline_detection.patch
@@ -0,0 +1,32 @@
+From c6eeec3614bd6e91f3313f37a723a2b37467ec6a Mon Sep 17 00:00:00 2001
+From: jcorporation <mail@jcgames.de>
+Date: Fri, 10 Oct 2025 15:45:06 +0200
+Subject: [PATCH] Fix: Simplify ending newline detection #1470
+
+---
+ build.sh | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/build.sh b/build.sh
+index 366e3e619..1f20fcdb0 100755
+--- a/build.sh
++++ b/build.sh
+@@ -217,7 +217,7 @@ createassets() {
+     [ "$F" = "js/long-press-event.js" ] && continue
+     [ "$F" = "js/version.js" ] && continue
+     JSSRCFILES="$JSSRCFILES htdocs/$F"
+-    if tail -1 "htdocs/$F" | perl -npe 'exit 1 if m/\n/; exit 0'
++    if [ -n "$(tail -c 1 "htdocs/$F")" ]
+     then
+       echo_error "$F don't end with newline character"
+       exit 1
+@@ -241,7 +241,7 @@ createassets() {
+   JSFILES="$JSFILES $MYMPD_BUILDDIR/htdocs/js/*.min.js"
+   for F in $JSFILES
+   do
+-    if tail -1 "$F" | perl -npe 'exit 1 if m/\n/; exit 0'
++    if [ -n "$(tail -c 1 "$F")" ]
+     then
+       echo_error "$F don't end with newline character"
+       exit 1
+