summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaúl Porcel <armin76@gentoo.org>2007-04-14 16:04:32 +0000
committerRaúl Porcel <armin76@gentoo.org>2007-04-14 16:04:32 +0000
commit20945c11859a4582a39ba70c0d8847547c2606c3 (patch)
tree2429f47d2ed801cd2f71c9fc72c16fb75fd463ae /app-misc/slmon
parentfix bug #174349 (diff)
downloadgentoo-2-20945c11859a4582a39ba70c0d8847547c2606c3.tar.gz
gentoo-2-20945c11859a4582a39ba70c0d8847547c2606c3.tar.bz2
gentoo-2-20945c11859a4582a39ba70c0d8847547c2606c3.zip
Add glib-2 to DEPEND, and add a patch to remove a invalid pointer, thanks to Ali Polatel <polatel at gmail dot com> for the patch, bug 151293
(Portage version: 2.1.2.3)
Diffstat (limited to 'app-misc/slmon')
-rw-r--r--app-misc/slmon/ChangeLog7
-rw-r--r--app-misc/slmon/files/slmon-0.5.13-invalid-free.patch16
-rw-r--r--app-misc/slmon/slmon-0.5.13.ebuild14
3 files changed, 34 insertions, 3 deletions
diff --git a/app-misc/slmon/ChangeLog b/app-misc/slmon/ChangeLog
index 796516928d51..14d1516a9f01 100644
--- a/app-misc/slmon/ChangeLog
+++ b/app-misc/slmon/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for app-misc/slmon
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/slmon/ChangeLog,v 1.9 2007/03/19 01:47:02 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/slmon/ChangeLog,v 1.10 2007/04/14 16:04:32 armin76 Exp $
+
+ 14 Apr 2007; Raúl Porcel <armin76@gentoo.org>
+ +files/slmon-0.5.13-invalid-free.patch, slmon-0.5.13.ebuild:
+ Add glib-2 to DEPEND, and add a patch to remove a invalid pointer, thanks to
+ Ali Polatel <polatel at gmail dot com> for the patch, bug 151293
19 Mar 2007; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
Remove ka0ttic from metadata.xml due to retirement.
diff --git a/app-misc/slmon/files/slmon-0.5.13-invalid-free.patch b/app-misc/slmon/files/slmon-0.5.13-invalid-free.patch
new file mode 100644
index 000000000000..9728492fcc88
--- /dev/null
+++ b/app-misc/slmon/files/slmon-0.5.13-invalid-free.patch
@@ -0,0 +1,16 @@
+--- rc.c.orig 2004-06-20 18:56:48.000000000 +0300
++++ rc.c 2007-04-09 19:14:05.000000000 +0300
+@@ -177,9 +177,10 @@
+ char *home, dotrc[1024] = { 0 };
+
+ home = getenv("HOME");
+- strcpy(dotrc, home);
+- strcat(dotrc, "/.slmonrc");
+- free(home);
++ if ( home != NULL ) {
++ strcpy(dotrc, home);
++ strcat(dotrc, "/.slmonrc");
++ }
+
+ if ((f = fopen("/etc/slmonrc", "r")) != NULL) {
+ slmon_conf_parse(f);
diff --git a/app-misc/slmon/slmon-0.5.13.ebuild b/app-misc/slmon/slmon-0.5.13.ebuild
index dac3576ccf7a..af48c84fe159 100644
--- a/app-misc/slmon/slmon-0.5.13.ebuild
+++ b/app-misc/slmon/slmon-0.5.13.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/slmon/slmon-0.5.13.ebuild,v 1.1 2005/02/11 11:08:10 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/slmon/slmon-0.5.13.ebuild,v 1.2 2007/04/14 16:04:32 armin76 Exp $
+
+inherit eutils
DESCRIPTION="Colored text-based system performance monitor"
HOMEPAGE="http://slmon.sourceforge.net/"
@@ -11,9 +13,17 @@ SLOT="0"
KEYWORDS="x86"
IUSE="debug"
+DEPEND=">=dev-libs/glib-2.0"
RDEPEND="sys-libs/slang
gnome-base/libgtop"
+src_unpack() {
+ unpack ${A}
+ cd ${S}
+
+ epatch "${FILESDIR}"/${P}-invalid-free.patch # bug 151293
+}
+
src_compile() {
econf $(use_enable debug) || die "econf failed"
emake || die "emake failed"