diff -r -u Python-2.5.1/Modules/Setup.dist Python-2.5.1_cci/Modules/Setup.dist
--- Python-2.5.1/Modules/Setup.dist	2006-08-06 00:26:21.000000000 -0700
+++ Python-2.5.1_cci/Modules/Setup.dist	2007-04-20 11:33:46.000000000 -0700
@@ -241,12 +241,12 @@
 # Message-Digest Algorithm, described in RFC 1321.  The necessary files
 # md5.c and md5.h are included here.
 
-#_md5 md5module.c md5.c
+_md5 md5module.c md5.c
 
 
 # The _sha module implements the SHA checksum algorithm.
 # (NIST's Secure Hash Algorithm.)
-#_sha shamodule.c
+_sha shamodule.c
 
 
 # SGI IRIX specific modules -- off by default.
diff -r -u Python-2.5.1/Modules/posixmodule.c Python-2.5.1_cci/Modules/posixmodule.c
--- Python-2.5.1/Modules/posixmodule.c	2007-04-04 11:30:56.000000000 -0700
+++ Python-2.5.1_cci/Modules/posixmodule.c	2007-11-24 21:28:14.000000000 -0800
@@ -23,6 +23,11 @@
 #  pragma weak statvfs
 #  pragma weak fstatvfs
 
+#if !defined(SETPGRP_HAVE_ARG) \
+ && defined(__APPLE_CC__) && __APPLE_CC__ >= 5465
+#define SETPGRP_HAVE_ARG
+#endif
+
 #endif /* __APPLE__ */
 
 #define PY_SSIZE_T_CLEAN