From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4bWkpD1ZR1z2ykg for ; Tue, 1 Jul 2025 13:46:28 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R11" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4bWkpD1HT0z2xWZ for ; Tue, 1 Jul 2025 13:46:28 +0000 (UTC) Received: from people01.haj.ipfire.org (people01.haj.ipfire.org [172.28.1.161]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature ECDSA (secp384r1) client-digest SHA384) (Client CN "people01.haj.ipfire.org", Issuer "E6" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4bWkpC4qCDz1Ps for ; Tue, 1 Jul 2025 13:46:27 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1751377587; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=8pqiupkDvvPe1uM+vk5OmjcKI3OnJ0/WqElQRdz1T8A=; b=e3zl98K0VMTd7txMEhNbcHrYilLSWNMBSYYsF3YZDoVs9I9KElW3Bu8N1YZBYK7KmaPswq 2JluJpP/M2Tg/SCg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1751377587; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=8pqiupkDvvPe1uM+vk5OmjcKI3OnJ0/WqElQRdz1T8A=; b=kZqUGXQmHkQKJDLohzwfU1kArClWZFTQNK7xAozpbqu5URAHrEImgO1cIpKUkjWFKOsy+C Tt4U94knKPQWy4/bSn9rx2mDdnWppxE2grmxZF6Q4bBKYfBwzT2XkZoLzfeghtoI4dxUE+ j0hcj6VKDU09XJGnQprRrLp8XUtan5rfw9ewAImCQhH+f5tpVjRFfeSgGGpWdwuwlFs+7a PD45Py4yIFXLYcesAPqnoNzd+6HZ2qfJm1+lqm2/LkdCKlP7zUtPhlqrapiwJ5TkfQac9v V1v/o0ebKHtizyB2i77GZ+/YrH9YICPDWB45Jz6SQYvyWs+ibgY6EYke3je2eA== Received: by people01.haj.ipfire.org (Postfix, from userid 1000) id 4bWkpC0wLvz2xK7; Tue, 1 Jul 2025 13:46:27 +0000 (UTC) To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 80b5bcd5ed1c3dbad515e0835806999cdbe71e61 X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 4b8c437bbc2c45e7623ac56197036f6af103b8b7 X-Git-Newrev: 80b5bcd5ed1c3dbad515e0835806999cdbe71e61 Message-Id: <4bWkpC0wLvz2xK7@people01.haj.ipfire.org> Date: Tue, 1 Jul 2025 13:46:27 +0000 (UTC) From: Michael Tremer Precedence: list List-Id: List-Subscribe: , List-Unsubscribe: , List-Post: List-Help: Sender: Mail-Followup-To: 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 80b5bcd5ed1c3dbad515e0835806999cdbe71e61 (commit) via 830a6725ead4285b2c8ae50ea184c14aed732977 (commit) from 4b8c437bbc2c45e7623ac56197036f6af103b8b7 (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 80b5bcd5ed1c3dbad515e0835806999cdbe71e61 Author: Adolf Belka Date: Mon Jun 30 18:12:02 2025 +0200 libusb: Add comment to update nut when libusb is updated - libusb is a run time requirement for nut Signed-off-by: Adolf Belka Signed-off-by: Michael Tremer commit 830a6725ead4285b2c8ae50ea184c14aed732977 Author: Adolf Belka Date: Tue Jul 1 15:44:35 2025 +0200 core196: Revert ship of customservices from fwhosts - Shipping the customservices file replaced the existing file on all users systems, which resulted in any modificationjs they had made being wiped out. - Having thought about it further what I shouldn have done is just added the additional custom service of "DNS over TLS" to the end of the customservices file during the update process using update.sh but that is also not so easy because what number to use for the "DNS over TLS" entry will depend on how many custom services the user has created. - At the least the shipping of the customservices file needs to be reverted. I and others can then think about alternative ways to provide that entry to existing files. - Alternatively we could leave it without doing anything. A fresh install will have the "DNS over TLS" entry and upgrades will just leave the existing customservices file alone. - Users can of course recover the file by doing a restore from the backup they have created but it is not good to overwrite those sorts of files. Signed-off-by: Adolf Belka Signed-off-by: Michael Tremer ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/196/filelists/files | 1 - lfs/libusb | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) Difference in files: diff --git a/config/rootfiles/core/196/filelists/files b/config/rootfiles/core/196/filelists/files index 1d83bafb5..8e1fc096d 100644 --- a/config/rootfiles/core/196/filelists/files +++ b/config/rootfiles/core/196/filelists/files @@ -11,7 +11,6 @@ srv/web/ipfire/cgi-bin/pakfire.cgi srv/web/ipfire/cgi-bin/wireguard.cgi usr/sbin/setup var/ipfire/backup/bin/backup.pl -var/ipfire/fwhosts/customservices var/ipfire/graphs.pl var/ipfire/header.pl var/ipfire/ipblocklist-functions.pl diff --git a/lfs/libusb b/lfs/libusb index 4b12242d7..0ff89ff75 100644 --- a/lfs/libusb +++ b/lfs/libusb @@ -25,6 +25,7 @@ include Config VER = 1.0.29 +# Ship nut when libusb is updated THISAPP = libusb-$(VER) DL_FILE = $(THISAPP).tar.bz2 hooks/post-receive -- IPFire 2.x development tree