freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

www/{nginx,nginx-devel,freenginx}: 3rd-pary modules managemeht

Browse Source 
Update mod_zip to 1.3.0 and switch Github author to evanmiller as this
seems to be author that the other, less current, versions are forked
from.

PR:	295934
Sponsored by:	Netzkommune GmbH
This commit is contained in:
Ryan Steinmetz
2026-06-14 17:12:07 +02:00
committed by Jochen Neumeister
parent e2eff479e1
commit 2dfd1ee55a
13 changed files with 111 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
www/freenginx/Makefile
+1 -1
View File
@@ -1,6 +1,6 @@
PORTNAME= freenginx
PORTVERSION= 1.30.0
PORTREVISION?= 2
PORTREVISION?= 3
CATEGORIES= www
MASTER_SITES= https://freenginx.org/download/ \
LOCAL/joneum
www/freenginx/Makefile.extmod
+2 -1
View File
@@ -191,8 +191,9 @@ HTTP_VIDEO_THUMBEXTRACTOR_GH_TUPLE= wandenberg:nginx-video-thumbextractor-module
HTTP_VIDEO_THUMBEXTRACTOR_VARS= DSO_EXTMODS+=vte
HTTP_VIDEO_THUMBEXTRACTOR_EXTRA_PATCHES=${PATCHDIR}/extra-patch-nginx-thumbextractor-module-config
HTTP_ZIP_GH_TUPLE= vince2678:mod_zip:5b2604b:mod_zip
HTTP_ZIP_GH_TUPLE= evanmiller:mod_zip:a9f9afa:mod_zip
HTTP_ZIP_VARS= DSO_EXTMODS+=mod_zip
HTTP_ZIP_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-mod_zip
ICONV_IMPLIES= DEVEL_KIT
ICONV_USES= iconv
www/freenginx/distinfo
+3 -3
View File
@@ -1,4 +1,4 @@
TIMESTAMP = 1779726341
TIMESTAMP = 1781449592
SHA256 (freenginx-1.30.0.tar.gz) = 104d8e9b2f4473b491af430273832561d8803a9cc297b5a7acd09beefddeb27e
SIZE (freenginx-1.30.0.tar.gz) = 1252239
SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae
@@ -85,8 +85,8 @@ SHA256 (dvershinin-nginx-sticky-module-ng-2753211_GH0.tar.gz) = e4a533dfa214ea28
SIZE (dvershinin-nginx-sticky-module-ng-2753211_GH0.tar.gz) = 120676
SHA256 (wandenberg-nginx-video-thumbextractor-module-e81f850_GH0.tar.gz) = 9113f887a8740fe72614ee32f481177d33e9542c3b0625627da19a1c4f3da2cb
SIZE (wandenberg-nginx-video-thumbextractor-module-e81f850_GH0.tar.gz) = 2710072
SHA256 (vince2678-mod_zip-5b2604b_GH0.tar.gz) = 4fe63be3b842882494152e586f0b87e73f51bfbfd801b78f033c71a011cba789
SIZE (vince2678-mod_zip-5b2604b_GH0.tar.gz) = 29559
SHA256 (evanmiller-mod_zip-a9f9afa_GH0.tar.gz) = 645035b7d7a83ab3f47c692386e85bef69514b7778c1d069783d8fc76cc868da
SIZE (evanmiller-mod_zip-a9f9afa_GH0.tar.gz) = 30917
SHA256 (calio-iconv-nginx-module-v0.14_GH0.tar.gz) = b8b9f355c05c0790226512f6732348a2404d48531688a1fc04ce6768163bf462
SIZE (calio-iconv-nginx-module-v0.14_GH0.tar.gz) = 13133
SHA256 (baysao-nginx-let-module-c1f23aa_GH0.tar.gz) = 7393809d5d8877812da1bd5b5fbd1d8b00bc85e71f2f387c344f007773e49050
www/freenginx/files/extra-patch-mod_zip
+31
View File
@@ -0,0 +1,31 @@
--- ../mod_zip-a9f9afa/config 2025-09-04 19:55:16.000000000 +0000
+++ ../mod_zip-a9f9afa/config 2026-06-12 13:41:30.208275468 +0000
@@ -43,7 +43,7 @@
ngx_feature="multi-value headers are linked lists (nginx 1.23.0+)"
ngx_feature_name="NGX_ZIP_MULTI_HEADERS_LINKED_LISTS"
-ngx_feature_run=yes
+ngx_feature_run=no
ngx_feature_incs="#include \"nginx.h\""
ngx_feature_path="src/core"
ngx_feature_test="
--- ../mod_zip-a9f9afa/ngx_http_zip_module.h 2025-09-04 19:55:16.000000000 +0000
+++ ../mod_zip-a9f9afa/ngx_http_zip_module.h 2026-06-12 13:41:14.029809686 +0000
@@ -3,8 +3,17 @@
#include <ngx_config.h>
#include <ngx_core.h>
#include <ngx_http.h>
+#include <nginx.h>
#include <time.h>
+/* Fallback in case the configure-time feature test did not run:
+ * multi-value headers became linked lists in nginx 1.23.0 */
+#ifndef NGX_ZIP_MULTI_HEADERS_LINKED_LISTS
+#if (nginx_version >= 1023000)
+#define NGX_ZIP_MULTI_HEADERS_LINKED_LISTS 1
+#endif
+#endif
+
#define NGX_ZIP_MIME_TYPE "application/zip"
#define ngx_http_zip_current_file(ctx) ctx->pieces[ctx->pieces_i].file
www/nginx-devel/Makefile
+1 -1
View File
@@ -1,7 +1,7 @@
PORTNAME?= nginx
PORTVERSION= ${NGINX_VERSION}
.include "version.mk"
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= www
MASTER_SITES= https://nginx.org/download/ \
LOCAL/osa
www/nginx-devel/Makefile.extmod
+2 -1
View File
@@ -187,8 +187,9 @@ HTTP_VIDEO_THUMBEXTRACTOR_GH_TUPLE= wandenberg:nginx-video-thumbextractor-module
HTTP_VIDEO_THUMBEXTRACTOR_VARS= DSO_EXTMODS+=vte
HTTP_VIDEO_THUMBEXTRACTOR_EXTRA_PATCHES=${PATCHDIR}/extra-patch-nginx-thumbextractor-module-config
HTTP_ZIP_GH_TUPLE= vince2678:mod_zip:39dc908:mod_zip
HTTP_ZIP_GH_TUPLE= evanmiller:mod_zip:a9f9afa:mod_zip
HTTP_ZIP_VARS= DSO_EXTMODS+=mod_zip
HTTP_ZIP_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-mod_zip
ICONV_IMPLIES= DEVEL_KIT
ICONV_USES= iconv
www/nginx-devel/distinfo
+3 -3
View File
@@ -1,4 +1,4 @@
TIMESTAMP = 1779726360
TIMESTAMP = 1781448913
SHA256 (nginx-1.31.0.tar.gz) = 6d5b00d45393af2e4e7c52a442d2a198f0ccbc7678ed062a46f403edd833ebaa
SIZE (nginx-1.31.0.tar.gz) = 1337335
SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae
@@ -85,8 +85,8 @@ SHA256 (gdongca-nginx-sticky-module-ng-a3263ad_GH0.tar.gz) = 610bd7fa83d6f8fdb17
SIZE (gdongca-nginx-sticky-module-ng-a3263ad_GH0.tar.gz) = 122022
SHA256 (wandenberg-nginx-video-thumbextractor-module-e81f850_GH0.tar.gz) = 9113f887a8740fe72614ee32f481177d33e9542c3b0625627da19a1c4f3da2cb
SIZE (wandenberg-nginx-video-thumbextractor-module-e81f850_GH0.tar.gz) = 2710072
SHA256 (vince2678-mod_zip-39dc908_GH0.tar.gz) = bc5c3d725268abbe1c5c38de5b18a4ad9dbe5821c4afeaccabd3eec38b272be4
SIZE (vince2678-mod_zip-39dc908_GH0.tar.gz) = 30275
SHA256 (evanmiller-mod_zip-a9f9afa_GH0.tar.gz) = 645035b7d7a83ab3f47c692386e85bef69514b7778c1d069783d8fc76cc868da
SIZE (evanmiller-mod_zip-a9f9afa_GH0.tar.gz) = 30917
SHA256 (calio-iconv-nginx-module-v0.14_GH0.tar.gz) = b8b9f355c05c0790226512f6732348a2404d48531688a1fc04ce6768163bf462
SIZE (calio-iconv-nginx-module-v0.14_GH0.tar.gz) = 13133
SHA256 (baysao-nginx-let-module-c1f23aa_GH0.tar.gz) = 7393809d5d8877812da1bd5b5fbd1d8b00bc85e71f2f387c344f007773e49050
www/nginx-devel/files/extra-patch-mod_zip
+31
View File
@@ -0,0 +1,31 @@
--- ../mod_zip-a9f9afa/config 2025-09-04 19:55:16.000000000 +0000
+++ ../mod_zip-a9f9afa/config 2026-06-12 13:41:30.208275468 +0000
@@ -43,7 +43,7 @@
ngx_feature="multi-value headers are linked lists (nginx 1.23.0+)"
ngx_feature_name="NGX_ZIP_MULTI_HEADERS_LINKED_LISTS"
-ngx_feature_run=yes
+ngx_feature_run=no
ngx_feature_incs="#include \"nginx.h\""
ngx_feature_path="src/core"
ngx_feature_test="
--- ../mod_zip-a9f9afa/ngx_http_zip_module.h 2025-09-04 19:55:16.000000000 +0000
+++ ../mod_zip-a9f9afa/ngx_http_zip_module.h 2026-06-12 13:41:14.029809686 +0000
@@ -3,8 +3,17 @@
#include <ngx_config.h>
#include <ngx_core.h>
#include <ngx_http.h>
+#include <nginx.h>
#include <time.h>
+/* Fallback in case the configure-time feature test did not run:
+ * multi-value headers became linked lists in nginx 1.23.0 */
+#ifndef NGX_ZIP_MULTI_HEADERS_LINKED_LISTS
+#if (nginx_version >= 1023000)
+#define NGX_ZIP_MULTI_HEADERS_LINKED_LISTS 1
+#endif
+#endif
+
#define NGX_ZIP_MIME_TYPE "application/zip"
#define ngx_http_zip_current_file(ctx) ctx->pieces[ctx->pieces_i].file
www/nginx-full/Makefile
+1 -1
View File
@@ -1,5 +1,5 @@
PORTNAME= nginx
PORTREVISION= 1
PORTREVISION= 2
PKGNAMESUFFIX= -full
MAINTAINER= joneum@FreeBSD.org
www/nginx/Makefile
+1 -1
View File
@@ -1,7 +1,7 @@
PORTNAME= nginx
PORTVERSION= ${NGINX_VERSION}
.include "version.mk"
PORTREVISION= 2
PORTREVISION= 3
PORTEPOCH= 3
CATEGORIES= www
MASTER_SITES= https://nginx.org/download/ \
www/nginx/Makefile.extmod
+2 -1
View File
@@ -185,8 +185,9 @@ HTTP_VIDEO_THUMBEXTRACTOR_GH_TUPLE= wandenberg:nginx-video-thumbextractor-module
HTTP_VIDEO_THUMBEXTRACTOR_VARS= DSO_EXTMODS+=vte
HTTP_VIDEO_THUMBEXTRACTOR_EXTRA_PATCHES=${PATCHDIR}/extra-patch-nginx-thumbextractor-module-config
HTTP_ZIP_GH_TUPLE= vince2678:mod_zip:5b2604b:mod_zip
HTTP_ZIP_GH_TUPLE= evanmiller:mod_zip:a9f9afa:mod_zip
HTTP_ZIP_VARS= DSO_EXTMODS+=mod_zip
HTTP_ZIP_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-mod_zip
ICONV_IMPLIES= DEVEL_KIT
ICONV_USES= iconv
www/nginx/distinfo
+2 -2
View File
@@ -83,8 +83,8 @@ SHA256 (dvershinin-nginx-sticky-module-ng-2753211_GH0.tar.gz) = e4a533dfa214ea28
SIZE (dvershinin-nginx-sticky-module-ng-2753211_GH0.tar.gz) = 120676
SHA256 (wandenberg-nginx-video-thumbextractor-module-e81f850_GH0.tar.gz) = 9113f887a8740fe72614ee32f481177d33e9542c3b0625627da19a1c4f3da2cb
SIZE (wandenberg-nginx-video-thumbextractor-module-e81f850_GH0.tar.gz) = 2710072
SHA256 (vince2678-mod_zip-5b2604b_GH0.tar.gz) = 4fe63be3b842882494152e586f0b87e73f51bfbfd801b78f033c71a011cba789
SIZE (vince2678-mod_zip-5b2604b_GH0.tar.gz) = 29559
SHA256 (evanmiller-mod_zip-a9f9afa_GH0.tar.gz) = 645035b7d7a83ab3f47c692386e85bef69514b7778c1d069783d8fc76cc868da
SIZE (evanmiller-mod_zip-a9f9afa_GH0.tar.gz) = 30917
SHA256 (calio-iconv-nginx-module-v0.14_GH0.tar.gz) = b8b9f355c05c0790226512f6732348a2404d48531688a1fc04ce6768163bf462
SIZE (calio-iconv-nginx-module-v0.14_GH0.tar.gz) = 13133
SHA256 (baysao-nginx-let-module-c1f23aa_GH0.tar.gz) = 7393809d5d8877812da1bd5b5fbd1d8b00bc85e71f2f387c344f007773e49050
www/nginx/files/extra-patch-mod_zip
+31
View File
@@ -0,0 +1,31 @@
--- ../mod_zip-a9f9afa/config 2025-09-04 19:55:16.000000000 +0000
+++ ../mod_zip-a9f9afa/config 2026-06-12 13:41:30.208275468 +0000
@@ -43,7 +43,7 @@
ngx_feature="multi-value headers are linked lists (nginx 1.23.0+)"
ngx_feature_name="NGX_ZIP_MULTI_HEADERS_LINKED_LISTS"
-ngx_feature_run=yes
+ngx_feature_run=no
ngx_feature_incs="#include \"nginx.h\""
ngx_feature_path="src/core"
ngx_feature_test="
--- ../mod_zip-a9f9afa/ngx_http_zip_module.h 2025-09-04 19:55:16.000000000 +0000
+++ ../mod_zip-a9f9afa/ngx_http_zip_module.h 2026-06-12 13:41:14.029809686 +0000
@@ -3,8 +3,17 @@
#include <ngx_config.h>
#include <ngx_core.h>
#include <ngx_http.h>
+#include <nginx.h>
#include <time.h>
+/* Fallback in case the configure-time feature test did not run:
+ * multi-value headers became linked lists in nginx 1.23.0 */
+#ifndef NGX_ZIP_MULTI_HEADERS_LINKED_LISTS
+#if (nginx_version >= 1023000)
+#define NGX_ZIP_MULTI_HEADERS_LINKED_LISTS 1
+#endif
+#endif
+
#define NGX_ZIP_MIME_TYPE "application/zip"
#define ngx_http_zip_current_file(ctx) ctx->pieces[ctx->pieces_i].file