git: df021c457f81 - main - security/honeytrap: Update to g20210510

Mikael Urankar mikael at FreeBSD.org
Fri Oct 1 13:11:19 UTC 2021 

The branch main has been updated by mikael:

URL: https://cgit.FreeBSD.org/ports/commit/?id=df021c457f81d103a4b75acc341f1e3edd59c336

commit df021c457f81d103a4b75acc341f1e3edd59c336
Author:     Mikael Urankar <mikael at FreeBSD.org>
AuthorDate: 2021-10-01 13:05:36 +0000
Commit:     Mikael Urankar <mikael at FreeBSD.org>
CommitDate: 2021-10-01 13:07:25 +0000

    security/honeytrap: Update to g20210510
    
      - Update to g20210510
      - Update license information
      - Split long lines
      - Add HONEYTRAP_LOGDIR
    
    PR:             258245
    Reported by:    Borja Marcos
    Approved by:    maintainer timeout
---
 security/honeytrap/Makefile                        | 33 ++++++++++++++--------
 security/honeytrap/distinfo                        | 14 ++-------
 ...sor_pkg_sentry_platform_kvm_bluepill__unsafe.go | 11 --------
 ...isor_pkg_sentry_platform_kvm_machine__unsafe.go | 11 --------
 ...kg_sentry_platform_ptrace_subprocess__unsafe.go | 11 --------
 ...isor.dev_gvisor_pkg_sentry_vfs_mount__unsafe.go | 11 --------
 ...or_gvisor.dev_gvisor_pkg_sleep_sleep__unsafe.go | 11 --------
 ...visor_pkg_sync_downgradable__rwmutex__unsafe.go | 11 --------
 ...r_gvisor.dev_gvisor_pkg_sync_memmove__unsafe.go | 11 --------
 ...or_gvisor.dev_gvisor_pkg_sync_tmutex__unsafe.go | 11 --------
 ...pip_link_rawfile_blockingpoll__yield__unsafe.go | 11 --------
 ...dor_gvisor.dev_gvisor_pkg_tcpip_time__unsafe.go | 11 --------
 12 files changed, 24 insertions(+), 133 deletions(-)

diff --git a/security/honeytrap/Makefile b/security/honeytrap/Makefile
index fc300a240581..c4a2f89bd849 100644
--- a/security/honeytrap/Makefile
+++ b/security/honeytrap/Makefile
@@ -1,22 +1,29 @@
 PORTNAME=	honeytrap
-DISTVERSION=	g20200625
+DISTVERSION=	g20210510
 CATEGORIES=	security
 
 MAINTAINER=	ezri.mudde at dutchsec.com
 COMMENT=	Framework for running, monitoring and managing honeypots
 
-LICENSE=	ART20
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 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"'
+GO_BUILDFLAGS=	-ldflags \
+		'-X github.com/honeytrap/honeytrap/cmd.Version=2021-05-10T00:00:00 \
+		-X github.com/honeytrap/honeytrap/cmd.ReleaseTag=DEVELOPMENT.2021-05-10T00-00-00Z \
+		-X github.com/honeytrap/honeytrap/cmd.CommitID=110030494f54421d01edfb57343aee3a102dc37d \
+		-X github.com/honeytrap/honeytrap/cmd.ShortCommitID=110030494f54 \
+		-extldflags "static"'
 USE_GITHUB=	yes
-GH_TAGNAME=	33bbb2d
-GH_TUPLE=	AndreasBriese:bbloom:28f7e881ca57:andreasbriese_bbloom/vendor/github.com/AndreasBriese/bbloom \
+GH_TAGNAME=	1100304
+GH_TUPLE=	\
+		AndreasBriese:bbloom:28f7e881ca57:andreasbriese_bbloom/vendor/github.com/AndreasBriese/bbloom \
 		BurntSushi:toml:v0.3.0:burntsushi_toml/vendor/github.com/BurntSushi/toml \
 		Logicalis:asn1:c9c836c1a3cd:logicalis_asn1/vendor/github.com/Logicalis/asn1 \
 		Shopify:sarama:v1.16.0:shopify_sarama/vendor/github.com/Shopify/sarama \
 		boltdb:bolt:v1.3.1:boltdb_bolt/vendor/github.com/boltdb/bolt \
-		cenkalti:backoff:v4.0.0:cenkalti_backoff/vendor/github.com/cenkalti/backoff/v4 \
+		cenkalti:backoff:v4.0.0:cenkalti_backoff_v4/vendor/github.com/cenkalti/backoff/v4 \
 		davecgh:go-spew:v1.1.0:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
 		dgraph-io:badger:94594b20babf:dgraph_io_badger/vendor/github.com/dgraph-io/badger \
 		dgryski:go-farm:2de33835d102:dgryski_go_farm/vendor/github.com/dgryski/go-farm \
@@ -36,7 +43,6 @@ GH_TUPLE=	AndreasBriese:bbloom:28f7e881ca57:andreasbriese_bbloom/vendor/github.c
 		golang:snappy:553a64147049:golang_snappy/vendor/github.com/golang/snappy \
 		golang:sys:d101bd2416d5:golang_sys/vendor/golang.org/x/sys \
 		golang:time:555d28b269f0:golang_time/vendor/golang.org/x/time \
-		google:btree:v1.0.0:google_btree/vendor/github.com/google/btree \
 		google:gopacket:v1.1.14:google_gopacket/vendor/github.com/google/gopacket \
 		gorilla:websocket:v1.2.0:gorilla_websocket/vendor/github.com/gorilla/websocket \
 		honeytrap:honeytrap-web:02944754979e:honeytrap_honeytrap_web/vendor/github.com/honeytrap/honeytrap-web \
@@ -63,27 +69,30 @@ GH_TUPLE=	AndreasBriese:bbloom:28f7e881ca57:andreasbriese_bbloom/vendor/github.c
 		songgao:water:75f112d19d5a:songgao_water/vendor/github.com/songgao/water \
 		streadway:amqp:8e4aba63da9f:streadway_amqp/vendor/github.com/streadway/amqp \
 		urfave:cli:v1.20.0:urfave_cli/vendor/gopkg.in/urfave/cli.v1 \
-		vishvananda:netlink:v1.1.0:vishvananda_netlink/vendor/github.com/vishvananda/netlink \
-		vishvananda:netns:0a2b9b5464df:vishvananda_netns/vendor/github.com/vishvananda/netns \
-		yuin:gopher-lua:8bfc7677f583:yuin_gopher_lua/vendor/github.com/yuin/gopher-lua \
-		google:gvisor:3eb302470365:google_gvisor/vendor/gvisor.dev/gvisor
+		yuin:gopher-lua:8bfc7677f583:yuin_gopher_lua/vendor/github.com/yuin/gopher-lua
 
 HONEYTRAP_USER?=	honeytrap
 HONEYTRAP_GROUP?=	honeytrap
 HONEYTRAP_DBDIR?=	/var/db/${PORTNAME}
+HONEYTRAP_LOGDIR?=	/var/log/${PORTNAME}
 
 USERS=		${HONEYTRAP_USER}
 GROUPS=		${HONEYTRAP_GROUP}
 USE_RC_SUBR=	honeytrap
 PLIST_FILES=	"@sample(honeytrap,honeytrap,0600) ${ETCDIR}/honeytrap.toml.sample" \
+		"@dir(honeytrap,honeytrap,0700) ${HONEYTRAP_LOGDIR}" \
 		bin/honeytrap
 
 SUB_LIST=	GROUP=${HONEYTRAP_GROUP} \
 		HONEYTRAP_DBDIR=${HONEYTRAP_DBDIR} \
 		USER=${HONEYTRAP_USER}
 
+post-patch:
+	${REINPLACE_CMD} 's#/etc#${ETCDIR}#' \
+		${WRKSRC}/cmd/honeytrap/main.go
 do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/bin
+	${MKDIR} ${STAGEDIR}${PREFIX}/bin \
+		${STAGEDIR}${HONEYTRAP_LOGDIR}
 	${INSTALL_PROGRAM} ${WRKDIR}/bin/honeytrap ${STAGEDIR}${PREFIX}/bin/honeytrap
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/rc.d ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${FILESDIR}/honeytrap.toml ${STAGEDIR}${ETCDIR}/honeytrap.toml.sample
diff --git a/security/honeytrap/distinfo b/security/honeytrap/distinfo
index 6f082e28ae61..62653cdd8443 100644
--- a/security/honeytrap/distinfo
+++ b/security/honeytrap/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1595352531
-SHA256 (honeytrap-honeytrap-g20200625-33bbb2d_GH0.tar.gz) = a6390179c0ba3282d7523f3633d4a15852f39081fd666f4ac3a4c37f95fef4c4
-SIZE (honeytrap-honeytrap-g20200625-33bbb2d_GH0.tar.gz) = 379053
+TIMESTAMP = 1632492215
+SHA256 (honeytrap-honeytrap-g20210510-1100304_GH0.tar.gz) = 03279a7dd22181f31a6cf03ad3045c8d50ae73a7853ee7482a6785a3779c389f
+SIZE (honeytrap-honeytrap-g20210510-1100304_GH0.tar.gz) = 372365
 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
@@ -51,8 +51,6 @@ SHA256 (golang-sys-d101bd2416d5_GH0.tar.gz) = c1de80d233d3df630ed34bf80cbb3f1861
 SIZE (golang-sys-d101bd2416d5_GH0.tar.gz) = 1537146
 SHA256 (golang-time-555d28b269f0_GH0.tar.gz) = 8ce368da65025dad4e4ed302a5835e2b3579f3a111721f9b275803519a5d10b3
 SIZE (golang-time-555d28b269f0_GH0.tar.gz) = 9577
-SHA256 (google-btree-v1.0.0_GH0.tar.gz) = 9f53e0e1330a4dbe92100d516606791f7196bf828ba93d693ef4d5c1cbd5fe30
-SIZE (google-btree-v1.0.0_GH0.tar.gz) = 15292
 SHA256 (google-gopacket-v1.1.14_GH0.tar.gz) = cb67f185cd2547652b9161829e82ebdeafc8984e827825647fd8d3f4e9f93250
 SIZE (google-gopacket-v1.1.14_GH0.tar.gz) = 748336
 SHA256 (gorilla-websocket-v1.2.0_GH0.tar.gz) = 04d1c4fa839a01d32d3c8c558370a964d83b5c980f74c4b965f3dd04f8cb9276
@@ -105,11 +103,5 @@ SHA256 (streadway-amqp-8e4aba63da9f_GH0.tar.gz) = b410ff90980687c896dfdaf84f0257
 SIZE (streadway-amqp-8e4aba63da9f_GH0.tar.gz) = 85410
 SHA256 (urfave-cli-v1.20.0_GH0.tar.gz) = c5ba59f5742c99618b5ba34211699287cd3e80c41488bb267035ce0163e3bade
 SIZE (urfave-cli-v1.20.0_GH0.tar.gz) = 58397
-SHA256 (vishvananda-netlink-v1.1.0_GH0.tar.gz) = c72754916ac1551cea4e1f801d5b2c26c1476f11bd3130382a4a890822eb5929
-SIZE (vishvananda-netlink-v1.1.0_GH0.tar.gz) = 147026
-SHA256 (vishvananda-netns-0a2b9b5464df_GH0.tar.gz) = 15f89c51e1daf9b0c24d80ad38a2dbbec2efd7214e36120dc1383702387ec679
-SIZE (vishvananda-netns-0a2b9b5464df_GH0.tar.gz) = 8004
 SHA256 (yuin-gopher-lua-8bfc7677f583_GH0.tar.gz) = 44997d2b2d921f747e8e96201c0457250e897c66efc7bf5dd2011a9e29a6aaaa
 SIZE (yuin-gopher-lua-8bfc7677f583_GH0.tar.gz) = 152266
-SHA256 (google-gvisor-3eb302470365_GH0.tar.gz) = a308a1ca98632293e622805b46e85f19b582db2c39aa04b9d1181f9d8df100fa
-SIZE (google-gvisor-3eb302470365_GH0.tar.gz) = 1658415
diff --git a/security/honeytrap/files/patch-vendor_gvisor.dev_gvisor_pkg_sentry_platform_kvm_bluepill__unsafe.go b/security/honeytrap/files/patch-vendor_gvisor.dev_gvisor_pkg_sentry_platform_kvm_bluepill__unsafe.go
deleted file mode 100644
index d670112de571..000000000000
--- a/security/honeytrap/files/patch-vendor_gvisor.dev_gvisor_pkg_sentry_platform_kvm_bluepill__unsafe.go
+++ /dev/null
@@ -1,11 +0,0 @@
---- vendor/gvisor.dev/gvisor/pkg/sentry/platform/kvm/bluepill_unsafe.go.orig	2020-01-31 23:11:21 UTC
-+++ vendor/gvisor.dev/gvisor/pkg/sentry/platform/kvm/bluepill_unsafe.go
-@@ -13,7 +13,7 @@
- // limitations under the License.
- 
- // +build go1.12
--// +build !go1.15
-+// +build !go1.17
- 
- // Check go:linkname function signatures when updating Go version.
- 
diff --git a/security/honeytrap/files/patch-vendor_gvisor.dev_gvisor_pkg_sentry_platform_kvm_machine__unsafe.go b/security/honeytrap/files/patch-vendor_gvisor.dev_gvisor_pkg_sentry_platform_kvm_machine__unsafe.go
deleted file mode 100644
index 12bc2d789aa4..000000000000
--- a/security/honeytrap/files/patch-vendor_gvisor.dev_gvisor_pkg_sentry_platform_kvm_machine__unsafe.go
+++ /dev/null
@@ -1,11 +0,0 @@
---- vendor/gvisor.dev/gvisor/pkg/sentry/platform/kvm/machine_unsafe.go.orig	2020-01-31 23:11:21 UTC
-+++ vendor/gvisor.dev/gvisor/pkg/sentry/platform/kvm/machine_unsafe.go
-@@ -13,7 +13,7 @@
- // limitations under the License.
- 
- // +build go1.12
--// +build !go1.15
-+// +build !go1.17
- 
- // Check go:linkname function signatures when updating Go version.
- 
diff --git a/security/honeytrap/files/patch-vendor_gvisor.dev_gvisor_pkg_sentry_platform_ptrace_subprocess__unsafe.go b/security/honeytrap/files/patch-vendor_gvisor.dev_gvisor_pkg_sentry_platform_ptrace_subprocess__unsafe.go
deleted file mode 100644
index e9914deb2ebd..000000000000
--- a/security/honeytrap/files/patch-vendor_gvisor.dev_gvisor_pkg_sentry_platform_ptrace_subprocess__unsafe.go
+++ /dev/null
@@ -1,11 +0,0 @@
---- vendor/gvisor.dev/gvisor/pkg/sentry/platform/ptrace/subprocess_unsafe.go.orig	2020-01-31 23:11:21 UTC
-+++ vendor/gvisor.dev/gvisor/pkg/sentry/platform/ptrace/subprocess_unsafe.go
-@@ -13,7 +13,7 @@
- // limitations under the License.
- 
- // +build go1.12
--// +build !go1.15
-+// +build !go1.17
- 
- // Check go:linkname function signatures when updating Go version.
- 
diff --git a/security/honeytrap/files/patch-vendor_gvisor.dev_gvisor_pkg_sentry_vfs_mount__unsafe.go b/security/honeytrap/files/patch-vendor_gvisor.dev_gvisor_pkg_sentry_vfs_mount__unsafe.go
deleted file mode 100644
index 430d8d76942a..000000000000
--- a/security/honeytrap/files/patch-vendor_gvisor.dev_gvisor_pkg_sentry_vfs_mount__unsafe.go
+++ /dev/null
@@ -1,11 +0,0 @@
---- vendor/gvisor.dev/gvisor/pkg/sentry/vfs/mount_unsafe.go.orig	2020-01-31 23:11:21 UTC
-+++ vendor/gvisor.dev/gvisor/pkg/sentry/vfs/mount_unsafe.go
-@@ -13,7 +13,7 @@
- // limitations under the License.
- 
- // +build go1.12
--// +build !go1.15
-+// +build !go1.17
- 
- // Check go:linkname function signatures when updating Go version.
- 
diff --git a/security/honeytrap/files/patch-vendor_gvisor.dev_gvisor_pkg_sleep_sleep__unsafe.go b/security/honeytrap/files/patch-vendor_gvisor.dev_gvisor_pkg_sleep_sleep__unsafe.go
deleted file mode 100644
index 83aae92765a2..000000000000
--- a/security/honeytrap/files/patch-vendor_gvisor.dev_gvisor_pkg_sleep_sleep__unsafe.go
+++ /dev/null
@@ -1,11 +0,0 @@
---- vendor/gvisor.dev/gvisor/pkg/sleep/sleep_unsafe.go.orig	2020-01-31 23:11:21 UTC
-+++ vendor/gvisor.dev/gvisor/pkg/sleep/sleep_unsafe.go
-@@ -13,7 +13,7 @@
- // limitations under the License.
- 
- // +build go1.11
--// +build !go1.15
-+// +build !go1.17
- 
- // Check go:linkname function signatures when updating Go version.
- 
diff --git a/security/honeytrap/files/patch-vendor_gvisor.dev_gvisor_pkg_sync_downgradable__rwmutex__unsafe.go b/security/honeytrap/files/patch-vendor_gvisor.dev_gvisor_pkg_sync_downgradable__rwmutex__unsafe.go
deleted file mode 100644
index 1e65b05ca9c1..000000000000
--- a/security/honeytrap/files/patch-vendor_gvisor.dev_gvisor_pkg_sync_downgradable__rwmutex__unsafe.go
+++ /dev/null
@@ -1,11 +0,0 @@
---- vendor/gvisor.dev/gvisor/pkg/sync/downgradable_rwmutex_unsafe.go.orig	2020-01-31 23:11:21 UTC
-+++ vendor/gvisor.dev/gvisor/pkg/sync/downgradable_rwmutex_unsafe.go
-@@ -4,7 +4,7 @@
- // license that can be found in the LICENSE file.
- 
- // +build go1.13
--// +build !go1.15
-+// +build !go1.17
- 
- // Check go:linkname function signatures when updating Go version.
- 
diff --git a/security/honeytrap/files/patch-vendor_gvisor.dev_gvisor_pkg_sync_memmove__unsafe.go b/security/honeytrap/files/patch-vendor_gvisor.dev_gvisor_pkg_sync_memmove__unsafe.go
deleted file mode 100644
index 1dea45d7f217..000000000000
--- a/security/honeytrap/files/patch-vendor_gvisor.dev_gvisor_pkg_sync_memmove__unsafe.go
+++ /dev/null
@@ -1,11 +0,0 @@
---- vendor/gvisor.dev/gvisor/pkg/sync/memmove_unsafe.go.orig	2020-01-31 23:11:21 UTC
-+++ vendor/gvisor.dev/gvisor/pkg/sync/memmove_unsafe.go
-@@ -4,7 +4,7 @@
- // license that can be found in the LICENSE file.
- 
- // +build go1.12
--// +build !go1.15
-+// +build !go1.17
- 
- // Check go:linkname function signatures when updating Go version.
- 
diff --git a/security/honeytrap/files/patch-vendor_gvisor.dev_gvisor_pkg_sync_tmutex__unsafe.go b/security/honeytrap/files/patch-vendor_gvisor.dev_gvisor_pkg_sync_tmutex__unsafe.go
deleted file mode 100644
index d254f8b6d6e0..000000000000
--- a/security/honeytrap/files/patch-vendor_gvisor.dev_gvisor_pkg_sync_tmutex__unsafe.go
+++ /dev/null
@@ -1,11 +0,0 @@
---- vendor/gvisor.dev/gvisor/pkg/sync/tmutex_unsafe.go.orig	2020-01-31 23:11:21 UTC
-+++ vendor/gvisor.dev/gvisor/pkg/sync/tmutex_unsafe.go
-@@ -4,7 +4,7 @@
- // license that can be found in the LICENSE file.
- 
- // +build go1.13
--// +build !go1.15
-+// +build !go1.17
- 
- // When updating the build constraint (above), check that syncMutex matches the
- // standard library sync.Mutex definition.
diff --git a/security/honeytrap/files/patch-vendor_gvisor.dev_gvisor_pkg_tcpip_link_rawfile_blockingpoll__yield__unsafe.go b/security/honeytrap/files/patch-vendor_gvisor.dev_gvisor_pkg_tcpip_link_rawfile_blockingpoll__yield__unsafe.go
deleted file mode 100644
index 1eb2a67b39d5..000000000000
--- a/security/honeytrap/files/patch-vendor_gvisor.dev_gvisor_pkg_tcpip_link_rawfile_blockingpoll__yield__unsafe.go
+++ /dev/null
@@ -1,11 +0,0 @@
---- vendor/gvisor.dev/gvisor/pkg/tcpip/link/rawfile/blockingpoll_yield_unsafe.go.orig	2020-01-31 23:11:21 UTC
-+++ vendor/gvisor.dev/gvisor/pkg/tcpip/link/rawfile/blockingpoll_yield_unsafe.go
-@@ -14,7 +14,7 @@
- 
- // +build linux,amd64 linux,arm64
- // +build go1.12
--// +build !go1.15
-+// +build !go1.17
- 
- // Check go:linkname function signatures when updating Go version.
- 
diff --git a/security/honeytrap/files/patch-vendor_gvisor.dev_gvisor_pkg_tcpip_time__unsafe.go b/security/honeytrap/files/patch-vendor_gvisor.dev_gvisor_pkg_tcpip_time__unsafe.go
deleted file mode 100644
index 7b42bc977827..000000000000
--- a/security/honeytrap/files/patch-vendor_gvisor.dev_gvisor_pkg_tcpip_time__unsafe.go
+++ /dev/null
@@ -1,11 +0,0 @@
---- vendor/gvisor.dev/gvisor/pkg/tcpip/time_unsafe.go.orig	2020-01-31 23:11:21 UTC
-+++ vendor/gvisor.dev/gvisor/pkg/tcpip/time_unsafe.go
-@@ -13,7 +13,7 @@
- // limitations under the License.
- 
- // +build go1.9
--// +build !go1.15
-+// +build !go1.17
- 
- // Check go:linkname function signatures when updating Go version.
-

More information about the dev-commits-ports-all mailing list