community/caddy: upgrade to 0.10.6

3 files changed, 24 insertions, 239 deletions

diff --git a/community/caddy/APKBUILD b/community/caddy/APKBUILD
index 8160d5750f..c2b8ec3f39 100644
--- a/community/caddy/APKBUILD
+++ b/community/caddy/APKBUILD
@@ -1,16 +1,14 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Carlo Landmeter <clandmeter@gmail.com>
 pkgname=caddy
-# When updating pkgver don't forget to run glide_init.
-pkgver=0.9.3
-_vcheck="0.9.3"
-pkgrel=1
+pkgver=0.10.6
+pkgrel=0
 pkgdesc="Fast, cross-platform HTTP/2 web server with automatic HTTPS"
 url="https://caddyserver.com/"
 arch="all !s390x"
 license="ASL 2.0"
 depends="ca-certificates"
-makedepends="go libcap bash glide"
+makedepends="go libcap bash"
 install="$pkgname.pre-install"
 pkgusers="$pkgname"
 pkggroups="$pkgname"
@@ -18,77 +16,52 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/mholt/$pkgname/archive/v$pkg
 	$pkgname.initd
 	$pkgname.confd
 	$pkgname.conf
-	glide.yaml
-	glide.lock
 	"
-builddir="$srcdir/$pkgname-$pkgver"
+builddir="$srcdir/src/github.com/mholt/$pkgname"
 
 prepare() {
-	# prevent abump to auto update this pkg.
-	[ "$pkgver" = "$_vcheck" ] || error "Please run glide_init and update _vcheck"
-	default_prepare || return 1
+        mkdir -p ${builddir%/*}
+        mv "$srcdir"/$pkgname-$pkgver "$builddir"/
+        cd "$builddir"
+        default_prepare
 }
 
 build() {
-	export GOPATH="$startdir"
-	cd "$builddir"
-	cp "$srcdir"/glide.yaml "$srcdir"/glide.lock .
-	glide install --skip-test || return 1
-	cd caddy && ./build.bash || return 1
+        cd "$builddir"/caddy
+        export GOPATH="$srcdir"
+	go build -v -o caddy -ldflags \
+		"-X github.com/mholt/caddy/caddy/caddymain.gitTag=$pkgver"
+}
+
+check() {
+	"$builddir"/caddy/caddy -version > /dev/null
 }
 
 package() {
 	cd "$builddir"
 
-	install -Dm755 caddy/caddy "$pkgdir"/usr/sbin/caddy || return 1
+	install -Dm755 caddy/caddy "$pkgdir"/usr/sbin/caddy
 
 	# caddy currently does not support dropping privileges so we
 	# change attributes with setcat to allow access to priv ports
 	# https://caddyserver.com/docs/faq
 	setcap cap_net_bind_service=+ep \
-		"$pkgdir"/usr/sbin/caddy || return 1
+		"$pkgdir"/usr/sbin/caddy
 
 	install -d -o caddy -g caddy \
 		"$pkgdir"/var/lib/caddy \
 		"$pkgdir"/etc/caddy \
-		"$pkgdir"/var/www || return 1
+		"$pkgdir"/var/www
 
 	install -Dm755 "$srcdir"/$pkgname.initd \
-		"$pkgdir"/etc/init.d/$pkgname || return 1
+		"$pkgdir"/etc/init.d/$pkgname
 	install -Dm644 "$srcdir"/$pkgname.confd \
-		"$pkgdir"/etc/conf.d/$pkgname || return 1
+		"$pkgdir"/etc/conf.d/$pkgname
 	install -Dm644 "$srcdir"/$pkgname.conf \
-		"$pkgdir"/etc/$pkgname/$pkgname.conf || return 1
-}
-
-glide_init() {
-	# caddy does not handle versioned dependencies.
-	# we calculate them with glide and lock them.
-	abuild clean deps unpack prepare
-	cd "$builddir"
-	export GOPATH="$startdir"
-	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
+		"$pkgdir"/etc/$pkgname/$pkgname.conf
 }
 
-md5sums="d63e1ac220a6abddf9e21c5cf02b95d9  caddy-0.9.3.tar.gz
-8217cae6d4621dc942b15dad6a364e6a  caddy.initd
-b5f1f62ac7d59b722bdebdcc9d2a6af5  caddy.confd
-82217943769d0761c24e333e9fd51f1f  caddy.conf
-5c6ceee23c8bb64de0106b3a922090f1  glide.yaml
-c8d945904c94350efe80bb62028feb7e  glide.lock"
-sha256sums="ec2f6e708262f6474a48a3503a1fbfb6e05e050772c0639ec823edda5e467668  caddy-0.9.3.tar.gz
-c9070cce0b57cef69894f05841b1eb7eca33cf9b50af71c15e57ebf17a40af2c  caddy.initd
-61a23e879e2aa9743f631fc54a62b9c23a1944606194b9dbbbcf3f563a8998c1  caddy.confd
-08065486d87a9922464b3ae033343db27eca86d790cc0233dbb9b6666641db98  caddy.conf
-1e6a02c40eb314944c34d47d8e13f46d7aa8dc6e8517bb2f0a57e1ff6472bbb6  glide.yaml
-0f690f6e147d91c7db9ebd8e32697436d803498654a365cf21f79aba4cc308ef  glide.lock"
-sha512sums="90a797e727f132c0c70fc9d9d973f37fc5c678668f8776e4f9598a2316ca231dde92076b723dad53f07f11827e1ecf04d2d012b485213959e79b7dbde86c1d20  caddy-0.9.3.tar.gz
+sha512sums="21c72ff1f018467104059533bc9ced765b1bf3a625e180907781c190c34fb62cf1f58a7bbec26a71bf4a2ce89fa228e0c4f9a0b3f10af4928fd5b2cdd5980edd  caddy-0.10.6.tar.gz
 00fe095efd8d801f0c2c69832c7240858080407ea3696ca07f6b53d3304f7e2784566d8a6b447cb83d7dc4542db551f1b4fa48ff031da7e4a1d4a26e59fc05c5  caddy.initd
 7808688e92ab9950403a9b8ad29777f5bd0f75aa8cccc1d49958bb1e5af1b972dfba0c6d31931354f702a3a13933d0a1b8f28b82eed263773d71b79ec95cc15c  caddy.confd
-c24805d17234e6cf40fe1dd102c03f05cf6129d43f58f5567d540a0e4400ce89994820bb0e317f611c65459ae26bcf7110e23a8fecaae11ca78a561892b45d75  caddy.conf
-ba28f42636fd4e4681f62cbf3246d6f5574ecfa9dad6f8d366f119a428b877610ecfe8c33c53f1733f029b7348b34f15815cf73c33d2e1e4904d80ff8408e05c  glide.yaml
-ee251f44e940b269f421567e1faa51d8ea47f3b8488125353eafeb07ae74add41284493b6665b7416a47ba15e1d920b2ea233f5c13846ca73eaf637ac19bd4c7  glide.lock"
+c24805d17234e6cf40fe1dd102c03f05cf6129d43f58f5567d540a0e4400ce89994820bb0e317f611c65459ae26bcf7110e23a8fecaae11ca78a561892b45d75  caddy.conf"
diff --git a/community/caddy/glide.lock b/community/caddy/glide.lock
deleted file mode 100644
index 863c433699..0000000000
--- a/community/caddy/glide.lock
+++ /dev/null
@@ -1,129 +0,0 @@
-hash: 1e6a02c40eb314944c34d47d8e13f46d7aa8dc6e8517bb2f0a57e1ff6472bbb6
-updated: 2016-11-07T11:11:53.388790064+01:00
-imports:
-- name: github.com/aead/chacha20
-  version: 7e1038a97ad08a9a16cb88ed7a6778b366ba4d99
-  subpackages:
-  - chacha
-- name: github.com/aead/poly1305
-  version: 7ab7663051fa9fa57de391f966a859e781d48b0a
-- name: github.com/dsnet/compress
-  version: b9aab3c6a04eef14c56384b4ad065e7b73438862
-  subpackages:
-  - bzip2
-  - bzip2/internal/sais
-  - internal
-  - internal/prefix
-- name: github.com/dustin/go-humanize
-  version: bd88f87ad3a420f7bcf05e90566fd1ceb351fa7f
-- name: github.com/flynn/go-shlex
-  version: 3f9db97f856818214da2e1057f8ad84803971cff
-- name: github.com/gorilla/websocket
-  version: 9fbf129ff2a3cf2467f7d0021de2eb4d3aecc109
-- name: github.com/hashicorp/go-syslog
-  version: 315de0c1920b18b942603ffdc2229e2af4803c17
-- name: github.com/hashicorp/golang-lru
-  version: 0a025b7e63adc15a622f29b0b2c4c3848243bbf6
-  subpackages:
-  - simplelru
-- name: github.com/jimstudt/http-authentication
-  version: 3eca13d6893afd7ecabe15f4445f5d2872a1b012
-  subpackages:
-  - basic
-- name: github.com/lucas-clemente/aes12
-  version: 8ee5b5610baca43b60ecfad586b3c40d92a96e0c
-- name: github.com/lucas-clemente/fnv128a
-  version: 393af48d391698c6ae4219566bfbdfef67269997
-- name: github.com/lucas-clemente/quic-go
-  version: 0d6356d9d80226bbd18634d461cdc1d1a81c08bf
-  subpackages:
-  - ackhandler
-  - congestion
-  - crypto
-  - flowcontrol
-  - frames
-  - h2quic
-  - handshake
-  - protocol
-  - qerr
-  - utils
-- name: github.com/lucas-clemente/quic-go-certificates
-  version: d2f86524cced5186554df90d92529757d22c1cb6
-- name: github.com/mholt/archiver
-  version: 4a8a092653655d29c8e091cf2ecf91cbe697f0de
-- name: github.com/mholt/caddy
-  version: 0cdaaba4b87da8a72c0591ee301bb50df94a6371
-  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/maxrequestbody
-  - caddyhttp/mime
-  - caddyhttp/pprof
-  - caddyhttp/proxy
-  - caddyhttp/redirect
-  - caddyhttp/rewrite
-  - caddyhttp/root
-  - caddyhttp/staticfiles
-  - caddyhttp/status
-  - caddyhttp/templates
-  - caddyhttp/websocket
-  - caddytls
-  - startupshutdown
-- name: github.com/miekg/dns
-  version: 58f52c57ce9df13460ac68200cef30a008b9c468
-- name: github.com/naoina/go-stringutil
-  version: 6b638e95a32d0c1131db0e7fe83775cbea4a0d0b
-- name: github.com/naoina/toml
-  version: 751171607256bb66e64c9f0220c00662420c38e9
-  subpackages:
-  - ast
-- 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: 7615653a085a8e71beaf29911eefb2c8ad83daa6
-  subpackages:
-  - acme
-- name: golang.org/x/crypto
-  version: bc89c496413265e715159bdc8478ee9a92fdc265
-  subpackages:
-  - curve25519
-  - hkdf
-  - ocsp
-- name: golang.org/x/net
-  version: 57bfaa875b96fb91b4766077f34470528d4b03e9
-  subpackages:
-  - http2
-  - http2/hpack
-  - lex/httplex
-  - publicsuffix
-  - websocket
-- name: gopkg.in/natefinch/lumberjack.v2
-  version: dd45e6a67c53f673bb49ca8a001fd3a63ceb640e
-- name: gopkg.in/square/go-jose.v1
-  version: aa2e30fdd1fe9dd3394119af66451ae790d50e0d
-  subpackages:
-  - cipher
-  - json
-- name: gopkg.in/yaml.v2
-  version: a5b47d31c556af34a302ce5d659e6fea44d90de0
-testImports: []
diff --git a/community/caddy/glide.yaml b/community/caddy/glide.yaml
deleted file mode 100644
index 5364012f34..0000000000
--- a/community/caddy/glide.yaml
+++ /dev/null
@@ -1,59 +0,0 @@
-package: caddy-0.9.3
-import:
-- 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/status
-  - caddyhttp/templates
-  - caddyhttp/websocket
-  - caddytls
-  - startupshutdown
-- package: github.com/naoina/toml
-- 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