Codebase list groonga / 5ed0d15
Remove needless patch fix-ngx-mruby-gcc10.patch It's supported by upstream ref. https://github.com/matsumotory/ngx_mruby/pull/452/ This fix is included into ngx_mruby v2.2.1. Kentaro Hayashi 4 years ago
2 changed file(s) with 0 addition(s) and 61 deletion(s). Raw diff Collapse all Expand all
+0
-60
debian/patches/fix-ngx-mruby-gcc10.patch less more
0 diff -uNr groonga-10.0.0.orig/vendor/ngx_mruby-source/src/http/ngx_http_mruby_core.c groonga-10.0.0/vendor/ngx_mruby-source/src/http/ngx_http_mruby_core.c
1 --- groonga-10.0.0.orig/vendor/ngx_mruby-source/src/http/ngx_http_mruby_core.c 2019-08-14 13:54:10.000000000 +0900
2 +++ groonga-10.0.0/vendor/ngx_mruby-source/src/http/ngx_http_mruby_core.c 2020-04-20 08:08:11.094081325 +0900
3 @@ -13,8 +13,6 @@
4 #include "mruby/string.h"
5 #include "mruby/variable.h"
6
7 -ngx_module_t ngx_http_mruby_module;
8 -
9 #if (NGX_DEBUG)
10 static void ngx_mrb_log_backtrace(mrb_state *mrb, mrb_value obj, ngx_log_t *log)
11 {
12 diff -uNr groonga-10.0.0.orig/vendor/ngx_mruby-source/src/http/ngx_http_mruby_module.c groonga-10.0.0/vendor/ngx_mruby-source/src/http/ngx_http_mruby_module.c
13 --- groonga-10.0.0.orig/vendor/ngx_mruby-source/src/http/ngx_http_mruby_module.c 2019-08-14 13:54:10.000000000 +0900
14 +++ groonga-10.0.0/vendor/ngx_mruby-source/src/http/ngx_http_mruby_module.c 2020-04-20 08:08:11.098081303 +0900
15 @@ -27,6 +27,9 @@
16 (code)->ctx = NULL; \
17 }
18
19 +ngx_http_output_header_filter_pt ngx_http_next_header_filter;
20 +ngx_http_output_body_filter_pt ngx_http_next_body_filter;
21 +
22 // set conf
23 static void *ngx_http_mruby_create_srv_conf(ngx_conf_t *cf);
24 static char *ngx_http_mruby_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child);
25 diff -uNr groonga-10.0.0.orig/vendor/ngx_mruby-source/src/http/ngx_http_mruby_module.h groonga-10.0.0/vendor/ngx_mruby-source/src/http/ngx_http_mruby_module.h
26 --- groonga-10.0.0.orig/vendor/ngx_mruby-source/src/http/ngx_http_mruby_module.h 2019-08-14 13:54:10.000000000 +0900
27 +++ groonga-10.0.0/vendor/ngx_mruby-source/src/http/ngx_http_mruby_module.h 2020-04-20 08:08:11.098081303 +0900
28 @@ -103,7 +103,7 @@
29 ngx_http_output_body_filter_pt body_filter_handler;
30 } ngx_http_mruby_loc_conf_t;
31
32 -ngx_http_output_header_filter_pt ngx_http_next_header_filter;
33 -ngx_http_output_body_filter_pt ngx_http_next_body_filter;
34 +extern ngx_http_output_header_filter_pt ngx_http_next_header_filter;
35 +extern ngx_http_output_body_filter_pt ngx_http_next_body_filter;
36
37 #endif // NGX_HTTP_MRUBY_MODULE_H
38 diff -uNr groonga-10.0.0.orig/vendor/ngx_mruby-source/src/stream/ngx_stream_mruby_core.c groonga-10.0.0/vendor/ngx_mruby-source/src/stream/ngx_stream_mruby_core.c
39 --- groonga-10.0.0.orig/vendor/ngx_mruby-source/src/stream/ngx_stream_mruby_core.c 2019-08-14 13:54:10.000000000 +0900
40 +++ groonga-10.0.0/vendor/ngx_mruby-source/src/stream/ngx_stream_mruby_core.c 2020-04-20 08:08:11.098081303 +0900
41 @@ -10,7 +10,7 @@
42
43 #include <mruby/hash.h>
44 #include <mruby/string.h>
45 -ngx_module_t ngx_stream_mruby_module;
46 +
47 static mrb_value ngx_stream_mrb_errlogger(mrb_state *mrb, mrb_value self)
48 {
49 mrb_value msg;
50 diff -uNr groonga-10.0.0.orig/vendor/ngx_mruby-source/src/stream/ngx_stream_mruby_core.h groonga-10.0.0/vendor/ngx_mruby-source/src/stream/ngx_stream_mruby_core.h
51 --- groonga-10.0.0.orig/vendor/ngx_mruby-source/src/stream/ngx_stream_mruby_core.h 2019-08-14 13:54:10.000000000 +0900
52 +++ groonga-10.0.0/vendor/ngx_mruby-source/src/stream/ngx_stream_mruby_core.h 2020-04-20 08:08:11.098081303 +0900
53 @@ -23,4 +23,6 @@
54
55 ngx_stream_mruby_ctx_t *ngx_stream_mrb_get_module_ctx(mrb_state *mrb, ngx_stream_session_t *s);
56
57 +extern ngx_module_t ngx_stream_mruby_module;
58 +
59 #endif // NGX_STREAM_MRUBY_CORE_H
+0
-1
debian/patches/series less more
00 fix-nginx-FTBFS-on-kfreebsd.patch
11 0002-Remove-needless-groonga-keyring-postrm.patch
22 0003-Use-user-name-with-underline.patch
3 fix-ngx-mruby-gcc10.patch