2 2

[alpine-devel] [PATCH] testing/dnscrypt-proxy: fix MUSL bug

Stuart Cardall
Details
Message ID
<1401471522-896-1-git-send-email-developer@it-offshore.co.uk>
Sender timestamp
1401471522
DKIM signature
missing
Download raw message
Patch: +13 -11
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 <francesco.colista@gmail.com>
 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 </td>
 sed -i "s/^<\/td>//g" $output
+#remove stray <td> under MUSL C
+sed -i "s/^<td>//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
---
Francesco Colista
Details
Message ID
<1cc94705026f0f2f0d5eed1d8f1fbd66@bsod.eu>
In-Reply-To
<1401471522-896-1-git-send-email-developer@it-offshore.co.uk> (view parent)
Sender timestamp
1403770816
DKIM signature
missing
Download raw message
Hi Stuart, hi all.
Regards http://bugs.alpinelinux.org/issues/3090 i'm looking at this 
script :

> --- a/testing/dnscrypt-proxy/dnscrypt-proxy.setup
> +++ b/testing/dnscrypt-proxy/dnscrypt-proxy.setup

The idea is good, thanks for the script.
What do you think if we took the occasion of this request to improve it?

For instance, avoiding (when possible) other stuff outside busybox.
Since a lot of Alpine script are written in lua, what do you think to 
port in in lua (5.2)?
In the meanwhile, i'm going to split the script on a subpackage, so the 
dependencies are installed optionally.
I'll fix the /var/empty issue.

Any hint are welcome.


-- 
:: Francesco Colista
:: Alpine Linux Infrstraucture
:: http://www.alpinelinux.org


---
Unsubscribe:  alpine-devel+unsubscribe@lists.alpinelinux.org
Help:         alpine-devel+help@lists.alpinelinux.org
---
Chris Spillane
Details
Message ID
<CAKv362ujywi1-FPRrVm=KuTDE3C1reunqsVSJnP3DRRwCFCPOA@mail.gmail.com>
In-Reply-To
<1cc94705026f0f2f0d5eed1d8f1fbd66@bsod.eu> (view parent)
Sender timestamp
1403777053
DKIM signature
missing
Download raw message
Hello all!

*If *it's possible to get the script to work without sed/curl that would be
fantastic, but I have no idea how much work that is.  Otherwise, sed and
curl aren't large or heavy packages, so unless anyone is strongly opposed,
I don't see adding them as dependencies a problem.




On 26 June 2014 09:20, Francesco Colista <fcolista@alpinelinux.org> wrote:

> Hi Stuart, hi all.
> Regards http://bugs.alpinelinux.org/issues/3090 i'm looking at this
> script :
>
>  --- a/testing/dnscrypt-proxy/dnscrypt-proxy.setup
>> +++ b/testing/dnscrypt-proxy/dnscrypt-proxy.setup
>>
>
> The idea is good, thanks for the script.
> What do you think if we took the occasion of this request to improve it?
>
> For instance, avoiding (when possible) other stuff outside busybox.
> Since a lot of Alpine script are written in lua, what do you think to port
> in in lua (5.2)?
> In the meanwhile, i'm going to split the script on a subpackage, so the
> dependencies are installed optionally.
> I'll fix the /var/empty issue.
>
> Any hint are welcome.
>
>
> --
> :: Francesco Colista
> :: Alpine Linux Infrstraucture
> :: http://www.alpinelinux.org
>
>
>
> ---
> Unsubscribe:  alpine-devel+unsubscribe@lists.alpinelinux.org
> Help:         alpine-devel+help@lists.alpinelinux.org
> ---
>
>


-- 
Chris Spillane