kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update two third-party modules to their recent versions:

Browse source 
o) modsecurity3
o) vod

Remove the needless patch for the third-party vod module,
it's been added to the upstream.

Bump PORTREVISION.
This commit is contained in:
Sergey A. Osokin 2019-12-17 15:03:03 +00:00
parent 7fee233362
commit d3a1686dd4
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=520332
5 changed files with 10 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
www/nginx-devel/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= nginx
PORTVERSION= 1.17.6
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= www
MASTER_SITES= https://nginx.org/download/ \
LOCAL/osa

4
www/nginx-devel/Makefile.extmod
View file

@ -226,7 +226,7 @@ MODSECURITY_VARS= WRKSRC_modsecurity=${WRKDIR}/modsecurity-${MODSECURITY_VERSIO
MODSECURITY_CONFIGURE_ON= --add-module=${WRKDIR}/modsecurity-${MODSECURITY_VERSION}/nginx/modsecurity
MODSECURITY3_LIB_DEPENDS= libmodsecurity.so:security/modsecurity3
MODSECURITY3_GH_TUPLE= SpiderLabs:ModSecurity-nginx:ecb255a:modsec
MODSECURITY3_GH_TUPLE= SpiderLabs:ModSecurity-nginx:c6fd138:modsec
MODSECURITY3_CONFIGURE_ON= --add-module=${WRKSRC_modsec}
NAXSI_NGINX_VER= 0.56
@ -291,7 +291,7 @@ SMALL_LIGHT_VARS= DSO_EXTMODS+=small_light
SRCACHE_GH_TUPLE= openresty:srcache-nginx-module:v0.31:srcache
SRCACHE_VARS= DSO_EXTMODS+=srcache
VOD_GH_TUPLE= kaltura:nginx-vod-module:1.23:vod
VOD_GH_TUPLE= kaltura:nginx-vod-module:1.25:vod
VOD_USE= GNOME=libxml2
VOD_VARS= DSO_EXTMODS+=vod
VOD_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-nginx-vod-module-config \

10
www/nginx-devel/distinfo
View file

@ -1,4 +1,4 @@
TIMESTAMP = 1574281440
TIMESTAMP = 1576594040
SHA256 (nginx-1.17.6.tar.gz) = 3cb4a5314dc0ab0a4e8a7b51ae17c027133417a45cc6c5a96e3dd80141c237b6
SIZE (nginx-1.17.6.tar.gz) = 1037527
SHA256 (ngx_cache_purge-2.3.tar.gz) = 279e0d8a46d3b1521fd43b3f78bc1c08b263899142a7cc5058c1c0361a92c89c
@ -107,8 +107,8 @@ SHA256 (openresty-lua-nginx-module-v0.10.15_GH0.tar.gz) = 7d5f3439c8df56046d0564
SIZE (openresty-lua-nginx-module-v0.10.15_GH0.tar.gz) = 655110
SHA256 (openresty-memc-nginx-module-v0.19_GH0.tar.gz) = 8c2bdbe875e4f5225d0778bfb09a2668f9281d7de6218c7b462a7ba2cee06fe8
SIZE (openresty-memc-nginx-module-v0.19_GH0.tar.gz) = 34654
SHA256 (SpiderLabs-ModSecurity-nginx-ecb255a_GH0.tar.gz) = 5db295eec3936ab2bd519e13fad3bb48507ca22a6c0284a0d8dd3b07cfe8eec7
SIZE (SpiderLabs-ModSecurity-nginx-ecb255a_GH0.tar.gz) = 31087
SHA256 (SpiderLabs-ModSecurity-nginx-c6fd138_GH0.tar.gz) = ec25e9c3f37042e87ee1f55845b5dbb4509835c442cdf4f34c18dab3312a60e0
SIZE (SpiderLabs-ModSecurity-nginx-c6fd138_GH0.tar.gz) = 31935
SHA256 (nbs-system-naxsi-0.56_GH0.tar.gz) = 0a66dcadd32432460fab180be9f2efe24e911e3798917b2787ee710e02901eb4
SIZE (nbs-system-naxsi-0.56_GH0.tar.gz) = 192120
SHA256 (nginx-njs-0.3.7_GH0.tar.gz) = 4e1218ba3f3e9d15a700a12f202f8a8e812c8db588138c702bf03f967ca817fe
@ -133,8 +133,8 @@ SHA256 (cubicdaiya-ngx_small_light-v0.9.2_GH0.tar.gz) = 4cf660651d11330a13aab29e
SIZE (cubicdaiya-ngx_small_light-v0.9.2_GH0.tar.gz) = 56502
SHA256 (openresty-srcache-nginx-module-v0.31_GH0.tar.gz) = 3f9729e73a8340926fa9d9fc15707c2f287cd27b6a9fe42e83f660ca48a5972d
SIZE (openresty-srcache-nginx-module-v0.31_GH0.tar.gz) = 48310
SHA256 (kaltura-nginx-vod-module-1.23_GH0.tar.gz) = 800cf3de639567e27f4cb75527392f23842b349fb680abefd12d4db9a5be951f
SIZE (kaltura-nginx-vod-module-1.23_GH0.tar.gz) = 442053
SHA256 (kaltura-nginx-vod-module-1.25_GH0.tar.gz) = 42fd3b7f5bd4e13a7e27fcbd830153e285544c8cce37bfaea87cfce549f636d7
SIZE (kaltura-nginx-vod-module-1.25_GH0.tar.gz) = 446830
SHA256 (vozlt-nginx-module-vts-v0.1.18_GH0.tar.gz) = 17ea41d4083f6d1ab1ab83dad9160eeca66867abe16c5a0421f85a39d7c84b65
SIZE (vozlt-nginx-module-vts-v0.1.18_GH0.tar.gz) = 380327
SHA256 (tg123-websockify-nginx-module-e82d254_GH0.tar.gz) = 1ea0fd35e3bed61c822aa0bfb9329a38d908a602b78a5e5fef9c7e946a26de6b

4
www/nginx-devel/files/extra-patch-nginx-vod-module-config
View file

@ -1,5 +1,5 @@
--- ../nginx-vod-module-1.23/config.orig 2018-04-24 17:51:34.654430000 -0400
+++ ../nginx-vod-module-1.23/config 2018-04-24 18:10:13.517041000 -0400
--- ../nginx-vod-module-1.25/config.orig 2018-04-24 17:51:34.654430000 -0400
+++ ../nginx-vod-module-1.25/config 2018-04-24 18:10:13.517041000 -0400
@@ -154,8 +154,12 @@
ngx_feature_run=no
ngx_feature_incs="#include <libxml/parser.h>

20
www/nginx-devel/files/extra-patch-vod-filters-audio_encoder.c
View file

@ -1,20 +0,0 @@
--- ../nginx-vod-module-1.23/vod/filters/audio_encoder.c.orig 2018-05-13 10:05:51.704192000 -0400
+++ ../nginx-vod-module-1.23/vod/filters/audio_encoder.c 2018-05-13 10:08:30.590029000 -0400
@@ -100,7 +100,7 @@
encoder->channel_layout = params->channel_layout;
encoder->channels = params->channels;
encoder->bit_rate = params->bitrate;
- encoder->flags |= CODEC_FLAG_GLOBAL_HEADER; // make the codec generate the extra data
+ encoder->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; // make the codec generate the extra data
avrc = avcodec_open2(encoder, encoder_codec, NULL);
if (avrc < 0)
@@ -139,7 +139,7 @@
{
audio_encoder_state_t* state = context;
- if ((state->encoder->codec->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE) != 0)
+ if ((state->encoder->codec->capabilities & AV_CODEC_CAP_VARIABLE_FRAME_SIZE) != 0)
{
return 0;
}