summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lang/python23/Makefile5
-rw-r--r--lang/python23/Makefile.common8
-rw-r--r--lang/python23/PLIST.common3
-rw-r--r--lang/python23/distinfo12
-rw-r--r--lang/python23/patches/patch-ah24
-rw-r--r--lang/python23/patches/patch-ec44
6 files changed, 36 insertions, 60 deletions
diff --git a/lang/python23/Makefile b/lang/python23/Makefile
index b74a5643c39..a7db44aa430 100644
--- a/lang/python23/Makefile
+++ b/lang/python23/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.39 2008/07/14 14:42:51 joerg Exp $
+# $NetBSD: Makefile,v 1.40 2008/11/10 19:41:47 wiz Exp $
#
-PKGNAME= python23-2.3.5
-PKGREVISION= 11
+PKGNAME= python23-2.3.7
CONFLICTS+= python-[0-9]*
diff --git a/lang/python23/Makefile.common b/lang/python23/Makefile.common
index f021ef88556..8f1824a5497 100644
--- a/lang/python23/Makefile.common
+++ b/lang/python23/Makefile.common
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.39 2008/07/14 14:42:51 joerg Exp $
+# $NetBSD: Makefile.common,v 1.40 2008/11/10 19:41:47 wiz Exp $
#
-DISTNAME= Python-2.3.5
+DISTNAME= Python-2.3.7
CATEGORIES= lang python
-MASTER_SITES= ftp://ftp.python.org/pub/python/2.3.5/ \
- http://www.python.org/ftp/python/2.3.5/
+MASTER_SITES= ftp://ftp.python.org/pub/python/2.3.7/ \
+ http://www.python.org/ftp/python/2.3.7/
EXTRACT_SUFX= .tgz
MAINTAINER= recht@NetBSD.org
diff --git a/lang/python23/PLIST.common b/lang/python23/PLIST.common
index 759b49c312f..e1cf25cc6df 100644
--- a/lang/python23/PLIST.common
+++ b/lang/python23/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.8 2008/04/12 22:43:02 jlam Exp $
+@comment $NetBSD: PLIST.common,v 1.9 2008/11/10 19:41:47 wiz Exp $
bin/pydoc${PY_VER_SUFFIX}
bin/python${PY_VER_SUFFIX}
include/python${PY_VER_SUFFIX}/Python.h
@@ -609,6 +609,7 @@ lib/python${PY_VER_SUFFIX}/email/test/data/msg_33.txt
lib/python${PY_VER_SUFFIX}/email/test/data/msg_34.txt
lib/python${PY_VER_SUFFIX}/email/test/data/msg_35.txt
lib/python${PY_VER_SUFFIX}/email/test/data/msg_40.txt
+lib/python${PY_VER_SUFFIX}/email/test/data/msg_41.txt
lib/python${PY_VER_SUFFIX}/email/test/test_email.py
lib/python${PY_VER_SUFFIX}/email/test/test_email.pyc
lib/python${PY_VER_SUFFIX}/email/test/test_email.pyo
diff --git a/lang/python23/distinfo b/lang/python23/distinfo
index eaac3cfdfc9..c4e85b0f1d1 100644
--- a/lang/python23/distinfo
+++ b/lang/python23/distinfo
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.40 2007/12/24 01:19:48 minskim Exp $
+$NetBSD: distinfo,v 1.41 2008/11/10 19:41:47 wiz Exp $
-SHA1 (Python-2.3.5.tgz) = 2729d068f5d1abe7b743f32012d4f7c4b0508a3c
-RMD160 (Python-2.3.5.tgz) = 2104a393ca7c91b72b990ced53a0da752ccf42ef
-Size (Python-2.3.5.tgz) = 8535749 bytes
+SHA1 (Python-2.3.7.tgz) = 3d7656b9977c266c48987c3ec9f36393a7b00637
+RMD160 (Python-2.3.7.tgz) = bc9be27b87fc8bebd4adb5477eb7b8ccea9cb88b
+Size (Python-2.3.7.tgz) = 8694077 bytes
SHA1 (patch-aa) = dd8f89952d7f40c9a979e362758775f093e047bc
SHA1 (patch-ab) = 111d7fa8adbb7001bacad36e3bdbe23ae6ce8b9b
SHA1 (patch-ac) = 0ae5b3d547c7dbe1366c5ae6c60c11516e4550b8
SHA1 (patch-ad) = c8f6ea08e68dae3bd9ad639c38e74cf654c0b41e
SHA1 (patch-ae) = 3dcf150147333342b333871b41fe6fa92bced2d9
SHA1 (patch-af) = f161ce64bb1b318926bd9c534fe7050d7ddb636f
-SHA1 (patch-ah) = 6740fb09c3a1fca8cd25642a683d65d6d66760f8
+SHA1 (patch-ah) = 2f3457b239f08e0d438cdd63be56c4c3b2e158f3
SHA1 (patch-ai) = 0e8564ec8157fb5c48c801294213c66ae89a55a1
SHA1 (patch-al) = 98818fe37c3bac94bee91fe4f3dd8633172bec49
SHA1 (patch-am) = 786de1c656656fb900308a4811f1e9956db485b7
@@ -22,6 +22,6 @@ SHA1 (patch-da) = b082eff79571726701aab53c37d8d53a8115e204
SHA1 (patch-dc) = 3f2f9c37ae7ee35550669a3e517833e68dc0ab61
SHA1 (patch-ea) = babfed4a0e5ae599441423a06622d4820ab237b1
SHA1 (patch-eb) = b72694d414b55d11e324cc76d6ed03b7c8e7630c
-SHA1 (patch-ec) = 9bec8cc75868ca785810b92ffe60406117bdc3fd
+SHA1 (patch-ec) = 9c08e077a78bb3cf35c60ca46ee5c98f302c97d9
SHA1 (patch-ed) = 4e032197f21b16c99331b6d744c4d1d72e650d4d
SHA1 (patch-na) = 0019127a9b5b5b3f9f0fe3ae8d6b03672dea51e0
diff --git a/lang/python23/patches/patch-ah b/lang/python23/patches/patch-ah
index 6ca5dc28cc8..44d54c20bb2 100644
--- a/lang/python23/patches/patch-ah
+++ b/lang/python23/patches/patch-ah
@@ -1,22 +1,27 @@
-$NetBSD: patch-ah,v 1.6 2005/03/07 12:11:49 dmcmahill Exp $
+$NetBSD: patch-ah,v 1.7 2008/11/10 19:41:47 wiz Exp $
---- Makefile.pre.in.orig 2005-01-11 08:48:52.000000000 -0500
-+++ Makefile.pre.in 2005-03-07 06:41:33.425152000 -0500
-@@ -57,5 +57,5 @@
+--- Makefile.pre.in.orig 2005-01-11 13:49:02.000000000 +0000
++++ Makefile.pre.in
+@@ -56,7 +56,7 @@ MAKESETUP= $(srcdir)/Modules/makese
+ OPT= @OPT@
BASECFLAGS= @BASECFLAGS@
CFLAGS= $(BASECFLAGS) $(OPT)
-CPPFLAGS= -I. -I$(srcdir)/Include
+CPPFLAGS+= @CPPFLAGS@ -I. -I$(srcdir)/Include
LDFLAGS= @LDFLAGS@
LDLAST= @LDLAST@
-@@ -309,5 +309,5 @@
+ SGI_ABI= @SGI_ABI@
+@@ -308,7 +308,7 @@ all: $(BUILDPYTHON) oldsharedmods share
+ $(BUILDPYTHON): Modules/$(MAINOBJ) $(LIBRARY) $(LDLIBRARY)
$(LINKCC) $(LDFLAGS) $(LINKFORSHARED) -o $@ \
Modules/$(MAINOBJ) \
- $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
+ $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) ${LINK_ALL_LIBGCC_HACK}
platform: $(BUILDPYTHON)
-@@ -349,8 +349,8 @@
+ $(RUNSHARED) ./$(BUILDPYTHON) -E -c 'import sys ; from distutils.util import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform
+@@ -348,15 +348,18 @@ $(LIBRARY): $(LIBRARY_OBJS)
+
libpython$(VERSION).so: $(LIBRARY_OBJS)
if test $(INSTSONAME) != $(LDLIBRARY); then \
- $(LDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM); \
@@ -27,7 +32,7 @@ $NetBSD: patch-ah,v 1.6 2005/03/07 12:11:49 dmcmahill Exp $
+ $(LDSHARED) -o $@ $(LIBRARY_OBJS) $(LDFLAGS) $(SHLIBS) $(LIBC) $(LIBM); \
fi
-@@ -358,4 +358,7 @@
+ libpython$(VERSION).sl: $(LIBRARY_OBJS)
$(LDSHARED) -o $@ $(LIBRARY_OBJS) $(LIBC) $(LIBM)
+libpython$(VERSION).dylib: $(LIBRARY_OBJS)
@@ -35,7 +40,9 @@ $NetBSD: patch-ah,v 1.6 2005/03/07 12:11:49 dmcmahill Exp $
+
# This rule is here for OPENSTEP/Rhapsody/MacOSX. It builds a temporary
# minimal framework (not including the Lib directory and such) in the current
-@@ -617,5 +620,10 @@
+ # directory.
+@@ -616,7 +619,12 @@ altbininstall: $(BUILDPYTHON)
+ (cd $(DESTDIR)$(LIBDIR); $(LN) -sf $(INSTSONAME) libpython$(VERSION)$(SO)); \
fi \
fi; \
- else true; \
@@ -47,3 +54,4 @@ $NetBSD: patch-ah,v 1.6 2005/03/07 12:11:49 dmcmahill Exp $
+ fi \
fi
+ # Install the manual page
diff --git a/lang/python23/patches/patch-ec b/lang/python23/patches/patch-ec
index 8d4d0cf13b1..251b54fcee0 100644
--- a/lang/python23/patches/patch-ec
+++ b/lang/python23/patches/patch-ec
@@ -1,40 +1,8 @@
-$NetBSD: patch-ec,v 1.1 2005/10/01 19:36:01 recht Exp $
+$NetBSD: patch-ec,v 1.2 2008/11/10 19:41:47 wiz Exp $
---- Modules/pypcre.c.orig 2003-10-20 16:34:47.000000000 +0200
-+++ Modules/pypcre.c 2005-10-01 21:13:56.000000000 +0200
-@@ -1163,14 +1163,31 @@
- int min = 0;
- int max = -1;
-
-+/* Read the minimum value and do a paranoid check: a negative value indicates
-+an integer overflow. */
-+
- while ((pcre_ctypes[*p] & ctype_digit) != 0) min = min * 10 + *p++ - '0';
-
-+if (min < 0 || min > 65535)
-+ {
-+ *errorptr = ERR5;
-+ return p;
-+ }
-+
-+/* Read the maximum value if there is one, and again do a paranoid on its size
-+. Also, max must not be less than min. */
-+
- if (*p == '}') max = min; else
- {
- if (*(++p) != '}')
- {
- max = 0;
- while((pcre_ctypes[*p] & ctype_digit) != 0) max = max * 10 + *p++ - '0';
-+ if (max < 0 || max > 65535)
-+ {
-+ *errorptr = ERR5;
-+ return p;
-+ }
- if (max < min)
- {
- *errorptr = ERR4;
-@@ -2267,6 +2284,7 @@
+--- Modules/pypcre.c.orig 2005-08-31 12:55:21.000000000 +0000
++++ Modules/pypcre.c
+@@ -2278,6 +2278,7 @@ int c, size;
int bracount = 0;
int brastack[200];
int top_backref = 0;
@@ -42,7 +10,7 @@ $NetBSD: patch-ec,v 1.1 2005/10/01 19:36:01 recht Exp $
unsigned int brastackptr = 0;
uschar *code;
const uschar *ptr;
-@@ -2446,6 +2464,7 @@
+@@ -2457,6 +2458,7 @@ while ((c = *(++ptr)) != 0)
/* Brackets may be genuine groups or special things */
case '(':
@@ -50,7 +18,7 @@ $NetBSD: patch-ec,v 1.1 2005/10/01 19:36:01 recht Exp $
/* Handle special forms of bracket, which all start (? */
-@@ -2543,10 +2562,15 @@
+@@ -2554,10 +2556,15 @@ while ((c = *(++ptr)) != 0)
continue; /* End of this bracket handling */
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-24 05:01:32 +0000