Compare commits

..

No commits in common. 'c8-stream-5.24' and 'c9' have entirely different histories.

2
.gitignore vendored

@ -1 +1 @@
SOURCES/podlators-4.09.tar.gz SOURCES/podlators-4.14.tar.gz

@ -1 +1 @@
82b9ef16999957156d4c062b1f6dad0e075307de SOURCES/podlators-4.09.tar.gz d018dd65ec935da3978a4be67020d1a3654b485f SOURCES/podlators-4.14.tar.gz

@ -1,45 +0,0 @@
From 72b821db9a1e5e25febe2f3551dcb1ef273206c9 Mon Sep 17 00:00:00 2001
From: Russ Allbery <rra@cpan.org>
Date: Sun, 17 Sep 2017 11:38:23 -0700
Subject: [PATCH] Coerce file handle to glob for PerlIO::get_layers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
[Pod::Man] Wrap the output file descriptor in a glob before passing it
to PerlIO::get_layers so that the layer check works properly.
Previously, this code would throw a warning if given a scalar not
wrapped in a glob and not detect layers properly. Patch from Zefram.
(#122521)
Petr Písař: Port to 4.09.
---
lib/Pod/Man.pm | 7 +++++--
diff --git a/lib/Pod/Man.pm b/lib/Pod/Man.pm
index db49bde..a737e5b 100644
--- a/lib/Pod/Man.pm
+++ b/lib/Pod/Man.pm
@@ -800,13 +800,16 @@ sub start_document {
# has a PerlIO encoding layer set. If it does not, we'll need to encode
# our output before printing it (handled in the output() sub). Wrap the
# check in an eval to handle versions of Perl without PerlIO.
+ #
+ # PerlIO::get_layers still requires its argument be a glob, so coerce the
+ # file handle to a glob.
$$self{ENCODE} = 0;
if ($$self{utf8}) {
$$self{ENCODE} = 1;
eval {
my @options = (output => 1, details => 1);
- my $flag = (PerlIO::get_layers ($$self{output_fh}, @options))[-1];
- if ($flag & PerlIO::F_UTF8 ()) {
+ my @layers = PerlIO::get_layers (*{$$self{output_fh}}, @options);
+ if ($layers[-1] & PerlIO::F_UTF8 ()) {
$$self{ENCODE} = 0;
}
}
--
2.13.6

@ -1,93 +0,0 @@
From 2b37a985ccd71d1a88e23cefd789a54d690d3761 Mon Sep 17 00:00:00 2001
From: Russ Allbery <rra@cpan.org>
Date: Sat, 27 May 2017 18:44:06 -0700
Subject: [PATCH] Properly diagnose empty input to pod2man and pod2text
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Produce a proper diagnostic when given empty input on standard input
with no other arguments to pod2man or pod2text. Reported by Guillem
Jover.
Fixes #5
Petr Písař: Ported to 4.09.
---
scripts/pod2man.PL | 10 +++++++---
scripts/pod2text.PL | 10 +++++++---
diff --git a/scripts/pod2man.PL b/scripts/pod2man.PL
index b70057b..3f19b79 100755
--- a/scripts/pod2man.PL
+++ b/scripts/pod2man.PL
@@ -47,7 +47,7 @@ print {$out} <<'SCRIPT_BODY' or die "Cannot write to $file: $!\n";
# pod2man -- Convert POD data to formatted *roff input.
#
# Copyright 1999, 2000, 2001, 2004, 2006, 2008, 2010, 2012, 2013, 2014, 2015,
-# 2016 Russ Allbery <rra@cpan.org>
+# 2016, 2017 Russ Allbery <rra@cpan.org>
#
# This program is free software; you may redistribute it and/or modify it
# under the same terms as Perl itself.
@@ -113,7 +113,11 @@ do {
$parser->parse_from_file (@files);
if ($parser->{CONTENTLESS}) {
$status = 1;
- warn "$0: unable to format $files[0]\n";
+ if (defined $files[0]) {
+ warn "$0: unable to format $files[0]\n";
+ } else {
+ warn "$0: unable to format standard input\n";
+ }
if (defined ($files[1]) and $files[1] ne '-') {
unlink $files[1] unless (-s $files[1]);
}
@@ -428,7 +432,7 @@ B<pod2man> by Larry Wall and Tom Christiansen.
=head1 COPYRIGHT AND LICENSE
Copyright 1999, 2000, 2001, 2004, 2006, 2008, 2010, 2012, 2013, 2014,
-2015, 2016 Russ Allbery <rra@cpan.org>
+2015, 2016, 2017 Russ Allbery <rra@cpan.org>
This program is free software; you may redistribute it and/or modify it
under the same terms as Perl itself.
diff --git a/scripts/pod2text.PL b/scripts/pod2text.PL
index f6c8071..d1a146e 100755
--- a/scripts/pod2text.PL
+++ b/scripts/pod2text.PL
@@ -47,7 +47,7 @@ print {$out} <<'SCRIPT_BODY' or die "Cannot write to $file: $!\n";
# pod2text -- Convert POD data to formatted ASCII text.
#
# Copyright 1999, 2000, 2001, 2004, 2006, 2008, 2010, 2012, 2013, 2014, 2015,
-# 2016 Russ Allbery <rra@cpan.org>
+# 2016, 2017 Russ Allbery <rra@cpan.org>
#
# This program is free software; you may redistribute it and/or modify it
# under the same terms as Perl itself.
@@ -123,7 +123,11 @@ do {
$parser->parse_from_file ($input, $output);
if ($parser->{CONTENTLESS}) {
$status = 1;
- warn "$0: unable to format $input\n";
+ if (defined $input) {
+ warn "$0: unable to format $input\n";
+ } else {
+ warn "$0: unable to format standard input\n";
+ }
if (defined ($output) and $output ne '-') {
unlink $output unless (-s $output);
}
@@ -358,7 +362,7 @@ Russ Allbery <rra@cpan.org>.
=head1 COPYRIGHT AND LICENSE
Copyright 1999, 2000, 2001, 2004, 2006, 2008, 2010, 2012, 2013, 2014, 2015,
-2016 Russ Allbery <rra@cpan.org>
+2016, 2017 Russ Allbery <rra@cpan.org>
This program is free software; you may redistribute it and/or modify it
under the same terms as Perl itself.
--
2.13.6

@ -1,31 +1,42 @@
Name: perl-podlators Name: perl-podlators
Version: 4.09 Epoch: 1
Release: 3%{?dist} Version: 4.14
Release: 460%{?dist}
Summary: Format POD source into various output formats Summary: Format POD source into various output formats
# pod/perlpodstyle: MIT # pod/perlpodstyle.pod: FSFAP
# other files: GPL+ or Artistic # other files: GPL+ or Artistic
## Not in the binary package ## Not in the binary package
# t/data/basic.cap: FSFAP
# t/data/basic.clr: FSFAP
# t/data/basic.man: FSFAP
# t/data/basic.ovr: FSFAP
# t/data/basic.pod: FSFAP
# t/data/basic.txt: FSFAP
# t/data/snippets/man/uppercase-license: MIT
# t/data/snippets/README: FSFAP
# t/docs/pod.t: MIT # t/docs/pod.t: MIT
# t/docs/pod-spelling.t: MIT # t/docs/pod-spelling.t: MIT
# t/docs/spdx-license.t: MIT
# t/docs/synopsis.t: MIT # t/docs/synopsis.t: MIT
License: (GPL+ or Artistic) and MIT # t/docs/urls.t: MIT
Group: Development/Libraries # t/lib/Test/RRA.pm: MIT
URL: http://search.cpan.org/dist/podlators/ # t/lib/Test/RRA/Config.pm: MIT
Source0: http://www.cpan.org/authors/id/R/RR/RRA/podlators-%{version}.tar.gz # t/lib/Test/RRA/ModuleVersion.pm: MIT
# Fix pod2man and pod2text error messages when standard input is empty, # t/style/minimum-version.t: MIT
# <https://github.com/rra/podlators/issues/5>, fixed in 4.10 # t/style/module-version.t: MIT
Patch0: podlators-4.09-Properly-diagnose-empty-input-to-pod2man-and-pod2tex.patch # t/style/strict.t: MIT
# Fix layers detection on output file handle, CPAN RT#122521, fixed in 4.10 License: (GPL+ or Artistic) and FSFAP
Patch1: podlators-4.09-Coerce-file-handle-to-glob-for-PerlIO-get_layers.patch URL: https://metacpan.org/release/podlators
Source0: https://cpan.metacpan.org/authors/id/R/RR/RRA/podlators-%{version}.tar.gz
BuildArch: noarch BuildArch: noarch
BuildRequires: findutils
BuildRequires: make BuildRequires: make
BuildRequires: perl
BuildRequires: perl-generators BuildRequires: perl-generators
BuildRequires: perl-interpreter
BuildRequires: perl(:VERSION) >= 5.8
BuildRequires: perl(Config) BuildRequires: perl(Config)
# Cwd run by PL script in scripts directory # Cwd run by PL script in scripts directory
BuildRequires: perl(Cwd) BuildRequires: perl(Cwd)
BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(ExtUtils::MakeMaker) >= 6.76
# File::Basename run by PL script in scripts directory # File::Basename run by PL script in scripts directory
BuildRequires: perl(File::Basename) BuildRequires: perl(File::Basename)
# File::Spec version declared in lib/Pod/Man.pm comment # File::Spec version declared in lib/Pod/Man.pm comment
@ -45,7 +56,9 @@ BuildRequires: perl(Term::ANSIColor)
BuildRequires: perl(Term::Cap) BuildRequires: perl(Term::Cap)
BuildRequires: perl(vars) BuildRequires: perl(vars)
# Tests: # Tests:
BuildRequires: perl(base)
BuildRequires: perl(File::Find) BuildRequires: perl(File::Find)
BuildRequires: perl(File::Temp)
BuildRequires: perl(Getopt::Long) BuildRequires: perl(Getopt::Long)
BuildRequires: perl(IO::File) BuildRequires: perl(IO::File)
BuildRequires: perl(lib) BuildRequires: perl(lib)
@ -78,19 +91,17 @@ with various capabilities.
%prep %prep
%setup -q -n podlators-%{version} %setup -q -n podlators-%{version}
%patch0 -p1
%patch1 -p1
%build %build
perl Makefile.PL INSTALLDIRS=vendor perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1
make %{?_smp_mflags} %{make_build}
%install %install
make pure_install DESTDIR=$RPM_BUILD_ROOT %{make_install}
find $RPM_BUILD_ROOT -type f -name .packlist -delete
%{_fixperms} $RPM_BUILD_ROOT/* %{_fixperms} $RPM_BUILD_ROOT/*
%check %check
unset AUTHOR_TESTING AUTOMATED_TESTING RELEASE_TESTING
make test make test
%files %files
@ -102,9 +113,64 @@ make test
%{_mandir}/man3/* %{_mandir}/man3/*
%changelog %changelog
* Tue Jan 02 2018 Petr Pisar <ppisar@redhat.com> - 4.09-3 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1:4.14-460
- Fix pod2man and pod2text error messages when standard input is empty - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
- Fix layers detection on output file handle (CPAN RT#122521) Related: rhbz#1991688
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1:4.14-459
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.14-458
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.14-457
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon Jun 22 2020 Jitka Plesnikova <jplesnik@redhat.com> - 1:4.14-456
- Increase release to favour standalone package
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.14-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Mon Jan 06 2020 Petr Pisar <ppisar@redhat.com> - 1:4.14-1
- 4.14 bump
* Thu Jan 02 2020 Petr Pisar <ppisar@redhat.com> - 1:4.13-1
- 4.13 bump
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.12-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Wed Jun 05 2019 Petr Pisar <ppisar@redhat.com> - 1:4.12-1
- 4.12 bump
* Thu May 30 2019 Jitka Plesnikova <jplesnik@redhat.com> - 1:4.11-438
- Increase release to favour standalone package
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.11-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.11-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Tue Jun 26 2018 Jitka Plesnikova <jplesnik@redhat.com> - 1:4.11-2
- Perl 5.28 rebuild
* Wed May 09 2018 Petr Pisar <ppisar@redhat.com> - 4.11-1
- 4.11 bump
- License changed to (GPL+ or Artistic) and FSFAP
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.10-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Tue Jan 02 2018 Petr Pisar <ppisar@redhat.com> - 4.10-1
- 4.10 bump
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.09-394
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Sat Jun 03 2017 Jitka Plesnikova <jplesnik@redhat.com> - 4.09-393
- Perl 5.26 rebuild
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.09-2 * Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.09-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild

Loading…
Cancel
Save