Index: head/security/honeytrap/Makefile =================================================================== --- head/security/honeytrap/Makefile (revision 550880) +++ head/security/honeytrap/Makefile (revision 550881) @@ -1,93 +1,93 @@ # $FreeBSD$ PORTNAME= honeytrap -DISTVERSION= g20200415 +DISTVERSION= g20200625 CATEGORIES= security -MAINTAINER= remco.verhoef@dutchsec.com -COMMENT= HoneyTrap Freebsd port +MAINTAINER= ezri.mudde@dutchsec.com +COMMENT= Framework for running, monitoring and managing honeypots LICENSE= ART20 -BROKEN= fails to build - 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_TUPLE= \ - AndreasBriese:bbloom:28f7e881ca57:andreasbriese_bbloom/vendor/github.com/AndreasBriese/bbloom \ +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 \ 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 \ 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 \ dutchcoders:gobus:ece5a7810d96:dutchcoders_gobus/vendor/github.com/dutchcoders/gobus \ eapache:go-resiliency:v1.0.0:eapache_go_resiliency/vendor/github.com/eapache/go-resiliency \ eapache:go-xerial-snappy:bb955e01b934:eapache_go_xerial_snappy/vendor/github.com/eapache/go-xerial-snappy \ eapache:queue:v1.1.0:eapache_queue/vendor/github.com/eapache/queue \ elastic:go-lumber:v0.1.0:elastic_go_lumber/vendor/github.com/elastic/go-lumber \ elazarl:go-bindata-assetfs:38087fe4dafb:elazarl_go_bindata_assetfs/vendor/github.com/elazarl/go-bindata-assetfs \ fatih:color:v1.6.0:fatih_color/vendor/github.com/fatih/color \ 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: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: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: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 \ mailru:easyjson:32fa128f234d:mailru_easyjson/vendor/github.com/mailru/easyjson \ mattn:go-colorable:v0.0.9:mattn_go_colorable/vendor/github.com/mattn/go-colorable \ mattn:go-isatty:v0.0.3:mattn_go_isatty/vendor/github.com/mattn/go-isatty \ miekg:dns:v1.0.4:miekg_dns/vendor/github.com/miekg/dns \ mimoo:StrobeGo:43f0c284a7f9:mimoo_strobego/vendor/github.com/mimoo/StrobeGo \ mimoo:disco:15dd4b8476c9:mimoo_disco/vendor/github.com/mimoo/disco \ olivere:elastic:v5.0.65:olivere_elastic/vendor/gopkg.in/olivere/elastic.v5 \ op:go-logging:b2cb9fa56473:op_go_logging/vendor/github.com/op/go-logging \ oschwald:maxminddb-golang:v1.3.0:oschwald_maxminddb_golang/vendor/github.com/oschwald/maxminddb-golang \ pierrec:lz4:2fcda4cb7018:pierrec_lz4/vendor/github.com/pierrec/lz4 \ pierrec:xxHash:v0.1.1:pierrec_xxhash/vendor/github.com/pierrec/xxHash \ pkg:errors:v0.8.0:pkg_errors/vendor/github.com/pkg/errors \ pkg:profile:v1.2.1:pkg_profile/vendor/github.com/pkg/profile \ rcrowley:go-metrics:8732c616f529:rcrowley_go_metrics/vendor/github.com/rcrowley/go-metrics \ rs:xid:02dd45c33376:rs_xid/vendor/github.com/rs/xid \ satori:go.uuid:v1.2.0:satori_go_uuid/vendor/github.com/satori/go.uuid \ songgao:packets:549a10cd4091:songgao_packets/vendor/github.com/songgao/packets \ 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 -USERS= honeytrap -GROUPS= honeytrap +HONEYTRAP_USER?= honeytrap +HONEYTRAP_GROUP?= honeytrap +HONEYTRAP_DBDIR?= /var/db/${PORTNAME} + +USERS= ${HONEYTRAP_USER} +GROUPS= ${HONEYTRAP_GROUP} USE_RC_SUBR= honeytrap -PLIST_FILES= bin/honeytrap \ - etc/honeytrap.toml \ - "@dir(honeytrap,honeytrap,4744) /var/log/honeytrap" \ - "@dir(honeytrap,honeytrap,4744) libdata/honeytrap" +PLIST_FILES= "@sample(honeytrap,honeytrap,0600) ${ETCDIR}/honeytrap.toml.sample" \ + bin/honeytrap +SUB_LIST= GROUP=${HONEYTRAP_GROUP} \ + HONEYTRAP_DBDIR=${HONEYTRAP_DBDIR} \ + USER=${HONEYTRAP_USER} + do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKDIR}/bin/honeytrap ${STAGEDIR}${PREFIX}/bin/honeytrap - ${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 + ${MKDIR} ${STAGEDIR}${PREFIX}/etc/rc.d ${STAGEDIR}${ETCDIR} + ${INSTALL_DATA} ${FILESDIR}/honeytrap.toml ${STAGEDIR}${ETCDIR}/honeytrap.toml.sample .include Index: head/security/honeytrap/distinfo =================================================================== --- head/security/honeytrap/distinfo (revision 550880) +++ head/security/honeytrap/distinfo (revision 550881) @@ -1,115 +1,115 @@ -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 SIZE (BurntSushi-toml-v0.3.0_GH0.tar.gz) = 41554 SHA256 (Logicalis-asn1-c9c836c1a3cd_GH0.tar.gz) = 2fe9d49621a393a4bffe185162c347f8091a8e7bb2346b9a4eb63db628937b9b SIZE (Logicalis-asn1-c9c836c1a3cd_GH0.tar.gz) = 20060 SHA256 (Shopify-sarama-v1.16.0_GH0.tar.gz) = 0727859f5ad3900662e637cd9d26198e78b07b80c646600df917a8cf621f2d13 SIZE (Shopify-sarama-v1.16.0_GH0.tar.gz) = 156199 SHA256 (boltdb-bolt-v1.3.1_GH0.tar.gz) = b5ae498b780f535a5d308c188dee1329b3536275d29ad6758876084c0b8586a8 SIZE (boltdb-bolt-v1.3.1_GH0.tar.gz) = 83437 SHA256 (cenkalti-backoff-v4.0.0_GH0.tar.gz) = 976c5d645edf39b748d4941157f750849a809657435bdfea9b47b51f1fe463aa SIZE (cenkalti-backoff-v4.0.0_GH0.tar.gz) = 9317 SHA256 (davecgh-go-spew-v1.1.0_GH0.tar.gz) = 1f7e0bd2db0341925b5f2ee5834e99380f4c2b1bd36cf0fa62d7717899d39d62 SIZE (davecgh-go-spew-v1.1.0_GH0.tar.gz) = 42337 SHA256 (dgraph-io-badger-94594b20babf_GH0.tar.gz) = 433c4be89bc75022cc63c3c4e64923539bf31039d7b8c870a624372e5e7e48d0 SIZE (dgraph-io-badger-94594b20babf_GH0.tar.gz) = 1010366 SHA256 (dgryski-go-farm-2de33835d102_GH0.tar.gz) = 99bdd64a8f774ed9bd9fc466aecc16eec52c5d8e520e0c23c749d64e0fbb6b6d SIZE (dgryski-go-farm-2de33835d102_GH0.tar.gz) = 20513 SHA256 (dutchcoders-gobus-ece5a7810d96_GH0.tar.gz) = 74bb5747ff8256591732fe9bcb6cc102c12726135bc08776766687d9b451e875 SIZE (dutchcoders-gobus-ece5a7810d96_GH0.tar.gz) = 1968 SHA256 (eapache-go-resiliency-v1.0.0_GH0.tar.gz) = b4f5a9926e8b68f13e506001a9f52c1e3083a2ed171722ac857a4840d7c36486 SIZE (eapache-go-resiliency-v1.0.0_GH0.tar.gz) = 9504 SHA256 (eapache-go-xerial-snappy-bb955e01b934_GH0.tar.gz) = 14f53d673ef846d3ff8009422c941eecb7ffde75ab5e0f2f8513be23a5102848 SIZE (eapache-go-xerial-snappy-bb955e01b934_GH0.tar.gz) = 4101 SHA256 (eapache-queue-v1.1.0_GH0.tar.gz) = 2be4716ba2bba5f7c125a8fe72ba534f02cf0d7d98d3a372d4ebe54b170f7329 SIZE (eapache-queue-v1.1.0_GH0.tar.gz) = 3502 SHA256 (elastic-go-lumber-v0.1.0_GH0.tar.gz) = 7c6dd5e6f833ac91f4af5063d746db3abf80d0734bebc6c2274b193fa4822851 SIZE (elastic-go-lumber-v0.1.0_GH0.tar.gz) = 13897 SHA256 (elazarl-go-bindata-assetfs-38087fe4dafb_GH0.tar.gz) = 5cf4eb132283be75bbcda0935070e4dba82ce11c3a132a319da9d206dba72dca SIZE (elazarl-go-bindata-assetfs-38087fe4dafb_GH0.tar.gz) = 3986 SHA256 (fatih-color-v1.6.0_GH0.tar.gz) = e633b81888680274454a0a5f57b1fb9c1cedd2733007e7cb42c4b3fe5de197a3 SIZE (fatih-color-v1.6.0_GH0.tar.gz) = 816503 SHA256 (fuyufjh-splunk-hec-go-v0.3.3_GH0.tar.gz) = 75702415bb97874c6fa2684cc248ea30d53469c63a3bd3ed0ec93fa4f411f398 SIZE (fuyufjh-splunk-hec-go-v0.3.3_GH0.tar.gz) = 10202 SHA256 (glycerine-rbuf-54320fe9f6f3_GH0.tar.gz) = 8550d62758095e6a24f9f64c0a98a5837908540f13c3617796e4194d208c021d 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-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-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 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 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-protocol-219b95413db0_GH0.tar.gz) = 8dc8817bb935480222adbf115c9f73a4cf4faac4685a02e8e5699436d96b4a3f SIZE (honeytrap-protocol-219b95413db0_GH0.tar.gz) = 1071 SHA256 (klauspost-compress-v1.9.8_GH0.tar.gz) = 875db400d8bd838ce050db5931f540c17186f6ec2630420238da48be7bac1f56 SIZE (klauspost-compress-v1.9.8_GH0.tar.gz) = 16106285 SHA256 (lxc-go-lxc-2f350e4a2980_GH0.tar.gz) = 4f4623f9a1af3696e4f1ac63f946b0474b4979df3c711eba9197660e451c6179 SIZE (lxc-go-lxc-2f350e4a2980_GH0.tar.gz) = 41255 SHA256 (mailru-easyjson-32fa128f234d_GH0.tar.gz) = ead61c440ecc5b13fe250080ccfb51d1db9391af3a0616aa6647bec9eea42adb SIZE (mailru-easyjson-32fa128f234d_GH0.tar.gz) = 72859 SHA256 (mattn-go-colorable-v0.0.9_GH0.tar.gz) = 703db7bd13f84446bb06a7f075cf6b21d65b828cd6831dc9069e28b564bdfb87 SIZE (mattn-go-colorable-v0.0.9_GH0.tar.gz) = 7593 SHA256 (mattn-go-isatty-v0.0.3_GH0.tar.gz) = daf68970a6506650b05bac72082865f88d582ecdb74418b95ac5621d5392b633 SIZE (mattn-go-isatty-v0.0.3_GH0.tar.gz) = 3364 SHA256 (miekg-dns-v1.0.4_GH0.tar.gz) = d4398d5b1cc4034d806125e1b72e17662351a906f1c5c4926e5a7811061c8ff6 SIZE (miekg-dns-v1.0.4_GH0.tar.gz) = 2517695 SHA256 (mimoo-StrobeGo-43f0c284a7f9_GH0.tar.gz) = 1f3df40101cb4fee88ec6c4d618ca530505bdacc36bdef05f587fb5bad61a6bd SIZE (mimoo-StrobeGo-43f0c284a7f9_GH0.tar.gz) = 47536 SHA256 (mimoo-disco-15dd4b8476c9_GH0.tar.gz) = 4c079356b8657396b7c33267ed4401417afa4c3728799f5c4e4eff04ea2c8c17 SIZE (mimoo-disco-15dd4b8476c9_GH0.tar.gz) = 1831041 SHA256 (olivere-elastic-v5.0.65_GH0.tar.gz) = 53e7f4e9f62484894a8af12d39a9179c0bc8f85303c8a7adfae538d1c5465949 SIZE (olivere-elastic-v5.0.65_GH0.tar.gz) = 302656 SHA256 (op-go-logging-b2cb9fa56473_GH0.tar.gz) = 7374bc77c090ba614bd7b34d5cfd121dcc82e476af3b5b18f9db8b387918a260 SIZE (op-go-logging-b2cb9fa56473_GH0.tar.gz) = 35882 SHA256 (oschwald-maxminddb-golang-v1.3.0_GH0.tar.gz) = 176a45e9ebfe67d0cf3fa647778857dd2bc96bf112e39f31ce158b0437d6db05 SIZE (oschwald-maxminddb-golang-v1.3.0_GH0.tar.gz) = 17984 SHA256 (pierrec-lz4-2fcda4cb7018_GH0.tar.gz) = b3d90a7f96df7ec343dbac642d7d3a7351243b22fa427fe82632aae81457f909 SIZE (pierrec-lz4-2fcda4cb7018_GH0.tar.gz) = 12541149 SHA256 (pierrec-xxHash-v0.1.1_GH0.tar.gz) = 0824254614001ab64e7103e960104e566ceb3dbb78c773a6b3bd9ece6054f745 SIZE (pierrec-xxHash-v0.1.1_GH0.tar.gz) = 6109 SHA256 (pkg-errors-v0.8.0_GH0.tar.gz) = bacf6c58e490911398cee61742ddc6a90c560733e4c9dcb3d867b17a894c9dd5 SIZE (pkg-errors-v0.8.0_GH0.tar.gz) = 11344 SHA256 (pkg-profile-v1.2.1_GH0.tar.gz) = 21b6541e7cad44e984e9bad1dc700def6e52fa1affa38a867f32ff6a6bec3ac0 SIZE (pkg-profile-v1.2.1_GH0.tar.gz) = 5789 SHA256 (rcrowley-go-metrics-8732c616f529_GH0.tar.gz) = ac01227589ff12753633f534bc8e495dcf150cc0fb623070bd0172a1d1781b05 SIZE (rcrowley-go-metrics-8732c616f529_GH0.tar.gz) = 35623 SHA256 (rs-xid-02dd45c33376_GH0.tar.gz) = d47afa2f9740c6eb3b89180b21f6f61c61a097f5243183b84e70b6271f8bb366 SIZE (rs-xid-02dd45c33376_GH0.tar.gz) = 6714 SHA256 (satori-go.uuid-v1.2.0_GH0.tar.gz) = 6f9d9549958252d7c5a5ed1cabeedeaab7a600ca0b888a3666cce4c3590aa5a7 SIZE (satori-go.uuid-v1.2.0_GH0.tar.gz) = 8297 SHA256 (songgao-packets-549a10cd4091_GH0.tar.gz) = 15993683d3ab9d61baf14efe270c0ba06fe62a0b48621420e1d1da6bb24c85ac SIZE (songgao-packets-549a10cd4091_GH0.tar.gz) = 3517 SHA256 (songgao-water-75f112d19d5a_GH0.tar.gz) = 2df942c01e22d3a4c4036b46cfce6e29ea909dac6ff8c61848556cf0716e3582 SIZE (songgao-water-75f112d19d5a_GH0.tar.gz) = 14425 SHA256 (streadway-amqp-8e4aba63da9f_GH0.tar.gz) = b410ff90980687c896dfdaf84f02576d42d1357f822b1903834d57243dac02b1 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 Index: head/security/honeytrap/files/etc/honeytrap.toml =================================================================== --- head/security/honeytrap/files/etc/honeytrap.toml (revision 550880) +++ head/security/honeytrap/files/etc/honeytrap.toml (nonexistent) @@ -1,20 +0,0 @@ -[listener] -type="socket" - -[service.ssh-simulator] -type="ssh-simulator" -credentials=["root:root", "root:password"] - -[[port]] -ports=["tcp/8022"] -services=["ssh-simulator"] - -[channel.console] -type="console" - -[[filter]] -channel=["console"] - -[[logging]] -output="/var/log/honeytrap/logging.log" -level="debug" Property changes on: head/security/honeytrap/files/etc/honeytrap.toml ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/honeytrap/files/honeytrap.in =================================================================== --- head/security/honeytrap/files/honeytrap.in (revision 550880) +++ head/security/honeytrap/files/honeytrap.in (revision 550881) @@ -1,41 +1,88 @@ #!/bin/sh # $FreeBSD$ # # PROVIDE: honeytrap -# REQUIRE: LOGIN +# REQUIRE: NETWORKING SERVERS DAEMON # KEYWORD: shutdown + +# Add honeytrap_enable="YES" to /etc/rc.conf to enable Honeytrap + +# Additional variables you can define are: + +# honeytrap_config (path): Config file path. +# Set to %%ETCDIR%%/honeytrap.toml by default. +# honeytrap_datadir (dir): Set dir to store honeytrap data in. +# Default is "%%HONEYTRAP_DBDIR%%" +# honeytrap_logdir (dir): Set dir to store honeytrap logs in. +# Default is "/var/log/honeytrap" +# honeytrap_user (string): Set user to run honeytrap. +# Default is "%%USER%%". +# honeytrap_group (string): Set group to run honeytrap. +# Default is "%%GROUP%%". +# honeytrap_pidfile (string): Set full path to pid file +# Default is "/var/run/honeytrap.pid" +# honeytrap_syslog_output_enable (bool): Set to YES to enable syslog output +# Default is "NO". See daemon(8). +# honeytrap_syslog_output_tag (str): Set syslog tag if syslog enabled. +# Default is "honeytrap". See daemon(8). +# honeytrap_syslog_output_priority (str): Set syslog priority if syslog enabled. +# Default is "info". See daemon(8). +# honeytrap_syslog_output_facility (str): Set syslog facility if syslog enabled. +# Default is "daemon". See daemon(8). # -# Add these lines to /etc/rc.conf.local or /etc/rc.conf -# 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 -# by default. . /etc/rc.subr name=honeytrap rcvar=honeytrap_enable load_rc_config $name : ${honeytrap_enable:="NO"} -: ${honeytrap_datadir="%%PREFIX%%/libdata/honeytrap"} -: ${honeytrap_config="%%PREFIX%%/etc/honeytrap.toml"} +: ${honeytrap_config="%%ETCDIR%%/honeytrap.toml"} +: ${honeytrap_datadir:="%%HONEYTRAP_DBDIR%%"} +: ${honeytrap_logdir:="/var/log/honeytrap"} +: ${honeytrap_user:="%%USER%%"} +: ${honeytrap_group:="%%GROUP%%"} +: ${honeytrap_pidfile:="/var/run/${name}.pid"} +: ${honeytrap_syslog_output_enable:="NO"} -start_cmd="${name}_start" +pidfile=${honeytrap_pidfile} +procname="%%PREFIX%%/bin/honeytrap" +command="/usr/sbin/daemon" -honeytrap_program="%%PREFIX%%/bin/honeytrap" -honeytrap_flags="--data $honeytrap_datadir --config $honeytrap_config" -pidfile=/var/run/${name}.pid +start_precmd="honeytrap_start_precmd" -honeytrap_start() +if checkyesno honeytrap_syslog_output_enable; then + if [ -n "${honeytrap_syslog_output_tag}" ]; then + honeytrap_syslog_output_flags="-T ${honeytrap_syslog_output_tag}" + else + honeytrap_syslog_output_flags="-T ${name}" + fi + if [ -n "${honeytrap_syslog_output_priority}" ]; then + honeytrap_syslog_output_flags="${honeytrap_syslog_output_flags} -s ${honeytrap_syslog_output_priority}" + fi + + if [ -n "${honeytrap_syslog_output_facility}" ]; then + honeytrap_syslog_output_flags="${honeytrap_syslog_output_flags} -l ${honeytrap_syslog_output_facility}" + fi +fi + +command_args="-f -t ${name} ${honeytrap_syslog_output_flags} -p ${pidfile} /usr/bin/env ${honeytrap_env} ${procname} --data ${honeytrap_datadir} --config ${honeytrap_config} ${honeytrap_flags}" + +honeytrap_start_precmd() { - daemon -o /var/log/honeytrap/service.log -p $pidfile -u $name $honeytrap_program $honeytrap_flags -} + if [ ! -e ${pidfile} ]; then + install -o ${honeytrap_user} -g ${honeytrap_group} /dev/null ${pidfile} + fi + if [ ! -d ${honeytrap_datadir} ]; then + install -d -m 0750 -o ${honeytrap_user} -g ${honeytrap_group} ${honeytrap_datadir} + fi + if [ ! -d ${honeytrap_logdir} ]; then + install -d -m 0750 -o ${honeytrap_user} -g ${honeytrap_group} ${honeytrap_logdir} + fi +} + run_rc_command "$@" Index: head/security/honeytrap/files/honeytrap.toml =================================================================== --- head/security/honeytrap/files/honeytrap.toml (nonexistent) +++ head/security/honeytrap/files/honeytrap.toml (revision 550881) @@ -0,0 +1,20 @@ +[listener] +type="socket" + +[service.ssh-simulator] +type="ssh-simulator" +credentials=["root:root", "root:password"] + +[[port]] +ports=["tcp/8022"] +services=["ssh-simulator"] + +[channel.console] +type="console" + +[[filter]] +channel=["console"] + +[[logging]] +output="/var/log/honeytrap/logging.log" +level="debug" Property changes on: head/security/honeytrap/files/honeytrap.toml ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +on \ 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 Index: head/security/honeytrap/files/patch-cmd_constants.go =================================================================== --- head/security/honeytrap/files/patch-cmd_constants.go (nonexistent) +++ head/security/honeytrap/files/patch-cmd_constants.go (revision 550881) @@ -0,0 +1,21 @@ +--- cmd/constants.go.orig 2020-08-11 10:18:40 UTC ++++ cmd/constants.go +@@ -19,15 +19,12 @@ var ( + // 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: head/security/honeytrap/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 Index: head/security/honeytrap/files/patch-vendor_gvisor.dev_gvisor_pkg_sentry_platform_kvm_bluepill__unsafe.go =================================================================== --- head/security/honeytrap/files/patch-vendor_gvisor.dev_gvisor_pkg_sentry_platform_kvm_bluepill__unsafe.go (nonexistent) +++ head/security/honeytrap/files/patch-vendor_gvisor.dev_gvisor_pkg_sentry_platform_kvm_bluepill__unsafe.go (revision 550881) @@ -0,0 +1,11 @@ +--- vendor/gvisor.dev/gvisor/pkg/sentry/platform/kvm/bluepill_unsafe.go.orig 2020-08-27 10:13:09 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.16 + + // Check go:linkname function signatures when updating Go version. + Property changes on: head/security/honeytrap/files/patch-vendor_gvisor.dev_gvisor_pkg_sentry_platform_kvm_bluepill__unsafe.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 Index: head/security/honeytrap/files/patch-vendor_gvisor.dev_gvisor_pkg_sentry_platform_kvm_machine__unsafe.go =================================================================== --- head/security/honeytrap/files/patch-vendor_gvisor.dev_gvisor_pkg_sentry_platform_kvm_machine__unsafe.go (nonexistent) +++ head/security/honeytrap/files/patch-vendor_gvisor.dev_gvisor_pkg_sentry_platform_kvm_machine__unsafe.go (revision 550881) @@ -0,0 +1,11 @@ +--- vendor/gvisor.dev/gvisor/pkg/sentry/platform/kvm/machine_unsafe.go.orig 2020-08-27 10:11:57 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.16 + + // Check go:linkname function signatures when updating Go version. + Property changes on: head/security/honeytrap/files/patch-vendor_gvisor.dev_gvisor_pkg_sentry_platform_kvm_machine__unsafe.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 Index: head/security/honeytrap/files/patch-vendor_gvisor.dev_gvisor_pkg_sentry_platform_ptrace_subprocess__unsafe.go =================================================================== --- head/security/honeytrap/files/patch-vendor_gvisor.dev_gvisor_pkg_sentry_platform_ptrace_subprocess__unsafe.go (nonexistent) +++ head/security/honeytrap/files/patch-vendor_gvisor.dev_gvisor_pkg_sentry_platform_ptrace_subprocess__unsafe.go (revision 550881) @@ -0,0 +1,11 @@ +--- vendor/gvisor.dev/gvisor/pkg/sentry/platform/ptrace/subprocess_unsafe.go.orig 2020-08-27 10:10:47 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.16 + + // Check go:linkname function signatures when updating Go version. + Property changes on: head/security/honeytrap/files/patch-vendor_gvisor.dev_gvisor_pkg_sentry_platform_ptrace_subprocess__unsafe.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 Index: head/security/honeytrap/files/patch-vendor_gvisor.dev_gvisor_pkg_sentry_vfs_mount__unsafe.go =================================================================== --- head/security/honeytrap/files/patch-vendor_gvisor.dev_gvisor_pkg_sentry_vfs_mount__unsafe.go (nonexistent) +++ head/security/honeytrap/files/patch-vendor_gvisor.dev_gvisor_pkg_sentry_vfs_mount__unsafe.go (revision 550881) @@ -0,0 +1,11 @@ +--- vendor/gvisor.dev/gvisor/pkg/sentry/vfs/mount_unsafe.go.orig 2020-08-27 10:09:46 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.16 + + // Check go:linkname function signatures when updating Go version. + Property changes on: head/security/honeytrap/files/patch-vendor_gvisor.dev_gvisor_pkg_sentry_vfs_mount__unsafe.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 Index: head/security/honeytrap/files/patch-vendor_gvisor.dev_gvisor_pkg_sleep_sleep__unsafe.go =================================================================== --- head/security/honeytrap/files/patch-vendor_gvisor.dev_gvisor_pkg_sleep_sleep__unsafe.go (nonexistent) +++ head/security/honeytrap/files/patch-vendor_gvisor.dev_gvisor_pkg_sleep_sleep__unsafe.go (revision 550881) @@ -0,0 +1,11 @@ +--- vendor/gvisor.dev/gvisor/pkg/sleep/sleep_unsafe.go.orig 2020-08-27 10:03:23 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.16 + + // Check go:linkname function signatures when updating Go version. + Property changes on: head/security/honeytrap/files/patch-vendor_gvisor.dev_gvisor_pkg_sleep_sleep__unsafe.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 Index: head/security/honeytrap/files/patch-vendor_gvisor.dev_gvisor_pkg_sync_downgradable__rwmutex__unsafe.go =================================================================== --- head/security/honeytrap/files/patch-vendor_gvisor.dev_gvisor_pkg_sync_downgradable__rwmutex__unsafe.go (nonexistent) +++ head/security/honeytrap/files/patch-vendor_gvisor.dev_gvisor_pkg_sync_downgradable__rwmutex__unsafe.go (revision 550881) @@ -0,0 +1,11 @@ +--- vendor/gvisor.dev/gvisor/pkg/sync/downgradable_rwmutex_unsafe.go.orig 2020-08-27 10:03:50 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.16 + + // Check go:linkname function signatures when updating Go version. + Property changes on: head/security/honeytrap/files/patch-vendor_gvisor.dev_gvisor_pkg_sync_downgradable__rwmutex__unsafe.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 Index: head/security/honeytrap/files/patch-vendor_gvisor.dev_gvisor_pkg_sync_memmove__unsafe.go =================================================================== --- head/security/honeytrap/files/patch-vendor_gvisor.dev_gvisor_pkg_sync_memmove__unsafe.go (nonexistent) +++ head/security/honeytrap/files/patch-vendor_gvisor.dev_gvisor_pkg_sync_memmove__unsafe.go (revision 550881) @@ -0,0 +1,11 @@ +--- vendor/gvisor.dev/gvisor/pkg/sync/memmove_unsafe.go.orig 2020-08-27 10:04:54 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.16 + + // Check go:linkname function signatures when updating Go version. + Property changes on: head/security/honeytrap/files/patch-vendor_gvisor.dev_gvisor_pkg_sync_memmove__unsafe.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 Index: head/security/honeytrap/files/patch-vendor_gvisor.dev_gvisor_pkg_sync_tmutex__unsafe.go =================================================================== --- head/security/honeytrap/files/patch-vendor_gvisor.dev_gvisor_pkg_sync_tmutex__unsafe.go (nonexistent) +++ head/security/honeytrap/files/patch-vendor_gvisor.dev_gvisor_pkg_sync_tmutex__unsafe.go (revision 550881) @@ -0,0 +1,11 @@ +--- vendor/gvisor.dev/gvisor/pkg/sync/tmutex_unsafe.go.orig 2020-08-27 10:06:40 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.16 + + // When updating the build constraint (above), check that syncMutex matches the + // standard library sync.Mutex definition. Property changes on: head/security/honeytrap/files/patch-vendor_gvisor.dev_gvisor_pkg_sync_tmutex__unsafe.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 Index: head/security/honeytrap/files/patch-vendor_gvisor.dev_gvisor_pkg_tcpip_link_rawfile_blockingpoll__yield__unsafe.go =================================================================== --- head/security/honeytrap/files/patch-vendor_gvisor.dev_gvisor_pkg_tcpip_link_rawfile_blockingpoll__yield__unsafe.go (nonexistent) +++ head/security/honeytrap/files/patch-vendor_gvisor.dev_gvisor_pkg_tcpip_link_rawfile_blockingpoll__yield__unsafe.go (revision 550881) @@ -0,0 +1,11 @@ +--- vendor/gvisor.dev/gvisor/pkg/tcpip/link/rawfile/blockingpoll_yield_unsafe.go.orig 2020-08-27 10:08:00 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.16 + + // Check go:linkname function signatures when updating Go version. + Property changes on: head/security/honeytrap/files/patch-vendor_gvisor.dev_gvisor_pkg_tcpip_link_rawfile_blockingpoll__yield__unsafe.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 Index: head/security/honeytrap/files/patch-vendor_gvisor.dev_gvisor_pkg_tcpip_time__unsafe.go =================================================================== --- head/security/honeytrap/files/patch-vendor_gvisor.dev_gvisor_pkg_tcpip_time__unsafe.go (nonexistent) +++ head/security/honeytrap/files/patch-vendor_gvisor.dev_gvisor_pkg_tcpip_time__unsafe.go (revision 550881) @@ -0,0 +1,11 @@ +--- vendor/gvisor.dev/gvisor/pkg/tcpip/time_unsafe.go.orig 2020-08-27 10:08:55 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.16 + + // Check go:linkname function signatures when updating Go version. + Property changes on: head/security/honeytrap/files/patch-vendor_gvisor.dev_gvisor_pkg_tcpip_time__unsafe.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