From da55e9b97d2e7fd2ae4d2f188b96363b961841ff Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Sat, 19 May 2018 03:50:28 +0200 Subject: [PATCH] nginx: Update from 1.12.2 to 1.14.0 --- packages/nginx/auto-threads.patch | 9 ++++++--- packages/nginx/build.sh | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/packages/nginx/auto-threads.patch b/packages/nginx/auto-threads.patch index 353525388..5b295b9ce 100644 --- a/packages/nginx/auto-threads.patch +++ b/packages/nginx/auto-threads.patch @@ -1,8 +1,11 @@ ---- ./auto/threads 2017-01-31 20:31:11.000000000 +0530 -+++ ../threads 2017-03-18 21:24:15.697120228 +0530 -@@ -16,5 +16,4 @@ +diff -u -r ../nginx-1.14.0/auto/threads ./auto/threads +--- ../nginx-1.14.0/auto/threads 2018-04-17 15:22:36.000000000 +0000 ++++ ./auto/threads 2018-05-19 01:20:25.703633445 +0000 +@@ -16,6 +16,5 @@ have=NGX_THREADS . auto/have CORE_DEPS="$CORE_DEPS $THREAD_POOL_DEPS" CORE_SRCS="$CORE_SRCS $THREAD_POOL_SRCS" - CORE_LIBS="$CORE_LIBS -lpthread" +- NGX_LIBPTHREAD="-lpthread" ++ NGX_LIBPTHREAD="" fi diff --git a/packages/nginx/build.sh b/packages/nginx/build.sh index a0aa596fc..81c1dae17 100644 --- a/packages/nginx/build.sh +++ b/packages/nginx/build.sh @@ -1,7 +1,7 @@ TERMUX_PKG_HOMEPAGE=https://www.nginx.org TERMUX_PKG_DESCRIPTION="Lightweight HTTP server" -TERMUX_PKG_VERSION=1.12.2 -TERMUX_PKG_SHA256=305f379da1d5fb5aefa79e45c829852ca6983c7cd2a79328f8e084a324cf0416 +TERMUX_PKG_VERSION=1.14.0 +TERMUX_PKG_SHA256=5d15becbf69aba1fe33f8d416d97edd95ea8919ea9ac519eff9bafebb6022cb5 TERMUX_PKG_SRCURL=http://nginx.org/download/nginx-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_DEPENDS="libandroid-glob, libcrypt, pcre, openssl"