From 77a343441b0c3aad6bb5da86bb5677bd0a113562 Mon Sep 17 00:00:00 2001 From: Carlo Landmeter Date: Mon, 7 Nov 2016 11:16:27 +0100 Subject: community/caddy: upgrade to 0.9.3 --- community/caddy/APKBUILD | 41 +++++++++++++++---------------- community/caddy/glide.lock | 60 +++++++++++++++++++++------------------------- community/caddy/glide.yaml | 5 ++-- 3 files changed, 51 insertions(+), 55 deletions(-) (limited to 'community/caddy') diff --git a/community/caddy/APKBUILD b/community/caddy/APKBUILD index 4aadf592ef1..fcbdfef8c19 100644 --- a/community/caddy/APKBUILD +++ b/community/caddy/APKBUILD @@ -2,7 +2,8 @@ # Maintainer: Carlo Landmeter pkgname=caddy # When updating pkgver don't forget to run glide_init. -pkgver=0.9.1 +pkgver=0.9.3 +_vcheck="0.9.3" pkgrel=0 pkgdesc="Fast, cross-platform HTTP/2 web server with automatic HTTPS" url="https://caddyserver.com/" @@ -22,15 +23,17 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/mholt/$pkgname/archive/v$pkg " builddir="$srcdir/$pkgname-$pkgver" +prepare() { + # prevent abump to auto update this pkg. + [ "$pkgver" = "$_vcheck" ] || error "Please run glide_init and update _vcheck" + default_prepare || return 1 +} + build() { export GOPATH="$startdir" - - cd "$builddir" || return 1 - + cd "$builddir" cp "$srcdir"/glide.yaml "$srcdir"/glide.lock . glide install --skip-test || return 1 - go fix || return 1 - cd caddy && ./build.bash || return 1 } @@ -59,35 +62,33 @@ package() { } glide_init() { - export GOPATH="$startdir" - echo "GOPATH=$startdir" - + # 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 } -md5sums="2a73c8659269826f5804d3f220468848 caddy-0.9.1.tar.gz +md5sums="d63e1ac220a6abddf9e21c5cf02b95d9 caddy-0.9.3.tar.gz 8217cae6d4621dc942b15dad6a364e6a caddy.initd b5f1f62ac7d59b722bdebdcc9d2a6af5 caddy.confd 82217943769d0761c24e333e9fd51f1f caddy.conf -9e720bbf5653276036981f29ba4e105c glide.yaml -49725847a434788589699bfc59e98175 glide.lock" -sha256sums="c868e676042e88676c31188e0462b943618a24b3e264ad0512e77bc6cab38725 caddy-0.9.1.tar.gz +5c6ceee23c8bb64de0106b3a922090f1 glide.yaml +c8d945904c94350efe80bb62028feb7e glide.lock" +sha256sums="ec2f6e708262f6474a48a3503a1fbfb6e05e050772c0639ec823edda5e467668 caddy-0.9.3.tar.gz c9070cce0b57cef69894f05841b1eb7eca33cf9b50af71c15e57ebf17a40af2c caddy.initd 61a23e879e2aa9743f631fc54a62b9c23a1944606194b9dbbbcf3f563a8998c1 caddy.confd 08065486d87a9922464b3ae033343db27eca86d790cc0233dbb9b6666641db98 caddy.conf -0d50578298cea73930ab057dcfd9c31a0f429644fee66bf8ac51964cb5545f53 glide.yaml -51a5a280cbaf519c070976f1ba630f15a69640383cee281d3a1ee63a9c7a31db glide.lock" -sha512sums="33e817ae7b04f325bbd876e51be9365cc101173c6006dc8f1f667305d0f94dedfc94ccdde9bf4093818468108a258aad4b14469a831f26c4cdbd88364a4fa1f8 caddy-0.9.1.tar.gz +1e6a02c40eb314944c34d47d8e13f46d7aa8dc6e8517bb2f0a57e1ff6472bbb6 glide.yaml +0f690f6e147d91c7db9ebd8e32697436d803498654a365cf21f79aba4cc308ef glide.lock" +sha512sums="90a797e727f132c0c70fc9d9d973f37fc5c678668f8776e4f9598a2316ca231dde92076b723dad53f07f11827e1ecf04d2d012b485213959e79b7dbde86c1d20 caddy-0.9.3.tar.gz 00fe095efd8d801f0c2c69832c7240858080407ea3696ca07f6b53d3304f7e2784566d8a6b447cb83d7dc4542db551f1b4fa48ff031da7e4a1d4a26e59fc05c5 caddy.initd 7808688e92ab9950403a9b8ad29777f5bd0f75aa8cccc1d49958bb1e5af1b972dfba0c6d31931354f702a3a13933d0a1b8f28b82eed263773d71b79ec95cc15c caddy.confd c24805d17234e6cf40fe1dd102c03f05cf6129d43f58f5567d540a0e4400ce89994820bb0e317f611c65459ae26bcf7110e23a8fecaae11ca78a561892b45d75 caddy.conf -7d929225889b16b4171ee00812f840cfd3279df7d2f50138bbd8f78e559ab0d5bcb2350f7ab9c6d8960cb6c0704e8cc7a25ca45b88a98c62904cf5387b9b48d4 glide.yaml -a794837bbc476ee8a87edb2648f8c66a3162928064b072b737ccbec6971b3bba7cc94ffc52933323a89a90edffc647706b7be09dcb1f0262cd519759a73aec8d glide.lock" +ba28f42636fd4e4681f62cbf3246d6f5574ecfa9dad6f8d366f119a428b877610ecfe8c33c53f1733f029b7348b34f15815cf73c33d2e1e4904d80ff8408e05c glide.yaml +ee251f44e940b269f421567e1faa51d8ea47f3b8488125353eafeb07ae74add41284493b6665b7416a47ba15e1d920b2ea233f5c13846ca73eaf637ac19bd4c7 glide.lock" diff --git a/community/caddy/glide.lock b/community/caddy/glide.lock index ddf0d7ef5d8..863c433699d 100644 --- a/community/caddy/glide.lock +++ b/community/caddy/glide.lock @@ -1,14 +1,12 @@ -hash: 0d50578298cea73930ab057dcfd9c31a0f429644fee66bf8ac51964cb5545f53 -updated: 2016-09-15T16:24:46.97897365+02:00 +hash: 1e6a02c40eb314944c34d47d8e13f46d7aa8dc6e8517bb2f0a57e1ff6472bbb6 +updated: 2016-11-07T11:11:53.388790064+01:00 imports: - name: github.com/aead/chacha20 - version: 89264ae06c28bcefe4da0280ab1fb6d8f7a0025f + version: 7e1038a97ad08a9a16cb88ed7a6778b366ba4d99 subpackages: - chacha - name: github.com/aead/poly1305 - version: 6145bf188f408e57e4a256eab2e0989eb8b92f53 -- name: github.com/BurntSushi/toml - version: 99064174e013895bbd9b025c31100bd1d9b590ca + version: 7ab7663051fa9fa57de391f966a859e781d48b0a - name: github.com/dsnet/compress version: b9aab3c6a04eef14c56384b4ad065e7b73438862 subpackages: @@ -17,11 +15,11 @@ imports: - internal - internal/prefix - name: github.com/dustin/go-humanize - version: 2fcb5204cdc65b4bec9fd0a87606bb0d0e3c54e8 + version: bd88f87ad3a420f7bcf05e90566fd1ceb351fa7f - name: github.com/flynn/go-shlex version: 3f9db97f856818214da2e1057f8ad84803971cff - name: github.com/gorilla/websocket - version: 2d1e4548da234d9cb742cc3628556fef86aafbac + version: 9fbf129ff2a3cf2467f7d0021de2eb4d3aecc109 - name: github.com/hashicorp/go-syslog version: 315de0c1920b18b942603ffdc2229e2af4803c17 - name: github.com/hashicorp/golang-lru @@ -37,24 +35,24 @@ imports: - name: github.com/lucas-clemente/fnv128a version: 393af48d391698c6ae4219566bfbdfef67269997 - name: github.com/lucas-clemente/quic-go - version: 2592b9a97cb522c39c8660eda40f584ab5afa27d + version: 0d6356d9d80226bbd18634d461cdc1d1a81c08bf subpackages: - - h2quic - - protocol - - qerr - - utils - ackhandler + - congestion - crypto - flowcontrol - frames + - h2quic - handshake - - congestion + - protocol + - qerr + - utils - name: github.com/lucas-clemente/quic-go-certificates version: d2f86524cced5186554df90d92529757d22c1cb6 - name: github.com/mholt/archiver - version: eb71e84c00a9158cceae5817af934a1f74aa707f + version: 4a8a092653655d29c8e091cf2ecf91cbe697f0de - name: github.com/mholt/caddy - version: bedad34b25cfcc67620fa5b854fed020547efbdf + version: 0cdaaba4b87da8a72c0591ee301bb50df94a6371 subpackages: - caddy/caddymain - caddyfile @@ -74,6 +72,7 @@ imports: - caddyhttp/markdown - caddyhttp/markdown/metadata - caddyhttp/markdown/summary + - caddyhttp/maxrequestbody - caddyhttp/mime - caddyhttp/pprof - caddyhttp/proxy @@ -81,13 +80,13 @@ imports: - caddyhttp/rewrite - caddyhttp/root - caddyhttp/staticfiles + - caddyhttp/status - caddyhttp/templates - caddyhttp/websocket - caddytls - startupshutdown - - caddyhttp/status - name: github.com/miekg/dns - version: db96a2b759cdef4f11a34506a42eb8d1290c598e + version: 58f52c57ce9df13460ac68200cef30a008b9c468 - name: github.com/naoina/go-stringutil version: 6b638e95a32d0c1131db0e7fe83775cbea4a0d0b - name: github.com/naoina/toml @@ -97,39 +96,34 @@ imports: - name: github.com/nwaples/rardecode version: f94841372ddc36be531a5c3e1206238e32e93d74 - name: github.com/russross/blackfriday - version: 35eb537633d9950afc8ae7bdf0edb6134584e9fc + version: 93622da34e54fb6529bfb7c57e710f37a8d9cbd8 - name: github.com/shurcooL/sanitized_anchor_name version: 10ef21a441db47d8b13ebcc5fd2310f636973c77 - name: github.com/xenolf/lego - version: 82ac43327b01319544c050d5d78a4edeff9565d2 + version: 7615653a085a8e71beaf29911eefb2c8ad83daa6 subpackages: - acme - name: golang.org/x/crypto - version: 81372b2fc2f10bef2a7f338da115c315a56b2726 + version: bc89c496413265e715159bdc8478ee9a92fdc265 subpackages: - - ocsp - curve25519 - hkdf + - ocsp - name: golang.org/x/net - version: de35ec43e7a9aabd6a9c54d2898220ea7e44de7d + version: 57bfaa875b96fb91b4766077f34470528d4b03e9 subpackages: - - publicsuffix - http2 - http2/hpack - - idna - lex/httplex + - publicsuffix - websocket - name: gopkg.in/natefinch/lumberjack.v2 - version: 514cbda263a734ae8caac038dadf05f8f3f9f738 + version: dd45e6a67c53f673bb49ca8a001fd3a63ceb640e - name: gopkg.in/square/go-jose.v1 - version: 139276ceb5afbf13e636c44e9382f0ca75c12ba3 + version: aa2e30fdd1fe9dd3394119af66451ae790d50e0d subpackages: - cipher - json - name: gopkg.in/yaml.v2 - version: 31c299268d302dd0aa9a0dcf765a3d58971ac83f -testImports: -- name: golang.org/x/net - version: de35ec43e7a9aabd6a9c54d2898220ea7e44de7d - subpackages: - - websocket + version: a5b47d31c556af34a302ce5d659e6fea44d90de0 +testImports: [] diff --git a/community/caddy/glide.yaml b/community/caddy/glide.yaml index b87271f9ccc..5364012f348 100644 --- a/community/caddy/glide.yaml +++ b/community/caddy/glide.yaml @@ -1,6 +1,5 @@ -package: caddy-0.9.1 +package: caddy-0.9.3 import: -- package: github.com/BurntSushi/toml - package: github.com/dustin/go-humanize - package: github.com/flynn/go-shlex - package: github.com/gorilla/websocket @@ -39,10 +38,12 @@ import: - 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: -- cgit v1.2.3