Accepting request 1040075 from X11:XOrg

- Update to release 1.1.14
  * This release improves compatibility for building with GNU
    libc 2.36, and adds a --without-xinerama option to the
    configure script for those who want to build without linking
    to libXinerama.
- supersedes u_glibc-2.36.patch

OBS-URL: https://build.opensuse.org/request/show/1040075
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xdm?expand=0&rev=98

u_glibc-2.36.patch

@@ -1,39 +0,0 @@
-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

xdm-1.1.13.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e58267e8f1478f2f5cd57cbcf2367a36973860c3131a450a3e0816585af03264
-size 418404

xdm.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Sun Dec  4 21:36:50 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
+
+- Update to release 1.1.14
+  * This release improves compatibility for building with GNU
+    libc 2.36, and adds a --without-xinerama option to the
+    configure script for those who want to build without linking
+    to libXinerama.
+- supersedes u_glibc-2.36.patch
+
 -------------------------------------------------------------------
 Thu Oct 13 09:55:49 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
 

xdm.spec

@@ -25,7 +25,7 @@
   %define _fillupdir %{_localstatedir}/adm/fillup-templates
 %endif
 Name:           xdm
-Version:        1.1.13
+Version:        1.1.14
 Release:        0
 Summary:        X Display Manager
 License:        MIT
@@ -40,7 +40,6 @@ 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
@@ -102,7 +101,6 @@ cp %{SOURCE2} .
 pushd xdm
 %patch1 -p1
 popd
-%patch5 -p1
 # reverse apply (boo#1130321)
 %patch3 -p1 -R