nginx-module-rtmp updated to version 1.2.2
diff --git a/alpine/Makefile.module-rtmp b/alpine/Makefile.module-rtmp index d205e94..5f550fe 100644 --- a/alpine/Makefile.module-rtmp +++ b/alpine/Makefile.module-rtmp
@@ -11,8 +11,6 @@ MODULE_SOURCES_rtmp= nginx-rtmp-module-$(NGINX_RTMP_MODULE_VERSION).tar.gz -MODULE_PATCHES_rtmp= $(CONTRIB)/src/nginx-rtmp-module/PR1340.patch - MODULE_CONFARGS_rtmp= --add-dynamic-module=$(MODSRC_PREFIX)nginx-rtmp-module-$(NGINX_RTMP_MODULE_VERSION) .deps-module-rtmp:
diff --git a/contrib/src/nginx-rtmp-module/Makefile b/contrib/src/nginx-rtmp-module/Makefile index 048f26a..5ea0195 100644 --- a/contrib/src/nginx-rtmp-module/Makefile +++ b/contrib/src/nginx-rtmp-module/Makefile
@@ -12,7 +12,6 @@ nginx-rtmp-module: nginx-rtmp-module-$(NGINX_RTMP_MODULE_VERSION).tar.gz .sum-nginx-rtmp-module $(UNPACK) - $(APPLY) $(SRC)/nginx-rtmp-module/PR1340.patch $(MOVE) .nginx-rtmp-module: nginx-rtmp-module
diff --git a/contrib/src/nginx-rtmp-module/PR1340.patch b/contrib/src/nginx-rtmp-module/PR1340.patch deleted file mode 100644 index 4315592..0000000 --- a/contrib/src/nginx-rtmp-module/PR1340.patch +++ /dev/null
@@ -1,21 +0,0 @@ -From 28f0acce2ebcd20f236e2d804a2ebef77b0f5640 Mon Sep 17 00:00:00 2001 -From: Andrei Belov <defanator@gmail.com> -Date: Sat, 22 Dec 2018 02:39:31 +0300 -Subject: [PATCH] Fixed building with gcc 8 - ---- - ngx_rtmp_eval.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/ngx_rtmp_eval.c b/ngx_rtmp_eval.c -index 1e5195a9..c658f14e 100644 ---- a/ngx_rtmp_eval.c -+++ b/ngx_rtmp_eval.c -@@ -166,6 +166,7 @@ ngx_rtmp_eval(void *ctx, ngx_str_t *in, ngx_rtmp_eval_t **e, ngx_str_t *out, - state = ESCAPE; - continue; - } -+ /* fall through */ - - case ESCAPE: - ngx_rtmp_eval_append(&b, &c, 1, log);
diff --git a/contrib/src/nginx-rtmp-module/SHA512SUMS b/contrib/src/nginx-rtmp-module/SHA512SUMS index 56f0f0e..4d3fff1 100644 --- a/contrib/src/nginx-rtmp-module/SHA512SUMS +++ b/contrib/src/nginx-rtmp-module/SHA512SUMS
@@ -1 +1 @@ -4a0af5e9afa4deb0b53de8de7ddb2cfa6430d372e1ef9e421f01b509548bd134d427345442ac1ce667338cc2a1484dc2ab732e316e878ac7d3537dc527d5f922 nginx-rtmp-module-1.2.1.tar.gz +3f8c803221854c4b1a06aadc6313fbfec74bd7179c0ee51d4365b26ffa8875881a6e1e48f777a9c9efbb9170ab7478a82920d5448a2c2df485503d37bb03ab81 nginx-rtmp-module-1.2.2.tar.gz
diff --git a/contrib/src/nginx-rtmp-module/version b/contrib/src/nginx-rtmp-module/version index e311d2d..7692c0d 100644 --- a/contrib/src/nginx-rtmp-module/version +++ b/contrib/src/nginx-rtmp-module/version
@@ -1 +1 @@ -NGINX_RTMP_MODULE_VERSION := 1.2.1 +NGINX_RTMP_MODULE_VERSION := 1.2.2
diff --git a/debian/Makefile.module-rtmp b/debian/Makefile.module-rtmp index 8593852..09869b2 100644 --- a/debian/Makefile.module-rtmp +++ b/debian/Makefile.module-rtmp
@@ -10,7 +10,6 @@ MODULE_VERSION_PREFIX_rtmp=$(MODULE_TARGET_PREFIX) MODULE_SOURCES_rtmp= nginx-rtmp-module-$(NGINX_RTMP_MODULE_VERSION).tar.gz -MODULE_PATCHES_rtmp= $(CONTRIB)/src/nginx-rtmp-module/PR1340.patch MODULE_CONFARGS_rtmp= --add-dynamic-module=$(MODSRC_PREFIX)nginx-rtmp-module-$(NGINX_RTMP_MODULE_VERSION)
diff --git a/docs/nginx-module-rtmp.xml b/docs/nginx-module-rtmp.xml index a6af1da..b60fa42 100644 --- a/docs/nginx-module-rtmp.xml +++ b/docs/nginx-module-rtmp.xml
@@ -5,6 +5,18 @@ <change_log title="nginx_module_rtmp"> +<changes apply="nginx-module-rtmp" ver="1.2.2" rev="1" basever="1.21.0" + date="2021-06-11" time="18:40:44 +0300" + packager="Igor Ippolitov <iippolitov@nginx.com>"> +<change> +<para> +nginx-module-rtmp updated to 1.2.2 +</para> +</change> + +</changes> + + <changes apply="nginx-module-rtmp" ver="1.2.1" rev="1" basever="1.21.0" date="2021-05-25" time="16:01:22 +0300" packager="Konstantin Pavlov <thresh@nginx.com>">
diff --git a/rpm/SPECS/Makefile.module-rtmp b/rpm/SPECS/Makefile.module-rtmp index 4eb68b0..a5088a2 100644 --- a/rpm/SPECS/Makefile.module-rtmp +++ b/rpm/SPECS/Makefile.module-rtmp
@@ -10,7 +10,6 @@ MODULE_VERSION_PREFIX_rtmp=$(MODULE_TARGET_PREFIX) MODULE_SOURCES_rtmp= nginx-rtmp-module-$(NGINX_RTMP_MODULE_VERSION).tar.gz -MODULE_PATCHES_rtmp= $(CONTRIB)/src/nginx-rtmp-module/PR1340.patch MODULE_CONFARGS_rtmp= --add-dynamic-module=nginx-rtmp-module-$(NGINX_RTMP_MODULE_VERSION)