From nobody Thu Mar 24 23:48:56 2022 X-Original-To: dev-commits-ports-all@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 7AB9B1A4442B; Thu, 24 Mar 2022 23:48:58 +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 4KPhky027hz3DFx; Thu, 24 Mar 2022 23:48:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648165738; 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=V7CsljVprygx1/eI9OR1QetNmSLAoGoIgQqctrZfRdA=; b=ORTZ+x7sUjBW3wSS2LGgPgrrDVS2M7Q61tTX8DObz0UETmo1liUOsTVpm7f74iiKwisTw7 LRwVB4sBj5jbCRF2byOuZ1lkgaTl+0QXCmwa0h9+Ja888T4g6oXHhio1UMsy3mrSmWz7jL OjwKegDw/AUQOdZsVm4UqSFxcsBzEbdlI7ORdWuAH7M3xHrf+JJJ0dd8WqiQWBHRFrfKbG 5d8WQpb7+R9v7aFx5KlsrRMreoRof81WvYaul90/OgWc/Zmv+R5H6NjPP2w0Ly+j5xPeUy W5/eNkzCZdlJL/D1gld1HQpLw6hbHsJlQQ88zwCxXM1VJkZ6MgCFRCTpSkVZTg== 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 E4A9621377; Thu, 24 Mar 2022 23:48:56 +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 22ONmuDv085453; Thu, 24 Mar 2022 23:48:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22ONmuOv085452; Thu, 24 Mar 2022 23:48:56 GMT (envelope-from git) Date: Thu, 24 Mar 2022 23:48:56 GMT Message-Id: <202203242348.22ONmuOv085452@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guido Falsi Subject: git: 66e6345cf99e - main - net/ntopng,net/ndpi: Fix build due to missing symbols in certain circumstances List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: madpilot X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 66e6345cf99ecb76939beba0b008e704fc7dcf5f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648165738; 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=V7CsljVprygx1/eI9OR1QetNmSLAoGoIgQqctrZfRdA=; b=C/7Q1uxK2rd6xqkEZaheve0V9yBZW8d6RECkm+EUEt4X0ZLNMDPvRangD7Dgt8prfaDKi4 OM+l/Tt6+qggKhf6/WYdi/f1z1bc0Yio+LvHDZK4wPkbYUoaPT0bj9KtFyYIMrisnpqgis n3unsfww9VulGLU9k9o3Cy+4G49KzRBHlTgw56xBCc6HNm28huulIpX4n+MzZcr4K9mT9t Oe4BNYJpW4WezU+8urEv54kW8FroRhIkAsDjwx2qa1b92sEY+86JeRRubUGfyRmeBJUii8 riMVvpS1FeWASJksDz2o1lVGtMSlG/bbvU0TxCkXiBtJhVYDV3p4P4vhO9WnNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648165738; a=rsa-sha256; cv=none; b=Ys+ns8xtjfRC3PBUauKMFy8bnRwtMeRyNCdxI2yUl5JkUKcYWiBhq3QBFNdGm8Lh+ik31I 6LfestsbcTBzDGZrpzyIuV7LG3afXxr6/kj6Wy4q3RF3XVDwiu3I1amFORi0hxVjDVzzNA Ug65Eshvn5HdMFdjoFECjOS4cu6lxwxg092cNzGGKMqmNF5m+PG4x7NrTrZkeyMQROImFX FMr5a2AMuaNGLFew4Jg6defV+f/d1Xg1tJ7ObZM3gFTckzWL9c+Y3ujYpL996Tu7lbj2rg dGd0aq1Dx/TN0cEonp31G/3p3mV/tP1+Agq9GZlrAVk9BOIlrzam4xfHrtdZ2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=66e6345cf99ecb76939beba0b008e704fc7dcf5f commit 66e6345cf99ecb76939beba0b008e704fc7dcf5f Author: Guido Falsi AuthorDate: 2022-03-24 23:46:14 +0000 Commit: Guido Falsi CommitDate: 2022-03-24 23:48:47 +0000 net/ntopng,net/ndpi: Fix build due to missing symbols in certain circumstances When building on live machines when rrdtool happens to be already present, which often happens automatically due to the order in which the ports system builds things locally, the ntopng port could fail due to unreferenced symbols from glib. This was caused by ntopng trying to unconditionally link statically to ndpi but not providing all required static libraries references to the command line. - Add databases/rrdtool dependency in ndpi to ensure the same libraries are used in both ports - Make ntopng unconditionally use dynamic linking for ndpi too, avoiding the issue described above. PR: 262756 --- net/ndpi/Makefile | 4 +++- net/ntopng/Makefile | 1 + net/ntopng/files/patch-configure.ac.in | 13 ++++++++++++- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/net/ndpi/Makefile b/net/ndpi/Makefile index be5586355e87..bf446f5a7baa 100644 --- a/net/ndpi/Makefile +++ b/net/ndpi/Makefile @@ -2,6 +2,7 @@ PORTNAME= ndpi PORTVERSION= 4.2.d20220210 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= net @@ -11,7 +12,8 @@ COMMENT= NTOP-maintained superset of the popular OpenDPI library LICENSE= LGPL3+ LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libjson-c.so:devel/json-c \ +LIB_DEPENDS= librrd.so:databases/rrdtool \ + libjson-c.so:devel/json-c \ libgcrypt.so:security/libgcrypt \ libgpg-error.so:security/libgpg-error diff --git a/net/ntopng/Makefile b/net/ntopng/Makefile index 0152a1c83dab..3c147efe9b1b 100644 --- a/net/ntopng/Makefile +++ b/net/ntopng/Makefile @@ -2,6 +2,7 @@ PORTNAME= ntopng PORTVERSION= 5.2.d20220314 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= net diff --git a/net/ntopng/files/patch-configure.ac.in b/net/ntopng/files/patch-configure.ac.in index 6beddc465a27..e004ff597172 100644 --- a/net/ntopng/files/patch-configure.ac.in +++ b/net/ntopng/files/patch-configure.ac.in @@ -1,5 +1,16 @@ ---- configure.ac.in.orig 2022-02-08 09:52:25 UTC +--- configure.ac.in.orig 2022-03-14 16:15:57 UTC +++ configure.ac.in +@@ -236,8 +236,8 @@ PKG_CHECK_MODULES([NDPI], [libndpi >= 2.0], [ + PKG_CHECK_MODULES([NDPI], [libndpi >= 2.0], [ + NDPI_INC=`echo $NDPI_CFLAGS | sed -e "s/[ ]*$//"` + # Use static libndpi library as building against the dynamic library fails +- NDPI_LIB="-Wl,-Bstatic $NDPI_LIBS -Wl,-Bdynamic" +- #NDPI_LIB="$NDPI_LIBS" ++ #NDPI_LIB="-Wl,-Bstatic $NDPI_LIBS -Wl,-Bdynamic" ++ NDPI_LIB="$NDPI_LIBS" + NDPI_LIB_DEP= + ], [ + AC_MSG_CHECKING(for nDPI source) @@ -444,7 +444,7 @@ if test "${with_nedge+set}" != set; then PF_RING_HOME=${HOME}/PF_RING