From de49812990871e1705b64051c35161d5e6400269 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 24 Dec 2018 14:11:38 +0000 Subject: gentoo resync : 24.12.2018 --- ...-fail-to-start-on-Linux-LTS-3.14.X-ignore.patch | 72 ---------------------- net-dns/unbound/files/unbound-1.4.12-gentoo.patch | 12 ---- net-dns/unbound/files/unbound.confd | 4 -- net-dns/unbound/files/unbound.initd | 55 ----------------- 4 files changed, 143 deletions(-) delete mode 100644 net-dns/unbound/files/0001-fix-fail-to-start-on-Linux-LTS-3.14.X-ignore.patch delete mode 100644 net-dns/unbound/files/unbound-1.4.12-gentoo.patch delete mode 100644 net-dns/unbound/files/unbound.confd delete mode 100644 net-dns/unbound/files/unbound.initd (limited to 'net-dns/unbound/files') diff --git a/net-dns/unbound/files/0001-fix-fail-to-start-on-Linux-LTS-3.14.X-ignore.patch b/net-dns/unbound/files/0001-fix-fail-to-start-on-Linux-LTS-3.14.X-ignore.patch deleted file mode 100644 index c1be28cbc0db..000000000000 --- a/net-dns/unbound/files/0001-fix-fail-to-start-on-Linux-LTS-3.14.X-ignore.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 858da540f70a4411ad8fbe7144cef6ce9da18f89 Mon Sep 17 00:00:00 2001 -From: wouter -Date: Mon, 5 Jan 2015 13:51:22 +0000 -Subject: [PATCH] - Fix #634: fix fail to start on Linux LTS 3.14.X, ignores - missing IP_MTU_DISCOVER OMIT option. - ---- a/services/listen_dnsport.c -+++ b/services/listen_dnsport.c -@@ -368,29 +368,47 @@ create_udp_sock(int family, int socktype, struct sockaddr* addr, - * (and also uses the interface mtu to determine the size of the packets). - * So there won't be any EMSGSIZE error. Against DNS fragmentation attacks. - * FreeBSD already has same semantics without setting the option. */ --# if defined(IP_PMTUDISC_OMIT) -- int action = IP_PMTUDISC_OMIT; --# else -- int action = IP_PMTUDISC_DONT; --# endif -+ int omit_set = 0; -+ int action; -+# if defined(IP_PMTUDISC_OMIT) -+ action = IP_PMTUDISC_OMIT; - if (setsockopt(s, IPPROTO_IP, IP_MTU_DISCOVER, - &action, (socklen_t)sizeof(action)) < 0) { -- log_err("setsockopt(..., IP_MTU_DISCOVER, " --# if defined(IP_PMTUDISC_OMIT) -- "IP_PMTUDISC_OMIT" -+ -+ if (errno != EINVAL) { -+ log_err("setsockopt(..., IP_MTU_DISCOVER, IP_PMTUDISC_OMIT...) failed: %s", -+ strerror(errno)); -+ -+# ifndef USE_WINSOCK -+ close(s); - # else -- "IP_PMTUDISC_DONT" -+ closesocket(s); - # endif -- "...) failed: %s", -- strerror(errno)); -+ *noproto = 0; -+ *inuse = 0; -+ return -1; -+ } -+ } -+ else -+ { -+ omit_set = 1; -+ } -+# endif -+ if (omit_set == 0) { -+ action = IP_PMTUDISC_DONT; -+ if (setsockopt(s, IPPROTO_IP, IP_MTU_DISCOVER, -+ &action, (socklen_t)sizeof(action)) < 0) { -+ log_err("setsockopt(..., IP_MTU_DISCOVER, IP_PMTUDISC_DONT...) failed: %s", -+ strerror(errno)); - # ifndef USE_WINSOCK -- close(s); -+ close(s); - # else -- closesocket(s); -+ closesocket(s); - # endif -- *noproto = 0; -- *inuse = 0; -- return -1; -+ *noproto = 0; -+ *inuse = 0; -+ return -1; -+ } - } - # elif defined(IP_DONTFRAG) - int off = 0; diff --git a/net-dns/unbound/files/unbound-1.4.12-gentoo.patch b/net-dns/unbound/files/unbound-1.4.12-gentoo.patch deleted file mode 100644 index 57920689783e..000000000000 --- a/net-dns/unbound/files/unbound-1.4.12-gentoo.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur unbound-1.4.12.orig/doc/example.conf.in unbound-1.4.12/doc/example.conf.in ---- unbound-1.4.12.orig/doc/example.conf.in 2011-07-14 17:33:37.000000000 +0900 -+++ unbound-1.4.12/doc/example.conf.in 2011-07-16 10:01:06.644402341 +0900 -@@ -334,7 +334,7 @@ - # with several entries, one file per entry. - # Zone file format, with DS and DNSKEY entries. - # Note this gets out of date, use auto-trust-anchor-file please. -- # trust-anchor-file: "" -+ # trust-anchor-file: "@UNBOUND_ROOTKEY_FILE@" - - # Trusted key for validation. DS or DNSKEY. specify the RR on a - # single line, surrounded by "". TTL is ignored. class is IN default. diff --git a/net-dns/unbound/files/unbound.confd b/net-dns/unbound/files/unbound.confd deleted file mode 100644 index b4de7cf1142e..000000000000 --- a/net-dns/unbound/files/unbound.confd +++ /dev/null @@ -1,4 +0,0 @@ -# Settings should normally not need any changes. - -# Location of the unbound configuration file. Leave empty for the default. -#UNBOUND_CONFFILE="/etc/unbound/unbound.conf" diff --git a/net-dns/unbound/files/unbound.initd b/net-dns/unbound/files/unbound.initd deleted file mode 100644 index b295f285dd1e..000000000000 --- a/net-dns/unbound/files/unbound.initd +++ /dev/null @@ -1,55 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -name="unbound daemon" -extra_commands="configtest" -extra_started_commands="reload" -description="unbound is a Domain Name Server (DNS) that is used to resolve host names to IP address." -description_configtest="Run syntax tests for configuration files only." -description_reload="Kills all children and reloads the configuration." - - -UNBOUND_BINARY=${UNBOUND_BINARY:-/usr/sbin/unbound} -UNBOUND_CHECKCONF=${UNBOUND_CHECKCONF:-/usr/sbin/unbound-checkconf} -UNBOUND_CONFFILE=${UNBOUND_CONFFILE:-/etc/unbound/${SVCNAME}.conf} - -depend() { - need net - use logger - provide dns - after auth-dns -} - -checkconfig() { - UNBOUND_PIDFILE=$("${UNBOUND_CHECKCONF}" -o pidfile "${UNBOUND_CONFFILE}") - return $? -} - -configtest() { - ebegin "Checking ${SVCNAME} configuration" - checkconfig - eend $? -} - -start() { - checkconfig || return $? - ebegin "Starting ${SVCNAME}" - start-stop-daemon --start --pidfile "${UNBOUND_PIDFILE}" \ - --exec "${UNBOUND_BINARY}" -- -c "${UNBOUND_CONFFILE}" - eend $? -} - -stop() { - checkconfig || return $? - ebegin "Stopping ${SVCNAME}" - start-stop-daemon --stop --pidfile "${UNBOUND_PIDFILE}" - eend $? -} - -reload() { - checkconfig || return $? - ebegin "Reloading ${SVCNAME}" - start-stop-daemon --signal HUP --pidfile "${UNBOUND_PIDFILE}" - eend $? -} -- cgit v1.2.3