community/caddy: upgrade to 0.9.0 and use glide

switched to glide to create reproducable builds.
use abuild glide_init when upgrading.

3 files changed, 222 insertions, 46 deletions

diff --git a/community/caddy/APKBUILD b/community/caddy/APKBUILD
index 797d2e0155c..fad46fa3792 100644
--- a/community/caddy/APKBUILD
+++ b/community/caddy/APKBUILD
@@ -1,66 +1,42 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Carlo Landmeter <clandmeter@gmail.com>
 pkgname=caddy
-pkgver=0.8.3
-pkgrel=1
+# when updating pkgver dont forget to run glide_init
+pkgver=0.9.0
+pkgrel=0
 pkgdesc="Fast, cross-platform HTTP/2 web server with automatic HTTPS"
 url="https://caddyserver.com/"
 arch="all"
 license="ASL 2.0"
 depends="ca-certificates"
 depends_dev=""
-makedepends="$depends_dev go libcap bash"
+makedepends="$depends_dev go libcap bash glide"
 install="$pkgname.pre-install"
 subpackages=""
 pkgusers="$pkgname"
 pkggroups="$pkgname"
-source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.gz
+source="$pkgname-$pkgver.tar.gz::https://github.com/mholt/caddy/archive/v${pkgver}.tar.gz
 	$pkgname.initd
 	$pkgname.confd
 	$pkgname.conf
+	glide.yaml
+	glide.lock
 	"
-
-_disturl="dev.alpinelinux.org:/archive/$pkgname/"
-_gourl="github.com/mholt/caddy"
-_builddir="$srcdir"/src/$_gourl
-
-prepare() {
-        local i
-        cd "$_builddir"
-        for i in $source; do
-                case $i in
-                *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-                esac
-        done
-}
-
-snapshot() {
-        abuild clean && abuild deps
-        export GOPATH="$srcdir"
-        msg "Checking out v${pkgver} tag"
-        # go get will not checkout a specific tag
-	# so we run our own git checkout branch
-	git clone --quiet --branch v${pkgver} \
-		https://$_gourl $_builddir || return 1
-        cd $_builddir
-	# fetch deps
-	go get -v -d || return 1
-        cd "$srcdir"
-        tar zcf $pkgname-$pkgver.tar.gz src || return 1
-        rsync --progress -La $pkgname-$pkgver.tar.gz \
-                $_disturl || return 1
-        cd $startdir && abuild undeps
-}
+builddir="$srcdir"/caddy-$pkgver
 
 build() {
-        cd "$_builddir" || return 1
-        export GOPATH="$srcdir"
+	export GOPATH="$startdir"
+        cd "$builddir" || return 1
+        cp "$srcdir"/glide.yaml "$srcdir"/glide.lock .
+        glide install --skip-test || return 1
+        go fix || return 1
+	cd caddy
 	./build.bash || return 1
 }
 
 package() {
-	cd "$_builddir"
-	install -Dm755 ecaddy "$pkgdir"/usr/sbin/caddy || return 1
+	cd "$builddir"
+	install -Dm755 caddy/caddy "$pkgdir"/usr/sbin/caddy || return 1
 	# caddy currently does not support dropping privileges so we
 	# change attributes with setcat to allow access to priv ports
 	# https://caddyserver.com/docs/faq
@@ -76,15 +52,33 @@ package() {
 		$pkgdir/etc/$pkgname/$pkgname.conf || return 1
 }
 
-md5sums="d1b987f6d1964adc674a1e7c0b578822  caddy-0.8.3.tar.gz
+glide_init() {
+	echo $startdir
+	export GOPATH="$startdir"
+	abuild clean deps unpack prepare
+	cd $builddir
+	rm -f glide.yaml glide.lock
+	glide init --non-interactive || return 1
+	glide update || return 1
+	cp glide.yaml glide.lock $startdir
+	cd $startdir && abuild checksum clean
+}
+
+md5sums="793baba3bb1b524916f1a566554e4b2a  caddy-0.9.0.tar.gz
 8217cae6d4621dc942b15dad6a364e6a  caddy.initd
 b5f1f62ac7d59b722bdebdcc9d2a6af5  caddy.confd
-82217943769d0761c24e333e9fd51f1f  caddy.conf"
-sha256sums="bd8cdfa6568c2eb62d77c8b06dee7fdfcc4a654214c82313be7667df7bfd7069  caddy-0.8.3.tar.gz
+82217943769d0761c24e333e9fd51f1f  caddy.conf
+4356ece4c7eb3d38f212941343362e2c  glide.yaml
+ebb974a594cb861e0d6ac31bc0d33a24  glide.lock"
+sha256sums="ded8400281d5c7e3ab7765d3ee89740212e9d2b1323e111ef88f4fffc7e074b2  caddy-0.9.0.tar.gz
 c9070cce0b57cef69894f05841b1eb7eca33cf9b50af71c15e57ebf17a40af2c  caddy.initd
 61a23e879e2aa9743f631fc54a62b9c23a1944606194b9dbbbcf3f563a8998c1  caddy.confd
-08065486d87a9922464b3ae033343db27eca86d790cc0233dbb9b6666641db98  caddy.conf"
-sha512sums="185201c3d77c235921545cc2439eff0969d9d1f3a97136c8b1183ecf82479bd26be0d8b49ca5d4e46362dcdd5d763b8b3461256bd0031eafb4b3ebf3fe719494  caddy-0.8.3.tar.gz
+08065486d87a9922464b3ae033343db27eca86d790cc0233dbb9b6666641db98  caddy.conf
+9a2931210a42e5575510be6eacca0adaedb926c83936210f7ca770e6fffa8c87  glide.yaml
+99f0ec6e97a59ee41186f6107206fb3d58b99f1015f0e51cf32ab9c14be58a0c  glide.lock"
+sha512sums="fa90fe4b8803f2c94e0121b5e2d5cf2e4f38f2fd4a3732d520d105f0d36108a7c7e6acd4b520e50942e351e7a63d921fc0c62763b0c0317ef1adcb41c32f5609  caddy-0.9.0.tar.gz
 00fe095efd8d801f0c2c69832c7240858080407ea3696ca07f6b53d3304f7e2784566d8a6b447cb83d7dc4542db551f1b4fa48ff031da7e4a1d4a26e59fc05c5  caddy.initd
 7808688e92ab9950403a9b8ad29777f5bd0f75aa8cccc1d49958bb1e5af1b972dfba0c6d31931354f702a3a13933d0a1b8f28b82eed263773d71b79ec95cc15c  caddy.confd
-c24805d17234e6cf40fe1dd102c03f05cf6129d43f58f5567d540a0e4400ce89994820bb0e317f611c65459ae26bcf7110e23a8fecaae11ca78a561892b45d75  caddy.conf"
+c24805d17234e6cf40fe1dd102c03f05cf6129d43f58f5567d540a0e4400ce89994820bb0e317f611c65459ae26bcf7110e23a8fecaae11ca78a561892b45d75  caddy.conf
+597e38684bff1f8fe13d4127881d9723cb5404130e08092f6bc6b747ea7590b86291fa844f4b154e8e8126d4e92fb85ad5fdc0a3ca340c20b76cd219227b104f  glide.yaml
+0c8bd5baf27689890ac606a85650a4b2640765b1b180b5091d03c393d5a174cccd44f84e0e83ff0fbf432f72691edd4d35ebf66e7ac06ac95239d4c4c9cd7344  glide.lock"
diff --git a/community/caddy/glide.lock b/community/caddy/glide.lock
new file mode 100644
index 00000000000..56704d66ba3
--- /dev/null
+++ b/community/caddy/glide.lock
@@ -0,0 +1,124 @@
+hash: 9a2931210a42e5575510be6eacca0adaedb926c83936210f7ca770e6fffa8c87
+updated: 2016-07-30T22:01:53.078256577+02:00
+imports:
+- name: github.com/aead/chacha20
+  version: 5f68ba5d50e69593623ae5005be3bcc10d73e7ce
+  subpackages:
+  - chacha
+- name: github.com/aead/poly1305
+  version: 5b931d1d1dd3d2b588e349ba27667f18cf891e9f
+- name: github.com/BurntSushi/toml
+  version: 99064174e013895bbd9b025c31100bd1d9b590ca
+- name: github.com/dsnet/compress
+  version: b9aab3c6a04eef14c56384b4ad065e7b73438862
+  subpackages:
+  - bzip2
+  - bzip2/internal/sais
+  - internal
+  - internal/prefix
+- name: github.com/dustin/go-humanize
+  version: 2fcb5204cdc65b4bec9fd0a87606bb0d0e3c54e8
+- name: github.com/flynn/go-shlex
+  version: 3f9db97f856818214da2e1057f8ad84803971cff
+- name: github.com/gorilla/websocket
+  version: 5e2e56d5dfd46884df1036f828777ee6273f2cff
+- name: github.com/hashicorp/go-syslog
+  version: 42a2b573b664dbf281bd48c3cc12c086b17a39ba
+- name: github.com/jimstudt/http-authentication
+  version: 3eca13d6893afd7ecabe15f4445f5d2872a1b012
+  subpackages:
+  - basic
+- name: github.com/lucas-clemente/aes12
+  version: 5a3c52721c1e81aa8162601ac2342486525156d5
+- name: github.com/lucas-clemente/fnv128a
+  version: 393af48d391698c6ae4219566bfbdfef67269997
+- name: github.com/lucas-clemente/quic-go
+  version: e8a2c497e976d62e20d226327cebd31ccf8d7b4b
+  subpackages:
+  - h2quic
+  - protocol
+  - qerr
+  - utils
+  - ackhandler
+  - ackhandlerlegacy
+  - crypto
+  - flowcontrol
+  - frames
+  - handshake
+  - congestion
+- name: github.com/lucas-clemente/quic-go-certificates
+  version: 9bb36d3159787cca26dcfa15e23049615e307ef8
+- name: github.com/mholt/archiver
+  version: a075791974ee7d363104fde72b5e009515cc0def
+- name: github.com/mholt/caddy
+  version: 7157bdc79d38e203386d7e12d7065d884166c431
+  subpackages:
+  - caddy/caddymain
+  - caddyfile
+  - caddyhttp
+  - caddyhttp/basicauth
+  - caddyhttp/bind
+  - caddyhttp/browse
+  - caddyhttp/errors
+  - caddyhttp/expvar
+  - caddyhttp/extensions
+  - caddyhttp/fastcgi
+  - caddyhttp/gzip
+  - caddyhttp/header
+  - caddyhttp/httpserver
+  - caddyhttp/internalsrv
+  - caddyhttp/log
+  - caddyhttp/markdown
+  - caddyhttp/markdown/metadata
+  - caddyhttp/markdown/summary
+  - caddyhttp/mime
+  - caddyhttp/pprof
+  - caddyhttp/proxy
+  - caddyhttp/redirect
+  - caddyhttp/rewrite
+  - caddyhttp/root
+  - caddyhttp/staticfiles
+  - caddyhttp/templates
+  - caddyhttp/websocket
+  - caddytls
+  - startupshutdown
+- name: github.com/miekg/dns
+  version: db96a2b759cdef4f11a34506a42eb8d1290c598e
+- name: github.com/nwaples/rardecode
+  version: f94841372ddc36be531a5c3e1206238e32e93d74
+- name: github.com/russross/blackfriday
+  version: 93622da34e54fb6529bfb7c57e710f37a8d9cbd8
+- name: github.com/shurcooL/sanitized_anchor_name
+  version: 10ef21a441db47d8b13ebcc5fd2310f636973c77
+- name: github.com/xenolf/lego
+  version: 5720cba2c972d1eb982fdf65d11021c1d8370193
+  subpackages:
+  - acme
+- name: golang.org/x/crypto
+  version: bc89c496413265e715159bdc8478ee9a92fdc265
+  subpackages:
+  - ocsp
+  - curve25519
+  - hkdf
+- name: golang.org/x/net
+  version: 6a513affb38dc9788b449d59ffed099b8de18fa0
+  subpackages:
+  - publicsuffix
+  - http2
+  - http2/hpack
+  - lex/httplex
+  - websocket
+- name: gopkg.in/natefinch/lumberjack.v2
+  version: 514cbda263a734ae8caac038dadf05f8f3f9f738
+- name: gopkg.in/square/go-jose.v1
+  version: e3f973b66b91445ec816dd7411ad1b6495a5a2fc
+  subpackages:
+  - cipher
+  - json
+- name: gopkg.in/yaml.v2
+  version: e4d366fc3c7938e2958e662b4258c7a89e1f0e3e
+testImports:
+- name: golang.org/x/net
+  version: 6a513affb38dc9788b449d59ffed099b8de18fa0
+  subpackages:
+  - websocket
diff --git a/community/caddy/glide.yaml b/community/caddy/glide.yaml
new file mode 100644
index 00000000000..68d4e52cae3
--- /dev/null
+++ b/community/caddy/glide.yaml
@@ -0,0 +1,58 @@
+package: caddy-0.9.0
+import:
+- package: github.com/BurntSushi/toml
+- package: github.com/dustin/go-humanize
+- package: github.com/flynn/go-shlex
+- package: github.com/gorilla/websocket
+- package: github.com/hashicorp/go-syslog
+- package: github.com/jimstudt/http-authentication
+  subpackages:
+  - basic
+- package: github.com/lucas-clemente/quic-go
+  subpackages:
+  - h2quic
+- package: github.com/mholt/archiver
+- package: github.com/mholt/caddy
+  subpackages:
+  - caddy/caddymain
+  - caddyfile
+  - caddyhttp
+  - caddyhttp/basicauth
+  - caddyhttp/bind
+  - caddyhttp/browse
+  - caddyhttp/errors
+  - caddyhttp/expvar
+  - caddyhttp/extensions
+  - caddyhttp/fastcgi
+  - caddyhttp/gzip
+  - caddyhttp/header
+  - caddyhttp/httpserver
+  - caddyhttp/internalsrv
+  - caddyhttp/log
+  - caddyhttp/markdown
+  - caddyhttp/markdown/metadata
+  - caddyhttp/markdown/summary
+  - caddyhttp/mime
+  - caddyhttp/pprof
+  - caddyhttp/proxy
+  - caddyhttp/redirect
+  - caddyhttp/rewrite
+  - caddyhttp/root
+  - caddyhttp/staticfiles
+  - caddyhttp/templates
+  - caddyhttp/websocket
+  - caddytls
+  - startupshutdown
+- package: github.com/russross/blackfriday
+- package: github.com/xenolf/lego
+  subpackages:
+  - acme
+- package: golang.org/x/crypto
+  subpackages:
+  - ocsp
+- package: gopkg.in/natefinch/lumberjack.v2
+- package: gopkg.in/yaml.v2
+testImport:
+- package: golang.org/x/net
+  subpackages:
+  - websocket