net/ntopng: sync with upstream

Taken from: HardenedBSD
This commit is contained in:
Franco Fichtner 2020-06-22 11:05:04 +02:00
parent b9d529fe34
commit 369a90ca0f
3 changed files with 24 additions and 5 deletions

View file

@ -2,7 +2,8 @@
# $FreeBSD$
PORTNAME= ntopng
PORTVERSION= 4.0.d20200530
PORTVERSION= 4.0.d20200615
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= net
@ -38,7 +39,7 @@ PLIST_SUB= NTOPNGUSER="${USERS}" NTOPNGROUP="${GROUPS}"
USE_GITHUB= yes
GH_ACCOUNT= ntop
GH_TAGNAME= 66a6a44
GH_TAGNAME= 20c4c31
CPE_VENDOR= ntop

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1590935345
SHA256 (ntop-ntopng-4.0.d20200530-66a6a44_GH0.tar.gz) = ee56a7418d46c40e5375dde963fd06d773c0c8237b77cab1208c93e8e525f85c
SIZE (ntop-ntopng-4.0.d20200530-66a6a44_GH0.tar.gz) = 43398672
TIMESTAMP = 1592226824
SHA256 (ntop-ntopng-4.0.d20200615-20c4c31_GH0.tar.gz) = f25c29945c55779b78244f1573253090da2345d186ffc6c6decaa73a5f65b37f
SIZE (ntop-ntopng-4.0.d20200615-20c4c31_GH0.tar.gz) = 43399945

View file

@ -0,0 +1,18 @@
--- httpdocs/misc/ntopng-add-user.sh.orig 2020-06-15 13:08:57 UTC
+++ httpdocs/misc/ntopng-add-user.sh
@@ -111,13 +111,13 @@ function validate_username {
function password_md5 {
#make sure the md5 utility works as expected
- local admin_md5=`echo -n admin | md5sum | cut -c 1-32`
+ local admin_md5=`echo -n admin | md5 | cut -c 1-32`
if [[ $admin_md5 != "21232f297a57a5a743894a0e4a801fc3" ]]
then
echo "md5sum not working as expected"
return 1
fi
- NTOPNG_PASSWORD_MD5=`echo -n $NTOPNG_PASSWORD | md5sum | cut -c 1-32`
+ NTOPNG_PASSWORD_MD5=`echo -n $NTOPNG_PASSWORD | md5 | cut -c 1-32`
return 0
}