perl.perl5.changes

perl.perl5.changes http://www.nntp.perl.org/group/perl.perl5.changes/ ... Copyright 1998-2013 perl.org Sat, 25 May 2013 04:42:12 +0000 ask@perl.org [perl.git] branch blead, updated. v5.19.0-195-gb98b7dc by James Keenan In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/b98b7dc97e705b7a4410316cc3bc580b0b088b55?hp=2d3da5dff664249958bdf802dd9ac45f4b48be3a> - Log ----------------------------------------------------------------- commit b98b7dc97e705b7a4410316cc3bc580b0b088b55 Author: James E Keenan <jkeenan@cpan.org> Date: Sat May 25 05:22:23 2013 +0200 Bump $VERSION. M dist/Locale-Maketext/lib/Locale/Maketext.pm commit 2b1cd0ebb7e64c82e40b3fcf6f8fbc6349497614 Author: David Steinbrunner <dsteinbrunner@pobox.com> Date: Tue May 21 07:12:24 2013 -0400 typo fixes for Locale::Maketext M dist/Locale-Maketext/lib/Locale/Maketext.pm M dist/Locale-Maketext/lib/Locale/Maketext/TPJ13.pod ----------------------------------------------------------------------- Summary of changes: dist/Locale-Maketext/lib/Locale/Maketext.pm | 6 +++--- dist/Locale-Maketext/lib/Locale/Maketext/TPJ13.pod | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dist/Locale-Maketext/lib/Locale/Maketext.pm b/dist/Locale-Maketext/lib/Locale/Maketext.pm index 63e5fba..a21d679 100644 --- a/dist/Locale-Maketext/lib/Locale/Maketext.pm +++ b/dist/Locale-Maketext/lib/Locale/Maketext.pm @@ -27,7 +27,7 @@ BEGIN { } -$VERSION = '1.23'; +$VERSION = '1.24'; @ISA = (); $MATCH_SUPERS = 1; @@ -194,7 +194,7 @@ sub maketext { my($handle, $phrase) = splice(@_,0,2); Carp::confess('No handle/phrase') unless (defined($handle) && defined($phrase)); - # backup $@ in case it it's still being used in the calling code. + # backup $@ in case it's still being used in the calling code. # If no failures, we'll re-set it back to what it was later. my $at = $@; @@ -344,7 +344,7 @@ sub _langtag_munging { my($base_class, @languages) = @_; # We have all these DEBUG statements because otherwise it's hard as hell - # to diagnose ifwhen something goes wrong. + # to diagnose if/when something goes wrong. DEBUG and warn 'Lgs1: ', map("<$_>", @languages), "\n"; diff --git a/dist/Locale-Maketext/lib/Locale/Maketext/TPJ13.pod b/dist/Locale-Maketext/lib/Locale/Maketext/TPJ13.pod index b9586b2..8d3eae6 100644 --- a/dist/Locale-Maketext/lib/Locale/Maketext/TPJ13.pod +++ b/dist/Locale-Maketext/lib/Locale/Maketext/TPJ13.pod @@ -715,7 +715,7 @@ right tool for the job. However, other accidents of history have made Perl a well-accepted language for design of server-side programs (generally in CGI form) for Web site interfaces. Localization of static pages in Web sites is -trivial, feasable either with simple language-negotiation features in +trivial, feasible either with simple language-negotiation features in servers like Apache, or with some kind of server-side inclusions of language-appropriate text into layout templates. However, I think that the localization of Perl-based search systems (or other kinds of -- Perl5 Master Repository http://www.nntp.perl.org/group/perl.perl5.changes/2013/05/msg37231.html Sat, 25 May 2013 03:23:36 +0000 [perl.git] branch blead, updated. v5.19.0-193-g2d3da5d by James Keenan In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/2d3da5dff664249958bdf802dd9ac45f4b48be3a?hp=344b43a3ab9d4fa948543f8da3500baaccff34e0> - Log ----------------------------------------------------------------- commit 2d3da5dff664249958bdf802dd9ac45f4b48be3a Author: David Steinbrunner <dsteinbrunner@pobox.com> Date: Tue May 21 07:11:33 2013 -0400 typo fixes for Cwd Bump $VERSION. ----------------------------------------------------------------------- Summary of changes: dist/Cwd/Cwd.pm | 4 ++-- dist/Cwd/lib/File/Spec/VMS.pm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dist/Cwd/Cwd.pm b/dist/Cwd/Cwd.pm index 8886c67..5cbb9d8 100644 --- a/dist/Cwd/Cwd.pm +++ b/dist/Cwd/Cwd.pm @@ -171,7 +171,7 @@ use strict; use Exporter; use vars qw(@ISA @EXPORT @EXPORT_OK $VERSION); -$VERSION = '3.40'; +$VERSION = '3.41'; my $xs_version = $VERSION; $VERSION =~ tr/_//; @@ -343,7 +343,7 @@ foreach my $try ('/bin/pwd', } my $found_pwd_cmd = defined($pwd_cmd); unless ($pwd_cmd) { - # Isn't this wrong? _backtick_pwd() will fail if somenone has + # Isn't this wrong? _backtick_pwd() will fail if someone has # pwd in their path but it is not /bin/pwd or /usr/bin/pwd? # See [perl #16774]. --jhi $pwd_cmd = 'pwd'; diff --git a/dist/Cwd/lib/File/Spec/VMS.pm b/dist/Cwd/lib/File/Spec/VMS.pm index 6af1ac0..ce0dab7 100644 --- a/dist/Cwd/lib/File/Spec/VMS.pm +++ b/dist/Cwd/lib/File/Spec/VMS.pm @@ -4,7 +4,7 @@ use strict; use vars qw(@ISA $VERSION); require File::Spec::Unix; -$VERSION = '3.40'; +$VERSION = '3.41'; $VERSION =~ tr/_//; @ISA = qw(File::Spec::Unix); @@ -27,7 +27,7 @@ there. This package overrides the implementation of these methods, not the semantics. The default behavior is to allow either VMS or Unix syntax on input and to -return VMS syntax on output unless Unix syntax has been explicity requested +return VMS syntax on output unless Unix syntax has been explicitly requested via the C<DECC$FILENAME_UNIX_REPORT> CRTL feature. =over 4 -- Perl5 Master Repository http://www.nntp.perl.org/group/perl.perl5.changes/2013/05/msg37230.html Sat, 25 May 2013 03:20:27 +0000 [perl.git] branch blead, updated. v5.19.0-192-g344b43a by James Keenan In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/344b43a3ab9d4fa948543f8da3500baaccff34e0?hp=4c75f49d21ef881afc6a7d21ca3532af1426d61b> - Log ----------------------------------------------------------------- commit 344b43a3ab9d4fa948543f8da3500baaccff34e0 Author: David Steinbrunner <dsteinbrunner@pobox.com> Date: Tue May 21 07:10:50 2013 -0400 another typo fix for ExtUtils::ParseXS Bump $VERSION. ----------------------------------------------------------------------- Summary of changes: dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm b/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm index d50b501..9cb89fa 100644 --- a/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm +++ b/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm @@ -11,7 +11,7 @@ use Symbol; our $VERSION; BEGIN { - $VERSION = '3.18'; + $VERSION = '3.19'; } use ExtUtils::ParseXS::Constants $VERSION; use ExtUtils::ParseXS::CountLines $VERSION; @@ -1638,7 +1638,7 @@ sub PopFile { close $self->{FH}; $self->{FH} = $data->{Handle}; - # $filename is the leafname, which for some reason isused for diagnostic + # $filename is the leafname, which for some reason is used for diagnostic # messages, whereas $filepathname is the full pathname, and is used for # #line directives. $self->{filename} = $data->{Filename}; -- Perl5 Master Repository http://www.nntp.perl.org/group/perl.perl5.changes/2013/05/msg37229.html Sat, 25 May 2013 03:17:21 +0000 [perl.git] branch blead, updated. v5.19.0-191-g4c75f49 by James Keenan In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/4c75f49d21ef881afc6a7d21ca3532af1426d61b?hp=a0b243e8e44aef1742dd1f6780ad44cf08739252> - Log ----------------------------------------------------------------- commit 4c75f49d21ef881afc6a7d21ca3532af1426d61b Author: David Steinbrunner <dsteinbrunner@pobox.com> Date: Tue May 21 07:08:49 2013 -0400 typo fixes for ExtUtils::ParseXS ----------------------------------------------------------------------- Summary of changes: dist/ExtUtils-ParseXS/lib/perlxs.pod | 4 ++-- dist/ExtUtils-ParseXS/lib/perlxstypemap.pod | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dist/ExtUtils-ParseXS/lib/perlxs.pod b/dist/ExtUtils-ParseXS/lib/perlxs.pod index 11fc13c..4d67aaf 100644 --- a/dist/ExtUtils-ParseXS/lib/perlxs.pod +++ b/dist/ExtUtils-ParseXS/lib/perlxs.pod @@ -556,7 +556,7 @@ not care about its initial contents. Starting with Perl 5.16, you can embed typemaps into your XS code instead of or in addition to typemaps in a separate file. Multiple such embedded typemaps will be processed in order of appearance in -the XS code and like local typemap files take precendence over the +the XS code and like local typemap files take precedence over the default typemap, the embedded typemaps may overwrite previous definitions of TYPEMAP, INPUT, and OUTPUT stanzas. The syntax for embedded typemaps is @@ -1958,7 +1958,7 @@ of C<my_cxt_t>. =item MY_CXT_INIT -The MY_CXT_INIT macro initialises storage for the C<my_cxt_t> struct. +The MY_CXT_INIT macro initializes storage for the C<my_cxt_t> struct. It I<must> be called exactly once, typically in a BOOT: section. If you are maintaining multiple interpreters, it should be called once in each diff --git a/dist/ExtUtils-ParseXS/lib/perlxstypemap.pod b/dist/ExtUtils-ParseXS/lib/perlxstypemap.pod index 94bd037..e2bc7ed 100644 --- a/dist/ExtUtils-ParseXS/lib/perlxstypemap.pod +++ b/dist/ExtUtils-ParseXS/lib/perlxstypemap.pod @@ -159,7 +159,7 @@ has default XS types for a large number of C types. For example, if you simply return a C<char *> from your XSUB, the core typemap will have this C type associated with the T_PV XS type. That means your C string will be copied into the PV (pointer value) slot of a new scalar -that will be returned from your XSUB to to Perl. +that will be returned from your XSUB to Perl. If you're developing a CPAN distribution using XS, you may add your own file called F<typemap> to the distribution. That file may contain @@ -595,7 +595,7 @@ C<XS_unpack_foo_tPtr>. =item T_PACKEDARRAY T_PACKEDARRAY is similar to T_PACKED. In fact, the C<INPUT> (Perl -to XSUB) typemap is indentical, but the C<OUTPUT> typemap passes +to XSUB) typemap is identical, but the C<OUTPUT> typemap passes an additional argument to the C<XS_pack_$ntype> function. This third parameter indicates the number of elements in the output so that the function can handle C arrays sanely. The variable @@ -612,7 +612,7 @@ is concerned. It just has to be in line with the declared variable. Of course, unless you know the number of elements in the C<sometype **> C array, within your XSUB, the return value from -C<foo_t ** XS_unpack_foo_tPtrPtr(...)> will be hard to decypher. +C<foo_t ** XS_unpack_foo_tPtrPtr(...)> will be hard to decipher. Since the details are all up to the XS author (the typemap user), there are several solutions, none of which particularly elegant. The most commonly seen solution has been to allocate memory for @@ -620,7 +620,7 @@ N+1 pointers and assign C<NULL> to the (N+1)th to facilitate iteration. Alternatively, using a customized typemap for your purposes in -the first place is probably preferrable. +the first place is probably preferable. =item T_DATAUNIT -- Perl5 Master Repository http://www.nntp.perl.org/group/perl.perl5.changes/2013/05/msg37228.html Sat, 25 May 2013 03:14:04 +0000 [perl.git] branch blead, updated. v5.19.0-190-ga0b243e by James Keenan In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/a0b243e8e44aef1742dd1f6780ad44cf08739252?hp=fedcf306fb1b03106a6d5ed34c81fb05a1515940> - Log ----------------------------------------------------------------- commit a0b243e8e44aef1742dd1f6780ad44cf08739252 Author: David Steinbrunner <dsteinbrunner@pobox.com> Date: Tue May 21 07:08:03 2013 -0400 typo fix for Attribute::Handlers Bump $VERSION. ----------------------------------------------------------------------- Summary of changes: dist/Attribute-Handlers/lib/Attribute/Handlers.pm | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dist/Attribute-Handlers/lib/Attribute/Handlers.pm b/dist/Attribute-Handlers/lib/Attribute/Handlers.pm index 60ee32a..4b93a1d 100644 --- a/dist/Attribute-Handlers/lib/Attribute/Handlers.pm +++ b/dist/Attribute-Handlers/lib/Attribute/Handlers.pm @@ -4,7 +4,7 @@ use Carp; use warnings; use strict; use vars qw($VERSION $AUTOLOAD); -$VERSION = '0.94'; # remember to update version in POD! +$VERSION = '0.95'; # remember to update version in POD! # $DB::single=1; my %symcache; @@ -266,8 +266,7 @@ Attribute::Handlers - Simpler definition of attribute handlers =head1 VERSION -This document describes version 0.93 of Attribute::Handlers, -released July 20, 2011. +This document describes version 0.95 of Attribute::Handlers. =head1 SYNOPSIS @@ -878,7 +877,7 @@ C<SCALAR>, C<ARRAY>, C<HASH>, C<CODE>, or C<ANY>. =item C<Attribute handler %s doesn't handle %s attributes> A handler for attributes of the specified name I<was> defined, but not -for the specified type of declaration. Typically encountered whe trying +for the specified type of declaration. Typically encountered when trying to apply a C<VAR> attribute handler to a subroutine, or a C<SCALAR> attribute handler to some other type of variable. -- Perl5 Master Repository http://www.nntp.perl.org/group/perl.perl5.changes/2013/05/msg37227.html Sat, 25 May 2013 03:11:27 +0000 [perl.git] branch blead, updated. v5.19.0-189-gfedcf30 by Tony Cook In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/fedcf306fb1b03106a6d5ed34c81fb05a1515940?hp=b84c7839f2ebbf8f6a5093a22eaab00479899711> - Log ----------------------------------------------------------------- commit fedcf306fb1b03106a6d5ed34c81fb05a1515940 Author: Tony Cook <tony@develop-help.com> Date: Sat May 25 12:58:04 2013 +1000 lib/perldoc.pod is no longer generated, stop ignoring it This changed with cb1974ba, 4a430f72 added an ignore for the new location but didn't remove the old location. ----------------------------------------------------------------------- Summary of changes: lib/.gitignore | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/lib/.gitignore b/lib/.gitignore index 7675672..ef09b17 100644 --- a/lib/.gitignore +++ b/lib/.gitignore @@ -342,7 +342,6 @@ /lib.pm /ops.pm /parent.pm -/perldoc.pod /perlfaq* /perlglossary.pod /perlxs.pod -- Perl5 Master Repository http://www.nntp.perl.org/group/perl.perl5.changes/2013/05/msg37226.html Sat, 25 May 2013 03:04:23 +0000 [perl.git] branch blead, updated. v5.19.0-188-gb84c783 by James Keenan In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/b84c7839f2ebbf8f6a5093a22eaab00479899711?hp=7e3426eab08c236f7768b95d4ae8a536009bd0fa> - Log ----------------------------------------------------------------- commit b84c7839f2ebbf8f6a5093a22eaab00479899711 Author: David Steinbrunner <dsteinbrunner@pobox.com> Date: Tue May 21 07:05:15 2013 -0400 Typo fixes for B modules. Uses of 'optimise' change to 'optimize' to be consistent with other uses of 'optimize'. Bump $VERSION. ----------------------------------------------------------------------- Summary of changes: ext/B/B.pm | 4 ++-- ext/B/B/Concise.pm | 4 ++-- ext/B/B/Showlex.pm | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ext/B/B.pm b/ext/B/B.pm index 8856a32..338a0fe 100644 --- a/ext/B/B.pm +++ b/ext/B/B.pm @@ -15,7 +15,7 @@ require Exporter; # walkoptree comes from B.xs BEGIN { - $B::VERSION = '1.42'; + $B::VERSION = '1.43'; @B::EXPORT_OK = (); # Our BOOT code needs $VERSION set, and will append to @EXPORT_OK. @@ -1063,7 +1063,7 @@ underlying C "inheritance": / \ B::LOOP B::PMOP -Access methods correspond to the underlying C structre field names, +Access methods correspond to the underlying C structure field names, with the leading "class indication" prefix (C<"op_">) removed. =head2 B::OP Methods diff --git a/ext/B/B/Concise.pm b/ext/B/B/Concise.pm index 67876a1..72ac3f9 100644 --- a/ext/B/B/Concise.pm +++ b/ext/B/B/Concise.pm @@ -14,7 +14,7 @@ use warnings; # uses #3 and #4, since warnings uses Carp use Exporter (); # use #5 -our $VERSION = "0.95"; +our $VERSION = "0.96"; our @ISA = qw(Exporter); our @EXPORT_OK = qw( set_style set_style_standard add_callback concise_subref concise_cv concise_main @@ -1636,7 +1636,7 @@ your program is). =item B<#opt> -Whether or not the op has been optimised by the peephole optimiser. +Whether or not the op has been optimized by the peephole optimizer. Only available in 5.9 and later. diff --git a/ext/B/B/Showlex.pm b/ext/B/B/Showlex.pm index 2de8aa4..ab68451 100644 --- a/ext/B/B/Showlex.pm +++ b/ext/B/B/Showlex.pm @@ -1,6 +1,6 @@ package B::Showlex; -our $VERSION = '1.03'; +our $VERSION = '1.04'; use strict; use B qw(svref_2object comppadlist class); @@ -196,7 +196,7 @@ example. See L<B::Concise> for a fuller explanation of reasons. Some of the reported info, such as hex addresses, is not particularly valuable. Other information would be more useful for the typical programmer, such as line-numbers, pad-slot reuses, etc.. Given this, --newlex isnt a particularly good flag-name. +-newlex is not a particularly good flag-name. =head1 AUTHOR -- Perl5 Master Repository http://www.nntp.perl.org/group/perl.perl5.changes/2013/05/msg37225.html Sat, 25 May 2013 03:01:36 +0000 [perl.git] branch blead, updated. v5.19.0-187-g7e3426e by James Keenan In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/7e3426eab08c236f7768b95d4ae8a536009bd0fa?hp=1a471f9e757c3f621b4b066b68334e6706e0c3b9> - Log ----------------------------------------------------------------- commit 7e3426eab08c236f7768b95d4ae8a536009bd0fa Author: David Steinbrunner <dsteinbrunner@pobox.com> Date: Tue May 21 07:02:52 2013 -0400 typo fix for perl5db Bump $VERSION. ----------------------------------------------------------------------- Summary of changes: lib/perl5db.pl | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/perl5db.pl b/lib/perl5db.pl index 85a5ef4..223bfc5 100644 --- a/lib/perl5db.pl +++ b/lib/perl5db.pl @@ -318,7 +318,7 @@ is entered or exited. =item * 8 - Adds parameter information to messages, and overloaded stringify and tied FETCH is enabled on the printed arguments. Ignored if C<4> is not on. -=item * 16 - Adds C<I<context> return from I<subname>: I<value>> messages on subroutine/eval exit. Ignored if C<4> is is not on. +=item * 16 - Adds C<I<context> return from I<subname>: I<value>> messages on subroutine/eval exit. Ignored if C<4> is not on. =back @@ -523,7 +523,7 @@ BEGIN { # Debugger for Perl 5.00x; perl5db.pl patch level: use vars qw($VERSION $header); -$VERSION = '1.39_09'; +$VERSION = '1.39_10'; $header = "perl5db.pl version $VERSION"; @@ -1821,7 +1821,7 @@ sub _DB__read_next_cmd setterm(); } - # ... and it belogs to this PID or we get one for this PID ... + # ... and it belongs to this PID or we get one for this PID ... if ($term_pid != $$) { resetterm(1); } @@ -2097,7 +2097,7 @@ sub _DB__handle_forward_slash_command { # If the pattern isn't null ... if ( $inpat ne "" ) { - # Turn of warn and die procesing for a bit. + # Turn off warn and die processing for a bit. local $SIG{__DIE__}; local $SIG{__WARN__}; @@ -2965,7 +2965,7 @@ Same as for C</>, except the loop runs backwards. =head4 C<$rc> - Recall command Manages the commands in C<@hist> (which is created if C<Term::ReadLine> reports -that the terminal supports history). It find the the command required, puts it +that the terminal supports history). It finds the command required, puts it into C<$cmd>, and redoes the loop to execute it. =cut @@ -3141,7 +3141,7 @@ again. # # my $obj = DB::Obj->new( # -# The following package declaraton must come before that, +# The following package declaration must come before that, # or else runtime errors will occur with # # PERLDB_OPTS="autotrace nonstop" @@ -6083,7 +6083,7 @@ sub cmd_W { } ## end foreach (@to_watch) # We don't bother to turn watching off because - # a) we don't want to stop calling watchfunction() it it exists + # a) we don't want to stop calling watchfunction() if it exists # b) foreach over a null list doesn't do anything anyway } ## end elsif ($expr =~ /^(\S.*)/) @@ -6418,7 +6418,7 @@ sub print_trace { # Drop out if the user has lost interest and hit control-C. last if $signal; - # Set the separator so arrys print nice. + # Set the separator so arrays print nice. local $" = ', '; # Grab and stringify the arguments if they are there. @@ -10303,7 +10303,7 @@ sub cmd_prepost { my $which = ''; # Make sure we have some array or another to address later. - # This means that if ssome reason the tests fail, we won't be + # This means that if for some reason the tests fail, we won't be # trying to stash actions or delete them from the wrong place. my $aref = []; -- Perl5 Master Repository http://www.nntp.perl.org/group/perl.perl5.changes/2013/05/msg37224.html Sat, 25 May 2013 02:54:42 +0000 [perl.git] branch blead, updated. v5.19.0-186-g1a471f9 by James Keenan In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/1a471f9e757c3f621b4b066b68334e6706e0c3b9?hp=c0b435603334620c1f3cdd7aedc09f29b4f07381> - Log ----------------------------------------------------------------- commit 1a471f9e757c3f621b4b066b68334e6706e0c3b9 Author: David Steinbrunner <dsteinbrunner@pobox.com> Date: Tue May 21 07:01:50 2013 -0400 typo fix for Thread Bump $VERSION. ----------------------------------------------------------------------- Summary of changes: lib/Thread.pm | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Thread.pm b/lib/Thread.pm index 247f90c..395b7eb 100644 --- a/lib/Thread.pm +++ b/lib/Thread.pm @@ -4,7 +4,7 @@ use strict; use warnings; no warnings 'redefine'; -our $VERSION = '3.02'; +our $VERSION = '3.03'; $VERSION = eval $VERSION; BEGIN { @@ -168,7 +168,7 @@ does a C<cond_signal> or C<cond_broadcast> for that same locked variable. The variable that C<cond_wait> blocked on is relocked after the C<cond_wait> is satisfied. If there are multiple threads C<cond_wait>ing on the same variable, all but one will reblock waiting -to reaquire the lock on the variable. (So if you're only using +to require the lock on the variable. (So if you're only using C<cond_wait> for synchronization, give up the lock as soon as possible.) -- Perl5 Master Repository http://www.nntp.perl.org/group/perl.perl5.changes/2013/05/msg37223.html Sat, 25 May 2013 02:47:46 +0000 [perl.git] branch blead, updated. v5.19.0-185-gc0b4356 by James Keenan In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/c0b435603334620c1f3cdd7aedc09f29b4f07381?hp=203f930da805cdab62f8b1ab4e75492b9f4def0c> - Log ----------------------------------------------------------------- commit c0b435603334620c1f3cdd7aedc09f29b4f07381 Author: David Steinbrunner <dsteinbrunner@pobox.com> Date: Tue May 21 07:01:35 2013 -0400 typo fix for DB Bump $VERSION. ----------------------------------------------------------------------- Summary of changes: lib/DB.pm | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/DB.pm b/lib/DB.pm index 03f2b21..6c1ce56 100644 --- a/lib/DB.pm +++ b/lib/DB.pm @@ -38,10 +38,10 @@ BEGIN { $DB::package = ''; # current package space $DB::filename = ''; # current filename - $DB::subname = ''; # currently executing sub (fullly qualified name) + $DB::subname = ''; # currently executing sub (fully qualified name) $DB::lineno = ''; # current line number - $DB::VERSION = $DB::VERSION = '1.04'; + $DB::VERSION = $DB::VERSION = '1.05'; # initialize private globals to avoid warnings -- Perl5 Master Repository http://www.nntp.perl.org/group/perl.perl5.changes/2013/05/msg37222.html Sat, 25 May 2013 02:44:27 +0000 [perl.git] branch blead, updated. v5.19.0-184-g203f930 by James Keenan In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/203f930da805cdab62f8b1ab4e75492b9f4def0c?hp=4a430f720d08f48d71ea41860370d45d52b6d650> - Log ----------------------------------------------------------------- commit 203f930da805cdab62f8b1ab4e75492b9f4def0c Author: David Steinbrunner <dsteinbrunner@pobox.com> Date: Tue May 21 07:01:16 2013 -0400 typo fix for _charnames Bump $VERSION for charnames. ----------------------------------------------------------------------- Summary of changes: lib/_charnames.pm | 2 +- lib/charnames.pm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/_charnames.pm b/lib/_charnames.pm index fa52a9b..7492e65 100644 --- a/lib/_charnames.pm +++ b/lib/_charnames.pm @@ -475,7 +475,7 @@ sub lookup_name ($$$) { /xs) { # Even in non-loose matching, the script traditionally has been - # case insensitve + # case insensitive $scripts_trie = "\U$1"; $lookup_name = $2; diff --git a/lib/charnames.pm b/lib/charnames.pm index 5790fcc..acb174d 100644 --- a/lib/charnames.pm +++ b/lib/charnames.pm @@ -1,7 +1,7 @@ package charnames; use strict; use warnings; -our $VERSION = '1.37'; +our $VERSION = '1.38'; use unicore::Name; # mktables-generated algorithmically-defined names use _charnames (); # The submodule for this where most of the work gets done -- Perl5 Master Repository http://www.nntp.perl.org/group/perl.perl5.changes/2013/05/msg37221.html Sat, 25 May 2013 02:39:26 +0000 [perl.git] branch blead, updated. v5.19.0-183-g4a430f7 by James Keenan In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/4a430f720d08f48d71ea41860370d45d52b6d650?hp=c84f4bc67c7c5d0722ecf3460daaac8426330799> - Log ----------------------------------------------------------------- commit 4a430f720d08f48d71ea41860370d45d52b6d650 Author: James E Keenan <jkeenan@cpan.org> Date: Sat May 25 04:31:09 2013 +0200 Add lib/Pod/perldoc.pod to lib/.gitignore. M lib/.gitignore commit 5f7d9242a8905643a016764d7a54078faa4fe7e2 Author: David Steinbrunner <dsteinbrunner@pobox.com> Date: Tue May 21 07:00:56 2013 -0400 typo fixes for Benchmark Bump $VERSION; clean up trailing whitespace. M lib/Benchmark.pm ----------------------------------------------------------------------- Summary of changes: lib/.gitignore | 1 + lib/Benchmark.pm | 48 ++++++++++++++++++++++++------------------------ 2 files changed, 25 insertions(+), 24 deletions(-) diff --git a/lib/.gitignore b/lib/.gitignore index 4ed7ce0..7675672 100644 --- a/lib/.gitignore +++ b/lib/.gitignore @@ -285,6 +285,7 @@ /Pod/Text.pm /Pod/Text/ /Pod/Usage.pm +/Pod/perldoc.pod /SDBM_File.pm /Safe.pm /Scalar diff --git a/lib/Benchmark.pm b/lib/Benchmark.pm index 1fa187e..f507efa 100644 --- a/lib/Benchmark.pm +++ b/lib/Benchmark.pm @@ -37,7 +37,7 @@ Benchmark - benchmark running times of Perl code }); # ...or in two stages - $results = timethese($count, + $results = timethese($count, { 'Name1' => sub { ...code1... }, 'Name2' => sub { ...code2... }, @@ -339,7 +339,7 @@ outputs something like this: a 4152037/s 166% -- -while +while use Benchmark qw( timethese cmpthese ) ; $x = 3; @@ -402,8 +402,8 @@ documentation. April 04-07th, 1997: by Jarkko Hietaniemi, added the run-for-some-time functionality. -September, 1999; by Barrie Slaymaker: math fixes and accuracy and -efficiency tweaks. Added cmpthese(). A result is now returned from +September, 1999; by Barrie Slaymaker: math fixes and accuracy and +efficiency tweaks. Added cmpthese(). A result is now returned from timethese(). Exposed countit() (was runfor()). December, 2001; by Nicholas Clark: make timestr() recognise the style 'none' @@ -440,7 +440,7 @@ our(@ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS, $VERSION); clearcache clearallcache disablecache enablecache); %EXPORT_TAGS=( all => [ @EXPORT, @EXPORT_OK ] ) ; -$VERSION = 1.15; +$VERSION = 1.16; # --- ':hireswallclock' special handling @@ -485,7 +485,7 @@ sub init { sub debug { $Debug = ($_[1] != 0); } -sub usage { +sub usage { my $calling_sub = (caller(1))[3]; $calling_sub =~ s/^Benchmark:://; return $_Usage{$calling_sub} || ''; @@ -498,18 +498,18 @@ $_Usage{clearcache} = <<'USAGE'; usage: clearcache($count); USAGE -sub clearcache { +sub clearcache { die usage unless @_ == 1; - delete $Cache{"$_[0]c"}; delete $Cache{"$_[0]s"}; + delete $Cache{"$_[0]c"}; delete $Cache{"$_[0]s"}; } $_Usage{clearallcache} = <<'USAGE'; usage: clearallcache(); USAGE -sub clearallcache { +sub clearallcache { die usage if @_; - %Cache = (); + %Cache = (); } $_Usage{enablecache} = <<'USAGE'; @@ -518,7 +518,7 @@ USAGE sub enablecache { die usage if @_; - $Do_Cache = 1; + $Do_Cache = 1; } $_Usage{disablecache} = <<'USAGE'; @@ -527,7 +527,7 @@ USAGE sub disablecache { die usage if @_; - $Do_Cache = 0; + $Do_Cache = 0; } @@ -652,7 +652,7 @@ sub runloop { croak "runloop unable to compile '$c': $@\ncode: $subcode\n" if $@; print STDERR "runloop $n '$subcode'\n" if $Debug; - # Wait for the user timer to tick. This makes the error range more like + # Wait for the user timer to tick. This makes the error range more like # -0.01, +0. If we don't wait, then it's more like -0.01, +0.01. This # may not seem important, but it significantly reduces the chances of # getting a too low initial $n in the initial, 'find the minimum' loop @@ -748,7 +748,7 @@ sub countit { while ( $tc < $tpra ) { # The 5% fudge is to keep us from iterating again all # that often (this speeds overall responsiveness when $tmax is big - # and we guess a little low). This does not noticably affect + # and we guess a little low). This does not noticeably affect # accuracy since we're not counting these times. $n = int( $tpra * 1.05 * $n / $tc ); # Linear approximation. my $td = timeit($n, $code); @@ -929,10 +929,10 @@ sub cmpthese{ my @rows; my @col_widths; - my @top_row = ( - '', - $display_as_rate ? 'Rate' : 's/iter', - map { $_->[0] } @vals + my @top_row = ( + '', + $display_as_rate ? 'Rate' : 's/iter', + map { $_->[0] } @vals ); push @rows, \@top_row; @@ -958,9 +958,9 @@ sub cmpthese{ # Only give a few decimal places before switching to sci. notation, # since the results aren't usually that accurate anyway. - my $format = - $rate >= 100 ? - "%0.0f" : + my $format = + $rate >= 100 ? + "%0.0f" : $rate >= 10 ? "%0.1f" : $rate >= 1 ? @@ -997,7 +997,7 @@ sub cmpthese{ $col_widths[$col_num+2] = length( $out ) if length( $out ) > $col_widths[$col_num+2]; - # A little wierdness to set the first column width properly + # A little weirdness to set the first column width properly $col_widths[$col_num+2] = length( $col_val->[0] ) if length( $col_val->[0] ) > $col_widths[$col_num+2]; } @@ -1008,7 +1008,7 @@ sub cmpthese{ # Equalize column widths in the chart as much as possible without # exceeding 80 characters. This does not use or affect cols 0 or 1. - my @sorted_width_refs = + my @sorted_width_refs = sort { $$a <=> $$b } map { \$_ } @col_widths[2..$#col_widths]; my $max_width = ${$sorted_width_refs[-1]}; @@ -1021,7 +1021,7 @@ sub cmpthese{ last if $min_width == $max_width; for ( @sorted_width_refs ) { - last + last if $$_ > $min_width; ++$$_; ++$total; -- Perl5 Master Repository http://www.nntp.perl.org/group/perl.perl5.changes/2013/05/msg37220.html Sat, 25 May 2013 02:36:16 +0000 [perl.git] branch blead, updated. v5.19.0-181-gc84f4bc by James Keenan In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/c84f4bc67c7c5d0722ecf3460daaac8426330799?hp=107bec06d7f6354a0c05a5301ea02c2cc9d30840> - Log ----------------------------------------------------------------- commit c84f4bc67c7c5d0722ecf3460daaac8426330799 Author: David Steinbrunner <dsteinbrunner@pobox.com> Date: Tue May 21 06:59:07 2013 -0400 typo fix for File::Find Bump $VERSION for File::Find. ----------------------------------------------------------------------- Summary of changes: lib/File/Find.pm | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/File/Find.pm b/lib/File/Find.pm index d1dbc52..99b868e 100644 --- a/lib/File/Find.pm +++ b/lib/File/Find.pm @@ -3,7 +3,7 @@ use 5.006; use strict; use warnings; use warnings::register; -our $VERSION = '1.23'; +our $VERSION = '1.24'; require Exporter; require Cwd; @@ -488,7 +488,7 @@ sub _find_opt { $cwd = VMS::Filespec::unixpath($cwd); # Apparently this is not expected to have a trailing space. - # To attempt to make VMS/UNIX conversions mostly reversable, + # To attempt to make VMS/UNIX conversions mostly reversible, # a trailing slash is needed. The run-time functions ignore the # resulting double slash, but it causes the perl tests to fail. $cwd =~ s#/\z##; -- Perl5 Master Repository http://www.nntp.perl.org/group/perl.perl5.changes/2013/05/msg37219.html Sat, 25 May 2013 02:16:32 +0000 [perl.git] branch blead, updated. v5.19.0-180-g107bec0 by Chris 'Bingos' Williams In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/107bec06d7f6354a0c05a5301ea02c2cc9d30840?hp=cb1974ba967c78b8c4c5124d5b470405af5b8541> - Log ----------------------------------------------------------------- commit 107bec06d7f6354a0c05a5301ea02c2cc9d30840 Author: Chris 'BinGOs' Williams <chris@bingosnet.co.uk> Date: Fri May 24 21:46:26 2013 +0100 Update HTTP-Tiny to CPAN version 0.029 [DELTA] 0.029 2013-04-17 13:49:07 America/New_York [FIXED] - Checks for new enough OpenSSL library before using SNI (otherwise IO::Socket::SSL throws warnings) 0.028 2013-03-05 14:11:57 America/New_York [SUPPORT] - Fix repository/issue links to reflect proper repo name 0.027 2013-03-05 12:02:58 America/New_York [SUPPORT] - Changed metadata to point to the chansen github repository for code and issues [DOCUMENTATION] - Added hyperlink for HTTP::CookieJar 0.026 2013-03-04 22:53:39 America/New_York [ADDED] - Added cookie support if an HTTP::CookieJar object is provided in the 'cookie_jar' attribute [Edward Zborowski] M MANIFEST M Porting/Maintainers.pl M cpan/HTTP-Tiny/lib/HTTP/Tiny.pm M cpan/HTTP-Tiny/t/00-compile.t M cpan/HTTP-Tiny/t/001_api.t A cpan/HTTP-Tiny/t/070_cookie_jar.t A cpan/HTTP-Tiny/t/160_cookies.t A cpan/HTTP-Tiny/t/BrokenCookieJar.pm A cpan/HTTP-Tiny/t/SimpleCookieJar.pm A cpan/HTTP-Tiny/t/cases/cookies-01.txt A cpan/HTTP-Tiny/t/cases/cookies-02.txt A cpan/HTTP-Tiny/t/cases/cookies-03.txt A cpan/HTTP-Tiny/t/cases/cookies-04.txt A cpan/HTTP-Tiny/t/cases/cookies-05.txt A cpan/HTTP-Tiny/t/cases/cookies-06.txt A cpan/HTTP-Tiny/t/cases/cookies-07.txt commit ee76e75720066eb0cd82eb280936c6b52bdddc7f Author: Chris 'BinGOs' Williams <chris@bingosnet.co.uk> Date: Fri May 24 21:43:09 2013 +0100 Update Module-Build to CPAN version 0.4005 [DELTA] 0.4005 - Thu Apr 25 15:10:14 CEST 2013 [ENHANCEMENTS] - Added --pureperl-only support [BUG FIXES] - #72176: pod2html will fail with an empty podpath in some cases. [Phillip Moore] - Fix links between modules in HTML docs output [Michael Wild, Leon Timmermans] 0.4004 - Fri Mar 29 15:05:00 CET 2013 [BUG FIXES] - Minor VMS fix for @INC [Craig Berry] [ENHANCEMENTS] - test_requires support has been added [Matsuno Tokuhiro] M Porting/Maintainers.pl M cpan/Module-Build/Changes M cpan/Module-Build/lib/Module/Build.pm M cpan/Module-Build/lib/Module/Build/API.pod M cpan/Module-Build/lib/Module/Build/Authoring.pod M cpan/Module-Build/lib/Module/Build/Base.pm M cpan/Module-Build/lib/Module/Build/Compat.pm M cpan/Module-Build/lib/Module/Build/Config.pm M cpan/Module-Build/lib/Module/Build/Cookbook.pm M cpan/Module-Build/lib/Module/Build/Dumper.pm M cpan/Module-Build/lib/Module/Build/ModuleInfo.pm M cpan/Module-Build/lib/Module/Build/Notes.pm M cpan/Module-Build/lib/Module/Build/PPMMaker.pm M cpan/Module-Build/lib/Module/Build/Platform/Amiga.pm M cpan/Module-Build/lib/Module/Build/Platform/Default.pm M cpan/Module-Build/lib/Module/Build/Platform/EBCDIC.pm M cpan/Module-Build/lib/Module/Build/Platform/MPEiX.pm M cpan/Module-Build/lib/Module/Build/Platform/MacOS.pm M cpan/Module-Build/lib/Module/Build/Platform/RiscOS.pm M cpan/Module-Build/lib/Module/Build/Platform/Unix.pm M cpan/Module-Build/lib/Module/Build/Platform/VMS.pm M cpan/Module-Build/lib/Module/Build/Platform/VOS.pm M cpan/Module-Build/lib/Module/Build/Platform/Windows.pm M cpan/Module-Build/lib/Module/Build/Platform/aix.pm M cpan/Module-Build/lib/Module/Build/Platform/cygwin.pm M cpan/Module-Build/lib/Module/Build/Platform/darwin.pm M cpan/Module-Build/lib/Module/Build/Platform/os2.pm M cpan/Module-Build/lib/Module/Build/PodParser.pm M cpan/Module-Build/lib/inc/latest.pm M cpan/Module-Build/lib/inc/latest/private.pm M cpan/Module-Build/t/install.t M cpan/Module-Build/t/metadata.t M cpan/Module-Build/t/xs.t ----------------------------------------------------------------------- Summary of changes: MANIFEST | 11 ++ Porting/Maintainers.pl | 4 +- cpan/HTTP-Tiny/lib/HTTP/Tiny.pm | 139 +++++++++++++++++--- cpan/HTTP-Tiny/t/00-compile.t | 1 + cpan/HTTP-Tiny/t/001_api.t | 2 +- cpan/HTTP-Tiny/t/070_cookie_jar.t | 42 ++++++ cpan/HTTP-Tiny/t/160_cookies.t | 79 +++++++++++ cpan/HTTP-Tiny/t/BrokenCookieJar.pm | 24 ++++ cpan/HTTP-Tiny/t/SimpleCookieJar.pm | 29 ++++ cpan/HTTP-Tiny/t/cases/cookies-01.txt | 34 +++++ cpan/HTTP-Tiny/t/cases/cookies-02.txt | 52 ++++++++ cpan/HTTP-Tiny/t/cases/cookies-03.txt | 87 ++++++++++++ cpan/HTTP-Tiny/t/cases/cookies-04.txt | 37 +++++ cpan/HTTP-Tiny/t/cases/cookies-05.txt | 35 +++++ cpan/HTTP-Tiny/t/cases/cookies-06.txt | 51 +++++++ cpan/HTTP-Tiny/t/cases/cookies-07.txt | 34 +++++ cpan/Module-Build/Changes | 22 +++ cpan/Module-Build/lib/Module/Build.pm | 2 +- cpan/Module-Build/lib/Module/Build/API.pod | 24 ++++- cpan/Module-Build/lib/Module/Build/Authoring.pod | 4 + cpan/Module-Build/lib/Module/Build/Base.pm | 34 +++-- cpan/Module-Build/lib/Module/Build/Compat.pm | 2 +- cpan/Module-Build/lib/Module/Build/Config.pm | 2 +- cpan/Module-Build/lib/Module/Build/Cookbook.pm | 2 +- cpan/Module-Build/lib/Module/Build/Dumper.pm | 2 +- cpan/Module-Build/lib/Module/Build/ModuleInfo.pm | 2 +- cpan/Module-Build/lib/Module/Build/Notes.pm | 2 +- cpan/Module-Build/lib/Module/Build/PPMMaker.pm | 2 +- .../lib/Module/Build/Platform/Amiga.pm | 2 +- .../lib/Module/Build/Platform/Default.pm | 2 +- .../lib/Module/Build/Platform/EBCDIC.pm | 2 +- .../lib/Module/Build/Platform/MPEiX.pm | 2 +- .../lib/Module/Build/Platform/MacOS.pm | 2 +- .../lib/Module/Build/Platform/RiscOS.pm | 2 +- .../Module-Build/lib/Module/Build/Platform/Unix.pm | 2 +- cpan/Module-Build/lib/Module/Build/Platform/VMS.pm | 2 +- cpan/Module-Build/lib/Module/Build/Platform/VOS.pm | 2 +- .../lib/Module/Build/Platform/Windows.pm | 2 +- cpan/Module-Build/lib/Module/Build/Platform/aix.pm | 2 +- .../lib/Module/Build/Platform/cygwin.pm | 2 +- .../lib/Module/Build/Platform/darwin.pm | 2 +- cpan/Module-Build/lib/Module/Build/Platform/os2.pm | 2 +- cpan/Module-Build/lib/Module/Build/PodParser.pm | 2 +- cpan/Module-Build/lib/inc/latest.pm | 2 +- cpan/Module-Build/lib/inc/latest/private.pm | 2 +- cpan/Module-Build/t/install.t | 8 - cpan/Module-Build/t/metadata.t | 8 +- cpan/Module-Build/t/xs.t | 10 ++- 48 files changed, 752 insertions(+), 69 deletions(-) create mode 100644 cpan/HTTP-Tiny/t/070_cookie_jar.t create mode 100644 cpan/HTTP-Tiny/t/160_cookies.t create mode 100644 cpan/HTTP-Tiny/t/BrokenCookieJar.pm create mode 100644 cpan/HTTP-Tiny/t/SimpleCookieJar.pm create mode 100644 cpan/HTTP-Tiny/t/cases/cookies-01.txt create mode 100644 cpan/HTTP-Tiny/t/cases/cookies-02.txt create mode 100644 cpan/HTTP-Tiny/t/cases/cookies-03.txt create mode 100644 cpan/HTTP-Tiny/t/cases/cookies-04.txt create mode 100644 cpan/HTTP-Tiny/t/cases/cookies-05.txt create mode 100644 cpan/HTTP-Tiny/t/cases/cookies-06.txt create mode 100644 cpan/HTTP-Tiny/t/cases/cookies-07.txt diff --git a/MANIFEST b/MANIFEST index ada4d8b..e3e3b8f 100644 --- a/MANIFEST +++ b/MANIFEST @@ -1058,6 +1058,7 @@ cpan/HTTP-Tiny/t/030_response.t cpan/HTTP-Tiny/t/040_content.t cpan/HTTP-Tiny/t/050_chunked_body.t cpan/HTTP-Tiny/t/060_http_date.t +cpan/HTTP-Tiny/t/070_cookie_jar.t cpan/HTTP-Tiny/t/100_get.t cpan/HTTP-Tiny/t/101_head.t cpan/HTTP-Tiny/t/102_put.t @@ -1067,6 +1068,15 @@ cpan/HTTP-Tiny/t/110_mirror.t cpan/HTTP-Tiny/t/130_redirect.t cpan/HTTP-Tiny/t/140_proxy.t cpan/HTTP-Tiny/t/150_post_form.t +cpan/HTTP-Tiny/t/160_cookies.t +cpan/HTTP-Tiny/t/BrokenCookieJar.pm +cpan/HTTP-Tiny/t/cases/cookies-01.txt +cpan/HTTP-Tiny/t/cases/cookies-02.txt +cpan/HTTP-Tiny/t/cases/cookies-03.txt +cpan/HTTP-Tiny/t/cases/cookies-04.txt +cpan/HTTP-Tiny/t/cases/cookies-05.txt +cpan/HTTP-Tiny/t/cases/cookies-06.txt +cpan/HTTP-Tiny/t/cases/cookies-07.txt cpan/HTTP-Tiny/t/cases/delete-01.txt cpan/HTTP-Tiny/t/cases/form-01.txt cpan/HTTP-Tiny/t/cases/form-02.txt @@ -1114,6 +1124,7 @@ cpan/HTTP-Tiny/t/cases/redirect-06.txt cpan/HTTP-Tiny/t/cases/redirect-07.txt cpan/HTTP-Tiny/t/cases/redirect-08.txt cpan/HTTP-Tiny/t/cases/redirect-09.txt +cpan/HTTP-Tiny/t/SimpleCookieJar.pm cpan/HTTP-Tiny/t/Util.pm cpan/IO-Compress/bin/zipdetails IO::Compress cpan/IO-Compress/Changes IO::Compress diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index 38d72b2..a570de8 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -926,7 +926,7 @@ use File::Glob qw(:case); 'HTTP::Tiny' => { 'MAINTAINER' => 'dagolden', - 'DISTRIBUTION' => 'DAGOLDEN/HTTP-Tiny-0.025.tar.gz', + 'DISTRIBUTION' => 'DAGOLDEN/HTTP-Tiny-0.029.tar.gz', 'FILES' => q[cpan/HTTP-Tiny], 'EXCLUDED' => [ 't/00-report-prereqs.t', @@ -1188,7 +1188,7 @@ use File::Glob qw(:case); 'Module::Build' => { 'MAINTAINER' => 'kwilliams', - 'DISTRIBUTION' => 'LEONT/Module-Build-0.4003.tar.gz', + 'DISTRIBUTION' => 'LEONT/Module-Build-0.4005.tar.gz', 'FILES' => q[cpan/Module-Build], 'EXCLUDED' => [ qw( t/par.t diff --git a/cpan/HTTP-Tiny/lib/HTTP/Tiny.pm b/cpan/HTTP-Tiny/lib/HTTP/Tiny.pm index 333aab5..dfcf07b 100644 --- a/cpan/HTTP-Tiny/lib/HTTP/Tiny.pm +++ b/cpan/HTTP-Tiny/lib/HTTP/Tiny.pm @@ -3,14 +3,14 @@ package HTTP::Tiny; use strict; use warnings; # ABSTRACT: A small, simple, correct HTTP/1.1 client -our $VERSION = '0.025'; # VERSION +our $VERSION = '0.029'; # VERSION use Carp (); my @attributes; BEGIN { - @attributes = qw(agent default_headers local_address max_redirect max_size proxy timeout SSL_options verify_SSL); + @attributes = qw(agent cookie_jar default_headers local_address max_redirect max_size proxy timeout SSL_options verify_SSL); no strict 'refs'; for my $accessor ( @attributes ) { *{$accessor} = sub { @@ -35,6 +35,8 @@ sub new { $args{agent} .= $default_agent if defined $args{agent} && $args{agent} =~ / $/; + $class->_validate_cookie_jar( $args{cookie_jar} ) if $args{cookie_jar}; + for my $key ( @attributes ) { $self->{$key} = $args{$key} if exists $args{$key} } @@ -157,7 +159,7 @@ sub www_form_urlencode { (@_ == 2 && ref $data) or Carp::croak(q/Usage: $http->www_form_urlencode(DATAREF)/ . "\n"); (ref $data eq 'HASH' || ref $data eq 'ARRAY') - or Carp::croak("form data must be a hash or array reference"); + or Carp::croak("form data must be a hash or array reference\n"); my @params = ref $data eq 'HASH' ? %$data : @$data; @params % 2 == 0 @@ -216,13 +218,15 @@ sub _request { $handle->connect($scheme, $host, $port); } - $self->_prepare_headers_and_cb($request, $args); + $self->_prepare_headers_and_cb($request, $args, $url); $handle->write_request($request); my $response; do { $response = $handle->read_response_header } until (substr($response->{status},0,1) ne '1'); + $self->_update_cookie_jar( $url, $response ) if $self->{cookie_jar}; + if ( my @redir_args = $self->_maybe_redirect($request, $response, $args) ) { $handle->close; return $self->_request(@redir_args, $args); @@ -243,7 +247,7 @@ sub _request { } sub _prepare_headers_and_cb { - my ($self, $request, $args) = @_; + my ($self, $request, $args, $url) = @_; for ($self->{default_headers}, $args->{headers}) { next unless defined; @@ -277,6 +281,13 @@ sub _prepare_headers_and_cb { $request->{trailer_cb} = $args->{trailer_callback} if ref $args->{trailer_callback} eq 'CODE'; } + + ### If we have a cookie jar, then maybe add relevant cookies + if ( $self->{cookie_jar} ) { + my $cookies = $self->cookie_jar->cookie_header( $url ); + $request->{headers}{cookie} = $cookies if length $cookies; + } + return; } @@ -300,6 +311,31 @@ sub _prepare_data_cb { return $data_cb; } +sub _update_cookie_jar { + my ($self, $url, $response) = @_; + + my $cookies = $response->{headers}->{'set-cookie'}; + return unless defined $cookies; + + my @cookies = ref $cookies ? @$cookies : $cookies; + + $self->cookie_jar->add( $url, $_ ) for @cookies; + + return; +} + +sub _validate_cookie_jar { + my ($class, $jar) = @_; + + # duck typing + for my $method ( qw/add cookie_header/ ) { + Carp::croak(qq/Cookie jar must provide the '$method' method\n/) + unless ref($jar) && ref($jar)->can($method); + } + + return; +} + sub _maybe_redirect { my ($self, $request, $response, $args) = @_; my $headers = $response->{headers}; @@ -428,8 +464,10 @@ sub connect { my ($self, $scheme, $host, $port) = @_; if ( $scheme eq 'https' ) { - die(qq/IO::Socket::SSL 1.56 must be installed for https support\n/) - unless eval {require IO::Socket::SSL; IO::Socket::SSL->VERSION(1.56)}; + # Need IO::Socket::SSL 1.42 for SSL_create_ctx_callback + die(qq/IO::Socket::SSL 1.42 must be installed for https support\n/) + unless eval {require IO::Socket::SSL; IO::Socket::SSL->VERSION(1.42)}; + # Need Net::SSLeay 1.49 for MODE_AUTO_RETRY die(qq/Net::SSLeay 1.49 must be installed for https support\n/) unless eval {require Net::SSLeay; Net::SSLeay->VERSION(1.49)}; } @@ -894,9 +932,13 @@ sub _find_CA_file { sub _ssl_args { my ($self, $host) = @_; - my %ssl_args = ( - SSL_hostname => $host, # SNI - ); + my %ssl_args; + + # This test reimplements IO::Socket::SSL::can_client_sni(), which wasn't + # added until IO::Socket::SSL 1.84 + if ( Net::SSLeay::OPENSSL_VERSION_NUMBER() >= 0x01000000 ) { + $ssl_args{SSL_hostname} = $host, # Sane SNI support + } if ($self->{verify_SSL}) { $ssl_args{SSL_verifycn_scheme} = 'http'; # enable CN validation @@ -923,13 +965,15 @@ __END__ =pod +=encoding utf-8 + =head1 NAME HTTP::Tiny - A small, simple, correct HTTP/1.1 client =head1 VERSION -version 0.025 +version 0.029 =head1 SYNOPSIS @@ -976,6 +1020,12 @@ A user-agent string (defaults to 'HTTP-Tiny/$VERSION'). If C<agent> ends in a sp =item * +C<cookie_jar> + +An instance of L<HTTP::CookieJar> or equivalent class that supports the C<add> and C<cookie_header> methods + +=item * + C<default_headers> A hashref of default headers to apply to requests @@ -1202,6 +1252,7 @@ reference. The key/value pairs in the resulting string will be sorted by key and value. =for Pod::Coverage agent +cookie_jar default_headers local_address max_redirect @@ -1332,9 +1383,7 @@ always be set to C<close>. =item * -Cookies are not directly supported. Users that set a C<Cookie> header -should also set C<max_redirect> to zero to ensure cookies are not -inappropriately re-transmitted. +Cookie support requires L<HTTP::CookieJar> or an equivalent class. =item * @@ -1390,7 +1439,7 @@ L<Net::SSLeay> =head2 Bugs / Feature Requests Please report any bugs or feature requests through the issue tracker -at L<https://rt.cpan.org/Public/Dist/Display.html?Name=HTTP-Tiny>. +at L<https://github.com/chansen/p5-http-tiny/issues>. You will be notified automatically of any progress on your issue. =head2 Source Code @@ -1398,9 +1447,9 @@ You will be notified automatically of any progress on your issue. This is open source software. The code repository is available for public review and contribution under the terms of the license. -L<https://github.com/dagolden/http-tiny> +L<https://github.com/chansen/p5-http-tiny> - git clone git://github.com/dagolden/http-tiny.git + git clone git://github.com/chansen/p5-http-tiny.git =head1 AUTHORS @@ -1414,15 +1463,69 @@ Christian Hansen <chansen@cpan.org> David Golden <dagolden@cpan.org> +=back + +=head1 CONTRIBUTORS + +=over 4 + +=item * + +Alan Gardner <gardner@pythian.com> + +=item * + +Alessandro Ghedini <al3xbio@gmail.com> + +=item * + +Chris Nehren <apeiron@cpan.org> + +=item * + +Chris Weyl <cweyl@alumni.drew.edu> + +=item * + +Claes Jakobsson <claes@surfar.nu> + +=item * + +Craig Berry <cberry@cpan.org> + +=item * + +David Mitchell <davem@iabyn.com> + +=item * + +Edward Zborowski <ed@rubensteintech.com> + +=item * + +Jess Robinson <castaway@desert-island.me.uk> + +=item * + +Lukas Eklund <leklund@gmail.com> + =item * Mike Doherty <doherty@cpan.org> +=item * + +Serguei Trouchelle <stro@cpan.org> + +=item * + +Tony Cook <tony@develop-help.com> + =back =head1 COPYRIGHT AND LICENSE -This software is copyright (c) 2012 by Christian Hansen. +This software is copyright (c) 2013 by Christian Hansen. This is free software; you can redistribute it and/or modify it under the same terms as the Perl 5 programming language system itself. diff --git a/cpan/HTTP-Tiny/t/00-compile.t b/cpan/HTTP-Tiny/t/00-compile.t index 6987686..6454c82 100644 --- a/cpan/HTTP-Tiny/t/00-compile.t +++ b/cpan/HTTP-Tiny/t/00-compile.t @@ -70,4 +70,5 @@ $plan ? (plan tests => $plan) : (plan skip_all => "no tests to run"); script_compiles( $file, "$script script compiles" ); } } + } diff --git a/cpan/HTTP-Tiny/t/001_api.t b/cpan/HTTP-Tiny/t/001_api.t index 4311c67..0083c2e 100644 --- a/cpan/HTTP-Tiny/t/001_api.t +++ b/cpan/HTTP-Tiny/t/001_api.t @@ -7,7 +7,7 @@ use Test::More tests => 2; use HTTP::Tiny; my @accessors = qw( - agent default_headers local_address max_redirect max_size proxy timeout SSL_options verify_SSL + agent default_headers local_address max_redirect max_size proxy timeout SSL_options verify_SSL cookie_jar ); my @methods = qw( new get head put post delete post_form request mirror www_form_urlencode diff --git a/cpan/HTTP-Tiny/t/070_cookie_jar.t b/cpan/HTTP-Tiny/t/070_cookie_jar.t new file mode 100644 index 0000000..bd09a54 --- /dev/null +++ b/cpan/HTTP-Tiny/t/070_cookie_jar.t @@ -0,0 +1,42 @@ +#!perl + +use strict; +use warnings; + +use Test::More tests => 4; +use t::SimpleCookieJar; +use t::BrokenCookieJar; +use HTTP::Tiny; + +### a couple tests to ensure that: +### * by default there is no cookie jar defined +### * the correct cookie jar is returned when specified +### * error when cookie jar does not support the add and cookie_header methods + + +my $default = undef; +my $jar = t::SimpleCookieJar->new(); +my $mug = t::BrokenCookieJar->new(); +my $dog = t::BrokenCookieJar2->new(); + +{ + my $ua = HTTP::Tiny->new(); + is $ua->cookie_jar, $default, 'default cookie jar is as expected'; +} + +{ + my $ua = HTTP::Tiny->new(cookie_jar => $jar); + is $ua->cookie_jar, $jar, 'cookie_jar is as expected'; +} + +{ + my $ua = eval { HTTP::Tiny->new(cookie_jar => $mug) }; + my $err = $@; + like( $err, qr/must provide .* 'add' method/ + => 'invalid jar does not support add method' ); + + $ua = eval { HTTP::Tiny->new(cookie_jar => $dog) }; + $err = $@; + like( $err, qr/must provide .* 'cookie_header' method/ + => 'invalid jar does not support cookie_header method' ); +} diff --git a/cpan/HTTP-Tiny/t/160_cookies.t b/cpan/HTTP-Tiny/t/160_cookies.t new file mode 100644 index 0000000..899a197 --- /dev/null +++ b/cpan/HTTP-Tiny/t/160_cookies.t @@ -0,0 +1,79 @@ +#!perl + +use strict; +use warnings; + +use File::Basename; +use Test::More 0.96; +use t::SimpleCookieJar; +use t::Util qw[tmpfile rewind slurp monkey_patch dir_list parse_case + hashify connect_args clear_socket_source set_socket_source sort_headers + $CRLF $LF]; + +use HTTP::Tiny; +BEGIN { monkey_patch() } + +SKIP: for my $class ( qw/t::SimpleCookieJar HTTP::CookieJar/ ) { + + subtest $class => sub { + eval "require $class; 1" + or plan skip_all => "Needs $class"; + + for my $file ( dir_list("t/cases", qr/^cookies/ ) ) { + my $label = basename($file); + my $data = do { local (@ARGV,$/) = $file; <> }; + my @cases = split /--+\n/, $data; + + my $jar = t::SimpleCookieJar->new(); + my $http = undef; + while (@cases) { + my ($params, $expect_req, $give_res) = splice( @cases, 0, 3 ); + + my $case = parse_case($params); + + my $url = $case->{url}[0]; + my $method = $case->{method}[0] || 'GET'; + my %headers = hashify( $case->{headers} ); + my %new_args = hashify( $case->{new_args} ); + + if( exists $headers{Cookie} ) { + my $cookies = delete $headers{Cookie}; + $jar->add( $url, $cookies ); + } + + if( exists $headers{'No-Cookie-Jar'} ) { + delete $headers{'No-Cookie-Jar'}; + $jar = undef; + } + + my %options; + $options{headers} = \%headers if %headers; + + my $version = HTTP::Tiny->VERSION || 0; + my $agent = $new_args{agent} || "HTTP-Tiny/$version"; + + $new_args{cookie_jar} = $jar; + + # cleanup source data + $expect_req =~ s{HTTP-Tiny/VERSION}{$agent}; + s{\n}{$CRLF}g for ($expect_req, $give_res); + + # setup mocking and test + my $res_fh = tmpfile($give_res); + my $req_fh = tmpfile(); + + $http = HTTP::Tiny->new(%new_args) if !defined $http; + clear_socket_source(); + set_socket_source($req_fh, $res_fh); + + my @call_args = %options ? ($url, \%options) : ($url); + my $response = $http->get(@call_args); + + my $got_req = slurp($req_fh); + is( sort_headers($got_req), sort_headers($expect_req), "$label request data"); + } + } + }; +} + +done_testing; diff --git a/cpan/HTTP-Tiny/t/BrokenCookieJar.pm b/cpan/HTTP-Tiny/t/BrokenCookieJar.pm new file mode 100644 index 0000000..f638e20 --- /dev/null +++ b/cpan/HTTP-Tiny/t/BrokenCookieJar.pm @@ -0,0 +1,24 @@ +package t::BrokenCookieJar; + +use strict; +use warnings; + +sub new { + my $class = shift; + return bless {} => $class; +} + +package t::BrokenCookieJar2; + +use strict; +use warnings; + +sub new { + my $class = shift; + return bless {} => $class; +} + +sub add { +} + +1; diff --git a/cpan/HTTP-Tiny/t/SimpleCookieJar.pm b/cpan/HTTP-Tiny/t/SimpleCookieJar.pm new file mode 100644 index 0000000..4c8fe08 --- /dev/null +++ b/cpan/HTTP-Tiny/t/SimpleCookieJar.pm @@ -0,0 +1,29 @@ +package t::SimpleCookieJar; + +use strict; +use warnings; + +sub new { + my $class = shift; + return bless {} => $class; +} + +sub add { + my ($self, $url, $cookie) = @_; + + my ($kv) = split qr/;/, $cookie; + my ($k, $v) = split qr/\s*=\s*/, $kv, 2; + + $self->{$url}{$k} = $v; +} + +sub cookie_header { + my ($self, $url) = @_; + + my $cookies = $self->{$url} + or return ''; + + return join( "; ", map{ "$_=$cookies->{$_}" } sort keys %$cookies ); +} + +1; diff --git a/cpan/HTTP-Tiny/t/cases/cookies-01.txt b/cpan/HTTP-Tiny/t/cases/cookies-01.txt new file mode 100644 index 0000000..e71bf01 --- /dev/null +++ b/cpan/HTTP-Tiny/t/cases/cookies-01.txt @@ -0,0 +1,34 @@ +url + http://example.com/index.html +---------- +GET /index.html HTTP/1.1 +Host: example.com +Connection: close +User-Agent: HTTP-Tiny/VERSION + +---------- +HTTP/1.1 200 OK +Date: Sat, 02 Mar 2013 00:00:00 GMT +Set-Cookie: cname=cvalue; domain=example.com; path=/ +Content-Type: text/plain +Content-Length: 44 + +abcdefghijklmnopqrstuvwxyz1234567890abcdef +---------- +url + http://example.com/index.html +---------- +GET /index.html HTTP/1.1 +Host: example.com +Connection: close +User-Agent: HTTP-Tiny/VERSION +Cookie: cname=cvalue + +---------- +HTTP/1.1 200 OK +Date: Sat, 02 Mar 2013 00:00:00 GMT +Set-Cookie: cname=cvalue; domain=example.com; path=/ +Content-Type: text/plain +Content-Length: 44 + +abcdefghijklmnopqrstuvwxyz1234567890abcdef diff --git a/cpan/HTTP-Tiny/t/cases/cookies-02.txt b/cpan/HTTP-Tiny/t/cases/cookies-02.txt new file mode 100644 index 0000000..7e7db2c --- /dev/null +++ b/cpan/HTTP-Tiny/t/cases/cookies-02.txt @@ -0,0 +1,52 @@ +url + http://example.com/index.html +---------- +GET /index.html HTTP/1.1 +Host: example.com +Connection: close +User-Agent: HTTP-Tiny/VERSION + +---------- +HTTP/1.1 200 OK +Date: Sat, 02 Mar 2013 00:00:00 GMT +Set-Cookie: cname=cvalue01; domain=example.com; path=/ +Content-Type: text/plain +Content-Length: 44 + +abcdefghijklmnopqrstuvwxyz1234567890abcdef +---------- +url + http://example.com/index.html +---------- +GET /index.html HTTP/1.1 +Host: example.com +Connection: close +User-Agent: HTTP-Tiny/VERSION +Cookie: cname=cvalue01 + +---------- +HTTP/1.1 200 OK +Date: Sat, 02 Mar 2013 00:00:00 GMT +Set-Cookie: cname=cvalue02; domain=example.com; path=/ +Content-Type: text/plain +Content-Length: 44 + +abcdefghijklmnopqrstuvwxyz1234567890abcdef +---------- +url + http://example.com/index.html +---------- +GET /index.html HTTP/1.1 +Host: example.com +Connection: close +User-Agent: HTTP-Tiny/VERSION +Cookie: cname=cvalue02 + +---------- +HTTP/1.1 200 OK +Date: Sat, 02 Mar 2013 00:00:00 GMT +Set-Cookie: cname=cvalue02; domain=example.com; path=/ +Content-Type: text/plain +Content-Length: 44 + +abcdefghijklmnopqrstuvwxyz1234567890abcdef diff --git a/cpan/HTTP-Tiny/t/cases/cookies-03.txt b/cpan/HTTP-Tiny/t/cases/cookies-03.txt new file mode 100644 index 0000000..c7eab4e --- /dev/null +++ b/cpan/HTTP-Tiny/t/cases/cookies-03.txt @@ -0,0 +1,87 @@ +url + http://example.com/index.html +---------- +GET /index.html HTTP/1.1 +Host: example.com +Connection: close +User-Agent: HTTP-Tiny/VERSION + +---------- +HTTP/1.1 200 OK +Date: Sat, 02 Mar 2013 00:00:00 GMT +Set-Cookie: cname=cvalue01; domain=example.com; path=/ +Content-Type: text/plain +Content-Length: 44 + +abcdefghijklmnopqrstuvwxyz1234567890abcdef +---------- +url + http://example.com/index.html +---------- +GET /index.html HTTP/1.1 +Host: example.com +Connection: close +User-Agent: HTTP-Tiny/VERSION +Cookie: cname=cvalue01 + +---------- +HTTP/1.1 200 OK +Date: Sat, 02 Mar 2013 00:00:00 GMT +Set-Cookie: cname=cvalue02; domain=example.com; path=/ +Content-Type: text/plain +Content-Length: 44 + +abcdefghijklmnopqrstuvwxyz1234567890abcdef +---------- +url + http://example.com/index02.html +---------- +GET /index02.html HTTP/1.1 +Host: example.com +Connection: close +User-Agent: HTTP-Tiny/VERSION + +---------- +HTTP/1.1 200 OK +Date: Sat, 02 Mar 2013 00:00:00 GMT +Set-Cookie: cname=cvalue03; domain=example.com; path=/ +Content-Type: text/plain +Content-Length: 44 + +abcdefghijklmnopqrstuvwxyz1234567890abcdef +---------- +url + http://example.com/index.html +---------- +GET /index.html HTTP/1.1 +Host: example.com +Connection: close +User-Agent: HTTP-Tiny/VERSION +Cookie: cname=cvalue02 + +---------- +HTTP/1.1 200 OK +Date: Sat, 02 Mar 2013 00:00:00 GMT +Set-Cookie: cname=cvalue02; domain=example.com; path=/ +Content-Type: text/plain +Content-Length: 44 + +abcdefghijklmnopqrstuvwxyz1234567890abcdef +---------- +url + http://example.com/index02.html +---------- +GET /index02.html HTTP/1.1 +Host: example.com +Connection: close +User-Agent: HTTP-Tiny/VERSION +Cookie: cname=cvalue03 + +---------- +HTTP/1.1 200 OK +Date: Sat, 02 Mar 2013 00:00:00 GMT +Set-Cookie: cname=cvalue03; domain=example.com; path=/ +Content-Type: text/plain +Content-Length: 44 + +abcdefghijklmnopqrstuvwxyz1234567890abcdef diff --git a/cpan/HTTP-Tiny/t/cases/cookies-04.txt b/cpan/HTTP-Tiny/t/cases/cookies-04.txt new file mode 100644 index 0000000..7c9c1cb --- /dev/null +++ b/cpan/HTTP-Tiny/t/cases/cookies-04.txt @@ -0,0 +1,37 @@ +url + http://example.com/index.html +headers + Cookie: cname=cvalue05; domain=example.com; path=/ +---------- +GET /index.html HTTP/1.1 +Host: example.com +Connection: close +User-Agent: HTTP-Tiny/VERSION +Cookie: cname=cvalue05 + +---------- +HTTP/1.1 200 OK +Date: Sat, 02 Mar 2013 00:00:00 GMT +Set-Cookie: cname=cvalue06; domain=example.com; path=/ +Content-Type: text/plain +Content-Length: 44 + +abcdefghijklmnopqrstuvwxyz1234567890abcdef +---------- +url + http://example.com/index.html +---------- +GET /index.html HTTP/1.1 +Host: example.com +Connection: close +User-Agent: HTTP-Tiny/VERSION +Cookie: cname=cvalue06 + +---------- +HTTP/1.1 200 OK +Date: Sat, 02 Mar 2013 00:00:00 GMT +Set-Cookie: cname=cvalue06; domain=example.com; path=/ +Content-Type: text/plain +Content-Length: 44 + +abcdefghijklmnopqrstuvwxyz1234567890abcdef diff --git a/cpan/HTTP-Tiny/t/cases/cookies-05.txt b/cpan/HTTP-Tiny/t/cases/cookies-05.txt new file mode 100644 index 0000000..0d41152 --- /dev/null +++ b/cpan/HTTP-Tiny/t/cases/cookies-05.txt @@ -0,0 +1,35 @@ +url + http://example.com/index.html +headers + No-Cookie-Jar: 1 +---------- +GET /index.html HTTP/1.1 +Host: example.com +Connection: close +User-Agent: HTTP-Tiny/VERSION + +---------- +HTTP/1.1 200 OK +Date: Sat, 02 Mar 2013 00:00:00 GMT +Set-Cookie: cname=cvalue06; domain=example.com; path=/ +Content-Type: text/plain +Content-Length: 44 + +abcdefghijklmnopqrstuvwxyz1234567890abcdef +---------- +url + http://example.com/index.html +---------- +GET /index.html HTTP/1.1 +Host: example.com +Connection: close +User-Agent: HTTP-Tiny/VERSION + +---------- +HTTP/1.1 200 OK +Date: Sat, 02 Mar 2013 00:00:00 GMT +Set-Cookie: cname=cvalue06; domain=example.com; path=/ +Content-Type: text/plain +Content-Length: 44 + +abcdefghijklmnopqrstuvwxyz1234567890abcdef diff --git a/cpan/HTTP-Tiny/t/cases/cookies-06.txt b/cpan/HTTP-Tiny/t/cases/cookies-06.txt new file mode 100644 index 0000000..86632b0 --- /dev/null +++ b/cpan/HTTP-Tiny/t/cases/cookies-06.txt @@ -0,0 +1,51 @@ +url + http://example.com/index.html +---------- +GET /index.html HTTP/1.1 +Host: example.com +Connection: close +User-Agent: HTTP-Tiny/VERSION + +---------- +HTTP/1.1 200 OK +Date: Sat, 02 Mar 2013 00:00:00 GMT +Set-Cookie: cname1=cvalue01; domain=example.com; path=/ +Content-Type: text/plain +Content-Length: 44 + +abcdefghijklmnopqrstuvwxyz1234567890abcdef +---------- +url + http://example.com/index.html +---------- +GET /index.html HTTP/1.1 +Host: example.com +Connection: close +User-Agent: HTTP-Tiny/VERSION +Cookie: cname1=cvalue01 + +---------- +HTTP/1.1 200 OK +Date: Sat, 02 Mar 2013 00:00:00 GMT +Set-Cookie: cname2=cvalue02; domain=example.com; path=/ +Content-Type: text/plain +Content-Length: 44 + +abcdefghijklmnopqrstuvwxyz1234567890abcdef +---------- +url + http://example.com/index.html +---------- +GET /index.html HTTP/1.1 +Host: example.com +Connection: close +User-Agent: HTTP-Tiny/VERSION +Cookie: cname1=cvalue01; cname2=cvalue02 + +---------- +HTTP/1.1 200 OK +Date: Sat, 02 Mar 2013 00:00:00 GMT +Content-Type: text/plain +Content-Length: 44 + +abcdefghijklmnopqrstuvwxyz1234567890abcdef diff --git a/cpan/HTTP-Tiny/t/cases/cookies-07.txt b/cpan/HTTP-Tiny/t/cases/cookies-07.txt new file mode 100644 index 0000000..69c4a62 --- /dev/null +++ b/cpan/HTTP-Tiny/t/cases/cookies-07.txt @@ -0,0 +1,34 @@ +url + http://example.com/index.html +---------- +GET /index.html HTTP/1.1 +Host: example.com +Connection: close +User-Agent: HTTP-Tiny/VERSION + +---------- +HTTP/1.1 200 OK +Date: Sat, 02 Mar 2013 00:00:00 GMT +Set-Cookie: cname1=cvalue01; domain=example.com; path=/ +Set-Cookie: cname2=cvalue02; domain=example.com; path=/ +Content-Type: text/plain +Content-Length: 44 + +abcdefghijklmnopqrstuvwxyz1234567890abcdef +---------- +url + http://example.com/index.html +---------- +GET /index.html HTTP/1.1 +Host: example.com +Connection: close +User-Agent: HTTP-Tiny/VERSION +Cookie: cname1=cvalue01; cname2=cvalue02 + +---------- +HTTP/1.1 200 OK +Date: Sat, 02 Mar 2013 00:00:00 GMT +Content-Type: text/plain +Content-Length: 44 + +abcdefghijklmnopqrstuvwxyz1234567890abcdef diff --git a/cpan/Module-Build/Changes b/cpan/Module-Build/Changes index 5d79968..fc37e21 100644 --- a/cpan/Module-Build/Changes +++ b/cpan/Module-Build/Changes @@ -1,5 +1,27 @@ Revision history for Perl extension Module::Build. +0.4005 - Thu Apr 25 15:10:14 CEST 2013 + + [ENHANCEMENTS] + + - Added --pureperl-only support + + [BUG FIXES] + + - #72176: pod2html will fail with an empty podpath in some cases. [Phillip Moore] + + - Fix links between modules in HTML docs output [Michael Wild, Leon Timmermans] + +0.4004 - Fri Mar 29 15:05:00 CET 2013 + + [BUG FIXES] + + - Minor VMS fix for @INC [Craig Berry] + + [ENHANCEMENTS] + + - test_requires support has been added [Matsuno Tokuhiro] + 0.4003 - Sat Aug 18 11:17:49 CEST 2012 [BUG FIXES] diff --git a/cpan/Module-Build/lib/Module/Build.pm b/cpan/Module-Build/lib/Module/Build.pm index fd835fc..3c964e7 100644 --- a/cpan/Module-Build/lib/Module/Build.pm +++ b/cpan/Module-Build/lib/Module/Build.pm @@ -16,7 +16,7 @@ use Module::Build::Base; use vars qw($VERSION @ISA); @ISA = qw(Module::Build::Base); -$VERSION = '0.4003'; +$VERSION = '0.4005'; $VERSION = eval $VERSION; diff --git a/cpan/Module-Build/lib/Module/Build/API.pod b/cpan/Module-Build/lib/Module/Build/API.pod index 4980218..2810c2b 100644 --- a/cpan/Module-Build/lib/Module/Build/API.pod +++ b/cpan/Module-Build/lib/Module/Build/API.pod @@ -72,6 +72,13 @@ An array reference of files to be cleaned up when the C<clean> action is performed. See also the L<add_to_cleanup()|/"add_to_cleanup(@files)"> method. +=item allow_pureperl + +[version 0.4005] + +A bool indicating the module is still functional without its xs parts. +When an XS module is build with --pureperl_only, it will otherwise fail. + =item auto_configure_requires [version 0.34] @@ -175,6 +182,15 @@ See L</auto_configure_requires> for details. See the documentation for L<Module::Build::Authoring/"PREREQUISITES"> for the details of how requirements can be specified. +=item test_requires + +[version 0.4004] + +Modules listed in this section must be installed before testing the distribution. + +See the documentation for L<Module::Build::Authoring/"PREREQUISITES"> +for the details of how requirements can be specified. + =item create_packlist [version 0.28] @@ -1753,7 +1769,7 @@ Examples: Returns a reference to a hash describing all prerequisites. The keys of the hash will be the various prerequisite types ('requires', 'build_requires', -'configure_requires', 'recommends', or 'conflicts') and the values will be +'test_requires', 'configure_requires', 'recommends', or 'conflicts') and the values will be references to hashes of module names and version numbers. Only prerequisites types that are defined will be included. The C<prereq_data> action is just a thin wrapper around the C<prereq_data()> method and dumps the hash as a string @@ -1916,6 +1932,8 @@ accessor methods for the following properties: =item allow_mb_mismatch() +=item allow_pureperl() + =item auto_configure_requires() =item autosplit() @@ -2016,6 +2034,8 @@ accessor methods for the following properties: =item program_name() +=item pureperl_only() + =item quiet() =item recommends() @@ -2034,6 +2054,8 @@ accessor methods for the following properties: =item test_file_exts() +=item test_requires() + =item use_rcfile() =item use_tap_harness() diff --git a/cpan/Module-Build/lib/Module/Build/Authoring.pod b/cpan/Module-Build/lib/Module/Build/Authoring.pod index b1dc584..7bbf562 100644 --- a/cpan/Module-Build/lib/Module/Build/Authoring.pod +++ b/cpan/Module-Build/lib/Module/Build/Authoring.pod @@ -183,6 +183,10 @@ ways to use this distribution without having them installed. You might also think of this as "can use" or "is aware of" or "changes behavior in the presence of". +=item test_requires + +Items that are necessary for testing. + =item conflicts Items that can cause problems with this distribution when installed. diff --git a/cpan/Module-Build/lib/Module/Build/Base.pm b/cpan/Module-Build/lib/Module/Build/Base.pm index cf42cc0..5fb8506 100644 --- a/cpan/Module-Build/lib/Module/Build/Base.pm +++ b/cpan/Module-Build/lib/Module/Build/Base.pm @@ -6,7 +6,7 @@ use strict; use vars qw($VERSION); use warnings; -$VERSION = '0.4003'; +$VERSION = '0.4005'; $VERSION = eval $VERSION; BEGIN { require 5.006001 } @@ -922,6 +922,8 @@ __PACKAGE__->add_property(test_file_exts => ['.t']); __PACKAGE__->add_property(use_tap_harness => 0); __PACKAGE__->add_property(cpan_client => 'cpan'); __PACKAGE__->add_property(tap_harness_args => {}); +__PACKAGE__->add_property(pureperl_only => 0); +__PACKAGE__->add_property(allow_pureperl => 0); __PACKAGE__->add_property( 'installdirs', default => 'site', @@ -942,7 +944,7 @@ __PACKAGE__->add_property( } { - my @prereq_action_types = qw(requires build_requires conflicts recommends); + my @prereq_action_types = qw(requires build_requires test_requires conflicts recommends); foreach my $type (@prereq_action_types) { __PACKAGE__->add_property($type => {}); } @@ -1812,7 +1814,7 @@ sub print_build_script { my @myINC = $self->_added_to_INC; for (@myINC, values %q) { - $_ = File::Spec->canonpath( $_ ); + $_ = File::Spec->canonpath( $_ ) unless $self->is_vmsish; s/([\\\'])/\\$1/g; } @@ -1915,6 +1917,7 @@ sub create_mymeta { # XXX refactor this mapping somewhere $mymeta->{prereqs}{runtime}{requires} = $prereqs->{requires}; $mymeta->{prereqs}{build}{requires} = $prereqs->{build_requires}; + $mymeta->{prereqs}{test}{requires} = $prereqs->{test_requires}; $mymeta->{prereqs}{runtime}{recommends} = $prereqs->{recommends}; $mymeta->{prereqs}{runtime}{conflicts} = $prereqs->{conflicts}; # delete empty entries @@ -2119,6 +2122,8 @@ sub _translate_option { use_tap_harness tap_harness_args cpan_client + pureperl_only + allow_pureperl ); # normalize only selected option names return $opt; @@ -2159,6 +2164,8 @@ sub _optional_arg { debug sign use_tap_harness + pureperl_only + allow_pureperl ); # inverted boolean options; eg --noverbose or --no-verbose @@ -2968,7 +2975,9 @@ sub process_PL_files { sub process_xs_files { my $self = shift; + return if $self->pureperl_only && $self->allow_pureperl; my $files = $self->find_xs_files; + croak 'Can\'t build xs files under --pureperl-only' if %$files && $self->pureperl_only; while (my ($from, $to) = each %$files) { unless ($from eq $to) { $self->add_to_cleanup($to); @@ -3301,6 +3310,7 @@ sub _find_pods { foreach my $regexp ( @{ $args{exclude} } ) { next FILE if $file =~ $regexp; } + $file = $self->localize_file_path($file); $files{$file} = File::Spec->abs2rel($file, $dir) if $self->contains_pod( $file ) } } @@ -3358,11 +3368,11 @@ sub htmlify_pods { : $self->original_prefix('core'); my $htmlroot = $self->install_sets('core')->{libhtml}; - my @podpath = (map { File::Spec->abs2rel($_ ,$podroot) } grep { -d } + my @podpath = ( (map { File::Spec->abs2rel($_ ,$podroot) } grep { -d } ( $self->install_sets('core', 'lib'), # lib $self->install_sets('core', 'bin'), # bin $self->install_sets('site', 'lib'), # site/lib - ) ), File::Spec->rel2abs($self->blib); + ) ), File::Spec->rel2abs($self->blib) ); my $podpath = $ENV{PERL_CORE} ? File::Spec->catdir($podroot, 'lib') @@ -3427,7 +3437,7 @@ sub htmlify_pods { } or $self->log_warn("[$htmltool] pod2html (" . join(", ", map { "q{$_} => q{$opts{$_}}" } (keys %opts)) . ") failed: $@"); } else { - my $path2root = join( '/', ('..') x (@rootdirs+@dirs) ); + my $path2root = File::Spec->catdir(File::Spec->updir x @dirs); my $fh = IO::File->new($infile) or die "Can't read $infile: $!"; my $abstract = Module::Build::PodParser->new(fh => $fh)->get_abstract(); @@ -4094,9 +4104,9 @@ sub ACTION_disttest { $self->run_perl_script('Build.PL') # XXX Should this be run w/ --nouse-rcfile or die "Error executing 'Build.PL' in dist directory: $!"; - $self->run_perl_script('Build') - or die "Error executing 'Build' in dist directory: $!"; - $self->run_perl_script('Build', [], ['test']) + $self->run_perl_script($self->build_script) + or die "Error executing $self->build_script in dist directory: $!"; + $self->run_perl_script($self->build_script, [], ['test']) or die "Error executing 'Build test' in dist directory"; }); } @@ -4110,9 +4120,9 @@ sub ACTION_distinstall { sub { $self->run_perl_script('Build.PL') or die "Error executing 'Build.PL' in dist directory: $!"; - $self->run_perl_script('Build') - or die "Error executing 'Build' in dist directory: $!"; - $self->run_perl_script('Build', [], ['install']) + $self->run_perl_script($self->build_script) + or die "Error executing $self->build_script in dist directory: $!"; + $self->run_perl_script($self->build_script, [], ['install']) or die "Error executing 'Build install' in dist directory"; } ); diff --git a/cpan/Module-Build/lib/Module/Build/Compat.pm b/cpan/Module-Build/lib/Module/Build/Compat.pm index 79499a6..504c6f9 100644 --- a/cpan/Module-Build/lib/Module/Build/Compat.pm +++ b/cpan/Module-Build/lib/Module/Build/Compat.pm @@ -2,7 +2,7 @@ package Module::Build::Compat; use strict; use vars qw($VERSION); -$VERSION = '0.4003'; +$VERSION = '0.4005'; use File::Basename (); use File::Spec; diff --git a/cpan/Module-Build/lib/Module/Build/Config.pm b/cpan/Module-Build/lib/Module/Build/Config.pm index 88a3ff3..9bb5e54 100644 --- a/cpan/Module-Build/lib/Module/Build/Config.pm +++ b/cpan/Module-Build/lib/Module/Build/Config.pm @@ -2,7 +2,7 @@ package Module::Build::Config; use strict; use vars qw($VERSION); -$VERSION = '0.4003'; +$VERSION = '0.4005'; $VERSION = eval $VERSION; use Config; diff --git a/cpan/Module-Build/lib/Module/Build/Cookbook.pm b/cpan/Module-Build/lib/Module/Build/Cookbook.pm index e66020c..84ef43a 100644 --- a/cpan/Module-Build/lib/Module/Build/Cookbook.pm +++ b/cpan/Module-Build/lib/Module/Build/Cookbook.pm @@ -1,7 +1,7 @@ package Module::Build::Cookbook; use strict; use vars qw($VERSION); -$VERSION = '0.4003'; +$VERSION = '0.4005'; =head1 NAME diff --git a/cpan/Module-Build/lib/Module/Build/Dumper.pm b/cpan/Module-Build/lib/Module/Build/Dumper.pm index 73839c7..7db6262 100644 --- a/cpan/Module-Build/lib/Module/Build/Dumper.pm +++ b/cpan/Module-Build/lib/Module/Build/Dumper.pm @@ -1,7 +1,7 @@ package Module::Build::Dumper; use strict; use vars qw($VERSION); -$VERSION = '0.4003'; +$VERSION = '0.4005'; # This is just a split-out of a wrapper function to do Data::Dumper # stuff "the right way". See: diff --git a/cpan/Module-Build/lib/Module/Build/ModuleInfo.pm b/cpan/Module-Build/lib/Module/Build/ModuleInfo.pm index b36cc38..9309fe8 100644 --- a/cpan/Module-Build/lib/Module/Build/ModuleInfo.pm +++ b/cpan/Module-Build/lib/Module/Build/ModuleInfo.pm @@ -4,7 +4,7 @@ package Module::Build::ModuleInfo; use strict; use vars qw($VERSION); -$VERSION = '0.4003'; +$VERSION = '0.4005'; $VERSION = eval $VERSION; require Module::Metadata; diff --git a/cpan/Module-Build/lib/Module/Build/Notes.pm b/cpan/Module-Build/lib/Module/Build/Notes.pm index 0477322..bd1433d 100644 --- a/cpan/Module-Build/lib/Module/Build/Notes.pm +++ b/cpan/Module-Build/lib/Module/Build/Notes.pm @@ -4,7 +4,7 @@ package Module::Build::Notes; use strict; use vars qw($VERSION); -$VERSION = '0.4003'; +$VERSION = '0.4005'; $VERSION = eval $VERSION; use Data::Dumper; use IO::File; diff --git a/cpan/Module-Build/lib/Module/Build/PPMMaker.pm b/cpan/Module-Build/lib/Module/Build/PPMMaker.pm index 34f5495..a996e59 100644 --- a/cpan/Module-Build/lib/Module/Build/PPMMaker.pm +++ b/cpan/Module-Build/lib/Module/Build/PPMMaker.pm @@ -5,7 +5,7 @@ use Config; use vars qw($VERSION); use IO::File; -$VERSION = '0.4003'; +$VERSION = '0.4005'; $VERSION = eval $VERSION; # This code is mostly borrowed from ExtUtils::MM_Unix 6.10_03, with a diff --git a/cpan/Module-Build/lib/Module/Build/Platform/Amiga.pm b/cpan/Module-Build/lib/Module/Build/Platform/Amiga.pm index 0be3dde..a0bf3bd 100644 --- a/cpan/Module-Build/lib/Module/Build/Platform/Amiga.pm +++ b/cpan/Module-Build/lib/Module/Build/Platform/Amiga.pm @@ -2,7 +2,7 @@ package Module::Build::Platform::Amiga; use strict; use vars qw($VERSION); -$VERSION = '0.4003'; +$VERSION = '0.4005'; $VERSION = eval $VERSION; use Module::Build::Base; diff --git a/cpan/Module-Build/lib/Module/Build/Platform/Default.pm b/cpan/Module-Build/lib/Module/Build/Platform/Default.pm index 53bffc0..db6a63d 100644 --- a/cpan/Module-Build/lib/Module/Build/Platform/Default.pm +++ b/cpan/Module-Build/lib/Module/Build/Platform/Default.pm @@ -2,7 +2,7 @@ package Module::Build::Platform::Default; use strict; use vars qw($VERSION); -$VERSION = '0.4003'; +$VERSION = '0.4005'; $VERSION = eval $VERSION; use Module::Build::Base; diff --git a/cpan/Module-Build/lib/Module/Build/Platform/EBCDIC.pm b/cpan/Module-Build/lib/Module/Build/Platform/EBCDIC.pm index 8c4349b..3829f44 100644 --- a/cpan/Module-Build/lib/Module/Build/Platform/EBCDIC.pm +++ b/cpan/Module-Build/lib/Module/Build/Platform/EBCDIC.pm @@ -2,7 +2,7 @@ package Module::Build::Platform::EBCDIC; use strict; use vars qw($VERSION); -$VERSION = '0.4003'; +$VERSION = '0.4005'; $VERSION = eval $VERSION; use Module::Build::Base; diff --git a/cpan/Module-Build/lib/Module/Build/Platform/MPEiX.pm b/cpan/Module-Build/lib/Module/Build/Platform/MPEiX.pm index 5688a99..60728bd 100644 --- a/cpan/Module-Build/lib/Module/Build/Platform/MPEiX.pm +++ b/cpan/Module-Build/lib/Module/Build/Platform/MPEiX.pm @@ -2,7 +2,7 @@ package Module::Build::Platform::MPEiX; use strict; use vars qw($VERSION); -$VERSION = '0.4003'; +$VERSION = '0.4005'; $VERSION = eval $VERSION; use Module::Build::Base; diff --git a/cpan/Module-Build/lib/Module/Build/Platform/MacOS.pm b/cpan/Module-Build/lib/Module/Build/Platform/MacOS.pm index 8b56766..e72ee77 100644 --- a/cpan/Module-Build/lib/Module/Build/Platform/MacOS.pm +++ b/cpan/Module-Build/lib/Module/Build/Platform/MacOS.pm @@ -2,7 +2,7 @@ package Module::Build::Platform::MacOS; use strict; use vars qw($VERSION); -$VERSION = '0.4003'; +$VERSION = '0.4005'; $VERSION = eval $VERSION; use Module::Build::Base; use vars qw(@ISA); diff --git a/cpan/Module-Build/lib/Module/Build/Platform/RiscOS.pm b/cpan/Module-Build/lib/Module/Build/Platform/RiscOS.pm index 6ed9d3d..16fc776 100644 --- a/cpan/Module-Build/lib/Module/Build/Platform/RiscOS.pm +++ b/cpan/Module-Build/lib/Module/Build/Platform/RiscOS.pm @@ -2,7 +2,7 @@ package Module::Build::Platform::RiscOS; use strict; use vars qw($VERSION); -$VERSION = '0.4003'; +$VERSION = '0.4005'; $VERSION = eval $VERSION; use Module::Build::Base; diff --git a/cpan/Module-Build/lib/Module/Build/Platform/Unix.pm b/cpan/Module-Build/lib/Module/Build/Platform/Unix.pm index e3d7ff5..2b514e4 100644 --- a/cpan/Module-Build/lib/Module/Build/Platform/Unix.pm +++ b/cpan/Module-Build/lib/Module/Build/Platform/Unix.pm @@ -2,7 +2,7 @@ package Module::Build::Platform::Unix; use strict; use vars qw($VERSION); -$VERSION = '0.4003'; +$VERSION = '0.4005'; $VERSION = eval $VERSION; use Module::Build::Base; diff --git a/cpan/Module-Build/lib/Module/Build/Platform/VMS.pm b/cpan/Module-Build/lib/Module/Build/Platform/VMS.pm index 7ff7e05..d447fbc 100644 --- a/cpan/Module-Build/lib/Module/Build/Platform/VMS.pm +++ b/cpan/Module-Build/lib/Module/Build/Platform/VMS.pm @@ -2,7 +2,7 @@ package Module::Build::Platform::VMS; use strict; use vars qw($VERSION); -$VERSION = '0.4003'; +$VERSION = '0.4005'; $VERSION = eval $VERSION; use Module::Build::Base; use Config; diff --git a/cpan/Module-Build/lib/Module/Build/Platform/VOS.pm b/cpan/Module-Build/lib/Module/Build/Platform/VOS.pm index 2578e31..db94bf4 100644 --- a/cpan/Module-Build/lib/Module/Build/Platform/VOS.pm +++ b/cpan/Module-Build/lib/Module/Build/Platform/VOS.pm @@ -2,7 +2,7 @@ package Module::Build::Platform::VOS; use strict; use vars qw($VERSION); -$VERSION = '0.4003'; +$VERSION = '0.4005'; $VERSION = eval $VERSION; use Module::Build::Base; diff --git a/cpan/Module-Build/lib/Module/Build/Platform/Windows.pm b/cpan/Module-Build/lib/Module/Build/Platform/Windows.pm index e35e28f..859d1fb 100644 --- a/cpan/Module-Build/lib/Module/Build/Platform/Windows.pm +++ b/cpan/Module-Build/lib/Module/Build/Platform/Windows.pm @@ -2,7 +2,7 @@ package Module::Build::Platform::Windows; use strict; use vars qw($VERSION); -$VERSION = '0.4003'; +$VERSION = '0.4005'; $VERSION = eval $VERSION; use Config; diff --git a/cpan/Module-Build/lib/Module/Build/Platform/aix.pm b/cpan/Module-Build/lib/Module/Build/Platform/aix.pm index 3833ceb..e8928ac 100644 --- a/cpan/Module-Build/lib/Module/Build/Platform/aix.pm +++ b/cpan/Module-Build/lib/Module/Build/Platform/aix.pm @@ -2,7 +2,7 @@ package Module::Build::Platform::aix; use strict; use vars qw($VERSION); -$VERSION = '0.4003'; +$VERSION = '0.4005'; $VERSION = eval $VERSION; use Module::Build::Platform::Unix; diff --git a/cpan/Module-Build/lib/Module/Build/Platform/cygwin.pm b/cpan/Module-Build/lib/Module/Build/Platform/cygwin.pm index 15d3e81..136e853 100644 --- a/cpan/Module-Build/lib/Module/Build/Platform/cygwin.pm +++ b/cpan/Module-Build/lib/Module/Build/Platform/cygwin.pm @@ -2,7 +2,7 @@ package Module::Build::Platform::cygwin; use strict; use vars qw($VERSION); -$VERSION = '0.4003'; +$VERSION = '0.4005'; $VERSION = eval $VERSION; use Module::Build::Platform::Unix; diff --git a/cpan/Module-Build/lib/Module/Build/Platform/darwin.pm b/cpan/Module-Build/lib/Module/Build/Platform/darwin.pm index 45d68fd..2f939a1 100644 --- a/cpan/Module-Build/lib/Module/Build/Platform/darwin.pm +++ b/cpan/Module-Build/lib/Module/Build/Platform/darwin.pm @@ -2,7 +2,7 @@ package Module::Build::Platform::darwin; use strict; use vars qw($VERSION); -$VERSION = '0.4003'; +$VERSION = '0.4005'; $VERSION = eval $VERSION; use Module::Build::Platform::Unix; diff --git a/cpan/Module-Build/lib/Module/Build/Platform/os2.pm b/cpan/Module-Build/lib/Module/Build/Platform/os2.pm index 52d6e17..40797fb 100644 --- a/cpan/Module-Build/lib/Module/Build/Platform/os2.pm +++ b/cpan/Module-Build/lib/Module/Build/Platform/os2.pm @@ -2,7 +2,7 @@ package Module::Build::Platform::os2; use strict; use vars qw($VERSION); -$VERSION = '0.4003'; +$VERSION = '0.4005'; $VERSION = eval $VERSION; use Module::Build::Platform::Unix; diff --git a/cpan/Module-Build/lib/Module/Build/PodParser.pm b/cpan/Module-Build/lib/Module/Build/PodParser.pm index 6605fd4..ab4f467 100644 --- a/cpan/Module-Build/lib/Module/Build/PodParser.pm +++ b/cpan/Module-Build/lib/Module/Build/PodParser.pm @@ -2,7 +2,7 @@ package Module::Build::PodParser; use strict; use vars qw($VERSION); -$VERSION = '0.4003'; +$VERSION = '0.4005'; $VERSION = eval $VERSION; use vars qw(@ISA); diff --git a/cpan/Module-Build/lib/inc/latest.pm b/cpan/Module-Build/lib/inc/latest.pm index b794c4a..631a234 100644 --- a/cpan/Module-Build/lib/inc/latest.pm +++ b/cpan/Module-Build/lib/inc/latest.pm @@ -1,7 +1,7 @@ package inc::latest; use strict; use vars qw($VERSION); -$VERSION = '0.4003'; +$VERSION = '0.4005'; $VERSION = eval $VERSION; use Carp; diff --git a/cpan/Module-Build/lib/inc/latest/private.pm b/cpan/Module-Build/lib/inc/latest/private.pm index 2a62c57..d17ecc1 100644 --- a/cpan/Module-Build/lib/inc/latest/private.pm +++ b/cpan/Module-Build/lib/inc/latest/private.pm @@ -1,7 +1,7 @@ package inc::latest::private; use strict; use vars qw($VERSION); -$VERSION = '0.4003'; +$VERSION = '0.4005'; $VERSION = eval $VERSION; use File::Spec; diff --git a/cpan/Module-Build/t/install.t b/cpan/Module-Build/t/install.t index 2d487f6..261411c 100644 --- a/cpan/Module-Build/t/install.t +++ b/cpan/Module-Build/t/install.t @@ -209,14 +209,6 @@ Simple Man <simple@example.com> is keys %$pods, 1; my $expect = $mb->localize_file_path('lib/Simple/Docs.pod'); - # TODO: - # True for traditional VMS, but will need to be changed when ODS-5 support - # for case preserved filenames is active. - # The issue is that the keys to the $pods hash are currently being set to - # lowercase on VMS so can not be found in exact case. - - $expect = lc($expect) if $^O eq 'VMS'; - is $pods->{$expect}, $expect; my $pms = $mb->_find_file_by_type('awefawef', 'lib'); diff --git a/cpan/Module-Build/t/metadata.t b/cpan/Module-Build/t/metadata.t index f9ce95e..d728a68 100644 --- a/cpan/Module-Build/t/metadata.t +++ b/cpan/Module-Build/t/metadata.t @@ -2,7 +2,7 @@ use strict; use lib 't/lib'; -use MBTest tests => 51; +use MBTest tests => 52; blib_load('Module::Build'); blib_load('Module::Build::ConfigData'); @@ -15,6 +15,9 @@ my %metadata = dist_version => '3.14159265', dist_author => [ 'Simple Simon <ss\@somewhere.priv>' ], dist_abstract => 'Something interesting', + test_requires => { + 'Test::More' => 0.98, + }, license => 'perl', meta_add => { keywords => [qw(super duper something)], @@ -80,6 +83,9 @@ my $mb = Module::Build->new_from_context; is_deeply $node->{author}, $metadata{dist_author}; is $node->{license}, $metadata{license}; is_deeply $node->{configure_requires}, $mb_config_req, 'Add M::B to configure_requires'; + is_deeply $node->{test_requires}, { + 'Test::More' => '0.98', + }, 'Test::More was required by ->new'; like $node->{generated_by}, qr{Module::Build}; ok defined( $node->{'meta-spec'}{version} ), "'meta-spec' -> 'version' field present in META.yml"; diff --git a/cpan/Module-Build/t/xs.t b/cpan/Module-Build/t/xs.t index 84f82d9..6d81361 100644 --- a/cpan/Module-Build/t/xs.t +++ b/cpan/Module-Build/t/xs.t @@ -19,7 +19,7 @@ blib_load('Module::Build'); } elsif ( !$Config{usedl} ) { plan skip_all => 'Perl not compiled for dynamic loading' } else { - plan tests => 20; + plan tests => 22; } require Cwd; $tmp = MBTest->tmpdir( $tmp_exec ? () : (DIR => Cwd::cwd) ); @@ -117,6 +117,14 @@ is $@, ''; stdout_stderr_of( sub { eval { $mb->dispatch('test') } } ); is $@, ''; +eval { $mb->dispatch('clean') }; + +eval { $mb->dispatch('build', 'pureperl_only' => 1) }; +like $@, qr/\ACan\'t build xs files under --pureperl-only/, 'Can\'t build xs under pureperl'; + +eval { $mb->dispatch('build', pureperl_only => 1, allow_pureperl => 1) }; +is $@, '', 'Can\'t build xs under pureperl, unless allow_pureperl'; + eval { $mb->dispatch('realclean') }; is $@, ''; -- Perl5 Master Repository http://www.nntp.perl.org/group/perl.perl5.changes/2013/05/msg37218.html Fri, 24 May 2013 21:09:30 +0000 [perl.git] branch blead, updated. v5.19.0-178-gcb1974b by Chris 'Bingos' Williams In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/cb1974ba967c78b8c4c5124d5b470405af5b8541?hp=c2a50ddb1bed657609ef5e85c7ac5c0bfcaa2c9a> - Log ----------------------------------------------------------------- commit cb1974ba967c78b8c4c5124d5b470405af5b8541 Author: Chris 'BinGOs' Williams <chris@bingosnet.co.uk> Date: Fri May 24 20:45:36 2013 +0100 Update Pod-Perldoc to CPAN version 3.20 [DELTA] 3.20 - Sat Apr 27 05:25:30 UTC 2013 * Make default formatter "ToTerm" instead of "ToMan" for better UTF-8 support * When dynamically building POD from perlfunc (perlvar) make sure we open filehandles with utf8 and add an =encoding (RT #80527) (RT #80640) M MANIFEST M Porting/Maintainers.pl M cpan/Pod-Perldoc/lib/Pod/Perldoc.pm M cpan/Pod-Perldoc/lib/Pod/Perldoc/BaseTo.pm M cpan/Pod-Perldoc/lib/Pod/Perldoc/GetOptsOO.pm M cpan/Pod-Perldoc/lib/Pod/Perldoc/ToANSI.pm M cpan/Pod-Perldoc/lib/Pod/Perldoc/ToChecker.pm M cpan/Pod-Perldoc/lib/Pod/Perldoc/ToMan.pm M cpan/Pod-Perldoc/lib/Pod/Perldoc/ToNroff.pm M cpan/Pod-Perldoc/lib/Pod/Perldoc/ToPod.pm M cpan/Pod-Perldoc/lib/Pod/Perldoc/ToRtf.pm M cpan/Pod-Perldoc/lib/Pod/Perldoc/ToTerm.pm M cpan/Pod-Perldoc/lib/Pod/Perldoc/ToText.pm M cpan/Pod-Perldoc/lib/Pod/Perldoc/ToTk.pm M cpan/Pod-Perldoc/lib/Pod/Perldoc/ToXml.pm D cpan/Pod-Perldoc/lib/perldoc.pod A cpan/Pod-Perldoc/perldoc.pod M pod/perl.pod commit 5b9c51566def4f7f9229c13bb00b03103aa4fae8 Author: Chris 'BinGOs' Williams <chris@bingosnet.co.uk> Date: Fri May 24 20:22:20 2013 +0100 Update Pod-Usage to CPAN version 1.62 [DELTA] 1.62 (marekr) Patches provided by rjbs - many thanks! - These commits update Pod::Usage to only use Pod::Simple, so that any reliance on Pod::Parser is removed, making it easier to remove Pod::Parser from core. - [PATCH 1/4] update Makefile: strict, INSTALLDIR, 5.6 - [PATCH 2/4] we will start to require perl 5.6 from here on out - [PATCH 3/4] always use Pod::Text as default base class - [PATCH 4/4] eliminate the branch in which Pod::Parser would be used This commit is intended entirely to free Pod::Usage from any reliance on Pod::Parser. * Usage.pm now defaults to using Pod::Text, rather than checking $] to pick. * $Pod::Select::MAX_HEADING_LEVEL is replaced with a local var * &Pod::Select::_compile_section_spec is copied into this module This isn't the most elegant fix, but it's a bit of a ball of mud. The code is written to let you alter @ISA at runtime to something that is derived either from Pod::Parser or Pod::Simple. This should probably be more explicitly limited to Pod::Simple in future releases. - CPAN#84031: eliminate branches using Pod::Parser removed test suite dependencies on Pod::Parser M MANIFEST M Porting/Maintainers.pl M cpan/Pod-Usage/lib/Pod/Usage.pm D cpan/Pod-Usage/t/pod/pod2usage.t D cpan/Pod-Usage/t/pod/pod2usage.xr D cpan/Pod-Usage/t/pod/testp2pt.pl ----------------------------------------------------------------------- Summary of changes: MANIFEST | 5 +- Porting/Maintainers.pl | 4 +- cpan/Pod-Perldoc/lib/Pod/Perldoc.pm | 14 +- cpan/Pod-Perldoc/lib/Pod/Perldoc/BaseTo.pm | 2 +- cpan/Pod-Perldoc/lib/Pod/Perldoc/GetOptsOO.pm | 2 +- cpan/Pod-Perldoc/lib/Pod/Perldoc/ToANSI.pm | 2 +- cpan/Pod-Perldoc/lib/Pod/Perldoc/ToChecker.pm | 2 +- cpan/Pod-Perldoc/lib/Pod/Perldoc/ToMan.pm | 6 +- cpan/Pod-Perldoc/lib/Pod/Perldoc/ToNroff.pm | 2 +- cpan/Pod-Perldoc/lib/Pod/Perldoc/ToPod.pm | 2 +- cpan/Pod-Perldoc/lib/Pod/Perldoc/ToRtf.pm | 2 +- cpan/Pod-Perldoc/lib/Pod/Perldoc/ToTerm.pm | 2 +- cpan/Pod-Perldoc/lib/Pod/Perldoc/ToText.pm | 2 +- cpan/Pod-Perldoc/lib/Pod/Perldoc/ToTk.pm | 2 +- cpan/Pod-Perldoc/lib/Pod/Perldoc/ToXml.pm | 2 +- cpan/Pod-Perldoc/{lib => }/perldoc.pod | 0 cpan/Pod-Usage/lib/Pod/Usage.pm | 1576 +++++++++++++------------ cpan/Pod-Usage/t/pod/pod2usage.t | 18 - cpan/Pod-Usage/t/pod/pod2usage.xr | 63 - cpan/Pod-Usage/t/pod/testp2pt.pl | 192 --- pod/perl.pod | 2 +- 21 files changed, 839 insertions(+), 1063 deletions(-) rename cpan/Pod-Perldoc/{lib => }/perldoc.pod (100%) delete mode 100644 cpan/Pod-Usage/t/pod/pod2usage.t delete mode 100644 cpan/Pod-Usage/t/pod/pod2usage.xr delete mode 100644 cpan/Pod-Usage/t/pod/testp2pt.pl diff --git a/MANIFEST b/MANIFEST index 1449568..ada4d8b 100644 --- a/MANIFEST +++ b/MANIFEST @@ -1803,7 +1803,6 @@ cpan/Pod-Parser/t/pod/twice.t Test Pod::Parser cpan/Pod-Perldoc/corpus/no-head.pod test file for Pod-Perldoc cpan/Pod-Perldoc/corpus/perlfunc.pod test file for Pod-Perldoc cpan/Pod-Perldoc/corpus/utf8.pod test file for Pod-Perldoc -cpan/Pod-Perldoc/lib/perldoc.pod Look up Perl documentation in Pod format cpan/Pod-Perldoc/lib/Pod/Perldoc/BaseTo.pm utility module for perldoc cpan/Pod-Perldoc/lib/Pod/Perldoc/GetOptsOO.pm options parsing for perldoc cpan/Pod-Perldoc/lib/Pod/Perldoc.pm guts of the 'perldoc' utility @@ -1817,6 +1816,7 @@ cpan/Pod-Perldoc/lib/Pod/Perldoc/ToTerm.pm convert POD to terminal output cpan/Pod-Perldoc/lib/Pod/Perldoc/ToText.pm convert POD to plain text cpan/Pod-Perldoc/lib/Pod/Perldoc/ToTk.pm convert POD via Tk::Pod cpan/Pod-Perldoc/lib/Pod/Perldoc/ToXml.pm convert POD to XML +cpan/Pod-Perldoc/perldoc.pod cpan/Pod-Perldoc/t/load.t test file for Pod-Perldoc cpan/Pod-Perldoc/t/man/_get_columns.t test file for Pod-Perldoc cpan/Pod-Perldoc/t/pod.t test file for Pod-Perldoc @@ -2019,10 +2019,7 @@ cpan/Pod-Usage/lib/Pod/Usage.pm cpan/Pod-Usage/scripts/pod2usage.PL cpan/Pod-Usage/t/pod/p2u_data.pl cpan/Pod-Usage/t/pod/pod2usage2.t -cpan/Pod-Usage/t/pod/pod2usage.t -cpan/Pod-Usage/t/pod/pod2usage.xr cpan/Pod-Usage/t/pod/testcmp.pl -cpan/Pod-Usage/t/pod/testp2pt.pl cpan/Pod-Usage/t/pod/usage2.pod cpan/Pod-Usage/t/pod/usage.pod cpan/Socket/Makefile.PL Socket extension makefile writer diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index 7ab6414..38d72b2 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -1460,7 +1460,7 @@ use File::Glob qw(:case); 'Pod::Perldoc' => { 'MAINTAINER' => 'mallen', - 'DISTRIBUTION' => 'MALLEN/Pod-Perldoc-3.19.tar.gz', + 'DISTRIBUTION' => 'MALLEN/Pod-Perldoc-3.20.tar.gz', 'FILES' => q[cpan/Pod-Perldoc], # in blead, the perldoc executable is generated by perldoc.PL @@ -1480,7 +1480,7 @@ use File::Glob qw(:case); 'Pod::Usage' => { 'MAINTAINER' => 'marekr', - 'DISTRIBUTION' => 'MAREKR/Pod-Usage-1.61.tar.gz', + 'DISTRIBUTION' => 'MAREKR/Pod-Usage-1.62.tar.gz', 'FILES' => q[cpan/Pod-Usage], 'UPSTREAM' => 'cpan', }, diff --git a/cpan/Pod-Perldoc/lib/Pod/Perldoc.pm b/cpan/Pod-Perldoc/lib/Pod/Perldoc.pm index 8c841e8..9cdee80 100644 --- a/cpan/Pod-Perldoc/lib/Pod/Perldoc.pm +++ b/cpan/Pod-Perldoc/lib/Pod/Perldoc.pm @@ -12,7 +12,7 @@ use File::Spec::Functions qw(catfile catdir splitdir); use vars qw($VERSION @Pagers $Bindir $Pod2man $Temp_Files_Created $Temp_File_Lifetime ); -$VERSION = '3.19'; +$VERSION = '3.20'; #.......................................................................... @@ -470,7 +470,7 @@ sub init_formatter_class_list { $self->opt_M_with('Pod::Perldoc::ToPod'); # the always-there fallthru $self->opt_o_with('text'); - $self->opt_o_with('man') unless $self->is_mswin32 || $self->is_dos + $self->opt_o_with('term') unless $self->is_mswin32 || $self->is_dos || !($ENV{TERM} && ( ($ENV{TERM} || '') !~ /dumb|emacs|none|unknown/i )); @@ -927,6 +927,10 @@ sub maybe_generate_dynamic_pod { } elsif ( @dynamic_pod ) { $self->aside("Hm, I found some Pod from that search!\n"); my ($buffd, $buffer) = $self->new_tempfile('pod', 'dyn'); + if ( $] >= 5.008 && $self->opt_L ) { + binmode($buffd, ":utf8"); + print $buffd "=encoding utf8\n\n"; + } push @{ $self->{'temp_file_list'} }, $buffer; # I.e., it MIGHT be deleted at the end. @@ -1162,6 +1166,12 @@ sub search_perlfunc { if ( $self->opt_L && defined $self->{'translators'}->[0] ) { my $tr = $self->{'translators'}->[0]; $re = $tr->search_perlfunc_re if $tr->can('search_perlfunc_re'); + if ( $] < 5.008 ) { + $self->aside("Your old perl doesn't really have proper unicode support."); + } + else { + binmode(PFUNC, ":utf8"); + } } # Skip introduction diff --git a/cpan/Pod-Perldoc/lib/Pod/Perldoc/BaseTo.pm b/cpan/Pod-Perldoc/lib/Pod/Perldoc/BaseTo.pm index 5bf8a93..80ffc80 100644 --- a/cpan/Pod-Perldoc/lib/Pod/Perldoc/BaseTo.pm +++ b/cpan/Pod-Perldoc/lib/Pod/Perldoc/BaseTo.pm @@ -3,7 +3,7 @@ use strict; use warnings; use vars qw($VERSION); -$VERSION = '3.19'; +$VERSION = '3.20'; use Carp qw(croak carp); use Config qw(%Config); diff --git a/cpan/Pod-Perldoc/lib/Pod/Perldoc/GetOptsOO.pm b/cpan/Pod-Perldoc/lib/Pod/Perldoc/GetOptsOO.pm index 0355f8f..5b90794 100644 --- a/cpan/Pod-Perldoc/lib/Pod/Perldoc/GetOptsOO.pm +++ b/cpan/Pod-Perldoc/lib/Pod/Perldoc/GetOptsOO.pm @@ -2,7 +2,7 @@ package Pod::Perldoc::GetOptsOO; use strict; use vars qw($VERSION); -$VERSION = '3.19'; +$VERSION = '3.20'; BEGIN { # Make a DEBUG constant ASAP *DEBUG = defined( &Pod::Perldoc::DEBUG ) diff --git a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToANSI.pm b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToANSI.pm index c6534bd..baaea03 100644 --- a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToANSI.pm +++ b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToANSI.pm @@ -4,7 +4,7 @@ use warnings; use parent qw(Pod::Perldoc::BaseTo); use vars qw($VERSION); -$VERSION = '3.19'; +$VERSION = '3.20'; sub is_pageable { 1 } sub write_with_binmode { 0 } diff --git a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToChecker.pm b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToChecker.pm index 6f8d12c..6bf0cf8 100644 --- a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToChecker.pm +++ b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToChecker.pm @@ -4,7 +4,7 @@ use warnings; use vars qw(@ISA); use vars qw($VERSION); -$VERSION = '3.19'; +$VERSION = '3.20'; # Pick our superclass... # diff --git a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToMan.pm b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToMan.pm index 225a786..bdd0140 100644 --- a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToMan.pm +++ b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToMan.pm @@ -5,7 +5,7 @@ use warnings; use parent qw(Pod::Perldoc::BaseTo); use vars qw($VERSION); -$VERSION = '3.19'; +$VERSION = '3.20'; use File::Spec::Functions qw(catfile); use Pod::Man 2.18; @@ -136,7 +136,7 @@ sub _get_columns { sub _get_podman_switches { my( $self ) = @_; - my @switches = grep !m/^_/s, keys %$self; + my @switches = map { $_, $self->{$_} } grep !m/^_/s, keys %$self; # There needs to be a cleaner way to handle setting # the UTF-8 flag, but for now, comment out this @@ -242,7 +242,7 @@ sub _collect_nroff_switches { push @render_switches, $self->_get_device_switches; # Thanks to Brendan O'Dea for contributing the following block - if( $self->_is_roff and $self->is_linux and -t STDOUT and my ($cols) = $self->_get_columns ) { + if( $self->_is_roff and -t STDOUT and my ($cols) = $self->_get_columns ) { my $c = $cols * 39 / 40; $cols = $c > $cols - 2 ? $c : $cols -2; push @render_switches, '-rLL=' . (int $c) . 'n' if $cols > 80; diff --git a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToNroff.pm b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToNroff.pm index 4f720e7..c9fa0fa 100644 --- a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToNroff.pm +++ b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToNroff.pm @@ -4,7 +4,7 @@ use warnings; use parent qw(Pod::Perldoc::BaseTo); use vars qw($VERSION); -$VERSION = '3.19'; +$VERSION = '3.20'; # This is unlike ToMan.pm in that it emits the raw nroff source! diff --git a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToPod.pm b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToPod.pm index 7083ae6..dc5523f 100644 --- a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToPod.pm +++ b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToPod.pm @@ -4,7 +4,7 @@ use warnings; use parent qw(Pod::Perldoc::BaseTo); use vars qw($VERSION); -$VERSION = '3.19'; +$VERSION = '3.20'; sub is_pageable { 1 } sub write_with_binmode { 0 } diff --git a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToRtf.pm b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToRtf.pm index 6e190f7..75ea630 100644 --- a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToRtf.pm +++ b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToRtf.pm @@ -4,7 +4,7 @@ use warnings; use parent qw( Pod::Simple::RTF ); use vars qw($VERSION); -$VERSION = '3.19'; +$VERSION = '3.20'; sub is_pageable { 0 } sub write_with_binmode { 0 } diff --git a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToTerm.pm b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToTerm.pm index f8d9349..bdc5625 100644 --- a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToTerm.pm +++ b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToTerm.pm @@ -3,7 +3,7 @@ use strict; use warnings; use vars qw($VERSION); -$VERSION = '3.19'; +$VERSION = '3.20'; use parent qw(Pod::Perldoc::BaseTo); diff --git a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToText.pm b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToText.pm index 530bdee..b2861f3 100644 --- a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToText.pm +++ b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToText.pm @@ -3,7 +3,7 @@ use strict; use warnings; use vars qw($VERSION); -$VERSION = '3.19'; +$VERSION = '3.20'; use parent qw(Pod::Perldoc::BaseTo); diff --git a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToTk.pm b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToTk.pm index deed6b3..8c1240a 100644 --- a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToTk.pm +++ b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToTk.pm @@ -3,7 +3,7 @@ use strict; use warnings; use vars qw($VERSION); -$VERSION = '3.19'; +$VERSION = '3.20'; use parent qw(Pod::Perldoc::BaseTo); diff --git a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToXml.pm b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToXml.pm index f85f01e..9de73fb 100644 --- a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToXml.pm +++ b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToXml.pm @@ -6,7 +6,7 @@ use vars qw($VERSION); use parent qw( Pod::Simple::XMLOutStream ); use vars qw($VERSION); -$VERSION = '3.19'; +$VERSION = '3.20'; sub is_pageable { 0 } sub write_with_binmode { 0 } diff --git a/cpan/Pod-Perldoc/lib/perldoc.pod b/cpan/Pod-Perldoc/perldoc.pod similarity index 100% rename from cpan/Pod-Perldoc/lib/perldoc.pod rename to cpan/Pod-Perldoc/perldoc.pod diff --git a/cpan/Pod-Usage/lib/Pod/Usage.pm b/cpan/Pod-Usage/lib/Pod/Usage.pm index e09d69e..1c509cb 100644 --- a/cpan/Pod-Usage/lib/Pod/Usage.pm +++ b/cpan/Pod-Usage/lib/Pod/Usage.pm @@ -1,767 +1,809 @@ -############################################################################# -# Pod/Usage.pm -- print usage messages for the running script. -# -# Copyright (C) 1996-2000 by Bradford Appleton. All rights reserved. -# This file is part of "PodParser". PodParser is free software; -# you can redistribute it and/or modify it under the same terms -# as Perl itself. -############################################################################# - -package Pod::Usage; -use strict; - -use vars qw($VERSION @ISA @EXPORT); -$VERSION = '1.61'; ## Current version of this package -require 5.005; ## requires this Perl version or later - -#use diagnostics; -use Carp; -use Config; -use Exporter; -use File::Spec; - -@EXPORT = qw(&pod2usage); -BEGIN { - $Pod::Usage::Formatter ||= - ( $] >= 5.005_58 ? 'Pod::Text' : 'Pod::PlainText'); - eval "require $Pod::Usage::Formatter"; - die $@ if $@; - @ISA = ( $Pod::Usage::Formatter ); -} - -require Pod::Select; - -##--------------------------------------------------------------------------- - -##--------------------------------- -## Function definitions begin here -##--------------------------------- - -sub pod2usage { - local($_) = shift; - my %opts; - ## Collect arguments - if (@_ > 0) { - ## Too many arguments - assume that this is a hash and - ## the user forgot to pass a reference to it. - %opts = ($_, @_); - } - elsif (!defined $_) { - $_ = ''; - } - elsif (ref $_) { - ## User passed a ref to a hash - %opts = %{$_} if (ref($_) eq 'HASH'); - } - elsif (/^[-+]?\d+$/) { - ## User passed in the exit value to use - $opts{'-exitval'} = $_; - } - else { - ## User passed in a message to print before issuing usage. - $_ and $opts{'-message'} = $_; - } - - ## Need this for backward compatibility since we formerly used - ## options that were all uppercase words rather than ones that - ## looked like Unix command-line options. - ## to be uppercase keywords) - %opts = map { - my ($key, $val) = ($_, $opts{$_}); - $key =~ s/^(?=\w)/-/; - $key =~ /^-msg/i and $key = '-message'; - $key =~ /^-exit/i and $key = '-exitval'; - lc($key) => $val; - } (keys %opts); - - ## Now determine default -exitval and -verbose values to use - if ((! defined $opts{'-exitval'}) && (! defined $opts{'-verbose'})) { - $opts{'-exitval'} = 2; - $opts{'-verbose'} = 0; - } - elsif (! defined $opts{'-exitval'}) { - $opts{'-exitval'} = ($opts{'-verbose'} > 0) ? 1 : 2; - } - elsif (! defined $opts{'-verbose'}) { - $opts{'-verbose'} = (lc($opts{'-exitval'}) eq 'noexit' || - $opts{'-exitval'} < 2); - } - - ## Default the output file - $opts{'-output'} = (lc($opts{'-exitval'}) eq 'noexit' || - $opts{'-exitval'} < 2) ? \*STDOUT : \*STDERR - unless (defined $opts{'-output'}); - ## Default the input file - $opts{'-input'} = $0 unless (defined $opts{'-input'}); - - ## Look up input file in path if it doesnt exist. - unless ((ref $opts{'-input'}) || (-e $opts{'-input'})) { - my $basename = $opts{'-input'}; - my $pathsep = ($^O =~ /^(?:dos|os2|MSWin32)$/i) ? ';' - : (($^O eq 'MacOS' || $^O eq 'VMS') ? ',' : ':'); - my $pathspec = $opts{'-pathlist'} || $ENV{PATH} || $ENV{PERL5LIB}; - - my @paths = (ref $pathspec) ? @$pathspec : split($pathsep, $pathspec); - for my $dirname (@paths) { - $_ = File::Spec->catfile($dirname, $basename) if length; - last if (-e $_) && ($opts{'-input'} = $_); - } - } - - ## Now create a pod reader and constrain it to the desired sections. - my $parser = new Pod::Usage(USAGE_OPTIONS => \%opts); - if ($opts{'-verbose'} == 0) { - $parser->select('(?:SYNOPSIS|USAGE)\s*'); - } - elsif ($opts{'-verbose'} == 1) { - my $opt_re = '(?i)' . - '(?:OPTIONS|ARGUMENTS)' . - '(?:\s*(?:AND|\/)\s*(?:OPTIONS|ARGUMENTS))?'; - $parser->select( '(?:SYNOPSIS|USAGE)\s*', $opt_re, "DESCRIPTION/$opt_re" ); - } - elsif ($opts{'-verbose'} >= 2 && $opts{'-verbose'} != 99) { - $parser->select('.*'); - } - elsif ($opts{'-verbose'} == 99) { - my $sections = $opts{'-sections'}; - $parser->select( (ref $sections) ? @$sections : $sections ); - $opts{'-verbose'} = 1; - } - - ## Check for perldoc - my $progpath = File::Spec->catfile($Config{scriptdirexp} - || $Config{scriptdir}, 'perldoc'); - - my $version = sprintf("%vd",$^V); - if ($Config{versiononly} and $Config{startperl} =~ /\Q$version\E$/ ) { - $progpath .= $version; - } - $opts{'-noperldoc'} = 1 unless -e $progpath; - - ## Now translate the pod document and then exit with the desired status - if ( !$opts{'-noperldoc'} - and $opts{'-verbose'} >= 2 - and !ref($opts{'-input'}) - and $opts{'-output'} == \*STDOUT ) - { - ## spit out the entire PODs. Might as well invoke perldoc - print { $opts{'-output'} } ($opts{'-message'}, "\n") if($opts{'-message'}); - if(defined $opts{-input} && $opts{-input} =~ /^\s*(\S.*?)\s*$/) { - # the perldocs back to 5.005 should all have -F - # without -F there are warnings in -T scripts - system($progpath, '-F', $1); - if($?) { - # RT16091: fall back to more if perldoc failed - system(($Config{pager} || $ENV{PAGER} || '/bin/more'), $1); - } - } else { - croak "Unspecified input file or insecure argument.\n"; - } - } - else { - $parser->parse_from_file($opts{'-input'}, $opts{'-output'}); - } - - exit($opts{'-exitval'}) unless (lc($opts{'-exitval'}) eq 'noexit'); -} - -##--------------------------------------------------------------------------- - -##------------------------------- -## Method definitions begin here -##------------------------------- - -sub new { - my $this = shift; - my $class = ref($this) || $this; - my %params = @_; - my $self = {%params}; - bless $self, $class; - if ($self->can('initialize')) { - $self->initialize(); - } else { - # pass through options to Pod::Text - my %opts; - for (qw(alt code indent loose margin quotes sentence stderr utf8 width)) { - my $val = $params{USAGE_OPTIONS}{"-$_"}; - $opts{$_} = $val if defined $val; - } - $self = $self->SUPER::new(%opts); - %$self = (%$self, %params); - } - return $self; -} - -sub select { - my ($self, @sections) = @_; - if ($ISA[0]->can('select')) { - $self->SUPER::select(@sections); - } else { - # we're using Pod::Simple - need to mimic the behavior of Pod::Select - my $add = ($sections[0] eq '+') ? shift(@sections) : ''; - ## Reset the set of sections to use - unless (@sections) { - delete $self->{USAGE_SELECT} unless ($add); - return; - } - $self->{USAGE_SELECT} = [] - unless ($add && $self->{USAGE_SELECT}); - my $sref = $self->{USAGE_SELECT}; - ## Compile each spec - for my $spec (@sections) { - my $cs = Pod::Select::_compile_section_spec($spec); - if ( defined $cs ) { - ## Store them in our sections array - push(@$sref, $cs); - } else { - carp qq{Ignoring section spec "$spec"!\n}; - } - } - } -} - -# Override Pod::Text->seq_i to return just "arg", not "*arg*". -sub seq_i { return $_[1] } - -# This overrides the Pod::Text method to do something very akin to what -# Pod::Select did as well as the work done below by preprocess_paragraph. -# Note that the below is very, very specific to Pod::Text. -sub _handle_element_end { - my ($self, $element) = @_; - if ($element eq 'head1') { - $self->{USAGE_HEADINGS} = [ $$self{PENDING}[-1][1] ]; - if ($self->{USAGE_OPTIONS}->{-verbose} < 2) { - $$self{PENDING}[-1][1] =~ s/^\s*SYNOPSIS\s*$/USAGE/; - } - } elsif ($element =~ /^head(\d+)$/ && $1) { # avoid 0 - my $idx = $1 - 1; - $self->{USAGE_HEADINGS} = [] unless($self->{USAGE_HEADINGS}); - $self->{USAGE_HEADINGS}->[$idx] = $$self{PENDING}[-1][1]; - } - if ($element =~ /^head\d+$/) { - $$self{USAGE_SKIPPING} = 1; - if (!$$self{USAGE_SELECT} || !@{ $$self{USAGE_SELECT} }) { - $$self{USAGE_SKIPPING} = 0; - } else { - my @headings = @{$$self{USAGE_HEADINGS}}; - for my $section_spec ( @{$$self{USAGE_SELECT}} ) { - my $match = 1; - for (my $i = 0; $i < $Pod::Select::MAX_HEADING_LEVEL; ++$i) { - $headings[$i] = '' unless defined $headings[$i]; - my $regex = $section_spec->[$i]; - my $negated = ($regex =~ s/^\!//); - $match &= ($negated ? ($headings[$i] !~ /${regex}/) - : ($headings[$i] =~ /${regex}/)); - last unless ($match); - } # end heading levels - if ($match) { - $$self{USAGE_SKIPPING} = 0; - last; - } - } # end sections - } - - # Try to do some lowercasing instead of all-caps in headings, and use - # a colon to end all headings. - if($self->{USAGE_OPTIONS}->{-verbose} < 2) { - local $_ = $$self{PENDING}[-1][1]; - s{([A-Z])([A-Z]+)}{((length($2) > 2) ? $1 : lc($1)) . lc($2)}ge; - s/\s*$/:/ unless (/:\s*$/); - $_ .= "\n"; - $$self{PENDING}[-1][1] = $_; - } - } - if ($$self{USAGE_SKIPPING} && $element !~ m/^over-/) { - pop @{ $$self{PENDING} }; - } else { - $self->SUPER::_handle_element_end($element); - } -} - -# required for Pod::Simple API -sub start_document { - my $self = shift; - $self->SUPER::start_document(); - my $msg = $self->{USAGE_OPTIONS}->{-message} or return 1; - my $out_fh = $self->output_fh(); - print $out_fh "$msg\n"; -} - -# required for old Pod::Parser API -sub begin_pod { - my $self = shift; - $self->SUPER::begin_pod(); ## Have to call superclass - my $msg = $self->{USAGE_OPTIONS}->{-message} or return 1; - my $out_fh = $self->output_handle(); - print $out_fh "$msg\n"; -} - -sub preprocess_paragraph { - my $self = shift; - local $_ = shift; - my $line = shift; - ## See if this is a heading and we arent printing the entire manpage. - if (($self->{USAGE_OPTIONS}->{-verbose} < 2) && /^=head/) { - ## Change the title of the SYNOPSIS section to USAGE - s/^=head1\s+SYNOPSIS\s*$/=head1 USAGE/; - ## Try to do some lowercasing instead of all-caps in headings - s{([A-Z])([A-Z]+)}{((length($2) > 2) ? $1 : lc($1)) . lc($2)}ge; - ## Use a colon to end all headings - s/\s*$/:/ unless (/:\s*$/); - $_ .= "\n"; - } - return $self->SUPER::preprocess_paragraph($_); -} - -1; # keep require happy - -__END__ - -=head1 NAME - -Pod::Usage, pod2usage() - print a usage message from embedded pod documentation - -=head1 SYNOPSIS - - use Pod::Usage - - my $message_text = "This text precedes the usage message."; - my $exit_status = 2; ## The exit status to use - my $verbose_level = 0; ## The verbose level to use - my $filehandle = \*STDERR; ## The filehandle to write to - - pod2usage($message_text); - - pod2usage($exit_status); - - pod2usage( { -message => $message_text , - -exitval => $exit_status , - -verbose => $verbose_level, - -output => $filehandle } ); - - pod2usage( -msg => $message_text , - -exitval => $exit_status , - -verbose => $verbose_level, - -output => $filehandle ); - - pod2usage( -verbose => 2, - -noperldoc => 1 ) - -=head1 ARGUMENTS - -B<pod2usage> should be given either a single argument, or a list of -arguments corresponding to an associative array (a "hash"). When a single -argument is given, it should correspond to exactly one of the following: - -=over 4 - -=item * - -A string containing the text of a message to print I<before> printing -the usage message - -=item * - -A numeric value corresponding to the desired exit status - -=item * - -A reference to a hash - -=back - -If more than one argument is given then the entire argument list is -assumed to be a hash. If a hash is supplied (either as a reference or -as a list) it should contain one or more elements with the following -keys: - -=over 4 - -=item C<-message> - -=item C<-msg> - -The text of a message to print immediately prior to printing the -program's usage message. - -=item C<-exitval> - -The desired exit status to pass to the B<exit()> function. -This should be an integer, or else the string "NOEXIT" to -indicate that control should simply be returned without -terminating the invoking process. - -=item C<-verbose> - -The desired level of "verboseness" to use when printing the usage -message. If the corresponding value is 0, then only the "SYNOPSIS" -section of the pod documentation is printed. If the corresponding value -is 1, then the "SYNOPSIS" section, along with any section entitled -"OPTIONS", "ARGUMENTS", or "OPTIONS AND ARGUMENTS" is printed. If the -corresponding value is 2 or more then the entire manpage is printed. - -The special verbosity level 99 requires to also specify the -sections -parameter; then these sections are extracted (see L<Pod::Select>) -and printed. - -=item C<-sections> - -A string representing a selection list for sections to be printed -when -verbose is set to 99, e.g. C<"NAME|SYNOPSIS|DESCRIPTION|VERSION">. - -Alternatively, an array reference of section specifications can be used: - - pod2usage(-verbose => 99, - -sections => [ qw(fred fred/subsection) ] ); - -=item C<-output> - -A reference to a filehandle, or the pathname of a file to which the -usage message should be written. The default is C<\*STDERR> unless the -exit value is less than 2 (in which case the default is C<\*STDOUT>). - -=item C<-input> - -A reference to a filehandle, or the pathname of a file from which the -invoking script's pod documentation should be read. It defaults to the -file indicated by C<$0> (C<$PROGRAM_NAME> for users of F<English.pm>). - -If you are calling B<pod2usage()> from a module and want to display -that module's POD, you can use this: - - use Pod::Find qw(pod_where); - pod2usage( -input => pod_where({-inc => 1}, __PACKAGE__) ); - -=item C<-pathlist> - -A list of directory paths. If the input file does not exist, then it -will be searched for in the given directory list (in the order the -directories appear in the list). It defaults to the list of directories -implied by C<$ENV{PATH}>. The list may be specified either by a reference -to an array, or by a string of directory paths which use the same path -separator as C<$ENV{PATH}> on your system (e.g., C<:> for Unix, C<;> for -MSWin32 and DOS). - -=item C<-noperldoc> - -By default, Pod::Usage will call L<perldoc> when -verbose >= 2 is -specified. This does not work well e.g. if the script was packed -with L<PAR>. The -noperldoc option suppresses the external call to -L<perldoc> and uses the simple text formatter (L<Pod::Text>) to -output the POD. - -=back - -=head2 Formatting base class - -The default text formatter depends on the Perl version (L<Pod::Text> or -L<Pod::PlainText> for Perl versions E<lt> 5.005_58). The base class for -Pod::Usage can be defined by pre-setting C<$Pod::Usage::Formatter> I<before> -loading Pod::Usage, e.g.: - - BEGIN { $Pod::Usage::Formatter = 'Pod::Text::Termcap'; } - use Pod::Usage qw(pod2usage); - -=head2 Pass-through options - -The following options are passed through to the underlying text formatter. -See the manual pages of these modules for more information. - - alt code indent loose margin quotes sentence stderr utf8 width - -=head1 DESCRIPTION - -B<pod2usage> will print a usage message for the invoking script (using -its embedded pod documentation) and then exit the script with the -desired exit status. The usage message printed may have any one of three -levels of "verboseness": If the verbose level is 0, then only a synopsis -is printed. If the verbose level is 1, then the synopsis is printed -along with a description (if present) of the command line options and -arguments. If the verbose level is 2, then the entire manual page is -printed. - -Unless they are explicitly specified, the default values for the exit -status, verbose level, and output stream to use are determined as -follows: - -=over 4 - -=item * - -If neither the exit status nor the verbose level is specified, then the -default is to use an exit status of 2 with a verbose level of 0. - -=item * - -If an exit status I<is> specified but the verbose level is I<not>, then the -verbose level will default to 1 if the exit status is less than 2 and -will default to 0 otherwise. - -=item * - -If an exit status is I<not> specified but verbose level I<is> given, then -the exit status will default to 2 if the verbose level is 0 and will -default to 1 otherwise. - -=item * - -If the exit status used is less than 2, then output is printed on -C<STDOUT>. Otherwise output is printed on C<STDERR>. - -=back - -Although the above may seem a bit confusing at first, it generally does -"the right thing" in most situations. This determination of the default -values to use is based upon the following typical Unix conventions: - -=over 4 - -=item * - -An exit status of 0 implies "success". For example, B<diff(1)> exits -with a status of 0 if the two files have the same contents. - -=item * - -An exit status of 1 implies possibly abnormal, but non-defective, program -termination. For example, B<grep(1)> exits with a status of 1 if -it did I<not> find a matching line for the given regular expression. - -=item * - -An exit status of 2 or more implies a fatal error. For example, B<ls(1)> -exits with a status of 2 if you specify an illegal (unknown) option on -the command line. - -=item * - -Usage messages issued as a result of bad command-line syntax should go -to C<STDERR>. However, usage messages issued due to an explicit request -to print usage (like specifying B<-help> on the command line) should go -to C<STDOUT>, just in case the user wants to pipe the output to a pager -(such as B<more(1)>). - -=item * - -If program usage has been explicitly requested by the user, it is often -desirable to exit with a status of 1 (as opposed to 0) after issuing -the user-requested usage message. It is also desirable to give a -more verbose description of program usage in this case. - -=back - -B<pod2usage> doesn't force the above conventions upon you, but it will -use them by default if you don't expressly tell it to do otherwise. The -ability of B<pod2usage()> to accept a single number or a string makes it -convenient to use as an innocent looking error message handling function: - - use Pod::Usage; - use Getopt::Long; - - ## Parse options - GetOptions("help", "man", "flag1") || pod2usage(2); - pod2usage(1) if ($opt_help); - pod2usage(-verbose => 2) if ($opt_man); - - ## Check for too many filenames - pod2usage("$0: Too many files given.\n") if (@ARGV > 1); - -Some user's however may feel that the above "economy of expression" is -not particularly readable nor consistent and may instead choose to do -something more like the following: - - use Pod::Usage; - use Getopt::Long; - - ## Parse options - GetOptions("help", "man", "flag1") || pod2usage(-verbose => 0); - pod2usage(-verbose => 1) if ($opt_help); - pod2usage(-verbose => 2) if ($opt_man); - - ## Check for too many filenames - pod2usage(-verbose => 2, -message => "$0: Too many files given.\n") - if (@ARGV > 1); - -As with all things in Perl, I<there's more than one way to do it>, and -B<pod2usage()> adheres to this philosophy. If you are interested in -seeing a number of different ways to invoke B<pod2usage> (although by no -means exhaustive), please refer to L<"EXAMPLES">. - -=head1 EXAMPLES - -Each of the following invocations of C<pod2usage()> will print just the -"SYNOPSIS" section to C<STDERR> and will exit with a status of 2: - - pod2usage(); - - pod2usage(2); - - pod2usage(-verbose => 0); - - pod2usage(-exitval => 2); - - pod2usage({-exitval => 2, -output => \*STDERR}); - - pod2usage({-verbose => 0, -output => \*STDERR}); - - pod2usage(-exitval => 2, -verbose => 0); - - pod2usage(-exitval => 2, -verbose => 0, -output => \*STDERR); - -Each of the following invocations of C<pod2usage()> will print a message -of "Syntax error." (followed by a newline) to C<STDERR>, immediately -followed by just the "SYNOPSIS" section (also printed to C<STDERR>) and -will exit with a status of 2: - - pod2usage("Syntax error."); - - pod2usage(-message => "Syntax error.", -verbose => 0); - - pod2usage(-msg => "Syntax error.", -exitval => 2); - - pod2usage({-msg => "Syntax error.", -exitval => 2, -output => \*STDERR}); - - pod2usage({-msg => "Syntax error.", -verbose => 0, -output => \*STDERR}); - - pod2usage(-msg => "Syntax error.", -exitval => 2, -verbose => 0); - - pod2usage(-message => "Syntax error.", - -exitval => 2, - -verbose => 0, - -output => \*STDERR); - -Each of the following invocations of C<pod2usage()> will print the -"SYNOPSIS" section and any "OPTIONS" and/or "ARGUMENTS" sections to -C<STDOUT> and will exit with a status of 1: - - pod2usage(1); - - pod2usage(-verbose => 1); - - pod2usage(-exitval => 1); - - pod2usage({-exitval => 1, -output => \*STDOUT}); - - pod2usage({-verbose => 1, -output => \*STDOUT}); - - pod2usage(-exitval => 1, -verbose => 1); - - pod2usage(-exitval => 1, -verbose => 1, -output => \*STDOUT}); - -Each of the following invocations of C<pod2usage()> will print the -entire manual page to C<STDOUT> and will exit with a status of 1: - - pod2usage(-verbose => 2); - - pod2usage({-verbose => 2, -output => \*STDOUT}); - - pod2usage(-exitval => 1, -verbose => 2); - - pod2usage({-exitval => 1, -verbose => 2, -output => \*STDOUT}); - -=head2 Recommended Use - -Most scripts should print some type of usage message to C<STDERR> when a -command line syntax error is detected. They should also provide an -option (usually C<-H> or C<-help>) to print a (possibly more verbose) -usage message to C<STDOUT>. Some scripts may even wish to go so far as to -provide a means of printing their complete documentation to C<STDOUT> -(perhaps by allowing a C<-man> option). The following complete example -uses B<Pod::Usage> in combination with B<Getopt::Long> to do all of these -things: - - use Getopt::Long; - use Pod::Usage; - - my $man = 0; - my $help = 0; - ## Parse options and print usage if there is a syntax error, - ## or if usage was explicitly requested. - GetOptions('help|?' => \$help, man => \$man) or pod2usage(2); - pod2usage(1) if $help; - pod2usage(-verbose => 2) if $man; - - ## If no arguments were given, then allow STDIN to be used only - ## if it's not connected to a terminal (otherwise print usage) - pod2usage("$0: No files given.") if ((@ARGV == 0) && (-t STDIN)); - __END__ - - =head1 NAME - - sample - Using GetOpt::Long and Pod::Usage - - =head1 SYNOPSIS - - sample [options] [file ...] - - Options: - -help brief help message - -man full documentation - - =head1 OPTIONS - - =over 8 - - =item B<-help> - - Print a brief help message and exits. - - =item B<-man> - - Prints the manual page and exits. - - =back - - =head1 DESCRIPTION - - B<This program> will read the given input file(s) and do something - useful with the contents thereof. - - =cut - -=head1 CAVEATS - -By default, B<pod2usage()> will use C<$0> as the path to the pod input -file. Unfortunately, not all systems on which Perl runs will set C<$0> -properly (although if C<$0> isn't found, B<pod2usage()> will search -C<$ENV{PATH}> or else the list specified by the C<-pathlist> option). -If this is the case for your system, you may need to explicitly specify -the path to the pod docs for the invoking script using something -similar to the following: - - pod2usage(-exitval => 2, -input => "/path/to/your/pod/docs"); - -In the pathological case that a script is called via a relative path -I<and> the script itself changes the current working directory -(see L<perlfunc/chdir>) I<before> calling pod2usage, Pod::Usage will -fail even on robust platforms. Don't do that. Or use L<FindBin> to locate -the script: - - use FindBin; - pod2usage(-input => $FindBin::Bin . "/" . $FindBin::Script); - -=head1 AUTHOR - -Please report bugs using L<http://rt.cpan.org>. - -Marek Rouchal E<lt>marekr@cpan.orgE<gt> - -Brad Appleton E<lt>bradapp@enteract.comE<gt> - -Based on code for B<Pod::Text::pod2text()> written by -Tom Christiansen E<lt>tchrist@mox.perl.comE<gt> - -=head1 ACKNOWLEDGMENTS - -Steven McDougall E<lt>swmcd@world.std.comE<gt> for his help and patience -with re-writing this manpage. - -=head1 SEE ALSO - -B<Pod::Usage> is now a standalone distribution. - -L<Pod::Parser>, L<Pod::Perldoc>, L<Getopt::Long>, L<Pod::Find>, L<FindBin>, -L<Pod::Text>, L<Pod::PlainText>, L<Pod::Text::Termcap> - -=cut - +############################################################################# +# Pod/Usage.pm -- print usage messages for the running script. +# +# Copyright (C) 1996-2000 by Bradford Appleton. All rights reserved. +# This file is part of "PodParser". PodParser is free software; +# you can redistribute it and/or modify it under the same terms +# as Perl itself. +############################################################################# + +package Pod::Usage; +use strict; + +use vars qw($VERSION @ISA @EXPORT); +$VERSION = '1.61'; ## Current version of this package +require 5.006; ## requires this Perl version or later + +#use diagnostics; +use Carp; +use Config; +use Exporter; +use File::Spec; + +@EXPORT = qw(&pod2usage); +BEGIN { + $Pod::Usage::Formatter ||= 'Pod::Text'; + eval "require $Pod::Usage::Formatter"; + die $@ if $@; + @ISA = ( $Pod::Usage::Formatter ); +} + +our $MAX_HEADING_LEVEL = 3; + +##--------------------------------------------------------------------------- + +##--------------------------------- +## Function definitions begin here +##--------------------------------- + +sub pod2usage { + local($_) = shift; + my %opts; + ## Collect arguments + if (@_ > 0) { + ## Too many arguments - assume that this is a hash and + ## the user forgot to pass a reference to it. + %opts = ($_, @_); + } + elsif (!defined $_) { + $_ = ''; + } + elsif (ref $_) { + ## User passed a ref to a hash + %opts = %{$_} if (ref($_) eq 'HASH'); + } + elsif (/^[-+]?\d+$/) { + ## User passed in the exit value to use + $opts{'-exitval'} = $_; + } + else { + ## User passed in a message to print before issuing usage. + $_ and $opts{'-message'} = $_; + } + + ## Need this for backward compatibility since we formerly used + ## options that were all uppercase words rather than ones that + ## looked like Unix command-line options. + ## to be uppercase keywords) + %opts = map { + my ($key, $val) = ($_, $opts{$_}); + $key =~ s/^(?=\w)/-/; + $key =~ /^-msg/i and $key = '-message'; + $key =~ /^-exit/i and $key = '-exitval'; + lc($key) => $val; + } (keys %opts); + + ## Now determine default -exitval and -verbose values to use + if ((! defined $opts{'-exitval'}) && (! defined $opts{'-verbose'})) { + $opts{'-exitval'} = 2; + $opts{'-verbose'} = 0; + } + elsif (! defined $opts{'-exitval'}) { + $opts{'-exitval'} = ($opts{'-verbose'} > 0) ? 1 : 2; + } + elsif (! defined $opts{'-verbose'}) { + $opts{'-verbose'} = (lc($opts{'-exitval'}) eq 'noexit' || + $opts{'-exitval'} < 2); + } + + ## Default the output file + $opts{'-output'} = (lc($opts{'-exitval'}) eq 'noexit' || + $opts{'-exitval'} < 2) ? \*STDOUT : \*STDERR + unless (defined $opts{'-output'}); + ## Default the input file + $opts{'-input'} = $0 unless (defined $opts{'-input'}); + + ## Look up input file in path if it doesnt exist. + unless ((ref $opts{'-input'}) || (-e $opts{'-input'})) { + my $basename = $opts{'-input'}; + my $pathsep = ($^O =~ /^(?:dos|os2|MSWin32)$/i) ? ';' + : (($^O eq 'MacOS' || $^O eq 'VMS') ? ',' : ':'); + my $pathspec = $opts{'-pathlist'} || $ENV{PATH} || $ENV{PERL5LIB}; + + my @paths = (ref $pathspec) ? @$pathspec : split($pathsep, $pathspec); + for my $dirname (@paths) { + $_ = File::Spec->catfile($dirname, $basename) if length; + last if (-e $_) && ($opts{'-input'} = $_); + } + } + + ## Now create a pod reader and constrain it to the desired sections. + my $parser = new Pod::Usage(USAGE_OPTIONS => \%opts); + if ($opts{'-verbose'} == 0) { + $parser->select('(?:SYNOPSIS|USAGE)\s*'); + } + elsif ($opts{'-verbose'} == 1) { + my $opt_re = '(?i)' . + '(?:OPTIONS|ARGUMENTS)' . + '(?:\s*(?:AND|\/)\s*(?:OPTIONS|ARGUMENTS))?'; + $parser->select( '(?:SYNOPSIS|USAGE)\s*', $opt_re, "DESCRIPTION/$opt_re" ); + } + elsif ($opts{'-verbose'} >= 2 && $opts{'-verbose'} != 99) { + $parser->select('.*'); + } + elsif ($opts{'-verbose'} == 99) { + my $sections = $opts{'-sections'}; + $parser->select( (ref $sections) ? @$sections : $sections ); + $opts{'-verbose'} = 1; + } + + ## Check for perldoc + my $progpath = File::Spec->catfile($Config{scriptdirexp} + || $Config{scriptdir}, 'perldoc'); + + my $version = sprintf("%vd",$^V); + if ($Config{versiononly} and $Config{startperl} =~ /\Q$version\E$/ ) { + $progpath .= $version; + } + $opts{'-noperldoc'} = 1 unless -e $progpath; + + ## Now translate the pod document and then exit with the desired status + if ( !$opts{'-noperldoc'} + and $opts{'-verbose'} >= 2 + and !ref($opts{'-input'}) + and $opts{'-output'} == \*STDOUT ) + { + ## spit out the entire PODs. Might as well invoke perldoc + print { $opts{'-output'} } ($opts{'-message'}, "\n") if($opts{'-message'}); + if(defined $opts{-input} && $opts{-input} =~ /^\s*(\S.*?)\s*$/) { + # the perldocs back to 5.005 should all have -F + # without -F there are warnings in -T scripts + system($progpath, '-F', $1); + if($?) { + # RT16091: fall back to more if perldoc failed + system(($Config{pager} || $ENV{PAGER} || '/bin/more'), $1); + } + } else { + croak "Unspecified input file or insecure argument.\n"; + } + } + else { + $parser->parse_from_file($opts{'-input'}, $opts{'-output'}); + } + + exit($opts{'-exitval'}) unless (lc($opts{'-exitval'}) eq 'noexit'); +} + +##--------------------------------------------------------------------------- + +##------------------------------- +## Method definitions begin here +##------------------------------- + +sub new { + my $this = shift; + my $class = ref($this) || $this; + my %params = @_; + my $self = {%params}; + bless $self, $class; + if ($self->can('initialize')) { + $self->initialize(); + } else { + # pass through options to Pod::Text + my %opts; + for (qw(alt code indent loose margin quotes sentence stderr utf8 width)) { + my $val = $params{USAGE_OPTIONS}{"-$_"}; + $opts{$_} = $val if defined $val; + } + $self = $self->SUPER::new(%opts); + %$self = (%$self, %params); + } + return $self; +} + +# This subroutine was copied in whole-cloth from Pod::Select 1.60 in order to +# allow the ejection of Pod::Select from the core without breaking Pod::Usage. +# -- rjbs, 2013-03-18 +sub _compile_section_spec { + my ($section_spec) = @_; + my (@regexs, $negated); + + ## Compile the spec into a list of regexs + local $_ = $section_spec; + s{\\\\}{\001}g; ## handle escaped backward slashes + s{\\/}{\002}g; ## handle escaped forward slashes + + ## Parse the regexs for the heading titles + @regexs = split(/\//, $_, $MAX_HEADING_LEVEL); + + ## Set default regex for ommitted levels + for (my $i = 0; $i < $MAX_HEADING_LEVEL; ++$i) { + $regexs[$i] = '.*' unless ((defined $regexs[$i]) + && (length $regexs[$i])); + } + ## Modify the regexs as needed and validate their syntax + my $bad_regexs = 0; + for (@regexs) { + $_ .= '.+' if ($_ eq '!'); + s{\001}{\\\\}g; ## restore escaped backward slashes + s{\002}{\\/}g; ## restore escaped forward slashes + $negated = s/^\!//; ## check for negation + eval "m{$_}"; ## check regex syntax + if ($@) { + ++$bad_regexs; + carp qq{Bad regular expression /$_/ in "$section_spec": $@\n}; + } + else { + ## Add the forward and rear anchors (and put the negator back) + $_ = '^' . $_ unless (/^\^/); + $_ = $_ . '$' unless (/\$$/); + $_ = '!' . $_ if ($negated); + } + } + return (! $bad_regexs) ? [ @regexs ] : undef; +} + +sub select { + my ($self, @sections) = @_; + if ($ISA[0]->can('select')) { + $self->SUPER::select(@sections); + } else { + # we're using Pod::Simple - need to mimic the behavior of Pod::Select + my $add = ($sections[0] eq '+') ? shift(@sections) : ''; + ## Reset the set of sections to use + unless (@sections) { + delete $self->{USAGE_SELECT} unless ($add); + return; + } + $self->{USAGE_SELECT} = [] + unless ($add && $self->{USAGE_SELECT}); + my $sref = $self->{USAGE_SELECT}; + ## Compile each spec + for my $spec (@sections) { + my $cs = _compile_section_spec($spec); + if ( defined $cs ) { + ## Store them in our sections array + push(@$sref, $cs); + } else { + carp qq{Ignoring section spec "$spec"!\n}; + } + } + } +} + +# Override Pod::Text->seq_i to return just "arg", not "*arg*". +sub seq_i { return $_[1] } + +# This overrides the Pod::Text method to do something very akin to what +# Pod::Select did as well as the work done below by preprocess_paragraph. +# Note that the below is very, very specific to Pod::Text. +sub _handle_element_end { + my ($self, $element) = @_; + if ($element eq 'head1') { + $self->{USAGE_HEADINGS} = [ $$self{PENDING}[-1][1] ]; + if ($self->{USAGE_OPTIONS}->{-verbose} < 2) { + $$self{PENDING}[-1][1] =~ s/^\s*SYNOPSIS\s*$/USAGE/; + } + } elsif ($element =~ /^head(\d+)$/ && $1) { # avoid 0 + my $idx = $1 - 1; + $self->{USAGE_HEADINGS} = [] unless($self->{USAGE_HEADINGS}); + $self->{USAGE_HEADINGS}->[$idx] = $$self{PENDING}[-1][1]; + } + if ($element =~ /^head\d+$/) { + $$self{USAGE_SKIPPING} = 1; + if (!$$self{USAGE_SELECT} || !@{ $$self{USAGE_SELECT} }) { + $$self{USAGE_SKIPPING} = 0; + } else { + my @headings = @{$$self{USAGE_HEADINGS}}; + for my $section_spec ( @{$$self{USAGE_SELECT}} ) { + my $match = 1; + for (my $i = 0; $i < $MAX_HEADING_LEVEL; ++$i) { + $headings[$i] = '' unless defined $headings[$i]; + my $regex = $section_spec->[$i]; + my $negated = ($regex =~ s/^\!//); + $match &= ($negated ? ($headings[$i] !~ /${regex}/) + : ($headings[$i] =~ /${regex}/)); + last unless ($match); + } # end heading levels + if ($match) { + $$self{USAGE_SKIPPING} = 0; + last; + } + } # end sections + } + + # Try to do some lowercasing instead of all-caps in headings, and use + # a colon to end all headings. + if($self->{USAGE_OPTIONS}->{-verbose} < 2) { + local $_ = $$self{PENDING}[-1][1]; + s{([A-Z])([A-Z]+)}{((length($2) > 2) ? $1 : lc($1)) . lc($2)}ge; + s/\s*$/:/ unless (/:\s*$/); + $_ .= "\n"; + $$self{PENDING}[-1][1] = $_; + } + } + if ($$self{USAGE_SKIPPING} && $element !~ m/^over-/) { + pop @{ $$self{PENDING} }; + } else { + $self->SUPER::_handle_element_end($element); + } +} + +# required for Pod::Simple API +sub start_document { + my $self = shift; + $self->SUPER::start_document(); + my $msg = $self->{USAGE_OPTIONS}->{-message} or return 1; + my $out_fh = $self->output_fh(); + print $out_fh "$msg\n"; +} + +# required for old Pod::Parser API +sub begin_pod { + my $self = shift; + $self->SUPER::begin_pod(); ## Have to call superclass + my $msg = $self->{USAGE_OPTIONS}->{-message} or return 1; + my $out_fh = $self->output_handle(); + print $out_fh "$msg\n"; +} + +sub preprocess_paragraph { + my $self = shift; + local $_ = shift; + my $line = shift; + ## See if this is a heading and we arent printing the entire manpage. + if (($self->{USAGE_OPTIONS}->{-verbose} < 2) && /^=head/) { + ## Change the title of the SYNOPSIS section to USAGE + s/^=head1\s+SYNOPSIS\s*$/=head1 USAGE/; + ## Try to do some lowercasing instead of all-caps in headings + s{([A-Z])([A-Z]+)}{((length($2) > 2) ? $1 : lc($1)) . lc($2)}ge; + ## Use a colon to end all headings + s/\s*$/:/ unless (/:\s*$/); + $_ .= "\n"; + } + return $self->SUPER::preprocess_paragraph($_); +} + +1; # keep require happy + +__END__ + +=head1 NAME + +Pod::Usage, pod2usage() - print a usage message from embedded pod documentation + +=head1 SYNOPSIS + + use Pod::Usage + + my $message_text = "This text precedes the usage message."; + my $exit_status = 2; ## The exit status to use + my $verbose_level = 0; ## The verbose level to use + my $filehandle = \*STDERR; ## The filehandle to write to + + pod2usage($message_text); + + pod2usage($exit_status); + + pod2usage( { -message => $message_text , + -exitval => $exit_status , + -verbose => $verbose_level, + -output => $filehandle } ); + + pod2usage( -msg => $message_text , + -exitval => $exit_status , + -verbose => $verbose_level, + -output => $filehandle ); + + pod2usage( -verbose => 2, + -noperldoc => 1 ) + +=head1 ARGUMENTS + +B<pod2usage> should be given either a single argument, or a list of +arguments corresponding to an associative array (a "hash"). When a single +argument is given, it should correspond to exactly one of the following: + +=over 4 + +=item * + +A string containing the text of a message to print I<before> printing +the usage message + +=item * + +A numeric value corresponding to the desired exit status + +=item * + +A reference to a hash + +=back + +If more than one argument is given then the entire argument list is +assumed to be a hash. If a hash is supplied (either as a reference or +as a list) it should contain one or more elements with the following +keys: + +=over 4 + +=item C<-message> + +=item C<-msg> + +The text of a message to print immediately prior to printing the +program's usage message. + +=item C<-exitval> + +The desired exit status to pass to the B<exit()> function. +This should be an integer, or else the string "NOEXIT" to +indicate that control should simply be returned without +terminating the invoking process. + +=item C<-verbose> + +The desired level of "verboseness" to use when printing the usage +message. If the corresponding value is 0, then only the "SYNOPSIS" +section of the pod documentation is printed. If the corresponding value +is 1, then the "SYNOPSIS" section, along with any section entitled +"OPTIONS", "ARGUMENTS", or "OPTIONS AND ARGUMENTS" is printed. If the +corresponding value is 2 or more then the entire manpage is printed. + +The special verbosity level 99 requires to also specify the -sections +parameter; then these sections are extracted and printed. + +=item C<-sections> + +A string representing a selection list for sections to be printed +when -verbose is set to 99, e.g. C<"NAME|SYNOPSIS|DESCRIPTION|VERSION">. + +Alternatively, an array reference of section specifications can be used: + + pod2usage(-verbose => 99, + -sections => [ qw(fred fred/subsection) ] ); + +=item C<-output> + +A reference to a filehandle, or the pathname of a file to which the +usage message should be written. The default is C<\*STDERR> unless the +exit value is less than 2 (in which case the default is C<\*STDOUT>). + +=item C<-input> + +A reference to a filehandle, or the pathname of a file from which the +invoking script's pod documentation should be read. It defaults to the +file indicated by C<$0> (C<$PROGRAM_NAME> for users of F<English.pm>). + +If you are calling B<pod2usage()> from a module and want to display +that module's POD, you can use this: + + use Pod::Find qw(pod_where); + pod2usage( -input => pod_where({-inc => 1}, __PACKAGE__) ); + +=item C<-pathlist> + +A list of directory paths. If the input file does not exist, then it +will be searched for in the given directory list (in the order the +directories appear in the list). It defaults to the list of directories +implied by C<$ENV{PATH}>. The list may be specified either by a reference +to an array, or by a string of directory paths which use the same path +separator as C<$ENV{PATH}> on your system (e.g., C<:> for Unix, C<;> for +MSWin32 and DOS). + +=item C<-noperldoc> + +By default, Pod::Usage will call L<perldoc> when -verbose >= 2 is +specified. This does not work well e.g. if the script was packed +with L<PAR>. The -noperldoc option suppresses the external call to +L<perldoc> and uses the simple text formatter (L<Pod::Text>) to +output the POD. + +=back + +=head2 Formatting base class + +The default text formatter is L<Pod::Text>. The base class for Pod::Usage can +be defined by pre-setting C<$Pod::Usage::Formatter> I<before> +loading Pod::Usage, e.g.: + + BEGIN { $Pod::Usage::Formatter = 'Pod::Text::Termcap'; } + use Pod::Usage qw(pod2usage); + +=head2 Pass-through options + +The following options are passed through to the underlying text formatter. +See the manual pages of these modules for more information. + + alt code indent loose margin quotes sentence stderr utf8 width + +=head1 DESCRIPTION + +B<pod2usage> will print a usage message for the invoking script (using +its embedded pod documentation) and then exit the script with the +desired exit status. The usage message printed may have any one of three +levels of "verboseness": If the verbose level is 0, then only a synopsis +is printed. If the verbose level is 1, then the synopsis is printed +along with a description (if present) of the command line options and +arguments. If the verbose level is 2, then the entire manual page is +printed. + +Unless they are explicitly specified, the default values for the exit +status, verbose level, and output stream to use are determined as +follows: + +=over 4 + +=item * + +If neither the exit status nor the verbose level is specified, then the +default is to use an exit status of 2 with a verbose level of 0. + +=item * + +If an exit status I<is> specified but the verbose level is I<not>, then the +verbose level will default to 1 if the exit status is less than 2 and +will default to 0 otherwise. + +=item * + +If an exit status is I<not> specified but verbose level I<is> given, then +the exit status will default to 2 if the verbose level is 0 and will +default to 1 otherwise. + +=item * + +If the exit status used is less than 2, then output is printed on +C<STDOUT>. Otherwise output is printed on C<STDERR>. + +=back + +Although the above may seem a bit confusing at first, it generally does +"the right thing" in most situations. This determination of the default +values to use is based upon the following typical Unix conventions: + +=over 4 + +=item * + +An exit status of 0 implies "success". For example, B<diff(1)> exits +with a status of 0 if the two files have the same contents. + +=item * + +An exit status of 1 implies possibly abnormal, but non-defective, program +termination. For example, B<grep(1)> exits with a status of 1 if +it did I<not> find a matching line for the given regular expression. + +=item * + +An exit status of 2 or more implies a fatal error. For example, B<ls(1)> +exits with a status of 2 if you specify an illegal (unknown) option on +the command line. + +=item * + +Usage messages issued as a result of bad command-line syntax should go +to C<STDERR>. However, usage messages issued due to an explicit request +to print usage (like specifying B<-help> on the command line) should go +to C<STDOUT>, just in case the user wants to pipe the output to a pager +(such as B<more(1)>). + +=item * + +If program usage has been explicitly requested by the user, it is often +desirable to exit with a status of 1 (as opposed to 0) after issuing +the user-requested usage message. It is also desirable to give a +more verbose description of program usage in this case. + +=back + +B<pod2usage> doesn't force the above conventions upon you, but it will +use them by default if you don't expressly tell it to do otherwise. The +ability of B<pod2usage()> to accept a single number or a string makes it +convenient to use as an innocent looking error message handling function: + + use Pod::Usage; + use Getopt::Long; + + ## Parse options + GetOptions("help", "man", "flag1") || pod2usage(2); + pod2usage(1) if ($opt_help); + pod2usage(-verbose => 2) if ($opt_man); + + ## Check for too many filenames + pod2usage("$0: Too many files given.\n") if (@ARGV > 1); + +Some user's however may feel that the above "economy of expression" is +not particularly readable nor consistent and may instead choose to do +something more like the following: + + use Pod::Usage; + use Getopt::Long; + + ## Parse options + GetOptions("help", "man", "flag1") || pod2usage(-verbose => 0); + pod2usage(-verbose => 1) if ($opt_help); + pod2usage(-verbose => 2) if ($opt_man); + + ## Check for too many filenames + pod2usage(-verbose => 2, -message => "$0: Too many files given.\n") + if (@ARGV > 1); + +As with all things in Perl, I<there's more than one way to do it>, and +B<pod2usage()> adheres to this philosophy. If you are interested in +seeing a number of different ways to invoke B<pod2usage> (although by no +means exhaustive), please refer to L<"EXAMPLES">. + +=head1 EXAMPLES + +Each of the following invocations of C<pod2usage()> will print just the +"SYNOPSIS" section to C<STDERR> and will exit with a status of 2: + + pod2usage(); + + pod2usage(2); + + pod2usage(-verbose => 0); + + pod2usage(-exitval => 2); + + pod2usage({-exitval => 2, -output => \*STDERR}); + + pod2usage({-verbose => 0, -output => \*STDERR}); + + pod2usage(-exitval => 2, -verbose => 0); + + pod2usage(-exitval => 2, -verbose => 0, -output => \*STDERR); + +Each of the following invocations of C<pod2usage()> will print a message +of "Syntax error." (followed by a newline) to C<STDERR>, immediately +followed by just the "SYNOPSIS" section (also printed to C<STDERR>) and +will exit with a status of 2: + + pod2usage("Syntax error."); + + pod2usage(-message => "Syntax error.", -verbose => 0); + + pod2usage(-msg => "Syntax error.", -exitval => 2); + + pod2usage({-msg => "Syntax error.", -exitval => 2, -output => \*STDERR}); + + pod2usage({-msg => "Syntax error.", -verbose => 0, -output => \*STDERR}); + + pod2usage(-msg => "Syntax error.", -exitval => 2, -verbose => 0); + + pod2usage(-message => "Syntax error.", + -exitval => 2, + -verbose => 0, + -output => \*STDERR); + +Each of the following invocations of C<pod2usage()> will print the +"SYNOPSIS" section and any "OPTIONS" and/or "ARGUMENTS" sections to +C<STDOUT> and will exit with a status of 1: + + pod2usage(1); + + pod2usage(-verbose => 1); + + pod2usage(-exitval => 1); + + pod2usage({-exitval => 1, -output => \*STDOUT}); + + pod2usage({-verbose => 1, -output => \*STDOUT}); + + pod2usage(-exitval => 1, -verbose => 1); + + pod2usage(-exitval => 1, -verbose => 1, -output => \*STDOUT}); + +Each of the following invocations of C<pod2usage()> will print the +entire manual page to C<STDOUT> and will exit with a status of 1: + + pod2usage(-verbose => 2); + + pod2usage({-verbose => 2, -output => \*STDOUT}); + + pod2usage(-exitval => 1, -verbose => 2); + + pod2usage({-exitval => 1, -verbose => 2, -output => \*STDOUT}); + +=head2 Recommended Use + +Most scripts should print some type of usage message to C<STDERR> when a +command line syntax error is detected. They should also provide an +option (usually C<-H> or C<-help>) to print a (possibly more verbose) +usage message to C<STDOUT>. Some scripts may even wish to go so far as to +provide a means of printing their complete documentation to C<STDOUT> +(perhaps by allowing a C<-man> option). The following complete example +uses B<Pod::Usage> in combination with B<Getopt::Long> to do all of these +things: + + use Getopt::Long; + use Pod::Usage; + + my $man = 0; + my $help = 0; + ## Parse options and print usage if there is a syntax error, + ## or if usage was explicitly requested. + GetOptions('help|?' => \$help, man => \$man) or pod2usage(2); + pod2usage(1) if $help; + pod2usage(-verbose => 2) if $man; + + ## If no arguments were given, then allow STDIN to be used only + ## if it's not connected to a terminal (otherwise print usage) + pod2usage("$0: No files given.") if ((@ARGV == 0) && (-t STDIN)); + __END__ + + =head1 NAME + + sample - Using GetOpt::Long and Pod::Usage + + =head1 SYNOPSIS + + sample [options] [file ...] + + Options: + -help brief help message + -man full documentation + + =head1 OPTIONS + + =over 8 + + =item B<-help> + + Print a brief help message and exits. + + =item B<-man> + + Prints the manual page and exits. + + =back + + =head1 DESCRIPTION + + B<This program> will read the given input file(s) and do something + useful with the contents thereof. + + =cut + +=head1 CAVEATS + +By default, B<pod2usage()> will use C<$0> as the path to the pod input +file. Unfortunately, not all systems on which Perl runs will set C<$0> +properly (although if C<$0> isn't found, B<pod2usage()> will search +C<$ENV{PATH}> or else the list specified by the C<-pathlist> option). +If this is the case for your system, you may need to explicitly specify +the path to the pod docs for the invoking script using something +similar to the following: + + pod2usage(-exitval => 2, -input => "/path/to/your/pod/docs"); + +In the pathological case that a script is called via a relative path +I<and> the script itself changes the current working directory +(see L<perlfunc/chdir>) I<before> calling pod2usage, Pod::Usage will +fail even on robust platforms. Don't do that. Or use L<FindBin> to locate +the script: + + use FindBin; + pod2usage(-input => $FindBin::Bin . "/" . $FindBin::Script); + +=head1 AUTHOR + +Please report bugs using L<http://rt.cpan.org>. + +Marek Rouchal E<lt>marekr@cpan.orgE<gt> + +Brad Appleton E<lt>bradapp@enteract.comE<gt> + +Based on code for B<Pod::Text::pod2text()> written by +Tom Christiansen E<lt>tchrist@mox.perl.comE<gt> + +=head1 ACKNOWLEDGMENTS + +rjbs for refactoring Pod::Usage to not use Pod::Parser any more. + +Steven McDougall E<lt>swmcd@world.std.comE<gt> for his help and patience +with re-writing this manpage. + +=head1 SEE ALSO + +B<Pod::Usage> is now a standalone distribution, depending on +L<Pod::Text> which in turn depends on L<Pod::Simple>. + +L<Pod::Perldoc>, L<Getopt::Long>, L<Pod::Find>, L<FindBin>, +L<Pod::Text>, L<Pod::Text::Termcap>, L<Pod::Simple> + +=cut + diff --git a/cpan/Pod-Usage/t/pod/pod2usage.t b/cpan/Pod-Usage/t/pod/pod2usage.t deleted file mode 100644 index 98788fc..0000000 --- a/cpan/Pod-Usage/t/pod/pod2usage.t +++ /dev/null @@ -1,18 +0,0 @@ -BEGIN { - use File::Basename; - my $THISDIR = dirname $0; - unshift @INC, $THISDIR; - require "testp2pt.pl"; - import TestPodIncPlainText; -} - -my %options = map { $_ => 1 } @ARGV; ## convert cmdline to options-hash -my $passed = testpodplaintext \%options, $0; -exit( ($passed == 1) ? 0 : -1 ) unless $ENV{HARNESS_ACTIVE}; - - -__END__ - -=include pod2usage.PL - - diff --git a/cpan/Pod-Usage/t/pod/pod2usage.xr b/cpan/Pod-Usage/t/pod/pod2usage.xr deleted file mode 100644 index ceac4f1..0000000 --- a/cpan/Pod-Usage/t/pod/pod2usage.xr +++ /dev/null @@ -1,63 +0,0 @@ -###### begin =include pod2usage.PL ##### -NAME - pod2usage - print usage messages from embedded pod docs in files - -SYNOPSIS - pod2usage [-help] [-man] [-exit *exitval*] [-output *outfile*] - [-verbose *level*] [-pathlist *dirlist*] [-formatter - *module*] *file* - -OPTIONS AND ARGUMENTS - -help Print a brief help message and exit. - - -man Print this command's manual page and exit. - - -exit *exitval* - The exit status value to return. - - -output *outfile* - The output file to print to. If the special names "-" or ">&1" - or ">&STDOUT" are used then standard output is used. If ">&2" or - ">&STDERR" is used then standard error is used. - - -verbose *level* - The desired level of verbosity to use: - - 1 : print SYNOPSIS only - 2 : print SYNOPSIS sections and any OPTIONS/ARGUMENTS sections - 3 : print the entire manpage (similar to running pod2text) - - -pathlist *dirlist* - Specifies one or more directories to search for the input file - if it was not supplied with an absolute path. Each directory - path in the given list should be separated by a ':' on Unix (';' - on MSWin32 and DOS). - - -formatter *module* - Which text formatter to use. Default is the Pod::Text manpage, - or for very old Perl versions the Pod::PlainText manpage. An - alternative would be e.g. the Pod::Text::Termcap manpage. - - *file* The pathname of a file containing pod documentation to be output - in usage message format (defaults to standard input). - -DESCRIPTION - pod2usage will read the given input file looking for pod documentation - and will print the corresponding usage message. If no input file is - specified then standard input is read. - - pod2usage invokes the pod2usage() function in the Pod::Usage module. - Please see the pod2usage() entry in the Pod::Usage manpage. - -SEE ALSO - the Pod::Usage manpage, the pod2text(1) manpage - -AUTHOR - Please report bugs using http://rt.cpan.org. - - Brad Appleton <bradapp@enteract.com> - - Based on code for pod2text(1) written by Tom Christiansen - <tchrist@mox.perl.com> - -###### end =include pod2usage.PL ##### diff --git a/cpan/Pod-Usage/t/pod/testp2pt.pl b/cpan/Pod-Usage/t/pod/testp2pt.pl deleted file mode 100644 index 5c17300..0000000 --- a/cpan/Pod-Usage/t/pod/testp2pt.pl +++ /dev/null @@ -1,192 +0,0 @@ -package TestPodIncPlainText; - -BEGIN { - use File::Basename; - use File::Spec; - use Cwd qw(abs_path); - push @INC, '..'; - my $THISDIR = abs_path(dirname $0); - unshift @INC, $THISDIR; - require "testcmp.pl"; - import TestCompare; - my $PARENTDIR = dirname $THISDIR; - push @INC, map { File::Spec->catfile($_, 'lib') } ($PARENTDIR, $THISDIR); -} - -#use strict; -#use diagnostics; -use Carp; -use Exporter; -#use File::Compare; -#use Cwd qw(abs_path); - -use vars qw($MYPKG @EXPORT @ISA); -$MYPKG = eval { (caller)[0] }; -@EXPORT = qw(&testpodplaintext); -BEGIN { - require Pod::PlainText; - @ISA = qw( Pod::PlainText ); - require VMS::Filespec if $^O eq 'VMS'; -} - -## Hardcode settings for TERMCAP and COLUMNS so we can try to get -## reproducible results between environments -@ENV{qw(TERMCAP COLUMNS)} = ('co=76:do=^J', 76); - -sub catfile(@) { File::Spec->catfile(@_); } - -my $INSTDIR = abs_path(dirname $0); -$INSTDIR = VMS::Filespec::unixpath($INSTDIR) if $^O eq 'VMS'; -$INSTDIR =~ s#/$## if $^O eq 'VMS'; -$INSTDIR =~ s#:$## if $^O eq 'MacOS'; -$INSTDIR = (dirname $INSTDIR) if (basename($INSTDIR) eq 'pod'); -$INSTDIR =~ s#:$## if $^O eq 'MacOS'; **** PATCH TRUNCATED AT 2000 LINES -- 162 NOT SHOWN **** -- Perl5 Master Repository http://www.nntp.perl.org/group/perl.perl5.changes/2013/05/msg37217.html Fri, 24 May 2013 20:38:17 +0000 [perl.git] branch smoke-me/nicholas/rt-118055, deleted. v5.19.0-143-ge0cd864 by Nicholas Clark In perl.git, the branch smoke-me/nicholas/rt-118055 has been deleted <http://perl5.git.perl.org/perl.git/commitdiff/0000000000000000000000000000000000000000?hp=e0cd8647b984507a9beb2487859a8656e289cde0> was e0cd8647b984507a9beb2487859a8656e289cde0 ----------------------------------------------------------------------- e0cd8647b984507a9beb2487859a8656e289cde0 Ensure that the IV in struct pmop (for ithreads) is aligned properly. ----------------------------------------------------------------------- -- Perl5 Master Repository http://www.nntp.perl.org/group/perl.perl5.changes/2013/05/msg37216.html Fri, 24 May 2013 19:33:16 +0000 [perl.git] branch blead, updated. v5.19.0-176-gc2a50dd by Nicholas Clark In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/c2a50ddb1bed657609ef5e85c7ac5c0bfcaa2c9a?hp=1a72e160c417a912e69c85d4171a406daa388a27> - Log ----------------------------------------------------------------- commit c2a50ddb1bed657609ef5e85c7ac5c0bfcaa2c9a Author: Nicholas Clark <nick@ccl4.org> Date: Thu May 23 13:46:05 2013 +0200 Ensure that the IV in struct pmop (for ithreads) is aligned properly. The members of struct pmop vary between ithreads and non-ithreads builds. For ithreads, an IV is used for op_pmoffset. For 32 bit platforms built with -Duse64bitint, IVs are 64 bits, but pointers (and all other members of all OP structures) are 32 bits, hence on 32 bit platforms OP structure sizes can be an odd multiple of 4 bytes. Since the swap to the slab allocator, this is causing problems on architectures where 8 byte IVs have to be 8 byte aligned, notably sparcs. The long-term fix is to replace the IV with an appropriate 32 bit type, as it is being used for an array index. However, for maint-5.18 we need a work around which doesn't change the public headers and ideally doesn't impose a large speed or memory penalty. Hence for now, simply avoid using the slab allocator when allocating a struct pmop. Only do this for 32 bit platforms build with 8 byte IVs and ithreads. This is the interim fix for RT #118055. ----------------------------------------------------------------------- Summary of changes: op.c | 13 +++++++++++++ pod/perldelta.pod | 6 +++++- 2 files changed, 18 insertions(+), 1 deletions(-) diff --git a/op.c b/op.c index 1501e14..792e8d6 100644 --- a/op.c +++ b/op.c @@ -175,6 +175,19 @@ Perl_Slab_Alloc(pTHX_ size_t sz) || (CvSTART(PL_compcv) && !CvSLABBED(PL_compcv))) return PerlMemShared_calloc(1, sz); +#if defined(USE_ITHREADS) && IVSIZE > U32SIZE + /* Work around a goof with alignment on our part. For sparc32 (and + possibly other architectures), if built with -Duse64bitint, the IV + op_pmoffset in struct pmop should be 8 byte aligned, but the slab + allocator is only providing 4 byte alignment. The real fix is to change + the IV to a type the same size as a pointer, such as size_t, but we + can't do that without breaking the ABI, which is a no-no in a maint + release. So instead, simply allocate struct pmop directly, which will be + suitably aligned: */ + if (sz == sizeof(struct pmop)) + return PerlMemShared_calloc(1, sz); +#endif + /* While the subroutine is under construction, the slabs are accessed via CvSTART(), to avoid needing to expand PVCV by one pointer for something unneeded at runtime. Once a subroutine is constructed, the slabs are diff --git a/pod/perldelta.pod b/pod/perldelta.pod index 431e811..d8994b4 100644 --- a/pod/perldelta.pod +++ b/pod/perldelta.pod @@ -356,7 +356,11 @@ files in F<ext/> and F<lib/> are best summarized in L</Modules and Pragmata>. =item * -XXX +The OP allocation code now returns correctly aligned memory in all cases +for C<struct pmop>. Previously it could return memory only aligned to a +4-byte boundary, which is not correct for an ithreads build with 64 bit IVs +on some 32 bit platforms. Notably, this caused the build to fail completely +on sparc GNU/Linux. [RT #118055] =back -- Perl5 Master Repository http://www.nntp.perl.org/group/perl.perl5.changes/2013/05/msg37215.html Fri, 24 May 2013 19:33:10 +0000 [perl.git] branch blead, updated. v5.19.0-175-g1a72e16 by Chris 'Bingos' Williams In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/1a72e160c417a912e69c85d4171a406daa388a27?hp=54b985aaf6458a3ba4f6ff294da358647a0b39d8> - Log ----------------------------------------------------------------- commit 1a72e160c417a912e69c85d4171a406daa388a27 Author: Chris 'BinGOs' Williams <chris@bingosnet.co.uk> Date: Fri May 24 19:39:54 2013 +0100 Update to CPAN-Meta means META.* need regenerating M META.json M META.yml commit 814e893fe6bc47fcca75948b0516b6225c436579 Author: Chris 'BinGOs' Williams <chris@bingosnet.co.uk> Date: Fri May 24 19:26:56 2013 +0100 Update File-Temp to CPAN version 0.2301 [DELTA] 0.2301 2013-04-11 16:30:05 Europe/London * dist.ini: Managed with Dist::Zilla now; generates Makefile.PL to avoid circular dependency when using Build.PL M Porting/Maintainers.pl M cpan/File-Temp/lib/File/Temp.pm commit 7f6e6ca2fce125217f63287b879e5c4b708dffc2 Author: Chris 'BinGOs' Williams <chris@bingosnet.co.uk> Date: Fri May 24 19:22:44 2013 +0100 Update CPAN-Meta to CPAN version 2.130880 [DELTA] 2.130880 2013-03-29 09:51:00 America/New_York [BUGFIX] - Fix provides 'version' bug introduced in the 2.130870 fix 2.130870 2013-03-28 11:08:50 America/New_York [BUGFIX] - Don't add 'version' to 'provides' during conversion if one didn't exist in the original [Reported by Miyagawa; fixed by David Golden] M MANIFEST M Porting/Maintainers.pl M cpan/CPAN-Meta/Changes M cpan/CPAN-Meta/lib/CPAN/Meta.pm M cpan/CPAN-Meta/lib/CPAN/Meta/Converter.pm M cpan/CPAN-Meta/lib/CPAN/Meta/Feature.pm M cpan/CPAN-Meta/lib/CPAN/Meta/History.pm M cpan/CPAN-Meta/lib/CPAN/Meta/Prereqs.pm M cpan/CPAN-Meta/lib/CPAN/Meta/Spec.pm M cpan/CPAN-Meta/lib/CPAN/Meta/Validator.pm M cpan/CPAN-Meta/t/converter.t A cpan/CPAN-Meta/t/data/provides-version-missing.json commit e571b8a647f3c46be5f7ac05bec5738a0e0b37bd Author: Chris 'BinGOs' Williams <chris@bingosnet.co.uk> Date: Fri May 24 19:19:17 2013 +0100 Updated Module-Metadata to CPAN version 1.000014 [DELTA] 1.000014 - 2014-05-09 - Remove "now installs to 'site' for perl 5.12+" from last version 1.000013 - 2013-05-08 - Fix reliance on recent Test::Builder - Make tests perl 5.6 compatible - now installs to 'site' for perl 5.12+, as per p5p recommendation 1.000012 - 2013-05-04 - improved package detection heuristics (thanks, Edward Zborowski!) - fix ->contains_pod (RT#84932, Tokuhiro Matsuno) - fix detection of pod after __END__ (RT79656, Tokuhiro Matsuno) M MANIFEST M Porting/Maintainers.pl M cpan/Module-Metadata/lib/Module/Metadata.pm A cpan/Module-Metadata/t/contains_pod.t A cpan/Module-Metadata/t/endpod.t A cpan/Module-Metadata/t/lib/ENDPOD.pm M cpan/Module-Metadata/t/metadata.t commit 9062a81cf6820101fefe59cc702c50eaaf32a827 Author: Chris 'BinGOs' Williams <chris@bingosnet.co.uk> Date: Fri May 24 19:17:43 2013 +0100 Update File-Fetch to CPAN version 0.42 [DELTA] Changes for 0.42 Fri Apr 12 15:28:34 2013 ================================================= * Skip slurp tests for git:// Changes for 0.40 Fri Apr 12 11:18:52 2013 ================================================= * Added git:// url support M Porting/Maintainers.pl M cpan/File-Fetch/lib/File/Fetch.pm M cpan/File-Fetch/t/01_File-Fetch.t commit f3dd8566cf2591f2ae3220437898ec986c5226d4 Author: Chris 'BinGOs' Williams <chris@bingosnet.co.uk> Date: Fri May 24 19:15:58 2013 +0100 Update perlfaq to CPAN version 5.0150043 [DELTA] 5.0150043 Sun 12 May 2013 19:40:17 +0100 * Various typos and URL fixes (dsteinbrunner) * Typo (argrath) M Porting/Maintainers.pl M cpan/perlfaq/lib/perlfaq.pm M cpan/perlfaq/lib/perlfaq.pod M cpan/perlfaq/lib/perlfaq3.pod M cpan/perlfaq/lib/perlfaq4.pod M cpan/perlfaq/lib/perlfaq5.pod M cpan/perlfaq/lib/perlfaq7.pod commit bbf2f5be121c69b9c2c5ad2cb7f313f3a3833fce Author: Chris 'BinGOs' Williams <chris@bingosnet.co.uk> Date: Fri May 24 19:14:08 2013 +0100 Update Encode to CPAN version 2.51 [DELTA] $Revision: 2.51 $ $Date: 2013/04/29 22:19:11 $ ! Encode.xs Addressed: Encode.xs doesn't compile with Microsoft C compiler https://rt.cpan.org/Public/Bug/Display.html?id=84920 ! MANIFEST Addressed: t/taint.t missing https://rt.cpan.org/Public/Bug/Display.html?id=84919 2.50 2013/04/26 18:30:46 ! Encode.xs Unicode/Unicode.xs lib/Encode/Unicode/UTF7.pm lib/CN/HZ.pm lib/Encode/GSM0338.pm t/taint.t Addressed: Encode::encode and Encode::decode gratuitously launders tainted data Taintedness now propagates as it should. https://rt.cpan.org/Ticket/Display.html?id=84879 ! encoding.pm Addressed: 5.18 deprecation https://rt.cpan.org/Ticket/Display.html?id=84709 ! bin/piconv Applied: Update piconv documentation https://rt.cpan.org/Ticket/Display.html?id=84695 M MANIFEST M Porting/Maintainers.pl M cpan/Encode/Changes M cpan/Encode/Encode.pm M cpan/Encode/Encode.xs M cpan/Encode/MANIFEST M cpan/Encode/META.json M cpan/Encode/META.yml M cpan/Encode/Unicode/Unicode.xs M cpan/Encode/bin/piconv M cpan/Encode/encoding.pm M cpan/Encode/lib/Encode/CN/HZ.pm M cpan/Encode/lib/Encode/GSM0338.pm M cpan/Encode/lib/Encode/Unicode/UTF7.pm A cpan/Encode/t/taint.t ----------------------------------------------------------------------- Summary of changes: MANIFEST | 5 + META.json | 2 +- META.yml | 2 +- Porting/Maintainers.pl | 16 +- cpan/CPAN-Meta/Changes | 13 + cpan/CPAN-Meta/lib/CPAN/Meta.pm | 71 +- cpan/CPAN-Meta/lib/CPAN/Meta/Converter.pm | 79 +- cpan/CPAN-Meta/lib/CPAN/Meta/Feature.pm | 72 +- cpan/CPAN-Meta/lib/CPAN/Meta/History.pm | 76 +- cpan/CPAN-Meta/lib/CPAN/Meta/Prereqs.pm | 72 +- cpan/CPAN-Meta/lib/CPAN/Meta/Spec.pm | 68 +- cpan/CPAN-Meta/lib/CPAN/Meta/Validator.pm | 72 +- cpan/CPAN-Meta/t/converter.t | 18 + .../{META-2.json => provides-version-missing.json} | 13 + cpan/Encode/Changes | 27 +- cpan/Encode/Encode.pm | 6 +- cpan/Encode/Encode.xs | 7 +- cpan/Encode/MANIFEST | 1 + cpan/Encode/META.json | 4 +- cpan/Encode/META.yml | 4 +- cpan/Encode/Unicode/Unicode.xs | 11 +- cpan/Encode/bin/piconv | 58 +- cpan/Encode/encoding.pm | 11 +- cpan/Encode/lib/Encode/CN/HZ.pm | 8 +- cpan/Encode/lib/Encode/GSM0338.pm | 8 +- cpan/Encode/lib/Encode/Unicode/UTF7.pm | 9 +- cpan/Encode/t/taint.t | 15 + cpan/File-Fetch/lib/File/Fetch.pm | 56 +- cpan/File-Fetch/t/01_File-Fetch.t | 30 +- cpan/File-Temp/lib/File/Temp.pm | 1626 ++++++++++---------- cpan/Module-Metadata/lib/Module/Metadata.pm | 109 +- cpan/Module-Metadata/t/contains_pod.t | 59 + cpan/Module-Metadata/t/endpod.t | 11 + cpan/Module-Metadata/t/lib/ENDPOD.pm | 13 + cpan/Module-Metadata/t/metadata.t | 65 +- cpan/perlfaq/lib/perlfaq.pm | 2 +- cpan/perlfaq/lib/perlfaq.pod | 2 +- cpan/perlfaq/lib/perlfaq3.pod | 8 +- cpan/perlfaq/lib/perlfaq4.pod | 4 +- cpan/perlfaq/lib/perlfaq5.pod | 2 +- cpan/perlfaq/lib/perlfaq7.pod | 2 +- 41 files changed, 1769 insertions(+), 968 deletions(-) copy cpan/CPAN-Meta/t/data/{META-2.json => provides-version-missing.json} (87%) create mode 100644 cpan/Encode/t/taint.t create mode 100644 cpan/Module-Metadata/t/contains_pod.t create mode 100644 cpan/Module-Metadata/t/endpod.t create mode 100644 cpan/Module-Metadata/t/lib/ENDPOD.pm diff --git a/MANIFEST b/MANIFEST index bea7fd6..1449568 100644 --- a/MANIFEST +++ b/MANIFEST @@ -342,6 +342,7 @@ cpan/CPAN-Meta/t/data/META-1_2.yml cpan/CPAN-Meta/t/data/META-1_3.yml cpan/CPAN-Meta/t/data/META-1_4.yml cpan/CPAN-Meta/t/data/META-2.json +cpan/CPAN-Meta/t/data/provides-version-missing.json cpan/CPAN-Meta/t/data/resources.yml cpan/CPAN-Meta/t/data/restricted-2.json cpan/CPAN-Meta/t/data/restrictive-1_4.yml @@ -779,6 +780,7 @@ cpan/Encode/t/Mod_EUCJP.pm module that t/enc_module.enc uses cpan/Encode/t/perlio.t test script cpan/Encode/t/piconv.t Test for piconv.t cpan/Encode/t/rt.pl test script +cpan/Encode/t/taint.t cpan/Encode/t/unibench.pl benchmark script cpan/Encode/t/Unicode.t test script cpan/Encode/t/utf8ref.t test script @@ -1640,13 +1642,16 @@ cpan/Module-Load/t/to_load/Must/Be/Loaded.pm Module::Load tests cpan/Module-Load/t/to_load/TestModule.pm Module::Load tests cpan/Module-Load/t/to_load/ToBeLoaded Module::Load tests cpan/Module-Metadata/lib/Module/Metadata.pm +cpan/Module-Metadata/t/contains_pod.t cpan/Module-Metadata/t/encoding.t +cpan/Module-Metadata/t/endpod.t cpan/Module-Metadata/t/lib/0_1/Foo.pm cpan/Module-Metadata/t/lib/0_2/Foo.pm cpan/Module-Metadata/t/lib/BOMTest/UTF16BE.pm cpan/Module-Metadata/t/lib/BOMTest/UTF16LE.pm cpan/Module-Metadata/t/lib/BOMTest/UTF8.pm cpan/Module-Metadata/t/lib/DistGen.pm +cpan/Module-Metadata/t/lib/ENDPOD.pm cpan/Module-Metadata/t/lib/MBTest.pm cpan/Module-Metadata/t/lib/Tie/CPHash.pm cpan/Module-Metadata/t/metadata.t diff --git a/META.json b/META.json index 20bc6eb..f57c601 100644 --- a/META.json +++ b/META.json @@ -4,7 +4,7 @@ "perl5-porters@perl.org" ], "dynamic_config" : 1, - "generated_by" : "CPAN::Meta version 2.120921", + "generated_by" : "CPAN::Meta version 2.130880", "license" : [ "perl_5" ], diff --git a/META.yml b/META.yml index 92f4de1..57b8480 100644 --- a/META.yml +++ b/META.yml @@ -4,7 +4,7 @@ author: - perl5-porters@perl.org build_requires: {} dynamic_config: 1 -generated_by: 'CPAN::Meta version 2.120921, CPAN::Meta::Converter version 2.120921' +generated_by: 'CPAN::Meta version 2.130880, CPAN::Meta::Converter version 2.130880' license: perl meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index a59477d..7ab6414 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -445,10 +445,11 @@ use File::Glob qw(:case); 'CPAN::Meta' => { 'MAINTAINER' => 'dagolden', - 'DISTRIBUTION' => 'DAGOLDEN/CPAN-Meta-2.120921.tar.gz', + 'DISTRIBUTION' => 'DAGOLDEN/CPAN-Meta-2.130880.tar.gz', 'FILES' => q[cpan/CPAN-Meta], 'EXCLUDED' => [ qw(t/00-compile.t), + qw[t/00-report-prereqs.t], qr{^xt}, qr{^history}, ], @@ -585,7 +586,7 @@ use File::Glob qw(:case); 'Encode' => { 'MAINTAINER' => 'dankogai', - 'DISTRIBUTION' => 'DANKOGAI/Encode-2.49.tar.gz', + 'DISTRIBUTION' => 'DANKOGAI/Encode-2.51.tar.gz', 'FILES' => q[cpan/Encode], 'UPSTREAM' => 'cpan', }, @@ -725,7 +726,7 @@ use File::Glob qw(:case); 'perlfaq' => { 'MAINTAINER' => 'perlfaq', - 'DISTRIBUTION' => 'LLAP/perlfaq-5.0150042.tar.gz', + 'DISTRIBUTION' => 'LLAP/perlfaq-5.0150043.tar.gz', 'FILES' => q[cpan/perlfaq], 'EXCLUDED' => [ qw( t/release-pod-syntax.t @@ -762,7 +763,7 @@ use File::Glob qw(:case); 'File::Fetch' => { 'MAINTAINER' => 'kane', - 'DISTRIBUTION' => 'BINGOS/File-Fetch-0.38.tar.gz', + 'DISTRIBUTION' => 'BINGOS/File-Fetch-0.42.tar.gz', 'FILES' => q[cpan/File-Fetch], 'UPSTREAM' => 'cpan', }, @@ -803,12 +804,15 @@ use File::Glob qw(:case); 'File::Temp' => { 'MAINTAINER' => 'tjenness', - 'DISTRIBUTION' => 'TJENNESS/File-Temp-0.23.tar.gz', + 'DISTRIBUTION' => 'DAGOLDEN/File-Temp-0.2301.tar.gz', 'FILES' => q[cpan/File-Temp], 'EXCLUDED' => [ qw( misc/benchmark.pl misc/results.txt ), + qw(t/00-compile.t), + qw[t/00-report-prereqs.t], + qr{^xt}, ], 'UPSTREAM' => 'cpan', }, @@ -1227,7 +1231,7 @@ use File::Glob qw(:case); 'Module::Metadata' => { 'MAINTAINER' => 'dagolden', - 'DISTRIBUTION' => 'APEIRON/Module-Metadata-1.000011.tar.gz', + 'DISTRIBUTION' => 'BOBTFISH/Module-Metadata-1.000014.tar.gz', 'FILES' => q[cpan/Module-Metadata], 'EXCLUDED' => [ qr{^maint}, diff --git a/cpan/CPAN-Meta/Changes b/cpan/CPAN-Meta/Changes index e866b76..060dd89 100644 --- a/cpan/CPAN-Meta/Changes +++ b/cpan/CPAN-Meta/Changes @@ -1,5 +1,18 @@ Revision history for CPAN-Meta +2.130880 2013-03-29 09:51:00 America/New_York + + [BUGFIX] + + - Fix provides 'version' bug introduced in the 2.130870 fix + +2.130870 2013-03-28 11:08:50 America/New_York + + [BUGFIX] + + - Don't add 'version' to 'provides' during conversion if one didn't + exist in the original [Reported by Miyagawa; fixed by David Golden] + 2.120921 2012-04-01 15:20:24 Europe/Paris [REMOVED] diff --git a/cpan/CPAN-Meta/lib/CPAN/Meta.pm b/cpan/CPAN-Meta/lib/CPAN/Meta.pm index 19980bd..76ca474 100644 --- a/cpan/CPAN-Meta/lib/CPAN/Meta.pm +++ b/cpan/CPAN-Meta/lib/CPAN/Meta.pm @@ -2,7 +2,7 @@ use 5.006; use strict; use warnings; package CPAN::Meta; -our $VERSION = '2.120921'; # VERSION +our $VERSION = '2.130880'; # VERSION use Carp qw(carp croak); @@ -336,17 +336,19 @@ sub TO_JSON { # ABSTRACT: the distribution metadata for a CPAN dist - +__END__ =pod +=encoding utf-8 + =head1 NAME CPAN::Meta - the distribution metadata for a CPAN dist =head1 VERSION -version 2.120921 +version 2.130880 =head1 SYNOPSIS @@ -701,6 +703,64 @@ Ricardo Signes <rjbs@cpan.org> =back +=head1 CONTRIBUTORS + +=over 4 + +=item * + +Ansgar Burchardt <ansgar@cpan.org> + +=item * + +Michael G. Schwern <mschwern@cpan.org> + +=item * + +Randy Sims <randys@thepierianspring.org> + +=item * + +Ãvar ArnfjÃ¶rÃ° Bjarmason <avar@cpan.org> + +=item * + +Christopher J. Madsen <cjm@cpan.org> + +=item * + +Cory G Watson <gphat@cpan.org> + +=item * + +Damyan Ivanov <dam@cpan.org> + +=item * + +Eric Wilhelm <ewilhelm@cpan.org> + +=item * + +Gregor Hermann <gregoa@debian.org> + +=item * + +Ken Williams <kwilliams@cpan.org> + +=item * + +Lars DÉªá´á´á´á´á´¡ è¿ªææ¯ <daxim@cpan.org> + +=item * + +Leon Timmermans <leont@cpan.org> + +=item * + +Mark Fowler <markf@cpan.org> + +=back + =head1 COPYRIGHT AND LICENSE This software is copyright (c) 2010 by David Golden and Ricardo Signes. @@ -709,8 +769,3 @@ This is free software; you can redistribute it and/or modify it under the same terms as the Perl 5 programming language system itself. =cut - - -__END__ - - diff --git a/cpan/CPAN-Meta/lib/CPAN/Meta/Converter.pm b/cpan/CPAN-Meta/lib/CPAN/Meta/Converter.pm index 772d579..fc05d8e 100644 --- a/cpan/CPAN-Meta/lib/CPAN/Meta/Converter.pm +++ b/cpan/CPAN-Meta/lib/CPAN/Meta/Converter.pm @@ -2,7 +2,7 @@ use 5.006; use strict; use warnings; package CPAN::Meta::Converter; -our $VERSION = '2.120921'; # VERSION +our $VERSION = '2.130880'; # VERSION use CPAN::Meta::Validator; @@ -307,7 +307,7 @@ sub _is_module_name { } sub _clean_version { - my ($element, $key, $meta, $to_version) = @_; + my ($element) = @_; return 0 if ! defined $element; $element =~ s{^\s*}{}; @@ -676,12 +676,12 @@ sub _release_status_from_version { my $provides_spec = { file => \&_keep, - version => \&_clean_version, + version => \&_keep, }; my $provides_spec_2 = { file => \&_keep, - version => \&_clean_version, + version => \&_keep, ':custom' => \&_prefix_custom, }; @@ -692,6 +692,8 @@ sub _provides { my $new_data = {}; for my $k ( keys %$element ) { $new_data->{$k} = _convert($element->{$k}, $spec, $to_version); + $new_data->{$k}{version} = _clean_version($element->{$k}{version}) + if exists $element->{$k}{version}; } return $new_data; } @@ -1260,17 +1262,19 @@ sub convert { # ABSTRACT: Convert CPAN distribution metadata structures - +__END__ =pod +=encoding utf-8 + =head1 NAME CPAN::Meta::Converter - Convert CPAN distribution metadata structures =head1 VERSION -version 2.120921 +version 2.130880 =head1 SYNOPSIS @@ -1378,6 +1382,64 @@ Ricardo Signes <rjbs@cpan.org> =back +=head1 CONTRIBUTORS + +=over 4 + +=item * + +Ansgar Burchardt <ansgar@cpan.org> + +=item * + +Michael G. Schwern <mschwern@cpan.org> + +=item * + +Randy Sims <randys@thepierianspring.org> + +=item * + +Ãvar ArnfjÃ¶rÃ° Bjarmason <avar@cpan.org> + +=item * + +Christopher J. Madsen <cjm@cpan.org> + +=item * + +Cory G Watson <gphat@cpan.org> + +=item * + +Damyan Ivanov <dam@cpan.org> + +=item * + +Eric Wilhelm <ewilhelm@cpan.org> + +=item * + +Gregor Hermann <gregoa@debian.org> + +=item * + +Ken Williams <kwilliams@cpan.org> + +=item * + +Lars DÉªá´á´á´á´á´¡ è¿ªææ¯ <daxim@cpan.org> + +=item * + +Leon Timmermans <leont@cpan.org> + +=item * + +Mark Fowler <markf@cpan.org> + +=back + =head1 COPYRIGHT AND LICENSE This software is copyright (c) 2010 by David Golden and Ricardo Signes. @@ -1386,8 +1448,3 @@ This is free software; you can redistribute it and/or modify it under the same terms as the Perl 5 programming language system itself. =cut - - -__END__ - - diff --git a/cpan/CPAN-Meta/lib/CPAN/Meta/Feature.pm b/cpan/CPAN-Meta/lib/CPAN/Meta/Feature.pm index 31f4935..1960f48 100644 --- a/cpan/CPAN-Meta/lib/CPAN/Meta/Feature.pm +++ b/cpan/CPAN-Meta/lib/CPAN/Meta/Feature.pm @@ -2,7 +2,7 @@ use 5.006; use strict; use warnings; package CPAN::Meta::Feature; -our $VERSION = '2.120921'; # VERSION +our $VERSION = '2.130880'; # VERSION use CPAN::Meta::Prereqs; @@ -32,17 +32,19 @@ sub prereqs { $_[0]{prereqs} } # ABSTRACT: an optional feature provided by a CPAN distribution - +__END__ =pod +=encoding utf-8 + =head1 NAME CPAN::Meta::Feature - an optional feature provided by a CPAN distribution =head1 VERSION -version 2.120921 +version 2.130880 =head1 DESCRIPTION @@ -99,17 +101,69 @@ Ricardo Signes <rjbs@cpan.org> =back -=head1 COPYRIGHT AND LICENSE +=head1 CONTRIBUTORS -This software is copyright (c) 2010 by David Golden and Ricardo Signes. +=over 4 -This is free software; you can redistribute it and/or modify it under -the same terms as the Perl 5 programming language system itself. +=item * -=cut +Ansgar Burchardt <ansgar@cpan.org> +=item * -__END__ +Michael G. Schwern <mschwern@cpan.org> + +=item * +Randy Sims <randys@thepierianspring.org> +=item * + +Ãvar ArnfjÃ¶rÃ° Bjarmason <avar@cpan.org> + +=item * + +Christopher J. Madsen <cjm@cpan.org> + +=item * + +Cory G Watson <gphat@cpan.org> + +=item * + +Damyan Ivanov <dam@cpan.org> + +=item * +Eric Wilhelm <ewilhelm@cpan.org> + +=item * + +Gregor Hermann <gregoa@debian.org> + +=item * + +Ken Williams <kwilliams@cpan.org> + +=item * + +Lars DÉªá´á´á´á´á´¡ è¿ªææ¯ <daxim@cpan.org> + +=item * + +Leon Timmermans <leont@cpan.org> + +=item * + +Mark Fowler <markf@cpan.org> + +=back + +=head1 COPYRIGHT AND LICENSE + +This software is copyright (c) 2010 by David Golden and Ricardo Signes. + +This is free software; you can redistribute it and/or modify it under +the same terms as the Perl 5 programming language system itself. + +=cut diff --git a/cpan/CPAN-Meta/lib/CPAN/Meta/History.pm b/cpan/CPAN-Meta/lib/CPAN/Meta/History.pm index 9e32d56..b793884 100644 --- a/cpan/CPAN-Meta/lib/CPAN/Meta/History.pm +++ b/cpan/CPAN-Meta/lib/CPAN/Meta/History.pm @@ -3,24 +3,25 @@ use 5.006; use strict; use warnings; package CPAN::Meta::History; -our $VERSION = '2.120921'; # VERSION +our $VERSION = '2.130880'; # VERSION 1; # ABSTRACT: history of CPAN Meta Spec changes - - __END__ + =pod +=encoding utf-8 + =head1 NAME CPAN::Meta::History - history of CPAN Meta Spec changes =head1 VERSION -version 2.120921 +version 2.130880 =head1 DESCRIPTION @@ -174,10 +175,6 @@ November 2006 =item * -Clarified that all prerequisites take version range specifications - -=item * - Added 'no_index' subkey 'directory' and removed 'dir' to match actual usage in the wild @@ -211,6 +208,10 @@ Changed 'license' to be mandatory =item * +Added version range specifications for prerequisites + +=item * + Added required 'abstract' field =item * @@ -304,6 +305,64 @@ Ricardo Signes <rjbs@cpan.org> =back +=head1 CONTRIBUTORS + +=over 4 + +=item * + +Ansgar Burchardt <ansgar@cpan.org> + +=item * + +Michael G. Schwern <mschwern@cpan.org> + +=item * + +Randy Sims <randys@thepierianspring.org> + +=item * + +Ãvar ArnfjÃ¶rÃ° Bjarmason <avar@cpan.org> + +=item * + +Christopher J. Madsen <cjm@cpan.org> + +=item * + +Cory G Watson <gphat@cpan.org> + +=item * + +Damyan Ivanov <dam@cpan.org> + +=item * + +Eric Wilhelm <ewilhelm@cpan.org> + +=item * + +Gregor Hermann <gregoa@debian.org> + +=item * + +Ken Williams <kwilliams@cpan.org> + +=item * + +Lars DÉªá´á´á´á´á´¡ è¿ªææ¯ <daxim@cpan.org> + +=item * + +Leon Timmermans <leont@cpan.org> + +=item * + +Mark Fowler <markf@cpan.org> + +=back + =head1 COPYRIGHT AND LICENSE This software is copyright (c) 2010 by David Golden and Ricardo Signes. @@ -312,4 +371,3 @@ This is free software; you can redistribute it and/or modify it under the same terms as the Perl 5 programming language system itself. =cut - diff --git a/cpan/CPAN-Meta/lib/CPAN/Meta/Prereqs.pm b/cpan/CPAN-Meta/lib/CPAN/Meta/Prereqs.pm index c1c58f0..f5fca20 100644 --- a/cpan/CPAN-Meta/lib/CPAN/Meta/Prereqs.pm +++ b/cpan/CPAN-Meta/lib/CPAN/Meta/Prereqs.pm @@ -2,7 +2,7 @@ use 5.006; use strict; use warnings; package CPAN::Meta::Prereqs; -our $VERSION = '2.120921'; # VERSION +our $VERSION = '2.130880'; # VERSION use Carp qw(confess); @@ -139,17 +139,19 @@ sub clone { # ABSTRACT: a set of distribution prerequisites by phase and type - +__END__ =pod +=encoding utf-8 + =head1 NAME CPAN::Meta::Prereqs - a set of distribution prerequisites by phase and type =head1 VERSION -version 2.120921 +version 2.130880 =head1 DESCRIPTION @@ -260,17 +262,69 @@ Ricardo Signes <rjbs@cpan.org> =back -=head1 COPYRIGHT AND LICENSE +=head1 CONTRIBUTORS -This software is copyright (c) 2010 by David Golden and Ricardo Signes. +=over 4 -This is free software; you can redistribute it and/or modify it under -the same terms as the Perl 5 programming language system itself. +=item * -=cut +Ansgar Burchardt <ansgar@cpan.org> +=item * -__END__ +Michael G. Schwern <mschwern@cpan.org> + +=item * +Randy Sims <randys@thepierianspring.org> +=item * + +Ãvar ArnfjÃ¶rÃ° Bjarmason <avar@cpan.org> + +=item * + +Christopher J. Madsen <cjm@cpan.org> + +=item * + +Cory G Watson <gphat@cpan.org> + +=item * + +Damyan Ivanov <dam@cpan.org> + +=item * +Eric Wilhelm <ewilhelm@cpan.org> + +=item * + +Gregor Hermann <gregoa@debian.org> + +=item * + +Ken Williams <kwilliams@cpan.org> + +=item * + +Lars DÉªá´á´á´á´á´¡ è¿ªææ¯ <daxim@cpan.org> + +=item * + +Leon Timmermans <leont@cpan.org> + +=item * + +Mark Fowler <markf@cpan.org> + +=back + +=head1 COPYRIGHT AND LICENSE + +This software is copyright (c) 2010 by David Golden and Ricardo Signes. + +This is free software; you can redistribute it and/or modify it under +the same terms as the Perl 5 programming language system itself. + +=cut diff --git a/cpan/CPAN-Meta/lib/CPAN/Meta/Spec.pm b/cpan/CPAN-Meta/lib/CPAN/Meta/Spec.pm index 9addfd4..a7397cd 100644 --- a/cpan/CPAN-Meta/lib/CPAN/Meta/Spec.pm +++ b/cpan/CPAN-Meta/lib/CPAN/Meta/Spec.pm @@ -3,24 +3,25 @@ use 5.006; use strict; use warnings; package CPAN::Meta::Spec; -our $VERSION = '2.120921'; # VERSION +our $VERSION = '2.130880'; # VERSION 1; # ABSTRACT: specification for CPAN distribution metadata - - __END__ + =pod +=encoding utf-8 + =head1 NAME CPAN::Meta::Spec - specification for CPAN distribution metadata =head1 VERSION -version 2.120921 +version 2.130880 =head1 SYNOPSIS @@ -1136,6 +1137,64 @@ Ricardo Signes <rjbs@cpan.org> =back +=head1 CONTRIBUTORS + +=over 4 + +=item * + +Ansgar Burchardt <ansgar@cpan.org> + +=item * + +Michael G. Schwern <mschwern@cpan.org> + +=item * + +Randy Sims <randys@thepierianspring.org> + +=item * + +Ãvar ArnfjÃ¶rÃ° Bjarmason <avar@cpan.org> + +=item * + +Christopher J. Madsen <cjm@cpan.org> + +=item * + +Cory G Watson <gphat@cpan.org> + +=item * + +Damyan Ivanov <dam@cpan.org> + +=item * + +Eric Wilhelm <ewilhelm@cpan.org> + +=item * + +Gregor Hermann <gregoa@debian.org> + +=item * + +Ken Williams <kwilliams@cpan.org> + +=item * + +Lars DÉªá´á´á´á´á´¡ è¿ªææ¯ <daxim@cpan.org> + +=item * + +Leon Timmermans <leont@cpan.org> + +=item * + +Mark Fowler <markf@cpan.org> + +=back + =head1 COPYRIGHT AND LICENSE This software is copyright (c) 2010 by David Golden and Ricardo Signes. @@ -1144,4 +1203,3 @@ This is free software; you can redistribute it and/or modify it under the same terms as the Perl 5 programming language system itself. =cut - diff --git a/cpan/CPAN-Meta/lib/CPAN/Meta/Validator.pm b/cpan/CPAN-Meta/lib/CPAN/Meta/Validator.pm index e35f4c0..264658f 100644 --- a/cpan/CPAN-Meta/lib/CPAN/Meta/Validator.pm +++ b/cpan/CPAN-Meta/lib/CPAN/Meta/Validator.pm @@ -2,7 +2,7 @@ use 5.006; use strict; use warnings; package CPAN::Meta::Validator; -our $VERSION = '2.120921'; # VERSION +our $VERSION = '2.130880'; # VERSION #--------------------------------------------------------------------------# @@ -828,17 +828,19 @@ sub _error { # ABSTRACT: validate CPAN distribution metadata structures - +__END__ =pod +=encoding utf-8 + =head1 NAME CPAN::Meta::Validator - validate CPAN distribution metadata structures =head1 VERSION -version 2.120921 +version 2.130880 =head1 SYNOPSIS @@ -1041,17 +1043,69 @@ Ricardo Signes <rjbs@cpan.org> =back -=head1 COPYRIGHT AND LICENSE +=head1 CONTRIBUTORS -This software is copyright (c) 2010 by David Golden and Ricardo Signes. +=over 4 -This is free software; you can redistribute it and/or modify it under -the same terms as the Perl 5 programming language system itself. +=item * -=cut +Ansgar Burchardt <ansgar@cpan.org> +=item * -__END__ +Michael G. Schwern <mschwern@cpan.org> + +=item * +Randy Sims <randys@thepierianspring.org> +=item * + +Ãvar ArnfjÃ¶rÃ° Bjarmason <avar@cpan.org> + +=item * + +Christopher J. Madsen <cjm@cpan.org> + +=item * + +Cory G Watson <gphat@cpan.org> + +=item * + +Damyan Ivanov <dam@cpan.org> + +=item * +Eric Wilhelm <ewilhelm@cpan.org> + +=item * + +Gregor Hermann <gregoa@debian.org> + +=item * + +Ken Williams <kwilliams@cpan.org> + +=item * + +Lars DÉªá´á´á´á´á´¡ è¿ªææ¯ <daxim@cpan.org> + +=item * + +Leon Timmermans <leont@cpan.org> + +=item * + +Mark Fowler <markf@cpan.org> + +=back + +=head1 COPYRIGHT AND LICENSE + +This software is copyright (c) 2010 by David Golden and Ricardo Signes. + +This is free software; you can redistribute it and/or modify it under +the same terms as the Perl 5 programming language system itself. + +=cut diff --git a/cpan/CPAN-Meta/t/converter.t b/cpan/CPAN-Meta/t/converter.t index a4dc56c..30fe9b3 100644 --- a/cpan/CPAN-Meta/t/converter.t +++ b/cpan/CPAN-Meta/t/converter.t @@ -225,6 +225,24 @@ for my $f ( reverse sort @files ) { is( $converted->{prereqs}{runtime}{requires}{'File::Path'}, "v1.0.0", "normalize v1.0.0"); } +# specific test for missing provides version +{ + my $path = File::Spec->catfile('t','data','provides-version-missing.json'); + my $original = Parse::CPAN::Meta->load_file( $path ); + ok( $original, "loaded " . basename $path ); + my $cmc = CPAN::Meta::Converter->new( $original ); + my $converted = $cmc->convert( version => 2 ); + is_deeply( $converted->{provides}{"Foo::Bar"}, { file => "lib/Foo/Bar.pm", version => "0.27_02" }, + "Foo::Bar provides correct" + ); + is_deeply( $converted->{provides}{"Foo::Bar::Blah"}, { file => "lib/Foo/Bar/Blah.pm" }, + "Foo::Bar::Blah provides correct" + ); + is_deeply( $converted->{provides}{"Foo::Bar::Baz"}, { file => "lib/Foo/Bar/Baz.pm", version => "0.3" }, + "Foo::Bar provides correct" + ); +} + # CMR standardizes stuff in a way that makes it hard to test original vs final # so we remove spaces and >= to make them compare the same sub _normalize_reqs { diff --git a/cpan/CPAN-Meta/t/data/META-2.json b/cpan/CPAN-Meta/t/data/provides-version-missing.json similarity index 87% copy from cpan/CPAN-Meta/t/data/META-2.json copy to cpan/CPAN-Meta/t/data/provides-version-missing.json index d737fef..2264e92 100644 --- a/cpan/CPAN-Meta/t/data/META-2.json +++ b/cpan/CPAN-Meta/t/data/provides-version-missing.json @@ -30,6 +30,19 @@ "cpan", "dual-life" ], + "provides" : { + "Foo::Bar" : { + "file" : "lib/Foo/Bar.pm", + "version" : "0.27_02" + }, + "Foo::Bar::Blah" : { + "file" : "lib/Foo/Bar/Blah.pm" + }, + "Foo::Bar::Baz" : { + "file" : "lib/Foo/Bar/Baz.pm", + "version" : 0.3 + } + }, "prereqs" : { "runtime" : { "requires" : { diff --git a/cpan/Encode/Changes b/cpan/Encode/Changes index c916db9..f8dd726 100644 --- a/cpan/Encode/Changes +++ b/cpan/Encode/Changes @@ -1,8 +1,31 @@ # Revision history for Perl extension Encode. # -# $Id: Changes,v 2.49 2013/03/05 03:12:49 dankogai Exp dankogai $ +# $Id: Changes,v 2.51 2013/04/29 22:19:11 dankogai Exp dankogai $ # -$Revision: 2.49 $ $Date: 2013/03/05 03:12:49 $ +$Revision: 2.51 $ $Date: 2013/04/29 22:19:11 $ +! Encode.xs + Addressed: Encode.xs doesn't compile with Microsoft C compiler + https://rt.cpan.org/Public/Bug/Display.html?id=84920 +! MANIFEST + Addressed: t/taint.t missing + https://rt.cpan.org/Public/Bug/Display.html?id=84919 + +2.50 2013/04/26 18:30:46 +! Encode.xs Unicode/Unicode.xs + lib/Encode/Unicode/UTF7.pm lib/CN/HZ.pm lib/Encode/GSM0338.pm + t/taint.t + Addressed: Encode::encode and Encode::decode + gratuitously launders tainted data + Taintedness now propagates as it should. + https://rt.cpan.org/Ticket/Display.html?id=84879 +! encoding.pm + Addressed: 5.18 deprecation + https://rt.cpan.org/Ticket/Display.html?id=84709 +! bin/piconv + Applied: Update piconv documentation + https://rt.cpan.org/Ticket/Display.html?id=84695 + +2.49 2013/03/05 03:12:49 ! Encode.xs Addressed: Encoding objects leak memory if decoding fails https://github.com/dankogai/p5-encode/issues/8 diff --git a/cpan/Encode/Encode.pm b/cpan/Encode/Encode.pm index fe81119..5c30031 100644 --- a/cpan/Encode/Encode.pm +++ b/cpan/Encode/Encode.pm @@ -1,10 +1,10 @@ # -# $Id: Encode.pm,v 2.49 2013/03/05 03:13:47 dankogai Exp dankogai $ +# $Id: Encode.pm,v 2.51 2013/04/29 22:19:11 dankogai Exp dankogai $ # package Encode; use strict; use warnings; -our $VERSION = sprintf "%d.%02d", q$Revision: 2.49 $ =~ /(\d+)/g; +our $VERSION = sprintf "%d.%02d", q$Revision: 2.51 $ =~ /(\d+)/g; use constant DEBUG => !!$ENV{PERL_ENCODE_DEBUG}; use XSLoader (); XSLoader::load( __PACKAGE__, $VERSION ); @@ -1021,7 +1021,7 @@ who submitted code to the project. =head1 COPYRIGHT -Copyright 2002-2012 Dan Kogai I<< <dankogai@cpan.org> >>. +Copyright 2002-2013 Dan Kogai I<< <dankogai@cpan.org> >>. This library is free software; you can redistribute it and/or modify it under the same terms as Perl itself. diff --git a/cpan/Encode/Encode.xs b/cpan/Encode/Encode.xs index f99da10..25b0b83 100644 --- a/cpan/Encode/Encode.xs +++ b/cpan/Encode/Encode.xs @@ -1,5 +1,5 @@ /* - $Id: Encode.xs,v 2.21 2013/03/05 03:12:49 dankogai Exp dankogai $ + $Id: Encode.xs,v 2.23 2013/04/29 22:19:11 dankogai Exp dankogai $ */ #define PERL_NO_GET_CONTEXT @@ -101,7 +101,6 @@ encode_method(pTHX_ const encode_t * enc, const encpage_t * dir, SV * src, STRLEN tlen = slen; STRLEN ddone = 0; STRLEN sdone = 0; - /* We allocate slen+1. PerlIO dumps core if this value is smaller than this. */ SV *dst = sv_2mortal(newSV(slen+1)); @@ -111,6 +110,8 @@ encode_method(pTHX_ const encode_t * enc, const encpage_t * dir, SV * src, STRLEN trmlen = 0; U8 *trm = term ? (U8*) SvPV(term, trmlen) : NULL; + if (SvTAINTED(src)) SvTAINTED_on(dst); /* propagate taintedness */ + if (offset) { s += *offset; if (slen > *offset){ /* safeguard against slen overflow */ @@ -482,6 +483,7 @@ CODE: SvCUR_set(src, slen); } SvUTF8_on(dst); + if (SvTAINTED(src)) SvTAINTED_on(dst); /* propagate taintedness */ ST(0) = dst; XSRETURN(1); } @@ -543,6 +545,7 @@ CODE: } SvPOK_only(dst); SvUTF8_off(dst); + if (SvTAINTED(src)) SvTAINTED_on(dst); /* propagate taintedness */ ST(0) = dst; XSRETURN(1); } diff --git a/cpan/Encode/MANIFEST b/cpan/Encode/MANIFEST index 830cebc..be51afd 100644 --- a/cpan/Encode/MANIFEST +++ b/cpan/Encode/MANIFEST @@ -96,6 +96,7 @@ t/mime_header_iso2022jp.t test script t/perlio.t test script t/piconv.t test script t/rt.pl even more test script +t/taint.t test script t/unibench.pl benchmark script t/utf8ref.t test script t/utf8strict.t test script diff --git a/cpan/Encode/META.json b/cpan/Encode/META.json index 4895bda..60e2b60 100644 --- a/cpan/Encode/META.json +++ b/cpan/Encode/META.json @@ -4,7 +4,7 @@ "unknown" ], "dynamic_config" : 1, - "generated_by" : "ExtUtils::MakeMaker version 6.64, CPAN::Meta::Converter version 2.120921", + "generated_by" : "ExtUtils::MakeMaker version 6.66, CPAN::Meta::Converter version 2.130880", "license" : [ "perl_5" ], @@ -35,5 +35,5 @@ } }, "release_status" : "stable", - "version" : "2.49" + "version" : "2.51" } diff --git a/cpan/Encode/META.yml b/cpan/Encode/META.yml index 398a230..84a426d 100644 --- a/cpan/Encode/META.yml +++ b/cpan/Encode/META.yml @@ -7,7 +7,7 @@ build_requires: configure_requires: ExtUtils::MakeMaker: 0 dynamic_config: 1 -generated_by: 'ExtUtils::MakeMaker version 6.64, CPAN::Meta::Converter version 2.120921' +generated_by: 'ExtUtils::MakeMaker version 6.66, CPAN::Meta::Converter version 2.130880' license: perl meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html @@ -18,4 +18,4 @@ no_index: - t - inc requires: {} -version: 2.49 +version: 2.51 diff --git a/cpan/Encode/Unicode/Unicode.xs b/cpan/Encode/Unicode/Unicode.xs index 026f8fb..4abbf72 100644 --- a/cpan/Encode/Unicode/Unicode.xs +++ b/cpan/Encode/Unicode/Unicode.xs @@ -1,5 +1,5 @@ /* - $Id: Unicode.xs,v 2.9 2012/08/05 23:08:49 dankogai Exp $ + $Id: Unicode.xs,v 2.10 2013/04/26 18:30:46 dankogai Exp $ */ #define PERL_NO_GET_CONTEXT @@ -299,9 +299,8 @@ CODE: *SvEND(str) = '\0'; } - if (!temp_result) - shrink_buffer(result); - + if (!temp_result) shrink_buffer(result); + if (SvTAINTED(str)) SvTAINTED_on(result); /* propagate taintedness */ XSRETURN(1); } @@ -400,8 +399,8 @@ CODE: *SvEND(utf8) = '\0'; } - if (!temp_result) - shrink_buffer(result); + if (!temp_result) shrink_buffer(result); + if (SvTAINTED(utf8)) SvTAINTED_on(result); /* propagate taintedness */ SvSETMAGIC(utf8); diff --git a/cpan/Encode/bin/piconv b/cpan/Encode/bin/piconv index 9fdebd1..74adca4 100644 --- a/cpan/Encode/bin/piconv +++ b/cpan/Encode/bin/piconv @@ -1,5 +1,5 @@ #!./perl -# $Id: piconv,v 2.4 2009/07/08 13:34:15 dankogai Exp $ +# $Id: piconv,v 2.5 2013/04/26 18:30:46 dankogai Exp $ # use 5.8.0; use strict; @@ -147,9 +147,13 @@ sub help { my $message = shift; $message and print STDERR "$name error: $message\n"; print STDERR <<"EOT"; -$name [-f from_encoding] [-t to_encoding] [-s string] [files...] +$name [-f from_encoding] [-t to_encoding] + [-p|--perlqq|--htmlcref|--xmlcref] [-C N|-c] [-D] [-S scheme] + [-s string|file...] $name -l $name -r encoding_alias +$name -h +Common options: -l,--list lists all available encodings -r,--resolve encoding_alias @@ -161,13 +165,17 @@ $name -r encoding_alias -s,--string string "string" will be the input instead of STDIN or files The following are mainly of interest to Encode hackers: - -D,--debug show debug information -C N | -c check the validity of the input + -D,--debug show debug information -S,--scheme scheme use the scheme for conversion -Those are handy when you can only see ascii characters: - -p,--perlqq - --htmlcref - --xmlcref +Those are handy when you can only see ASCII characters: + -p,--perlqq transliterate characters missing in encoding to \x{HHHH} + where HHHH is the hexadecimal Unicode code point + --htmlcref transliterate characters missing in encoding to &#NNN; + where NNN is the decimal Unicode code point + --xmlcref transliterate characters missing in encoding to &#xHHHH; + where HHHH is the hexadecimal Unicode code point + EOT exit; } @@ -180,12 +188,11 @@ piconv -- iconv(1), reinvented in perl =head1 SYNOPSIS - piconv [-f from_encoding] [-t to_encoding] [-s string] [files...] + piconv [-f from_encoding] [-t to_encoding] + [-p|--perlqq|--htmlcref|--xmlcref] [-C N|-c] [-D] [-S scheme] + [-s string|file...] piconv -l - piconv [-C N|-c|-p] - piconv -S scheme ... - piconv -r encoding - piconv -D ... + piconv -r encoding_alias piconv -h =head1 DESCRIPTION @@ -198,17 +205,17 @@ place of iconv for virtually any case. piconv converts the character encoding of either STDIN or files specified in the argument and prints out to STDOUT. -Here is the list of options. Each option can be in short format (-f) -or long (--from). +Here is the list of options. Some options can be in short format (-f) +or long (--from) one. =over 4 -=item -f,--from from_encoding +=item -f,--from I<from_encoding> Specifies the encoding you are converting from. Unlike B<iconv>, this option can be omitted. In such cases, the current locale is used. -=item -t,--to to_encoding +=item -t,--to I<to_encoding> Specifies the encoding you are converting to. Unlike B<iconv>, this option can be omitted. In such cases, the current locale is used. @@ -229,6 +236,10 @@ and common aliases work, such as "latin1" for "ISO-8859-1", or "ibm850" instead of "cp850", or "winlatin1" for "cp1252". See L<Encode::Supported> for a full discussion. +=item -r,--resolve I<encoding_alias> + +Resolve I<encoding_alias> to Encode canonical encoding name. + =item -C,--check I<N> Check the validity of the stream if I<N> = 1. When I<N> = -1, something @@ -240,15 +251,18 @@ Same as C<-C 1>. =item -p,--perlqq -=item --htmlcref +Transliterate characters missing in encoding to \x{HHHH} where HHHH is the +hexadecimal Unicode code point. -=item --xmlcref +=item --htmlcref -Applies PERLQQ, HTMLCREF, XMLCREF, respectively. Try +Transliterate characters missing in encoding to &#NNN; where NNN is the +decimal Unicode code point. - piconv -f utf8 -t ascii --perlqq +=item --xmlcref -To see what it does. +Transliterate characters missing in encoding to &#xHHHH; where HHHH is the +hexadecimal Unicode code point. =item -h,--help @@ -258,7 +272,7 @@ Show usage. Invokes debugging mode. Primarily for Encode hackers. -=item -S,--scheme scheme +=item -S,--scheme I<scheme> Selects which scheme is to be used for conversion. Available schemes are as follows: diff --git a/cpan/Encode/encoding.pm b/cpan/Encode/encoding.pm index 2783c9f..c0bff08 100644 --- a/cpan/Encode/encoding.pm +++ b/cpan/Encode/encoding.pm @@ -1,6 +1,6 @@ -# $Id: encoding.pm,v 2.11 2013/02/18 02:23:56 dankogai Exp $ +# $Id: encoding.pm,v 2.12 2013/04/26 18:30:46 dankogai Exp $ package encoding; -our $VERSION = '2.6_01'; +our $VERSION = sprintf "%d.%02d", q$Revision: 2.12 $ =~ /(\d+)/g; use Encode; use strict; @@ -213,6 +213,13 @@ This module is deprecated under perl 5.18. It uses a mechanism provided by perl that is deprecated under 5.18 and higher, and may be removed in a future version. +The easiest and the best alternative is to write your script in UTF-8 +and declear: + + use utf8; # not use encoding ':utf8'; + +See L<perluniintro> and L<utf8> for details. + =head1 SYNOPSIS use encoding "greek"; # Perl like Greek to you? diff --git a/cpan/Encode/lib/Encode/CN/HZ.pm b/cpan/Encode/lib/Encode/CN/HZ.pm index 98c16a9..7a93e25 100644 --- a/cpan/Encode/lib/Encode/CN/HZ.pm +++ b/cpan/Encode/lib/Encode/CN/HZ.pm @@ -5,7 +5,7 @@ use warnings; use utf8 (); use vars qw($VERSION); -$VERSION = do { my @r = ( q$Revision: 2.5 $ =~ /\d+/g ); sprintf "%d." . "%02d" x $#r, @r }; +$VERSION = do { my @r = ( q$Revision: 2.6 $ =~ /\d+/g ); sprintf "%d." . "%02d" x $#r, @r }; use Encode qw(:fallbacks); @@ -23,7 +23,7 @@ sub decode ($$;$) { my ( $obj, $str, $chk ) = @_; my $GB = Encode::find_encoding('gb2312-raw'); - my $ret = ''; + my $ret = substr($str, 0, 0); # to propagate taintedness my $in_ascii = 1; # default mode is ASCII. while ( length $str ) { @@ -133,10 +133,10 @@ sub cat_decode { } sub encode($$;$) { - my ( $obj, $str, $chk ) = @_; + my ( $obj, $str, $chk ) = @_; my $GB = Encode::find_encoding('gb2312-raw'); - my $ret = ''; + my $ret = substr($str, 0, 0); # to propagate taintedness; my $in_ascii = 1; # default mode is ASCII. no warnings 'utf8'; # $str may be malformed UTF8 at the end of a chunk. diff --git a/cpan/Encode/lib/Encode/GSM0338.pm b/cpan/Encode/lib/Encode/GSM0338.pm index aeff637..e1a11bd 100644 --- a/cpan/Encode/lib/Encode/GSM0338.pm +++ b/cpan/Encode/lib/Encode/GSM0338.pm @@ -1,5 +1,5 @@ # -# $Id: GSM0338.pm,v 2.2 2012/08/15 05:36:16 dankogai Exp $ +# $Id: GSM0338.pm,v 2.3 2013/04/26 18:30:46 dankogai Exp $ # package Encode::GSM0338; @@ -8,7 +8,7 @@ use warnings; use Carp; use vars qw($VERSION); -$VERSION = do { my @r = ( q$Revision: 2.2 $ =~ /\d+/g ); sprintf "%d." . "%02d" x $#r, @r }; +$VERSION = do { my @r = ( q$Revision: 2.3 $ =~ /\d+/g ); sprintf "%d." . "%02d" x $#r, @r }; use Encode qw(:fallbacks); @@ -171,7 +171,7 @@ our $NBSP = "\x{00A0}"; sub decode ($$;$) { my ( $obj, $bytes, $chk ) = @_; - my $str; + my $str = substr($bytes, 0, 0); # to propagate taintedness; while ( length $bytes ) { my $c = substr( $bytes, 0, 1, '' ); my $u; @@ -216,7 +216,7 @@ sub decode ($$;$) { sub encode($$;$) { my ( $obj, $str, $chk ) = @_; - my $bytes; + my $bytes = substr($str, 0, 0); # to propagate taintedness while ( length $str ) { my $u = substr( $str, 0, 1, '' ); my $c; diff --git a/cpan/Encode/lib/Encode/Unicode/UTF7.pm b/cpan/Encode/lib/Encode/Unicode/UTF7.pm index ea9257b..0b22dbe 100644 --- a/cpan/Encode/lib/Encode/Unicode/UTF7.pm +++ b/cpan/Encode/lib/Encode/Unicode/UTF7.pm @@ -1,5 +1,5 @@ # -# $Id: UTF7.pm,v 2.6 2012/08/05 23:08:49 dankogai Exp $ +# $Id: UTF7.pm,v 2.7 2013/04/26 18:30:46 dankogai Exp $ # package Encode::Unicode::UTF7; use strict; @@ -7,7 +7,7 @@ use warnings; no warnings 'redefine'; use base qw(Encode::Encoding); __PACKAGE__->Define('UTF-7'); -our $VERSION = do { my @r = ( q$Revision: 2.6 $ =~ /\d+/g ); sprintf "%d." . "%02d" x $#r, @r }; +our $VERSION = do { my @r = ( q$Revision: 2.7 $ =~ /\d+/g ); sprintf "%d." . "%02d" x $#r, @r }; use MIME::Base64; use Encode; @@ -32,7 +32,7 @@ sub encode($$;$) { my ( $obj, $str, $chk ) = @_; my $len = length($str); pos($str) = 0; - my $bytes = ''; + my $bytes = substr($str, 0, 0); # to propagate taintedness while ( pos($str) < $len ) { if ( $str =~ /\G($re_asis+)/ogc ) { my $octets = $1; @@ -59,9 +59,10 @@ sub encode($$;$) { } sub decode($$;$) { + use re 'taint'; my ( $obj, $bytes, $chk ) = @_; my $len = length($bytes); - my $str = ""; + my $str = substr($bytes, 0, 0); # to propagate taintedness; pos($bytes) = 0; no warnings 'uninitialized'; while ( pos($bytes) < $len ) { diff --git a/cpan/Encode/t/taint.t b/cpan/Encode/t/taint.t new file mode 100644 index 0000000..ade8b07 --- /dev/null +++ b/cpan/Encode/t/taint.t @@ -0,0 +1,15 @@ +#!/usr/bin/perl -T +use strict; +use Encode qw(encode decode); +use Scalar::Util qw(tainted); +use Test::More; + +my $str = "abc" . substr($ENV{PATH},0,0); # tainted string +my @names = Encode->encodings(':all'); +plan tests => 2 * @names; +for my $name (@names){ + my $e = encode($name, $str); + ok tainted($e), "encode $name"; + my $d = decode($name, $e); + ok tainted($d), "decode $name"; +} diff --git a/cpan/File-Fetch/lib/File/Fetch.pm b/cpan/File-Fetch/lib/File/Fetch.pm index 37f7bc6..75e42c6 100644 --- a/cpan/File-Fetch/lib/File/Fetch.pm +++ b/cpan/File-Fetch/lib/File/Fetch.pm @@ -22,7 +22,7 @@ use vars qw[ $VERBOSE $PREFER_BIN $FROM_EMAIL $USER_AGENT $FTP_PASSIVE $TIMEOUT $DEBUG $WARN ]; -$VERSION = '0.38'; +$VERSION = '0.42'; $VERSION = eval $VERSION; # avoid warnings with development releases $PREFER_BIN = 0; # XXX TODO implement $FROM_EMAIL = 'File-Fetch@example.com'; @@ -39,7 +39,8 @@ $METHODS = { http => [ qw|lwp httptiny wget curl lftp fetch httplite lynx iosock| ], ftp => [ qw|lwp netftp wget curl lftp fetch ncftp ftp| ], file => [ qw|lwp lftp file| ], - rsync => [ qw|rsync| ] + rsync => [ qw|rsync| ], + git => [ qw|git| ], }; ### silly warnings ### @@ -87,7 +88,7 @@ File::Fetch - A generic file fetching mechanism File::Fetch is a generic file fetching mechanism. It allows you to fetch any file pointed to by a C<ftp>, C<http>, -C<file>, or C<rsync> uri by a number of different means. +C<file>, C<git> or C<rsync> uri by a number of different means. See the C<HOW IT WORKS> section further down for details. @@ -1402,6 +1403,52 @@ sub _rsync_fetch { } +### use git to fetch files +sub _git_fetch { + my $self = shift; + my %hash = @_; + + my ($to); + my $tmpl = { + to => { required => 1, store => \$to } + }; + check( $tmpl, \%hash ) or return; + my $git; + unless ( $git = can_run('git') ) { + $METHOD_FAIL->{'git'} = 1; + return; + } + + my $cmd = [ $git, 'clone' ]; + + #push(@$cmd, '--timeout=' . $TIMEOUT) if $TIMEOUT; + + push(@$cmd, '--quiet') unless $DEBUG; + + ### DO NOT quote things for IPC::Run, it breaks stuff. + push @$cmd, $self->uri, $to; + + ### with IPC::Cmd > 0.41, this is fixed in teh library, + ### and there's no need for special casing any more. + ### DO NOT quote things for IPC::Run, it breaks stuff. + # $IPC::Cmd::USE_IPC_RUN + # ? ($to, $self->uri) + # : (QUOTE. $to .QUOTE, QUOTE. $self->uri .QUOTE); + + my $captured; + unless(run( command => $cmd, + buffer => \$captured, + verbose => $DEBUG ) + ) { + + return $self->_error(loc("Command %1 failed: %2", + "@$cmd" || '', $captured || '')); + } + + return $to; + +} + ################################# # # Error code @@ -1454,6 +1501,7 @@ for what schemes, if available: http => LWP, HTTP::Lite, wget, curl, lftp, fetch, lynx, iosock ftp => LWP, Net::FTP, wget, curl, lftp, fetch, ncftp, ftp rsync => rsync + git => git If you'd like to disable the use of one or more of these utilities and/or modules, see the C<$BLACKLIST> variable further down. @@ -1470,6 +1518,8 @@ three platforms. C<iosock> is a very limited L<IO::Socket::INET> based mechanism for retrieving C<http> schemed urls. It doesn't follow redirects for instance. +C<git> only supports C<git://> style urls. + A special note about fetching files from an ftp uri: By default, all ftp connections are done in passive mode. To change diff --git a/cpan/File-Fetch/t/01_File-Fetch.t b/cpan/File-Fetch/t/01_File-Fetch.t index 538c55e..e4fdccf 100644 --- a/cpan/File-Fetch/t/01_File-Fetch.t +++ b/cpan/File-Fetch/t/01_File-Fetch.t @@ -7,6 +7,7 @@ use Test::More 'no_plan'; use Cwd qw[cwd]; use File::Basename qw[basename]; +use File::Path qw[rmtree]; use Data::Dumper; use_ok('File::Fetch'); @@ -46,7 +47,7 @@ if( $File::Fetch::DEBUG ) { } ### Heuristics -my %heuristics = map { $_ => 1 } qw(http ftp rsync file); +my %heuristics = map { $_ => 1 } qw(http ftp rsync file git); ### _parse_uri tests ### these go on all platforms my @map = ( @@ -62,6 +63,12 @@ my @map = ( path => '/CPAN/', file => 'MIRRORING.FROM', }, + { uri => 'git://github.com/jib/file-fetch.git', + scheme => 'git', + host => 'github.com', + path => '/jib/', + file => 'file-fetch.git', + }, { uri => 'http://localhost/tmp/index.txt', scheme => 'http', host => 'localhost', # host is empty only on 'file://' @@ -216,6 +223,21 @@ for my $entry (@map) { } } +### Heuristics +{ + require IO::Socket::INET; + my $sock = IO::Socket::INET->new( PeerAddr => 'github.com', PeerPort => 9418, Timeout => 20 ) + or $heuristics{git} = 0; +} + +### git:// tests ### +{ my $uri = 'git://github.com/jib/file-fetch.git'; + + for (qw[git]) { + _fetch_uri( git => $uri, $_ ); + } +} + sub _fetch_uri { my $type = shift; my $uri = shift; @@ -240,7 +262,7 @@ sub _fetch_uri { for my $to ( 'tmp', do { \my $o } ) { SKIP: { - my $how = ref $to ? 'slurp' : 'file'; + my $how = ref $to && $type ne 'git' ? 'slurp' : 'file'; my $skip = ref $to ? 4 : 3; ok( 1, " Fetching '$uri' in $how mode" ); @@ -258,7 +280,7 @@ sub _fetch_uri { ok( $file, " File ($file) fetched with $method ($uri)" ); ### check we got some contents if we were meant to slurp - if( ref $to ) { + if( ref $to && $type ne 'git' ) { ok( $$to, " Contents slurped" ); } @@ -267,7 +289,7 @@ sub _fetch_uri { is( $file && basename($file), $ff->output_file, " File has expected name" ); - unlink $file; + rmtree $file; }} } } diff --git a/cpan/File-Temp/lib/File/Temp.pm b/cpan/File-Temp/lib/File/Temp.pm index ac57c26..2dd3102 100644 --- a/cpan/File-Temp/lib/File/Temp.pm +++ b/cpan/File-Temp/lib/File/Temp.pm @@ -1,141 +1,7 @@ package File::Temp; +# ABSTRACT: return name and handle of a temporary file safely +our $VERSION = '0.2301'; # VERSION -=head1 NAME - -File::Temp - return name and handle of a temporary file safely - -=begin __INTERNALS - -=head1 PORTABILITY - -This section is at the top in order to provide easier access to -porters. It is not expected to be rendered by a standard pod -formatting tool. Please skip straight to the SYNOPSIS section if you -are not trying to port this module to a new platform. - -This module is designed to be portable across operating systems and it -currently supports Unix, VMS, DOS, OS/2, Windows and Mac OS -(Classic). When porting to a new OS there are generally three main -issues that have to be solved: - -=over 4 - -=item * - -Can the OS unlink an open file? If it can not then the -C<_can_unlink_opened_file> method should be modified. - -=item * - -Are the return values from C<stat> reliable? By default all the -return values from C<stat> are compared when unlinking a temporary -file using the filename and the handle. Operating systems other than -unix do not always have valid entries in all fields. If utility function -C<File::Temp::unlink0> fails then the C<stat> comparison should be -modified accordingly. - -=item * - -Security. Systems that can not support a test for the sticky bit -on a directory can not use the MEDIUM and HIGH security tests. -The C<_can_do_level> method should be modified accordingly. - -=back - -=end __INTERNALS - -=head1 SYNOPSIS - - use File::Temp qw/ tempfile tempdir /; - - $fh = tempfile(); - ($fh, $filename) = tempfile(); - - ($fh, $filename) = tempfile( $template, DIR => $dir); - ($fh, $filename) = tempfile( $template, SUFFIX => '.dat'); - ($fh, $filename) = tempfile( $template, TMPDIR => 1 ); - - binmode( $fh, ":utf8" ); - - $dir = tempdir( CLEANUP => 1 ); - ($fh, $filename) = tempfile( DIR => $dir ); - -Object interface: - - require File::Temp; - use File::Temp (); - use File::Temp qw/ :seekable /; - - $fh = File::Temp->new(); - $fname = $fh->filename; - - $fh = File::Temp->new(TEMPLATE => $template); - $fname = $fh->filename; - - $tmp = File::Temp->new( UNLINK => 0, SUFFIX => '.dat' ); - print $tmp "Some data\n"; - print "Filename is $tmp\n"; - $tmp->seek( 0, SEEK_END ); - -The following interfaces are provided for compatibility with -existing APIs. They should not be used in new code. - -MkTemp family: - - use File::Temp qw/ :mktemp /; - - ($fh, $file) = mkstemp( "tmpfileXXXXX" ); - ($fh, $file) = mkstemps( "tmpfileXXXXXX", $suffix); - - $tmpdir = mkdtemp( $template ); - - $unopened_file = mktemp( $template ); - -POSIX functions: - - use File::Temp qw/ :POSIX /; - - $file = tmpnam(); - $fh = tmpfile(); - - ($fh, $file) = tmpnam(); - -Compatibility functions: - - $unopened_file = File::Temp::tempnam( $dir, $pfx ); - -=head1 DESCRIPTION - -C<File::Temp> can be used to create and open temporary files in a safe -way. There is both a function interface and an object-oriented -interface. The File::Temp constructor or the tempfile() function can -be used to return the name and the open filehandle of a temporary -file. The tempdir() function can be used to create a temporary -directory. - -The security aspect of temporary file creation is emphasized such that -a filehandle and filename are returned together. This helps guarantee -that a race condition can not occur where the temporary file is -created by another process between checking for the existence of the -file and its opening. Additional security levels are provided to -check, for example, that the sticky bit is set on world writable -directories. See L<"safe_level"> for more information. - -For compatibility with popular C library functions, Perl implementations of -the mkstemp() family of functions are provided. These are, mkstemp(), -mkstemps(), mkdtemp() and mktemp(). - -Additionally, implementations of the standard L<POSIX|POSIX> -tmpnam() and tmpfile() functions are provided if required. - -Implementations of mktemp(), tmpnam(), and tempnam() are provided, -but should be used with caution since they return only a filename -that was valid when function was called, so cannot guarantee -that the file will not exist by the time the caller opens the filename. - -Filehandles returned by these functions support the seekable methods. - -=cut # 5.6.0 gives us S_IWOTH, S_IWGRP, our and auto-vivifying filehandls # People would like a version on 5.004 so give them what they want :-) @@ -167,7 +33,7 @@ use overload '""' => "STRINGIFY", '0+' => "NUMIFY", fallback => 1; # use 'our' on v5.6.0 -use vars qw($VERSION @EXPORT_OK %EXPORT_TAGS $DEBUG $KEEP_ALL); +use vars qw(@EXPORT_OK %EXPORT_TAGS $DEBUG $KEEP_ALL); $DEBUG = 0; $KEEP_ALL = 0; @@ -205,10 +71,6 @@ use base qw/Exporter/; # add contents of these tags to @EXPORT Exporter::export_tags('POSIX','mktemp','seekable'); -# Version number - -$VERSION = '0.23'; - # This is a list of characters that can be used in random filenames my @CHARS = (qw/ A B C D E F G H I J K L M N O P Q R S T U V W X Y Z @@ -1017,53 +879,6 @@ sub _parse_args { return( \@template, \%args ); } -=head1 OBJECT-ORIENTED INTERFACE - -This is the primary interface for interacting with -C<File::Temp>. Using the OO interface a temporary file can be created -when the object is constructed and the file can be removed when the -object is no longer required. - -Note that there is no method to obtain the filehandle from the -C<File::Temp> object. The object itself acts as a filehandle. The object -isa C<IO::Handle> and isa C<IO::Seekable> so all those methods are -available. - -Also, the object is configured such that it stringifies to the name of the -temporary file and so can be compared to a filename directly. It numifies -to the C<refaddr> the same as other handles and so can be compared to other -handles with C<==>. - - $fh eq $filename # as a string - $fh != \*STDOUT # as a number - -=over 4 - -=item B<new> - -Create a temporary file object. - - my $tmp = File::Temp->new(); - -by default the object is constructed as if C<tempfile> -was called without options, but with the additional behaviour -that the temporary file is removed by the object destructor -if UNLINK is set to true (the default). - -Supported arguments are the same as for C<tempfile>: UNLINK -(defaulting to true), DIR, EXLOCK and SUFFIX. Additionally, the filename -template is specified using the TEMPLATE option. The OPEN option -is not supported (the file is always opened). - - $tmp = File::Temp->new( TEMPLATE => 'tempXXXXX', - DIR => 'mydir', - SUFFIX => '.dat'); - -Arguments are case insensitive. - -Can call croak() if an error occurs. - -=cut sub new { my $proto = shift; @@ -1101,23 +916,6 @@ sub new { return $fh; } -=item B<newdir> - -Create a temporary directory using an object oriented interface. - - $dir = File::Temp->newdir(); - -By default the directory is deleted when the object goes out of scope. - -Supports the same options as the C<tempdir> function. Note that directories -created with this method default to CLEANUP => 1. - - $dir = File::Temp->newdir( $template, %options ); - -A template may be specified either with a leading template or -with a TEMPLATE argument. - -=cut sub newdir { my $self = shift; @@ -1142,17 +940,6 @@ sub newdir { }, "File::Temp::Dir"; } -=item B<filename> - -Return the name of the temporary file associated with this object -(if the object was created using the "new" constructor). - - $filename = $tmp->filename; - -This method is called automatically when the object is used as -a string. - -=cut sub filename { my $self = shift; @@ -1171,25 +958,6 @@ sub NUMIFY { return refaddr($_[0]); } -=item B<dirname> - -Return the name of the temporary directory associated with this -object (if the object was created using the "newdir" constructor). - - $dirname = $tmpdir->dirname; - -This method is called automatically when the object is used in string context. - -=item B<unlink_on_destroy> - -Control whether the file is unlinked when the object goes out of scope. -The file is removed if this value is true and $KEEP_ALL is not. - - $fh->unlink_on_destroy( 1 ); - -Default is for the file to be removed. - -=cut sub unlink_on_destroy { my $self = shift; @@ -1199,29 +967,6 @@ sub unlink_on_destroy { return ${*$self}{UNLINK}; } -=item B<DESTROY> - -When the object goes out of scope, the destructor is called. This -destructor will attempt to unlink the file (using L<unlink1|"unlink1">) -if the constructor was called with UNLINK set to 1 (the default state -if UNLINK is not specified). - -No error is given if the unlink fails. **** PATCH TRUNCATED AT 2000 LINES -- 2095 NOT SHOWN **** -- Perl5 Master Repository http://www.nntp.perl.org/group/perl.perl5.changes/2013/05/msg37214.html Fri, 24 May 2013 18:54:58 +0000 [perl.git] branch smoke-me/nicholas/perl5db-perldoc, updated. v5.19.0-168-g5becb9f by Nicholas Clark In perl.git, the branch smoke-me/nicholas/perl5db-perldoc has been updated <http://perl5.git.perl.org/perl.git/commitdiff/5becb9f37bb572644c060a629d8f4eab2e9f1696?hp=215cc5d70607dba8b91d6d92a786a8c0efd151f3> - Log ----------------------------------------------------------------- commit 5becb9f37bb572644c060a629d8f4eab2e9f1696 Author: Nicholas Clark <nick@ccl4.org> Date: Fri May 24 20:15:10 2013 +0200 Fix the man/perldoc/doc command in the debugger. This was accidentally broken by commit c7b0c61d36b24841. ----------------------------------------------------------------------- Summary of changes: lib/perl5db.pl | 4 ++-- lib/perl5db.t | 22 +++++++++++++++++++++- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/lib/perl5db.pl b/lib/perl5db.pl index 85a5ef4..71dc920 100644 --- a/lib/perl5db.pl +++ b/lib/perl5db.pl @@ -523,7 +523,7 @@ BEGIN { # Debugger for Perl 5.00x; perl5db.pl patch level: use vars qw($VERSION $header); -$VERSION = '1.39_09'; +$VERSION = '1.39_10'; $header = "perl5db.pl version $VERSION"; @@ -3695,7 +3695,7 @@ sub _handle_doc_command { # man, perldoc, doc - show manual pages. if (my ($man_page) = $DB::cmd =~ /\A(?:man|(?:perl)?doc)\b(?:\s+([^(]*))?\z/) { - runman($man_page); + DB::runman($man_page); next CMD; } diff --git a/lib/perl5db.t b/lib/perl5db.t index fe1031b..81bd5da 100644 --- a/lib/perl5db.t +++ b/lib/perl5db.t @@ -28,7 +28,7 @@ BEGIN { } } -plan(113); +plan(114); my $rc_filename = '.perldb'; @@ -2635,6 +2635,26 @@ sub _calc_trace_wrapper ); } +# Test the perldoc command +# We don't actually run the program, but we need to provide one to the wrapper. +{ + my $wrapper = DebugWrap->new( + { + cmds => + [ + 'perldoc perlrules', + 'q', + ], + prog => '../lib/perl5db/t/fact', + } + ); + + $wrapper->output_like( + qr/No manual entry for perlrules/, + 'perldoc command works fine', + ); +} + END { 1 while unlink ($rc_filename, $out_fn); } -- Perl5 Master Repository http://www.nntp.perl.org/group/perl.perl5.changes/2013/05/msg37213.html Fri, 24 May 2013 18:16:46 +0000 [perl.git] branch smoke-me/nicholas/perl5db-perldoc, created. v5.19.0-167-g215cc5d by Nicholas Clark In perl.git, the branch smoke-me/nicholas/perl5db-perldoc has been created <http://perl5.git.perl.org/perl.git/commitdiff/215cc5d70607dba8b91d6d92a786a8c0efd151f3?hp=0000000000000000000000000000000000000000> at 215cc5d70607dba8b91d6d92a786a8c0efd151f3 (commit) - Log ----------------------------------------------------------------- No new revisions added by this update ----------------------------------------------------------------------- -- Perl5 Master Repository http://www.nntp.perl.org/group/perl.perl5.changes/2013/05/msg37212.html Fri, 24 May 2013 18:16:44 +0000 [perl.git] branch blead, updated. v5.19.0-168-g54b985a by Chris 'Bingos' Williams In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/54b985aaf6458a3ba4f6ff294da358647a0b39d8?hp=215cc5d70607dba8b91d6d92a786a8c0efd151f3> - Log ----------------------------------------------------------------- commit 54b985aaf6458a3ba4f6ff294da358647a0b39d8 Author: Chris 'BinGOs' Williams <chris@bingosnet.co.uk> Date: Fri May 24 19:12:47 2013 +0100 Update Config-Perl-V version in Maintainers.pl ----------------------------------------------------------------------- Summary of changes: Porting/Maintainers.pl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index e724f92..a59477d 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -373,7 +373,7 @@ use File::Glob qw(:case); 'Config::Perl::V' => { 'MAINTAINER' => 'hmbrand', - 'DISTRIBUTION' => 'HMBRAND/Config-Perl-V-0.17.tgz', + 'DISTRIBUTION' => 'HMBRAND/Config-Perl-V-0.18.tgz', 'FILES' => q[cpan/Config-Perl-V], 'EXCLUDED' => ['examples/show-v.pl'], 'UPSTREAM' => 'cpan', -- Perl5 Master Repository http://www.nntp.perl.org/group/perl.perl5.changes/2013/05/msg37211.html Fri, 24 May 2013 18:13:26 +0000 [perl.git] branch blead, updated. v5.19.0-167-g215cc5d by H.Merijn Brand In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/215cc5d70607dba8b91d6d92a786a8c0efd151f3?hp=3b0e4ee2077fba66799177fc238e669d82ac3d2f> - Log ----------------------------------------------------------------- commit 215cc5d70607dba8b91d6d92a786a8c0efd151f3 Author: H.Merijn Brand <h.m.brand@xs4all.nl> Date: Fri May 24 17:33:07 2013 +0200 Update Config-Perl-V to version 0.18 ----------------------------------------------------------------------- Summary of changes: MANIFEST | 3 +- cpan/Config-Perl-V/V.pm | 26 +++++- cpan/Config-Perl-V/t/{20_plv.t => 20_plv510.t} | 5 +- cpan/Config-Perl-V/t/21_plv518.t | 102 ++++++++++++++++++++++++ 4 files changed, 128 insertions(+), 8 deletions(-) rename cpan/Config-Perl-V/t/{20_plv.t => 20_plv510.t} (95%) create mode 100644 cpan/Config-Perl-V/t/21_plv518.t diff --git a/MANIFEST b/MANIFEST index 72fcff9..bea7fd6 100644 --- a/MANIFEST +++ b/MANIFEST @@ -248,7 +248,8 @@ cpan/Compress-Raw-Zlib/Zlib.xs Compress::Raw::Zlib cpan/Config-Perl-V/t/00_pod.t Config::Perl::V cpan/Config-Perl-V/t/01_pod.t Config::Perl::V cpan/Config-Perl-V/t/10_base.t Config::Perl::V -cpan/Config-Perl-V/t/20_plv.t Config::Perl::V +cpan/Config-Perl-V/t/20_plv510.t Config::Perl::V +cpan/Config-Perl-V/t/21_plv518.t Config::Perl::V cpan/Config-Perl-V/V.pm Config::Perl::V cpan/CPAN/Changes CPAN.pm Changes file cpan/CPAN/lib/App/Cpan.pm helper package for CPAN.pm diff --git a/cpan/Config-Perl-V/V.pm b/cpan/Config-Perl-V/V.pm index c52b826..fea6857 100644 --- a/cpan/Config-Perl-V/V.pm +++ b/cpan/Config-Perl-V/V.pm @@ -8,7 +8,7 @@ use warnings; use Config; use Exporter; use vars qw($VERSION @ISA @EXPORT_OK %EXPORT_TAGS); -$VERSION = "0.17"; +$VERSION = "0.18"; @ISA = ("Exporter"); @EXPORT_OK = qw( plv2hash summary myconfig signature ); %EXPORT_TAGS = ( @@ -22,14 +22,25 @@ $VERSION = "0.17"; # The list are as the perl binary has stored it in PL_bincompat_options # search for it in -# perl.c line 1661 S_Internals_V () -# perl.h line 4664 (second block), +# perl.c line 1669 S_Internals_V () +# perl.h line 4505 PL_bincompat_options my %BTD = map { $_ => 0 } qw( DEBUGGING NO_MATHOMS + NO_HASH_SEED + NO_TAINT_SUPPORT PERL_DISABLE_PMC PERL_DONT_CREATE_GVSV + PERL_EXTERNAL_GLOB + PERL_HASH_FUNC_SIPHASH + PERL_HASH_FUNC_SDBM + PERL_HASH_FUNC_DJB2 + PERL_HASH_FUNC_SUPERFAST + PERL_HASH_FUNC_MURMUR3 + PERL_HASH_FUNC_ONE_AT_A_TIME + PERL_HASH_FUNC_ONE_AT_A_TIME_HARD + PERL_HASH_FUNC_ONE_AT_A_TIME_OLD PERL_IS_MINIPERL PERL_MALLOC_WRAP PERL_MEM_LOG @@ -38,6 +49,10 @@ my %BTD = map { $_ => 0 } qw( PERL_MEM_LOG_NOIMPL PERL_MEM_LOG_STDERR PERL_MEM_LOG_TIMESTAMP + PERL_NEW_COPY_ON_WRITE + PERL_PERTURB_KEYS_DETERMINISTIC + PERL_PERTURB_KEYS_DISABLED + PERL_PERTURB_KEYS_RANDOM PERL_PRESERVE_IVUV PERL_RELOCATABLE_INCPUSH PERL_USE_DEVEL @@ -45,7 +60,9 @@ my %BTD = map { $_ => 0 } qw( UNLINK_ALL_VERSIONS USE_ATTRIBUTES_FOR_PERLIO USE_FAST_STDIO + USE_HASH_SEED_EXPLICIT USE_LOCALE + USE_LOCALE_CTYPE USE_PERL_ATOF USE_SITECUSTOMIZE @@ -55,6 +72,7 @@ my %BTD = map { $_ => 0 } qw( FAKE_THREADS FCRYPT HAS_TIMES + HAVE_INTERP_INTERN MULTIPLICITY MYMALLOC PERLIO_LAYERS @@ -92,7 +110,7 @@ my %BTD = map { $_ => 0 } qw( ); # These are all the keys that are -# 1. Always present in %Config (first block) +# 1. Always present in %Config - lib/Config.pm #87 tie %Config # 2. Reported by 'perl -V' (the rest) my @config_vars = qw( diff --git a/cpan/Config-Perl-V/t/20_plv.t b/cpan/Config-Perl-V/t/20_plv510.t similarity index 95% rename from cpan/Config-Perl-V/t/20_plv.t rename to cpan/Config-Perl-V/t/20_plv510.t index a739490..4b1e267 100644 --- a/cpan/Config-Perl-V/t/20_plv.t +++ b/cpan/Config-Perl-V/t/20_plv510.t @@ -18,9 +18,8 @@ BEGIN { use Config::Perl::V; ok (my $conf = Config::Perl::V::plv2hash (<DATA>), "Read perl -v block"); -for (qw( build environment config inc )) { - ok (exists $conf->{build}, "Has build entry"); - } +ok (exists $conf->{$_}, "Has $_ entry") for qw( build environment config inc ); + is ($conf->{build}{osname}, $conf->{config}{osname}, "osname"); is ($conf->{build}{stamp}, 0, "No build time known"); is ($conf->{config}{version}, "5.10.0", "reconstructed \%Config{version}"); diff --git a/cpan/Config-Perl-V/t/21_plv518.t b/cpan/Config-Perl-V/t/21_plv518.t new file mode 100644 index 0000000..ed0a2a6 --- /dev/null +++ b/cpan/Config-Perl-V/t/21_plv518.t @@ -0,0 +1,102 @@ +#!/pro/bin/perl + +use strict; +use warnings; + +BEGIN { + use Test::More; + my $tests = 35; + unless ($ENV{PERL_CORE}) { + require Test::NoWarnings; + Test::NoWarnings->import (); + $tests++; + } + + plan tests => $tests; + } + +use Config::Perl::V; + +ok (my $conf = Config::Perl::V::plv2hash (<DATA>), "Read perl -v block"); +ok (exists $conf->{$_}, "Has $_ entry") for qw( build environment config inc ); + +is ($conf->{build}{osname}, $conf->{config}{osname}, "osname"); +is ($conf->{build}{stamp}, 0, "No build time known"); +is ($conf->{config}{version}, "5.18.0", "reconstructed \$Config{version}"); + +# Some random checks +is ($conf->{build}{options}{$_}, 0, "Runtime option $_") for qw( + DEBUG_LEAKING_SCALARS NO_HASH_SEED PERL_MEM_LOG_STDERR PERL_MEM_LOG_ENV + PERL_MEM_LOG_TIMESTAMP PERL_MICRO USE_ATTRIBUTES_FOR_PERLIO VMS_DO_SOCKETS ); + +my %check = ( + alignbytes => 4, + api_version => 18, + bincompat5005 => "undef", + byteorder => 12345678, + cc => "cc", + cccdlflags => "-fPIC", + ccdlflags => "-Wl,-E", + config_args => "-Duse64bitint -Duselongdouble -des", + gccversion => "4.7.2 20130108 [gcc-4_7-branch revision 195012]", + gnulibc_version => "2.17", + ivsize => 8, + ivtype => "long long", + ld => "cc", + lddlflags => "-shared -O3 -L/pro/local/lib -fstack-protector", + ldflags => "-L/pro/local/lib -fstack-protector", + libc => "/lib/libc-2.17.so", + lseektype => "off_t", + osvers => "3.7.10-1.4-desktop", + use64bitint => "define", + ); +is ($conf->{config}{$_}, $check{$_}, "reconstructed \$Config{$_}") for sort keys %check; + +__END__ +Summary of my perl5 (revision 5 version 18 subversion 0) configuration: + + Platform: + osname=linux, osvers=3.7.10-1.4-desktop, archname=i686-linux-64int-ld + uname='linux test 3.7.10-1.4-desktop #1 smp preempt fri apr 19 12:06:34 utc 2013 (8ef74f8) i686 i686 i386 gnulinux ' + config_args='-Duse64bitint -Duselongdouble -des' + hint=recommended, useposix=true, d_sigaction=define + useithreads=undef, usemultiplicity=undef + useperlio=define, d_sfio=undef, uselargefiles=define, usesocks=undef + use64bitint=define, use64bitall=undef, uselongdouble=define + usemymalloc=n, bincompat5005=undef + Compiler: + cc='cc', ccflags ='-fno-strict-aliasing -pipe -fstack-protector -I/pro/local/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64', + optimize='-O3', + cppflags='-fno-strict-aliasing -pipe -fstack-protector -I/pro/local/include' + ccversion='', gccversion='4.7.2 20130108 [gcc-4_7-branch revision 195012]', gccosandvers='' + intsize=4, longsize=4, ptrsize=4, doublesize=8, byteorder=12345678 + d_longlong=define, longlongsize=8, d_longdbl=define, longdblsize=12 + ivtype='long long', ivsize=8, nvtype='long double', nvsize=12, Off_t='off_t', lseeksize=8 + alignbytes=4, prototype=define + Linker and Libraries: + ld='cc', ldflags ='-L/pro/local/lib -fstack-protector' + libpth=/pro/local/lib /lib /usr/lib /usr/local/lib + libs=-lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lgdbm_compat + perllibs=-lnsl -ldl -lm -lcrypt -lutil -lc + libc=/lib/libc-2.17.so, so=so, useshrplib=false, libperl=libperl.a + gnulibc_version='2.17' + Dynamic Linking: + dlsrc=dl_dlopen.xs, dlext=so, d_dlsymun=undef, ccdlflags='-Wl,-E' + cccdlflags='-fPIC', lddlflags='-shared -O3 -L/pro/local/lib -fstack-protector' + + +Characteristics of this binary (from libperl): + Compile-time options: HAS_TIMES PERLIO_LAYERS PERL_DONT_CREATE_GVSV + PERL_HASH_FUNC_ONE_AT_A_TIME_HARD PERL_MALLOC_WRAP + PERL_PRESERVE_IVUV PERL_SAWAMPERSAND USE_64_BIT_INT + USE_LARGE_FILES USE_LOCALE USE_LOCALE_COLLATE + USE_LOCALE_CTYPE USE_LOCALE_NUMERIC USE_LONG_DOUBLE + USE_PERLIO USE_PERL_ATOF + Built under linux + Compiled at May 18 2013 17:34:20 + @INC: + /pro/lib/perl5/site_perl/5.18.0/i686-linux-64int-ld + /pro/lib/perl5/site_perl/5.18.0 + /pro/lib/perl5/5.18.0/i686-linux-64int-ld + /pro/lib/perl5/5.18.0 + . -- Perl5 Master Repository http://www.nntp.perl.org/group/perl.perl5.changes/2013/05/msg37210.html Fri, 24 May 2013 15:33:48 +0000 [perl.git] branch smoke-me/smueller/eupxs_ng2, created. v5.19.0-182-ge2325a5 by Steffen Mueller In perl.git, the branch smoke-me/smueller/eupxs_ng2 has been created <http://perl5.git.perl.org/perl.git/commitdiff/e2325a5c59555e43803ae07038e90c64522bce59?hp=0000000000000000000000000000000000000000> at e2325a5c59555e43803ae07038e90c64522bce59 (commit) - Log ----------------------------------------------------------------- commit e2325a5c59555e43803ae07038e90c64522bce59 Author: Steffen Mueller <smueller@cpan.org> Date: Wed May 22 22:08:42 2013 +0200 EU::ParseXS: Test cleanup Lots of dead code and some inflexibilities wrt. running tests from / or t/. M dist/ExtUtils-ParseXS/t/001-basic.t M dist/ExtUtils-ParseXS/t/002-more.t M dist/ExtUtils-ParseXS/t/003-usage.t M dist/ExtUtils-ParseXS/t/004-nolinenumbers.t M dist/ExtUtils-ParseXS/t/101-standard_typemap_locations.t M dist/ExtUtils-ParseXS/t/102-trim_whitespace.t M dist/ExtUtils-ParseXS/t/103-tidy_type.t M dist/ExtUtils-ParseXS/t/104-map_type.t M dist/ExtUtils-ParseXS/t/105-valid_proto_string.t M dist/ExtUtils-ParseXS/t/106-process_typemaps.t M dist/ExtUtils-ParseXS/t/108-map_type.t M dist/ExtUtils-ParseXS/t/109-standard_XS_defs.t M dist/ExtUtils-ParseXS/t/110-assign_func_args.t M dist/ExtUtils-ParseXS/t/111-analyze_preprocessor_statements.t M dist/ExtUtils-ParseXS/t/112-set_cond.t M dist/ExtUtils-ParseXS/t/113-check_cond_preproc_statements.t M dist/ExtUtils-ParseXS/t/114-blurt_death_Warn.t M dist/ExtUtils-ParseXS/t/115-avoid-noise.t M dist/ExtUtils-ParseXS/t/517-t-targetable.t commit b3a15250c78464eed3f40ee528c85e197805c274 Author: Steffen Mueller <smueller@cpan.org> Date: Wed May 22 22:07:59 2013 +0200 EU::ParseXS: Move several constants out of the runtime object M dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm M dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/Constants.pm commit 80c98ca596a1e17a46e49df98cbeafd9ffbe400c Author: Steffen Mueller <smueller@cpan.org> Date: Wed May 22 22:07:10 2013 +0200 EU::ParseXS: Cosmetics; more explicitness in *_handler Basically, using named lexical beats $_ by a long shot since they don't magically propagate into functions called. M dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm commit 93c049c51f2119972cb158fa8d526df5d62771c2 Author: Steffen Mueller <smueller@cpan.org> Date: Wed May 22 22:04:51 2013 +0200 EU::ParseXS: Use OO version of ExtUtils::ParseXS in test Sort of. Breaking encapsulation, but that's better than not even having a blessed object at all. M dist/ExtUtils-ParseXS/t/104-map_type.t commit 59e376c54367c90fe58d972a57db5b0815169210 Author: Steffen Mueller <smueller@cpan.org> Date: Wed May 22 22:03:38 2013 +0200 EU::ParseXS: Simplify output typemap code generation (targetable) M dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm commit bdaedb56bc332027a0d1d57e1e76de0c3703c88e Author: Steffen Mueller <smueller@cpan.org> Date: Wed May 22 22:00:48 2013 +0200 EU::ParseXS: Cosmetics; better variable naming M dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm commit 1f76cba74e2ac34cfa0ba5e16b96c7be178f45bc Author: Steffen Mueller <smueller@cpan.org> Date: Wed May 22 21:57:59 2013 +0200 EU::ParseXS: Fix targetable size detection Adds new / vastly improved tests for 'targetable'. Also improves targetable documentation. M MANIFEST M dist/ExtUtils-ParseXS/lib/ExtUtils/Typemaps/OutputMap.pm A dist/ExtUtils-ParseXS/t/517-t-targetable.t commit e0bfe2ad8c63213d042f40c04f978cc275f96c3b Author: Steffen Mueller <smueller@cpan.org> Date: Wed May 22 21:53:44 2013 +0200 EU::ParseXS: Drop dup'd code: make_targetable moves to EU::Typemaps The make_targetable function in ExtUtils::ParseXS::Utilities now lives in ExtUtils::Typemaps::OutputMap as method 'targetable' since the code was quite duplicated before. Makes very minor adjustments to 'targetable'. Removes the flawed make_targetable tests. Improved tests in lieu of the old ones will be added asap. M MANIFEST M dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm M dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/Utilities.pm M dist/ExtUtils-ParseXS/lib/ExtUtils/Typemaps/OutputMap.pm D dist/ExtUtils-ParseXS/t/107-make_targetable.t commit 0fd164cf3858725297d400e5d1ee5863cad6e913 Author: Steffen Mueller <smueller@cpan.org> Date: Wed May 22 21:51:55 2013 +0200 EU::ParseXS: Update changelog M dist/ExtUtils-ParseXS/Changes commit 80652dacca793b0e0424f333fd13a3c8fe711c5d Author: Steffen Mueller <smueller@cpan.org> Date: Wed May 22 21:49:06 2013 +0200 EU::ParseXS: Attempt to canonicalize C++ types in tidy_type Includes moving tidy_type to ExtUtils::Typemaps where it seems to belong. It's a pretty poor canonicalizer, but better than nothing! M dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm M dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/Utilities.pm M dist/ExtUtils-ParseXS/lib/ExtUtils/Typemaps.pm M dist/ExtUtils-ParseXS/lib/ExtUtils/Typemaps/Type.pm M dist/ExtUtils-ParseXS/t/103-tidy_type.t M dist/ExtUtils-ParseXS/t/600-t-compat.t commit db19eb46acba4e04a2f89c50acbe7fbfc203a96c Author: Steffen Mueller <smueller@cpan.org> Date: Mon Apr 15 08:48:07 2013 +0200 EU::ParseXS: Update Changelog M dist/ExtUtils-ParseXS/Changes commit 5010872c2f608daae78cc1eb76e390538b226cf5 Author: Steffen Mueller <smueller@cpan.org> Date: Mon Apr 15 08:47:23 2013 +0200 EU::Typemaps: Document special typemap variables For better or for worse, these are likely to stay. Don't cry if they don't. M dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/Eval.pm commit 5f2aae7d44eb491b4367f9ece77afdf5cca3b805 Author: Steffen Mueller <smueller@cpan.org> Date: Mon Apr 15 08:31:53 2013 +0200 EU::ParseXS: Stop using global state; an OO interface This stops ExtUtils::ParseXS from using global state (unless using the functional interface which uses a singleton for compatibility). It also makes the interface more or less properly OO. Includes tests & docs; migrates xsubpp to use the OO interface. M MANIFEST M dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm M dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pod A dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/Eval.pm M dist/ExtUtils-ParseXS/lib/ExtUtils/xsubpp M dist/ExtUtils-ParseXS/t/001-basic.t M dist/ExtUtils-ParseXS/t/003-usage.t commit 3752132ec2c6425da86a1a30f8bcced9ce3d2ec4 Author: Steffen Mueller <smueller@cpan.org> Date: Mon Apr 15 08:01:36 2013 +0200 EU::ParseXS: Don't inherit from Exporter; import 'import' instead M dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm commit 3e040f8fb8dd47152a7e44c7b3ce51f0aeded244 Author: Steffen Mueller <smueller@cpan.org> Date: Mon Apr 15 07:59:28 2013 +0200 EU::ParseXS: Only initialize some parser regexps once M dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm commit 48e595e3972e6fea80979b2e3b296ce51c1fc201 Author: Steffen Mueller <smueller@cpan.org> Date: Mon Apr 15 07:56:41 2013 +0200 EU::Typemaps: Implement API for typemap cloning The docs used to suggest cloning, but never provided an API. M MANIFEST M dist/ExtUtils-ParseXS/lib/ExtUtils/Typemaps.pm A dist/ExtUtils-ParseXS/t/516-t-clone.t commit b457af9da0ea20f34b58ab0842dd1894b580e983 Author: Steffen Mueller <smueller@cpan.org> Date: Mon Apr 15 07:56:17 2013 +0200 ExtUtils::ParseXS version bump to 3.19 M dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm M dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/Constants.pm M dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/CountLines.pm M dist/ExtUtils-ParseXS/lib/ExtUtils/Typemaps/Cmd.pm M dist/ExtUtils-ParseXS/lib/ExtUtils/Typemaps/InputMap.pm M dist/ExtUtils-ParseXS/lib/ExtUtils/Typemaps/OutputMap.pm M dist/ExtUtils-ParseXS/lib/ExtUtils/Typemaps/Type.pm ----------------------------------------------------------------------- -- Perl5 Master Repository http://www.nntp.perl.org/group/perl.perl5.changes/2013/05/msg37209.html Fri, 24 May 2013 14:52:22 +0000 [perl.git] branch blead, updated. v5.19.0-166-g3b0e4ee by H.Merijn Brand In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/3b0e4ee2077fba66799177fc238e669d82ac3d2f?hp=730ad6b92c67f5477893aa2deaa6c6832860a024> - Log ----------------------------------------------------------------- commit 3b0e4ee2077fba66799177fc238e669d82ac3d2f Author: H.Merijn Brand <h.m.brand@xs4all.nl> Date: Fri May 24 16:36:55 2013 +0200 Add NO_TAINT_SUPPORT to S_Internals_V () ----------------------------------------------------------------------- Summary of changes: perl.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/perl.c b/perl.c index 0f8d4f7..f603f4d 100644 --- a/perl.c +++ b/perl.c @@ -1686,6 +1686,9 @@ S_Internals_V(pTHX_ CV *cv) # ifdef NO_HASH_SEED " NO_HASH_SEED" # endif +# ifdef NO_TAINT_SUPPORT + " NO_TAINT_SUPPORT" +# endif # ifdef PERL_DISABLE_PMC " PERL_DISABLE_PMC" # endif -- Perl5 Master Repository http://www.nntp.perl.org/group/perl.perl5.changes/2013/05/msg37208.html Fri, 24 May 2013 14:42:21 +0000 [perl.git] branch smueller/eupxs_ng2, created. v5.19.0-182-ge2325a5 by Steffen Mueller In perl.git, the branch smueller/eupxs_ng2 has been created <http://perl5.git.perl.org/perl.git/commitdiff/e2325a5c59555e43803ae07038e90c64522bce59?hp=0000000000000000000000000000000000000000> at e2325a5c59555e43803ae07038e90c64522bce59 (commit) - Log ----------------------------------------------------------------- commit e2325a5c59555e43803ae07038e90c64522bce59 Author: Steffen Mueller <smueller@cpan.org> Date: Wed May 22 22:08:42 2013 +0200 EU::ParseXS: Test cleanup Lots of dead code and some inflexibilities wrt. running tests from / or t/. M dist/ExtUtils-ParseXS/t/001-basic.t M dist/ExtUtils-ParseXS/t/002-more.t M dist/ExtUtils-ParseXS/t/003-usage.t M dist/ExtUtils-ParseXS/t/004-nolinenumbers.t M dist/ExtUtils-ParseXS/t/101-standard_typemap_locations.t M dist/ExtUtils-ParseXS/t/102-trim_whitespace.t M dist/ExtUtils-ParseXS/t/103-tidy_type.t M dist/ExtUtils-ParseXS/t/104-map_type.t M dist/ExtUtils-ParseXS/t/105-valid_proto_string.t M dist/ExtUtils-ParseXS/t/106-process_typemaps.t M dist/ExtUtils-ParseXS/t/108-map_type.t M dist/ExtUtils-ParseXS/t/109-standard_XS_defs.t M dist/ExtUtils-ParseXS/t/110-assign_func_args.t M dist/ExtUtils-ParseXS/t/111-analyze_preprocessor_statements.t M dist/ExtUtils-ParseXS/t/112-set_cond.t M dist/ExtUtils-ParseXS/t/113-check_cond_preproc_statements.t M dist/ExtUtils-ParseXS/t/114-blurt_death_Warn.t M dist/ExtUtils-ParseXS/t/115-avoid-noise.t M dist/ExtUtils-ParseXS/t/517-t-targetable.t commit b3a15250c78464eed3f40ee528c85e197805c274 Author: Steffen Mueller <smueller@cpan.org> Date: Wed May 22 22:07:59 2013 +0200 EU::ParseXS: Move several constants out of the runtime object M dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm M dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/Constants.pm commit 80c98ca596a1e17a46e49df98cbeafd9ffbe400c Author: Steffen Mueller <smueller@cpan.org> Date: Wed May 22 22:07:10 2013 +0200 EU::ParseXS: Cosmetics; more explicitness in *_handler Basically, using named lexical beats $_ by a long shot since they don't magically propagate into functions called. M dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm commit 93c049c51f2119972cb158fa8d526df5d62771c2 Author: Steffen Mueller <smueller@cpan.org> Date: Wed May 22 22:04:51 2013 +0200 EU::ParseXS: Use OO version of ExtUtils::ParseXS in test Sort of. Breaking encapsulation, but that's better than not even having a blessed object at all. M dist/ExtUtils-ParseXS/t/104-map_type.t commit 59e376c54367c90fe58d972a57db5b0815169210 Author: Steffen Mueller <smueller@cpan.org> Date: Wed May 22 22:03:38 2013 +0200 EU::ParseXS: Simplify output typemap code generation (targetable) M dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm commit bdaedb56bc332027a0d1d57e1e76de0c3703c88e Author: Steffen Mueller <smueller@cpan.org> Date: Wed May 22 22:00:48 2013 +0200 EU::ParseXS: Cosmetics; better variable naming M dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm commit 1f76cba74e2ac34cfa0ba5e16b96c7be178f45bc Author: Steffen Mueller <smueller@cpan.org> Date: Wed May 22 21:57:59 2013 +0200 EU::ParseXS: Fix targetable size detection Adds new / vastly improved tests for 'targetable'. Also improves targetable documentation. M MANIFEST M dist/ExtUtils-ParseXS/lib/ExtUtils/Typemaps/OutputMap.pm A dist/ExtUtils-ParseXS/t/517-t-targetable.t commit e0bfe2ad8c63213d042f40c04f978cc275f96c3b Author: Steffen Mueller <smueller@cpan.org> Date: Wed May 22 21:53:44 2013 +0200 EU::ParseXS: Drop dup'd code: make_targetable moves to EU::Typemaps The make_targetable function in ExtUtils::ParseXS::Utilities now lives in ExtUtils::Typemaps::OutputMap as method 'targetable' since the code was quite duplicated before. Makes very minor adjustments to 'targetable'. Removes the flawed make_targetable tests. Improved tests in lieu of the old ones will be added asap. M MANIFEST M dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm M dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/Utilities.pm M dist/ExtUtils-ParseXS/lib/ExtUtils/Typemaps/OutputMap.pm D dist/ExtUtils-ParseXS/t/107-make_targetable.t commit 0fd164cf3858725297d400e5d1ee5863cad6e913 Author: Steffen Mueller <smueller@cpan.org> Date: Wed May 22 21:51:55 2013 +0200 EU::ParseXS: Update changelog M dist/ExtUtils-ParseXS/Changes commit 80652dacca793b0e0424f333fd13a3c8fe711c5d Author: Steffen Mueller <smueller@cpan.org> Date: Wed May 22 21:49:06 2013 +0200 EU::ParseXS: Attempt to canonicalize C++ types in tidy_type Includes moving tidy_type to ExtUtils::Typemaps where it seems to belong. It's a pretty poor canonicalizer, but better than nothing! M dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm M dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/Utilities.pm M dist/ExtUtils-ParseXS/lib/ExtUtils/Typemaps.pm M dist/ExtUtils-ParseXS/lib/ExtUtils/Typemaps/Type.pm M dist/ExtUtils-ParseXS/t/103-tidy_type.t M dist/ExtUtils-ParseXS/t/600-t-compat.t commit db19eb46acba4e04a2f89c50acbe7fbfc203a96c Author: Steffen Mueller <smueller@cpan.org> Date: Mon Apr 15 08:48:07 2013 +0200 EU::ParseXS: Update Changelog M dist/ExtUtils-ParseXS/Changes commit 5010872c2f608daae78cc1eb76e390538b226cf5 Author: Steffen Mueller <smueller@cpan.org> Date: Mon Apr 15 08:47:23 2013 +0200 EU::Typemaps: Document special typemap variables For better or for worse, these are likely to stay. Don't cry if they don't. M dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/Eval.pm commit 5f2aae7d44eb491b4367f9ece77afdf5cca3b805 Author: Steffen Mueller <smueller@cpan.org> Date: Mon Apr 15 08:31:53 2013 +0200 EU::ParseXS: Stop using global state; an OO interface This stops ExtUtils::ParseXS from using global state (unless using the functional interface which uses a singleton for compatibility). It also makes the interface more or less properly OO. Includes tests & docs; migrates xsubpp to use the OO interface. M MANIFEST M dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm M dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pod A dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/Eval.pm M dist/ExtUtils-ParseXS/lib/ExtUtils/xsubpp M dist/ExtUtils-ParseXS/t/001-basic.t M dist/ExtUtils-ParseXS/t/003-usage.t commit 3752132ec2c6425da86a1a30f8bcced9ce3d2ec4 Author: Steffen Mueller <smueller@cpan.org> Date: Mon Apr 15 08:01:36 2013 +0200 EU::ParseXS: Don't inherit from Exporter; import 'import' instead M dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm commit 3e040f8fb8dd47152a7e44c7b3ce51f0aeded244 Author: Steffen Mueller <smueller@cpan.org> Date: Mon Apr 15 07:59:28 2013 +0200 EU::ParseXS: Only initialize some parser regexps once M dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm commit 48e595e3972e6fea80979b2e3b296ce51c1fc201 Author: Steffen Mueller <smueller@cpan.org> Date: Mon Apr 15 07:56:41 2013 +0200 EU::Typemaps: Implement API for typemap cloning The docs used to suggest cloning, but never provided an API. M MANIFEST M dist/ExtUtils-ParseXS/lib/ExtUtils/Typemaps.pm A dist/ExtUtils-ParseXS/t/516-t-clone.t commit b457af9da0ea20f34b58ab0842dd1894b580e983 Author: Steffen Mueller <smueller@cpan.org> Date: Mon Apr 15 07:56:17 2013 +0200 ExtUtils::ParseXS version bump to 3.19 M dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm M dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/Constants.pm M dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/CountLines.pm M dist/ExtUtils-ParseXS/lib/ExtUtils/Typemaps/Cmd.pm M dist/ExtUtils-ParseXS/lib/ExtUtils/Typemaps/InputMap.pm M dist/ExtUtils-ParseXS/lib/ExtUtils/Typemaps/OutputMap.pm M dist/ExtUtils-ParseXS/lib/ExtUtils/Typemaps/Type.pm ----------------------------------------------------------------------- -- Perl5 Master Repository http://www.nntp.perl.org/group/perl.perl5.changes/2013/05/msg37207.html Fri, 24 May 2013 14:37:56 +0000 [perl.git] branch smueller/eupxs_ng, deleted. v5.18.0-RC4-17-g1d1a818 by Steffen Mueller In perl.git, the branch smueller/eupxs_ng has been deleted <http://perl5.git.perl.org/perl.git/commitdiff/0000000000000000000000000000000000000000?hp=1d1a818bdfffe5c58427085f2e1d14117ae3a75e> was 1d1a818bdfffe5c58427085f2e1d14117ae3a75e ----------------------------------------------------------------------- 1d1a818bdfffe5c58427085f2e1d14117ae3a75e EU::ParseXS: Test cleanup ----------------------------------------------------------------------- -- Perl5 Master Repository http://www.nntp.perl.org/group/perl.perl5.changes/2013/05/msg37206.html Fri, 24 May 2013 14:37:55 +0000 [perl.git] branch blead, updated. v5.19.0-165-g730ad6b by Ricardo Signes In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/730ad6b92c67f5477893aa2deaa6c6832860a024?hp=8524aa6e56ea4ae1610e36bc239b06bfb087e84b> - Log ----------------------------------------------------------------- commit 730ad6b92c67f5477893aa2deaa6c6832860a024 Author: David Steinbrunner <dsteinbrunner@pobox.com> Date: Tue May 21 06:56:08 2013 -0400 typo fixes for porting scripts ----------------------------------------------------------------------- Summary of changes: Porting/add-package.pl | 8 ++++---- Porting/bisect-runner.pl | 4 ++-- Porting/bump-perl-version | 2 +- Porting/cherrymaint | 2 +- Porting/core-cpan-diff | 2 +- Porting/make_dot_patch.pl | 2 +- Porting/pod_lib.pl | 2 +- Porting/sync-with-cpan | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Porting/add-package.pl b/Porting/add-package.pl index 948f16e..88b96fc 100755 --- a/Porting/add-package.pl +++ b/Porting/add-package.pl @@ -94,7 +94,7 @@ my $ModName; # name of the module my @ModFiles; # the .PMs in this package { print "Creating top level dir..." if $Verbose; - ### make sure we get the shortest file, so we dont accidentally get + ### make sure we get the shortest file, so we don't accidentally get ### a subdir @ModFiles = sort { length($a) <=> length($b) } map { chomp; $_ } @@ -344,7 +344,7 @@ my @ChangedFiles; } ### we need some entries in a vms specific file as well.. - ### except, i dont understand how it works or what it does, and it + ### except, I don't understand how it works or what it does, and it ### looks all a bit odd... so lets just print a warning... ### the entries look something like this: # ./vms/descrip_mms.template:utils4 = [.utils]enc2xs.com @@ -358,8 +358,8 @@ my @ChangedFiles; print $/.$/; print " WARNING! You should add entries like the following\n" . " to $file (Using $TestBin as an example)\n" - . " Unfortunately I dont understand what these entries\n" - . " do, so I wont change them automatically:\n\n"; + . " Unfortunately I don't understand what these entries\n" + . " do, so I won't change them automatically:\n\n"; print `grep -nC1 $TestBin $Repo/$file`; print $/.$/; diff --git a/Porting/bisect-runner.pl b/Porting/bisect-runner.pl index ca4c12c..5779606 100755 --- a/Porting/bisect-runner.pl +++ b/Porting/bisect-runner.pl @@ -1228,8 +1228,8 @@ EOPATCH my $mips = extract_from_file('Configure', qr!(''\) if (?:\./)?mips; then)!); # This is part of perl-5.001n. It's needed, to add -L/usr/local/lib to - # theld flags if libraries are found there. It shifts the code to set up - # libpth earlier, and then adds the code to add libpth entries to + # the ld flags if libraries are found there. It shifts the code to set + # up libpth earlier, and then adds the code to add libpth entries to # ldflags # mips was changed to ./mips in ecfc54246c2a6f42, perl5.000 patch.0g apply_patch(sprintf <<'EOPATCH', $mips); diff --git a/Porting/bump-perl-version b/Porting/bump-perl-version index 627f907..f2f5bcc 100644 --- a/Porting/bump-perl-version +++ b/Porting/bump-perl-version @@ -43,7 +43,7 @@ # # Note there are various files and directories that it skips; these are # ones that are unlikely to contain anything needing bumping, but which -# will generate lots fo false positives (eg pod/*). These are listed on +# will generate lots of false positives (eg pod/*). These are listed on # STDERR as they are skipped. use strict; diff --git a/Porting/cherrymaint b/Porting/cherrymaint index f4092a9..08e8eb5 100644 --- a/Porting/cherrymaint +++ b/Porting/cherrymaint @@ -95,7 +95,7 @@ either on the command line with --address, or by doing HERE -# Note that you can vote through your browser by pointing it at the the local +# Note that you can vote through your browser by pointing it at the local # end of the tunnel. For example, L<http://localhost:3000/> if you went with # the suggested default values } diff --git a/Porting/core-cpan-diff b/Porting/core-cpan-diff index dbfeac7..712b896 100644 --- a/Porting/core-cpan-diff +++ b/Porting/core-cpan-diff @@ -519,7 +519,7 @@ sub do_crosscheck { } # get the EXCLUDED and MAP entries for this module, or -# make up defauts if they don't exist +# make up defaults if they don't exist sub get_map { my ( $m, $module_name, $perl_files ) = @_; diff --git a/Porting/make_dot_patch.pl b/Porting/make_dot_patch.pl index b50fd85..71c4604 100755 --- a/Porting/make_dot_patch.pl +++ b/Porting/make_dot_patch.pl @@ -8,7 +8,7 @@ use warnings; # It tries to find which of our primary branches the sha1 can be found on, # and then prints to standard out something similar to what our rsync feed # would produce for that situation. The main difference being, in that case -# we KNOW what branch we are on, and in this one we dont, and in that case +# we KNOW what branch we are on, and in this one we don't, and in that case # the $tstamp field holds the time the snapshot was generated (so that multiple # fetches will always have an increasing tstamp field), however in this case # we use the commit date of the sha1. diff --git a/Porting/pod_lib.pl b/Porting/pod_lib.pl index 5d923ba..8c5ac21 100644 --- a/Porting/pod_lib.pl +++ b/Porting/pod_lib.pl @@ -403,7 +403,7 @@ List of one or more arguments. =item * Boolean true or false -=item * Reference to a suboutine. +=item * Reference to a subroutine. =item * Various other arguments. diff --git a/Porting/sync-with-cpan b/Porting/sync-with-cpan index 68e22ca..c3f9ce1 100755 --- a/Porting/sync-with-cpan +++ b/Porting/sync-with-cpan @@ -402,7 +402,7 @@ print "done\n"; # # Must clean up, or else t/porting/FindExt.t will fail. -# Note that we can always retrieve the orginal directory with a git checkout. +# Note that we can always retrieve the original directory with a git checkout. # print "About to clean up; hit return or abort (^C) "; <STDIN>; -- Perl5 Master Repository http://www.nntp.perl.org/group/perl.perl5.changes/2013/05/msg37205.html Fri, 24 May 2013 14:34:52 +0000 [perl.git] branch smueller/eupxs_ng, created. v5.18.0-RC4-17-g1d1a818 by Steffen Mueller In perl.git, the branch smueller/eupxs_ng has been created <http://perl5.git.perl.org/perl.git/commitdiff/1d1a818bdfffe5c58427085f2e1d14117ae3a75e?hp=0000000000000000000000000000000000000000> at 1d1a818bdfffe5c58427085f2e1d14117ae3a75e (commit) - Log ----------------------------------------------------------------- commit 1d1a818bdfffe5c58427085f2e1d14117ae3a75e Author: Steffen Mueller <smueller@cpan.org> Date: Wed May 22 22:08:42 2013 +0200 EU::ParseXS: Test cleanup Lots of dead code and some inflexibilities wrt. running tests from / or t/. M dist/ExtUtils-ParseXS/t/001-basic.t M dist/ExtUtils-ParseXS/t/002-more.t M dist/ExtUtils-ParseXS/t/003-usage.t M dist/ExtUtils-ParseXS/t/004-nolinenumbers.t M dist/ExtUtils-ParseXS/t/101-standard_typemap_locations.t M dist/ExtUtils-ParseXS/t/102-trim_whitespace.t M dist/ExtUtils-ParseXS/t/103-tidy_type.t M dist/ExtUtils-ParseXS/t/104-map_type.t M dist/ExtUtils-ParseXS/t/105-valid_proto_string.t M dist/ExtUtils-ParseXS/t/106-process_typemaps.t M dist/ExtUtils-ParseXS/t/108-map_type.t M dist/ExtUtils-ParseXS/t/109-standard_XS_defs.t M dist/ExtUtils-ParseXS/t/110-assign_func_args.t M dist/ExtUtils-ParseXS/t/111-analyze_preprocessor_statements.t M dist/ExtUtils-ParseXS/t/112-set_cond.t M dist/ExtUtils-ParseXS/t/113-check_cond_preproc_statements.t M dist/ExtUtils-ParseXS/t/114-blurt_death_Warn.t M dist/ExtUtils-ParseXS/t/115-avoid-noise.t M dist/ExtUtils-ParseXS/t/517-t-targetable.t commit 31a87c97009224574031116999f2c07516be737a Author: Steffen Mueller <smueller@cpan.org> Date: Wed May 22 22:07:59 2013 +0200 EU::ParseXS: Move several constants out of the runtime object M dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm M dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/Constants.pm commit 1f08a5f6f90a13e6beec0dc620660d39c8f7dc1a Author: Steffen Mueller <smueller@cpan.org> Date: Wed May 22 22:07:10 2013 +0200 EU::ParseXS: Cosmetics; more explicitness in *_handler Basically, using named lexical beats $_ by a long shot since they don't magically propagate into functions called. M dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm commit 85ebc16673d718a21cfecac9b6ffe55df9a07e2d Author: Steffen Mueller <smueller@cpan.org> Date: Wed May 22 22:04:51 2013 +0200 EU::ParseXS: Use OO version of ExtUtils::ParseXS in test Sort of. Breaking encapsulation, but that's better than not even having a blessed object at all. M dist/ExtUtils-ParseXS/t/104-map_type.t commit e5042edd1b43355c9033738909295e26ca37812b Author: Steffen Mueller <smueller@cpan.org> Date: Wed May 22 22:03:38 2013 +0200 EU::ParseXS: Simplify output typemap code generation (targetable) M dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm commit 639e8eb179e8970848b77c418963412bd4809d41 Author: Steffen Mueller <smueller@cpan.org> Date: Wed May 22 22:00:48 2013 +0200 EU::ParseXS: Cosmetics; better variable naming M dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm commit 2104487e125986a87331af18745dc8b0c8f0e266 Author: Steffen Mueller <smueller@cpan.org> Date: Wed May 22 21:57:59 2013 +0200 EU::ParseXS: Fix targetable size detection Adds new / vastly improved tests for 'targetable'. Also improves targetable documentation. M MANIFEST M dist/ExtUtils-ParseXS/lib/ExtUtils/Typemaps/OutputMap.pm A dist/ExtUtils-ParseXS/t/517-t-targetable.t commit b525cb63e33563f6158f72ae6f1d7f1d5d79822b Author: Steffen Mueller <smueller@cpan.org> Date: Wed May 22 21:53:44 2013 +0200 EU::ParseXS: Drop dup'd code: make_targetable moves to EU::Typemaps The make_targetable function in ExtUtils::ParseXS::Utilities now lives in ExtUtils::Typemaps::OutputMap as method 'targetable' since the code was quite duplicated before. Makes very minor adjustments to 'targetable'. Removes the flawed make_targetable tests. Improved tests in lieu of the old ones will be added asap. M MANIFEST M dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm M dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/Utilities.pm M dist/ExtUtils-ParseXS/lib/ExtUtils/Typemaps/OutputMap.pm D dist/ExtUtils-ParseXS/t/107-make_targetable.t commit 2dd01b6f85de61333692a54f03a92f01e1e0532b Author: Steffen Mueller <smueller@cpan.org> Date: Wed May 22 21:51:55 2013 +0200 EU::ParseXS: Update changelog M dist/ExtUtils-ParseXS/Changes commit f20c522a72024bec0f3fc2015a3e4c4985b5a0c5 Author: Steffen Mueller <smueller@cpan.org> Date: Wed May 22 21:49:06 2013 +0200 EU::ParseXS: Attempt to canonicalize C++ types in tidy_type Includes moving tidy_type to ExtUtils::Typemaps where it seems to belong. It's a pretty poor canonicalizer, but better than nothing! M dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm M dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/Utilities.pm M dist/ExtUtils-ParseXS/lib/ExtUtils/Typemaps.pm M dist/ExtUtils-ParseXS/lib/ExtUtils/Typemaps/Type.pm M dist/ExtUtils-ParseXS/t/103-tidy_type.t M dist/ExtUtils-ParseXS/t/600-t-compat.t commit 15b479852835411dff8b4666cfe02be36bd49423 Author: Steffen Mueller <smueller@cpan.org> Date: Mon Apr 15 08:48:07 2013 +0200 EU::ParseXS: Update Changelog M dist/ExtUtils-ParseXS/Changes commit b6085d801f66088b4a76f80229299ccf4dfb8a93 Author: Steffen Mueller <smueller@cpan.org> Date: Mon Apr 15 08:47:23 2013 +0200 EU::Typemaps: Document special typemap variables For better or for worse, these are likely to stay. Don't cry if they don't. M dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/Eval.pm commit 79c68ad647f84c769aba267933ea96971192101f Author: Steffen Mueller <smueller@cpan.org> Date: Mon Apr 15 08:31:53 2013 +0200 EU::ParseXS: Stop using global state; an OO interface This stops ExtUtils::ParseXS from using global state (unless using the functional interface which uses a singleton for compatibility). It also makes the interface more or less properly OO. Includes tests & docs; migrates xsubpp to use the OO interface. M MANIFEST M dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm M dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pod A dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/Eval.pm M dist/ExtUtils-ParseXS/lib/ExtUtils/xsubpp M dist/ExtUtils-ParseXS/t/001-basic.t M dist/ExtUtils-ParseXS/t/003-usage.t commit 986f17dbbd984484615c4924a888786c1c4b5943 Author: Steffen Mueller <smueller@cpan.org> Date: Mon Apr 15 08:01:36 2013 +0200 EU::ParseXS: Don't inherit from Exporter; import 'import' instead M dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm commit 17d083366b65da587f29f1f9c0b1ca5e77cd1e99 Author: Steffen Mueller <smueller@cpan.org> Date: Mon Apr 15 07:59:28 2013 +0200 EU::ParseXS: Only initialize some parser regexps once M dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm commit d7479fd478678857398a1ca0a8e03884b3c93736 Author: Steffen Mueller <smueller@cpan.org> Date: Mon Apr 15 07:56:41 2013 +0200 EU::Typemaps: Implement API for typemap cloning The docs used to suggest cloning, but never provided an API. M MANIFEST M dist/ExtUtils-ParseXS/lib/ExtUtils/Typemaps.pm A dist/ExtUtils-ParseXS/t/516-t-clone.t commit 3d403816bbb40d549fe5b31fdb05a6e8142f65c2 Author: Steffen Mueller <smueller@cpan.org> Date: Mon Apr 15 07:56:17 2013 +0200 ExtUtils::ParseXS version bump to 3.19 M dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm M dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/Constants.pm M dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/CountLines.pm M dist/ExtUtils-ParseXS/lib/ExtUtils/Typemaps/Cmd.pm M dist/ExtUtils-ParseXS/lib/ExtUtils/Typemaps/InputMap.pm M dist/ExtUtils-ParseXS/lib/ExtUtils/Typemaps/OutputMap.pm M dist/ExtUtils-ParseXS/lib/ExtUtils/Typemaps/Type.pm ----------------------------------------------------------------------- -- Perl5 Master Repository http://www.nntp.perl.org/group/perl.perl5.changes/2013/05/msg37204.html Fri, 24 May 2013 12:56:55 +0000 [perl.git] branch smoke-me/nicholas/ex-dgux, updated. v5.19.0-151-g527f0c1 by Nicholas Clark In perl.git, the branch smoke-me/nicholas/ex-dgux has been updated <http://perl5.git.perl.org/perl.git/commitdiff/527f0c114598879ed0df528ab0f3be07f8065f73?hp=741c0772bf49e348fe0e2ea00a8937512b03d074> - Log ----------------------------------------------------------------- commit 527f0c114598879ed0df528ab0f3be07f8065f73 Author: Nicholas Clark <nick@ccl4.org> Date: Fri May 24 12:20:02 2013 +0200 Remove DG/UX support. DG/UX was a Unix sold by Data General. The last release was in April 2001. It only runs on Data General's own hardware. ----------------------------------------------------------------------- Summary of changes: MANIFEST | 2 - README.dgux | 117 -------------------------- hints/dgux.sh | 237 ----------------------------------------------------- lib/perl5db.pl | 3 +- perl.c | 14 --- perl.h | 9 +-- pod/perl.pod | 1 - pod/perlport.pod | 3 +- t/op/stat.t | 11 +-- thread.h | 4 - win32/Makefile | 18 ++-- win32/makefile.mk | 18 ++-- 12 files changed, 21 insertions(+), 416 deletions(-) delete mode 100644 README.dgux delete mode 100644 hints/dgux.sh diff --git a/MANIFEST b/MANIFEST index 72fcff9..a938b7b 100644 --- a/MANIFEST +++ b/MANIFEST @@ -3926,7 +3926,6 @@ hints/cygwin.sh Hints for named architecture hints/darwin.sh Hints for named architecture hints/dcosx.sh Hints for named architecture hints/dec_osf.sh Hints for named architecture -hints/dgux.sh Hints for named architecture hints/dos_djgpp.sh Hints for named architecture hints/dragonfly.sh Hints for named architecture hints/dynixptx.sh Hints for named architecture @@ -4676,7 +4675,6 @@ README.bs2000 Perl notes for POSIX-BC BS2000 README.ce Perl notes for WinCE README.cn Perl for Simplified Chinese (in EUC-CN) README.cygwin Perl notes for Cygwin -README.dgux Perl notes for DG/UX README.dos Perl notes for DOS README.freebsd Perl notes for FreeBSD README.haiku Perl notes for Haiku diff --git a/README.dgux b/README.dgux deleted file mode 100644 index fd6eaa3..0000000 --- a/README.dgux +++ /dev/null @@ -1,117 +0,0 @@ -If you read this file _as_is_, just ignore the funny characters you -see. It is written in the POD format (see perlpod manpage) which is -specially designed to be readable as is. - -=head1 NAME - -perldgux - Perl under DG/UX. - -=head1 SYNOPSIS - -One can read this document in the following formats: - - man perldgux - view perl perldgux - explorer perldgux.html - info perldgux - -to list some (not all may be available simultaneously), or it may -be read I<as is>: as F<README.dgux>. - -=cut - -Contents - - perldgux - Perl under DG/UX. - - NAME - SYNOPSIS - DESCRIPTION - BUILD - - Non-threaded Case - - Threaded Case - - Testing - - Installing the built perl - AUTHOR - SEE ALSO - -=head1 DESCRIPTION - -Perl 5.7/8.x for DG/UX ix86 R4.20MU0x - -=head1 BUILDING PERL ON DG/UX - -=head2 Non-threaded Perl on DG/UX - -Just run ./Configure script from the top directory. -Then give "make" to compile. - -=head2 Threaded Perl on DG/UX - -If you are using as compiler GCC-2.95.x rev(DG/UX) -an easy solution for configuring perl in your DG/UX -machine is to run the command: - -./Configure -Dusethreads -Duseithreads -Dusedevel -des - -This will automatically accept all the defaults and -in particular /usr/local/ as installation directory. -Note that GCC-2.95.x rev(DG/UX) knows the switch --pthread which allows it to link correctly DG/UX's --lthread library. - -If you want to change the installation directory or -have a standard DG/UX with C compiler GCC-2.7.2.x -then you have no choice than to do an interactive -build by issuing the command: - -./Configure -Dusethreads -Duseithreads - -In particular with GCC-2.7.2.x accept all the defaults -and *watch* out for the message: - - Any additional ld flags (NOT including libraries)? [ -pthread] - -Instead of -pthread put here -lthread. CGCC-2.7.2.x -that comes with the DG/UX OS does NOT know the -pthread -switch. So your build will fail if you choose the defaults. -After configuration is done correctly give "make" to compile. - -=head2 Testing Perl on DG/UX - -Issuing a "make test" will run all the tests. -If the test lib/ftmp-security gives you as a result -something like - - lib/ftmp-security....File::Temp::_gettemp: - Parent directory (/tmp/) is not safe (sticky bit not set - when world writable?) at lib/ftmp-security.t line 100 - -don't panic and just set the sticky bit in your /tmp -directory by doing the following as root: - -cd / -chmod +t /tmp (=set the sticky bit to /tmp). - -Then rerun the tests. This time all must be OK. - -=head2 Installing the built perl on DG/UX - -Run the command "make install" - -=head1 AUTHOR - -Takis Psarogiannakopoulos -University of Cambridge -Centre for Mathematical Sciences -Department of Pure Mathematics -Wilberforce road -Cambridge CB3 0WB , UK -email <takis@XFree86.Org> - -=head1 SEE ALSO - -perl(1). - -=cut - diff --git a/hints/dgux.sh b/hints/dgux.sh deleted file mode 100644 index bb49556..0000000 --- a/hints/dgux.sh +++ /dev/null @@ -1,237 +0,0 @@ -# This is a hints file for DGUX, which is EMC's Data General's Unix. It -# was originally developed with version 5.4.3.10 of the OS, and then was -# later updated running under version 4.11.2 (running on m88k hardware). -# The gross features should work with versions going back to 2.nil but -# some tweaking will probably be necessary. -# -# DGUX is an SVR4 derivative. It ships with gcc as the standard -# compiler. Since version 3.0 it has shipped with Perl 4.036 -# installed in /usr/bin, which is kind of neat. Be careful when you -# install that you don't overwrite the system version, though (by -# answering yes to the question about installing perl as /usr/bin/perl), -# as it would suck to try to get support if the vendor learned that you -# were physically replacing the system binaries. -# -# -Roderick Schertler <roderick@argon.org> - -# The standard system compiler is gcc, but invoking it as cc changes its -# behavior. I have to pick one name or the other so I can get the -# dynamic loading switches right (they vary depending on this). I'm -# picking gcc because there's no way to get at the optimization options -# and so on when you call it cc. - -########################################## -# Modified by Takis Psarogiannakopoulos -# University of Cambridge -# Centre for Mathematical Sciences -# Department of Pure Mathematics -# Wilberforce road -# Cambridge CB3 0WB , UK -# e-mail <takis@XFree86.Org> -# Use GCC-2.95.2/3 rev (DG/UX) for threads -# This compiler supports the -pthread switch -# to link correctly DG/UX 's -lthread. -# March 2002 -########################################### - -cc=gcc -ccflags="-DDGUX -D_DGUX_SOURCE" -# Debug build. If using GNU as,ld use the flag -gstabs+ -# ccflags="-g -mstandard -DDGUX -D_DGUX_SOURCE -DDEBUGGING" -# Dummy ; always compile with -O2 on GCC 2.95.2/3 rev (DG/UX) -# even if you debugging the program! -optimize="-mno-legend -O2" - -archname="ix86-dgux" -libpth="/usr/lib" - -##################################### -# <takis@XFree86.Org> -# Change this if you want. -# prefix =/usr/local -##################################### - -prefix=/usr/local -perlpath="$prefix/bin/perl519" -startperl="#! $prefix/bin/perl519" -privlib="$prefix/lib/perl519" -man1dir="$prefix/man/man1" -man3dir="$prefix/man/man3" - -sitearch="$prefix/lib/perl519/$archname" -sitelib="$prefix/lib/perl519" - -#Do not overwrite by default /usr/bin/perl of DG/UX -installusrbinperl="$undef" - -# Configure may fail to find lstat() -# function in <sys/stat.h>. -d_lstat='define' - -# Internal (perl) malloc is causing serious problems and -# test failures in DG/UX. Most notable Embed.t -# So for perl-5.7.3 and on do NOT use. -# I have no time to investigate more. -# <takis@XFree86.Org> - -case "$usemymalloc" in -'') usemymalloc='n' ;; -esac - -case "$uselongdouble" in -'') uselongdouble='y' ;; -esac - -#usevfork=true -usevfork=false - -# DG has this thing set up with symlinks which point to different places -# depending on environment variables (see elink(5)) and the compiler and -# related tools use them to access different development environments -# (COFF, ELF, m88k BCS and so on), see sde(5). The upshot, however, is -# that when a normal program tries to access one of these elinks it sees -# no such file (like stat()ting a mis-directed symlink). Setting -# $plibpth to explicitly include the place to which the elinks point -# allows Configure to find libraries which vary based on the development -# environment. -# -# Starting with version 4.10 (the first time the OS supported Intel -# hardware) all libraries are accessed with this mechanism. -# -# The default $TARGET_BINARY_INTERFACE changed with version 4.10. The -# system now comes with a link named /usr/sde/default which points to -# the proper entry, but older versions lacked this and used m88kdgux -# directly. - -: && sde_path=${SDE_PATH:-/usr}/sde # hide from Configure -while : # dummy loop -do - if [ -n "$TARGET_BINARY_INTERFACE" ] - then set X "$TARGET_BINARY_INTERFACE" - else set X default dg m88k_dg ix86_dg m88kdgux m88kdguxelf - fi - shift - default_sde=$1 - for sde - do - [ -d "$sde_path/$sde" ] && break 2 - done - cat <<END >&2 - -NOTE: I can't figure out what SDE is used by default on this machine (I -didn't find a likely directory under $sde_path). This is bad news. If -this is a R4.10 or newer system I'm not going to be able to find any of -your libraries, if this system is R3.10 or older I won't be able to find -the math library. You should re-run Configure with the environment -variable TARGET_BINARY_INTERFACE set to the proper value for this -machine, see sde(5) and the notes in hints/dgux.sh. - -END - sde=$default_sde - break -done - -plibpth="$plibpth $sde_path/$sde/usr/lib" -unset sde_path default_sde sde - -##################################### -# <takis@XFree86.Org> -##################################### - -libperl="libperl519.so" - -# Many functions (eg, gethostent(), killpg(), getpriority(), setruid() -# dbm_*(), and plenty more) are defined in -ldgc. Usually you don't -# need to know this (it seems that libdgc.so is searched automatically -# by ld), but Configure needs to check it otherwise it will report all -# those functions as missing. - -##################################### -# <takis@XFree86.Org> -##################################### - -# libswanted="dgc gdbm $libswanted" -#libswanted="dbm posix $libswanted" -# Do *NOT* add there the malloc native -# DG/UX library! -libswanted="dbm posix resolv socket nsl dl m" - -##################################### -# <takis@XFree86.Org> -##################################### - -mydomain='.localhost' -cf_by=`(whoami) 2>/dev/null` -cf_email="$cf_by@localhost" - -# Dynamic loading works using the dlopen() functions. Note that dlfcn.h -# used to be broken, it declared _dl*() rather than dl*(). This was the -# case up to 3.10, it has been fixed in 4.11. I'm not sure if it was -# fixed in 4.10. If you have the older header just ignore the warnings -# (since pointers and integers have the same format on m88k). - -# usedl=true -usedl=false - -# For cc rather than gcc the flags would be `-K PIC' for compiling and -# -G for loading. I haven't tested this. - -##################################### -# <takis@XFree86.Org> -# Use -fPIC instead -fpic -##################################### - -cccdlflags=-fPIC -#We must use gcc -ld="gcc" -lddlflags="-shared" - -############################################################################ -# DGUX Posix 4A Draft 10 Thread support -# <takis@XFree86.Org> -# use Configure -Dusethreads to enable -############################################################################ - -cat > UU/usethreads.cbu <<'EOCBU' -case "$usethreads" in -$define|true|[yY]*) - ccflags="$ccflags" - # DG/UX has this for sure! Main Configure fails to - # detect it but it is needed! - d_pthread_atfork='define' - shift - # DG/UX's sched_yield is in -lrte - # Do *NOT* add there the malloc native - # DG/UX library! - libswanted="dbm posix resolv socket nsl dl m rte" - archname="ix86-dgux-thread" - sitearch="$prefix/lib/perl519/$archname" - sitelib="$prefix/lib/perl519" - case "$cc" in - *gcc*) - #### Use GCC -2.95.2/3 rev (DG/UX) and -pthread - #### Otherwise take out the switch -pthread - #### And add manually the -D_POSIX4A_DRAFT10_SOURCE flag. - ld="gcc" - ccflags="$ccflags -D_POSIX4A_DRAFT10_SOURCE" - # Debug build : use -DS flag on command line perl - # ccflags="$ccflags -g -mstandard -DDEBUGGING -D_POSIX4A_DRAFT10_SOURCE -pthread" - cccdlflags='-fPIC' - lddlflags="-shared" - #### Use GCC -2.95.2/3 rev (DG/UX) and -pthread - #### Otherwise take out the switch -pthread - #### And add manually the -lthread library. - ldflags="$ldflags -pthread" - ;; - - *) - echo "Not supported DG/UX cc and threads !" - ;; - esac -esac -EOCBU - -# "./Configure -d" can't figure this out easily -d_suidsafe='define' - -################################################### diff --git a/lib/perl5db.pl b/lib/perl5db.pl index 85a5ef4..8c1549c 100644 --- a/lib/perl5db.pl +++ b/lib/perl5db.pl @@ -523,7 +523,7 @@ BEGIN { # Debugger for Perl 5.00x; perl5db.pl patch level: use vars qw($VERSION $header); -$VERSION = '1.39_09'; +$VERSION = '1.39_10'; $header = "perl5db.pl version $VERSION"; @@ -8930,7 +8930,6 @@ my %_is_in_pods = (map { $_ => 1 } debtut debug delta - dgux diag doc dos diff --git a/perl.c b/perl.c index 0f8d4f7..fe5fe33 100644 --- a/perl.c +++ b/perl.c @@ -3461,7 +3461,6 @@ S_minus_v(pTHX) PerlIO * PIO_stdout; if (!sv_derived_from(PL_patchlevel, "version")) upg_version(PL_patchlevel, TRUE); -#if !defined(DGUX) { SV* level= vstringify(PL_patchlevel); #ifdef PERL_PATCHNUM @@ -3493,19 +3492,6 @@ S_minus_v(pTHX) ); SvREFCNT_dec(level); } -#else /* DGUX */ - PIO_stdout = PerlIO_stdout(); -/* Adjust verbose output as in the perl that ships with the DG/UX OS from EMC */ - PerlIO_printf(PIO_stdout, - Perl_form(aTHX_ "\nThis is perl, %"SVf"\n", - SVfARG(vstringify(PL_patchlevel)))); - PerlIO_printf(PIO_stdout, - Perl_form(aTHX_ " built under %s at %s %s\n", - OSNAME, __DATE__, __TIME__)); - PerlIO_printf(PIO_stdout, - Perl_form(aTHX_ " OS Specific Release: %s\n", - OSVERS)); -#endif /* !DGUX */ #if defined(LOCAL_PATCH_COUNT) if (LOCAL_PATCH_COUNT > 0) PerlIO_printf(PIO_stdout, diff --git a/perl.h b/perl.h index 1f6e4e4..69c18bd 100644 --- a/perl.h +++ b/perl.h @@ -22,10 +22,6 @@ #define USE_STDIO #endif /* PERL_FOR_X2P */ -#if defined(DGUX) -#include <sys/fcntl.h> -#endif - #ifdef VOIDUSED # undef VOIDUSED #endif @@ -520,7 +516,7 @@ struct op *Perl_op asm(stringify(OP_IN_REGISTER)); # define STANDARD_C 1 #endif -#if defined(__cplusplus) || defined(WIN32) || defined(__sgi) || defined(__EMX__) || defined(__DGUX) || defined(__QNX__) || defined(NETWARE) || defined(PERL_MICRO) +#if defined(__cplusplus) || defined(WIN32) || defined(__sgi) || defined(__EMX__) || defined(__QNX__) || defined(NETWARE) || defined(PERL_MICRO) # define DONT_DECLARE_STD 1 #endif @@ -4064,8 +4060,7 @@ EXT char *** environ_pointer; # ifdef USE_ENVIRON_ARRAY # if !defined(DONT_DECLARE_STD) || \ (defined(__svr4__) && defined(__GNUC__) && defined(sun)) || \ - defined(__sgi) || \ - defined(__DGUX) + defined(__sgi) extern char ** environ; /* environment variables supplied via exec */ # endif # endif diff --git a/pod/perl.pod b/pod/perl.pod index 40d1270..fa72164 100644 --- a/pod/perl.pod +++ b/pod/perl.pod @@ -234,7 +234,6 @@ aux a2p c2ph h2ph h2xs perlbug pl2pm pod2html pod2man s2p splain xsubpp perlbs2000 Perl notes for POSIX-BC BS2000 perlce Perl notes for WinCE perlcygwin Perl notes for Cygwin - perldgux Perl notes for DG/UX perldos Perl notes for DOS perlfreebsd Perl notes for FreeBSD perlhaiku Perl notes for Haiku diff --git a/pod/perlport.pod b/pod/perlport.pod index cdde52d..d186d12 100644 --- a/pod/perlport.pod +++ b/pod/perlport.pod @@ -804,7 +804,6 @@ are a few of the more popular Unix flavors: AIX aix aix BSD/OS bsdos i386-bsdos Darwin darwin darwin - dgux dgux AViiON-dgux DYNIX/ptx dynixptx i386-dynixptx FreeBSD freebsd freebsd-i386 Haiku haiku BePC-haiku @@ -2309,7 +2308,7 @@ L<http://www.cpan.org/ports/index.html> for binary distributions. =head1 SEE ALSO L<perlaix>, L<perlamiga>, L<perlbs2000>, -L<perlce>, L<perlcygwin>, L<perldgux>, L<perldos>, +L<perlce>, L<perlcygwin>, L<perldos>, L<perlebcdic>, L<perlfreebsd>, L<perlhurd>, L<perlhpux>, L<perlirix>, L<perlmacos>, L<perlmacosx>, L<perlnetware>, L<perlos2>, L<perlos390>, L<perlos400>, diff --git a/t/op/stat.t b/t/op/stat.t index c5c74ca..2ff4cdf 100644 --- a/t/op/stat.t +++ b/t/op/stat.t @@ -36,7 +36,6 @@ $Is_NetWare = $^O eq 'NetWare'; $Is_OS2 = $^O eq 'os2'; $Is_Solaris = $^O eq 'solaris'; $Is_VMS = $^O eq 'VMS'; -$Is_DGUX = $^O eq 'dgux'; $Is_MPRAS = $^O =~ /svr4/ && -f '/etc/.relid'; $Is_Dosish = $Is_Dos || $Is_OS2 || $Is_MSWin32 || $Is_NetWare; @@ -294,13 +293,10 @@ SKIP: { is($c1, $c2, "ls and $_[1] agreeing on /dev ($c1 $c2)"); }; -SKIP: { - skip("DG/UX ls -L broken", 3) if $Is_DGUX; - +{ $try->('b', '-b'); $try->('c', '-c'); $try->('s', '-S'); - } ok(! -b $Curdir, '!-b cwd'); @@ -377,12 +373,7 @@ SKIP: { my $statfile = './op/stat.t'; ok( -T $statfile, '-T'); ok(! -B $statfile, '!-B'); - -SKIP: { - skip("DG/UX", 1) if $Is_DGUX; ok(-B $Perl, '-B'); -} - ok(! -T $Perl, '!-T'); open(FOO,$statfile); diff --git a/thread.h b/thread.h index 03965c8..15d2665 100644 --- a/thread.h +++ b/thread.h @@ -91,10 +91,6 @@ # endif #endif -#ifdef DGUX -# define THREAD_CREATE_NEEDS_STACK (32*1024) -#endif - #ifdef __VMS /* Default is 1024 on VAX, 8192 otherwise */ # ifdef __ia64 diff --git a/win32/Makefile b/win32/Makefile index 79287a8..4f8898a 100644 --- a/win32/Makefile +++ b/win32/Makefile @@ -1129,7 +1129,6 @@ utils: $(PERLEXE) $(X2P) copy ..\README.ce ..\pod\perlce.pod copy ..\README.cn ..\pod\perlcn.pod copy ..\README.cygwin ..\pod\perlcygwin.pod - copy ..\README.dgux ..\pod\perldgux.pod copy ..\README.dos ..\pod\perldos.pod copy ..\README.freebsd ..\pod\perlfreebsd.pod copy ..\README.haiku ..\pod\perlhaiku.pod @@ -1248,15 +1247,14 @@ distclean: realclean -if exist $(LIBDIR)\Win32API rmdir /s /q $(LIBDIR)\Win32API -cd $(PODDIR) && del /f *.html *.bat roffitall \ perl5191delta.pod perlaix.pod perlamiga.pod perlapi.pod \ - perlbs2000.pod perlce.pod perlcn.pod perlcygwin.pod \ - perldgux.pod perldos.pod perlfreebsd.pod perlhaiku.pod \ - perlhpux.pod perlhurd.pod perlintern.pod perlirix.pod \ - perljp.pod perlko.pod perllinux.pod perlmacos.pod \ - perlmacosx.pod perlmodlib.pod perlnetware.pod perlopenbsd.pod \ - perlos2.pod perlos390.pod perlos400.pod perlplan9.pod \ - perlqnx.pod perlriscos.pod perlsolaris.pod perlsymbian.pod \ - perltoc.pod perltru64.pod perltw.pod perluniprops.pod \ - perlvos.pod perlwin32.pod + perlbs2000.pod perlce.pod perlcn.pod perlcygwin.pod perldos.pod \ + perlfreebsd.pod perlhaiku.pod perlhpux.pod perlhurd.pod \ + perlintern.pod perlirix.pod perljp.pod perlko.pod perllinux.pod \ + perlmacos.pod perlmacosx.pod perlmodlib.pod perlnetware.pod \ + perlopenbsd.pod perlos2.pod perlos390.pod perlos400.pod \ + perlplan9.pod perlqnx.pod perlriscos.pod perlsolaris.pod \ + perlsymbian.pod perltoc.pod perltru64.pod perltw.pod \ + perluniprops.pod perlvos.pod perlwin32.pod -cd ..\utils && del /f h2ph splain perlbug pl2pm c2ph pstruct h2xs \ perldoc perlivp libnetcfg enc2xs piconv cpan *.bat \ xsubpp pod2html instmodsh json_pp prove ptar ptardiff ptargrep shasum corelist config_data zipdetails diff --git a/win32/makefile.mk b/win32/makefile.mk index 6752a11..edaf6cc 100644 --- a/win32/makefile.mk +++ b/win32/makefile.mk @@ -1309,7 +1309,6 @@ utils: $(PERLEXE) $(X2P) copy ..\README.ce ..\pod\perlce.pod copy ..\README.cn ..\pod\perlcn.pod copy ..\README.cygwin ..\pod\perlcygwin.pod - copy ..\README.dgux ..\pod\perldgux.pod copy ..\README.dos ..\pod\perldos.pod copy ..\README.freebsd ..\pod\perlfreebsd.pod copy ..\README.haiku ..\pod\perlhaiku.pod @@ -1427,15 +1426,14 @@ distclean: realclean -if exist $(LIBDIR)\Win32API rmdir /s /q $(LIBDIR)\Win32API -cd $(PODDIR) && del /f *.html *.bat roffitall \ perl5191delta.pod perlaix.pod perlamiga.pod perlapi.pod \ - perlbs2000.pod perlce.pod perlcn.pod perlcygwin.pod \ - perldgux.pod perldos.pod perlfreebsd.pod perlhaiku.pod \ - perlhpux.pod perlhurd.pod perlintern.pod perlirix.pod \ - perljp.pod perlko.pod perllinux.pod perlmacos.pod \ - perlmacosx.pod perlmodlib.pod perlnetware.pod perlopenbsd.pod \ - perlos2.pod perlos390.pod perlos400.pod perlplan9.pod \ - perlqnx.pod perlriscos.pod perlsolaris.pod perlsymbian.pod \ - perltoc.pod perltru64.pod perltw.pod perluniprops.pod \ - perlvos.pod perlwin32.pod + perlbs2000.pod perlce.pod perlcn.pod perlcygwin.pod perldos.pod \ + perlfreebsd.pod perlhaiku.pod perlhpux.pod perlhurd.pod \ + perlintern.pod perlirix.pod perljp.pod perlko.pod perllinux.pod \ + perlmacos.pod perlmacosx.pod perlmodlib.pod perlnetware.pod \ + perlopenbsd.pod perlos2.pod perlos390.pod perlos400.pod \ + perlplan9.pod perlqnx.pod perlriscos.pod perlsolaris.pod \ + perlsymbian.pod perltoc.pod perltru64.pod perltw.pod \ + perluniprops.pod perlvos.pod perlwin32.pod -cd ..\utils && del /f h2ph splain perlbug pl2pm c2ph pstruct h2xs \ perldoc perlivp libnetcfg enc2xs piconv cpan *.bat \ xsubpp pod2html instmodsh json_pp prove ptar ptardiff ptargrep shasum corelist config_data zipdetails -- Perl5 Master Repository http://www.nntp.perl.org/group/perl.perl5.changes/2013/05/msg37203.html Fri, 24 May 2013 11:10:05 +0000 [perl.git] branch smoke-me/nicholas/ex-dgux, created. v5.19.0-150-g741c077 by Nicholas Clark In perl.git, the branch smoke-me/nicholas/ex-dgux has been created <http://perl5.git.perl.org/perl.git/commitdiff/741c0772bf49e348fe0e2ea00a8937512b03d074?hp=0000000000000000000000000000000000000000> at 741c0772bf49e348fe0e2ea00a8937512b03d074 (commit) - Log ----------------------------------------------------------------- No new revisions added by this update ----------------------------------------------------------------------- -- Perl5 Master Repository http://www.nntp.perl.org/group/perl.perl5.changes/2013/05/msg37202.html Fri, 24 May 2013 11:10:00 +0000 [perl.git] branch smoke-me/nicholas/ex-dgux, deleted. v5.19.0-151-g2dd62c2 by Nicholas Clark In perl.git, the branch smoke-me/nicholas/ex-dgux has been deleted <http://perl5.git.perl.org/perl.git/commitdiff/0000000000000000000000000000000000000000?hp=2dd62c2f22851eb97a042e086f81c1380e91c0ea> was 2dd62c2f22851eb97a042e086f81c1380e91c0ea ----------------------------------------------------------------------- 2dd62c2f22851eb97a042e086f81c1380e91c0ea Remove DG/UX support. ----------------------------------------------------------------------- -- Perl5 Master Repository http://www.nntp.perl.org/group/perl.perl5.changes/2013/05/msg37201.html Fri, 24 May 2013 11:09:57 +0000 [perl.git] branch smoke-me/nicholas/ex-dgux, updated. v5.19.0-151-g2dd62c2 by Nicholas Clark In perl.git, the branch smoke-me/nicholas/ex-dgux has been updated <http://perl5.git.perl.org/perl.git/commitdiff/2dd62c2f22851eb97a042e086f81c1380e91c0ea?hp=741c0772bf49e348fe0e2ea00a8937512b03d074> - Log ----------------------------------------------------------------- commit 2dd62c2f22851eb97a042e086f81c1380e91c0ea Author: Nicholas Clark <nick@ccl4.org> Date: Fri May 24 12:20:02 2013 +0200 Remove DG/UX support. DG/UX was a Unix sold by Data General. The last release was in April 2001. It only runs on Data General's own hardware. ----------------------------------------------------------------------- Summary of changes: MANIFEST | 2 - README.dgux | 117 -------------------------- hints/dgux.sh | 237 ----------------------------------------------------- lib/perl5db.pl | 3 +- pod/perl.pod | 1 - pod/perlport.pod | 3 +- t/op/stat.t | 11 +-- win32/Makefile | 18 ++-- win32/makefile.mk | 18 ++-- 9 files changed, 19 insertions(+), 391 deletions(-) delete mode 100644 README.dgux delete mode 100644 hints/dgux.sh diff --git a/MANIFEST b/MANIFEST index 72fcff9..a938b7b 100644 --- a/MANIFEST +++ b/MANIFEST @@ -3926,7 +3926,6 @@ hints/cygwin.sh Hints for named architecture hints/darwin.sh Hints for named architecture hints/dcosx.sh Hints for named architecture hints/dec_osf.sh Hints for named architecture -hints/dgux.sh Hints for named architecture hints/dos_djgpp.sh Hints for named architecture hints/dragonfly.sh Hints for named architecture hints/dynixptx.sh Hints for named architecture @@ -4676,7 +4675,6 @@ README.bs2000 Perl notes for POSIX-BC BS2000 README.ce Perl notes for WinCE README.cn Perl for Simplified Chinese (in EUC-CN) README.cygwin Perl notes for Cygwin -README.dgux Perl notes for DG/UX README.dos Perl notes for DOS README.freebsd Perl notes for FreeBSD README.haiku Perl notes for Haiku diff --git a/README.dgux b/README.dgux deleted file mode 100644 index fd6eaa3..0000000 --- a/README.dgux +++ /dev/null @@ -1,117 +0,0 @@ -If you read this file _as_is_, just ignore the funny characters you -see. It is written in the POD format (see perlpod manpage) which is -specially designed to be readable as is. - -=head1 NAME - -perldgux - Perl under DG/UX. - -=head1 SYNOPSIS - -One can read this document in the following formats: - - man perldgux - view perl perldgux - explorer perldgux.html - info perldgux - -to list some (not all may be available simultaneously), or it may -be read I<as is>: as F<README.dgux>. - -=cut - -Contents - - perldgux - Perl under DG/UX. - - NAME - SYNOPSIS - DESCRIPTION - BUILD - - Non-threaded Case - - Threaded Case - - Testing - - Installing the built perl - AUTHOR - SEE ALSO - -=head1 DESCRIPTION - -Perl 5.7/8.x for DG/UX ix86 R4.20MU0x - -=head1 BUILDING PERL ON DG/UX - -=head2 Non-threaded Perl on DG/UX - -Just run ./Configure script from the top directory. -Then give "make" to compile. - -=head2 Threaded Perl on DG/UX - -If you are using as compiler GCC-2.95.x rev(DG/UX) -an easy solution for configuring perl in your DG/UX -machine is to run the command: - -./Configure -Dusethreads -Duseithreads -Dusedevel -des - -This will automatically accept all the defaults and -in particular /usr/local/ as installation directory. -Note that GCC-2.95.x rev(DG/UX) knows the switch --pthread which allows it to link correctly DG/UX's --lthread library. - -If you want to change the installation directory or -have a standard DG/UX with C compiler GCC-2.7.2.x -then you have no choice than to do an interactive -build by issuing the command: - -./Configure -Dusethreads -Duseithreads - -In particular with GCC-2.7.2.x accept all the defaults -and *watch* out for the message: - - Any additional ld flags (NOT including libraries)? [ -pthread] - -Instead of -pthread put here -lthread. CGCC-2.7.2.x -that comes with the DG/UX OS does NOT know the -pthread -switch. So your build will fail if you choose the defaults. -After configuration is done correctly give "make" to compile. - -=head2 Testing Perl on DG/UX - -Issuing a "make test" will run all the tests. -If the test lib/ftmp-security gives you as a result -something like - - lib/ftmp-security....File::Temp::_gettemp: - Parent directory (/tmp/) is not safe (sticky bit not set - when world writable?) at lib/ftmp-security.t line 100 - -don't panic and just set the sticky bit in your /tmp -directory by doing the following as root: - -cd / -chmod +t /tmp (=set the sticky bit to /tmp). - -Then rerun the tests. This time all must be OK. - -=head2 Installing the built perl on DG/UX - -Run the command "make install" - -=head1 AUTHOR - -Takis Psarogiannakopoulos -University of Cambridge -Centre for Mathematical Sciences -Department of Pure Mathematics -Wilberforce road -Cambridge CB3 0WB , UK -email <takis@XFree86.Org> - -=head1 SEE ALSO - -perl(1). - -=cut - diff --git a/hints/dgux.sh b/hints/dgux.sh deleted file mode 100644 index bb49556..0000000 --- a/hints/dgux.sh +++ /dev/null @@ -1,237 +0,0 @@ -# This is a hints file for DGUX, which is EMC's Data General's Unix. It -# was originally developed with version 5.4.3.10 of the OS, and then was -# later updated running under version 4.11.2 (running on m88k hardware). -# The gross features should work with versions going back to 2.nil but -# some tweaking will probably be necessary. -# -# DGUX is an SVR4 derivative. It ships with gcc as the standard -# compiler. Since version 3.0 it has shipped with Perl 4.036 -# installed in /usr/bin, which is kind of neat. Be careful when you -# install that you don't overwrite the system version, though (by -# answering yes to the question about installing perl as /usr/bin/perl), -# as it would suck to try to get support if the vendor learned that you -# were physically replacing the system binaries. -# -# -Roderick Schertler <roderick@argon.org> - -# The standard system compiler is gcc, but invoking it as cc changes its -# behavior. I have to pick one name or the other so I can get the -# dynamic loading switches right (they vary depending on this). I'm -# picking gcc because there's no way to get at the optimization options -# and so on when you call it cc. - -########################################## -# Modified by Takis Psarogiannakopoulos -# University of Cambridge -# Centre for Mathematical Sciences -# Department of Pure Mathematics -# Wilberforce road -# Cambridge CB3 0WB , UK -# e-mail <takis@XFree86.Org> -# Use GCC-2.95.2/3 rev (DG/UX) for threads -# This compiler supports the -pthread switch -# to link correctly DG/UX 's -lthread. -# March 2002 -########################################### - -cc=gcc -ccflags="-DDGUX -D_DGUX_SOURCE" -# Debug build. If using GNU as,ld use the flag -gstabs+ -# ccflags="-g -mstandard -DDGUX -D_DGUX_SOURCE -DDEBUGGING" -# Dummy ; always compile with -O2 on GCC 2.95.2/3 rev (DG/UX) -# even if you debugging the program! -optimize="-mno-legend -O2" - -archname="ix86-dgux" -libpth="/usr/lib" - -##################################### -# <takis@XFree86.Org> -# Change this if you want. -# prefix =/usr/local -##################################### - -prefix=/usr/local -perlpath="$prefix/bin/perl519" -startperl="#! $prefix/bin/perl519" -privlib="$prefix/lib/perl519" -man1dir="$prefix/man/man1" -man3dir="$prefix/man/man3" - -sitearch="$prefix/lib/perl519/$archname" -sitelib="$prefix/lib/perl519" - -#Do not overwrite by default /usr/bin/perl of DG/UX -installusrbinperl="$undef" - -# Configure may fail to find lstat() -# function in <sys/stat.h>. -d_lstat='define' - -# Internal (perl) malloc is causing serious problems and -# test failures in DG/UX. Most notable Embed.t -# So for perl-5.7.3 and on do NOT use. -# I have no time to investigate more. -# <takis@XFree86.Org> - -case "$usemymalloc" in -'') usemymalloc='n' ;; -esac - -case "$uselongdouble" in -'') uselongdouble='y' ;; -esac - -#usevfork=true -usevfork=false - -# DG has this thing set up with symlinks which point to different places -# depending on environment variables (see elink(5)) and the compiler and -# related tools use them to access different development environments -# (COFF, ELF, m88k BCS and so on), see sde(5). The upshot, however, is -# that when a normal program tries to access one of these elinks it sees -# no such file (like stat()ting a mis-directed symlink). Setting -# $plibpth to explicitly include the place to which the elinks point -# allows Configure to find libraries which vary based on the development -# environment. -# -# Starting with version 4.10 (the first time the OS supported Intel -# hardware) all libraries are accessed with this mechanism. -# -# The default $TARGET_BINARY_INTERFACE changed with version 4.10. The -# system now comes with a link named /usr/sde/default which points to -# the proper entry, but older versions lacked this and used m88kdgux -# directly. - -: && sde_path=${SDE_PATH:-/usr}/sde # hide from Configure -while : # dummy loop -do - if [ -n "$TARGET_BINARY_INTERFACE" ] - then set X "$TARGET_BINARY_INTERFACE" - else set X default dg m88k_dg ix86_dg m88kdgux m88kdguxelf - fi - shift - default_sde=$1 - for sde - do - [ -d "$sde_path/$sde" ] && break 2 - done - cat <<END >&2 - -NOTE: I can't figure out what SDE is used by default on this machine (I -didn't find a likely directory under $sde_path). This is bad news. If -this is a R4.10 or newer system I'm not going to be able to find any of -your libraries, if this system is R3.10 or older I won't be able to find -the math library. You should re-run Configure with the environment -variable TARGET_BINARY_INTERFACE set to the proper value for this -machine, see sde(5) and the notes in hints/dgux.sh. - -END - sde=$default_sde - break -done - -plibpth="$plibpth $sde_path/$sde/usr/lib" -unset sde_path default_sde sde - -##################################### -# <takis@XFree86.Org> -##################################### - -libperl="libperl519.so" - -# Many functions (eg, gethostent(), killpg(), getpriority(), setruid() -# dbm_*(), and plenty more) are defined in -ldgc. Usually you don't -# need to know this (it seems that libdgc.so is searched automatically -# by ld), but Configure needs to check it otherwise it will report all -# those functions as missing. - -##################################### -# <takis@XFree86.Org> -##################################### - -# libswanted="dgc gdbm $libswanted" -#libswanted="dbm posix $libswanted" -# Do *NOT* add there the malloc native -# DG/UX library! -libswanted="dbm posix resolv socket nsl dl m" - -##################################### -# <takis@XFree86.Org> -##################################### - -mydomain='.localhost' -cf_by=`(whoami) 2>/dev/null` -cf_email="$cf_by@localhost" - -# Dynamic loading works using the dlopen() functions. Note that dlfcn.h -# used to be broken, it declared _dl*() rather than dl*(). This was the -# case up to 3.10, it has been fixed in 4.11. I'm not sure if it was -# fixed in 4.10. If you have the older header just ignore the warnings -# (since pointers and integers have the same format on m88k). - -# usedl=true -usedl=false - -# For cc rather than gcc the flags would be `-K PIC' for compiling and -# -G for loading. I haven't tested this. - -##################################### -# <takis@XFree86.Org> -# Use -fPIC instead -fpic -##################################### - -cccdlflags=-fPIC -#We must use gcc -ld="gcc" -lddlflags="-shared" - -############################################################################ -# DGUX Posix 4A Draft 10 Thread support -# <takis@XFree86.Org> -# use Configure -Dusethreads to enable -############################################################################ - -cat > UU/usethreads.cbu <<'EOCBU' -case "$usethreads" in -$define|true|[yY]*) - ccflags="$ccflags" - # DG/UX has this for sure! Main Configure fails to - # detect it but it is needed! - d_pthread_atfork='define' - shift - # DG/UX's sched_yield is in -lrte - # Do *NOT* add there the malloc native - # DG/UX library! - libswanted="dbm posix resolv socket nsl dl m rte" - archname="ix86-dgux-thread" - sitearch="$prefix/lib/perl519/$archname" - sitelib="$prefix/lib/perl519" - case "$cc" in - *gcc*) - #### Use GCC -2.95.2/3 rev (DG/UX) and -pthread - #### Otherwise take out the switch -pthread - #### And add manually the -D_POSIX4A_DRAFT10_SOURCE flag. - ld="gcc" - ccflags="$ccflags -D_POSIX4A_DRAFT10_SOURCE" - # Debug build : use -DS flag on command line perl - # ccflags="$ccflags -g -mstandard -DDEBUGGING -D_POSIX4A_DRAFT10_SOURCE -pthread" - cccdlflags='-fPIC' - lddlflags="-shared" - #### Use GCC -2.95.2/3 rev (DG/UX) and -pthread - #### Otherwise take out the switch -pthread - #### And add manually the -lthread library. - ldflags="$ldflags -pthread" - ;; - - *) - echo "Not supported DG/UX cc and threads !" - ;; - esac -esac -EOCBU - -# "./Configure -d" can't figure this out easily -d_suidsafe='define' - -################################################### diff --git a/lib/perl5db.pl b/lib/perl5db.pl index 85a5ef4..8c1549c 100644 --- a/lib/perl5db.pl +++ b/lib/perl5db.pl @@ -523,7 +523,7 @@ BEGIN { # Debugger for Perl 5.00x; perl5db.pl patch level: use vars qw($VERSION $header); -$VERSION = '1.39_09'; +$VERSION = '1.39_10'; $header = "perl5db.pl version $VERSION"; @@ -8930,7 +8930,6 @@ my %_is_in_pods = (map { $_ => 1 } debtut debug delta - dgux diag doc dos diff --git a/pod/perl.pod b/pod/perl.pod index 40d1270..fa72164 100644 --- a/pod/perl.pod +++ b/pod/perl.pod @@ -234,7 +234,6 @@ aux a2p c2ph h2ph h2xs perlbug pl2pm pod2html pod2man s2p splain xsubpp perlbs2000 Perl notes for POSIX-BC BS2000 perlce Perl notes for WinCE perlcygwin Perl notes for Cygwin - perldgux Perl notes for DG/UX perldos Perl notes for DOS perlfreebsd Perl notes for FreeBSD perlhaiku Perl notes for Haiku diff --git a/pod/perlport.pod b/pod/perlport.pod index cdde52d..d186d12 100644 --- a/pod/perlport.pod +++ b/pod/perlport.pod @@ -804,7 +804,6 @@ are a few of the more popular Unix flavors: AIX aix aix BSD/OS bsdos i386-bsdos Darwin darwin darwin - dgux dgux AViiON-dgux DYNIX/ptx dynixptx i386-dynixptx FreeBSD freebsd freebsd-i386 Haiku haiku BePC-haiku @@ -2309,7 +2308,7 @@ L<http://www.cpan.org/ports/index.html> for binary distributions. =head1 SEE ALSO L<perlaix>, L<perlamiga>, L<perlbs2000>, -L<perlce>, L<perlcygwin>, L<perldgux>, L<perldos>, +L<perlce>, L<perlcygwin>, L<perldos>, L<perlebcdic>, L<perlfreebsd>, L<perlhurd>, L<perlhpux>, L<perlirix>, L<perlmacos>, L<perlmacosx>, L<perlnetware>, L<perlos2>, L<perlos390>, L<perlos400>, diff --git a/t/op/stat.t b/t/op/stat.t index c5c74ca..2ff4cdf 100644 --- a/t/op/stat.t +++ b/t/op/stat.t @@ -36,7 +36,6 @@ $Is_NetWare = $^O eq 'NetWare'; $Is_OS2 = $^O eq 'os2'; $Is_Solaris = $^O eq 'solaris'; $Is_VMS = $^O eq 'VMS'; -$Is_DGUX = $^O eq 'dgux'; $Is_MPRAS = $^O =~ /svr4/ && -f '/etc/.relid'; $Is_Dosish = $Is_Dos || $Is_OS2 || $Is_MSWin32 || $Is_NetWare; @@ -294,13 +293,10 @@ SKIP: { is($c1, $c2, "ls and $_[1] agreeing on /dev ($c1 $c2)"); }; -SKIP: { - skip("DG/UX ls -L broken", 3) if $Is_DGUX; - +{ $try->('b', '-b'); $try->('c', '-c'); $try->('s', '-S'); - } ok(! -b $Curdir, '!-b cwd'); @@ -377,12 +373,7 @@ SKIP: { my $statfile = './op/stat.t'; ok( -T $statfile, '-T'); ok(! -B $statfile, '!-B'); - -SKIP: { - skip("DG/UX", 1) if $Is_DGUX; ok(-B $Perl, '-B'); -} - ok(! -T $Perl, '!-T'); open(FOO,$statfile); diff --git a/win32/Makefile b/win32/Makefile index 79287a8..4f8898a 100644 --- a/win32/Makefile +++ b/win32/Makefile @@ -1129,7 +1129,6 @@ utils: $(PERLEXE) $(X2P) copy ..\README.ce ..\pod\perlce.pod copy ..\README.cn ..\pod\perlcn.pod copy ..\README.cygwin ..\pod\perlcygwin.pod - copy ..\README.dgux ..\pod\perldgux.pod copy ..\README.dos ..\pod\perldos.pod copy ..\README.freebsd ..\pod\perlfreebsd.pod copy ..\README.haiku ..\pod\perlhaiku.pod @@ -1248,15 +1247,14 @@ distclean: realclean -if exist $(LIBDIR)\Win32API rmdir /s /q $(LIBDIR)\Win32API -cd $(PODDIR) && del /f *.html *.bat roffitall \ perl5191delta.pod perlaix.pod perlamiga.pod perlapi.pod \ - perlbs2000.pod perlce.pod perlcn.pod perlcygwin.pod \ - perldgux.pod perldos.pod perlfreebsd.pod perlhaiku.pod \ - perlhpux.pod perlhurd.pod perlintern.pod perlirix.pod \ - perljp.pod perlko.pod perllinux.pod perlmacos.pod \ - perlmacosx.pod perlmodlib.pod perlnetware.pod perlopenbsd.pod \ - perlos2.pod perlos390.pod perlos400.pod perlplan9.pod \ - perlqnx.pod perlriscos.pod perlsolaris.pod perlsymbian.pod \ - perltoc.pod perltru64.pod perltw.pod perluniprops.pod \ - perlvos.pod perlwin32.pod + perlbs2000.pod perlce.pod perlcn.pod perlcygwin.pod perldos.pod \ + perlfreebsd.pod perlhaiku.pod perlhpux.pod perlhurd.pod \ + perlintern.pod perlirix.pod perljp.pod perlko.pod perllinux.pod \ + perlmacos.pod perlmacosx.pod perlmodlib.pod perlnetware.pod \ + perlopenbsd.pod perlos2.pod perlos390.pod perlos400.pod \ + perlplan9.pod perlqnx.pod perlriscos.pod perlsolaris.pod \ + perlsymbian.pod perltoc.pod perltru64.pod perltw.pod \ + perluniprops.pod perlvos.pod perlwin32.pod -cd ..\utils && del /f h2ph splain perlbug pl2pm c2ph pstruct h2xs \ perldoc perlivp libnetcfg enc2xs piconv cpan *.bat \ xsubpp pod2html instmodsh json_pp prove ptar ptardiff ptargrep shasum corelist config_data zipdetails diff --git a/win32/makefile.mk b/win32/makefile.mk index 6752a11..edaf6cc 100644 --- a/win32/makefile.mk +++ b/win32/makefile.mk @@ -1309,7 +1309,6 @@ utils: $(PERLEXE) $(X2P) copy ..\README.ce ..\pod\perlce.pod copy ..\README.cn ..\pod\perlcn.pod copy ..\README.cygwin ..\pod\perlcygwin.pod - copy ..\README.dgux ..\pod\perldgux.pod copy ..\README.dos ..\pod\perldos.pod copy ..\README.freebsd ..\pod\perlfreebsd.pod copy ..\README.haiku ..\pod\perlhaiku.pod @@ -1427,15 +1426,14 @@ distclean: realclean -if exist $(LIBDIR)\Win32API rmdir /s /q $(LIBDIR)\Win32API -cd $(PODDIR) && del /f *.html *.bat roffitall \ perl5191delta.pod perlaix.pod perlamiga.pod perlapi.pod \ - perlbs2000.pod perlce.pod perlcn.pod perlcygwin.pod \ - perldgux.pod perldos.pod perlfreebsd.pod perlhaiku.pod \ - perlhpux.pod perlhurd.pod perlintern.pod perlirix.pod \ - perljp.pod perlko.pod perllinux.pod perlmacos.pod \ - perlmacosx.pod perlmodlib.pod perlnetware.pod perlopenbsd.pod \ - perlos2.pod perlos390.pod perlos400.pod perlplan9.pod \ - perlqnx.pod perlriscos.pod perlsolaris.pod perlsymbian.pod \ - perltoc.pod perltru64.pod perltw.pod perluniprops.pod \ - perlvos.pod perlwin32.pod + perlbs2000.pod perlce.pod perlcn.pod perlcygwin.pod perldos.pod \ + perlfreebsd.pod perlhaiku.pod perlhpux.pod perlhurd.pod \ + perlintern.pod perlirix.pod perljp.pod perlko.pod perllinux.pod \ + perlmacos.pod perlmacosx.pod perlmodlib.pod perlnetware.pod \ + perlopenbsd.pod perlos2.pod perlos390.pod perlos400.pod \ + perlplan9.pod perlqnx.pod perlriscos.pod perlsolaris.pod \ + perlsymbian.pod perltoc.pod perltru64.pod perltw.pod \ + perluniprops.pod perlvos.pod perlwin32.pod -cd ..\utils && del /f h2ph splain perlbug pl2pm c2ph pstruct h2xs \ perldoc perlivp libnetcfg enc2xs piconv cpan *.bat \ xsubpp pod2html instmodsh json_pp prove ptar ptardiff ptargrep shasum corelist config_data zipdetails -- Perl5 Master Repository http://www.nntp.perl.org/group/perl.perl5.changes/2013/05/msg37200.html Fri, 24 May 2013 10:23:09 +0000 [perl.git] branch smoke-me/nicholas/ex-dgux, created. v5.19.0-150-g741c077 by Nicholas Clark In perl.git, the branch smoke-me/nicholas/ex-dgux has been created <http://perl5.git.perl.org/perl.git/commitdiff/741c0772bf49e348fe0e2ea00a8937512b03d074?hp=0000000000000000000000000000000000000000> at 741c0772bf49e348fe0e2ea00a8937512b03d074 (commit) - Log ----------------------------------------------------------------- No new revisions added by this update ----------------------------------------------------------------------- -- Perl5 Master Repository http://www.nntp.perl.org/group/perl.perl5.changes/2013/05/msg37199.html Fri, 24 May 2013 10:23:02 +0000 [perl.git] branch blead, updated. v5.19.0-164-g8524aa6 by James Keenan In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/8524aa6e56ea4ae1610e36bc239b06bfb087e84b?hp=246653713af14d15f3f4cbbe21de04d5606be285> - Log ----------------------------------------------------------------- commit 8524aa6e56ea4ae1610e36bc239b06bfb087e84b Author: David Steinbrunner <dsteinbrunner@pobox.com> Date: Tue May 21 06:57:44 2013 -0400 typo fixes for version pod ----------------------------------------------------------------------- Summary of changes: lib/version/Internals.pod | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/version/Internals.pod b/lib/version/Internals.pod index ff63eba..f2b3e81 100644 --- a/lib/version/Internals.pod +++ b/lib/version/Internals.pod @@ -251,7 +251,7 @@ when using version.pm methods, as this will ensure that what you type is what is used. Additionally, if you quote your initializer, then the quoted value that goes -B<in> will be be exactly what comes B<out> when your $VERSION is printed +B<in> will be exactly what comes B<out> when your $VERSION is printed (stringified). If you do not quote your value, Perl's normal numeric handling comes into play and you may not get back what you were expecting. @@ -343,7 +343,7 @@ See L<version/is_qv()>. =item alpha A boolean that denotes whether this is an alpha version. NOTE: that the -underscore can can only appear in the last position. See L<version/is_alpha()>. +underscore can only appear in the last position. See L<version/is_alpha()>. =item version -- Perl5 Master Repository http://www.nntp.perl.org/group/perl.perl5.changes/2013/05/msg37198.html Fri, 24 May 2013 01:54:07 +0000 [perl.git] branch blead, updated. v5.19.0-163-g2466537 by David Golden In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/246653713af14d15f3f4cbbe21de04d5606be285?hp=67a05ee15ae3919df791f947984a7a505e2fbdcf> - Log ----------------------------------------------------------------- commit 246653713af14d15f3f4cbbe21de04d5606be285 Author: David Golden <dagolden@cpan.org> Date: Thu May 23 19:11:23 2013 -0400 Try to avoid nesting F<$F<...>> in generated Config.pm M configpm commit 3d6c5fec8cb3579a30be60177e31058bc31285d7 Author: David Golden <dagolden@cpan.org> Date: Thu May 23 18:08:48 2013 -0400 fix various podcheck nits M Porting/how_to_write_a_perldelta.pod M Porting/release_schedule.pod M dist/Filter-Simple/lib/Filter/Simple.pm M dist/Math-BigInt/lib/Math/BigInt/CalcEmu.pm M dist/Math-BigRat/lib/Math/BigRat.pm M dist/Safe/Safe.pm M lib/diagnostics.t M lib/unicore/mktables M op.c M pod/perldiag.pod M pod/perlfunc.pod M pod/perlunifaq.pod M t/porting/known_pod_issues.dat M x2p/a2p.pod commit 1dcc3c19f1c031cf741527de0a2b2e4c178e9f04 Author: David Golden <dagolden@cpan.org> Date: Thu May 23 16:58:20 2013 -0400 fix various Pod line length warnings M Porting/todo.pod M README.ce M README.cygwin M README.netware M README.os2 M README.tru64 M dist/ExtUtils-ParseXS/lib/perlxstut.pod M ext/POSIX/lib/POSIX.pod M pod/perldiag.pod M pod/perlgit.pod M pod/perlrun.pod M t/porting/known_pod_issues.dat commit f5bfcfd8f19e8103e4fff44523de3ca4d7c7a8f0 Author: David Golden <dagolden@cpan.org> Date: Thu May 23 18:08:24 2013 -0400 help t/podcheck.t skip duplicate pod in utils M t/porting/podcheck.t commit b5902b6c26c970cce129029794643abe71c742de Author: David Golden <dagolden@cpan.org> Date: Thu May 23 18:07:58 2013 -0400 stop t/podcheck.t from flagging blockquotes M t/porting/podcheck.t commit f26da014a698383ac348973050af3e754752e6ab Author: David Golden <dagolden@cpan.org> Date: Thu May 23 16:33:09 2013 -0400 Make t/podcheck.t less sensitive The max line length is increased to 100. This eliminates dozens of known issues. The warnings about using F<> and L<> instead of C<> have been removed on the rationale that they are too opinionated. They flag stylistic issues rather than syntactic or structural issues and have minimal impact on the effectiveness of the resulting documentation. M t/porting/known_pod_issues.dat M t/porting/podcheck.t ----------------------------------------------------------------------- Summary of changes: Porting/how_to_write_a_perldelta.pod | 6 +- Porting/release_schedule.pod | 4 + Porting/todo.pod | 3 +- README.ce | 6 +- README.cygwin | 3 +- README.netware | 8 +- README.os2 | 14 ++- README.tru64 | 6 +- configpm | 2 +- dist/ExtUtils-ParseXS/lib/perlxstut.pod | 3 +- dist/Filter-Simple/lib/Filter/Simple.pm | 3 +- dist/Math-BigInt/lib/Math/BigInt/CalcEmu.pm | 12 ++- dist/Math-BigRat/lib/Math/BigRat.pm | 4 +- dist/Safe/Safe.pm | 6 +- ext/POSIX/lib/POSIX.pod | 31 ++++- lib/diagnostics.t | 2 +- lib/unicore/mktables | 28 ++++- op.c | 4 +- pod/perldiag.pod | 14 +-- pod/perlfunc.pod | 3 +- pod/perlgit.pod | 3 +- pod/perlrun.pod | 12 +- pod/perlunifaq.pod | 6 +- t/porting/known_pod_issues.dat | 173 +++------------------------ t/porting/podcheck.t | 97 +-------------- x2p/a2p.pod | 4 - 26 files changed, 136 insertions(+), 321 deletions(-) diff --git a/Porting/how_to_write_a_perldelta.pod b/Porting/how_to_write_a_perldelta.pod index 5c2d88c..c9b5ea6 100644 --- a/Porting/how_to_write_a_perldelta.pod +++ b/Porting/how_to_write_a_perldelta.pod @@ -1,4 +1,8 @@ -=head1 How to write a perldelta +=head1 NAME + +how_to_write_a_perldelta - How to write a perldelta + +=head2 Description This is intended as a guide for how to write a perldelta. There has never been a formal specification - the working rule is "fake up a document that diff --git a/Porting/release_schedule.pod b/Porting/release_schedule.pod index 9249f18..80704d9 100644 --- a/Porting/release_schedule.pod +++ b/Porting/release_schedule.pod @@ -1,5 +1,9 @@ =encoding utf8 +=head1 NAME + +release_schedule - Perl 5 release schedule + =head1 STABLE RELEASE SCHEDULE This schedule lists the projected or historical development and diff --git a/Porting/todo.pod b/Porting/todo.pod index 0aba9f2..ffd0035 100644 --- a/Porting/todo.pod +++ b/Porting/todo.pod @@ -548,7 +548,8 @@ Maybe create a utility that checks after each libperl.a creation that none of the above (nor sprintf(), vsprintf(), or *SHUDDER* gets()) ever creep back to libperl.a. - nm libperl.a | ./miniperl -alne '$o = $F[0] if /:$/; print "$o $F[1]" if $F[0] eq "U" && $F[1] =~ /^(?:strn?c(?:at|py)|v?sprintf|gets)$/' + nm libperl.a | ./miniperl -alne '$o = $F[0] if /:$/; + print "$o $F[1]" if $F[0] eq "U" && $F[1] =~ /^(?:strn?c(?:at|py)|v?sprintf|gets)$/' Note, of course, that this will only tell whether B<your> platform is using those naughty interfaces. diff --git a/README.ce b/README.ce index 7481bad..6b44731 100644 --- a/README.ce +++ b/README.ce @@ -120,8 +120,10 @@ has proper "MACHINE" parameter set, to, say, C<wince-mips-pocket-wce300>. compile.bat compile.bat dist - compile.bat CROSS_NAME=mips-wce300-thr "USE_ITHREADS=define" "USE_IMP_SYS=define" "USE_MULTI=define" - compile.bat CROSS_NAME=mips-wce300-thr "USE_ITHREADS=define" "USE_IMP_SYS=define" "USE_MULTI=define" dist + compile.bat CROSS_NAME=mips-wce300-thr "USE_ITHREADS=define" ^ + "USE_IMP_SYS=define" "USE_MULTI=define" + compile.bat CROSS_NAME=mips-wce300-thr "USE_ITHREADS=define" ^ + "USE_IMP_SYS=define" "USE_MULTI=define" dist If all goes okay and no errors during a build, you'll get two independent distributions: C<wince-mips-pocket-wce300> and C<mips-wce300-thr>. diff --git a/README.cygwin b/README.cygwin index 0ad627f..8414a97 100644 --- a/README.cygwin +++ b/README.cygwin @@ -409,7 +409,8 @@ looks like like the following: or: - 183 [main] perl 3588 C:\cygwin\bin\perl.exe: *** fatal error - unable to remap C:\cygwin\bin\cygsvn_subr-1-0.dll to same address as parent(0x6FB30000) != 0x6FE60000 + 183 [main] perl 3588 C:\cygwin\bin\perl.exe: *** fatal error - unable to remap + C:\cygwin\bin\cygsvn_subr-1-0.dll to same address as parent(0x6FB30000) != 0x6FE60000 46 [main] perl 3488 fork: child 3588 - died waiting for dll loading, errno11 See L<http://cygwin.com/faq/faq-nochunks.html#faq.using.fixing-fork-failures> diff --git a/README.netware b/README.netware index 6720a58..d8c0416 100644 --- a/README.netware +++ b/README.netware @@ -174,13 +174,13 @@ typing I<nmake install>, will copy the files onto the NetWare server. Example: You can execute the following on the command prompt. - perl -Ic:/perl/5.6.1/lib/NetWare-x86-multi-thread -Ic:\perl\5.6.1\lib MakeFile.pl - INSTALLSITELIB=i:\perl\lib + perl -Ic:/perl/5.6.1/lib/NetWare-x86-multi-thread -Ic:\perl\5.6.1\lib MakeFile.pl + INSTALLSITELIB=i:\perl\lib or - perl -Ic:/perl/5.8.0/lib/NetWare-x86-multi-thread -Ic:\perl\5.8.0\lib MakeFile.pl - INSTALLSITELIB=i:\perl\lib + perl -Ic:/perl/5.8.0/lib/NetWare-x86-multi-thread -Ic:\perl\5.8.0\lib MakeFile.pl + INSTALLSITELIB=i:\perl\lib =item * diff --git a/README.os2 b/README.os2 index d5a86df..90938eb 100644 --- a/README.os2 +++ b/README.os2 @@ -404,11 +404,12 @@ there is an executable file F<blah.exe> I<anywhere> on C<PATH>. In other words, C<PATH> is essentially searched twice: once by the OS for an executable, then by Perl for scripts. -Note also that executable files on OS/2 can have an arbitrary extension, -but F<.exe> will be automatically appended if no dot is present in the name. -The workaround is as simple as that: since F<blah.> and F<blah> denote the -same file (at list on FAT and HPFS file systems), to start an executable residing in file F<n:/bin/blah> (no -extension) give an argument C<n:/bin/blah.> (dot appended) to system(). +Note also that executable files on OS/2 can have an arbitrary extension, but +F<.exe> will be automatically appended if no dot is present in the name. The +workaround is as simple as that: since F<blah.> and F<blah> denote the same +file (at list on FAT and HPFS file systems), to start an executable residing in +file F<n:/bin/blah> (no extension) give an argument C<n:/bin/blah.> (dot +appended) to system(). Perl will start PM programs from VIO (=text-mode) Perl process in a separate PM session; @@ -1409,7 +1410,8 @@ For best results compile the C file below with the same options as the Perl DLL. However, a lot of functionality will work even if the executable is not an EMX applications, e.g., if compiled with - gcc -Wall -DDOSISH -DOS2=1 -O2 -s -Zomf -Zsys perl-starter.c -DPERL_DLL_BASENAME=\"perl312F\" -Zstack 8192 -Zlinker /PM:VIO + gcc -Wall -DDOSISH -DOS2=1 -O2 -s -Zomf -Zsys perl-starter.c \ + -DPERL_DLL_BASENAME=\"perl312F\" -Zstack 8192 -Zlinker /PM:VIO Here is the sample C file: diff --git a/README.tru64 b/README.tru64 index 81ef9fe..8f7e9b9 100644 --- a/README.tru64 +++ b/README.tru64 @@ -120,13 +120,15 @@ since pointers are automatically 64-bit wide. When compiling Perl in Tru64 you may (depending on the compiler release) see two warnings like this - cc: Warning: numeric.c, line 104: In this statement, floating-point overflow occurs in evaluating the expression "1.8e308". (floatoverfl) + cc: Warning: numeric.c, line 104: In this statement, floating-point + overflow occurs in evaluating the expression "1.8e308". (floatoverfl) return HUGE_VAL; -----------^ and when compiling the POSIX extension - cc: Warning: const-c.inc, line 2007: In this statement, floating-point overflow occurs in evaluating the expression "1.8e308". (floatoverfl) + cc: Warning: const-c.inc, line 2007: In this statement, floating-point + overflow occurs in evaluating the expression "1.8e308". (floatoverfl) return HUGE_VAL; -------------------^ diff --git a/configpm b/configpm index cfcc467..efba74d 100755 --- a/configpm +++ b/configpm @@ -1019,7 +1019,7 @@ EOF s{([\'\"])([^\'\"\s]+)\1}(C<$2>)g; # "date" command s{\'([A-Za-z_\- *=/]+)\'}(C<$1>)g; # 'ln -s' s{ - (?<! [\w./<\'\"] ) # Only standalone file names + (?<! [\w./<\'\"\$] ) # Only standalone file names (?! e \. g \. ) # Not e.g. (?! \. \. \. ) # Not ... (?! \d ) # Not 5.004 diff --git a/dist/ExtUtils-ParseXS/lib/perlxstut.pod b/dist/ExtUtils-ParseXS/lib/perlxstut.pod index d36f425..189b6e9 100644 --- a/dist/ExtUtils-ParseXS/lib/perlxstut.pod +++ b/dist/ExtUtils-ParseXS/lib/perlxstut.pod @@ -265,7 +265,8 @@ We will be calling the test script through the command "C<make test>". You should see output that looks something like this: %make test - PERL_DL_NONLAZY=1 /usr/bin/perl "-MExtUtils::Command::MM" "-e" "test_harness(0, 'blib/lib', 'blib/arch')" t/*.t + PERL_DL_NONLAZY=1 /usr/bin/perl "-MExtUtils::Command::MM" "-e" + "test_harness(0, 'blib/lib', 'blib/arch')" t/*.t t/Mytest....ok All tests successful. Files=1, Tests=4, 0 wallclock secs ( 0.03 cusr + 0.00 csys = 0.03 CPU) diff --git a/dist/Filter-Simple/lib/Filter/Simple.pm b/dist/Filter-Simple/lib/Filter/Simple.pm index 5de131f..d1da0b2 100644 --- a/dist/Filter-Simple/lib/Filter/Simple.pm +++ b/dist/Filter-Simple/lib/Filter/Simple.pm @@ -4,7 +4,7 @@ use Text::Balanced ':ALL'; use vars qw{ $VERSION @EXPORT }; -$VERSION = '0.89'; +$VERSION = '0.90'; use Filter::Util::Call; use Carp; @@ -243,7 +243,6 @@ __END__ Filter::Simple - Simplified source filtering - =head1 SYNOPSIS # in MyFilter.pm: diff --git a/dist/Math-BigInt/lib/Math/BigInt/CalcEmu.pm b/dist/Math-BigInt/lib/Math/BigInt/CalcEmu.pm index c82e153..6295d86 100644 --- a/dist/Math-BigInt/lib/Math/BigInt/CalcEmu.pm +++ b/dist/Math-BigInt/lib/Math/BigInt/CalcEmu.pm @@ -5,7 +5,7 @@ use strict; # use warnings; # dont use warnings for older Perls use vars qw/$VERSION/; -$VERSION = '1.998'; +$VERSION = '1.999'; package Math::BigInt; @@ -305,11 +305,15 @@ using a call to the native lib. =head1 METHODS -=head2 __emu_bxor +=over -=head2 __emu_band +=item __emu_bxor -=head2 __emu_bior +=item __emu_band + +=item __emu_bior + +=back =head1 LICENSE diff --git a/dist/Math-BigRat/lib/Math/BigRat.pm b/dist/Math-BigRat/lib/Math/BigRat.pm index a70a429..757a03b 100644 --- a/dist/Math-BigRat/lib/Math/BigRat.pm +++ b/dist/Math-BigRat/lib/Math/BigRat.pm @@ -24,7 +24,7 @@ use vars qw($VERSION @ISA $upgrade $downgrade @ISA = qw(Math::BigFloat); -$VERSION = '0.2604'; +$VERSION = '0.2605'; $VERSION = eval $VERSION; # inherit overload from Math::BigFloat, but disable the bitwise ops that don't @@ -1925,7 +1925,7 @@ Euler's number. This method was added in v0.20 of Math::BigRat (May 2007). -See also L</blog()>. +See also C<blog()>. =head2 bnok() diff --git a/dist/Safe/Safe.pm b/dist/Safe/Safe.pm index f00853e..bee3718 100644 --- a/dist/Safe/Safe.pm +++ b/dist/Safe/Safe.pm @@ -3,7 +3,7 @@ package Safe; use 5.003_11; use Scalar::Util qw(reftype refaddr); -$Safe::VERSION = "2.35"; +$Safe::VERSION = "2.36"; # *** Don't declare any lexicals above this point *** # @@ -590,9 +590,7 @@ Deny I<only> the listed operators from being used when compiling code in the compartment (I<all> other operators will be permitted, so you probably don't want to use this method). -=head2 trap (OP, ...) - -=head2 untrap (OP, ...) +=head2 trap (OP, ...), untrap (OP, ...) The trap and untrap methods are synonyms for deny and permit respectfully. diff --git a/ext/POSIX/lib/POSIX.pod b/ext/POSIX/lib/POSIX.pod index 7141b87..51862ca 100644 --- a/ext/POSIX/lib/POSIX.pod +++ b/ext/POSIX/lib/POSIX.pod @@ -1998,7 +1998,8 @@ OPOST =item Constants -_PC_CHOWN_RESTRICTED _PC_LINK_MAX _PC_MAX_CANON _PC_MAX_INPUT _PC_NAME_MAX _PC_NO_TRUNC _PC_PATH_MAX _PC_PIPE_BUF _PC_VDISABLE +_PC_CHOWN_RESTRICTED _PC_LINK_MAX _PC_MAX_CANON _PC_MAX_INPUT _PC_NAME_MAX +_PC_NO_TRUNC _PC_PATH_MAX _PC_PIPE_BUF _PC_VDISABLE =back @@ -2008,7 +2009,11 @@ _PC_CHOWN_RESTRICTED _PC_LINK_MAX _PC_MAX_CANON _PC_MAX_INPUT _PC_NAME_MAX _PC_N =item Constants -_POSIX_ARG_MAX _POSIX_CHILD_MAX _POSIX_CHOWN_RESTRICTED _POSIX_JOB_CONTROL _POSIX_LINK_MAX _POSIX_MAX_CANON _POSIX_MAX_INPUT _POSIX_NAME_MAX _POSIX_NGROUPS_MAX _POSIX_NO_TRUNC _POSIX_OPEN_MAX _POSIX_ ... [125 chars truncated] +_POSIX_ARG_MAX _POSIX_CHILD_MAX _POSIX_CHOWN_RESTRICTED _POSIX_JOB_CONTROL +_POSIX_LINK_MAX _POSIX_MAX_CANON _POSIX_MAX_INPUT _POSIX_NAME_MAX +_POSIX_NGROUPS_MAX _POSIX_NO_TRUNC _POSIX_OPEN_MAX _POSIX_PATH_MAX +_POSIX_PIPE_BUF _POSIX_SAVED_IDS _POSIX_SSIZE_MAX _POSIX_STREAM_MAX +_POSIX_TZNAME_MAX _POSIX_VDISABLE _POSIX_VERSION =back @@ -2018,7 +2023,9 @@ _POSIX_ARG_MAX _POSIX_CHILD_MAX _POSIX_CHOWN_RESTRICTED _POSIX_JOB_CONTROL _POSI =item Constants -_SC_ARG_MAX _SC_CHILD_MAX _SC_CLK_TCK _SC_JOB_CONTROL _SC_NGROUPS_MAX _SC_OPEN_MAX _SC_PAGESIZE _SC_SAVED_IDS _SC_STREAM_MAX _SC_TZNAME_MAX _SC_VERSION +_SC_ARG_MAX _SC_CHILD_MAX _SC_CLK_TCK _SC_JOB_CONTROL _SC_NGROUPS_MAX +_SC_OPEN_MAX _SC_PAGESIZE _SC_SAVED_IDS _SC_STREAM_MAX _SC_TZNAME_MAX +_SC_VERSION =back @@ -2047,7 +2054,9 @@ ETXTBSY EUSERS EWOULDBLOCK EXDEV =item Constants -FD_CLOEXEC F_DUPFD F_GETFD F_GETFL F_GETLK F_OK F_RDLCK F_SETFD F_SETFL F_SETLK F_SETLKW F_UNLCK F_WRLCK O_ACCMODE O_APPEND O_CREAT O_EXCL O_NOCTTY O_NONBLOCK O_RDONLY O_RDWR O_TRUNC O_WRONLY +FD_CLOEXEC F_DUPFD F_GETFD F_GETFL F_GETLK F_OK F_RDLCK F_SETFD F_SETFL F_SETLK +F_SETLKW F_UNLCK F_WRLCK O_ACCMODE O_APPEND O_CREAT O_EXCL O_NOCTTY O_NONBLOCK +O_RDONLY O_RDWR O_TRUNC O_WRONLY =back @@ -2057,7 +2066,11 @@ FD_CLOEXEC F_DUPFD F_GETFD F_GETFL F_GETLK F_OK F_RDLCK F_SETFD F_SETFL F_SETLK =item Constants -DBL_DIG DBL_EPSILON DBL_MANT_DIG DBL_MAX DBL_MAX_10_EXP DBL_MAX_EXP DBL_MIN DBL_MIN_10_EXP DBL_MIN_EXP FLT_DIG FLT_EPSILON FLT_MANT_DIG FLT_MAX FLT_MAX_10_EXP FLT_MAX_EXP FLT_MIN FLT_MIN_10_EXP FLT_M ... [139 chars truncated] +DBL_DIG DBL_EPSILON DBL_MANT_DIG DBL_MAX DBL_MAX_10_EXP DBL_MAX_EXP DBL_MIN +DBL_MIN_10_EXP DBL_MIN_EXP FLT_DIG FLT_EPSILON FLT_MANT_DIG FLT_MAX +FLT_MAX_10_EXP FLT_MAX_EXP FLT_MIN FLT_MIN_10_EXP FLT_MIN_EXP FLT_RADIX +FLT_ROUNDS LDBL_DIG LDBL_EPSILON LDBL_MANT_DIG LDBL_MAX LDBL_MAX_10_EXP +LDBL_MAX_EXP LDBL_MIN LDBL_MIN_10_EXP LDBL_MIN_EXP =back @@ -2067,7 +2080,10 @@ DBL_DIG DBL_EPSILON DBL_MANT_DIG DBL_MAX DBL_MAX_10_EXP DBL_MAX_EXP DBL_MIN DBL_ =item Constants -ARG_MAX CHAR_BIT CHAR_MAX CHAR_MIN CHILD_MAX INT_MAX INT_MIN LINK_MAX LONG_MAX LONG_MIN MAX_CANON MAX_INPUT MB_LEN_MAX NAME_MAX NGROUPS_MAX OPEN_MAX PATH_MAX PIPE_BUF SCHAR_MAX SCHAR_MIN SHRT_MAX SHR ... [76 chars truncated] +ARG_MAX CHAR_BIT CHAR_MAX CHAR_MIN CHILD_MAX INT_MAX INT_MIN LINK_MAX LONG_MAX +LONG_MIN MAX_CANON MAX_INPUT MB_LEN_MAX NAME_MAX NGROUPS_MAX OPEN_MAX PATH_MAX +PIPE_BUF SCHAR_MAX SCHAR_MIN SHRT_MAX SHRT_MIN SSIZE_MAX STREAM_MAX TZNAME_MAX +UCHAR_MAX UINT_MAX ULONG_MAX USHRT_MAX =back @@ -2111,7 +2127,8 @@ SIG_UNBLOCK =item Constants -S_IRGRP S_IROTH S_IRUSR S_IRWXG S_IRWXO S_IRWXU S_ISGID S_ISUID S_IWGRP S_IWOTH S_IWUSR S_IXGRP S_IXOTH S_IXUSR +S_IRGRP S_IROTH S_IRUSR S_IRWXG S_IRWXO S_IRWXU S_ISGID S_ISUID S_IWGRP S_IWOTH +S_IWUSR S_IXGRP S_IXOTH S_IXUSR =item Macros diff --git a/lib/diagnostics.t b/lib/diagnostics.t index 6eecdda..206d2a4 100644 --- a/lib/diagnostics.t +++ b/lib/diagnostics.t @@ -43,7 +43,7 @@ seek STDERR, 0,0; $warning = ''; warn 'Lexing code attempted to stuff non-Latin-1 character into Latin-1 input'; -like $warning, qr/using lex_stuff_pvn or similar/, 'L<foo|bar/baz>'; +like $warning, qr/lex_stuff_pvn or similar/, 'L<foo|bar/baz>'; # Multiple messages with the same description seek STDERR, 0,0; diff --git a/lib/unicore/mktables b/lib/unicore/mktables index 76d4c68..5bb67e9 100644 --- a/lib/unicore/mktables +++ b/lib/unicore/mktables @@ -15493,20 +15493,34 @@ B<Legend summary:> =over 4 -=item Z<>B<*> is a wild-card +=item * -=item B<(\\d+)> in the info column gives the number of code points matched by +B<*> is a wild-card + +=item * + +B<(\\d+)> in the info column gives the number of code points matched by this property. -=item B<$DEPRECATED> means this is deprecated. +=item * + +B<$DEPRECATED> means this is deprecated. + +=item * + +B<$OBSOLETE> means this is obsolete. + +=item * + +B<$STABILIZED> means this is stabilized. -=item B<$OBSOLETE> means this is obsolete. +=item * -=item B<$STABILIZED> means this is stabilized. +B<$STRICTER> means tighter (stricter) name matching applies. -=item B<$STRICTER> means tighter (stricter) name matching applies. +=item * -=item B<$DISCOURAGED> means use of this form is discouraged, and may not be +B<$DISCOURAGED> means use of this form is discouraged, and may not be stable. =back diff --git a/op.c b/op.c index 96a06b1..1501e14 100644 --- a/op.c +++ b/op.c @@ -4969,7 +4969,7 @@ Perl_newGVOP(pTHX_ I32 type, I32 flags, GV *gv) Constructs, checks, and returns an op of any type that involves an embedded C-level pointer (PV). I<type> is the opcode. I<flags> gives the eight bits of C<op_flags>. I<pv> supplies the C-level pointer, which -must have been allocated using L</PerlMemShared_malloc>; the memory will +must have been allocated using C<PerlMemShared_malloc>; the memory will be freed when the op is destroyed. =cut @@ -5664,7 +5664,7 @@ Perl_newASSIGNOP(pTHX_ I32 flags, OP *left, I32 optype, OP *right) Constructs a state op (COP). The state op is normally a C<nextstate> op, but will be a C<dbstate> op if debugging is enabled for currently-compiled -code. The state op is populated from L</PL_curcop> (or L</PL_compiling>). +code. The state op is populated from C<PL_curcop> (or C<PL_compiling>). If I<label> is non-null, it supplies the name of a label to attach to the state op; this function takes ownership of the memory pointed at by I<label>, and will free it. I<flags> gives the eight bits of C<op_flags> diff --git a/pod/perldiag.pod b/pod/perldiag.pod index 13ffbee..229ce0d 100644 --- a/pod/perldiag.pod +++ b/pod/perldiag.pod @@ -2707,10 +2707,10 @@ The number of items in a hash can be obtained by doing: =item Lexing code attempted to stuff non-Latin-1 character into Latin-1 input -(F) An extension is attempting to insert text into the current parse -(using L<lex_stuff_pvn|perlapi/lex_stuff_pvn> or similar), but tried to insert a character that -couldn't be part of the current input. This is an inherent pitfall -of the stuffing mechanism, and one of the reasons to avoid it. Where +(F) An extension is attempting to insert text into the current parse (using +L<lex_stuff_pvn|perlapi/lex_stuff_pvn> or similar), but tried to insert a +character that couldn't be part of the current input. This is an inherent +pitfall of the stuffing mechanism, and one of the reasons to avoid it. Where it is necessary to stuff, stuffing only plain ASCII is recommended. =item Lexing code internal error (%s) @@ -4662,11 +4662,7 @@ L<perlre>. (F) The end of the perl code contained within the {...} must be followed immediately by a ')'. -=item Z<>500 Server error - -See Server error. - -=item Server error +=item Server error (a.k.a. "500 Server error") (A) This is the error message generally seen in a browser window when trying to run a CGI program (including SSI) over the web. The diff --git a/pod/perlfunc.pod b/pod/perlfunc.pod index 9540a01..5c6b4f8 100644 --- a/pod/perlfunc.pod +++ b/pod/perlfunc.pod @@ -2471,8 +2471,7 @@ is left as an exercise to the reader. The C<POSIX::getattr> function can do this more portably on systems purporting POSIX compliance. See also the C<Term::ReadKey> -module from your nearest CPAN site; details on CPAN can be found under -L<perlmodlib/CPAN>. +module from your nearest L<CPAN|http://www.cpan.org> site. =item getlogin X<getlogin> X<login> diff --git a/pod/perlgit.pod b/pod/perlgit.pod index 65dde7c..100a547 100644 --- a/pod/perlgit.pod +++ b/pod/perlgit.pod @@ -889,7 +889,8 @@ Finally, you should then delete the remote smoke-me branch: (which is likely to produce a warning like this, which can be ignored: - remote: fatal: ambiguous argument 'refs/heads/smoke-me/tonyc/win32stat': unknown revision or path not in the working tree. + remote: fatal: ambiguous argument 'refs/heads/smoke-me/tonyc/win32stat': + unknown revision or path not in the working tree. remote: Use '--' to separate paths from revisions ) and then delete your local branch: diff --git a/pod/perlrun.pod b/pod/perlrun.pod index ae2efe1..05dea4e 100644 --- a/pod/perlrun.pod +++ b/pod/perlrun.pod @@ -592,8 +592,9 @@ If, for a given file, Perl is unable to create the backup file as specified in the extension then it will skip that file and continue on with the next one (if it exists). -For a discussion of issues surrounding file permissions and B<-i>, -see L<perlfaq5/Why does Perl let me delete read-only files? Why does -i clobber protected files? Isn't this a bug in Perl?>. +For a discussion of issues surrounding file permissions and B<-i>, see +L<perlfaq5/Why does Perl let me delete read-only files? Why does -i clobber +protected files? Isn't this a bug in Perl?>. You cannot use B<-i> to create directories or to strip extensions from files. @@ -738,9 +739,10 @@ if it is invoked with B<-xyz=abc>. #!/usr/bin/perl -s if ($xyz) { print "$xyz\n" } -Do note that a switch like B<--help> creates the variable C<${-help}>, which is not compliant -with C<use strict "refs">. Also, when using this option on a script with -warnings enabled you may get a lot of spurious "used only once" warnings. +Do note that a switch like B<--help> creates the variable C<${-help}>, which is +not compliant with C<use strict "refs">. Also, when using this option on a +script with warnings enabled you may get a lot of spurious "used only once" +warnings. =item B<-S> X<-S> diff --git a/pod/perlunifaq.pod b/pod/perlunifaq.pod index f952d1a..9399768 100644 --- a/pod/perlunifaq.pod +++ b/pod/perlunifaq.pod @@ -136,8 +136,6 @@ concern, and you can just C<eval> dumped data as always. =head2 Why do regex character classes sometimes match only in the ASCII range? -=head2 Why do some characters not uppercase or lowercase correctly? - Starting in Perl 5.14 (and partially in Perl 5.12), just put a C<use feature 'unicode_strings'> near the beginning of your program. Within its lexical scope you shouldn't have this problem. It also is @@ -164,6 +162,10 @@ already been upgraded. For a more detailed discussion, see L<Unicode::Semantics> on CPAN. +=head2 Why do some characters not uppercase or lowercase correctly? + +See the answer to the previous question. + =head2 How can I determine if a string is a text string or a binary string? You can't. Some use the UTF8 flag for this, but that's misuse, and makes well diff --git a/t/porting/known_pod_issues.dat b/t/porting/known_pod_issues.dat index b175a81..61157fc 100644 --- a/t/porting/known_pod_issues.dat +++ b/t/porting/known_pod_issues.dat @@ -121,8 +121,6 @@ PerlIO::via::Base64 PerlIO::via::StripHTML perllexwarn(1) perlthanks -pod/perldiag.pod Verbatim line length including indents exceeds 79 by 1 -pod/perlrun.pod Verbatim line length including indents exceeds 79 by 3 POD2::FR POD2::IT pod2ipf(1) @@ -186,159 +184,18 @@ Win32::Locale YAML YAML::Syck YAML::Tiny -dist/cwd/lib/file/spec/vms.pm Verbatim line length including indents exceeds 79 by 1 -dist/cwd/lib/file/spec/win32.pm Verbatim line length including indents exceeds 79 by 1 -dist/data-dumper/dumper.pm ? Should you be using L<...> instead of 1 -dist/extutils-parsexs/lib/perlxs.pod Verbatim line length including indents exceeds 79 by 1 -dist/extutils-parsexs/lib/perlxstut.pod Verbatim line length including indents exceeds 79 by 10 -dist/filter-simple/lib/filter/simple.pm Verbatim paragraph in NAME section 1 -dist/locale-maketext/lib/locale/maketext/tpj13.pod No items in =over / =back list 3 -dist/math-bigint/lib/math/bigint.pm Verbatim line length including indents exceeds 79 by 77 -dist/math-bigint/lib/math/bigint/calcemu.pm empty section in previous paragraph 3 -dist/math-bigrat/lib/math/bigrat.pm Verbatim line length including indents exceeds 79 by 7 -dist/math-bigrat/lib/math/bigrat.pm unresolved internal link 1 -dist/module-corelist/blib/script/corelist Verbatim line length including indents exceeds 79 by 1 -dist/module-corelist/lib/module/corelist.pod Verbatim line length including indents exceeds 79 by 4 -dist/net-ping/lib/net/ping.pm Verbatim line length including indents exceeds 79 by 2 -dist/safe/safe.pm Verbatim line length including indents exceeds 79 by 1 -dist/safe/safe.pm empty section in previous paragraph 1 -dist/selfloader/lib/selfloader.pm Verbatim line length including indents exceeds 79 by 13 -dist/storable/storable.pm Verbatim line length including indents exceeds 79 by 4 -dist/thread-queue/lib/thread/queue.pm Verbatim line length including indents exceeds 79 by 4 -dist/threads/lib/threads.pm Verbatim line length including indents exceeds 79 by 3 -dist/tie-file/lib/tie/file.pm Verbatim line length including indents exceeds 79 by 3 -ext/b/b/concise.pm Verbatim line length including indents exceeds 79 by 1 -ext/devel-peek/peek.pm ? Should you be using L<...> instead of 2 -ext/devel-peek/peek.pm Verbatim line length including indents exceeds 79 by 2 -ext/dynaloader/dynaloader.pm Verbatim line length including indents exceeds 79 by 1 -ext/file-glob/glob.pm Verbatim line length including indents exceeds 79 by 15 -ext/hash-util-fieldhash/lib/hash/util/fieldhash.pm Verbatim line length including indents exceeds 79 by 2 -ext/i18n-langinfo/langinfo.pm Verbatim line length including indents exceeds 79 by 1 -ext/pod-html/bin/pod2html Pod NAME already used 1 -ext/pod-html/testdir/perlpodspec-copy.pod Verbatim line length including indents exceeds 79 by 8 -ext/pod-html/testdir/perlvar-copy.pod ? Should you be using L<...> instead of 3 -ext/pod-html/testdir/perlvar-copy.pod Verbatim line length including indents exceeds 79 by 6 -ext/posix/lib/posix.pod Verbatim line length including indents exceeds 79 by 13 -ext/vms-dclsym/dclsym.pm ? Should you be using L<...> instead of 1 -ext/vms-dclsym/dclsym.pm Verbatim line length including indents exceeds 79 by 1 -ext/vms-stdio/stdio.pm Verbatim line length including indents exceeds 79 by 1 -ext/xs-apitest/apitest.pm Verbatim line length including indents exceeds 79 by 1 -install ? Should you be using F<...> or maybe L<...> instead of 1 -installhtml Verbatim line length including indents exceeds 79 by 3 -os2/os2/os2-extattr/extattr.pm ? Should you be using F<...> or maybe L<...> instead of 1 -os2/os2/os2-process/process.pm Verbatim line length including indents exceeds 79 by 27 -os2/os2/os2-rexx/dll/dll.pm Verbatim line length including indents exceeds 79 by 2 -os2/os2/os2-rexx/rexx.pm Verbatim line length including indents exceeds 79 by 1 -pod/perl.pod Verbatim line length including indents exceeds 79 by 8 -pod/perlaix.pod Verbatim line length including indents exceeds 79 by 11 -pod/perlapi.pod ? Should you be using L<...> instead of 76 -pod/perlapi.pod Verbatim line length including indents exceeds 79 by 6 -pod/perlapi.pod unresolved internal link 3 -pod/perlapio.pod Verbatim line length including indents exceeds 79 by 5 -pod/perlbook.pod Verbatim line length including indents exceeds 79 by 1 -pod/perlcall.pod Verbatim line length including indents exceeds 79 by 2 -pod/perlce.pod Verbatim line length including indents exceeds 79 by 2 -pod/perlcygwin.pod Verbatim line length including indents exceeds 79 by 24 -pod/perldbmfilter.pod Verbatim line length including indents exceeds 79 by 1 -pod/perldebguts.pod Verbatim line length including indents exceeds 79 by 34 -pod/perldebtut.pod Verbatim line length including indents exceeds 79 by 22 -pod/perldebug.pod Verbatim line length including indents exceeds 79 by 3 -pod/perldiag.pod =item type mismatch 1 -pod/perldiag.pod Verbatim line length including indents exceeds 79 by 1 -pod/perldsc.pod Verbatim line length including indents exceeds 79 by 4 -pod/perldtrace.pod Verbatim line length including indents exceeds 79 by 26 -pod/perlebcdic.pod Verbatim line length including indents exceeds 79 by 13 -pod/perlembed.pod Verbatim line length including indents exceeds 79 by 27 -pod/perlfunc.pod There is more than one target 1 -pod/perlgit.pod Verbatim line length including indents exceeds 79 by 12 -pod/perlgpl.pod Verbatim line length including indents exceeds 79 by 50 -pod/perlguts.pod ? Should you be using F<...> or maybe L<...> instead of 2 -pod/perlguts.pod ? Should you be using L<...> instead of 1 -pod/perlhack.pod ? Should you be using L<...> instead of 1 -pod/perlhack.pod Verbatim line length including indents exceeds 79 by 1 -pod/perlhist.pod Verbatim line length including indents exceeds 79 by 2 -pod/perlhpux.pod Verbatim line length including indents exceeds 79 by 5 -pod/perlhurd.pod Verbatim line length including indents exceeds 79 by 2 -pod/perlintern.pod ? Should you be using L<...> instead of 5 -pod/perlinterp.pod ? Should you be using L<...> instead of 1 -pod/perliol.pod Verbatim line length including indents exceeds 79 by 8 -pod/perlipc.pod Verbatim line length including indents exceeds 79 by 19 -pod/perlirix.pod Verbatim line length including indents exceeds 79 by 4 -pod/perllol.pod Verbatim line length including indents exceeds 79 by 4 -pod/perlmacosx.pod Verbatim line length including indents exceeds 79 by 4 -pod/perlmod.pod Verbatim line length including indents exceeds 79 by 2 -pod/perlmodlib.pod Verbatim line length including indents exceeds 79 by 3 -pod/perlmodstyle.pod Verbatim line length including indents exceeds 79 by 2 -pod/perlmroapi.pod ? Should you be using L<...> instead of 1 -pod/perlnetware.pod Verbatim line length including indents exceeds 79 by 4 -pod/perlnewmod.pod Verbatim line length including indents exceeds 79 by 1 -pod/perlootut.pod ? Should you be using F<...> or maybe L<...> instead of 1 -pod/perlos2.pod ? Should you be using L<...> instead of 2 -pod/perlos2.pod Verbatim line length including indents exceeds 79 by 22 -pod/perlos390.pod Verbatim line length including indents exceeds 79 by 11 -pod/perlpacktut.pod Verbatim line length including indents exceeds 79 by 6 -pod/perlperf.pod Verbatim line length including indents exceeds 79 by 154 -pod/perlpodspec.pod Verbatim line length including indents exceeds 79 by 9 -pod/perlpodstyle.pod Verbatim line length including indents exceeds 79 by 1 -pod/perlref.pod Verbatim line length including indents exceeds 79 by 1 -pod/perlrequick.pod Verbatim line length including indents exceeds 79 by 3 -pod/perlretut.pod Verbatim line length including indents exceeds 79 by 13 -pod/perlrun.pod Verbatim line length including indents exceeds 79 by 3 -pod/perlsolaris.pod Verbatim line length including indents exceeds 79 by 14 -pod/perlsource.pod ? Should you be using F<...> or maybe L<...> instead of 1 -pod/perlsub.pod ? Should you be using F<...> or maybe L<...> instead of 3 -pod/perlsub.pod Verbatim line length including indents exceeds 79 by 4 -pod/perlsymbian.pod Verbatim line length including indents exceeds 79 by 20 -pod/perlthrtut.pod Verbatim line length including indents exceeds 79 by 5 -pod/perltie.pod Verbatim line length including indents exceeds 79 by 13 -pod/perltrap.pod ? Should you be using F<...> or maybe L<...> instead of 1 -pod/perltru64.pod ? Should you be using F<...> or maybe L<...> instead of 1 -pod/perltru64.pod Verbatim line length including indents exceeds 79 by 4 -pod/perlunifaq.pod empty section in previous paragraph 1 -pod/perluniprops.pod =item type mismatch 6 -pod/perlvms.pod ? Should you be using F<...> or maybe L<...> instead of 1 -pod/perlvms.pod Verbatim line length including indents exceeds 79 by 2 -pod/perlwin32.pod Verbatim line length including indents exceeds 79 by 12 -porting/epigraphs.pod Verbatim line length including indents exceeds 79 by 3 -porting/expand-macro.pl Verbatim line length including indents exceeds 79 by 2 -porting/how_to_write_a_perldelta.pod There is no NAME 1 -porting/how_to_write_a_perldelta.pod Verbatim line length including indents exceeds 79 by 3 -porting/pumpkin.pod Verbatim line length including indents exceeds 79 by 9 -porting/release_managers_guide.pod Verbatim line length including indents exceeds 79 by 7 -porting/release_schedule.pod There is no NAME 1 -porting/todo.pod Verbatim line length including indents exceeds 79 by 7 -symbian/perlutil.pod Verbatim line length including indents exceeds 79 by 4 -utils/c2ph Verbatim line length including indents exceeds 79 by 44 -utils/pod2html Pod NAME already used 1 -vms/ext/filespec.pm Verbatim line length including indents exceeds 79 by 1 -x2p/a2p.pod empty section in previous paragraph 2 -lib/benchmark.pm Verbatim line length including indents exceeds 79 by 4 -lib/class/struct.pm Verbatim line length including indents exceeds 79 by 7 -lib/config.pod ? Should you be using L<...> instead of -1 -lib/config.pod nested commands F<...F<...>...> 3 -lib/db.pm Verbatim line length including indents exceeds 79 by 2 -lib/dbm_filter.pm Verbatim line length including indents exceeds 79 by 1 -lib/dbm_filter/compress.pm Verbatim line length including indents exceeds 79 by 1 -lib/dbm_filter/encode.pm Verbatim line length including indents exceeds 79 by 1 -lib/dbm_filter/int32.pm Verbatim line length including indents exceeds 79 by 1 -lib/dbm_filter/null.pm Verbatim line length including indents exceeds 79 by 1 -lib/dbm_filter/utf8.pm Verbatim line length including indents exceeds 79 by 1 -lib/deprecate.pm Verbatim line length including indents exceeds 79 by 2 -lib/english.pm Verbatim line length including indents exceeds 79 by 1 -lib/extutils/embed.pm Verbatim line length including indents exceeds 79 by 2 -lib/extutils/xssymset.pm Verbatim line length including indents exceeds 79 by 1 -lib/file/basename.pm Verbatim line length including indents exceeds 79 by 2 -lib/file/find.pm Verbatim line length including indents exceeds 79 by 1 -lib/getopt/std.pm Verbatim line length including indents exceeds 79 by 1 -lib/integer.pm Verbatim line length including indents exceeds 79 by 1 -lib/perl5db.pl ? Should you be using L<...> instead of 1 -lib/perl5db.pl Verbatim line length including indents exceeds 79 by 1 -lib/perlio.pm Verbatim line length including indents exceeds 79 by 2 -lib/pod/text/overstrike.pm Verbatim line length including indents exceeds 79 by 1 -lib/strict.pm Verbatim line length including indents exceeds 79 by 1 -lib/tie/array.pm Verbatim line length including indents exceeds 79 by 1 -lib/tie/hash.pm Verbatim line length including indents exceeds 79 by 3 -lib/tie/scalar.pm Verbatim line length including indents exceeds 79 by 1 -lib/version.pod Verbatim line length including indents exceeds 79 by 1 -lib/version/internals.pod Verbatim line length including indents exceeds 79 by 2 -lib/vmsish.pm Verbatim line length including indents exceeds 79 by 1 +dist/net-ping/lib/net/ping.pm Verbatim line length including indents exceeds 100 by 1 +ext/posix/lib/posix.pod Verbatim line length including indents exceeds 100 by 2 +pod/perlbook.pod Verbatim line length including indents exceeds 100 by 1 +pod/perldebguts.pod Verbatim line length including indents exceeds 100 by 2 +pod/perldtrace.pod Verbatim line length including indents exceeds 100 by 4 +pod/perlebcdic.pod Verbatim line length including indents exceeds 100 by 10 +pod/perlmacosx.pod Verbatim line length including indents exceeds 100 by 3 +pod/perlos2.pod Verbatim line length including indents exceeds 100 by 4 +pod/perlperf.pod Verbatim line length including indents exceeds 100 by 32 +pod/perlrun.pod Verbatim line length including indents exceeds 100 by 1 +pod/perlthrtut.pod Verbatim line length including indents exceeds 100 by 1 +pod/perltru64.pod Verbatim line length including indents exceeds 100 by 1 +pod/perlwin32.pod Verbatim line length including indents exceeds 100 by 6 +porting/release_managers_guide.pod Verbatim line length including indents exceeds 100 by 1 +lib/benchmark.pm Verbatim line length including indents exceeds 100 by 2 diff --git a/t/porting/podcheck.t b/t/porting/podcheck.t index 1d018f6..a22672b 100644 --- a/t/porting/podcheck.t +++ b/t/porting/podcheck.t @@ -329,7 +329,7 @@ my $known_issues = File::Spec->catfile($data_dir, 'known_pod_issues.dat'); my $MANIFEST = File::Spec->catfile(File::Spec->updir($original_dir), 'MANIFEST'); my $copy_fh; -my $MAX_LINE_LENGTH = 79; # 79 columns +my $MAX_LINE_LENGTH = 100; # 79 columns my $INDENT = 7; # default nroff indent # Our warning messages. Better not have [('"] in them, as those are used as @@ -337,8 +337,6 @@ my $INDENT = 7; # default nroff indent my $line_length = "Verbatim line length including indents exceeds $MAX_LINE_LENGTH by"; my $broken_link = "Apparent broken link"; my $broken_internal_link = "Apparent internal link is missing its forward slash"; -my $see_not_linked = "? Should you be using L<...> instead of"; -my $C_with_slash = "? Should you be using F<...> or maybe L<...> instead of"; my $multiple_targets = "There is more than one target"; my $duplicate_name = "Pod NAME already used"; my $need_encoding = "Should have =encoding statement because have non-ASCII"; @@ -440,6 +438,7 @@ my @suppressed_messages = ( "unescaped <>", "Entity number out of range", # Checker outputs this for anything above # 255, but in fact all Unicode is valid + "No items in =over", # ie a blockquote ); sub suppressed { @@ -811,95 +810,7 @@ package My::Pod::Checker { # Extend Pod::Checker } } } - $paragraph = join " ", split /^/, $paragraph; - - # Matches something that looks like a file name, but is enclosed in - # C<...> - my $C_path_re = qr{ \b ( C< - # exclude various things that have slashes - # in them but aren't paths - (?! - (?: (?: s | qr | m) / ) # regexes - | \d+/\d+> # probable fractions - | OS/2> - | Perl/Tk> - | origin/blead> - | origin/maint - | - # File names don't begin with "-" - ) - [-\w]+ (?: / [-\w]+ )+ (?: \. \w+ )? > ) - }x; - - # If looks like a reference to other documentation by containing the - # word 'See' and then a likely pod directive, warn. - while ($paragraph =~ m{ - ( (?: \w+ \s+ )* ) # The phrase before, if any - \b [Ss]ee \s+ - ( ( [^L] ) - < - ( [^<]*? ) # The not < excludes nested C<L<... - > - ) - ( \s+ (?: under | in ) \s+ L< )? - }xg) { - my $prefix = $1 // ""; - my $construct = $2; # The whole thing, like C<...> - my $type = $3; - my $interior = $4; - my $trailing = $5; # After the whole thing ending in "L<" - - # If the full phrase is something like, "you might see C<", or - # similar, it really isn't a reference to a link. The ones I saw - # all had the word "you" in them; and the "you" wasn't the - # beginning of a sentence. - if ($prefix !~ / \b you \b /x) { - - # Now, find what the module or man page name within the - # construct would be if it actually has L<> syntax. If it - # doesn't have that syntax, will set the module to the entire - # interior. - $interior =~ m/ ^ - (?: [^|]+ \| )? # Optional arbitrary text ending - # in "|" - ( .+? ) # module, etc. name - (?: \/ .+ )? # target within module - $ - /xs; - my $module = $1; - if (! defined $trailing # not referring to something in another - # section - && $interior !~ /$non_pods/ - - # C<> that look like files have their own message below, so - # exclude them - && $construct !~ /$C_path_re/g - - # There can't be spaces (I think) in module names or man - # pages - && $module !~ / \s /x - - # F<> that end in eg \.pl are almost certainly ok, as are - # those that look like a path with multiple "/" chars - && ($type ne "F" - || (! -e $interior - && $interior !~ /\.\w+$/ - && $interior !~ /\/.+\//) - ) - ) { - $self->poderror({ -line => $line, -file => $file, - -msg => $see_not_linked, - parameter => $construct - }); - } - } - } - while ($paragraph =~ m/$C_path_re/g) { - my $construct = $1; - $self->poderror({ -line => $line, -file => $file, - -msg => $C_with_slash, - parameter => $construct - }); - } + return; } @@ -1587,6 +1498,8 @@ foreach my $filename (@files) { && $prior_filename =~ /^cpan/) { $checker->set_skip("CPAN is upstream for $filename"); + } elsif ( $filename =~ /^utils/ or $prior_filename =~ /^utils/ ) { + $checker->set_skip("$filename copy is in utils/"); } else { # Here have two pods with identical names that differ $prior_checker->poderror( { -msg => $duplicate_name, diff --git a/x2p/a2p.pod b/x2p/a2p.pod index 9bab1f8..aeddf9a 100644 --- a/x2p/a2p.pod +++ b/x2p/a2p.pod @@ -159,16 +159,12 @@ A2p uses no environment variables. Larry Wall E<lt>F<larry@wall.org>E<gt> -=head1 FILES - =head1 SEE ALSO perl The perl compiler/interpreter s2p sed to perl translator -=head1 DIAGNOSTICS - =head1 BUGS It would be possible to emulate awk's behavior in selecting string -- Perl5 Master Repository http://www.nntp.perl.org/group/perl.perl5.changes/2013/05/msg37197.html Fri, 24 May 2013 00:14:42 +0000 [perl.git] branch blead, updated. v5.19.0-157-g67a05ee by James Keenan In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/67a05ee15ae3919df791f947984a7a505e2fbdcf?hp=c5fb089acddd55b3662bb6358ab8a2a3b3ba1e2e> - Log ----------------------------------------------------------------- commit 67a05ee15ae3919df791f947984a7a505e2fbdcf Author: David Steinbrunner <dsteinbrunner@pobox.com> Date: Tue May 21 06:53:18 2013 -0400 typo fixes for porting modules Bump $VERSION for Porting/Maintainers.pm. ----------------------------------------------------------------------- Summary of changes: Porting/GitUtils.pm | 2 +- Porting/Maintainers.pm | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Porting/GitUtils.pm b/Porting/GitUtils.pm index 9ee6ca5..f1b4354 100644 --- a/Porting/GitUtils.pm +++ b/Porting/GitUtils.pm @@ -45,7 +45,7 @@ sub gen_dot_patch { last if $branch ne 'undefined'; } for ($branch) { - $_ ||= "error"; # hmm, we didnt get /anything/ from name-rev? + $_ ||= "error"; # hmm, we did not get /anything/ from name-rev? s!^\Q$reftype\E/!! || # strip off the reftype s!^refs/heads/!! || # possible other places it was found s!^refs/remotes/!! || # ... diff --git a/Porting/Maintainers.pm b/Porting/Maintainers.pm index 896e7c8..6b28ea7 100644 --- a/Porting/Maintainers.pm +++ b/Porting/Maintainers.pm @@ -22,7 +22,7 @@ use vars qw(@ISA @EXPORT_OK $VERSION); show_results process_options files_to_modules finish_tap_output reload_manifest); -$VERSION = 0.09; +$VERSION = 0.10; require Exporter; @@ -64,7 +64,7 @@ sub get_module_pat { split ' ', $Modules{$m}{FILES}; } -# exand dir/ or foo* into a full list of files +# expand dir/ or foo* into a full list of files # sub expand_glob { sort { lc $a cmp lc $b } @@ -236,7 +236,7 @@ sub files_to_modules { if (@ToDo) { # Try prefix matching. - # Need to try longst prefixes first, else lib/CPAN may match + # Need to try longest prefixes first, else lib/CPAN may match # lib/CPANPLUS/... and similar my @OrderedModuleByPat -- Perl5 Master Repository http://www.nntp.perl.org/group/perl.perl5.changes/2013/05/msg37196.html Fri, 24 May 2013 00:07:26 +0000 [perl.git] branch blead, updated. v5.19.0-156-gc5fb089 by James Keenan In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/c5fb089acddd55b3662bb6358ab8a2a3b3ba1e2e?hp=aded5122391be239cff0d21bdfb48a1e18222483> - Log ----------------------------------------------------------------- commit c5fb089acddd55b3662bb6358ab8a2a3b3ba1e2e Author: David Steinbrunner <dsteinbrunner@pobox.com> Date: Tue May 21 06:52:43 2013 -0400 typo fixes for porting pod note optimiser Change to optimizer to be consistent with other uses of optimizer in todo. Clear up confusion in regex optimizer entry. ----------------------------------------------------------------------- Summary of changes: Porting/README.pod | 2 +- Porting/epigraphs.pod | 2 +- Porting/release_managers_guide.pod | 6 +++--- Porting/todo.pod | 13 +++++++------ 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Porting/README.pod b/Porting/README.pod index a714193..695e7ed 100644 --- a/Porting/README.pod +++ b/Porting/README.pod @@ -288,7 +288,7 @@ L<http://y2038.googlecode.com/>. =head2 F<release_announcement_template.txt> -Release announcment for minor releasements of the 5.17 development series. +Release announcement for minor releasements of the 5.19 development series. =head2 F<release_managers_guide.pod> diff --git a/Porting/epigraphs.pod b/Porting/epigraphs.pod index 9580a97..39589eb 100644 --- a/Porting/epigraphs.pod +++ b/Porting/epigraphs.pod @@ -1874,7 +1874,7 @@ L<Announced on 2004-04-05 by Nicholas Clark|http://groups.google.com/group/perl. Then Skimble will appear and he'll saunter to the rear: He's been busy in the luggage van! He gives one flash of his glass-green eyes - And the the signal goes 'All Clear!' + And the signal goes 'All Clear!' And we're off at last of the northern part Of the Northern Hemisphere! diff --git a/Porting/release_managers_guide.pod b/Porting/release_managers_guide.pod index 7f03b69..d4c6467 100644 --- a/Porting/release_managers_guide.pod +++ b/Porting/release_managers_guide.pod @@ -249,7 +249,7 @@ hash. Restore any files mentioned in the C<CUSTOMIZED> section, using C<git checkout>. Make any new customizations if necessary. Also, restore any files that are mentioned in C<@IGNORE>, but were checked -in in the repository anyway. +into the repository anyway. =item * @@ -363,7 +363,7 @@ Increase the version number (e.g. from 5.12.0 to 5.12.1). For a release candidate for a stable perl, this should happen a week or two before the first release candidate to allow sufficient time for testing and smoking with the target version built into the perl executable. For -subsequent release candidates and the final release, it it not necessary to +subsequent release candidates and the final release, it is not necessary to bump the version further. There is a tool to semi-automate this process: @@ -776,7 +776,7 @@ Build perl, then make sure it passes its own test suite, and installs: Check that the output of C</tmp/perl-5.x.y-pretest/bin/perl -v> and C</tmp/perl-5.x.y-pretest/bin/perl -V> are as expected, especially as regards version numbers, patch and/or RC levels, and @INC -paths. Note that as they have been been built from a git working +paths. Note that as they have been built from a git working directory, they will still identify themselves using git tags and commits. (Note that for an odd-numbered version, perl will install itself as C<perl5.x.y>). C<perl -v> will identify itself as: diff --git a/Porting/todo.pod b/Porting/todo.pod index a08fad9..0aba9f2 100644 --- a/Porting/todo.pod +++ b/Porting/todo.pod @@ -358,7 +358,7 @@ are needed to our current source code. Prime example of this is Android. There are several scripts and tools for cross-compiling perl for other platforms. However, these are somewhat inconsistent and scattered across the codebase, none are documented well, none are clearly flexible enough to -be confident that they can support any TARGET/HOST plaform pair other than +be confident that they can support any TARGET/HOST platform pair other than that which they were developed on, and it's not clear how bitrotted they are. For example, C<Configure> understands C<-Dusecrosscompile> option. This option @@ -370,7 +370,7 @@ ARM Linux targets, relying on hand curated F<config.sh> files, but that code is getting on for 5 years old, and requires insider knowledge of perl's build system to draft a F<config.sh> for a new platform. -Jess Robinson has sumbitted a grant to TPF to work on cleaning this up. +Jess Robinson has submitted a grant to TPF to work on cleaning this up. =head2 Split "linker" from "compiler" @@ -972,10 +972,11 @@ done." ssh and screen do this with named pipes in /tmp. Maybe we can too. The old perltodo notes that lvalue functions don't work for list or hash slices. This would be good to fix. -=head2 regexp optimiser optional +=head2 regexp optimizer optional -The regexp optimiser is not optional. It should configurable to be, to allow -its performance to be measured, and its bugs to be easily demonstrated. +The regexp optimizer is not optional. It should be configurable to be optional +and to allow its performance to be measured and its bugs to be easily +demonstrated. =head2 C</w> regex modifier @@ -1118,7 +1119,7 @@ would produce this output What might work is to have an optional line number in memory just before the BASEOP structure, with a flag bit in the op to say whether it's present. Initially during compile every OP would carry its line number. Then add a late -pass to the optimiser (potentially combined with L</repack the optree>) which +pass to the optimizer (potentially combined with L</repack the optree>) which looks at the two ops on every edge of the graph of the execution path. If the line number changes, flags the destination OP with this information. Once all paths are traced, replace every op with the flag with a -- Perl5 Master Repository http://www.nntp.perl.org/group/perl.perl5.changes/2013/05/msg37195.html Fri, 24 May 2013 00:00:50 +0000 [perl.git] branch blead, updated. v5.19.0-155-gaded512 by James Keenan In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/aded5122391be239cff0d21bdfb48a1e18222483?hp=09bf710e3bc7de550fe7d6629360d1328d015873> - Log ----------------------------------------------------------------- commit aded5122391be239cff0d21bdfb48a1e18222483 Author: David Steinbrunner <dsteinbrunner@pobox.com> Date: Tue May 21 06:50:14 2013 -0400 making DOS stand out in dosify ----------------------------------------------------------------------- Summary of changes: djgpp/fixpmain | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/djgpp/fixpmain b/djgpp/fixpmain index 3f965f1..8ebbf78 100644 --- a/djgpp/fixpmain +++ b/djgpp/fixpmain @@ -12,7 +12,7 @@ $perlmain=<PERLM>; $makefile=<MAKEFILE>; ($_) = $makefile =~ /\bNAME\b.*=>\W*([\w\:]+)/; # extract module name -$badname=join ("__",map {lc substr ($_,0,8)} split /:+/); # dosify +$badname=join ("__",map {lc substr ($_,0,8)} split /:+/); # DOSify $perlmain =~ s/^.*boot_$badname.*$//gm if $badname; # delete bad lines @exts=('DynaLoader',split (" ",$Config{known_extensions})); -- Perl5 Master Repository http://www.nntp.perl.org/group/perl.perl5.changes/2013/05/msg37194.html Thu, 23 May 2013 23:52:42 +0000 [perl.git] branch blead, updated. v5.19.0-154-g09bf710 by James Keenan In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/09bf710e3bc7de550fe7d6629360d1328d015873?hp=e8a97f298713315136bdcfc986d8b4f1f4a02fb9> - Log ----------------------------------------------------------------- commit 09bf710e3bc7de550fe7d6629360d1328d015873 Author: David Steinbrunner <dsteinbrunner@pobox.com> Date: Tue May 21 06:49:13 2013 -0400 typo fix for os2 module Bump $VERSION for os2/OS2/OS2-Process/Process.pm. ----------------------------------------------------------------------- Summary of changes: os2/OS2/OS2-Process/Process.pm | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/os2/OS2/OS2-Process/Process.pm b/os2/OS2/OS2-Process/Process.pm index baee0e6..55e8f61 100644 --- a/os2/OS2/OS2-Process/Process.pm +++ b/os2/OS2/OS2-Process/Process.pm @@ -20,7 +20,7 @@ BEGIN { #require AutoLoader; our @ISA = qw(Exporter); - our $VERSION = "1.08"; + our $VERSION = "1.09"; XSLoader::load('OS2::Process', $VERSION); } @@ -2006,7 +2006,7 @@ will show the 22nd system icon as the dialog icon (small folder icon). =item _MessageBox2($text, $buttons_Icon_struct, [$title, ...]) -low-level workhorse to implement MessageBox2(). Differs by the dafault +low-level workhorse to implement MessageBox2(). Differs by the default $title, and that $buttons_Icon_struct is required, and is a string with low-level C struct. -- Perl5 Master Repository http://www.nntp.perl.org/group/perl.perl5.changes/2013/05/msg37193.html Thu, 23 May 2013 23:49:23 +0000 [perl.git] branch blead, updated. v5.19.0-153-ge8a97f2 by James Keenan In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/e8a97f298713315136bdcfc986d8b4f1f4a02fb9?hp=f5323a256eff3c470c70f3ef7872ca9dbf29e3ac> - Log ----------------------------------------------------------------- commit e8a97f298713315136bdcfc986d8b4f1f4a02fb9 Author: David Steinbrunner <dsteinbrunner@pobox.com> Date: Tue May 21 06:48:37 2013 -0400 typo fix for util script ----------------------------------------------------------------------- Summary of changes: utils/perlbug.PL | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/utils/perlbug.PL b/utils/perlbug.PL index bf86670..225d3f5 100644 --- a/utils/perlbug.PL +++ b/utils/perlbug.PL @@ -54,7 +54,7 @@ my $patch_tags = join "", map /(\S+)/ ? "+$1 " : (), @patches; close(PATCH_LEVEL) or die "Error closing patchlevel.h: $!"; -# TO DO (prehaps): store/embed $Config::config_sh into perlbug. When perlbug is +# TO DO (perhaps): store/embed $Config::config_sh into perlbug. When perlbug is # used, compare $Config::config_sh with the stored version. If they differ then # append a list of individual differences to the bug report. -- Perl5 Master Repository http://www.nntp.perl.org/group/perl.perl5.changes/2013/05/msg37192.html Thu, 23 May 2013 23:20:37 +0000