From dfda0c2676f13429f739eb80eec96a8c2445bceb Mon Sep 17 00:00:00 2001
From: Paul Howarth <paul@city-fan.org>
Date: Jul 24 2013 11:16:24 +0000
Subject: Update to 2.007


- New upstream release 2.007
- BR: perl(Test::More) and perl(Time::HiRes)
- Add various other buildreqs for additional test coverage
- Don't use macros for commands
- Don't need to remove empty directories from the buildroot
- Drop %defattr, redundant since rpm 4.4
- Use DESTDIR rather than PERL_INSTALL_ROOT

---

diff --git a/.gitignore b/.gitignore
index b414fa7..ef938ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-Net-Server-0.97.tar.gz
-/Net-Server-2.006.tar.gz
+/Net-Server-[0-9.]*.tar.gz
diff --git a/Net-Server-2.007-cert-verify.patch b/Net-Server-2.007-cert-verify.patch
new file mode 100644
index 0000000..ca711f2
--- /dev/null
+++ b/Net-Server-2.007-cert-verify.patch
@@ -0,0 +1,24 @@
+Since 1.950, IO::Socket::SSL->SSL_verify_mode default changed
+from SSL_VERIFY_NONE to SSL_VERIFY_PEER, which breaks this test.
+
+IO::Socket::SSL version 1.31 or later is needed for the
+SSL_VERIFY_NONE constant.
+
+--- t/SSL_test.t
++++ t/SSL_test.t
+@@ -53,6 +53,7 @@
+ 
+ use_ok qw(Net::Server::Proto::SSL) or exit;
+ require Net::Server;
++use IO::Socket::SSL 1.31;
+ @Net::Server::Test::ISA = qw(Net::Server);
+ 
+ sub accept {
+@@ -76,6 +77,7 @@
+         my $remote = IO::Socket::SSL->new(
+             PeerAddr => $env->{'hostname'},
+             PeerPort => $env->{'ports'}->[0],
++            SSL_verify_mode => SSL_VERIFY_NONE,
+         ) || die "Couldn't open child to sock: $!";
+ 
+         my $line = <$remote>;
diff --git a/perl-Net-Server.spec b/perl-Net-Server.spec
index f14da9e..455fc4d 100644
--- a/perl-Net-Server.spec
+++ b/perl-Net-Server.spec
@@ -1,20 +1,29 @@
 Name:           perl-Net-Server
-Version:        2.006
-Release:        3%{?dist}
+Version:        2.007
+Release:        1%{?dist}
 Summary:        Extensible, general Perl server engine
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Net-Server/
 Source0:        http://www.cpan.org/modules/by-module/Net/Net-Server-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0:         Net-Server-2.007-cert-verify.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
 BuildArch:      noarch
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(Socket)
-Requires:       perl(Socket)
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-# IO::Multiplex support is optional, but since it's in Fedora and not
-# including it causes build problems in some packages…
-Requires: perl(IO::Multiplex)
+BuildRequires:  perl(Test::More)
+BuildRequires:  perl(Time::HiRes)
+Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
+
+# Also buildreq various optional modules for test suite
+BuildRequires:  perl(IO::Multiplex) >= 1.05
+BuildRequires:  perl(IO::Socket::INET6)
+BuildRequires:  perl(IO::Socket::SSL) >= 1.31
+BuildRequires:  perl(Net::SSLeay)
+BuildRequires:  perl(Socket6)
+ 
+# IO::Multiplex support is optional, but not including it causes build problems in some packages...
+Requires:       perl(IO::Multiplex) >= 1.05
 
 %description
 An extensible, class oriented module written in perl and intended to
@@ -23,21 +32,21 @@ be the back end layer of internet protocol servers.
 %prep
 %setup -q -n Net-Server-%{version}
 
+# Don't attempt to verify a test certificate (CPAN RT#86707)
+%patch0
+
+# Do not want to pull in any packaging deps here.
+chmod -c 644 examples/*
+
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor
+perl Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
-# Do not want to pull in any packaging deps here.
-chmod 644 examples/*
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
-make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-
+make pure_install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
-find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
-
-%{_fixperms} $RPM_BUILD_ROOT/*
+%{_fixperms} $RPM_BUILD_ROOT
 
 %check
 make test
@@ -46,7 +55,6 @@ make test
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root,-)
 %doc Changes README examples
 %{perl_vendorlib}/*
 %{_mandir}/man3/*
@@ -54,6 +62,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/net-server.1*
 
 %changelog
+* Wed Jul 24 2013 Paul Howarth <paul@city-fan.org> - 2.007-1
+- Update to 2.007
+- BR: perl(Test::More) and perl(Time::HiRes)
+- Add various other buildreqs for additional test coverage
+- Don't use macros for commands
+- Don't need to remove empty directories from the buildroot
+- Drop %%defattr, redundant since rpm 4.4
+- Use DESTDIR rather than PERL_INSTALL_ROOT
+
 * Wed Jul 17 2013 Petr Pisar <ppisar@redhat.com> - 2.006-3
 - Perl 5.18 rebuild
 
@@ -80,7 +97,7 @@ rm -rf $RPM_BUILD_ROOT
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
 * Tue Dec 21 2010 Marcela Maslanova <mmaslano@redhat.com> - 0.97-10
-- 661697 rebuild for fixing problems with vendorach/lib
+- Rebuild to fix problems with vendorarch/lib (#661697)
 
 * Tue May 04 2010 Marcela Maslanova <mmaslano@redhat.com> - 0.97-9
 - Mass rebuild with perl-5.12.0
diff --git a/sources b/sources
index f57f016..bd0a8fa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-74779e005acf97197799d936fe8a72d8  Net-Server-2.006.tar.gz
+b256c35a18caecc8fce9e6e1f2825658  Net-Server-2.007.tar.gz