Index: head/net/ndpi/Makefile =================================================================== --- head/net/ndpi/Makefile (revision 562592) +++ head/net/ndpi/Makefile (revision 562593) @@ -1,53 +1,56 @@ # Created by: Muhammad Moinur Rahman <5u623l20@gmail.com> # $FreeBSD$ PORTNAME= ndpi PORTVERSION= 3.4.d20201222 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= net MAINTAINER= madpilot@FreeBSD.org 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= 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 USE_LDCONFIG= yes CONFIGURE_ARGS= --with-pic 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= 75898a4 PLIST_SUB= MAJOR_VER=${PORTVERSION:R:R} VER=${PORTVERSION:R} post-patch: (cd ${WRKSRC} && ${SH} autogen.sh) post-configure: @${REINPLACE_CMD} -e 's/#define PACKAGE/#define NDPI_PACKAGE/g' \ -e 's/#define VERSION/#define NDPI_VERSION/g' \ ${WRKSRC}/configure post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libndpi.so.${PORTVERSION:R}.0 ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ndpiReader ${RM} ${STAGEDIR}${PREFIX}/lib/libndpi.so \ ${STAGEDIR}${PREFIX}/lib/libndpi.so.${PORTVERSION:R:R} ${RLN} ${STAGEDIR}${PREFIX}/lib/libndpi.so.${PORTVERSION:R}.0 \ ${STAGEDIR}${PREFIX}/lib/libndpi.so ${RLN} ${STAGEDIR}${PREFIX}/lib/libndpi.so.${PORTVERSION:R}.0 \ ${STAGEDIR}${PREFIX}/lib/libndpi.so.${PORTVERSION:R:R} .include Index: head/net/ntopng/Makefile =================================================================== --- head/net/ntopng/Makefile (revision 562592) +++ head/net/ntopng/Makefile (revision 562593) @@ -1,63 +1,65 @@ # Created by: Muhammad Moinur Rahman <5u623l20@gmail.com> # $FreeBSD$ PORTNAME= ntopng -PORTVERSION= 4.2.d20201228 +PORTVERSION= 4.2.d20210122 PORTEPOCH= 1 CATEGORIES= net MAINTAINER= madpilot@FreeBSD.org COMMENT= Network monitoring tool with command line and web interfaces LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= librrd.so:databases/rrdtool \ libzmq.so:net/libzmq4 \ libcurl.so:ftp/curl \ libndpi.so:net/ndpi \ libjson-c.so:devel/json-c \ 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 \ mysql pathfix pkgconfig shebangfix sqlite ssl SUB_FILES= ntopng-geoip2update.sh pkg-deinstall SHEBANG_FILES= httpdocs/misc/ntopng-add-user.sh \ httpdocs/misc/ntopng-utils-manage-config.in GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-ndpi-includes=${LOCALBASE}/include/ndpi USERS= ntopng GROUPS= ntopng PLIST_SUB= NTOPNGUSER="${USERS}" NTOPNGROUP="${GROUPS}" USE_GITHUB= yes GH_ACCOUNT= ntop -GH_TAGNAME= d2f4f8f +GH_TAGNAME= e91b1b5 CPE_VENDOR= ntop OPTIONS_DEFINE= NLS OPTIONS_SUB= yes NLS_USES= gettext USE_RC_SUBR= ntopng post-patch: cd ${WRKSRC} && ${SH} autogen.sh post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ntopng ${MKDIR} ${STAGEDIR}/var/db/ntopng ${INSTALL_SCRIPT} ${WRKDIR}/ntopng-geoip2update.sh ${STAGEDIR}${PREFIX}/bin ${RM} ${STAGEDIR}${DATADIR}/httpdocs/misc/ntopng-utils-manage-updates \ ${STAGEDIR}${DATADIR}/httpdocs/misc/ntopng-utils-manage-updates.in .include Index: head/net/ntopng/distinfo =================================================================== --- head/net/ntopng/distinfo (revision 562592) +++ head/net/ntopng/distinfo (revision 562593) @@ -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 Index: head/net/ntopng/files/patch-configure.seed =================================================================== --- head/net/ntopng/files/patch-configure.seed (revision 562592) +++ head/net/ntopng/files/patch-configure.seed (revision 562593) @@ -1,63 +1,72 @@ ---- 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 AC_ARG_WITH(sanitizer, [ --with-sanitizer Build with support for the LLVM address sanitizer]) -CPPFLAGS="${CPPFLAGS} -Wno-address-of-packed-member -Wno-unused-function" +CPPFLAGS="${CPPFLAGS} -Wno-unused-function" AC_PROG_CPP AC_PROG_CXX @@ -77,33 +77,8 @@ fi # On CentOS 6 `git rev-list HEAD --count` does not work # # -REVISION=`git log --pretty=oneline | wc -l` +#REVISION=`git log --pretty=oneline | wc -l` -if test -d "/usr/local/include"; then - CFLAGS="${CFLAGS} -I/usr/local/include" - CPPFLAGS="${CPPFLAGS} -I/usr/local/include" -fi - -if test -d "/usr/local/lib"; then - LDFLAGS="${LDFLAGS} -L/usr/local/lib" -fi - -if test -d /opt/local/include; then : - CFLAGS="${CFLAGS} -I/opt/local/include" - CPPFLAGS="${CPPFLAGS} -I/opt/local/include" -fi - -if test -d /opt/local/lib; then : - LDFLAGS="${LDFLAGS} -L/opt/local/lib" -fi - -if [ test -f /usr/bin/lsb_release ]; then - CODENAME=`/usr/bin/lsb_release -c|cut -f 2` - if [[ $CODENAME == "wheezy" ]]; then : - CPPFLAGS="${CPPFLAGS} -DOLD_NETFILTER_INTERFACE=1" - fi -fi - 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 GMAKE="make" -fi - -GIT=`which git` -if test x$GIT = x; then - AC_MSG_RESULT(FATAL ERROR: git is not installed on your host) -fi - -WGET=`which wget` -if test x$WGET = x; then - AC_MSG_RESULT(ERROR. wget is not installed on your host: you cannot download GeoIP data) fi umask 002