Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 22 Dec 2004 23:41:57 -0200 (BRST)
From:      Marcus Grando <marcus@corp.grupos.com.br>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        simuran@shaw.ca
Subject:   ports/75412: Update port: devel/py-psyco change to 1.3
Message-ID:  <20041223014157.3D66020A78@corp.grupos.com.br>
Resent-Message-ID: <200412230150.iBN1oR9q063656@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         75412
>Category:       ports
>Synopsis:       Update port: devel/py-psyco change to 1.3
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Dec 23 01:50:27 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Marcus Grando
>Release:        FreeBSD 4.11-STABLE i386
>Organization:
Grupos Internet S/A
>Environment:
System: FreeBSD corp.grupos.com.br 4.11-STABLE FreeBSD 4.11-STABLE #34: Sun Dec 19 18:25:44 BRST 2004 root@corp.grupos.com.br:/usr/obj/usr/src/sys/CORP i386


	
>Description:
Update port: devel/py-psyco change to 1.3

+ change to 1.3
- rm files/patch-c::codemanager.c
- rmdir files
	
>How-To-Repeat:
	
>Fix:

	

--- py-psyco.patch begins here ---
diff -ruN py-psyco.old/Makefile py-psyco/Makefile
--- py-psyco.old/Makefile	Mon Aug  2 17:11:19 2004
+++ py-psyco/Makefile	Wed Dec 22 23:31:50 2004
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	psyco
-PORTVERSION=	1.2
-PORTREVISION=	1
+PORTVERSION=	1.3
+PORTREVISION=	0
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	psyco
diff -ruN py-psyco.old/distinfo py-psyco/distinfo
--- py-psyco.old/distinfo	Wed Jul 14 01:07:08 2004
+++ py-psyco/distinfo	Wed Dec 22 23:32:28 2004
@@ -1,2 +1,2 @@
-MD5 (psyco-1.2-src.tar.gz) = 441bfc7693bf13902a479550dcbaabd2
-SIZE (psyco-1.2-src.tar.gz) = 318472
+MD5 (psyco-1.3-src.tar.gz) = ef2dd14e933c40b420693d0cf5bb2aff
+SIZE (psyco-1.3-src.tar.gz) = 1099318
diff -ruN py-psyco.old/files/patch-c::codemanager.c py-psyco/files/patch-c::codemanager.c
--- py-psyco.old/files/patch-c::codemanager.c	Mon Aug  2 14:49:14 2004
+++ py-psyco/files/patch-c::codemanager.c	Wed Dec 31 21:00:00 1969
@@ -1,85 +0,0 @@
---- c/codemanager.c.orig	Tue Dec  2 17:46:39 2003
-+++ c/codemanager.c	Sun Aug  1 08:41:16 2004
-@@ -2,21 +2,12 @@
- #include <ipyencoding.h>
- 
- /*** Allocators for Large Executable Blocks of Memory ***/
--/* Defaults, possibly overridden below */
--#define LEBM_WITH_MMAP         0  /* assume memory executable by default */
--#define LEBM_NUM_BIGBLOCKS     1  /* not too large blocks */
- 
- #ifndef MS_WINDOWS
- /* Assume UNIX */
- #  include <sys/mman.h>
--#  if defined(MAP_ANONYMOUS) || defined(MAP_ANON)
--#    undef LEBM_WITH_MMAP
--#    undef LEBM_NUM_BIGBLOCKS
--#    define LEBM_WITH_MMAP           1  /* use mmap() with PROT_EXEC */
--#    define LEBM_NUM_BIGBLOCKS      32  /* ask for 32MB at a time */
--#    ifndef MAP_ANONYMOUS
--#      define MAP_ANONYMOUS  MAP_ANON
--#    endif
-+#  if defined(MAP_ANON) && !defined(MAP_ANONYMOUS)
-+#    define MAP_ANONYMOUS  MAP_ANON
- #  endif
- #endif
- 
-@@ -42,22 +33,44 @@
- 
- static void allocate_more_buffers(codemanager_buf_t** bb)
- {
--  char* p;
--  int i;
--  
--#if LEBM_WITH_MMAP
--  p = (char*) mmap(NULL, BIG_BUFFER_SIZE * LEBM_NUM_BIGBLOCKS,
--                   PROT_EXEC|PROT_READ|PROT_WRITE,
--                   MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
--  if (p == MAP_FAILED)
--    OUT_OF_MEMORY();
--#else
--  p = (char*) PyMem_MALLOC(BIG_BUFFER_SIZE * LEBM_NUM_BIGBLOCKS);
--  if (!p)
--    OUT_OF_MEMORY();
-+  char* p = NULL;
-+  int num_bigblocks = 1;
-+
-+#if defined(MAP_ANONYMOUS) && defined(MAP_PRIVATE)
-+  /* if we have anonymous mmap's, try using that -- this is known
-+     to fail on some platforms */
-+  static int mmap_works = -1;
-+  if (mmap_works != 0)
-+    {
-+      num_bigblocks = 32;    /* allocate 32MB at a time */
-+      p = (char*) mmap(NULL, BIG_BUFFER_SIZE * num_bigblocks,
-+                       PROT_EXEC|PROT_READ|PROT_WRITE,
-+                       MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
-+      if (p == MAP_FAILED || p == NULL)
-+        {
-+          if (mmap_works == 1)
-+            OUT_OF_MEMORY();
-+          mmap_works = 0;   /* doesn't work */
-+          p = NULL;
-+          num_bigblocks = 1;
-+          /* note that some platforms *require* the allocation to be performed
-+             by mmap, because PyMem_MALLOC() doesn't set the PROT_EXEC flag.
-+             On these platforms we just hope that the first allocation is
-+             successful, which sets mmap_works to 1; a failure in a subsequent
-+             allocation correctly signals the OUT_OF_MEMORY. */
-+        }
-+      else
-+        mmap_works = 1;
-+    }
- #endif
- 
--  for (i=0; i<LEBM_NUM_BIGBLOCKS; i++)
-+  if (p == NULL)
-+    {
-+      p = (char*) PyMem_MALLOC(BIG_BUFFER_SIZE);
-+      if (p == NULL)
-+        OUT_OF_MEMORY();
-+    }
-+  while (--num_bigblocks >= 0)
-     {
-       /* the codemanager_buf_t structure is put at the end of the buffer,
-          with its signature to detect overflows (just in case) */
--- py-psyco.patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20041223014157.3D66020A78>