From debbugs-submit-bounces@debbugs.gnu.org Thu Oct 06 13:31:18 2022 Received: (at submit) by debbugs.gnu.org; 6 Oct 2022 17:31:18 +0000 Received: from localhost ([127.0.0.1]:33466 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ogUiK-0006BU-NI for submit@debbugs.gnu.org; Thu, 06 Oct 2022 13:31:18 -0400 Received: from lists.gnu.org ([209.51.188.17]:32972) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ogTOE-0001fA-PU for submit@debbugs.gnu.org; Thu, 06 Oct 2022 12:06:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45380) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ogTO2-0000A7-9J for guix-patches@gnu.org; Thu, 06 Oct 2022 12:06:19 -0400 Received: from mail-lj1-x232.google.com ([2a00:1450:4864:20::232]:37604) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ogTO0-0005BZ-2E for guix-patches@gnu.org; Thu, 06 Oct 2022 12:06:13 -0400 Received: by mail-lj1-x232.google.com with SMTP id by36so2764001ljb.4 for ; Thu, 06 Oct 2022 09:06:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:to:subject:message-id:date:from :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=zZauLJV0a8/Wx6UKjAwqIUPwNWNU5k1nYOK9yZSTlGw=; b=JkrO6Em7r7HpW88SBKFnMzSqtODcqg/CenBPZvmHcrjwFzKGABkcsaZaSwIzshrS08 +NRRrvGA2DHfLm4fq4pjuybMVr2+ckVWrzv7hE6anapilP3SXILo13p9roOgucZ9BW2y /DkHrvmJA11DtX+SZQOaGXymnZv4xJW65mYlwrHzq4Ijhg+Av+h+9LB89AAS6Vz5V8xf YexzRybN+/41oH7d7Fm8FVtOaQxSkZISMpxG+D8x/anTk2NjRUGcZlkDeRUYDyUu9VNv 5YmTtrDCRJ3M6eM3Gj428pLx0yUA4Cv+VVb6UYDCrEEAwBLV7rogR2hJKGYAW5zwMkt9 Gczg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:to:subject:message-id:date:from :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=zZauLJV0a8/Wx6UKjAwqIUPwNWNU5k1nYOK9yZSTlGw=; b=13f4L3TUl+bDxE4RYXOoh2wPxBkLXqZIhI4jtB9rS1eZIB066YPaiz/ho7z7WDsSMz HhVvBjf0JYhQAtCMYSK7DkuLvDneQIjtKZcJBR8T+yuByJyH7hFuXJBkPGzZh5lulwk8 iE0ux4nyEWSRFhsLYwywM1a/UHw3+IFQN647ojSN3yKYf1uBCwAkfBqyLmv3TnwGFINh 8zB1pnwhu3gAp1C2dqUsCm3kqZfPvkO5DyCaUDNTHcDRjA37Fkfsz2nHOwhDvud/0iuz 5cPdq6bieT0b4z+usuXnblHEntnnNET1oV7U9YXBF3bCbV8fKUC1/JtWY5gSb6sf/8f5 //3A== X-Gm-Message-State: ACrzQf12nutzXmNM5Tz/l8zLSq8E+E/yjIPxDdbvTbX9q4XQzbgRwmdW eN6uspRuXfSBHa27+3995rcS7XusRsrIRjRQtmvPCe9nn7s4Ww== X-Google-Smtp-Source: AMsMyM4B44XUf1Ux4E1WCeSiapi1qu3s2gcAOXT9pka2V48C0I6WpNk3xAWIqNHZ/dVhyKMoyKmNwLWvWZ1PbOvlD60= X-Received: by 2002:a05:651c:1991:b0:26c:296f:4b32 with SMTP id bx17-20020a05651c199100b0026c296f4b32mr137117ljb.51.1665072367255; Thu, 06 Oct 2022 09:06:07 -0700 (PDT) MIME-Version: 1.0 From: Mehmet Tekman Date: Thu, 6 Oct 2022 18:05:31 +0200 Message-ID: Subject: [PATCH] Add x11vnc recipe To: guix-patches@gnu.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=2a00:1450:4864:20::232; envelope-from=mtekman89@gmail.com; helo=mail-lj1-x232.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.1 (-) X-Debbugs-Envelope-To: submit X-Mailman-Approved-At: Thu, 06 Oct 2022 13:31:15 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.1 (--) --- gnu/packages/patches/x11vnc-gcc10-fix.patch | 42 ++++++++++ ...c-scan-limit-access-to-shared-memory.patch | 22 ++++++ .../patches/x11vnc-xfc-null-ptr.patch | 29 +++++++ gnu/packages/x11vnc.scm | 79 +++++++++++++++++++ 4 files changed, 172 insertions(+) create mode 100644 gnu/packages/patches/x11vnc-gcc10-fix.patch create mode 100644 gnu/packages/patches/x11vnc-scan-limit-access-to-shared-memory.patch create mode 100644 gnu/packages/patches/x11vnc-xfc-null-ptr.patch create mode 100644 gnu/packages/x11vnc.scm diff --git a/gnu/packages/patches/x11vnc-gcc10-fix.patch b/gnu/packages/patches/x11vnc-gcc10-fix.patch new file mode 100644 index 0000000000..a32d5785d9 --- /dev/null +++ b/gnu/packages/patches/x11vnc-gcc10-fix.patch @@ -0,0 +1,42 @@ +From a48b0b1cd887d7f3ae67f525d7d334bd2feffe60 Mon Sep 17 00:00:00 2001 +From: Alexander Tsoy +Date: Tue, 28 Jan 2020 22:21:01 +0300 +Subject: [PATCH] Fix build with -fno-common + +GCC 10 defaults to -fno-common +--- + src/util.c | 3 +++ + src/util.h | 6 +++--- + 2 files changed, 6 insertions(+), 3 deletions(-) + +diff --git a/src/util.c b/src/util.c +index a82a1a42..6a52ebf4 100644 +--- a/src/util.c ++++ b/src/util.c +@@ -47,6 +47,9 @@ int hxl =3D 0; + #ifdef LIBVNCSERVER_HAVE_LIBPTHREAD + MUTEX(x11Mutex); + MUTEX(scrollMutex); ++MUTEX(clientMutex); ++MUTEX(inputMutex); ++MUTEX(pointerMutex); + #endif + + int nfix(int i, int n); +diff --git a/src/util.h b/src/util.h +index 35c1afd2..99b5dd1d 100644 +--- a/src/util.h ++++ b/src/util.h +@@ -102,9 +102,9 @@ extern struct timeval _mysleep; + #ifdef LIBVNCSERVER_HAVE_LIBPTHREAD + extern MUTEX(x11Mutex); + extern MUTEX(scrollMutex); +-MUTEX(clientMutex); +-MUTEX(inputMutex); +-MUTEX(pointerMutex); ++extern MUTEX(clientMutex); ++extern MUTEX(inputMutex); ++extern MUTEX(pointerMutex); + #endif + + #define X_INIT INIT_MUTEX(x11Mutex) diff --git a/gnu/packages/patches/x11vnc-scan-limit-access-to-shared-memory= .patch b/gnu/packages/patches/x11vnc-scan-limit-access-to-shared-memory.patch new file mode 100644 index 0000000000..5424094434 --- /dev/null +++ b/gnu/packages/patches/x11vnc-scan-limit-access-to-shared-memory.patch @@ -0,0 +1,22 @@ +From 69eeb9f7baa14ca03b16c9de821f9876def7a36a Mon Sep 17 00:00:00 2001 +From: =3D?UTF-8?q?Gu=3DC3=3DA9nal=3D20DAVALAN?=3D +Date: Wed, 18 Nov 2020 08:40:45 +0100 +Subject: [PATCH] scan: limit access to shared memory segments to current u= ser + +--- + src/scan.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/scan.c b/src/scan.c +index 43e00d20..12994d52 100644 +--- a/src/scan.c ++++ b/src/scan.c +@@ -320,7 +320,7 @@ static int shm_create(XShmSegmentInfo *shm, XImage **ximg_ptr, int w, int h, + + #if HAVE_XSHM + shm->shmid =3D shmget(IPC_PRIVATE, +- xim->bytes_per_line * xim->height, IPC_CREAT | 0777); ++ xim->bytes_per_line * xim->height, IPC_CREAT | 0600); + + if (shm->shmid =3D=3D -1) { + rfbErr("shmget(%s) failed.\n", name); diff --git a/gnu/packages/patches/x11vnc-xfc-null-ptr.patch b/gnu/packages/patches/x11vnc-xfc-null-ptr.patch new file mode 100644 index 0000000000..65f339d716 --- /dev/null +++ b/gnu/packages/patches/x11vnc-xfc-null-ptr.patch @@ -0,0 +1,29 @@ +From 95a10ab64c2dbbec2c8dad91a5ffb73a0d68474b Mon Sep 17 00:00:00 2001 +From: Jonathan Liu +Date: Mon, 16 Mar 2020 20:04:06 +1100 +Subject: [PATCH] src/cursor: fix xfc NULL pointer dereference + +xfc->width and xfc->height for the XFixes cursor image returned from +XFixesGetCursorImage(dpy) are accessed without first checking that xfc +is not NULL. This can result in the server sometimes crashing when +moving a Google Chrome window. + +Fixes: 37c946191a0f ("Broken cursor bugfix for 64 bit systems (#49)") +Signed-off-by: Jonathan Liu +--- + src/cursor.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/cursor.c b/src/cursor.c +index 39e73a69..74a08c69 100644 +--- a/src/cursor.c ++++ b/src/cursor.c +@@ -1311,7 +1311,7 @@ static int get_exact_cursor(int init) { + + /* retrieve the cursor info + pixels from server: */ + xfc =3D XFixesGetCursorImage(dpy); +- { ++ if (xfc) { + /* 2017-07-09, Stephan Fuhrmann: This fixes an implementation flaw for 64 bit systems. + * The XFixesCursorImage structure says xfc->pixels is (unsigned long*) in the structure, but + * the protocol spec says it's 32 bit per pixel diff --git a/gnu/packages/x11vnc.scm b/gnu/packages/x11vnc.scm new file mode 100644 index 0000000000..55c51305b3 --- /dev/null +++ b/gnu/packages/x11vnc.scm @@ -0,0 +1,79 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright =C2=A9 2022 Mehmet Tekman +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + + +(define-module (gnu packages x11vnc) + #:use-module (guix packages) + #:use-module (gnu packages) + #:use-module (gnu packages perl) + #:use-module (gnu packages tcl) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages xorg) + #:use-module (gnu packages tls) + #:use-module (guix git-download) + #:use-module (guix build-system gnu) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (gnu packages autotools) + #:use-module (gnu packages avahi) + #:use-module (gnu packages vnc) + #:use-module (gnu packages compression) + #:use-module (gnu packages image)) + +(define-public x11vnc + (let ((commit "4ca006fed80410bd9b061a1519bd5d9366bb0bc8") + (version "0.9.16") + (revision "1")) + (package + (name "x11vnc") + (version (git-version version revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/LibVNC/x11vnc") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1g652mmi79pfq4p5p7spaswa164rpzjhc5rn2phy5pm71lm0vib1")) + (patches + (search-patches "x11vnc-xfc-null-ptr.patch" + "x11vnc-gcc10-fix.patch" + "x11vnc-scan-limit-access-to-shared-memory.patch")))) + (build-system gnu-build-system) + (arguments + '(#:phases + (modify-phases + %standard-phases + (add-before 'bootstrap 'delete-premature-configure + (lambda _ (substitute* "./autogen.sh" + ((".*/configure") ""))))))) + (native-inputs (list + ;; [optional requirements] + ;; perl tk + autoconf automake autobuild pkg-config avahi libvnc + libx11 libxcomposite libxdamage libxext libxfixes li= bxi + libxinerama libxrandr libxtst + openssl xdpyinfo zlib libjpeg-turbo xf86-video-dummy= )) + (synopsis "VNC server for real X displays") + (home-page "https://github.com/LibVNC/x11vnc") + (description + "x11vnc allows one to view remotely and interact with real X +displays (i.e. a display corresponding to a physical monitor, keyboard, an= d +mouse) with any VNC viewer. In this way it plays the role for Unix/X11 th= at +WinVNC plays for Windows.") + (license license:gpl2)))) --=20 2.38.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Oct 08 00:33:58 2022 Received: (at 58341) by debbugs.gnu.org; 8 Oct 2022 04:33:58 +0000 Received: from localhost ([127.0.0.1]:37875 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oh1XA-00076s-J3 for submit@debbugs.gnu.org; Sat, 08 Oct 2022 00:33:58 -0400 Received: from mail-qt1-f170.google.com ([209.85.160.170]:36728) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oh1X7-00076e-Op for 58341@debbugs.gnu.org; Sat, 08 Oct 2022 00:33:55 -0400 Received: by mail-qt1-f170.google.com with SMTP id d12so2733220qtp.3 for <58341@debbugs.gnu.org>; Fri, 07 Oct 2022 21:33:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=of3EpU2/tGJ4gi04RtRbYXRC3/02UcCHy7TWDyUCkQI=; b=AGeFVTD/XdrlAZzY6PIlGYfW4f+zP4kmC8CBjyOoseEZJROZn/MMaz8QP1ZMYEAorW /updPHcwPOslqZIxQvVJcGb0Nr/DPJYiShShltN1LWWc9htaoU2zeoUAj1LGRHe4iZWA DLx2guu5aXtFJ8IieJMh4F7KXlG5lSKgYZE+whQrJk38SCBqe0NLJ6qisKXq8HfEUPLu Kw/B9baikPmOV5On1ngkHOLGftEChQNwGR0kLtignTgp1okYvEVs09fkljrFy/H/IsoK Mdx6x96uWniB3S6+XYfKtCVWzOlj+hkwDd65/1xJ9ylA2chxA9yKcQNIuTUtz/oTXIox ujQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=of3EpU2/tGJ4gi04RtRbYXRC3/02UcCHy7TWDyUCkQI=; b=SGOMyWqdKUvVsuNkmXGd/QrDYVBGXD6oNYTQU7+YVesYtLr61xJgOasDgTG18WT0wD 1/YEYR1WUuOFhrjD+inoyZecMVSA15X2VJ+NgC1Ifyc1fUV7DBUJoJFl0cVZosGtzANW NJl6BRyBuBlOZBw2Fex7yzTi8dFhwzynCIz5+uZr3l1z60RAKs5mhvBXEjSUV2b8Vltp r/E+UalCS+FOsSIo1x0uQvL+dzcrr7Asz30soEwt89EAN2qT6nROiYKIYEUkgeRm3SG2 SZxdnZ81YFExK3kx/WxejnXHxObBcAr7ox/w2DIzgehntYF9fCg2TBkd16oYLTQ+iyPg EGKg== X-Gm-Message-State: ACrzQf3gFZ0Ie5sdNpXPB82oObLcwZvshbOeiXnQsxnRB2RABZth3xNu VEO27bwNJLY1BAXi1tVYPgVPD1Hjk7t+Kw== X-Google-Smtp-Source: AMsMyM4jZRmijILmtvfMhZfSRpTaPVUGsc24wSQqkb/SajYy3eMueSx9Q258AVpp5QWtH0Zf+Sr2PA== X-Received: by 2002:a05:622a:2c8:b0:391:b8ab:c281 with SMTP id a8-20020a05622a02c800b00391b8abc281mr7055327qtx.188.1665203628019; Fri, 07 Oct 2022 21:33:48 -0700 (PDT) Received: from hurd ([2607:fad8:4:3::1005]) by smtp.gmail.com with ESMTPSA id x4-20020a05620a448400b006cebda00630sm4109195qkp.60.2022.10.07.21.33.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Oct 2022 21:33:47 -0700 (PDT) From: Maxim Cournoyer To: Mehmet Tekman Subject: Re: bug#58341: [PATCH] Add x11vnc recipe References: Date: Sat, 08 Oct 2022 00:33:46 -0400 In-Reply-To: (Mehmet Tekman's message of "Thu, 6 Oct 2022 18:05:31 +0200") Message-ID: <874jwf2atx.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 58341 Cc: 58341@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello, and thank you for your contribution! Mehmet Tekman writes: > --- > gnu/packages/patches/x11vnc-gcc10-fix.patch | 42 ++++++++++ > ...c-scan-limit-access-to-shared-memory.patch | 22 ++++++ > .../patches/x11vnc-xfc-null-ptr.patch | 29 +++++++ > gnu/packages/x11vnc.scm | 79 +++++++++++++++++++ > 4 files changed, 172 insertions(+) > create mode 100644 gnu/packages/patches/x11vnc-gcc10-fix.patch > create mode 100644 > gnu/packages/patches/x11vnc-scan-limit-access-to-shared-memory.patch > create mode 100644 gnu/packages/patches/x11vnc-xfc-null-ptr.patch > create mode 100644 gnu/packages/x11vnc.scm Would it be possible to send the patch complete with the commit message, as can be produced with 'git format-patch'? You can read 'info "(guix) Submitting Patches". The git commit message should use the GNU ChangeLog format, as mentioned there. You can look at the git history to learn. The patches should be registered in the gnu/local.mk file, in the dist_patch_DATA section. Please mind the sorting in the file. > diff --git a/gnu/packages/patches/x11vnc-gcc10-fix.patch > b/gnu/packages/patches/x11vnc-gcc10-fix.patch > new file mode 100644 > index 0000000000..a32d5785d9 > --- /dev/null > +++ b/gnu/packages/patches/x11vnc-gcc10-fix.patch > @@ -0,0 +1,42 @@ > +From a48b0b1cd887d7f3ae67f525d7d334bd2feffe60 Mon Sep 17 00:00:00 2001 > +From: Alexander Tsoy > +Date: Tue, 28 Jan 2020 22:21:01 +0300 > +Subject: [PATCH] Fix build with -fno-common > + > +GCC 10 defaults to -fno-common > +--- > + src/util.c | 3 +++ > + src/util.h | 6 +++--- > + 2 files changed, 6 insertions(+), 3 deletions(-) > + > +diff --git a/src/util.c b/src/util.c > +index a82a1a42..6a52ebf4 100644 > +--- a/src/util.c > ++++ b/src/util.c > +@@ -47,6 +47,9 @@ int hxl =3D 0; > + #ifdef LIBVNCSERVER_HAVE_LIBPTHREAD > + MUTEX(x11Mutex); > + MUTEX(scrollMutex); > ++MUTEX(clientMutex); > ++MUTEX(inputMutex); > ++MUTEX(pointerMutex); > + #endif > + > + int nfix(int i, int n); > +diff --git a/src/util.h b/src/util.h > +index 35c1afd2..99b5dd1d 100644 > +--- a/src/util.h > ++++ b/src/util.h > +@@ -102,9 +102,9 @@ extern struct timeval _mysleep; > + #ifdef LIBVNCSERVER_HAVE_LIBPTHREAD > + extern MUTEX(x11Mutex); > + extern MUTEX(scrollMutex); > +-MUTEX(clientMutex); > +-MUTEX(inputMutex); > +-MUTEX(pointerMutex); > ++extern MUTEX(clientMutex); > ++extern MUTEX(inputMutex); > ++extern MUTEX(pointerMutex); > + #endif > + > + #define X_INIT INIT_MUTEX(x11Mutex) > diff --git a/gnu/packages/patches/x11vnc-scan-limit-access-to-shared-memo= ry.patch > b/gnu/packages/patches/x11vnc-scan-limit-access-to-shared-memory.patch > new file mode 100644 > index 0000000000..5424094434 > --- /dev/null > +++ b/gnu/packages/patches/x11vnc-scan-limit-access-to-shared-memory.patch > @@ -0,0 +1,22 @@ > +From 69eeb9f7baa14ca03b16c9de821f9876def7a36a Mon Sep 17 00:00:00 2001 > +From: =3D?UTF-8?q?Gu=3DC3=3DA9nal=3D20DAVALAN?=3D > +Date: Wed, 18 Nov 2020 08:40:45 +0100 > +Subject: [PATCH] scan: limit access to shared memory segments to current= user > + > +--- > + src/scan.c | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/src/scan.c b/src/scan.c > +index 43e00d20..12994d52 100644 > +--- a/src/scan.c > ++++ b/src/scan.c > +@@ -320,7 +320,7 @@ static int shm_create(XShmSegmentInfo *shm, > XImage **ximg_ptr, int w, int h, > + > + #if HAVE_XSHM > + shm->shmid =3D shmget(IPC_PRIVATE, > +- xim->bytes_per_line * xim->height, IPC_CREAT | 0777); > ++ xim->bytes_per_line * xim->height, IPC_CREAT | 0600); > + > + if (shm->shmid =3D=3D -1) { > + rfbErr("shmget(%s) failed.\n", name); > diff --git a/gnu/packages/patches/x11vnc-xfc-null-ptr.patch > b/gnu/packages/patches/x11vnc-xfc-null-ptr.patch > new file mode 100644 > index 0000000000..65f339d716 > --- /dev/null > +++ b/gnu/packages/patches/x11vnc-xfc-null-ptr.patch > @@ -0,0 +1,29 @@ > +From 95a10ab64c2dbbec2c8dad91a5ffb73a0d68474b Mon Sep 17 00:00:00 2001 > +From: Jonathan Liu > +Date: Mon, 16 Mar 2020 20:04:06 +1100 > +Subject: [PATCH] src/cursor: fix xfc NULL pointer dereference > + > +xfc->width and xfc->height for the XFixes cursor image returned from > +XFixesGetCursorImage(dpy) are accessed without first checking that xfc > +is not NULL. This can result in the server sometimes crashing when > +moving a Google Chrome window. > + > +Fixes: 37c946191a0f ("Broken cursor bugfix for 64 bit systems (#49)") > +Signed-off-by: Jonathan Liu > +--- > + src/cursor.c | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/src/cursor.c b/src/cursor.c > +index 39e73a69..74a08c69 100644 > +--- a/src/cursor.c > ++++ b/src/cursor.c > +@@ -1311,7 +1311,7 @@ static int get_exact_cursor(int init) { > + > + /* retrieve the cursor info + pixels from server: */ > + xfc =3D XFixesGetCursorImage(dpy); > +- { > ++ if (xfc) { > + /* 2017-07-09, Stephan Fuhrmann: This fixes an > implementation flaw for 64 bit systems. > + * The XFixesCursorImage structure says xfc->pixels is > (unsigned long*) in the structure, but > + * the protocol spec says it's 32 bit per pixel > diff --git a/gnu/packages/x11vnc.scm b/gnu/packages/x11vnc.scm > new file mode 100644 > index 0000000000..55c51305b3 Since we are using a recent commit, shouldn't these (upstream?) patches be unnecessary? Perhaps we can use an even newer commit that includes them? > --- /dev/null > +++ b/gnu/packages/x11vnc.scm > @@ -0,0 +1,79 @@ > +;;; GNU Guix --- Functional package management for GNU > +;;; Copyright =C2=A9 2022 Mehmet Tekman > +;;; > +;;; This file is part of GNU Guix. > +;;; > +;;; GNU Guix is free software; you can redistribute it and/or modify it > +;;; under the terms of the GNU General Public License as published by > +;;; the Free Software Foundation; either version 3 of the License, or (at > +;;; your option) any later version. > +;;; > +;;; GNU Guix is distributed in the hope that it will be useful, but > +;;; WITHOUT ANY WARRANTY; without even the implied warranty of > +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > +;;; GNU General Public License for more details. > +;;; > +;;; You should have received a copy of the GNU General Public License > +;;; along with GNU Guix. If not, see . > + > + > +(define-module (gnu packages x11vnc) There already is a (gnu packages vnc) module; that'd be a better home. We can group all VNC-related packages there. > + #:use-module (guix packages) > + #:use-module (gnu packages) > + #:use-module (gnu packages perl) > + #:use-module (gnu packages tcl) > + #:use-module (gnu packages pkg-config) > + #:use-module (gnu packages xorg) > + #:use-module (gnu packages tls) > + #:use-module (guix git-download) > + #:use-module (guix build-system gnu) > + #:use-module ((guix licenses) #:prefix license:) > + #:use-module (gnu packages autotools) > + #:use-module (gnu packages avahi) > + #:use-module (gnu packages vnc) > + #:use-module (gnu packages compression) > + #:use-module (gnu packages image)) Imports should be lexicographically sorted. > +(define-public x11vnc When using an unreleased version, it's good to mention why (issues it fixes, a very old release, etc.). > + (let ((commit "4ca006fed80410bd9b061a1519bd5d9366bb0bc8") > + (version "0.9.16") > + (revision "1")) > + (package > + (name "x11vnc") > + (version (git-version version revision commit)) > + (source (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://github.com/LibVNC/x11vnc") > + (commit commit))) > + (file-name (git-file-name name version)) > + (sha256 > + (base32 > + "1g652mmi79pfq4p5p7spaswa164rpzjhc5rn2phy5pm71lm0vib1"= )) > + (patches > + (search-patches "x11vnc-xfc-null-ptr.patch" > + "x11vnc-gcc10-fix.patch" > + > "x11vnc-scan-limit-access-to-shared-memory.patch")))) Odd blank line here. You can try './pre-inst-env guix style x11vnc' to see how it would do it, else I'd do it like to avoid breaking the 80 chars max width: (search-patches "patch1" "patch2" ...) > + (build-system gnu-build-system) > + (arguments > + '(#:phases > + (modify-phases > + %standard-phases > + (add-before 'bootstrap 'delete-premature-configure > + (lambda _ (substitute* "./autogen.sh" > + ((".*/configure") ""))))))) > + (native-inputs (list > + ;; [optional requirements] > + ;; perl tk > + autoconf automake autobuild pkg-config avahi libvnc > + libx11 libxcomposite libxdamage libxext libxfixes = libxi > + libxinerama libxrandr libxtst > + openssl xdpyinfo zlib libjpeg-turbo xf86-video-dum= my)) The libraries that are used at run time should appear as inputs, not native-inputs. Native-inputs are for build tools or tests. > + (synopsis "VNC server for real X displays") > + (home-page "https://github.com/LibVNC/x11vnc") > + (description > + "x11vnc allows one to view remotely and interact with real X > +displays (i.e. a display corresponding to a physical monitor, keyboard, = and > +mouse) with any VNC viewer. In this way it plays the role for Unix/X11 = that > +WinVNC plays for Windows.") I'd remove the useless comparison with windows, perhaps stress that this provides a VNC *server* in the description as well. > + (license license:gpl2)))) --=20 Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Sat Oct 08 00:34:06 2022 Received: (at control) by debbugs.gnu.org; 8 Oct 2022 04:34:06 +0000 Received: from localhost ([127.0.0.1]:37879 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oh1XK-00077f-5P for submit@debbugs.gnu.org; Sat, 08 Oct 2022 00:34:06 -0400 Received: from mail-qv1-f52.google.com ([209.85.219.52]:45715) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oh1XI-000774-AK for control@debbugs.gnu.org; Sat, 08 Oct 2022 00:34:05 -0400 Received: by mail-qv1-f52.google.com with SMTP id g9so4243483qvo.12 for ; Fri, 07 Oct 2022 21:34:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=subject:from:to:message-id:date:from:to:cc:subject:date:message-id :reply-to; bh=QXkESWT9+WPTaZNKmxF7P13eZjZPD14muGJjWp5DUT0=; b=X72QQA6bIJDSAFYVt95C1CsU+9l9CdrdFCeQ/H/E+zrTRqeat0mgfy8UnLUddQphdt TiICi5SBoly30xrsabAsZyuXuBwSuKDFsTZJRk2t7suMQnrXmGltXfA3Ab+NG/97oCrc KiO95ZyHLoJ+A1x4daQIYGEyhJDRCs/H7LrLP1huHNoQmrXa2q/8Fe8AQ3nTxAiT36fX YNlfDdLfc04wI1PXclg8cYiLKd6pQhzsvdDSb4IwEq9Lc434CLVkcnM/TbTuMatQ6T5/ TWzEFaApWYyESL0jRg5fOhG6Pn5guXyJHJgbsXcyn8OydFHDzUVwK8hGExwtwKKKUf+2 QMOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=subject:from:to:message-id:date:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QXkESWT9+WPTaZNKmxF7P13eZjZPD14muGJjWp5DUT0=; b=PofgjBogd0hv5ViIW6OFKe0b8Djx7CKFzSfaL2K1XB5ysUDwPDq5QJl9PvKEoyTz8D 8tJ0nJZdR/VOvk8C/wxzSlvnGycStStyHyALli91ViVXszUxzqKjPiO8tp0U7OWyNvRe DSr3OFiaNtVq5M8WjVd7R1YClPrrR7pjKkZHhzfZzwZJVM66eNhnWGdrVX90A3cSU9nr tXK/LFIGtCPDVMdFuRE0ciIoTcgcARg7+n0GhpxYXfmtDlaCpwfe+GSj0vvBADpB89WH SzrNdSi4LE65SbdxrHXNKMTB88Ax4iSr87hrfAnYCD9L1kRonDo+1OpfgCwF59UDL0c7 RXOA== X-Gm-Message-State: ACrzQf1D70vq+CSbJb/pZ8zTfdEZGezfiAXyQb8lWNnPZ18m5utRwpQ2 LUIgFLHlVztsf8WyshGQ73lqyZ2Wcm1X2w== X-Google-Smtp-Source: AMsMyM78P4xTtQPfqqC58NtTpuLWLLhXXh0iVjiCvlM5Bf0+D7M+y6ogUZyUGjJgmbo338M1D0ua7g== X-Received: by 2002:a0c:9083:0:b0:4ac:7fde:1a04 with SMTP id p3-20020a0c9083000000b004ac7fde1a04mr6699003qvp.48.1665203638708; Fri, 07 Oct 2022 21:33:58 -0700 (PDT) Received: from hurd ([2607:fad8:4:3::1005]) by smtp.gmail.com with ESMTPSA id j10-20020ac806ca000000b00359961365f1sm3413684qth.68.2022.10.07.21.33.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Oct 2022 21:33:58 -0700 (PDT) Date: Sat, 08 Oct 2022 00:33:57 -0400 Message-Id: <8735bz2atm.fsf@gmail.com> To: control@debbugs.gnu.org From: Maxim Cournoyer Subject: control message for bug #58341 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) tags 58341 + moreinfo quit From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 10 12:06:36 2022 Received: (at 58341) by debbugs.gnu.org; 10 Oct 2022 16:06:36 +0000 Received: from localhost ([127.0.0.1]:49619 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ohvIZ-0000kc-8c for submit@debbugs.gnu.org; Mon, 10 Oct 2022 12:06:36 -0400 Received: from mail-lf1-f44.google.com ([209.85.167.44]:40546) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ohvIW-0000kI-7f for 58341@debbugs.gnu.org; Mon, 10 Oct 2022 12:06:34 -0400 Received: by mail-lf1-f44.google.com with SMTP id b1so12283504lfs.7 for <58341@debbugs.gnu.org>; Mon, 10 Oct 2022 09:06:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=9AoZ5RXQPJmfgXa2gRonFK0Q5NqS4HAeUvnolrqOAWg=; b=kDOSYD4dEbFjv7qCkws+tLnFK6vzV6hV9T5XEHki3wAQC397PsCePmz3tJ73HlXc38 d45SlrvgfZi7F0/B4730VP74+RNO910/Mfni/sLqfROseR0gs4o7JzNX+I7InuhCxHyI lneUswUlVhfsj0JgI4zXpCvz2f/XoNx5QqF5cXvjZ3R6+MRF+80pBb8sXDOl4xDVTNqR ElRVlmyW+fjDxFyEH6PChHCIv0xk07eG3uhu7MbK5Ei5drR1+3KaBbMNdfV220jSsG3s qaXm1pMz0Q0wRwHVJ7jYXFXiS6w9J1LQrJNna+rtyyElzsYCnj5/5lkWryswqe2DH2h8 tXKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=9AoZ5RXQPJmfgXa2gRonFK0Q5NqS4HAeUvnolrqOAWg=; b=EheG+GmJN7GCLe40Udfs8lMU55m8vyZKzA+Om/XrYtTuh95i6QNGg0352ONpsc+DJo 3SLlMCRUhcFNNrnwbN2I3vgWR5s5DdUIjDlkWwuNSgPMa6FP69bC4dbCx7+4Z2z4tjAd xULy477dAErO5iiOJacacWKvKumEe0wFZetX6kJo/wQacaXdNzoWd9B7gcJheNeUAQkY 2LKrtg561WiDQ/zAAp5U6WaGK9jCIjcTq0iYgwn7u86yewrvM3NUhSOGSP+OABiE8ecH kvtdrV/Y/DUjCfS4fSQDgsY4MlnVICVC92dJX70lppEEX0MXNbGNQUMPf+H7nyBRMlZc VXCw== X-Gm-Message-State: ACrzQf0r4hvZuVs0ELuQUGGH3L3yWUG5UqqrqF7Pa6FwpsLzBJaVPlHx kxY47NZWNoiMmyNeFgCx2p2Ga962PtGJdWxIIVY= X-Google-Smtp-Source: AMsMyM7qKO+f31uzLqkUMbsVOpwiaQHl40JvOWdwqUSh3WfNZ5LCvAfzoyqNWZhDWYKLaAjPqya/3nEPYumyks68cyk= X-Received: by 2002:a05:6512:462:b0:4a2:22ff:e628 with SMTP id x2-20020a056512046200b004a222ffe628mr7378467lfd.4.1665417985792; Mon, 10 Oct 2022 09:06:25 -0700 (PDT) MIME-Version: 1.0 References: <874jwf2atx.fsf@gmail.com> In-Reply-To: <874jwf2atx.fsf@gmail.com> From: Mehmet Tekman Date: Mon, 10 Oct 2022 18:05:49 +0200 Message-ID: Subject: Re: bug#58341: [PATCH] Add x11vnc recipe To: Maxim Cournoyer Content-Type: multipart/mixed; boundary="00000000000072371505eab05764" X-Spam-Score: 0.2 (/) X-Debbugs-Envelope-To: 58341 Cc: 58341@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.8 (/) --00000000000072371505eab05764 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hello, thank you for the review! I've put the recipe into vnc.scm and built to a newer commit that makes the patches redundant (thanks for the tip, I was basing my recipe off one from another distro). I've fixed the commit message and linted and styled the vnc.scm file. I created a new branch and put my changes there, so please disregard the above changes. I attach here the patch file, as I don't quite trust myself to paste the changes into this email. Looking forward to the next review, Best, Mehmet On Sat, 8 Oct 2022 at 06:33, Maxim Cournoyer wr= ote: > > Hello, and thank you for your contribution! > > Mehmet Tekman writes: > > > --- > > gnu/packages/patches/x11vnc-gcc10-fix.patch | 42 ++++++++++ > > ...c-scan-limit-access-to-shared-memory.patch | 22 ++++++ > > .../patches/x11vnc-xfc-null-ptr.patch | 29 +++++++ > > gnu/packages/x11vnc.scm | 79 +++++++++++++++++++ > > 4 files changed, 172 insertions(+) > > create mode 100644 gnu/packages/patches/x11vnc-gcc10-fix.patch > > create mode 100644 > > gnu/packages/patches/x11vnc-scan-limit-access-to-shared-memory.patch > > create mode 100644 gnu/packages/patches/x11vnc-xfc-null-ptr.patch > > create mode 100644 gnu/packages/x11vnc.scm > > Would it be possible to send the patch complete with the commit message, > as can be produced with 'git format-patch'? You can read 'info "(guix) > Submitting Patches". The git commit message should use the GNU > ChangeLog format, as mentioned there. You can look at the git history > to learn. > > The patches should be registered in the gnu/local.mk file, in the > dist_patch_DATA section. Please mind the sorting in the file. > > > diff --git a/gnu/packages/patches/x11vnc-gcc10-fix.patch > > b/gnu/packages/patches/x11vnc-gcc10-fix.patch > > new file mode 100644 > > index 0000000000..a32d5785d9 > > --- /dev/null > > +++ b/gnu/packages/patches/x11vnc-gcc10-fix.patch > > @@ -0,0 +1,42 @@ > > +From a48b0b1cd887d7f3ae67f525d7d334bd2feffe60 Mon Sep 17 00:00:00 2001 > > +From: Alexander Tsoy > > +Date: Tue, 28 Jan 2020 22:21:01 +0300 > > +Subject: [PATCH] Fix build with -fno-common > > + > > +GCC 10 defaults to -fno-common > > +--- > > + src/util.c | 3 +++ > > + src/util.h | 6 +++--- > > + 2 files changed, 6 insertions(+), 3 deletions(-) > > + > > +diff --git a/src/util.c b/src/util.c > > +index a82a1a42..6a52ebf4 100644 > > +--- a/src/util.c > > ++++ b/src/util.c > > +@@ -47,6 +47,9 @@ int hxl =3D 0; > > + #ifdef LIBVNCSERVER_HAVE_LIBPTHREAD > > + MUTEX(x11Mutex); > > + MUTEX(scrollMutex); > > ++MUTEX(clientMutex); > > ++MUTEX(inputMutex); > > ++MUTEX(pointerMutex); > > + #endif > > + > > + int nfix(int i, int n); > > +diff --git a/src/util.h b/src/util.h > > +index 35c1afd2..99b5dd1d 100644 > > +--- a/src/util.h > > ++++ b/src/util.h > > +@@ -102,9 +102,9 @@ extern struct timeval _mysleep; > > + #ifdef LIBVNCSERVER_HAVE_LIBPTHREAD > > + extern MUTEX(x11Mutex); > > + extern MUTEX(scrollMutex); > > +-MUTEX(clientMutex); > > +-MUTEX(inputMutex); > > +-MUTEX(pointerMutex); > > ++extern MUTEX(clientMutex); > > ++extern MUTEX(inputMutex); > > ++extern MUTEX(pointerMutex); > > + #endif > > + > > + #define X_INIT INIT_MUTEX(x11Mutex) > > diff --git a/gnu/packages/patches/x11vnc-scan-limit-access-to-shared-me= mory.patch > > b/gnu/packages/patches/x11vnc-scan-limit-access-to-shared-memory.patch > > new file mode 100644 > > index 0000000000..5424094434 > > --- /dev/null > > +++ b/gnu/packages/patches/x11vnc-scan-limit-access-to-shared-memory.pa= tch > > @@ -0,0 +1,22 @@ > > +From 69eeb9f7baa14ca03b16c9de821f9876def7a36a Mon Sep 17 00:00:00 2001 > > +From: =3D?UTF-8?q?Gu=3DC3=3DA9nal=3D20DAVALAN?=3D > > +Date: Wed, 18 Nov 2020 08:40:45 +0100 > > +Subject: [PATCH] scan: limit access to shared memory segments to curre= nt user > > + > > +--- > > + src/scan.c | 2 +- > > + 1 file changed, 1 insertion(+), 1 deletion(-) > > + > > +diff --git a/src/scan.c b/src/scan.c > > +index 43e00d20..12994d52 100644 > > +--- a/src/scan.c > > ++++ b/src/scan.c > > +@@ -320,7 +320,7 @@ static int shm_create(XShmSegmentInfo *shm, > > XImage **ximg_ptr, int w, int h, > > + > > + #if HAVE_XSHM > > + shm->shmid =3D shmget(IPC_PRIVATE, > > +- xim->bytes_per_line * xim->height, IPC_CREAT | 0777); > > ++ xim->bytes_per_line * xim->height, IPC_CREAT | 0600); > > + > > + if (shm->shmid =3D=3D -1) { > > + rfbErr("shmget(%s) failed.\n", name); > > diff --git a/gnu/packages/patches/x11vnc-xfc-null-ptr.patch > > b/gnu/packages/patches/x11vnc-xfc-null-ptr.patch > > new file mode 100644 > > index 0000000000..65f339d716 > > --- /dev/null > > +++ b/gnu/packages/patches/x11vnc-xfc-null-ptr.patch > > @@ -0,0 +1,29 @@ > > +From 95a10ab64c2dbbec2c8dad91a5ffb73a0d68474b Mon Sep 17 00:00:00 2001 > > +From: Jonathan Liu > > +Date: Mon, 16 Mar 2020 20:04:06 +1100 > > +Subject: [PATCH] src/cursor: fix xfc NULL pointer dereference > > + > > +xfc->width and xfc->height for the XFixes cursor image returned from > > +XFixesGetCursorImage(dpy) are accessed without first checking that xfc > > +is not NULL. This can result in the server sometimes crashing when > > +moving a Google Chrome window. > > + > > +Fixes: 37c946191a0f ("Broken cursor bugfix for 64 bit systems (#49)") > > +Signed-off-by: Jonathan Liu > > +--- > > + src/cursor.c | 2 +- > > + 1 file changed, 1 insertion(+), 1 deletion(-) > > + > > +diff --git a/src/cursor.c b/src/cursor.c > > +index 39e73a69..74a08c69 100644 > > +--- a/src/cursor.c > > ++++ b/src/cursor.c > > +@@ -1311,7 +1311,7 @@ static int get_exact_cursor(int init) { > > + > > + /* retrieve the cursor info + pixels from server: */ > > + xfc =3D XFixesGetCursorImage(dpy); > > +- { > > ++ if (xfc) { > > + /* 2017-07-09, Stephan Fuhrmann: This fixes an > > implementation flaw for 64 bit systems. > > + * The XFixesCursorImage structure says xfc->pixels is > > (unsigned long*) in the structure, but > > + * the protocol spec says it's 32 bit per pixel > > diff --git a/gnu/packages/x11vnc.scm b/gnu/packages/x11vnc.scm > > new file mode 100644 > > index 0000000000..55c51305b3 > > Since we are using a recent commit, shouldn't these (upstream?) patches > be unnecessary? Perhaps we can use an even newer commit that includes > them? > > > --- /dev/null > > +++ b/gnu/packages/x11vnc.scm > > @@ -0,0 +1,79 @@ > > +;;; GNU Guix --- Functional package management for GNU > > +;;; Copyright =C2=A9 2022 Mehmet Tekman > > +;;; > > +;;; This file is part of GNU Guix. > > +;;; > > +;;; GNU Guix is free software; you can redistribute it and/or modify i= t > > +;;; under the terms of the GNU General Public License as published by > > +;;; the Free Software Foundation; either version 3 of the License, or = (at > > +;;; your option) any later version. > > +;;; > > +;;; GNU Guix is distributed in the hope that it will be useful, but > > +;;; WITHOUT ANY WARRANTY; without even the implied warranty of > > +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > > +;;; GNU General Public License for more details. > > +;;; > > +;;; You should have received a copy of the GNU General Public License > > +;;; along with GNU Guix. If not, see . > > + > > + > > +(define-module (gnu packages x11vnc) > > There already is a (gnu packages vnc) module; that'd be a better home. > We can group all VNC-related packages there. > > > + #:use-module (guix packages) > > + #:use-module (gnu packages) > > + #:use-module (gnu packages perl) > > + #:use-module (gnu packages tcl) > > + #:use-module (gnu packages pkg-config) > > + #:use-module (gnu packages xorg) > > + #:use-module (gnu packages tls) > > + #:use-module (guix git-download) > > + #:use-module (guix build-system gnu) > > + #:use-module ((guix licenses) #:prefix license:) > > + #:use-module (gnu packages autotools) > > + #:use-module (gnu packages avahi) > > + #:use-module (gnu packages vnc) > > + #:use-module (gnu packages compression) > > + #:use-module (gnu packages image)) > > Imports should be lexicographically sorted. > > > +(define-public x11vnc > > When using an unreleased version, it's good to mention why (issues it > fixes, a very old release, etc.). > > + (let ((commit "4ca006fed80410bd9b061a1519bd5d9366bb0bc8") > > + (version "0.9.16") > > + (revision "1")) > > + (package > > + (name "x11vnc") > > + (version (git-version version revision commit)) > > + (source (origin > > + (method git-fetch) > > + (uri (git-reference > > + (url "https://github.com/LibVNC/x11vnc") > > + (commit commit))) > > + (file-name (git-file-name name version)) > > + (sha256 > > + (base32 > > + "1g652mmi79pfq4p5p7spaswa164rpzjhc5rn2phy5pm71lm0vib= 1")) > > + (patches > > + (search-patches "x11vnc-xfc-null-ptr.patch" > > + "x11vnc-gcc10-fix.patch" > > + > > "x11vnc-scan-limit-access-to-shared-memory.patch")))) > > Odd blank line here. You can try './pre-inst-env guix style x11vnc' to > see how it would do it, else I'd do it like to avoid breaking the 80 > chars max width: > > (search-patches > "patch1" > "patch2" > ...) > > > + (build-system gnu-build-system) > > + (arguments > > + '(#:phases > > + (modify-phases > > + %standard-phases > > + (add-before 'bootstrap 'delete-premature-configure > > + (lambda _ (substitute* "./autogen.sh" > > + ((".*/configure") ""))))))) > > + (native-inputs (list > > + ;; [optional requirements] > > + ;; perl tk > > + autoconf automake autobuild pkg-config avahi lib= vnc > > + libx11 libxcomposite libxdamage libxext libxfixe= s libxi > > + libxinerama libxrandr libxtst > > + openssl xdpyinfo zlib libjpeg-turbo xf86-video-d= ummy)) > > The libraries that are used at run time should appear as inputs, not > native-inputs. Native-inputs are for build tools or tests. > > > + (synopsis "VNC server for real X displays") > > + (home-page "https://github.com/LibVNC/x11vnc") > > + (description > > + "x11vnc allows one to view remotely and interact with real X > > +displays (i.e. a display corresponding to a physical monitor, keyboard= , and > > +mouse) with any VNC viewer. In this way it plays the role for Unix/X1= 1 that > > +WinVNC plays for Windows.") > > I'd remove the useless comparison with windows, perhaps stress that this > provides a VNC *server* in the description as well. > > > + (license license:gpl2)))) > > -- > Thanks, > Maxim --00000000000072371505eab05764 Content-Type: text/x-patch; charset="UTF-8"; name="0001-gnu-Add-x11vnc.patch" Content-Disposition: attachment; filename="0001-gnu-Add-x11vnc.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_l92ytl650 RnJvbSAzNzljMTUyYTU1OWY3NTM4Y2I1ZWM4NjhkYzU4YTAzZGFmNTkyZjA1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNZWhtZXQgVGVrbWFuIDxtdGVrbWFuODlAZ21haWwuY29tPgpE YXRlOiBNb24sIDEwIE9jdCAyMDIyIDE3OjU0OjIxICswMjAwClN1YmplY3Q6IFtQQVRDSF0gZ251 OiBBZGQgeDExdm5jLgoKKiBnbnUvcGFja2FnZXMvdm5jLnNjbSAoeDExdm5jKTogTmV3IHZhcmlh YmxlLgotLS0KIGdudS9wYWNrYWdlcy92bmMuc2NtIHwgNTUgKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysKIDEgZmlsZSBjaGFuZ2VkLCA1NSBpbnNlcnRpb25zKCsp CgpkaWZmIC0tZ2l0IGEvZ251L3BhY2thZ2VzL3ZuYy5zY20gYi9nbnUvcGFja2FnZXMvdm5jLnNj bQppbmRleCA4NGM4NGFlYzc2Li4wMTdhYzZiMzQzIDEwMDY0NAotLS0gYS9nbnUvcGFja2FnZXMv dm5jLnNjbQorKysgYi9nbnUvcGFja2FnZXMvdm5jLnNjbQpAQCAtNiw2ICs2LDcgQEAKIDs7OyBD b3B5cmlnaHQgwqkgMjAyMCBWaW5jZW50IExlZ29sbCA8dmluY2VudC5sZWdvbGxAZ21haWwuY29t PgogOzs7IENvcHlyaWdodCDCqSAyMDIxLCAyMDIyIFRvYmlhcyBHZWVyaW5ja3gtUmljZSA8bWVA dG9iaWFzLmdyPgogOzs7IENvcHlyaWdodCDCqSAyMDIyIE1heGltIENvdXJub3llciA8bWF4aW0u Y291cm5veWVyQGdtYWlsLmNvbT4KKzs7OyBDb3B5cmlnaHQgwqkgMjAyMiBNZWhtZXQgVGVrbWFu IDxtdGVrbWFuODlAZ21haWwuY29tPgogOzs7CiA7OzsgVGhpcyBmaWxlIGlzIHBhcnQgb2YgR05V IEd1aXguCiA7OzsKQEAgLTI0LDEwICsyNSwxMiBAQAogCiAoZGVmaW5lLW1vZHVsZSAoZ251IHBh Y2thZ2VzIHZuYykKICAgIzp1c2UtbW9kdWxlIChndWl4IGJ1aWxkLXN5c3RlbSBjbWFrZSkKKyAg Izp1c2UtbW9kdWxlIChndWl4IGJ1aWxkLXN5c3RlbSBnbnUpCiAgICM6dXNlLW1vZHVsZSAoZ3Vp eCBkb3dubG9hZCkKICAgIzp1c2UtbW9kdWxlIChndWl4IGdpdC1kb3dubG9hZCkKICAgIzp1c2Ut bW9kdWxlICgoZ3VpeCBsaWNlbnNlcykgIzpwcmVmaXggbGljZW5zZTopCiAgICM6dXNlLW1vZHVs ZSAoZ3VpeCBnZXhwKQorICAjOnVzZS1tb2R1bGUgKGd1aXggZ2l0LWRvd25sb2FkKQogICAjOnVz ZS1tb2R1bGUgKGd1aXggcGFja2FnZXMpCiAgICM6dXNlLW1vZHVsZSAoZ3VpeCB1dGlscykKICAg Izp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMpCkBAIC01MTEsNiArNTE0LDU4IEBAIChkZWZpbmUg b3BlbmpkayAjJCh0aGlzLXBhY2thZ2UtaW5wdXQgIm9wZW5qZGsiKSkKIHJhdHBvaXNvbi4iKQog ICAgIChsaWNlbnNlIGxpY2Vuc2U6Z3BsMispKSkKIAorKGRlZmluZS1wdWJsaWMgeDExdm5jCisg IDs7IFRoZSByZWxlYXNlIHZlcnNpb24gb2YgMC45LjE2IHJlcXVpcmVzIHBhdGNoZXMgdG8gd29y aywgc28gd2UgcGluIHRvIHRoZQorICA7OyBsYXRlc3Qgd29ya2luZyBjb21taXQKKyAgKGxldCAo KGNvbW1pdCAiM2U0ZGM4ZWYyOTg1YTZlNjcwZTFkOTY0OWZlNTUzOTVjMmIzMTAzOSIpCisgICAg ICAgICh2ZXJzaW9uICIwLjkuMTYiKQorICAgICAgICAocmV2aXNpb24gIjEiKSkKKyAgICAocGFj a2FnZQorICAgICAgKG5hbWUgIngxMXZuYyIpCisgICAgICAodmVyc2lvbiAoZ2l0LXZlcnNpb24g dmVyc2lvbiByZXZpc2lvbiBjb21taXQpKQorICAgICAgKHNvdXJjZSAob3JpZ2luCisgICAgICAg ICAgICAgICAgKG1ldGhvZCBnaXQtZmV0Y2gpCisgICAgICAgICAgICAgICAgKHVyaSAoZ2l0LXJl ZmVyZW5jZQorICAgICAgICAgICAgICAgICAgICAgICh1cmwgImh0dHBzOi8vZ2l0aHViLmNvbS9M aWJWTkMveDExdm5jIikKKyAgICAgICAgICAgICAgICAgICAgICAoY29tbWl0IGNvbW1pdCkpKQor ICAgICAgICAgICAgICAgIChmaWxlLW5hbWUgKGdpdC1maWxlLW5hbWUgbmFtZSB2ZXJzaW9uKSkK KyAgICAgICAgICAgICAgICAoc2hhMjU2CisgICAgICAgICAgICAgICAgIChiYXNlMzIKKyAgICAg ICAgICAgICAgICAgICIwYTEyMGd2OWgzd2hpem5sZGRsMGozbnozNDAwampnbDk3em5haW5jbTVp Mm01cG5qaWZzIikpKSkKKyAgICAgIChidWlsZC1zeXN0ZW0gZ251LWJ1aWxkLXN5c3RlbSkKKyAg ICAgIChhcmd1bWVudHMKKyAgICAgICAnKCM6cGhhc2VzIChtb2RpZnktcGhhc2VzICVzdGFuZGFy ZC1waGFzZXMKKyAgICAgICAgICAgICAgICAgICAgKGFkZC1iZWZvcmUgJ2Jvb3RzdHJhcCAnZGVs ZXRlLXByZW1hdHVyZS1jb25maWd1cmUKKyAgICAgICAgICAgICAgICAgICAgICAobGFtYmRhIF8K KyAgICAgICAgICAgICAgICAgICAgICAgIChzdWJzdGl0dXRlKiAiLi9hdXRvZ2VuLnNoIgorICAg ICAgICAgICAgICAgICAgICAgICAgICAoKCIuKi9jb25maWd1cmUiKQorICAgICAgICAgICAgICAg ICAgICAgICAgICAgIiIpKSkpKSkpCisgICAgICAobmF0aXZlLWlucHV0cyAobGlzdCBhdXRvY29u ZiBhdXRvbWFrZSBhdXRvYnVpbGQgcGtnLWNvbmZpZykpCisgICAgICAoaW5wdXRzIChsaXN0IGF2 YWhpCisgICAgICAgICAgICAgICAgICAgIGxpYnZuYworICAgICAgICAgICAgICAgICAgICBsaWJ4 MTEKKyAgICAgICAgICAgICAgICAgICAgbGlieGNvbXBvc2l0ZQorICAgICAgICAgICAgICAgICAg ICBsaWJ4ZGFtYWdlCisgICAgICAgICAgICAgICAgICAgIGxpYnhleHQKKyAgICAgICAgICAgICAg ICAgICAgbGlieGZpeGVzCisgICAgICAgICAgICAgICAgICAgIGxpYnhpCisgICAgICAgICAgICAg ICAgICAgIGxpYnhpbmVyYW1hCisgICAgICAgICAgICAgICAgICAgIGxpYnhyYW5kcgorICAgICAg ICAgICAgICAgICAgICBsaWJ4dHN0CisgICAgICAgICAgICAgICAgICAgIG9wZW5zc2wKKyAgICAg ICAgICAgICAgICAgICAgeGRweWluZm8KKyAgICAgICAgICAgICAgICAgICAgemxpYgorICAgICAg ICAgICAgICAgICAgICBsaWJqcGVnLXR1cmJvCisgICAgICAgICAgICAgICAgICAgIHhmODYtdmlk ZW8tZHVtbXkpKQorICAgICAgKHN5bm9wc2lzICJWTkMgc2VydmVyIGZvciByZWFsIFggZGlzcGxh eXMiKQorICAgICAgKGhvbWUtcGFnZSAiaHR0cHM6Ly9naXRodWIuY29tL0xpYlZOQy94MTF2bmMi KQorICAgICAgKGRlc2NyaXB0aW9uCisgICAgICAgIngxMXZuYyBhbGxvd3Mgb25lIHRvIHZpZXcg cmVtb3RlbHkgYW5kIGludGVyYWN0IHdpdGggcmVhbCBYCitkaXNwbGF5cyAoaS5lLiBhIGRpc3Bs YXkgY29ycmVzcG9uZGluZyB0byBhIHBoeXNpY2FsIG1vbml0b3IsIGtleWJvYXJkLCBhbmQKK21v dXNlKSB3aXRoIGFueSBWTkMgdmlld2VyLiIpCisgICAgICAobGljZW5zZSBsaWNlbnNlOmdwbDIp KSkpCisKKwogKGRlZmluZS1wdWJsaWMgbGlidm5jCiAgIChwYWNrYWdlCiAgICAgKG5hbWUgImxp YnZuYyIpCi0tIAoyLjM4LjAKCg== --00000000000072371505eab05764-- From debbugs-submit-bounces@debbugs.gnu.org Tue Oct 11 06:53:10 2022 Received: (at 58341) by debbugs.gnu.org; 11 Oct 2022 10:53:10 +0000 Received: from localhost ([127.0.0.1]:51146 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oiCso-0004xN-2b for submit@debbugs.gnu.org; Tue, 11 Oct 2022 06:53:10 -0400 Received: from mail-lf1-f41.google.com ([209.85.167.41]:46598) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oiCsm-0004x0-EN for 58341@debbugs.gnu.org; Tue, 11 Oct 2022 06:53:08 -0400 Received: by mail-lf1-f41.google.com with SMTP id bp15so20479741lfb.13 for <58341@debbugs.gnu.org>; Tue, 11 Oct 2022 03:53:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :from:to:cc:subject:date:message-id:reply-to; bh=URQIXogBBPgcKbuid6Z+1NDQ6eCb2uw3HW4+sGdKX3A=; b=owvGRQf6NI0fSL7ob+cGn14LlQ4XNcOluOCSHJ4E6GVniQoCRkEYwHIG2ymRCGc728 XkI8DC6CJkb2f367GUW0jthp/aSZU70N7T8OizW3hS38quNHpG9f54PQfxbATpyFBdre HTz3yIqcW3YKs8fOrIdsQZeLyX8stVaP2b8h1CvirD4yr9wmiZsRirvACioTENpIdZii tEl4zhG9hMTD9pH7QST7yullje3ZRic7De1u6yEugRkJT2dHkPPyUsmVXNbeDFCZbAGx KtBfl0iOUhGrrE2ohDeXDpuyuaEF72s+RdDxEpZCJSkTiRvn6jXe9RgTDtsc7z10P/tN OI6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=URQIXogBBPgcKbuid6Z+1NDQ6eCb2uw3HW4+sGdKX3A=; b=wa9aFFe8AUdawVNKtYfQvuGCmL1gfKe8/1L3wZTwOpHjlof6DSOt9ZaFEcnrjIwQTF pw9Lrb+R0Yo7Iio4mOnkmil95at40Okq7iJQ59f5OFewr8UPcCTi+oJ+gkXV0NL2C8gE QijgMUMO/of+TQ+Z7ufFjCju6Wt6v6TQQAgOGOuU9QqIAN71Ad24+shQTf34RENIGxWZ FaXADP37yK8XI84vldkjSQeupXrZL/rQW5zZQK78QygfuU8vPlwF7HzQfZW/RpMABdlv tLyHxHd2ZSIUtNLFkGr3r83UY3JPHPuGqlyyP/+FW++jW3YxIXt9JEevvRj4adwdh+81 PjtQ== X-Gm-Message-State: ACrzQf1P1ztPhDT84UjC8QFTeKjhwBilj8vFTSIb+h7ozAMDpHnh2Q5S JOcCN7Z3Dye/9SaNg5/mFtqRXzw4kW1911H4lm05Ir7Uj2k= X-Google-Smtp-Source: AMsMyM70DMgnP4rKvk/nFI7GcnV59P849wcnM6k92Qg6uiAjoXX/ztJwLEhlbCNadmKWSTz0M4ANLrY/hRwf3tqIIGI= X-Received: by 2002:a05:6512:2385:b0:4a2:c690:4015 with SMTP id c5-20020a056512238500b004a2c6904015mr5913558lfv.493.1665485582273; Tue, 11 Oct 2022 03:53:02 -0700 (PDT) MIME-Version: 1.0 References: <874jwf2atx.fsf@gmail.com> In-Reply-To: From: Mehmet Tekman Date: Tue, 11 Oct 2022 12:52:26 +0200 Message-ID: Subject: Re: bug#58341: [PATCH] Add x11vnc recipe To: 58341@debbugs.gnu.org Content-Type: text/plain; charset="UTF-8" X-Spam-Score: 0.2 (/) X-Debbugs-Envelope-To: 58341 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.8 (/) (Apologies for the quoted reply, I've now learned how to disable that) From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 31 11:36:50 2022 Received: (at 58341-done) by debbugs.gnu.org; 31 Oct 2022 15:36:50 +0000 Received: from localhost ([127.0.0.1]:41550 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1opWqG-0007eT-BA for submit@debbugs.gnu.org; Mon, 31 Oct 2022 11:36:49 -0400 Received: from mail-qt1-f173.google.com ([209.85.160.173]:40692) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1opWqD-0007eF-6A for 58341-done@debbugs.gnu.org; Mon, 31 Oct 2022 11:36:46 -0400 Received: by mail-qt1-f173.google.com with SMTP id h24so7623080qta.7 for <58341-done@debbugs.gnu.org>; Mon, 31 Oct 2022 08:36:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=JAsx1ytqyiDnhRuXwk0eHEfX3wTI8UZYd8ykVJQ7GAQ=; b=PdvKQS2QZxhbgybNh7gDpd7JqXxD+fsrOhjWH6D407jScKVdcWwGKl185K6r6DSa5V GGS7++KzB9FQEvLdQhS52mOdXCWP+xfzOPDdO7Bj2IJ7GJeUiS//bdAVCSDtbUqDGusj qlYx3LzBTLwPkRDPIpQMsf+iiVhDYiMxd64+k1ju1qEvXkY0WCtNGp+FAIXAZzPENOzJ Tp17s48iNd2FpU9R6ge3wKnj9YiufZccY5dXHjW/zh6tvhLsgNatTehQTfbU6t3WxeBW A7Teo/b1NouVtthO7g4HH1dQyTP/Xa1b+5xP6B0Nxt6/nwbUlV3I0aqVw4Few+pAnAQT WsqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=JAsx1ytqyiDnhRuXwk0eHEfX3wTI8UZYd8ykVJQ7GAQ=; b=Gh5xsUxBQvmK0o4EnQ/YL/x0d05bzRCVeA8ea4atLItgyQZ3Ad1vgPbU6R5JBbCyK2 SnRZhxGLZQwkH2eW5q1Wo6akpuGIMbsPG2QCXdpwlQK3CFHVKCLl8mXnjeNcbED7kG/i MtOHLJ/hx9waU2vAg0wOLytI/Ic2DR7whohHHaFfVdhpvF74OlOoFOUmtc4OX6KTQUsH M/1emowD5VpjC3C6cHzO/RWVJJPIJLwJUV6rMIekUsFSHpfjAt7oYt7zVmJlyBJXVQVP FQWf5MUzQiihx32ud+7ojHAKhjORy6FCktnDHG5woyM9P573fKCxCH5C3KQA+fp9oWQW +e+A== X-Gm-Message-State: ACrzQf30Sc5tuGhEOcmGp8H8k4UGpHqfB/tVT9L+0TVDIWMic6kU1j10 626fMKbOKDHvU5q6GI7dspNTwqkxDuA= X-Google-Smtp-Source: AMsMyM7tkM++favrP/C3NRRB6YeCydcRDRcvDiKoHTW3bysRkPdBh+VhQlJkjSDRs24Uy9mx2Imhbw== X-Received: by 2002:a05:622a:1791:b0:3a4:fafc:1800 with SMTP id s17-20020a05622a179100b003a4fafc1800mr11181232qtk.401.1667230599454; Mon, 31 Oct 2022 08:36:39 -0700 (PDT) Received: from hurd ([2607:fad8:4:3::1001]) by smtp.gmail.com with ESMTPSA id k26-20020ac8475a000000b00398313f286dsm2119487qtp.40.2022.10.31.08.36.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 08:36:38 -0700 (PDT) From: Maxim Cournoyer To: Mehmet Tekman Subject: Re: bug#58341: [PATCH] Add x11vnc recipe References: <874jwf2atx.fsf@gmail.com> Date: Mon, 31 Oct 2022 11:36:37 -0400 In-Reply-To: (Mehmet Tekman's message of "Mon, 10 Oct 2022 18:05:49 +0200") Message-ID: <878rkwdmyi.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 58341-done Cc: 58341-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Mehmet, Mehmet Tekman writes: > Hello, thank you for the review! Thanks for the prompt reply, and sorry for the delays on my part! > I've put the recipe into vnc.scm and built to a newer commit that > makes the patches redundant (thanks for the tip, I was basing my > recipe off one from another distro). > > I've fixed the commit message and linted and styled the vnc.scm file. > > I created a new branch and put my changes there, so please disregard > the above changes. > > I attach here the patch file, as I don't quite trust myself to paste > the changes into this email. That's fine. It looks very good! I've made the following cosmetic/nitpicking changes: --8<---------------cut here---------------start------------->8--- modified gnu/packages/vnc.scm @@ -568,11 +568,10 @@ (define-public x11vnc ;; The release version of 0.9.16 requires patches to work, so we pin to the ;; latest working commit (let ((commit "3e4dc8ef2985a6e670e1d9649fe55395c2b31039") - (version "0.9.16") - (revision "1")) + (revision "0")) (package (name "x11vnc") - (version (git-version version revision commit)) + (version (git-version "0.9.16" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -584,14 +583,15 @@ (define-public x11vnc "0a120gv9h3whiznlddl0j3nz3400jjgl97znaincm5i2m5pnjifs")))) (build-system gnu-build-system) (arguments - '(#:phases (modify-phases %standard-phases - (add-before 'bootstrap 'delete-premature-configure - (lambda _ - (substitute* "./autogen.sh" - ((".*/configure") - ""))))))) + (list #:phases #~(modify-phases %standard-phases + (add-before 'bootstrap 'delete-premature-configure + (lambda _ + (substitute* "./autogen.sh" + ((".*/configure") + ""))))))) (native-inputs (list autoconf automake autobuild pkg-config)) (inputs (list avahi + libjpeg-turbo libvnc libx11 libxcomposite @@ -604,9 +604,8 @@ (define-public x11vnc libxtst openssl xdpyinfo - zlib - libjpeg-turbo - xf86-video-dummy)) + xf86-video-dummy + zlib)) (synopsis "VNC server for real X displays") (home-page "https://github.com/LibVNC/x11vnc") (description @@ -615,7 +614,6 @@ (define-public x11vnc mouse) with any VNC viewer.") (license license:gpl2)))) - (define-public libvnc (package (name "libvnc") --8<---------------cut here---------------end--------------->8--- 1. Do not bind a "version" variable in let; it's bound by the version field of the package record at definition (see: define-record-type* from (guix records)). 2. Used a plain list with a gexp for the phases, which is more forward-looking. 3. Sorted the inputs. 4. Removed an extra newline at the end (we use only one newline between definitions). Before pushing, I've also double checked the license and found that it should be gpl2+, as the COPYING file contains the "any later version" text. x11vnc.h also has in the license notice: x11vnc is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. I made these changes and pushed to master! Thanks again, Maxim From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 31 13:30:59 2022 Received: (at 58341-done) by debbugs.gnu.org; 31 Oct 2022 17:31:00 +0000 Received: from localhost ([127.0.0.1]:41674 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1opYcl-0004GC-Nx for submit@debbugs.gnu.org; Mon, 31 Oct 2022 13:30:59 -0400 Received: from mail-lf1-f46.google.com ([209.85.167.46]:43589) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1opYcj-0004Fy-VM for 58341-done@debbugs.gnu.org; Mon, 31 Oct 2022 13:30:58 -0400 Received: by mail-lf1-f46.google.com with SMTP id d6so20315325lfs.10 for <58341-done@debbugs.gnu.org>; Mon, 31 Oct 2022 10:30:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :from:to:cc:subject:date:message-id:reply-to; bh=LHq14Vqprn/2V7879DEJTQgPtZ7syZLL7OmmCK9qbOQ=; b=QzIro2XyamDYgaBkRi0QNxxsiMbx4KSgwXZAoMrSq6HaoTiPREOIpdyOF6FGcmghp2 QuATrxwQKI85HneTfBV6DcjnvjTq5Yvxp95c4+gpHNqiY+y3oxLQaLcgtW67VkhYat3p qG8e//02I2BldcHHTk4hmq3WYz6VFatD6Y4lUqf43cBSTSqsFxvQR75NiQjw00b9lPaY f/7Mx3Q38ssas/44R5i8iisVHzSnTPkrFD1jzJOKwb7EMORlgbyujHgijFKjH9vE5jlD Yc7P1TLU4nRHmEfIwYyg1WGd29eEIQsL4dhno+HOvldAbaOB6fuUYFKUqKIWpnr9dzc2 WrBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=LHq14Vqprn/2V7879DEJTQgPtZ7syZLL7OmmCK9qbOQ=; b=e4OCzrUztMTAHWXDtKcynXAwRSgt11c+KFxCm9a1hyLH3cwiX/3J/znf2uNR7rK4Wx Te7Wb6fklfpAS6hJjLGzQmZ2pG/+H7fhzS1uLppDsdxvEjUBaxyJWTjLzU6VnV/8EtWd wQhErW+5uM5C+1bKGBB5T92o/806Z2RdDSXZSxR3h5u05wtr3UVzUPeUVYjXFejkJMrI u41HK6iMXcmmIj4GoT6PyMweNAOMwrWRjc8U97lFQWY1BcNf6k78K9KmSV8RrCzMTERY OF0gl5wvlEq3NvNVBI/QSOd37hI5PAHqyZ+7uozgL6dxCPdVZcqTZ9CfRSXitQQ0X18f O8xw== X-Gm-Message-State: ACrzQf2Erd62YxgCgjbRJmYTVlq7a2mQ9Iq6WTjqYYOTXzhFdsOlCGnh M7nShd0XpQd+SiM7hd4swat5D5XufLzRhkEFGV4w6Yh8RAY= X-Google-Smtp-Source: AMsMyM6bEZr+Mklq3lnlRNsApZS+8u48aTbsHWGJRcsoCYLG+uhwMYLnRC2TnYAVvwldPHBwkyUfU2owqMnwfLD6YiM= X-Received: by 2002:ac2:5a5d:0:b0:4a2:3d64:8ad3 with SMTP id r29-20020ac25a5d000000b004a23d648ad3mr6094015lfn.530.1667237451728; Mon, 31 Oct 2022 10:30:51 -0700 (PDT) MIME-Version: 1.0 References: <874jwf2atx.fsf@gmail.com> <878rkwdmyi.fsf_-_@gmail.com> In-Reply-To: <878rkwdmyi.fsf_-_@gmail.com> From: Mehmet Tekman Date: Mon, 31 Oct 2022 18:30:15 +0100 Message-ID: Subject: Re: bug#58341: [PATCH] Add x11vnc recipe To: 58341-done@debbugs.gnu.org Content-Type: multipart/alternative; boundary="000000000000110b3205ec57f873" X-Spam-Score: 0.3 (/) X-Debbugs-Envelope-To: 58341-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --000000000000110b3205ec57f873 Content-Type: text/plain; charset="UTF-8" Thanks for the edits! --000000000000110b3205ec57f873 Content-Type: text/html; charset="UTF-8"
Thanks for the edits!
--000000000000110b3205ec57f873-- From unknown Sat Jun 21 03:17:46 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Tue, 29 Nov 2022 12:24:06 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator