Attachment 216661 Details for Bug 247140 – patch 3

[patch] patch 3

honeytrap-g20200625.diff (text/plain), 4.05 KB, created by ezri.mudde on 2020-07-22 12:32:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: ezri.mudde

Created: 2020-07-22 12:32:39 UTC

Size: 4.05 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 542851)
>+++ Makefile	(working copy)
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	honeytrap
>-DISTVERSION=	g20200415
>+DISTVERSION=	g20200625
> CATEGORIES=	security
> 
> MAINTAINER=	remco.verhoef@dutchsec.com
>@@ -10,8 +10,9 @@
> 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=	d8d94c8f
>+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 \
>Index: distinfo
>===================================================================
>--- distinfo	(revision 542851)
>+++ distinfo	(working copy)
>@@ -1,6 +1,6 @@
>-TIMESTAMP = 1587390791
>-SHA256 (honeytrap-honeytrap-g20200415-d8d94c8f_GH0.tar.gz) = f565e52e8f4bbebc3765bd2ead68b7ab141da4ef00073749ae55268290f5d13a
>-SIZE (honeytrap-honeytrap-g20200415-d8d94c8f_GH0.tar.gz) = 379014
>+TIMESTAMP = 1595352531
>+SHA256 (honeytrap-honeytrap-g20200625-33bbb2d_GH0.tar.gz) = a6390179c0ba3282d7523f3633d4a15852f39081fd666f4ac3a4c37f95fef4c4
>+SIZE (honeytrap-honeytrap-g20200625-33bbb2d_GH0.tar.gz) = 379053
> 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
>Index: files/honeytrap.in
>===================================================================
>--- files/honeytrap.in	(revision 542851)
>+++ files/honeytrap.in	(working copy)
>@@ -10,7 +10,7 @@
> # to enable this service:
> #
> # honeytrap_enable (bool):	Set to NO by default.
>-#				Set it to YES to enable honeytrap.
>+#			        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
>@@ -27,15 +27,7 @@
> : ${honeytrap_datadir="%%PREFIX%%/libdata/honeytrap"}
> : ${honeytrap_config="%%PREFIX%%/etc/honeytrap.toml"}
> 
>-start_cmd="${name}_start"
>+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 "$@"
>Index: files/patch-cmd_constants.go
>===================================================================
>--- files/patch-cmd_constants.go	(nonexistent)
>+++ files/patch-cmd_constants.go	(working copy)
>@@ -0,0 +1,21 @@
>+--- 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]
>+ )
>
>Property changes on: files/patch-cmd_constants.go
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 247140: 215417 | 216631 | 216661 | 216962 | 217154 | 217238 | 217239