Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 4 Apr 2020 08:41:37 +0000 (UTC)
From:      =?UTF-8?Q?Alexandre_C=2e_Guimar=c3=a3es?= <rigoletto@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r530630 - in head/security/honeytrap: . files
Message-ID:  <202004040841.0348fbe1097377@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rigoletto
Date: Sat Apr  4 08:41:37 2020
New Revision: 530630
URL: https://svnweb.freebsd.org/changeset/ports/530630

Log:
  security/honeytrap: Update to 2020-02-26
  
  PR:		244591
  Submitted by:	ezri.mudde@dutchsec.com (maintainer)
  Approved by:	rigoletto

Modified:
  head/security/honeytrap/Makefile
  head/security/honeytrap/distinfo
  head/security/honeytrap/files/honeytrap.in

Modified: head/security/honeytrap/Makefile
==============================================================================
--- head/security/honeytrap/Makefile	Sat Apr  4 08:25:38 2020	(r530629)
+++ head/security/honeytrap/Makefile	Sat Apr  4 08:41:37 2020	(r530630)
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	honeytrap
-PORTVERSION=	20200129
-DISTVERSIONPREFIX=	g
+DISTVERSION=	g20200226
 CATEGORIES=	security
 
 MAINTAINER=	remco.verhoef@dutchsec.com
@@ -12,9 +11,7 @@ LICENSE=	ART20
 
 USES=		go:modules
 USE_GITHUB=	yes
-GH_ACCOUNT=	honeytrap
-GH_PROJECT=	honeytrap
-GH_TAGNAME=	93936c1
+GH_TAGNAME=	77a150d1
 GH_TUPLE=	\
 		AndreasBriese:bbloom:28f7e881ca57:andreasbriese_bbloom/vendor/github.com/AndreasBriese/bbloom \
 		BurntSushi:toml:v0.3.0:burntsushi_toml/vendor/github.com/BurntSushi/toml \
@@ -77,7 +74,9 @@ USERS=		honeytrap
 GROUPS=		honeytrap
 USE_RC_SUBR=	honeytrap
 PLIST_FILES=	bin/honeytrap \
-		etc/honeytrap.toml
+		etc/honeytrap.toml \
+		"@dir(honeytrap,honeytrap,4744) /var/log/honeytrap" \
+		"@dir(honeytrap,honeytrap,4744) libdata/honeytrap"
 
 post-patch:
 	@${REINPLACE_CMD} -i '' '/go1.13/d' ${WRKDIR}/netstack-9ea5e4d2258f/tcpip/time_unsafe.go
@@ -85,8 +84,11 @@ post-patch:
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKDIR}/bin/honeytrap ${STAGEDIR}${PREFIX}/bin/honeytrap
-	${MKDIR} ${STAGEDIR}${PREFIX}/etc
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/rc.d
 	${INSTALL_DATA} ${FILESDIR}/etc/honeytrap.toml ${STAGEDIR}${PREFIX}/etc
+
+post-install:
+	${MKDIR} ${STAGEDIR}${PREFIX}/libdata/honeytrap
+	${MKDIR} ${STAGEDIR}/var/log/honeytrap
 
 .include <bsd.port.mk>

Modified: head/security/honeytrap/distinfo
==============================================================================
--- head/security/honeytrap/distinfo	Sat Apr  4 08:25:38 2020	(r530629)
+++ head/security/honeytrap/distinfo	Sat Apr  4 08:41:37 2020	(r530630)
@@ -1,6 +1,6 @@
-TIMESTAMP = 1580990332
-SHA256 (honeytrap-honeytrap-g20200129-93936c1_GH0.tar.gz) = c60a0496a609b8473e039b3de1c02eea4d35831439a58284eed986bc6038c4b1
-SIZE (honeytrap-honeytrap-g20200129-93936c1_GH0.tar.gz) = 377514
+TIMESTAMP = 1585981490
+SHA256 (honeytrap-honeytrap-g20200226-77a150d1_GH0.tar.gz) = 3ed81ebc5b62f203fecc2c768efcee5fd2a3cf2e2b4c7862e5564bef26730fa6
+SIZE (honeytrap-honeytrap-g20200226-77a150d1_GH0.tar.gz) = 377512
 SHA256 (AndreasBriese-bbloom-28f7e881ca57_GH0.tar.gz) = c87bf25d12aa9ef597c6a465dd2959d6d7e06d8341030d6d75c8a81ccc388ccd
 SIZE (AndreasBriese-bbloom-28f7e881ca57_GH0.tar.gz) = 7141
 SHA256 (BurntSushi-toml-v0.3.0_GH0.tar.gz) = 2c49390424cfb043f803977bce80b1504495bada54f9e845ff8b30a05fab9a36

Modified: head/security/honeytrap/files/honeytrap.in
==============================================================================
--- head/security/honeytrap/files/honeytrap.in	Sat Apr  4 08:25:38 2020	(r530629)
+++ head/security/honeytrap/files/honeytrap.in	Sat Apr  4 08:41:37 2020	(r530630)
@@ -11,7 +11,7 @@
 #
 # honeytrap_enable (bool):	Set to NO by default.
 #				Set it to YES to enable honeytrap.
-# honeytrap_datadir (path):	Set to %%PREFIX%%/var/lib/honeytrap
+# honeytrap_datadir (path):	Set to %%PREFIX%%/libdata/honeytrap
 #				by default.
 # honeytrap_config (path):	Set to %%PREFIX%%/etc/honeytrap.toml
 #				by default.
@@ -24,10 +24,10 @@ rcvar=honeytrap_enable
 load_rc_config $name
 
 : ${honeytrap_enable:="NO"}
-: ${honeytrap_datadir="%%PREFIX%%/var/lib/honeytrap"}
+: ${honeytrap_datadir="%%PREFIX%%/libdata/honeytrap"}
 : ${honeytrap_config="%%PREFIX%%/etc/honeytrap.toml"}
 
-start_cmd="$name_start"
+start_cmd="${name}_start"
 
 honeytrap_program="%%PREFIX%%/bin/honeytrap"
 honeytrap_flags="--data $honeytrap_datadir --config $honeytrap_config"
@@ -35,7 +35,7 @@ pidfile=/var/run/${name}.pid
 
 honeytrap_start()
 {
-	daemon -p $pidfile -u $name $honeytrap_program $honeytrap_flags
+	daemon -o /var/log/honeytrap/service.log -p $pidfile -u $name $honeytrap_program $honeytrap_flags
 }
 
-run_rc_command "$1"
+run_rc_command "$@"



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