X-Original-To: alpine-devel@lists.alpinelinux.org Delivered-To: alpine-devel@mail.alpinelinux.org Received: from apollo.thewebhostserver.com (apollomail.thewebhostserver.com [46.23.65.248]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.alpinelinux.org (Postfix) with ESMTPS id 78E82DC020F for ; Fri, 30 May 2014 17:38:58 +0000 (UTC) Received: from [81.4.121.188] (port=59740 helo=localhost.localdomain) by apollo.thewebhostserver.com with esmtpsa (UNKNOWN:AES128-SHA256:128) (Exim 4.82) (envelope-from ) id 1WqQlb-003Ghg-Cr; Fri, 30 May 2014 18:38:55 +0100 From: Stuart Cardall To: alpine-devel@lists.alpinelinux.org Cc: Stuart Cardall Subject: [alpine-devel] [PATCH] testing/dnscrypt-proxy: fix MUSL bug Date: Fri, 30 May 2014 17:38:42 +0000 Message-Id: <1401471522-896-1-git-send-email-developer@it-offshore.co.uk> X-Mailer: git-send-email 1.9.1 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - apollo.thewebhostserver.com X-AntiAbuse: Original Domain - lists.alpinelinux.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - it-offshore.co.uk X-Get-Message-Sender-Via: apollo.thewebhostserver.com: authenticated_id: developer@it-offshore.co.uk X-Source: X-Source-Args: X-Source-Dir: X-Mailinglist: alpine-devel Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: This closes http://bugs.alpinelinux.org/issues/2971 --- testing/dnscrypt-proxy/APKBUILD | 14 +++++++------- testing/dnscrypt-proxy/dnscrypt-proxy.confd | 8 ++++---- testing/dnscrypt-proxy/dnscrypt-proxy.setup | 2 ++ 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/testing/dnscrypt-proxy/APKBUILD b/testing/dnscrypt-proxy/APKBUILD index 53e2488..0e80ef1 100644 --- a/testing/dnscrypt-proxy/APKBUILD +++ b/testing/dnscrypt-proxy/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Francesco Colista pkgname=dnscrypt-proxy pkgver=1.4.0 -pkgrel=0 +pkgrel=1 pkgdesc="A tool for securing communications between a client and a DNS resolver" url="http://dnscrypt.org/" arch="all" @@ -54,13 +54,13 @@ package() { md5sums="64b5f5ababbcf72d6c32c57a092785c5 dnscrypt-proxy-1.4.0.tar.gz fc51d5d38e7f3066221300fff821d81f dnscrypt-proxy.initd -223bc3032b229ca961bec2a3f3c44d4d dnscrypt-proxy.confd -4b1c9ffcd06dee8ac1cdd7832e463c95 dnscrypt-proxy.setup" +3f76462b443edc1b11d9398121b0c871 dnscrypt-proxy.confd +74544eead43d8723cb0c41c6baee64e0 dnscrypt-proxy.setup" sha256sums="d750d4b0f100ea454a50194062230f7a12db5df897fb4a528d3585ce277dc3d9 dnscrypt-proxy-1.4.0.tar.gz a56cb07b4bcedd0e9bb994f93f5f721c276ba61b576c3059a1bfad4e56c786ac dnscrypt-proxy.initd -8291300235a79932ce753f948f850d0817f374159f28bfbbf527f8a3dcefb1c7 dnscrypt-proxy.confd -06c79b5add8f9adc1d59823326dbc053239596a910032a78dbdd516fb1272621 dnscrypt-proxy.setup" +b48c07e0b490342a6be56c9296591317030e9e89eeeccf75c61911d5fe0958c6 dnscrypt-proxy.confd +b490ee8ca7a08e0b0481d20d8688978583e601c04bd0c5c386e720d6df3eee0f dnscrypt-proxy.setup" sha512sums="a9542797f27bc4ac7b39ae4d7fcba3f7a6f83ebe1a66feeadca5c1e240047276577aed8271463af33c131102b634f7a19af90a66dbb59be03bb993a1bdae2a4e dnscrypt-proxy-1.4.0.tar.gz e5516c7e1fd6baf391059407aee65a837c7324698f15a675d0368fd34de10f023fe39671e95bc951bee260254fb4e3613fde6045cdf2faf085f322b769969864 dnscrypt-proxy.initd -70be47b2954bb95341a678b3e6d68c8684e16644b8162b52c736fbac314928e1fa1d7fa9f97b4034b38d443808526fecd833b1d356df1a5e74a443e96e97d8e5 dnscrypt-proxy.confd -e4b395ed374d98f888ff84f350631b953257719058b2a5cf9701ad719a3e178ce36cb414ae40de4d0729fe83362953d8277a7c54ce320b49b238549216452304 dnscrypt-proxy.setup" +583af2bd63066bdc5e843748c79c31f9e488cbcb2d522c0b804e42078a388debdcbd29286be0b6e936dece19c9a12e53f017d57d29969c18ca469fedff738972 dnscrypt-proxy.confd +385ad6c68a76d4ff290603756ce38b347bfd9186e5c87b1f2a059c7c2cfedf0c48add7c9ecba822c3d93b420d9baf9e50e0de910dae5cbeb59bd706c0ee8aa96 dnscrypt-proxy.setup" diff --git a/testing/dnscrypt-proxy/dnscrypt-proxy.confd b/testing/dnscrypt-proxy/dnscrypt-proxy.confd index 6a008ea..1ee9035 100644 --- a/testing/dnscrypt-proxy/dnscrypt-proxy.confd +++ b/testing/dnscrypt-proxy/dnscrypt-proxy.confd @@ -3,7 +3,7 @@ # override listen address where DNSCRYPT listen # DNSCRYPT_LOCALIP=127.0.0.1:53 -# override the default OpenDNS Resolver here -# RESOLVER=208.67.220.220:443; -# PROVIDER=2.dnscrypt-cert.opendns.com -# PUBKEY=B735:1140:206F:225D:3E2B:D822:D7FD:691E:A1C3:3CC8:D666:8D0C:BE04:BFAB:CA43:FB79; +# override the default OpenDNS Resolver here (or run /sbin/setup-dnscrypt) +RESOLVER=208.67.220.220:443 +PROVIDER=2.dnscrypt-cert.opendns.com +PUBKEY=B735:1140:206F:225D:3E2B:D822:D7FD:691E:A1C3:3CC8:D666:8D0C:BE04:BFAB:CA43:FB79 diff --git a/testing/dnscrypt-proxy/dnscrypt-proxy.setup b/testing/dnscrypt-proxy/dnscrypt-proxy.setup index f82e7c3..d1bd8f1 100644 --- a/testing/dnscrypt-proxy/dnscrypt-proxy.setup +++ b/testing/dnscrypt-proxy/dnscrypt-proxy.setup @@ -236,6 +236,8 @@ done #remove stray sed -i "s/^<\/td>//g" $output +#remove stray under MUSL C +sed -i "s/^//g" $output # delete empty lines sed -i '/^$/d' $output # change rows to columns -- 1.9.1 --- Unsubscribe: alpine-devel+unsubscribe@lists.alpinelinux.org Help: alpine-devel+help@lists.alpinelinux.org ---