diff options
| author | Steven Barth <steven@midlink.org> | 2014-06-18 17:06:37 +0000 |
|---|---|---|
| committer | Steven Barth <steven@midlink.org> | 2014-06-18 17:06:37 +0000 |
| commit | f439aef6cd80032d09ef5254824397838aa9783e (patch) | |
| tree | 0291434c0dd7687e230f5a94047bdd528e4aeb1c /package/network/services | |
| parent | 4456b621cb7c77dc09df1d2adb2cb322c0b35da9 (diff) | |
| download | upstream-f439aef6cd80032d09ef5254824397838aa9783e.tar.gz upstream-f439aef6cd80032d09ef5254824397838aa9783e.tar.bz2 upstream-f439aef6cd80032d09ef5254824397838aa9783e.zip | |
dnsmasq: removing nettle 3.0 support due to nettle downgrade
Signed-off-by: Steven Barth <steven@midlink.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41264 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/network/services')
| -rw-r--r-- | package/network/services/dnsmasq/Makefile | 2 | ||||
| -rw-r--r-- | package/network/services/dnsmasq/patches/120-nettle-3.0-compatibility.patch | 29 |
2 files changed, 1 insertions, 30 deletions
diff --git a/package/network/services/dnsmasq/Makefile b/package/network/services/dnsmasq/Makefile index 5c54d855c1..1d5b201c05 100644 --- a/package/network/services/dnsmasq/Makefile +++ b/package/network/services/dnsmasq/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dnsmasq PKG_VERSION:=2.71 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq diff --git a/package/network/services/dnsmasq/patches/120-nettle-3.0-compatibility.patch b/package/network/services/dnsmasq/patches/120-nettle-3.0-compatibility.patch deleted file mode 100644 index 2e5fc2ae34..0000000000 --- a/package/network/services/dnsmasq/patches/120-nettle-3.0-compatibility.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/src/dnssec.c -+++ b/src/dnssec.c -@@ -20,7 +20,7 @@ - #ifdef HAVE_DNSSEC - - #include <nettle/rsa.h> --#include <nettle/dsa.h> -+#include <nettle/dsa-compat.h> - #ifndef NO_NETTLE_ECC - # include <nettle/ecdsa.h> - # include <nettle/ecc-curve.h> -@@ -173,7 +173,7 @@ static int rsa_verify(struct blockdata * - return 0; - } - --static int dsa_verify(struct blockdata *key_data, unsigned int key_len, unsigned char *sig, size_t sig_len, -+static int dnsmasq_dsa_verify(struct blockdata *key_data, unsigned int key_len, unsigned char *sig, size_t sig_len, - unsigned char *digest, int algo) - { - unsigned char *p; -@@ -296,7 +296,7 @@ static int verify(struct blockdata *key_ - return rsa_verify(key_data, key_len, sig, sig_len, digest, algo); - - case 3: case 6: -- return dsa_verify(key_data, key_len, sig, sig_len, digest, algo); -+ return dnsmasq_dsa_verify(key_data, key_len, sig, sig_len, digest, algo); - - #ifndef NO_NETTLE_ECC - case 13: case 14: |