net-misc/olsrd: add memleak patch and use correct CC

svn path=/sunrise/; revision=720

4 files changed, 31 insertions, 12 deletions

diff --git a/net-misc/olsrd/ChangeLog b/net-misc/olsrd/ChangeLog
index 5e7209a2f..f38e60d0a 100644
--- a/net-misc/olsrd/ChangeLog
+++ b/net-misc/olsrd/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  28 Jul 2006; Cedric Krier <ced@ced.homedns.org> olsrd-0.4.10.ebuild,
+  +files/olsrd-0.4.10-memleak_in_olsr_remove_scheduler_event.patch:
+  add memleak patch and use correct CC
+
   22 Jun 2006; Cedric Krier <ced@ced.homedns.org> ChangeLog:
   New Ebuild for bug 76646 thanks to Daniel Webert
 
diff --git a/net-misc/olsrd/Manifest b/net-misc/olsrd/Manifest
index 62c7b6194..a877a9f16 100644
--- a/net-misc/olsrd/Manifest
+++ b/net-misc/olsrd/Manifest
@@ -6,15 +6,19 @@ AUX olsrd-0.4.10-gui_makefile.patch 523 RMD160 afa409cd3c8fb8e56cecc8c2787999832
 MD5 b920fd0f81deffd96b246c1d385829d0 files/olsrd-0.4.10-gui_makefile.patch 523
 RMD160 afa409cd3c8fb8e56cecc8c27879998329160408 files/olsrd-0.4.10-gui_makefile.patch 523
 SHA256 e721d838a2acbb7419f1c8b80687df2b90ad088a95cc991e61641a3802510c23 files/olsrd-0.4.10-gui_makefile.patch 523
+AUX olsrd-0.4.10-memleak_in_olsr_remove_scheduler_event.patch 246 RMD160 2f0414c22e559fe03ab5968fa21b8c2c4a437ff6 SHA1 b042b511094020813a6fd0e43c99e03bb3e77117 SHA256 a9a5e96a138c65b32b62a73556a62feb529e95de34bb1b450652d81825459124
+MD5 2e80f148d7b40546d50cdecb4ea0ae4d files/olsrd-0.4.10-memleak_in_olsr_remove_scheduler_event.patch 246
+RMD160 2f0414c22e559fe03ab5968fa21b8c2c4a437ff6 files/olsrd-0.4.10-memleak_in_olsr_remove_scheduler_event.patch 246
+SHA256 a9a5e96a138c65b32b62a73556a62feb529e95de34bb1b450652d81825459124 files/olsrd-0.4.10-memleak_in_olsr_remove_scheduler_event.patch 246
 DIST olsrd-0.4.10.tar.bz2 490519 RMD160 a0432cb885efdf93ce36e7367a1346b6744c9f90 SHA1 78325658657c6b1aeebe106d02cabcc6eed2571c SHA256 af04bdd8abd85bb4715fd6011566054847c75fcbac5e5e9cdee80858ac2957d3
-EBUILD olsrd-0.4.10.ebuild 1926 RMD160 10db84d35d24f57981ebafa62479846514990634 SHA1 9f2544d9fbbac16e954c2ea560bb7b47c4e1113c SHA256 9ea1b3a31c3473f9db2631e9239e87f420d7b40e1023dbe8cf8a2fd392e4270d
-MD5 638f131e14cb0256ecf6654fb1902d2f olsrd-0.4.10.ebuild 1926
-RMD160 10db84d35d24f57981ebafa62479846514990634 olsrd-0.4.10.ebuild 1926
-SHA256 9ea1b3a31c3473f9db2631e9239e87f420d7b40e1023dbe8cf8a2fd392e4270d olsrd-0.4.10.ebuild 1926
-MISC ChangeLog 228 RMD160 b885690a6354ac4b408e6a073c35caff95f68e32 SHA1 8ed88d5be9d29808c991ab154c0f379b3f0a1470 SHA256 c623f970f121e3dbcc6545d129d8f1ca2c3f9648c92f67bf912b9cb2925b27db
-MD5 e31d4e64a976f0690e55279d6bcd4aed ChangeLog 228
-RMD160 b885690a6354ac4b408e6a073c35caff95f68e32 ChangeLog 228
-SHA256 c623f970f121e3dbcc6545d129d8f1ca2c3f9648c92f67bf912b9cb2925b27db ChangeLog 228
+EBUILD olsrd-0.4.10.ebuild 2059 RMD160 48b271cba9b582abe0ded41ddd1d97215c8a1289 SHA1 054e152bd2b02c07e9eaf3f50f992cd9d3cad27b SHA256 46a47631c56c4bbd87f5b989c995b80f4ea6afbe19848ab153e8d39673a86b2f
+MD5 ce86003f126d99a3c9816ffd3c0e438a olsrd-0.4.10.ebuild 2059
+RMD160 48b271cba9b582abe0ded41ddd1d97215c8a1289 olsrd-0.4.10.ebuild 2059
+SHA256 46a47631c56c4bbd87f5b989c995b80f4ea6afbe19848ab153e8d39673a86b2f olsrd-0.4.10.ebuild 2059
+MISC ChangeLog 407 RMD160 63ef8d1826d2a083920ce0e16f8636fd596a0dfc SHA1 5ae51b5f2093f8bacfb34755c86e64dc47fd541f SHA256 37dad615d65be00e983be7843f123dec7691fe45b809c3bd1d6342b589ce19a6
+MD5 7f93e9756990bf6e73bc6a29570ab415 ChangeLog 407
+RMD160 63ef8d1826d2a083920ce0e16f8636fd596a0dfc ChangeLog 407
+SHA256 37dad615d65be00e983be7843f123dec7691fe45b809c3bd1d6342b589ce19a6 ChangeLog 407
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
 MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170
 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170
diff --git a/net-misc/olsrd/files/olsrd-0.4.10-memleak_in_olsr_remove_scheduler_event.patch b/net-misc/olsrd/files/olsrd-0.4.10-memleak_in_olsr_remove_scheduler_event.patch
new file mode 100644
index 000000000..7d0574d20
--- /dev/null
+++ b/net-misc/olsrd/files/olsrd-0.4.10-memleak_in_olsr_remove_scheduler_event.patch
@@ -0,0 +1,10 @@
+--- olsrd-0.4.10~/src/scheduler.c	2006-07-28 16:09:26.000000000 +0200
++++ olsrd-0.4.10/src/scheduler.c	2006-07-28 16:10:42.000000000 +0200
+@@ -329,6 +329,7 @@
+ 	    {
+ 	      prev->next = entry->next;
+ 	    }
++	  free(entry);
+ 	  return 1;
+ 	}
+ 
diff --git a/net-misc/olsrd/olsrd-0.4.10.ebuild b/net-misc/olsrd/olsrd-0.4.10.ebuild
index 5af266555..209dc148b 100644
--- a/net-misc/olsrd/olsrd-0.4.10.ebuild
+++ b/net-misc/olsrd/olsrd-0.4.10.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="An implementation of the Optimized Link State Routing protocol"
 HOMEPAGE="http://www.olsr.org/"
@@ -19,21 +19,22 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}/${P}-gui_makefile.patch"
+	epatch "${FILESDIR}/${P}-memleak_in_olsr_remove_scheduler_event.patch"
 }
 
 src_compile() {
 	cd "${S}"
-	emake OS=linux || die "emake failed"
+	emake OS=linux CC=$(tc-getCC) || die "emake failed"
 
 	for module in dot_draw dyn_gw httpinfo nameservice powerinfo secure ; do
 		cd "${S}/lib/${module}"
-		emake OS=linux || die "emake failed"
+		emake OS=linux CC=$(tc-getCC) || die "emake failed"
 	done
 
 	if use gtk ; then
 		cd "${S}/gui/linux-gtk"
 		einfo "Building GUI ..."
-		emake || die "emake failed"
+		emake CC=$(tc-getCC) || die "emake failed"
 	fi
 }