[arch-commits] Commit in xorg-server/trunk (PKGBUILD)

2022-05-23 Thread Andreas Radke via arch-commits 
Date: Monday, May 23, 2022 @ 19:59:39
  Author: andyrtr
Revision: 446466

upgpkg: xorg-server 21.1.3-7: actually enable libunwind - FS#74837

Modified:
  xorg-server/trunk/PKGBUILD

--+
 PKGBUILD |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-05-23 19:46:54 UTC (rev 446465)
+++ PKGBUILD2022-05-23 19:59:39 UTC (rev 446466)
@@ -5,7 +5,7 @@
 pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xvfb' 
'xorg-server-xnest'
  'xorg-server-common' 'xorg-server-devel')
 pkgver=21.1.3
-pkgrel=6
+pkgrel=7
 arch=('x86_64')
 license=('custom')
 groups=('xorg')
@@ -70,7 +70,8 @@
 -D systemd_logind=true \
 -D suid_wrapper=true \
 -D xkb_dir=/usr/share/X11/xkb \
--D xkb_output_dir=/var/lib/xkb
+-D xkb_output_dir=/var/lib/xkb \
+-D libunwind=true
 
   # Print config
   meson configure build
@@ -161,7 +162,7 @@
 
 package_xorg-server-xnest() {
   pkgdesc="A nested X server that runs as an X application"
-  depends=(libxfont2 libxext pixman xorg-server-common nettle libtirpc 
systemd-libs)
+  depends=(libxfont2 libunwind libxext pixman xorg-server-common nettle 
libtirpc systemd-libs)
 
   _install fakeinstall/usr/bin/Xnest
   _install fakeinstall/usr/share/man/man1/Xnest.1

[arch-commits] Commit in xorg-server/trunk (PKGBUILD xvfb-run)

2022-02-18 Thread Andreas Radke via arch-commits 
Date: Friday, February 18, 2022 @ 18:30:09
  Author: andyrtr
Revision: 437697

upgpkg: xorg-server 21.1.3-3: fix xvfb-run does not accept --auth-file - 
FS#73865

Modified:
  xorg-server/trunk/PKGBUILD
  xorg-server/trunk/xvfb-run

--+
 PKGBUILD |4 ++--
 xvfb-run |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-02-18 18:29:34 UTC (rev 437696)
+++ PKGBUILD2022-02-18 18:30:09 UTC (rev 437697)
@@ -5,7 +5,7 @@
 pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xvfb' 
'xorg-server-xnest'
  'xorg-server-common' 'xorg-server-devel')
 pkgver=21.1.3
-pkgrel=2
+pkgrel=3
 arch=('x86_64')
 license=('custom')
 groups=('xorg')
@@ -24,7 +24,7 @@
 validpgpkeys=('FD0004A26EADFE43A4C3F249C6F7AE200374452D') # Povilas Kanapickas 

 
sha512sums=('cf5fed023eadda62ae732f8c4d427c272ebe005188341290f3d03147042c103b00cbb94d86a0256da815fb9b9a3da315c21a05ee0c926c1a2ff0c54ab0c0638b'
 'SKIP'
-
'4154dd55702b98083b26077bf70c60aa957b4795dbf831bcc4c78b3cb44efe214f0cf8e3c140729c829b5f24e7466a24615ab8dbcce0ac6ebee3229531091514'
+
'87c79b4a928e74463f96f58d277558783eac9b8ea6ba00d667ad84c4d65b3792d960ea2a70089ae18162e82ae572a49ad36df169c974cc99dbaa51f63eb2'
 
'de5e2cb3c6825e6cf1f07ca0d52423e17f34d70ec7935e9dd24be5fb9883bf1e03b50ff584931bd3b41095c510ab2aa44d2573fd5feaebdcb59363b65607ff22'
 
'bc3b955072f320ae72a771bebecbcf56637cd0448c3afa28149fcd9e0de3700e9fba1fec21fe283be77e1236e317e385f6970eb59df54d3181324c229c8309d7')
 

Modified: xvfb-run
===
--- xvfb-run2022-02-18 18:29:34 UTC (rev 437696)
+++ xvfb-run2022-02-18 18:30:09 UTC (rev 437697)
@@ -101,7 +101,7 @@
 
 # Parse the command line.
 ARGS=$(getopt --options +ade:f:hn:lp:s:w: \
-   --long 
auto-servernum,auto-display,error-file:auth-file:,help,server-num:,listen-tcp,xauth-protocol:,server-args:,wait:
 \
+   --long 
auto-servernum,auto-display,error-file:,auth-file:,help,server-num:,listen-tcp,xauth-protocol:,server-args:,wait:
 \
--name "$PROGNAME" -- "$@")
 GETOPT_STATUS=$?

[arch-commits] Commit in xorg-server/trunk (PKGBUILD)

2021-11-06 Thread Laurent Carlier via arch-commits 
Date: Saturday, November 6, 2021 @ 10:08:51
  Author: lcarlier
Revision: 427395

upgpkg: xorg-server 21.1.0-1: upstream update 21.1.0

Modified:
  xorg-server/trunk/PKGBUILD

--+
 PKGBUILD |   38 --
 1 file changed, 38 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-11-06 10:00:31 UTC (rev 427394)
+++ PKGBUILD2021-11-06 10:08:51 UTC (rev 427395)
@@ -4,16 +4,8 @@
 pkgbase=xorg-server
 pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xvfb' 
'xorg-server-xnest'
  'xorg-server-common' 'xorg-server-devel')
-<<< .mine
 pkgver=21.1.0
 pkgrel=1
-||| .r426734
-pkgver=1.20.13
-pkgrel=2
-===
-pkgver=1.20.13
-pkgrel=3
->>> .r427393
 arch=('x86_64')
 license=('custom')
 groups=('xorg')
@@ -97,15 +89,7 @@
   pkgdesc="Xorg X server"
   depends=(libepoxy libxfont2 pixman xorg-server-common libunwind
dbus libgl xf86-input-libinput nettle
-<<< .mine
libpciaccess libdrm libxshmfence libxcvt) # FS#52949
-||| .r426734
-   libpciaccess libdrm libxshmfence) # FS#52949
-
-===
-   libpciaccess libdrm libxshmfence libxcvt) # FS#52949
-
->>> .r427393
   # see xorg-server-*/hw/xfree86/common/xf86Module.h for ABI versions - we 
provide major numbers that drivers can depend on
   # and /usr/lib/pkgconfig/xorg-server.pc in xorg-server-devel pkg
   provides=('X-ABI-VIDEODRV_VERSION=25.2' 'X-ABI-XINPUT_VERSION=24.4' 
'X-ABI-EXTENSION_VERSION=10.0' 'x-server')
@@ -113,28 +97,12 @@
   replaces=('glamor-egl' 'xf86-video-modesetting')
   install=xorg-server.install
 
-<<< .mine
   _install fakeinstall/usr/bin/{X,Xorg,gtf}
-||| .r426734
-  _install fakeinstall/usr/bin/{Xorg,cvt,gtf}
-  ln -s /usr/bin/Xorg "${pkgdir}/usr/bin/X"
-===
-  _install fakeinstall/usr/bin/{Xorg,gtf}
-  ln -s /usr/bin/Xorg "${pkgdir}/usr/bin/X"
->>> .r427393
   _install fakeinstall/usr/lib/Xorg{,.wrap}
   _install fakeinstall/usr/lib/xorg/modules/*
   _install fakeinstall/usr/share/X11/xorg.conf.d/10-quirks.conf
-<<< .mine
   _install fakeinstall/usr/share/man/man1/{Xorg,Xorg.wrap,gtf}.1
   _install 
fakeinstall/usr/share/man/man4/{exa,fbdevhw,inputtestdrv,modesetting}.4
-||| .r426734
-  _install fakeinstall/usr/share/man/man1/{Xorg,Xorg.wrap,cvt,gtf}.1
-  _install fakeinstall/usr/share/man/man4/{exa,fbdevhw,modesetting}.4
-===
-  _install fakeinstall/usr/share/man/man1/{Xorg,Xorg.wrap,gtf}.1
-  _install fakeinstall/usr/share/man/man4/{exa,fbdevhw,modesetting}.4
->>> .r427393
   _install 
fakeinstall/usr/share/man/man5/{Xwrapper.config,xorg.conf,xorg.conf.d}.5
 
   # distro specific files must be installed in /usr/share/X11/xorg.conf.d
@@ -197,11 +165,5 @@
   install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" 
"${pkgbase}-${pkgver}"/COPYING
 
   # make sure there are no files left to install
-<<< .mine
-||| .r426734
-  rm fakeinstall/usr/bin/Xwayland
-===
-  rm -rf fakeinstall/usr/bin/cvt fakeinstall/usr/share/man/man1/cvt.1
->>> .r427393
   find fakeinstall -depth -print0 | xargs -0 rmdir
 }

[arch-commits] Commit in xorg-server/trunk (PKGBUILD)

2021-11-06 Thread Laurent Carlier via arch-commits 
Date: Saturday, November 6, 2021 @ 10:00:31
  Author: lcarlier
Revision: 427394

upgpkg: xorg-server -: upstream update 21.1.0

Modified:
  xorg-server/trunk/PKGBUILD

--+
 PKGBUILD |   67 ++---
 1 file changed, 42 insertions(+), 25 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-11-06 01:13:54 UTC (rev 427393)
+++ PKGBUILD2021-11-06 10:00:31 UTC (rev 427394)
@@ -4,33 +4,32 @@
 pkgbase=xorg-server
 pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xvfb' 
'xorg-server-xnest'
  'xorg-server-common' 'xorg-server-devel')
+<<< .mine
+pkgver=21.1.0
+pkgrel=1
+||| .r426734
 pkgver=1.20.13
+pkgrel=2
+===
+pkgver=1.20.13
 pkgrel=3
+>>> .r427393
 arch=('x86_64')
 license=('custom')
 groups=('xorg')
 url="https://xorg.freedesktop.org;
 makedepends=('xorgproto' 'pixman' 'libx11' 'mesa' 'mesa-libgl' 'xtrans'
- 'libxkbfile' 'libxfont2' 'libpciaccess' 'libxv'
+ 'libxkbfile' 'libxfont2' 'libpciaccess' 'libxv' 'libxcvt'
  'libxmu' 'libxrender' 'libxi' 'libxaw' 'libxtst' 'libxres'
  'xorg-xkbcomp' 'xorg-util-macros' 'xorg-font-util' 'libepoxy'
  'xcb-util' 'xcb-util-image' 'xcb-util-renderutil' 'xcb-util-wm' 
'xcb-util-keysyms'
  'libxshmfence' 'libunwind' 'systemd' 'meson' 'git')
-source=(https://xorg.freedesktop.org/releases/individual/xserver/${pkgbase}-${pkgver}.tar.xz{,.sig}
-xserver-autobind-hotplug.patch
-0001-v2-FS-58644.patch
-0002-fix-libshadow-2.patch
+source=(${pkgbase}-${pkgver}::git+https://gitlab.freedesktop.org/xorg/xserver.git#commit=27a0ee32ccef8d621aaa758c804fc9a5ceeb5a56
+#source=(https://xorg.freedesktop.org/releases/individual/xserver/${pkgbase}-${pkgver}.tar.xz{,.sig}
 xvfb-run # with updates from FC master
 xvfb-run.1)
-validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C'
-  'C383B778255613DFDB409D91DB221A690011'
-  'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3'
-  '3BB639E56F861FA2E86505690FDD682D974CA72A')
-sha512sums=('4e0b7bd4e070dc52cb2c51c2056feb133de2c0487d359392ed63abba9702910cd2e2983e9415973d8d6e9672eac78be6f39202687fc56610877914ce722554b3'
-'SKIP'
-
'd84f4d63a502b7af76ea49944d1b21e2030dfd250ac1e82878935cf631973310ac9ba1f0dfedf10980ec6c7431d61b7daa4b7bbaae9ee477b2c19812c1661a22'
-
'74e1aa0c101e42f0f25349d305641873b3a79ab3b9bb2d4ed68ba8e392b4db2701fcbc35826531ee2667d3ee55673e4b4fecc2a9f088141af29ceb400f72f363'
-
'3d3be34ad9fa976daec53573d3a30a9f1953341ba5ee27099af0141f0ef7994fa5cf84dc08aae848380e6abfc10879f9a67f07601c7a437abf8aef13a3ec9fe1'
+validpgpkeys=('FD0004A26EADFE43A4C3F249C6F7AE200374452D') # Povilas Kanapickas 

+sha512sums=('SKIP'
 
'4154dd55702b98083b26077bf70c60aa957b4795dbf831bcc4c78b3cb44efe214f0cf8e3c140729c829b5f24e7466a24615ab8dbcce0ac6ebee3229531091514'
 
'de5e2cb3c6825e6cf1f07ca0d52423e17f34d70ec7935e9dd24be5fb9883bf1e03b50ff584931bd3b41095c510ab2aa44d2573fd5feaebdcb59363b65607ff22')
 
@@ -37,15 +36,6 @@
 prepare() {
   cd "${pkgbase}-${pkgver}"
 
-  # patch from Fedora, not yet merged
-  patch -Np1 -i ../xserver-autobind-hotplug.patch
-
-  # Fix rootless xorg - FS#58644
-  # https://bugs.freedesktop.org/show_bug.cgi?id=106588
-  patch -Np1 -i ../0001-v2-FS-58644.patch
-
-  # Fix libshadow.so: libfb.so => not found - merge in master
-  patch -Np1 -i ../0002-fix-libshadow-2.patch
 }
 
 build() {
@@ -57,7 +47,6 @@
   export LDFLAGS=${LDFLAGS/,-z,now}
 
   arch-meson ${pkgbase}-$pkgver build \
--D os_vendor="Archlinux" \
 -D ipv6=true \
 -D xvfb=true \
 -D xnest=true \
@@ -66,6 +55,7 @@
 -D xephyr=true \
 -D glamor=true \
 -D udev=true \
+-D dtrace=false \
 -D systemd_logind=true \
 -D suid_wrapper=true \
 -D xkb_dir=/usr/share/X11/xkb \
@@ -107,22 +97,44 @@
   pkgdesc="Xorg X server"
   depends=(libepoxy libxfont2 pixman xorg-server-common libunwind
dbus libgl xf86-input-libinput nettle
+<<< .mine
libpciaccess libdrm libxshmfence libxcvt) # FS#52949
+||| .r426734
+   libpciaccess libdrm libxshmfence) # FS#52949
 
+===
+   libpciaccess libdrm libxshmfence libxcvt) # FS#52949
+
+>>> .r427393
   # see xorg-server-*/hw/xfree86/common/xf86Module.h for ABI versions - we 
provide major numbers that drivers can depend on
   # and /usr/lib/pkgconfig/xorg-server.pc in xorg-server-devel pkg
-  provides=('X-ABI-VIDEODRV_VERSION=24.0' 'X-ABI-XINPUT_VERSION=24.1' 
'X-ABI-EXTENSION_VERSION=10.0' 'x-server')
+  provides=('X-ABI-VIDEODRV_VERSION=25.2' 'X-ABI-XINPUT_VERSION=24.4' 
'X-ABI-EXTENSION_VERSION=10.0' 'x-server')
   conflicts=('nvidia-utils<=331.20' 'glamor-egl' 'xf86-video-modesetting')
   replaces=('glamor-egl' 'xf86-video-modesetting')
   install=xorg-server.install
 
+<<< .mine
+

[arch-commits] Commit in xorg-server/trunk (PKGBUILD)

2021-10-31 Thread Andreas Radke via arch-commits 
Date: Sunday, October 31, 2021 @ 06:32:38
  Author: andyrtr
Revision: 426850

upgpkg: xorg-server 1.20.13-3: depend on libxcvt - FS#72013; fully drop 
xwayland build because we do a standalone build now

Modified:
  xorg-server/trunk/PKGBUILD

--+
 PKGBUILD |6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-10-31 06:25:06 UTC (rev 426849)
+++ PKGBUILD2021-10-31 06:32:38 UTC (rev 426850)
@@ -15,8 +15,7 @@
  'libxmu' 'libxrender' 'libxi' 'libxaw' 'libxtst' 'libxres'
  'xorg-xkbcomp' 'xorg-util-macros' 'xorg-font-util' 'libepoxy'
  'xcb-util' 'xcb-util-image' 'xcb-util-renderutil' 'xcb-util-wm' 
'xcb-util-keysyms'
- 'libxshmfence' 'libunwind' 'systemd' 'meson' 'git'
- 'wayland-protocols' 'egl-wayland')
+ 'libxshmfence' 'libunwind' 'systemd' 'meson' 'git')
 
source=(https://xorg.freedesktop.org/releases/individual/xserver/${pkgbase}-${pkgver}.tar.xz{,.sig}
 xserver-autobind-hotplug.patch
 0001-v2-FS-58644.patch
@@ -65,8 +64,6 @@
 -D xcsecurity=true \
 -D xorg=true \
 -D xephyr=true \
--D xwayland=true \
--D xwayland_eglstream=true \
 -D glamor=true \
 -D udev=true \
 -D systemd_logind=true \
@@ -188,7 +185,6 @@
   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
   rm -rf fakeinstall/usr/bin/cvt fakeinstall/usr/share/man/man1/cvt.1
   find fakeinstall -depth -print0 | xargs -0 rmdir
 }

[arch-commits] Commit in xorg-server/trunk (PKGBUILD)

2021-10-31 Thread Andreas Radke via arch-commits 
Date: Sunday, October 31, 2021 @ 06:24:49
  Author: andyrtr
Revision: 426848

upgpkg: xorg-server 1.20.13-3: depend on libxcvt - FS#72013

Modified:
  xorg-server/trunk/PKGBUILD

--+
 PKGBUILD |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-10-30 20:13:24 UTC (rev 426847)
+++ PKGBUILD2021-10-31 06:24:49 UTC (rev 426848)
@@ -5,7 +5,7 @@
 pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xvfb' 
'xorg-server-xnest'
  'xorg-server-common' 'xorg-server-devel')
 pkgver=1.20.13
-pkgrel=2
+pkgrel=3
 arch=('x86_64')
 license=('custom')
 groups=('xorg')
@@ -110,7 +110,7 @@
   pkgdesc="Xorg X server"
   depends=(libepoxy libxfont2 pixman xorg-server-common libunwind
dbus libgl xf86-input-libinput nettle
-   libpciaccess libdrm libxshmfence) # FS#52949
+   libpciaccess libdrm libxshmfence libxcvt) # FS#52949
 
   # see xorg-server-*/hw/xfree86/common/xf86Module.h for ABI versions - we 
provide major numbers that drivers can depend on
   # and /usr/lib/pkgconfig/xorg-server.pc in xorg-server-devel pkg
@@ -119,12 +119,12 @@
   replaces=('glamor-egl' 'xf86-video-modesetting')
   install=xorg-server.install
 
-  _install fakeinstall/usr/bin/{Xorg,cvt,gtf}
+  _install fakeinstall/usr/bin/{Xorg,gtf}
   ln -s /usr/bin/Xorg "${pkgdir}/usr/bin/X"
   _install fakeinstall/usr/lib/Xorg{,.wrap}
   _install fakeinstall/usr/lib/xorg/modules/*
   _install fakeinstall/usr/share/X11/xorg.conf.d/10-quirks.conf
-  _install fakeinstall/usr/share/man/man1/{Xorg,Xorg.wrap,cvt,gtf}.1
+  _install fakeinstall/usr/share/man/man1/{Xorg,Xorg.wrap,gtf}.1
   _install fakeinstall/usr/share/man/man4/{exa,fbdevhw,modesetting}.4
   _install 
fakeinstall/usr/share/man/man5/{Xwrapper.config,xorg.conf,xorg.conf.d}.5
 
@@ -189,5 +189,6 @@
 
   # make sure there are no files left to install
   rm fakeinstall/usr/bin/Xwayland
+  rm -rf fakeinstall/usr/bin/cvt fakeinstall/usr/share/man/man1/cvt.1
   find fakeinstall -depth -print0 | xargs -0 rmdir
 }

[arch-commits] Commit in xorg-server/trunk (PKGBUILD)

2021-08-04 Thread Laurent Carlier via arch-commits 
Date: Wednesday, August 4, 2021 @ 08:17:46
  Author: lcarlier
Revision: 421117

upgpkg: xorg-server 1.20.13-2: restore Xorg.wrap setuid bit (FS#70469)

Modified:
  xorg-server/trunk/PKGBUILD

--+
 PKGBUILD |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-08-04 07:32:22 UTC (rev 421116)
+++ PKGBUILD2021-08-04 08:17:46 UTC (rev 421117)
@@ -5,7 +5,7 @@
 pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xvfb' 
'xorg-server-xnest'
  'xorg-server-common' 'xorg-server-devel')
 pkgver=1.20.13
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 license=('custom')
 groups=('xorg')
@@ -88,7 +88,9 @@
 f="${src#fakeinstall/}"
 dir="${pkgdir}/${f%/*}"
 install -m755 -d "${dir}"
-mv -v "${src}" "${dir}/"
+# use copy so a new file is created and fakeroot can track properties such 
as setuid
+cp -av "${src}" "${dir}/"
+rm -rf "${src}"
   done
 }

[arch-commits] Commit in xorg-server/trunk (PKGBUILD)

2021-07-08 Thread Andreas Radke via arch-commits 
Date: Thursday, July 8, 2021 @ 20:02:59
  Author: andyrtr
Revision: 419311

upgpkg: xorg-server 1.20.12-1: upstream update 1.20.12

Modified:
  xorg-server/trunk/PKGBUILD

--+
 PKGBUILD |   16 
 1 file changed, 8 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-07-08 19:58:41 UTC (rev 419310)
+++ PKGBUILD2021-07-08 20:02:59 UTC (rev 419311)
@@ -4,7 +4,7 @@
 pkgbase=xorg-server
 pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xvfb' 
'xorg-server-xnest'
  'xorg-server-common' 'xorg-server-devel')
-pkgver=1.20.11
+pkgver=1.20.12
 pkgrel=1
 arch=('x86_64')
 license=('custom')
@@ -17,7 +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}
+source=(https://xorg.freedesktop.org/releases/individual/xserver/${pkgbase}-${pkgver}.tar.xz{,.sig}
 xserver-autobind-hotplug.patch
 0001-v2-FS-58644.patch
 0002-fix-libshadow-2.patch
@@ -27,13 +27,13 @@
   'C383B778255613DFDB409D91DB221A690011'
   'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3'
   '3BB639E56F861FA2E86505690FDD682D974CA72A')
-sha256sums=('914c796e3ffabe1af48071d40ccc85e92117c97a9082ed1df29e4d64e3c34c49'
+sha512sums=('98350c42fb1f10c965663c1c8d4b225689a6a63163d788d454aa71b28b9cc8fcf9709a932f882358a13ca0c277c0c15812d05919092b4c32828d4ed61cca0406'
 'SKIP'
-'cae1b7f296c18177de38f9b1215a4f916da2288b85f1fcb9e80373a42e2892b8'
-'6253fb5cf06cf650539be585d6ca13cfa00217b51ca9825476c8fd55c09341a4'
-'d07b2fe55828dad61517a80c77f6f183113916f5e1fce30ff43041550d58bd6e'
-'d709078f5658576931655c7a46ff90b3586a2643a9124075d00ff3a567937845'
-'2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776')
+
'd84f4d63a502b7af76ea49944d1b21e2030dfd250ac1e82878935cf631973310ac9ba1f0dfedf10980ec6c7431d61b7daa4b7bbaae9ee477b2c19812c1661a22'
+
'74e1aa0c101e42f0f25349d305641873b3a79ab3b9bb2d4ed68ba8e392b4db2701fcbc35826531ee2667d3ee55673e4b4fecc2a9f088141af29ceb400f72f363'
+
'3d3be34ad9fa976daec53573d3a30a9f1953341ba5ee27099af0141f0ef7994fa5cf84dc08aae848380e6abfc10879f9a67f07601c7a437abf8aef13a3ec9fe1'
+
'4154dd55702b98083b26077bf70c60aa957b4795dbf831bcc4c78b3cb44efe214f0cf8e3c140729c829b5f24e7466a24615ab8dbcce0ac6ebee3229531091514'
+
'de5e2cb3c6825e6cf1f07ca0d52423e17f34d70ec7935e9dd24be5fb9883bf1e03b50ff584931bd3b41095c510ab2aa44d2573fd5feaebdcb59363b65607ff22')
 
 prepare() {
   cd "${pkgbase}-${pkgver}"

[arch-commits] Commit in xorg-server/trunk (PKGBUILD)

2021-04-13 Thread Laurent Carlier via arch-commits 
Date: Tuesday, April 13, 2021 @ 18:36:40
  Author: lcarlier
Revision: 412412

remove void signature entry

Modified:
  xorg-server/trunk/PKGBUILD

--+
 PKGBUILD |1 -
 1 file changed, 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-04-13 17:56:50 UTC (rev 412411)
+++ PKGBUILD2021-04-13 18:36:40 UTC (rev 412412)
@@ -26,7 +26,6 @@
 validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C'
   'C383B778255613DFDB409D91DB221A690011'
   'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3'
-  ''
   '3BB639E56F861FA2E86505690FDD682D974CA72A')
 sha256sums=('914c796e3ffabe1af48071d40ccc85e92117c97a9082ed1df29e4d64e3c34c49'
 'SKIP'

[arch-commits] Commit in xorg-server/trunk (PKGBUILD)

2021-04-13 Thread Laurent Carlier via arch-commits 
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
===
--- PKGBUILD2021-04-13 14:56:26 UTC (rev 412400)
+++ PKGBUILD2021-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}"