diff --git a/net/ntopng/Makefile b/net/ntopng/Makefile index d75deed86053..281ca67edf31 100644 --- a/net/ntopng/Makefile +++ b/net/ntopng/Makefile @@ -1,71 +1,70 @@ PORTNAME= ntopng -PORTVERSION= 6.0.d20240102 -PORTREVISION= 1 +PORTVERSION= 6.0.d20240307 PORTEPOCH= 1 CATEGORIES= net MAINTAINER= madpilot@FreeBSD.org COMMENT= Network monitoring tool with command line and web interfaces WWW= https://www.ntop.org/products/traffic-analysis/ntop/ 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 \ libgcrypt.so:security/libgcrypt \ libgpg-error.so:security/libgpg-error \ libhiredis.so:databases/hiredis BUILD_DEPENDS= bash:shells/bash USES= autoreconf compiler:c++11-lang cpe gmake libtool localbase \ lua:54 mysql pathfix pkgconfig shebangfix sqlite ssl SUB_FILES= ntopng-geoip2update.sh pkg-deinstall pkg-message 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_TUPLE= ntop:ntopng-dist:dddc988:dist/httpdocs/dist GH_ACCOUNT= ntop -GH_TAGNAME= 1a85a3d1 +GH_TAGNAME= 1229d40d CPE_VENDOR= ntop OPTIONS_DEFINE= NLS OPTIONS_SUB= yes NLS_USES= gettext USE_RC_SUBR= ntopng post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ -e 's|%%SSL_INC%%|${OPENSSLINC}|g' \ -e 's|%%SSL_LIB%%|${OPENSSLLIB}|g' \ ${WRKSRC}/Makefile.in \ ${WRKSRC}/configure.ac.in 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 diff --git a/net/ntopng/distinfo b/net/ntopng/distinfo index d1227adafe78..fba0c3714303 100644 --- a/net/ntopng/distinfo +++ b/net/ntopng/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1704289138 -SHA256 (ntop-ntopng-6.0.d20240102-1a85a3d1_GH0.tar.gz) = 56d5ed490bbff3eb2b599ed0cf61c2bb2f10d3bf274a286c6642678b59eb247d -SIZE (ntop-ntopng-6.0.d20240102-1a85a3d1_GH0.tar.gz) = 68317371 +TIMESTAMP = 1709883909 +SHA256 (ntop-ntopng-6.0.d20240307-1229d40d_GH0.tar.gz) = cf25a7a530a8d3a6cdda9d2adc6a2aed1ef7864320c30f50a18fb657cf315b67 +SIZE (ntop-ntopng-6.0.d20240307-1229d40d_GH0.tar.gz) = 68320590 SHA256 (ntop-ntopng-dist-dddc988_GH0.tar.gz) = 6b614c439506f3d9af89de7a821dc50baada7c56f15cdd28c31cae0a8ad7fb7d SIZE (ntop-ntopng-dist-dddc988_GH0.tar.gz) = 2887475 diff --git a/net/ntopng/files/ntopng.in b/net/ntopng/files/ntopng.in index 462f0a3f0603..8c0f3d2ddf67 100644 --- a/net/ntopng/files/ntopng.in +++ b/net/ntopng/files/ntopng.in @@ -1,45 +1,45 @@ #!/bin/sh # PROVIDE: ntopng -# REQUIRE: LOGIN netif mysql +# REQUIRE: LOGIN netif mysql redis # KEYWORD: shutdown # # Add the following lines to /etc/rc.conf to enable ntopng: # # ntopng_enable (bool): Set it to "YES" to enable ntopng # Default is "NO". # ntopng_flags (flags): Set extra flags to ntopng # Empty by default. # ntopng_pidfile (path): Path to the pidfile # Default /var/run/ntopng/ntopng.pid # . /etc/rc.subr name=ntopng desc="Monitors network traffic in realtime" rcvar=ntopng_enable load_rc_config $name : ${ntopng_enable:=NO} : ${ntopng_pidfile:=/var/run/ntopng/ntopng.pid} httpdocs_path=%%DATADIR%%/httpdocs scripts_path=%%DATADIR%%/scripts callbacks_path=%%DATADIR%%/scripts/callbacks user_path=%%PREFIX%%/etc/ntopng-users.conf start_precmd=ntopng_precmd command=%%PREFIX%%/bin/ntopng command_args="-U ntopng -G ${ntopng_pidfile} -1 ${httpdocs_path} -2 ${scripts_path} -3 ${callbacks_path} -e" ntopng_precmd() { local rundir=${ntopng_pidfile%/*} if [ ! -d $rundir ] ; then install -d -m 0755 -o ntopng -g ntopng $rundir fi } run_rc_command "$1"