public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: net-misc/vino/files/, net-misc/vino/
@ 2015-10-24  7:45 Pacho Ramos
  0 siblings, 0 replies; 4+ messages in thread
From: Pacho Ramos @ 2015-10-24  7:45 UTC (permalink / raw
  To: gentoo-commits

commit:     6c693e0a73b17ba7b4d4ab202e66f96181ffc366
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 24 07:44:31 2015 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Oct 24 07:45:30 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c693e0a

net-misc/vino: Apply upstream fixes, also including a fix for a crash when gnome-control-center is not present (#561786 by Mikhail Kurinnoi)

Package-Manager: portage-2.2.23

 net-misc/vino/files/vino-3.16.0-fix-crash.patch    | 53 +++++++++++++++
 .../vino/files/vino-3.16.0-name-resolution.patch   | 47 +++++++++++++
 net-misc/vino/vino-3.16.0-r1.ebuild                | 77 ++++++++++++++++++++++
 3 files changed, 177 insertions(+)

diff --git a/net-misc/vino/files/vino-3.16.0-fix-crash.patch b/net-misc/vino/files/vino-3.16.0-fix-crash.patch
new file mode 100644
index 0000000..bf0d190
--- /dev/null
+++ b/net-misc/vino/files/vino-3.16.0-fix-crash.patch
@@ -0,0 +1,53 @@
+From 22f6575b32675ae38567efd3ed8e2362bbc9240d Mon Sep 17 00:00:00 2001
+From: David King <amigadave@amigadave.com>
+Date: Mon, 19 Oct 2015 14:48:44 +0100
+Subject: Avoid a crash when showing the preferences
+
+Show an error message when the preferences desktop file is not found,
+such as if gnome-control-center is not installed.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=756654
+---
+ server/vino-status-icon.c      | 5 +++++
+ server/vino-status-tube-icon.c | 9 ++++++++-
+ 2 files changed, 13 insertions(+), 1 deletion(-)
+
+diff --git a/server/vino-status-icon.c b/server/vino-status-icon.c
+index 53eec02..aaab0af 100644
+--- a/server/vino-status-icon.c
++++ b/server/vino-status-icon.c
+@@ -202,6 +202,11 @@ vino_status_icon_preferences (VinoStatusIcon *icon)
+   info = g_desktop_app_info_new ("gnome-sharing-panel.desktop");
+   if (info == NULL)
+     info = g_desktop_app_info_new ("vino-preferences.desktop");
++  if (info == NULL)
++    {
++      vino_util_show_error (NULL, _("Error displaying preferences"), NULL);
++      return;
++    }
+   context = gdk_display_get_app_launch_context (gdk_screen_get_display (screen));
+   if (!g_app_info_launch (G_APP_INFO (info), NULL, G_APP_LAUNCH_CONTEXT (context), &error))
+     {
+diff --git a/server/vino-status-tube-icon.c b/server/vino-status-tube-icon.c
+index 0a23a23..e5cbb11 100644
+--- a/server/vino-status-tube-icon.c
++++ b/server/vino-status-tube-icon.c
+@@ -165,7 +165,14 @@ vino_status_tube_icon_preferences (VinoStatusTubeIcon *icon)
+   GError *error = NULL;
+ 
+   screen = gtk_status_icon_get_screen (GTK_STATUS_ICON (icon));
+-  info = g_desktop_app_info_new ("vino-preferences.desktop");
++  info = g_desktop_app_info_new ("gnome-sharing-panel.desktop");
++  if (info == NULL)
++    info = g_desktop_app_info_new ("vino-preferences.desktop");
++  if (info == NULL)
++    {
++      vino_util_show_error (NULL, _("Error displaying preferences"), NULL);
++      return;
++    }
+   context = gdk_display_get_app_launch_context (gdk_screen_get_display (screen));
+   if (!g_app_info_launch (G_APP_INFO (info), NULL, G_APP_LAUNCH_CONTEXT (context), &error))
+     {
+-- 
+cgit v0.11.2
+

diff --git a/net-misc/vino/files/vino-3.16.0-name-resolution.patch b/net-misc/vino/files/vino-3.16.0-name-resolution.patch
new file mode 100644
index 0000000..2989ffa
--- /dev/null
+++ b/net-misc/vino/files/vino-3.16.0-name-resolution.patch
@@ -0,0 +1,47 @@
+From bdd14508f9ea46372fcef93e17a9c14bcb8b4c83 Mon Sep 17 00:00:00 2001
+From: Dimitri Tarassenko <dtarassenko@gmail.com>
+Date: Fri, 28 Aug 2015 17:02:15 +0100
+Subject: Improve handling of name resolution failure
+
+Ensure that the host string for a client is always filled with a valid
+string, by calling getnameinfo() a second time (ensuring a numeric host
+is returned) if the first call fails.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=754194
+---
+ server/libvncserver/rfbserver.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/server/libvncserver/rfbserver.c b/server/libvncserver/rfbserver.c
+index 1295219..0a60fb2 100644
+--- a/server/libvncserver/rfbserver.c
++++ b/server/libvncserver/rfbserver.c
+@@ -150,7 +150,7 @@ rfbNewClient(rfbScreenInfoPtr rfbScreen,
+     struct sockaddr_storage addr;
+     socklen_t addrlen = sizeof(addr);
+     int i;
+-    char host[NI_MAXHOST];
++    char host[NI_MAXHOST] = "(unresolved)";
+     const char *prt = "unknown";
+ 
+     cl = (rfbClientPtr)calloc(sizeof(rfbClientRec),1);
+@@ -166,11 +166,11 @@ rfbNewClient(rfbScreenInfoPtr rfbScreen,
+ 
+       getpeername(sock, (struct sockaddr *)&addr, &addrlen);
+ 
+-      getnameinfo((struct sockaddr *)&addr,
+-                  addrlen,
+-                  host, sizeof(host),
+-                  NULL, 0,
+-                  0);
++      if (getnameinfo((struct sockaddr *)&addr, addrlen,
++                      host, sizeof(host), NULL, 0, 0)) {
++        getnameinfo((struct sockaddr *)&addr, addrlen,
++                    host, sizeof(host), NULL, 0, NI_NUMERICHOST);
++      }
+ 
+       cl->host = strdup(host);
+ 
+-- 
+cgit v0.11.2
+

diff --git a/net-misc/vino/vino-3.16.0-r1.ebuild b/net-misc/vino/vino-3.16.0-r1.ebuild
new file mode 100644
index 0000000..0b338c3
--- /dev/null
+++ b/net-misc/vino/vino-3.16.0-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+
+inherit eutils gnome2
+
+DESCRIPTION="An integrated VNC server for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Projects/Vino"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="crypt gnome-keyring ipv6 jpeg ssl +telepathy zeroconf +zlib"
+# bug #394611; tight encoding requires zlib encoding
+REQUIRED_USE="jpeg? ( zlib )"
+
+# cairo used in vino-fb
+# libSM and libICE used in eggsmclient-xsmp
+RDEPEND="
+	>=dev-libs/glib-2.26:2
+	>=dev-libs/libgcrypt-1.1.90:0=
+	>=x11-libs/gtk+-3:3
+
+	dev-libs/dbus-glib
+	x11-libs/cairo:=
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXtst
+	x11-libs/pango[X]
+
+	>=x11-libs/libnotify-0.7.0:=
+
+	crypt? ( >=dev-libs/libgcrypt-1.1.90:0= )
+	gnome-keyring? ( app-crypt/libsecret )
+	jpeg? ( virtual/jpeg:0= )
+	ssl? ( >=net-libs/gnutls-2.2.0:= )
+	telepathy? ( >=net-libs/telepathy-glib-0.18 )
+	zeroconf? ( >=net-dns/avahi-0.6:=[dbus] )
+	zlib? ( sys-libs/zlib:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-lang/perl-5
+	>=dev-util/intltool-0.50
+	virtual/pkgconfig
+	app-crypt/libsecret
+"
+# libsecret is always required at build time per bug 322763
+
+src_prepare() {
+	# Improve handling of name resolution failure (from 'master')
+	epatch "${FILESDIR}"/${P}-name-resolution.patch
+
+	# Avoid a crash when showing the preferences (from 'master')
+	epatch "${FILESDIR}"/${P}-fix-crash.patch
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--with-gcrypt \
+		$(use_enable ipv6) \
+		$(use_with crypt gcrypt) \
+		$(use_with gnome-keyring secret) \
+		$(use_with jpeg) \
+		$(use_with ssl gnutls) \
+		$(use_with telepathy) \
+		$(use_with zeroconf avahi) \
+		$(use_with zlib)
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/vino/files/, net-misc/vino/
@ 2016-06-28 20:30 Pacho Ramos
  0 siblings, 0 replies; 4+ messages in thread
From: Pacho Ramos @ 2016-06-28 20:30 UTC (permalink / raw
  To: gentoo-commits

commit:     3bdc0ce6ff231ec13b88169bbcb0e80d81c9287b
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 28 20:23:46 2016 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Tue Jun 28 20:29:57 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bdc0ce6

net-misc/vino: Drop old

Package-Manager: portage-2.3.0_rc1

 net-misc/vino/Manifest                             |  1 -
 net-misc/vino/files/vino-3.16.0-fix-crash.patch    | 53 ---------------
 .../vino/files/vino-3.16.0-name-resolution.patch   | 47 -------------
 net-misc/vino/vino-3.16.0-r1.ebuild                | 77 ----------------------
 4 files changed, 178 deletions(-)

diff --git a/net-misc/vino/Manifest b/net-misc/vino/Manifest
index acf9a7c..8f45ea4 100644
--- a/net-misc/vino/Manifest
+++ b/net-misc/vino/Manifest
@@ -1,2 +1 @@
-DIST vino-3.16.0.tar.xz 760508 SHA256 608d3613d4e0ad40566759df06587effcfae77f205fce83e3bcf7574bc608dc5 SHA512 232cf9e2d986043e8da4db6d7a07ada77b46f71280da85915c54ed53c7212d47256b0e9532aa4879f6e3fa374a46c7ec7e58310d07581f7708efc1a131ba643f WHIRLPOOL 676c055ce1ef93c966c9691d415c84922247993ac6821ba174108bbaf359d3ee7f6d5d6b8e070bc4af02136ead206a25d11b1efba92a46b4dc209d83e0f88543
 DIST vino-3.18.1.tar.xz 766944 SHA256 07ec6e78bbecd4ee3fce873eb26932fdda9c7642bb09d17ac36483b996fafe5a SHA512 6c98b86a1ae324547b63a2071208f5c2213765ad554f10f3e504bc6ab5817682e5a03df5c23ddbb814d918f263027579c3344dab944eeb4329b0a84f9a3bd182 WHIRLPOOL 261c6fcd7a93b7a937c4c9dfe49a5c6f9833518dc70100b350a12ed282b482761a80e1e4bdf5a08fa27282d0903f2b6ab85a03c2b8f501f43ce16ad5a38160a9

diff --git a/net-misc/vino/files/vino-3.16.0-fix-crash.patch b/net-misc/vino/files/vino-3.16.0-fix-crash.patch
deleted file mode 100644
index bf0d190..0000000
--- a/net-misc/vino/files/vino-3.16.0-fix-crash.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 22f6575b32675ae38567efd3ed8e2362bbc9240d Mon Sep 17 00:00:00 2001
-From: David King <amigadave@amigadave.com>
-Date: Mon, 19 Oct 2015 14:48:44 +0100
-Subject: Avoid a crash when showing the preferences
-
-Show an error message when the preferences desktop file is not found,
-such as if gnome-control-center is not installed.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=756654
----
- server/vino-status-icon.c      | 5 +++++
- server/vino-status-tube-icon.c | 9 ++++++++-
- 2 files changed, 13 insertions(+), 1 deletion(-)
-
-diff --git a/server/vino-status-icon.c b/server/vino-status-icon.c
-index 53eec02..aaab0af 100644
---- a/server/vino-status-icon.c
-+++ b/server/vino-status-icon.c
-@@ -202,6 +202,11 @@ vino_status_icon_preferences (VinoStatusIcon *icon)
-   info = g_desktop_app_info_new ("gnome-sharing-panel.desktop");
-   if (info == NULL)
-     info = g_desktop_app_info_new ("vino-preferences.desktop");
-+  if (info == NULL)
-+    {
-+      vino_util_show_error (NULL, _("Error displaying preferences"), NULL);
-+      return;
-+    }
-   context = gdk_display_get_app_launch_context (gdk_screen_get_display (screen));
-   if (!g_app_info_launch (G_APP_INFO (info), NULL, G_APP_LAUNCH_CONTEXT (context), &error))
-     {
-diff --git a/server/vino-status-tube-icon.c b/server/vino-status-tube-icon.c
-index 0a23a23..e5cbb11 100644
---- a/server/vino-status-tube-icon.c
-+++ b/server/vino-status-tube-icon.c
-@@ -165,7 +165,14 @@ vino_status_tube_icon_preferences (VinoStatusTubeIcon *icon)
-   GError *error = NULL;
- 
-   screen = gtk_status_icon_get_screen (GTK_STATUS_ICON (icon));
--  info = g_desktop_app_info_new ("vino-preferences.desktop");
-+  info = g_desktop_app_info_new ("gnome-sharing-panel.desktop");
-+  if (info == NULL)
-+    info = g_desktop_app_info_new ("vino-preferences.desktop");
-+  if (info == NULL)
-+    {
-+      vino_util_show_error (NULL, _("Error displaying preferences"), NULL);
-+      return;
-+    }
-   context = gdk_display_get_app_launch_context (gdk_screen_get_display (screen));
-   if (!g_app_info_launch (G_APP_INFO (info), NULL, G_APP_LAUNCH_CONTEXT (context), &error))
-     {
--- 
-cgit v0.11.2
-

diff --git a/net-misc/vino/files/vino-3.16.0-name-resolution.patch b/net-misc/vino/files/vino-3.16.0-name-resolution.patch
deleted file mode 100644
index 2989ffa..0000000
--- a/net-misc/vino/files/vino-3.16.0-name-resolution.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From bdd14508f9ea46372fcef93e17a9c14bcb8b4c83 Mon Sep 17 00:00:00 2001
-From: Dimitri Tarassenko <dtarassenko@gmail.com>
-Date: Fri, 28 Aug 2015 17:02:15 +0100
-Subject: Improve handling of name resolution failure
-
-Ensure that the host string for a client is always filled with a valid
-string, by calling getnameinfo() a second time (ensuring a numeric host
-is returned) if the first call fails.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=754194
----
- server/libvncserver/rfbserver.c | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/server/libvncserver/rfbserver.c b/server/libvncserver/rfbserver.c
-index 1295219..0a60fb2 100644
---- a/server/libvncserver/rfbserver.c
-+++ b/server/libvncserver/rfbserver.c
-@@ -150,7 +150,7 @@ rfbNewClient(rfbScreenInfoPtr rfbScreen,
-     struct sockaddr_storage addr;
-     socklen_t addrlen = sizeof(addr);
-     int i;
--    char host[NI_MAXHOST];
-+    char host[NI_MAXHOST] = "(unresolved)";
-     const char *prt = "unknown";
- 
-     cl = (rfbClientPtr)calloc(sizeof(rfbClientRec),1);
-@@ -166,11 +166,11 @@ rfbNewClient(rfbScreenInfoPtr rfbScreen,
- 
-       getpeername(sock, (struct sockaddr *)&addr, &addrlen);
- 
--      getnameinfo((struct sockaddr *)&addr,
--                  addrlen,
--                  host, sizeof(host),
--                  NULL, 0,
--                  0);
-+      if (getnameinfo((struct sockaddr *)&addr, addrlen,
-+                      host, sizeof(host), NULL, 0, 0)) {
-+        getnameinfo((struct sockaddr *)&addr, addrlen,
-+                    host, sizeof(host), NULL, 0, NI_NUMERICHOST);
-+      }
- 
-       cl->host = strdup(host);
- 
--- 
-cgit v0.11.2
-

diff --git a/net-misc/vino/vino-3.16.0-r1.ebuild b/net-misc/vino/vino-3.16.0-r1.ebuild
deleted file mode 100644
index 5e463dd..0000000
--- a/net-misc/vino/vino-3.16.0-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-
-inherit eutils gnome2
-
-DESCRIPTION="An integrated VNC server for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Projects/Vino"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-IUSE="crypt gnome-keyring ipv6 jpeg ssl +telepathy zeroconf +zlib"
-# bug #394611; tight encoding requires zlib encoding
-REQUIRED_USE="jpeg? ( zlib )"
-
-# cairo used in vino-fb
-# libSM and libICE used in eggsmclient-xsmp
-RDEPEND="
-	>=dev-libs/glib-2.26:2
-	>=dev-libs/libgcrypt-1.1.90:0=
-	>=x11-libs/gtk+-3:3
-
-	dev-libs/dbus-glib
-	x11-libs/cairo:=
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXtst
-	x11-libs/pango[X]
-
-	>=x11-libs/libnotify-0.7.0:=
-
-	crypt? ( >=dev-libs/libgcrypt-1.1.90:0= )
-	gnome-keyring? ( app-crypt/libsecret )
-	jpeg? ( virtual/jpeg:0= )
-	ssl? ( >=net-libs/gnutls-2.2.0:= )
-	telepathy? ( >=net-libs/telepathy-glib-0.18 )
-	zeroconf? ( >=net-dns/avahi-0.6:=[dbus] )
-	zlib? ( sys-libs/zlib:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5
-	>=dev-util/intltool-0.50
-	virtual/pkgconfig
-	app-crypt/libsecret
-"
-# libsecret is always required at build time per bug 322763
-
-src_prepare() {
-	# Improve handling of name resolution failure (from 'master')
-	epatch "${FILESDIR}"/${P}-name-resolution.patch
-
-	# Avoid a crash when showing the preferences (from 'master')
-	epatch "${FILESDIR}"/${P}-fix-crash.patch
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--with-gcrypt \
-		$(use_enable ipv6) \
-		$(use_with crypt gcrypt) \
-		$(use_with gnome-keyring secret) \
-		$(use_with jpeg) \
-		$(use_with ssl gnutls) \
-		$(use_with telepathy) \
-		$(use_with zeroconf avahi) \
-		$(use_with zlib)
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/vino/files/, net-misc/vino/
@ 2019-03-01 18:34 Dennis Lamm
  0 siblings, 0 replies; 4+ messages in thread
From: Dennis Lamm @ 2019-03-01 18:34 UTC (permalink / raw
  To: gentoo-commits

commit:     3d6bb2617e6e5db6d21c9b1a3afd366f80d52c8d
Author:     Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  1 18:34:02 2019 +0000
Commit:     Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
CommitDate: Fri Mar  1 18:34:19 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d6bb261

net-misc/vino: fixed segfaults in wayland

Signed-off-by: Dennis Lamm <expeditioneer <AT> gentoo.org>
Bug: https://bugs.gentoo.org/617902
Bug: https://bugs.gentoo.org/639264
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 .../vino-return-error-if-X11-is-no-detected.patch  | 41 ++++++++++++
 .../vino/files/vino-segfaults-on-wayland.patch     | 30 +++++++++
 net-misc/vino/vino-3.22.0-r1.ebuild                | 72 ++++++++++++++++++++++
 3 files changed, 143 insertions(+)

diff --git a/net-misc/vino/files/vino-return-error-if-X11-is-no-detected.patch b/net-misc/vino/files/vino-return-error-if-X11-is-no-detected.patch
new file mode 100644
index 00000000000..171d8590e3c
--- /dev/null
+++ b/net-misc/vino/files/vino-return-error-if-X11-is-no-detected.patch
@@ -0,0 +1,41 @@
+From 5e49ab2d125388b843eca4f1f47849d18ccabcd3 Mon Sep 17 00:00:00 2001
+From: Ondrej Holy <oholy@redhat.com>
+Date: Tue, 20 Feb 2018 12:26:18 +0100
+Subject: [PATCH] Return error if X11 is not detected
+
+Vino-server crashes on Wayland in XQueryExtension. Since vino-server is
+not expected to work on displays other than X11, let's exit immediately
+if GDK_IS_X11_DISPLAY fail.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=761120
+---
+ server/vino-main.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/server/vino-main.c b/server/vino-main.c
+index dd95de7..7be3fff 100644
+--- a/server/vino-main.c
++++ b/server/vino-main.c
+@@ -28,6 +28,7 @@
+ #include <glib/gi18n.h>
+ #include <gtk/gtk.h>
+ #include <locale.h>
++#include <gdk/gdkx.h>
+ 
+ #include "vino-input.h"
+ #include "vino-mdns.h"
+@@ -273,6 +274,12 @@ main (int argc, char **argv)
+     g_option_context_free (context);
+   }
+ 
++  if (!GDK_IS_X11_DISPLAY (gdk_display_get_default ()))
++    {
++      g_printerr ("X11 is not detected\n");
++      return 1;
++    }
++
+   /* GSettings */
+   vino.settings = g_settings_new ("org.gnome.Vino");
+ 
+-- 
+2.16.2

diff --git a/net-misc/vino/files/vino-segfaults-on-wayland.patch b/net-misc/vino/files/vino-segfaults-on-wayland.patch
new file mode 100644
index 00000000000..ee161ae6fb9
--- /dev/null
+++ b/net-misc/vino/files/vino-segfaults-on-wayland.patch
@@ -0,0 +1,30 @@
+From c5e3011b7364729fa2cd4f11761bf1f001a931a4 Mon Sep 17 00:00:00 2001
+From: Ondrej Holy <oholy@redhat.com>
+Date: Tue, 22 May 2018 20:45:45 +0200
+Subject: [PATCH] Do not restart service after unclean exit code
+
+Currently, the vino-server.service has Restart=on-failure, which means
+that it is restarted in abnormal cases, but also in case of non-zero
+exit code. It is restarted 5 times e.g. in case when X11 is not detected,
+which doesn't make sense. Non-zero exit code is used only for states
+which won't change with restart (invalid commandline, wayland and some
+sanity checks). Change the value to Restart=on-abnormal in order to
+prevent the useless restarts and to not spam journal.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=761120
+---
+ server/vino-server.service.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/server/vino-server.service.in b/server/vino-server.service.in
+index a48b813..49e9c1f 100644
+--- a/server/vino-server.service.in
++++ b/server/vino-server.service.in
+@@ -5,4 +5,4 @@ Description=Vino VNC server
+ Type=dbus
+ BusName=org.gnome.Vino
+ ExecStart=@libexecdir@/vino-server
+-Restart=on-failure
++Restart=on-abnormal
+-- 
+2.17.0

diff --git a/net-misc/vino/vino-3.22.0-r1.ebuild b/net-misc/vino/vino-3.22.0-r1.ebuild
new file mode 100644
index 00000000000..9f17a92230a
--- /dev/null
+++ b/net-misc/vino/vino-3.22.0-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2 systemd
+
+DESCRIPTION="An integrated VNC server for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Projects/Vino"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="crypt debug gnome-keyring ipv6 jpeg ssl systemd +telepathy zeroconf +zlib"
+# bug #394611; tight encoding requires zlib encoding
+REQUIRED_USE="jpeg? ( zlib )"
+
+# cairo used in vino-fb
+# libSM and libICE used in eggsmclient-xsmp
+RDEPEND="
+	>=dev-libs/glib-2.26:2
+	>=dev-libs/libgcrypt-1.1.90:0=
+	>=x11-libs/gtk+-3:3
+
+	x11-libs/cairo:=
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXtst
+	x11-libs/pango[X]
+
+	>=x11-libs/libnotify-0.7.0:=
+
+	crypt? ( >=dev-libs/libgcrypt-1.1.90:0= )
+	gnome-keyring? ( app-crypt/libsecret )
+	jpeg? ( virtual/jpeg:0= )
+	ssl? ( >=net-libs/gnutls-2.2.0:= )
+	systemd? ( sys-apps/dbus[user-session] )
+	telepathy? (
+		dev-libs/dbus-glib
+		>=net-libs/telepathy-glib-0.18 )
+	zeroconf? ( >=net-dns/avahi-0.6:=[dbus] )
+	zlib? ( sys-libs/zlib:= )
+"
+DEPEND="${RDEPEND}
+	app-crypt/libsecret
+	dev-util/glib-utils
+	>=dev-util/intltool-0.50
+	virtual/pkgconfig
+"
+# libsecret is always required at build time per bug 322763
+
+PATCHES=(
+	"${FILESDIR}/${PN}-segfaults-on-wayland.patch"
+	"${FILESDIR}/${PN}-return-error-if-X11-is-no-detected.patch"
+)
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable ipv6) \
+		$(use_with crypt gcrypt) \
+		$(usex debug --enable-debug=yes ' ') \
+		$(use_with gnome-keyring secret) \
+		$(use_with jpeg) \
+		$(use_with ssl gnutls) \
+		$(use_with telepathy) \
+		$(use_with zeroconf avahi) \
+		$(use_with zlib) \
+		--with-systemduserunitdir="$(systemd_get_userunitdir)"
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/vino/files/, net-misc/vino/
@ 2020-02-16 17:28 Mart Raudsepp
  0 siblings, 0 replies; 4+ messages in thread
From: Mart Raudsepp @ 2020-02-16 17:28 UTC (permalink / raw
  To: gentoo-commits

commit:     56b1a55f56872459376e4f24cdf272477844123c
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 16 13:03:12 2020 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sun Feb 16 17:27:50 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56b1a55f

net-misc/vino: apply 3 security fixes and misc upstream fixes

Adds patchset for a plethora of translation updates and a couple
bug fixes pending in master without any releases for years.
The security fixes are not found in upstream and are ported
separately from libvncserver commits.

Bug: https://bugs.gentoo.org/701836
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 net-misc/vino/Manifest                   |  1 +
 net-misc/vino/files/CVE-2014-6053.patch  | 31 +++++++++++++
 net-misc/vino/files/CVE-2018-7225.patch  | 64 +++++++++++++++++++++++++++
 net-misc/vino/files/CVE-2019-15681.patch | 26 +++++++++++
 net-misc/vino/vino-3.22.0-r2.ebuild      | 76 ++++++++++++++++++++++++++++++++
 5 files changed, 198 insertions(+)

diff --git a/net-misc/vino/Manifest b/net-misc/vino/Manifest
index 8ec11375c7e..56fb2cd63fb 100644
--- a/net-misc/vino/Manifest
+++ b/net-misc/vino/Manifest
@@ -1 +1,2 @@
+DIST vino-3.22.0-patchset.tar.xz 158480 BLAKE2B fb8b50abde8cb4728410302c1d3a57bc4d344a33ac0bd9f1265fd24eb142dcd52e870845b902c9b63e98134f87873ebf6abfcfcd1efadb72b0cc72b04f9bf4be SHA512 cf96f5dce96d5c060462698c9d8df6f6d94eb9d624cb689c1262830840ed8f3617485f2274832076c273625e92a89732f9c2ae99dbcbf495e5293cf88408064f
 DIST vino-3.22.0.tar.xz 768716 BLAKE2B 5c3f6df059f129009bbc97527d1767bc8a29d8cbff5e6f9e89dabc4583ffdae2cf235eec66cbcb5f9e73c9a0a7c05a504e4e90221bf5adfc2ecbbbd518fdc84a SHA512 29b88e151b0b8c69bce1565ae3ec2e788f48c7645429984329fb2d3daaf03cc5ac100abbf70247bf0516c6d03a3b9aeb78d018c8f1bf35fd241919117fd1105f

diff --git a/net-misc/vino/files/CVE-2014-6053.patch b/net-misc/vino/files/CVE-2014-6053.patch
new file mode 100644
index 00000000000..8830c30f870
--- /dev/null
+++ b/net-misc/vino/files/CVE-2014-6053.patch
@@ -0,0 +1,31 @@
+From b1bfadcbfd88970c6d48672e2dbcca8713c91411 Mon Sep 17 00:00:00 2001
+From: Nicolas Ruff <nruff@google.com>
+Date: Mon, 18 Aug 2014 15:16:16 +0200
+Subject: [PATCH 1/3] Check malloc() return value on client->server
+ ClientCutText message. Client can send up to 2**32-1 bytes of text, and such
+ a large allocation is likely to fail in case of high memory pressure. This
+ would in a server crash (write at address 0).
+
+---
+ server/libvncserver/rfbserver.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/server/libvncserver/rfbserver.c b/server/libvncserver/rfbserver.c
+index a880b53..2615dc3 100644
+--- a/server/libvncserver/rfbserver.c
++++ b/server/libvncserver/rfbserver.c
+@@ -853,6 +853,11 @@ rfbProcessClientNormalMessage(rfbClientPtr cl)
+ 	msg.cct.length = Swap32IfLE(msg.cct.length);
+ 
+ 	str = (char *)malloc(msg.cct.length);
++	if (str == NULL) {
++		rfbLogPerror("rfbProcessClientNormalMessage: not enough memory");
++		rfbCloseClient(cl);
++		return;
++	}
+ 
+ 	if ((n = ReadExact(cl, str, msg.cct.length)) <= 0) {
+ 	    if (n != 0)
+-- 
+2.20.1
+

diff --git a/net-misc/vino/files/CVE-2018-7225.patch b/net-misc/vino/files/CVE-2018-7225.patch
new file mode 100644
index 00000000000..1b1186b4fe7
--- /dev/null
+++ b/net-misc/vino/files/CVE-2018-7225.patch
@@ -0,0 +1,64 @@
+From d8a663541ef358a13fed2fbb39e7d323454369dc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
+Date: Mon, 26 Feb 2018 13:48:00 +0100
+Subject: [PATCH 2/3] Limit client cut text length to 1 MB
+
+This patch constrains a client cut text length to 1 MB. Otherwise
+a client could make server allocate 2 GB of memory and that seems to
+be to much to classify it as a denial of service.
+
+The limit also prevents from an integer overflow followed by copying
+an uninitilized memory when processing msg.cct.length value larger
+than SIZE_MAX or INT_MAX - sz_rfbClientCutTextMsg.
+
+This patch also corrects accepting length value of zero (malloc(0) is
+interpreted on differnet systems differently).
+
+CVE-2018-7225
+<https://github.com/LibVNC/libvncserver/issues/218>
+---
+ server/libvncserver/rfbserver.c | 21 ++++++++++++++++++++-
+ 1 file changed, 20 insertions(+), 1 deletion(-)
+
+diff --git a/server/libvncserver/rfbserver.c b/server/libvncserver/rfbserver.c
+index 2615dc3..2224edb 100644
+--- a/server/libvncserver/rfbserver.c
++++ b/server/libvncserver/rfbserver.c
+@@ -59,6 +59,9 @@
+ #define DEBUGPROTO(x)
+ #endif
+ 
++/* PRIu32 */
++#include <inttypes.h>
++
+ rfbClientPtr pointerClient = NULL;  /* Mutex for pointer events */
+ 
+ static void rfbProcessClientProtocolVersion(rfbClientPtr cl);
+@@ -852,7 +855,23 @@ rfbProcessClientNormalMessage(rfbClientPtr cl)
+ 
+ 	msg.cct.length = Swap32IfLE(msg.cct.length);
+ 
+-	str = (char *)malloc(msg.cct.length);
++	/* uint32_t input is passed to malloc()'s size_t argument,
++	 * to rfbReadExact()'s int argument, to rfbStatRecordMessageRcvd()'s int
++	 * argument increased of sz_rfbClientCutTextMsg, and to setXCutText()'s int
++	 * argument. Here we impose a limit of 1 MB so that the value fits
++	 * into all of the types to prevent from misinterpretation and thus
++	 * from accessing uninitialized memory (CVE-2018-7225) and also to
++	 * prevent from a denial-of-service by allocating to much memory in
++	 * the server. */
++	if (msg.cct.length > 1<<20) {
++	    rfbLog("rfbClientCutText: too big cut text length requested: %" PRIu32 "\n",
++		    msg.cct.length);
++	    rfbCloseClient(cl);
++	    return;
++	}
++
++	/* Allow zero-length client cut text. */
++	str = (char *)calloc(msg.cct.length ? msg.cct.length : 1, 1);
+ 	if (str == NULL) {
+ 		rfbLogPerror("rfbProcessClientNormalMessage: not enough memory");
+ 		rfbCloseClient(cl);
+-- 
+2.20.1
+

diff --git a/net-misc/vino/files/CVE-2019-15681.patch b/net-misc/vino/files/CVE-2019-15681.patch
new file mode 100644
index 00000000000..31bb47ee9b2
--- /dev/null
+++ b/net-misc/vino/files/CVE-2019-15681.patch
@@ -0,0 +1,26 @@
+From d9f3fa0ede556c6a751a8ca6c8bc37e769715233 Mon Sep 17 00:00:00 2001
+From: Christian Beier <dontmind@freeshell.org>
+Date: Mon, 19 Aug 2019 22:32:25 +0200
+Subject: [PATCH 3/3] rfbserver: don't leak stack memory to the remote
+
+Thanks go to Pavel Cheremushkin of Kaspersky for reporting.
+---
+ server/libvncserver/rfbserver.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/server/libvncserver/rfbserver.c b/server/libvncserver/rfbserver.c
+index 2224edb..ca4f59b 100644
+--- a/server/libvncserver/rfbserver.c
++++ b/server/libvncserver/rfbserver.c
+@@ -1565,6 +1565,8 @@ rfbSendServerCutText(rfbScreenInfoPtr rfbScreen,char *str, int len)
+     rfbServerCutTextMsg sct;
+     rfbClientIteratorPtr iterator;
+ 
++    memset((char *)&sct, 0, sizeof(sct));
++
+     iterator = rfbGetClientIterator(rfbScreen);
+     while ((cl = rfbClientIteratorNext(iterator)) != NULL) {
+         /* Client is not authenticated, ignore. See GNOME bug 678434. */
+-- 
+2.20.1
+

diff --git a/net-misc/vino/vino-3.22.0-r2.ebuild b/net-misc/vino/vino-3.22.0-r2.ebuild
new file mode 100644
index 00000000000..bb0874d055d
--- /dev/null
+++ b/net-misc/vino/vino-3.22.0-r2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_EAUTORECONF="yes"
+inherit gnome2 systemd
+
+DESCRIPTION="An integrated VNC server for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Projects/Vino"
+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="crypt debug gnome-keyring ipv6 jpeg ssl systemd +telepathy zeroconf +zlib"
+# bug #394611; tight encoding requires zlib encoding
+REQUIRED_USE="jpeg? ( zlib )"
+
+# cairo used in vino-fb
+# libSM and libICE used in eggsmclient-xsmp
+RDEPEND="
+	>=dev-libs/glib-2.26:2
+	>=dev-libs/libgcrypt-1.1.90:0=
+	>=x11-libs/gtk+-3:3
+
+	x11-libs/cairo:=
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXtst
+	x11-libs/pango[X]
+
+	>=x11-libs/libnotify-0.7.0:=
+
+	crypt? ( >=dev-libs/libgcrypt-1.1.90:0= )
+	gnome-keyring? ( app-crypt/libsecret )
+	jpeg? ( virtual/jpeg:0= )
+	ssl? ( >=net-libs/gnutls-2.2.0:= )
+	systemd? ( sys-apps/dbus[user-session] )
+	telepathy? (
+		dev-libs/dbus-glib
+		>=net-libs/telepathy-glib-0.18 )
+	zeroconf? ( >=net-dns/avahi-0.6:=[dbus] )
+	zlib? ( sys-libs/zlib:= )
+"
+DEPEND="${RDEPEND}
+	app-crypt/libsecret
+	dev-util/glib-utils
+	>=dev-util/intltool-0.50
+	virtual/pkgconfig
+"
+# libsecret is always required at build time per bug 322763
+
+PATCHES=(
+	"${WORKDIR}"/patches/ # Patches from master branch at 2020-02-15 state; needs autoreconf
+	"${FILESDIR}"/CVE-2014-6053.patch
+	"${FILESDIR}"/CVE-2018-7225.patch
+	"${FILESDIR}"/CVE-2019-15681.patch
+)
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable ipv6) \
+		$(use_with crypt gcrypt) \
+		$(usex debug --enable-debug=yes ' ') \
+		$(use_with gnome-keyring secret) \
+		$(use_with jpeg) \
+		$(use_with ssl gnutls) \
+		$(use_with telepathy) \
+		$(use_with zeroconf avahi) \
+		$(use_with zlib) \
+		--with-systemduserunitdir="$(systemd_get_userunitdir)"
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-02-16 17:28 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-24  7:45 [gentoo-commits] repo/gentoo:master commit in: net-misc/vino/files/, net-misc/vino/ Pacho Ramos
  -- strict thread matches above, loose matches on Subject: below --
2016-06-28 20:30 Pacho Ramos
2019-03-01 18:34 Dennis Lamm
2020-02-16 17:28 Mart Raudsepp

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox