commit:     161f6371818c0df5496883080cc45f2372b15959
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 20 00:19:03 2016 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Feb 20 00:19:41 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=161f6371

net-dns/dnscrypt-proxy: bump, security vuln in OpenDNS plugins; use syslog by 
default for logging

Package-Manager: portage-2.2.27

 net-dns/dnscrypt-proxy/Manifest                    |  1 +
 net-dns/dnscrypt-proxy/dnscrypt-proxy-1.6.1.ebuild | 58 +++++++++++++++++++
 .../files/dnscrypt-proxy.initd-1.6.1               | 65 ++++++++++++++++++++++
 3 files changed, 124 insertions(+)

diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
index c6b84c9..c886122 100644
--- a/net-dns/dnscrypt-proxy/Manifest
+++ b/net-dns/dnscrypt-proxy/Manifest
@@ -1,3 +1,4 @@
 DIST dnscrypt-proxy-1.4.2.tar.gz 1592962 SHA256 
1d519068c30868bb60a151908f0e300a1754b234f7bc2ad1d749ad9d0d977076 SHA512 
ecb81b5d20cf88a610421bb1266861a2f5dd34d0ce916c54507507ca5dbe5d9e49e95916f76fa7997b112860f2bc37793f075ed812c75b2904adf6cdf32cac17
 WHIRLPOOL 
ddfa3da3de933f6cbb8721ccd6435e97b9e893d32311e1c3badbc23b6a0547b6cb0f8d6037baaf0027ca1eb972c4be167dc9ce56194f7f6fa54fac974ca0bd24
 DIST dnscrypt-proxy-1.4.3.tar.gz 1560345 SHA256 
f10f10c18e25ced3c5ec5d0c4145d33270f9cfa991fd1b18d5d9af00e4d9b68e SHA512 
3aae9f20bc06087b0860a24488bcda117010a34218d7aef3c68a0f155f8164ce06a88865a9caf1ce5c5eaa8588518ccc2c8a61a97cc39f527f7b2b14cdf8c118
 WHIRLPOOL 
49915b0f95d340828c79febc9b7d94c4f0c444e016b9f78d134e05f43945b446ab71bbc6a230d6e15d5f1f4c0b97d9f671b6001314cc157cdcd419b01bf23550
 DIST dnscrypt-proxy-1.6.0.tar.gz 1579293 SHA256 
7703a41a1040fc30b19fdfbbaba36b411e66d998584b0e2fa5088f734f4f86be SHA512 
1937a80ab0e6e5786b0d004fef1c007d9d8a4df335542ae6f96c1eac7739920f2ff4b469d30abac774c12a41d275c2a8bf31b5514d7af446028cedeeb3efcf02
 WHIRLPOOL 
b24eb58bca1ff8fa55fec3836399a3ee5c66823d8b459e5f8ce7aa653454407dc3b80d7dc050b76e5c0595fc0e2d854478a6f949ef859b149f6b20e127c98274
+DIST dnscrypt-proxy-1.6.1.tar.gz 1721006 SHA256 
c519012a66f3ee30be02113d1e0139be08ccd2ec45ca4102eac35be731a65340 SHA512 
8d49be73e4b2fe1131349846191f54c7f212ff301a6a6c2a77505225f81b0615e968c945013e732c4fce3b6090606245ec7343fb0d6145bb10b67dd4112d2367
 WHIRLPOOL 
ca5a1c3792728ff54ee5e3c5a8815deb1ce2e1bdd016438ad0b84d89458064e0178df3c1dee77c8a685894092e48a305b521dc8e4bfc3cb40a0d7ac7e7e66d18

diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.6.1.ebuild 
b/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.6.1.ebuild
new file mode 100644
index 0000000..524bed4
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.6.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit systemd user
+
+DESCRIPTION="A tool for securing communications between a client and a DNS 
resolver"
+HOMEPAGE="http://dnscrypt.org/";
+SRC_URI="http://download.dnscrypt.org/${PN}/${P}.tar.gz";
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+plugins systemd"
+
+CDEPEND="
+       dev-libs/libsodium
+       net-libs/ldns
+       systemd? ( sys-apps/systemd )"
+RDEPEND="${CDEPEND}"
+DEPEND="${CDEPEND}
+       virtual/pkgconfig"
+
+DOCS="AUTHORS ChangeLog NEWS README* THANKS *txt"
+
+pkg_setup() {
+       enewgroup dnscrypt
+       enewuser dnscrypt -1 -1 /var/empty dnscrypt
+}
+
+src_configure() {
+       econf \
+               $(use_enable plugins) \
+               $(use_with systemd)
+}
+
+src_install() {
+       default
+
+       newinitd "${FILESDIR}"/${PN}.initd-1.6.1 ${PN}
+       newconfd "${FILESDIR}"/${PN}.confd-1.6.0-r1 ${PN}
+       systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+pkg_postinst() {
+       elog "After starting the service you will need to update your"
+       elog "/etc/resolv.conf and replace your current set of resolvers"
+       elog "with:"
+       elog
+       elog "nameserver <DNSCRYPT_LOCALIP>"
+       elog
+       elog "where <DNSCRYPT_LOCALIP> is what you supplied in"
+       elog "/etc/conf.d/dnscrypt-proxy, default is \"127.0.0.1\"."
+       elog
+       elog "Also see https://github.com/jedisct1/dnscrypt-proxy#usage.";
+}

diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd-1.6.1 
b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd-1.6.1
new file mode 100644
index 0000000..e7a02d6
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd-1.6.1
@@ -0,0 +1,65 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DNSCRYPT_LOGFILE=${DNSCRYPT_LOGFILE:-syslog}
+DNSCRYPT_RESOLVERS_LIST=${DNSCRYPT_RESOLVERS_LIST:-/usr/share/dnscrypt-proxy/dnscrypt-resolvers.csv}
+
+rundir=${rundir:-/var/run/dnscrypt-proxy}
+pidfile=${pidfile:-${rundir}/dnscrypt-proxy.pid}
+rundir=${rundir:-/var/run/dnscrypt-proxy}
+runas_user=${runas_user:-dnscrypt}
+runas_group=${runas_user:-dnscrypt}
+
+depend() {
+       use net
+       before dns
+       after logger
+}
+
+start() {
+       if [ ! -d "${rundir}" ]; then
+               mkdir "${rundir}"
+               if [ -n "${runas_user}" ]; then
+                       touch "${DNSCRYPT_LOGFILE}"
+                       chown ${runas_user}:${runas_group} "${DNSCRYPT_LOGFILE}"
+                       chown -R ${runas_user}:${runas_group} "${rundir}"
+               fi
+       fi
+
+       if [ -n "$DNSCRYPT_RESOLVER_NAME" -a -n "$DNSCRYPT_RESOLVERIP" ]; then
+               eerror "You must set exactly one of DNSCRYPT_RESOLVER_NAME or 
DNSCRYPT_RESOLVERIP!"
+               return 1
+       elif [ -n "$DNSCRYPT_RESOLVER_NAME" ]; then
+               resolver_opts="--resolvers-list=${DNSCRYPT_RESOLVERS_LIST} 
--resolver-name=${DNSCRYPT_RESOLVER_NAME}"
+       elif [ -n "$DNSCRYPT_RESOLVERIP" ]; then
+               
resolver_opts="--resolver-address=${DNSCRYPT_RESOLVERIP}:${DNSCRYPT_RESOLVERPORT}
 --provider-name=${DNSCRYPT_PROVIDER_NAME} 
--provider-key=${DNSCRYPT_PROVIDER_KEY}"
+       else
+               eerror "You must set exactly one of DNSCRYPT_RESOLVER_NAME or 
DNSCRYPT_RESOLVERIP!"
+               return 1
+       fi
+
+       if [[ "${DNSCRYPT_LOGFILE}" == "syslog" ]]; then
+               logopt="--syslog"
+       else
+               logopt="--logfile='${DNSCRYPT_LOGFILE}'"
+       fi
+       ebegin "Starting dnscrypt-proxy"
+       start-stop-daemon --start --quiet \
+               --exec /usr/sbin/dnscrypt-proxy \
+               -- \
+               $logopt \
+               --pidfile="${pidfile}" \
+               --daemonize --user=${runas_user} \
+               --local-address=${DNSCRYPT_LOCALIP}:${DNSCRYPT_LOCALPORT} \
+               $resolver_opts \
+               ${DNSCRYPT_OPTIONS}
+       eend $?
+}
+
+stop() {
+       ebegin "Stopping dnscrypt-proxy"
+       start-stop-daemon --stop --quiet --exec /usr/sbin/dnscrypt-proxy
+       eend $?
+}

Reply via email to