[70908] trunk/dports/lang/python26

25 Aug 2010

Revision: 70908
          http://trac.macports.org/changeset/70908
Author:   blb@macports.org
Date:     2010-08-25 14:10:49 -0700 (Wed, 25 Aug 2010)
Log Message:
-----------
lang/python26 - update to 2.6.6, ticket #26242

Modified Paths:
--------------
    trunk/dports/lang/python26/Portfile
    trunk/dports/lang/python26/files/patch-Makefile.pre.in.diff
    trunk/dports/lang/python26/files/posixmodule.c.ed

Modified: trunk/dports/lang/python26/Portfile
===================================================================

--- trunk/dports/lang/python26/Portfile	2010-08-25 19:35:40 UTC (rev 70907)
+++ trunk/dports/lang/python26/Portfile	2010-08-25 21:10:49 UTC (rev 70908)
@@ -4,8 +4,7 @@
 PortGroup select 1.0
 
 name                    python26
-version                 2.6.5
-revision                3
+version                 2.6.6
 set major               [lindex [split $version .] 0]
 set branch              [join [lrange [split ${version} .] 0 1] .]
 categories              lang
@@ -29,9 +28,9 @@
 distname                Python-${version}
 use_bzip2               yes
 
-checksums               md5     6bef0417e71a1a1737ccf5750420fdb3 \
-                        sha1    24c94f5428a8c94c9d0b316e3019fee721fdb5d1 \
-                        rmd160  909c6a13749396f2b19fed51821d3e2577b2833b
+checksums               md5     cf4e6881bb84a7ce6089e4a307f71f14 \
+                        sha1    a1daf2c2c7cffe0939c015260447572fe75c7e50 \
+                        rmd160  2d63f4f0ad3c124a8e62215ca94bd0231350e912
 
 # patch-Lib-distutils-dist.py.diff comes from
 # <http://bugs.python.org/issue1180>

Modified: trunk/dports/lang/python26/files/patch-Makefile.pre.in.diff
===================================================================
--- trunk/dports/lang/python26/files/patch-Makefile.pre.in.diff	2010-08-25 19:35:40 UTC (rev 70907)
+++ trunk/dports/lang/python26/files/patch-Makefile.pre.in.diff	2010-08-25 21:10:49 UTC (rev 70908)
@@ -4,10 +4,10 @@
  # Build the shared modules
  sharedmods: $(BUILDPYTHON)
  	@case $$MAKEFLAGS in \
--	*s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \
--	*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
-+	*s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q --no-user-cfg build;; \
-+	*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py --no-user-cfg build;; \
+-	*s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' LDFLAGS='$(LDFLAGS)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \
+-	*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' LDFLAGS='$(LDFLAGS)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
++	*s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' LDFLAGS='$(LDFLAGS)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q --no-user-cfg build;; \
++	*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' LDFLAGS='$(LDFLAGS)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py --no-user-cfg build;; \
  	esac
  
  # Build static library

Modified: trunk/dports/lang/python26/files/posixmodule.c.ed
===================================================================
--- trunk/dports/lang/python26/files/posixmodule.c.ed	2010-08-25 19:35:40 UTC (rev 70907)
+++ trunk/dports/lang/python26/files/posixmodule.c.ed	2010-08-25 21:10:49 UTC (rev 70908)
@@ -7,32 +7,7 @@
 /return PyInt_FromLong((long)getegid());/s//return PyInt_FromLong((long)(int)getegid());/
 /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;
-.
-/else {/s//} else {/
-/PyInt_FromLong((long)grouplist\[i\]);/s//PyInt_FromLong((long)(int)grouplist[i]);/
-/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
 .

    

blb＠macports.org

tags

participants (1)