Attachment 156335 Details for Bug 198573 – updated patch from dch@ lacking SSL OPTION

[patch] updated patch from dch@ lacking SSL OPTION

h2o-1.2.0.patch (text/plain), 2.28 KB, created by Dave Cottlehuber on 2015-05-04 12:24:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dave Cottlehuber

Created: 2015-05-04 12:24:53 UTC

Size: 2.28 KB

patch

obsolete

>commit ab0ba1c51c2157c7c85223a57e359193a469b580
>Author: Dave Cottlehuber <dch@skunkwerks.at>
>Date:   Mon May 4 11:42:35 2015 +0000
>
>    PR198573 h2o update to 1.2.0
>
>diff --git www/h2o/Makefile www/h2o/Makefile
>index 1e9696e..61a3cc4 100644
>--- www/h2o/Makefile
>+++ www/h2o/Makefile
>@@ -2,7 +2,8 @@
> # $FreeBSD$
> 
> PORTNAME=	h2o
>-PORTVERSION=	1.0.1
>+PORTVERSION=	1.2.0
>+DISTVERSIONPREFIX=	v
> CATEGORIES=	www
> 
> MAINTAINER=	dch@skunkwerks.at
>@@ -10,17 +11,9 @@ COMMENT=	Optimized HTTP2 server with support for HTTP/1.x
> 
> LICENSE=	MIT
> 
>-LIB_DEPENDS=	libyaml.so:${PORTSDIR}/textproc/libyaml
>-
> USE_GITHUB=	yes
>-GH_ACCOUNT=	h2o
>-GH_TAGNAME=	v1.0.1
>-GH_COMMIT=	c28f39e
>-
>-MAKE_JOBS_UNSAFE=	yes
>-USES=	cmake:outsource compiler:c11
> 
>-USE_OPENSSL=	yes
>+USES=		cmake compiler:c11
> 
> PORTDOCS=	README.md
> 
>@@ -43,7 +36,16 @@ H2O_PIDDIR=	/var/run/${PORTNAME}/
> 
> USE_RC_SUBR=	${PORTNAME}
> 
>-do-install:
>+.include <bsd.port.options.mk>
>+
>+.if ${OSVERSION} < 900000
>+BROKEN=	fails to compile on 8.x
>+.endif
>+
>+CMAKE_ARGS+=	-DWITH_BUNDLED_SSL=OFF
>+USE_OPENSSL_PORT=	yes
>+
>+post-install:
> 	${MKDIR} ${STAGEDIR}${DOCSDIR} \
> 		${STAGEDIR}${ETCDIR} \
> 		${STAGEDIR}${H2O_PIDDIR} \
>@@ -52,12 +54,5 @@ do-install:
> 	${INSTALL_DATA} \
> 		${FILESDIR}/${PORTNAME}.conf.sample \
> 		${STAGEDIR}${ETCDIR}/${PORTNAME}.conf.sample
>-	${INSTALL_PROGRAM} ${WRKDIR}/.build/h2o ${STAGEDIR}${PREFIX}/bin/h2o
>-
>-.include <bsd.port.pre.mk>
>-
>-.if ${OSVERSION} < 900000
>-BROKEN=	fails to compile on 8.x
>-.endif
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff --git www/h2o/distinfo www/h2o/distinfo
>index 3dff7a1..4365884 100644
>--- www/h2o/distinfo
>+++ www/h2o/distinfo
>@@ -1,2 +1,2 @@
>-SHA256 (h2o-1.0.1.tar.gz) = 44d8142482d0bd2a0a3ce904dafeb365c295883de263ed76891e9e264ca3669e
>-SIZE (h2o-1.0.1.tar.gz) = 782916
>+SHA256 (h2o-h2o-v1.2.0_GH0.tar.gz) = 09aacd84ea0a53eaffdc8e0c2a2cf1108bea5db81d5859a136221fd67f07833f
>+SIZE (h2o-h2o-v1.2.0_GH0.tar.gz) = 4155709
>diff --git www/h2o/pkg-plist www/h2o/pkg-plist
>index 2d65812..f8f6bd1 100644
>--- www/h2o/pkg-plist
>+++ www/h2o/pkg-plist
>@@ -1,5 +1,6 @@
> bin/h2o
>+share/h2o/fetch-ocsp-response
>+share/h2o/start_server
> @dir(%%H2O_USER%%,%%H2O_GROUP%%,0750) %%H2O_LOGDIR%%
> @dir(%%H2O_USER%%,%%H2O_GROUP%%,0750) %%H2O_PIDDIR%%
>-@dir(%%H2O_USER%%,%%H2O_GROUP%%,0750) %%ETCDIR%%
> @sample %%ETCDIR%%/h2o.conf.sample

Actions: View | Diff

Attachments on bug 198573: 154289 | 155619 | 156335