From 98909efa85cfc51279d5fbf4c7d35e186a5a7b8e Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Fri, 21 Jun 2019 12:27:47 -0700 Subject: [PATCH] dnscrypt-proxy: Update to latest git revision Includes a security fix. Fixed usage with latest libsodium. Signed-off-by: Rosen Penev (cherry-picked from 71f9b042d8fb4a9ebc87c3ce75c4757e4af73928) --- net/dnscrypt-proxy/Makefile | 20 +++++++++---------- net/dnscrypt-proxy/patches/010-internal.patch | 11 ++++++++++ 2 files changed, 20 insertions(+), 11 deletions(-) create mode 100644 net/dnscrypt-proxy/patches/010-internal.patch diff --git a/net/dnscrypt-proxy/Makefile b/net/dnscrypt-proxy/Makefile index ddaca89549..32a7c00e7f 100644 --- a/net/dnscrypt-proxy/Makefile +++ b/net/dnscrypt-proxy/Makefile @@ -8,21 +8,21 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dnscrypt-proxy -PKG_VERSION:=1.9.5 -PKG_RELEASE:=8 +PKG_SOURCE_DATE:=2018-11-22 +PKG_SOURCE_VERSION:=f61ca76a852cf56e399a458f9e002886b1b049f0 +PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz -PKG_SOURCE_VERSION:=f71ca699aa3399f0c103c1f13ce1a86f9ce9638c PKG_SOURCE_URL:=https://github.com/dyne/dnscrypt-proxy -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_MIRROR_HASH:=a3a52f7f85b390184695db688c9837bf51cf25c4cb2c1093bb315640dbd2a54f - -PKG_FIXUP:=autoreconf -PKG_INSTALL:=1 +PKG_MIRROR_HASH:=1de8d9913aea4528920dbc6fcd4769a7ab70f7c1c73abba39e68e07376cbb395 PKG_MAINTAINER:=Damiano Renfer PKG_LICENSE:=ISC +PKG_LICENSE_FILES:=COPYING + +PKG_FIXUP:=autoreconf +PKG_INSTALL:=1 +PKG_BUILD_PARALLEL:=1 PKG_CONFIG_DEPENDS:= \ CONFIG_DNSCRYPT_ENABLE_PLUGINS @@ -33,7 +33,6 @@ define Package/dnscrypt-proxy/Default CATEGORY:=Network SUBMENU:=IP Addresses and Names URL:=https://github.com/dyne/dnscrypt-proxy - MAINTAINER:=Damiano Renfer endef define Package/dnscrypt-proxy @@ -55,7 +54,6 @@ endef define Package/dnscrypt-proxy-resolvers $(call Package/dnscrypt-proxy/Default) TITLE:=Package with current list of dnscrypt-proxy resolvers - VERSION:=$(PKG_VERSION)+git-20171001-2d43be3-$(PKG_RELEASE) endef define Package/dnscrypt-proxy-resolvers/description diff --git a/net/dnscrypt-proxy/patches/010-internal.patch b/net/dnscrypt-proxy/patches/010-internal.patch new file mode 100644 index 0000000000..f10a85f1ba --- /dev/null +++ b/net/dnscrypt-proxy/patches/010-internal.patch @@ -0,0 +1,11 @@ +--- a/src/proxy/app.c ++++ b/src/proxy/app.c +@@ -391,7 +391,7 @@ dnscrypt_proxy_main(int argc, char *argv[]) + } + logger_noformat(&proxy_context, LOG_NOTICE, "Starting " PACKAGE_STRING); + sodium_mlock(&proxy_context, sizeof proxy_context); +- randombytes_set_implementation(&randombytes_salsa20_implementation); ++ randombytes_set_implementation(&randombytes_internal_implementation); + + #ifdef PLUGINS + if (plugin_support_context_load(app_context.dcps_context) != 0) { -- 2.30.2