Change 33611: Integrate:
Change 33611 by [EMAIL PROTECTED] on 2008/03/31 12:32:56 Integrate: [ 33085] Subject: FW: [PATCH] RE: [PATCH] volatile, avoid clobbered From: Robin Barker [EMAIL PROTECTED] Date: Wed, 23 Jan 2008 18:51:24 - Message-ID: [EMAIL PROTECTED] [ 33106] Fix Win32 compiler warnings introduced by #33081 and #33085 [just the 33081 part] [ 33152] Subject: [PATCH] don't forbid brace groups with g++ 4.2.2 From: Robin Barker [EMAIL PROTECTED] Date: Wed, 30 Jan 2008 18:42:25 - Message-ID: [EMAIL PROTECTED] [ 33368] Two break; statements that aren't (yet) needed, but may trip someone up in the future. Affected files ... ... //depot/maint-5.10/perl/embed.fnc#9 integrate ... //depot/maint-5.10/perl/op.c#6 integrate ... //depot/maint-5.10/perl/perl.c#6 integrate ... //depot/maint-5.10/perl/perl.h#9 integrate ... //depot/maint-5.10/perl/pod/perlapi.pod#5 integrate ... //depot/maint-5.10/perl/proto.h#7 integrate Differences ... //depot/maint-5.10/perl/embed.fnc#9 (text) Index: perl/embed.fnc --- perl/embed.fnc#8~33167~ 2008-02-01 06:04:12.0 -0800 +++ perl/embed.fnc 2008-03-31 05:32:56.0 -0700 @@ -646,7 +646,7 @@ Apd|I32|call_argv |NN const char* sub_name|I32 flags|NN char** argv Apd|I32|call_method|NN const char* methname|I32 flags Apd|I32|call_pv|NN const char* sub_name|I32 flags -Apd|I32|call_sv|NN SV* sv|I32 flags +Apd|I32|call_sv|NN SV* sv|VOL I32 flags Ap |void |despatch_signals Ap |OP * |doref |NN OP *o|I32 type|bool set_op_ref Apd|SV*|eval_pv|NN const char* p|I32 croak_on_error //depot/maint-5.10/perl/op.c#6 (text) Index: perl/op.c --- perl/op.c#5~33141~ 2008-01-30 15:50:34.0 -0800 +++ perl/op.c 2008-03-31 05:32:56.0 -0700 @@ -870,6 +870,7 @@ case OP_SORT: if (ckWARN(WARN_VOID)) Perl_warner(aTHX_ packWARN(WARN_VOID), Useless use of sort in scalar context); + break; } return o; } @@ -2339,7 +2340,7 @@ Perl_fold_constants(pTHX_ register OP *o) { dVAR; -register OP *curop; +register OP * VOL curop; OP *newop; VOL I32 type = o-op_type; SV * VOL sv = NULL; @@ -2384,6 +2385,7 @@ /* XXX what about the numeric ops? */ if (PL_hints HINT_LOCALE) goto nope; + break; } if (PL_parser PL_parser-error_count) //depot/maint-5.10/perl/perl.c#6 (text) Index: perl/perl.c --- perl/perl.c#5~33166~2008-02-01 04:52:40.0 -0800 +++ perl/perl.c 2008-03-31 05:32:56.0 -0700 @@ -2581,7 +2581,7 @@ */ I32 -Perl_call_sv(pTHX_ SV *sv, I32 flags) +Perl_call_sv(pTHX_ SV *sv, VOL I32 flags) /* See G_* flags in cop.h */ { dVAR; dSP; //depot/maint-5.10/perl/perl.h#9 (text) Index: perl/perl.h --- perl/perl.h#8~33590~2008-03-28 12:01:33.0 -0700 +++ perl/perl.h 2008-03-31 05:32:56.0 -0700 @@ -452,8 +452,12 @@ /* gcc (-ansi) -pedantic doesn't allow gcc statement expressions, * g++ allows them but seems to have problems with them - * (insane errors ensue). */ -#if defined(PERL_GCC_PEDANTIC) || (defined(__GNUC__) defined(__cplusplus)) + * (insane errors ensue). + * g++ does not give insane errors now (RMB 2008-01-30, gcc 4.2.2). + */ +#if defined(PERL_GCC_PEDANTIC) || \ +(defined(__GNUC__) defined(__cplusplus) \ + ((__GNUC__ 4) || ((__GNUC__ == 4) (__GNUC_MINOR__ 2 # ifndef PERL_GCC_BRACE_GROUPS_FORBIDDEN #define PERL_GCC_BRACE_GROUPS_FORBIDDEN # endif @@ -528,11 +532,7 @@ #endif #if defined(HASVOLATILE) || defined(STANDARD_C) -# ifdef __cplusplus -# define VOL /* to temporarily suppress warnings */ -# else # define VOL volatile -# endif #else # define VOL #endif //depot/maint-5.10/perl/pod/perlapi.pod#5 (text+w) Index: perl/pod/perlapi.pod --- perl/pod/perlapi.pod#4~33610~ 2008-03-30 16:20:46.0 -0700 +++ perl/pod/perlapi.pod2008-03-31 05:32:56.0 -0700 @@ -428,7 +428,7 @@ NOTE: the perl_ form of this function is deprecated. - I32 call_sv(SV* sv, I32 flags) + I32 call_sv(SV* sv, VOL I32 flags) =for hackers Found in file perl.c //depot/maint-5.10/perl/proto.h#7 (text+w) Index: perl/proto.h --- perl/proto.h#6~33167~ 2008-02-01 06:04:12.0 -0800 +++ perl/proto.h2008-03-31 05:32:56.0 -0700 @@ -1773,7 +1773,7 @@ PERL_CALLCONV I32 Perl_call_pv(pTHX_ const char* sub_name, I32 flags) __attribute__nonnull__(pTHX_1); -PERL_CALLCONV I32 Perl_call_sv(pTHX_ SV* sv, I32 flags) +PERL_CALLCONV I32 Perl_call_sv(pTHX_ SV* sv, VOL I32 flags)
Change 33612: Config.pm needs to be listed in Module::CoreList, too
Change 33612 by [EMAIL PROTECTED] on 2008/03/31 15:21:42 Config.pm needs to be listed in Module::CoreList, too Affected files ... ... //depot/perl/Porting/corelist.pl#8 edit Differences ... //depot/perl/Porting/corelist.pl#8 (text) Index: perl/Porting/corelist.pl --- perl/Porting/corelist.pl#7~31562~ 2007-07-07 03:59:10.0 -0700 +++ perl/Porting/corelist.pl2008-03-31 08:21:42.0 -0700 @@ -36,6 +36,8 @@ $lines{sprintf \t%-24s= $version,\n, '$module'}++; }, 'lib', 'ext', 'vms/ext', 'symbian/ext'); +-e 'configpm' and $lines{sprintf \t%-24s= undef,\n, 'Config'}++; + if (open my $ucdv, , lib/unicore/version) { chomp (my $ucd = $ucdv); $lines{sprintf \t%-24s= '$ucd',\n, 'Unicode'}++; End of Patch.
Change 33613: Integrate:
Change 33613 by [EMAIL PROTECTED] on 2008/03/31 16:04:00 Integrate: [ 32809] Subject: [PATCH] RE: How to load a loadable object that has a non-default file extension ? From: Jan Dubois [EMAIL PROTECTED] Date: Sun, 30 Dec 2007 12:52:30 -0800 Message-ID: [EMAIL PROTECTED] [ 33609] Give DynaLoader a non-dev version number. Affected files ... ... //depot/maint-5.10/perl/ext/DynaLoader/DynaLoader_pm.PL#2 integrate Differences ... //depot/maint-5.10/perl/ext/DynaLoader/DynaLoader_pm.PL#2 (text) Index: perl/ext/DynaLoader/DynaLoader_pm.PL --- perl/ext/DynaLoader/DynaLoader_pm.PL#1~32694~ 2007-12-22 01:23:09.0 -0800 +++ perl/ext/DynaLoader/DynaLoader_pm.PL2008-03-31 09:04:00.0 -0700 @@ -85,7 +85,7 @@ # [EMAIL PROTECTED], August 1994 BEGIN { -$VERSION = '1.08'; +$VERSION = '1.09'; } require AutoLoader; @@ -109,14 +109,19 @@ sub dl_load_flags { 0x00 } -# ($dl_dlext, $dlsrc) -# = @Config::Config{'dlext', 'dlsrc'}; EOT -$dl_dlext = $Config::Config{'dlext'}; -$dl_so = $Config::Config{'so'}; -print OUT (\$dl_dlext, \$dlsrc) = ('$dl_dlext', , - to_string($Config::Config{'dlsrc'}), )\n;; +if ($ENV{PERL_BUILD_EXPAND_CONFIG_VARS}) { +print OUT (\$dl_dlext, \$dl_so, \$dlsrc) = (, + to_string($Config{'dlext'}), ,, + to_string($Config{'so'}), ,, + to_string($Config{'dlsrc'}), )\n; ; +} +else { +print OUT 'EOT'; +($dl_dlext, $dl_so, $dlsrc) = @Config::Config{qw(dlext so dlsrc)}; +EOT +} print OUT expand_os_specific('EOT'); @@ -310,8 +315,8 @@ my $modpname = join($^O-eq-MacOS':'|$^O-eq-MacOS'/'/$^O-eq-MacOS,@modparts); print STDERR DynaLoader::bootstrap for $module , - $^O-eq-MacOS (:auto:$modpname:$modfname.=$dl_dlext)\n - |$^O-eq-MacOS(auto/$modpname/$modfname.=$dl_dlext)\n/$^O-eq-MacOS + $^O-eq-MacOS (:auto:$modpname:$modfname.$dl_dlext)\n + |$^O-eq-MacOS(auto/$modpname/$modfname.$dl_dlext)\n/$^O-eq-MacOS if $dl_debug; foreach (@INC) { @@ -330,7 +335,7 @@ next unless -d $dir; # skip over uninteresting directories # check for common cases to avoid autoload of dl_findfile - my $try = $^O-eq-MacOS $dir:$modfname.=$dl_dlext |$^O-eq-MacOS $dir/$modfname.=$dl_dlext/$^O-eq-MacOS; + my $try = $^O-eq-MacOS $dir:$modfname.$dl_dlext |$^O-eq-MacOS $dir/$modfname.$dl_dlext/$^O-eq-MacOS; last if $file = $^O-eq-VMS($do_expand) ? dl_expandspec($try) : ((-f $try) $try); |$^O-eq-VMS(-f $try) $try; /$^O-eq-VMS @@ -492,13 +497,13 @@ my(@names, $name);# what filenames to look for if (m:-l: ) { # convert -lname to appropriate library name s/-l//; -push(@names,lib$_.=$dl_so); +push(@names,lib$_.$dl_so); push(@names,lib$_.a); } else {# Umm, a bare name. Try various alternatives: # these should be ordered with the most likely first -push(@names,$_.=$dl_dlext)unless m/\.=$dl_dlext$/o; -push(@names,$_.=$dl_so) unless m/\.=$dl_so$/o; -push(@names,lib$_.=$dl_so) unless m:/:; +push(@names,$_.$dl_dlext)unless m/\.$dl_dlext$/o; +push(@names,$_.$dl_so) unless m/\.$dl_so$/o; +push(@names,lib$_.$dl_so) unless m:/:; push(@names,$_.a) if !m/\.a$/ and $dlsrc eq dl_dld.xs; push(@names, $_); } End of Patch.
Change 33614: Affected files ...
Change 33614 by [EMAIL PROTECTED] on 2008/03/31 16:59:07 Affected files ... ... //depot/maint-5.10/perl/av.c#3 integrate ... //depot/maint-5.10/perl/dump.c#6 integrate ... //depot/maint-5.10/perl/perl.c#7 integrate ... //depot/maint-5.10/perl/perlio.c#5 integrate ... //depot/maint-5.10/perl/pp_pack.c#4 integrate ... //depot/maint-5.10/perl/sv.c#9 integrate ... //depot/maint-5.10/perl/t/op/pack.t#2 integrate ... //depot/maint-5.10/perl/t/run/switches.t#2 integrate ... //depot/maint-5.10/perl/util.c#4 integrate Differences ... //depot/maint-5.10/perl/av.c#3 (text) Index: perl/av.c --- perl/av.c#2~33139~ 2008-01-30 15:19:42.0 -0800 +++ perl/av.c 2008-03-31 09:59:07.0 -0700 @@ -433,7 +433,7 @@ /* Give any tie a chance to cleanup first */ if (SvRMAGICAL(av)) { const MAGIC* const mg = SvMAGIC(av); - if (PL_delaymagic mg-mg_type == PERL_MAGIC_isa) + if (PL_delaymagic mg mg-mg_type == PERL_MAGIC_isa) PL_delaymagic |= DM_ARRAY; else mg_clear((SV*)av); //depot/maint-5.10/perl/dump.c#6 (text) Index: perl/dump.c --- perl/dump.c#5~33149~2008-01-31 03:43:05.0 -0800 +++ perl/dump.c 2008-03-31 09:59:07.0 -0700 @@ -1188,7 +1188,7 @@ { PERL_MAGIC_qr, qr(r) }, { PERL_MAGIC_sigelem,sigelem(s) }, { PERL_MAGIC_taint, taint(t) }, - { PERL_MAGIC_uvar_elem, uvar_elem(v) }, + { PERL_MAGIC_uvar_elem, uvar_elem(u) }, { PERL_MAGIC_vec,vec(v) }, { PERL_MAGIC_vstring,vstring(V) }, { PERL_MAGIC_utf8, utf8(w) }, //depot/maint-5.10/perl/perl.c#7 (text) Index: perl/perl.c --- perl/perl.c#6~33611~2008-03-31 05:32:56.0 -0700 +++ perl/perl.c 2008-03-31 09:59:07.0 -0700 @@ -1128,18 +1128,11 @@ } /* Now absolutely destruct everything, somehow or other, loops or no. */ -SvFLAGS(PL_fdpid) |= SVTYPEMASK; /* don't clean out pid table now */ -SvFLAGS(PL_strtab) |= SVTYPEMASK; /* don't clean out strtab now */ /* the 2 is for PL_fdpid and PL_strtab */ -while (PL_sv_count 2 sv_clean_all()) +while (sv_clean_all() 2) ; -SvFLAGS(PL_fdpid) = ~SVTYPEMASK; -SvFLAGS(PL_fdpid) |= SVt_PVAV; -SvFLAGS(PL_strtab) = ~SVTYPEMASK; -SvFLAGS(PL_strtab) |= SVt_PVHV; - AvREAL_off(PL_fdpid); /* no surviving entries */ SvREFCNT_dec(PL_fdpid);/* needed in io_close() */ PL_fdpid = NULL; @@ -1371,10 +1364,17 @@ */ const char * const s = PerlEnv_getenv(PERL_DESTRUCT_LEVEL); if (!s || atoi(s) == 0) { + const U32 old_debug = PL_debug; /* Emulate the PerlHost behaviour of free()ing all memory allocated in this thread at thread exit. */ + if (DEBUG_m_TEST) { + PerlIO_puts(Perl_debug_log, Disabling memory debugging as we + free this thread's memory\n); + PL_debug = ~ DEBUG_m_FLAG; + } while(aTHXx-Imemory_debug_header.next != (aTHXx-Imemory_debug_header)) safesysfree(sTHX + (char *)(aTHXx-Imemory_debug_header.next)); + PL_debug = old_debug; } } #endif @@ -2981,6 +2981,7 @@ { dVAR; UV rschar; +const char option = *s; /* used to remember option in -m/-M code */ switch (*s) { case '0': @@ -3178,6 +3179,7 @@ const char *end; SV *sv; const char *use = use ; + bool colon = FALSE; /* -M-foo == 'no foo' */ /* Leading space on no is deliberate, to make both possibilities the same length. */ @@ -3185,19 +3187,30 @@ sv = newSVpvn(use,4); start = s; /* We allow -M'Module qw(Foo Bar)' */ - while(isALNUM(*s) || *s==':') ++s; + while(isALNUM(*s) || *s==':') { + if( *s++ == ':' ) { + if( *s == ':' ) + s++; + else + colon = TRUE; + } + } + if (s == start) + Perl_croak(aTHX_ Module name required with -%c option, + option); + if (colon) + Perl_croak(aTHX_ Invalid module name %.*s with -%c option: + contains single ':', + s - start, start, option); end = s + strlen(s); if (*s != '=') { sv_catpvn(sv, start, end - start); - if (*(start-1) == 'm') { + if (option == 'm') { if (*s != '\0') Perl_croak(aTHX_ Can't use '%c' after -mname, *s); sv_catpvs( sv, ()); } } else { -if (s == start) -
Re: Change 33614: Affected files ...
On Mon, Mar 31, 2008 at 10:00:05AM -0700, Nicholas Clark wrote: Change 33614 by [EMAIL PROTECTED] on 2008/03/31 16:59:07 Affected files ... Ooh. That's not right. It should say: Integrate: [ 33239] in unpack, () groups in scalar context were still returning a list, resulting in garbage on the stack, which could manifest as a SEGV (Bug 50256) [ 33296] Subject: [PATCH] Unused var in perlio.c (revised) From: Jerry D. Hedden [EMAIL PROTECTED] Date: Tue, 12 Feb 2008 10:00:18 -0500 Message-ID: [EMAIL PROTECTED] [ 33301] Subject: [PATCH] PERL_MAGIC_uvar_elem should be 'u' in dump.c From: Vincent Pit [EMAIL PROTECTED] Date: Wed, 13 Feb 2008 11:10:11 +0100 (CET) Message-ID: [EMAIL PROTECTED] [ 4] Enable caching of strxfrm() results also for readonly SVs as returned e.g. by keys %hash. This speeds up sorting of lots of hash keys significantly. See also: Subject: Slowdown of sort keys %hash under use locale From: Marcus Holland-Moritz [EMAIL PROTECTED] Date: Fri, 15 Feb 2008 17:00:15 +0100 Message-ID: [EMAIL PROTECTED] [ 33388] Do the memory debug header fixup earlier to avoid valgrind screaming under -Dm. Also, temporarily disable memory logging during thread memory freeing, as otherwise we try to log using memory we already freed. [ 33407] Subject: [PATCH] for -M:Foo, extended and revised From: Robin Barker [EMAIL PROTECTED] Date: Wed, 27 Feb 2008 19:19:54 - Message-ID: [EMAIL PROTECTED] [ 33408] Subject: Re: interrupting system() with signal depends on signal handler From: Steffen Ullrich [EMAIL PROTECTED] Date: Tue, 26 Feb 2008 19:43:00 +0100 Message-ID: [EMAIL PROTECTED] [ 33495] Subject: [perl #51636] segmentation fault with array ties From: [EMAIL PROTECTED] (via RT) [EMAIL PROTECTED] Date: Wed, 12 Mar 2008 02:59:45 -0700 Message-ID: [EMAIL PROTECTED] [ 33595] Subject: [PATCH] do not use SVTYPEMASK to prevent cleaning of PL_fdpid and PL_strtab From: Gerard Goossen [EMAIL PROTECTED] Message-ID: [EMAIL PROTECTED] Date: Wed, 26 Mar 2008 14:07:13 +0100 [ 33596] Fix compiler warning about comparison of pointer types. It now does. It always did. We thank Big Brother for raising the chocolate ration to 20g. Nicholas Clark
Change 33615: Integrate:
Change 33615 by [EMAIL PROTECTED] on 2008/03/31 18:01:17 Integrate: [ 33244] corelist changes: - Add a new -d option to find first perl version by date and not by version number - Better handling of perl versions that end with a 0 - use version.pm only for version numbers that have multiple dots [ 33503] Regexp::DESTROY was only added in 5.8.1 Affected files ... ... //depot/maint-5.10/perl/ext/Opcode/Safe.pm#5 integrate ... //depot/maint-5.10/perl/lib/Module/CoreList.pm#3 integrate ... //depot/maint-5.10/perl/lib/Module/CoreList/bin/corelist#2 integrate Differences ... //depot/maint-5.10/perl/ext/Opcode/Safe.pm#5 (text) Index: perl/ext/Opcode/Safe.pm --- perl/ext/Opcode/Safe.pm#4~33171~2008-02-01 10:17:03.0 -0800 +++ perl/ext/Opcode/Safe.pm 2008-03-31 11:01:17.0 -0700 @@ -3,7 +3,7 @@ use 5.003_11; use strict; -$Safe::VERSION = 2.15; +$Safe::VERSION = 2.16; # *** Don't declare any lexicals above this point *** # @@ -46,7 +46,6 @@ my $default_share = [qw[ *_ PerlIO::get_layers -Regexp::DESTROY UNIVERSAL::isa UNIVERSAL::can UNIVERSAL::VERSION @@ -58,7 +57,9 @@ utf8::downgrade utf8::native_to_unicode utf8::unicode_to_native -], ($] = 5.010 qw[ +], ($] = 5.008001 qw[ +Regexp::DESTROY +]), ($] = 5.010 qw[ re::is_regexp re::regname re::regnames //depot/maint-5.10/perl/lib/Module/CoreList.pm#3 (text) Index: perl/lib/Module/CoreList.pm --- perl/lib/Module/CoreList.pm#2~33140~2008-01-30 15:41:49.0 -0800 +++ perl/lib/Module/CoreList.pm 2008-03-31 11:01:17.0 -0700 @@ -1,7 +1,7 @@ package Module::CoreList; use strict; use vars qw/$VERSION %released %patchlevel %version %families/; -$VERSION = '2.13'; +$VERSION = '2.14'; =head1 NAME @@ -138,6 +138,11 @@ return sort keys %mods } +sub find_version { +my ($class, $v) = @_; +return $version{$v} if defined $version{$v}; +return undef; +} # when things escaped %released = ( //depot/maint-5.10/perl/lib/Module/CoreList/bin/corelist#2 (text) Index: perl/lib/Module/CoreList/bin/corelist --- perl/lib/Module/CoreList/bin/corelist#1~32694~ 2007-12-22 01:23:09.0 -0800 +++ perl/lib/Module/CoreList/bin/corelist 2008-03-31 11:01:17.0 -0700 @@ -11,14 +11,14 @@ =head1 SYNOPSIS corelist -v -corelist [-a] ModuleName | /ModuleRegex/ [ModuleVersion] ... +corelist [-a|-d] ModuleName | /ModuleRegex/ [ModuleVersion] ... corelist [-v PerlVersion] [ ModuleName | /ModuleRegex/ ] ... =head1 OPTIONS =over -=item -a modulename +=item -a lists all versions of the given module (or the matching modules, in case you used a module regexp) in the perls Module::CoreList knows about. @@ -44,6 +44,11 @@ 5.009002 1.04 5.009003 1.06 +=item -d + +finds the first perl version where a module has been released by +date, and not by version number (as is the default). + =item -? or -help help! help! help! to see more help, try --man. @@ -79,7 +84,7 @@ my %Opts; -GetOptions(\%Opts, qw[ help|?! man! v|version:f a! ] ); +GetOptions(\%Opts, qw[ help|?! man! v|version:f a! d ] ); pod2usage(1) if $Opts{help}; pod2usage(-verbose=2) if $Opts{man}; @@ -93,15 +98,16 @@ } $Opts{v} = numify_version( $Opts{v} ); -if( !exists $Module::CoreList::version{$Opts{v}} ) { +my $version_hash = Module::CoreList-find_version($Opts{v}); +if( !$version_hash ) { print \nModule::CoreList has no info on perl v$Opts{v}\n\n; exit 1; } if ( [EMAIL PROTECTED] ) { print \nThe following modules were in perl v$Opts{v} CORE\n; - print $_ , $Module::CoreList::version{$Opts{v}}{$_} || ,\n - for sort keys %{$Module::CoreList::version{$Opts{v}}}; + print $_ , $version_hash-{$_} || ,\n + for sort keys %$version_hash; print \n; exit 0; } @@ -149,12 +155,17 @@ my($mod,$ver) = @_; if ( $Opts{v} ) { -return printf %-24s %-10s\n, -$mod, -$Module::CoreList::version{$Opts{v}}{$mod} || 'undef'; + my $version_hash = Module::CoreList-find_version($Opts{v}); + if ($version_hash) { + print $mod, , $version_hash-{$mod} || 'undef', \n; + return; + } + else { die Shouldn't happen } } -my $ret = Module::CoreList-first_release(@_); +my $ret = $Opts{d} + ? Module::CoreList-first_release_by_date(@_) + : Module::CoreList-first_release(@_); my $msg = $mod; $msg .= $ver if $ver; @@ -184,13 +195,12 @@ sub numify_version { my $ver = shift; -if ( index( $ver, q{.}, index( $ver, q{.} ) ) = 0 ) { - eval { require version }; - if ($@) { - die You need to install version.pm to use dotted version numbers\n; - } +if ($ver =~ /\..+\./) { +
Change 33616: Correct the formatting of one line of the Changes file, so that
Change 33616 by [EMAIL PROTECTED] on 2008/03/31 19:04:22 Correct the formatting of one line of the Changes file, so that Porting/checkAUTHROS.pl can parse it. Affected files ... ... //depot/maint-5.10/perl/Changes#5 edit Differences ... //depot/maint-5.10/perl/Changes#5 (text) Index: perl/Changes --- perl/Changes#4~33549~ 2008-03-21 13:25:35.0 -0700 +++ perl/Changes2008-03-31 12:04:22.0 -0700 @@ -1571,8 +1571,7 @@ ! ext/Opcode/Safe.pm ext/Safe/t/safe3.t [ 33111] By: nicholas on 2008/01/29 19:03:04 - -Integrate: + Log: Integrate: [ 32651] Upgrade to B-Lint-1.11 End of Patch.
Change 33617: Integrate:
Change 33617 by [EMAIL PROTECTED] on 2008/03/31 19:23:09 Integrate: [ 33260] I've been maintaining Net::Ping for a while now. [ 33295] Make sure we only find the macro we were looking for, not something that only starts with the same string. [ 33303] Jerry D. Hedden now maintains Thread::Semaphore on CPAN [ 33352] Subject: [patch] Porting/expand-macros.pl gets 'indent'ing From: Jim Cromie [EMAIL PROTECTED] Message-ID: [EMAIL PROTECTED] Date: Thu, 07 Feb 2008 17:03:22 -0700 [ 33353] Take advantage of the fact that we can use indent as a stdin/stdout filter to reduce its workload (and ours) by only sending it the 3 or so lines that we are interested in printing, not the preceding bucket loads. [ 33456] Subject: checkAUTHORS.pl update for me From: Michael G Schwern [EMAIL PROTECTED] Date: Sun, 09 Mar 2008 00:35:48 +0100 Message-ID: [EMAIL PROTECTED] Affected files ... ... //depot/maint-5.10/perl/Porting/Maintainers.pl#6 integrate ... //depot/maint-5.10/perl/Porting/checkAUTHORS.pl#2 integrate ... //depot/maint-5.10/perl/Porting/expand-macro.pl#2 integrate Differences ... //depot/maint-5.10/perl/Porting/Maintainers.pl#6 (text) Index: perl/Porting/Maintainers.pl --- perl/Porting/Maintainers.pl#5~33524~2008-03-14 02:37:22.0 -0700 +++ perl/Porting/Maintainers.pl 2008-03-31 12:23:09.0 -0700 @@ -17,7 +17,6 @@ 'arandal' = 'Allison Randal [EMAIL PROTECTED]', 'audreyt' = 'Audrey Tang [EMAIL PROTECTED]', 'avar' = 'Ævar Arnfjörð Bjarmason [EMAIL PROTECTED]', - 'bbb' = 'Rob Brown [EMAIL PROTECTED]', 'craig' = 'Craig Berry [EMAIL PROTECTED]', 'dankogai' = 'Dan Kogai [EMAIL PROTECTED]', 'dconway' = 'Damian Conway [EMAIL PROTECTED]', @@ -70,6 +69,7 @@ 'sburke'= 'Sean Burke [EMAIL PROTECTED]', 'mschwern' = 'Michael Schwern [EMAIL PROTECTED]', 'smccam'= 'Stephen McCamant [EMAIL PROTECTED]', + 'smpeters' = 'Steve Peters [EMAIL PROTECTED]', 'smueller' = 'Steffen Mueller [EMAIL PROTECTED]', 'tels' = 'Tels [EMAIL PROTECTED]', 'tomhughes' = 'Tom Hughes [EMAIL PROTECTED]', @@ -618,7 +618,7 @@ 'Net::Ping' = { - 'MAINTAINER'= 'bbb', + 'MAINTAINER'= 'smpeters', 'FILES' = q[lib/Net/Ping.pm lib/Net/Ping], 'CPAN' = 1, }, //depot/maint-5.10/perl/Porting/checkAUTHORS.pl#2 (text) Index: perl/Porting/checkAUTHORS.pl --- perl/Porting/checkAUTHORS.pl#1~32694~ 2007-12-22 01:23:09.0 -0800 +++ perl/Porting/checkAUTHORS.pl2008-03-31 12:23:09.0 -0700 @@ -436,6 +436,9 @@ schubiger\100cpan.org steven\100accognoscere.org + sts\100accognoscere.org schwern\100pobox.comschwern\100gmail.com ++ schwern\100athens.arena-i.com ++ schwern\100blackrider.aocn.com ++ schwern\100ool-18b93024.dyn.optonline.net sebastien\100aperghis.net maddingue\100free.fr + saper\100cpan.org simon\100simon-cozens.org simon\100pembro4.pmb.ox.ac.uk //depot/maint-5.10/perl/Porting/expand-macro.pl#2 (text) Index: perl/Porting/expand-macro.pl --- perl/Porting/expand-macro.pl#1~33117~ 2008-01-29 15:38:53.0 -0800 +++ perl/Porting/expand-macro.pl2008-03-31 12:23:09.0 -0700 @@ -1,16 +1,37 @@ #!perl -w use strict; +use Getopt::Std; + use vars qw($trysource $tryout $sentinel); $trysource = try.c; $tryout = try.i; +getopts('fF:ekvI:', \my %opt) or usage(); + +sub usage { +dieEO_HELP; [EMAIL PROTECTED]; +usage: $0 [options] macro-name [headers] +options: +-f use 'indent' to format output +-F tool use tool to format output (instead of -f) +-e erase try.[ic] instead of failing when theyre present (errdetect) +-k keep them after generating (for handy inspection) +-v verbose +-I indent-opts passed into indent +EO_HELP +} + my $macro = shift; -die $0 macro [headers] unless defined $macro; +usage missing macro-name unless defined $macro; $sentinel = $macro expands to; +usage -f and -F tool are exclusive\n if $opt{f} and $opt{F}; + foreach($trysource, $tryout) { +unlink $_ if $opt{e}; die You already have a $_ if -e $_; } @@ -23,16 +44,20 @@ my $args = ''; +my $found_macro; while () { -next unless /^#\s*define\s+$macro/; +next unless /^#\s*define\s+$macro\b/; my
Change 33618: [PATCH] Double magic with substr
Change 33618 by [EMAIL PROTECTED] on 2008/03/31 19:48:26 Subject: [PATCH] Double magic with substr From: Vincent Pit [EMAIL PROTECTED] Date: Mon, 31 Mar 2008 19:05:44 +0200 Message-ID: [EMAIL PROTECTED] Affected files ... ... //depot/perl/embed.fnc#607 edit ... //depot/perl/embed.h#754 edit ... //depot/perl/global.sym#353 edit ... //depot/perl/pod/perlapi.pod#330 edit ... //depot/perl/pp.c#626 edit ... //depot/perl/proto.h#942 edit ... //depot/perl/sv.c#1532 edit Differences ... //depot/perl/embed.fnc#607 (text) Index: perl/embed.fnc --- perl/embed.fnc#606~33563~ 2008-03-25 04:36:22.0 -0700 +++ perl/embed.fnc 2008-03-31 12:48:26.0 -0700 @@ -884,6 +884,8 @@ Apd|void |sv_inc |NULLOK SV *const sv Apd|void |sv_insert |NN SV *const bigstr|const STRLEN offset|const STRLEN len \ |NN const char *const little|const STRLEN littlelen +Apd|void |sv_insert_flags|NN SV *const bigstr|const STRLEN offset|const STRLEN len \ + |NN const char *const little|const STRLEN littlelen|const U32 flags Apd|int|sv_isa |NULLOK SV* sv|NN const char *const name Apd|int|sv_isobject|NULLOK SV* sv Apd|STRLEN |sv_len |NULLOK SV *const sv //depot/perl/embed.h#754 (text+w) Index: perl/embed.h --- perl/embed.h#753~33389~ 2008-02-27 11:10:02.0 -0800 +++ perl/embed.h2008-03-31 12:48:26.0 -0700 @@ -886,6 +886,7 @@ #define sv_growPerl_sv_grow #define sv_inc Perl_sv_inc #define sv_insert Perl_sv_insert +#define sv_insert_flagsPerl_sv_insert_flags #define sv_isa Perl_sv_isa #define sv_isobjectPerl_sv_isobject #define sv_len Perl_sv_len @@ -3188,6 +3189,7 @@ #define sv_grow(a,b) Perl_sv_grow(aTHX_ a,b) #define sv_inc(a) Perl_sv_inc(aTHX_ a) #define sv_insert(a,b,c,d,e) Perl_sv_insert(aTHX_ a,b,c,d,e) +#define sv_insert_flags(a,b,c,d,e,f) Perl_sv_insert_flags(aTHX_ a,b,c,d,e,f) #define sv_isa(a,b)Perl_sv_isa(aTHX_ a,b) #define sv_isobject(a) Perl_sv_isobject(aTHX_ a) #define sv_len(a) Perl_sv_len(aTHX_ a) //depot/perl/global.sym#353 (text+w) Index: perl/global.sym --- perl/global.sym#352~33083~ 2008-01-28 02:02:24.0 -0800 +++ perl/global.sym 2008-03-31 12:48:26.0 -0700 @@ -523,6 +523,7 @@ Perl_sv_grow Perl_sv_inc Perl_sv_insert +Perl_sv_insert_flags Perl_sv_isa Perl_sv_isobject Perl_sv_len //depot/perl/pod/perlapi.pod#330 (text+w) Index: perl/pod/perlapi.pod --- perl/pod/perlapi.pod#329~33507~ 2008-03-13 07:35:58.0 -0700 +++ perl/pod/perlapi.pod2008-03-31 12:48:26.0 -0700 @@ -5755,13 +5755,23 @@ Xsv_insert Inserts a string at the specified offset/length within the SV. Similar to -the Perl substr() function. +the Perl substr() function. Handles get magic. voidsv_insert(SV *const bigstr, const STRLEN offset, const STRLEN len, const char *const little, const STRLEN littlelen) =for hackers Found in file sv.c +=item sv_insert_flags +Xsv_insert_flags + +Same as Csv_insert, but the extra Cflags are passed the CSvPV_force_flags that applies to Cbigstr. + + voidsv_insert_flags(SV *const bigstr, const STRLEN offset, const STRLEN len, const char *const little, const STRLEN littlelen, const U32 flags) + +=for hackers +Found in file sv.c + =item sv_isa Xsv_isa //depot/perl/pp.c#626 (text) Index: perl/pp.c --- perl/pp.c#625~33560~2008-03-25 02:52:27.0 -0700 +++ perl/pp.c 2008-03-31 12:48:26.0 -0700 @@ -3180,7 +3180,7 @@ } if (!SvOK(sv)) sv_setpvs(sv, ); - sv_insert(sv, pos, rem, repl, repl_len); + sv_insert_flags(sv, pos, rem, repl, repl_len, 0); if (repl_is_utf8) SvUTF8_on(sv); if (repl_sv_copy) //depot/perl/proto.h#942 (text+w) Index: perl/proto.h --- perl/proto.h#941~33563~ 2008-03-25 04:36:22.0 -0700 +++ perl/proto.h2008-03-31 12:48:26.0 -0700 @@ -3185,6 +3185,12 @@ #define PERL_ARGS_ASSERT_SV_INSERT \ assert(bigstr); assert(little) +PERL_CALLCONV void Perl_sv_insert_flags(pTHX_ SV *const bigstr, const STRLEN offset, const STRLEN len, const char *const little, const STRLEN littlelen, const U32 flags) + __attribute__nonnull__(pTHX_1) + __attribute__nonnull__(pTHX_4); +#define PERL_ARGS_ASSERT_SV_INSERT_FLAGS \ + assert(bigstr); assert(little) + PERL_CALLCONV int Perl_sv_isa(pTHX_ SV* sv, const char *const name) __attribute__nonnull__(pTHX_2); #define PERL_ARGS_ASSERT_SV_ISA\ //depot/perl/sv.c#1532 (text) Index: perl/sv.c
Change 33619: Integrate:
Change 33619 by [EMAIL PROTECTED] on 2008/03/31 21:36:46 Integrate: [ 33326] Subject: [PATCH] Don't install threads files on non-threaded Perls From: Jerry D. Hedden [EMAIL PROTECTED] Date: Fri, 15 Feb 2008 11:02:54 -0500 Message-ID: [EMAIL PROTECTED] [ 33358] Subject: [PATCH] Revert change 33326 From: Jerry D. Hedden [EMAIL PROTECTED] Date: Fri, 22 Feb 2008 16:21:14 -0500 Message-ID: [EMAIL PROTECTED] Affected files ... ... //depot/maint-5.10/perl/installperl#4 integrate Differences ... End of Patch.
Change 33620: update perl5101delta.pod
Change 33620 by [EMAIL PROTECTED] on 2008/03/31 21:51:46 update perl5101delta.pod Affected files ... ... //depot/maint-5.10/perl/pod/perl5101delta.pod#2 edit Differences ... //depot/maint-5.10/perl/pod/perl5101delta.pod#2 (text) Index: perl/pod/perl5101delta.pod --- perl/pod/perl5101delta.pod#1~32697~ 2007-12-22 02:26:16.0 -0800 +++ perl/pod/perl5101delta.pod 2008-03-31 14:51:46.0 -0700 @@ -13,10 +13,33 @@ =head1 Incompatible Changes +=over + +=item * + +The semantics of Cuse feature :5.10* have changes slightly. +See LModules and Pragmata for more information. + +=back + + =head1 Core Enhancements =head1 Modules and Pragmata +=over + +=item * + +Cfeature the meaning of the C:5.10 and C:5.10.X bundles has +changed slightly. The last component, if any (ie CX) is simply ignored. +This is predicated on the assumption that new features will not, in +general, be added to maintenance releases. So C:5.10 and C:5.10.X +have identical effect. This is a change to the behaviour documented for +5.10.0. + +=back + =head1 Utility Changes =head1 Documentation End of Patch.
Change 33621: $VERSION++ for all the non-dual life modules in ext/ that
Change 33621 by [EMAIL PROTECTED] on 2008/03/31 22:25:19 $VERSION++ for all the non-dual life modules in ext/ that Porting/cmpVERSION.pl reports differ from the 5.10.0 release. Affected files ... ... //depot/perl/ext/B/B/Concise.pm#79 edit ... //depot/perl/ext/Devel/DProf/DProf.pm#17 edit ... //depot/perl/ext/Devel/Peek/Peek.pm#22 edit ... //depot/perl/ext/POSIX/POSIX.pm#53 edit ... //depot/perl/ext/PerlIO/encoding/encoding.pm#17 edit ... //depot/perl/ext/PerlIO/scalar/scalar.pm#9 edit ... //depot/perl/ext/PerlIO/via/via.pm#8 edit ... //depot/perl/ext/Socket/Socket.pm#34 edit Differences ... //depot/perl/ext/B/B/Concise.pm#79 (text) Index: perl/ext/B/B/Concise.pm --- perl/ext/B/B/Concise.pm#78~32734~ 2007-12-26 09:03:56.0 -0800 +++ perl/ext/B/B/Concise.pm 2008-03-31 15:25:19.0 -0700 @@ -14,7 +14,7 @@ use Exporter (); # use #5 -our $VERSION = 0.74; +our $VERSION = 0.75; our @ISA = qw(Exporter); our @EXPORT_OK = qw( set_style set_style_standard add_callback concise_subref concise_cv concise_main //depot/perl/ext/Devel/DProf/DProf.pm#17 (text) Index: perl/ext/Devel/DProf/DProf.pm --- perl/ext/Devel/DProf/DProf.pm#16~27620~ 2006-03-28 03:18:52.0 -0800 +++ perl/ext/Devel/DProf/DProf.pm 2008-03-31 15:25:19.0 -0700 @@ -230,7 +230,7 @@ use XSLoader (); -$Devel::DProf::VERSION = '20050603.00'; # this version not authorized by +$Devel::DProf::VERSION = '20080331.00'; # this version not authorized by # Dean Roehrich. See Changes file. XSLoader::load 'Devel::DProf', $Devel::DProf::VERSION; //depot/perl/ext/Devel/Peek/Peek.pm#22 (text) Index: perl/ext/Devel/Peek/Peek.pm --- perl/ext/Devel/Peek/Peek.pm#21~24248~ 2005-04-19 02:55:51.0 -0700 +++ perl/ext/Devel/Peek/Peek.pm 2008-03-31 15:25:19.0 -0700 @@ -3,7 +3,7 @@ package Devel::Peek; -$VERSION = '1.03'; +$VERSION = '1.04'; $XS_VERSION = $VERSION; $VERSION = eval $VERSION; //depot/perl/ext/POSIX/POSIX.pm#53 (text) Index: perl/ext/POSIX/POSIX.pm --- perl/ext/POSIX/POSIX.pm#52~30590~ 2007-03-15 02:35:14.0 -0700 +++ perl/ext/POSIX/POSIX.pm 2008-03-31 15:25:19.0 -0700 @@ -4,7 +4,7 @@ our(@ISA, %EXPORT_TAGS, @EXPORT_OK, @EXPORT, $AUTOLOAD, %SIGRT) = (); -our $VERSION = 1.13; +our $VERSION = 1.14; use AutoLoader; //depot/perl/ext/PerlIO/encoding/encoding.pm#17 (text) Index: perl/ext/PerlIO/encoding/encoding.pm --- perl/ext/PerlIO/encoding/encoding.pm#16~30213~ 2007-02-11 09:13:44.0 -0800 +++ perl/ext/PerlIO/encoding/encoding.pm2008-03-31 15:25:19.0 -0700 @@ -1,7 +1,7 @@ package PerlIO::encoding; use strict; -our $VERSION = '0.10'; +our $VERSION = '0.11'; our $DEBUG = 0; $DEBUG and warn __PACKAGE__, called by , join(, , caller), \n; //depot/perl/ext/PerlIO/scalar/scalar.pm#9 (text) Index: perl/ext/PerlIO/scalar/scalar.pm --- perl/ext/PerlIO/scalar/scalar.pm#8~28799~ 2006-09-07 04:46:40.0 -0700 +++ perl/ext/PerlIO/scalar/scalar.pm2008-03-31 15:25:19.0 -0700 @@ -1,5 +1,5 @@ package PerlIO::scalar; -our $VERSION = '0.05'; +our $VERSION = '0.06'; use XSLoader (); XSLoader::load 'PerlIO::scalar'; 1; //depot/perl/ext/PerlIO/via/via.pm#8 (text) Index: perl/ext/PerlIO/via/via.pm --- perl/ext/PerlIO/via/via.pm#7~29702~ 2007-01-05 10:30:52.0 -0800 +++ perl/ext/PerlIO/via/via.pm 2008-03-31 15:25:19.0 -0700 @@ -1,5 +1,5 @@ package PerlIO::via; -our $VERSION = '0.04'; +our $VERSION = '0.05'; use XSLoader (); XSLoader::load 'PerlIO::via'; 1; //depot/perl/ext/Socket/Socket.pm#34 (text) Index: perl/ext/Socket/Socket.pm --- perl/ext/Socket/Socket.pm#33~31581~ 2007-07-10 13:31:31.0 -0700 +++ perl/ext/Socket/Socket.pm 2008-03-31 15:25:19.0 -0700 @@ -1,7 +1,7 @@ package Socket; our($VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS); -$VERSION = 1.80; +$VERSION = 1.81; =head1 NAME End of Patch.
Change 33622: Fix bug in the code for --opened - it was not working on blead.
Change 33622 by [EMAIL PROTECTED] on 2008/03/31 22:33:36 Fix bug in the code for --opened - it was not working on blead. Affected files ... ... //depot/perl/Porting/Maintainers.pm#7 edit Differences ... //depot/perl/Porting/Maintainers.pm#7 (text) Index: perl/Porting/Maintainers.pm --- perl/Porting/Maintainers.pm#6~33193~2008-02-02 09:01:43.0 -0800 +++ perl/Porting/Maintainers.pm 2008-03-31 15:33:36.0 -0700 @@ -107,9 +107,12 @@ my @Files; if ($Opened) { - my @raw = `p4 opened`; + @Files = `p4 opened`; die if $?; - @Files = map {s!#.*!!s; s!^//depot/.*?/perl/!!; $_} @raw; + foreach (@Files) { + s!#.*!!s; + s!^//depot/(?:perl|.*?/perl)/!!; + } } else { @Files = @ARGV; } End of Patch.
Change 33623: $VERSION++ for all the non-dual life modules outside ext/ that
Change 33623 by [EMAIL PROTECTED] on 2008/03/31 23:08:45 $VERSION++ for all the non-dual life modules outside ext/ that Porting/cmpVERSION.pl reports differ from the 5.10.0 release. All the rest of the differences would seem to be dual-life. :-( Affected files ... ... //depot/perl/Porting/Maintainers.pm#8 edit ... //depot/perl/lib/ExtUtils/Embed.pm#34 edit ... //depot/perl/lib/File/Basename.pm#46 edit ... //depot/perl/lib/File/Find.pm#94 edit ... //depot/perl/os2/OS2/REXX/REXX.pm#13 edit Differences ... //depot/perl/Porting/Maintainers.pm#8 (text) Index: perl/Porting/Maintainers.pm --- perl/Porting/Maintainers.pm#7~33622~2008-03-31 15:33:36.0 -0700 +++ perl/Porting/Maintainers.pm 2008-03-31 16:08:45.0 -0700 @@ -14,11 +14,12 @@ require Maintainers.pl; use vars qw(%Modules %Maintainers); -use vars qw(@ISA @EXPORT_OK); +use vars qw(@ISA @EXPORT_OK $VERSION); @ISA = qw(Exporter); @EXPORT_OK = qw(%Modules %Maintainers get_module_files get_module_pat show_results process_options); +$VERSION = 0.02; require Exporter; use File::Find; //depot/perl/lib/ExtUtils/Embed.pm#34 (text) Index: perl/lib/ExtUtils/Embed.pm --- perl/lib/ExtUtils/Embed.pm#33~32883~2008-01-06 13:43:24.0 -0800 +++ perl/lib/ExtUtils/Embed.pm 2008-03-31 16:08:45.0 -0700 @@ -19,7 +19,7 @@ use strict; # This is not a dual-life module, so no need for development version numbers -$VERSION = '1.27'; +$VERSION = '1.28'; @ISA = qw(Exporter); @EXPORT = qw(xsinit ldopts //depot/perl/lib/File/Basename.pm#46 (text) Index: perl/lib/File/Basename.pm --- perl/lib/File/Basename.pm#45~33402~ 2008-03-01 03:20:20.0 -0800 +++ perl/lib/File/Basename.pm 2008-03-31 16:08:45.0 -0700 @@ -54,7 +54,7 @@ require Exporter; @ISA = qw(Exporter); @EXPORT = qw(fileparse fileparse_set_fstype basename dirname); -$VERSION = 2.76; +$VERSION = 2.77; fileparse_set_fstype($^O); //depot/perl/lib/File/Find.pm#94 (text) Index: perl/lib/File/Find.pm --- perl/lib/File/Find.pm#93~3~ 2008-02-18 08:16:09.0 -0800 +++ perl/lib/File/Find.pm 2008-03-31 16:08:45.0 -0700 @@ -3,7 +3,7 @@ use strict; use warnings; use warnings::register; -our $VERSION = '1.12'; +our $VERSION = '1.13'; require Exporter; require Cwd; //depot/perl/os2/OS2/REXX/REXX.pm#13 (text) Index: perl/os2/OS2/REXX/REXX.pm --- perl/os2/OS2/REXX/REXX.pm#12~26804~ 2006-01-12 10:44:49.0 -0800 +++ perl/os2/OS2/REXX/REXX.pm 2008-03-31 16:08:45.0 -0700 @@ -11,7 +11,7 @@ # Other items we are prepared to export if requested @EXPORT_OK = qw(drop register); -$VERSION = '1.03'; +$VERSION = '1.04'; # We cannot just put OS2::DLL in @ISA, since some scripts would use # function interface, not method interface... End of Patch.