Hi,

On Fri, 30 Oct 2020 09:28:22 +0100 Johannes Schauer <jo...@debian.org> wrote:
> The offending commit is:
> 
> > commit 2a53909e732b19ccbaf6d1534e932dff74fa757e (refs/bisect/bad)
> > Author: Vasyl Gello <vasek.ge...@gmail.com>
> > Date:   Fri Oct 2 03:48:45 2020 +0000
> > 
> >     Use fixed-width members in fake_msg
> > 
> >      * Also usevthe same padding on all architectures
> >      * Fixes cross-architecture SysV IPC connection failures
> >        (i.e using system-wide fakeroot in chroot-ed jails)
> 
> If I revert that commit on the current master branch, then everything works
> fine again, thus I'm tagging this bug with "patch".
> 
> Please either fix this issue or revert the commit until you have a solution
> that doesn't break this use-case. It currently makes the mmdebstrap
> autopkgtest fail and thus will block it from migration to testing (thus
> raising severity).

since there has been no activity on this RC bug for 10 days, I made a NMU with
a delay of seven days. Please chime in if you'd like me to cancel the upload. I
attached the debdiff of my NMU to this message.

Thanks!

cheers, josch
diff -Nru fakeroot-1.25.3/debian/changelog fakeroot-1.25.3/debian/changelog
--- fakeroot-1.25.3/debian/changelog	2020-10-08 19:13:45.000000000 +0200
+++ fakeroot-1.25.3/debian/changelog	2020-11-10 09:36:35.000000000 +0100
@@ -1,3 +1,11 @@
+fakeroot (1.25.3-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * add patch to revert commit "Use fixed-width members in fake_msg"
+    closes: #973405
+
+ -- Johannes 'josch' Schauer <jo...@debian.org>  Tue, 10 Nov 2020 09:36:35 +0100
+
 fakeroot (1.25.3-1) unstable; urgency=medium
 
   * Patch from Aurelien Jarno to fix statx wrapper on mipsel.
diff -Nru fakeroot-1.25.3/debian/patches/0001-Revert-Use-fixed-width-members-in-fake_msg.patch fakeroot-1.25.3/debian/patches/0001-Revert-Use-fixed-width-members-in-fake_msg.patch
--- fakeroot-1.25.3/debian/patches/0001-Revert-Use-fixed-width-members-in-fake_msg.patch	1970-01-01 01:00:00.000000000 +0100
+++ fakeroot-1.25.3/debian/patches/0001-Revert-Use-fixed-width-members-in-fake_msg.patch	2020-11-10 09:35:02.000000000 +0100
@@ -0,0 +1,72 @@
+From ffba4a8941a5f11748a9d305bf76691e7a2aa296 Mon Sep 17 00:00:00 2001
+From: Johannes 'josch' Schauer <jo...@mister-muffin.de>
+Date: Tue, 3 Nov 2020 00:55:40 +0100
+Subject: [PATCH] Revert "Use fixed-width members in fake_msg"
+
+This reverts commit 2a53909e732b19ccbaf6d1534e932dff74fa757e.
+---
+ message.h | 16 ++++++++++++++--
+ 1 file changed, 14 insertions(+), 2 deletions(-)
+
+diff --git a/message.h b/message.h
+index 6fad1fb..9dfce94 100644
+--- a/message.h
++++ b/message.h
+@@ -48,7 +48,9 @@ typedef uint32_t fake_gid_t;
+ typedef uint32_t fake_mode_t;
+ typedef uint32_t fake_nlink_t;
+ 
++#if __SUNPRO_C
+ #pragma pack(4)
++#endif
+ struct fakestat {
+ 	fake_uid_t   uid;
+ 	fake_gid_t   gid;
+@@ -58,32 +60,42 @@ struct fakestat {
+ 	fake_mode_t  mode;
+ 	fake_nlink_t nlink;
+ } FAKEROOT_ATTR(packed);
++#if __SUNPRO_C
+ #pragma pack()
++#endif
+ 
+ #define MAX_IPC_BUFFER_SIZE 1024
+ 
++#if __SUNPRO_C
+ #pragma pack(4)
++#endif
+ struct fakexattr {
+ 	uint32_t   buffersize;
+ 	char       buf[MAX_IPC_BUFFER_SIZE];
+ 	int32_t    flags_rc; /* flags from setxattr. Return code on round trip */
+ } FAKEROOT_ATTR(packed);
++#if __SUNPRO_C
+ #pragma pack()
++#endif
+ 
++#if __SUNPRO_C
+ #pragma pack(4)
++#endif
+ struct fake_msg {
+ #ifndef FAKEROOT_FAKENET
+-	int64_t mtype; /* message type in SYSV message sending */
++	long mtype; /* message type in SYSV message sending */
+ #endif
+ 	func_id_t       id; /* the requested function */
+ #ifndef FAKEROOT_FAKENET
+ 	pid_t pid;
+-	int32_t serial;
++	int serial;
+ #endif
+ 	struct fakestat st;
+ 	struct fakexattr xattr;
+ 	uint32_t        remote;
+ } FAKEROOT_ATTR(packed);
++#if __SUNPRO_C
+ #pragma pack()
++#endif
+ 
+ #endif
+-- 
+2.27.0
+
diff -Nru fakeroot-1.25.3/debian/patches/series fakeroot-1.25.3/debian/patches/series
--- fakeroot-1.25.3/debian/patches/series	2020-10-08 19:13:32.000000000 +0200
+++ fakeroot-1.25.3/debian/patches/series	2020-11-10 09:35:13.000000000 +0100
@@ -1,2 +1,3 @@
 eglibc-fts-without-LFS
 fix-shell-in-fakeroot
+0001-Revert-Use-fixed-width-members-in-fake_msg.patch

Attachment: signature.asc
Description: signature

Reply via email to