 @@ -1,28 +1,34 @@
-$NetBSD: distinfo,v 1.46.2.1 2008/05/30 17:13:43 spz Exp $
+$NetBSD: distinfo,v 1.46.2.2 2008/06/02 09:15:44 tron Exp $
 SHA1 (perl-5.8.8.tar.bz2) = 4aab490040727ca4419098720eca2ba4367df539
 RMD160 (perl-5.8.8.tar.bz2) = e78f26d9b96e6db35f946ad4ff55e3a69385c71b
 Size (perl-5.8.8.tar.bz2) = 10123359 bytes
 SHA1 (patch-aa) = 9b6844635086206dc7740103747a2b54bf987941
 SHA1 (patch-ab) = e32427327192f023477b16f29bc55fdf4f057410
 SHA1 (patch-ac) = 428e0757495b82a47ec092a71333fb3ec366f14f
 SHA1 (patch-ad) = 914e1c74555a9b6a0256992a694b2ba609f29786
 SHA1 (patch-ae) = 287ac0d97a5372c8b45457129f3e70fe42cf69e2
 SHA1 (patch-af) = b11574297e46b910f206f09702effc6cc272b0fd
 SHA1 (patch-ag) = 0122ec30b8fcd17198e068d07e95974bee0945b6
 SHA1 (patch-ah) = 25443063c26287b1b8130c53d5c9d92248d4c0d1
 SHA1 (patch-ai) = 4a07c6268a1e27b73f2f6fcde86f788fce77fcbd
 SHA1 (patch-aj) = a2fc32766ed8556455c60780fe242a034ce491a9
 SHA1 (patch-ak) = 8899f8b6d1d038b950979073cb0527c8e7afca1e
 SHA1 (patch-am) = cf1687063d0c0542e811545aaaad291bad12d75e
 SHA1 (patch-an) = 987763c3098bf4356993dd6d8741962a1ff8190d
 SHA1 (patch-ap) = 178d6909a8aa6544b849c2b63530fcf1893b77ea
 SHA1 (patch-aq) = b9569d0cd74a06912e82498cd2bfba131c0b6f3b
 SHA1 (patch-ar) = 9d257ceeca337e3d477b80215560bbc290d19dd2
 SHA1 (patch-as) = 371827db418eac11f0b49df45e9d587106908bf0
 SHA1 (patch-ba) = 27aefd5043c251380ac607df54fff882f689f237
 SHA1 (patch-ca) = 5ed14e043a6d5f8dadf5711b59418f01aa5f6f21
 SHA1 (patch-cb) = 2cbcaa476f33c270bfea50cddd0da3f476dbe689
 SHA1 (patch-ce) = 6b1efab32c6bc28e0faf7522322e6d805eb21730
 SHA1 (patch-ch) = a0831869e23d4a66588e6e27eecedb08527c9498
 SHA1 (patch-ci) = fe943f07044efa457d163eb86974ea10bb356226
 SHA1 (patch-cj) = 3f40f1b166a054d55224c3e79d74516ca608b696
 SHA1 (patch-ck) = 28207b8186c9ad194a1edc696159915bc16d1097
 SHA1 (patch-cn) = b5e56787fb9ca10025e9061d7bfd2da549ee3fa3
-SHA1 (patch-da) = b25f30544dd679d95997cafb7e427a41f98884b1
+SHA1 (patch-da) = 24c8783fcdbead35de20bc3cecf1627a64717853
 SHA1 (patch-ta) = ca0d1e4bc2dbbc4b86a087fed27cd1e7bbb2873f
 SHA1 (patch-zc) = 0c61b6028813e0f80bfe0760a1e74e3037d37cdd

 @@ -1,61 +1,150 @@
-$NetBSD: patch-da,v 1.1 2007/11/06 19:54:53 drochner Exp $
+$NetBSD: patch-da,v 1.1.6.1 2008/06/02 09:15:44 tron Exp $
---- regcomp.c.orig	2006-01-08 21:59:27.000000000 +0100
+Fix for
 http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-1927
 from
 http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=26;filename=27_fix_regcomp_utf8;att=1;bug=454792
 --- regcomp.c.orig	2008-06-01 22:04:17.000000000 +0200
 +++ regcomp.c
-@@ -135,7 +135,8 @@ typedef struct RExC_state_t {
+@@ -2790,6 +2790,39 @@ S_regpiece(pTHX_ RExC_state_t *pRExC_sta
      I32		extralen;
      I32		seen_zerolen;
      I32		seen_evals;
 -    I32		utf8;
 +    I32		utf8;			/* pattern is utf8 or not */
 +    I32		orig_utf8;		/* pattern was originally utf8 */
  #if ADD_TO_REGEXEC
      char 	*starttry;		/* -Dr: where regtry was called. */
  #define RExC_starttry	(pRExC_state->starttry)
@@ -161,6 +162,7 @@ typedef struct RExC_state_t {
  #define RExC_seen_zerolen	(pRExC_state->seen_zerolen)
  #define RExC_seen_evals	(pRExC_state->seen_evals)
  #define RExC_utf8	(pRExC_state->utf8)
 +#define RExC_orig_utf8	(pRExC_state->orig_utf8)
  #define	ISMULT1(c)	((c) == '*' || (c) == '+' || (c) == '?')
  #define	ISMULT2(s)	((*s) == '*' || (*s) == '+' || (*s) == '?' || \
@@ -1749,15 +1751,17 @@ Perl_pregcomp(pTHX_ char *exp, char *xen
      if (exp == NULL)
  	FAIL("NULL regexp argument");
--    RExC_utf8 = pm->op_pmdynflags & PMdf_CMP_UTF8;
+ /*
-+    RExC_orig_utf8 = RExC_utf8 = pm->op_pmdynflags & PMdf_CMP_UTF8;
++ * reg_recode
 + *
--    RExC_precomp = exp;
++ * It returns the code point in utf8 for the value in *encp.
-     DEBUG_r({
++ *    value: a code value in the source encoding
- 	 if (!PL_colorset) reginitcolors();
++ *    encp:  a pointer to an Encode object
- 	 PerlIO_printf(Perl_debug_log, "%sCompiling REx%s `%s%*s%s'\n",
++ *
- 		       PL_colors[4],PL_colors[5],PL_colors[0],
++ * If the result from Encode is not a single character,
--		       (int)(xend - exp), RExC_precomp, PL_colors[1]);
++ * it returns U+FFFD (Replacement character) and sets *encp to NULL.
-+		       (int)(xend - exp), exp, PL_colors[1]);
++ */
-     });
++STATIC UV
 +S_reg_recode(pTHX_ const char value, SV **encp)
 +{
 +    STRLEN numlen = 1;
 +    SV * const sv = sv_2mortal(newSVpvn(&value, numlen));
 +    const char * const s = encp && *encp ? sv_recode_to_utf8(sv, *encp)
 +					 : SvPVX(sv);
 +    const STRLEN newlen = SvCUR(sv);
 +    UV uv = UNICODE_REPLACEMENT;
++
-+redo_first_pass:
++    if (newlen)
-+    RExC_precomp = exp;
++	uv = SvUTF8(sv)
-     RExC_flags = pm->op_pmflags;
++	     ? utf8n_to_uvchr((U8*)s, newlen, &numlen, UTF8_ALLOW_DEFAULT)
-     RExC_sawback = 0;
++	     : *(U8*)s;
++
-@@ -1783,6 +1787,17 @@ Perl_pregcomp(pTHX_ char *exp, char *xen
++    if (!newlen || numlen != newlen) {
- 	RExC_precomp = Nullch;
++	uv = UNICODE_REPLACEMENT;
- 	return(NULL);
++	if (encp)
 +	    *encp = NULL;
 +    if (RExC_utf8 && !RExC_orig_utf8) {
 +        STRLEN len = xend-exp;
 +        DEBUG_r(PerlIO_printf(Perl_debug_log,
 +                    "UTF8 mismatch! Converting to utf8 for resizing and compile\n"));
 +        exp = (char*)Perl_bytes_to_utf8(aTHX_ (U8*)exp, &len);
 +        xend = exp + len;
 +        RExC_orig_utf8 = RExC_utf8;
 +        SAVEFREEPV(exp);
 +        goto redo_first_pass;
 +    }
 +    return uv;
 +}
++
-     DEBUG_r(PerlIO_printf(Perl_debug_log, "size %"IVdf" ", (IV)RExC_size));
++/*
   - regatom - the lowest level
+  *
   * Optimization:  gobbles an entire sequence of ordinary characters so that
@@ -3181,6 +3214,8 @@ tryagain:
  			    ender = grok_hex(p, &numlen, &flags, NULL);
  			    p += numlen;
+ 			}
 +			if (PL_encoding && ender < 0x100)
 +			    goto recode_encoding;
  			break;
  		    case 'c':
  			p++;
@@ -3200,6 +3235,17 @@ tryagain:
  			    --p;
  			    goto loopdone;
+ 			}
 +			if (PL_encoding && ender < 0x100)
 +			    goto recode_encoding;
 +			break;
 +		    recode_encoding:
 +			{
 +			    SV* enc = PL_encoding;
 +			    ender = reg_recode((const char)(U8)ender, &enc);
 +			    if (!enc && SIZE_ONLY && ckWARN(WARN_REGEXP))
 +				vWARN(p, "Invalid escape in the specified encoding");
 +			    RExC_utf8 = 1;
 +			}
  			break;
  		    case '\0':
  			if (p >= RExC_end)
@@ -3330,32 +3376,6 @@ tryagain:
  	break;
+     }
 -    /* If the encoding pragma is in effect recode the text of
 -     * any EXACT-kind nodes. */
 -    if (PL_encoding && PL_regkind[(U8)OP(ret)] == EXACT) {
 -	STRLEN oldlen = STR_LEN(ret);
 -	SV *sv        = sv_2mortal(newSVpvn(STRING(ret), oldlen));
+-
 -	if (RExC_utf8)
 -	    SvUTF8_on(sv);
 -	if (sv_utf8_downgrade(sv, TRUE)) {
 -	    const char * const s = sv_recode_to_utf8(sv, PL_encoding);
 -	    const STRLEN newlen = SvCUR(sv);
+-
 -	    if (SvUTF8(sv))
 -		RExC_utf8 = 1;
 -	    if (!SIZE_ONLY) {
 -		DEBUG_r(PerlIO_printf(Perl_debug_log, "recode %*s to %*s\n",
 -				      (int)oldlen, STRING(ret),
 -				      (int)newlen, s));
 -		Copy(s, STRING(ret), newlen, char);
 -		STR_LEN(ret) += newlen - oldlen;
 -		RExC_emit += STR_SZ(newlen) - STR_SZ(oldlen);
 -	    } else
 -		RExC_size += STR_SZ(newlen) - STR_SZ(oldlen);
 -	}
 -    }
+-
      return(ret);
+ }
-     /* Small enough for pointer-storage convention?
+@@ -3733,6 +3753,8 @@ S_regclass(pTHX_ RExC_state_t *pRExC_sta
  		    value = grok_hex(RExC_parse, &numlen, &flags, NULL);
  		    RExC_parse += numlen;
+ 		}
 +		if (PL_encoding && value < 0x100)
 +		    goto recode_encoding;
  		break;
  	    case 'c':
  		value = UCHARAT(RExC_parse++);
@@ -3740,13 +3762,24 @@ S_regclass(pTHX_ RExC_state_t *pRExC_sta
  		break;
  	    case '0': case '1': case '2': case '3': case '4':
  	    case '5': case '6': case '7': case '8': case '9':
 -            {
 -                I32 flags = 0;
 -		numlen = 3;
 -		value = grok_oct(--RExC_parse, &numlen, &flags, NULL);
 -		RExC_parse += numlen;
 -		break;
 -            }
 +		{
 +		    I32 flags = 0;
 +		    numlen = 3;
 +		    value = grok_oct(--RExC_parse, &numlen, &flags, NULL);
 +		    RExC_parse += numlen;
 +		    if (PL_encoding && value < 0x100)
 +			goto recode_encoding;
 +		    break;
 +		}
 +	    recode_encoding:
 +		{
 +		    SV* enc = PL_encoding;
 +		    value = reg_recode((const char)(U8)value, &enc);
 +		    if (!enc && SIZE_ONLY && ckWARN(WARN_REGEXP))
 +			vWARN(RExC_parse,
 +			      "Invalid escape in the specified encoding");
 +		    break;
 +		}
  	    default:
  		if (!SIZE_ONLY && isALPHA(value) && ckWARN(WARN_REGEXP))
  		    vWARN2(RExC_parse,

 @@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.136 2008/02/19 19:28:39 tnn Exp $
+# $NetBSD: Makefile,v 1.136.2.1 2008/06/02 09:15:44 tron Exp $
 DISTNAME=	perl-5.8.8
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	lang devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:S,/modules/by-module/$,/src/,}
 EXTRACT_SUFX=	.tar.bz2
 DISTFILES+=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	jlam@pkgsrc.org
 HOMEPAGE=	http://www.perl.org/
 COMMENT=	Practical Extraction and Report Language
 #LICENSE=	gnu-gpl-v2
 PKG_DESTDIR_SUPPORT=	user-destdir
 CONFLICTS=	perl-base-[0-9]* perl-thread-[0-9]*			\