From: kruceter <kruceter@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] xdm: fix build with glibc 2.36
Date: Sun, 20 Nov 2022 04:16:20 +0100 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-40634@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 613 bytes --]
There is a new pull request by kruceter against master on the void-packages repository
https://github.com/kruceter/void-packages xdm
https://github.com/void-linux/void-packages/pull/40634
xdm: fix build with glibc 2.36
Refer to #39960.
[xdm.txt](https://github.com/void-linux/void-packages/files/10048371/xdm.txt)
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64
A patch file from https://github.com/void-linux/void-packages/pull/40634.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-xdm-40634.patch --]
[-- Type: text/x-diff, Size: 1587 bytes --]
From b25eff91f337c19a1f3fbd17daa47ec4c1d11e3a Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Sun, 20 Nov 2022 06:10:58 +0300
Subject: [PATCH] xdm: fix build with glibc 2.36
---
srcpkgs/xdm/patches/glibc-2.36.patch | 36 ++++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
create mode 100644 srcpkgs/xdm/patches/glibc-2.36.patch
diff --git a/srcpkgs/xdm/patches/glibc-2.36.patch b/srcpkgs/xdm/patches/glibc-2.36.patch
new file mode 100644
index 000000000000..7f0166dcf701
--- /dev/null
+++ b/srcpkgs/xdm/patches/glibc-2.36.patch
@@ -0,0 +1,36 @@
+From 468b76023a2dfb750c4d5e9b184f230c5b6ec670 Mon Sep 17 00:00:00 2001
+From: Callum Farmer <gmbr3@opensuse.org>
+Date: Sun, 11 Sep 2022 12:57:05 +0100
+Subject: [PATCH] genauth: fix build with arc4random in glibc 2.36
+
+HAVE_ARC4RANDOM is defined under glibc 2.36 but this will attempt to include
+<bsd/stdlib.h> from libbsd instead of <stdlib.h> from glibc
+
+Signed-off-by: Callum Farmer <gmbr3@opensuse.org>
+---
+ xdm/genauth.c | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/xdm/genauth.c b/xdm/genauth.c
+index 38a0215..de7abfc 100644
+--- a/xdm/genauth.c
++++ b/xdm/genauth.c
+@@ -42,7 +42,15 @@ from The Open Group.
+
+ #ifdef HAVE_ARC4RANDOM
+ # ifdef __linux__
+-# include <bsd/stdlib.h>
++# if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
++# if __GLIBC_PREREQ(2, 36)
++# include <stdlib.h>
++# else
++# include <bsd/stdlib.h>
++# endif
++# else
++# include <bsd/stdlib.h>
++# endif
+ # else
+ # include <stdlib.h>
+ # endif
+--
+GitLab
next reply other threads:[~2022-11-20 3:16 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-20 3:16 kruceter [this message]
2022-11-20 12:50 ` [PR PATCH] [Merged]: " paper42
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-40634@inbox.vuxu.org \
--to=kruceter@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).