diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2019-07-22 12:29:06 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2019-07-22 19:03:08 +0000 |
| commit | b32e4060aeaa79ed585992243713a6e71b2f2069 (patch) | |
| tree | ba47861409dff89aa81ab4283481a4f739cc354c /main | |
| parent | 493bb973b8d83293d33e3aed3f7a219fb87b3c8d (diff) | |
main/dnsmasq: rebuild against nettle-3.5
Diffstat (limited to 'main')
| -rw-r--r-- | main/dnsmasq/APKBUILD | 4 | ||||
| -rw-r--r-- | main/dnsmasq/nettle-3.5.patch | 42 |
2 files changed, 45 insertions, 1 deletions
diff --git a/main/dnsmasq/APKBUILD b/main/dnsmasq/APKBUILD index cb61ea892a5..a173b994c31 100644 --- a/main/dnsmasq/APKBUILD +++ b/main/dnsmasq/APKBUILD @@ -15,7 +15,7 @@ # pkgname=dnsmasq pkgver=2.80 -pkgrel=3 +pkgrel=4 pkgdesc="A lightweight DNS, DHCP, RA, TFTP and PXE server" url="http://www.thekelleys.org.uk/dnsmasq/" arch="all" @@ -26,6 +26,7 @@ install="$pkgname.pre-install $pkgname.pre-upgrade $pkgname-dnssec.pre-install $pkgname-dnssec.pre-upgrade" subpackages="$pkgname-doc $pkgname-dnssec" source="http://www.thekelleys.org.uk/dnsmasq/$pkgname-$pkgver.tar.gz + nettle-3.5.patch $pkgname.initd $pkgname.confd uncomment-conf-dir.patch @@ -74,6 +75,7 @@ dnssec() { } sha512sums="da50030ac96617fbb7d54d5ef02d2ed1e14ec1ebe0df49bc23a1509381bc1644cf6fb95ff72ed15e0ad1e9bd6aa11ec6e4dcabec8ebb152da0d84f9a4408565b dnsmasq-2.80.tar.gz +df64088b22f996ff228fce18dd05b329d9fdf7b02290bc3992546004394e662be7bc416dc718ea866341403234eb20efd5bbf1eec96df1cb6ab099ebfd3fdee4 nettle-3.5.patch a7d64a838d10f4f69e0f2178cf66f0b3725901696e30df9e8e3e09f2afd7c86e9d95af64d2b63ef66f18b8a637397b7015573938df9ad961e2b36c391c3ac579 dnsmasq.initd 9a401bfc408bf1638645c61b8ca734bea0a09ef79fb36648ec7ef21666257234254bbe6c73c82cc23aa1779ddcdda0e6baa2c041866f16dfb9c4e0ba9133eab8 dnsmasq.confd 01e9e235e667abda07675009fb1947547863e0bb0256393c5a415978e2a49c1007585c7f0b51e8decce79c05e6f2ced3f400b11343feaa4de9b2e524f74a1ee3 uncomment-conf-dir.patch" diff --git a/main/dnsmasq/nettle-3.5.patch b/main/dnsmasq/nettle-3.5.patch new file mode 100644 index 00000000000..7d77a21de7c --- /dev/null +++ b/main/dnsmasq/nettle-3.5.patch @@ -0,0 +1,42 @@ +From 6fd9aba7abe1e084123bc5002959350897774ace Mon Sep 17 00:00:00 2001 +From: Vladislav Grishenko <themiron@mail.ru> +Date: Wed, 26 Jun 2019 20:27:11 +0500 +Subject: [PATCH] Fix build with libnettle 3.5 + +--- + src/crypto.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/src/crypto.c b/src/crypto.c +index 1f1c12b..9cfe371 100644 +--- a/src/crypto.c ++++ b/src/crypto.c +@@ -296,6 +296,10 @@ static int dnsmasq_ecdsa_verify(struct blockdata *key_data, unsigned int key_len + static struct ecc_point *key_256 = NULL, *key_384 = NULL; + static mpz_t x, y; + static struct dsa_signature *sig_struct; ++#if NETTLE_VERSION_MAJOR == 3 && NETTLE_VERSION_MINOR < 4 ++#define nettle_get_secp_256r1() (&nettle_secp_256r1) ++#define nettle_get_secp_384r1() (&nettle_secp_384r1) ++#endif + + if (!sig_struct) + { +@@ -315,7 +319,7 @@ static int dnsmasq_ecdsa_verify(struct blockdata *key_data, unsigned int key_len + if (!(key_256 = whine_malloc(sizeof(struct ecc_point)))) + return 0; + +- nettle_ecc_point_init(key_256, &nettle_secp_256r1); ++ nettle_ecc_point_init(key_256, nettle_get_secp_256r1()); + } + + key = key_256; +@@ -328,7 +332,7 @@ static int dnsmasq_ecdsa_verify(struct blockdata *key_data, unsigned int key_len + if (!(key_384 = whine_malloc(sizeof(struct ecc_point)))) + return 0; + +- nettle_ecc_point_init(key_384, &nettle_secp_384r1); ++ nettle_ecc_point_init(key_384, nettle_get_secp_384r1()); + } + + key = key_384; |