[gentoo-commits] repo/gentoo:master commit in: www-servers/h2o/, www-servers/h2o/files/

2023-04-27 Thread Sam James 
commit: cd2145a304808f254c2ae301598d57ac3f4fb62c
Author: orbea  riseup  net>
AuthorDate: Fri Apr 28 00:38:42 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr 28 00:49:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd2145a3

www-servers/h2o: add upstream libressl patch

These two patches were merged upstream and fix the build with newer
libressl versions (>= 3.5).

Bug: https://bugs.gentoo.org/903001
Upstream-PR: https://github.com/h2o/neverbleed/pull/51
Upstream-Commit: 
https://github.com/h2o/neverbleed/commit/e1005c16e11b2ca358c86df2a4226632a2992d55
Upstream-PR: https://github.com/h2o/h2o/pull/3214
Upstream-Commit: 
https://github.com/h2o/h2o/commit/83f89f2fe7c5399b88386a940b2a675742478aca
Upstream-PR: https://github.com/h2o/h2o/pull/2062
Upstream-Commit: 
https://github.com/h2o/h2o/commit/e61e9c8296e894a479268d041985e65433c17e67
Signed-off-by: orbea  riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/30785
Signed-off-by: Sam James  gentoo.org>

 www-servers/h2o/files/h2o-2.2-libressl.patch | 54 
 www-servers/h2o/h2o-2.2.6-r1.ebuild  |  1 +
 2 files changed, 55 insertions(+)

diff --git a/www-servers/h2o/files/h2o-2.2-libressl.patch 
b/www-servers/h2o/files/h2o-2.2-libressl.patch
new file mode 100644
index ..59aca8df8550
--- /dev/null
+++ b/www-servers/h2o/files/h2o-2.2-libressl.patch
@@ -0,0 +1,54 @@
+https://bugs.gentoo.org/903001
+https://github.com/h2o/neverbleed/pull/51
+https://github.com/h2o/neverbleed/commit/e1005c16e11b2ca358c86df2a4226632a2992d55
+https://github.com/h2o/h2o/pull/3214
+https://github.com/h2o/h2o/commit/83f89f2fe7c5399b88386a940b2a675742478aca
+https://github.com/h2o/h2o/pull/2062
+https://github.com/h2o/h2o/commit/e61e9c8296e894a479268d041985e65433c17e67
+
+From 81494ee75e8f533c9fbf841d0dfe83f8eeba7bbd Mon Sep 17 00:00:00 2001
+From: Kazuho Oku 
+Date: Mon, 13 Mar 2023 18:56:12 +0900
+Subject: [PATCH] libressl 3.5 and above have opaque RSA struct
+
+---
+ deps/neverbleed/neverbleed.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/neverbleed.c b/neverbleed.c
+index d7cd979..74d7aa3 100644
+--- a/deps/neverbleed/neverbleed.c
 b/deps/neverbleed/neverbleed.c
+@@ -45,7 +45,7 @@
+ #endif
+ #include "neverbleed.h"
+ 
+-#if (!defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 
0x101fL)
++#if defined(LIBRESSL_VERSION_NUMBER) ? LIBRESSL_VERSION_NUMBER >= 0x305fL 
: OPENSSL_VERSION_NUMBER >= 0x101fL
+ #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.
+
+From b408b9e015627394003a04577dd7ee7e870d1797 Mon Sep 17 00:00:00 2001
+From: David Carlier 
+Date: Thu, 30 May 2019 15:05:44 +0100
+Subject: [PATCH] LibreSSL little build warning fix proposal
+
+---
+ lib/common/socket.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/common/socket.c b/lib/common/socket.c
+index 172b75026f..45c18591b7 100644
+--- a/lib/common/socket.c
 b/lib/common/socket.c
+@@ -946,7 +946,7 @@ static void create_ossl(h2o_socket_t *sock)
+ }
+ 
+ static SSL_SESSION *on_async_resumption_get(SSL *ssl,
+-#if OPENSSL_VERSION_NUMBER >= 0x101fL && !defined(LIBRESSL_VERSION_NUMBER)
++#if !defined(LIBRESSL_VERSION_NUMBER) ? OPENSSL_VERSION_NUMBER >= 0x101fL 
: LIBRESSL_VERSION_NUMBER > 0x207f
+ const
+ #endif
+ unsigned char *data,

diff --git a/www-servers/h2o/h2o-2.2.6-r1.ebuild 
b/www-servers/h2o/h2o-2.2.6-r1.ebuild
index 01434dbf32a5..4e38eec82228 100644
--- a/www-servers/h2o/h2o-2.2.6-r1.ebuild
+++ b/www-servers/h2o/h2o-2.2.6-r1.ebuild
@@ -39,6 +39,7 @@ BDEPEND="libh2o? ( virtual/pkgconfig )
)"
 
 PATCHES=(
+   "${FILESDIR}"/${PN}-2.2-libressl.patch #903001
"${FILESDIR}"/${PN}-2.2-mruby.patch
"${FILESDIR}"/${PN}-2.2-ruby30.patch
 )

[gentoo-commits] repo/gentoo:master commit in: www-servers/h2o/, www-servers/h2o/files/

2023-03-17 Thread Akinori Hattori 
commit: 3b7cbc03c5fa67926b0597e950cc7c66d03f8a37
Author: Akinori Hattori  gentoo  org>
AuthorDate: Sat Mar 18 02:15:12 2023 +
Commit: Akinori Hattori  gentoo  org>
CommitDate: Sat Mar 18 02:15:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b7cbc03

www-servers/h2o: fix build with >=dev-lang/ruby-3.0

Closes: https://bugs.gentoo.org/899572
Signed-off-by: Akinori Hattori  gentoo.org>

 www-servers/h2o/files/h2o-2.2-ruby30.patch | 63 ++
 www-servers/h2o/h2o-2.2.6-r1.ebuild|  7 +++-
 2 files changed, 68 insertions(+), 2 deletions(-)

diff --git a/www-servers/h2o/files/h2o-2.2-ruby30.patch 
b/www-servers/h2o/files/h2o-2.2-ruby30.patch
new file mode 100644
index ..47692d68bba5
--- /dev/null
+++ b/www-servers/h2o/files/h2o-2.2-ruby30.patch
@@ -0,0 +1,63 @@
+--- 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/h2o-2.2.6-r1.ebuild 
b/www-servers/h2o/h2o-2.2.6-r1.ebuild
index 33ece8ab07b7..2871e3f8b93b 100644
--- a/www-servers/h2o/h2o-2.2.6-r1.ebuild
+++ b/www-servers/h2o/h2o-2.2.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -38,7 +38,10 @@ BDEPEND="libh2o? ( virtual/pkgconfig )
virtual/pkgconfig
)"
 
-PATCHES=( "${FILESDIR}"/${PN}-2.2-mruby.patch )
+PATCHES=(
+   "${FILESDIR}"/${PN}-2.2-mruby.patch
+   "${FILESDIR}"/${PN}-2.2-ruby30.patch
+)
 
 src_prepare() {
cmake_src_prepare

[gentoo-commits] repo/gentoo:master commit in: www-servers/h2o/, www-servers/h2o/files/

2019-03-02 Thread Akinori Hattori 
commit: dc8384f173ea1b1578cfd0fbc8c38879b248811c
Author: Akinori Hattori  gentoo  org>
AuthorDate: Sat Mar  2 12:45:45 2019 +
Commit: Akinori Hattori  gentoo  org>
CommitDate: Sat Mar  2 12:45:45 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc8384f1

www-servers/h2o: fix build with >=dev-libs/libressl-2.7

Closes: https://bugs.gentoo.org/678430
Signed-off-by: Akinori Hattori  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 www-servers/h2o/files/h2o-2.2-libressl-2.7.patch | 23 +++
 www-servers/h2o/h2o-2.2.5.ebuild |  7 +--
 2 files changed, 28 insertions(+), 2 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
new file mode 100644
index 000..02942b49227
--- /dev/null
+++ b/www-servers/h2o/files/h2o-2.2-libressl-2.7.patch
@@ -0,0 +1,23 @@
+From db50d885a87985310e65159a705b45de8646dc26 Mon Sep 17 00:00:00 2001
+From: AIZAWA Hina 
+Date: Fri, 23 Mar 2018 22:50:51 +0900
+Subject: [PATCH] Add supporting LibreSSL 2.7
+
+Signed-off-by: AIZAWA Hina 
+---
+ 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 < 0x207fL)
+ 
+ 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.5.ebuild b/www-servers/h2o/h2o-2.2.5.ebuild
index 3d4d736c3e8..de3a311b755 100644
--- a/www-servers/h2o/h2o-2.2.5.ebuild
+++ b/www-servers/h2o/h2o-2.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -32,7 +32,10 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
)"
 
-PATCHES=( "${FILESDIR}"/${PN}-2.2-mruby.patch )
+PATCHES=(
+   "${FILESDIR}"/${PN}-2.2-libressl-2.7.patch
+   "${FILESDIR}"/${PN}-2.2-mruby.patch
+)
 
 pkg_setup() {
enewgroup ${PN}

[gentoo-commits] repo/gentoo:master commit in: www-servers/h2o/, www-servers/h2o/files/

2018-07-17 Thread Akinori Hattori 
commit: eaac95bc0181fe13f08dea97c808a8548836bb17
Author: Akinori Hattori  gentoo  org>
AuthorDate: Tue Jul 17 13:45:25 2018 +
Commit: Akinori Hattori  gentoo  org>
CommitDate: Tue Jul 17 13:45:25 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eaac95bc

www-servers/h2o: add dev-libs/onigmo dependency

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 www-servers/h2o/files/h2o-2.2-mruby.patch | 30 
 www-servers/h2o/files/h2o-2.3-mruby.patch | 39 ++-
 www-servers/h2o/h2o-2.2.5.ebuild  |  5 +++-
 www-servers/h2o/h2o-.ebuild   |  5 +++-
 4 files changed, 36 insertions(+), 43 deletions(-)

diff --git a/www-servers/h2o/files/h2o-2.2-mruby.patch 
b/www-servers/h2o/files/h2o-2.2-mruby.patch
index e542ba8b64d..92e7a8e7f1d 100644
--- a/www-servers/h2o/files/h2o-2.2-mruby.patch
+++ b/www-servers/h2o/files/h2o-2.2-mruby.patch
@@ -1,23 +1,26 @@
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -157,6 +157,16 @@
+@@ -157,6 +157,19 @@
  SET(WSLAY_LIBRARIES -lwslay)
  ENDIF (NOT WSLAY_FOUND)
  
 +IF (PKG_CONFIG_FOUND)
-+PKG_CHECK_MODULES(ONIG oniguruma)
++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_RUBY)
-+MESSAGE(FATAL_ERROR "Oniguruma not found")
-+ENDIF (NOT ONIG_FOUND AND WITH_RUBY)
++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 +470,7 @@
+@@ -460,7 +473,7 @@
  ELSE ()
  SET(MRUBY_TOOLCHAIN "gcc")
  ENDIF ()
@@ -26,7 +29,7 @@
  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/deps/mruby)
  LIST(APPEND STANDALONE_SOURCE_FILES
  lib/handler/mruby.c
-@@ -491,7 +501,7 @@
+@@ -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"
@@ -35,19 +38,6 @@
  "m")
  ADD_DEPENDENCIES(h2o mruby)
  ENDIF (WITH_MRUBY)
 a/deps/mruby-onig-regexp/mrbgem.rake
-+++ b/deps/mruby-onig-regexp/mrbgem.rake
-@@ -101,9 +101,7 @@
- cc.defines += ['HAVE_ONIGMO_H']
-   end
- 
--  if spec.respond_to? :search_package and spec.search_package 'onigmo'
--spec.cc.defines += ['HAVE_ONIGMO_H']
--  elsif spec.respond_to? :search_package and spec.search_package 'oniguruma'
-+  if spec.respond_to? :search_package and spec.search_package 'oniguruma'
- spec.cc.defines += ['HAVE_ONIGURUMA_H']
-   elsif build.cc.respond_to? :search_header_path and 
build.cc.search_header_path 'oniguruma.h'
- spec.linker.libraries << 'onig'
 --- a/misc/mruby_config.rb
 +++ b/misc/mruby_config.rb
 @@ -15,13 +15,7 @@

diff --git a/www-servers/h2o/files/h2o-2.3-mruby.patch 
b/www-servers/h2o/files/h2o-2.3-mruby.patch
index a0ad25eba27..3db3ebae880 100644
--- a/www-servers/h2o/files/h2o-2.3-mruby.patch
+++ b/www-servers/h2o/files/h2o-2.3-mruby.patch
@@ -1,23 +1,26 @@
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -174,6 +174,16 @@
+@@ -174,6 +174,19 @@
  SET(WSLAY_LIBRARIES -lwslay)
  ENDIF (NOT WSLAY_FOUND)
  
 +IF (PKG_CONFIG_FOUND)
-+PKG_CHECK_MODULES(ONIG oniguruma)
++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_RUBY)
-+MESSAGE(FATAL_ERROR "Oniguruma not found")
-+ENDIF (NOT ONIG_FOUND AND WITH_RUBY)
++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})
-@@ -533,7 +543,7 @@
+@@ -533,7 +546,7 @@
  ELSE ()
  SET(MRUBY_TOOLCHAIN "gcc")
  ENDIF ()
@@ -26,7 +29,7 @@
  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/deps/mruby)
  LIST(APPEND STANDALONE_SOURCE_FILES
  lib/handler/mruby.c
-@@ -560,7 +570,7 @@
+@@ -560,7 +573,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"
@@ -37,23 +40,17 @@
  ENDIF (WITH_MRUBY)
 --- a/deps/mruby-onig-regexp/mrbgem.rake
 +++ b/deps/mruby-onig-regexp/mrbgem.rake
-@@ -101,15 +101,9 @@
- file "#{dir}/src/mruby_onig_regexp.c" => 
[:mruby_onig_regexp_with_compile_option, oniguruma_lib]
-   end
+@@ -103,10 +103,8 @@
  
--  if spec.respond_to? :search_package and spec.search_pac

[gentoo-commits] repo/gentoo:master commit in: www-servers/h2o/, www-servers/h2o/files/

2018-07-11 Thread Akinori Hattori 
commit: 734eddfb4ed754c87338062b0bf0a29a3811678b
Author: Akinori Hattori  gentoo  org>
AuthorDate: Wed Jul 11 13:03:36 2018 +
Commit: Akinori Hattori  gentoo  org>
CommitDate: Wed Jul 11 13:03:36 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=734eddfb

www-servers/h2o: inherit ssl-cert

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 www-servers/h2o/files/h2o.conf   | 26 --
 www-servers/h2o/h2o-2.2.4.ebuild | 10 +-
 www-servers/h2o/h2o-.ebuild  | 10 +-
 3 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/www-servers/h2o/files/h2o.conf b/www-servers/h2o/files/h2o.conf
index ccca5dd2de5..a135cc35735 100644
--- a/www-servers/h2o/files/h2o.conf
+++ b/www-servers/h2o/files/h2o.conf
@@ -1,27 +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

diff --git a/www-servers/h2o/h2o-2.2.4.ebuild b/www-servers/h2o/h2o-2.2.4.ebuild
index 25c1690eeeb..47d1794fa4a 100644
--- a/www-servers/h2o/h2o-2.2.4.ebuild
+++ b/www-servers/h2o/h2o-2.2.4.ebuild
@@ -3,9 +3,10 @@
 
 EAPI="6"
 CMAKE_MAKEFILE_GENERATOR="emake"
+SSL_DEPS_SKIP=1
 USE_RUBY="ruby23 ruby24"
 
-inherit cmake-utils ruby-single systemd toolchain-funcs user
+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/";
@@ -88,3 +89,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
+}

diff --git a/www-servers/h2o/h2o-.ebuild b/www-servers/h2o/h2o-.ebuild
index 89f63062ca9..56f77212526 100644
--- a/www-servers/h2o/h2o-.ebuild
+++ b/www-servers/h2o/h2o-.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/";
@@ -85,3 +86,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
+}

[gentoo-commits] repo/gentoo:master commit in: www-servers/h2o/, www-servers/h2o/files/

2018-07-11 Thread Akinori Hattori 
commit: 5bb189641338e5066a1b8656eb5c62fb5c84932d
Author: Akinori Hattori  gentoo  org>
AuthorDate: Wed Jul 11 13:15:03 2018 +
Commit: Akinori Hattori  gentoo  org>
CommitDate: Wed Jul 11 13:15:03 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bb18964

www-servers/h2o: fix docs installation path

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 www-servers/h2o/files/h2o.conf   | 3 ---
 www-servers/h2o/h2o-2.2.4.ebuild | 2 ++
 www-servers/h2o/h2o-.ebuild  | 2 ++
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/www-servers/h2o/files/h2o.conf b/www-servers/h2o/files/h2o.conf
index a135cc35735..23f2d76d51e 100644
--- a/www-servers/h2o/files/h2o.conf
+++ b/www-servers/h2o/files/h2o.conf
@@ -15,6 +15,3 @@ hosts:
 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
index 47d1794fa4a..63228398d26 100644
--- a/www-servers/h2o/h2o-2.2.4.ebuild
+++ b/www-servers/h2o/h2o-2.2.4.ebuild
@@ -54,6 +54,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
 

diff --git a/www-servers/h2o/h2o-.ebuild b/www-servers/h2o/h2o-.ebuild
index 56f77212526..e1d9604c4b4 100644
--- a/www-servers/h2o/h2o-.ebuild
+++ b/www-servers/h2o/h2o-.ebuild
@@ -51,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

[gentoo-commits] repo/gentoo:master commit in: www-servers/h2o/, www-servers/h2o/files/

2018-05-11 Thread Michał Górny 
commit: 020699fb8aa0e91e444e98910fe035ef6bd1cd6c
Author: Ian Moone  chaoslab  org>
AuthorDate: Wed May  9 19:06:29 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri May 11 09:43:13 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=020699fb

www-servers/h2o: fix build with LibreSSL 2.7

- LibreSSL 2.7 implements OpenSSL 1.1 API
- Use patch from upstream: h2o/h2o#1706

Closes: https://github.com/gentoo/gentoo/pull/8329
Package-Manager: Portage-2.3.36, Repoman-2.3.9

 www-servers/h2o/files/h2o-2.2.4-libressl.patch | 54 ++
 www-servers/h2o/h2o-2.2.4.ebuild   |  2 +
 2 files changed, 56 insertions(+)

diff --git a/www-servers/h2o/files/h2o-2.2.4-libressl.patch 
b/www-servers/h2o/files/h2o-2.2.4-libressl.patch
new file mode 100644
index 000..3849dd0e2b6
--- /dev/null
+++ b/www-servers/h2o/files/h2o-2.2.4-libressl.patch
@@ -0,0 +1,54 @@
+--- a/include/h2o/openssl_backport.h
 b/include/h2o/openssl_backport.h
+@@ -25,7 +25,7 @@
+ #include 
+
+ /* backports for OpenSSL 1.0.2 */
+-#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x1010L || (defined(LIBRESSL_VERSION_NUMBER) 
&& LIBRESSL_VERSION_NUMBER < 0x207fL)
+
+ #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 < 0x207fL)
+
+ #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 < 0x207fL)
+
+ 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 < 0x1010L || defined(LIBRESSL_VERSION_NUMBER))
+-#define OPENSSL_1_0_API 1
++#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x1010L
++#define OPENSSL_1_1_API 1
++#elif defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 
0x207fL
++#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)

diff --git a/www-servers/h2o/h2o-2.2.4.ebuild b/www-servers/h2o/h2o-2.2.4.ebuild
index d33e39efe54..ab022fd4783 100644
--- a/www-servers/h2o/h2o-2.2.4.ebuild
+++ b/www-servers/h2o/h2o-2.2.4.ebuild
@@ -25,6 +25,8 @@ DEPEND="${RDEPEND}
${RUBY_DEPS}
)"
 
+PATCHES=( "${FILESDIR}"/${P}-libressl.patch )
+
 pkg_setup() {
enewgroup h2o
enewuser h2o -1 -1 -1 h2o