Index: UIDs
===================================================================
--- UIDs	(revision 493439)
+++ UIDs	(working copy)
@@ -550,7 +550,7 @@
 _pkcs11:*:602:602:daemon:0:0:opencryptoki user:/var/empty:/usr/sbin/nologin
 _acme:*:603:603::0:0:ACME client user:/var/empty:/usr/sbin/nologin
 # free: 604
-# free: 605
+_hockeypuck:*:605:605::0:0:hockeypuck pgp keyserver user:/var/empty:/usr/sbin/nologin
 # free: 606
 # free: 607
 # free: 608
Index: GIDs
===================================================================
--- GIDs	(revision 493439)
+++ GIDs	(working copy)
@@ -545,7 +545,7 @@
 _pkcs11:*:602:
 _acme:*:603:
 # free: 604
-# free: 605
+_hockeypuck:*:605:
 # free: 606
 # free: 607
 # free: 608
Index: security/Makefile
===================================================================
--- security/Makefile	(revision 493439)
+++ security/Makefile	(working copy)
@@ -215,6 +215,7 @@
     SUBDIR += hitch
     SUBDIR += hlfl
     SUBDIR += hmap
+    SUBDIR += hockeypuck
     SUBDIR += honeybadger
     SUBDIR += honggfuzz
     SUBDIR += hotssh
Index: security/hockeypuck/Makefile
===================================================================
--- security/hockeypuck/Makefile	(nonexistent)
+++ security/hockeypuck/Makefile	(working copy)
@@ -0,0 +1,50 @@
+# Created by: Michiel van Baak <michiel@vanbaak.eu
+# $FreeBSD$
+
+PORTNAME=	hockeypuck
+DISTVERSION=	g20180725
+CATEGORIES=	security
+
+MAINTAINER=	michiel@vanbaak.eu
+COMMENT=	Synchronizing Key Server, a fast OpenPGP keyserver
+
+LICENSE=	GPLv3+
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+USES=		go
+
+GO_PKGNAME=	github.com/hockeypuck/server
+GO_BUILDFLAGS=	-ldflags "-X github.com/hockeypuck/server.version=${PORTVERSION}"
+GO_TARGET=	github.com/hockeypuck/server/cmd/hockeypuck \
+		github.com/hockeypuck/server/cmd/hockeypuck-dump \
+		github.com/hockeypuck/server/cmd/hockeypuck-load \
+		github.com/hockeypuck/server/cmd/hockeypuck-pbuild
+
+USE_GITHUB=	yes
+
+GH_PROJECT=	server
+GH_TAGNAME=	16d0faf
+GH_TUPLE=	golang:crypto:24ffb5feb3312a39054178a4b0a4554fc2201248:gocrypto/vendor/golang.org/x/crypto \
+		BurntSushi:toml:056c9bc7be7190eaa7715723883caffa5f8fa3e4:toml/vendor/github.com/BurntSushi/toml \
+		carbocation:interpose:50c09d12f8624ab10532f931cb630d0bf5f7c2c7:interpose/vendor/github.com/carbocation/interpose \
+		julienschmidt:httprouter:8c199fb6259ffc1af525cc3ad52ee60ba8359669:httprouter/vendor/github.com/julienschmidt/httprouter \
+		lib:pq:93e9980741c9e593411b94e07d5bad8cfb4809db:pq/vendor/github.com/lib/pq \
+		syndtr:goleveldb:012f65f74744ed62a80abac6e9a8c86e71c2b6fa:goleveldb/vendor/github.com/syndtr/goleveldb \
+		syndtr:gosnappy:156a073208e131d7d2e212cb749feae7c339e846:gosnappy/vendor/github.com/syndtr/gosnappy \
+		go-basen:basen:c8826fd23a9b8fee76fd0c3c5ac34a44cc15dc75:basen/vendor/gopkg.in/basen.v1 \
+		go-errgo:errgo:81357a83344ddd9f7772884874e5622c2a3da21c:errgo/vendor/gopkg.in/errgo.v1 \
+		go-mgo:mgo:c6a7dce14133ccac2dcac3793f1d6e2ef048503a:mgo/vendor/gopkg.in/mgo.v2 \
+		go-tomb:tomb:14b3d72120e8d10ea6e6b7f87f7175734b1faab8:tomb/vendor/gopkg.in/tomb.v2 \
+		hockeypuck:conflux:aa90c9a973df4ce6f26a9a8eda5418d35ef647d2:conflux/vendor/gopkg.in/hockeypuck/conflux.v2 \
+		hockeypuck:hkp:148cf10d066b925e0331ba77e5b86c65865ba1eb:hkp/vendor/gopkg.in/hockeypuck/hkp.v1 \
+		hockeypuck:logrus:55eb11d21d2a31a3cc93838241d04800f52e823d:logrus/vendor/gopkg.in/hockeypuck/logrus.v0 \
+		hockeypuck:mgohkp:315bc3b0e2bb701822b0445b1ebb02ee9a2c0aa9:mgohk/vendor/gopkg.in/hockeypuck/mgohkp.v1 \
+		hockeypuck:openpgp:24bbf23d26ff51ca7a8e051998a8da67b6043689:openpgp/vendor/gopkg.in/hockeypuck/openpgp.v1 \
+		hockeypuck:pghkp:098cd7e4f3ec817e44b90dcc2833a84f736f6042:pghkp/vendor/gopkg.in/hockeypuck/pghkp.v1 \
+
+USE_RC_SUBR=	hockeypuck
+
+USERS=		_hockeypuck
+GROUPS=		_hockeypuck
+
+.include <bsd.port.mk>

Property changes on: security/hockeypuck/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: security/hockeypuck/distinfo
===================================================================
--- security/hockeypuck/distinfo	(nonexistent)
+++ security/hockeypuck/distinfo	(working copy)
@@ -0,0 +1,37 @@
+TIMESTAMP = 1550709376
+SHA256 (hockeypuck-server-g20180725-16d0faf_GH0.tar.gz) = e1d4d7f6c5dd8a7bc62dd0464c79cc30db5e7e619e3d4b428b36bddafbf3acb1
+SIZE (hockeypuck-server-g20180725-16d0faf_GH0.tar.gz) = 217194
+SHA256 (golang-crypto-24ffb5feb3312a39054178a4b0a4554fc2201248_GH0.tar.gz) = ecc91295529e5c9a54b1fdaf4bd982bca654c296770332716023ce6ef62d4ac2
+SIZE (golang-crypto-24ffb5feb3312a39054178a4b0a4554fc2201248_GH0.tar.gz) = 864553
+SHA256 (BurntSushi-toml-056c9bc7be7190eaa7715723883caffa5f8fa3e4_GH0.tar.gz) = d7de08bc388663e38b3a03679c2d8d58b64a9cbe4b6e52add0fb1eda7117d4dd
+SIZE (BurntSushi-toml-056c9bc7be7190eaa7715723883caffa5f8fa3e4_GH0.tar.gz) = 37110
+SHA256 (carbocation-interpose-50c09d12f8624ab10532f931cb630d0bf5f7c2c7_GH0.tar.gz) = bdb3276196707eb2493195d84529f5dc8091fad39b12ed8b9cf5fd014fd12c3d
+SIZE (carbocation-interpose-50c09d12f8624ab10532f931cb630d0bf5f7c2c7_GH0.tar.gz) = 12704
+SHA256 (julienschmidt-httprouter-8c199fb6259ffc1af525cc3ad52ee60ba8359669_GH0.tar.gz) = 6d18f3d3fb5c385ea5c22ada6b0c4403dd3739dd791cc9fb9b18098548203b56
+SIZE (julienschmidt-httprouter-8c199fb6259ffc1af525cc3ad52ee60ba8359669_GH0.tar.gz) = 19966
+SHA256 (lib-pq-93e9980741c9e593411b94e07d5bad8cfb4809db_GH0.tar.gz) = cf17825fc42462a7c2237ed4245c161b8a3283f982561f63c17e7552213ec899
+SIZE (lib-pq-93e9980741c9e593411b94e07d5bad8cfb4809db_GH0.tar.gz) = 64406
+SHA256 (syndtr-goleveldb-012f65f74744ed62a80abac6e9a8c86e71c2b6fa_GH0.tar.gz) = a104b6661dd41b7efa5bcb9a4afa55460122a2de06389e609c99306d0261714d
+SIZE (syndtr-goleveldb-012f65f74744ed62a80abac6e9a8c86e71c2b6fa_GH0.tar.gz) = 129537
+SHA256 (syndtr-gosnappy-156a073208e131d7d2e212cb749feae7c339e846_GH0.tar.gz) = c580b208ff9f3656536a54a525544ba1974507a8c3982fc924681bc97b8bd5e8
+SIZE (syndtr-gosnappy-156a073208e131d7d2e212cb749feae7c339e846_GH0.tar.gz) = 10315
+SHA256 (go-basen-basen-c8826fd23a9b8fee76fd0c3c5ac34a44cc15dc75_GH0.tar.gz) = db494a1414c4b1f20555c40786f8406801c974e30bcef977cbc8cf99814f724d
+SIZE (go-basen-basen-c8826fd23a9b8fee76fd0c3c5ac34a44cc15dc75_GH0.tar.gz) = 4142
+SHA256 (go-errgo-errgo-81357a83344ddd9f7772884874e5622c2a3da21c_GH0.tar.gz) = fa5f0947cb1d54c5ce13118992847262344501f4c58cd34c807097c1d12b410c
+SIZE (go-errgo-errgo-81357a83344ddd9f7772884874e5622c2a3da21c_GH0.tar.gz) = 7289
+SHA256 (go-mgo-mgo-c6a7dce14133ccac2dcac3793f1d6e2ef048503a_GH0.tar.gz) = 546cad1b39b51b915d87b3ec35811ae09320c5a988a861caf3cc4a817cb8bb0d
+SIZE (go-mgo-mgo-c6a7dce14133ccac2dcac3793f1d6e2ef048503a_GH0.tar.gz) = 150189
+SHA256 (go-tomb-tomb-14b3d72120e8d10ea6e6b7f87f7175734b1faab8_GH0.tar.gz) = 1920b356401fdd9675baafb540dcce9ae6a31e05c2b2c1548344fc506cc06c5c
+SIZE (go-tomb-tomb-14b3d72120e8d10ea6e6b7f87f7175734b1faab8_GH0.tar.gz) = 4053
+SHA256 (hockeypuck-conflux-aa90c9a973df4ce6f26a9a8eda5418d35ef647d2_GH0.tar.gz) = 62b83b3aafda652cc288dc1b5874406d04568c9ef9a4186705517ab4760b1d2a
+SIZE (hockeypuck-conflux-aa90c9a973df4ce6f26a9a8eda5418d35ef647d2_GH0.tar.gz) = 365665
+SHA256 (hockeypuck-hkp-148cf10d066b925e0331ba77e5b86c65865ba1eb_GH0.tar.gz) = 39b42937c58f87e6880ab58249412183d32fb797b2b385065943c3a480482b57
+SIZE (hockeypuck-hkp-148cf10d066b925e0331ba77e5b86c65865ba1eb_GH0.tar.gz) = 27193
+SHA256 (hockeypuck-logrus-55eb11d21d2a31a3cc93838241d04800f52e823d_GH0.tar.gz) = 548dbbe68869b7ec179687337158a64c570b57d36161378ebd4b2d497a20918e
+SIZE (hockeypuck-logrus-55eb11d21d2a31a3cc93838241d04800f52e823d_GH0.tar.gz) = 23877
+SHA256 (hockeypuck-mgohkp-315bc3b0e2bb701822b0445b1ebb02ee9a2c0aa9_GH0.tar.gz) = 32fb60172b1ac775442e660968d86697360d64ddb4d35d80f515ed00dfdd0de4
+SIZE (hockeypuck-mgohkp-315bc3b0e2bb701822b0445b1ebb02ee9a2c0aa9_GH0.tar.gz) = 16950
+SHA256 (hockeypuck-openpgp-24bbf23d26ff51ca7a8e051998a8da67b6043689_GH0.tar.gz) = d0e355de27425b97896084ac40a7b50cae05d70bb68acbd9a25f73a935133e41
+SIZE (hockeypuck-openpgp-24bbf23d26ff51ca7a8e051998a8da67b6043689_GH0.tar.gz) = 26312
+SHA256 (hockeypuck-pghkp-098cd7e4f3ec817e44b90dcc2833a84f736f6042_GH0.tar.gz) = b05366e06d791e920d2ff23ec01a58123d6eb37e3445d3b37ce2c161007c91af
+SIZE (hockeypuck-pghkp-098cd7e4f3ec817e44b90dcc2833a84f736f6042_GH0.tar.gz) = 17541

Property changes on: security/hockeypuck/distinfo
___________________________________________________________________
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: security/hockeypuck/files/hockeypuck.in
===================================================================
--- security/hockeypuck/files/hockeypuck.in	(nonexistent)
+++ security/hockeypuck/files/hockeypuck.in	(working copy)
@@ -0,0 +1,25 @@
+#!/bin/sh
+# Created by: Michiel van Baak <michiel@vanbaak.eu>
+#
+# $FreeBSD$
+#
+# PROVIDE: hockeypuck
+# REQUIRE: DAEMON
+
+. /etc/rc.subr
+
+name="hockeypuck"
+rcvar=hockeypuck_enable
+load_rc_config $name
+
+: ${hockeypuck_enable:=NO}
+: ${hockeypuck_user="_sks"}
+: ${hockeypuck_group="_sks"}
+
+command="/usr/local/bin/hockeypuck"
+command_args="--config /usr/local/etc/hockeypuck.conf"
+pidfile="/var/run/hockeypuck.pid"
+
+start_cmd="/usr/sbin/daemon -f -p ${pidfile} -u ${hockeypuck_user} ${command} ${command_args}"
+
+run_rc_command "$1"

Property changes on: security/hockeypuck/files/hockeypuck.in
___________________________________________________________________
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: security/hockeypuck/pkg-descr
===================================================================
--- security/hockeypuck/pkg-descr	(nonexistent)
+++ security/hockeypuck/pkg-descr	(working copy)
@@ -0,0 +1,10 @@
+Hockeypuck implements the HKP draft protocol specification,
+as well as several extensions to the protocol supported by SKS.
+
+Public key material conforming to RFC 4880 is supported by the keyserver,
+as are RFC 6637 ECC keys.
+As-of-yet unsupported key material, such as recent Ed25519 signing keys,
+may be distributed by Hockeypuck, however Hockeypuck is not able to
+validate them yet.
+
+WWW: https://hockeypuck.github.io

Property changes on: security/hockeypuck/pkg-descr
___________________________________________________________________
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: security/hockeypuck/pkg-message
===================================================================
--- security/hockeypuck/pkg-message	(nonexistent)
+++ security/hockeypuck/pkg-message	(working copy)
@@ -0,0 +1,9 @@
+
+Hockeypuck needs a configuration file before it can be used.
+For more information about configuration details see:
+https://hockeypuck.github.io/configuration.html
+
+If this hockeypuck install is to be used in the sks-keyserver.net pools
+it needs to be populated with a current dump of the keys in the network.
+For more information on populating the database see:
+https://hockeypuck.github.io/populating.html

Property changes on: security/hockeypuck/pkg-message
___________________________________________________________________
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: security/hockeypuck/pkg-plist
===================================================================
--- security/hockeypuck/pkg-plist	(nonexistent)
+++ security/hockeypuck/pkg-plist	(working copy)
@@ -0,0 +1,4 @@
+bin/hockeypuck
+bin/hockeypuck-dump
+bin/hockeypuck-load
+bin/hockeypuck-pbuild

Property changes on: security/hockeypuck/pkg-plist
___________________________________________________________________
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