head 1.2; access; symbols pkgsrc-2013Q2:1.2.0.36 pkgsrc-2013Q2-base:1.2 pkgsrc-2012Q4:1.2.0.34 pkgsrc-2012Q4-base:1.2 pkgsrc-2011Q4:1.2.0.32 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q2:1.2.0.30 pkgsrc-2011Q2-base:1.2 pkgsrc-2009Q4:1.2.0.28 pkgsrc-2009Q4-base:1.2 pkgsrc-2008Q4:1.2.0.26 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.24 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.22 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.20 pkgsrc-2008Q2-base:1.2 pkgsrc-2008Q1:1.2.0.18 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.16 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.14 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.12 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.10 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.8 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.6 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.4 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.2 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.1.0.4 pkgsrc-2005Q4-base:1.1 pkgsrc-2005Q3:1.1.0.2; locks; strict; comment @# @; 1.2 date 2006.01.09.23.26.09; author joerg; state dead; branches; next 1.1; 1.1 date 2005.10.01.19.36.01; author recht; state Exp; branches 1.1.2.1; next ; 1.1.2.1 date 2005.10.01.19.36.01; author salo; state dead; branches; next 1.1.2.2; 1.1.2.2 date 2005.10.09.00.17.41; author salo; state Exp; branches; next ; desc @@ 1.2 log @Change python23-nth to use the patches and distinfo of python23. Use the SUBST framework to replace the version numbers as before. OK recht@@ @ text @$NetBSD: patch-ec,v 1.1 2005/10/01 19:36:01 recht 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 @@@@ int bracount = 0; int brastack[200]; int top_backref = 0; +BOOL capturing; unsigned int brastackptr = 0; uschar *code; const uschar *ptr; @@@@ -2446,6 +2464,7 @@@@ /* Brackets may be genuine groups or special things */ case '(': + capturing = FALSE; /* Handle special forms of bracket, which all start (? */ @@@@ -2543,10 +2562,15 @@@@ continue; /* End of this bracket handling */ } + /* Ordinary parentheses, not followed by '?', are capturing unless + PCRE_NO_AUTO_CAPTURE is set. */ + + else capturing = (options & PCRE_NO_AUTO_CAPTURE) == 0; + /* Extracting brackets must be counted so we can process escapes in a Perlish way. */ - else bracount++; + if (capturing) bracount++; /* Non-special forms of bracket. Save length for computing whole length at end if there's a repeat that requires duplication of the group. */ @ 1.1 log @Add a patch for CAN-2005-2491 (uffer overflow vulnerability in the PCRE library) from ubuntu Linux (via gentoo). For details see: http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2005-2491 Bump PKGREVISION's. @ text @d1 1 a1 1 $NetBSD$ @ 1.1.2.1 log @file patch-ec was added on branch pkgsrc-2005Q3 on 2005-10-01 19:36:01 +0000 @ text @d1 69 @ 1.1.2.2 log @Pullup ticket 815 - requested by Havard Eidnes security fix for python23 Revisions pulled up: - pkgsrc/lang/python23/Makefile 1.30 - pkgsrc/lang/python23/distinfo 1.34 - pkgsrc/lang/python23/patches/patch-ea 1.1 - pkgsrc/lang/python23/patches/patch-eb 1.1 - pkgsrc/lang/python23/patches/patch-ec 1.1 - pkgsrc/lang/python23-nth/Makefile 1.6 - pkgsrc/lang/python23-nth/distinfo 1.6 - pkgsrc/lang/python23-nth/patches/patch-ea 1.1 - pkgsrc/lang/python23-nth/patches/patch-eb 1.1 - pkgsrc/lang/python23-nth/patches/patch-ec 1.1 - pkgsrc/lang/python23-pth/Makefile 1.30 Module Name: pkgsrc Committed By: recht Date: Sat Oct 1 19:36:01 UTC 2005 Modified Files: pkgsrc/lang/python23: Makefile distinfo pkgsrc/lang/python23-nth: Makefile distinfo pkgsrc/lang/python23-pth: Makefile Added Files: pkgsrc/lang/python23-nth/patches: patch-ea patch-eb patch-ec pkgsrc/lang/python23/patches: patch-ea patch-eb patch-ec Log Message: Add a patch for CAN-2005-2491 (uffer overflow vulnerability in the PCRE library) from ubuntu Linux (via gentoo). For details see: http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2005-2491 Bump PKGREVISION's. @ text @a0 69 $NetBSD: patch-ec,v 1.1.2.1 2005/10/09 00:17:41 salo 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 @@@@ int bracount = 0; int brastack[200]; int top_backref = 0; +BOOL capturing; unsigned int brastackptr = 0; uschar *code; const uschar *ptr; @@@@ -2446,6 +2464,7 @@@@ /* Brackets may be genuine groups or special things */ case '(': + capturing = FALSE; /* Handle special forms of bracket, which all start (? */ @@@@ -2543,10 +2562,15 @@@@ continue; /* End of this bracket handling */ } + /* Ordinary parentheses, not followed by '?', are capturing unless + PCRE_NO_AUTO_CAPTURE is set. */ + + else capturing = (options & PCRE_NO_AUTO_CAPTURE) == 0; + /* Extracting brackets must be counted so we can process escapes in a Perlish way. */ - else bracount++; + if (capturing) bracount++; /* Non-special forms of bracket. Save length for computing whole length at end if there's a repeat that requires duplication of the group. */ @