daftaupe/opt
1
0
Fork 0
forked from ports/opt
Code Pull Requests Activity

dnsmasq: update to 2.81

Browse Source
This commit is contained in:
Juergen Daubert 2020-04-13 12:32:09 +02:00
parent 43b2b7e39a
commit 15556053d7
3 changed files with 6 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dnsmasq/.signature
View File

@ -1,8 +1,7 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/V41bI1t4g+BJe2mQZfPWIxQgRYu9CoOW88721dHm7xg3sR4oIA8r815cyeKmXQjPd3LXVud58bLjR9GYGesmw8=
SHA256 (Pkgfile) = 31deb1032beac3dafc884f80943ffcf9e49a8f34f287748e1457d2f6c8c1d2e4
RWSE3ohX2g5d/css+rh0ulW17DWI8rGhMwySQ6TLJ0wdtysFrZ5iqRy7MCtF3IKEn2WHM5cLK7gKpkIo61wjCtjVKXQ36jSS9Ag=
SHA256 (Pkgfile) = 203686968e2a477d2e9d3100783dc45e86d3ceb76f2a635f59883ed71dbe5eb7
SHA256 (.footprint) = a9b2926c49f21dee91cc4b4186a4abc2494b610a40941467c281573e2f9c76d9
SHA256 (dnsmasq-2.80.tar.xz) = cdaba2785e92665cf090646cba6f94812760b9d7d8c8d0cfb07ac819377a63bb
SHA256 (dnsmasq-2.81.tar.xz) = 749ca903537c5197c26444ac24b0dce242cf42595fdfe6b9a5b9e4c7ad32f8fb
SHA256 (dnsmasq-config.patch) = bfbf4e3e327f404d87052bbe37a8da064cc59dce3835532652569455d811ef69
SHA256 (dnsmasq) = 3c5425d2662177614a9f79a89027e03d2622687c1b387f62d6bf73326fbd59b1
SHA256 (nettle-3.5.patch) = 1d9f577b796a95a6e363739f03fb5b2173255af7ab595430624e998ff86ac411

8
dnsmasq/Pkgfile
View File

@ -4,17 +4,15 @@
# Depends on: nettle
name=dnsmasq
version=2.80
release=3
version=2.81
release=1
source=(http://www.thekelleys.org.uk/$name/$name-$version.tar.xz \
$name-config.patch dnsmasq \
nettle-3.5.patch)
$name-config.patch dnsmasq)
build () {
cd $name-$version
patch -p1 -i $SRC/$name-config.patch
patch -p1 -i $SRC/nettle-3.5.patch
make COPTS="-DHAVE_DNSSEC" CFLAGS="$CFLAGS -Wall -W"
make COPTS="-DHAVE_DNSSEC" PREFIX=$PKG/usr install

34
dnsmasq/nettle-3.5.patch
View File

@ -1,34 +0,0 @@
# http://lists.thekelleys.org.uk/pipermail/dnsmasq-discuss/2019q2/013096.html
diff -Nru dnsmasq-2.80.orig/src/crypto.c dnsmasq-2.80/src/crypto.c
--- dnsmasq-2.80.orig/src/crypto.c 2019-06-27 16:28:48.474960428 +0200
+++ dnsmasq-2.80/src/crypto.c 2019-06-27 16:33:45.004283079 +0200
@@ -275,6 +275,10 @@
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 < 5
+#define nettle_get_secp_256r1() (&nettle_secp_256r1)
+#define nettle_get_secp_384r1() (&nettle_secp_384r1)
+#endif
if (!sig_struct)
{
@@ -294,7 +298,7 @@
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;
@@ -307,7 +311,7 @@
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;