cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-30 15:38:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

treewide: Run refresh on all packages

Browse Source 
The crude loop I wrote to come up with this changeset:

  find -L package/feeds/packages/ -name patches | \
  sed 's/patches$/refresh/' | sort | xargs make

Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
(cherry picked from commit 5d8d4fbbcb)
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
This commit is contained in:
Ilya Lipnitskiy
2021-02-20 16:02:15 -08:00
committed by Jeffery To
parent 99a5a094eb
commit b1cbd93bcd
558 changed files with 1518 additions and 2977 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/h2o/patches/100-socket_disable_npn.patch
+2 -2
View File
@@ -1,6 +1,6 @@
--- a/include/h2o/socket.h
+++ b/include/h2o/socket.h
@@ -29,6 +29,7 @@
@@ -29,6 +29,7 @@ extern "C" {
#include <stdint.h>
#include <sys/socket.h>
#include <openssl/ssl.h>
@@ -8,7 +8,7 @@
#include "h2o/cache.h"
#include "h2o/memory.h"
#include "h2o/openssl_backport.h"
@@ -45,7 +44,11 @@
@@ -44,7 +45,11 @@ extern "C" {
#if OPENSSL_VERSION_NUMBER >= 0x10002000L
#define H2O_USE_ALPN 1
libs/h2o/patches/200-libh2o-evloop_wslay-link.patch
+3 -5
View File
@@ -15,11 +15,9 @@ Signed-off-by: James Taylor <james@jtaylor.id.au>
CMakeLists.txt | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a68613081..13c2f8a9f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -519,13 +519,21 @@ SET_TARGET_PROPERTIES(libh2o PROPERTIES
@@ -386,13 +386,21 @@ SET_TARGET_PROPERTIES(libh2o PROPERTIES
OUTPUT_NAME h2o
VERSION ${LIBRARY_VERSION}
SOVERSION ${LIBRARY_SOVERSION})
@@ -41,5 +39,5 @@ index a68613081..13c2f8a9f 100644
+ TARGET_LINK_LIBRARIES(libh2o-evloop ${EXTRA_LIBS})
+ENDIF (WSLAY_FOUND)
TARGET_INCLUDE_DIRECTORIES(libh2o PUBLIC ${OPENSSL_INCLUDE_DIR})
TARGET_INCLUDE_DIRECTORIES(libh2o-evloop PUBLIC ${OPENSSL_INCLUDE_DIR})
IF (OPENSSL_FOUND)
TARGET_INCLUDE_DIRECTORIES(libh2o PUBLIC ${OPENSSL_INCLUDE_DIR})
libs/h2o/patches/400-backtrace-detection.patch
+2 -6
View File
@@ -8,8 +8,6 @@ Subject: [PATCH] Autodetect backtrace and backtrace_symbols_fd
src/main.c | 10 ++++++----
2 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index abfab1f19..2a26fb98a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,6 +58,19 @@ __sync_add_and_fetch(&a, 1);
@@ -32,8 +30,6 @@ index abfab1f19..2a26fb98a 100644
SET(WITH_BUNDLED_SSL_DEFAULT "ON")
IF ((NOT UNIX) OR CYGWIN)
SET(WITH_BUNDLED_SSL_DEFAULT "OFF")
diff --git a/src/main.c b/src/main.c
index 7c346af18..edc7d5eb3 100644
--- a/src/main.c
+++ b/src/main.c
@@ -48,7 +48,7 @@
@@ -45,7 +41,7 @@ index 7c346af18..edc7d5eb3 100644
#include <execinfo.h>
#endif
#if H2O_USE_PICOTLS
@@ -1435,7 +1435,8 @@ static void on_sigterm(int signo)
@@ -1436,7 +1436,8 @@ static void on_sigterm(int signo)
notify_all_threads();
}
@@ -55,7 +51,7 @@ index 7c346af18..edc7d5eb3 100644
static int popen_crash_handler(void)
{
char *cmd_fullpath = h2o_configurator_get_cmd_path(conf.crash_handler), *argv[] = {cmd_fullpath, NULL};
@@ -1487,13 +1488,14 @@ static void on_sigfatal(int signo)
@@ -1488,13 +1489,14 @@ static void on_sigfatal(int signo)
raise(signo);
}
libs/h2o/patches/500-openssl.patch
+6 -6
View File
@@ -18,7 +18,7 @@
#include <openssl/x509.h>
#include <openssl/x509v3.h>
#include <openssl/x509_vfy.h>
@@ -941,7 +942,7 @@ int ptls_openssl_encrypt_ticket(ptls_buffer_t *buf, ptls_iovec_t src,
@@ -941,7 +942,7 @@ int ptls_openssl_encrypt_ticket(ptls_buf
Exit:
if (cctx != NULL)
@@ -27,7 +27,7 @@
if (hctx != NULL)
HMAC_CTX_free(hctx);
return ret;
@@ -1011,7 +1012,7 @@ int ptls_openssl_decrypt_ticket(ptls_buffer_t *buf, ptls_iovec_t src,
@@ -1011,7 +1012,7 @@ int ptls_openssl_decrypt_ticket(ptls_buf
Exit:
if (cctx != NULL)
@@ -46,7 +46,7 @@
#include <openssl/crypto.h>
#include <openssl/err.h>
#include <openssl/ssl.h>
@@ -1825,7 +1826,7 @@ static h2o_iovec_t on_extra_status(void *unused, h2o_globalconf_t *_conf, h2o_re
@@ -1827,7 +1828,7 @@ static h2o_iovec_t on_extra_status(void
" \"listeners\": %zu,\n"
" \"worker-threads\": %zu,\n"
" \"num-sessions\": %lu",
@@ -55,7 +55,7 @@
num_connections(0), conf.max_connections, conf.num_listeners, conf.num_threads, num_sessions(0));
assert(ret.len < BUFSIZE);
@@ -2006,7 +2007,7 @@ int main(int argc, char **argv)
@@ -2008,7 +2009,7 @@ int main(int argc, char **argv)
break;
case 'v':
printf("h2o version " H2O_VERSION "\n");
@@ -66,7 +66,7 @@
"mruby: YES\n"); /* TODO determine the way to obtain the version of mruby (that is being linked dynamically) */
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -911,6 +911,7 @@ void ssl_setup_session_resumption(SSL_CTX **contexts, size_t num_contexts)
@@ -911,6 +911,7 @@ void ssl_setup_session_resumption(SSL_CT
#endif
}
@@ -74,7 +74,7 @@
static pthread_mutex_t *mutexes;
static void lock_callback(int mode, int n, const char *file, int line)
@@ -937,9 +938,11 @@ static int add_lock_callback(int *num, int amount, int type, const char *file, i
@@ -937,9 +938,11 @@ static int add_lock_callback(int *num, i
return __sync_add_and_fetch(num, amount);
}
libs/h2o/patches/600-engine.patch
+2 -2
View File
@@ -1,6 +1,6 @@
--- a/deps/neverbleed/neverbleed.c
+++ b/deps/neverbleed/neverbleed.c
@@ -1486,6 +1486,7 @@ int neverbleed_init(neverbleed_t *nb, char *errbuf)
@@ -1486,6 +1486,7 @@ int neverbleed_init(neverbleed_t *nb, ch
close(pipe_fds[0]);
pipe_fds[0] = -1;
@@ -8,7 +8,7 @@
/* setup engine */
if ((nb->engine = ENGINE_new()) == NULL || !ENGINE_set_id(nb->engine, "neverbleed") ||
!ENGINE_set_name(nb->engine, "privilege separation software engine") || !ENGINE_set_RSA(nb->engine, rsa_method)
@@ -1497,6 +1498,7 @@ int neverbleed_init(neverbleed_t *nb, char *errbuf)
@@ -1497,6 +1498,7 @@ int neverbleed_init(neverbleed_t *nb, ch
goto Fail;
}
ENGINE_add(nb->engine);