From 468a4b50c52428ed43b2a595901339bff5c10dd6 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 1 Jun 2016 15:49:57 -0400 Subject: www-apache/mod_h2: update to newer pre-releases These are meant to be used in conjunction with newer apache releases so fixes to just the mod_http2 module can be tested. --- profiles/package.mask | 4 --- www-apache/mod_h2/Manifest | 4 +-- www-apache/mod_h2/files/mod_h2.conf | 8 ------ www-apache/mod_h2/files/mod_http2.conf | 8 ++++++ www-apache/mod_h2/mod_h2-0.8.2.ebuild | 47 -------------------------------- www-apache/mod_h2/mod_h2-0.8.3.ebuild | 47 -------------------------------- www-apache/mod_h2/mod_h2-1.4.7.ebuild | 49 ++++++++++++++++++++++++++++++++++ www-apache/mod_h2/mod_h2-1.5.6.ebuild | 49 ++++++++++++++++++++++++++++++++++ www-apache/mod_h2/mod_h2-9999.ebuild | 16 ++++++----- 9 files changed, 117 insertions(+), 115 deletions(-) delete mode 100644 www-apache/mod_h2/files/mod_h2.conf create mode 100644 www-apache/mod_h2/files/mod_http2.conf delete mode 100644 www-apache/mod_h2/mod_h2-0.8.2.ebuild delete mode 100644 www-apache/mod_h2/mod_h2-0.8.3.ebuild create mode 100644 www-apache/mod_h2/mod_h2-1.4.7.ebuild create mode 100644 www-apache/mod_h2/mod_h2-1.5.6.ebuild diff --git a/profiles/package.mask b/profiles/package.mask index dab7a2ae44e2..9f7f88fb4f94 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -401,10 +401,6 @@ sys-fs/bedup # Breaking changes #563540 =app-text/ghostscript-gpl-9.18 -# Mike Frysinger (18 Oct 2015) -# apache-2.4.17 includes support for http2 now. -www-apache/mod_h2 - # Mike Pagano (2 Oct 2015) # A regression in kernel 4.1.9 could lead to a system # lockup. This has been fixed in gentoo-sources-4.1.9-r1 diff --git a/www-apache/mod_h2/Manifest b/www-apache/mod_h2/Manifest index 76bab13db910..92a0c89b1e91 100644 --- a/www-apache/mod_h2/Manifest +++ b/www-apache/mod_h2/Manifest @@ -1,2 +1,2 @@ -DIST mod_h2-0.8.2.tar.gz 2622925 SHA256 cc4a67a0c994ce7c08319bd10bc92de7d0293ebaa0c2ece0e4cc6bc8351c06aa SHA512 19d55ab28776f551ee2df157a1ab0f72b0c5362210c5da39911e6b2cbdc7079478404e7179128a31d39c393ca32e453ed2a4db310bd4f720287e9e54046c095f WHIRLPOOL 290c368b7e69d214c805e57fc6ef5790a0a4914a71035358a3ebf1cdaf0fc69ce170b2c266a0d2174c9c0e252991aba5a0de5c5aec754bfb79e37b0fd4be57e3 -DIST mod_h2-0.8.3.tar.gz 2622525 SHA256 50867947ed80c5c876c95b318b17dcdf3b77b36a80b36ef9f4778005587ac9ed SHA512 45ab6f070189175180511cc2985dcb0ab676225b144e141698baebe53f097c6d451f2c85382f23afd0042aa4703b7f37dcb88fe5a968e3422c91b46fe5526c97 WHIRLPOOL f6b110df1831ecdf849c3c30b9a09b66ef833aa11664f2cc91747ca5a027cac72caeab4dc674f34aa4e5d3e36eafea183f81261479005aeebdb07ab0582c166b +DIST mod_http2-1.4.7.tar.gz 476716 SHA256 0d51a019917aa6bf7866cf23bf837626592ad0e74408eb341d070982cb88380a SHA512 6d91d8f73de4a571dc9ac24328b2f7214afcc9a3a00cbf93a74954533a45b647480f96f0cb1c85d767e980080b21561891a55b16943b0369a0fe2573bba1b54f WHIRLPOOL 0b81b8baf871ff043e972c65c685ae9f18737c0909bff65528a6ea3dd56735a2230c9dda67879a5684e867681fc6487f483ef006611397061b367bc275793ad6 +DIST mod_http2-1.5.6.tar.gz 502108 SHA256 73c11780e82e65c11e71e5a44685c22a7d8f07203d55dca094ea61d7a5bbaffc SHA512 8cc8894d56e32489f8e3064145cb527a415723131bdefd99583b6678af5fc50e3d4ebbf59f4734640bef0381ac0f808c780dafb9a3fe6bb45e7af4d595470716 WHIRLPOOL a2f3efb9e7ecf657be61d46a832a1b438cdaab0e44114e8ec717d9b77e8500308e7c904248c195bb55157410a103cffff8714e0378e2d2099ecb7aa7d679a4a7 diff --git a/www-apache/mod_h2/files/mod_h2.conf b/www-apache/mod_h2/files/mod_h2.conf deleted file mode 100644 index 564e97b66549..000000000000 --- a/www-apache/mod_h2/files/mod_h2.conf +++ /dev/null @@ -1,8 +0,0 @@ - - -LoadModule h2_module modules/mod_h2.so - -# See https://github.com/icing/mod_h2#configuration for more options. -H2Engine on - - diff --git a/www-apache/mod_h2/files/mod_http2.conf b/www-apache/mod_h2/files/mod_http2.conf new file mode 100644 index 000000000000..aa36a6a1d65e --- /dev/null +++ b/www-apache/mod_h2/files/mod_http2.conf @@ -0,0 +1,8 @@ + + +LoadModule http2_module modules/mod_http2.so + +# https://httpd.apache.org/docs/2.4/mod/mod_http2.html +Protocols h2 http/1.1 + + diff --git a/www-apache/mod_h2/mod_h2-0.8.2.ebuild b/www-apache/mod_h2/mod_h2-0.8.2.ebuild deleted file mode 100644 index 2890e5a789ae..000000000000 --- a/www-apache/mod_h2/mod_h2-0.8.2.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -inherit apache-module - -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://github.com/icing/mod_h2.git" - inherit git-2 -else - SRC_URI="https://github.com/icing/mod_h2/releases/download/v${PV}/${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -DESCRIPTION="HTTP/2 module for Apache" -HOMEPAGE="https://github.com/icing/mod_h2" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="ssl" - -RDEPEND=">=net-libs/nghttp2-1.0 - ssl? ( www-servers/apache[alpn] )" -DEPEND="${RDEPEND}" - -need_apache2_4 - -src_configure() { - econf \ - --docdir='$(datarootdir)'/doc/${PF} \ - --disable-werror \ - --disable-sandbox -} - -src_compile() { - default -} - -src_install() { - default - - APACHE2_MOD_DEFINE="HTTP2" - insinto "${APACHE_MODULES_CONFDIR}" - newins "${FILESDIR}/mod_h2.conf" "75_mod_h2.conf" -} diff --git a/www-apache/mod_h2/mod_h2-0.8.3.ebuild b/www-apache/mod_h2/mod_h2-0.8.3.ebuild deleted file mode 100644 index 2890e5a789ae..000000000000 --- a/www-apache/mod_h2/mod_h2-0.8.3.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -inherit apache-module - -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://github.com/icing/mod_h2.git" - inherit git-2 -else - SRC_URI="https://github.com/icing/mod_h2/releases/download/v${PV}/${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -DESCRIPTION="HTTP/2 module for Apache" -HOMEPAGE="https://github.com/icing/mod_h2" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="ssl" - -RDEPEND=">=net-libs/nghttp2-1.0 - ssl? ( www-servers/apache[alpn] )" -DEPEND="${RDEPEND}" - -need_apache2_4 - -src_configure() { - econf \ - --docdir='$(datarootdir)'/doc/${PF} \ - --disable-werror \ - --disable-sandbox -} - -src_compile() { - default -} - -src_install() { - default - - APACHE2_MOD_DEFINE="HTTP2" - insinto "${APACHE_MODULES_CONFDIR}" - newins "${FILESDIR}/mod_h2.conf" "75_mod_h2.conf" -} diff --git a/www-apache/mod_h2/mod_h2-1.4.7.ebuild b/www-apache/mod_h2/mod_h2-1.4.7.ebuild new file mode 100644 index 000000000000..48f0e8ef3707 --- /dev/null +++ b/www-apache/mod_h2/mod_h2-1.4.7.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" + +inherit apache-module + +MY_P="${PN/h2/http2}-${PV}" + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/icing/mod_h2.git" + inherit git-2 +else + SRC_URI="https://github.com/icing/mod_h2/releases/download/v${PV}/${MY_P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="HTTP/2 module for Apache" +HOMEPAGE="https://github.com/icing/mod_h2" + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="ssl" + +RDEPEND=">=net-libs/nghttp2-1.0 + >=www-servers/apache-2.4.20[-apache2_modules_http2,ssl?]" +DEPEND="${RDEPEND}" + +S="${WORKDIR}/${MY_P}" + +need_apache2_4 + +src_configure() { + econf \ + --docdir='$(datarootdir)'/doc/${PF} \ + --disable-werror +} + +src_compile() { + default +} + +src_install() { + default + + APACHE2_MOD_DEFINE="HTTP2" + insinto "${APACHE_MODULES_CONFDIR}" + newins "${FILESDIR}/mod_http2.conf" "41_mod_http2.conf" +} diff --git a/www-apache/mod_h2/mod_h2-1.5.6.ebuild b/www-apache/mod_h2/mod_h2-1.5.6.ebuild new file mode 100644 index 000000000000..48f0e8ef3707 --- /dev/null +++ b/www-apache/mod_h2/mod_h2-1.5.6.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" + +inherit apache-module + +MY_P="${PN/h2/http2}-${PV}" + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/icing/mod_h2.git" + inherit git-2 +else + SRC_URI="https://github.com/icing/mod_h2/releases/download/v${PV}/${MY_P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="HTTP/2 module for Apache" +HOMEPAGE="https://github.com/icing/mod_h2" + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="ssl" + +RDEPEND=">=net-libs/nghttp2-1.0 + >=www-servers/apache-2.4.20[-apache2_modules_http2,ssl?]" +DEPEND="${RDEPEND}" + +S="${WORKDIR}/${MY_P}" + +need_apache2_4 + +src_configure() { + econf \ + --docdir='$(datarootdir)'/doc/${PF} \ + --disable-werror +} + +src_compile() { + default +} + +src_install() { + default + + APACHE2_MOD_DEFINE="HTTP2" + insinto "${APACHE_MODULES_CONFDIR}" + newins "${FILESDIR}/mod_http2.conf" "41_mod_http2.conf" +} diff --git a/www-apache/mod_h2/mod_h2-9999.ebuild b/www-apache/mod_h2/mod_h2-9999.ebuild index 2890e5a789ae..48f0e8ef3707 100644 --- a/www-apache/mod_h2/mod_h2-9999.ebuild +++ b/www-apache/mod_h2/mod_h2-9999.ebuild @@ -1,16 +1,17 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ EAPI="5" inherit apache-module +MY_P="${PN/h2/http2}-${PV}" + if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://github.com/icing/mod_h2.git" inherit git-2 else - SRC_URI="https://github.com/icing/mod_h2/releases/download/v${PV}/${P}.tar.gz" + SRC_URI="https://github.com/icing/mod_h2/releases/download/v${PV}/${MY_P}.tar.gz" KEYWORDS="~amd64 ~x86" fi @@ -22,16 +23,17 @@ SLOT="0" IUSE="ssl" RDEPEND=">=net-libs/nghttp2-1.0 - ssl? ( www-servers/apache[alpn] )" + >=www-servers/apache-2.4.20[-apache2_modules_http2,ssl?]" DEPEND="${RDEPEND}" +S="${WORKDIR}/${MY_P}" + need_apache2_4 src_configure() { econf \ --docdir='$(datarootdir)'/doc/${PF} \ - --disable-werror \ - --disable-sandbox + --disable-werror } src_compile() { @@ -43,5 +45,5 @@ src_install() { APACHE2_MOD_DEFINE="HTTP2" insinto "${APACHE_MODULES_CONFDIR}" - newins "${FILESDIR}/mod_h2.conf" "75_mod_h2.conf" + newins "${FILESDIR}/mod_http2.conf" "41_mod_http2.conf" } -- cgit v1.2.3-65-gdbad