Update to 1.234

- New upstream release 1.234
  - Prevent sub names like v10 from being version strings (GH#65)
  - Add Changes entries forgotten in 1.230
  - Remove temporary fix introduced in 1.226
  - Prevent possible regex on undefined scalar in
    __current_token_is_forced_word
This commit is contained in:
Paul Howarth 2017-06-21 14:34:49 +01:00
parent 79fa9ca6a1
commit ffd968877b
3 changed files with 10 additions and 20 deletions

View File

@ -1,12 +0,0 @@
--- lib/PPI/Tokenizer.pm
+++ lib/PPI/Tokenizer.pm
@@ -833,8 +833,7 @@ sub __current_token_is_forced_word {
# We also have to make sure that the sub/package/etc doing the forcing
# is not a method call.
if( $USUALLY_FORCES{$content}) {
- return 1 if not defined $word; # TODO this is a quick fix to unblock Perl::Critic users, needs to be verified
- return if $word =~ /^v[0-9]+$/ and ( $content eq "use" or $content eq "no" );
+ return if defined($word) and $word =~ /^v[0-9]+$/ and ( $content eq "use" or $content eq "no" );
return 1 if not $prevprev;
return 1 if not $USUALLY_FORCES{$prevprev->content} and $prevprev->content ne '->';
return;

View File

@ -6,14 +6,13 @@
%endif
Name: perl-PPI
Version: 1.228
Version: 1.234
Release: 1%{?dist}
Summary: Parse, Analyze and Manipulate Perl
License: GPL+ or Artistic
URL: http://search.cpan.org/dist/PPI/
Source0: http://search.cpan.org/CPAN/authors/id/M/MI/MITHALDU/PPI-%{version}.tar.gz
Patch0: PPI-1.215-utf8.patch
Patch1: PPI-1.228-fix-temporary-fix.patch
BuildArch: noarch
# =============== Module Build ======================
BuildRequires: coreutils
@ -97,11 +96,6 @@ Parse, analyze and manipulate Perl (without perl).
# Recode documentation as UTF-8
%patch0
# Fix upstream's temporary fix
# https://github.com/adamkennedy/PPI/issues/206
# https://github.com/adamkennedy/PPI/issues/212
%patch1
%if %{without XSAccessor}
rm lib/PPI/XSAccessor.pm
sed -i '/^lib\/PPI\/XSAccessor\.pm$/d' MANIFEST
@ -135,6 +129,14 @@ make test TEST_FILES="xt/*.t" RELEASE_TESTING=1
%{_mandir}/man3/PPI*.3*
%changelog
* Wed Jun 21 2017 Paul Howarth <paul@city-fan.org> - 1.234-1
- Update to 1.234
- Prevent sub names like v10 from being version strings (GH#65)
- Add Changes entries forgotten in 1.230
- Remove temporary fix introduced in 1.226
- Prevent possible regex on undefined scalar in
__current_token_is_forced_word
* Wed Jun 21 2017 Paul Howarth <paul@city-fan.org> - 1.228-1
- Update to 1.228
- Fix test reliance on '.' in @INC

View File

@ -1 +1 @@
SHA512 (PPI-1.228.tar.gz) = 3fa0aff7921b37f75de6f407d0b4c9b78e4e5670e3537e10b6b6934324deacdf5974bd15dffc8914999a9693bd28ffb24fb217f4f76d5343de26c0160da485fe
SHA512 (PPI-1.234.tar.gz) = 9284a3c9799c602491e26cd941b39bd80c1ce9ca03eeef5fd0d06cd2af543fabd6f0b65a068d1d2a8dc24febeb5917b0f8284d582519125dfeda87dd2eea0316