From 3d7a5996906ab7be77802ab661cd647d0bdc2c5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <[email protected]> Date: Thu, 1 Jun 2017 15:31:35 +0200 Subject: 1.3 bump
--- .gitignore | 1 + ...field-tests-if-OpenSSL-does-not-suppport-.patch | 74 ---------------------- perl-Crypt-OpenSSL-EC.spec | 25 ++++---- sources | 2 +- 4 files changed, 14 insertions(+), 88 deletions(-) delete mode 100644 Crypt-OpenSSL-EC-1.01-Skip-prime-field-tests-if-OpenSSL-does-not-suppport-.patch diff --git a/.gitignore b/.gitignore index 6131d4a..09ad74c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /Crypt-OpenSSL-EC-1.01.tar.gz +/Crypt-OpenSSL-EC-1.3.tar.gz diff --git a/Crypt-OpenSSL-EC-1.01-Skip-prime-field-tests-if-OpenSSL-does-not-suppport-.patch b/Crypt-OpenSSL-EC-1.01-Skip-prime-field-tests-if-OpenSSL-does-not-suppport-.patch deleted file mode 100644 index d18955f..0000000 --- a/Crypt-OpenSSL-EC-1.01-Skip-prime-field-tests-if-OpenSSL-does-not-suppport-.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 89a1e4be8bccf793478fc07aac7003121de73dc3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <[email protected]> -Date: Mon, 27 Apr 2015 16:01:52 +0200 -Subject: [PATCH] Skip prime-field tests if OpenSSL does not suppport EC2M -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -prime-field.t exhibits many function calls with arguments that are not -support by OpenSSL if it was built without EC2M support. - -It's easier to skip all the tests instead of skipping almost all of -them. This patch does that if <openssl/opensslconf.h> defines -OPENSSL_NO_EC2M. - -Signed-off-by: Petr Písař <[email protected]> - -diff --git a/Makefile.PL b/Makefile.PL -index edacc74..4290278 100644 ---- a/Makefile.PL -+++ b/Makefile.PL -@@ -10,6 +10,9 @@ WriteMakefile( - NAME => 'Crypt::OpenSSL::EC', - VERSION_FROM => 'lib/Crypt/OpenSSL/EC.pm', - PREREQ_PM => { 'Crypt::OpenSSL::Bignum' => 0.04, -+ 'ExtUtils::CBuilder' => 0, -+ 'File::Spec' => 0, -+ 'File::Temp' => 0, - }, - ($] >= 5.005 ? ## Add these new keywords supported since 5.005 - (ABSTRACT_FROM => 'lib/Crypt/OpenSSL/EC.pm', # retrieve abstract from module -diff --git a/t/prime-field.t b/t/prime-field.t -index 0a9a2d9..033c0bf 100644 ---- a/t/prime-field.t -+++ b/t/prime-field.t -@@ -7,7 +7,34 @@ use Crypt::OpenSSL::Bignum::CTX; - - BEGIN { use_ok('Crypt::OpenSSL::EC') }; - --&prime_field_tests(); -+ -+# Check OpenSSL supports EC2M -+my $no_ec2m = 1; -+{ -+ use File::Spec; -+ use File::Temp; -+ use ExtUtils::CBuilder; -+ my $dir = File::Temp::tempdir(CLEANUP => 1); -+ my $file = File::Spec->catfile($dir, 'test.c'); -+ open my $fh, '>', $file or die; -+ print $fh <<TEST; -+#include <openssl/opensslconf.h> -+#ifdef OPENSSL_NO_EC2M -+#error EC2M disabled -+#endif -+TEST -+ close $fh or die; -+ my $object; -+ eval { $object = ExtUtils::CBuilder->new->compile(source => $file) }; -+ if (defined $object) { -+ $no_ec2m = 0; -+ } -+} -+ -+SKIP: { -+ skip('OpenSSL does not support EC2M', 262) if $no_ec2m; -+ &prime_field_tests(); -+}; - - sub prime_field_tests() - { --- -2.1.0 - diff --git a/perl-Crypt-OpenSSL-EC.spec b/perl-Crypt-OpenSSL-EC.spec index c904df8..fb11974 100644 --- a/perl-Crypt-OpenSSL-EC.spec +++ b/perl-Crypt-OpenSSL-EC.spec @@ -1,20 +1,20 @@ Name: perl-Crypt-OpenSSL-EC -Version: 1.01 -Release: 5%{?dist} +Version: 1.3 +Release: 1%{?dist} Summary: Perl extension for OpenSSL EC (Elliptic Curves) library License: GPL+ or Artistic -Group: Development/Libraries URL: http://search.cpan.org/dist/Crypt-OpenSSL-EC/ Source0: http://www.cpan.org/authors/id/M/MI/MIKEM/Crypt-OpenSSL-EC-%{version}.tar.gz -# Skip tests exercising disabled EC2M OpenSSL feature, CPAN RT#104000 -Patch0: Crypt-OpenSSL-EC-1.01-Skip-prime-field-tests-if-OpenSSL-does-not-suppport-.patch +BuildRequires: findutils +BuildRequires: gcc +BuildRequires: make BuildRequires: openssl-devel BuildRequires: perl BuildRequires: perl-devel BuildRequires: perl-generators -# Use ExtUtils::Constant to regenerated XS code +# Use ExtUtils::Constant to regenerate XS code BuildRequires: perl(ExtUtils::Constant) -BuildRequires: perl(ExtUtils::MakeMaker) +BuildRequires: perl(ExtUtils::MakeMaker) >= 6.76 BuildRequires: perl(File::Copy) BuildRequires: perl(File::Spec) # Run-time: @@ -27,8 +27,6 @@ BuildRequires: perl(XSLoader) # Tests: BuildRequires: perl(Crypt::OpenSSL::Bignum) >= 0.04 BuildRequires: perl(Crypt::OpenSSL::Bignum::CTX) -BuildRequires: perl(ExtUtils::CBuilder) -BuildRequires: perl(File::Temp) BuildRequires: perl(Test::More) Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) @@ -38,16 +36,14 @@ OpenSSL Elliptic Curve library. Some object-oriented calls are supported. %prep %setup -q -n Crypt-OpenSSL-EC-%{version} -%patch0 -p1 %build -perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" +perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 OPTIMIZE="$RPM_OPT_FLAGS" make %{?_smp_mflags} %install make pure_install DESTDIR=$RPM_BUILD_ROOT -find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; -find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -exec rm -f {} \; +find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -delete %{_fixperms} $RPM_BUILD_ROOT/* %check @@ -60,6 +56,9 @@ make test %{_mandir}/man3/* %changelog +* Thu Jun 01 2017 Petr Pisar <[email protected]> - 1.3-1 +- 1.3 bump + * Sun May 15 2016 Jitka Plesnikova <[email protected]> - 1.01-5 - Perl 5.24 rebuild diff --git a/sources b/sources index 51c8a3e..bb3efd7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -742f192f26bcac2249017cdd9e8bac35 Crypt-OpenSSL-EC-1.01.tar.gz +SHA512 (Crypt-OpenSSL-EC-1.3.tar.gz) = 39f879248a95858199d578dfdac03f88dbcf2cd70ac0e7619f0b25587078c2def7cfe2a080b135850bdb516e38edf22ce2d795cb7711d0fdce0b3d9ef2f8a9bc -- cgit v1.1 https://src.fedoraproject.org/cgit/perl-Crypt-OpenSSL-EC.git/commit/?h=f25&id=3d7a5996906ab7be77802ab661cd647d0bdc2c5c _______________________________________________ perl-devel mailing list -- [email protected] To unsubscribe send an email to [email protected]
