summaryrefslogtreecommitdiff
path: root/data/python/environ.diff
diff options
context:
space:
mode:
Diffstat (limited to 'data/python/environ.diff')
-rw-r--r--data/python/environ.diff26
1 files changed, 26 insertions, 0 deletions
diff --git a/data/python/environ.diff b/data/python/environ.diff
new file mode 100644
index 000000000..e42f70ec4
--- /dev/null
+++ b/data/python/environ.diff
@@ -0,0 +1,26 @@
+diff -ru Python-2.5.1/Misc/setuid-prog.c Python-2.5.1+iPhone/Misc/setuid-prog.c
+--- Python-2.5.1/Misc/setuid-prog.c 1998-09-10 20:18:09.000000000 +0000
++++ Python-2.5.1+iPhone/Misc/setuid-prog.c 2008-01-09 14:04:57.000000000 +0000
+@@ -102,9 +102,8 @@
+ clean_environ(void)
+ {
+ char **p;
+- extern char **environ;
+
+- for (p = environ; *p; p++) {
++ for (p = _NSGetEnviron(); *p; p++) {
+ if (strncmp(*p, "LD_", 3) == 0)
+ **p = 'X';
+ else if (strncmp(*p, "_RLD", 4) == 0)
+diff -ru Python-2.5.1/Modules/posixmodule.c Python-2.5.1+iPhone/Modules/posixmodule.c
+--- Python-2.5.1/Modules/posixmodule.c 2007-04-04 18:30:56.000000000 +0000
++++ Python-2.5.1+iPhone/Modules/posixmodule.c 2008-01-09 14:07:59.000000000 +0000
+@@ -339,7 +339,7 @@
+ #endif
+
+ /* Return a dictionary corresponding to the POSIX environment table */
+-#ifdef WITH_NEXT_FRAMEWORK
++#if 1
+ /* On Darwin/MacOSX a shared library or framework has no access to
+ ** environ directly, we must obtain it with _NSGetEnviron().
+ */