summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2016-11-04 11:22:22 +0100
committerPacho Ramos <pacho@gentoo.org>2016-11-04 11:30:24 +0100
commitf9387c9587d27548d9a157616411263dbc635b50 (patch)
tree646c5fc92b27b02c67d81567592e9a4c811fc588 /net-misc/grdesktop/files
parentnet-dialup/moserial: scrollkeeper running is disabled, then, we don't need it (diff)
downloadgentoo-f9387c9587d27548d9a157616411263dbc635b50.tar.gz
gentoo-f9387c9587d27548d9a157616411263dbc635b50.tar.bz2
gentoo-f9387c9587d27548d9a157616411263dbc635b50.zip
net-misc/grdesktop: Fix compilation with format security (#517662), rarian is needed, bump eapi.
Package-Manager: portage-2.3.2
Diffstat (limited to 'net-misc/grdesktop/files')
-rw-r--r--net-misc/grdesktop/files/grdesktop-0.23-desktop.patch4
-rw-r--r--net-misc/grdesktop/files/grdesktop-0.23-format-security.patch25
2 files changed, 27 insertions, 2 deletions
diff --git a/net-misc/grdesktop/files/grdesktop-0.23-desktop.patch b/net-misc/grdesktop/files/grdesktop-0.23-desktop.patch
index 6fcbd046050f..01102b802cd3 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 000000000000..b5610efc0c62
--- /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);