community/dnscrypt-proxy: upgrade to 2.0.9b2

3 files changed, 30 insertions, 20 deletions

diff --git a/community/dnscrypt-proxy/APKBUILD b/community/dnscrypt-proxy/APKBUILD
index 4c71684b77..d2992b3f4a 100644
--- a/community/dnscrypt-proxy/APKBUILD
+++ b/community/dnscrypt-proxy/APKBUILD
@@ -1,51 +1,61 @@
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=dnscrypt-proxy
-pkgver=1.9.5
-pkgrel=2
+pkgver=2.0.9b2
+pkgrel=0
 pkgdesc="A tool for securing communications between a client and a DNS resolver"
 url="https://dnscrypt.org/"
 arch="all"
 license="custom"
-makedepends="$depends_dev libsodium-dev ldns-dev"
+makedepends="$depends_dev libsodium-dev ldns-dev go"
 install="$pkgname.pre-install"
+options="!check" #upstream does not provide check/test
 pkgusers=dnscrypt
 pkggroups=dnscrypt
 subpackages="$pkgname-doc $pkgname-setup::noarch"
-source="http://download.dnscrypt.org/$pkgname/$pkgname-$pkgver.tar.gz
+source="$pkgname-$pkgver.tar.gz::https://github.com/jedisct1/$pkgname/archive/$pkgver.tar.gz
 	$pkgname.initd
 	$pkgname.confd
 	$pkgname.setup
 	"
 builddir="$srcdir"/$pkgname-$pkgver
 
-build() {
+prepare() {
+	default_prepare
 	cd "$builddir"
-	CFLAGS="$CFLAGS -fPIC" ./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr
-	make
+	export GOPATH=$(pwd)
+	ln -sfv vendor src
 }
 
-check() {
-    cd "$builddir"
-    make check
+build() {
+	cd "$builddir"/$pkgname
+	go build -ldflags="-s -w" -v
 }
 
 package() {
-	cd "$builddir"
-	make DESTDIR=$pkgdir install || return 1
+	cd "$builddir"/$pkgname
 	mkdir -p "$pkgdir"/var/log/$pkgname
 	mkdir -p "$pkgdir"/var/run/$pkgname
 	mkdir -p "$pkgdir"/var/empty
 	mkdir -p $pkgdir/usr/share/licenses/$pkgname
-        install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
+    install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
 	install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
+	install -m755 -D $pkgname "$pkgdir"/usr/bin/$pkgname
+	install -vDm 644 "example-${pkgname}.toml" \
+		"${pkgdir}/etc/${pkgname}/${pkgname}.toml"
+	install -vDm 644 "example-blacklist.txt" \
+		"${pkgdir}/etc/${pkgname}/blacklist.txt"
+	install -vDm 644 "example-cloaking-rules.txt" \
+		"${pkgdir}/etc/${pkgname}/cloaking-rules.txt"
+	install -vDm 644 "example-forwarding-rules.txt" \
+		"${pkgdir}/etc/${pkgname}/forwarding-rules.txt"
+	install -vDm 644 "example-whitelist.txt" \
+		"${pkgdir}/etc/${pkgname}/example-whitelist.txt"
 	chown dnscrypt "$pkgdir"/var/log/$pkgname
 	chown dnscrypt "$pkgdir"/var/run/$pkgname
 	chown dnscrypt "$pkgdir"/var/empty
-	install -m 644 COPYING $pkgdir/usr/share/licenses/$pkgname
+	chown dnscrypt "$pkgdir"/etc/$pkgname
+	install -m 644 ../LICENSE $pkgdir/usr/share/licenses/$pkgname
 }
 
 setup() {
@@ -56,7 +66,7 @@ setup() {
 	install -m755 -D "$srcdir"/$pkgname.setup "$subpkgdir"/sbin/setup-dnscrypt
 }
 
-sha512sums="af5abcd08e3a51c1c8e142647946773c7afb4ba5076f95e74a5cbf7c54a62082de98014b6c9a1349ec6938f90d4f3584b6e6caa136902345922e16e7c9689132  dnscrypt-proxy-1.9.5.tar.gz
+sha512sums="d64cc8e0b61e1e548b63531dc4c733af1605ccda89a9f905227e97cb966a3488104ac9af229521909ca88bde283dce224e712326b4d1717af70be2d04821c6c2  dnscrypt-proxy-2.0.9b2.tar.gz
 5ad36161fc44d9c8c86a13e20d4d5fa0be81b317097bf1c092aab1e1e307021a8b6f1a92dbf2bec5fb7c534b59cf926235ea507fa6b4ccd2974ac2e3b7baa257  dnscrypt-proxy.initd
 8cd2d40c1f465a3b26aa934fe2103650beba9504676faca3ccc9ee2b5bad940e561b3dd201d84c380bfdada72cacbe4862fc1315a4bd44fd7c56ef4f19a884f9  dnscrypt-proxy.confd
 904965588e8e1119600413445627dc85a5efc0e32f7f3ad029921f59f214dd5c999bcd98a6622b572e528da4c5265083221fea189ed96407612842033ffcffe1  dnscrypt-proxy.setup"
diff --git a/community/dnscrypt-proxy/dnscrypt-proxy.initd b/community/dnscrypt-proxy/dnscrypt-proxy.initd
index 8c3246b6c6..f68da6da72 100644
--- a/community/dnscrypt-proxy/dnscrypt-proxy.initd
+++ b/community/dnscrypt-proxy/dnscrypt-proxy.initd
@@ -1,7 +1,7 @@
 #!/sbin/openrc-run
 
 pidfile=/var/run/dnscrypt-proxy/dnscrypt-proxy.pid
-command=/usr/sbin/dnscrypt-proxy
+command=/usr/bin/dnscrypt-proxy
 command_args="--pidfile=$pidfile --daemonize
 	--logfile=${DNSCRYPT_LOGFILE:-/var/log/dnscrypt-proxy/dnscrypt-proxy.log}
 	--user=${DNSCRYPT_USER:-dnscrypt}
diff --git a/community/dnscrypt-proxy/dnscrypt-proxy.setup b/community/dnscrypt-proxy/dnscrypt-proxy.setup
index c1a028c3d3..8feeae8840 100644
--- a/community/dnscrypt-proxy/dnscrypt-proxy.setup
+++ b/community/dnscrypt-proxy/dnscrypt-proxy.setup
@@ -215,7 +215,7 @@ fi
 
 ##### Download DNS Resolver details ################################################################
 
-url='https://raw.githubusercontent.com/jedisct1/dnscrypt-proxy/master/dnscrypt-resolvers.csv'
+url='https://raw.githubusercontent.com/dyne/dnscrypt-proxy/master/dnscrypt-resolvers.csv'
 output='/tmp/dnscrypt.list'
 
 echo -e "Retrieving current list of free DNS Resolvers\n"