net-misc/grdesktop: Fix compilation with format security (#517662), rarian is needed...

Package-Manager: portage-2.3.2

diff --git a/net-misc/grdesktop/files/grdesktop-0.23-desktop.patch b/net-misc/grdesktop/files/grdesktop-0.23-desktop.patch
index 6fcbd046050f35ce508e7fc91f4f09fb7cd6bea3..01102b802cd37fb74e7a5faaef6a175fa02319e6 100644 (file)
--- 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 (file)
index 0000000..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 7d7ffdf257c693723c1e4eda657fca4aa3b48fee..381d402036cd65fa45e46a532acd677ece52e1be 100644 (file)
--- 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"