Compare commits

..

No commits in common. "c8" and "c9s" have entirely different histories.
c8 ... c9s

9 changed files with 348 additions and 22 deletions

1
.fmf/version Normal file
View File

@ -0,0 +1 @@
1

44
.gitignore vendored
View File

@ -1 +1,43 @@
SOURCES/CGI-4.38.tar.gz
/CGI.pm-3.50.tar.gz
/CGI.pm-3.51.tar.gz
/CGI.pm-3.60.tar.gz
/CGI.pm-3.61.tar.gz
/CGI.pm-3.62.tar.gz
/CGI.pm-3.63.tar.gz
/CGI.pm-3.64.tar.gz
/CGI.pm-3.65.tar.gz
/CGI.pm-4.00.tar.gz
/CGI.pm-4.01.tar.gz
/CGI.pm-4.02.tar.gz
/CGI.pm-4.03.tar.gz
/CGI-4.04.tar.gz
/CGI-4.13.tar.gz
/CGI-4.14.tar.gz
/CGI-4.15.tar.gz
/CGI-4.20.tar.gz
/CGI-4.21.tar.gz
/CGI-4.22.tar.gz
/CGI-4.24.tar.gz
/CGI-4.25.tar.gz
/CGI-4.26.tar.gz
/CGI-4.27.tar.gz
/CGI-4.28.tar.gz
/CGI-4.31.tar.gz
/CGI-4.32.tar.gz
/CGI-4.33.tar.gz
/CGI-4.35.tar.gz
/CGI-4.36.tar.gz
/CGI-4.37.tar.gz
/CGI-4.38.tar.gz
/CGI-4.39.tar.gz
/CGI-4.40.tar.gz
/CGI-4.42.tar.gz
/CGI-4.43.tar.gz
/CGI-4.44.tar.gz
/CGI-4.45.tar.gz
/CGI-4.46.tar.gz
/CGI-4.47.tar.gz
/CGI-4.48.tar.gz
/CGI-4.49.tar.gz
/CGI-4.50.tar.gz
/CGI-4.51.tar.gz

View File

@ -1 +0,0 @@
89c7f4cccc3047154726399e3a261377c85d7d0d SOURCES/CGI-4.38.tar.gz

View File

@ -0,0 +1,149 @@
diff -up CGI-4.27/t/cgi.t.orig CGI-4.27/t/cgi.t
--- CGI-4.27/t/cgi.t.orig 2016-03-02 08:43:05.000000000 +0100
+++ CGI-4.27/t/cgi.t 2016-03-02 15:52:50.825729857 +0100
@@ -6,7 +6,6 @@ use strict;
use warnings;
use Test::More tests => 25;
-use Test::Deep;
use CGI ();
@@ -27,11 +26,15 @@ is( $q->PrintHeader,$q->header,'PrintHea
is( $q->HtmlTop,$q->start_html,'HtmlTop' );
is( $q->HtmlBot,$q->end_html,'HtmlBot' );
-cmp_deeply(
+SKIP: {
+ skip 'Test::Deep module is not available', 1 unless
+ eval 'use Test::Deep 0.11; 1';
+ cmp_deeply(
[ my @params = CGI::SplitParam( "foo\0bar" ) ],
[ qw/ foo bar /],
'SplitParam'
-);
+ );
+}
ok( $q->MethGet,'MethGet' );
ok( ! $q->MethPost,'MethPost' );
@@ -60,13 +63,17 @@ $CGI::CLOSE_UPLOAD_FILES = 0;
ok( $q->close_upload_files( 1 ),'close_upload_files' );
is( $CGI::CLOSE_UPLOAD_FILES,1,' ... sets $CGI::CLOSE_UPLOAD_FILES' );
-cmp_deeply(
+SKIP: {
+ skip 'Test::Deep module is not available', 1 unless
+ eval 'use Test::Deep 0.11; 1';
+ cmp_deeply(
$q->default_dtd,
[
'-//W3C//DTD HTML 4.01 Transitional//EN',
'http://www.w3.org/TR/html4/loose.dtd'
],
'default_dtd'
-);
+ );
+}
ok( ! $q->private_tempfiles,'private_tempfiles' );
diff -up CGI-4.27/t/param_list_context.t.orig CGI-4.27/t/param_list_context.t
--- CGI-4.27/t/param_list_context.t.orig 2016-03-02 08:48:20.000000000 +0100
+++ CGI-4.27/t/param_list_context.t 2016-03-02 15:52:50.825729857 +0100
@@ -4,7 +4,7 @@ use strict;
use warnings;
use Test::More;
-use Test::Deep;
+
use Test::Warn;
use CGI ();
@@ -43,11 +43,15 @@ warnings_are
" ... but we only warn once",
;
-cmp_deeply(
+SKIP: {
+ skip 'Test::Deep module is not available', 1 unless
+ eval 'use Test::Deep 0.11; 1';
+ cmp_deeply(
[ sort @params ],
[ qw/ checkers chess / ],
'CGI::param()',
-);
+ );
+}
warnings_are
{ @params = $q->multi_param('game') }
@@ -55,11 +59,15 @@ warnings_are
"no warnings calling multi_param"
;
-cmp_deeply(
+SKIP: {
+ skip 'Test::Deep module is not available', 1 unless
+ eval 'use Test::Deep 0.11; 1';
+ cmp_deeply(
[ sort @params ],
[ qw/ checkers chess / ],
'CGI::multi_param'
-);
+ );
+}
$CGI::LIST_CONTEXT_WARN = 0;
diff -up CGI-4.27/t/request.t.orig CGI-4.27/t/request.t
--- CGI-4.27/t/request.t.orig 2016-03-02 08:16:46.000000000 +0100
+++ CGI-4.27/t/request.t 2016-03-02 15:52:50.825729857 +0100
@@ -4,7 +4,6 @@ use strict;
use warnings;
use Test::More tests => 71;
-use Test::Deep;
use CGI ();
use Config;
@@ -117,7 +116,9 @@ $q->_reset_globals;
is_deeply [ sort $q->$_( 'keywords' ) ], [ qw/ dragon tiger / ],
"$_ keywords" for qw/ param url_param /;
- {
+ SKIP: {
+ skip 'Test::Deep module is not available', 2 unless
+ (eval 'use Test::Deep 0.11; 1');
$^W++;
CGI::_reset_globals;
diff -up CGI-4.27/t/util.t.orig CGI-4.27/t/util.t
--- CGI-4.27/t/util.t.orig 2015-12-15 18:12:19.000000000 +0100
+++ CGI-4.27/t/util.t 2016-03-02 15:52:50.825729857 +0100
@@ -6,7 +6,6 @@
$| = 1;
use Test::More tests => 80;
-use Test::Deep;
use Config;
use_ok ( 'CGI::Util', qw(
escape
@@ -68,6 +67,10 @@ for ( 1 .. 20 ) {
%args,
);
+ SKIP: {
+ skip 'Test::Deep module is not available', 1 unless
+ eval 'use Test::Deep 0.11; 1';
+
cmp_deeply(
[ @ordered ],
[
@@ -83,6 +86,7 @@ for ( 1 .. 20 ) {
],
'rearrange not sensitive to hash key ordering'
);
+ }
}
ok( CGI::Util::utf8_chr( "1",1 ),'utf8_chr' );

7
gating.yaml Normal file
View File

@ -0,0 +1,7 @@
--- !Policy
product_versions:
- fedora-*
decision_context: bodhi_update_push_stable
subject_type: koji_build
rules:
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}

View File

@ -1,11 +1,13 @@
# Run optional test
%bcond_without perl_CGI_enables_optional_test
Name: perl-CGI
Summary: Handle Common Gateway Interface requests and responses
Version: 4.38
Release: 2%{?dist}
License: (GPL+ or Artistic) and Artistic 2.0
Group: Development/Libraries
Source0: http://search.cpan.org/CPAN/authors/id/L/LE/LEEJO/CGI-%{version}.tar.gz
URL: http://search.cpan.org/dist/CGI
Version: 4.51
Release: 5%{?dist}
License: Artistic 2.0
Source0: https://cpan.metacpan.org/authors/id/L/LE/LEEJO/CGI-%{version}.tar.gz
URL: https://metacpan.org/release/CGI
BuildArch: noarch
BuildRequires: coreutils
BuildRequires: findutils
@ -13,19 +15,14 @@ BuildRequires: glibc-common
BuildRequires: make
BuildRequires: perl-interpreter
BuildRequires: perl-generators
BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: perl(ExtUtils::MakeMaker) >= 6.76
# Run-requires:
BuildRequires: perl(base)
BuildRequires: perl(Carp)
# Config not needed on Linux
%if 0%{?fedora} >= 22
BuildRequires: perl(deprecate)
%endif
BuildRequires: perl(Exporter)
BuildRequires: perl(File::Spec) >= 0.82
BuildRequires: perl(File::Temp) >= 0.17
BuildRequires: perl(HTML::Entities) >= 3.69
BuildRequires: perl(if)
BuildRequires: perl(overload)
BuildRequires: perl(parent)
BuildRequires: perl(strict)
@ -47,14 +44,11 @@ BuildRequires: perl(Test::Deep) >= 0.11
BuildRequires: perl(Test::More) >= 0.98
BuildRequires: perl(Test::Warn) >= 0.3
BuildRequires: perl(utf8)
%if !%{defined perl_bootstrap}
%if !%{defined perl_bootstrap} && %{with perl_CGI_enables_optional_test}
# Optional tests
BuildRequires: perl(Test::CPAN::Changes)
%endif
Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
%if 0%{?fedora} >= 22
Requires: perl(deprecate)
%endif
Requires: perl(File::Spec) >= 0.82
Requires: perl(File::Temp) >= 0.17
Requires: perl(HTML::Entities) >= 3.69
@ -69,6 +63,11 @@ Requires: perl(Text::ParseWords)
%global __provides_exclude %{?__provides_exclude:%__provides_exclude|}^perl\\(MultipartBuffer\\)$
%global __provides_exclude %{?__provides_exclude:%__provides_exclude|}^perl\\(Fh\\)
# Filter modules bundled for tests
%global __requires_exclude %{__requires_exclude}|^perl\\(Apache)\s*$
%global __provides_exclude_from %{?__provides_exclude_from:%__provides_exclude_from|}^%{_libexecdir}
%description
CGI.pm is a stable, complete and mature solution for processing and preparing
HTTP requests and responses. Major features including processing form
@ -79,22 +78,55 @@ HTML generation utilities are included as well.
CGI.pm performs very well in in a vanilla CGI.pm environment and also comes
with built-in support for mod_perl and mod_perl2 as well as FastCGI.
%package tests
Summary: Tests for %{name}
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: perl-Test-Harness
Requires: perl(Test::CPAN::Changes)
%description tests
Tests from %{name}-%{version}. Execute them
with "%{_libexecdir}/%{name}/test".
%prep
%setup -q -n CGI-%{version}
iconv -f iso8859-1 -t utf-8 < Changes > Changes.1
mv Changes.1 Changes
chmod -c -x examples/*
# Help file to recognise the Perl scripts
for F in `find t -name *.t`; do
if grep -q "^#!.*perl" "$F" ; then
perl -MConfig -pi -e 's|^#!.*perl\b|$Config{startperl}|' "$F"
else
perl -i -MConfig -ple 'print $Config{startperl} if $. == 1' "$F"
fi
chmod +x "$F"
done
# Remove release tests
rm t/compiles_pod.t t/changes.t
perl -i -ne 'print $_ unless m{^t/compiles_pod\.t}' MANIFEST
perl -i -ne 'print $_ unless m{^t/changes\.t}' MANIFEST
%build
perl Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}
perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1
%{make_build}
%install
make pure_install DESTDIR=%{buildroot}
find %{buildroot} -type f -name .packlist -delete
%{make_install}
# Install tests
mkdir -p %{buildroot}/%{_libexecdir}/%{name}
cp -a t %{buildroot}/%{_libexecdir}/%{name}
cat > %{buildroot}/%{_libexecdir}/%{name}/test << 'EOF'
#!/bin/sh
cd %{_libexecdir}/%{name} && exec prove -I . -j "$(getconf _NPROCESSORS_ONLN)"
EOF
chmod +x %{buildroot}/%{_libexecdir}/%{name}/test
%{_fixperms} %{buildroot}/*
%check
export HARNESS_OPTIONS=j$(perl -e 'if ($ARGV[0] =~ /.*-j([0-9][0-9]*).*/) {print $1} else {print 1}' -- '%{?_smp_mflags}')
make test
%files
@ -103,7 +135,92 @@ make test
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*
%files tests
%{_libexecdir}/%{name}
%changelog
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 4.51-5
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 4.51-4
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Mon Mar 01 2021 Jitka Plesnikova <jplesnik@redhat.com> - 4.51-3
- Package tests
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.51-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Oct 06 2020 Jitka Plesnikova <jplesnik@redhat.com> - 4.51-1
- 4.51 bump
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.50-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Fri Jun 26 2020 Jitka Plesnikova <jplesnik@redhat.com> - 4.50-3
- Perl 5.32 re-rebuild of bootstrapped packages
* Tue Jun 23 2020 Jitka Plesnikova <jplesnik@redhat.com> - 4.50-2
- Perl 5.32 rebuild
* Mon Jun 22 2020 Jitka Plesnikova <jplesnik@redhat.com> - 4.50-1
- 4.50 bump
* Mon Jun 08 2020 Jitka Plesnikova <jplesnik@redhat.com> - 4.49-1
- 4.49 bump
* Tue Jun 02 2020 Jitka Plesnikova <jplesnik@redhat.com> - 4.48-1
- 4.48 bump
* Mon May 04 2020 Jitka Plesnikova <jplesnik@redhat.com> - 4.47-1
- 4.47 bump
* Tue Feb 04 2020 Jitka Plesnikova <jplesnik@redhat.com> - 4.46-1
- 4.46 bump
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.45-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Mon Jan 13 2020 Jitka Plesnikova <jplesnik@redhat.com> - 4.45-1
- 4.45 bump
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.44-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Wed Jun 05 2019 Jitka Plesnikova <jplesnik@redhat.com> - 4.44-1
- 4.44 bump
* Sun Jun 02 2019 Jitka Plesnikova <jplesnik@redhat.com> - 4.43-3
- Perl 5.30 re-rebuild of bootstrapped packages
* Fri May 31 2019 Jitka Plesnikova <jplesnik@redhat.com> - 4.43-2
- Perl 5.30 rebuild
* Thu May 02 2019 Jitka Plesnikova <jplesnik@redhat.com> - 4.43-1
- 4.43 bump
* Wed Mar 27 2019 Jitka Plesnikova <jplesnik@redhat.com> - 4.42-1
- 4.42 bump
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.40-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Mon Aug 20 2018 Jitka Plesnikova <jplesnik@redhat.com> - 4.40-1
- 4.40 bump
* Tue Aug 14 2018 Jitka Plesnikova <jplesnik@redhat.com> - 4.39-1
- 4.39 bump
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.38-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Sat Jun 30 2018 Jitka Plesnikova <jplesnik@redhat.com> - 4.38-4
- Perl 5.28 re-rebuild of bootstrapped packages
* Thu Jun 28 2018 Jitka Plesnikova <jplesnik@redhat.com> - 4.38-3
- Perl 5.28 rebuild
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.38-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

5
plans/sanity.fmf Normal file
View File

@ -0,0 +1,5 @@
summary: Sanity tests
discover:
how: fmf
execute:
how: tmt

1
sources Normal file
View File

@ -0,0 +1 @@
SHA512 (CGI-4.51.tar.gz) = 1ff69bf78c346142f0355e816fae18c69eb57504c2fc06738f2d26b97adee7cee1df2b4b2246ae72532e769a613aea6d6f7027956066a0c12354658e62a98e5d

5
tests/upstream-tests.fmf Normal file
View File

@ -0,0 +1,5 @@
summary: Upstream tests
component: perl-CGI
require: perl-CGI-tests
test: /usr/libexec/perl-CGI/test