diff options
| author | tron <tron> | 2012-03-24 12:04:36 +0000 |
|---|---|---|
| committer | tron <tron> | 2012-03-24 12:04:36 +0000 |
| commit | bba5e98c670b0763a4b6df63cb7a55cb11235b7f (patch) | |
| tree | d9d825efe987f0d093e868c18af3cbb510e7a694 /lang/python27/patches/patch-au | |
| parent | 7fbf841c7f69873571ca9b7ce6e1b199489cd842 (diff) | |
| download | pkgsrc-bba5e98c670b0763a4b6df63cb7a55cb11235b7f.tar.gz | |
Add a fix for the DoS vulnerability reported in CVE-2012-1150 taken
from the Python Mercurial repository.
Diffstat (limited to 'lang/python27/patches/patch-au')
| -rw-r--r-- | lang/python27/patches/patch-au | 32 |
1 files changed, 27 insertions, 5 deletions
diff --git a/lang/python27/patches/patch-au b/lang/python27/patches/patch-au index 1841ab3e402..71b3517bea3 100644 --- a/lang/python27/patches/patch-au +++ b/lang/python27/patches/patch-au @@ -1,8 +1,21 @@ -$NetBSD: patch-au,v 1.3 2011/06/13 11:31:13 obache Exp $ +$NetBSD: patch-au,v 1.4 2012/03/24 12:04:37 tron Exp $ ---- Makefile.pre.in.orig 2011-06-11 15:46:26.000000000 +0000 -+++ Makefile.pre.in -@@ -447,7 +447,7 @@ gdbhooks: $(BUILDPYTHON)-gdb.py +1.) Fix for unpriviliged build. +2.) Fix for CVE-2012-1150 taken from here: + +http://hg.python.org/cpython/rev/a0f43f4481e0 + +--- Makefile.pre.in.orig 2011-06-11 16:46:26.000000000 +0100 ++++ Makefile.pre.in 2012-03-24 11:02:25.000000000 +0000 +@@ -290,6 +290,7 @@ + Python/pymath.o \ + Python/pystate.o \ + Python/pythonrun.o \ ++ Python/random.o \ + Python/structmember.o \ + Python/symtable.o \ + Python/sysmodule.o \ +@@ -447,7 +448,7 @@ SRC_GDB_HOOKS=$(srcdir)/Tools/gdb/libpython.py $(BUILDPYTHON)-gdb.py: $(SRC_GDB_HOOKS) @@ -11,7 +24,16 @@ $NetBSD: patch-au,v 1.3 2011/06/13 11:31:13 obache 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 -@@ -820,7 +820,8 @@ altbininstall: $(BUILDPYTHON) +@@ -739,7 +740,7 @@ + -@if which pybuildbot.identify >/dev/null 2>&1; then \ + pybuildbot.identify "CC='$(CC)'" "CXX='$(CXX)'"; \ + fi +- $(TESTPYTHON) $(TESTPROG) -uall -rwW $(TESTOPTS) ++ $(TESTPYTHON) -R $(TESTPROG) -uall -rwW $(TESTOPTS) + + QUICKTESTOPTS= $(TESTOPTS) -x test_subprocess test_io test_lib2to3 \ + test_multibytecodec test_urllib2_localnet test_itertools \ +@@ -820,7 +821,8 @@ (cd $(DESTDIR)$(LIBDIR); $(LN) -sf $(INSTSONAME) $(LDLIBRARY)) \ fi \ fi; \ |