Date: Tuesday, April 13, 2021 @ 15:17:18 Author: lcarlier Revision: 412401
upgpkg: xorg-server 1.20.11-1: upstream update 1.20.11, fixes CVE-2021-3472 Modified: xorg-server/trunk/PKGBUILD ----------+ PKGBUILD | 47 +++++++++++++++-------------------------------- 1 file changed, 15 insertions(+), 32 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-04-13 14:56:26 UTC (rev 412400) +++ PKGBUILD 2021-04-13 15:17:18 UTC (rev 412401) @@ -4,11 +4,8 @@ pkgbase=xorg-server pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel') - -_commit=bc111a2e67e16d4e6d4f3196ab86c22c1e278c45 # server-1.20-branch 2020-12-01 = 1.20.10 - -pkgver=1.20.10 -pkgrel=3 +pkgver=1.20.11 +pkgrel=1 arch=('x86_64') license=('custom') groups=('xorg') @@ -20,8 +17,7 @@ 'xcb-util' 'xcb-util-image' 'xcb-util-renderutil' 'xcb-util-wm' 'xcb-util-keysyms' 'libxshmfence' 'libunwind' 'systemd' 'meson' 'git' 'wayland-protocols' 'egl-wayland') -source=(#https://xorg.freedesktop.org/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2{,.sig} - "git+https://gitlab.freedesktop.org/xorg/xserver#commit=${_commit}" #?signed" +source=(https://xorg.freedesktop.org/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2{,.sig} xserver-autobind-hotplug.patch 0001-v2-FS-58644.patch 0002-fix-libshadow-2.patch @@ -32,7 +28,8 @@ 'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3' '' '3BB639E56F861FA2E86505690FDD682D974CA72A') -sha256sums=('SKIP' +sha256sums=('914c796e3ffabe1af48071d40ccc85e92117c97a9082ed1df29e4d64e3c34c49' + 'SKIP' 'cae1b7f296c18177de38f9b1215a4f916da2288b85f1fcb9e80373a42e2892b8' '6253fb5cf06cf650539be585d6ca13cfa00217b51ca9825476c8fd55c09341a4' 'd07b2fe55828dad61517a80c77f6f183113916f5e1fce30ff43041550d58bd6e' @@ -39,14 +36,8 @@ 'd709078f5658576931655c7a46ff90b3586a2643a9124075d00ff3a567937845' '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776') -pkgver() { - cd xserver - git describe --tags | sed 's/^xorg.server.//;s/\([^-]*-g\)/r\1/;s/-/./g' -} - prepare() { - #cd "${pkgbase}"-${pkgver}" - cd xserver + cd "${pkgbase}-${pkgver}" # patch from Fedora, not yet merged patch -Np1 -i ../xserver-autobind-hotplug.patch @@ -67,9 +58,8 @@ export CXXFLAGS=${CXXFLAGS/-fno-plt} export LDFLAGS=${LDFLAGS/,-z,now} - #arch-meson ${pkgbase}-$pkgver build \ - arch-meson xserver build \ - -D os_vendor="Arch Linux" \ + arch-meson ${pkgbase}-$pkgver build \ + -D os_vendor="Archlinux" \ -D ipv6=true \ -D xvfb=true \ -D xnest=true \ @@ -110,11 +100,9 @@ _install fakeinstall/usr/lib/xorg/protocol.txt _install fakeinstall/usr/share/man/man1/Xserver.1 - #install -m644 -Dt "${pkgdir}/var/lib/xkb/" "${pkgbase}-${pkgver}"/xkb/README.compiled - install -m644 -Dt "${pkgdir}/var/lib/xkb/" xserver/xkb/README.compiled + install -m644 -Dt "${pkgdir}/var/lib/xkb/" "${pkgbase}-${pkgver}"/xkb/README.compiled # license - #install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING - install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xserver/COPYING + install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING } package_xorg-server() { @@ -143,8 +131,7 @@ install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d" # license - #install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING - install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xserver/COPYING + install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING } package_xorg-server-xephyr() { @@ -157,8 +144,7 @@ _install fakeinstall/usr/share/man/man1/Xephyr.1 # license - #install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING - install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xserver/COPYING + install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING } package_xorg-server-xvfb() { @@ -173,8 +159,7 @@ install -m644 "${srcdir}/xvfb-run.1" "${pkgdir}/usr/share/man/man1/" # outda # license - #install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING - install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xserver/COPYING + install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING } package_xorg-server-xnest() { @@ -185,8 +170,7 @@ _install fakeinstall/usr/share/man/man1/Xnest.1 # license - #install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING - install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xserver/COPYING + install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING } package_xorg-server-devel() { @@ -200,8 +184,7 @@ _install fakeinstall/usr/share/aclocal/xorg-server.m4 # license - #install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING - install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xserver/COPYING + install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING # make sure there are no files left to install rm fakeinstall/usr/bin/Xwayland