From nobody Sun Jul 10 20:40:30 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 251D717FAF21; Sun, 10 Jul 2022 20:40:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LgzRg0bfLz3rwM; Sun, 10 Jul 2022 20:40:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657485631; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=afYKGBqEXSdx0kD7IPxY/QBxTLdND2T+vSID2ti1Hlo=; b=Rf5Rpz8sS7bfSRjg+tWNAedjnwUhNvbQ8taidcfZupP59aiWVVeDCnNQj1F7ZkTxCSJ1Dk WoQHABQaXpdekfQhnrHzEHn56YIGs2F+ncw0gNU0Yg/TlHbr6r1p5OCG4hC8vbrTVFMZ3W UHa68hZBkW3r2rh98bj0N9Hi1yImzRoNKzk+iKBm9SpzGuT5TSV1GtZngEG2A+uHC4ax1n Ib9Zyn1Zj1AAvKixrAb6KQfiCJZEXdCZ1OicLAcP0XnNirhyBMy4ud2I1RTyXACm6zkSea 6/BSXeph35jxCWnP0dfgU+MXF4YIciV3N/kvAn8hTF8860Dx1iwnndZbdtMyzw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4LgzRf6df8zd5g; Sun, 10 Jul 2022 20:40:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 26AKeUmn013258; Sun, 10 Jul 2022 20:40:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26AKeU3h013257; Sun, 10 Jul 2022 20:40:30 GMT (envelope-from git) Date: Sun, 10 Jul 2022 20:40:30 GMT Message-Id: <202207102040.26AKeU3h013257@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Sergey A. Osokin" Subject: git: 58a190479a5b - main - www/nginx-devel: update third-party vod module 1.29 -> 1.30 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: osa X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 58a190479a5be8119f0ac9694af6c9c88cdf7442 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657485631; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=afYKGBqEXSdx0kD7IPxY/QBxTLdND2T+vSID2ti1Hlo=; b=APa61Kp/uVQNqQnRQB+9azRFNbSGZYiWbYT5FRal25wHFFam/IU4ojbKhxITdotulxJwEY nP5ZPjWXPDXOoJ5fI2OsCRq+TV55FLL320nNOTXk7gdnozgMR+UloISXoonvFF6ABfxTHR s+9qDwmyijvAHiJshSBURbCzJv+csJxD5at6KNAJCU8UWPFIgN+5mBu7Ae/BT/4HLgCVXB SgAQvAg1bya7p5xHznEq9LQH9mFoRVoWrr5eq7hw6Hkdyq1XhrCGJ82CVe7rE4Xb0UHmA6 W2IyjfF6YltUeTBfqNewOLBbZ8g643QfqigFiKHqfHLAguvMYQywTnSl3wLTDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657485631; a=rsa-sha256; cv=none; b=Qk63Y88YOhYcqIaxZJfbYd9uiXl1F96xdIuzWxDmaMPaT/JeKSGSHFbWabsZRBkb6vT3E5 jHQh/Cpe8aFo1rkz7lf5gCjlBVU7zekZh4p/0TrQXfZHR4hUBe0Js8PSWYwm7WpQXOIORA l2o1UvOcQiXQoPaSAUuRprzjow9+UogTB+Yh4So2qulI9DSMSZgcWYav4iqvhFiiQS8cvJ 6DYiFDgNpQ5+/UosnSZRWPL6WgAT1SuiZ0qZgwR619Les8NzTk3v7ipciAd5NZc5P7ecSB X9UJlzRNtegthvdwTpFjlp7NB8jlxezBnrHq73QpYI252lH29P6Rn0tUlkQlbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=58a190479a5be8119f0ac9694af6c9c88cdf7442 commit 58a190479a5be8119f0ac9694af6c9c88cdf7442 Author: Sergey A. Osokin AuthorDate: 2022-07-10 20:39:24 +0000 Commit: Sergey A. Osokin CommitDate: 2022-07-10 20:39:24 +0000 www/nginx-devel: update third-party vod module 1.29 -> 1.30 Bump PORTREVISION. --- www/nginx-devel/Makefile | 5 ++--- www/nginx-devel/Makefile.extmod | 3 +-- www/nginx-devel/distinfo | 6 +++--- .../files/extra-patch-nginx-vod-module-config | 17 ----------------- 4 files changed, 6 insertions(+), 25 deletions(-) diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile index 0d94f81afdbb..80d545ea9653 100644 --- a/www/nginx-devel/Makefile +++ b/www/nginx-devel/Makefile @@ -2,7 +2,7 @@ PORTNAME?= nginx PORTVERSION= 1.23.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ LOCAL/osa @@ -254,8 +254,7 @@ NJS_CONFIGURE_ARGS= --no-pcre2 ${PORT_OPTIONS:MHTTP_UPSTREAM_STICKY} || \ ${PORT_OPTIONS:MHTTP_ZIP} || \ ${PORT_OPTIONS:MNAXSI} || \ - ${PORT_OPTIONS:MSRCACHE} || \ - ${PORT_OPTIONS:MVOD} + ${PORT_OPTIONS:MSRCACHE} IGNORE= a patch requires .endif diff --git a/www/nginx-devel/Makefile.extmod b/www/nginx-devel/Makefile.extmod index c8edbf55356b..f5a46eab37bc 100644 --- a/www/nginx-devel/Makefile.extmod +++ b/www/nginx-devel/Makefile.extmod @@ -311,12 +311,11 @@ SMALL_LIGHT_VARS= DSO_EXTMODS+=small_light SRCACHE_GH_TUPLE= openresty:srcache-nginx-module:v0.32:srcache SRCACHE_VARS= DSO_EXTMODS+=srcache -VOD_GH_TUPLE= kaltura:nginx-vod-module:1.29:vod +VOD_GH_TUPLE= kaltura:nginx-vod-module:1.30:vod VOD_LIB_DEPENDS= libxml2.so:textproc/libxml2 \ libavutil.so:multimedia/ffmpeg VOD_USES= iconv VOD_VARS= DSO_EXTMODS+=vod -VOD_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-nginx-vod-module-config VTS_GH_TUPLE= vozlt:nginx-module-vts:v0.1.18:vts VTS_VARS= DSO_EXTMODS+=vts diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo index c5d0558cf011..ea3f27efbfa4 100644 --- a/www/nginx-devel/distinfo +++ b/www/nginx-devel/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1657479744 +TIMESTAMP = 1657485370 SHA256 (nginx-1.23.0.tar.gz) = 820acaa35b9272be9e9e72f6defa4a5f2921824709f8aa4772c78ab31ed94cd1 SIZE (nginx-1.23.0.tar.gz) = 1102940 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae @@ -135,8 +135,8 @@ SHA256 (kawakibi-ngx_small_light-2f5e1d0_GH0.tar.gz) = bb7b4943a2db89a6a7020850d SIZE (kawakibi-ngx_small_light-2f5e1d0_GH0.tar.gz) = 57160 SHA256 (openresty-srcache-nginx-module-v0.32_GH0.tar.gz) = fd80e59b672e4ff3b4e943740b3facab421c6965226b5934aed16a514baacf47 SIZE (openresty-srcache-nginx-module-v0.32_GH0.tar.gz) = 49891 -SHA256 (kaltura-nginx-vod-module-1.29_GH0.tar.gz) = 775898874367900f14b6197366501c782e8c86dd2b0c3cc45973abf4e8a9217c -SIZE (kaltura-nginx-vod-module-1.29_GH0.tar.gz) = 469764 +SHA256 (kaltura-nginx-vod-module-1.30_GH0.tar.gz) = db1a7b31b4109eff32519f6624eaa54815db79f8e8b671bd24e5906ea5b3b905 +SIZE (kaltura-nginx-vod-module-1.30_GH0.tar.gz) = 470262 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-c11bc9a_GH0.tar.gz) = aca454bffcee2476dc92682ebfb8c0378a271fda178be7e945d648419d220758 diff --git a/www/nginx-devel/files/extra-patch-nginx-vod-module-config b/www/nginx-devel/files/extra-patch-nginx-vod-module-config deleted file mode 100644 index 5de5f30201aa..000000000000 --- a/www/nginx-devel/files/extra-patch-nginx-vod-module-config +++ /dev/null @@ -1,17 +0,0 @@ ---- ../nginx-vod-module-1.29/config.orig 2018-04-24 17:51:34.654430000 -0400 -+++ ../nginx-vod-module-1.29/config 2018-04-24 18:10:13.517041000 -0400 -@@ -154,8 +154,12 @@ - ngx_feature_run=no - ngx_feature_incs="#include - #include " --ngx_feature_path="/usr/include/libxml2" --ngx_feature_libs="-lxml2" -+ngx_feature_path="%%PREFIX%%/include/libxml2 %%PREFIX%%/include" -+if [ $NGX_RPATH = YES ]; then -+ ngx_feature_libs="-R%%PREFIX%%/lib -L%%PREFIX%%/lib -lxml2 -lxslt" -+else -+ ngx_feature_libs="-L%%PREFIX%%/lib -lxml2 -lxslt" -+fi - ngx_feature_test="xmlReadMemory(NULL, 0, NULL, NULL, 0);" - . auto/feature -