diff --git a/build.profile b/build.profile index 05fd6e5..1dfcb39 100644 --- a/build.profile +++ b/build.profile @@ -45,9 +45,9 @@ BUILD_zbar_SRCURL="https://beehive.molgen.mpg.de/3f69d17f6495de023b59b3539ce5e60 BUILD_leptonica=leptonica-1.87.0 BUILD_leptonica_SRCURL="https://beehive.molgen.mpg.de/d523d2c883b71850a46af2517d8915bf/${BUILD_leptonica}.tar.gz" -# wget "https://nginx.org/download/nginx-1.30.0.tar.gz" -BUILD_nginx=nginx-1.30.0 -BUILD_nginx_SRCURL="https://beehive.molgen.mpg.de/ec242797e2368affe346a79e96ab58f8/${BUILD_nginx}.tar.gz" +# wget "https://nginx.org/download/nginx-1.31.0.tar.gz" +BUILD_nginx=nginx-1.31.0 +BUILD_nginx_SRCURL="https://beehive.molgen.mpg.de/40b2a7057eb55965d42d5416636c27e2/${BUILD_nginx}.tar.gz" # SRCURL="https://github.com/liberationfonts/liberation-fonts/files/7261482/liberation-fonts-ttf-2.1.5.tar.gz" BUILD_libfontttf=liberation-fonts-ttf-2.1.5 diff --git a/jbig2enc.build.sh b/jbig2enc.build.sh index c1fb622..c589031 100755 --- a/jbig2enc.build.sh +++ b/jbig2enc.build.sh @@ -33,7 +33,6 @@ if [[ ! -d ${BUILD_PKG} ]]; then if [ "${GITVER}" != "${BUILD_PKG#*-}" ]; then echo "${BUILD_PKG} should be updated to ${GITVER} update!" - exit 1 fi fi diff --git a/nginx.chicken.patch b/nginx.chicken.patch index 4e52972..e05d2b2 100644 --- a/nginx.chicken.patch +++ b/nginx.chicken.patch @@ -19,7 +19,7 @@ index a57c2f9..6ba724b 100644 diff --git a/html/index.html b/html/index.html -index cdc75e8..adacf00 100644 +index 75bcddc..b6668f7 100644 --- a/html/index.html +++ b/html/index.html @@ -1,7 +1,7 @@ @@ -31,7 +31,7 @@ index cdc75e8..adacf00 100644 @@ -40,7 +40,7 @@ index cdc75e8..adacf00 100644 -Further configuration is required for the web server, reverse proxy, -API gateway, load balancer, content cache, or other features.

+

Chicken!

-+

Bwok Puk bok pukak bwak-bwak bwok Cluck bwak-bwak waaaaak bwwwaak-bwwwaaaaak..

++

Bwok Puk bok pukak bwak-bwak bwok Cluck bwak-bwak waaaaak bwwwaak-bwwwaaaaak.

-

For online documentation and support please refer to -nginx.org.
@@ -50,29 +50,30 @@ index cdc75e8..adacf00 100644 -security features and capabilities please refer to -f5.com/nginx.

+

Cluckity... Cluckity Puk-puk Waaaaak cock-a-doodle-doo bwak-bwak-bwak cluckity bwwwaak! Cluckity bok-bok Bok bwok-bwok-bwok bwak-bwak-bwak cluck. Cluck wak-waaaak pukaaaak-pukaaaak-pukaaaaak Puk-puk-puk Puk Gobble-gobble bok Pukaaaaaaak-pukaaaaak bwwwak-bwwwak-bwwwaaaaak Puk bwak bwak-bwak waak-waaaaaaak cluck. Pukak Bwok?

-+ -

Thank you for using nginx.

+

Cluck-cluck-cluck gobble-gobble-gobble honk Gobble-gobble bwwwaaaaaak.

diff --git a/src/core/nginx.h b/src/core/nginx.h -index 088aa1e..0e1632f 100644 +index f4ccc61..8ff917c 100644 --- a/src/core/nginx.h +++ b/src/core/nginx.h -@@ -10,8 +10,8 @@ +@@ -9,9 +9,9 @@ + #define _NGINX_H_INCLUDED_ - #define nginx_version 1030000 --#define NGINX_VERSION "1.30.0" +-#define nginx_version 1031000 +-#define NGINX_VERSION "1.31.0" -#define NGINX_VER "nginx/" NGINX_VERSION -+#define NGINX_VERSION "1.30.1" ++#define nginx_version 1032000 ++#define NGINX_VERSION "1.32.0" +#define NGINX_VER "chicken/" NGINX_VERSION #ifdef NGX_BUILD #define NGINX_VER_BUILD NGINX_VER " (" NGX_BUILD ")" diff --git a/src/http/ngx_http_special_response.c b/src/http/ngx_http_special_response.c -index eaf42e3..fd682a3 100644 +index 2984ffe..cc40bc6 100644 --- a/src/http/ngx_http_special_response.c +++ b/src/http/ngx_http_special_response.c @@ -33,7 +33,7 @@ static u_char ngx_http_error_build_tail[] = @@ -85,7 +86,7 @@ index eaf42e3..fd682a3 100644 "" CRLF ; diff --git a/src/http/v2/ngx_http_v2_filter_module.c b/src/http/v2/ngx_http_v2_filter_module.c -index 6b73b1e..54996ef 100644 +index 6b73b1e..a7b8094 100644 --- a/src/http/v2/ngx_http_v2_filter_module.c +++ b/src/http/v2/ngx_http_v2_filter_module.c @@ -120,7 +120,7 @@ ngx_http_v2_header_filter(ngx_http_request_t *r) @@ -98,10 +99,10 @@ index 6b73b1e..54996ef 100644 static const u_char accept_encoding[12] = { 0x8b, 0x84, 0x84, 0x2d, 0x69, 0x5b, 0x05, 0x44, 0x3c, 0x86, 0xaa, 0x6f diff --git a/src/http/v3/ngx_http_v3_filter_module.c b/src/http/v3/ngx_http_v3_filter_module.c -index 4d2276d..7b156a6 100644 +index e3f1536..ff97b0f 100644 --- a/src/http/v3/ngx_http_v3_filter_module.c +++ b/src/http/v3/ngx_http_v3_filter_module.c -@@ -166,7 +166,7 @@ ngx_http_v3_header_filter(ngx_http_request_t *r) +@@ -169,7 +169,7 @@ ngx_http_v3_header_filter(ngx_http_request_t *r) n = sizeof(NGINX_VER_BUILD) - 1; } else { @@ -110,7 +111,7 @@ index 4d2276d..7b156a6 100644 } len += ngx_http_v3_encode_field_lri(NULL, 0, -@@ -349,8 +349,8 @@ ngx_http_v3_header_filter(ngx_http_request_t *r) +@@ -352,8 +352,8 @@ ngx_http_v3_header_filter(ngx_http_request_t *r) n = sizeof(NGINX_VER_BUILD) - 1; } else { @@ -121,16 +122,3 @@ index 4d2276d..7b156a6 100644 } ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0, -diff --git a/src/http/ngx_http_header_filter_module.c b/src/http/ngx_http_header_filter_module.c -index 7899383..b8fcb8f 100644 ---- a/src/http/ngx_http_header_filter_module.c -+++ b/src/http/ngx_http_header_filter_module.c -@@ -47,7 +47,7 @@ ngx_module_t ngx_http_header_filter_module = { - }; - - --static u_char ngx_http_server_string[] = "Server: nginx" CRLF; -+static u_char ngx_http_server_string[] = "Server: chicken" CRLF; - static u_char ngx_http_server_full_string[] = "Server: " NGINX_VER CRLF; - static u_char ngx_http_server_build_string[] = "Server: " NGINX_VER_BUILD CRLF; - diff --git a/pngquant.build.sh b/pngquant.build.sh index db99cd9..2dbe1ee 100755 --- a/pngquant.build.sh +++ b/pngquant.build.sh @@ -26,7 +26,6 @@ if [[ ! -d ${BUILD_PKG} ]]; then popd if [ "${GITVER}" != "${BUILD_PKG}" ]; then echo "${BUILD_PKG} should be updated to ${GITVER} update!" - exit 1 fi fi