Attachment 213601 Details for Bug 245762 – patch

[patch] patch

honeytrap-g20200415.diff (text/plain), 8.02 KB, created by ezri.mudde on 2020-04-20 12:24:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: ezri.mudde

Created: 2020-04-20 12:24:20 UTC

Size: 8.02 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 532198)
>+++ Makefile	(working copy)
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	honeytrap
>-DISTVERSION=	g20200226
>+DISTVERSION=	g20200415
> CATEGORIES=	security
> 
> MAINTAINER=	remco.verhoef@dutchsec.com
>@@ -11,7 +11,7 @@
> 
> USES=		go:modules
> USE_GITHUB=	yes
>-GH_TAGNAME=	77a150d1
>+GH_TAGNAME=	d8d94c8f
> GH_TUPLE=	\
> 		AndreasBriese:bbloom:28f7e881ca57:andreasbriese_bbloom/vendor/github.com/AndreasBriese/bbloom \
> 		BurntSushi:toml:v0.3.0:burntsushi_toml/vendor/github.com/BurntSushi/toml \
>@@ -32,17 +32,16 @@
> 		fuyufjh:splunk-hec-go:v0.3.3:fuyufjh_splunk_hec_go/vendor/github.com/fuyufjh/splunk-hec-go \
> 		glycerine:rbuf:54320fe9f6f3:glycerine_rbuf/vendor/github.com/glycerine/rbuf \
> 		go-asn1-ber:asn1-ber:379148ca0225:go_asn1_ber_asn1_ber/vendor/github.com/go-asn1-ber/asn1-ber \
>-		golang:crypto:c2843e01d9a2:golang_crypto/vendor/golang.org/x/crypto \
>-		golang:net:6afb5195e5aa:golang_net/vendor/golang.org/x/net \
>+		golang:crypto:69ecbb4d6d5d:golang_crypto/vendor/golang.org/x/crypto \
>+		golang:net:eb5bcb51f2a3:golang_net/vendor/golang.org/x/net \
> 		golang:protobuf:v1.3.1:golang_protobuf/vendor/github.com/golang/protobuf \
> 		golang:snappy:553a64147049:golang_snappy/vendor/github.com/golang/snappy \
>-		golang:sys:d0b11bdaac8a:golang_sys/vendor/golang.org/x/sys \
>+		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 \
>-		honeytrap:netstack:9ea5e4d2258f:honeytrap_netstack/vendor/github.com/google/netstack \
> 		honeytrap:protocol:219b95413db0:honeytrap_protocol/vendor/github.com/honeytrap/protocol \
> 		klauspost:compress:v1.9.8:klauspost_compress/vendor/github.com/klauspost/compress \
> 		lxc:go-lxc:2f350e4a2980:lxc_go_lxc/vendor/gopkg.in/lxc/go-lxc.v2 \
>@@ -66,9 +65,10 @@
> 		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:adb577d4a45e:vishvananda_netlink/vendor/github.com/vishvananda/netlink \
>-		vishvananda:netns:be1fbeda1936:vishvananda_netns/vendor/github.com/vishvananda/netns \
>-		yuin:gopher-lua:8bfc7677f583:yuin_gopher_lua/vendor/github.com/yuin/gopher-lua
>+		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
> 
> USERS=		honeytrap
> GROUPS=		honeytrap
>@@ -78,9 +78,6 @@
> 		"@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
>-
> do-install:
> 	${MKDIR} ${STAGEDIR}${PREFIX}/bin
> 	${INSTALL_PROGRAM} ${WRKDIR}/bin/honeytrap ${STAGEDIR}${PREFIX}/bin/honeytrap
>Index: distinfo
>===================================================================
>--- distinfo	(revision 532198)
>+++ distinfo	(working copy)
>@@ -1,6 +1,6 @@
>-TIMESTAMP = 1585981490
>-SHA256 (honeytrap-honeytrap-g20200226-77a150d1_GH0.tar.gz) = 3ed81ebc5b62f203fecc2c768efcee5fd2a3cf2e2b4c7862e5564bef26730fa6
>-SIZE (honeytrap-honeytrap-g20200226-77a150d1_GH0.tar.gz) = 377512
>+TIMESTAMP = 1587390791
>+SHA256 (honeytrap-honeytrap-g20200415-d8d94c8f_GH0.tar.gz) = f565e52e8f4bbebc3765bd2ead68b7ab141da4ef00073749ae55268290f5d13a
>+SIZE (honeytrap-honeytrap-g20200415-d8d94c8f_GH0.tar.gz) = 379014
> 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
>@@ -39,16 +39,16 @@
> SIZE (glycerine-rbuf-54320fe9f6f3_GH0.tar.gz) = 12134
> SHA256 (go-asn1-ber-asn1-ber-379148ca0225_GH0.tar.gz) = ab6b124786f841d93c6fb853d752a224c4ea8dabe150902e1a4edf39cc653b29
> SIZE (go-asn1-ber-asn1-ber-379148ca0225_GH0.tar.gz) = 12423
>-SHA256 (golang-crypto-c2843e01d9a2_GH0.tar.gz) = a4d91350f176b2ef99084cd71f990ecee5f549efed72ef59a5b9e425a00d454a
>-SIZE (golang-crypto-c2843e01d9a2_GH0.tar.gz) = 1650817
>-SHA256 (golang-net-6afb5195e5aa_GH0.tar.gz) = e326d6b33545abf9db8bb622852d66e34f0957833e4c8839f8a01309b5aa263d
>-SIZE (golang-net-6afb5195e5aa_GH0.tar.gz) = 1172285
>+SHA256 (golang-crypto-69ecbb4d6d5d_GH0.tar.gz) = 006815c146fa85ab4b28f862748df3d7866f51688d5803d015c8a397019de0f9
>+SIZE (golang-crypto-69ecbb4d6d5d_GH0.tar.gz) = 1719992
>+SHA256 (golang-net-eb5bcb51f2a3_GH0.tar.gz) = 191dd6c41872d0afa48ad594314ec60455fab7c98a2aca88ed0df28c32062348
>+SIZE (golang-net-eb5bcb51f2a3_GH0.tar.gz) = 976944
> SHA256 (golang-protobuf-v1.3.1_GH0.tar.gz) = 3f3a6123054a9847093c119895f1660612f301fe95358f3a6a1a33fd0933e6cf
> SIZE (golang-protobuf-v1.3.1_GH0.tar.gz) = 310884
> SHA256 (golang-snappy-553a64147049_GH0.tar.gz) = 7e322fd3c30642ad1297c9163f86b4775e522e9320cdda09d49bc2fe56428213
> SIZE (golang-snappy-553a64147049_GH0.tar.gz) = 62046
>-SHA256 (golang-sys-d0b11bdaac8a_GH0.tar.gz) = e7e3f36dd307e908e59dbda3864ff74f9a5d7f0fdd4d88af630e092beb7d270c
>-SIZE (golang-sys-d0b11bdaac8a_GH0.tar.gz) = 1243049
>+SHA256 (golang-sys-d101bd2416d5_GH0.tar.gz) = c1de80d233d3df630ed34bf80cbb3f186199e7b5218726abe0234520c8eddb8b
>+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
>@@ -59,8 +59,6 @@
> SIZE (gorilla-websocket-v1.2.0_GH0.tar.gz) = 42984
> SHA256 (honeytrap-honeytrap-web-02944754979e_GH0.tar.gz) = 16f1b27025a040dcd4ebad29377e846189d3e0e237458fc41b15422ed541bda6
> SIZE (honeytrap-honeytrap-web-02944754979e_GH0.tar.gz) = 1552561
>-SHA256 (honeytrap-netstack-9ea5e4d2258f_GH0.tar.gz) = c95f6e511887a6ad980e2b6c475ed75fd2c318e78677265976cb32f021960112
>-SIZE (honeytrap-netstack-9ea5e4d2258f_GH0.tar.gz) = 270923
> SHA256 (honeytrap-protocol-219b95413db0_GH0.tar.gz) = 8dc8817bb935480222adbf115c9f73a4cf4faac4685a02e8e5699436d96b4a3f
> SIZE (honeytrap-protocol-219b95413db0_GH0.tar.gz) = 1071
> SHA256 (klauspost-compress-v1.9.8_GH0.tar.gz) = 875db400d8bd838ce050db5931f540c17186f6ec2630420238da48be7bac1f56
>@@ -107,9 +105,11 @@
> 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-adb577d4a45e_GH0.tar.gz) = f40d20149265c87cd2504d4a21884a9647d0c874898118785722728c052954c1
>-SIZE (vishvananda-netlink-adb577d4a45e_GH0.tar.gz) = 136969
>-SHA256 (vishvananda-netns-be1fbeda1936_GH0.tar.gz) = ab6ca44fb17d203e673480adcc6112ceb709810afc5ae3f0fd9c09411c4e8fd5
>-SIZE (vishvananda-netns-be1fbeda1936_GH0.tar.gz) = 7777
>+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

Actions: View | Diff

Attachments on bug 245762: 213601