From dc15a2937227d71d1846481ed5191ff5e5990139 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Wed, 26 May 2021 13:24:18 +0200 Subject: [PATCH] 0.29 bump --- .gitignore | 1 + Convert-ASN1-0.27-CVE-2013-7488.patch | 45 --- ...-ASN1-0.27-Correct-shebangs-in-tests.patch | 257 ------------------ perl-Convert-ASN1.spec | 26 +- sources | 2 +- 5 files changed, 16 insertions(+), 315 deletions(-) delete mode 100644 Convert-ASN1-0.27-CVE-2013-7488.patch delete mode 100644 Convert-ASN1-0.27-Correct-shebangs-in-tests.patch diff --git a/.gitignore b/.gitignore index 4628c0b..89eed4d 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ Convert-ASN1-0.22.tar.gz /Convert-ASN1-0.23.tar.gz /Convert-ASN1-0.26.tar.gz /Convert-ASN1-0.27.tar.gz +/Convert-ASN1-0.29.tar.gz diff --git a/Convert-ASN1-0.27-CVE-2013-7488.patch b/Convert-ASN1-0.27-CVE-2013-7488.patch deleted file mode 100644 index 4bc9a6f..0000000 --- a/Convert-ASN1-0.27-CVE-2013-7488.patch +++ /dev/null @@ -1,45 +0,0 @@ -From ce148a2e0872b708450005cf0b3a944014aae990 Mon Sep 17 00:00:00 2001 -From: Dana Jacobsen -Date: Tue, 29 Oct 2013 08:37:48 -0700 -Subject: [PATCH 1/2] Fix unsafe decoding in indef case - -Bug: https://github.com/gbarr/perl-Convert-ASN1/pull/15 ---- - lib/Convert/ASN1/_decode.pm | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lib/Convert/ASN1/_decode.pm b/lib/Convert/ASN1/_decode.pm -index e811e8d..eb2b584 100644 ---- a/lib/Convert/ASN1/_decode.pm -+++ b/lib/Convert/ASN1/_decode.pm -@@ -685,6 +685,7 @@ sub _scan_indef { - if((unpack("C",$tag) & 0x1f) == 0x1f) { - my $b; - do { -+ return if $pos >= $end; - $tag .= substr($_[0],$pos++,1); - $b = ord substr($tag,-1); - } while($b & 0x80); - -From 8125d99e15596fee1b5f904ed74a76bccf54082d Mon Sep 17 00:00:00 2001 -From: Dana Jacobsen -Date: Tue, 29 Oct 2013 08:53:09 -0700 -Subject: [PATCH 2/2] Add second part of position check - -Bug: https://github.com/gbarr/perl-Convert-ASN1/pull/15 ---- - lib/Convert/ASN1/_decode.pm | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lib/Convert/ASN1/_decode.pm b/lib/Convert/ASN1/_decode.pm -index eb2b584..67b95aa 100644 ---- a/lib/Convert/ASN1/_decode.pm -+++ b/lib/Convert/ASN1/_decode.pm -@@ -679,6 +679,7 @@ sub _scan_indef { - $pos += 2; - next; - } -+ return if $pos >= $end; - - my $tag = substr($_[0], $pos++, 1); - diff --git a/Convert-ASN1-0.27-Correct-shebangs-in-tests.patch b/Convert-ASN1-0.27-Correct-shebangs-in-tests.patch deleted file mode 100644 index 607465f..0000000 --- a/Convert-ASN1-0.27-Correct-shebangs-in-tests.patch +++ /dev/null @@ -1,257 +0,0 @@ -From f3ffdf1baa2a5400bdaadc44ef6015c3003a42bc Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Wed, 28 Aug 2019 09:56:10 +0200 -Subject: [PATCH] Correct shebangs in tests -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Petr Písař ---- - t/00prim.t | 2 +- - t/01tag.t | 2 +- - t/02seq.t | 2 +- - t/03seqof.t | 2 +- - t/04opt.t | 2 +- - t/05time.t | 2 +- - t/06bigint.t | 2 +- - t/07io.t | 2 +- - t/08set.t | 2 +- - t/09contr.t | 2 +- - t/10choice.t | 2 +- - t/11explicit.t | 2 +- - t/11indef.t | 2 +- - t/12der.t | 2 +- - t/13utf8.t | 2 +- - t/14any.t | 2 +- - t/15extseq.t | 2 +- - t/16extset.t | 2 +- - t/17extchoice.t | 2 +- - t/18tagdefault.t | 2 +- - t/99misc.t | 2 +- - t/x509.t | 2 +- - 22 files changed, 22 insertions(+), 22 deletions(-) - -diff --git a/t/00prim.t b/t/00prim.t -index 904c9c6..cd18732 100644 ---- a/t/00prim.t -+++ b/t/00prim.t -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/perl - - # - # Test that the primitive operators are working -diff --git a/t/01tag.t b/t/01tag.t -index 40e28a0..dd375af 100644 ---- a/t/01tag.t -+++ b/t/01tag.t -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/perl - - # - # Test that the primitive operators are working -diff --git a/t/02seq.t b/t/02seq.t -index bc21712..531f2fe 100644 ---- a/t/02seq.t -+++ b/t/02seq.t -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/perl - - # - # Test the use of sequences -diff --git a/t/03seqof.t b/t/03seqof.t -index 66683b6..a5e699b 100644 ---- a/t/03seqof.t -+++ b/t/03seqof.t -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/perl - - # - # Test that the primitive operators are working -diff --git a/t/04opt.t b/t/04opt.t -index 7f23fca..33fba19 100644 ---- a/t/04opt.t -+++ b/t/04opt.t -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/perl - - # - # Test that the primitive operators are working -diff --git a/t/05time.t b/t/05time.t -index f444e7f..fe6a179 100644 ---- a/t/05time.t -+++ b/t/05time.t -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/perl - - # - # Test that the primitive operators are working -diff --git a/t/06bigint.t b/t/06bigint.t -index f9aeba3..ab1164f 100644 ---- a/t/06bigint.t -+++ b/t/06bigint.t -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/perl - - # - # Test bigint INTEGER encoding/decoding -diff --git a/t/07io.t b/t/07io.t -index 706cf51..b4c0c58 100644 ---- a/t/07io.t -+++ b/t/07io.t -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/perl - - use Convert::ASN1 qw(:io); - use IO::Socket; -diff --git a/t/08set.t b/t/08set.t -index b35a7ba..7554157 100644 ---- a/t/08set.t -+++ b/t/08set.t -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/perl - - # - # Test the use of sets -diff --git a/t/09contr.t b/t/09contr.t -index 2213c7e..72d25fc 100644 ---- a/t/09contr.t -+++ b/t/09contr.t -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/perl - - # - # Test the decode on constructed values -diff --git a/t/10choice.t b/t/10choice.t -index 6ceeb6d..93d194f 100644 ---- a/t/10choice.t -+++ b/t/10choice.t -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/perl - - # - # Test the use of choices -diff --git a/t/11explicit.t b/t/11explicit.t -index 7e24506..195958c 100644 ---- a/t/11explicit.t -+++ b/t/11explicit.t -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/perl - - BEGIN { require 't/funcs.pl' } - -diff --git a/t/11indef.t b/t/11indef.t -index 7c3886d..b0581d7 100644 ---- a/t/11indef.t -+++ b/t/11indef.t -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/perl - - # - # Test that indefinite length encodings can be decoded -diff --git a/t/12der.t b/t/12der.t -index b7d1b79..4469bd1 100644 ---- a/t/12der.t -+++ b/t/12der.t -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/perl - - # - # Test the use of sets -diff --git a/t/13utf8.t b/t/13utf8.t -index 1f62042..c8bff82 100644 ---- a/t/13utf8.t -+++ b/t/13utf8.t -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/perl - - # - # Test the use of utf8 strings -diff --git a/t/14any.t b/t/14any.t -index 4147764..799e1dc 100644 ---- a/t/14any.t -+++ b/t/14any.t -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/perl - - # - # Check whether the ANY DEFINED BY syntax is working -diff --git a/t/15extseq.t b/t/15extseq.t -index 6060793..af934e2 100644 ---- a/t/15extseq.t -+++ b/t/15extseq.t -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/perl - - # - # Test the use of sequences -diff --git a/t/16extset.t b/t/16extset.t -index c57ac0c..f3fbea7 100644 ---- a/t/16extset.t -+++ b/t/16extset.t -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/perl - - # - # Test the use of sequences -diff --git a/t/17extchoice.t b/t/17extchoice.t -index 66bd9c5..a3ba5d9 100644 ---- a/t/17extchoice.t -+++ b/t/17extchoice.t -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/perl - - # - # Test the use of sequences -diff --git a/t/18tagdefault.t b/t/18tagdefault.t -index 6a1fa3b..18fb1d8 100644 ---- a/t/18tagdefault.t -+++ b/t/18tagdefault.t -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/perl - - # - # Test that default EXPLICIT tagging works. -diff --git a/t/99misc.t b/t/99misc.t -index 4b67aba..da3044a 100644 ---- a/t/99misc.t -+++ b/t/99misc.t -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/perl - - # - # Misc tests from github reported issues -diff --git a/t/x509.t b/t/x509.t -index 3fd5ba0..f931385 100644 ---- a/t/x509.t -+++ b/t/x509.t -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/perl - - print "1..26\n"; - --- -2.21.0 - diff --git a/perl-Convert-ASN1.spec b/perl-Convert-ASN1.spec index d6ba564..59eb41d 100644 --- a/perl-Convert-ASN1.spec +++ b/perl-Convert-ASN1.spec @@ -3,19 +3,14 @@ Summary: ASN.1 encode/decode library Name: perl-Convert-ASN1 -Version: 0.27 -Release: 23%{?dist} +Version: 0.29 +Release: 1%{?dist} License: GPL+ or Artistic URL: https://metacpan.org/release/Convert-ASN1 -Source0: https://cpan.metacpan.org/authors/id/G/GB/GBARR/Convert-ASN1-%{version}.tar.gz -# Correct shebangs in the tests -Patch0: Convert-ASN1-0.27-Correct-shebangs-in-tests.patch +Source0: https://cpan.metacpan.org/authors/id/T/TI/TIMLEGGE/Convert-ASN1-%{version}.tar.gz # Allow running tests from a read-only location, # -Patch1: Convert-ASN1-0.27-Use-temporary-output-files-for-tests.patch -# Fix unsafe decoding in indef case, -# -Patch2: Convert-ASN1-0.27-CVE-2013-7488.patch +Patch0: Convert-ASN1-0.27-Use-temporary-output-files-for-tests.patch BuildArch: noarch BuildRequires: coreutils BuildRequires: make @@ -41,6 +36,7 @@ BuildRequires: perl(bytes) BuildRequires: perl(File::Temp) BuildRequires: perl(IO::Socket) BuildRequires: perl(Math::BigInt) >= 1.997 +BuildRequires: perl(Test::More) >= 0.90 %if %{with perl_Convert_ASN1_enables_optional_test} # Optional tests: BuildRequires: perl(Data::Dumper) @@ -76,9 +72,12 @@ with "%{_libexecdir}/%{name}/test". %prep %setup -q -n Convert-ASN1-%{version} %patch0 -p1 -%patch1 -p1 -%patch2 -p1 -chmod +x t/*.t + +# Help file to recognise the Perl scripts +for F in t/*.t; do + perl -i -MConfig -ple 'print $Config{startperl} if $. == 1 && !s{\A#!.*perl\b}{$Config{startperl}}' "$F" + chmod +x "$F" +done %build perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1 @@ -109,6 +108,9 @@ make test %{_libexecdir}/%{name} %changelog +* Wed May 26 2021 Jitka Plesnikova - 0.29-1 +- 0.29 bump + * Fri May 21 2021 Jitka Plesnikova - 0.27-23 - Perl 5.34 rebuild diff --git a/sources b/sources index 51cecb1..9fb13be 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -68723e96be0b258a9e20480276e8a62c Convert-ASN1-0.27.tar.gz +SHA512 (Convert-ASN1-0.29.tar.gz) = 3a4906a3df33ee2070a718508bc58335c5e8fb334859782c4d47aa44efe500fa9c7e3bd27f9604a46bdf7123451a94fd6abcdae09eb3fd53a385dcae1a0fe4d0