* [gentoo-commits] repo/proj/libressl:master commit in: www-servers/h2o/files/, www-servers/h2o/
@ 2022-07-10 22:52 Quentin Retornaz
0 siblings, 0 replies; 3+ messages in thread
From: Quentin Retornaz @ 2022-07-10 22:52 UTC (permalink / raw
To: gentoo-commits
commit: ccdc75130c19dcf17ef0b1770a7628d06b4c5930
Author: orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Thu Jul 7 21:08:34 2022 +0000
Commit: Quentin Retornaz <gentoo <AT> retornaz <DOT> com>
CommitDate: Sun Jul 10 22:50:13 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=ccdc7513
www-servers/h2o: Add 2.2.6-r1
Signed-off-by: orbea <orbea <AT> riseup.net>
Signed-off-by: Quentin Retornaz <gentoo <AT> retornaz.com>
www-servers/h2o/files/h2o-2.2-libressl-3.5.patch | 29 +++++++
www-servers/h2o/files/h2o.initd | 2 +-
www-servers/h2o/h2o-2.2.6-r1.ebuild | 105 +++++++++++++++++++++++
www-servers/h2o/metadata.xml | 2 +-
4 files changed, 136 insertions(+), 2 deletions(-)
diff --git a/www-servers/h2o/files/h2o-2.2-libressl-3.5.patch b/www-servers/h2o/files/h2o-2.2-libressl-3.5.patch
new file mode 100644
index 0000000..5d9144d
--- /dev/null
+++ b/www-servers/h2o/files/h2o-2.2-libressl-3.5.patch
@@ -0,0 +1,29 @@
+Fix build with opaque RSA{,_METHOD} in LibreSSL 3.5. The relevant OpenSSL API
+has been available since LibreSSL 2.9. ECDSA support is thus also available.
+
+Index: deps/neverbleed/neverbleed.c
+--- a/deps/neverbleed/neverbleed.c.orig
++++ b/deps/neverbleed/neverbleed.c
+@@ -45,7 +45,7 @@
+ #endif
+ #include "neverbleed.h"
+
+-#if (!defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x1010000fL)
++#if ((!defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER >= 0x2090000fL) && OPENSSL_VERSION_NUMBER >= 0x1010000fL)
+ #define OPENSSL_1_1_API 1
+ #else
+ #define OPENSSL_1_1_API 0
+Silence compiler warning. The get_session_cb has had const since LibreSSL 2.8.
+
+Index: lib/common/socket.c
+--- a/lib/common/socket.c.orig
++++ b/lib/common/socket.c
+@@ -920,7 +920,7 @@ static void create_ossl(h2o_socket_t *sock)
+ }
+
+ static SSL_SESSION *on_async_resumption_get(SSL *ssl,
+-#if OPENSSL_VERSION_NUMBER >= 0x1010000fL && !defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER >= 0x1010000fL && (!defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER >= 0x2080000fL)
+ const
+ #endif
+ unsigned char *data,
diff --git a/www-servers/h2o/files/h2o.initd b/www-servers/h2o/files/h2o.initd
index 7c7cb20..61944cc 100644
--- a/www-servers/h2o/files/h2o.initd
+++ b/www-servers/h2o/files/h2o.initd
@@ -1,5 +1,5 @@
#!/sbin/openrc-run
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
extra_commands="checkconfig"
diff --git a/www-servers/h2o/h2o-2.2.6-r1.ebuild b/www-servers/h2o/h2o-2.2.6-r1.ebuild
new file mode 100644
index 0000000..abb112d
--- /dev/null
+++ b/www-servers/h2o/h2o-2.2.6-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+CMAKE_MAKEFILE_GENERATOR="emake"
+SSL_DEPS_SKIP=1
+USE_RUBY="ruby26 ruby27"
+
+inherit cmake ruby-single ssl-cert systemd toolchain-funcs
+
+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="libh2o +mruby"
+
+RDEPEND="acct-group/h2o
+ acct-user/h2o
+ dev-lang/perl
+ !sci-libs/libh2o
+ sys-libs/zlib
+ libh2o? ( dev-libs/libuv )
+ dev-libs/openssl:0="
+DEPEND="${RDEPEND}
+ mruby? (
+ ${RUBY_DEPS}
+ || (
+ dev-libs/onigmo
+ dev-libs/oniguruma
+ )
+ )"
+BDEPEND="libh2o? ( virtual/pkgconfig )
+ mruby? (
+ sys-devel/bison
+ virtual/pkgconfig
+ )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.2-libressl-3.5.patch
+ "${FILESDIR}"/${PN}-2.2-mruby.patch
+)
+
+src_prepare() {
+ cmake_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=$(usex !libh2o)
+ -DBUILD_SHARED_LIBS=$(usex libh2o)
+ )
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_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/metadata.xml b/www-servers/h2o/metadata.xml
index dab1128..689e903 100644
--- a/www-servers/h2o/metadata.xml
+++ b/www-servers/h2o/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>hattya@gentoo.org</email>
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/proj/libressl:master commit in: www-servers/h2o/files/, www-servers/h2o/
@ 2022-07-10 22:52 Quentin Retornaz
0 siblings, 0 replies; 3+ messages in thread
From: Quentin Retornaz @ 2022-07-10 22:52 UTC (permalink / raw
To: gentoo-commits
commit: 267757bad990adc2c1923ccc5c344db89c3dda5d
Author: orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Thu Jul 7 21:08:58 2022 +0000
Commit: Quentin Retornaz <gentoo <AT> retornaz <DOT> com>
CommitDate: Sun Jul 10 22:50:13 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=267757ba
www-servers/h2o: Remove old version
Signed-off-by: orbea <orbea <AT> riseup.net>
Closes: https://github.com/gentoo/libressl/pull/441
Signed-off-by: Quentin Retornaz <gentoo <AT> retornaz.com>
www-servers/h2o/files/h2o-2.2-libressl-2.7.patch | 23 -----
www-servers/h2o/h2o-2.2.6.ebuild | 107 -----------------------
2 files changed, 130 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 02942b4..0000000
--- 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)
- {
diff --git a/www-servers/h2o/h2o-2.2.6.ebuild b/www-servers/h2o/h2o-2.2.6.ebuild
deleted file mode 100644
index ca1edb2..0000000
--- a/www-servers/h2o/h2o-2.2.6.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-CMAKE_MAKEFILE_GENERATOR="emake"
-SSL_DEPS_SKIP=1
-USE_RUBY="ruby24 ruby25 ruby26"
-
-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="libh2o +mruby"
-
-RDEPEND="dev-lang/perl
- sys-libs/zlib
- libh2o? ( dev-libs/libuv )
- dev-libs/openssl:0="
-DEPEND="${RDEPEND}
- libh2o? ( virtual/pkgconfig )
- mruby? (
- ${RUBY_DEPS}
- || (
- dev-libs/onigmo
- dev-libs/oniguruma
- )
- sys-devel/bison
- virtual/pkgconfig
- )"
-RDEPEND+="
- !sci-libs/libh2o"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.2-libressl-2.7.patch
- "${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=$(usex !libh2o)
- -DBUILD_SHARED_LIBS=$(usex libh2o)
- )
- 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
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/proj/libressl:master commit in: www-servers/h2o/files/, www-servers/h2o/
@ 2023-04-28 14:36 orbea
0 siblings, 0 replies; 3+ messages in thread
From: orbea @ 2023-04-28 14:36 UTC (permalink / raw
To: gentoo-commits
commit: 67b46f0e699aa2c4d64f7566479cd3b19bc49f93
Author: orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Fri Apr 28 14:19:57 2023 +0000
Commit: orbea <orbea <AT> riseup <DOT> net>
CommitDate: Fri Apr 28 14:20:09 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=67b46f0e
www-servers/h2o: treeclean
Bug: https://bugs.gentoo.org/903001
Upstream-PR: https://github.com/gentoo/gentoo/pull/30785
Upstream-Commit: https://github.com/gentoo/gentoo/commit/cd2145a304808f254c2ae301598d57ac3f4fb62c
Signed-off-by: orbea <orbea <AT> riseup.net>
www-servers/h2o/Manifest | 1 -
www-servers/h2o/files/h2o-2.2-libressl-3.5.patch | 29 -------
www-servers/h2o/files/h2o-2.2-mruby.patch | 57 ------------
www-servers/h2o/files/h2o-2.2-ruby30.patch | 63 --------------
www-servers/h2o/files/h2o-2.3-mruby.patch | 70 ---------------
www-servers/h2o/files/h2o.conf | 17 ----
www-servers/h2o/files/h2o.initd | 37 --------
www-servers/h2o/files/h2o.logrotate | 11 ---
www-servers/h2o/files/h2o.service | 13 ---
www-servers/h2o/h2o-2.2.6-r1.ebuild | 106 -----------------------
www-servers/h2o/metadata.xml | 20 -----
11 files changed, 424 deletions(-)
diff --git a/www-servers/h2o/Manifest b/www-servers/h2o/Manifest
deleted file mode 100644
index 710248b..0000000
--- a/www-servers/h2o/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST h2o-2.2.6.tar.gz 16257760 BLAKE2B 8474751ca9832ddae2022710654ca58a93ebf9ca01afe934950209b04357b7548b05c598c49fe92684b2910fd6309d6fc3923a0b01cdeeb4b0dc65b08842255f SHA512 f2f28905c01782a0432c9dfdb2f21054e0a4741ac4c5f26802d4b439d0172840aa215aba5dc7c9af62275dcc24de105674a3819384dc38246e43ce3e8263eb20
diff --git a/www-servers/h2o/files/h2o-2.2-libressl-3.5.patch b/www-servers/h2o/files/h2o-2.2-libressl-3.5.patch
deleted file mode 100644
index 5d9144d..0000000
--- a/www-servers/h2o/files/h2o-2.2-libressl-3.5.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Fix build with opaque RSA{,_METHOD} in LibreSSL 3.5. The relevant OpenSSL API
-has been available since LibreSSL 2.9. ECDSA support is thus also available.
-
-Index: deps/neverbleed/neverbleed.c
---- a/deps/neverbleed/neverbleed.c.orig
-+++ b/deps/neverbleed/neverbleed.c
-@@ -45,7 +45,7 @@
- #endif
- #include "neverbleed.h"
-
--#if (!defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x1010000fL)
-+#if ((!defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER >= 0x2090000fL) && OPENSSL_VERSION_NUMBER >= 0x1010000fL)
- #define OPENSSL_1_1_API 1
- #else
- #define OPENSSL_1_1_API 0
-Silence compiler warning. The get_session_cb has had const since LibreSSL 2.8.
-
-Index: lib/common/socket.c
---- a/lib/common/socket.c.orig
-+++ b/lib/common/socket.c
-@@ -920,7 +920,7 @@ static void create_ossl(h2o_socket_t *sock)
- }
-
- static SSL_SESSION *on_async_resumption_get(SSL *ssl,
--#if OPENSSL_VERSION_NUMBER >= 0x1010000fL && !defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER >= 0x1010000fL && (!defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER >= 0x2080000fL)
- const
- #endif
- unsigned char *data,
diff --git a/www-servers/h2o/files/h2o-2.2-mruby.patch b/www-servers/h2o/files/h2o-2.2-mruby.patch
deleted file mode 100644
index 92e7a8e..0000000
--- a/www-servers/h2o/files/h2o-2.2-mruby.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -157,6 +157,19 @@
- SET(WSLAY_LIBRARIES -lwslay)
- ENDIF (NOT WSLAY_FOUND)
-
-+IF (PKG_CONFIG_FOUND)
-+ PKG_CHECK_MODULES(ONIG onigmo)
-+ IF (NOT ONIG_FOUND)
-+ PKG_CHECK_MODULES(ONIG oniguruma)
-+ ENDIF (NOT ONIG_FOUND)
-+ IF (ONIG_FOUND)
-+ LINK_DIRECTORIES(${ONIG_LIBRARY_DIRS})
-+ ENDIF (ONIG_FOUND)
-+ENDIF (PKG_CONFIG_FOUND)
-+IF (NOT ONIG_FOUND AND WITH_MRUBY)
-+ MESSAGE(FATAL_ERROR "Onigmo/Oniguruma not found")
-+ENDIF (NOT ONIG_FOUND AND WITH_MRUBY)
-+
- IF (ZLIB_FOUND)
- INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIRS})
- LINK_DIRECTORIES(${ZLIB_LIBRARY_DIRS})
-@@ -460,7 +473,7 @@
- ELSE ()
- SET(MRUBY_TOOLCHAIN "gcc")
- ENDIF ()
-- ADD_CUSTOM_TARGET(mruby MRUBY_TOOLCHAIN=${MRUBY_TOOLCHAIN} MRUBY_CONFIG=${CMAKE_CURRENT_SOURCE_DIR}/misc/mruby_config.rb MRUBY_BUILD_DIR=${CMAKE_CURRENT_BINARY_DIR}/mruby ruby minirake
-+ ADD_CUSTOM_TARGET(mruby MRUBY_TOOLCHAIN=${MRUBY_TOOLCHAIN} MRUBY_CONFIG=${CMAKE_CURRENT_SOURCE_DIR}/misc/mruby_config.rb MRUBY_BUILD_DIR=${CMAKE_CURRENT_BINARY_DIR}/mruby ruby minirake -v
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/deps/mruby)
- LIST(APPEND STANDALONE_SOURCE_FILES
- lib/handler/mruby.c
-@@ -491,7 +504,7 @@
- # 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"
-- "${CMAKE_CURRENT_BINARY_DIR}/mruby/host/mrbgems/mruby-onig-regexp/onigmo-6.1.1/.libs/libonigmo.a"
-+ ${ONIG_LIBRARIES}
- "m")
- ADD_DEPENDENCIES(h2o mruby)
- ENDIF (WITH_MRUBY)
---- a/misc/mruby_config.rb
-+++ b/misc/mruby_config.rb
-@@ -15,13 +15,7 @@
- # use mrbgems
- Dir.glob("../mruby-*/mrbgem.rake") do |x|
- g = File.basename File.dirname x
-- if g == 'mruby-onig-regexp'
-- conf.gem "../deps/#{g}" do |c|
-- c.bundle_onigmo
-- end
-- else
-- conf.gem "../deps/#{g}"
-- end
-+ conf.gem "../deps/#{g}"
- end
-
- # include all the core GEMs
diff --git a/www-servers/h2o/files/h2o-2.2-ruby30.patch b/www-servers/h2o/files/h2o-2.2-ruby30.patch
deleted file mode 100644
index 47692d6..0000000
--- a/www-servers/h2o/files/h2o-2.2-ruby30.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- a/deps/mruby/Rakefile
-+++ b/deps/mruby/Rakefile
-@@ -37,15 +37,15 @@
- task :default => :all
-
- bin_path = ENV['INSTALL_DIR'] || "#{MRUBY_ROOT}/bin"
--FileUtils.mkdir_p bin_path, { :verbose => $verbose }
-+FileUtils.mkdir_p bin_path, :verbose => $verbose
-
- depfiles = MRuby.targets['host'].bins.map do |bin|
- install_path = MRuby.targets['host'].exefile("#{bin_path}/#{bin}")
- source_path = MRuby.targets['host'].exefile("#{MRuby.targets['host'].build_dir}/bin/#{bin}")
-
- file install_path => source_path do |t|
-- FileUtils.rm_f t.name, { :verbose => $verbose }
-- FileUtils.cp t.prerequisites.first, t.name, { :verbose => $verbose }
-+ FileUtils.rm_f t.name, :verbose => $verbose
-+ FileUtils.cp t.prerequisites.first, t.name, :verbose => $verbose
- end
-
- install_path
-@@ -78,8 +78,8 @@
- install_path = MRuby.targets['host'].exefile("#{bin_path}/#{bin}")
-
- file install_path => exec do |t|
-- FileUtils.rm_f t.name, { :verbose => $verbose }
-- FileUtils.cp t.prerequisites.first, t.name, { :verbose => $verbose }
-+ FileUtils.rm_f t.name, :verbose => $verbose
-+ FileUtils.cp t.prerequisites.first, t.name, :verbose => $verbose
- end
- depfiles += [ install_path ]
- elsif target == MRuby.targets['host-debug']
-@@ -87,8 +87,8 @@
- install_path = MRuby.targets['host-debug'].exefile("#{bin_path}/#{bin}")
-
- file install_path => exec do |t|
-- FileUtils.rm_f t.name, { :verbose => $verbose }
-- FileUtils.cp t.prerequisites.first, t.name, { :verbose => $verbose }
-+ FileUtils.rm_f t.name, :verbose => $verbose
-+ FileUtils.cp t.prerequisites.first, t.name, :verbose => $verbose
- end
- depfiles += [ install_path ]
- end
-@@ -127,16 +127,16 @@
- desc "clean all built and in-repo installed artifacts"
- task :clean do
- MRuby.each_target do |t|
-- FileUtils.rm_rf t.build_dir, { :verbose => $verbose }
-+ FileUtils.rm_rf t.build_dir, :verbose => $verbose
- end
-- FileUtils.rm_f depfiles, { :verbose => $verbose }
-+ FileUtils.rm_f depfiles, :verbose => $verbose
- puts "Cleaned up target build folder"
- end
-
- desc "clean everything!"
- task :deep_clean => ["clean"] do
- MRuby.each_target do |t|
-- FileUtils.rm_rf t.gem_clone_dir, { :verbose => $verbose }
-+ FileUtils.rm_rf t.gem_clone_dir, :verbose => $verbose
- end
- puts "Cleaned up mrbgems build folder"
- end
diff --git a/www-servers/h2o/files/h2o-2.3-mruby.patch b/www-servers/h2o/files/h2o-2.3-mruby.patch
deleted file mode 100644
index 4f64565..0000000
--- a/www-servers/h2o/files/h2o-2.3-mruby.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -237,6 +237,19 @@
- SET(WSLAY_LIBRARIES -lwslay)
- ENDIF (NOT WSLAY_FOUND)
-
-+IF (PKG_CONFIG_FOUND)
-+ PKG_CHECK_MODULES(ONIG onigmo)
-+ IF (NOT ONIG_FOUND)
-+ PKG_CHECK_MODULES(ONIG oniguruma)
-+ ENDIF (NOT ONIG_FOUND)
-+ IF (ONIG_FOUND)
-+ LINK_DIRECTORIES(${ONIG_LIBRARY_DIRS})
-+ ENDIF (ONIG_FOUND)
-+ENDIF (PKG_CONFIG_FOUND)
-+IF (NOT ONIG_FOUND AND WITH_MRUBY)
-+ MESSAGE(FATAL_ERROR "Onigmo/Oniguruma not found")
-+ENDIF (NOT ONIG_FOUND AND WITH_MRUBY)
-+
- IF (ZLIB_FOUND)
- INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIRS})
- LINK_DIRECTORIES(${ZLIB_LIBRARY_DIRS})
-@@ -743,7 +756,7 @@
- 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
- 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 @@
- # 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"
-- "${CMAKE_CURRENT_BINARY_DIR}/mruby/host/mrbgems/mruby-onig-regexp/onigmo-6.2.0/.libs/libonigmo.a"
-+ ${ONIG_LIBRARIES}
- "m")
- ADD_DEPENDENCIES(h2o mruby)
- ENDIF (WITH_MRUBY)
---- a/deps/mruby-onig-regexp/mrbgem.rake
-+++ b/deps/mruby-onig-regexp/mrbgem.rake
-@@ -108,10 +108,8 @@
-
- if spec.respond_to? :search_package and spec.search_package 'onigmo'
- spec.cc.defines += ['HAVE_ONIGMO_H']
-- spec.linker.libraries << 'onigmo'
- elsif spec.respond_to? :search_package and spec.search_package 'oniguruma'
- spec.cc.defines += ['HAVE_ONIGURUMA_H']
-- spec.linker.libraries << 'onig'
- elsif build.cc.respond_to? :search_header_path and build.cc.search_header_path 'onigmo.h'
- spec.cc.defines += ['HAVE_ONIGMO_H']
- spec.linker.libraries << 'onigmo'
---- a/misc/mruby_config.rb
-+++ b/misc/mruby_config.rb
-@@ -15,13 +15,7 @@
- # use mrbgems
- Dir.glob("../mruby-*/mrbgem.rake") do |x|
- g = File.basename File.dirname x
-- if g == 'mruby-onig-regexp'
-- conf.gem "../deps/#{g}" do |c|
-- c.bundle_onigmo
-- end
-- else
-- conf.gem "../deps/#{g}"
-- end
-+ conf.gem "../deps/#{g}"
- end
-
- # include all the core GEMs
diff --git a/www-servers/h2o/files/h2o.conf b/www-servers/h2o/files/h2o.conf
deleted file mode 100644
index 23f2d76..0000000
--- a/www-servers/h2o/files/h2o.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-user: h2o
-pid-file: /run/h2o.pid
-access-log: /var/log/h2o/access.log
-error-log: /var/log/h2o/error.log
-
-hosts:
- "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
diff --git a/www-servers/h2o/files/h2o.initd b/www-servers/h2o/files/h2o.initd
deleted file mode 100644
index 61944cc..0000000
--- a/www-servers/h2o/files/h2o.initd
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_commands="checkconfig"
-extra_started_commands="reload"
-
-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"
-
-depend() {
- need net
- use dns
-}
-
-checkconfig() {
- "${command}" -m test -c "${h2o_config}" || return 1
-}
-
-start_pre() {
- checkconfig || return 1
-}
-
-reload() {
- checkconfig || return 1
- ebegin "Reloading ${name:-${RC_SVCNAME}}"
- start-stop-daemon --signal HUP --pidfile "${pidfile}"
- eend ${?}
-}
diff --git a/www-servers/h2o/files/h2o.logrotate b/www-servers/h2o/files/h2o.logrotate
deleted file mode 100644
index 166b6e7..0000000
--- a/www-servers/h2o/files/h2o.logrotate
+++ /dev/null
@@ -1,11 +0,0 @@
-# h2o logrotate script for Gentoo
-
-/var/log/h2o/*.log {
- missingok
- notifempty
- sharedscripts
- delaycompress
- postrotate
- /bin/kill -HUP $(grep pid-file "/etc/h2o/h2o.conf" | cut -d' ' -f2 | cat) 2>/dev/null || true
- endscript
-}
diff --git a/www-servers/h2o/files/h2o.service b/www-servers/h2o/files/h2o.service
deleted file mode 100644
index 0ea3f45..0000000
--- a/www-servers/h2o/files/h2o.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=H2O - the optimized HTTP/1, HTTP/2 server
-After=network.target remote-fs.target nss-lookup.target
-
-[Service]
-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
-
-[Install]
-WantedBy=multi-user.target
diff --git a/www-servers/h2o/h2o-2.2.6-r1.ebuild b/www-servers/h2o/h2o-2.2.6-r1.ebuild
deleted file mode 100644
index c3be8ec..0000000
--- a/www-servers/h2o/h2o-2.2.6-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-CMAKE_MAKEFILE_GENERATOR="emake"
-SSL_DEPS_SKIP=1
-USE_RUBY="ruby27 ruby30 ruby31"
-
-inherit cmake ruby-single ssl-cert systemd toolchain-funcs
-
-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="libh2o +mruby"
-
-RDEPEND="acct-group/h2o
- acct-user/h2o
- dev-lang/perl
- !sci-libs/libh2o
- sys-libs/zlib
- libh2o? ( dev-libs/libuv )
- dev-libs/openssl:0="
-DEPEND="${RDEPEND}
- mruby? (
- ${RUBY_DEPS}
- || (
- dev-libs/onigmo
- dev-libs/oniguruma
- )
- )"
-BDEPEND="libh2o? ( virtual/pkgconfig )
- mruby? (
- sys-devel/bison
- virtual/pkgconfig
- )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.2-libressl-3.5.patch
- "${FILESDIR}"/${PN}-2.2-mruby.patch
- "${FILESDIR}"/${PN}-2.2-ruby30.patch
-)
-
-src_prepare() {
- cmake_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=$(usex !libh2o)
- -DBUILD_SHARED_LIBS=$(usex libh2o)
- )
- cmake_src_configure
-}
-
-src_install() {
- cmake_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/metadata.xml b/www-servers/h2o/metadata.xml
deleted file mode 100644
index 689e903..0000000
--- a/www-servers/h2o/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>hattya@gentoo.org</email>
- <name>Akinori Hattori</name>
- </maintainer>
- <longdescription lang="en">
- H2O is a new generation HTTP server. Not only is it very fast,
- it also provides much quicker response to end-users
- when compared to older generations of HTTP servers.
- </longdescription>
- <use>
- <flag name="libh2o">Build and install libh2o</flag>
- <flag name="mruby">Enable support for mruby</flag>
- </use>
- <upstream>
- <remote-id type="github">h2o/h2o</remote-id>
- </upstream>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-04-28 14:36 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-04-28 14:36 [gentoo-commits] repo/proj/libressl:master commit in: www-servers/h2o/files/, www-servers/h2o/ orbea
-- strict thread matches above, loose matches on Subject: below --
2022-07-10 22:52 Quentin Retornaz
2022-07-10 22:52 Quentin Retornaz
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox