summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/nginx/Makefile6
-rw-r--r--package/nginx/patches/patch-auto_install16
-rw-r--r--package/nginx/patches/patch-auto_os_linux59
3 files changed, 3 insertions, 78 deletions
diff --git a/package/nginx/Makefile b/package/nginx/Makefile
index 6a13c1277..803371016 100644
--- a/package/nginx/Makefile
+++ b/package/nginx/Makefile
@@ -4,9 +4,9 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= nginx
-PKG_VERSION:= 1.25.3
+PKG_VERSION:= 1.26.1
PKG_RELEASE:= 1
-PKG_HASH:= 64c5b975ca287939e828303fa857d22f142b251f17808dfe41733512d9cded86
+PKG_HASH:= f9187468ff2eb159260bfd53867c25ff8e334726237acf227b9e870e53d3e36b
PKG_DESCR:= powerful http reverse proxy and webserver
PKG_SECTION:= net/http
PKG_BUILDDEP:= pcre zlib
@@ -58,7 +58,7 @@ ALL_TARGET:=
nginx-install:
$(INSTALL_DIR) $(IDIR_NGINX)/usr/sbin $(IDIR_NGINX)/etc/nginx
- $(INSTALL_BIN) $(WRKINST)/usr/sbin/nginx \
+ $(INSTALL_BIN) $(WRKBUILD)/objs/nginx \
$(IDIR_NGINX)/usr/sbin
for f in nginx.conf mime.types fastcgi_params koi-utf koi-win win-utf; do \
cp ./files/$${f} \
diff --git a/package/nginx/patches/patch-auto_install b/package/nginx/patches/patch-auto_install
deleted file mode 100644
index 0c9f06568..000000000
--- a/package/nginx/patches/patch-auto_install
+++ /dev/null
@@ -1,16 +0,0 @@
---- nginx-1.9.13.orig/auto/install 2016-03-29 17:09:30.000000000 +0200
-+++ nginx-1.9.13/auto/install 2016-04-01 23:45:09.250318293 +0200
-@@ -107,11 +107,8 @@ $NGX_OBJS/nginx.8: $NGX_MAN $NGX_AUTO_CO
- install: build $NGX_INSTALL_PERL_MODULES
- test -d '\$(DESTDIR)$NGX_PREFIX' || mkdir -p '\$(DESTDIR)$NGX_PREFIX'
-
-- test -d '\$(DESTDIR)`dirname "$NGX_SBIN_PATH"`' \\
-- || mkdir -p '\$(DESTDIR)`dirname "$NGX_SBIN_PATH"`'
-- test ! -f '\$(DESTDIR)$NGX_SBIN_PATH' \\
-- || mv '\$(DESTDIR)$NGX_SBIN_PATH' \\
-- '\$(DESTDIR)$NGX_SBIN_PATH.old'
-+ test -d '\$(DESTDIR)$NGX_SBIN_PATH' \\
-+ || mkdir -p '\$(DESTDIR)$NGX_SBIN_PATH'
- cp $NGX_OBJS/nginx '\$(DESTDIR)$NGX_SBIN_PATH'
-
- test -d '\$(DESTDIR)$NGX_CONF_PREFIX' \\
diff --git a/package/nginx/patches/patch-auto_os_linux b/package/nginx/patches/patch-auto_os_linux
deleted file mode 100644
index 0e33cb195..000000000
--- a/package/nginx/patches/patch-auto_os_linux
+++ /dev/null
@@ -1,59 +0,0 @@
---- nginx-1.21.3.orig/auto/os/linux 2021-09-07 17:21:03.000000000 +0200
-+++ nginx-1.21.3/auto/os/linux 2021-10-29 14:50:09.089546624 +0200
-@@ -36,7 +36,7 @@ fi
-
- ngx_feature="epoll"
- ngx_feature_name="NGX_HAVE_EPOLL"
--ngx_feature_run=yes
-+ngx_feature_run=no
- ngx_feature_incs="#include <sys/epoll.h>"
- ngx_feature_path=
- ngx_feature_libs=
-@@ -135,7 +135,7 @@ ngx_feature_test="int fd; struct stat sb
- CC_AUX_FLAGS="$cc_aux_flags -D_GNU_SOURCE"
- ngx_feature="sendfile()"
- ngx_feature_name="NGX_HAVE_SENDFILE"
--ngx_feature_run=yes
-+ngx_feature_run=no
- ngx_feature_incs="#include <sys/sendfile.h>
- #include <errno.h>"
- ngx_feature_path=
-@@ -156,7 +156,7 @@ fi
- CC_AUX_FLAGS="$cc_aux_flags -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64"
- ngx_feature="sendfile64()"
- ngx_feature_name="NGX_HAVE_SENDFILE64"
--ngx_feature_run=yes
-+ngx_feature_run=no
- ngx_feature_incs="#include <sys/sendfile.h>
- #include <errno.h>"
- ngx_feature_path=
-@@ -174,7 +174,7 @@ ngx_include="sys/prctl.h"; . auto/includ
-
- ngx_feature="prctl(PR_SET_DUMPABLE)"
- ngx_feature_name="NGX_HAVE_PR_SET_DUMPABLE"
--ngx_feature_run=yes
-+ngx_feature_run=no
- ngx_feature_incs="#include <sys/prctl.h>"
- ngx_feature_path=
- ngx_feature_libs=
-@@ -215,20 +215,6 @@ ngx_feature_test="struct __user_cap_data
- (void) SYS_capset"
- . auto/feature
-
--
--# crypt_r()
--
--ngx_feature="crypt_r()"
--ngx_feature_name="NGX_HAVE_GNU_CRYPT_R"
--ngx_feature_run=no
--ngx_feature_incs="#include <crypt.h>"
--ngx_feature_path=
--ngx_feature_libs=-lcrypt
--ngx_feature_test="struct crypt_data cd;
-- crypt_r(\"key\", \"salt\", &cd);"
--. auto/feature
--
--
- ngx_include="sys/vfs.h"; . auto/include
-
-