Attachment #210656 for bug #242863

View | Details | Raw Unified | Return to bug 242863 | Differences between
Collapse All | Expand All




PORTNAME=	h2o
DISTVERSIONPREFIX=	v
DISTVERSION=	2.2.6
PORTREVISION=	1
CATEGORIES=	www

MAINTAINER=	dch@FreeBSD.org

USES=		cmake:noninja compiler:c11 cpe perl5 shebangfix ssl pkgconfig
USE_GITHUB=	yes
USE_PERL5=	run
USE_LDCONFIG=	yes

CPE_VENDOR=	h2o_project


MRUBY_USE=		ruby=yes
MRUBY_VARS=		RUBY_NO_RUN_DEPENDS=yes

.include <bsd.port.pre.mk>
.if ${SSL_DEFAULT:Mlibressl*}
USES+=	localbase
.endif
		${WRKSRC}/share/h2o/fetch-ocsp-response \
		${WRKSRC}/share/h2o/kill-on-close \
		${WRKSRC}/share/h2o/setuidgid \
		${WRKSRC}/share/h2o/start_server

post-install:
	${MKDIR} ${STAGEDIR}${ETCDIR} \

	${MKDIR} ${STAGEDIR}${DOCSDIR}
	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}

.include <bsd.port.post.mk>




--- deps/neverbleed/neverbleed.c.orig	2019-12-27 07:57:52 UTC
+++ deps/neverbleed/neverbleed.c
@@ -631,8 +631,11 @@ static int sign_stub(struct expbuf_t *buf)
 }
 
 #if !OPENSSL_1_1_API
-
+#if !defined(LIBRESSL_VERSION_NUMBER)
 static void RSA_get0_key(const RSA *rsa, const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
+#else
+void RSA_get0_key(const RSA *rsa, const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
+#endif
 {
     if (n) {
         *n = rsa->n;
@@ -647,7 +650,11 @@ static void RSA_get0_key(const RSA *rsa, const BIGNUM 
     }
 }
 
+#if !defined(LIBRESSL_VERSION_NUMBER)
 static int RSA_set0_key(RSA *rsa, BIGNUM *n, BIGNUM *e, BIGNUM *d)
+#else
+int RSA_set0_key(RSA *rsa, BIGNUM *n, BIGNUM *e, BIGNUM *d)
+#endif
 {
     if (n == NULL || e == NULL) {
         return 0;
@@ -663,7 +670,11 @@ static int RSA_set0_key(RSA *rsa, BIGNUM *n, BIGNUM *e
     return 1;
 }
 
+#if !defined(LIBRESSL_VERSION_NUMBER)
 static void RSA_set_flags(RSA *r, int flags)
+#else
+void RSA_set_flags(RSA *r, int flags)
+#endif
 {
     r->flags |= flags;
 }

Return to bug 242863

Lines 4-9 Link Here

(-)Makefile (-10 / +7 lines)
4	PORTNAME= h2o	4	PORTNAME= h2o
5	DISTVERSIONPREFIX= v	5	DISTVERSIONPREFIX= v
6	DISTVERSION= 2.2.6	6	DISTVERSION= 2.2.6
		7	PORTREVISION= 1
7	CATEGORIES= www	8	CATEGORIES= www
8		9
9	MAINTAINER= dch@FreeBSD.org	10	MAINTAINER= dch@FreeBSD.org
Lines 22-28 Link Here
22	USES= cmake:noninja compiler:c11 cpe perl5 shebangfix ssl pkgconfig	23	USES= cmake:noninja compiler:c11 cpe perl5 shebangfix ssl pkgconfig
23	USE_GITHUB= yes	24	USE_GITHUB= yes
24	USE_PERL5= run	25	USE_PERL5= run
25	USE_LDCONFIG= yes	26	USE_LDCONFIG= yes
26		27
27	CPE_VENDOR= h2o_project	28	CPE_VENDOR= h2o_project
28		29
Lines 60-73 Link Here
60	MRUBY_USE= ruby=yes	61	MRUBY_USE= ruby=yes
61	MRUBY_VARS= RUBY_NO_RUN_DEPENDS=yes	62	MRUBY_VARS= RUBY_NO_RUN_DEPENDS=yes
62		63
63	post-patch:	64	.include <bsd.port.pre.mk>
64	@${REINPLACE_CMD} -e 's\|exec perl\|exec ${LOCALBASE}/bin/perl\|' \	65	.if ${SSL_DEFAULT:Mlibressl*}
65	${WRKSRC}/share/h2o/annotate-backtrace-symbols \	66	USES+= localbase
66	${WRKSRC}/share/h2o/fastcgi-cgi \	67	.endif
67	${WRKSRC}/share/h2o/fetch-ocsp-response \
68	${WRKSRC}/share/h2o/kill-on-close \
69	${WRKSRC}/share/h2o/setuidgid \
70	${WRKSRC}/share/h2o/start_server
71		68
72	post-install:	69	post-install:
73	${MKDIR} ${STAGEDIR}${ETCDIR} \	70	${MKDIR} ${STAGEDIR}${ETCDIR} \
Lines 80-83 Link Here
80	${MKDIR} ${STAGEDIR}${DOCSDIR}	77	${MKDIR} ${STAGEDIR}${DOCSDIR}
81	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}	78	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
82		79
83	.include <bsd.port.mk>	80	.include <bsd.port.post.mk>

Line 0 Link Here

(-)files/patch-deps_neverbleed-neverbleed.c (+39 lines)
	1	--- deps/neverbleed/neverbleed.c.orig 2019-12-27 07:57:52 UTC
	2	+++ deps/neverbleed/neverbleed.c
	3	@@ -631,8 +631,11 @@ static int sign_stub(struct expbuf_t *buf)
	4	}
	5
	6	#if !OPENSSL_1_1_API
	7	-
	8	+#if !defined(LIBRESSL_VERSION_NUMBER)
	9	static void RSA_get0_key(const RSA rsa, const BIGNUM n, const BIGNUM e, const BIGNUM *d)
	10	+#else
	11	+void RSA_get0_key(const RSA rsa, const BIGNUM n, const BIGNUM e, const BIGNUM *d)
	12	+#endif
	13	{
	14	if (n) {
	15	*n = rsa->n;
	16	@@ -647,7 +650,11 @@ static void RSA_get0_key(const RSA *rsa, const BIGNUM
	17	}
	18	}
	19
	20	+#if !defined(LIBRESSL_VERSION_NUMBER)
	21	static int RSA_set0_key(RSA rsa, BIGNUM n, BIGNUM e, BIGNUM d)
	22	+#else
	23	+int RSA_set0_key(RSA rsa, BIGNUM n, BIGNUM e, BIGNUM d)
	24	+#endif
	25	{
	26	if (n == NULL \|\| e == NULL) {
	27	return 0;
	28	@@ -663,7 +670,11 @@ static int RSA_set0_key(RSA rsa, BIGNUM n, BIGNUM *e
	29	return 1;
	30	}
	31
	32	+#if !defined(LIBRESSL_VERSION_NUMBER)
	33	static void RSA_set_flags(RSA *r, int flags)
	34	+#else
	35	+void RSA_set_flags(RSA *r, int flags)
	36	+#endif
	37	{
	38	r->flags \|= flags;
	39	}