Add glib-2 to DEPEND, and add a patch to remove a invalid pointer, thanks to Ali...

Package-Manager: portage-2.1.2.3

diff --git a/app-misc/slmon/ChangeLog b/app-misc/slmon/ChangeLog
index 796516928d5145b2730b69f71470829b13ab7d21..14d1516a9f01a6675e59eee32e7f3e68accc8ece 100644 (file)
--- 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/Manifest b/app-misc/slmon/Manifest
index ffde72aaa0f580511f288d416ec757c6fd1db2a3..924e32d9511cd1bb8218973e644e7abd4623023c 100644 (file)
--- a/app-misc/slmon/Manifest
+++ b/app-misc/slmon/Manifest
@@ -1,15 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX slmon-0.5.13-invalid-free.patch 429 RMD160 20486b35f1c2e126bd5c8dd9a83a99c617d94308 SHA1 2bbb56783d1768e567062cc58c89f5140d1dda64 SHA256 7d5a9677d7b856e10dacae147c3c902d494763313c46abed61be98baf2d44c58
+MD5 75989e9c2a80eb87cc7de9456e9a0cce files/slmon-0.5.13-invalid-free.patch 429
+RMD160 20486b35f1c2e126bd5c8dd9a83a99c617d94308 files/slmon-0.5.13-invalid-free.patch 429
+SHA256 7d5a9677d7b856e10dacae147c3c902d494763313c46abed61be98baf2d44c58 files/slmon-0.5.13-invalid-free.patch 429
 DIST slmon-0.5.13.tar.gz 103826 RMD160 e60d2c645955cc49e3b32d89f1ea199623176c73 SHA1 b425b400d8a7d30092ace2ca4d8a9bc1899104eb SHA256 dc38740e4e0cccb86ccf76aaad5734d7d1e42e144615ee09bc8c8c9290110b28
-EBUILD slmon-0.5.13.ebuild 698 RMD160 96167db09742f2d9a6922d3b4ba5d05edc288063 SHA1 3b6e2bb391f13b487e066c68bfaefbfb0d8eeffc SHA256 4a2c393ff5aa951c1204f925050aa52f1359502e1e9fd4b81516aa158e518304
-MD5 54943ab05b640a7fe98a866a55fe970d slmon-0.5.13.ebuild 698
-RMD160 96167db09742f2d9a6922d3b4ba5d05edc288063 slmon-0.5.13.ebuild 698
-SHA256 4a2c393ff5aa951c1204f925050aa52f1359502e1e9fd4b81516aa158e518304 slmon-0.5.13.ebuild 698
-MISC ChangeLog 981 RMD160 235f9136c48033ee232a26ea6849d708fd3a00d9 SHA1 eecdba39d0626a95331f815bd40fea014210ed97 SHA256 0ca792b9b3fcd5d4a6ac5b579b3b63e6dfc06131bd3a415d88541aff1db52f65
-MD5 665b6dbc63348492e0a7390681177e74 ChangeLog 981
-RMD160 235f9136c48033ee232a26ea6849d708fd3a00d9 ChangeLog 981
-SHA256 0ca792b9b3fcd5d4a6ac5b579b3b63e6dfc06131bd3a415d88541aff1db52f65 ChangeLog 981
+EBUILD slmon-0.5.13.ebuild 843 RMD160 024801bd8900ba2210fa452c758737eefe15a339 SHA1 330b8e6d744f13add0847eccb39abaa763f914d0 SHA256 e04abfbc4de9031eb0833f56356ffef6f734eb0d0e337b7b03a901956ea58a36
+MD5 21dae67c3380ebc115c081f1de49727d slmon-0.5.13.ebuild 843
+RMD160 024801bd8900ba2210fa452c758737eefe15a339 slmon-0.5.13.ebuild 843
+SHA256 e04abfbc4de9031eb0833f56356ffef6f734eb0d0e337b7b03a901956ea58a36 slmon-0.5.13.ebuild 843
+MISC ChangeLog 1242 RMD160 f1e76627114192c2a7e0ded892ac79c7056c2f92 SHA1 579baa8086fecd767746945e56afcb1a3d56f86b SHA256 2e996701cdd389bbbcd21991cb61aa8251e8151763772286d07e929eae0860e6
+MD5 d3e8ffd45b66d9d28bf100a59e15f7ed ChangeLog 1242
+RMD160 f1e76627114192c2a7e0ded892ac79c7056c2f92 ChangeLog 1242
+SHA256 2e996701cdd389bbbcd21991cb61aa8251e8151763772286d07e929eae0860e6 ChangeLog 1242
 MISC metadata.xml 237 RMD160 c8e67b9ed38f0b1f4a09268a438fd51981e0a017 SHA1 893e2795205e43c12fbb4b034fb48356f047b449 SHA256 ba5b60fec3f01393f9e5a70f37a0372d8e99b6b15934baefa95566dce16dd3d8
 MD5 4a9bb1a9ddd9cc85f7698fb677bee7d7 metadata.xml 237
 RMD160 c8e67b9ed38f0b1f4a09268a438fd51981e0a017 metadata.xml 237
@@ -17,10 +18,3 @@ SHA256 ba5b60fec3f01393f9e5a70f37a0372d8e99b6b15934baefa95566dce16dd3d8 metadata
 MD5 f5936b51df7276faf32a7edd184d98c1 files/digest-slmon-0.5.13 238
 RMD160 77a2987079c01a84d7612613329302488731ee78 files/digest-slmon-0.5.13 238
 SHA256 b044a5d74b61968517f843778320423bdf2103550f46fa06b974feee826e0e3b files/digest-slmon-0.5.13 238
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFF/eteugEuf3OQ0akRAoykAJ9ioiFOMKOhhSfXLRb+yLfnhaqQcgCfX+Zh
-1/n6kV8ZEi3l1uEWsmPiRdQ=
-=jvVG
------END PGP SIGNATURE-----

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 (file)
index 0000000..9728492
--- /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 dac3576ccf7af59a517b1347bf2a59d4f06c8e79..af48c84fe1591489ee4bf13184518e9b07d2b2b4 100644 (file)
--- 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"