From 9fe2e409c1f6c6e788ba585b950dc631e61462a08c252dfccabc5816c7edc356 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Sun, 4 Dec 2022 21:51:34 +0000 Subject: [PATCH] - 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/package/show/X11:XOrg/xdm?expand=0&rev=257 --- u_glibc-2.36.patch | 39 --------------------------------------- xdm-1.1.13.tar.xz | 3 --- xdm-1.1.14.tar.xz | 3 +++ xdm.changes | 10 ++++++++++ xdm.spec | 4 +--- 5 files changed, 14 insertions(+), 45 deletions(-) delete mode 100644 u_glibc-2.36.patch delete mode 100644 xdm-1.1.13.tar.xz create mode 100644 xdm-1.1.14.tar.xz diff --git a/u_glibc-2.36.patch b/u_glibc-2.36.patch deleted file mode 100644 index 6d676cb..0000000 --- a/u_glibc-2.36.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 468b76023a2dfb750c4d5e9b184f230c5b6ec670 Mon Sep 17 00:00:00 2001 -From: Callum Farmer -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 - from libbsd instead of from glibc - -Signed-off-by: Callum Farmer ---- - 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 -+# if defined(__GLIBC__) && defined(__GLIBC_PREREQ) -+# if __GLIBC_PREREQ(2, 36) -+# include -+# else -+# include -+# endif -+# else -+# include -+# endif - # else - # include - # endif --- -GitLab diff --git a/xdm-1.1.13.tar.xz b/xdm-1.1.13.tar.xz deleted file mode 100644 index a8dff20..0000000 --- a/xdm-1.1.13.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e58267e8f1478f2f5cd57cbcf2367a36973860c3131a450a3e0816585af03264 -size 418404 diff --git a/xdm-1.1.14.tar.xz b/xdm-1.1.14.tar.xz new file mode 100644 index 0000000..33aa308 --- /dev/null +++ b/xdm-1.1.14.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3e9bf25636797ec9e595286dd6820ecc33901439f07705eaf608ecda012c3d5f +size 419324 diff --git a/xdm.changes b/xdm.changes index 264f258..2e46970 100644 --- a/xdm.changes +++ b/xdm.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sun Dec 4 21:36:50 UTC 2022 - Stefan Dirsch + +- 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 diff --git a/xdm.spec b/xdm.spec index 1ef19c5..8c6dadb 100644 --- a/xdm.spec +++ b/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