rpm/xdm
SHA256
1
0
Fork 0
forked from pool/xdm
Code Pull Requests Activity

Accepting request 1002507 from home:gmbr3:Active

Browse Source 
- Add u_glibc-2.36.patch: use glibc's arc4random instead of
  libbsd's (bsc#1202222)

OBS-URL: https://build.opensuse.org/request/show/1002507
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=252
This commit is contained in:
Stefan Dirsch 2022-09-14 13:51:34 +00:00 committed by Git OBS Bridge
parent f24d8c7499
commit e509876789
3 changed files with 47 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
u_glibc-2.36.patch Normal file
View File

@ -0,0 +1,39 @@
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
Patch-mainline: to be upstreamed
References: https://gitlab.freedesktop.org/xorg/app/xdm/-/merge_requests/11
bsc#1202222
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

6
xdm.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Sep 9 09:53:34 UTC 2022 - Callum Farmer <gmbr3@opensuse.org>
- Add u_glibc-2.36.patch: use glibc's arc4random instead of
libbsd's (bsc#1202222)
-------------------------------------------------------------------
Fri Aug 19 09:42:56 UTC 2022 - Dirk Müller <dmueller@suse.com>

3
xdm.spec
View File

@ -40,12 +40,12 @@ Patch1: xdm-tolerant-hostname-changes.diff
Patch2: xdm-tarball.patch
Patch3: n_Allow-the-greeter-to-set-the-input-fields-bg-color.patch
Patch4: xinit-UsrEtcMove.patch
Patch5: u_glibc-2.36.patch
BuildRequires: firewall-macros
BuildRequires: libtool
BuildRequires: pam-devel
BuildRequires: pkgconfig
BuildRequires: systemd-rpm-macros
BuildRequires: pkgconfig(libbsd)
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xau)
BuildRequires: pkgconfig(xaw7)
@ -102,6 +102,7 @@ cp %{SOURCE2} .
pushd xdm
%patch1 -p1
popd
%patch5 -p1
# reverse apply (boo#1130321)
%patch3 -p1 -R