Update to 1.979

- New upstream release 1.979
  - Hostname checking:
    - Configuration of 'leftmost' is renamed to 'full_label', but the old
      version is kept for compatibility reasons
    - Documentation of predefined schemes fixed to match reality
This commit is contained in:
Paul Howarth 2014-04-06 12:26:08 +01:00
parent 12ec243a1d
commit 2926895385
3 changed files with 9 additions and 75 deletions

View File

@ -1,69 +0,0 @@
From f00f9c221fd7d92b715434b7d96b26b644c8398f Mon Sep 17 00:00:00 2001
From: Steffen Ullrich <Steffen_Ullrich@genua.de>
Date: Fri, 4 Apr 2014 17:55:49 +0200
Subject: [PATCH] t/public_suffix_lib* - run test even if IDN lib cannot be
loaded, but skip IDN tests - don't use done_testing to work with older
Test::More
---
t/public_suffix_lib.pl | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/t/public_suffix_lib.pl b/t/public_suffix_lib.pl
index 6e6e3c5..66bdfe4 100644
--- a/t/public_suffix_lib.pl
+++ b/t/public_suffix_lib.pl
@@ -5,17 +5,19 @@
my $ps;
sub run_with_lib {
+ my @idnlib = @_;
my %require = (
'URI::_idna' => 0,
'Net::LibIDN' => 0,
'Net::IDN::Encode' => 0,
- map { $_ => 1 } @_,
+ map { $_ => 1 } @idnlib,
);
my %block;
+ my $can_idn;
while ( my ($lib,$load) = each %require ) {
if ( $load ) {
- eval "require $lib" or plan skip_all => "cannot load $lib: $@";
+ $can_idn = eval "require $lib";
} else {
$lib =~s{::}{/}g;
$block{"$lib.pm"} = 1;
@@ -28,6 +30,8 @@ sub run_with_lib {
require IO::Socket::SSL::PublicSuffix;
+ plan tests => 83;
+
# all one-level, but co.uk two-level
$ps = IO::Socket::SSL::PublicSuffix->from_string("*\nco.uk");
@@ -172,12 +176,14 @@ sub run_with_lib {
is public_suffix('www.test.k12.ak.us'), 'k12.ak.us';
# Domains and gTLDs with characters outside the ASCII range:
- if ( $ps->can_idn ) {
- is public_suffix('test.敎育.hk'), '敎育.hk';
- is public_suffix('ਭਾਰਤ.ਭਾਰਤ'), 'ਭਾਰਤ';
+ SKIP: {
+ if ( $can_idn ) {
+ is public_suffix('test.敎育.hk'), '敎育.hk';
+ is public_suffix('ਭਾਰਤ.ਭਾਰਤ'), 'ਭਾਰਤ';
+ } else {
+ skip "no IDN support with @idnlib",2
+ }
}
-
- done_testing();
}
--
1.9.1

View File

@ -1,12 +1,11 @@
Name: perl-IO-Socket-SSL
Version: 1.978
Version: 1.979
Release: 1%{?dist}
Summary: Perl library for transparent SSL
Group: Development/Libraries
License: GPL+ or Artistic
URL: http://search.cpan.org/dist/IO-Socket-SSL/
Source0: http://search.cpan.org/CPAN/authors/id/S/SU/SULLR/IO-Socket-SSL-%{version}.tar.gz
Patch0: https://github.com/noxxi/p5-io-socket-ssl/commit/f00f9c221fd7d92b715434b7d96b26b644c8398f.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
BuildArch: noarch
BuildRequires: openssl >= 0.9.8
@ -59,9 +58,6 @@ mod_perl.
%prep
%setup -q -n IO-Socket-SSL-%{version}
# Fix from upstream git to support building with Test::More < 0.88
%patch0 -p1
%build
echo n | perl Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}
@ -87,6 +83,13 @@ rm -rf %{buildroot}
%{_mandir}/man3/IO::Socket::SSL::Utils.3*
%changelog
* Sun Apr 6 2014 Paul Howarth <paul@city-fan.org> - 1.979-1
- Update to 1.979
- Hostname checking:
- Configuration of 'leftmost' is renamed to 'full_label', but the old
version is kept for compatibility reasons
- Documentation of predefined schemes fixed to match reality
* Fri Apr 4 2014 Paul Howarth <paul@city-fan.org> - 1.978-1
- Update to 1.978
- Added public prefix checking to verification of wildcard certificates, e.g.

View File

@ -1 +1 @@
72b0efa2b1a7777dde5ca88a069caf7e IO-Socket-SSL-1.978.tar.gz
3c2f1c40425b23867d6cf7c255dcc916 IO-Socket-SSL-1.979.tar.gz