Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 23 Dec 2020 20:12:08 +0000 (UTC)
From:      Jochen Neumeister <joneum@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r559021 - in head/www/nginx: . files
Message-ID:  <202012232012.0BNKC8kf058093@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: joneum
Date: Wed Dec 23 20:12:07 2020
New Revision: 559021
URL: https://svnweb.freebsd.org/changeset/ports/559021

Log:
  Update 3rd party Module nchan
  
  PR:		252050
  Sponsored by:	Netzkommune GmbH

Added:
  head/www/nginx/files/extra-patch-nchan-store-redis-redis_lua_commands.h   (contents, props changed)
Modified:
  head/www/nginx/Makefile
  head/www/nginx/Makefile.extmod
  head/www/nginx/distinfo
  head/www/nginx/files/extra-patch-nchan-store-private.h

Modified: head/www/nginx/Makefile
==============================================================================
--- head/www/nginx/Makefile	Wed Dec 23 20:11:57 2020	(r559020)
+++ head/www/nginx/Makefile	Wed Dec 23 20:12:07 2020	(r559021)
@@ -3,7 +3,7 @@
 
 PORTNAME=	nginx
 PORTVERSION=	1.18.0
-PORTREVISION?=	42
+PORTREVISION?=	43
 PORTEPOCH=	2
 CATEGORIES=	www
 MASTER_SITES=	https://nginx.org/download/ \

Modified: head/www/nginx/Makefile.extmod
==============================================================================
--- head/www/nginx/Makefile.extmod	Wed Dec 23 20:11:57 2020	(r559020)
+++ head/www/nginx/Makefile.extmod	Wed Dec 23 20:12:07 2020	(r559021)
@@ -140,9 +140,10 @@ HTTP_NOTICE_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-ngx
 				${PATCHDIR}/extra-patch-nginx-notice-config
 HTTP_NOTICE_VARS=		DSO_EXTMODS+=notice
 
-HTTP_PUSH_GH_TUPLE=		slact:nchan:v1.1.14:push
+HTTP_PUSH_GH_TUPLE=		slact:nchan:v1.2.7:push
 HTTP_PUSH_VARS=			DSO_EXTMODS+=push
-HTTP_PUSH_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-nchan-store-private.h
+HTTP_PUSH_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-nchan-store-private.h \
+				${PATCHDIR}/extra-patch-nchan-store-redis-redis_lua_commands.h
 
 HTTP_PUSH_STREAM_GH_TUPLE=	wandenberg:nginx-push-stream-module:0.5.4:pushstream
 HTTP_PUSH_STREAM_VARS=		DSO_EXTMODS+=pushstream

Modified: head/www/nginx/distinfo
==============================================================================
--- head/www/nginx/distinfo	Wed Dec 23 20:11:57 2020	(r559020)
+++ head/www/nginx/distinfo	Wed Dec 23 20:12:07 2020	(r559021)
@@ -1,4 +1,4 @@
-TIMESTAMP = 1608746983
+TIMESTAMP = 1608749735
 SHA256 (nginx-1.18.0.tar.gz) = 4c373e7ab5bf91d34a4f11a0c9496561061ba5eee6020db272a17a7228d35f99
 SIZE (nginx-1.18.0.tar.gz) = 1039530
 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae
@@ -75,8 +75,8 @@ SHA256 (nginx-modules-ngx_http_json_status_module-1d2f
 SIZE (nginx-modules-ngx_http_json_status_module-1d2f303_GH0.tar.gz) = 6736
 SHA256 (kr-nginx-notice-3c95966_GH0.tar.gz) = e829fc94178cc8c91fef15a1fc44ee7ac162c13eddc0bba4c9427aaa23386885
 SIZE (kr-nginx-notice-3c95966_GH0.tar.gz) = 3343
-SHA256 (slact-nchan-v1.1.14_GH0.tar.gz) = 70b38d9e54826b2a69a9a5f3de5fb0e25fb03177ec3ac0bc69b9fd2c087143b8
-SIZE (slact-nchan-v1.1.14_GH0.tar.gz) = 630564
+SHA256 (slact-nchan-v1.2.7_GH0.tar.gz) = 8bb5d1749af759bb5e9cc5476a9c4b44d51bee6096bb89ab5ff53e85367b490b
+SIZE (slact-nchan-v1.2.7_GH0.tar.gz) = 673406
 SHA256 (wandenberg-nginx-push-stream-module-0.5.4_GH0.tar.gz) = 5253bb8a804ea679e514137a234637298f044c3ef63c053670bf3802ff3535b1
 SIZE (wandenberg-nginx-push-stream-module-0.5.4_GH0.tar.gz) = 183493
 SHA256 (yaoweibin-ngx_http_substitutions_filter_module-b8a71ea_GH0.tar.gz) = 08f966328fc1b77e0dbbcacd9532c3905060c20c45b6461b6f2075cd844d0891

Modified: head/www/nginx/files/extra-patch-nchan-store-private.h
==============================================================================
--- head/www/nginx/files/extra-patch-nchan-store-private.h	Wed Dec 23 20:11:57 2020	(r559020)
+++ head/www/nginx/files/extra-patch-nchan-store-private.h	Wed Dec 23 20:12:07 2020	(r559021)
@@ -1,5 +1,5 @@
---- ../nchan-1.1.14/src/store/memory/store-private.h.orig	2020-09-20 13:11:33.781569000 +0200
-+++ ../nchan-1.1.14/src/store/memory/store-private.h	2020-09-20 13:11:48.679855000 +0200
+--- ../nchan-1.2.7/src/store/memory/store-private.h.orig	2020-09-20 13:11:33.781569000 +0200
++++ ../nchan-1.2.7/src/store/memory/store-private.h	2020-09-20 13:11:48.679855000 +0200
 @@ -172,6 +172,6 @@
  void memstore_chanhead_release(memstore_channel_head_t *ch, char *label);
  void memstore_chanhead_reserve(memstore_channel_head_t *ch, const char *label);

Added: head/www/nginx/files/extra-patch-nchan-store-redis-redis_lua_commands.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/nginx/files/extra-patch-nchan-store-redis-redis_lua_commands.h	Wed Dec 23 20:12:07 2020	(r559021)
@@ -0,0 +1,12 @@
+--- ../nchan-1.2.7/src/store/redis/redis_lua_commands.h.orig	2020-09-30 23:51:52.116513000 +0800
++++ ../nchan-1.2.7/src/store/redis/redis_lua_commands.h	2020-09-30 23:52:11.164617000 +0800
+@@ -63,7 +63,7 @@ typedef struct {
+   redis_lua_script_t subscriber_unregister;
+ 
+ } redis_lua_scripts_t;
+-redis_lua_scripts_t redis_lua_scripts;
+-const int redis_lua_scripts_count;
++extern redis_lua_scripts_t redis_lua_scripts;
++extern const int redis_lua_scripts_count;
+ #define REDIS_LUA_SCRIPTS_EACH(script) \
+ for((script)=(redis_lua_script_t *)&redis_lua_scripts; (script) < (redis_lua_script_t *)(&redis_lua_scripts + 1); (script)++) 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202012232012.0BNKC8kf058093>