This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, master has been updated via 8c43d1481a99743ce23d8b92879ea04f7e0153c1 (commit) via 7f7cbd68b8fc15de7d8a10569684611704f005b7 (commit) via 664eac84834676fd0bd64b7a90c93e4c612a860c (commit) via fdad4cf48f53556086fea1965b3e79b2c68ed3d5 (commit) from 83338946dc2121d1f0d332d4e5f2f13b1bf078d5 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 8c43d1481a99743ce23d8b92879ea04f7e0153c1 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Feb 2 07:33:38 2024 +0000
kernel: update to 6.6.15
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 7f7cbd68b8fc15de7d8a10569684611704f005b7 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Jan 31 21:09:14 2024 +0100
mympd: create/check config before first start
this create missing folders for webradio and state.
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 664eac84834676fd0bd64b7a90c93e4c612a860c Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Jan 28 21:29:46 2024 +0100
mympd: new addon to control mpd via WebGUI
myMPD is written in C and has a nice WebGUI to play local music and also a WebRadio browser. This is to replace the removec client175.
After install it can reached via https://IP_OF_THE_IPFIRE:8800
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit fdad4cf48f53556086fea1965b3e79b2c68ed3d5 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Jan 28 15:42:53 2024 +0100
mpfire: fix initskript uninstall
the uninstall with rm /etc/rc*.d/*mpd remove not only the mpd initlinks.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/backup/includes/mympd | 1 + config/kernel/kernel.config.aarch64-ipfire | 6 ++--- config/kernel/kernel.config.riscv64-ipfire | 4 +-- config/kernel/kernel.config.x86_64-ipfire | 2 +- config/rootfiles/common/aarch64/linux | 2 ++ config/rootfiles/packages/mympd | 18 +++++++++++++ lfs/linux | 4 +-- lfs/mpfire | 2 +- lfs/{soxr => mympd} | 37 +++++++++++++++++++------- make.sh | 1 + src/initscripts/packages/{qemu-ga => mympd} | 17 ++++++------ src/paks/mpfire/uninstall.sh | 2 +- src/paks/{fetchmail => mympd}/install.sh | 14 +++++----- src/paks/{igmpproxy => mympd}/uninstall.sh | 5 ++-- src/paks/{amazon-ssm-agent => mympd}/update.sh | 2 +- 15 files changed, 79 insertions(+), 38 deletions(-) create mode 100644 config/backup/includes/mympd create mode 100644 config/rootfiles/packages/mympd copy lfs/{soxr => mympd} (75%) copy src/initscripts/packages/{qemu-ga => mympd} (84%) copy src/paks/{fetchmail => mympd}/install.sh (84%) copy src/paks/{igmpproxy => mympd}/uninstall.sh (93%) copy src/paks/{amazon-ssm-agent => mympd}/update.sh (96%)
Difference in files: diff --git a/config/backup/includes/mympd b/config/backup/includes/mympd new file mode 100644 index 000000000..44481decc --- /dev/null +++ b/config/backup/includes/mympd @@ -0,0 +1 @@ +/var/lib/mympd diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire index 411e95be9..04d65d6ce 100644 --- a/config/kernel/kernel.config.aarch64-ipfire +++ b/config/kernel/kernel.config.aarch64-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.6.13-ipfire Kernel Configuration +# Linux/arm64 6.6.15-ipfire Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y @@ -378,7 +378,9 @@ CONFIG_ARM64_ERRATUM_2067961=y CONFIG_ARM64_ERRATUM_2441009=y CONFIG_ARM64_ERRATUM_2457168=y CONFIG_ARM64_ERRATUM_2645198=y +CONFIG_ARM64_WORKAROUND_SPECULATIVE_UNPRIV_LOAD=y CONFIG_ARM64_ERRATUM_2966298=y +CONFIG_ARM64_ERRATUM_3117295=y CONFIG_CAVIUM_ERRATUM_22375=y CONFIG_CAVIUM_ERRATUM_23154=y CONFIG_CAVIUM_ERRATUM_27456=y @@ -6859,8 +6861,6 @@ CONFIG_MMC_CQHCI=m CONFIG_MMC_BCM2835=y # CONFIG_MMC_MTK is not set # CONFIG_MMC_SDHCI_XENON is not set -# CONFIG_MMC_SDHCI_OMAP is not set -# CONFIG_MMC_SDHCI_AM654 is not set # CONFIG_SCSI_UFSHCD is not set # CONFIG_MEMSTICK is not set CONFIG_NEW_LEDS=y diff --git a/config/kernel/kernel.config.riscv64-ipfire b/config/kernel/kernel.config.riscv64-ipfire index 620854021..52a7c1c45 100644 --- a/config/kernel/kernel.config.riscv64-ipfire +++ b/config/kernel/kernel.config.riscv64-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/riscv 6.6.13-ipfire Kernel Configuration +# Linux/riscv 6.6.15-ipfire Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y @@ -5820,8 +5820,6 @@ CONFIG_MMC_CQHCI=m # CONFIG_MMC_TOSHIBA_PCI is not set # CONFIG_MMC_MTK is not set CONFIG_MMC_SDHCI_XENON=m -# CONFIG_MMC_SDHCI_OMAP is not set -# CONFIG_MMC_SDHCI_AM654 is not set CONFIG_SCSI_UFSHCD=m CONFIG_SCSI_UFS_BSG=y CONFIG_SCSI_UFS_CRYPTO=y diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire index 96da4cdb7..79375e954 100644 --- a/config/kernel/kernel.config.x86_64-ipfire +++ b/config/kernel/kernel.config.x86_64-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.6.13-ipfire Kernel Configuration +# Linux/x86 6.6.15-ipfire Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y diff --git a/config/rootfiles/common/aarch64/linux b/config/rootfiles/common/aarch64/linux index a32c3770e..92c4a4286 100644 --- a/config/rootfiles/common/aarch64/linux +++ b/config/rootfiles/common/aarch64/linux @@ -7263,6 +7263,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/ARM64_ERRATUM_2645198 #lib/modules/KVER-ipfire/build/include/config/ARM64_ERRATUM_2658417 #lib/modules/KVER-ipfire/build/include/config/ARM64_ERRATUM_2966298 +#lib/modules/KVER-ipfire/build/include/config/ARM64_ERRATUM_3117295 #lib/modules/KVER-ipfire/build/include/config/ARM64_ERRATUM_819472 #lib/modules/KVER-ipfire/build/include/config/ARM64_ERRATUM_824069 #lib/modules/KVER-ipfire/build/include/config/ARM64_ERRATUM_826319 @@ -7294,6 +7295,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/ARM64_WORKAROUND_CLEAN_CACHE #lib/modules/KVER-ipfire/build/include/config/ARM64_WORKAROUND_REPEAT_TLBI #lib/modules/KVER-ipfire/build/include/config/ARM64_WORKAROUND_SPECULATIVE_AT +#lib/modules/KVER-ipfire/build/include/config/ARM64_WORKAROUND_SPECULATIVE_UNPRIV_LOAD #lib/modules/KVER-ipfire/build/include/config/ARM64_WORKAROUND_TSB_FLUSH_FAILURE #lib/modules/KVER-ipfire/build/include/config/ARMADA_37XX_CLK #lib/modules/KVER-ipfire/build/include/config/ARMADA_37XX_WATCHDOG diff --git a/config/rootfiles/packages/mympd b/config/rootfiles/packages/mympd new file mode 100644 index 000000000..bc9912b85 --- /dev/null +++ b/config/rootfiles/packages/mympd @@ -0,0 +1,18 @@ +etc/rc.d/init.d/mympd +usr/bin/mympd +usr/bin/mympd-script +#usr/lib/systemd/system/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-script.1.gz +#usr/share/man/man1/mympd.1.gz +var/ipfire/backup/addons/includes/mympd +var/lib/mympd +#var/lib/mympd/config +#var/lib/mympd/config/http +#var/lib/mympd/config/ssl_port +#var/lib/mympd/state +#var/lib/mympd/state/music_directory diff --git a/lfs/linux b/lfs/linux index 023f48a4b..efd3e8533 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,7 +24,7 @@
include Config
-VER = 6.6.13 +VER = 6.6.15
THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -72,7 +72,7 @@ objects = \
$(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 1d644e48fa4fd3740712130b0d5756b75d70471cda2a7206083434ec89d288bd7487e633c8954ec038e3784d56d7a787e6cab1c93e5fbfcfc0b44a7b55b0debd +$(DL_FILE)_BLAKE2 = a630bc7b2463bdc312f8936210a54e92bbe4136fc78995c18d0ccafbcdb27cce5b7b0d4a6ba10c378e14e86855ee7e76e355acc0580f7441e4df64e7dbd8a4b7
install : $(TARGET)
diff --git a/lfs/mpfire b/lfs/mpfire index f45b02902..590cf31ef 100644 --- a/lfs/mpfire +++ b/lfs/mpfire @@ -32,7 +32,7 @@ THISAPP = mpfire-$(VER) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = mpfire -PAK_VER = 15 +PAK_VER = 16
DEPS = mpd mpc
diff --git a/lfs/mympd b/lfs/mympd new file mode 100644 index 000000000..ffedcdcce --- /dev/null +++ b/lfs/mympd @@ -0,0 +1,107 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2024 IPFire Team info@ipfire.org # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see http://www.gnu.org/licenses/. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +SUMMARY = Webfrontend for Music Player Daemon + +VER = 13.0.6 + +THISAPP = myMPD-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = mympd +PAK_VER = 1 + +# TODO move mpd initskript and config to mpd package to run without mpfire +DEPS = mpd libmpdclient mpfire + +SERVICES = mympd + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_BLAKE2 = 2ecd8d42b9398e85fc6c149c9e55f760f2039434039d558ac1914b447858a59676ed9300bc89b2a25757b8d9828dec5934376d4587f6b84026d07adbfd2e4a33 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +b2 : $(subst %,%_BLAKE2,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, b2sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_BLAKE2,$(objects)) : + @$(B2SUM) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && mkdir -p build + cd $(DIR_APP)/build && cmake -Wno-dev \ + -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release .. + cd $(DIR_APP)/build && make $(MAKETUNING) + cd $(DIR_APP)/build && make install + + #generate config + mkdir -p /var/lib/mympd/config + echo false > /var/lib/mympd/config/http + echo 8800 > /var/lib/mympd/config/ssl_port + mkdir -p /var/lib/mympd/state + echo /var/mp3 > /var/lib/mympd/state/music_directory + chown nobody:nobody -R /var/lib/mympd + + #install backup include + install -v -m 644 $(DIR_SRC)/config/backup/includes/mympd \ + /var/ipfire/backup/addons/includes/mympd + + #install initscript + $(call INSTALL_INITSCRIPTS,$(SERVICES)) + + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 06e09c9a3..f13d283bc 100755 --- a/make.sh +++ b/make.sh @@ -1699,6 +1699,7 @@ buildipfire() { lfsmake2 perl-MIME-Base32 lfsmake2 perl-URI-Encode lfsmake2 rsnapshot + lfsmake2 mympd
# Kernelbuild ... current we have no platform that need # multi kernel builds so KCFG is empty diff --git a/src/initscripts/packages/mympd b/src/initscripts/packages/mympd new file mode 100644 index 000000000..a7cb9e523 --- /dev/null +++ b/src/initscripts/packages/mympd @@ -0,0 +1,53 @@ +#!/bin/sh +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2024 IPFire Team info@ipfire.org # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see http://www.gnu.org/licenses/. # +# # +############################################################################### + +. /etc/sysconfig/rc +. $rc_functions + +case "$1" in + start) + + boot_mesg "Starting mympd..." + loadproc /usr/bin/mympd -u nobody -s >/dev/null 2>&1 & + evaluate_retval + ;; + + stop) + boot_mesg "Stopping mympd..." + killproc /usr/bin/mympd >/dev/null 2>&1 + evaluate_retval + ;; + + restart) + $0 stop + sleep 3 + $0 start + ;; + + status) + statusproc /usr/bin/mympd + ;; + + *) + echo "Usage: $0 {start|stop|restart|status}" + exit 1 + ;; +esac diff --git a/src/paks/mpfire/uninstall.sh b/src/paks/mpfire/uninstall.sh index e729cb1ff..7dec707ee 100644 --- a/src/paks/mpfire/uninstall.sh +++ b/src/paks/mpfire/uninstall.sh @@ -25,4 +25,4 @@ /etc/init.d/mpd stop make_backup ${NAME} remove_files -rm -f /etc/rc.d/rc*.d/*mpd /var/log/mpd.error.log /var/log/mpd.log /etc/mpd.conf +rm -f /etc/rc.d/rc*.d/???mpd /var/log/mpd.error.log /var/log/mpd.log /etc/mpd.conf diff --git a/src/paks/mympd/install.sh b/src/paks/mympd/install.sh new file mode 100644 index 000000000..529f415e6 --- /dev/null +++ b/src/paks/mympd/install.sh @@ -0,0 +1,33 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007-2024 IPFire-Team info@ipfire.org. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +extract_files +ln -svf /etc/init.d/mympd /etc/rc.d/rc3.d/S66mympd +ln -svf /etc/init.d/mympd /etc/rc.d/rc0.d/K34mympd +ln -svf /etc/init.d/mympd /etc/rc.d/rc6.d/K34mympd +restore_backup ${NAME} +# create/check config +/usr/bin/mympd -u nobody -c +# start service +/etc/init.d/mympd start diff --git a/src/paks/mympd/uninstall.sh b/src/paks/mympd/uninstall.sh new file mode 100644 index 000000000..8ca9ea74e --- /dev/null +++ b/src/paks/mympd/uninstall.sh @@ -0,0 +1,28 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007-2024 IPFire-Team info@ipfire.org. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/etc/init.d/mpd stop +make_backup ${NAME} +remove_files +rm -f /etc/rc.d/rc*.d/???mympd diff --git a/src/paks/mympd/update.sh b/src/paks/mympd/update.sh new file mode 100644 index 000000000..31d1d77cc --- /dev/null +++ b/src/paks/mympd/update.sh @@ -0,0 +1,27 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007-2024 IPFire-Team info@ipfire.org. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +extract_backup_includes +./uninstall.sh +./install.sh
hooks/post-receive -- IPFire 2.x development tree