summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Housh <jaeger@crux.ninja>2022-10-12 23:52:24 -0500
committerMatt Housh <jaeger@crux.ninja>2022-10-12 23:52:24 -0500
commit7575931e149d964c9e78e1129258c376eb03cc9f (patch)
tree89f4cf11c7351a5effab16c25dbb0e4c6fec41d0
parentb1e207769fde86a4a9cfe158ecb35a303e5a1a7d (diff)
downloadxorg-7575931e149d964c9e78e1129258c376eb03cc9f.tar.gz
xorg-7575931e149d964c9e78e1129258c376eb03cc9f.tar.xz
xorg-xdm: added patch for building with glibc 2.36
-rw-r--r--xorg-xdm/.signature5
-rw-r--r--xorg-xdm/Pkgfile3
-rw-r--r--xorg-xdm/xorg-xdm-glibc-2.36.patch21
3 files changed, 26 insertions, 3 deletions
diff --git a/xorg-xdm/.signature b/xorg-xdm/.signature
index d59690c4..531a280f 100644
--- a/xorg-xdm/.signature
+++ b/xorg-xdm/.signature
@@ -1,7 +1,8 @@
untrusted comment: verify with /etc/ports/xorg.pub
-RWTSGWF5Q7TndK6PUAx8yNuUe4z5qlZs4KzJ3o+azfYy+T7u/DHZ1my1NcIh1hZmJ4x+lZ2OwFnHQJGC4zdz8IPdCjBvs6ggQgI=
-SHA256 (Pkgfile) = 691e91fe2983d4280dd56d720564d8d59d8bffb6b8188d2915193c27c74e6915
+RWTSGWF5Q7TndPC7XEX3mJLIzwnk0AsETFjmHDE+mCu6ZDqrjExirzuufmVLHWZRTrmQ4spmtuBv0c7x7vQbz+sC4K7A0Xc0vQM=
+SHA256 (Pkgfile) = 82aa6b1002e27b8eda53457a6453ae4c651eef14c5d4500af6583cd714df3bdd
SHA256 (.footprint) = 80ccfc3956875dbdb8c9c8f95799e0c9361263086eaa65a6e43eae1a1ffd6131
SHA256 (xdm-1.1.13.tar.xz) = e58267e8f1478f2f5cd57cbcf2367a36973860c3131a450a3e0816585af03264
SHA256 (xdm) = 08f8309871469f521d70feb674e36ca683e7cb21d9728c899c93bb1d93b321a5
SHA256 (xdm.pam) = b40957971af8c231d118e78612e2909741d21e4dc437fa5052106e648a79a2d7
+SHA256 (xorg-xdm-glibc-2.36.patch) = a8143bb78728c7401a84c2ae7fdd34a76bdb2f282ef7679cd87dcd1ddfc6b00e
diff --git a/xorg-xdm/Pkgfile b/xorg-xdm/Pkgfile
index 11231de2..017c33cf 100644
--- a/xorg-xdm/Pkgfile
+++ b/xorg-xdm/Pkgfile
@@ -7,10 +7,11 @@ name=xorg-xdm
version=1.1.13
release=1
source=(https://www.x.org/releases/individual/app/xdm-$version.tar.xz
- xdm xdm.pam)
+ xdm xdm.pam xorg-xdm-glibc-2.36.patch)
build() {
cd xdm-$version
+ patch -p1 -i $SRC/xorg-xdm-glibc-2.36.patch
./configure \
--prefix=/usr \
diff --git a/xorg-xdm/xorg-xdm-glibc-2.36.patch b/xorg-xdm/xorg-xdm-glibc-2.36.patch
new file mode 100644
index 00000000..f15ea64f
--- /dev/null
+++ b/xorg-xdm/xorg-xdm-glibc-2.36.patch
@@ -0,0 +1,21 @@
+diff --git a/xdm/genauth.c b/xdm/genauth.c
+index 38a021599fe26f0b3d73549df3d3f9c7d405adb6..de7abfc87b3a163e69661720d386d59ca0e6aa43 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

Generated by cgit