diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-21 19:11:44 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-21 19:11:44 +0100 |
commit | 47af801ff0ee4a4207b36e6917b1e496354940c0 (patch) | |
tree | 9420c678c469e86a72a75a5d89efaaa9208cb054 /www-servers/h2o/files | |
parent | 6c7cfcb5a1624b262a84846285c2545c688af1a6 (diff) |
gentoo resync : 21.07.2018
Diffstat (limited to 'www-servers/h2o/files')
-rw-r--r-- | www-servers/h2o/files/h2o-2.2-mruby.patch | 30 | ||||
-rw-r--r-- | www-servers/h2o/files/h2o-2.2.4-libressl.patch | 54 | ||||
-rw-r--r-- | www-servers/h2o/files/h2o-2.3-mruby.patch | 39 |
3 files changed, 28 insertions, 95 deletions
diff --git a/www-servers/h2o/files/h2o-2.2-mruby.patch b/www-servers/h2o/files/h2o-2.2-mruby.patch index e542ba8b64db..92e7a8e7f1d7 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.2.4-libressl.patch b/www-servers/h2o/files/h2o-2.2.4-libressl.patch deleted file mode 100644 index 3849dd0e2b68..000000000000 --- 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) diff --git a/www-servers/h2o/files/h2o-2.3-mruby.patch b/www-servers/h2o/files/h2o-2.3-mruby.patch index a0ad25eba279..3db3ebae8806 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_package 'onigmo' -- spec.cc.defines += ['HAVE_ONIGMO_H'] + if spec.respond_to? :search_package and spec.search_package 'onigmo' + spec.cc.defines += ['HAVE_ONIGMO_H'] - spec.linker.libraries << 'onig' -- 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'] - 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' - elsif build.cc.respond_to? :search_header_path and build.cc.search_header_path 'oniguruma.h' + elsif spec.respond_to? :search_package and spec.search_package 'oniguruma' spec.cc.defines += ['HAVE_ONIGURUMA_H'] - spec.linker.libraries << 'onig' +- 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 @@ |