IPFire-SCM January 2025

ipfire-scm@lists.ipfire.org

1 participants
43 discussions

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 0ba187b4d391d02e3016cc44f313320e6481198b
by Arne Fitzenreiter 08 Jan '25

08 Jan '25

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 0ba187b4d391d02e3016cc44f313320e6481198b (commit) via 47b66afb31a82e239c94c18c9326294669df02ef (commit) via 275533dce4e4a8c35f73b665fab6787f64eeceda (commit) via b57bafa358ae77a3d4ac7e721b034ea21d3059a2 (commit) via 699abe572f8f4a56191d73d68ef1034b1174b576 (commit) from e3b5000b8318591a239125560b9e5fa101a3802e (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 0ba187b4d391d02e3016cc44f313320e6481198b Merge: 47b66afb31 b57bafa358 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Jan 8 06:33:35 2025 +0100 Merge remote-tracking branch 'origin/core190' commit 47b66afb31a82e239c94c18c9326294669df02ef Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Jan 8 06:32:52 2025 +0100 core191: reship squid and dhcpcd Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 275533dce4e4a8c35f73b665fab6787f64eeceda Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Jan 8 06:27:52 2025 +0100 core191: ship iplockslist/sources and inuitscript/functions Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: .../{oldcore/125 => core/191}/filelists/dhcpcd | 0 config/rootfiles/core/191/filelists/files | 2 + .../{oldcore/100 => core/191}/filelists/squid | 0 config/rootfiles/core/191/update.sh | 2 + config/rootfiles/packages/miniupnpc | 19 ----- lfs/miniupnpc | 87 ---------------------- lfs/transmission | 9 +-- make.sh | 1 - 8 files changed, 8 insertions(+), 112 deletions(-) copy config/rootfiles/{oldcore/125 => core/191}/filelists/dhcpcd (100%) copy config/rootfiles/{oldcore/100 => core/191}/filelists/squid (100%) delete mode 100644 config/rootfiles/packages/miniupnpc delete mode 100644 lfs/miniupnpc Difference in files: diff --git a/config/rootfiles/core/191/filelists/dhcpcd b/config/rootfiles/core/191/filelists/dhcpcd new file mode 120000 index 000000000..1e799dabb --- /dev/null +++ b/config/rootfiles/core/191/filelists/dhcpcd @@ -0,0 +1 @@ +../../../common/dhcpcd \ No newline at end of file diff --git a/config/rootfiles/core/191/filelists/files b/config/rootfiles/core/191/filelists/files index 0f03b7358..c1ac86999 100644 --- a/config/rootfiles/core/191/filelists/files +++ b/config/rootfiles/core/191/filelists/files @@ -1,5 +1,7 @@ +etc/rc.d/init.d/functions srv/web/ipfire/cgi-bin/connections.cgi srv/web/ipfire/cgi-bin/dnsforward.cgi srv/web/ipfire/cgi-bin/services.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi var/ipfire/backup/bin/backup.pl +var/ipfire/ipblocklist/sources diff --git a/config/rootfiles/core/191/filelists/squid b/config/rootfiles/core/191/filelists/squid new file mode 120000 index 000000000..2dc8372a0 --- /dev/null +++ b/config/rootfiles/core/191/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/core/191/update.sh b/config/rootfiles/core/191/update.sh index 85c9738f7..b496e932b 100644 --- a/config/rootfiles/core/191/update.sh +++ b/config/rootfiles/core/191/update.sh @@ -32,6 +32,7 @@ for (( i=1; i<=$core; i++ )); do done # Stop services +/etci/init.d/squid stop # Extract files extract_files @@ -77,6 +78,7 @@ telinit u /etc/init.d/sshd restart /etc/init.d/unbound restart /etc/init.d/suricata restart +/etc/init.d/squid start # This update needs a reboot... touch /var/run/need_reboot diff --git a/config/rootfiles/packages/miniupnpc b/config/rootfiles/packages/miniupnpc deleted file mode 100644 index deee07ed4..000000000 --- a/config/rootfiles/packages/miniupnpc +++ /dev/null @@ -1,19 +0,0 @@ -usr/bin/external-ip -usr/bin/upnp-listdevices -usr/bin/upnpc -#usr/include/miniupnpc -#usr/include/miniupnpc/igd_desc_parse.h -#usr/include/miniupnpc/miniupnpc.h -#usr/include/miniupnpc/miniupnpc_declspec.h -#usr/include/miniupnpc/miniupnpctypes.h -#usr/include/miniupnpc/miniwget.h -#usr/include/miniupnpc/portlistingparse.h -#usr/include/miniupnpc/upnpcommands.h -#usr/include/miniupnpc/upnpdev.h -#usr/include/miniupnpc/upnperrors.h -#usr/include/miniupnpc/upnpreplyparse.h -#usr/lib/libminiupnpc.a -#usr/lib/libminiupnpc.so -usr/lib/libminiupnpc.so.18 -#usr/lib/pkgconfig/miniupnpc.pc -#usr/share/man/man3/miniupnpc.3.gz diff --git a/lfs/miniupnpc b/lfs/miniupnpc deleted file mode 100644 index ae6f0947e..000000000 --- a/lfs/miniupnpc +++ /dev/null @@ -1,87 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2024 IPFire Team <info(a)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 = mini uPNP client (needed for transmission) - -VER = 2.2.8 - -THISAPP = miniupnpc-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = miniupnpc -PAK_VER = 1 - -DEPS = - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_BLAKE2 = eae4d97bdf8c494ea6744edfeb870f9d92df8468d23f974e0e44e735fc7c8925189ea58f60a71c37315aebff1269ae69e9413cdf80dc292c4b90df5f12bf58a4 - -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) && make - cd $(DIR_APP) && python3 setup.py build - cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD) - diff --git a/lfs/transmission b/lfs/transmission index 49e024a13..c95c8b373 100644 --- a/lfs/transmission +++ b/lfs/transmission @@ -26,7 +26,7 @@ include Config SUMMARY = A BitTorrent client with multiple UIs -VER = 4.0.6 +VER = 4.0.5 THISAPP = transmission-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -34,9 +34,9 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = transmission -PAK_VER = 24 +PAK_VER = 25 -DEPS = miniupnpc +DEPS = SERVICES = transmission @@ -48,7 +48,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 3eb1d851322299cb1b79c799f431c09db5aee1be0372fa2877e16508ca6f9e78ea42ed75520ab29a3325e62efcfca63a83559db73c39c981c9e2eddb403ef65a +$(DL_FILE)_BLAKE2 = 60caa3bc615137b225d3ac3f25daa352c6960fcc848c91e5ea45488ae109d93b53e314e4683bd7c4ef3f9b2f364d796b6c5bb014ca647d3f44fb5c9df9f8c997 install : $(TARGET) @@ -81,7 +81,6 @@ $(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 -i $(DIR_SRC)/src/patches/transmission-4.0.6-fix_for_miniupnpc-2.2.8.patch cd $(DIR_APP) && cmake . \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/make.sh b/make.sh index 0a21b9489..7b7a2b9cf 100755 --- a/make.sh +++ b/make.sh @@ -1986,7 +1986,6 @@ build_system() { lfsmake2 aws-cli lfsmake2 oci-python-sdk lfsmake2 oci-cli - lfsmake2 miniupnpc lfsmake2 transmission lfsmake2 mtr lfsmake2 minidlna hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, core190, updated. b57bafa358ae77a3d4ac7e721b034ea21d3059a2
by Michael Tremer 07 Jan '25

07 Jan '25

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, core190 has been updated via b57bafa358ae77a3d4ac7e721b034ea21d3059a2 (commit) via 699abe572f8f4a56191d73d68ef1034b1174b576 (commit) from c6febcc99646c39aeb2989ffd6fe43b5c876ca65 (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 b57bafa358ae77a3d4ac7e721b034ea21d3059a2 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Thu Jan 2 17:29:26 2025 +0100 miniupnpc: revert the addition of this package due to transmission reversion - As transmission has been reverted back to version 4.0.5 then miniupnpc is no longer needed for building or runtime. - This removes the minupnpc lfs and rootfile files. It also removes miniupnpc from the make.sh file. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 699abe572f8f4a56191d73d68ef1034b1174b576 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Thu Jan 2 17:29:25 2025 +0100 transmission: revert version back to 4.0.5 - Revert back from 4.0.6 to 4.0.5 due to a bug in 4.0.6 that has resulted in a variety of torrent mirrors banning transmission-4.0.6 - The update from 4.0.5 to 4.0.6 did not have any security fixes in it so there is no issue in moving backward to 4.0.5 - A fix has been created but it is unclear when (and if) version 4.0.7 will be released. The fix has also been included in version 4.1.0 but this is still in beta development form. - Version 4.0.6 required minupnpc for building and run time. This reversion is also removing miniupnpc in an associated patch in this patch set. - No change required in the rootfile. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/miniupnpc | 19 -------- lfs/miniupnpc | 87 ------------------------------------- lfs/transmission | 9 ++-- make.sh | 1 - 4 files changed, 4 insertions(+), 112 deletions(-) delete mode 100644 config/rootfiles/packages/miniupnpc delete mode 100644 lfs/miniupnpc Difference in files: diff --git a/config/rootfiles/packages/miniupnpc b/config/rootfiles/packages/miniupnpc deleted file mode 100644 index deee07ed4..000000000 --- a/config/rootfiles/packages/miniupnpc +++ /dev/null @@ -1,19 +0,0 @@ -usr/bin/external-ip -usr/bin/upnp-listdevices -usr/bin/upnpc -#usr/include/miniupnpc -#usr/include/miniupnpc/igd_desc_parse.h -#usr/include/miniupnpc/miniupnpc.h -#usr/include/miniupnpc/miniupnpc_declspec.h -#usr/include/miniupnpc/miniupnpctypes.h -#usr/include/miniupnpc/miniwget.h -#usr/include/miniupnpc/portlistingparse.h -#usr/include/miniupnpc/upnpcommands.h -#usr/include/miniupnpc/upnpdev.h -#usr/include/miniupnpc/upnperrors.h -#usr/include/miniupnpc/upnpreplyparse.h -#usr/lib/libminiupnpc.a -#usr/lib/libminiupnpc.so -usr/lib/libminiupnpc.so.18 -#usr/lib/pkgconfig/miniupnpc.pc -#usr/share/man/man3/miniupnpc.3.gz diff --git a/lfs/miniupnpc b/lfs/miniupnpc deleted file mode 100644 index ae6f0947e..000000000 --- a/lfs/miniupnpc +++ /dev/null @@ -1,87 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2024 IPFire Team <info(a)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 = mini uPNP client (needed for transmission) - -VER = 2.2.8 - -THISAPP = miniupnpc-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = miniupnpc -PAK_VER = 1 - -DEPS = - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_BLAKE2 = eae4d97bdf8c494ea6744edfeb870f9d92df8468d23f974e0e44e735fc7c8925189ea58f60a71c37315aebff1269ae69e9413cdf80dc292c4b90df5f12bf58a4 - -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) && make - cd $(DIR_APP) && python3 setup.py build - cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD) - diff --git a/lfs/transmission b/lfs/transmission index 49e024a13..c95c8b373 100644 --- a/lfs/transmission +++ b/lfs/transmission @@ -26,7 +26,7 @@ include Config SUMMARY = A BitTorrent client with multiple UIs -VER = 4.0.6 +VER = 4.0.5 THISAPP = transmission-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -34,9 +34,9 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = transmission -PAK_VER = 24 +PAK_VER = 25 -DEPS = miniupnpc +DEPS = SERVICES = transmission @@ -48,7 +48,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 3eb1d851322299cb1b79c799f431c09db5aee1be0372fa2877e16508ca6f9e78ea42ed75520ab29a3325e62efcfca63a83559db73c39c981c9e2eddb403ef65a +$(DL_FILE)_BLAKE2 = 60caa3bc615137b225d3ac3f25daa352c6960fcc848c91e5ea45488ae109d93b53e314e4683bd7c4ef3f9b2f364d796b6c5bb014ca647d3f44fb5c9df9f8c997 install : $(TARGET) @@ -81,7 +81,6 @@ $(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 -i $(DIR_SRC)/src/patches/transmission-4.0.6-fix_for_miniupnpc-2.2.8.patch cd $(DIR_APP) && cmake . \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/make.sh b/make.sh index 35a602f62..f12fe8da6 100755 --- a/make.sh +++ b/make.sh @@ -1983,7 +1983,6 @@ build_system() { lfsmake2 aws-cli lfsmake2 oci-python-sdk lfsmake2 oci-cli - lfsmake2 miniupnpc lfsmake2 transmission lfsmake2 mtr lfsmake2 minidlna hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 21d037bcea6bb2a8cdcb7ec92889aaafd5b074be
by Michael Tremer 06 Jan '25

06 Jan '25

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 3.x development tree". The branch, master has been updated via 21d037bcea6bb2a8cdcb7ec92889aaafd5b074be (commit) via a6b52073408418257211a35c92f109eba03491bb (commit) via 19f36c037e1d197e6e88d656fdd2ec3fa046d74e (commit) via 9b899ee01cc0bb6f109ebdde8d8943f2af077831 (commit) via 33b87d931be1484fd75037c0035136568f948a2d (commit) from c7cd601dacbf126856295e966fffc2b8520a46b7 (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 21d037bcea6bb2a8cdcb7ec92889aaafd5b074be Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jan 6 22:42:59 2025 +0000 wget: Update to 1.25.0 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit a6b52073408418257211a35c92f109eba03491bb Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jan 6 22:35:16 2025 +0000 libpsl: New package Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 19f36c037e1d197e6e88d656fdd2ec3fa046d74e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jan 6 22:34:29 2025 +0000 valgrind: New package For debugging shit. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 9b899ee01cc0bb6f109ebdde8d8943f2af077831 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Dec 31 14:12:31 2024 +0000 dwz: Remove package We don't plan to use this any more Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 33b87d931be1484fd75037c0035136568f948a2d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Dec 31 14:11:51 2024 +0000 beep: Update to 1.4.12 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: beep/beep.nm | 39 +++++++++++++++---------------- dwz/dwz.nm | 66 ---------------------------------------------------- libpsl/libpsl.nm | 57 +++++++++++++++++++++++++++++++++++++++++++++ valgrind/valgrind.nm | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++ wget/wget.nm | 4 ++-- 5 files changed, 144 insertions(+), 88 deletions(-) delete mode 100644 dwz/dwz.nm create mode 100644 libpsl/libpsl.nm create mode 100644 valgrind/valgrind.nm Difference in files: diff --git a/beep/beep.nm b/beep/beep.nm index 4bd39c0c3..c18cea963 100644 --- a/beep/beep.nm +++ b/beep/beep.nm @@ -4,37 +4,36 @@ ############################################################################### name = beep -version = 1.3 -release = 2 +version = 1.4.12 +release = 1 groups = Applications/System -url = http://www.johnath.com/beep/ +url = https://github.com/spkr-beep/beep license = GPLv2+ summary = Beep the PC speaker any number of ways. description - Beep allows the user to control the PC speaker with precision, \ - allowing different sounds to indicate different events. While it \ - can be run quite happily on the commandline, it's intended place \ - of residence is within shell/perl scripts, notifying the user when \ - something interesting occurs. Of course, it has no notion of \ + Beep allows the user to control the PC speaker with precision, + allowing different sounds to indicate different events. While it + can be run quite happily on the commandline, it's intended place + of residence is within shell/perl scripts, notifying the user when + something interesting occurs. Of course, it has no notion of what's interesting, but it's real good at that notifying part. end -source_dl = http://www.johnath.com/beep/ -tarball = %{thisapp}.tar.gz +source_dl = https://github.com/spkr-beep/beep/archive/refs/tags/v%{version}.tar.gz#/ build - build - make FLAGS="%{CFLAGS} %{LDFLAGS}" %{PARALLELISMFLAGS} - end - - install - mkdir -pv %{BUILDROOT}/usr/bin - mkdir -pv %{BUILDROOT}/usr/share/man/man1 - - install -m 0755 beep %{BUILDROOT}/usr/bin - cp beep.1.gz %{BUILDROOT}/usr/share/man/man1 + prepare_cmds + ( + echo "CC = %{CC}" + echo "CPPFLAGS = %{CPPFLAGS}" + echo "CFLAGS = %{CFLAGS}" + echo "LDFLAGS = %{LDFLAGS}" + echo "prefix = %{prefix}" + echo "bindir = %{bindir}" + echo "mandir = %{mandir}" + ) > local.mk end end diff --git a/dwz/dwz.nm b/dwz/dwz.nm deleted file mode 100644 index 8b63a64fc..000000000 --- a/dwz/dwz.nm +++ /dev/null @@ -1,66 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # -############################################################################### - -name = dwz -version = 0.15 -release = 1 - -groups = Development/Tools -url = https://sourceware.org/dwz/ -license = GPLv2+ and GPLv3+ -summary = DWARF optimization and duplicate removal tool - -description - The dwz package contains a program that attempts to optimize DWARF - debugging information contained in ELF shared libraries and ELF executables - for size, by replacing DWARF information representation with equivalent - smaller representation where possible and by reducing the amount of - duplication using techniques from DWARF standard appendix E - creating - DW_TAG_partial_unit compilation units (CUs) for duplicated information - and using DW_TAG_imported_unit to import it into each CU that needs it. -end - -source_dl = https://sourceware.org/ftp/dwz/releases/ -sources = %{thisapp}.tar.xz - -build - requires - elfutils-devel - xxhash-devel - - # Testsuite - dejagnu - gdb - end - - DIR_APP = %{DIR_SRC}/%{name} - - make_build_targets += \ - CFLAGS="%{CFLAGS}" \ - LDFLAGS="%{LDFLAGS}" \ - srcdir=%{DIR_APP} \ - prefix=%{prefix} \ - bindir=%{bindir} \ - mandir=%{mandir} - - test - # Compile the testsuite without any compiler or linker flags. - CFLAGS= LDFLAGS= srcdir=%{DIR_APP} make check - end - - make_install_targets += \ - srcdir=%{DIR_APP} \ - prefix=%{prefix} \ - bindir=%{bindir} \ - mandir=%{mandir} -end - -packages - package %{name} - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/libpsl/libpsl.nm b/libpsl/libpsl.nm new file mode 100644 index 000000000..7bbf46bff --- /dev/null +++ b/libpsl/libpsl.nm @@ -0,0 +1,57 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +name = libpsl +version = 0.21.5 +release = 1 + +groups = Application/Internet +url = https://rockdaboot.github.io/libpsl/ +license = MIT +summary = C library for the Public Suffix List + +description + A Public Suffix List is a collection of Top Level Domains (TLDs) + suffixes. TLDs include Global Top Level Domains (gTLDs) like .com + and .net; Country Top Level Domains (ccTLDs) like .de and .cn; and + Brand Top Level Domains like .apple and .google. Brand TLDs allows + users to register their own top level domain that exist at the same + level as ICANN's gTLDs. +end + +source_dl = https://github.com/rockdaboot/libpsl/releases/download/%{version}/ + +build + requires + libidn2-devel + libunistring-devel + end + + # Fix Python path + prepare_cmds + sed -e "s/env python/&3/" -i src/psl-make-dafsa + end + + configure_options += \ + --enable-builtin=libidn2 \ + --enable-runtime=libidn2 \ + --disable-static + + test + LD_LIBRARY_PATH=$(pwd)/src/.libs make check + end +end + +packages + package %{name} + + package %{name}-devel + template DEVEL + end + + package %{name}-debuginfo + template DEBUGINFO + end +end diff --git a/valgrind/valgrind.nm b/valgrind/valgrind.nm new file mode 100644 index 000000000..c9730761f --- /dev/null +++ b/valgrind/valgrind.nm @@ -0,0 +1,66 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +name = valgrind +version = 3.24.0 +release = 1 + +groups = Development/Debuggers +url = https://valgrind.org/ +license = GPL +summary = Tool to help find memory-management problems in programs + +description + Valgrind is an instrumentation framework for building dynamic analysis + tools. There are Valgrind tools that can automatically detect many + memory management and threading bugs, and profile your programs in + detail. You can also use Valgrind to build new tools. +end + +source_dl = https://sourceware.org/pub/valgrind/ +sources = %{thisapp}.tar.bz2 + +build + requires + autoconf + automake + docbook-dsssl + docbook-xsl + docbook-utils + gdb + perl + end + + # valgrind cannot be compiled with stack protection enabled as it + # implements its own functions. + CFLAGS += -fno-stack-protector + + # The linker fails to find memcpy without this flag + LTO_CFLAGS = + + prepare_cmds + ./autogen.sh + end + + configure += \ + --enable-only64bit \ + --enable-lto=yes + + test + make check + end +end + +packages + package %{name} + + package %{name}-devel + template DEVEL + end + + package %{name}-debuginfo + template DEBUGINFO + end +end diff --git a/wget/wget.nm b/wget/wget.nm index f268ce0eb..7264d09ac 100644 --- a/wget/wget.nm +++ b/wget/wget.nm @@ -4,11 +4,11 @@ ############################################################################### name = wget -version = 1.21.4 +version = 1.25.0 release = 1 groups = Applications/Internet -url = http://www.gnu.org/software/wget/ +url = https://www.gnu.org/software/wget/ license = GPLv3+ summary = Commandline tool to download files. hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. b9dd3e205bca7b7d1cedc38b44ff72be346a4998
by Arne Fitzenreiter 05 Jan '25

05 Jan '25

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, next has been updated via b9dd3e205bca7b7d1cedc38b44ff72be346a4998 (commit) from 7c7868104c03efca79b88dcbb381a2e5f0a38110 (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 b9dd3e205bca7b7d1cedc38b44ff72be346a4998 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Jan 5 19:59:27 2025 +0100 u-boot: update rootfile Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/aarch64/u-boot | 2 ++ 1 file changed, 2 insertions(+) Difference in files: diff --git a/config/rootfiles/common/aarch64/u-boot b/config/rootfiles/common/aarch64/u-boot index 241b19d3d..277ada68d 100644 --- a/config/rootfiles/common/aarch64/u-boot +++ b/config/rootfiles/common/aarch64/u-boot @@ -13,6 +13,8 @@ usr/share/u-boot/nanopi_r2c/u-boot-rockchip.bin usr/share/u-boot/nanopi_r2s/u-boot-rockchip.bin #usr/share/u-boot/nanopi_r4s usr/share/u-boot/nanopi_r4s/u-boot-rockchip.bin +#usr/share/u-boot/orangepi_pc2 +usr/share/u-boot/orangepi_pc2/u-boot-sunxi-with-spl.bin #usr/share/u-boot/orangepi_r1_plus_lts usr/share/u-boot/orangepi_r1_plus_lts/u-boot-rockchip.bin #usr/share/u-boot/orangepi_zero_plus hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 7c7868104c03efca79b88dcbb381a2e5f0a38110
by Arne Fitzenreiter 05 Jan '25

05 Jan '25

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, next has been updated via 7c7868104c03efca79b88dcbb381a2e5f0a38110 (commit) from 2e1528a90095ad8f0421d631f75844a7ad26e04c (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 7c7868104c03efca79b88dcbb381a2e5f0a38110 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Jan 5 18:00:14 2025 +0100 kernel: update to 6.12.8 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/kernel/kernel.config.aarch64-ipfire | 2 +- config/kernel/kernel.config.x86_64-ipfire | 2 +- lfs/linux | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) Difference in files: diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire index b1e19d4b7..43fa47eb4 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.12.7 Kernel Configuration +# Linux/arm64 6.12.8 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 14.2.0" CONFIG_CC_IS_GCC=y diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire index ac40e91f3..3a9767fde 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.12.6 Kernel Configuration +# Linux/x86 6.12.8 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 14.2.0" CONFIG_CC_IS_GCC=y diff --git a/lfs/linux b/lfs/linux index 5cd9def82..c081e89bf 100644 --- a/lfs/linux +++ b/lfs/linux @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2024 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2025 IPFire Team <info(a)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 # @@ -24,7 +24,7 @@ include Config -VER = 6.12.7 +VER = 6.12.8 THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -69,7 +69,7 @@ objects = \ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = ddf10abdcc50c077495050bd695b1e6f2547955c8f6a07a689e38a35c205ccc97849a1270be844eb30d07f396eb9af2f3ea8b4ad0c383711785456cc910d4554 +$(DL_FILE)_BLAKE2 = 62a3f435bbe7d24bea361f2545ba50f8b36030a98bd28d0979b86052d8af34dc7a4c27f7ca2890daba5e5bb51f5848e6b21cd5df4dbbd19919867bf67d38790d install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 2e1528a90095ad8f0421d631f75844a7ad26e04c
by Arne Fitzenreiter 05 Jan '25

05 Jan '25

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, next has been updated via 2e1528a90095ad8f0421d631f75844a7ad26e04c (commit) from 15667b3394ff07a9970f0c7ea76f27f08b5d1323 (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 2e1528a90095ad8f0421d631f75844a7ad26e04c Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Jan 5 14:14:19 2025 +0000 u-boot: add support for OrangePi PC 2 this board can also boot with the OrangePi Zero+ u-boot but then it not support video out. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/u-boot/boot.cmd | 6 +++++- config/u-boot/uEnv.txt | 1 - lfs/u-boot | 16 ++++++++++++++++ 3 files changed, 21 insertions(+), 2 deletions(-) Difference in files: diff --git a/config/u-boot/boot.cmd b/config/u-boot/boot.cmd index dc634ca98..929d30862 100644 --- a/config/u-boot/boot.cmd +++ b/config/u-boot/boot.cmd @@ -41,7 +41,11 @@ fi; # for compatiblity reasons set DTBSUNXI if we run on sunxi if test "${board}" = "sunxi"; then - setenv fdtfile ${DTBSUNXI}; + if test ${DTBSUNXI} = ""; then + echo ...; + else + setenv fdtfile ${DTBSUNXI}; + fi; fi; # Check if serial console is enabled diff --git a/config/u-boot/uEnv.txt b/config/u-boot/uEnv.txt index 21780a971..e4d40d1b1 100644 --- a/config/u-boot/uEnv.txt +++ b/config/u-boot/uEnv.txt @@ -1,4 +1,3 @@ KVER=xxxKVERxxx -DTBSUNXI=sun8i-h3-nanopi-r1.dtb root_dev=UUID=xxxROOT-UUIDxxx SERIAL-CONSOLE=ON diff --git a/lfs/u-boot b/lfs/u-boot index d686917b2..d92ab3012 100644 --- a/lfs/u-boot +++ b/lfs/u-boot @@ -127,6 +127,22 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && make distclean cd $(DIR_APP) && rm -f bl31.bin + # OrangePi PC 2 + cd $(DIR_APP) && rm -rf arm-trusted-firmware-$(ATF_VER) + cd $(DIR_APP) && tar axf $(DIR_DL)/arm-trusted-firmware-$(ATF_VER).tar.gz + cd $(DIR_APP)/arm-trusted-firmware-$(ATF_VER) && make PLAT=sun50i_a64 ARCH=aarch64 CROSS_COMPILE="aarch64-pc-linux-gnu-" DEBUG=0 bl31 + cd $(DIR_APP) && cp arm-trusted-firmware-$(ATF_VER)/build/sun50i_a64/release/bl31.bin bl31.bin + cd $(DIR_APP) && rm -rf arm-trusted-firmware-$(ATF_VER) + -mkdir -pv /usr/share/u-boot/orangepi_pc2 + cd $(DIR_APP) && make CROSS_COMPILE="" orangepi_pc2_config + cd $(DIR_APP) && sed -i -e 's!^CONFIG_IDENT_STRING=.*!CONFIG_IDENT_STRING=" OrangePi PC2 - IPFire.org"!' .config + cd $(DIR_APP) && make CROSS_COMPILE="" HOSTCC="gcc $(CFLAGS)" + cd $(DIR_APP) && install -v -m 644 u-boot-sunxi-with-spl.bin \ + /usr/share/u-boot/orangepi_pc2 + cd $(DIR_APP) && make distclean + cd $(DIR_APP) && rm -f bl31.bin + + # distrobootcmd support was removed for rockchip boards. Revert. cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/u-boot/u-boot-2024.10-revert_rockchip_distro_bootcmd_removal.patch hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 15667b3394ff07a9970f0c7ea76f27f08b5d1323
by Arne Fitzenreiter 04 Jan '25

04 Jan '25

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, next has been updated via 15667b3394ff07a9970f0c7ea76f27f08b5d1323 (commit) via 318c037092abe862bdf1cbea0fe5e28fb8278b7d (commit) from f7a575cebb35155372a32bc26e062dac32be9b3d (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 15667b3394ff07a9970f0c7ea76f27f08b5d1323 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jan 4 22:50:40 2025 +0100 u-boot: remove some arm32bit parts from bootscript Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 318c037092abe862bdf1cbea0fe5e28fb8278b7d Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jan 4 22:46:29 2025 +0100 rpi-firmware: update to 20240424 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/aarch64/rpi-firmware | 7 +++++-- config/u-boot/boot.cmd | 17 ++++------------- lfs/rpi-firmware | 6 +++--- 3 files changed, 12 insertions(+), 18 deletions(-) Difference in files: diff --git a/config/rootfiles/common/aarch64/rpi-firmware b/config/rootfiles/common/aarch64/rpi-firmware index 9c5c2fe28..c3eb09db1 100644 --- a/config/rootfiles/common/aarch64/rpi-firmware +++ b/config/rootfiles/common/aarch64/rpi-firmware @@ -1,7 +1,10 @@ #boot/LICENCE.broadcom -boot/bcm2711-rpi-4-b.dtb boot/bcm2711-rpi-400.dtb -boot/bcm2711-rpi-cm4.dtb +boot/bcm2711-rpi-4-b.dtb +boot/bcm2711-rpi-cm4-io.dtb +boot/bcm2837-rpi-3-b.dtb +boot/bcm2837-rpi-3-b-plus.dtb +boot/bcm2837-rpi-cm3-io3.dtb boot/bootcode.bin boot/config.txt boot/fixup.dat diff --git a/config/u-boot/boot.cmd b/config/u-boot/boot.cmd index 61c50d064..dc634ca98 100644 --- a/config/u-boot/boot.cmd +++ b/config/u-boot/boot.cmd @@ -58,16 +58,6 @@ if test "${SERIAL-CONSOLE}" = "ON"; then setenv console ttyAMA0,115200n8; fi; fi; - else - if test "${fdtfile}" = "bcm2837-rpi-3-b-plus.dtb"; then - setenv console ttyS1,115200n8; - else - if test "${fdtfile}" = "bcm2837-rpi-3-b.dtb"; then - setenv console ttyS1,115200n8; - else - setenv console ttyAMA0,115200n8; - fi; - fi; fi; else setenv console ttyS0,115200n8; @@ -80,7 +70,10 @@ else setenv bootargs console=tty1 root=${root_dev} rootwait; fi; -setenv fdt_high ffffffff; +if test ${fdt_high} = ""; then + setenv fdt_high ffffffff; +fi; + fatload ${boot_dev} ${boot_part} ${kernel_addr_r} vmlinuz-${KVER}; fatload ${boot_dev} ${boot_part} ${fdt_addr_r} dtb-${KVER}/${fdtfile}; @@ -99,10 +92,8 @@ else setenv ramdisk_addr -; fi; -bootz ${kernel_addr_r} ${ramdisk_addr} ${fdt_addr_r}; booti ${kernel_addr_r} ${ramdisk_addr} ${fdt_addr_r}; -bootz ${kernel_addr_r} - ${fdt_addr_r}; booti ${kernel_addr_r} - ${fdt_addr_r}; # Recompile with: diff --git a/lfs/rpi-firmware b/lfs/rpi-firmware index 51af49b07..edd8e5d06 100644 --- a/lfs/rpi-firmware +++ b/lfs/rpi-firmware @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2021 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2025 IPFire Team <info(a)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 # @@ -24,7 +24,7 @@ include Config -VER = 20211127 +VER = 20240424 THISAPP = rpi-firmware-$(VER) DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 1395f0d0a43212e9d40bcc17be4ec0625019cebfc4947815caf7cadd42ebf1d2093850f90ed6eca11c3df162fc3f29e6c427c3baf9dcc5229d16ce433886d0d9 +$(DL_FILE)_BLAKE2 = efad1a7686adf12aa43fbeb7c0f2071f242887ed6a392965133a822c6d89a6c806ba256a2df042b72c0aba241cf0ce728b25b45a6bca2292006f1f5dd1948fc3 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. f7a575cebb35155372a32bc26e062dac32be9b3d
by Arne Fitzenreiter 04 Jan '25

04 Jan '25

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, next has been updated via f7a575cebb35155372a32bc26e062dac32be9b3d (commit) via 4f9ffb9f20c739c49dfafe256e9674f4d8262c11 (commit) from bbbe9111da6aaef3b0855bd85867accc5275e20e (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 f7a575cebb35155372a32bc26e062dac32be9b3d Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jan 4 22:31:13 2025 +0100 mympd: update to 19.0.2 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 4f9ffb9f20c739c49dfafe256e9674f4d8262c11 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jan 4 17:30:06 2025 +0100 mympd: fix typo Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/mympd | 1 + lfs/mympd | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) Difference in files: diff --git a/config/rootfiles/packages/mympd b/config/rootfiles/packages/mympd index 3b93618b7..a07ccb3b3 100644 --- a/config/rootfiles/packages/mympd +++ b/config/rootfiles/packages/mympd @@ -17,6 +17,7 @@ var/ipfire/backup/addons/includes/mympd var/lib/mympd #var/lib/mympd/config #var/lib/mympd/config/http +#var/lib/mympd/config/loglevel #var/lib/mympd/config/ssl_port #var/lib/mympd/state #var/lib/mympd/state/music_directory diff --git a/lfs/mympd b/lfs/mympd index 4e9b174b6..81e270fab 100644 --- a/lfs/mympd +++ b/lfs/mympd @@ -26,7 +26,7 @@ include Config SUMMARY = Webfrontend for Music Player Daemon -VER = 19.0.1 +VER = 19.0.2 THISAPP = myMPD-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = mympd -PAK_VER = 9 +PAK_VER = 10 DEPS = mpd libmpdclient @@ -48,7 +48,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 54930a692fd3753a7346e7e2b05c92c49083211cd1d9043ef41dc36b847d92c746ba1d7a1a88dddb2bbbfeb22bcf734f023019ed58ad7f88eb8edd6c83fcd544 +$(DL_FILE)_BLAKE2 = a3f6c5e46b3f69ac8f7d9fee9af4425533604b0de94d18990fdc6e08178191d489b1290496d68f6a975f01e6340a160368e0f5f617c861cc11cdf1d43a1a6435 install : $(TARGET) @@ -95,7 +95,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) mkdir -p /var/lib/mympd/config echo false > /var/lib/mympd/config/http echo 8800 > /var/lib/mympd/config/ssl_port - echo 2 > /var/lib/mympd/config/loglovel + echo 2 > /var/lib/mympd/config/loglevel mkdir -p /var/lib/mympd/state echo /var/mp3 > /var/lib/mympd/state/music_directory chown nobody:nobody -R /var/lib/mympd hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. bbbe9111da6aaef3b0855bd85867accc5275e20e
by Arne Fitzenreiter 04 Jan '25

04 Jan '25

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, next has been updated via bbbe9111da6aaef3b0855bd85867accc5275e20e (commit) via 113750aae50a352a234a72527ed22729c0fb2bcc (commit) from ec6f65d9cc6be9863f39b896b479907f96416c4e (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 bbbe9111da6aaef3b0855bd85867accc5275e20e Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jan 4 09:12:05 2025 +0000 mympd: set loglevel 2 this silence the log to errors only. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 113750aae50a352a234a72527ed22729c0fb2bcc Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jan 4 09:10:04 2025 +0000 u-boot: fix usb boot on rpi4 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/u-boot/boot.cmd | 4 ++++ lfs/mympd | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) Difference in files: diff --git a/config/u-boot/boot.cmd b/config/u-boot/boot.cmd index 5faa3a1ec..61c50d064 100644 --- a/config/u-boot/boot.cmd +++ b/config/u-boot/boot.cmd @@ -7,6 +7,10 @@ if test "${board}" = "ten64"; then bootefi ${kernel_addr_r} ${fdt_addr_r} fi; +if test ${boot_dev} = ""; then + setenv boot_dev ${devtype} +fi; + if test ${boot_dev} = ""; then setenv boot_dev mmc; setenv root_dev /dev/mmcblk0p3; diff --git a/lfs/mympd b/lfs/mympd index 3372af620..4e9b174b6 100644 --- a/lfs/mympd +++ b/lfs/mympd @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2024 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2025 IPFire Team <info(a)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 # @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = mympd -PAK_VER = 8 +PAK_VER = 9 DEPS = mpd libmpdclient @@ -95,6 +95,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) mkdir -p /var/lib/mympd/config echo false > /var/lib/mympd/config/http echo 8800 > /var/lib/mympd/config/ssl_port + echo 2 > /var/lib/mympd/config/loglovel mkdir -p /var/lib/mympd/state echo /var/mp3 > /var/lib/mympd/state/music_directory chown nobody:nobody -R /var/lib/mympd hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. ec6f65d9cc6be9863f39b896b479907f96416c4e
by Arne Fitzenreiter 03 Jan '25

03 Jan '25

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, next has been updated via ec6f65d9cc6be9863f39b896b479907f96416c4e (commit) from 23e8b462f3775ffe0511ecc736a9d4fe490047a4 (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 ec6f65d9cc6be9863f39b896b479907f96416c4e Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Jan 3 23:44:06 2025 +0000 u-boot: revert rpi boards to distro_bootcmd Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/u-boot | 8 ++ ...2024.10-revert_rpi_distro_bootcmd_removal.patch | 89 ++++++++++++++++++++++ 2 files changed, 97 insertions(+) create mode 100644 src/patches/u-boot/u-boot-2024.10-revert_rpi_distro_bootcmd_removal.patch Difference in files: diff --git a/lfs/u-boot b/lfs/u-boot index de95719cb..d686917b2 100644 --- a/lfs/u-boot +++ b/lfs/u-boot @@ -83,10 +83,16 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + # distrobootcmd support was removed for raspberry pi boards. Revert. + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/u-boot/u-boot-2024.10-revert_rpi_distro_bootcmd_removal.patch + # Raspberry Pi 3 -mkdir -pv /usr/share/u-boot/rpi cd $(DIR_APP) && make CROSS_COMPILE="" rpi_3_config cd $(DIR_APP) && sed -i -e 's!^CONFIG_IDENT_STRING=.*!CONFIG_IDENT_STRING=" RPi3 - IPFire.org"!' .config + cd $(DIR_APP) && sed -i -e 's!^.*CONFIG_DISTRO_DEFAULTS.*!CONFIG_DISTRO_DEFAULTS=y!' .config + cd $(DIR_APP) && sed -i -e 's!^CONFIG_BOOTCOMMAND=.*!CONFIG_BOOTCOMMAND="run distro_bootcmd"!' .config + cd $(DIR_APP) && make CROSS_COMPILE="" HOSTCC="gcc $(CFLAGS)" cd $(DIR_APP) && install -v -m 644 u-boot.bin \ /usr/share/u-boot/rpi/u-boot-rpi3.bin @@ -98,6 +104,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) -mkdir -pv /usr/share/u-boot/rpi cd $(DIR_APP) && make CROSS_COMPILE="" rpi_4_config cd $(DIR_APP) && sed -i -e 's!^CONFIG_IDENT_STRING=.*!CONFIG_IDENT_STRING=" RPi4 - IPFire.org"!' .config + cd $(DIR_APP) && sed -i -e 's!^.*CONFIG_DISTRO_DEFAULTS.*!CONFIG_DISTRO_DEFAULTS=y!' .config + cd $(DIR_APP) && sed -i -e 's!^CONFIG_BOOTCOMMAND=.*!CONFIG_BOOTCOMMAND="run distro_bootcmd"!' .config cd $(DIR_APP) && make CROSS_COMPILE="" HOSTCC="gcc $(CFLAGS)" cd $(DIR_APP) && install -v -m 644 u-boot.bin \ /usr/share/u-boot/rpi/u-boot-rpi4.bin diff --git a/src/patches/u-boot/u-boot-2024.10-revert_rpi_distro_bootcmd_removal.patch b/src/patches/u-boot/u-boot-2024.10-revert_rpi_distro_bootcmd_removal.patch new file mode 100644 index 000000000..5a6028518 --- /dev/null +++ b/src/patches/u-boot/u-boot-2024.10-revert_rpi_distro_bootcmd_removal.patch @@ -0,0 +1,89 @@ +diff -Naur u-boot-2024.10.org/include/configs/rpi.h u-boot-2024.10/include/configs/rpi.h +--- u-boot-2024.10.org/include/configs/rpi.h 2024-10-07 14:54:35.000000000 +0000 ++++ u-boot-2024.10/include/configs/rpi.h 2025-01-03 14:15:12.450978450 +0000 +@@ -31,4 +31,85 @@ + */ + #define CFG_SYS_SDRAM_SIZE SZ_128M + ++/* DFU over USB/UDC */ ++#ifdef CONFIG_CMD_DFU ++#ifdef CONFIG_ARM64 ++#define KERNEL_FILENAME "Image" ++#else ++#define KERNEL_FILENAME "zImage" ++#endif ++ ++#define ENV_DFU_SETTINGS \ ++ "dfu_alt_info=u-boot.bin fat 0 1;uboot.env fat 0 1;" \ ++ "config.txt fat 0 1;" \ ++ KERNEL_FILENAME " fat 0 1\0" ++#else ++#define ENV_DFU_SETTINGS "" ++#endif ++ ++/* Environment */ ++#define ENV_DEVICE_SETTINGS \ ++ "stdin=serial,usbkbd\0" \ ++ "stdout=serial,vidconsole\0" \ ++ "stderr=serial,vidconsole\0" ++ ++#ifdef CONFIG_ARM64 ++#define FDT_HIGH "ffffffffffffffff" ++#define INITRD_HIGH "ffffffffffffffff" ++#else ++#define FDT_HIGH "ffffffff" ++#define INITRD_HIGH "ffffffff" ++#endif ++ ++#define ENV_MEM_LAYOUT_SETTINGS \ ++ "fdt_high=" FDT_HIGH "\0" \ ++ "initrd_high=" INITRD_HIGH "\0" \ ++ "kernel_addr_r=0x00080000\0" \ ++ "scriptaddr=0x02400000\0" \ ++ "pxefile_addr_r=0x02500000\0" \ ++ "fdt_addr_r=0x02600000\0" \ ++ "ramdisk_addr_r=0x02700000\0" ++ ++#if CONFIG_IS_ENABLED(CMD_MMC) ++ #define BOOT_TARGET_MMC(func) \ ++ func(MMC, mmc, 0) \ ++ func(MMC, mmc, 1) \ ++ func(MMC, mmc, 2) ++#else ++ #define BOOT_TARGET_MMC(func) ++#endif ++ ++#if CONFIG_IS_ENABLED(CMD_USB) ++ #define BOOT_TARGET_USB(func) func(USB, usb, 0) ++#else ++ #define BOOT_TARGET_USB(func) ++#endif ++ ++#if CONFIG_IS_ENABLED(CMD_PXE) ++ #define BOOT_TARGET_PXE(func) func(PXE, pxe, na) ++#else ++ #define BOOT_TARGET_PXE(func) ++#endif ++ ++#if CONFIG_IS_ENABLED(CMD_DHCP) ++ #define BOOT_TARGET_DHCP(func) func(DHCP, dhcp, na) ++#else ++ #define BOOT_TARGET_DHCP(func) ++#endif ++ ++#define BOOT_TARGET_DEVICES(func) \ ++ BOOT_TARGET_MMC(func) \ ++ BOOT_TARGET_USB(func) \ ++ BOOT_TARGET_PXE(func) \ ++ BOOT_TARGET_DHCP(func) ++ ++#include <config_distro_bootcmd.h> ++ ++#define CFG_EXTRA_ENV_SETTINGS \ ++ "dhcpuboot=usb start; dhcp u-boot.uimg; bootm\0" \ ++ ENV_DEVICE_SETTINGS \ ++ ENV_DFU_SETTINGS \ ++ ENV_MEM_LAYOUT_SETTINGS \ ++ BOOTENV ++ + #endif hooks/post-receive -- IPFire 2.x development tree

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM January 2025