[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 98a4302038bed8b6512764aecad0d678af6de7c9
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 98a4302038bed8b6512764aecad0d678af6de7c9 (commit) via e84f08d8ad19bf437f3d09d90b498585732ed87b (commit) via e3b76aa2257c9ea1bc7e4042afa67480ec8d0c12 (commit) via f00b41b39745ff58207df7f53739e02413981399 (commit) via 5826584909f3bf40b581b717f15f139db47862dd (commit) via b8d94d5d20ecebc2b0f998f42cfd18c7467deec2 (commit) via 4a9b564a3be837b8a26174caf308785e2a0ea847 (commit) from bbc2926ab41afe68aa360f4a2aaef9447d209574 (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 98a4302038bed8b6512764aecad0d678af6de7c9 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat Sep 16 13:41:38 2023 +0200
qemu: update to 8.1.0
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit e84f08d8ad19bf437f3d09d90b498585732ed87b Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat Sep 16 13:21:26 2023 +0200
qemu: update 8.0.4
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit e3b76aa2257c9ea1bc7e4042afa67480ec8d0c12 Author: Peter Müller peter.mueller@ipfire.org Date: Sat Sep 16 13:37:57 2023 +0200
nano: Update to 7.2
Signed-off-by: Peter Müller peter.mueller@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit f00b41b39745ff58207df7f53739e02413981399 Author: Peter Müller peter.mueller@ipfire.org Date: Sat Sep 16 13:24:52 2023 +0200
nftables: Update to 1.0.8
Signed-off-by: Peter Müller peter.mueller@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 5826584909f3bf40b581b717f15f139db47862dd Author: Peter Müller peter.mueller@ipfire.org Date: Sat Sep 16 13:24:26 2023 +0200
libnftnl: Update to 1.2.6
Signed-off-by: Peter Müller peter.mueller@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit b8d94d5d20ecebc2b0f998f42cfd18c7467deec2 Author: Peter Müller peter.mueller@ipfire.org Date: Sat Sep 16 10:18:11 2023 +0200
Unbound: Update to 1.18.0
Signed-off-by: Peter Müller peter.mueller@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 4a9b564a3be837b8a26174caf308785e2a0ea847 Author: Peter Müller peter.mueller@ipfire.org Date: Sat Sep 16 10:10:48 2023 +0200
psmisc: The project's homepage moved to Gitlab
However, its tarballs are still to be retrieved from SF.
Signed-off-by: Peter Müller peter.mueller@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: libnftnl/libnftnl.nm | 6 +- nano/nano.nm | 2 +- nftables/nftables.nm | 9 +-- psmisc/psmisc.nm | 2 +- ...ux-user-add-more-compat-ioctl-definitions.patch | 69 ------------------- ...x-user-fix-compat-with-glibc-2.36-sys-mou.patch | 78 ---------------------- qemu/qemu.nm | 5 +- unbound/unbound.nm | 4 +- 8 files changed, 15 insertions(+), 160 deletions(-) delete mode 100644 qemu/patches/0001-Revert-linux-user-add-more-compat-ioctl-definitions.patch delete mode 100644 qemu/patches/0002-Revert-linux-user-fix-compat-with-glibc-2.36-sys-mou.patch
Difference in files: diff --git a/libnftnl/libnftnl.nm b/libnftnl/libnftnl.nm index 547bbc090..5a8b9739f 100644 --- a/libnftnl/libnftnl.nm +++ b/libnftnl/libnftnl.nm @@ -4,8 +4,8 @@ ###############################################################################
name = libnftnl -version = 1.2.4 -release = 1.1 +version = 1.2.6 +release = 1
groups = Networking/Tools url = https://netfilter.org/projects/libnftnl @@ -18,7 +18,7 @@ description end
source_dl = https://netfilter.org/projects/libnftnl/files/ -sources = %{thisapp}.tar.bz2 +sources = %{thisapp}.tar.xz
build requires diff --git a/nano/nano.nm b/nano/nano.nm index ba5df8f63..e8caa4e88 100644 --- a/nano/nano.nm +++ b/nano/nano.nm @@ -4,7 +4,7 @@ ###############################################################################
name = nano -version = 7.1 +version = 7.2 release = 1
groups = Application/Editors diff --git a/nftables/nftables.nm b/nftables/nftables.nm index 9e358a7cf..9a138f941 100644 --- a/nftables/nftables.nm +++ b/nftables/nftables.nm @@ -4,8 +4,8 @@ ###############################################################################
name = nftables -version = 1.0.5 -release = 2.1 +version = 1.0.8 +release = 1
groups = Networking/Tools url = https://netfilter.org/projects/nftables/ @@ -17,7 +17,7 @@ description end
source_dl = https://netfilter.org/projects/nftables/files/ -sources = %{thisapp}.tar.bz2 +sources = %{thisapp}.tar.xz
build requires @@ -30,7 +30,8 @@ build libtool libedit-devel libmnl-devel >= 1.0.4 - libnftnl-devel >= 1.2.3 + libnftnl-devel >= 1.2.6 + python3-setuptools readline-devel end end diff --git a/psmisc/psmisc.nm b/psmisc/psmisc.nm index 748b0e8e5..1e3d5d0d7 100644 --- a/psmisc/psmisc.nm +++ b/psmisc/psmisc.nm @@ -8,7 +8,7 @@ version = 23.6 release = 1
groups = Applications/System -url = https://sourceforge.net/projects/psmisc +url = https://gitlab.com/psmisc/psmisc license = GPLv2+ summary = Utilities for managing processes on your system.
diff --git a/qemu/patches/0001-Revert-linux-user-add-more-compat-ioctl-definitions.patch b/qemu/patches/0001-Revert-linux-user-add-more-compat-ioctl-definitions.patch deleted file mode 100644 index cd8121fed..000000000 --- a/qemu/patches/0001-Revert-linux-user-add-more-compat-ioctl-definitions.patch +++ /dev/null @@ -1,69 +0,0 @@ -From afa96c55f2c270405de8984e2466067bbb44c0e4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= berrange@redhat.com -Date: Tue, 10 Jan 2023 12:49:00 -0500 -Subject: [PATCH] Revert "linux-user: add more compat ioctl definitions" -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This reverts commit c5495f4ecb0cdaaf2e9dddeb48f1689cdb520ca0. - -glibc has fixed (in 2.36.9000-40-g774058d729) the problem -that caused a clash when both sys/mount.h annd linux/mount.h -are included, and backported this to the 2.36 stable release -too: - - https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3... - -It is saner for QEMU to remove the workaround it applied for -glibc 2.36 and expect distros to ship the 2.36 maint release -with the fix. This avoids needing to add a further workaround -to QEMU to deal with the fact that linux/brtfs.h now also pulls -in linux/mount.h via linux/fs.h since Linux 6.1 - -Upstream-Status: Backport from v8.0 (master) - -Signed-off-by: Daniel P. Berrangé berrange@redhat.com -Reviewed-by: Marc-André Lureau marcandre.lureau@redhat.com -Link: https://lore.kernel.org/r/20230110174901.2580297-2-berrange@redhat.com -Signed-off-by: Joel Stanley joel@jms.id.au ---- - linux-user/syscall.c | 25 ------------------------- - 1 file changed, 25 deletions(-) - -diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index f95a6161e..510de8edc 100644 ---- a/linux-user/syscall.c -+++ b/linux-user/syscall.c -@@ -111,31 +111,6 @@ - #define FS_IOC32_SETFLAGS _IOW('f', 2, int) - #define FS_IOC32_GETVERSION _IOR('v', 1, int) - #define FS_IOC32_SETVERSION _IOW('v', 2, int) -- --#define BLKGETSIZE64 _IOR(0x12,114,size_t) --#define BLKDISCARD _IO(0x12,119) --#define BLKIOMIN _IO(0x12,120) --#define BLKIOOPT _IO(0x12,121) --#define BLKALIGNOFF _IO(0x12,122) --#define BLKPBSZGET _IO(0x12,123) --#define BLKDISCARDZEROES _IO(0x12,124) --#define BLKSECDISCARD _IO(0x12,125) --#define BLKROTATIONAL _IO(0x12,126) --#define BLKZEROOUT _IO(0x12,127) -- --#define FIBMAP _IO(0x00,1) --#define FIGETBSZ _IO(0x00,2) -- --struct file_clone_range { -- __s64 src_fd; -- __u64 src_offset; -- __u64 src_length; -- __u64 dest_offset; --}; -- --#define FICLONE _IOW(0x94, 9, int) --#define FICLONERANGE _IOW(0x94, 13, struct file_clone_range) -- - #else - #include <linux/fs.h> - #endif diff --git a/qemu/patches/0002-Revert-linux-user-fix-compat-with-glibc-2.36-sys-mou.patch b/qemu/patches/0002-Revert-linux-user-fix-compat-with-glibc-2.36-sys-mou.patch deleted file mode 100644 index d754f21ad..000000000 --- a/qemu/patches/0002-Revert-linux-user-fix-compat-with-glibc-2.36-sys-mou.patch +++ /dev/null @@ -1,78 +0,0 @@ -From e95c0a42940ca1cf763ca3374b36a9be030039d7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= berrange@redhat.com -Date: Tue, 10 Jan 2023 12:49:01 -0500 -Subject: [PATCH] Revert "linux-user: fix compat with glibc >= 2.36 - sys/mount.h" -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This reverts commit 3cd3df2a9584e6f753bb62a0028bd67124ab5532. - -glibc has fixed (in 2.36.9000-40-g774058d729) the problem -that caused a clash when both sys/mount.h annd linux/mount.h -are included, and backported this to the 2.36 stable release -too: - - https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3... - -It is saner for QEMU to remove the workaround it applied for -glibc 2.36 and expect distros to ship the 2.36 maint release -with the fix. This avoids needing to add a further workaround -to QEMU to deal with the fact that linux/brtfs.h now also pulls -in linux/mount.h via linux/fs.h since Linux 6.1 - -Upstream-Status: Backport from v8.0 (master) - -Signed-off-by: Daniel P. Berrangé berrange@redhat.com -Reviewed-by: Marc-André Lureau marcandre.lureau@redhat.com -Link: https://lore.kernel.org/r/20230110174901.2580297-3-berrange@redhat.com -Signed-off-by: Joel Stanley joel@jms.id.au ---- - linux-user/syscall.c | 18 ------------------ - meson.build | 2 -- - 2 files changed, 20 deletions(-) - -diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 510de8edc..13a67b84b 100644 ---- a/linux-user/syscall.c -+++ b/linux-user/syscall.c -@@ -95,25 +95,7 @@ - #include <linux/soundcard.h> - #include <linux/kd.h> - #include <linux/mtio.h> -- --#ifdef HAVE_SYS_MOUNT_FSCONFIG --/* -- * glibc >= 2.36 linux/mount.h conflicts with sys/mount.h, -- * which in turn prevents use of linux/fs.h. So we have to -- * define the constants ourselves for now. -- */ --#define FS_IOC_GETFLAGS _IOR('f', 1, long) --#define FS_IOC_SETFLAGS _IOW('f', 2, long) --#define FS_IOC_GETVERSION _IOR('v', 1, long) --#define FS_IOC_SETVERSION _IOW('v', 2, long) --#define FS_IOC_FIEMAP _IOWR('f', 11, struct fiemap) --#define FS_IOC32_GETFLAGS _IOR('f', 1, int) --#define FS_IOC32_SETFLAGS _IOW('f', 2, int) --#define FS_IOC32_GETVERSION _IOR('v', 1, int) --#define FS_IOC32_SETVERSION _IOW('v', 2, int) --#else - #include <linux/fs.h> --#endif - #include <linux/fd.h> - #if defined(CONFIG_FIEMAP) - #include <linux/fiemap.h> -diff --git a/meson.build b/meson.build -index e44432370..f37ba4114 100644 ---- a/meson.build -+++ b/meson.build -@@ -2032,8 +2032,6 @@ config_host_data.set('HAVE_OPTRESET', - cc.has_header_symbol('getopt.h', 'optreset')) - config_host_data.set('HAVE_IPPROTO_MPTCP', - cc.has_header_symbol('netinet/in.h', 'IPPROTO_MPTCP')) --config_host_data.set('HAVE_SYS_MOUNT_FSCONFIG', -- cc.has_header_symbol('sys/mount.h', 'FSCONFIG_SET_FLAG')) - - # has_member - config_host_data.set('HAVE_SIGEV_NOTIFY_THREAD_ID', diff --git a/qemu/qemu.nm b/qemu/qemu.nm index f0ca0b84f..3c56490b3 100644 --- a/qemu/qemu.nm +++ b/qemu/qemu.nm @@ -4,8 +4,8 @@ ###############################################################################
name = qemu -version = 7.2.0 -release = 3 +version = 8.1.0 +release = 1
groups = Applications/Virtualization url = https://www.qemu.org @@ -86,6 +86,7 @@ build --enable-vnc-jpeg \ --enable-seccomp \ --disable-xen \ + --disable-dbus-display \ --disable-sdl
install_cmds diff --git a/unbound/unbound.nm b/unbound/unbound.nm index 20998a364..fcd7e5a62 100644 --- a/unbound/unbound.nm +++ b/unbound/unbound.nm @@ -4,8 +4,8 @@ ###############################################################################
name = unbound -version = 1.17.0 -release = 4.1 +version = 1.18.0 +release = 1
groups = System/Daemons url = https://www.nlnetlabs.nl/unbound/
hooks/post-receive -- IPFire 3.x development tree
-
Michael Tremer