[arch-commits] Commit in x11vnc/trunk (PKGBUILD service x11vnc.service)

[Daniel Bermond via arch-commits]

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
===
--- PKGBUILD2020-12-11 02:23:36 UTC (rev 773098)
+++ PKGBUILD2020-12-11 02:45:43 UTC (rev 773099)
@@ -1,47 +1,50 @@
-# Maintainer: Gaetan Bisson 
+# Maintainer : Daniel Bermond 
+# Contributor: Gaetan Bisson 
 # Contributor: damir 
 
 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

[arch-commits] Commit in x11vnc/trunk (PKGBUILD service)

[Gaetan Bisson]

Date: Tuesday, August 14, 2012 @ 21:42:59
  Author: bisson
Revision: 165298

add service file, remove redundant dependencies

Added:
  x11vnc/trunk/service
Modified:
  x11vnc/trunk/PKGBUILD

--+
 PKGBUILD |   18 +-
 service  |7 +++
 2 files changed, 16 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-08-15 01:17:54 UTC (rev 165297)
+++ PKGBUILD2012-08-15 01:42:59 UTC (rev 165298)
@@ -4,18 +4,20 @@
 
 pkgname=x11vnc
 pkgver=0.9.13
-pkgrel=1
+pkgrel=2
 pkgdesc='VNC server for real X displays'
+url='http://www.karlrunge.com/x11vnc/'
 arch=('i686' 'x86_64')
-url='http://www.karlrunge.com/x11vnc/'
 license=('GPL2')
-depends=('openssl' 'libjpeg' 'zlib' 'libx11' 'libxtst' 'libxinerama' 
'libxdamage' 'libxrandr' 'avahi')
+depends=('openssl' 'libjpeg' 'libxtst' 'libxinerama' 'libxdamage' 'libxrandr' 
'avahi')
 optdepends=('tk: for GUI support')
 backup=('etc/conf.d/x11vnc')
 
source=(http://downloads.sourceforge.net/project/libvncserver/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz;
-   'conf.d'
-   'rc.d')
+'service'
+'conf.d'
+'rc.d')
 sha1sums=('f011d81488ac94dc8dce2d88739c23bd85a976fa'
+  '53e1ed7f84518a699a29607a03bee2321f9f9624'
   '11011cce06511e9ba61672a1c80bb63a3a187539'
   '477892cf0f0020043444b7493c80684762ded506')
 
@@ -28,9 +30,7 @@
 package() {
cd ${srcdir}/${pkgname}-${pkgver}
make DESTDIR=${pkgdir} install
-
+   install -Dm755 ../rc.d ${pkgdir}/etc/rc.d/x11vnc
+   install -Dm644 ../conf.d ${pkgdir}/etc/conf.d/x11vnc
rm -fr ${pkgdir}/usr/include/rfb # provided by libvncserver
-
-   install -D -m 755 ${srcdir}/rc.d ${pkgdir}/etc/rc.d/x11vnc
-   install -D -m 644 ${srcdir}/conf.d ${pkgdir}/etc/conf.d/x11vnc
 }

Added: service
===
--- service (rev 0)
+++ service 2012-08-15 01:42:59 UTC (rev 165298)
@@ -0,0 +1,7 @@
+[Unit]
+Description=VNC Server for X11
+Requires=graphical.target
+After=graphical.target
+
+[Service]
+ExecStart=/usr/bin/x11vnc