* [gentoo-commits] repo/gentoo:master commit in: www-servers/h2o/files/
@ 2018-07-04 13:24 Akinori Hattori
0 siblings, 0 replies; 6+ messages in thread
From: Akinori Hattori @ 2018-07-04 13:24 UTC (permalink / raw
To: gentoo-commits
commit: 706e08d516299f045abb4eb40b35d1f5460afb22
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 4 13:22:19 2018 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Wed Jul 4 13:23:48 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=706e08d5
www-servers/h2o: update systemd unit
Package-Manager: Portage-2.3.40, Repoman-2.3.9
www-servers/h2o/files/h2o.service | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/www-servers/h2o/files/h2o.service b/www-servers/h2o/files/h2o.service
index fe32c45cd90..0ea3f45fec4 100644
--- a/www-servers/h2o/files/h2o.service
+++ b/www-servers/h2o/files/h2o.service
@@ -1,13 +1,13 @@
[Unit]
-Description=An optimized HTTP/1.x, HTTP/2 server
-After=network-online.target nss-lookup.target remote-fs.target
+Description=H2O - the optimized HTTP/1, HTTP/2 server
+After=network.target remote-fs.target nss-lookup.target
[Service]
-Type=simple
-ExecStart=/usr/bin/h2o -c /etc/h2o/h2o.conf -m master
-SyslogLevel=notice
+ExecStartPre=/usr/bin/h2o -m test -c /etc/h2o/h2o.conf
+ExecStart=/usr/bin/h2o -m master -c /etc/h2o/h2o.conf
+ExecReload=/bin/kill -HUP ${MAINPID}
+ExecStop=/bin/kill -TERM ${MAINPID}
PrivateTmp=true
-LimitNOFILE=infinity
[Install]
WantedBy=multi-user.target
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/h2o/files/
@ 2018-07-04 13:24 Akinori Hattori
0 siblings, 0 replies; 6+ messages in thread
From: Akinori Hattori @ 2018-07-04 13:24 UTC (permalink / raw
To: gentoo-commits
commit: d789b6541c11824fe6c54368c7dd14416d463bed
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 4 13:19:12 2018 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Wed Jul 4 13:23:47 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d789b654
www-servers/h2o: update init script
Closes: https://bugs.gentoo.org/655468
Package-Manager: Portage-2.3.40, Repoman-2.3.9
www-servers/h2o/files/h2o.initd | 54 +++++++++++++++--------------------------
1 file changed, 20 insertions(+), 34 deletions(-)
diff --git a/www-servers/h2o/files/h2o.initd b/www-servers/h2o/files/h2o.initd
index ad598a5f619..b100434bd20 100644
--- a/www-servers/h2o/files/h2o.initd
+++ b/www-servers/h2o/files/h2o.initd
@@ -1,51 +1,37 @@
#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-extra_commands="configtest"
+extra_commands="checkconfig"
extra_started_commands="reload"
-description="An optimized HTTP/1.x, HTTP/2 server"
-description_configtest="Run H2O' internal config check"
-description_reload="Reload the H2O configuration or upgrade the binary without losing connections"
-: ${config:="/etc/h2o/h2o.conf"}
-pidfile=$(grep pid-file "${config}" | cut -d' ' -f2)
+description_checkconfig="Check the configuration file"
+description_reload="Reload the configuration file"
+: ${h2o_config:="/etc/${RC_SVCNAME}/${RC_SVCNAME}.conf"}
+
+start_stop_daemon_args="--group ${RC_SVCNAME}"
+command="/usr/bin/${RC_SVCNAME}"
+command_args="-m daemon -c \"${h2o_config}\""
+pidfile="$(grep pid-file "${h2o_config}" | cut -d' ' -f2-)"
name="H2O"
-command="/usr/bin/h2o"
-command_args="-m daemon -c ${config}"
-required_files="$config"
depend() {
- use net
- after logger
+ need net
+ use dns
}
-start_pre() {
- if [ "${RC_CMD}" != "restart" ]; then
- configtest || return 1
- fi
+checkconfig() {
+ "${command}" -m test -c "${h2o_config}" || return 1
}
-stop_pre() {
- if [ "${RC_CMD}" = "restart" ]; then
- configtest || return 1
- fi
+start_pre() {
+ checkconfig || return 1
}
reload() {
- configtest || return 1
- ebegin "Refreshing ${name} configuration"
- kill -HUP $(cat ${pidfile}) &>/dev/null
- eend $? "Failed to reload ${name}"
-}
-
-configtest() {
- ebegin "Checking ${name} configuration"
-
- if ! ${command} -c ${config} -t &>/dev/null; then
- ${command} -c ${config} -t
- fi
-
- eend $? "Failed, please correct the errors above"
+ checkconfig || return 1
+ ebegin "Reloading ${name:-${RC_SVCNAME}}"
+ start-stop-daemon --signal HUP --pidfile "${pidfile}"
+ eend ${?}
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/h2o/files/
@ 2018-07-04 13:27 Akinori Hattori
0 siblings, 0 replies; 6+ messages in thread
From: Akinori Hattori @ 2018-07-04 13:27 UTC (permalink / raw
To: gentoo-commits
commit: 32074359bf6a840899afc45afed2de5a50e2588a
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 4 13:27:28 2018 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Wed Jul 4 13:27:28 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32074359
www-servers/h2o: update init script
Package-Manager: Portage-2.3.40, Repoman-2.3.9
www-servers/h2o/files/h2o.initd | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www-servers/h2o/files/h2o.initd b/www-servers/h2o/files/h2o.initd
index b100434bd20..61944ccc555 100644
--- a/www-servers/h2o/files/h2o.initd
+++ b/www-servers/h2o/files/h2o.initd
@@ -13,7 +13,7 @@ description_reload="Reload the configuration file"
start_stop_daemon_args="--group ${RC_SVCNAME}"
command="/usr/bin/${RC_SVCNAME}"
command_args="-m daemon -c \"${h2o_config}\""
-pidfile="$(grep pid-file "${h2o_config}" | cut -d' ' -f2-)"
+pidfile="$(grep pid-file "${h2o_config}" | cut -d' ' -f2)"
name="H2O"
depend() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/h2o/files/
@ 2018-07-17 13:47 Akinori Hattori
0 siblings, 0 replies; 6+ messages in thread
From: Akinori Hattori @ 2018-07-17 13:47 UTC (permalink / raw
To: gentoo-commits
commit: 8b4cdbbea6c56a831eab3dc7c29380f833f5eba9
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 17 13:47:00 2018 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Tue Jul 17 13:47:00 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b4cdbbe
www-servers/h2o: remove unused patch
Package-Manager: Portage-2.3.40, Repoman-2.3.9
www-servers/h2o/files/h2o-2.2.4-libressl.patch | 54 --------------------------
1 file changed, 54 deletions(-)
diff --git a/www-servers/h2o/files/h2o-2.2.4-libressl.patch b/www-servers/h2o/files/h2o-2.2.4-libressl.patch
deleted file mode 100644
index 3849dd0e2b6..00000000000
--- a/www-servers/h2o/files/h2o-2.2.4-libressl.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- a/include/h2o/openssl_backport.h
-+++ b/include/h2o/openssl_backport.h
-@@ -25,7 +25,7 @@
- #include <stdlib.h>
-
- /* backports for OpenSSL 1.0.2 */
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
-
- #define BIO_get_data(bio) ((bio)->ptr)
- #define BIO_set_data(bio, p) ((bio)->ptr = (p))
-@@ -57,7 +58,7 @@ static inline BIO_METHOD *BIO_meth_new(int type, const char *name)
- #endif
-
- /* backports for OpenSSL 1.0.1 and LibreSSL */
--#if OPENSSL_VERSION_NUMBER < 0x10002000L || defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER < 0x10002000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
-
- #define SSL_is_server(ssl) ((ssl)->server)
-
---- a/deps/neverbleed/neverbleed.c
-+++ b/deps/neverbleed/neverbleed.c
-@@ -547,7 +547,7 @@ static int sign_stub(struct expbuf_t *buf)
- return 0;
- }
-
--#if !OPENSSL_1_1_API
-+#if !OPENSSL_1_1_API && (!defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x2070000fL)
-
- static void RSA_get0_key(const RSA *rsa, const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
- {
-
---- a/deps/picotls/lib/openssl.c
-+++ b/deps/picotls/lib/openssl.c
-@@ -41,13 +41,15 @@
- #include "picotls.h"
- #include "picotls/openssl.h"
-
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER))
--#define OPENSSL_1_0_API 1
-+#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#define OPENSSL_1_1_API 1
-+#elif defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL
-+#define OPENSSL_1_1_API 1
- #else
--#define OPENSSL_1_0_API 0
-+#define OPENSSL_1_1_API 0
- #endif
-
--#if OPENSSL_1_0_API
-+#if !OPENSSL_1_1_API
-
- #define EVP_PKEY_up_ref(p) CRYPTO_add(&(p)->references, 1, CRYPTO_LOCK_EVP_PKEY)
- #define X509_STORE_up_ref(p) CRYPTO_add(&(p)->references, 1, CRYPTO_LOCK_X509_STORE)
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/h2o/files/
@ 2021-05-03 18:46 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2021-05-03 18:46 UTC (permalink / raw
To: gentoo-commits
commit: acd3d18721cd084af64f6be9460a69aa47759743
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon May 3 18:38:22 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May 3 18:45:52 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acd3d187
www-servers/h2o: drop obsolete LibreSSL patch(es)
Package-Manager: Portage-3.0.18-prefix, Repoman-3.0.3
Signed-off-by: Sam James <sam <AT> gentoo.org>
www-servers/h2o/files/h2o-2.2-libressl-2.7.patch | 23 -----------------------
1 file changed, 23 deletions(-)
diff --git a/www-servers/h2o/files/h2o-2.2-libressl-2.7.patch b/www-servers/h2o/files/h2o-2.2-libressl-2.7.patch
deleted file mode 100644
index 02942b49227..00000000000
--- a/www-servers/h2o/files/h2o-2.2-libressl-2.7.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From db50d885a87985310e65159a705b45de8646dc26 Mon Sep 17 00:00:00 2001
-From: AIZAWA Hina <hina@bouhime.com>
-Date: Fri, 23 Mar 2018 22:50:51 +0900
-Subject: [PATCH] Add supporting LibreSSL 2.7
-
-Signed-off-by: AIZAWA Hina <hina@bouhime.com>
----
- deps/neverbleed/neverbleed.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/deps/neverbleed/neverbleed.c b/deps/neverbleed/neverbleed.c
-index 29b35a9..42356a6 100644
---- a/deps/neverbleed/neverbleed.c
-+++ b/deps/neverbleed/neverbleed.c
-@@ -547,7 +547,7 @@ static int sign_stub(struct expbuf_t *buf)
- return 0;
- }
-
--#if !OPENSSL_1_1_API
-+#if !OPENSSL_1_1_API && (!defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x2070000fL)
-
- static void RSA_get0_key(const RSA *rsa, const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
- {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/h2o/files/
@ 2023-04-14 0:31 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2023-04-14 0:31 UTC (permalink / raw
To: gentoo-commits
commit: b118d47190724cbf7b022b8b7a1c1d5cdbdbc100
Author: orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Tue Apr 11 19:19:47 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 14 00:27:59 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b118d471
www-servers/h2o: Rebase live patch
Signed-off-by: orbea <orbea <AT> riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/30560
Signed-off-by: Sam James <sam <AT> gentoo.org>
www-servers/h2o/files/h2o-2.3-mruby.patch | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/www-servers/h2o/files/h2o-2.3-mruby.patch b/www-servers/h2o/files/h2o-2.3-mruby.patch
index 4f64565a675a..353af46a3af7 100644
--- a/www-servers/h2o/files/h2o-2.3-mruby.patch
+++ b/www-servers/h2o/files/h2o-2.3-mruby.patch
@@ -1,6 +1,6 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -237,6 +237,19 @@
+@@ -239,6 +239,19 @@ IF (NOT WSLAY_FOUND)
SET(WSLAY_LIBRARIES -lwslay)
ENDIF (NOT WSLAY_FOUND)
@@ -20,16 +20,16 @@
IF (ZLIB_FOUND)
INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIRS})
LINK_DIRECTORIES(${ZLIB_LIBRARY_DIRS})
-@@ -743,7 +756,7 @@
+@@ -761,7 +774,7 @@ IF (WITH_MRUBY)
ADD_CUSTOM_TARGET(mruby
# deps/mruby/tasks/toolchains/clang.rake looks for CC, CXX and LD.
# There are no C++ files in deps/mruby, use the C compiler for linking.
-- MRUBY_TOOLCHAIN=${MRUBY_TOOLCHAIN} CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} LD=${CMAKE_C_COMPILER} MRUBY_CONFIG=${CMAKE_CURRENT_SOURCE_DIR}/misc/mruby_config.rb MRUBY_BUILD_DIR=${CMAKE_CURRENT_BINARY_DIR}/mruby MRUBY_ADDITIONAL_CONFIG=${MRUBY_ADDITIONAL_CONFIG} ruby minirake
-+ MRUBY_TOOLCHAIN=${MRUBY_TOOLCHAIN} CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} LD=${CMAKE_C_COMPILER} MRUBY_CONFIG=${CMAKE_CURRENT_SOURCE_DIR}/misc/mruby_config.rb MRUBY_BUILD_DIR=${CMAKE_CURRENT_BINARY_DIR}/mruby MRUBY_ADDITIONAL_CONFIG=${MRUBY_ADDITIONAL_CONFIG} ruby minirake -v
+- MRUBY_TOOLCHAIN=${MRUBY_TOOLCHAIN} CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} LD=${CMAKE_C_COMPILER} MRUBY_CONFIG=${CMAKE_CURRENT_SOURCE_DIR}/misc/mruby_config.rb MRUBY_BUILD_DIR=${CMAKE_CURRENT_BINARY_DIR}/mruby MRUBY_ADDITIONAL_CONFIG=${MRUBY_ADDITIONAL_CONFIG} INSTALL_DIR=${CMAKE_CURRENT_BINARY_DIR}/mruby-bin ruby minirake
++ MRUBY_TOOLCHAIN=${MRUBY_TOOLCHAIN} CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} LD=${CMAKE_C_COMPILER} MRUBY_CONFIG=${CMAKE_CURRENT_SOURCE_DIR}/misc/mruby_config.rb MRUBY_BUILD_DIR=${CMAKE_CURRENT_BINARY_DIR}/mruby MRUBY_ADDITIONAL_CONFIG=${MRUBY_ADDITIONAL_CONFIG} INSTALL_DIR=${CMAKE_CURRENT_BINARY_DIR}/mruby-bin ruby minirake -v
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/deps/mruby
BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/mruby/host/lib/libmruby.a"
"${CMAKE_CURRENT_BINARY_DIR}/mruby/host/mrbgems/mruby-onig-regexp/onigmo-6.2.0/.libs/libonigmo.a"
-@@ -777,7 +790,7 @@
+@@ -795,7 +808,7 @@ IF (WITH_MRUBY)
# note: the paths need to be determined before libmruby.flags.mak is generated
TARGET_LINK_LIBRARIES(h2o
"${CMAKE_CURRENT_BINARY_DIR}/mruby/host/lib/libmruby.a"
@@ -40,7 +40,7 @@
ENDIF (WITH_MRUBY)
--- a/deps/mruby-onig-regexp/mrbgem.rake
+++ b/deps/mruby-onig-regexp/mrbgem.rake
-@@ -108,10 +108,8 @@
+@@ -108,10 +108,8 @@ MRuby::Gem::Specification.new('mruby-onig-regexp') do |spec|
if spec.respond_to? :search_package and spec.search_package 'onigmo'
spec.cc.defines += ['HAVE_ONIGMO_H']
@@ -53,7 +53,7 @@
spec.linker.libraries << 'onigmo'
--- a/misc/mruby_config.rb
+++ b/misc/mruby_config.rb
-@@ -15,13 +15,7 @@
+@@ -17,13 +17,7 @@ MRuby::Build.new do |conf|
# use mrbgems
Dir.glob("../mruby-*/mrbgem.rake") do |x|
g = File.basename File.dirname x
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-04-14 0:31 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-05-03 18:46 [gentoo-commits] repo/gentoo:master commit in: www-servers/h2o/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2023-04-14 0:31 Sam James
2018-07-17 13:47 Akinori Hattori
2018-07-04 13:27 Akinori Hattori
2018-07-04 13:24 Akinori Hattori
2018-07-04 13:24 Akinori Hattori
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox