[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 7cbadad4034ba90d8c4b70f0b7162b27bba547ec

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 7cbadad4034ba90d8c4b70f0b7162b27bba547ec

[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  7cbadad4034ba90d8c4b70f0b7162b27bba547ec (commit)
       via  b62aad216efe558954a2bb297e8fdcc2303df9b8 (commit)
       via  64348ec49b49d18315e4a82b97c6b65d8fae6e86 (commit)
      from  1b63c86e15af17336d4ac3e384a778fe56c555a6 (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 7cbadad4034ba90d8c4b70f0b7162b27bba547ec
Author: Adolf Belka <adolf.belka@ipfire.org>
Date:   Mon Nov 17 18:30:46 2025 +0100

    core199: Ship general-functions.pl
    
    - This file was changed in CU198 but was not shipped so the changes were not included in
       CU198 updates.
    
    Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

commit b62aad216efe558954a2bb297e8fdcc2303df9b8
Author: Stefan Schantl <stefan.schantl@ipfire.org>
Date:   Mon Nov 17 12:49:55 2025 +0100

    ffmpeg: Re-enable lame and SSL support
    
    The ffmpeg developers decided at some point in the past to change some
    defaults during configure and therefore we need to explit enable support
    for lame and openssl.
    
    Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

commit 64348ec49b49d18315e4a82b97c6b65d8fae6e86
Author: Matthias Fischer <matthias.fischer@ipfire.org>
Date:   Sun Nov 16 14:32:36 2025 +0100

    nano: Update to 8.7
    
    For details see:
    https://www.nano-editor.org/news.php
    
    "2025 November 12 - GNU nano 8.7 "Blue Highways"
    
        At the Execute prompt, preceding the command with two pipe symbols
        allows implementing a copy-to-clipboard feature in your nanorc (on
        terminals that support OSC 52). See the doc/sample.nanorc file."
    
    Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

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

Summary of changes:
 config/rootfiles/core/199/filelists/files | 1 +
 lfs/ffmpeg                                | 4 +++-
 lfs/nano                                  | 4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

Difference in files:
diff --git a/config/rootfiles/core/199/filelists/files b/config/rootfiles/core/199/filelists/files
index 1a3e0b9c9..0d20bb165 100644
--- a/config/rootfiles/core/199/filelists/files
+++ b/config/rootfiles/core/199/filelists/files
@@ -27,6 +27,7 @@ usr/local/bin/lldpdctrl
 usr/sbin/openvpn-authenticator
 usr/sbin/redirect_wrapper
 var/ipfire/backup/include
+var/ipfire/general-functions.pl
 var/ipfire/header.pl
 var/ipfire/lldp
 var/ipfire/menu.d/30-network.menu
diff --git a/lfs/ffmpeg b/lfs/ffmpeg
index 28a697eee..5e69ce718 100644
--- a/lfs/ffmpeg
+++ b/lfs/ffmpeg
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = ffmpeg
-PAK_VER    = 21
+PAK_VER    = 22
 
 DEPS       = sdl2 lame libvorbis
 
@@ -95,6 +95,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 			--enable-gpl \
 			--enable-version3 \
 			--enable-avfilter \
+			--enable-libmp3lame \
+			--enable-openssl \
 			--disable-doc
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
diff --git a/lfs/nano b/lfs/nano
index d0c83e40b..9d670e589 100644
--- a/lfs/nano
+++ b/lfs/nano
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 8.6
+VER        = 8.7
 
 THISAPP    = nano-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = f7e17085d237ec3512b21bb732c2ebcf71a96991344acd0efc3592a650be856aed3ad958df59e27f332f750ac5e46ba7ed06b23093c8b68c4bf0a94aeecd2af0
+$(DL_FILE)_BLAKE2 = 4a7a67f854969960c96d1e3b2c7184f9d9c9fb305a14ff9764a39a8103ca5f5878f9e344b0dc522e27643f93e57582881ea8e664ac9c6eaa99c3b2d9632febdc
 
 install : $(TARGET)
 


hooks/post-receive
--
IPFire 2.x development tree