7 files changed, 10 insertions, 65 deletions

diff --git a/GIDs b/GIDs
index 8226f42aa01e..f7e5b3064996 100644
--- a/GIDs
+++ b/GIDs
@@ -179,3 +179,4 @@ nslcd:*:928:
 activemq:*:929:
 ifgraph:*:930:
 asterisk:*:931:
+sancp:*:932:
diff --git a/UIDs b/UIDs
index 78c68f754de4..5da66d910918 100644
--- a/UIDs
+++ b/UIDs
@@ -187,3 +187,4 @@ nslcd:*:928:928::0:0:nslcd daemon:/nonexistent:/usr/sbin/nologin
 activemq:*:929:929::0:0:ActiveMQ Daemon:/nonexistent:/sbin/nologin
 ifgraph:*:930:930::0:0:ifGraph:/nonexistent:/sbin/nologin
 asterisk:*:931:931::0:0:Asterisk User:/nonexistent:/sbin/nologin
+sancp:*:932:932::0:0:SANCP Daemon:/var/log/sancp:/sbin/nologin
diff --git a/security/sancp/Makefile b/security/sancp/Makefile
index 49e3013b1f96..2ae5f630fe08 100644
--- a/security/sancp/Makefile
+++ b/security/sancp/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	sancp
 PORTVERSION=	1.6.1
 DISTVERSIONSUFFIX=	-stable
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	security
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}-stable
 
@@ -16,9 +16,12 @@ MAINTAINER=	pauls@utdallas.edu
 COMMENT=	A network connection profiler
 
 ALL_TARGET=	bsd
-USE_RC_SUBR=	sancp.sh
+USE_RC_SUBR=	sancp
 SUB_FILES=	pkg-message
 
+USERS=		sancp
+GROUPS=		sancp
+
 PORTDOCS=	CHANGES INSTALL ISSUES README \
 		SETUP fields.LIST LICENSE
 
@@ -26,7 +29,6 @@ post-extract:
 	@cd ${WRKSRC} && ${MV} LICENSE docs/
 
 do-install:
-	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 	@${INSTALL_PROGRAM} ${WRKSRC}/sancp ${PREFIX}/bin
 	@${INSTALL_DATA} ${WRKSRC}/etc/sancp/sancp.conf ${PREFIX}/etc/sancp.conf-dist
 	@${CP} -n ${PREFIX}/etc/sancp.conf-dist ${PREFIX}/etc/sancp.conf
diff --git a/security/sancp/distinfo b/security/sancp/distinfo
index 939f39c5ac0b..2447c72e5ffa 100644
--- a/security/sancp/distinfo
+++ b/security/sancp/distinfo
@@ -1,3 +1,2 @@
-MD5 (sancp-1.6.1-stable.tar.gz) = ffa64f2fdb49afd7ef16fbefda21e251
 SHA256 (sancp-1.6.1-stable.tar.gz) = 9836262aaf02bde116a9e79d342ea3af8b4991c7ba27b816fb54ed6c0863ff48
 SIZE (sancp-1.6.1-stable.tar.gz) = 71748
diff --git a/security/sancp/files/sancp.sh.in b/security/sancp/files/sancp.in
index cd5c17793240..80bc18641069 100644
--- a/security/sancp/files/sancp.sh.in
+++ b/security/sancp/files/sancp.in
@@ -75,6 +75,6 @@ load_rc_config $name
 : ${sancp_conf="%%PREFIX%%/etc/sancp.conf"}
 : ${sancp_interface=""}
 
-command_args="${sancp_flags} -c ${sancp_conf} -i ${sancp_interface}"
+command_args="-c ${sancp_conf} -i ${sancp_interface}"
 
 run_rc_command "$1"
diff --git a/security/sancp/pkg-deinstall b/security/sancp/pkg-deinstall
index 212c8c38918f..96f4167cd9e0 100644
--- a/security/sancp/pkg-deinstall
+++ b/security/sancp/pkg-deinstall
@@ -4,28 +4,6 @@ if [ "$2" != "POST-DEINSTALL" ]; then
         exit 0
 fi
 
-PATH=/bin:/usr/sbin
-USER=sancp
-GROUP=${USER}
-LOG_DIR=/var/log/sancp
+PATH=/bin:/usr/bin
 
-# Remove the log directory
-if [ -d ${LOG_DIR} ]; 
-then 
-	rmdir ${LOG_DIR} >/dev/null 2>&1; 
-fi
-
-if pw user show "${USER}" >/dev/null 2>&1; then
-        if ! pw userdel ${USER} ;          
-        then
-                echo "Unable to remove user: ${USER}, remove it manually"
-        fi
-fi
-
-
-if pw group show "${GROUP}" >/dev/null 2>&1; then
-	if ! pw groupdel ${GROUP} ; 
-	then
-		echo "Unable to remove group: ${GROUP}, remove it manually"
-	fi
-fi
+echo "* If you nolonger plan to run sancp delete /var/log/sancp, the user & group created during install *"
diff --git a/security/sancp/pkg-install b/security/sancp/pkg-install
index d6856cb2c95e..926c97d363d1 100644
--- a/security/sancp/pkg-install
+++ b/security/sancp/pkg-install
@@ -5,42 +5,6 @@ if [ "$2" != "POST-INSTALL" ]; then
 fi
 
 PATH=/bin:/usr/sbin
-USER=sancp
-GROUP=${USER}
 LOG_DIR=/var/log/sancp
 
-if [ ! -d ${LOG_DIR} ]; then mkdir ${LOG_DIR}; fi
-
-if pw group show "${GROUP}" 2>/dev/null; then
-	echo "You already have a group \"${GROUP}\", so I will use it."
-else
-	if pw groupadd ${GROUP}; then
-		echo "Added group \"${GROUP}\"."
-	else
-		echo "Adding group \"${GROUP}\" failed..."
-		exit 1
-	fi
-fi
-
-if pw user show "${USER}" 2>/dev/null; then
-	echo "You already have a user \"${USER}\", so I will use it."
-	if pw usermod ${USER} -d ${LOG_DIR}
-	then
-		echo "Changed home directory of \"${USER}\" to \"${LOG_DIR}\""
-	else
-		echo "Changing home directory of \"${USER}\" to \"${LOG_DIR}\" failed..."
-		exit 1
-	fi
-else
-	if pw useradd ${USER} -g ${GROUP} -h - \
-		-d ${LOG_DIR} -s /sbin/nologin -c "SANCP Daemon"
-	then
-		echo "Added user \"${USER}\"."
-	else
-		echo "Adding user \"${USER}\" failed..."
-		exit 1
-	fi
-fi
-
-chown -R ${USER}:${GROUP} ${LOG_DIR}
 chmod 750 ${LOG_DIR}