From 0b0839989d9a2143a85e1e0c2ed9220ae365f08f Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 4 Dec 2022 17:35:53 +0100 Subject: [PATCH] xdm: update to 1.1.14. --- srcpkgs/xdm/patches/glibc-2.36.patch | 36 ---------------------------- srcpkgs/xdm/template | 6 ++--- 2 files changed, 3 insertions(+), 39 deletions(-) delete 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 deleted file mode 100644 index 7f0166dcf70..00000000000 --- a/srcpkgs/xdm/patches/glibc-2.36.patch +++ /dev/null @@ -1,36 +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 - -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/srcpkgs/xdm/template b/srcpkgs/xdm/template index 3a53a7ae30c..2fdc56ad7f2 100644 --- a/srcpkgs/xdm/template +++ b/srcpkgs/xdm/template @@ -1,6 +1,6 @@ # Template file for 'xdm' pkgname=xdm -version=1.1.13 +version=1.1.14 revision=1 build_style=gnu-configure configure_args="--with-random-device=/dev/urandom @@ -21,8 +21,8 @@ short_desc="X Display Manager" maintainer="Leah Neukirchen " license="MIT" homepage="http://xorg.freedesktop.org" -distfiles="${XORG_SITE}/app/$pkgname-$version.tar.xz" -checksum=e58267e8f1478f2f5cd57cbcf2367a36973860c3131a450a3e0816585af03264 +distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz" +checksum=3e9bf25636797ec9e595286dd6820ecc33901439f07705eaf608ecda012c3d5f post_install() { vsv xdm