From nobody Mon Nov 06 21:14:45 2023 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 4SPPHn47Wrz50B8T; Mon, 6 Nov 2023 21:14:45 +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 4SPPHn3gcDz3ZK3; Mon, 6 Nov 2023 21:14:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699305285; 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=m8KOv/fe5h44qZNRbI7ttU8neWmGj+Z/Aza6g2gIA7s=; b=E7tKBTRqCqM7v6NLglTVufVdh/6w2J72zkGsCE3U30l3xWXJlcXCyh9c9eSSN9KNUuO8kA P8BUizlheXGb4ipfKWHnN/cyy4gt96wykVfX9EEqg6AD9lfnD3/9I7bwZLx1N6pmIo4D6o 2EJo4fbqez5NqMGS8ZoZauHanye/ZSWVvAkyZcgz9SOlc5CgNX+2P5uoqW9pK32d6jyfKQ m6BnqtJ4WJogaF7wVAwJ7V3JetGntkgCu5pk13EO6TcqxDYBSmNtMeJzd31mjHkW7Ru9LK PJS+xD++kWm2vGi7IfYMn4JlwiJ8Es8gL9YQmMVoibqkLbRJAPWdqCKg3F2K0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699305285; 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=m8KOv/fe5h44qZNRbI7ttU8neWmGj+Z/Aza6g2gIA7s=; b=mIbEbhDG95NlIMB794cnMUg4S73WCVzY9pMUBiDiMv5bDS97T7P3yEIfRsDpRr3v3zabcM baVzY74T+i9HM3SeCGSHPg/7fc4um5QJ31iKXVuNyusDiKc2HWSQUuVE3fy3hcaNgy1m5o /XsOnZT8IcEzV+MhZKcW2Hoh8pnUY32D/DLMJFB8X9j+4rj7CKGQlfjYZV8I5MFGrxUbT6 JsWMACtFve7xIbMs8czxnMEujEG7SU8CZ4heRfSzqJo5+XZzQFiCeM4fSkIydtMfFYy+zx t/CFuZxWyVHV9joqW6lFWZfcWZc8TcyHwUgx8VdI12rW6kgJlIxkaNKdQr1PqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699305285; a=rsa-sha256; cv=none; b=Bq2Ret4uvgSjDIyPMn0ruAugSxcmp8uVRjb/7P/F0dkclToJJExJrJZoGF2BDbjuJrAY6U VQHR/vEecrrWXZt/pz00SZPwTE1rf5gf4mlQ24OuMw3UlUmyEb+Rjfphi24NBkw6PhSXk/ 1ONbXvWKqVLVd49KoR+0jP8BH2f2HQhxoYS0lVqtLitfgs3EuVP4gj+M18amsOQXeAvwEV zZvIh/1vhoRri6M2hkJntK5YY1vSpxtwfou6M1waiZfntD7xakGaqpI+VsdJ0W38uoPoHY nCMgffMMf/9S2gNGbOmQMFECk0LwWwOHr/vdoMByCEjjFAS0agwREn2bLsn7Cg== 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 4SPPHn2kr6z7rD; Mon, 6 Nov 2023 21:14:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A6LEjU1011321; Mon, 6 Nov 2023 21:14:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A6LEjc4011318; Mon, 6 Nov 2023 21:14:45 GMT (envelope-from git) Date: Mon, 6 Nov 2023 21:14:45 GMT Message-Id: <202311062114.3A6LEjc4011318@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: 80656e393399 - main - net/ntopng: Fix OpenSSL support in embedded webserver 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: 80656e393399a82da0db224a847b221034748cc3 Auto-Submitted: auto-generated The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=80656e393399a82da0db224a847b221034748cc3 commit 80656e393399a82da0db224a847b221034748cc3 Author: Guido Falsi AuthorDate: 2023-11-06 21:12:59 +0000 Commit: Guido Falsi CommitDate: 2023-11-06 21:12:59 +0000 net/ntopng: Fix OpenSSL support in embedded webserver PR: 274925 --- net/ntopng/Makefile | 1 + net/ntopng/files/patch-configure.ac.in | 18 +++++++++--------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/net/ntopng/Makefile b/net/ntopng/Makefile index 4abb1dff0402..3123823a03f5 100644 --- a/net/ntopng/Makefile +++ b/net/ntopng/Makefile @@ -1,5 +1,6 @@ PORTNAME= ntopng PORTVERSION= 6.0.d20231103 +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 2efdccd10217..ccb3bc112353 100644 --- a/net/ntopng/files/patch-configure.ac.in +++ b/net/ntopng/files/patch-configure.ac.in @@ -90,15 +90,13 @@ if test ! -z "$NDPI_CUST_INC" ; then : NDPI_INC=$NDPI_CUST_INC fi -@@ -339,46 +295,9 @@ AC_ARG_WITH(json-c-static, +@@ -339,45 +295,10 @@ AC_ARG_WITH(json-c-static, [PKG_CHECK_MODULES(JSON, json-c, [], [AC_MSG_ERROR(Please install libjson-c-dev package prerequisite)])] ) -if test -x /bin/freebsd-version; then - FREEBSD_VERSION=`freebsd-version | cut -f 1 -d '.'` -fi -+SSL_INC="-I%%SSL_INC%%" -+SSL_LIB="-L%%SSL_LIB%% -lssl -lcrypto" -if test "${FREEBSD_VERSION}" != "14"; then -pkg-config --exists libssl @@ -135,11 +133,13 @@ - fi -fi -fi -- ++AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl]) ++SSL_INC="-I%%SSL_INC%%" ++SSL_LIB="-L%%SSL_LIB%% -lssl -lcrypto" + AC_MSG_CHECKING([PF_RING nBPF]) NBPF_HOME=${PWD}/../PF_RING/userland/nbpf - LIBNBPF=${NBPF_HOME}/libnbpf.a -@@ -510,12 +429,8 @@ AS_VAR_IF(with_hiredis, yes, [ +@@ -510,12 +431,8 @@ AS_VAR_IF(with_hiredis, yes, [ pkg-config --exists hiredis if test "$?" -ne 1; then HIREDIS_INC="`pkg-config --cflags hiredis` -I/usr/include/hiredis" @@ -153,7 +153,7 @@ echo "Please install hiredis package prerequisite" exit -1 fi -@@ -533,14 +448,14 @@ if test "${with_nedge+set}" != set; then +@@ -533,14 +450,14 @@ if test "${with_nedge+set}" != set; then fi if test $SYSTEM = "FreeBSD"; then @@ -170,7 +170,7 @@ AC_DEFINE_UNQUOTED(HAVE_PF_RING, 1, [Native PF_RING support]) if test -f "${PF_RING_HOME}/userland/lib/libpfring.a"; then echo "${PF_RING_HOME}/userland/libpcap/libpcap.a" -@@ -560,18 +475,18 @@ if test "${with_nedge+set}" != set; then +@@ -560,18 +477,18 @@ if test "${with_nedge+set}" != set; then CXXFLAGS="${CXXFLAGS} -I/opt/pfring/include" echo "Using PF_RING installed in /opt/pfring" else @@ -195,7 +195,7 @@ echo "Please make sure you have installed your PF_RING libraries and try again" exit 1 fi -@@ -756,14 +671,12 @@ else +@@ -756,14 +673,12 @@ else echo "Building without support for MySQL libraries." fi else