Commit Graph

5 Commits (53dde2ec7b1f157bf3b17460a56638c4eaed7c69)

Author SHA1 Message Date
Thibault Charbonnier f77c3f84ac refactor: util/*: improved mirror-tarballs script and removed obsolete patches and files.
Fixes
-----

* Apply the init_cycle_pool_release patches to NGINX cores >= 1.13.6
  instead of == 1.13.6

Improvements to util/mirror-tarballs
------------------------------------

* Grouped all bundled components versions in `util/ver`
* Sped up with parallel downloads (45s vs 75s)
* Produced smaller tarballs (4.4Mb vs 4.7Mb)
* Reduced Perl usage to stay in Bash as much as possible
* Greatly reduced code duplication
* Ensured we include all OpenSSL patches automatically
* We now check for missing commands before running

Diff of openresty-tarball-master (prior) and openresty-tarball-refactor
(after this patch):

    $ diff -qr openresty-tarball-master openresty-tarball-refactor
    Only in ./openresty-tarball-master/bundle/nginx-1.17.1/auto/cc: clang.orig
    Only in ./openresty-tarball-master/bundle/nginx-1.17.1/auto/cc: conf.orig
    Only in ./openresty-tarball-master/bundle/nginx-1.17.1/auto/cc: gcc.orig
    Only in ./openresty-tarball-master/bundle/nginx-1.17.1/auto/cc: icc.orig
    Only in ./openresty-tarball-master/bundle/nginx-1.17.1/auto: options.orig
    Only in ./openresty-tarball-master/bundle/nginx-1.17.1/auto/os: linux.orig
    Only in ./openresty-tarball-master/bundle/nginx-1.17.1/auto: sources.orig
    Only in ./openresty-tarball-master/bundle/nginx-1.17.1/auto: unix.orig
    diff -yr --suppress-common-lines ./openresty-tarball-master/bundle/nginx-1.17.1/src/core/nginx.c ./openresty-tarball-refactor/bundle/nginx-1.17.1/src/core/nginx.c
                 > ngx_pool_t         *saved_init_cycle_pool = NULL;
                 >
                 >     saved_init_cycle_pool = init_cycle.pool;
    Only in ./openresty-tarball-master/bundle/nginx-1.17.1/src/core: nginx.c.orig
    Only in ./openresty-tarball-master/bundle/nginx-1.17.1/src/core: ngx_connection.c.orig
    diff -yr --suppress-common-lines ./openresty-tarball-master/bundle/nginx-1.17.1/src/core/ngx_core.h ./openresty-tarball-refactor/bundle/nginx-1.17.1/src/core/ngx_core.h
                 > extern ngx_pool_t        *saved_init_cycle_pool;
                 >
    diff -yr --suppress-common-lines ./openresty-tarball-master/bundle/nginx-1.17.1/src/core/ngx_cycle.c ./openresty-tarball-refactor/bundle/nginx-1.17.1/src/core/ngx_cycle.c
                 >         if (ngx_is_init_cycle(old_cycle)) {
                 >             saved_init_cycle_pool = NULL;
                 >         }
                 >
    Only in ./openresty-tarball-master/bundle/nginx-1.17.1/src/core: ngx_cycle.h.orig
    Only in ./openresty-tarball-master/bundle/nginx-1.17.1/src/core: ngx_log.h.orig
    Only in ./openresty-tarball-master/bundle/nginx-1.17.1/src/core: ngx_resolver.c.orig
    Only in ./openresty-tarball-master/bundle/nginx-1.17.1/src/event: ngx_event_accept.c.orig
    Only in ./openresty-tarball-master/bundle/nginx-1.17.1/src/event: ngx_event_connect.c.orig
    Only in ./openresty-tarball-master/bundle/nginx-1.17.1/src/event: ngx_event.c.orig
    Only in ./openresty-tarball-master/bundle/nginx-1.17.1/src/event: ngx_event_openssl.c.orig
    Only in ./openresty-tarball-master/bundle/nginx-1.17.1/src/http/modules: ngx_http_log_module.c.orig
    Only in ./openresty-tarball-master/bundle/nginx-1.17.1/src/http/modules: ngx_http_proxy_module.c.orig
    Only in ./openresty-tarball-master/bundle/nginx-1.17.1/src/http: ngx_http_core_module.c.orig
    Only in ./openresty-tarball-master/bundle/nginx-1.17.1/src/http: ngx_http_request.c.orig
    Only in ./openresty-tarball-master/bundle/nginx-1.17.1/src/http: ngx_http_special_response.c.orig
    Only in ./openresty-tarball-master/bundle/nginx-1.17.1/src/http: ngx_http_upstream.c.orig
    Only in ./openresty-tarball-master/bundle/nginx-1.17.1/src/http: ngx_http_upstream.h.orig
    Only in ./openresty-tarball-master/bundle/nginx-1.17.1/src/http/v2: ngx_http_v2_filter_module.c.orig
    diff -yr --suppress-common-lines ./openresty-tarball-master/bundle/nginx-1.17.1/src/os/unix/ngx_process_cycle.c ./openresty-tarball-refactor/bundle/nginx-1.17.1/src/os/unix/ngx_process_cycle.c
                 >     if (saved_init_cycle_pool != NULL && saved_init_cycle_poo
                 >         ngx_destroy_pool(saved_init_cycle_pool);
                 >         saved_init_cycle_pool = NULL;
                 >     }
                 >
    Only in ./openresty-tarball-master/bundle/nginx-1.17.1/src/os/unix: ngx_process_cycle.c.orig
    Only in ./openresty-tarball-master/bundle/nginx-1.17.1/src/stream: ngx_stream.h.orig
    Only in ./openresty-tarball-master/bundle/nginx-1.17.1/src/stream: ngx_stream_proxy_module.c.orig
    Only in ./openresty-tarball-master/bundle/nginx-1.17.1/src/stream: ngx_stream_ssl_preread_module.c.orig
    Only in ./openresty-tarball-master/bundle/nginx-1.17.1/src/stream: ngx_stream_upstream.h.orig
    Only in ./openresty-tarball-master/bundle/nginx-1.17.1/src/stream: ngx_stream_upstream_round_robin.c.orig
    Only in ./openresty-tarball-master/bundle: nginx-no_pool.patch
    Only in ./openresty-tarball-master/bundle/redis-nginx-module-0.3.7: ngx_http_redis_module.c.orig
    diff -yr --suppress-common-lines ./openresty-tarball-master/configure ./openresty-tarball-refactor/configure
            shell "patch -p0 < nginx-no_pool.patch";       |         shell "patch -p0 < ../patches/nginx-no_pool.patch";
    Only in ./openresty-tarball-master: Makefile
    Only in ./openresty-tarball-refactor/patches: nginx-no_pool.patch
    Only in ./openresty-tarball-refactor/patches: openssl-1.1.1c-sess_set_get_cb_yield.patch

Other notes
-----------

* Removed all patches for NGINX cores 1.5.x and below (we only support 1.6.0+)
* Removed all patches for NGINX cores that were never part of an official OpenResty release
* Removed obsolete lua-cjson patch
* Removed all PUC-Rio Lua 5.1 patches
* Removed all unused patches
* Removed LuaJIT 2.0 patch
6 years ago
Yichun Zhang (agentzh) b91001a87e upgraded the nginx core to 1.15.6. 7 years ago
Yichun Zhang (agentzh) 5f7f678876 upgraded the NGINX core to 1.9.11 and ngx_lua to 0.10.1rc0. 9 years ago
Yichun Zhang (agentzh) 83eeb14f6c upgraded the nginx core to 1.9.7. 10 years ago
Yichun Zhang (agentzh) 1f4045ef2c More MSYS/MinGW love.
* upgraded ngx_lua to 0.9.18rc1 to support Win32 LuaJIT DLL.
* upgraded lua-redis-parser to 0.11rc1 for better Win32 support.
* upgraded lua-rds-parser to 0.06rc2 for better Win32 support.
* upgraded ngx_rds_csv to 0.07rc1  for better Win32 support.
* upgraded lua-resty-cli to 0.04rc1 for better Win32 support.
* upgraded lua-resty-core to 0.1.2.
* applied a patch to LuaJIT to add "!/lualib/" to the default Lua
  package search paths.
* upgraded lua-cjson to 2.1.0.3rc2 for better Win32 support and
  a suppressed gcc warning.
* use OpenResty's nginx tarballs extracted directly from the official nginx
  code repos, because we need the win32 support which is excluded in the
  official nginx release tarballs. Our nginx release tarballs are
  generated by the util/package-nginx.sh script.
* added the util/package-win32.sh script to generate the Win32 OpenResty
  binary distribution file.
* applied a patch to always enable C compiler feature tests in nginx's
  own build system because the MinGW gcc compiler on Win32 is also
  powerful enough to support advanced features like variadic macros.
* added document README-win32.
* util/dist-check: do a partial uninstallation before installing
  anything new.
* added util/build-win32.sh to build OpenResty on Win32 using the
  MinGW/MSYS toolchain.
* ./configure: added support for building on Win32 using the MinGW/MSYS
  toolchain.
10 years ago