Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xdm for openSUSE:Factory checked in at 2022-09-15 22:57:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xdm (Old) and /work/SRC/openSUSE:Factory/.xdm.new.2083 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xdm" Thu Sep 15 22:57:48 2022 rev:96 rq:1003539 version:1.1.13 Changes: -------- --- /work/SRC/openSUSE:Factory/xdm/xdm.changes 2022-08-23 14:25:58.767138004 +0200 +++ /work/SRC/openSUSE:Factory/.xdm.new.2083/xdm.changes 2022-09-15 22:58:01.517018021 +0200 @@ -1,0 +2,6 @@ +Fri Sep 9 09:53:34 UTC 2022 - Callum Farmer <[email protected]> + +- Add u_glibc-2.36.patch: use glibc's arc4random instead of + libbsd's (bsc#1202222) + +------------------------------------------------------------------- New: ---- u_glibc-2.36.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xdm.spec ++++++ --- /var/tmp/diff_new_pack.tv3HJs/_old 2022-09-15 22:58:02.009019410 +0200 +++ /var/tmp/diff_new_pack.tv3HJs/_new 2022-09-15 22:58:02.013019421 +0200 @@ -40,12 +40,12 @@ 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 @@ pushd xdm %patch1 -p1 popd +%patch5 -p1 # reverse apply (boo#1130321) %patch3 -p1 -R ++++++ u_glibc-2.36.patch ++++++ >From 468b76023a2dfb750c4d5e9b184f230c5b6ec670 Mon Sep 17 00:00:00 2001 From: Callum Farmer <[email protected]> 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 <[email protected]> --- 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
