pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/www
Module Name: pkgsrc
Committed By: osa
Date: Mon Apr 24 16:34:39 UTC 2023
Modified Files:
pkgsrc/www/nginx: Makefile PLIST distinfo options.mk
pkgsrc/www/nginx-devel: Makefile PLIST distinfo options.mk
Log Message:
www/nginx*: add third-party redis module
Bump PKGREVISIONs.
PR pkg/45322
To generate a diff of this commit:
cvs rdiff -u -r1.137 -r1.138 pkgsrc/www/nginx/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/www/nginx/PLIST
cvs rdiff -u -r1.108 -r1.109 pkgsrc/www/nginx/distinfo
cvs rdiff -u -r1.93 -r1.94 pkgsrc/www/nginx/options.mk
cvs rdiff -u -r1.104 -r1.105 pkgsrc/www/nginx-devel/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/www/nginx-devel/PLIST
cvs rdiff -u -r1.93 -r1.94 pkgsrc/www/nginx-devel/distinfo
cvs rdiff -u -r1.20 -r1.21 pkgsrc/www/nginx-devel/options.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/www/nginx/Makefile
diff -u pkgsrc/www/nginx/Makefile:1.137 pkgsrc/www/nginx/Makefile:1.138
--- pkgsrc/www/nginx/Makefile:1.137 Mon Apr 24 15:25:28 2023
+++ pkgsrc/www/nginx/Makefile Mon Apr 24 16:34:38 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.137 2023/04/24 15:25:28 osa Exp $
+# $NetBSD: Makefile,v 1.138 2023/04/24 16:34:38 osa Exp $
DISTNAME= nginx-1.24.0
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= www
MASTER_SITES= https://nginx.org/download/
DISTFILES= ${DEFAULT_DISTFILES}
Index: pkgsrc/www/nginx/PLIST
diff -u pkgsrc/www/nginx/PLIST:1.18 pkgsrc/www/nginx/PLIST:1.19
--- pkgsrc/www/nginx/PLIST:1.18 Tue Apr 18 21:10:38 2023
+++ pkgsrc/www/nginx/PLIST Mon Apr 24 16:34:38 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2023/04/18 21:10:38 osa Exp $
+@comment $NetBSD: PLIST,v 1.19 2023/04/24 16:34:38 osa Exp $
${PLIST.dso}${PLIST.arrayvar}libexec/nginx/ngx_http_array_var_module.so
${PLIST.dso}${PLIST.cprg}libexec/nginx/ngx_http_cache_purge_module.so
${PLIST.dso}${PLIST.dav}libexec/nginx/ngx_http_dav_ext_module.so
@@ -18,6 +18,7 @@ ${PLIST.dso}${PLIST.ndk}libexec/nginx/nd
${PLIST.dso}${PLIST.njs}libexec/nginx/ngx_http_js_module.so
${PLIST.dso}${PLIST.njs}libexec/nginx/ngx_stream_js_module.so
${PLIST.dso}${PLIST.perl}libexec/nginx/ngx_http_perl_module.so
+${PLIST.dso}${PLIST.redis}libexec/nginx/ngx_http_redis_module.so
${PLIST.dso}${PLIST.rtmp}libexec/nginx/ngx_rtmp_module.so
${PLIST.dso}${PLIST.setmisc}libexec/nginx/ngx_http_set_misc_module.so
${PLIST.dso}${PLIST.stream}libexec/nginx/ngx_stream_module.so
Index: pkgsrc/www/nginx/distinfo
diff -u pkgsrc/www/nginx/distinfo:1.108 pkgsrc/www/nginx/distinfo:1.109
--- pkgsrc/www/nginx/distinfo:1.108 Tue Apr 18 21:10:38 2023
+++ pkgsrc/www/nginx/distinfo Mon Apr 24 16:34:38 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.108 2023/04/18 21:10:38 osa Exp $
+$NetBSD: distinfo,v 1.109 2023/04/24 16:34:38 osa Exp $
BLAKE2s (array-var-nginx-module-0.06.tar.gz) = fa6ad2a2ce3c3eba3f69287b224e9c01fcaca29a083394ab74f2f655d3e2138b
SHA512 (array-var-nginx-module-0.06.tar.gz) = bc72158856a1be18a26ee04c6b5b0f0a20bcce688610a493bf31e2a133e7eb12e11f7c18197a09a72b1513f6a08348ee5281b9d5b84cf43603539040ebd23c26
@@ -48,6 +48,9 @@ Size (ngx_http_geoip2_module-3.4.tar.gz)
BLAKE2s (njs-0.7.12.tar.gz) = a4c69c83bcc81ecd593f63f6d3e2d5d9cff8185ad56e8fd4846660c132976133
SHA512 (njs-0.7.12.tar.gz) = a65a6c6aa3fbd499536284f8d8610f61b87112156885e6c3b1f73872df22195af897766f266b4569098a70e1680aef66594da17d13519f16687b4e43dce49062
Size (njs-0.7.12.tar.gz) = 662554 bytes
+BLAKE2s (osokin-ngx_http_redis-59eb1c3_GH.tar.gz) = 4970dcfa8b4d51dde1e21b326a0c2a9feda370df9b7081e5e6e480bcfad63607
+SHA512 (osokin-ngx_http_redis-59eb1c3_GH.tar.gz) = 63a488f95167dcd3b87cfc687e68e99beb33766c3f91bbf2eea9d7427e806941d445fa969fcdfae741b6566ef0dc9f95c1be53ce398d6f6d80ea31399f383943
+Size (osokin-ngx_http_redis-59eb1c3_GH.tar.gz) = 12696 bytes
BLAKE2s (set-misc-nginx-module-0.33.tar.gz) = 306eb7a96ce5650c7e97a91e9cdba48d154d10cf6445d31193ffab889054d893
SHA512 (set-misc-nginx-module-0.33.tar.gz) = 1ff4c947538a5bd5f9d6adcd87b37f2702f5cc90e3342bc08359cbe8f290b705a3a2daa3dedfb1df3ce4bc19478c8fcac07081c4a53a804fc2862d50078278dc
Size (set-misc-nginx-module-0.33.tar.gz) = 30084 bytes
Index: pkgsrc/www/nginx/options.mk
diff -u pkgsrc/www/nginx/options.mk:1.93 pkgsrc/www/nginx/options.mk:1.94
--- pkgsrc/www/nginx/options.mk:1.93 Tue Apr 18 21:10:38 2023
+++ pkgsrc/www/nginx/options.mk Mon Apr 24 16:34:38 2023
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.93 2023/04/18 21:10:38 osa Exp $
+# $NetBSD: options.mk,v 1.94 2023/04/24 16:34:38 osa Exp $
CODELOAD_SITE_GITHUB= https://codeload.github.com/
@@ -7,7 +7,7 @@ PKG_SUPPORTED_OPTIONS= array-var auth-re
PKG_SUPPORTED_OPTIONS+= dso echo encrypted-session flv form-input
PKG_SUPPORTED_OPTIONS+= geoip geoip2 gssapi gtools gzip headers-more http2
PKG_SUPPORTED_OPTIONS+= image-filter luajit mail-proxy memcache
-PKG_SUPPORTED_OPTIONS+= naxsi njs perl push realip rtmp
+PKG_SUPPORTED_OPTIONS+= naxsi njs perl push realip redis rtmp
PKG_SUPPORTED_OPTIONS+= secure-link set-misc slice ssl status
PKG_SUPPORTED_OPTIONS+= stream-ssl-preread sts sub upload uwsgi vts
@@ -18,7 +18,7 @@ PKG_OPTIONS_LEGACY_OPTS+= v2:http2
PLIST_VARS+= arrayvar cprg dav dso echo encses forminput geoip2
PLIST_VARS+= gssapi headmore imagefilter lua mail naxsi nchan ndk njs
-PLIST_VARS+= perl rtmp setmisc stream sts upload uwsgi vts
+PLIST_VARS+= perl redis rtmp setmisc stream sts upload uwsgi vts
.include "../../mk/bsd.options.mk"
@@ -118,6 +118,18 @@ CONFIGURE_ARGS+= --without-http_memcache
CONFIGURE_ARGS+= --with-http_realip_module
.endif
+.if !empty(PKG_OPTIONS:Mredis)
+REDIS_GH_ACCOUNT= osokin
+REDIS_GH_PROJECT= ngx_http_redis
+REDIS_VERSION= 59eb1c3
+REDIS_DISTNAME= ${REDIS_GH_PROJECT}-${REDIS_VERSION}
+REDIS_DISTFILE= ${REDIS_GH_ACCOUNT}-${REDIS_DISTNAME}_GH.tar.gz
+SITES.${REDIS_DISTFILE}=-${CODELOAD_SITE_GITHUB:=${REDIS_GH_ACCOUNT}/${REDIS_GH_PROJECT}/tar.gz/${REDIS_VERSION}?dummy=${REDIS_DISTFILE}}
+DISTFILES+= ${REDIS_DISTFILE}
+DSO_EXTMODS+= redis
+PLIST.redis= yes
+.endif
+
# NDK must be added once and before 3rd party modules needing it
.for mod in luajit set-misc array-var form-input encrypted-session
. if !defined(NEED_NDK) && !empty(PKG_OPTIONS:M${mod}:O)
Index: pkgsrc/www/nginx-devel/Makefile
diff -u pkgsrc/www/nginx-devel/Makefile:1.104 pkgsrc/www/nginx-devel/Makefile:1.105
--- pkgsrc/www/nginx-devel/Makefile:1.104 Mon Apr 24 15:25:28 2023
+++ pkgsrc/www/nginx-devel/Makefile Mon Apr 24 16:34:39 2023
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.104 2023/04/24 15:25:28 osa Exp $
+# $NetBSD: Makefile,v 1.105 2023/04/24 16:34:39 osa Exp $
DISTNAME= nginx-1.24.0
PKGNAME= ${DISTNAME:S/-/-devel-/1}
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= www
MASTER_SITES= https://nginx.org/download/
DISTFILES= ${DEFAULT_DISTFILES}
Index: pkgsrc/www/nginx-devel/PLIST
diff -u pkgsrc/www/nginx-devel/PLIST:1.12 pkgsrc/www/nginx-devel/PLIST:1.13
--- pkgsrc/www/nginx-devel/PLIST:1.12 Tue Apr 18 21:10:38 2023
+++ pkgsrc/www/nginx-devel/PLIST Mon Apr 24 16:34:39 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2023/04/18 21:10:38 osa Exp $
+@comment $NetBSD: PLIST,v 1.13 2023/04/24 16:34:39 osa Exp $
${PLIST.dso}${PLIST.arrayvar}libexec/nginx/ngx_http_array_var_module.so
${PLIST.dso}${PLIST.cprg}libexec/nginx/ngx_http_cache_purge_module.so
${PLIST.dso}${PLIST.dav}libexec/nginx/ngx_http_dav_ext_module.so
@@ -18,6 +18,7 @@ ${PLIST.dso}${PLIST.ndk}libexec/nginx/nd
${PLIST.dso}${PLIST.njs}libexec/nginx/ngx_http_js_module.so
${PLIST.dso}${PLIST.njs}libexec/nginx/ngx_stream_js_module.so
${PLIST.dso}${PLIST.perl}libexec/nginx/ngx_http_perl_module.so
+${PLIST.dso}${PLIST.redis}libexec/nginx/ngx_http_redis_module.so
${PLIST.dso}${PLIST.rtmp}libexec/nginx/ngx_rtmp_module.so
${PLIST.dso}${PLIST.setmisc}libexec/nginx/ngx_http_set_misc_module.so
${PLIST.dso}${PLIST.stream}libexec/nginx/ngx_stream_module.so
Index: pkgsrc/www/nginx-devel/distinfo
diff -u pkgsrc/www/nginx-devel/distinfo:1.93 pkgsrc/www/nginx-devel/distinfo:1.94
--- pkgsrc/www/nginx-devel/distinfo:1.93 Tue Apr 18 21:10:38 2023
+++ pkgsrc/www/nginx-devel/distinfo Mon Apr 24 16:34:39 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.93 2023/04/18 21:10:38 osa Exp $
+$NetBSD: distinfo,v 1.94 2023/04/24 16:34:39 osa Exp $
BLAKE2s (array-var-nginx-module-0.06.tar.gz) = fa6ad2a2ce3c3eba3f69287b224e9c01fcaca29a083394ab74f2f655d3e2138b
SHA512 (array-var-nginx-module-0.06.tar.gz) = bc72158856a1be18a26ee04c6b5b0f0a20bcce688610a493bf31e2a133e7eb12e11f7c18197a09a72b1513f6a08348ee5281b9d5b84cf43603539040ebd23c26
@@ -48,6 +48,9 @@ Size (ngx_http_geoip2_module-3.4.tar.gz)
BLAKE2s (njs-0.7.12.tar.gz) = a4c69c83bcc81ecd593f63f6d3e2d5d9cff8185ad56e8fd4846660c132976133
SHA512 (njs-0.7.12.tar.gz) = a65a6c6aa3fbd499536284f8d8610f61b87112156885e6c3b1f73872df22195af897766f266b4569098a70e1680aef66594da17d13519f16687b4e43dce49062
Size (njs-0.7.12.tar.gz) = 662554 bytes
+BLAKE2s (osokin-ngx_http_redis-59eb1c3_GH.tar.gz) = 4970dcfa8b4d51dde1e21b326a0c2a9feda370df9b7081e5e6e480bcfad63607
+SHA512 (osokin-ngx_http_redis-59eb1c3_GH.tar.gz) = 63a488f95167dcd3b87cfc687e68e99beb33766c3f91bbf2eea9d7427e806941d445fa969fcdfae741b6566ef0dc9f95c1be53ce398d6f6d80ea31399f383943
+Size (osokin-ngx_http_redis-59eb1c3_GH.tar.gz) = 12696 bytes
BLAKE2s (set-misc-nginx-module-0.33.tar.gz) = 306eb7a96ce5650c7e97a91e9cdba48d154d10cf6445d31193ffab889054d893
SHA512 (set-misc-nginx-module-0.33.tar.gz) = 1ff4c947538a5bd5f9d6adcd87b37f2702f5cc90e3342bc08359cbe8f290b705a3a2daa3dedfb1df3ce4bc19478c8fcac07081c4a53a804fc2862d50078278dc
Size (set-misc-nginx-module-0.33.tar.gz) = 30084 bytes
Index: pkgsrc/www/nginx-devel/options.mk
diff -u pkgsrc/www/nginx-devel/options.mk:1.20 pkgsrc/www/nginx-devel/options.mk:1.21
--- pkgsrc/www/nginx-devel/options.mk:1.20 Tue Apr 18 21:10:38 2023
+++ pkgsrc/www/nginx-devel/options.mk Mon Apr 24 16:34:39 2023
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.20 2023/04/18 21:10:38 osa Exp $
+# $NetBSD: options.mk,v 1.21 2023/04/24 16:34:39 osa Exp $
CODELOAD_SITE_GITHUB= https://codeload.github.com/
@@ -7,7 +7,7 @@ PKG_SUPPORTED_OPTIONS= array-var auth-re
PKG_SUPPORTED_OPTIONS+= dso echo encrypted-session flv form-input
PKG_SUPPORTED_OPTIONS+= geoip geoip2 gssapi gtools gzip headers-more http2
PKG_SUPPORTED_OPTIONS+= image-filter luajit mail-proxy memcache
-PKG_SUPPORTED_OPTIONS+= naxsi njs perl push realip rtmp
+PKG_SUPPORTED_OPTIONS+= naxsi njs perl push realip redis rtmp
PKG_SUPPORTED_OPTIONS+= secure-link set-misc slice ssl status
PKG_SUPPORTED_OPTIONS+= stream-ssl-preread sts sub upload uwsgi vts
@@ -18,7 +18,7 @@ PKG_OPTIONS_LEGACY_OPTS+= v2:http2
PLIST_VARS+= arrayvar cprg dav dso echo encses forminput geoip2
PLIST_VARS+= gssapi headmore imagefilter lua mail naxsi nchan ndk njs
-PLIST_VARS+= perl rtmp setmisc stream sts upload uwsgi vts
+PLIST_VARS+= perl redis rtmp setmisc stream sts upload uwsgi vts
.include "../../mk/bsd.options.mk"
@@ -118,6 +118,18 @@ CONFIGURE_ARGS+= --without-http_memcache
CONFIGURE_ARGS+= --with-http_realip_module
.endif
+.if !empty(PKG_OPTIONS:Mredis)
+REDIS_GH_ACCOUNT= osokin
+REDIS_GH_PROJECT= ngx_http_redis
+REDIS_VERSION= 59eb1c3
+REDIS_DISTNAME= ${REDIS_GH_PROJECT}-${REDIS_VERSION}
+REDIS_DISTFILE= ${REDIS_GH_ACCOUNT}-${REDIS_DISTNAME}_GH.tar.gz
+SITES.${REDIS_DISTFILE}=-${CODELOAD_SITE_GITHUB:=${REDIS_GH_ACCOUNT}/${REDIS_GH_PROJECT}/tar.gz/${REDIS_VERSION}?dummy=${REDIS_DISTFILE}}
+DISTFILES+= ${REDIS_DISTFILE}
+DSO_EXTMODS+= redis
+PLIST.redis= yes
+.endif
+
# NDK must be added once and before 3rd party modules needing it
.for mod in luajit set-misc array-var form-input encrypted-session
. if !defined(NEED_NDK) && !empty(PKG_OPTIONS:M${mod}:O)
Home |
Main Index |
Thread Index |
Old Index