updated to 0.9.2

3 files changed, 37 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b260dc9d22df..3531152b2ea2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Wed Jul 27 12:58:57 UTC 2016
 pkgbase = caddy
 	pkgdesc = A configurable, general-purpose HTTP/2 web server for any platform
-	pkgver = 0.8.3
-	pkgrel = 2
+	pkgver = 0.9.2
+	pkgrel = 1
 	url = https://caddyserver.com
 	install = caddy.install
 	arch = i686
@@ -11,17 +9,13 @@ pkgbase = caddy
 	arch = armv7h
 	arch = aarch64
 	license = Apache
+	makedepends = go>=1.6
+	makedepends = git
 	conflicts = caddy-all-features
 	conflicts = caddy-git
 	conflicts = caddy-full-bin
-	source_i686 = https://github.com/mholt/caddy/releases/download/v0.8.3/caddy_linux_386.tar.gz
-	sha256sums_i686 = 25b173dc2f47bd22c48efb6831c713f3100c9d70a04d69f81bc3dc236abc7624
-	source_x86_64 = https://github.com/mholt/caddy/releases/download/v0.8.3/caddy_linux_amd64.tar.gz
-	sha256sums_x86_64 = cd3539f89c9cbccf0393e850073f788b9c95975bcecf4027ea062b0b1d9f66ac
-	source_armv7h = https://github.com/mholt/caddy/releases/download/v0.8.3/caddy_linux_arm7.tar.gz
-	sha256sums_armv7h = ab67746c2ff9d7060b6be200d176ba1c212f20988fd34f0ca61a9a5215978a73
-	source_aarch64 = https://github.com/mholt/caddy/releases/download/v0.8.3/caddy_linux_arm64.tar.gz
-	sha256sums_aarch64 = 766f2a358e9d057e9b112ea91e83467c2b339ef1cf2488c6a1e0749511c8e3d7
+	source = git+https://github.com/mholt/caddy#tag=v0.9.2
+	md5sums = SKIP
 
 pkgname = caddy
 
diff --git a/PKGBUILD b/PKGBUILD
index 6547bf46f868..b99b6261b412 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,31 +1,36 @@
-# Maintainer: Eric Engestrom <aur [at] engestrom [dot] ch>
-# Contributor: Tom Richards <tom [at] tomrichards [dot] net>
-
 pkgname=caddy
-pkgver=0.8.3
-pkgrel=2
-pkgdesc="A configurable, general-purpose HTTP/2 web server for any platform"
+pkgver=0.9.2
+pkgrel=1
+pkgdesc='A configurable, general-purpose HTTP/2 web server for any platform'
 arch=('i686' 'x86_64' 'armv7h' 'aarch64')
-url="https://caddyserver.com"
+url='https://caddyserver.com'
 license=('Apache')
 install='caddy.install'
+makedepends=('go>=1.6' 'git')
 conflicts=('caddy-all-features' 'caddy-git' 'caddy-full-bin')
 
-source_i686=("https://github.com/mholt/caddy/releases/download/v$pkgver/caddy_linux_386.tar.gz")
-sha256sums_i686=('25b173dc2f47bd22c48efb6831c713f3100c9d70a04d69f81bc3dc236abc7624')
-
-source_x86_64=("https://github.com/mholt/caddy/releases/download/v$pkgver/caddy_linux_amd64.tar.gz")
-sha256sums_x86_64=('cd3539f89c9cbccf0393e850073f788b9c95975bcecf4027ea062b0b1d9f66ac')
+gopkgname='github.com/mholt/caddy'
+source=("git+https://github.com/mholt/caddy#tag=v$pkgver")
+md5sums=('SKIP')
 
-source_armv7h=("https://github.com/mholt/caddy/releases/download/v$pkgver/caddy_linux_arm7.tar.gz")
-sha256sums_armv7h=('ab67746c2ff9d7060b6be200d176ba1c212f20988fd34f0ca61a9a5215978a73')
+prepare() {
+	cd $srcdir
+	rm -rf build
+	export GOPATH="$srcdir/build"
+	mkdir -p "$GOPATH/src/$gopkgname"
+	mv -Tv "$srcdir/caddy" "$GOPATH/src/$gopkgname"
+	echo 'download dependencies'
+	go get $gopkgname/...
+}
 
-source_aarch64=("https://github.com/mholt/caddy/releases/download/v$pkgver/caddy_linux_arm64.tar.gz")
-sha256sums_aarch64=('766f2a358e9d057e9b112ea91e83467c2b339ef1cf2488c6a1e0749511c8e3d7')
+build() {
+	cd $srcdir/build/src/$gopkgname/caddy
+	echo 'compile'
+	bash build.bash
+}
 
 package() {
-  rm -f "${srcdir}/"*.tar.gz
-  install -Dm755 "$srcdir/"caddy_linux_* "$pkgdir/usr/bin/caddy"
-  install -Dm644 "${srcdir}/init/linux-systemd/caddy@.service" "${pkgdir}/usr/lib/systemd/system/caddy@.service"
-  install -Dm644 "${srcdir}/init/linux-systemd/README.md" "${pkgdir}/usr/share/doc/caddy/systemd-service.md"
+    builddir="$srcdir/build/src/github.com/mholt/caddy"
+	install -Dm755 "$builddir/caddy/caddy" "${pkgdir}/usr/local/bin/caddy"
+	install -Dm644 "$builddir/dist/init/linux-systemd/caddy.service" "${pkgdir}/usr/lib/systemd/system/caddy.service"
 }
diff --git a/caddy.install b/caddy.install
index aca8c4a021a5..94fd46d64239 100644
--- a/caddy.install
+++ b/caddy.install
@@ -1,7 +1,11 @@
 post_install() {
-  setcap 'cap_net_bind_service=+ep' usr/bin/caddy
+    getent passwd www-data || useradd --system -s /usr/bin/nologin -d / -U www-data
+
+    mkdir -p /etc/ssl/caddy
+    chmod 770 /etc/ssl/caddy
+    chown www-data:www-data /etc/ssl/caddy
 }
 
 post_upgrade() {
-  post_install
+    post_install
 }