Changeset 98955

Timestamp:

Oct 22, 2012, 1:10:15 PM (12 years ago)

Author:

jmr@…

Message:

python27: update posixmodule.c.ed to fix crash in os.getgroups (#36085)

Location:

trunk/dports/lang/python27

Files:

• Portfile (modified) (1 diff)
• files/posixmodule.c.ed (modified) (2 diffs)

trunk/dports/lang/python27/Portfile

@@ -9 +9 @@
 # Remember to keep py27-tkinter and py27-gdbm's versions sync'd with this
 version             2.7.3
+revision            1
 
 set major           [lindex [split $version .] 0]

trunk/dports/lang/python27/files/posixmodule.c.ed

@@ +1 @@
+g/^posix_setuid *(//^[  ]*uid_t/s/uid_t/int/
+g/^posix_seteuid *(//^[         ]*uid_t/s/uid_t/int/
+g/^posix_setegid *(//^[         ]*gid_t/s/gid_t/int/
+g/^posix_setreuid *(//^[        ]*uid_t/s/uid_t/int/
+g/^posix_setregid *(//^[        ]*gid_t/s/gid_t/int/
+g/^posix_setgid *(//^[  ]*gid_t/s/gid_t/int/
 /PyInt_FromLong((long)st->st_uid)/s//PyInt_FromLong((long)(int)st->st_uid)/
 /PyInt_FromLong((long)st->st_gid)/s//PyInt_FromLong((long)(int)st->st_gid)/
@@ -8 +14 @@
 /return PyInt_FromLong((long)geteuid());/s//return PyInt_FromLong((long)(int)geteuid());/
 /return PyInt_FromLong((long)getgid());/s//return PyInt_FromLong((long)(int)getgid());/
-/^posix_getgroups/-1i
-#include <pwd.h>
-int getgrouplist_2(const char *name, gid_t basegid, gid_t **groups);
-
-.
-/gid_t grouplist\[MAX_GROUPS\];/c
-        gid_t *grouplist = NULL;
-        struct passwd *pw;
-.
-/n = getgroups(MAX_GROUPS, grouplist);/c
-        if ((pw = getpwuid(getuid())) == NULL) {
-            errno = EINVAL;
-            posix_error();
-            return NULL;
-        }
-        n = getgrouplist_2(pw->pw_name, pw->pw_gid, &grouplist);
-.
-/if (n < 0)/c
-        if (n < 0) {
-            errno = EINVAL;
-.
-/return result;/i
-    if (grouplist) free(grouplist);
-.
+/PyInt_FromLong((long)alt_grouplist\[i\]);/s//PyInt_FromLong((long)(int)alt_grouplist[i]);/
 /return PyInt_FromLong((long)getuid());/s//return PyInt_FromLong((long)(int)getuid());/
 /^posix_setgroups/a