1.0.0

2 files changed, 12 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a2bbdbc0ce70..ff861e1cf9f1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = caddy
 	pkgdesc = HTTP/2 Web Server with Automatic HTTPS
-	pkgver = 0.11.5
+	pkgver = 1.0.0
 	pkgrel = 1
 	url = https://caddyserver.com
 	install = caddy.install
@@ -12,14 +12,14 @@ pkgbase = caddy
 	license = Apache
 	makedepends = go>=2:1.12
 	backup = etc/caddy/caddy.conf
-	source = https://github.com/mholt/caddy/archive/v0.11.5/caddy-0.11.5.tar.gz
+	source = https://github.com/mholt/caddy/archive/v1.0.0/caddy-1.0.0.tar.gz
 	source = https://caddyserver.com/resources/images/brand/caddy-at-your-service-white.svg
 	source = index.html
 	source = caddy.service
 	source = caddy.tmpfiles
 	source = caddy.conf
 	source = plugins.go
-	sha256sums = ab2dc210bc7089fa7d041e702663e592b480945aa99f14b348090091103b7ec5
+	sha256sums = 1c8b435a79e21b9832c7a8a88c44e70bc80434ca3719853d2b1092ffbbbbff7d
 	sha256sums = e679dd79fd92dc351fc190c7af529c73e3896986aaa6b7c0ae01e561398d6b85
 	sha256sums = 6db7aec45e95bbbf770ce4d120a60d8e4992d2262a8ebf668521179279aa5ae7
 	sha256sums = 5f899f3d72bd815ba67a2fbd95144f7ff5d83ae47d1c4bee8297ce4e5d2ed400
diff --git a/PKGBUILD b/PKGBUILD
index 333e090bf7b9..3b4b4f6f1d32 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 _gopkgname='github.com/mholt/caddy'
 
 pkgname=caddy
-pkgver=0.11.5
+pkgver=1.0.0
 pkgrel=1
 pkgdesc='HTTP/2 Web Server with Automatic HTTPS'
 arch=('x86_64' 'i686' 'armv6h' 'armv7h' 'aarch64')
@@ -23,7 +23,7 @@ source=("https://$_gopkgname/archive/v$pkgver/$pkgname-$pkgver.tar.gz"
         'caddy.tmpfiles'
         'caddy.conf'
         'plugins.go')
-sha256sums=('ab2dc210bc7089fa7d041e702663e592b480945aa99f14b348090091103b7ec5'
+sha256sums=('1c8b435a79e21b9832c7a8a88c44e70bc80434ca3719853d2b1092ffbbbbff7d'
             'e679dd79fd92dc351fc190c7af529c73e3896986aaa6b7c0ae01e561398d6b85'
             '6db7aec45e95bbbf770ce4d120a60d8e4992d2262a8ebf668521179279aa5ae7'
             '5f899f3d72bd815ba67a2fbd95144f7ff5d83ae47d1c4bee8297ce4e5d2ed400'
@@ -44,23 +44,20 @@ patch_plugins() {
 }
 
 prepare() {
-    export GOPATH="$srcdir/build"
-    rm -rf "$GOPATH/src/$_gopkgname"
-    mkdir --parents `dirname "$GOPATH/src/$_gopkgname"`
-    mv -Tv "$srcdir/$pkgname-$pkgver" "$GOPATH/src/$_gopkgname"
+    cd "$srcdir/$pkgname-$pkgver"
 
     if [ ${#plugins[@]} -gt 0 ]; then
         echo enabled plugins: ${plugins[@]}
-        cd $GOPATH/src/$_gopkgname/caddy/caddymain/
+        cd caddy/caddymain/
         patch_plugins < run.go > run1.go
         mv run1.go run.go
-        go get -v -d $_gopkgname/caddy/caddymain
     fi
 }
 
 build() {
-    export GOPATH="$srcdir/build"
-    go build -v -o $srcdir/caddy -ldflags "-X $_gopkgname/caddy/caddymain.gitTag=v$pkgver" $_gopkgname/caddy
+    cd "$srcdir/$pkgname-$pkgver/caddy"
+    export GOPATH="$srcdir"
+    go build -v -o "$srcdir/caddy"
 }
 
 package() {
@@ -120,6 +117,7 @@ plugins=(
 #    'tls.dns.dnsimple'
 #    'tls.dns.dnsmadeeasy'
 #    'tls.dns.dnspod'
+#    'tls.dns.duckdns'
 #    'tls.dns.dyn'
 #    'tls.dns.exoscale'
 #    'tls.dns.gandi'
@@ -129,6 +127,7 @@ plugins=(
 #    'tls.dns.lightsail'
 #    'tls.dns.linode'
 #    'tls.dns.namecheap'
+#    'tls.dns.namedotcom'
 #    'tls.dns.ns1'
 #    'tls.dns.otc'
 #    'tls.dns.ovh'