From nobody Wed Oct 25 08:15:40 2023 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 4SFhZN5vDPz4yBrb; Wed, 25 Oct 2023 08:15:40 +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 4SFhZN5MBGz3DjX; Wed, 25 Oct 2023 08:15:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698221740; 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=6D1oOwwSNTSNcZR8DomaCX/BJO5G0GoFacujDoxeuNE=; b=Mo5EFqEMbjakguSHzNYTAXDOqROmEjDab5OOzTsDLBSKkrg06jJ2l7TRmfH67E3ztyOxGb 84XMTjU/wgAfWoJdsNd5ks07JlP0GDLC3IfslLwbojXeBcnlmoIJXXoZn1dprm1MsBeMMq kNzG5jWhEBEy8dVfbvOHSGLZjAAmeuYvYzE4rqCGLFsLL6ZcZWeYBo0VfuSU7QdxgOB42u 9GN/+UhApnriAFDtyhEr4NW6Y4CLAuDFt1TnSDcbAca/wX54Q+WRDAIWrLV17tLVTmioLx xiDlZpZnvYrL6+e09by+4gvVRuOADbqBJMWpenKXwqpdzPJ1/h5RSgzYsau2QA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698221740; a=rsa-sha256; cv=none; b=sR36lexxErObZI2iP7qnkyCPq2LvmDYhSBlkQIqK8IKxPphOp51jEXKAfKhZbKf9pvIQ5q qaeaC8F6qKolLf5XWG8qADImrlBEaS2Ak0taZ7/6x+QlU6cUemsXqTv+EMxE9xetiFU6bi blNeL9c6zhEQfDcrkP0b+b5uB7E4u8ZD6UOtTypOjRIR5OKH6O12j5MH/S+Ge2acrPGX5i tnOAwMSDbHgynXLp5jZ3Pok/CrDGcXrF4rUerlGVSh3scTd5HiQHqDrzjY53ThyRWK0uvB pXus692vdmXxYUNrkqLKxSf4RN4rT7RWxHsbyRKERykXlIwfM0wGWSMR0IdCwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698221740; 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=6D1oOwwSNTSNcZR8DomaCX/BJO5G0GoFacujDoxeuNE=; b=Ixs3rUbWbQ8MPJlzTzxNpEiM92/fPkoBpknuRMTduSQlQIUcv+7RcoynFUf2I/vmCvLJ2c HtWI5IfTLM4tg04hwNVgO/db7P7F+n2uTfy8+kXURa1g7XheDlaDCBYzc5nhlNAiCN1ODg 6N2yjky5oMVxonDniLdLqGm+sLYTa5Qt+MB7jlxHRlSZmNt8CadipNqVPNIg+JPLTkzPyd 92pw0uK59/X6Q6dM+4Y7qKQ/zojQPHhnnjHdgExWD+YfB2oevIdwJozmSNG42IhGbypDl5 HwxAEpkc+VA0AG0Upvg4Sig3ckds2io9fuwUlPxmQQq4h72lRt8sb1NCGFsGog== 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 4SFhZN4P8Dzxlp; Wed, 25 Oct 2023 08:15:40 +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 39P8FeDJ056734; Wed, 25 Oct 2023 08:15:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39P8Fel9056731; Wed, 25 Oct 2023 08:15:40 GMT (envelope-from git) Date: Wed, 25 Oct 2023 08:15:40 GMT Message-Id: <202310250815.39P8Fel9056731@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: 00ddd77ed36c - main - net/ndpi: Update to new 4.8 branch 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: madpilot X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 00ddd77ed36ccce9eec5d5ccabab23d8295a3056 Auto-Submitted: auto-generated The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=00ddd77ed36ccce9eec5d5ccabab23d8295a3056 commit 00ddd77ed36ccce9eec5d5ccabab23d8295a3056 Author: Guido Falsi AuthorDate: 2023-10-25 08:14:34 +0000 Commit: Guido Falsi CommitDate: 2023-10-25 08:14:34 +0000 net/ndpi: Update to new 4.8 branch --- net/ndpi/Makefile | 10 +++++----- net/ndpi/distinfo | 6 +++--- net/ndpi/files/patch-example_Makefile.in | 14 +++++++++++--- net/ndpi/files/patch-src_lib_Makefile.in | 22 ++++++++++------------ 4 files changed, 29 insertions(+), 23 deletions(-) diff --git a/net/ndpi/Makefile b/net/ndpi/Makefile index ca920d17c387..d4c5ace782c0 100644 --- a/net/ndpi/Makefile +++ b/net/ndpi/Makefile @@ -1,5 +1,5 @@ PORTNAME= ndpi -PORTVERSION= 4.6.d20230510 +PORTVERSION= 4.8.d20231023 PORTEPOCH= 1 CATEGORIES= net @@ -21,16 +21,16 @@ CPE_VENDOR= ntop USE_LDCONFIG= yes CONFIGURE_ARGS= --with-pic --with-local-libgcrypt -CPPFLAGS+= -I${LOCALBASE}/include/json-c -LIBS+= -ljson-c -MAKE_ENV+= EXAMPLESDIR="${EXAMPLESDIR_REL}" +CPPFLAGS= -I${LOCALBASE}/include/json-c +LIBS= -ljson-c +MAKE_ENV= EXAMPLESDIR="${EXAMPLESDIR_REL}" GNU_CONFIGURE= yes INSTALL_TARGET= install-strip USE_GITHUB= yes GH_ACCOUNT= ntop GH_PROJECT= nDPI -GH_TAGNAME= 4432e5b +GH_TAGNAME= b328916 PLIST_SUB= MAJOR_VER=${PORTVERSION:R:R} VER=${PORTVERSION:R} diff --git a/net/ndpi/distinfo b/net/ndpi/distinfo index 6f4ce70f53c5..48e9aa3557e8 100644 --- a/net/ndpi/distinfo +++ b/net/ndpi/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1686152228 -SHA256 (ntop-nDPI-4.6.d20230510-4432e5b_GH0.tar.gz) = 683bffed1ac54b54340ea4babd00171efcbcea6b81ebc2e3ad005e3ee6a8da7d -SIZE (ntop-nDPI-4.6.d20230510-4432e5b_GH0.tar.gz) = 29720730 +TIMESTAMP = 1698154698 +SHA256 (ntop-nDPI-4.8.d20231023-b328916_GH0.tar.gz) = 0ef6805c72ca6f87ec6d2c43e5289e014eeb7cfb48828243202193455fd06522 +SIZE (ntop-nDPI-4.8.d20231023-b328916_GH0.tar.gz) = 39479352 diff --git a/net/ndpi/files/patch-example_Makefile.in b/net/ndpi/files/patch-example_Makefile.in index afac677a898a..64aa6fdc0624 100644 --- a/net/ndpi/files/patch-example_Makefile.in +++ b/net/ndpi/files/patch-example_Makefile.in @@ -1,6 +1,14 @@ ---- example/Makefile.in.orig 2023-02-01 17:29:59 UTC +--- example/Makefile.in.orig 2023-10-23 09:45:30 UTC +++ example/Makefile.in -@@ -6,46 +6,23 @@ SRCHOME=../src +@@ -1,54 +1,28 @@ CXX=@CXX@ + AR=@AR@ + CC=@CC@ + CXX=@CXX@ +-ifeq ($(OS),Darwin) +-CC=clang -fno-color-diagnostics +-endif + BUILD_MINGW=@BUILD_MINGW@ + BUILD_MINGW_X64=@BUILD_MINGW_X64@ DISABLE_NPCAP=@DISABLE_NPCAP@ EXE_SUFFIX=@EXE_SUFFIX@ SRCHOME=../src @@ -50,7 +58,7 @@ libndpiReader.a: $(COMMON_SOURCES:%.c=%.o) $(LIBNDPI) $(AR) rsv libndpiReader.a $(COMMON_SOURCES:%.c=%.o) -@@ -61,10 +38,10 @@ install: ndpiReader$(EXE_SUFFIX) +@@ -64,10 +38,10 @@ install: ndpiReader$(EXE_SUFFIX) install: ndpiReader$(EXE_SUFFIX) mkdir -p $(DESTDIR)$(PREFIX)/bin/ diff --git a/net/ndpi/files/patch-src_lib_Makefile.in b/net/ndpi/files/patch-src_lib_Makefile.in index e27fd4ca157b..698cb08beee8 100644 --- a/net/ndpi/files/patch-src_lib_Makefile.in +++ b/net/ndpi/files/patch-src_lib_Makefile.in @@ -1,6 +1,4 @@ -- /bin/rm -f libndpi.a $(OBJECTS) -new file mode 100644 ---- src/lib/Makefile.in.orig 2023-02-01 17:29:59 UTC +--- src/lib/Makefile.in.orig 2023-10-23 09:45:30 UTC +++ src/lib/Makefile.in @@ -14,15 +14,12 @@ includedir = @includedir@/ndpi PREFIX = @prefix@ @@ -9,19 +7,19 @@ new file mode 100644 -ifneq ($(OS),Windows_NT) -CFLAGS += -fPIC -DPIC -endif --CFLAGS += -I../include -Ithird_party/include -DNDPI_LIB_COMPILATION @NDPI_CFLAGS@ @GPROF_CFLAGS@ @CUSTOM_NDPI@ @ADDITIONAL_INCS@ +-CFLAGS += -I. -I../include -Ithird_party/include -DNDPI_LIB_COMPILATION @NDPI_CFLAGS@ @GPROF_CFLAGS@ @CUSTOM_NDPI@ @ADDITIONAL_INCS@ +CFLAGS += -fPIC -DPIC -I../include -Ithird_party/include -DNDPI_LIB_COMPILATION @NDPI_CFLAGS@ @CFLAGS@ @GPROF_CFLAGS@ @CUSTOM_NDPI@ @ADDITIONAL_INCS@ LDFLAGS += @NDPI_LDFLAGS@ LIBS = @ADDITIONAL_LIBS@ @LIBS@ @GPROF_LIBS@ --OBJECTS = $(patsubst protocols/%.c, protocols/%.o, $(wildcard protocols/*.c)) $(patsubst third_party/src/%.c, third_party/src/%.o, $(wildcard third_party/src/*.c)) $(patsubst ./%.c, ./%.o, $(wildcard ./*.c)) --HEADERS = $(wildcard ../include/*.h) -+OBJECTS != ls protocols/*.c | sed 's/\(.*\)\.c$$/\1.o/' && ls third_party/src/*.c | sed -e 's/\(.*\)\.c$$/\1.o/' -e '/gcrypt_light/d' && ls ./*.c | sed 's/\(.*\)\.c$$/\1.o/' -+HEADERS != ls ../include/*.h +-OBJECTS = $(patsubst protocols/%.c, protocols/%.o, $(wildcard protocols/*.c)) $(patsubst third_party/src/%.c, third_party/src/%.o, $(wildcard third_party/src/*.c)) $(patsubst third_party/src/hll/%.c, third_party/src/hll/%.o, $(wildcard third_party/src/hll/*.c)) $(patsubst ./%.c, ./%.o, $(wildcard ./*.c)) +-HEADERS = $(wildcard ../include/*.h) $(wildcard ../include/*.h) ++OBJECTS != ls protocols/*.c | sed 's/\(.*\)\.c$$/\1.o/' && ls third_party/src/*.c | sed -e 's/\(.*\)\.c$$/\1.o/' -e '/gcrypt_light/d' && ls third_party/src/hll/*.c | sed -e 's/\(.*\)\.c$$/\1.o/' && ls ./*.c | sed 's/\(.*\)\.c$$/\1.o/' ++HEADERS != ls ../include/*.h NDPI_VERSION_MAJOR = @NDPI_MAJOR@ NDPI_LIB_STATIC = libndpi.a NDPI_LIB_SHARED_BASE = libndpi.so -@@ -30,27 +27,9 @@ USE_HOST_LIBGCRYPT = @USE_HOST_LIBGCRYPT@ +@@ -30,27 +27,7 @@ USE_HOST_LIBGCRYPT = @USE_HOST_LIBGCRYPT@ NDPI_LIBS = $(NDPI_LIB_STATIC) $(NDPI_LIB_SHARED) USE_HOST_LIBGCRYPT = @USE_HOST_LIBGCRYPT@ @@ -34,16 +32,16 @@ new file mode 100644 -OS := $(shell uname) -endif BUILD_MINGW = @BUILD_MINGW@ - +- -ifeq ($(OS),Darwin) --CC=clang +-CC=clang -fno-color-diagnostics -SONAME_FLAG= -else -ifneq ($(BUILD_MINGW),) -NDPI_LIB_SHARED_BASE = libndpi -NDPI_LIB_SHARED = $(NDPI_LIB_SHARED_BASE)-@NDPI_VERSION_SHORT@.dll -else - SONAME_FLAG=-Wl,-soname,$(NDPI_LIB_SHARED_BASE).$(NDPI_VERSION_MAJOR) +-SONAME_FLAG=-Wl,-soname,$(NDPI_LIB_SHARED_BASE).$(NDPI_VERSION_MAJOR) -endif -endif