Change 30871: [PATCH] RXf_WHITE never used due to small bug in regcomp.c
Change 30871 by [EMAIL PROTECTED] on 2007/04/08 07:58:39 Subject: [PATCH] RXf_WHITE never used due to small bug in regcomp.c From: =?UTF-8?Q?=C3=86var_Arnfj=C3=B6r=C3=B0_Bjarmason?= [EMAIL PROTECTED] Date: Sat, 7 Apr 2007 00:17:05 + Message-ID: [EMAIL PROTECTED] Affected files ... ... //depot/perl/regcomp.c#578 edit Differences ... //depot/perl/regcomp.c#578 (text) Index: perl/regcomp.c --- perl/regcomp.c#577~30849~ 2007-04-06 05:13:14.0 -0700 +++ perl/regcomp.c 2007-04-08 00:58:39.0 -0700 @@ -4677,7 +4677,7 @@ r-paren_names = (HV*)SvREFCNT_inc(RExC_paren_names); else r-paren_names = NULL; -if (r-prelen == 3 strEQ(\\s+, r-precomp)) +if (r-prelen == 3 strnEQ(\\s+, r-precomp, 3)) /* precomp = \\s+) */ r-extflags |= RXf_WHITE; else if (r-prelen == 1 r-precomp[0] == '^') r-extflags |= RXf_START_ONLY; End of Patch.
Change 30870: [PATCH] makedepend.SH syntax error
Change 30870 by [EMAIL PROTECTED] on 2007/04/08 07:55:04 Subject: [PATCH] makedepend.SH syntax error From: Yitzchak Scott-Thoennes [EMAIL PROTECTED] Date: Sat, 7 Apr 2007 23:32:44 -0700 (PDT) Message-ID: [EMAIL PROTECTED] Affected files ... ... //depot/perl/makedepend.SH#37 edit Differences ... //depot/perl/makedepend.SH#37 (xtext) Index: perl/makedepend.SH --- perl/makedepend.SH#36~29871~2007-01-18 06:03:21.0 -0800 +++ perl/makedepend.SH 2007-04-08 00:55:04.0 -0700 @@ -128,7 +128,7 @@ *.y) filebase=`basename $file .y` ;; esac case $file in -*/*) finc=-I`echo $file | sed 's#/[^/]*$##` ;; +*/*) finc=-I`echo $file | sed 's#/[^/]*$##'` ;; *) finc= ;; esac $echo Finding dependencies for $filebase$_o. End of Patch.
Change 30872: Integrate:
Change 30872 by [EMAIL PROTECTED] on 2007/04/08 11:06:16
Integrate:
[ 28568]
Subject: [PATCH] z/OS: CPAN-ized ext/ and lib/
From: Jarkko Hietaniemi [EMAIL PROTECTED]
Date: Thu, 13 Jul 2006 23:10:27 +0300
Message-ID: [EMAIL PROTECTED]
[ 28569]
Version bumps for z/OS fixes.
[ 28846]
Subject: [PATCH] C++ Encode
From: Jarkko Hietaniemi [EMAIL PROTECTED]
Date: Thu, 14 Sep 2006 09:05:10 +0300
Message-ID: [EMAIL PROTECTED]
[ 28849]
Avoid warnings when $Config{d_cplusplus} is undefined.
[ 28974]
Subject: [PATCH] Encode.xs: add an explicit cast to make g++ happier
From: [EMAIL PROTECTED] (Jarkko Hietaniemi)
Date: Mon, 9 Oct 2006 16:54:12 +0300 (EEST)
Message-Id: [EMAIL PROTECTED]
[ 28980]
Subject: [PATCH] enc2xs and C++: add extern C to data
From: Jarkko Hietaniemi [EMAIL PROTECTED]
Date: Tue, 10 Oct 2006 13:52:57 +0300
Message-ID: [EMAIL PROTECTED]
[ 29121]
Spelling nits from Debian bug list...
Subject: Bug#395426: perl: spelling errors
From: Matt Taggart [EMAIL PROTECTED]
Date: Thu, 26 Oct 2006 15:23:29 -0700
Message-Id: [EMAIL PROTECTED]
[ 29151]
Delete Encode's MANIFEST (or else the make process complains
about the missing Encode's META.yml file)
[ 30357]
Revert change #28980 per Jarkko's suggestion
(it was actually breaking g++ builds)
[ 30493]
Subject: Re: [PATCH] (Re: [PATCH] unicode/utf8 pod)
From: Juerd Waalboer [EMAIL PROTECTED]
Date: Sun, 4 Mar 2007 16:00:19 +0100
Message-ID: [EMAIL PROTECTED]
[ 30693]
Subject: [PATCH] Re: [perl #32687] Encode::is_utf8 on tainted UTF8
string
From: Rafael Garcia-Suarez [EMAIL PROTECTED]
Date: Thu, 16 Nov 2006 17:36:44 +0100
Message-ID: [EMAIL PROTECTED]
[ 30836]
C++ compilation patch by Jarkko
[ 30866]
Upgrade to Encode 2.19
Affected files ...
... //depot/maint-5.8/perl/MANIFEST#364 integrate
... //depot/maint-5.8/perl/ext/Encode/AUTHORS#18 integrate
... //depot/maint-5.8/perl/ext/Encode/Changes#32 integrate
... //depot/maint-5.8/perl/ext/Encode/Encode.pm#33 integrate
... //depot/maint-5.8/perl/ext/Encode/Encode.xs#19 integrate
... //depot/maint-5.8/perl/ext/Encode/MANIFEST#16 delete
... //depot/maint-5.8/perl/ext/Encode/bin/enc2xs#9 integrate
... //depot/maint-5.8/perl/ext/Encode/bin/piconv#10 integrate
... //depot/maint-5.8/perl/ext/Encode/encoding.pm#23 integrate
... //depot/maint-5.8/perl/ext/Encode/lib/Encode/Alias.pm#19 integrate
... //depot/maint-5.8/perl/ext/Encode/lib/Encode/CJKConstants.pm#8 integrate
... //depot/maint-5.8/perl/ext/Encode/lib/Encode/JP/H2Z.pm#5 integrate
... //depot/maint-5.8/perl/ext/Encode/lib/Encode/JP/JIS7.pm#9 integrate
... //depot/maint-5.8/perl/ext/Encode/lib/Encode/MIME/Header.pm#9 integrate
... //depot/maint-5.8/perl/ext/Encode/lib/Encode/Unicode/UTF7.pm#7 integrate
... //depot/maint-5.8/perl/ext/Encode/t/Aliases.t#5 integrate
... //depot/maint-5.8/perl/ext/Encode/t/mime-header.t#8 integrate
... //depot/maint-5.8/perl/ext/Encode/t/utf8strict.t#3 integrate
Differences ...
//depot/maint-5.8/perl/MANIFEST#364 (text)
Index: perl/MANIFEST
--- perl/MANIFEST#363~30810~2007-03-31 06:10:12.0 -0700
+++ perl/MANIFEST 2007-04-08 04:06:16.0 -0700
@@ -429,7 +429,6 @@
ext/Encode/lib/Encode/Supported.podDocuments for supported encodings
ext/Encode/lib/Encode/Unicode/UTF7.pm Encode extension
ext/Encode/Makefile.PL Encode extension makefile writer
-ext/Encode/MANIFESTEncode extension
ext/Encode/README Encode extension
ext/Encode/Symbol/Makefile.PL Encode extension
ext/Encode/Symbol/Symbol.pmEncode extension
//depot/maint-5.8/perl/ext/Encode/AUTHORS#18 (text)
Index: perl/ext/Encode/AUTHORS
--- perl/ext/Encode/AUTHORS#17~28165~ 2006-05-11 09:01:23.0 -0700
+++ perl/ext/Encode/AUTHORS 2007-04-08 04:06:16.0 -0700
@@ -50,6 +50,7 @@
SUGAWARA Hajime[EMAIL PROTECTED]
SUZUKI Norio [EMAIL PROTECTED]
Simon Cozens [EMAIL PROTECTED]
+Slaven Rezic [EMAIL PROTECTED]
Spider Boardman[EMAIL PROTECTED]
Steve Hay [EMAIL PROTECTED]
Steve Peters [EMAIL PROTECTED]
//depot/maint-5.8/perl/ext/Encode/Changes#32 (text)
Index: perl/ext/Encode/Changes
--- perl/ext/Encode/Changes#31~30047~ 2007-01-27 15:49:02.0 -0800
+++ perl/ext/Encode/Changes 2007-04-08 04:06:16.0 -0700
@@ -1,8 +1,33 @@
# Revision history for Perl extension Encode.
#
-# $Id: Changes,v 2.17
Change 30873: Integrate:
Change 30873 by [EMAIL PROTECTED] on 2007/04/08 11:25:47
Integrate:
[ 30400]
Module::Pluggable::Object::search_paths portability update prompted by
VMS test failures. Patch also submitted to CPAN RT queue at
http://rt.cpan.org/Public/Bug/Display.html?id=13607.
[ 30404]
Add a version number to Module::Pluggable::Object and
bump the version number of Module::Pluggable
[ 30869]
Upgrade to Module-Pluggable 3.6
Affected files ...
... //depot/maint-5.8/perl/lib/Module/Pluggable.pm#2 integrate
... //depot/maint-5.8/perl/lib/Module/Pluggable/Object.pm#2 integrate
... //depot/maint-5.8/perl/lib/Module/Pluggable/t/20dodgy_files.t#2 integrate
Differences ...
//depot/maint-5.8/perl/lib/Module/Pluggable.pm#2 (text)
Index: perl/lib/Module/Pluggable.pm
--- perl/lib/Module/Pluggable.pm#1~30559~ 2007-03-13 03:30:36.0
-0700
+++ perl/lib/Module/Pluggable.pm2007-04-08 04:25:47.0 -0700
@@ -9,7 +9,7 @@
# Peter Gibbons: I wouldn't say I've been missing it, Bob!
-$VERSION = '3.5';
+$VERSION = '3.6';
sub import {
my $class= shift;
//depot/maint-5.8/perl/lib/Module/Pluggable/Object.pm#2 (text)
Index: perl/lib/Module/Pluggable/Object.pm
--- perl/lib/Module/Pluggable/Object.pm#1~30559~2007-03-13
03:30:36.0 -0700
+++ perl/lib/Module/Pluggable/Object.pm 2007-04-08 04:25:47.0 -0700
@@ -3,10 +3,14 @@
use strict;
use File::Find ();
use File::Basename;
-use File::Spec::Functions qw(splitdir catdir abs2rel);
+use File::Spec::Functions qw(splitdir catdir curdir catfile abs2rel);
use Carp qw(croak carp);
use Devel::InnerPackage;
use Data::Dumper;
+use vars qw($VERSION);
+
+$VERSION = '3.6';
+
sub new {
my $class = shift;
@@ -145,17 +149,48 @@
# untaint the file; accept .pm only
next unless ($file) = ($file =~ /(.*$file_regex)$/);
# parse the file to get the name
-my ($name, $directory) = fileparse($file, $file_regex);
+my ($name, $directory, $suffix) = fileparse($file, $file_regex);
$directory = abs2rel($directory, $sp);
+
+# If we have a mixed-case package name, assume case has been
preserved
+# correctly. Otherwise, root through the file to locate the
case-preserved
+# version of the package name.
+my @pkg_dirs = ();
+if ( $name eq lc($name) || $name eq uc($name) ) {
+my $pkg_file = catfile($sp, $directory, $name$suffix);
+open PKGFILE, $pkg_file or die search_paths: Can't open
$pkg_file: $!;
+my $in_pod = 0;
+while ( my $line = PKGFILE ) {
+$in_pod = 1 if $line =~ m/^=\w/;
+$in_pod = 0 if $line =~ /^=cut/;
+next if ($in_pod || $line =~ /^=cut/); # skip pod text
+next if $line =~ /^\s*#/; # and comments
+if ( $line =~ m/^\s*package\s+(.*::)?($name)\s*;/i ) {
+@pkg_dirs = split /::/, $1;
+$name = $2;
+last;
+}
+}
+close PKGFILE;
+}
+
# then create the class name in a cross platform way
$directory =~ s/^[a-z]://i if($^O =~ /MSWin32|dos/); #
remove volume
+my @dirs = ();
if ($directory) {
($directory) = ($directory =~ /(.*)/);
+@dirs = grep(length($_), splitdir($directory))
+unless $directory eq curdir();
+for my $d (reverse @dirs) {
+my $pkg_dir = pop @pkg_dirs;
+last unless defined $pkg_dir;
+$d =~ s/\Q$pkg_dir\E/$pkg_dir/i; # Correct case
+}
} else {
$directory = ;
}
-my $plugin = join ::, splitdir catdir($searchpath, $directory,
$name);
+my $plugin = join '::', $searchpath, @dirs, $name;
next unless $plugin =~ m!(?:[a-z\d]+)[a-z\d]!i;
//depot/maint-5.8/perl/lib/Module/Pluggable/t/20dodgy_files.t#2 (text)
Index: perl/lib/Module/Pluggable/t/20dodgy_files.t
--- perl/lib/Module/Pluggable/t/20dodgy_files.t#1~30559~2007-03-13
03:30:36.0 -0700
+++ perl/lib/Module/Pluggable/t/20dodgy_files.t 2007-04-08 04:25:47.0
-0700
@@ -1,5 +1,12 @@
#!perl -w
+BEGIN {
+if ($^O eq 'VMS') {
+print 1..0 # Skip: can't handle misspelled plugin names\n;
+exit;
+}
+}
+
use strict;
use FindBin;
use lib $FindBin::Bin/lib;
End of Patch.
Change 30874: Integrate:
Change 30874 by [EMAIL PROTECTED] on 2007/04/08 12:05:44
Integrate:
[ 28568]
Subject: [PATCH] z/OS: CPAN-ized ext/ and lib/
From: Jarkko Hietaniemi [EMAIL PROTECTED]
Date: Thu, 13 Jul 2006 23:10:27 +0300
Message-ID: [EMAIL PROTECTED]
Affected files ...
... //depot/maint-5.8/perl/lib/CGI/t/util-58.t#2 integrate
Differences ...
//depot/maint-5.8/perl/lib/CGI/t/util-58.t#2 (text)
Index: perl/lib/CGI/t/util-58.t
--- perl/lib/CGI/t/util-58.t#1~19682~ 2003-06-03 22:22:46.0 -0700
+++ perl/lib/CGI/t/util-58.t2007-04-08 05:05:44.0 -0700
@@ -11,6 +11,11 @@
use Test::More tests = 2;
use_ok(CGI::Util);
my $uri = \x{5c0f}\x{98fc} \x{5f3e}.txt; # KOGAI, Dan, in Kanji
-is(CGI::Util::escape($uri), %E5%B0%8F%E9%A3%BC%20%E5%BC%BE.txt,
- # Escape string with UTF-8 flag);
+if (ord('A') == 193) { # EBCDIC.
+is(CGI::Util::escape($uri), %FC%C3%A0%EE%F9%E5%E7%F8%20%FC%C3%C7%CA.txt,
+ # Escape string with UTF-8 (UTF-EBCDIC) flag);
+} else {
+is(CGI::Util::escape($uri), %E5%B0%8F%E9%A3%BC%20%E5%BC%BE.txt,
+ # Escape string with UTF-8 flag);
+}
__END__
End of Patch.
