Expand gcc 4.3 patch to cover NULL not being declared in Interest.h and

BTree.h (bug #237953 by robs)
Package-Manager: portage-2.2_rc16/cvs/Linux 2.6.27-gentoo-r4 x86_64

3 files changed, 48 insertions, 9 deletions

diff --git a/app-admin/fam/ChangeLog b/app-admin/fam/ChangeLog
index 90cf21796fd3..3bec2fd69835 100644
--- a/app-admin/fam/ChangeLog
+++ b/app-admin/fam/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/fam
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/fam/ChangeLog,v 1.50 2008/05/09 01:41:10 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/fam/ChangeLog,v 1.51 2008/12/04 23:58:23 dirtyepic Exp $
+
+  04 Dec 2008; Ryan Hill <dirtyepic@gentoo.org> files/fam-2.7.0-gcc43.patch:
+  Expand gcc 4.3 patch to cover NULL not being declared in Interest.h and
+  BTree.h (bug #237953 by robs)
 
   09 May 2008; Mark Loeser <halcy0n@gentoo.org>
   +files/fam-2.7.0-gcc43.patch, fam-2.7.0-r4.ebuild:
diff --git a/app-admin/fam/Manifest b/app-admin/fam/Manifest
index eadbb54d1ceb..6c0fe46a0348 100644
--- a/app-admin/fam/Manifest
+++ b/app-admin/fam/Manifest
@@ -1,10 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX fam-2.7.0-gcc41.patch 724 RMD160 a10d46759952e51ccbdcd50e0d3a109e2bf93fda SHA1 3d1c34a593b3880602ae71d90e891162a84ada45 SHA256 cad37a5a6b756b1c2b536f1b8dc9b73abf97f0d6cf98f50e15e8003001270043
-AUX fam-2.7.0-gcc43.patch 585 RMD160 a61c93c2a7a140728c531012d0569ee23b78bd77 SHA1 a1051d1f1462597523959f77e6b3dea35f6d7e97 SHA256 bb7f5aba850ce7b6e8df0b4abda84d67c744a1f3d6bf624ee5b70e0645bab807
+AUX fam-2.7.0-gcc43.patch 1756 RMD160 0870d167cd5efb3acc60d9a2278889a85f2ee7e7 SHA1 6739fb34d959b6e390cdcf9f87a5ee8b02064042 SHA256 7cbf071c63ce95920e4091f05542d47d1b6ecb2274f2746a7dbc8ebc013ec88f
 AUX fam-2.7.0-largefiles.patch 326 RMD160 949475406175c0f221ab7b4f34abbd26f4e56533 SHA1 6394d99517fa8a614f5bcb64bbf175e6cc9fb05b SHA256 cbe4260704d2cdff34ad0ed52b51b49af36200bc7e801e2e19f1857e2177f7af
 AUX fam-2.7.0-limits.patch 316 RMD160 13df15ec643cb8b976b3704b8e6dc9d5aaeb83d0 SHA1 b5b22453affab7f724b5fdd3f23fe22cabbc4e4c SHA256 6030c74c7663a618630886b046e4e919fc61713cb3849a267814978b9444bf2a
 AUX famd 490 RMD160 ba0a1761b473c946d645aac2cc6b20d6bfbe8382 SHA1 a705c2b8dda3fb79fad015523ea2fced12569170 SHA256 1ce8019d276ef5f9ddaa38d0fc0eff12f66934eea21931b1f98ad8bcafc22bd9
 DIST fam-2.7.0-dnotify.patch 26419 RMD160 e30e8fc0090af026951316218223fd322f3dc690 SHA1 650bee425eaa45355875267520f683fd5315d9c1 SHA256 8d0bc57a587bd374ff1ad5c75852dc655b71a2cd9cb355f0abdeb882ae7aed4c
 DIST fam-2.7.0.tar.gz 301974 RMD160 1895b578d6a141c36d5bee4e3fbbc2a298a91430 SHA1 6c2316f02acf89a41c42ffc3d7fd9cf5eada83a8 SHA256 1e0aa136693a3e9f4b43ebd71e7bd934cea31817a4a6cba2edc7aac353b8a93f
 EBUILD fam-2.7.0-r4.ebuild 2182 RMD160 578f5e6d1e539ade6775e04f01c254362341e4da SHA1 62ef120425a015454eb17582f66cc130b6d771f6 SHA256 f16824f52150f7181fc0159e77bd835f38fd3b11872c1b56f5d3d1f897fa67b6
-MISC ChangeLog 10012 RMD160 6d155c0f0e4e2a3f3f33d39013735425a347fc10 SHA1 60f60aa2466578a536ecc24eb92ab760570997d7 SHA256 fc18f6844d785293c8aed26722c4fa174e82e3b26f033ac392cc641ba2903a2e
+MISC ChangeLog 10198 RMD160 d186c36a38b6016ba2b877888ee5bd93af02620a SHA1 8f472bd6fff5c545599dfe0117cc1eeb10c94a3f SHA256 c6267834d17d361fd7be8e05a8aeced88c28ed1bce498cddc142775fb302b588
 MISC metadata.xml 236 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae SHA1 dd1a8550a514e55ab0ed6190ab4794bb090994f8 SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkk4bqsACgkQiqiDRvmkBmIRrwCfUb09QyD/kahwmWjjGs6NRECW
+1yAAnjrdRSYbk+63t/WuyY6J5fACNYpd
+=J24p
+-----END PGP SIGNATURE-----
diff --git a/app-admin/fam/files/fam-2.7.0-gcc43.patch b/app-admin/fam/files/fam-2.7.0-gcc43.patch
index 7cb3cdab4f43..3ffeeca77eb3 100644
--- a/app-admin/fam/files/fam-2.7.0-gcc43.patch
+++ b/app-admin/fam/files/fam-2.7.0-gcc43.patch
@@ -1,5 +1,17 @@
---- lib/Client.c++
-+++ lib/Client.c++
+diff -Naur fam-2.7.0-orig/include/BTree.h fam-2.7.0/include/BTree.h
+--- fam-2.7.0-orig/include/BTree.h	2003-01-19 22:22:30.000000000 -0600
++++ fam-2.7.0/include/BTree.h	2008-12-04 17:51:22.000000000 -0600
+@@ -24,6 +24,7 @@
+ #define BTree_included
+ 
+ #include "Boolean.h"
++#include <cstdlib>
+ 
+ //  This is an in-core B-Tree implementation.
+ //
+diff -Naur fam-2.7.0-orig/lib/Client.c++ fam-2.7.0/lib/Client.c++
+--- fam-2.7.0-orig/lib/Client.c++	2003-01-18 08:18:12.000000000 -0600
++++ fam-2.7.0/lib/Client.c++	2008-12-04 17:51:19.000000000 -0600
 @@ -34,7 +34,7 @@
  #include <syslog.h>
  #include <errno.h>
@@ -9,8 +21,9 @@
  
  #include "fam.h"
  #include "Client.h"
---- src/DNotify.c++
-+++ src/DNotify.c++
+diff -Naur fam-2.7.0-orig/src/DNotify.c++ fam-2.7.0/src/DNotify.c++
+--- fam-2.7.0-orig/src/DNotify.c++	2008-12-04 17:50:48.000000000 -0600
++++ fam-2.7.0/src/DNotify.c++	2008-12-04 17:51:19.000000000 -0600
 @@ -31,6 +31,7 @@
  #include <sys/types.h>
  #include <sys/stat.h>
@@ -19,8 +32,9 @@
  
  #include "DNotify.h"
  
---- src/IMon.c++
-+++ src/IMon.c++
+diff -Naur fam-2.7.0-orig/src/IMon.c++ fam-2.7.0/src/IMon.c++
+--- fam-2.7.0-orig/src/IMon.c++	2003-01-18 08:18:12.000000000 -0600
++++ fam-2.7.0/src/IMon.c++	2008-12-04 17:51:19.000000000 -0600
 @@ -40,7 +40,7 @@
  #include "Interest.h"
  #include "Log.h"
@@ -30,3 +44,14 @@
  
  int		   IMon::imonfd = -2;
  IMon::EventHandler IMon::ehandler = NULL;
+diff -Naur fam-2.7.0-orig/src/Interest.h fam-2.7.0/src/Interest.h
+--- fam-2.7.0-orig/src/Interest.h	2008-12-04 17:50:48.000000000 -0600
++++ fam-2.7.0/src/Interest.h	2008-12-04 17:51:22.000000000 -0600
+@@ -29,6 +29,7 @@
+ #include <netinet/in.h>  //  for in_addr
+ 
+ #include "Boolean.h"
++#include <cstdlib>
+ 
+ class Event;
+ class FileSystem;