Hello community, here is the log from the commit of package perl-Pod-Usage for openSUSE:Factory checked in at 2020-03-17 13:10:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Pod-Usage (Old) and /work/SRC/openSUSE:Factory/.perl-Pod-Usage.new.3160 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-Pod-Usage" Tue Mar 17 13:10:10 2020 rev:4 rq:785683 version:1.70 Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Pod-Usage/perl-Pod-Usage.changes 2016-06-05 14:20:50.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-Pod-Usage.new.3160/perl-Pod-Usage.changes 2020-03-17 13:10:18.141806201 +0100 @@ -1,0 +2,26 @@ +Mon Mar 16 03:10:28 UTC 2020 - <[email protected]> + +- updated to 1.70 + see /usr/share/doc/packages/perl-Pod-Usage/CHANGES + + 1.70 (marekr) + - CPAN#115847: pod2usage exits with error when using "-verbose 3" with STDIN + Addressed in pod2usage script, and updated POD + - CPAN#122941: Pod::Usage::pod2usage() problem with $Config{scriptdir} + Should be fixed by 1.69 already; reviewed code + - CPAN#121489: I<> not emphasized when used with Pod::Text::Termcap + Added specific support of ::Termcap + - CPAN#114697: Sample code syntax error in documentation for Pod-Usage + Fixed. Well spotted! + - CPAN#125337: Typo in pod + Fixed. Well spotted, too! + - CPAN#130418: Fix parent directory in pod2usage auxiliary script + Patch accepted, thanks! + - CPAN#131845: $Config{pager} string can have arguments + fixed by changing the system() command from using the array form to + string form, and escape/quote the file path to protect any metacharacters + in the file path + - CPAN#131844: preferring PAGER to $Config{pager} + Fixed with the above CPAN#131845 + +------------------------------------------------------------------- Old: ---- Pod-Usage-1.69.tar.gz New: ---- Pod-Usage-1.70.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Pod-Usage.spec ++++++ --- /var/tmp/diff_new_pack.wQHuSM/_old 2020-03-17 13:10:19.169806991 +0100 +++ /var/tmp/diff_new_pack.wQHuSM/_new 2020-03-17 13:10:19.169806991 +0100 @@ -1,7 +1,7 @@ # # spec file for package perl-Pod-Usage # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,20 +12,20 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: perl-Pod-Usage -Version: 1.69 +Version: 1.70 Release: 0 -#Upstream: Artistic-1.0 or GPL-1.0+ +#Upstream: Artistic-1.0 or GPL-1.0-or-later %define cpan_name Pod-Usage -Summary: Print a Usage Message From Embedded Pod Documentation -License: GPL-1.0+ or Artistic-1.0 +Summary: Print a usage message from embedded pod documentation +License: GPL-1.0-or-later OR Artistic-1.0 Group: Development/Libraries/Perl -Url: http://search.cpan.org/dist/Pod-Usage/ -Source0: http://www.cpan.org/authors/id/M/MA/MAREKR/%{cpan_name}-%{version}.tar.gz +Url: https://metacpan.org/release/%{cpan_name} +Source0: https://cpan.metacpan.org/authors/id/M/MA/MAREKR/%{cpan_name}-%{version}.tar.gz Source1: cpanspec.yml BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -48,11 +48,11 @@ %setup -q -n %{cpan_name}-%{version} %build -%{__perl} Makefile.PL INSTALLDIRS=vendor -%{__make} %{?_smp_mflags} +perl Makefile.PL INSTALLDIRS=vendor +make %{?_smp_mflags} %check -%{__make} test +make test %install %perl_make_install ++++++ Pod-Usage-1.69.tar.gz -> Pod-Usage-1.70.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Pod-Usage-1.69/CHANGES new/Pod-Usage-1.70/CHANGES --- old/Pod-Usage-1.69/CHANGES 2016-05-23 22:53:27.000000000 +0200 +++ new/Pod-Usage-1.70/CHANGES 2020-03-15 19:31:41.000000000 +0100 @@ -1,3 +1,23 @@ +1.70 (marekr) +- CPAN#115847: pod2usage exits with error when using "-verbose 3" with STDIN + Addressed in pod2usage script, and updated POD +- CPAN#122941: Pod::Usage::pod2usage() problem with $Config{scriptdir} + Should be fixed by 1.69 already; reviewed code +- CPAN#121489: I<> not emphasized when used with Pod::Text::Termcap + Added specific support of ::Termcap +- CPAN#114697: Sample code syntax error in documentation for Pod-Usage + Fixed. Well spotted! +- CPAN#125337: Typo in pod + Fixed. Well spotted, too! +- CPAN#130418: Fix parent directory in pod2usage auxiliary script + Patch accepted, thanks! +- CPAN#131845: $Config{pager} string can have arguments + fixed by changing the system() command from using the array form to + string form, and escape/quote the file path to protect any metacharacters + in the file path +- CPAN#131844: preferring PAGER to $Config{pager} + Fixed with the above CPAN#131845 + 1.69 (marekr) - CPAN#111313: Makefile creation issue with Pod-Usage-1.68 thanks to H M Brand for the suggestion on how to create a more portable diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Pod-Usage-1.69/META.json new/Pod-Usage-1.70/META.json --- old/Pod-Usage-1.69/META.json 2016-05-23 22:55:43.000000000 +0200 +++ new/Pod-Usage-1.70/META.json 2020-03-15 19:44:24.000000000 +0100 @@ -5,7 +5,7 @@ "Marek Rouchal <[email protected]>" ], "dynamic_config" : 1, - "generated_by" : "ExtUtils::MakeMaker version 6.66, CPAN::Meta::Converter version 2.120921", + "generated_by" : "ExtUtils::MakeMaker version 7.44, CPAN::Meta::Converter version 2.143240", "license" : [ "perl_5" ], @@ -43,5 +43,5 @@ } }, "release_status" : "stable", - "version" : "1.69" + "version" : "1.70" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Pod-Usage-1.69/META.yml new/Pod-Usage-1.70/META.yml --- old/Pod-Usage-1.69/META.yml 2016-05-23 22:55:42.000000000 +0200 +++ new/Pod-Usage-1.70/META.yml 2020-03-15 19:44:24.000000000 +0100 @@ -4,25 +4,25 @@ - 'Brad Appleton <[email protected]>' - 'Marek Rouchal <[email protected]>' build_requires: - ExtUtils::MakeMaker: 0 + ExtUtils::MakeMaker: '0' configure_requires: - ExtUtils::MakeMaker: 0 + ExtUtils::MakeMaker: '0' dynamic_config: 1 -generated_by: 'ExtUtils::MakeMaker version 6.66, CPAN::Meta::Converter version 2.120921' +generated_by: 'ExtUtils::MakeMaker version 7.44, CPAN::Meta::Converter version 2.143240' license: perl meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html - version: 1.4 + version: '1.4' name: Pod-Usage no_index: directory: - t - inc requires: - Cwd: 0 - File::Basename: 0 - File::Spec: 0.82 - Pod::Text: 4 - Test::More: 0.6 - blib: 0 -version: 1.69 + Cwd: '0' + File::Basename: '0' + File::Spec: '0.82' + Pod::Text: '4' + Test::More: '0.6' + blib: '0' +version: '1.70' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Pod-Usage-1.69/Makefile.PL new/Pod-Usage-1.70/Makefile.PL --- old/Pod-Usage-1.69/Makefile.PL 2016-05-23 22:10:49.000000000 +0200 +++ new/Pod-Usage-1.70/Makefile.PL 2020-03-15 19:34:50.000000000 +0100 @@ -51,7 +51,7 @@ WriteMakefile( NAME => $DISTMOD, DISTNAME => $DISTNAME, - VERSION => '1.69', + VERSION => '1.70', INSTALLDIRS => ($] < 5.012 ? 'perl' : 'site'), PL_FILES => { map { (script("$_.PL") => script($_)) } @SCRIPTS }, EXE_FILES => [ @EXE_FILES ], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Pod-Usage-1.69/lib/Pod/Usage.pm new/Pod-Usage-1.70/lib/Pod/Usage.pm --- old/Pod-Usage-1.69/lib/Pod/Usage.pm 2016-05-23 22:09:13.000000000 +0200 +++ new/Pod-Usage-1.70/lib/Pod/Usage.pm 2020-03-15 19:36:26.000000000 +0100 @@ -12,7 +12,7 @@ use strict; use vars qw($VERSION @ISA @EXPORT); -$VERSION = '1.69'; ## Current version of this package +$VERSION = '1.70'; ## Current version of this package require 5.006; ## requires this Perl version or later #use diagnostics; @@ -130,8 +130,8 @@ ## Check for perldoc my $progpath = $opts{'-perldoc'} ? $opts{'-perldoc'} : - File::Spec->catfile($Config{scriptdirexp} - || $Config{scriptdir}, 'perldoc'); + File::Spec->catfile($Config{scriptdirexp} || $Config{scriptdir}, + 'perldoc'); my $version = sprintf("%vd",$^V); if ($Config{versiononly} and $Config{startperl} =~ /\Q$version\E$/ ) { @@ -159,9 +159,17 @@ push @perldoc_cmd, ('-F', $f); unshift @perldoc_cmd, $opts{'-perlcmd'} if $opts{'-perlcmd'}; system(@perldoc_cmd); + # RT16091: fall back to more if perldoc failed if($?) { - # RT16091: fall back to more if perldoc failed - system(($Config{pager} || $ENV{PAGER} || '/bin/more'), $1); + # RT131844: prefer PAGER env + my $pager = $ENV{PAGER} || $Config{pager}; + if(defined($pager) && length($pager)) { + my $cmd = $pager . ' ' . ($^O =~ /win/i ? qq("$f") : quotemeta($f)); + system($cmd); + } else { + # the most humble fallback; should work (at least) on *nix and Win + system('more', $f); + } } } else { croak "Unspecified input file or insecure argument.\n"; @@ -275,7 +283,12 @@ sub seq_i { return $_[1] } # Override Pod::Text->cmd_i to return just "arg", not "*arg*". # newer version based on Pod::Simple -sub cmd_i { return $_[2] } +sub cmd_i { + my $self = shift; + # RT121489: highlighting should be there with Termcap + return $self->SUPER::cmd_i(@_) if $self->isa('Pod::Text::Termcap'); + 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. @@ -379,7 +392,7 @@ =head1 SYNOPSIS - use Pod::Usage + use Pod::Usage; my $message_text = "This text precedes the usage message."; my $exit_status = 2; ## The exit status to use @@ -484,7 +497,7 @@ the C<=head1 DESCRIPTION> section. The regexp binding is stronger than the section separator, such that e.g.: - "DESCRIPTION|OPTIONS|ENVIORNMENT/Caveats" + "DESCRIPTION|OPTIONS|ENVIRONMENT/Caveats" will print any C<=head2 Caveats> section (only) within any of the three C<=head1> sections. @@ -876,6 +889,10 @@ Based on code for B<Pod::Text::pod2text()> written by Tom Christiansen E<lt>[email protected]<gt> +=head1 LICENSE + +Pod::Usage (the distribution) is licensed under the same terms as Perl. + =head1 ACKNOWLEDGMENTS rjbs for refactoring Pod::Usage to not use Pod::Parser any more. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Pod-Usage-1.69/scripts/pod2usage.PL new/Pod-Usage-1.70/scripts/pod2usage.PL --- old/Pod-Usage-1.69/scripts/pod2usage.PL 2016-01-03 14:41:54.000000000 +0100 +++ new/Pod-Usage-1.70/scripts/pod2usage.PL 2020-03-15 19:14:02.000000000 +0100 @@ -120,7 +120,9 @@ =item I<file> The pathname of a file containing pod documentation to be output in -usage message format (defaults to standard input). +usage message format. If omitted, standard input is read - but the +output is then formatted with L<Pod::Text> only - unless a specific +formatter has been specified with B<-formatter>. =back @@ -135,7 +137,8 @@ =head1 SEE ALSO -L<Pod::Usage>, L<pod2text(1)> +L<Pod::Usage>, L<pod2text>, L<Pod::Text>, L<Pod::Text::Termcap>, +L<perldoc> =head1 AUTHOR @@ -174,14 +177,13 @@ ## Dont default to STDIN if connected to a terminal pod2usage(2) if ((@ARGV == 0) && (-t STDIN)); -@ARGV = ('-') unless (@ARGV); if (@ARGV > 1) { print STDERR "pod2usage: Too many filenames given\n\n"; pod2usage(2); } my %usage = (); -$usage{-input} = shift(@ARGV); +$usage{-input} = shift(@ARGV) || \*STDIN; $usage{-exitval} = $options{'exit'} if (defined $options{'exit'}); $usage{-output} = $options{'output'} if (defined $options{'output'}); $usage{-verbose} = $options{'verbose'} if (defined $options{'verbose'}); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Pod-Usage-1.69/t/pod/pod2usage.xr new/Pod-Usage-1.70/t/pod/pod2usage.xr --- old/Pod-Usage-1.69/t/pod/pod2usage.xr 2015-02-12 22:48:10.000000000 +0100 +++ new/Pod-Usage-1.70/t/pod/pod2usage.xr 2020-03-15 19:33:00.000000000 +0100 @@ -42,7 +42,10 @@ the option "utf8". It turns on generation of utf8 output. *file* The pathname of a file containing pod documentation to be output - in usage message format (defaults to standard input). + in usage message format. If omitted, standard input is read - + but the output is then formatted with the Pod::Text manpage only + - unless a specific formatter has been specified with + -formatter. DESCRIPTION pod2usage will read the given input file looking for pod documentation @@ -53,7 +56,8 @@ Please see the pod2usage() entry in the Pod::Usage manpage. SEE ALSO - the Pod::Usage manpage, the pod2text(1) manpage + the Pod::Usage manpage, the pod2text manpage, the Pod::Text manpage, the + Pod::Text::Termcap manpage, the perldoc manpage AUTHOR Please report bugs using http://rt.cpan.org. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Pod-Usage-1.69/t/pod/pod2usage2.t new/Pod-Usage-1.70/t/pod/pod2usage2.t --- old/Pod-Usage-1.69/t/pod/pod2usage2.t 2016-05-23 22:26:54.000000000 +0200 +++ new/Pod-Usage-1.70/t/pod/pod2usage2.t 2020-03-15 19:33:42.000000000 +0100 @@ -226,7 +226,7 @@ is ($exit, 0, "Exit status pod2usage with self"); ok (compare ($text, <<'EOT'), "Output test pod2usage with self") or diag "Got:\n$text\n"; #Usage: -# use Pod::Usage +# use Pod::Usage; # # my $message_text = "This text precedes the usage message."; # my $exit_status = 2; ## The exit status to use diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Pod-Usage-1.69/t/pod/testp2pt.pl new/Pod-Usage-1.70/t/pod/testp2pt.pl --- old/Pod-Usage-1.69/t/pod/testp2pt.pl 2016-05-23 22:40:26.000000000 +0200 +++ new/Pod-Usage-1.70/t/pod/testp2pt.pl 2020-03-15 18:05:56.000000000 +0100 @@ -11,8 +11,9 @@ unshift @INC, $THISDIR; require "testcmp.pl"; import TestCompare; - $PARENTDIR = dirname $THISDIR; - push @INC, map { File::Spec->catfile($_, 'lib') } ($PARENTDIR, $THISDIR); + # RT#130418: previous use of dirname() was failing on VMS + $PARENTDIR = File::Spec->catdir($THISDIR, File::Spec->updir()); + push @INC, map { File::Spec->catdir($_, 'lib') } ($PARENTDIR, $THISDIR); } #use strict; @@ -27,8 +28,8 @@ @EXPORT = qw(&testpodplaintext); BEGIN { # we want this for testing only - unshift(@INC, File::Spec->catfile($PARENTDIR, 'inc')); -print "INC=@INC\n"; + unshift(@INC, File::Spec->catdir($PARENTDIR, 'inc')); + #print "INC=@INC\n"; require Pod::PlainText; @ISA = qw( Pod::PlainText ); @@ -39,7 +40,7 @@ ## reproducible results between environments @ENV{qw(TERMCAP COLUMNS)} = ('co=76:do=^J', 76); -sub catfile(@) { File::Spec->catfile(@_); } +sub catdir(@) { File::Spec->catdir(@_); } my $INSTDIR = abs_path(dirname $0); $INSTDIR = VMS::Filespec::unixpath($INSTDIR) if $^O eq 'VMS'; @@ -48,15 +49,15 @@ $INSTDIR = (dirname $INSTDIR) if (basename($INSTDIR) eq 'pod'); $INSTDIR =~ s#:$## if $^O eq 'MacOS'; $INSTDIR = (dirname $INSTDIR) if (basename($INSTDIR) eq 't'); -my @PODINCDIRS = ( catfile($INSTDIR, 'lib', 'Pod'), - catfile($INSTDIR, 'scripts'), - catfile($INSTDIR, 'pod'), - catfile($INSTDIR, 't', 'pod') +my @PODINCDIRS = ( catdir($INSTDIR, 'lib', 'Pod'), + catdir($INSTDIR, 'scripts'), + catdir($INSTDIR, 'pod'), + catdir($INSTDIR, 't', 'pod') ); # FIXME - we should make the core capable of finding utilities built in # locations in ext. -push @PODINCDIRS, catfile((File::Spec->updir()) x 2, 'pod') if $ENV{PERL_CORE}; +push @PODINCDIRS, catdir((File::Spec->updir()) x 2, 'pod') if $ENV{PERL_CORE}; ## Find the path to the file to =include sub findinclude { @@ -74,7 +75,7 @@ my @podincdirs = ($thispoddir, $parentdir, @PODINCDIRS); for (@podincdirs) { - my $incfile = catfile($_, $incname); + my $incfile = File::Spec->catfile($_, $incname); return $incfile if (-r $incfile); } warn("*** Can't find =include file $incname in @podincdirs\n");
