| 1 |
commit: c68e501b8b299cdd5dbd42f6f26dcd32fbb911a3 |
| 2 |
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jul 4 12:59:44 2018 +0000 |
| 4 |
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jul 4 13:23:46 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c68e501b |
| 7 |
|
| 8 |
www-servers/h2o: tidy |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
| 11 |
|
| 12 |
www-servers/h2o/files/h2o.logrotate | 7 ++++-- |
| 13 |
www-servers/h2o/h2o-2.2.4.ebuild | 44 ++++++++++++++++--------------------- |
| 14 |
www-servers/h2o/h2o-9999.ebuild | 36 ++++++++++++++++-------------- |
| 15 |
www-servers/h2o/metadata.xml | 1 + |
| 16 |
4 files changed, 44 insertions(+), 44 deletions(-) |
| 17 |
|
| 18 |
diff --git a/www-servers/h2o/files/h2o.logrotate b/www-servers/h2o/files/h2o.logrotate |
| 19 |
index b901bcfacb1..166b6e7f17b 100644 |
| 20 |
--- a/www-servers/h2o/files/h2o.logrotate |
| 21 |
+++ b/www-servers/h2o/files/h2o.logrotate |
| 22 |
@@ -1,8 +1,11 @@ |
| 23 |
+# h2o logrotate script for Gentoo |
| 24 |
+ |
| 25 |
/var/log/h2o/*.log { |
| 26 |
missingok |
| 27 |
- delaycompress |
| 28 |
+ notifempty |
| 29 |
sharedscripts |
| 30 |
+ delaycompress |
| 31 |
postrotate |
| 32 |
- test -r $(grep pid-file "/etc/h2o/h2o.conf" | cut -d' ' -f2) && kill -HUP $(pidof h2o) |
| 33 |
+ /bin/kill -HUP $(grep pid-file "/etc/h2o/h2o.conf" | cut -d' ' -f2 | cat) 2>/dev/null || true |
| 34 |
endscript |
| 35 |
} |
| 36 |
|
| 37 |
diff --git a/www-servers/h2o/h2o-2.2.4.ebuild b/www-servers/h2o/h2o-2.2.4.ebuild |
| 38 |
index 10c508037d7..579c8e92940 100644 |
| 39 |
--- a/www-servers/h2o/h2o-2.2.4.ebuild |
| 40 |
+++ b/www-servers/h2o/h2o-2.2.4.ebuild |
| 41 |
@@ -1,14 +1,14 @@ |
| 42 |
# Copyright 1999-2018 Gentoo Foundation |
| 43 |
# Distributed under the terms of the GNU General Public License v2 |
| 44 |
|
| 45 |
-EAPI=6 |
| 46 |
+EAPI="6" |
| 47 |
CMAKE_MAKEFILE_GENERATOR="emake" |
| 48 |
USE_RUBY="ruby23 ruby24" |
| 49 |
|
| 50 |
inherit cmake-utils ruby-single systemd user |
| 51 |
|
| 52 |
-DESCRIPTION="An optimized HTTP server with support for HTTP/1.x and HTTP/2" |
| 53 |
-HOMEPAGE="https://h2o.examp1e.net" |
| 54 |
+DESCRIPTION="H2O - the optimized HTTP/1, HTTP/2 server" |
| 55 |
+HOMEPAGE="https://h2o.examp1e.net/" |
| 56 |
SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
| 57 |
|
| 58 |
LICENSE="MIT" |
| 59 |
@@ -16,7 +16,8 @@ SLOT="0" |
| 60 |
KEYWORDS="~amd64 ~x86" |
| 61 |
IUSE="libressl +mruby" |
| 62 |
|
| 63 |
-RDEPEND=" |
| 64 |
+RDEPEND="dev-lang/perl |
| 65 |
+ sys-libs/zlib |
| 66 |
!libressl? ( dev-libs/openssl:0= ) |
| 67 |
libressl? ( dev-libs/libressl:0= )" |
| 68 |
DEPEND="${RDEPEND} |
| 69 |
@@ -28,22 +29,14 @@ DEPEND="${RDEPEND} |
| 70 |
PATCHES=( "${FILESDIR}"/${P}-libressl.patch ) |
| 71 |
|
| 72 |
pkg_setup() { |
| 73 |
- enewgroup h2o |
| 74 |
- enewuser h2o -1 -1 -1 h2o |
| 75 |
-} |
| 76 |
- |
| 77 |
-src_prepare() { |
| 78 |
- # Leave optimization level to user CFLAGS |
| 79 |
- sed -i 's/-O2 -g ${CC_WARNING_FLAGS} //g' ./CMakeLists.txt \ |
| 80 |
- || die "sed fix failed!" |
| 81 |
- |
| 82 |
- cmake-utils_src_prepare |
| 83 |
+ enewgroup ${PN} |
| 84 |
+ enewuser ${PN} -1 -1 -1 ${PN} |
| 85 |
} |
| 86 |
|
| 87 |
src_configure() { |
| 88 |
local mycmakeargs=( |
| 89 |
- -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc/h2o |
| 90 |
- -DWITH_MRUBY="$(usex mruby)" |
| 91 |
+ -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc/${PN} |
| 92 |
+ -DWITH_MRUBY=$(usex mruby) |
| 93 |
-DWITHOUT_LIBS=ON |
| 94 |
) |
| 95 |
cmake-utils_src_configure |
| 96 |
@@ -52,17 +45,18 @@ src_configure() { |
| 97 |
src_install() { |
| 98 |
cmake-utils_src_install |
| 99 |
|
| 100 |
- newinitd "${FILESDIR}"/h2o.initd h2o |
| 101 |
- systemd_dounit "${FILESDIR}"/h2o.service |
| 102 |
- |
| 103 |
- insinto /etc/h2o |
| 104 |
- doins "${FILESDIR}"/h2o.conf |
| 105 |
+ keepdir /var/www/localhost/htdocs |
| 106 |
|
| 107 |
- keepdir /var/log/h2o |
| 108 |
- fperms 0700 /var/log/h2o |
| 109 |
+ insinto /etc/${PN} |
| 110 |
+ doins "${FILESDIR}"/${PN}.conf |
| 111 |
|
| 112 |
- keepdir /var/www/localhost/htdocs |
| 113 |
+ newinitd "${FILESDIR}"/${PN}.initd ${PN} |
| 114 |
+ systemd_dounit "${FILESDIR}"/${PN}.service |
| 115 |
|
| 116 |
insinto /etc/logrotate.d |
| 117 |
- newins "${FILESDIR}"/h2o.logrotate h2o |
| 118 |
+ newins "${FILESDIR}"/${PN}.logrotate ${PN} |
| 119 |
+ |
| 120 |
+ keepdir /var/log/${PN} |
| 121 |
+ fowners ${PN}:${PN} /var/log/${PN} |
| 122 |
+ fperms 0750 /var/log/${PN} |
| 123 |
} |
| 124 |
|
| 125 |
diff --git a/www-servers/h2o/h2o-9999.ebuild b/www-servers/h2o/h2o-9999.ebuild |
| 126 |
index b0583fd8855..d6c5d65d823 100644 |
| 127 |
--- a/www-servers/h2o/h2o-9999.ebuild |
| 128 |
+++ b/www-servers/h2o/h2o-9999.ebuild |
| 129 |
@@ -1,14 +1,14 @@ |
| 130 |
# Copyright 1999-2018 Gentoo Foundation |
| 131 |
# Distributed under the terms of the GNU General Public License v2 |
| 132 |
|
| 133 |
-EAPI=6 |
| 134 |
+EAPI="6" |
| 135 |
CMAKE_MAKEFILE_GENERATOR="emake" |
| 136 |
USE_RUBY="ruby23 ruby24" |
| 137 |
|
| 138 |
inherit cmake-utils git-r3 ruby-single systemd user |
| 139 |
|
| 140 |
-DESCRIPTION="An optimized HTTP server with support for HTTP/1.x and HTTP/2" |
| 141 |
-HOMEPAGE="https://h2o.examp1e.net" |
| 142 |
+DESCRIPTION="H2O - the optimized HTTP/1, HTTP/2 server" |
| 143 |
+HOMEPAGE="https://h2o.examp1e.net/" |
| 144 |
EGIT_REPO_URI="https://github.com/${PN}/${PN}.git" |
| 145 |
|
| 146 |
LICENSE="MIT" |
| 147 |
@@ -16,7 +16,8 @@ SLOT="0" |
| 148 |
KEYWORDS="" |
| 149 |
IUSE="libressl +mruby" |
| 150 |
|
| 151 |
-RDEPEND=" |
| 152 |
+RDEPEND="dev-lang/perl |
| 153 |
+ sys-libs/zlib |
| 154 |
!libressl? ( dev-libs/openssl:0= ) |
| 155 |
libressl? ( dev-libs/libressl:0= )" |
| 156 |
DEPEND="${RDEPEND} |
| 157 |
@@ -26,14 +27,14 @@ DEPEND="${RDEPEND} |
| 158 |
)" |
| 159 |
|
| 160 |
pkg_setup() { |
| 161 |
- enewgroup h2o |
| 162 |
- enewuser h2o -1 -1 -1 h2o |
| 163 |
+ enewgroup ${PN} |
| 164 |
+ enewuser ${PN} -1 -1 -1 ${PN} |
| 165 |
} |
| 166 |
|
| 167 |
src_configure() { |
| 168 |
local mycmakeargs=( |
| 169 |
- -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc/h2o |
| 170 |
- -DWITH_MRUBY="$(usex mruby)" |
| 171 |
+ -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc/${PN} |
| 172 |
+ -DWITH_MRUBY=$(usex mruby) |
| 173 |
-DWITHOUT_LIBS=ON |
| 174 |
) |
| 175 |
cmake-utils_src_configure |
| 176 |
@@ -42,17 +43,18 @@ src_configure() { |
| 177 |
src_install() { |
| 178 |
cmake-utils_src_install |
| 179 |
|
| 180 |
- newinitd "${FILESDIR}"/h2o.initd h2o |
| 181 |
- systemd_dounit "${FILESDIR}"/h2o.service |
| 182 |
- |
| 183 |
- insinto /etc/h2o |
| 184 |
- doins "${FILESDIR}"/h2o.conf |
| 185 |
+ keepdir /var/www/localhost/htdocs |
| 186 |
|
| 187 |
- keepdir /var/log/h2o |
| 188 |
- fperms 0700 /var/log/h2o |
| 189 |
+ insinto /etc/${PN} |
| 190 |
+ doins "${FILESDIR}"/${PN}.conf |
| 191 |
|
| 192 |
- keepdir /var/www/localhost/htdocs |
| 193 |
+ newinitd "${FILESDIR}"/${PN}.initd ${PN} |
| 194 |
+ systemd_dounit "${FILESDIR}"/${PN}.service |
| 195 |
|
| 196 |
insinto /etc/logrotate.d |
| 197 |
- newins "${FILESDIR}"/h2o.logrotate h2o |
| 198 |
+ newins "${FILESDIR}"/${PN}.logrotate ${PN} |
| 199 |
+ |
| 200 |
+ keepdir /var/log/${PN} |
| 201 |
+ fowners ${PN}:${PN} /var/log/${PN} |
| 202 |
+ fperms 0750 /var/log/${PN} |
| 203 |
} |
| 204 |
|
| 205 |
diff --git a/www-servers/h2o/metadata.xml b/www-servers/h2o/metadata.xml |
| 206 |
index af6fee5b3de..6a34529b48f 100644 |
| 207 |
--- a/www-servers/h2o/metadata.xml |
| 208 |
+++ b/www-servers/h2o/metadata.xml |
| 209 |
@@ -3,6 +3,7 @@ |
| 210 |
<pkgmetadata> |
| 211 |
<maintainer type="person"> |
| 212 |
<email>hattya@g.o</email> |
| 213 |
+ <name>Akinori Hattori</name> |
| 214 |
</maintainer> |
| 215 |
<longdescription lang="en"> |
| 216 |
H2O is a new generation HTTP server. Not only is it very fast, |
Archives