Attachment #216661 for bug #247140




# $FreeBSD$

PORTNAME=	honeytrap
DISTVERSION=	g20200625
CATEGORIES=	security

MAINTAINER=	remco.verhoef@dutchsec.com

LICENSE=	ART20

USES=		go:modules
GO_BUILDFLAGS=	-ldflags '-X github.com/honeytrap/honeytrap/cmd.Version=2020-07-22T08:34:55 -X github.com/honeytrap/honeytrap/cmd.ReleaseTag=DEVELOPMENT.2020-07-22T08-34-55Z -X github.com/honeytrap/honeytrap/cmd.CommitID=33bbb2db3a3140b0ce4fbda14747bc954e0bcadd -X github.com/honeytrap/honeytrap/cmd.ShortCommitID=33bbb2db3a31 -extldflags "static"'
USE_GITHUB=	yes
GH_TAGNAME=	33bbb2d
GH_TUPLE=	\
		AndreasBriese:bbloom:28f7e881ca57:andreasbriese_bbloom/vendor/github.com/AndreasBriese/bbloom \
		BurntSushi:toml:v0.3.0:burntsushi_toml/vendor/github.com/BurntSushi/toml \

Lines 1-6 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1587390791	1	TIMESTAMP = 1595352531
2	SHA256 (honeytrap-honeytrap-g20200415-d8d94c8f_GH0.tar.gz) = f565e52e8f4bbebc3765bd2ead68b7ab141da4ef00073749ae55268290f5d13a	2	SHA256 (honeytrap-honeytrap-g20200625-33bbb2d_GH0.tar.gz) = a6390179c0ba3282d7523f3633d4a15852f39081fd666f4ac3a4c37f95fef4c4
3	SIZE (honeytrap-honeytrap-g20200415-d8d94c8f_GH0.tar.gz) = 379014	3	SIZE (honeytrap-honeytrap-g20200625-33bbb2d_GH0.tar.gz) = 379053
4	SHA256 (AndreasBriese-bbloom-28f7e881ca57_GH0.tar.gz) = c87bf25d12aa9ef597c6a465dd2959d6d7e06d8341030d6d75c8a81ccc388ccd	4	SHA256 (AndreasBriese-bbloom-28f7e881ca57_GH0.tar.gz) = c87bf25d12aa9ef597c6a465dd2959d6d7e06d8341030d6d75c8a81ccc388ccd
5	SIZE (AndreasBriese-bbloom-28f7e881ca57_GH0.tar.gz) = 7141	5	SIZE (AndreasBriese-bbloom-28f7e881ca57_GH0.tar.gz) = 7141
6	SHA256 (BurntSushi-toml-v0.3.0_GH0.tar.gz) = 2c49390424cfb043f803977bce80b1504495bada54f9e845ff8b30a05fab9a36	6	SHA256 (BurntSushi-toml-v0.3.0_GH0.tar.gz) = 2c49390424cfb043f803977bce80b1504495bada54f9e845ff8b30a05fab9a36




# to enable this service:
#
# honeytrap_enable (bool):	Set to NO by default.
#			        Set it to YES to enable honeytrap.
# honeytrap_datadir (path):	Set to %%PREFIX%%/libdata/honeytrap
#				by default.
# honeytrap_config (path):	Set to %%PREFIX%%/etc/honeytrap.toml

: ${honeytrap_datadir="%%PREFIX%%/libdata/honeytrap"}
: ${honeytrap_config="%%PREFIX%%/etc/honeytrap.toml"}

command=%%PREFIX%%/bin/${name}
command_args="--data ${honeytrap_datadir} --config ${honeytrap_config} >> /var/log/honeytrap/service.log 2>&1"

honeytrap_program="%%PREFIX%%/bin/honeytrap"
honeytrap_flags="--data $honeytrap_datadir --config $honeytrap_config"
pidfile=/var/run/${name}.pid

honeytrap_start()
{
	daemon -o /var/log/honeytrap/service.log -p $pidfile -u $name $honeytrap_program $honeytrap_flags
}

run_rc_command "$@"




--- cmd/constants_orig.go	2020-07-22 15:42:58.269124000 +0200
+++ cmd/constants.go	2020-07-22 15:50:18.660110000 +0200
@@ -19,15 +19,12 @@
 	// GOPATH - GOPATH value at the time of build.
 	GOPATH = ""
 
-	// Go get development tag.
-	goGetTag = "DEVELOPMENT.GOGET"
-
 	// Version - version time.RFC3339.
-	Version = goGetTag
+	Version = ""
 	// ReleaseTag - release tag in TAG.%Y-%m-%dT%H-%M-%SZ.
-	ReleaseTag = goGetTag
+	ReleaseTag = ""
 	// CommitID - latest commit id.
-	CommitID = goGetTag
+	CommitID = ""
 	// ShortCommitID - first 12 characters from CommitID.
 	ShortCommitID = CommitID[:12]
 )

Return to bug 247140

Lines 1-7 Link Here

(-)Makefile (-2 / +3 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= honeytrap	3	PORTNAME= honeytrap
4	DISTVERSION= g20200415	4	DISTVERSION= g20200625
5	CATEGORIES= security	5	CATEGORIES= security
6		6
7	MAINTAINER= remco.verhoef@dutchsec.com	7	MAINTAINER= remco.verhoef@dutchsec.com
Lines 10-17 Link Here
10	LICENSE= ART20	10	LICENSE= ART20
11		11
12	USES= go:modules	12	USES= go:modules
		13	GO_BUILDFLAGS= -ldflags '-X github.com/honeytrap/honeytrap/cmd.Version=2020-07-22T08:34:55 -X github.com/honeytrap/honeytrap/cmd.ReleaseTag=DEVELOPMENT.2020-07-22T08-34-55Z -X github.com/honeytrap/honeytrap/cmd.CommitID=33bbb2db3a3140b0ce4fbda14747bc954e0bcadd -X github.com/honeytrap/honeytrap/cmd.ShortCommitID=33bbb2db3a31 -extldflags "static"'
13	USE_GITHUB= yes	14	USE_GITHUB= yes
14	GH_TAGNAME= d8d94c8f	15	GH_TAGNAME= 33bbb2d
15	GH_TUPLE= \	16	GH_TUPLE= \
16	AndreasBriese:bbloom:28f7e881ca57:andreasbriese_bbloom/vendor/github.com/AndreasBriese/bbloom \	17	AndreasBriese:bbloom:28f7e881ca57:andreasbriese_bbloom/vendor/github.com/AndreasBriese/bbloom \
17	BurntSushi:toml:v0.3.0:burntsushi_toml/vendor/github.com/BurntSushi/toml \	18	BurntSushi:toml:v0.3.0:burntsushi_toml/vendor/github.com/BurntSushi/toml \

Lines 10-16 Link Here

(-)files/honeytrap.in (-11 / +3 lines)
10	# to enable this service:	10	# to enable this service:
11	#	11	#
12	# honeytrap_enable (bool): Set to NO by default.	12	# honeytrap_enable (bool): Set to NO by default.
13	# Set it to YES to enable honeytrap.	13	# Set it to YES to enable honeytrap.
14	# honeytrap_datadir (path): Set to %%PREFIX%%/libdata/honeytrap	14	# honeytrap_datadir (path): Set to %%PREFIX%%/libdata/honeytrap
15	# by default.	15	# by default.
16	# honeytrap_config (path): Set to %%PREFIX%%/etc/honeytrap.toml	16	# honeytrap_config (path): Set to %%PREFIX%%/etc/honeytrap.toml
Lines 27-41 Link Here
27	: ${honeytrap_datadir="%%PREFIX%%/libdata/honeytrap"}	27	: ${honeytrap_datadir="%%PREFIX%%/libdata/honeytrap"}
28	: ${honeytrap_config="%%PREFIX%%/etc/honeytrap.toml"}	28	: ${honeytrap_config="%%PREFIX%%/etc/honeytrap.toml"}
29		29
30	start_cmd="${name}_start"	30	command=%%PREFIX%%/bin/${name}
		31	command_args="--data ${honeytrap_datadir} --config ${honeytrap_config} >> /var/log/honeytrap/service.log 2>&1"
31		32
32	honeytrap_program="%%PREFIX%%/bin/honeytrap"
33	honeytrap_flags="--data $honeytrap_datadir --config $honeytrap_config"
34	pidfile=/var/run/${name}.pid
35
36	honeytrap_start()
37	{
38	daemon -o /var/log/honeytrap/service.log -p $pidfile -u $name $honeytrap_program $honeytrap_flags
39	}
40
41	run_rc_command "$@"	33	run_rc_command "$@"

Line 0 Link Here

(-)files/patch-cmd_constants.go (+21 lines)
	1	--- cmd/constants_orig.go 2020-07-22 15:42:58.269124000 +0200
	2	+++ cmd/constants.go 2020-07-22 15:50:18.660110000 +0200
	3	@@ -19,15 +19,12 @@
	4	// GOPATH - GOPATH value at the time of build.
	5	GOPATH = ""
	6
	7	- // Go get development tag.
	8	- goGetTag = "DEVELOPMENT.GOGET"
	9	-
	10	// Version - version time.RFC3339.
	11	- Version = goGetTag
	12	+ Version = ""
	13	// ReleaseTag - release tag in TAG.%Y-%m-%dT%H-%M-%SZ.
	14	- ReleaseTag = goGetTag
	15	+ ReleaseTag = ""
	16	// CommitID - latest commit id.
	17	- CommitID = goGetTag
	18	+ CommitID = ""
	19	// ShortCommitID - first 12 characters from CommitID.
	20	ShortCommitID = CommitID[:12]
	21	)