Date: Friday, December 11, 2020 @ 02:45:43 Author: dbermond Revision: 773099
upgpkg: x11vnc 1:0.9.16-4: fix FS#68930 Added: x11vnc/trunk/x11vnc.service (from rev 773098, x11vnc/trunk/service) Modified: x11vnc/trunk/PKGBUILD Deleted: x11vnc/trunk/service ----------------+ PKGBUILD | 51 +++++++++++++++++++++++++++------------------------ service | 7 ------- x11vnc.service | 7 +++++++ 3 files changed, 34 insertions(+), 31 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-12-11 02:23:36 UTC (rev 773098) +++ PKGBUILD 2020-12-11 02:45:43 UTC (rev 773099) @@ -1,47 +1,50 @@ -# Maintainer: Gaetan Bisson <bis...@archlinux.org> +# Maintainer : Daniel Bermond <dberm...@archlinux.org> +# Contributor: Gaetan Bisson <bis...@archlinux.org> # Contributor: damir <da...@archlinux.org> pkgname=x11vnc +pkgver=0.9.16 +pkgrel=4 epoch=1 -pkgver=0.9.16 -pkgrel=3 -_commit="4ca006fed80410bd9b061a1519bd5d9366bb0bc8" +_commit='4ca006fed80410bd9b061a1519bd5d9366bb0bc8' pkgdesc='VNC server for real X displays' url='https://github.com/LibVNC/x11vnc' arch=('x86_64') -license=('GPL2') -optdepends=('tk: GUI support' - 'net-tools: -auth guess' - 'xf86-video-dummy: Xdummy script') -depends=('libvncserver' 'openssl' 'libjpeg' 'libxtst' 'libxinerama' - 'libxdamage' 'libxrandr' 'avahi' 'xorg-xdpyinfo') -makedpends=('git') +license=('GPL') +depends=('libvncserver' 'openssl' 'libxcrypt' 'libxtst' 'libxext' 'libxinerama' + 'libxrandr' 'libxfixes' 'libxdamage' 'libxcomposite' 'libx11' 'avahi' + 'libxi' 'xorg-xdpyinfo') +optdepends=('tk: for GUI support' + 'net-tools: for -auth guess' + 'xf86-video-dummy: for Xdummy script') +makedepends=('git') source=("git+https://github.com/LibVNC/x11vnc.git#commit=${_commit}?signed" - "$pkgname-xfc-null-ptr.patch::https://github.com/LibVNC/x11vnc/commit/95a10ab64c2d.patch" - "$pkgname-gcc10.patch::https://github.com/LibVNC/x11vnc/commit/a48b0b1cd887.patch" - 'service') + '010-x11vnc-xfc-null-ptr.patch'::'https://github.com/LibVNC/x11vnc/commit/95a10ab64c2d.patch' + '020-x11vnc-gcc10-fix.patch'::'https://github.com/LibVNC/x11vnc/commit/a48b0b1cd887.patch' + '030-x11vnc-scan-limit-access-to-shared-memory'::'https://github.com/LibVNC/x11vnc/commit/69eeb9f7baa1.patch' + 'x11vnc.service') validpgpkeys=('25E71D2709955ECD4D041E03421BB3B45C6067F8') # Christian Beier sha256sums=('SKIP' 'eaa4678185dee4e2df6db8c74b5f5159ca982050825093362a7be79b4552ebf8' '9358217c23e586cb34d98564e5031dd58bf43e621d23435629d2105c901d0aa8' + '6047df38ca8a27760a6359a7f4029dd006f0423a4cd262cb0833da41defe1792' 'cfb19d44e09e960e2fdb958c9258bccf23c2677715314985f7e819f1dcedb6e4') prepare() { - cd "${srcdir}/${pkgname}" - patch -p1 -i ../$pkgname-xfc-null-ptr.patch # FS#65851 - patch -p1 -i ../$pkgname-gcc10.patch - autoreconf --force --install + patch -d x11vnc -Np1 -i "${srcdir}/010-x11vnc-xfc-null-ptr.patch" # FS#65851 + patch -d x11vnc -Np1 -i "${srcdir}/020-x11vnc-gcc10-fix.patch" + patch -d x11vnc -Np1 -i "${srcdir}/030-x11vnc-scan-limit-access-to-shared-memory" # FS#68930 + autoreconf -fi x11vnc } build() { - cd "${srcdir}/${pkgname}" - ./configure --prefix=/usr --mandir=/usr/share/man + cd "$pkgname" + ./configure --prefix='/usr' --mandir='/usr/share/man' make } package() { - cd "${srcdir}/${pkgname}" - make DESTDIR="${pkgdir}" install - install misc/{rx11vnc,Xdummy} "${pkgdir}"/usr/bin - install -Dm644 ../service "${pkgdir}/usr/lib/systemd/system/x11vnc.service" + make -C x11vnc DESTDIR="$pkgdir" install + install x11vnc/misc/{rx11vnc,Xdummy} "${pkgdir}/usr/bin" + install -D -m644 x11vnc.service -t "${pkgdir}/usr/lib/systemd/system" } Deleted: service =================================================================== --- service 2020-12-11 02:23:36 UTC (rev 773098) +++ service 2020-12-11 02:45:43 UTC (rev 773099) @@ -1,7 +0,0 @@ -[Unit] -Description=VNC Server for X11 -Requires=graphical.target -After=graphical.target - -[Service] -ExecStart=/usr/bin/x11vnc Copied: x11vnc/trunk/x11vnc.service (from rev 773098, x11vnc/trunk/service) =================================================================== --- x11vnc.service (rev 0) +++ x11vnc.service 2020-12-11 02:45:43 UTC (rev 773099) @@ -0,0 +1,7 @@ +[Unit] +Description=VNC Server for X11 +Requires=graphical.target +After=graphical.target + +[Service] +ExecStart=/usr/bin/x11vnc