Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 16 Jun 2020 22:22:31 +0000 (UTC)
From:      Guido Falsi <madpilot@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r539383 - in head/net/ntopng: . files
Message-ID:  <202006162222.05GMMViU027117@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: madpilot
Date: Tue Jun 16 22:22:30 2020
New Revision: 539383
URL: https://svnweb.freebsd.org/changeset/ports/539383

Log:
  Fix script to use md5 and not md5sum.
  
  PR:		243110
  Submitted by:	Tomoyuki Sakurai <trombik1973@gmail.com>

Added:
  head/net/ntopng/files/patch-httpdocs_misc_ntopng-add-user.sh   (contents, props changed)
Modified:
  head/net/ntopng/Makefile

Modified: head/net/ntopng/Makefile
==============================================================================
--- head/net/ntopng/Makefile	Tue Jun 16 22:15:43 2020	(r539382)
+++ head/net/ntopng/Makefile	Tue Jun 16 22:22:30 2020	(r539383)
@@ -3,6 +3,7 @@
 
 PORTNAME=	ntopng
 PORTVERSION=	4.0.d20200615
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	net
 

Added: head/net/ntopng/files/patch-httpdocs_misc_ntopng-add-user.sh
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/ntopng/files/patch-httpdocs_misc_ntopng-add-user.sh	Tue Jun 16 22:22:30 2020	(r539383)
@@ -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
+ }
+ 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006162222.05GMMViU027117>