Compare commits

...

No commits in common. "c8-stream-2.066" and "c8-stream-5.26" have entirely different histories.

4 changed files with 12 additions and 99 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/Net-SSLeay-1.88.tar.gz
SOURCES/Net-SSLeay-1.85.tar.gz

View File

@ -1 +1 @@
ab4a63502433b91b9a54504475d9df2ae2887714 SOURCES/Net-SSLeay-1.88.tar.gz
5f1c7b6ccac81efd5b78b1e076c694f96ca5c439 SOURCES/Net-SSLeay-1.85.tar.gz

View File

@ -1,45 +0,0 @@
From 67d9ad2238c6b58ea160df731208cc6f50b64e96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Thu, 13 Jun 2019 13:14:26 +0200
Subject: [PATCH] pkgconfig
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Link to OpenSSL library according to pkgconfig output if available.
Signed-off-by: Petr Písař <ppisar@redhat.com>
---
Makefile.PL | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/Makefile.PL b/Makefile.PL
index 31d9c74..6d7ceba 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -200,11 +200,17 @@ EOM
@{ $opts->{lib_links} } = map { $_ =~ s/32\b//g } @{ $opts->{lib_links} } if $Config{use64bitall};
}
else {
- push @{ $opts->{lib_links} },
- ($rsaref
- ? qw( ssl crypto RSAglue rsaref z )
- : qw( ssl crypto z )
- );
+ my $libsflags = `pkg-config --libs-only-l openssl`;
+ if ( $libsflags ne '' ) {
+ push @{ $opts->{lib_links} }, map { s/^-l//; $_ } split(' ', $libsflags);
+ }
+ else {
+ push @{ $opts->{lib_links} },
+ ($rsaref
+ ? qw( ssl crypto RSAglue rsaref z )
+ : qw( ssl crypto z )
+ );
+ }
if (($Config{cc} =~ /aCC/i) && $^O eq 'hpux') {
print "*** Enabling HPUX aCC options (+e)\n";
--
2.20.1

View File

@ -8,14 +8,12 @@
%global rpm49 %(rpm --version | perl -p -e 's/^.* (\\d+)\\.(\\d+).*/sprintf("%d.%03d",$1,$2) ge 4.009 ? 1 : 0/e' 2>/dev/null || echo 0)
Name: perl-Net-SSLeay
Version: 1.88
Release: 2%{?dist}
Version: 1.85
Release: 1%{?dist}
Summary: Perl extension for using OpenSSL
License: Artistic 2.0
URL: https://metacpan.org/release/Net-SSLeay
Source0: https://cpan.metacpan.org/modules/by-module/Net/Net-SSLeay-%{version}.tar.gz
# To prevent from linking to zlib
Patch1: Net-SSLeay-1.88-pkgconfig.patch
URL: http://search.cpan.org/dist/Net-SSLeay/
Source0: http://search.cpan.org/CPAN/authors/id/M/MI/MIKEM/Net-SSLeay-%{version}.tar.gz
# =========== Module Build ===========================
BuildRequires: coreutils
BuildRequires: findutils
@ -28,11 +26,8 @@ BuildRequires: perl-generators
BuildRequires: perl-interpreter
BuildRequires: perl(Cwd)
BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: perl(ExtUtils::MM)
BuildRequires: perl(File::Basename)
BuildRequires: perl(File::Path)
BuildRequires: perl(Symbol)
BuildRequires: pkgconf-pkg-config
BuildRequires: perl(lib)
# =========== Module Runtime =========================
BuildRequires: perl(AutoLoader)
BuildRequires: perl(Carp)
@ -43,12 +38,9 @@ BuildRequires: perl(XSLoader)
# =========== Test Suite =============================
BuildRequires: perl(Config)
BuildRequires: perl(File::Spec)
BuildRequires: perl(FindBin)
BuildRequires: perl(HTTP::Tiny)
BuildRequires: perl(IO::Handle)
BuildRequires: perl(IO::Socket::INET)
BuildRequires: perl(lib)
BuildRequires: perl(Storable)
BuildRequires: perl(strict)
BuildRequires: perl(Test::More) >= 0.61
BuildRequires: perl(threads)
@ -56,10 +48,8 @@ BuildRequires: perl(warnings)
# =========== Optional Test Suite ====================
%if %{with perl_Net_SSLeay_enables_optional_test}
BuildRequires: perl(Test::Exception)
# Test::Kwalitee 1.00 not used
BuildRequires: perl(Test::NoWarnings)
BuildRequires: perl(Test::Pod) >= 1.0
# Test::Pod::Coverage 1.00 not used
BuildRequires: perl(Test::Warn)
%endif
# =========== Module Runtime =========================
@ -80,10 +70,6 @@ so you can write servers or clients for more complicated applications.
%prep
%setup -q -n Net-SSLeay-%{version}
# Get libraries to link against from pkg-config
# https://github.com/radiator-software/p5-net-ssleay/pull/127
%patch1 -p1
# Fix permissions in examples to avoid bogus doc-file dependencies
chmod -c 644 examples/*
@ -94,10 +80,9 @@ chmod -c 644 examples/*
%endif
%build
unset OPENSSL_PREFIX
PERL_MM_USE_DEFAULT=1 perl Makefile.PL \
INSTALLDIRS=vendor \
OPTIMIZE="%{optflags}" </dev/null
OPTIMIZE="%{optflags}"
make %{?_smp_mflags}
%install
@ -110,16 +95,18 @@ find %{buildroot} -type f -name '*.bs' -empty -delete
rm -f %{buildroot}%{perl_vendorarch}/Net/ptrtstrun.pl
%check
unset RELEASE_TESTING
make test
# Check for https://bugzilla.redhat.com/show_bug.cgi?id=1222521
perl -Iblib/{arch,lib} -MNet::SSLeay -e 'Net::SSLeay::CTX_v3_new()'
%files
%if 0%{?_licensedir:1}
%license LICENSE
%else
%doc LICENSE
%endif
%doc Changes CONTRIBUTING.md Credits QuickRef README examples/
%doc Changes Credits QuickRef README examples/
%{perl_vendorarch}/auto/Net/
%dir %{perl_vendorarch}/Net/
%{perl_vendorarch}/Net/SSLeay/
@ -129,35 +116,6 @@ make test
%{_mandir}/man3/Net::SSLeay::Handle.3*
%changelog
* Mon Nov 22 2021 Jitka Plesnikova <jplesnik@redhat.com> - 1.88-2
- BR: perl(FindBin) for test suite
* Thu Jun 13 2019 Petr Pisar <ppisar@redhat.com>- 1.88-1
- Update to 1.88 (bug #1632597, bug #1633630)
* Sat Sep 29 2018 Paul Howarth <paul@city-fan.org> - 1.85-6
- OpenSSL 1.1.1 in Fedora disables SSL3 API, so stop trying to test it
(bug #1610376)
* Wed Aug 15 2018 Petr Pisar <ppisar@redhat.com> - 1.85-5
- Revert retry in Net::SSLeay::{read,write}() (bug #1610376)
- Revert retry in Net::SSLeay::write_partial() (bug #1610376)
* Tue Aug 14 2018 Petr Pisar <ppisar@redhat.com> - 1.85-4
- Avoid SIGPIPE in t/local/36_verify.t (bug #1610376)
* Mon Aug 13 2018 Petr Pisar <ppisar@redhat.com> - 1.85-3
- Adapt to OpenSSL 1.1.1 (bug #1610376)
- Adapt tests to system-wide crypto policy (bug #1610376)
- Adapt tests to security level 2 system-wide crypt policy (bug #1610376)
* Mon Aug 13 2018 Jitka Plesnikova <jplesnik@redhat.com> - 1.85-2
- Add missing call to va_end() in TRACE() (bug #1607018)
* Sat Aug 11 2018 Troy Dawson <tdawson@redhat.com>
- Disable %%check so package will build for Mass Rebuild
- Related: bug#1614611
* Wed Mar 14 2018 Paul Howarth <paul@city-fan.org> - 1.85-1
- Update to 1.85
- Preparations for transferring maintenace to a new maintainer