Compare commits

...

No commits in common. "c8s-stream-1.24" and "c9s" have entirely different histories.

6 changed files with 171 additions and 19 deletions

3
.gitignore vendored
View File

@ -1 +1,2 @@
SOURCES/YAML-1.24.tar.gz
/YAML-[0-9.]*.tar.gz
/YAML-free-[0-9.]*.tar.gz

View File

@ -1 +1 @@
1620af79b2be7d3c3ada7cd1678ecd0306558dc8 SOURCES/YAML-1.24.tar.gz
0482da488fe9d079d08bcdc980c914b96967d72e YAML-free-1.30.tar.gz

44
YAML-free Executable file
View File

@ -0,0 +1,44 @@
#!/bin/bash
# YAML-free: create repackaged YAML tarball without non-free content
# See https://bugzilla.redhat.com/show_bug.cgi?id=1813197
# https://github.com/ingydotnet/yaml-pm/issues/219
#
# Usage: YAML-free YAML-version.tar.gz
# Creates: YAML-free-version.tar.gz
case $# in
1) YAML_tarball="$1"
;;
*) echo "YAML-free: usage: YAML-free YAML-version.tar.gz" 1>&2
exit 1
;;
esac
if echo "$YAML_tarball" | grep --silent -x 'YAML-[1-9][0-9]*\.[0-9][0-9.]*\.tar\.gz'; then
YAML_free_tarball=$(echo "$YAML_tarball" | sed -e 's|^YAML|YAML-free|')
YAML_dirname=$(echo "$YAML_tarball" | sed -e 's|\.tar\.gz$||')
else
echo "YAML-free: tarball $YAML_tarball does not meet expected naming" 1>&2
exit 1
fi
echo "Creating $YAML_free_tarball from $YAML_tarball in directory $YAML_dirname"
echo "Ensuring directory $YAML_dirname does not already exist"
rm -rf "$YAML_dirname"
echo "Extracting $YAML_tarball"
tar xfz "$YAML_tarball"
echo "Removing non-free file t/load-slides.t"
rm "$YAML_dirname/t/load-slides.t"
echo "Removing reference to non-free file t/load-slides.t from MANIFEST"
sed -i -e '/^t\/load-slides.t/d' "$YAML_dirname/MANIFEST"
echo "Creating $YAML_free_tarball"
tar cfz "$YAML_free_tarball" "$YAML_dirname"
echo "Removing work directory $YAML_dirname"
rm -rf "$YAML_dirname"

8
perl-YAML.rpmlintrc Normal file
View File

@ -0,0 +1,8 @@
from Config import *
addFilter("spelling-error Summary\(en_US\) tm -> ")
# Tarball modified to remove non-free content
addFilter("invalid-url Source0: YAML-free-[0-9.]*\.tar\.gz")
# Tarball creation script is of course executable
addFilter("strange-permission YAML-free 755")

View File

@ -4,20 +4,31 @@
%else
%bcond_with perl_YAML_enables_test
%endif
# Run extra test
%if ! (0%{?rhel})
%bcond_without perl_YAML_enables_extra_test
%else
%bcond_with perl_YAML_enables_extra_test
%endif
Name: perl-YAML
Version: 1.24
Release: 3%{?dist}
Version: 1.30
Release: 8%{?dist}
Summary: YAML Ain't Markup Language (tm)
License: GPL+ or Artistic
URL: http://search.cpan.org/dist/YAML/
Source0: http://search.cpan.org/CPAN/authors/id/T/TI/TINITA/YAML-%{version}.tar.gz
URL: https://metacpan.org/release/YAML
# Tarball created from https://cpan.metacpan.org/modules/by-module/YAML/YAML-%%{version}.tar.gz
# using script YAML-free (see https://bugzilla.redhat.com/show_bug.cgi?id=1813197)
Source0: YAML-free-%{version}.tar.gz
# Script to remove non-free content from upstream tarball
# Usage: YAML-free YAML-%%{version}.tar.gz
Source1: YAML-free
BuildArch: noarch
# Module Build
BuildRequires: coreutils
BuildRequires: make
BuildRequires: perl-interpreter
BuildRequires: perl-generators
BuildRequires: perl-interpreter
BuildRequires: perl(ExtUtils::MakeMaker) > 6.75
# Module Runtime
BuildRequires: perl(B)
@ -32,14 +43,21 @@ BuildRequires: perl(warnings)
# Test Suite
# Avoid circular build deps Test::YAML → Test::Base → YAML when bootstrapping
%if %{with perl_YAML_enables_test} && !%{defined perl_bootstrap}
BuildRequires: perl(Config)
BuildRequires: perl(Data::Dumper)
BuildRequires: perl(Encode)
BuildRequires: perl(File::Find)
BuildRequires: perl(IO::File)
BuildRequires: perl(IO::Pipe)
BuildRequires: perl(lib)
BuildRequires: perl(Test::Deep)
BuildRequires: perl(Test::More) >= 0.88
BuildRequires: perl(Test::YAML) >= 1.05
BuildRequires: perl(utf8)
%if %{with perl_YAML_enables_extra_test}
# Author Tests
BuildRequires: perl(Test::Pod) >= 1.41
%endif
%endif
# Runtime
Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
@ -51,28 +69,27 @@ Requires: perl(Carp)
%global __provides_exclude ^perl\\(yaml_
%description
The YAML.pm module implements a YAML Loader and Dumper based on the
YAML 1.0 specification. http://www.yaml.org/spec/
YAML is a generic data serialization language that is optimized for
human readability. It can be used to express the data structures of
most modern programming languages, including Perl.
For information on the YAML syntax, please refer to the YAML
specification.
The YAML.pm module implements a YAML Loader and Dumper based on the YAML 1.0
specification (http://www.yaml.org/spec/). YAML is a generic data serialization
language that is optimized for human readability. It can be used to express the
data structures of most modern programming languages, including Perl. For
information on the YAML syntax, please refer to the YAML specification.
%prep
%setup -q -n YAML-%{version}
%build
perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1
make %{?_smp_mflags}
%{make_build}
%install
make install DESTDIR=%{buildroot}
%{make_install}
%{_fixperms} -c %{buildroot}
%check
# Avoid circular build deps Test::YAML → Test::Base → YAML when bootstrapping
%if %{with perl_YAML_enables_test} && !%{defined perl_bootstrap}
make test
make test AUTHOR_TESTING=%{with perl_YAML_enables_extra_test}
%endif
%files
@ -117,8 +134,89 @@ make test
%{_mandir}/man3/YAML::Types.3*
%changelog
* Fri Mar 29 2019 Jitka Plesnikova <jplesnik@redhat.com> - 1.24-3
- Rebuild with enable hardening (bug #1636329)
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.30-8
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.30-7
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.30-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.30-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Fri Jun 26 2020 Jitka Plesnikova <jplesnik@redhat.com> - 1.30-4
- Perl 5.32 re-rebuild of bootstrapped packages
* Mon Jun 22 2020 Jitka Plesnikova <jplesnik@redhat.com> - 1.30-3
- Perl 5.32 rebuild
* Fri Mar 13 2020 Paul Howarth <paul@city-fan.org> - 1.30-2
- Remove non-free test file t/load-slides.t (#1813197, GH#219)
* Tue Jan 28 2020 Paul Howarth <paul@city-fan.org> - 1.30-1
- Update to 1.30
- Breaking Change: Set $YAML::LoadBlessed default to false to make it more
secure
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.29-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Sun Jun 02 2019 Jitka Plesnikova <jplesnik@redhat.com> - 1.29-3
- Perl 5.30 re-rebuild of bootstrapped packages
* Thu May 30 2019 Jitka Plesnikova <jplesnik@redhat.com> - 1.29-2
- Perl 5.30 rebuild
* Sat May 11 2019 Paul Howarth <paul@city-fan.org> - 1.29-1
- Update to 1.29
- Fix regex for alias to match the one for anchors (GH#214)
* Sun Apr 28 2019 Paul Howarth <paul@city-fan.org> - 1.28-1
- Update to 1.28
- Security fix: only enable loading globs when $LoadCode is set (GH#213)
- Modernize spec using %%{make_build} and %%{make_install}
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.27-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Sat Nov 3 2018 Paul Howarth <paul@city-fan.org> - 1.27-1
- Update to 1.27
- Remove a warning about uninitialized value for perl 5.10
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.26-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Sat Jun 30 2018 Jitka Plesnikova <jplesnik@redhat.com> - 1.26-3
- Perl 5.28 re-rebuild of bootstrapped packages
* Wed Jun 27 2018 Jitka Plesnikova <jplesnik@redhat.com> - 1.26-2
- Perl 5.28 rebuild
* Sun May 20 2018 Paul Howarth <paul@city-fan.org> - 1.26-1
- Update to 1.26
- Fix bug introduced in 1.25 - loading of quoted string with colon as
sequence element (GH#208)
- Support zero indented block sequences (GH#207)
* Sat May 12 2018 Paul Howarth <paul@city-fan.org> - 1.25-1
- Update to 1.25
- Support trailing comments (GH#189, GH#190, GH#191)
- Remove unused code (GH#192)
- Use Test::Deep to actually test correctly for class names (GH#193)
- Fix loading of mapping key that starts with '= ' (GH#194)
- Fix loading strings with multiple spaces (GH#172)
- Allow more characters in anchor name (GH#196)
- Add $YAML::LoadBlessed for disabling loading objects (GH#197)
- Disable test with long string under certain conditions (GH#201)
- Quote scalar if it equals '=' (GH#202)
- Multiple regexp roundtrip does not grow (GH#203)
- Add support for compact nested block sequences (GH#204)
- Support reverse order of block scalar indicators (GH#205)
- Support nested mappings in sequences (GH#206)
- Fix parsing of quoted strings (GH#188)
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.24-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

1
sources Normal file
View File

@ -0,0 +1 @@
SHA512 (YAML-free-1.30.tar.gz) = 7ac72b2e688d14e0e6280d6cfcfece553b052bf2daeeb9ce09fd501151d27c7eedefd1ec9f7c1e587aaa6822c3b4fb0227a3b162d7fcaae8c2fcf616200d750e