[git.ipfire.org] IPFire 3.x development tree branch, master, updated. fdc5bfe81fb555778895950a4003cef0ebb6a90e

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. fdc5bfe81fb555778895950a4003cef0ebb6a90e

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 5312 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 3.x development tree".

The branch, master has been updated
       via  fdc5bfe81fb555778895950a4003cef0ebb6a90e (commit)
       via  98a495db26a0a1518a84cf69524b40cbc3023e79 (commit)
       via  e6858971cece01df6a509f73923a7d225faacdd1 (commit)
       via  36f55104532083ab7bddb2e4e526762ec9f252d0 (commit)
      from  3cf4b6275e3c396f3b0bce23b873fe99fc603cd1 (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 fdc5bfe81fb555778895950a4003cef0ebb6a90e
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Thu Sep 21 15:48:05 2023 +0000

    systemd: Link against whatever systemd supports
    
    We have some libraries which systemd can take advantage of which have
    formerly not been enabled.
    
    This patch also fixes running the testsuite which - however - currently
    does not run through.
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 98a495db26a0a1518a84cf69524b40cbc3023e79
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Thu Sep 21 15:36:58 2023 +0000

    kernel: Let kernel packages provide "kernel(VERSION)"
    
    This is useful for Pakfire to lock the running kernel so that it cannot
    be uninstalled.
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit e6858971cece01df6a509f73923a7d225faacdd1
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Thu Sep 21 14:47:18 2023 +0000

    libsolv: Update to 0.7.25
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 36f55104532083ab7bddb2e4e526762ec9f252d0
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Thu Sep 21 14:33:28 2023 +0000

    util-linux: Fix typo in libfdisk-devel package name
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

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

Summary of changes:
 kernel/kernel.nm         |  9 ++++++++-
 libsolv/libsolv.nm       |  4 ++--
 systemd/systemd.nm       | 14 +++++++++++---
 util-linux/util-linux.nm |  4 ++--
 4 files changed, 23 insertions(+), 8 deletions(-)

Difference in files:
diff --git a/kernel/kernel.nm b/kernel/kernel.nm
index fb104a8ec..667681d04 100644
--- a/kernel/kernel.nm
+++ b/kernel/kernel.nm
@@ -5,7 +5,7 @@
 
 name       = kernel
 version    = 6.5.3
-release    = 2
+release    = 3
 thisapp    = linux-%{version}
 
 maintainer = Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org>
@@ -293,6 +293,9 @@ packages
 
 		provides
 			kernel = %{fullver}
+
+			# Used to lock the running kernel from being uninstalled
+			kernel(%{fullver})
 		end
 
 		requires
@@ -343,6 +346,10 @@ packages
 			kernel-devel = %{thisver}
 		end
 
+		requires
+			kernel = %{thisver}
+		end
+
 		filter_requires
 			perl>=[0-9]\:.*
 		end
diff --git a/libsolv/libsolv.nm b/libsolv/libsolv.nm
index c4cbb6d3c..3d148a0f2 100644
--- a/libsolv/libsolv.nm
+++ b/libsolv/libsolv.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = libsolv
-version    = 0.7.22
-release    = 2
+version    = 0.7.25
+release    = 1
 
 maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
 groups     = System/Libraries
diff --git a/systemd/systemd.nm b/systemd/systemd.nm
index 984a1c026..bdb1e3f04 100644
--- a/systemd/systemd.nm
+++ b/systemd/systemd.nm
@@ -5,7 +5,7 @@
 
 name       = systemd
 version    = 254
-release    = 2
+release    = 3
 
 maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
 groups     = System/Base
@@ -50,16 +50,25 @@ build
 		kbd
 		kmod-devel >= 15
 		libacl-devel
+		libbpf-devel
 		libblkid-devel
 		libcap-devel
+		libcurl-devel
+		libfdisk-devel
 		libgcrypt-devel
+		libidn-devel
+		libidn2-devel
 		libmount-devel >= 2.34-2
+		libpwquality-devel
 		libseccomp-devel
 		libuuid-devel >= 2.34-2
 		libxcrypt-devel
+		lz4-devel
 		m4
 		meson >= 0.50.1
 		ninja >= 1.9.0
+		openssl-devel
+		p11-kit-devel
 		pam-devel
 		pciutils-devel
 		python3-devel
@@ -130,8 +139,7 @@ build
 		touch %{sysconfdir}/machine-id
 
 		# Run the testsuite.
-		ninja test -v %{PARALLELISMFLAGS} -C build || true
-
+		%{meson_test} || true
 	end
 
 	install
diff --git a/util-linux/util-linux.nm b/util-linux/util-linux.nm
index ce5bcdd82..91a593600 100644
--- a/util-linux/util-linux.nm
+++ b/util-linux/util-linux.nm
@@ -6,7 +6,7 @@
 name       = util-linux
 ver_maj    = 2.39
 version    = %{ver_maj}.2
-release    = 1
+release    = 2
 
 maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
 groups     = System/Base
@@ -274,7 +274,7 @@ packages
 	end
 
 	# Package information for libfdisk-devel.
-	package libfidsk-devel
+	package libfdisk-devel
 		summary = Development library and headers of libfdisk.
 		description = %{summary}
 


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