[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 8f36e4c8960b43548fca6eee18132e8ead91f7ea

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 8f36e4c8960b43548fca6eee18132e8ead91f7ea

[Arne Fitzenreiter]

[-- Attachment #1: Type: text/plain, Size: 5507 bytes --]

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  8f36e4c8960b43548fca6eee18132e8ead91f7ea (commit)
       via  adb153f64ffc67390107922ae28fc9a5d282fc4d (commit)
       via  a6fac033ba38e2e5cf2531fa5d7516432f60b0b5 (commit)
      from  28636c46cb541d583e8cc63ab9a4e5dca160d484 (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 8f36e4c8960b43548fca6eee18132e8ead91f7ea
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Tue Nov 19 20:32:47 2024 +0100

    transmission: add minipnpc as dependency
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

commit adb153f64ffc67390107922ae28fc9a5d282fc4d
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Tue Nov 19 20:27:42 2024 +0100

    miniupnpc: change to addon pak
    
    transmission need the lib at runtime.
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

commit a6fac033ba38e2e5cf2531fa5d7516432f60b0b5
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Tue Nov 19 19:19:28 2024 +0100

    kernel: update to 6.6.62
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

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

Summary of changes:
 config/kernel/kernel.config.x86_64-ipfire       |  2 +-
 config/rootfiles/{common => packages}/miniupnpc |  8 ++++----
 lfs/linux                                       |  4 ++--
 lfs/miniupnpc                                   | 10 ++++++++++
 lfs/transmission                                |  4 ++--
 5 files changed, 19 insertions(+), 9 deletions(-)
 rename config/rootfiles/{common => packages}/miniupnpc (85%)

Difference in files:
diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire
index 5ec0edab6..73fd04255 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.60 Kernel Configuration
+# Linux/x86 6.6.62 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 14.2.0"
 CONFIG_CC_IS_GCC=y
diff --git a/config/rootfiles/common/miniupnpc b/config/rootfiles/packages/miniupnpc
similarity index 85%
rename from config/rootfiles/common/miniupnpc
rename to config/rootfiles/packages/miniupnpc
index 616ea6131..deee07ed4 100644
--- a/config/rootfiles/common/miniupnpc
+++ b/config/rootfiles/packages/miniupnpc
@@ -1,6 +1,6 @@
-#usr/bin/external-ip
-#usr/bin/upnp-listdevices
-#usr/bin/upnpc
+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
@@ -14,6 +14,6 @@
 #usr/include/miniupnpc/upnpreplyparse.h
 #usr/lib/libminiupnpc.a
 #usr/lib/libminiupnpc.so
-#usr/lib/libminiupnpc.so.18
+usr/lib/libminiupnpc.so.18
 #usr/lib/pkgconfig/miniupnpc.pc
 #usr/share/man/man3/miniupnpc.3.gz
diff --git a/lfs/linux b/lfs/linux
index 7d0869a16..f23c1053a 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,7 +24,7 @@
 
 include Config
 
-VER         = 6.6.60
+VER         = 6.6.62
 
 THISAPP    = linux-$(VER)
 DL_FILE    = linux-$(VER).tar.xz
@@ -69,7 +69,7 @@ objects = \
 
 $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 82e39bb4f9abe204c6361152fdeb5ad2ccfeec478f0af20ab795dd52271b159bcfe2d4aea32cd505a567a0bed64cb10b988283548ddaa5cbbe014117970e3318
+$(DL_FILE)_BLAKE2 = be626b8e4af2394a9eca5024f0c6b2274d3bfccae9989c353d9b1a80c903f8a632cf986d43a0e283c02b62ae77a7409fbca6a6c7bf9cf1530119d7a712e8076f
 
 install : $(TARGET)
 
diff --git a/lfs/miniupnpc b/lfs/miniupnpc
index 7907bb5b9..ae6f0947e 100644
--- a/lfs/miniupnpc
+++ b/lfs/miniupnpc
@@ -24,6 +24,8 @@
 
 include Config
 
+SUMMARY    = mini uPNP client (needed for transmission)
+
 VER        = 2.2.8
 
 THISAPP    = miniupnpc-$(VER)
@@ -31,6 +33,10 @@ 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
@@ -50,6 +56,9 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 b2 : $(subst %,%_BLAKE2,$(objects))
 
+dist:
+	@$(PAK)
+
 ###############################################################################
 # Downloading, checking, b2sum
 ###############################################################################
@@ -75,3 +84,4 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
+
diff --git a/lfs/transmission b/lfs/transmission
index 1568b67e7..49e024a13 100644
--- a/lfs/transmission
+++ b/lfs/transmission
@@ -34,9 +34,9 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = transmission
-PAK_VER    = 23
+PAK_VER    = 24
 
-DEPS       =
+DEPS       = miniupnpc
 
 SERVICES   = transmission
 


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