From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3F8D31395E4 for ; Fri, 4 Nov 2016 10:30:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CB443E0BC1; Fri, 4 Nov 2016 10:30:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 178EDE0BE5 for ; Fri, 4 Nov 2016 10:30:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D81BD34122A for ; Fri, 4 Nov 2016 10:30:32 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0E43D24AF for ; Fri, 4 Nov 2016 10:30:31 +0000 (UTC) From: "Pacho Ramos" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Pacho Ramos" Message-ID: <1478255424.f9387c9587d27548d9a157616411263dbc635b50.pacho@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/grdesktop/, net-misc/grdesktop/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/grdesktop/files/grdesktop-0.23-desktop.patch net-misc/grdesktop/files/grdesktop-0.23-format-security.patch net-misc/grdesktop/grdesktop-0.23-r1.ebuild X-VCS-Directories: net-misc/grdesktop/files/ net-misc/grdesktop/ X-VCS-Committer: pacho X-VCS-Committer-Name: Pacho Ramos X-VCS-Revision: f9387c9587d27548d9a157616411263dbc635b50 X-VCS-Branch: master Date: Fri, 4 Nov 2016 10:30:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c5015ece-d0dc-4f85-9166-49c6232e763d X-Archives-Hash: 53c1491f9d83151713325f281ebb0fdb commit: f9387c9587d27548d9a157616411263dbc635b50 Author: Pacho Ramos gentoo org> AuthorDate: Fri Nov 4 10:22:22 2016 +0000 Commit: Pacho Ramos gentoo org> CommitDate: Fri Nov 4 10:30:24 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9387c95 net-misc/grdesktop: Fix compilation with format security (#517662), rarian is needed, bump eapi. Package-Manager: portage-2.3.2 .../grdesktop/files/grdesktop-0.23-desktop.patch | 4 ++-- .../files/grdesktop-0.23-format-security.patch | 25 ++++++++++++++++++++++ net-misc/grdesktop/grdesktop-0.23-r1.ebuild | 16 +++++++------- 3 files changed, 35 insertions(+), 10 deletions(-) diff --git a/net-misc/grdesktop/files/grdesktop-0.23-desktop.patch b/net-misc/grdesktop/files/grdesktop-0.23-desktop.patch index 6fcbd04..01102b8 100644 --- a/net-misc/grdesktop/files/grdesktop-0.23-desktop.patch +++ b/net-misc/grdesktop/files/grdesktop-0.23-desktop.patch @@ -1,5 +1,5 @@ ---- grdesktop.desktop.old 2014-07-08 14:05:45.500537718 +0200 -+++ grdesktop.desktop 2014-07-08 14:06:27.237420849 +0200 +--- a/grdesktop.desktop.old 2014-07-08 14:05:45.500537718 +0200 ++++ b/grdesktop.desktop 2014-07-08 14:06:27.237420849 +0200 @@ -4,13 +4,13 @@ Comment[de]=Verbindet zu einem entfernten Windows Terminal-Server TryExec=grdesktop diff --git a/net-misc/grdesktop/files/grdesktop-0.23-format-security.patch b/net-misc/grdesktop/files/grdesktop-0.23-format-security.patch new file mode 100644 index 00000000..b5610ef --- /dev/null +++ b/net-misc/grdesktop/files/grdesktop-0.23-format-security.patch @@ -0,0 +1,25 @@ +--- ./src/run.c.orig 2004-03-30 13:17:53.000000000 +0000 ++++ ./src/run.c 2012-05-13 06:33:35.000000000 +0000 +@@ -110,7 +110,7 @@ + sshcmd = g_strconcat(sshcmd, g_strdup_printf("%s", + SHASH("sshhost")), NULL); + sshcmd = g_strconcat(sshcmd, g_strdup_printf(" \"%s\"", cmd), NULL); +- g_warning(sshcmd); ++ g_warning("%s",sshcmd); + cmdline = g_strconcat(sshcmd, NULL); + } else { /* execute without ssh */ + cmdline = g_strconcat(cmd, NULL); +--- ./src/rdpparse.c.orig 2012-05-13 06:36:59.000000000 +0000 ++++ ./src/rdpparse.c 2012-05-13 06:37:31.000000000 +0000 +@@ -306,9 +306,9 @@ + parts = g_strsplit(value, "x", 2); + + if(typ == 'W') +- return(g_strdup_printf(parts[0])); ++ return(g_strdup_printf("%s",parts[0])); + else +- return(g_strdup_printf(parts[1])); ++ return(g_strdup_printf("%s",parts[1])); + + if(parts != NULL) + g_strfreev(parts); diff --git a/net-misc/grdesktop/grdesktop-0.23-r1.ebuild b/net-misc/grdesktop/grdesktop-0.23-r1.ebuild index 7d7ffdf..381d402 100644 --- a/net-misc/grdesktop/grdesktop-0.23-r1.ebuild +++ b/net-misc/grdesktop/grdesktop-0.23-r1.ebuild @@ -1,11 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" -GCONF_DEBUG="no" - -inherit eutils gnome2 +EAPI=6 +inherit gnome2 DESCRIPTION="Gtk2 frontend for rdesktop" HOMEPAGE="http://www.nongnu.org/grdesktop/" @@ -14,7 +12,6 @@ SRC_URI="https://savannah.nongnu.org/download/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc sparc x86 ~x86-fbsd" - IUSE="" RDEPEND=" @@ -24,13 +21,16 @@ RDEPEND=" gnome-base/gconf:2 " DEPEND="${RDEPEND} - app-text/scrollkeeper + app-text/rarian virtual/pkgconfig " src_prepare() { # Correct icon path. See bug #50295. - epatch "${FILESDIR}/${P}-desktop.patch" + eapply "${FILESDIR}/${P}-desktop.patch" + + # Fix compilation with format-security, bug #517662 + eapply "${FILESDIR}/${P}-format-security.patch" sed -e 's/\(GETTEXT_PACKAGE = \)@GETTEXT_PACKAGE@/\1grdesktop/g' \ -i po/Makefile.in.in || die "sed 2 failed"