www/nginx-devel: add third-party clojure module back

Bump PORTREVISION. Thanks to pluknet.
freebsd · Jul 11, 2022 · 3364325 · 3364325
1 parent 4a6b031
commit 3364325
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 4 deletions.
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME?=	nginx
 PORTVERSION=	1.23.0
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	www
 MASTER_SITES=	https://nginx.org/download/ \
 		LOCAL/osa

diff --git a/www/nginx-devel/Makefile.extmod b/www/nginx-devel/Makefile.extmod
@@ -2,7 +2,7 @@
 
 OPTIONS_GROUP+=	THIRDPARTYGRP
 # External modules (arrayvar MUST appear after devel_kit for build-dep)
-OPTIONS_GROUP_THIRDPARTYGRP=	AJP AWS_AUTH BROTLI CACHE_PURGE COOKIE_FLAG CT \
+OPTIONS_GROUP_THIRDPARTYGRP=	AJP AWS_AUTH BROTLI CACHE_PURGE CLOJURE COOKIE_FLAG CT \
 	DEVEL_KIT ARRAYVAR DRIZZLE DYNAMIC_HC DYNAMIC_UPSTREAM ECHO ENCRYPTSESSION \
 	FORMINPUT GRIDFS HEADERS_MORE HTTP_ACCEPT_LANGUAGE HTTP_AUTH_DIGEST \
 	HTTP_AUTH_KRB5 HTTP_AUTH_LDAP HTTP_AUTH_PAM HTTP_DAV_EXT HTTP_EVAL \
@@ -32,6 +32,14 @@ BROTLI_VARS=		DSO_EXTMODS+=brotli
 CACHE_PURGE_GH_TUPLE=	torden:ngx_cache_purge:2b977cf:cache_purge
 CACHE_PURGE_VARS=	DSO_EXTMODS+=cache_purge
 
+CLOJURE_CATEGORIES+=	java
+CLOJURE_USE=		JAVA=yes JAVA_OS=native JAVA_VERSION=1.8 \
+			JAVA_VENDOR=openjdk JAVA_BUILD=yes JAVA_RUN=yes
+CLOJURE_GH_TUPLE=	nginx-clojure:nginx-clojure:4347955:clojure
+CLOJURE_CONFIGURE_ENV=	"JNI_INCS=-I${LOCALBASE}/openjdk8/include -I${LOCALBASE}/openjdk8/include/freebsd"
+CLOJURE_VARS=		DSO_EXTMODS+=clojure CLOJURE_SUBDIR=/src/c
+CLOJURE_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-ngx_http_clojure_mem.h
+
 COOKIE_FLAG_GH_TUPLE=	AirisX:nginx_cookie_flag_module:c4ff449:cookie_flag
 COOKIE_FLAG_VARS=	DSO_EXTMODS+=cookie_flag
 

diff --git a/www/nginx-devel/Makefile.options.desc b/www/nginx-devel/Makefile.options.desc
@@ -58,7 +58,6 @@ HTTP_PUSH_STREAM_DESC=		3rd party push stream module
 HTTP_RANDOM_INDEX_DESC=		Enable http_random_index module
 HTTP_REALIP_DESC=		Enable http_realip module
 HTTP_REDIS_DESC=		3rd party http_redis module
-HTTP_RESPONSE_DESC=		3rd party http_response module
 HTTP_SECURE_LINK_DESC=		Enable http_secure_link module
 HTTP_SLICE_DESC=		Enable http_slice module
 HTTP_SLICE_AHEAD_DESC=		3rd party http_slice_ahead module

diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1657504169
+TIMESTAMP = 1657561075
 SHA256 (nginx-1.23.0.tar.gz) = 820acaa35b9272be9e9e72f6defa4a5f2921824709f8aa4772c78ab31ed94cd1
 SIZE (nginx-1.23.0.tar.gz) = 1102940
 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae
@@ -19,6 +19,8 @@ SHA256 (google-ngx_brotli-9aec15e_GH0.tar.gz) = 0177b1158ff7092b9996346de28a0b29
 SIZE (google-ngx_brotli-9aec15e_GH0.tar.gz) = 16194
 SHA256 (torden-ngx_cache_purge-2b977cf_GH0.tar.gz) = 9de7dad5827edf37e803435ee764f6815562053daa0821aedaf539580307ff93
 SIZE (torden-ngx_cache_purge-2b977cf_GH0.tar.gz) = 16739
+SHA256 (nginx-clojure-nginx-clojure-4347955_GH0.tar.gz) = 9f0fc3b479936fc5b20101c6d238bff5a6f4a32b28d8ec4a511f902abe2abc1f
+SIZE (nginx-clojure-nginx-clojure-4347955_GH0.tar.gz) = 756519
 SHA256 (AirisX-nginx_cookie_flag_module-c4ff449_GH0.tar.gz) = 4b8c1c1e1ed59ed85751f4bd7d68026ad5051103c8b983e05ad17eb0cdab138e
 SIZE (AirisX-nginx_cookie_flag_module-c4ff449_GH0.tar.gz) = 4713
 SHA256 (grahamedgecombe-nginx-ct-93e9884_GH0.tar.gz) = 72fdd125b9207cdda135f368095f85b943a78a4ff004d1cd217972e12b1571b2

diff --git a/www/nginx-devel/files/extra-patch-ngx_http_clojure_mem.h b/www/nginx-devel/files/extra-patch-ngx_http_clojure_mem.h
@@ -0,0 +1,11 @@
+--- ../nginx-clojure-4347955/src/c/ngx_http_clojure_mem.h.orig	2022-07-11 13:38:32.426478000 -0400
++++ ../nginx-clojure-4347955/src/c/ngx_http_clojure_mem.h	2022-07-11 13:38:45.346434000 -0400
+@@ -421,7 +421,7 @@
+ #define NGX_HTTP_CLOJURE_HEADERSI_PASSWD_IDX  90
+ #define NGX_HTTP_CLOJURE_HEADERSI_PASSWD_OFFSET offsetof(ngx_http_headers_in_t, passwd)
+ #define NGX_HTTP_CLOJURE_HEADERSI_COOKIE_IDX  91
+-#define NGX_HTTP_CLOJURE_HEADERSI_COOKIE_OFFSET offsetof(ngx_http_headers_in_t, cookies)
++#define NGX_HTTP_CLOJURE_HEADERSI_COOKIE_OFFSET offsetof(ngx_http_headers_in_t, cookie)
+ #define NGX_HTTP_CLOJURE_HEADERSI_SERVER_IDX  92
+ #define NGX_HTTP_CLOJURE_HEADERSI_SERVER_OFFSET offsetof(ngx_http_headers_in_t, server)
+ #define NGX_HTTP_CLOJURE_HEADERSI_CONTENT_LENGTH_N_IDX  93
diff --git a/www/nginx-devel/pkg-plist b/www/nginx-devel/pkg-plist
@@ -14,6 +14,7 @@
 %%DSO%%%%BROTLI%%libexec/nginx/ngx_http_brotli_filter_module.so
 %%DSO%%%%BROTLI%%libexec/nginx/ngx_http_brotli_static_module.so
 %%DSO%%%%CACHE_PURGE%%libexec/nginx/ngx_http_cache_purge_module.so
+%%DSO%%%%CLOJURE%%libexec/nginx/ngx_http_clojure_module.so
 %%DSO%%%%COOKIE_FLAG%%libexec/nginx/ngx_http_cookie_flag_filter_module.so
 %%DSO%%%%CT%%libexec/nginx/ngx_http_ssl_ct_module.so
 %%DSO%%%%CT%%libexec/nginx/ngx_ssl_ct_module.so