On 12/16/14 01:52, Alexander Bluhm wrote:
> Hi,
>
> The regression tests of www/p5-LWP-Protocol-https fail if
> net/p5-IO-Socket-IP is installed.
>
> ===> Regression tests for p5-LWP-Protocol-https-6.06p0
> PERL_DL_NONLAZY=1 /usr/bin/perl "-MExtUtils::Command::MM" "-MTest::Harness"
> "-e" "undef *Test::Harness::Switches; test_harness(0, 'blib/lib',
> 'blib/arch')" t/*.t
> t/apache.t ....... ok
> unexpected response: 500 Can't connect to 127.0.0.1:41264
> Content-Type: text/plain
> Client-Date: Tue, 16 Dec 2014 01:45:08 GMT
> Client-Warning: Internal response
>
> Can't connect to 127.0.0.1:41264
>
> Resource temporarily unavailable at
> /usr/local/libdata/perl5/site_perl/LWP/Protocol/http.pm line 49.
> # Looks like you planned 56 tests but ran 24.
> # Looks like your test exited with 35 just after 24.
> # creating cert for direct.ssl.access
> # SSL handshake failed: SSL accept attempt failed
> t/https_proxy.t ..
> Dubious, test returned 35 (wstat 8960, 0x2300)
> Failed 32/56 subtests
>
> There is a bug in p5-IO-Socket-IP-0.33, it does not restore the
> blocking mode of the client ssl socket. This results in the "Resource
> temporarily unavailable" error. The following patch fixes it, while
> there update p5-IO-Socket-IP to 0.34.
>
> ok?
>
> bluhm
>
> Index: net/p5-IO-Socket-IP/Makefile
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/ports/net/p5-IO-Socket-IP/Makefile,v
> retrieving revision 1.5
> diff -u -p -r1.5 Makefile
> --- net/p5-IO-Socket-IP/Makefile 22 Nov 2014 22:49:09 -0000 1.5
> +++ net/p5-IO-Socket-IP/Makefile 16 Dec 2014 00:15:18 -0000
> @@ -2,7 +2,7 @@
>
> COMMENT = family-neutral IP socket supporting both IPv4 and IPv6
>
> -DISTNAME = IO-Socket-IP-0.33
> +DISTNAME = IO-Socket-IP-0.34
>
> CATEGORIES = net
>
> Index: net/p5-IO-Socket-IP/distinfo
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/ports/net/p5-IO-Socket-IP/distinfo,v
> retrieving revision 1.5
> diff -u -p -r1.5 distinfo
> --- net/p5-IO-Socket-IP/distinfo 22 Nov 2014 22:49:09 -0000 1.5
> +++ net/p5-IO-Socket-IP/distinfo 16 Dec 2014 00:15:22 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (IO-Socket-IP-0.33.tar.gz) =
> v4fGgQnC4pRlfnVfZq/tzCIl0vLrMjZ9MW6Uyls4QLY=
> -SIZE (IO-Socket-IP-0.33.tar.gz) = 43445
> +SHA256 (IO-Socket-IP-0.34.tar.gz) =
> jiWt461GsT3/KTxdsLQQYec8bxYdlrlDWuYBDO2KD1o=
> +SIZE (IO-Socket-IP-0.34.tar.gz) = 43563
> Index: net/p5-IO-Socket-IP/patches/patch-lib_IO_Socket_IP_pm
> ===================================================================
> RCS file: net/p5-IO-Socket-IP/patches/patch-lib_IO_Socket_IP_pm
> diff -N net/p5-IO-Socket-IP/patches/patch-lib_IO_Socket_IP_pm
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ net/p5-IO-Socket-IP/patches/patch-lib_IO_Socket_IP_pm 16 Dec 2014
> 00:19:57 -0000
> @@ -0,0 +1,11 @@
> +$OpenBSD$
> +--- lib/IO/Socket/IP.pm.orig Wed Dec 3 01:06:55 2014
> ++++ lib/IO/Socket/IP.pm Tue Dec 16 01:19:47 2014
> +@@ -672,6 +672,7 @@ sub connect
> +
> + if( !$err ) {
> + # All happy
> ++ $self->blocking( $was_blocking );
> + return 1;
> + }
> + elsif( not( $err == EINPROGRESS or $err == EWOULDBLOCK ) ) {
> .
>
This is a possible wrong direction p5-IO-Socket-IP should no longer be a
port, this has been moved into base it's now part of Perl core. If you
want to update this then maybe you could update the base, otherwise
there is confusion or take this out of base and use the port. There
should be only one version - which?
The reason why my testing of p5-LWP-Protocol-https didn't fail was it
was tested against the base IO::Socket::IP version 0.29 not the port.
===> Regression tests for p5-LWP-Protocol-https-6.06p0
PERL_DL_NONLAZY=1 /usr/bin/perl "-MExtUtils::Command::MM"
"-MTest::Harness" "-e" "undef *Test::Harness::Switches; test_harness(0,
'blib/lib', 'blib/arch')" t/*.t
t/apache.t ....... ok
# creating cert for direct.ssl.access
# creating cert for direct.ssl.access
# creating cert for foo
# creating cert for bar
# creating cert for foo
# creating cert for foo
# creating cert for bar
# creating cert for bar
t/https_proxy.t .. ok
All tests successful.
Files=2, Tests=61, 3 wallclock secs ( 0.02 usr 0.01 sys + 0.50 cusr
0.09 csys = 0.62 CPU)
Result: PASS
$ pkg_info p5-IO-Socket-IP
$
$ corelist IO::Socket::IP
Data for 2014-09-14
IO::Socket::IP was first released with perl v5.19.8
and the version is 0.29 is in the base
$ corelist --diff v5.18.2 v5.20.1 | grep IO::Socket::IP
IO::Socket::IP (absent) 0.29
Seek a look at future Perl versions so far...
$ cd /usr/ports/openbsd-wip/devel/p5-Module-CoreList/
$ make patch
===> Checking files for p5-Module-CoreList-5.20141120
`/usr/ports/distfiles/Module-CoreList-5.20141120.tar.gz' is up to date.
>> (SHA256) Module-CoreList-5.20141120.tar.gz: OK
===> Extracting for p5-Module-CoreList-5.20141120
===> Patching for p5-Module-CoreList-5.20141120
$ cd `make show=WRKSRC`
$ perl -Ilib ./corelist --diff v5.18.2 v5.21.6 | grep IO::Socket::IP
IO::Socket::IP (absent) 0.32
0.30 and later added extra features none of the current ports actually
make use of these and don't have a requirement for a > 0.29 version.
These features are intended for a future Perl release 5.21.0 or later.
I have updates for Perl 5.18.2 to 5.20.1, and 5.21.0/later (when
Module::Build / CGI will be removed from core). Among the 5.18.2, 5.20.1
updates I was asked to hold back until 5.20.1 problems resolved,
includes removing p5-IO-Socket-IP as a dependency, and some other 5.20.1
issues that haven't been dealt with yet. Starting to clear my backlog now.
Locally I cleaned out net/p5-IO-Socket-IP
$ ls net/p5-IO-Socket-IP/
CVS pkg
I've unlinked the port for my local builds/deleted the package.
$ grep IO-Socket net/Makefile
SUBDIR += p5-IO-Socket-INET6
# SUBDIR += p5-IO-Socket-IP
SUBDIR += p5-IO-Socket-Multicast
SUBDIR += p5-IO-Socket-Socks
Also need an updated quirks makes installed p5-IO-Scoket-IP disappear...
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.199
diff -u -p -r1.199 Makefile
--- Makefile 16 Dec 2014 10:43:56 -0000 1.199
+++ Makefile 16 Dec 2014 16:43:37 -0000
@@ -5,7 +5,7 @@ CATEGORIES = devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-2.45
+PKGNAME = quirks-2.46
PKG_ARCH = *
MAINTAINER = Marc Espie <[email protected]>
Index: files/Quirks.pm
===================================================================
RCS file: /home/cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.206
diff -u -p -r1.206 Quirks.pm
--- files/Quirks.pm 16 Dec 2014 10:43:56 -0000 1.206
+++ files/Quirks.pm 16 Dec 2014 16:42:27 -0000
@@ -96,6 +96,8 @@ my $base_exceptions = {
'sqlite3' => '/usr/bin/sqlite3',
# 5.6
'unbound' => '/usr/sbin/unbound',
+# 5.7
+ 'p5-IO-Socket-IP' => "$p5/IO/Socket/IP.pm",
};
my $stem_extensions = {
I also cleaned out all the old Perl 5.18.2.
