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

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

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 4816 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  321469be460b0d546c1e001b4ea5e4980ba533cf (commit)
       via  dbca1c7354865f3f2d084082ffb89e2f8b4aca41 (commit)
      from  652faa638e6e44a17572aa63a7e660907ca96c51 (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 321469be460b0d546c1e001b4ea5e4980ba533cf
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Fri Sep 15 15:09:28 2023 +0000

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

commit dbca1c7354865f3f2d084082ffb89e2f8b4aca41
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Fri Sep 15 15:09:09 2023 +0000

    libbpf: New package
    
    This is required by Pakfire.
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

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

Summary of changes:
 libksba/libksba.nm => libbpf/libbpf.nm             | 21 +++++++++--------
 pakfire/pakfire.nm                                 |  5 +++-
 ...BFS-linux-fcntl.h-and-fcntl.h-are-incompa.patch | 27 ----------------------
 3 files changed, 15 insertions(+), 38 deletions(-)
 copy libksba/libksba.nm => libbpf/libbpf.nm (62%)
 delete mode 100644 pakfire/patches/0001-jail-Fix-FTBFS-linux-fcntl.h-and-fcntl.h-are-incompa.patch

Difference in files:
diff --git a/libbpf/libbpf.nm b/libbpf/libbpf.nm
new file mode 100644
index 000000000..321aa0cf2
--- /dev/null
+++ b/libbpf/libbpf.nm
@@ -0,0 +1,40 @@
+###############################################################################
+# IPFire.org    - An Open Source Firewall Solution                            #
+# Copyright (C) - IPFire Development Team <info(a)ipfire.org>                   #
+###############################################################################
+
+name       = libbpf
+version    = 1.2.2
+release    = 1
+
+groups     = System/Libraries
+url        = https://github.com/libbpf/libbpf/
+license    = LGPLv2.1
+summary    = eBPF helper library
+
+description
+	eBPF helper library
+end
+
+source_dl  = https://github.com/libbpf/libbpf/archive/refs/tags/v%{version}.tar.gz#/
+
+build
+	requires
+		elfutils-devel
+		zlib-devel
+	end
+
+	DIR_BUILD = %{DIR_APP}/src
+end
+
+packages
+	package %{name}
+
+	package %{name}-devel
+		template DEVEL
+	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
+end
diff --git a/pakfire/pakfire.nm b/pakfire/pakfire.nm
index 2b9c63e2f..6f405232f 100644
--- a/pakfire/pakfire.nm
+++ b/pakfire/pakfire.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = pakfire
-version    = 0.9.28
+version    = 0.9.29
 release    = 1
 
 maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
@@ -27,14 +27,17 @@ build
 		automake
 		bison
 		curl-devel
+		file-devel
 		flex
 		gettext-devel
 		gpgme-devel
 		intltool >= 0.40.0
 		json-c-devel >= 0.15
 		libarchive-devel >= 3.4.0
+		libbpf-devel
 		libcap-devel
 		libmount-devel
+		libnl3-devel
 		libseccomp-devel
 		libsolv-devel >= 0.7.5
 		libuuid-devel
diff --git a/pakfire/patches/0001-jail-Fix-FTBFS-linux-fcntl.h-and-fcntl.h-are-incompa.patch b/pakfire/patches/0001-jail-Fix-FTBFS-linux-fcntl.h-and-fcntl.h-are-incompa.patch
deleted file mode 100644
index 5bb19c617..000000000
--- a/pakfire/patches/0001-jail-Fix-FTBFS-linux-fcntl.h-and-fcntl.h-are-incompa.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From bcf09bf50c7f833cf632bd94a33a1a92fa75071a Mon Sep 17 00:00:00 2001
-From: Michael Tremer <michael.tremer(a)ipfire.org>
-Date: Fri, 9 Dec 2022 16:41:41 +0000
-Subject: [PATCH] jail: Fix FTBFS linux/fcntl.h and fcntl.h are incompatible
-
-Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
----
- src/libpakfire/jail.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/libpakfire/jail.c b/src/libpakfire/jail.c
-index 0850698a..97dda4f0 100644
---- a/src/libpakfire/jail.c
-+++ b/src/libpakfire/jail.c
-@@ -19,8 +19,8 @@
- #############################################################################*/
- 
- #include <errno.h>
-+#include <fcntl.h>
- #include <linux/capability.h>
--#include <linux/fcntl.h>
- #include <linux/sched.h>
- #include <sys/wait.h>
- #include <linux/wait.h>
--- 
-2.30.2
-


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