[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 08445b698be12fc4ee16423b295d677fb89e6728 - IPFire-SCM

7 Mar 2023

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  08445b698be12fc4ee16423b295d677fb89e6728 (commit)
       via  21c695c7d71a2da3e44d9d6f7c0a70a6add8ecac (commit)
       via  0b572234741c0c592c8f2c99fa7bb727e4dc991a (commit)
      from  82b6c2cbcaddb88a11fb8bacd5e987b08c30df34 (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 08445b698be12fc4ee16423b295d677fb89e6728
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Tue Mar 7 11:28:42 2023 +0000
plymouth: Drop any dependency on image files
We don't have those in order right now.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 21c695c7d71a2da3e44d9d6f7c0a70a6add8ecac
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Tue Mar 7 11:28:07 2023 +0000
glibc: Update to 2.37
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 0b572234741c0c592c8f2c99fa7bb727e4dc991a
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Tue Mar 7 11:27:45 2023 +0000
qemu: Fix build against glibc >= 2.36
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes:
 glibc/glibc.nm                                     |  4 +-
 plymouth/plymouth.nm                               |  5 +-
 ...ux-user-add-more-compat-ioctl-definitions.patch | 69 +++++++++++++++++++
 ...x-user-fix-compat-with-glibc-2.36-sys-mou.patch | 78 ++++++++++++++++++++++
 qemu/qemu.nm                                       |  3 +-
 5 files changed, 152 insertions(+), 7 deletions(-)
 create mode 100644 qemu/patches/0001-Revert-linux-user-add-more-compat-ioctl-definitions.patch
 create mode 100644 qemu/patches/0002-Revert-linux-user-fix-compat-with-glibc-2.36-sys-mou.patch
Difference in files:

diff --git a/glibc/glibc.nm b/glibc/glibc.nm
index 07dada011..5b94e0ed9 100644
--- a/glibc/glibc.nm
+++ b/glibc/glibc.nm
@@ -4,8 +4,8 @@
 ###############################################################################
name       = glibc
-version    = 2.36
-release    = 2
+version    = 2.37
+release    = 1
maintainer = Michael Tremer michael.tremer@ipfire.org
 groups     = System/Base
diff --git a/plymouth/plymouth.nm b/plymouth/plymouth.nm
index 5530e9a8d..5d3ac16b0 100644
--- a/plymouth/plymouth.nm
+++ b/plymouth/plymouth.nm
@@ -5,7 +5,7 @@
name       = plymouth
 version    = 22.02.122
-release    = 2.1
+release    = 3
groups     = System/Base
 url        = https://www.freedesktop.org/wiki/Software/Plymouth
@@ -33,14 +33,11 @@ build
    	libudev-devel
    	pango-devel >= 1.21.0
    	systemd-devel
-
-		%{datadir}/pixmaps/system-logo-white.png
    end
configure_options += \
    	--libexecdir=/usr/lib \
    	--disable-gtk \
-		--with-logo=%{datadir}/pixmaps/system-logo-white.png \
    	--with-background-start-color-stop=0x880400 \
    	--with-background-end-color-stop=0x000000 \
    	--with-background-color=0x880400 \
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
new file mode 100644
index 000000000..cd8121fed
--- /dev/null
+++ b/qemu/patches/0001-Revert-linux-user-add-more-compat-ioctl-definitions.patch
@@ -0,0 +1,69 @@
+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
new file mode 100644
index 000000000..d754f21ad
--- /dev/null
+++ b/qemu/patches/0002-Revert-linux-user-fix-compat-with-glibc-2.36-sys-mou.patch
@@ -0,0 +1,78 @@
+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 29840e380..84a9f8d4d 100644
--- a/qemu/qemu.nm
+++ b/qemu/qemu.nm
@@ -5,7 +5,7 @@
name       = qemu
 version    = 7.2.0
-release    = 1
+release    = 2
groups     = Applications/Virtualization
 url        = https://www.qemu.org
@@ -30,6 +30,7 @@ build
    	cairo-devel
    	flex
    	glib2-devel
+		glibc-devel >= 2.36
    	gnutls-devel
    	libcurl-devel
    	libgcrypt-devel
hooks/post-receive
--
IPFire 3.x development tree

    