Date: Sat, 8 Aug 2020 12:12:47 +0000 (UTC) From: Bernard Spil <brnrd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r544493 - in head/www/mod_http2: . files Message-ID: <202008081212.078CCls4084405@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brnrd Date: Sat Aug 8 12:12:47 2020 New Revision: 544493 URL: https://svnweb.freebsd.org/changeset/ports/544493 Log: www/mod_http2: Re-add port Added: head/www/mod_http2/ - copied from r484467, head/www/mod_http2-devel/ Modified: head/www/mod_http2/Makefile head/www/mod_http2/distinfo head/www/mod_http2/files/200_mod_http2.conf.in head/www/mod_http2/files/300_mod_proxy_http2.conf.in head/www/mod_http2/pkg-message Modified: head/www/mod_http2/Makefile ============================================================================== --- head/www/mod_http2-devel/Makefile Thu Nov 8 17:49:57 2018 (r484467) +++ head/www/mod_http2/Makefile Sat Aug 8 12:12:47 2020 (r544493) @@ -2,17 +2,13 @@ # $FreeBSD$ PORTNAME= mod_http2 -PORTVERSION= 1.11.4 +PORTVERSION= 1.15.13 DISTVERSIONPREFIX= v CATEGORIES= www PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX} -PKGNAMESUFFIX= -devel -DEPRECATED = Use the module that is shipped with Apache 2.4 -EXPIRATION_DATE=2019-01-01 - MAINTAINER= brnrd@FreeBSD.org -COMMENT= Early experience HTTP/2 modules for Apache httpd +COMMENT= HTTP/2 modules for Apache httpd LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE @@ -48,10 +44,8 @@ post-install: ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/${MODULENAME}.so ${MV} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/mod_proxy_http2.so \ ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/mod_proxy_h2.so - ${RM} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/mod_http2.so - ${RM} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/mod_proxy_http2.so - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/${MODULENAME}.so - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/mod_proxy_h2.so - ${RM} -v ${STAGEDIR}${DOCSDIR}/LICENSE + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/${MODULENAME}.so \ + ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/mod_proxy_h2.so + ${RM} ${STAGEDIR}${DOCSDIR}/LICENSE .include <bsd.port.mk> Modified: head/www/mod_http2/distinfo ============================================================================== --- head/www/mod_http2-devel/distinfo Thu Nov 8 17:49:57 2018 (r484467) +++ head/www/mod_http2/distinfo Sat Aug 8 12:12:47 2020 (r544493) @@ -1,3 +1,3 @@ -TIMESTAMP = 1541696373 -SHA256 (icing-mod_h2-v1.11.4_GH0.tar.gz) = 4efde628467b398737c013a502213755c199c3ed4cd64aabf9606a2a16afefb5 -SIZE (icing-mod_h2-v1.11.4_GH0.tar.gz) = 684344 +TIMESTAMP = 1596883732 +SHA256 (icing-mod_h2-v1.15.13_GH0.tar.gz) = 1868e52d130989e44944440bb537c1fb5d639d7bdc08b5b4e25e5e445ed6d7a3 +SIZE (icing-mod_h2-v1.15.13_GH0.tar.gz) = 703207 Modified: head/www/mod_http2/files/200_mod_http2.conf.in ============================================================================== --- head/www/mod_http2-devel/files/200_mod_http2.conf.in Thu Nov 8 17:49:57 2018 (r484467) +++ head/www/mod_http2/files/200_mod_http2.conf.in Sat Aug 8 12:12:47 2020 (r544493) @@ -1,6 +1,6 @@ # To enable, uncomment the LoadModule line -# LoadModule md_module %%APACHE_MODDIR%%/mod_h2.so +# LoadModule http2_module %%APACHE_MODDIR%%/mod_h2.so <IfModule http2_module> Protocols h2 http/1.1 Modified: head/www/mod_http2/files/300_mod_proxy_http2.conf.in ============================================================================== --- head/www/mod_http2-devel/files/300_mod_proxy_http2.conf.in Thu Nov 8 17:49:57 2018 (r484467) +++ head/www/mod_http2/files/300_mod_proxy_http2.conf.in Sat Aug 8 12:12:47 2020 (r544493) @@ -1,6 +1,6 @@ # To enable, uncomment the LoadModule line -# LoadModule md_module %%APACHE_MODDIR%%/mod_proxy_h2.so +# LoadModule proxy_http2_module %%APACHE_MODDIR%%/mod_proxy_h2.so <IfModule proxy_http2_module> # ProxyPass "/app" "h2://app.example.com" Modified: head/www/mod_http2/pkg-message ============================================================================== --- head/www/mod_http2-devel/pkg-message Thu Nov 8 17:49:57 2018 (r484467) +++ head/www/mod_http2/pkg-message Sat Aug 8 12:12:47 2020 (r544493) @@ -1,14 +1,32 @@ -If you want to have the h2 module enabled in your apache installation, -you need to add +[ +{ type: install + message: <<EOM +The module shlib file has been renamed from mod_http2 to mod_h2 to +allow the www/apache24 bundled and this (usually newer) module to +coexist. Change the LoadModule line in your Apache config from - LoadModule http2_module modules/mod_h2.so + LoadModule http2_module ${modDir}/mod_http2.so -somewhere in your config files and add a line like +to - H2Engine on + LoadModule http2_module ${modDir}/mod_h2.so -whereever you want the module to be active (general server of specific -virtual hosts). +to enable this port's module. +EOM +} , +{ type: upgrade + message: <<EOM +The module shlib file has been renamed from mod_http2 to mod_h2 to +allow the www/apache24 bundled and this (usually newer) module to +coexist. Change the LoadModule line in your Apache config from -NB: The shared libraries were renamed from mod_http2 to mod_h2 to - avoid conflicts with the (now bundled) mod_http2 in www/apache24 + LoadModule http2_module ${modDir}/mod_http2.so + +to + + LoadModule http2_module ${modDir}/mod_h2.so + +to enable this port's module. +EOM +} +]
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008081212.078CCls4084405>