diff options
Diffstat (limited to 'user')
| -rw-r--r-- | user/c-ares/APKBUILD | 11 | ||||
| -rw-r--r-- | user/c-ares/onion-segfault.patch | 36 |
2 files changed, 4 insertions, 43 deletions
diff --git a/user/c-ares/APKBUILD b/user/c-ares/APKBUILD index 8b9cc81ee..564b70ce9 100644 --- a/user/c-ares/APKBUILD +++ b/user/c-ares/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=c-ares -pkgver=1.15.0 -pkgrel=1 +pkgver=1.16.1 +pkgrel=0 pkgdesc="Asynchronous DNS/name resolver library" url="https://c-ares.haxx.se/" arch="all" @@ -11,9 +11,7 @@ license="MIT" depends="" makedepends="" subpackages="$pkgname-doc $pkgname-dev" -source="https://c-ares.haxx.se/download/$pkgname-$pkgver.tar.gz - onion-segfault.patch - " +source="https://c-ares.haxx.se/download/$pkgname-$pkgver.tar.gz" build() { ./configure \ @@ -34,5 +32,4 @@ package() { make -j1 DESTDIR="$pkgdir" install } -sha512sums="a1de6c5e7e1a6a13c926aae690e83d5caa51e7313d63da1cf2af6bc757c41d585aad5466bc3ba7b7f7793cb1748fa589f40972b196728851c8b059cfc8c3be50 c-ares-1.15.0.tar.gz -f26d4e981afc87fe734893d91210f1d5cbdf841d7704acf41a964991ab669fffd0ffd661c24be84d67edc9e1d6804214e6e7188e77f6555c01c9ad8165f6fbfa onion-segfault.patch" +sha512sums="4ac2a5d5c6da74eb1d6155c4eadc7127ab1b53a8d13caec41bd6172db5417a79f3ab022e77ba37d8b13da6893d7ced5fd8baf5cc3950a4154b4de8743ad31471 c-ares-1.16.1.tar.gz" diff --git a/user/c-ares/onion-segfault.patch b/user/c-ares/onion-segfault.patch deleted file mode 100644 index 7e5a712cd..000000000 --- a/user/c-ares/onion-segfault.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 43a915a1b741b7c5bad2f622de90f353cdae7694 Mon Sep 17 00:00:00 2001 -From: Khaidi Chu <i@2333.moe> -Date: Mon, 4 Feb 2019 10:38:07 +0800 -Subject: [PATCH] fix: init bufp before reject .onion to make it can be free - correctly (#241) - -When querying a .onion domain, it returns directly without setting bufp to NULL. A subsequent free() that occurs can cause a segmentation fault. - -Fix By: Khaidi Chu (@XadillaX) ---- - ares_create_query.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/ares_create_query.c b/ares_create_query.c -index 1606b1a1..9efce17c 100644 ---- a/ares_create_query.c -+++ b/ares_create_query.c -@@ -94,14 +94,14 @@ int ares_create_query(const char *name, int dnsclass, int type, - size_t buflen; - unsigned char *buf; - -- /* Per RFC 7686, reject queries for ".onion" domain names with NXDOMAIN. */ -- if (ares__is_onion_domain(name)) -- return ARES_ENOTFOUND; -- - /* Set our results early, in case we bail out early with an error. */ - *buflenp = 0; - *bufp = NULL; - -+ /* Per RFC 7686, reject queries for ".onion" domain names with NXDOMAIN. */ -+ if (ares__is_onion_domain(name)) -+ return ARES_ENOTFOUND; -+ - /* Allocate a memory area for the maximum size this packet might need. +2 - * is for the length byte and zero termination if no dots or ecscaping is - * used. |