Re: fix SSL and update www/p5-Mojo

2014-05-15 Thread Remi Locherer 
On Thu, May 15, 2014 at 01:01:50AM +0200, Alexander Bluhm wrote:
 Hi,
 
 I am the maintainer of the security/p5-IO-Socket-SSL port.  Upgrading
 it to 1.984 breaks the www/p5-Mojo port.  The latter needs to be
 fixed, my patch has already been commited upstream.  While there I
 also update p5-Mojo to 4.99 as it contains other SSL fixes.
 
 ok?

Works for me on amd64 -current from May 11. Though make test fails.
Something with the useragent is wrong. But my simple mojo get ... tests
worked fine.

The test from the two dependent ports www/p5-MojoX-Session and
textproc/p5-Mojolicious-Plugin-TtRenderer passed.

Remi

 
 bluhm
 
 Index: www/p5-Mojo/Makefile
 ===
 RCS file: /data/mirror/openbsd/cvs/ports/www/p5-Mojo/Makefile,v
 retrieving revision 1.12
 diff -u -p -r1.12 Makefile
 --- www/p5-Mojo/Makefile  21 Jan 2014 20:49:41 -  1.12
 +++ www/p5-Mojo/Makefile  14 May 2014 22:48:05 -
 @@ -3,7 +3,7 @@
  COMMENT =next generation web framework
  
  MODULES =cpan
 -DISTNAME =   Mojolicious-4.66
 +DISTNAME =   Mojolicious-4.99
  CATEGORIES = www
  
  MAINTAINER = Simon Bertrang si...@openbsd.org
 @@ -16,8 +16,8 @@ HOMEPAGE =  http://mojolicio.us/
  CPAN_AUTHOR =SRI
  
  RUN_DEPENDS =devel/p5-EV \
 - net/p5-IO-Socket-IP \
 - security/p5-IO-Socket-SSL
 + net/p5-IO-Socket-IP=0.20 \
 + security/p5-IO-Socket-SSL=1.84
  
  MAKE_ENV += TEST_CACHING=Yes
  MAKE_ENV += TEST_EV=Yes
 Index: www/p5-Mojo/distinfo
 ===
 RCS file: /data/mirror/openbsd/cvs/ports/www/p5-Mojo/distinfo,v
 retrieving revision 1.9
 diff -u -p -r1.9 distinfo
 --- www/p5-Mojo/distinfo  21 Jan 2014 20:49:41 -  1.9
 +++ www/p5-Mojo/distinfo  13 May 2014 19:50:22 -
 @@ -1,2 +1,2 @@
 -SHA256 (Mojolicious-4.66.tar.gz) = 
 YTZlpyOrYlHLoWNDfqjWThinDhqVWPfPfil3K3KOyjQ=
 -SIZE (Mojolicious-4.66.tar.gz) = 617312
 +SHA256 (Mojolicious-4.99.tar.gz) = 
 oc2usV+fawcyZxVzku5QhiTkGD/cFvqOXaOiNXoPtyg=
 +SIZE (Mojolicious-4.99.tar.gz) = 633846
 Index: www/p5-Mojo/patches/patch-lib_Mojo_IOLoop_Server_pm
 ===
 RCS file: www/p5-Mojo/patches/patch-lib_Mojo_IOLoop_Server_pm
 diff -N www/p5-Mojo/patches/patch-lib_Mojo_IOLoop_Server_pm
 --- /dev/null 1 Jan 1970 00:00:00 -
 +++ www/p5-Mojo/patches/patch-lib_Mojo_IOLoop_Server_pm   14 May 2014 
 20:20:20 -
 @@ -0,0 +1,14 @@
 +$OpenBSD$
 +https://github.com/kraih/mojo/issues/622
 +
 +--- lib/Mojo/IOLoop/Server.pm.orig   Sun May 11 20:27:28 2014
  lib/Mojo/IOLoop/Server.pmTue May 13 23:04:55 2014
 +@@ -127,7 +127,7 @@ sub _accept {
 + # Start TLS handshake
 + $self-emit_safe(accept = $handle) and next unless my $tls = 
 $self-{tls};
 + $self-_handshake($self-{handles}{$handle} = $handle)
 +-  if $handle = IO::Socket::SSL-start_SSL($handle, %$tls);
 ++  if $handle = IO::Socket::SSL-start_SSL($handle, %$tls, SSL_server = 
 1);
 +   }
 + }
 + 
 Index: www/p5-Mojo/pkg/PLIST
 ===
 RCS file: /data/mirror/openbsd/cvs/ports/www/p5-Mojo/pkg/PLIST,v
 retrieving revision 1.6
 diff -u -p -r1.6 PLIST
 --- www/p5-Mojo/pkg/PLIST 21 Jan 2014 20:49:41 -  1.6
 +++ www/p5-Mojo/pkg/PLIST 14 May 2014 20:26:34 -
 @@ -182,10 +182,9 @@ ${P5SITE}/Mojolicious/public/mojo/pretti
  ${P5SITE}/Mojolicious/public/mojo/prettify/run_prettify.js
  ${P5SITE}/Mojolicious/public/mojo/stripes.png
  ${P5SITE}/Mojolicious/templates/
 -${P5SITE}/Mojolicious/templates/exception.development.html.ep
 +${P5SITE}/Mojolicious/templates/development.html.ep
  ${P5SITE}/Mojolicious/templates/exception.html.ep
  ${P5SITE}/Mojolicious/templates/mojobar.html.ep
 -${P5SITE}/Mojolicious/templates/not_found.development.html.ep
  ${P5SITE}/Mojolicious/templates/not_found.html.ep
  ${P5SITE}/Mojolicious/templates/perldoc.html.ep
  ${P5SITE}/Test/

fix SSL and update www/p5-Mojo

2014-05-14 Thread Alexander Bluhm 
Hi,

I am the maintainer of the security/p5-IO-Socket-SSL port.  Upgrading
it to 1.984 breaks the www/p5-Mojo port.  The latter needs to be
fixed, my patch has already been commited upstream.  While there I
also update p5-Mojo to 4.99 as it contains other SSL fixes.

ok?

bluhm

Index: www/p5-Mojo/Makefile
===
RCS file: /data/mirror/openbsd/cvs/ports/www/p5-Mojo/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- www/p5-Mojo/Makefile21 Jan 2014 20:49:41 -  1.12
+++ www/p5-Mojo/Makefile14 May 2014 22:48:05 -
@@ -3,7 +3,7 @@
 COMMENT =  next generation web framework
 
 MODULES =  cpan
-DISTNAME = Mojolicious-4.66
+DISTNAME = Mojolicious-4.99
 CATEGORIES =   www
 
 MAINTAINER =   Simon Bertrang si...@openbsd.org
@@ -16,8 +16,8 @@ HOMEPAGE =http://mojolicio.us/
 CPAN_AUTHOR =  SRI
 
 RUN_DEPENDS =  devel/p5-EV \
-   net/p5-IO-Socket-IP \
-   security/p5-IO-Socket-SSL
+   net/p5-IO-Socket-IP=0.20 \
+   security/p5-IO-Socket-SSL=1.84
 
 MAKE_ENV += TEST_CACHING=Yes
 MAKE_ENV += TEST_EV=Yes
Index: www/p5-Mojo/distinfo
===
RCS file: /data/mirror/openbsd/cvs/ports/www/p5-Mojo/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- www/p5-Mojo/distinfo21 Jan 2014 20:49:41 -  1.9
+++ www/p5-Mojo/distinfo13 May 2014 19:50:22 -
@@ -1,2 +1,2 @@
-SHA256 (Mojolicious-4.66.tar.gz) = YTZlpyOrYlHLoWNDfqjWThinDhqVWPfPfil3K3KOyjQ=
-SIZE (Mojolicious-4.66.tar.gz) = 617312
+SHA256 (Mojolicious-4.99.tar.gz) = oc2usV+fawcyZxVzku5QhiTkGD/cFvqOXaOiNXoPtyg=
+SIZE (Mojolicious-4.99.tar.gz) = 633846
Index: www/p5-Mojo/patches/patch-lib_Mojo_IOLoop_Server_pm
===
RCS file: www/p5-Mojo/patches/patch-lib_Mojo_IOLoop_Server_pm
diff -N www/p5-Mojo/patches/patch-lib_Mojo_IOLoop_Server_pm
--- /dev/null   1 Jan 1970 00:00:00 -
+++ www/p5-Mojo/patches/patch-lib_Mojo_IOLoop_Server_pm 14 May 2014 20:20:20 
-
@@ -0,0 +1,14 @@
+$OpenBSD$
+https://github.com/kraih/mojo/issues/622
+
+--- lib/Mojo/IOLoop/Server.pm.orig Sun May 11 20:27:28 2014
 lib/Mojo/IOLoop/Server.pm  Tue May 13 23:04:55 2014
+@@ -127,7 +127,7 @@ sub _accept {
+ # Start TLS handshake
+ $self-emit_safe(accept = $handle) and next unless my $tls = 
$self-{tls};
+ $self-_handshake($self-{handles}{$handle} = $handle)
+-  if $handle = IO::Socket::SSL-start_SSL($handle, %$tls);
++  if $handle = IO::Socket::SSL-start_SSL($handle, %$tls, SSL_server = 
1);
+   }
+ }
+ 
Index: www/p5-Mojo/pkg/PLIST
===
RCS file: /data/mirror/openbsd/cvs/ports/www/p5-Mojo/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST
--- www/p5-Mojo/pkg/PLIST   21 Jan 2014 20:49:41 -  1.6
+++ www/p5-Mojo/pkg/PLIST   14 May 2014 20:26:34 -
@@ -182,10 +182,9 @@ ${P5SITE}/Mojolicious/public/mojo/pretti
 ${P5SITE}/Mojolicious/public/mojo/prettify/run_prettify.js
 ${P5SITE}/Mojolicious/public/mojo/stripes.png
 ${P5SITE}/Mojolicious/templates/
-${P5SITE}/Mojolicious/templates/exception.development.html.ep
+${P5SITE}/Mojolicious/templates/development.html.ep
 ${P5SITE}/Mojolicious/templates/exception.html.ep
 ${P5SITE}/Mojolicious/templates/mojobar.html.ep
-${P5SITE}/Mojolicious/templates/not_found.development.html.ep
 ${P5SITE}/Mojolicious/templates/not_found.html.ep
 ${P5SITE}/Mojolicious/templates/perldoc.html.ep
 ${P5SITE}/Test/

Re: fix SSL and update www/p5-Mojo

2014-05-14 Thread Abel Abraham Camarillo Ojeda 
On Wed, May 14, 2014 at 6:01 PM, Alexander Bluhm
alexander.bl...@gmx.net wrote:
 Hi,

 I am the maintainer of the security/p5-IO-Socket-SSL port.  Upgrading
 it to 1.984 breaks the www/p5-Mojo port.  The latter needs to be
 fixed, my patch has already been commited upstream.  While there I
 also update p5-Mojo to 4.99 as it contains other SSL fixes.

 ok?

 bluhm

 Index: www/p5-Mojo/Makefile
 ===
 RCS file: /data/mirror/openbsd/cvs/ports/www/p5-Mojo/Makefile,v
 retrieving revision 1.12
 diff -u -p -r1.12 Makefile
 --- www/p5-Mojo/Makefile21 Jan 2014 20:49:41 -  1.12
 +++ www/p5-Mojo/Makefile14 May 2014 22:48:05 -
 @@ -3,7 +3,7 @@
  COMMENT =  next generation web framework

  MODULES =  cpan
 -DISTNAME = Mojolicious-4.66
 +DISTNAME = Mojolicious-4.99
  CATEGORIES =   www

  MAINTAINER =   Simon Bertrang si...@openbsd.org
 @@ -16,8 +16,8 @@ HOMEPAGE =http://mojolicio.us/
  CPAN_AUTHOR =  SRI

  RUN_DEPENDS =  devel/p5-EV \
 -   net/p5-IO-Socket-IP \
 -   security/p5-IO-Socket-SSL
 +   net/p5-IO-Socket-IP=0.20 \
 +   security/p5-IO-Socket-SSL=1.84

  MAKE_ENV += TEST_CACHING=Yes
  MAKE_ENV += TEST_EV=Yes
 Index: www/p5-Mojo/distinfo
 ===
 RCS file: /data/mirror/openbsd/cvs/ports/www/p5-Mojo/distinfo,v
 retrieving revision 1.9
 diff -u -p -r1.9 distinfo
 --- www/p5-Mojo/distinfo21 Jan 2014 20:49:41 -  1.9
 +++ www/p5-Mojo/distinfo13 May 2014 19:50:22 -
 @@ -1,2 +1,2 @@
 -SHA256 (Mojolicious-4.66.tar.gz) = 
 YTZlpyOrYlHLoWNDfqjWThinDhqVWPfPfil3K3KOyjQ=
 -SIZE (Mojolicious-4.66.tar.gz) = 617312
 +SHA256 (Mojolicious-4.99.tar.gz) = 
 oc2usV+fawcyZxVzku5QhiTkGD/cFvqOXaOiNXoPtyg=
 +SIZE (Mojolicious-4.99.tar.gz) = 633846
 Index: www/p5-Mojo/patches/patch-lib_Mojo_IOLoop_Server_pm
 ===
 RCS file: www/p5-Mojo/patches/patch-lib_Mojo_IOLoop_Server_pm
 diff -N www/p5-Mojo/patches/patch-lib_Mojo_IOLoop_Server_pm
 --- /dev/null   1 Jan 1970 00:00:00 -
 +++ www/p5-Mojo/patches/patch-lib_Mojo_IOLoop_Server_pm 14 May 2014 20:20:20 
 -
 @@ -0,0 +1,14 @@
 +$OpenBSD$
 +https://github.com/kraih/mojo/issues/622
 +
 +--- lib/Mojo/IOLoop/Server.pm.orig Sun May 11 20:27:28 2014
  lib/Mojo/IOLoop/Server.pm  Tue May 13 23:04:55 2014
 +@@ -127,7 +127,7 @@ sub _accept {
 + # Start TLS handshake
 + $self-emit_safe(accept = $handle) and next unless my $tls = 
 $self-{tls};
 + $self-_handshake($self-{handles}{$handle} = $handle)
 +-  if $handle = IO::Socket::SSL-start_SSL($handle, %$tls);
 ++  if $handle = IO::Socket::SSL-start_SSL($handle, %$tls, SSL_server = 
 1);
 +   }
 + }
 +
 Index: www/p5-Mojo/pkg/PLIST
 ===
 RCS file: /data/mirror/openbsd/cvs/ports/www/p5-Mojo/pkg/PLIST,v
 retrieving revision 1.6
 diff -u -p -r1.6 PLIST
 --- www/p5-Mojo/pkg/PLIST   21 Jan 2014 20:49:41 -  1.6
 +++ www/p5-Mojo/pkg/PLIST   14 May 2014 20:26:34 -
 @@ -182,10 +182,9 @@ ${P5SITE}/Mojolicious/public/mojo/pretti
  ${P5SITE}/Mojolicious/public/mojo/prettify/run_prettify.js
  ${P5SITE}/Mojolicious/public/mojo/stripes.png
  ${P5SITE}/Mojolicious/templates/
 -${P5SITE}/Mojolicious/templates/exception.development.html.ep
 +${P5SITE}/Mojolicious/templates/development.html.ep
  ${P5SITE}/Mojolicious/templates/exception.html.ep
  ${P5SITE}/Mojolicious/templates/mojobar.html.ep
 -${P5SITE}/Mojolicious/templates/not_found.development.html.ep
  ${P5SITE}/Mojolicious/templates/not_found.html.ep
  ${P5SITE}/Mojolicious/templates/perldoc.html.ep
  ${P5SITE}/Test/


I will test this at night - I have some applications that depend on
mojo. thanks.