* [gentoo-commits] repo/gentoo:master commit in: net-misc/grdesktop/, net-misc/grdesktop/files/
@ 2016-11-04 10:30 Pacho Ramos
0 siblings, 0 replies; 2+ messages in thread
From: Pacho Ramos @ 2016-11-04 10:30 UTC (permalink / raw
To: gentoo-commits
commit: f9387c9587d27548d9a157616411263dbc635b50
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 4 10:22:22 2016 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> 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"
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/grdesktop/, net-misc/grdesktop/files/
@ 2020-09-20 7:57 Michał Górny
0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2020-09-20 7:57 UTC (permalink / raw
To: gentoo-commits
commit: 99ae0e6d201abef420fde918a9b9b0563b2bc8eb
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 20 06:50:44 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Sep 20 07:56:46 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99ae0e6d
net-misc/grdesktop: Remove old
Closes: https://bugs.gentoo.org/726792
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
.../grdesktop/files/grdesktop-0.23-desktop.patch | 19 ----------
.../files/grdesktop-0.23-format-security.patch | 25 ------------
net-misc/grdesktop/grdesktop-0.23-r1.ebuild | 44 ----------------------
3 files changed, 88 deletions(-)
diff --git a/net-misc/grdesktop/files/grdesktop-0.23-desktop.patch b/net-misc/grdesktop/files/grdesktop-0.23-desktop.patch
deleted file mode 100644
index 01102b802cd..00000000000
--- a/net-misc/grdesktop/files/grdesktop-0.23-desktop.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- 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
- Exec=grdesktop
--Icon=grdesktop.png
-+Icon=/usr/share/pixmaps/grdesktop/icon.png
- Terminal=false
- Type=Application
- Version=1.0
- Actions=Full;
--Categories=Application;Network;X-Red-Hat-Base;
--Encoding=UTF-8
-+Categories=Network;X-Red-Hat-Base;
-
- [Desktop Action Full]
-+Name=Remotedesktop Client
- Exec=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
deleted file mode 100644
index b5610efc0c6..00000000000
--- a/net-misc/grdesktop/files/grdesktop-0.23-format-security.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- ./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
deleted file mode 100644
index 8e5d2c6a2dd..00000000000
--- a/net-misc/grdesktop/grdesktop-0.23-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Gtk2 frontend for rdesktop"
-HOMEPAGE="http://www.nongnu.org/grdesktop/"
-SRC_URI="https://savannah.nongnu.org/download/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
-
-RDEPEND="
- x11-libs/gtk+:2
- >=gnome-base/libgnomeui-2
- net-misc/rdesktop
- gnome-base/gconf:2
-"
-DEPEND="${RDEPEND}
- app-text/rarian
- virtual/pkgconfig
-"
-
-src_prepare() {
- # Correct icon path. See bug #50295.
- 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"
-
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure \
- --disable-debug \
- --with-keymap-path=/usr/share/rdesktop/keymaps/
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-09-20 7:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-11-04 10:30 [gentoo-commits] repo/gentoo:master commit in: net-misc/grdesktop/, net-misc/grdesktop/files/ Pacho Ramos
-- strict thread matches above, loose matches on Subject: below --
2020-09-20 7:57 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox