[arch-commits] Commit in x11vnc/repos (9 files)
Gaëtan Bisson
bisson at archlinux.org
Sat Oct 8 07:05:54 UTC 2016
Date: Saturday, October 8, 2016 @ 07:05:53
Author: bisson
Revision: 277920
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
x11vnc/repos/extra-i686/PKGBUILD
(from rev 277919, x11vnc/trunk/PKGBUILD)
x11vnc/repos/extra-i686/fix-buffer-overflows.patch
(from rev 277919, x11vnc/trunk/fix-buffer-overflows.patch)
x11vnc/repos/extra-i686/service
(from rev 277919, x11vnc/trunk/service)
x11vnc/repos/extra-x86_64/PKGBUILD
(from rev 277919, x11vnc/trunk/PKGBUILD)
x11vnc/repos/extra-x86_64/fix-buffer-overflows.patch
(from rev 277919, x11vnc/trunk/fix-buffer-overflows.patch)
x11vnc/repos/extra-x86_64/service
(from rev 277919, x11vnc/trunk/service)
Deleted:
x11vnc/repos/extra-x86_64/PKGBUILD
x11vnc/repos/extra-x86_64/fix-buffer-overflows.patch
x11vnc/repos/extra-x86_64/service
-----------------------------------------+
/PKGBUILD | 41 ++++++++++++++++++++++++++++++
/fix-buffer-overflows.patch | 26 +++++++++++++++++++
/service | 7 +++++
extra-i686/PKGBUILD | 41 ++++++++++++++++++++++++++++++
extra-i686/fix-buffer-overflows.patch | 26 +++++++++++++++++++
extra-i686/service | 7 +++++
extra-x86_64/PKGBUILD | 41 ------------------------------
extra-x86_64/fix-buffer-overflows.patch | 26 -------------------
extra-x86_64/service | 7 -----
9 files changed, 148 insertions(+), 74 deletions(-)
Copied: x11vnc/repos/extra-i686/PKGBUILD (from rev 277919, x11vnc/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2016-10-08 07:05:53 UTC (rev 277920)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: damir <damir at archlinux.org>
+
+pkgname=x11vnc
+epoch=1
+pkgver=0.9.13
+pkgrel=9
+pkgdesc='VNC server for real X displays'
+url='http://www.karlrunge.com/x11vnc/'
+arch=('i686' 'x86_64')
+license=('GPL2')
+optdepends=('tk: GUI support'
+ 'net-tools: -auth guess'
+ 'xf86-video-dummy: Xdummy script')
+depends=('openssl' 'libjpeg' 'libxtst' 'libxinerama' 'libxdamage' 'libxrandr' 'avahi')
+source=("http://downloads.sourceforge.net/project/libvncserver/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"
+ 'fix-buffer-overflows.patch'
+ 'service')
+sha1sums=('f011d81488ac94dc8dce2d88739c23bd85a976fa'
+ 'd30e4036bd8e26da8a7c4da29081c07eb7a9b17d'
+ '53e1ed7f84518a699a29607a03bee2321f9f9624')
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -p1 -i ../fix-buffer-overflows.patch
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./configure --prefix=/usr --mandir=/usr/share/man
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+ install x11vnc/misc/{rx11vnc,Xdummy} "${pkgdir}"/usr/bin
+ install -Dm644 ../service "${pkgdir}/usr/lib/systemd/system/x11vnc.service"
+ rm -fr "${pkgdir}"/usr/include/rfb # provided by libvncserver
+}
Copied: x11vnc/repos/extra-i686/fix-buffer-overflows.patch (from rev 277919, x11vnc/trunk/fix-buffer-overflows.patch)
===================================================================
--- extra-i686/fix-buffer-overflows.patch (rev 0)
+++ extra-i686/fix-buffer-overflows.patch 2016-10-08 07:05:53 UTC (rev 277920)
@@ -0,0 +1,26 @@
+diff -Naur x11vnc-0.9.13-ori/x11vnc/win_utils.c x11vnc-0.9.13/x11vnc/win_utils.c
+--- x11vnc-0.9.13-ori/x11vnc/win_utils.c 2016-10-07 23:26:03.248600761 +0200
++++ x11vnc-0.9.13/x11vnc/win_utils.c 2016-10-07 23:26:51.919256706 +0200
+@@ -262,8 +262,8 @@
+ }
+
+ last_snap = now;
+- if (num > stack_list_len + blackouts) {
+- int n = 2*num;
++ if (num + blackouts > stack_list_len) {
++ int n = 2 * (num + blackouts);
+ free(stack_list);
+ stack_list = (winattr_t *) malloc(n*sizeof(winattr_t));
+ stack_list_len = n;
+diff -Naur x11vnc-0.9.13-ori/x11vnc/xrecord.c x11vnc-0.9.13/x11vnc/xrecord.c
+--- x11vnc-0.9.13-ori/x11vnc/xrecord.c 2016-10-07 23:26:03.248600761 +0200
++++ x11vnc-0.9.13/x11vnc/xrecord.c 2016-10-07 23:27:49.566700470 +0200
+@@ -964,7 +964,7 @@
+ data = (char *)req;
+ data += sz_xConfigureWindowReq;
+
+- for (i=0; i<req->length; i++) {
++ for (i = 0; i < req->length - sz_xConfigureWindowReq / 4 && i < 4; i++) {
+ unsigned int v;
+ /*
+ * We use unsigned int for the values. There were
Copied: x11vnc/repos/extra-i686/service (from rev 277919, x11vnc/trunk/service)
===================================================================
--- extra-i686/service (rev 0)
+++ extra-i686/service 2016-10-08 07:05:53 UTC (rev 277920)
@@ -0,0 +1,7 @@
+[Unit]
+Description=VNC Server for X11
+Requires=graphical.target
+After=graphical.target
+
+[Service]
+ExecStart=/usr/bin/x11vnc
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2016-10-08 07:04:59 UTC (rev 277919)
+++ extra-x86_64/PKGBUILD 2016-10-08 07:05:53 UTC (rev 277920)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-# Contributor: damir <damir at archlinux.org>
-
-pkgname=x11vnc
-epoch=1
-pkgver=0.9.13
-pkgrel=9
-pkgdesc='VNC server for real X displays'
-url='http://www.karlrunge.com/x11vnc/'
-arch=('i686' 'x86_64')
-license=('GPL2')
-optdepends=('tk: GUI support'
- 'net-tools: -auth guess'
- 'xf86-video-dummy: Xdummy script')
-depends=('openssl' 'libjpeg' 'libxtst' 'libxinerama' 'libxdamage' 'libxrandr' 'avahi')
-source=("http://downloads.sourceforge.net/project/libvncserver/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"
- 'fix-buffer-overflows.patch'
- 'service')
-sha1sums=('f011d81488ac94dc8dce2d88739c23bd85a976fa'
- 'd30e4036bd8e26da8a7c4da29081c07eb7a9b17d'
- '53e1ed7f84518a699a29607a03bee2321f9f9624')
-
-prepare() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -p1 -i ../fix-buffer-overflows.patch
-}
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --mandir=/usr/share/man
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
- install x11vnc/misc/{rx11vnc,Xdummy} "${pkgdir}"/usr/bin
- install -Dm644 ../service "${pkgdir}/usr/lib/systemd/system/x11vnc.service"
- rm -fr "${pkgdir}"/usr/include/rfb # provided by libvncserver
-}
Copied: x11vnc/repos/extra-x86_64/PKGBUILD (from rev 277919, x11vnc/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2016-10-08 07:05:53 UTC (rev 277920)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: damir <damir at archlinux.org>
+
+pkgname=x11vnc
+epoch=1
+pkgver=0.9.13
+pkgrel=9
+pkgdesc='VNC server for real X displays'
+url='http://www.karlrunge.com/x11vnc/'
+arch=('i686' 'x86_64')
+license=('GPL2')
+optdepends=('tk: GUI support'
+ 'net-tools: -auth guess'
+ 'xf86-video-dummy: Xdummy script')
+depends=('openssl' 'libjpeg' 'libxtst' 'libxinerama' 'libxdamage' 'libxrandr' 'avahi')
+source=("http://downloads.sourceforge.net/project/libvncserver/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"
+ 'fix-buffer-overflows.patch'
+ 'service')
+sha1sums=('f011d81488ac94dc8dce2d88739c23bd85a976fa'
+ 'd30e4036bd8e26da8a7c4da29081c07eb7a9b17d'
+ '53e1ed7f84518a699a29607a03bee2321f9f9624')
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -p1 -i ../fix-buffer-overflows.patch
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./configure --prefix=/usr --mandir=/usr/share/man
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+ install x11vnc/misc/{rx11vnc,Xdummy} "${pkgdir}"/usr/bin
+ install -Dm644 ../service "${pkgdir}/usr/lib/systemd/system/x11vnc.service"
+ rm -fr "${pkgdir}"/usr/include/rfb # provided by libvncserver
+}
Deleted: extra-x86_64/fix-buffer-overflows.patch
===================================================================
--- extra-x86_64/fix-buffer-overflows.patch 2016-10-08 07:04:59 UTC (rev 277919)
+++ extra-x86_64/fix-buffer-overflows.patch 2016-10-08 07:05:53 UTC (rev 277920)
@@ -1,26 +0,0 @@
-diff -Naur x11vnc-0.9.13-ori/x11vnc/win_utils.c x11vnc-0.9.13/x11vnc/win_utils.c
---- x11vnc-0.9.13-ori/x11vnc/win_utils.c 2016-10-07 23:26:03.248600761 +0200
-+++ x11vnc-0.9.13/x11vnc/win_utils.c 2016-10-07 23:26:51.919256706 +0200
-@@ -262,8 +262,8 @@
- }
-
- last_snap = now;
-- if (num > stack_list_len + blackouts) {
-- int n = 2*num;
-+ if (num + blackouts > stack_list_len) {
-+ int n = 2 * (num + blackouts);
- free(stack_list);
- stack_list = (winattr_t *) malloc(n*sizeof(winattr_t));
- stack_list_len = n;
-diff -Naur x11vnc-0.9.13-ori/x11vnc/xrecord.c x11vnc-0.9.13/x11vnc/xrecord.c
---- x11vnc-0.9.13-ori/x11vnc/xrecord.c 2016-10-07 23:26:03.248600761 +0200
-+++ x11vnc-0.9.13/x11vnc/xrecord.c 2016-10-07 23:27:49.566700470 +0200
-@@ -964,7 +964,7 @@
- data = (char *)req;
- data += sz_xConfigureWindowReq;
-
-- for (i=0; i<req->length; i++) {
-+ for (i = 0; i < req->length - sz_xConfigureWindowReq / 4 && i < 4; i++) {
- unsigned int v;
- /*
- * We use unsigned int for the values. There were
Copied: x11vnc/repos/extra-x86_64/fix-buffer-overflows.patch (from rev 277919, x11vnc/trunk/fix-buffer-overflows.patch)
===================================================================
--- extra-x86_64/fix-buffer-overflows.patch (rev 0)
+++ extra-x86_64/fix-buffer-overflows.patch 2016-10-08 07:05:53 UTC (rev 277920)
@@ -0,0 +1,26 @@
+diff -Naur x11vnc-0.9.13-ori/x11vnc/win_utils.c x11vnc-0.9.13/x11vnc/win_utils.c
+--- x11vnc-0.9.13-ori/x11vnc/win_utils.c 2016-10-07 23:26:03.248600761 +0200
++++ x11vnc-0.9.13/x11vnc/win_utils.c 2016-10-07 23:26:51.919256706 +0200
+@@ -262,8 +262,8 @@
+ }
+
+ last_snap = now;
+- if (num > stack_list_len + blackouts) {
+- int n = 2*num;
++ if (num + blackouts > stack_list_len) {
++ int n = 2 * (num + blackouts);
+ free(stack_list);
+ stack_list = (winattr_t *) malloc(n*sizeof(winattr_t));
+ stack_list_len = n;
+diff -Naur x11vnc-0.9.13-ori/x11vnc/xrecord.c x11vnc-0.9.13/x11vnc/xrecord.c
+--- x11vnc-0.9.13-ori/x11vnc/xrecord.c 2016-10-07 23:26:03.248600761 +0200
++++ x11vnc-0.9.13/x11vnc/xrecord.c 2016-10-07 23:27:49.566700470 +0200
+@@ -964,7 +964,7 @@
+ data = (char *)req;
+ data += sz_xConfigureWindowReq;
+
+- for (i=0; i<req->length; i++) {
++ for (i = 0; i < req->length - sz_xConfigureWindowReq / 4 && i < 4; i++) {
+ unsigned int v;
+ /*
+ * We use unsigned int for the values. There were
Deleted: extra-x86_64/service
===================================================================
--- extra-x86_64/service 2016-10-08 07:04:59 UTC (rev 277919)
+++ extra-x86_64/service 2016-10-08 07:05:53 UTC (rev 277920)
@@ -1,7 +0,0 @@
-[Unit]
-Description=VNC Server for X11
-Requires=graphical.target
-After=graphical.target
-
-[Service]
-ExecStart=/usr/bin/x11vnc
Copied: x11vnc/repos/extra-x86_64/service (from rev 277919, x11vnc/trunk/service)
===================================================================
--- extra-x86_64/service (rev 0)
+++ extra-x86_64/service 2016-10-08 07:05:53 UTC (rev 277920)
@@ -0,0 +1,7 @@
+[Unit]
+Description=VNC Server for X11
+Requires=graphical.target
+After=graphical.target
+
+[Service]
+ExecStart=/usr/bin/x11vnc
More information about the arch-commits
mailing list