MFH r393066,r396229,r396629,r397062:

r393066
www/h2o: 1.2.0 -> 1.4.2

ChangeLog:
https://github.com/h2o/h2o/releases

PR:		200998
Submitted by:	sean@x-n.su
Approved by:	Dave Cottlehuber <dch@skunkwerks.at> (maintainer)

r396229
- Update to 1.4.4 [1]
- Drop 8.x support [2]

PR:		202818 [1]
Submitted by:	Dave Cottlehuber (dch <at> skunkwerks <dot> at) [1]
Approved by:	portmgr blanket [2]

r396629
- Fix rc.d script
- Bump PORTVERSION

PR:		202937
Submitted by:	gblach
Approved by:	Dave Cottlehuber (dch <at> skunkwerks <dot> at)

r397062
- Fix rc.d issues introduced with recent perl changes [1]
- Update to 1.4.5 [2]

PR:		203147 [1], 203096 [2]
Submitted by:	Dave Cottlehuber (maintainer)

Security:	31ea7f73-5c55-11e5-8607-74d02b9a84d5
Security:	CVE-2015-5638
Approved by:	ports-secteam (feld)

6 files changed, 54 insertions, 30 deletions

diff --git a/www/h2o/Makefile b/www/h2o/Makefile
index a4eb878e9950..f61fe927aee6 100644
--- a/www/h2o/Makefile
+++ b/www/h2o/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	h2o
-PORTVERSION=	1.2.0
-PORTREVISION=	1
+PORTVERSION=	1.4.5
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www
 
@@ -14,7 +13,8 @@ LICENSE=	MIT
 
 USE_GITHUB=	yes
 
-USES=		cmake compiler:c11 shebangfix
+USES=		cmake compiler:c11 perl5 shebangfix
+USE_PERL5=	run
 SHEBANG_FILES=	share/h2o/start_server
 
 PORTDOCS=	README.md
@@ -22,35 +22,34 @@ PORTDOCS=	README.md
 SUB_FILES=	${PORTNAME}
 SUB_LIST+=	H2O_USER=${H2O_USER} \
 		H2O_GROUP=${H2O_GROUP} \
-		H2O_PIDDIR=${H2O_PIDDIR} \
 		H2O_LOGDIR=${H2O_LOGDIR}
 
 PLIST_SUB=	H2O_USER=${H2O_USER} \
 		H2O_GROUP=${H2O_GROUP} \
-		H2O_PIDDIR=${H2O_PIDDIR} \
 		H2O_LOGDIR=${H2O_LOGDIR}
 
 H2O_USER?=	www
 H2O_GROUP?=	www
 
 H2O_LOGDIR=	/var/log/${PORTNAME}/
-H2O_PIDDIR=	/var/run/${PORTNAME}/
 
 USE_RC_SUBR=	${PORTNAME}
 
 .include <bsd.port.options.mk>
 
-.if ${OSVERSION} < 900000
-BROKEN=		fails to compile on 8.x
-.endif
-
-CMAKE_ARGS+=	-DWITH_BUNDLED_SSL=OFF
+CMAKE_ARGS+=	-DWITH_BUNDLED_SSL=OFF -DEXTRA_LIBRARIES=OFF
 USE_OPENSSL_PORT=	yes
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|exec perl|exec ${LOCALBASE}/bin/perl|' \
+			${WRKSRC}/share/h2o/annotate-backtrace-symbols \
+			${WRKSRC}/share/h2o/fetch-ocsp-response \
+			${WRKSRC}/share/h2o/kill-on-close \
+			${WRKSRC}/share/h2o/start_server
+
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR} \
 		${STAGEDIR}${ETCDIR} \
-		${STAGEDIR}${H2O_PIDDIR} \
 		${STAGEDIR}${H2O_LOGDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} \
diff --git a/www/h2o/distinfo b/www/h2o/distinfo
index 43658842af9b..073a66e5e775 100644
--- a/www/h2o/distinfo
+++ b/www/h2o/distinfo
@@ -1,2 +1,2 @@
-SHA256 (h2o-h2o-v1.2.0_GH0.tar.gz) = 09aacd84ea0a53eaffdc8e0c2a2cf1108bea5db81d5859a136221fd67f07833f
-SIZE (h2o-h2o-v1.2.0_GH0.tar.gz) = 4155709
+SHA256 (h2o-h2o-v1.4.5_GH0.tar.gz) = 0f60e8d35afad61afc284a7abfa9c9a3b976e8f9faed3f0966fb34056e2e138d
+SIZE (h2o-h2o-v1.4.5_GH0.tar.gz) = 4736984
diff --git a/www/h2o/files/h2o.conf.sample b/www/h2o/files/h2o.conf.sample
index 387b0885bdfc..a55801d321af 100644
--- a/www/h2o/files/h2o.conf.sample
+++ b/www/h2o/files/h2o.conf.sample
@@ -1,5 +1,9 @@
 # vi: ft=yaml
 # to find out the configuration commands, run: h2o --help
+user: www
+pid-file: /var/run/h2o.pid
+access-log: /var/log/h2o/h2o-access.log
+error-log: /var/log/h2o/h2o-error.log
 listen: 80
 listen:
     port: 443
@@ -8,7 +12,6 @@ listen:
         # generate your own certificates
         certificate-file: /usr/local/etc/h2o/server.crt
         key-file: /usr/local/etc/h2o/server.key
-access-log: /var/log/h2o/h2o.log
 file.dirlisting: on
 # per-host configuration
 hosts:
diff --git a/www/h2o/files/h2o.in b/www/h2o/files/h2o.in
index 712d94169431..a6d335b3e550 100644
--- a/www/h2o/files/h2o.in
+++ b/www/h2o/files/h2o.in
@@ -14,7 +14,6 @@
 # Set it to YES to enable h2o.
 #
 # h2o_config    (string): Optional full path for h2o config file
-# h2o_user      (user):   Set to h2o by default.
 
 . /etc/rc.subr
 
@@ -23,22 +22,13 @@ rcvar=h2o_enable
 
 # defaults
 : ${h2o_enable:="NO"}
-: ${h2o_user:="%%H2O_USER%%"}
 : ${h2o_config:="%%PREFIX%%/etc/${name}/${name}.conf"}
-: ${h2o_options:=" --conf ${h2o_config}"}
 
 # daemon
-h2o_pidfile="%%H2O_PIDDIR%%${name}.pid"
-procname="%%PREFIX%%/bin/${name}"
-command=/usr/sbin/daemon
-command_args=" -f -c -p ${h2o_pidfile} ${procname} ${h2o_options}"
-start_precmd="h2o_precmd"
-
-h2o_precmd()
-{
-	# create empty pidfile with correct permissions
-	install -o ${h2o_user} /dev/null ${h2o_pidfile}
-}
+pidfile=`grep pid-file ${h2o_config} | cut -d' ' -f2`
+command="%%PREFIX%%/bin/${name}"
+command_args="-m daemon -c ${h2o_config}"
+procname="%%LOCALBASE%%/bin/perl"
 
 load_rc_config $name
 run_rc_command "$1"
diff --git a/www/h2o/files/patch-CMakeLists.txt b/www/h2o/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..ba812ffba99b
--- /dev/null
+++ b/www/h2o/files/patch-CMakeLists.txt
@@ -0,0 +1,30 @@
+--- CMakeLists.txt.orig	2015-09-01 19:56:02 UTC
++++ CMakeLists.txt
+@@ -285,7 +285,6 @@ IF (OPENSSL_FOUND)
+     ELSE (LIBUV_FOUND)
+         SET_TARGET_PROPERTIES(libh2o PROPERTIES EXCLUDE_FROM_ALL 1)
+     ENDIF (LIBUV_FOUND)
+-    INSTALL(TARGETS libh2o-evloop DESTINATION lib)
+ ELSE (OPENSSL_FOUND)
+     SET_TARGET_PROPERTIES(libh2o PROPERTIES EXCLUDE_FROM_ALL 1)
+     SET_TARGET_PROPERTIES(libh2o-evloop PROPERTIES EXCLUDE_FROM_ALL 1)
+@@ -353,16 +352,15 @@ ENDIF (WITH_BUNDLED_SSL)
+ TARGET_LINK_LIBRARIES(h2o ${EXTRA_LIBRARIES})
+ 
+ INSTALL(TARGETS h2o
+-    RUNTIME DESTINATION bin
+-    LIBRARY DESTINATION lib)
++    RUNTIME DESTINATION bin)
+ 
+ ADD_EXECUTABLE(setuidgid src/setuidgid.c)
+ INSTALL(TARGETS setuidgid RUNTIME DESTINATION share/h2o)
+ 
+-INSTALL(DIRECTORY include/ DESTINATION include FILES_MATCHING PATTERN "*.h")
++INSTALL(DIRECTORY include/ DESTINATION include FILES_MATCHING PATTERN "*.h"
++    EXCLUDE PATTERN "h2o" EXCLUDE PATTERN "h2o/socket")
+ 
+ INSTALL(PROGRAMS share/h2o/annotate-backtrace-symbols share/h2o/fetch-ocsp-response share/h2o/kill-on-close share/h2o/start_server DESTINATION share/h2o)
+-INSTALL(DIRECTORY doc/ DESTINATION share/doc/h2o PATTERN "Makefile" EXCLUDE PATTERN "README.md" EXCLUDE)
+ 
+ # tests
+ ADD_EXECUTABLE(t-00unit-evloop.t ${UNIT_TEST_SOURCE_FILES})
diff --git a/www/h2o/pkg-plist b/www/h2o/pkg-plist
index f8f6bd1e4f73..9d4f85930a8b 100644
--- a/www/h2o/pkg-plist
+++ b/www/h2o/pkg-plist
@@ -1,6 +1,8 @@
 bin/h2o
+share/h2o/annotate-backtrace-symbols
 share/h2o/fetch-ocsp-response
+share/h2o/kill-on-close
 share/h2o/start_server
+%%DATADIR%%/setuidgid
 @dir(%%H2O_USER%%,%%H2O_GROUP%%,0750) %%H2O_LOGDIR%%
-@dir(%%H2O_USER%%,%%H2O_GROUP%%,0750) %%H2O_PIDDIR%%
 @sample %%ETCDIR%%/h2o.conf.sample