From 71bc00c87bba1ce31de0dac6c3b7fd1aee6917fc Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:52:04 +0100 Subject: gentoo resync : 14.07.2018 --- www-servers/h2o/Manifest | 8 ++-- www-servers/h2o/files/h2o.conf | 29 ++++-------- www-servers/h2o/h2o-2.2.4.ebuild | 90 ------------------------------------- www-servers/h2o/h2o-2.2.5.ebuild | 97 ++++++++++++++++++++++++++++++++++++++++ www-servers/h2o/h2o-9999.ebuild | 12 ++++- 5 files changed, 120 insertions(+), 116 deletions(-) delete mode 100644 www-servers/h2o/h2o-2.2.4.ebuild create mode 100644 www-servers/h2o/h2o-2.2.5.ebuild (limited to 'www-servers/h2o') diff --git a/www-servers/h2o/Manifest b/www-servers/h2o/Manifest index ec1d0712bef2..cf7e5bc6662b 100644 --- a/www-servers/h2o/Manifest +++ b/www-servers/h2o/Manifest @@ -1,11 +1,11 @@ AUX h2o-2.2-mruby.patch 2532 BLAKE2B dc12356bb1e4685ee88a8a1aae1d70d6555225413649b252840dc5a572fced7f818b8439b8480ec2a1b2bf9a0ddf62670f21ee1b7f42f2b877e711cf3a22048a SHA512 9c3b5d3bb18bba55019a305346211e1784c83c6c21dfb1c086169e49afd423f7be71e0cbc05703199423bc56e892b9e653e9df43e861208033fb7766ab2a59d5 AUX h2o-2.2.4-libressl.patch 1946 BLAKE2B 6acaf45e7db2faf4fa09aa2214f6389e7f5b421c9bae8ae10dd35569d609839c2d9a7e8ca1c7057b37812d7b444406c86fae496084665e57d0688c76cf095b68 SHA512 63558d53fe52deaa54976fe33346708ed9b3c59588930ef463ae9d9f89747acc66038d3105dec1b72051715ba523323a6cb7c4bdbb445d521f23d9682ca4717f AUX h2o-2.3-mruby.patch 2993 BLAKE2B 5da06fa53d67a201e468b56aa78136edea305bc79d9d645da5a12ca54a4d633e821312e0bde382ed07229ee173ab02df8bcba592e076a8b39a199a8a7e185393 SHA512 de2e98103cea6337f68d31c8600de37ff5cf8163df824a19d1879c0a60e603773d4e9a42b926b94156ad0743e67ce630e73e9e81e86dc192d51656f595d26790 -AUX h2o.conf 673 BLAKE2B 2e7a51fa8ba766df6d3542e434c786e9ffcb4016a1ff9b3a1f065592eb559b90706e927ac8063b5f95f0aa78eb247b366d2a7e69226f261d11a5d610a8c11eab SHA512 48ab93dd7aee65f88bb12bc270f0ba0edf31bcb4610bb4b648936f8ffca47b30a3aa2aec129aa3c985f476450dc47305bd111f326715941f84e54bbc66f1325a +AUX h2o.conf 350 BLAKE2B 948c90451fd76cb55f3b42eaa9ddc01564b2bd2c46437649fb639d6cee89c5adfac780e533c13793133e6798d847c1c87c631979162af9a1b7c5caebb8963b3b SHA512 b2ba08c3bcd15c3c7631913dc64006870487773f952421aec624f82dcbe836137a2b8357cbd0b8e26626f9c6f108c8aee46beb61e8649fe78fac0e31ef585b6e AUX h2o.initd 845 BLAKE2B f420962962517051c695f00e11a3b6edb899a672d0984db3d68b88545064767e7059cd9b3ec60b7cb70469b403e0927dbaea4e9f7b7a00979b4f036f945585d5 SHA512 9fdfde2857d97937939b1dd591b94f26f77b6fd6061d385c807738be508f1df740acf36c38ca95c22a36f13caed5d537b6fc1f6cceaf1beda8f8f48ef452c177 AUX h2o.logrotate 230 BLAKE2B 44eeaf3b0e60104d4f87c7110815a30f907a6fd676e75a2068fb9cddd8192d3e75729aaeabc89d6430eef7c075b21271918fd65b086de188f7df0c6ceb332141 SHA512 88d36e272c52c5df765d8ebac8f2acca378c8b096af7fa8eda68e1ec5597cba6096286f0ab634f128329148e65980128f0612e90a185de781c5d109653e096dd AUX h2o.service 364 BLAKE2B 9995cde4d79e5998624a2cadfc6ec3e954d4609458cc267628c2fbcb44dccd78277bddc032a784a00445c6b399fafc1ee629920355bf7aa84d26b1010bd103b0 SHA512 475b1e7b616eae335e094451532b0de5aa9cf9abc4999aaa44a9a35c43def4fb060ee5e728409bc33960f8ad3a81e6f549783906ac7ebad5b72cb7422ffb96a2 -DIST h2o-2.2.4.tar.gz 16212596 BLAKE2B 0c2702fb3c7e85e7eae107294794f80cee02b6b2488bbc2e880ea356d8362f0de8f08c3c3d686512cbf9ae1558aed23354f44e27edaf449e43d5876940248296 SHA512 508ebe93b890f573e735d9b1f9c91a669144be3523e34fb7455227fd10b38e04a5db73e706fe8d05849fea3019e792754097871c073715c9eef4eae7c33560b5 -EBUILD h2o-2.2.4.ebuild 1852 BLAKE2B 3c34435df69fbd852f5d3a0433180c08af9766bbc026c487fc2c7a7df48bc1738badcb803366990361be7c24b9cb8aee02f368714b0b5709ec1ce765313f180f SHA512 45091b92f662b04f6825e0ecd616e8d881966ddb0cb2ca07c660ef4552908de1ca10543c278211ad545b1e2f83a2b56e1d6066aeea95ad159e01211afa5b81cf -EBUILD h2o-9999.ebuild 1785 BLAKE2B 65b7e61dc2142221a62615a7ac2d7072f0d9923b1b7c386b7e2aec896be70c1270d6f6e3e2bd2353826b8670a87ada5b218862fa8be9930cf16e46592e63c5ac SHA512 fccb2195da0b1abf236cc44fca72ee81e224a7ae23b93442cfecbd57012bc9c79d1957f250986915309f600d016fe6dcad5c1c329ffcd8bb19328d7f2d38adf4 +DIST h2o-2.2.5.tar.gz 16257295 BLAKE2B 3c13796eaf9a0aca29bbff7c35fb36d0b5ef47da91f39f71614a89f2d4fea5b1ebbc8f4e3e50bf37a02a84c0fcd96d5ac0be20c83add274157af966134b2d185 SHA512 24b07140d24fbb7796038aab44f44be5ffabc6f2841954273e2ad9f1a864e5482051dd7abfa6446297a46b6868763114695fa4f123ee3175bdac53b4c1868bc2 +EBUILD h2o-2.2.5.ebuild 2102 BLAKE2B 991f1077b60f0127b846bee2b35e929d99286844ece16a26bcaa4a665537d53d0766850ffaf87f57ae528d70df52f2e09eb1603439a4f6b18fe7b73018626b28 SHA512 26f87505e1f23e1a9da6f55b830cf6a0564c33f331102bcb0e6692e1619baa9ba536a628a3517cd8e21374695d68791c25f2689465a828388f9d3911f2e91f3b +EBUILD h2o-9999.ebuild 2071 BLAKE2B 5c242fe70d411b615fa99a746d5566ade617bece72c5ed8ac84a4b5f3afbcf9f107aba51c4f2a9febdfa5ca99ebf6ae0cb7007204f5a85dc441206b388d98f1a SHA512 42fdc9a672a79bd4e4bb9bd523b041910e550252b2f53cd410503783d5b9b607e51eee13b9b1df58baf36b37cc1533e2d21607339e80c4435490b6f391422351 MISC metadata.xml 610 BLAKE2B ada180731f691d3937d481e71f704b3ad47212114b170420f58e82e4163e4ca388c4f88c1b0760de4fa87e839b5485855f4a23f5fc57f305bd14dcd4b2c54405 SHA512 91c163c3d59c8797d6fac98c20c6bb888cf547e4c6d71090d0556e49b46ec23a44ffc116230621262aaaf0e9cd9aabc1c0b250b7d8e435c42ec01fae5a0d913b diff --git a/www-servers/h2o/files/h2o.conf b/www-servers/h2o/files/h2o.conf index ccca5dd2de51..23f2d76d51ee 100644 --- a/www-servers/h2o/files/h2o.conf +++ b/www-servers/h2o/files/h2o.conf @@ -1,30 +1,17 @@ -# see /usr/share/doc/h2o/index.html for detailed documentation -# see h2o --help for command-line options and settings - user: h2o pid-file: /run/h2o.pid access-log: /var/log/h2o/access.log error-log: /var/log/h2o/error.log -# httpoxy mitigation (https://httpoxy.org) -# see https://github.com/h2o/h2o/pull/996 -setenv: - HTTP_PROXY: "" - -listen: 80 - -#listen: -# port: 443 -# ssl: -# minimum-version: TLSv1.2 -# certificate-file: /etc/h2o/server.crt -# key-file: /etc/h2o/server.key - hosts: - "localhost:80": + "localhost": + listen: + port: 80 + listen: + port: 443 + ssl: + certificate-file: /etc/ssl/h2o/server.crt + key-file: /etc/ssl/h2o/server.key paths: "/": file.dir: /var/www/localhost/htdocs - "/doc": - file.dir: /usr/share/doc/h2o/ - file.index: [ 'index.html' ] diff --git a/www-servers/h2o/h2o-2.2.4.ebuild b/www-servers/h2o/h2o-2.2.4.ebuild deleted file mode 100644 index 25c1690eeeb3..000000000000 --- a/www-servers/h2o/h2o-2.2.4.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -CMAKE_MAKEFILE_GENERATOR="emake" -USE_RUBY="ruby23 ruby24" - -inherit cmake-utils ruby-single systemd toolchain-funcs user - -DESCRIPTION="H2O - the optimized HTTP/1, HTTP/2 server" -HOMEPAGE="https://h2o.examp1e.net/" -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="libressl +mruby" - -RDEPEND="dev-lang/perl - sys-libs/zlib - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= )" -DEPEND="${RDEPEND} - mruby? ( - ${RUBY_DEPS} - dev-libs/oniguruma - sys-devel/bison - virtual/pkgconfig - )" - -PATCHES=( - "${FILESDIR}"/${PN}-2.2-mruby.patch - "${FILESDIR}"/${P}-libressl.patch -) - -pkg_setup() { - enewgroup ${PN} - enewuser ${PN} -1 -1 -1 ${PN} -} - -src_prepare() { - cmake-utils_src_prepare - - local ruby="ruby" - if use mruby; then - for ruby in ${RUBY_TARGETS_PREFERENCE}; do - if has_version dev-lang/ruby:${ruby:4:1}.${ruby:5}; then - break - fi - ruby= - done - [[ -z ${ruby} ]] && die "no suitable ruby version found" - fi - - sed -i \ - -e "s: ruby: ${ruby}:" \ - CMakeLists.txt - - sed -i "s:pkg-config:$(tc-getPKG_CONFIG):g" deps/mruby/lib/mruby/gem.rb - tc-export CC - export LD="$(tc-getCC)" -} - -src_configure() { - local mycmakeargs=( - -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc/${PN} - -DWITH_MRUBY=$(usex mruby) - -DWITHOUT_LIBS=ON - ) - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - - keepdir /var/www/localhost/htdocs - - insinto /etc/${PN} - doins "${FILESDIR}"/${PN}.conf - - newinitd "${FILESDIR}"/${PN}.initd ${PN} - systemd_dounit "${FILESDIR}"/${PN}.service - - insinto /etc/logrotate.d - newins "${FILESDIR}"/${PN}.logrotate ${PN} - - keepdir /var/log/${PN} - fowners ${PN}:${PN} /var/log/${PN} - fperms 0750 /var/log/${PN} -} diff --git a/www-servers/h2o/h2o-2.2.5.ebuild b/www-servers/h2o/h2o-2.2.5.ebuild new file mode 100644 index 000000000000..91c20bba627a --- /dev/null +++ b/www-servers/h2o/h2o-2.2.5.ebuild @@ -0,0 +1,97 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" +CMAKE_MAKEFILE_GENERATOR="emake" +SSL_DEPS_SKIP=1 +USE_RUBY="ruby23 ruby24" + +inherit cmake-utils ruby-single ssl-cert systemd toolchain-funcs user + +DESCRIPTION="H2O - the optimized HTTP/1, HTTP/2 server" +HOMEPAGE="https://h2o.examp1e.net/" +SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="libressl +mruby" + +RDEPEND="dev-lang/perl + sys-libs/zlib + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= )" +DEPEND="${RDEPEND} + mruby? ( + ${RUBY_DEPS} + dev-libs/oniguruma + sys-devel/bison + virtual/pkgconfig + )" + +PATCHES=( "${FILESDIR}"/${PN}-2.2-mruby.patch ) + +pkg_setup() { + enewgroup ${PN} + enewuser ${PN} -1 -1 -1 ${PN} +} + +src_prepare() { + cmake-utils_src_prepare + + local ruby="ruby" + if use mruby; then + for ruby in ${RUBY_TARGETS_PREFERENCE}; do + if has_version dev-lang/ruby:${ruby:4:1}.${ruby:5}; then + break + fi + ruby= + done + [[ -z ${ruby} ]] && die "no suitable ruby version found" + fi + + sed -i \ + -e "/INSTALL/s:\(/doc/${PN}\) :\1/html :" \ + -e "/INSTALL/s:\(/doc\)/${PN}:\1/${PF}:" \ + -e "s: ruby: ${ruby}:" \ + CMakeLists.txt + + sed -i "s:pkg-config:$(tc-getPKG_CONFIG):g" deps/mruby/lib/mruby/gem.rb + tc-export CC + export LD="$(tc-getCC)" +} + +src_configure() { + local mycmakeargs=( + -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc/${PN} + -DWITH_MRUBY=$(usex mruby) + -DWITHOUT_LIBS=ON + ) + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + + keepdir /var/www/localhost/htdocs + + insinto /etc/${PN} + doins "${FILESDIR}"/${PN}.conf + + newinitd "${FILESDIR}"/${PN}.initd ${PN} + systemd_dounit "${FILESDIR}"/${PN}.service + + insinto /etc/logrotate.d + newins "${FILESDIR}"/${PN}.logrotate ${PN} + + keepdir /var/log/${PN} + fowners ${PN}:${PN} /var/log/${PN} + fperms 0750 /var/log/${PN} +} + +pkg_postinst() { + if [[ ! -f "${EROOT}"etc/ssl/${PN}/server.key ]]; then + install_cert /etc/ssl/${PN}/server + chown ${PN}:${PN} "${EROOT}"etc/ssl/${PN}/server.* + fi +} diff --git a/www-servers/h2o/h2o-9999.ebuild b/www-servers/h2o/h2o-9999.ebuild index 89f63062ca99..e1d9604c4b44 100644 --- a/www-servers/h2o/h2o-9999.ebuild +++ b/www-servers/h2o/h2o-9999.ebuild @@ -3,9 +3,10 @@ EAPI="6" CMAKE_MAKEFILE_GENERATOR="emake" +SSL_DEPS_SKIP=1 USE_RUBY="ruby23 ruby24" -inherit cmake-utils git-r3 ruby-single systemd toolchain-funcs user +inherit cmake-utils git-r3 ruby-single ssl-cert systemd toolchain-funcs user DESCRIPTION="H2O - the optimized HTTP/1, HTTP/2 server" HOMEPAGE="https://h2o.examp1e.net/" @@ -50,6 +51,8 @@ src_prepare() { fi sed -i \ + -e "/INSTALL/s:\(/doc/${PN}\) :\1/html :" \ + -e "/INSTALL/s:\(/doc\)/${PN}:\1/${PF}:" \ -e "s: ruby: ${ruby}:" \ CMakeLists.txt @@ -85,3 +88,10 @@ src_install() { fowners ${PN}:${PN} /var/log/${PN} fperms 0750 /var/log/${PN} } + +pkg_postinst() { + if [[ ! -f "${EROOT}"etc/ssl/${PN}/server.key ]]; then + install_cert /etc/ssl/${PN}/server + chown ${PN}:${PN} "${EROOT}"etc/ssl/${PN}/server.* + fi +} -- cgit v1.2.3