[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 80b5bcd5ed1c3dbad515e0835806999cdbe71e61

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 80b5bcd5ed1c3dbad515e0835806999cdbe71e61

[Michael Tremer]

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  80b5bcd5ed1c3dbad515e0835806999cdbe71e61 (commit)
       via  830a6725ead4285b2c8ae50ea184c14aed732977 (commit)
       via  4b8c437bbc2c45e7623ac56197036f6af103b8b7 (commit)
       via  baa22ec7a699eb8f5b73db54b9abfbf8580583ae (commit)
      from  99a3c58f2f6cd18515e6baa3c0da70dd23c69f1d (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 <adolf.belka@ipfire.org>
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 <adolf.belka@ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

commit 830a6725ead4285b2c8ae50ea184c14aed732977
Author: Adolf Belka <adolf.belka@ipfire.org>
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 <adolf.belka@ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

commit 4b8c437bbc2c45e7623ac56197036f6af103b8b7
Merge: baa22ec7a6 99a3c58f2f
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Mon Jun 30 08:53:10 2025 +0000

    Merge branch 'next'

commit baa22ec7a699eb8f5b73db54b9abfbf8580583ae
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Sun Jun 15 13:52:28 2025 +0100

    wireguard: Don't use fwmarks for the gateways
    
    This slightly conflicts with the reverse path filter which does not seem
    to consider the mark and therefore does not resolve to the correct route.
    
    There is not too much benefit of using the mark, except its elegance, a
    more accurate lookup and that we were hiding a direct route to the
    gateway from the clients.
    
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

-----------------------------------------------------------------------

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