From owner-svn-ports-all@freebsd.org Mon Jan 25 18:04:31 2021 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0EF584EB09A; Mon, 25 Jan 2021 18:04:31 +0000 (UTC) (envelope-from madpilot@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 4DPd6k6zLkz4mw3; Mon, 25 Jan 2021 18:04:30 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E28481AF91; Mon, 25 Jan 2021 18:04:30 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 10PI4Ud4052543; Mon, 25 Jan 2021 18:04:30 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 10PI4UT8052540; Mon, 25 Jan 2021 18:04:30 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <202101251804.10PI4UT8052540@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Mon, 25 Jan 2021 18:04:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r562594 - in branches/2021Q1/net: ndpi ntopng ntopng/files X-SVN-Group: ports-branches X-SVN-Commit-Author: madpilot X-SVN-Commit-Paths: in branches/2021Q1/net: ndpi ntopng ntopng/files X-SVN-Commit-Revision: 562594 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Jan 2021 18:04:31 -0000 Author: madpilot Date: Mon Jan 25 18:04:29 2021 New Revision: 562594 URL: https://svnweb.freebsd.org/changeset/ports/562594 Log: MFH: r562593 - Add unconditional dependency on gcrypt and libgpg-error to ndpi and ntopng to ensure full feature set [1] - Patch ntopng to link correctly with libgcrypt - While here, update ntopng to latest upstream snapshot PR: 252935 [1] Submitted by: Franco Fichtner Modified: branches/2021Q1/net/ndpi/Makefile branches/2021Q1/net/ntopng/Makefile branches/2021Q1/net/ntopng/distinfo branches/2021Q1/net/ntopng/files/patch-configure.seed Directory Properties: branches/2021Q1/ (props changed) Modified: branches/2021Q1/net/ndpi/Makefile ============================================================================== --- branches/2021Q1/net/ndpi/Makefile Mon Jan 25 18:03:29 2021 (r562593) +++ branches/2021Q1/net/ndpi/Makefile Mon Jan 25 18:04:29 2021 (r562594) @@ -3,6 +3,7 @@ PORTNAME= ndpi PORTVERSION= 3.4.d20201222 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= net @@ -12,7 +13,9 @@ COMMENT= NTOP-maintained superset of the popular OpenD LICENSE= LGPL3+ LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libjson-c.so:devel/json-c +LIB_DEPENDS= libjson-c.so:devel/json-c \ + libgcrypt.so:security/libgcrypt \ + libgpg-error.so:security/libgpg-error USES= autoreconf compiler:c++11-lang libtool localbase:ldflags pathfix \ pkgconfig Modified: branches/2021Q1/net/ntopng/Makefile ============================================================================== --- branches/2021Q1/net/ntopng/Makefile Mon Jan 25 18:03:29 2021 (r562593) +++ branches/2021Q1/net/ntopng/Makefile Mon Jan 25 18:04:29 2021 (r562594) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= ntopng -PORTVERSION= 4.2.d20201228 +PORTVERSION= 4.2.d20210122 PORTEPOCH= 1 CATEGORIES= net @@ -20,7 +20,9 @@ LIB_DEPENDS= librrd.so:databases/rrdtool \ libsodium.so:security/libsodium \ libmaxminddb.so:net/libmaxminddb \ libexpat.so:textproc/expat2 \ - libzstd.so:archivers/zstd + libzstd.so:archivers/zstd \ + libgcrypt.so:security/libgcrypt \ + libgpg-error.so:security/libgpg-error BUILD_DEPENDS= bash:shells/bash USES= autoreconf compiler:c++11-lang cpe gmake libtool localbase \ @@ -38,7 +40,7 @@ PLIST_SUB= NTOPNGUSER="${USERS}" NTOPNGROUP="${GROUPS} USE_GITHUB= yes GH_ACCOUNT= ntop -GH_TAGNAME= d2f4f8f +GH_TAGNAME= e91b1b5 CPE_VENDOR= ntop Modified: branches/2021Q1/net/ntopng/distinfo ============================================================================== --- branches/2021Q1/net/ntopng/distinfo Mon Jan 25 18:03:29 2021 (r562593) +++ branches/2021Q1/net/ntopng/distinfo Mon Jan 25 18:04:29 2021 (r562594) @@ -1,3 +1,3 @@ -TIMESTAMP = 1609190757 -SHA256 (ntop-ntopng-4.2.d20201228-d2f4f8f_GH0.tar.gz) = 041547feccd82237d3e8df0a75b163a9712248675a4d8117983719ffc5e61bd8 -SIZE (ntop-ntopng-4.2.d20201228-d2f4f8f_GH0.tar.gz) = 57560717 +TIMESTAMP = 1611571552 +SHA256 (ntop-ntopng-4.2.d20210122-e91b1b5_GH0.tar.gz) = cab743b41b2db631d3134e6745f8328261b13c0cb5cda3d9260fd26ae712f39e +SIZE (ntop-ntopng-4.2.d20210122-e91b1b5_GH0.tar.gz) = 57562463 Modified: branches/2021Q1/net/ntopng/files/patch-configure.seed ============================================================================== --- branches/2021Q1/net/ntopng/files/patch-configure.seed Mon Jan 25 18:03:29 2021 (r562593) +++ branches/2021Q1/net/ntopng/files/patch-configure.seed Mon Jan 25 18:04:29 2021 (r562594) @@ -1,4 +1,4 @@ ---- configure.seed.orig 2020-11-02 21:27:19 UTC +--- configure.seed.orig 2021-01-22 10:38:16 UTC +++ configure.seed @@ -4,7 +4,7 @@ dnl> Do not add anything above @@ -44,6 +44,15 @@ SHORT_MACHINE=`uname -m | cut -b1-3` GIT_RELEASE="@GIT_RELEASE@" +@@ -233,7 +208,7 @@ else + fi + fi + +-AC_CHECK_LIB([gcrypt], [gcry_cipher_checktag], [LDFLAGS="${LDFLAGS} -lgcrypt"]) ++AC_CHECK_LIB([gcrypt], [gcry_cipher_checktag], [LDFLAGS="${LDFLAGS} -lgcrypt -lgpg-error"]) + + AC_MSG_CHECKING(for ntopng professional edition) + @@ -678,16 +653,6 @@ AC_DEFINE_UNQUOTED(_CRT_SECURE_NO_WARNINGS, 1, [Disabl GMAKE=`which gmake` if test x$GMAKE = x; then