<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/dfacaeae9817403d3020d8a98e704c1f5ecdecc0">https://github.com/macports/macports-ports/commit/dfacaeae9817403d3020d8a98e704c1f5ecdecc0</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new dfacaea nginx: update rtmp module to 1.2.1
</span>dfacaea is described below
<span style='display:block; white-space:pre;color:#808000;'>commit dfacaeae9817403d3020d8a98e704c1f5ecdecc0
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Fri Apr 3 11:32:41 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> nginx: update rtmp module to 1.2.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/60304
</span>---
www/nginx/Portfile | 15 ++-
www/nginx/files/patch-ngx_rtmp_core_module.c.diff | 129 ----------------------
2 files changed, 7 insertions(+), 137 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/nginx/Portfile b/www/nginx/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 80b863b..c2251d2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/nginx/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/nginx/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,7 +27,7 @@ master_sites https://nginx.org/download:nginx \
</span> https://people.freebsd.org/~osa/:redis_module \
https://github.com/masterzen/nginx-upload-progress-module/archive/:uploadprogress_module \
https://github.com/arut/nginx-dav-ext-module/archive/:davext_module \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- https://github.com/arut/nginx-rtmp-module/archive/:rtmp_module \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ https://codeload.github.com/arut/nginx-rtmp-module/tar.gz/:rtmp_module \
</span> https://github.com/slact/nchan/archive/:http_push_module \
https://github.com/simpl/ngx_devel_kit/archive/:devel_kit_module \
https://github.com/openresty/lua-nginx-module/archive/:lua_module \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -326,16 +326,15 @@ variant redis description {Enable Ngx HTTP Redis module} {
</span>
variant rtmp description {Enable Ngx RTMP module (https://github.com/arut/nginx-rtmp-module)} {
set rtmp_filename nginx-rtmp-module
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set rtmp_version 1.1.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set rtmp_version 1.2.1
</span> set rtmp_distname ${rtmp_filename}-${rtmp_version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- distfiles-append v${rtmp_version}.tar.gz:rtmp_module
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums-append v${rtmp_version}.tar.gz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 3b7510fba6f6e572f0fb0b3676fe1eb4d4caecb1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 7922b0e3d5f3d9c4b275e4908cfb8f5fb1bfb3ac2df77f4c262cda56df21aab3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 519735
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distfiles-append v${rtmp_version}:rtmp_module
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums-append v${rtmp_version} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 5fc0b4ac0b2c0a6d70957a5256754db8a9e934cf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 87aa597400b0b5a05274ee2d23d8cb8224e12686227a0abe31d783b3a645ea37 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 519919
</span>
configure.args-append --add-module=${workpath}/${rtmp_distname}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-ngx_rtmp_core_module.c.diff
</span>
nginx_set_portfile_var nginx_rtmp_mod_dirname "${rtmp_distname}"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/nginx/files/patch-ngx_rtmp_core_module.c.diff b/www/nginx/files/patch-ngx_rtmp_core_module.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ee74728..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/nginx/files/patch-ngx_rtmp_core_module.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,129 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- nginx_rtmp_module.tmp/ngx_rtmp_core_module.c.orig 2015-03-23 14:30:37.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ nginx_rtmp_module.tmp/ngx_rtmp_core_module.c 2016-06-03 11:27:21.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -332,6 +332,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void *mconf;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ngx_uint_t m;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ngx_conf_t pcf;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ngx_module_t **modules;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ngx_rtmp_module_t *module;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ngx_rtmp_conf_ctx_t *ctx, *rtmp_ctx;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ngx_rtmp_core_srv_conf_t *cscf, **cscfp;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -357,12 +358,17 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return NGX_CONF_ERROR;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for (m = 0; ngx_modules[m]; m++) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (ngx_modules[m]->type != NGX_RTMP_MODULE) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(nginx_version) && nginx_version >= 1009011
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ modules = cf->cycle->modules;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ modules = ngx_modules;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for (m = 0; modules[m]; m++) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (modules[m]->type != NGX_RTMP_MODULE) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- continue;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- module = ngx_modules[m]->ctx;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ module = modules[m]->ctx;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (module->create_srv_conf) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mconf = module->create_srv_conf(cf);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -370,7 +376,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return NGX_CONF_ERROR;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ctx->srv_conf[ngx_modules[m]->ctx_index] = mconf;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ctx->srv_conf[modules[m]->ctx_index] = mconf;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (module->create_app_conf) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -379,7 +385,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return NGX_CONF_ERROR;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ctx->app_conf[ngx_modules[m]->ctx_index] = mconf;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ctx->app_conf[modules[m]->ctx_index] = mconf;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -419,6 +425,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ngx_int_t i;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ngx_str_t *value;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ngx_conf_t save;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ngx_module_t **modules;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ngx_rtmp_module_t *module;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ngx_rtmp_conf_ctx_t *ctx, *pctx;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ngx_rtmp_core_srv_conf_t *cscf;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -438,17 +445,22 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return NGX_CONF_ERROR;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for (i = 0; ngx_modules[i]; i++) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (ngx_modules[i]->type != NGX_RTMP_MODULE) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(nginx_version) && nginx_version >= 1009011
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ modules = cf->cycle->modules;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ modules = ngx_modules;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for (i = 0; modules[i]; i++) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (modules[i]->type != NGX_RTMP_MODULE) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- continue;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- module = ngx_modules[i]->ctx;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ module = modules[i]->ctx;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (module->create_app_conf) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ctx->app_conf[ngx_modules[i]->ctx_index] =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ctx->app_conf[modules[i]->ctx_index] =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- module->create_app_conf(cf);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (ctx->app_conf[ngx_modules[i]->ctx_index] == NULL) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (ctx->app_conf[modules[i]->ctx_index] == NULL) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return NGX_CONF_ERROR;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -488,7 +500,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- in_port_t port;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ngx_str_t *value;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ngx_url_t u;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ngx_uint_t i, m;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ngx_uint_t i;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct sockaddr *sa;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ngx_rtmp_listen_t *ls;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct sockaddr_in *sin;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -545,7 +557,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if (nginx_version >= 1011000)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (ngx_memcmp(ls[i].sockaddr + off, &u.sockaddr + off, len) != 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (ngx_memcmp(ls[i].sockaddr + off, u.sockaddr + off, len) != 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- continue;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -565,18 +581,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ngx_memzero(ls, sizeof(ngx_rtmp_listen_t));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if (nginx_version >= 1011000)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ngx_memcpy(ls->sockaddr, &u.sockaddr, u.socklen);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ngx_memcpy(ls->sockaddr, u.sockaddr, u.socklen);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ls->socklen = u.socklen;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ls->wildcard = u.wildcard;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ls->ctx = cf->ctx;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for (m = 0; ngx_modules[m]; m++) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (ngx_modules[m]->type != NGX_RTMP_MODULE) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- continue;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (i = 2; i < cf->args->nelts; i++) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (ngx_strcmp(value[i].data, "bind") == 0) {
</span></pre><pre style='margin:0'>
</pre>