Author: cyrus Date: 2014-06-18 19:06:37 +0200 (Wed, 18 Jun 2014) New Revision: 41264
Removed: trunk/package/network/services/dnsmasq/patches/120-nettle-3.0-compatibility.patch Modified: trunk/package/network/services/dnsmasq/Makefile Log: dnsmasq: removing nettle 3.0 support due to nettle downgrade Signed-off-by: Steven Barth <[email protected]> Modified: trunk/package/network/services/dnsmasq/Makefile =================================================================== --- trunk/package/network/services/dnsmasq/Makefile 2014-06-18 17:06:30 UTC (rev 41263) +++ trunk/package/network/services/dnsmasq/Makefile 2014-06-18 17:06:37 UTC (rev 41264) @@ -9,7 +9,7 @@ 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 Deleted: trunk/package/network/services/dnsmasq/patches/120-nettle-3.0-compatibility.patch =================================================================== --- trunk/package/network/services/dnsmasq/patches/120-nettle-3.0-compatibility.patch 2014-06-18 17:06:30 UTC (rev 41263) +++ trunk/package/network/services/dnsmasq/patches/120-nettle-3.0-compatibility.patch 2014-06-18 17:06:37 UTC (rev 41264) @@ -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: _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
