nchan version v1.2.8

https://github.com/slact/nchan/releases/tag/v1.2.8

3 files changed, 8 insertions, 81 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7b486f948c0b..a4432d40b6d3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,16 @@
 pkgbase = nginx-mainline-mod-nchan
 	pkgdesc = nchan nginx module
-	pkgver = 1.2.7
-	pkgrel = 10
+	pkgver = 1.2.8
+	pkgrel = 1
 	url = https://nchan.io/
 	arch = i686
 	arch = x86_64
 	license = MIT
 	depends = nginx-mainline=1.19.10
-	source = https://github.com/slact/nchan/archive/v1.2.7.tar.gz
+	source = https://github.com/slact/nchan/archive/v1.2.8.tar.gz
 	source = http://nginx.org/download/nginx-1.19.10.tar.gz
-	source = f484c603a81c3bddd3f0160cfdbe231b8a453cde.diff
-	sha256sums = 8bb5d1749af759bb5e9cc5476a9c4b44d51bee6096bb89ab5ff53e85367b490b
+	sha256sums = de42e8d4fef6aef9e4c7303a7480adfe9545992470a7f6be008de7a4bb64cc98
 	sha256sums = e8d0290ff561986ad7cd6c33307e12e11b137186c4403a6a5ccdb4914c082d88
-	sha256sums = 9f73929de9741a3571de712f6767069ea0a3e16282ac7b3e3d33df77113d04ed
 
 pkgname = nginx-mainline-mod-nchan
 
diff --git a/PKGBUILD b/PKGBUILD
index dde0f1752c24..357cf1bb5069 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Damjan Georgievski <gdamjan@gmail.com>
 
 pkgname=nginx-mainline-mod-nchan
-pkgver=1.2.7
-pkgrel=10
+pkgver=1.2.8
+pkgrel=1
 
 _nginxver=1.19.10
 
@@ -15,12 +15,10 @@ license=('MIT')
 source=(
     https://github.com/slact/nchan/archive/v${pkgver}.tar.gz
     http://nginx.org/download/nginx-$_nginxver.tar.gz
-    f484c603a81c3bddd3f0160cfdbe231b8a453cde.diff
 )
 
 build() {
     _module_dir="$srcdir"/nchan-$pkgver
-    patch -p1 -d $_module_dir < f484c603a81c3bddd3f0160cfdbe231b8a453cde.diff
 
     cd "$srcdir"/nginx-$_nginxver
     ./configure --with-compat --add-dynamic-module=${_module_dir}
@@ -34,6 +32,5 @@ package() {
     done
 }
 
-sha256sums=('8bb5d1749af759bb5e9cc5476a9c4b44d51bee6096bb89ab5ff53e85367b490b'
-            'e8d0290ff561986ad7cd6c33307e12e11b137186c4403a6a5ccdb4914c082d88'
-            '9f73929de9741a3571de712f6767069ea0a3e16282ac7b3e3d33df77113d04ed')
+sha256sums=('de42e8d4fef6aef9e4c7303a7480adfe9545992470a7f6be008de7a4bb64cc98'
+            'e8d0290ff561986ad7cd6c33307e12e11b137186c4403a6a5ccdb4914c082d88')
diff --git a/f484c603a81c3bddd3f0160cfdbe231b8a453cde.diff b/f484c603a81c3bddd3f0160cfdbe231b8a453cde.diff
deleted file mode 100644
index e64883c652e3..000000000000
--- a/f484c603a81c3bddd3f0160cfdbe231b8a453cde.diff
+++ /dev/null
@@ -1,68 +0,0 @@
-diff --git a/dev/Gemfile b/dev/Gemfile
-index 567848b5..55292781 100644
---- a/dev/Gemfile
-+++ b/dev/Gemfile
-@@ -41,4 +41,4 @@ gem 'minitest-reporters'
- 
- gem 'fpm', :git => "https://github.com/slact/fpm.git"
- 
--gem 'hsss'
-+gem 'hsss', "~> 0.1.20"
-diff --git a/dev/rebuild.sh b/dev/rebuild.sh
-index ab443f54..49bc5be9 100755
---- a/dev/rebuild.sh
-+++ b/dev/rebuild.sh
-@@ -244,6 +244,7 @@ if [[ -z $NO_MAKE ]]; then
-   bundle exec hsss \
-      --format whole \
-      --header-only \
-+     --header-guard NCHAN_REDIS_LUA_SCRIPTS_H \
-      --no-static \
-      ${rdstore_dir}/redis-lua-scripts/*.lua > ${rdstore_dir}/redis_lua_commands.h
-   if ! [ $? -eq 0 ]; then;
-diff --git a/src/store/memory/memstore.c b/src/store/memory/memstore.c
-index 2844220c..f0f78acc 100755
---- a/src/store/memory/memstore.c
-+++ b/src/store/memory/memstore.c
-@@ -40,6 +40,8 @@ static ngx_int_t redis_fakesub_timer_interval;
- 
- #endif
- 
-+uint16_t  memstore_worker_generation;
-+
- 
- typedef struct {
-   //memstore_channel_head_t       unbuffered_dummy_chanhead;
-diff --git a/src/store/memory/store-private.h b/src/store/memory/store-private.h
-index e4a426a3..49de940b 100644
---- a/src/store/memory/store-private.h
-+++ b/src/store/memory/store-private.h
-@@ -172,6 +172,6 @@ ngx_int_t chanhead_gc_withdraw(memstore_channel_head_t *chanhead, const char *);
- void memstore_chanhead_release(memstore_channel_head_t *ch, char *label);
- void memstore_chanhead_reserve(memstore_channel_head_t *ch, const char *label);
- 
--uint16_t  memstore_worker_generation; //times nginx has been restarted + 1
-+extern uint16_t  memstore_worker_generation; //times nginx has been restarted + 1
- 
- #endif /*MEMSTORE_PRIVATE_HEADER*/
-diff --git a/src/store/redis/redis_lua_commands.h b/src/store/redis/redis_lua_commands.h
-index 76fb7b95..2efb25bd 100644
---- a/src/store/redis/redis_lua_commands.h
-+++ b/src/store/redis/redis_lua_commands.h
-@@ -1,3 +1,5 @@
-+#ifndef NCHAN_REDIS_LUA_SCRIPTS_H
-+#define NCHAN_REDIS_LUA_SCRIPTS_H
- // don't edit this please, it was auto-generated by hsss
- // https://github.com/slact/hsss
- 
-@@ -63,7 +65,8 @@ 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)++) 
-+#endif //NCHAN_REDIS_LUA_SCRIPTS_H