From 6cbb45bdb441dd9e910363908219fc55e3727d59 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Thu, 26 Feb 2015 16:16:14 +0100 Subject: [PATCH] - updated to 1.5.2 - removed obsolete IP_PMTUDISC_OMIT patch --- unbound-IP_PMTUDISC_OMIT.patch | 33 --------------------------------- unbound.spec | 8 +++----- 2 files changed, 3 insertions(+), 38 deletions(-) delete mode 100644 unbound-IP_PMTUDISC_OMIT.patch diff --git a/unbound-IP_PMTUDISC_OMIT.patch b/unbound-IP_PMTUDISC_OMIT.patch deleted file mode 100644 index dfe71db..0000000 --- a/unbound-IP_PMTUDISC_OMIT.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -dur unbound-1.5.1.orig/services/listen_dnsport.c unbound-1.5.1/services/listen_dnsport.c ---- unbound-1.5.1.orig/services/listen_dnsport.c 2014-09-16 15:49:21.000000000 +0200 -+++ unbound-1.5.1/services/listen_dnsport.c 2014-12-18 10:37:55.000000000 +0100 -@@ -368,19 +368,20 @@ - * (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. */ -+ int action, result = -1; - # if defined(IP_PMTUDISC_OMIT) -- int action = IP_PMTUDISC_OMIT; --# else -- int action = IP_PMTUDISC_DONT; -+ action = IP_PMTUDISC_OMIT; -+ result = setsockopt(s, IPPROTO_IP, IP_MTU_DISCOVER, -+ &action, (socklen_t)sizeof(action)); - # endif -- if (setsockopt(s, IPPROTO_IP, IP_MTU_DISCOVER, -- &action, (socklen_t)sizeof(action)) < 0) { -+ if (result < 0) { -+ action = IP_PMTUDISC_DONT; -+ result = setsockopt(s, IPPROTO_IP, IP_MTU_DISCOVER, -+ &action, (socklen_t)sizeof(action)); -+ } -+ if (result < 0) { - log_err("setsockopt(..., IP_MTU_DISCOVER, " --# if defined(IP_PMTUDISC_OMIT) -- "IP_PMTUDISC_OMIT" --# else - "IP_PMTUDISC_DONT" --# endif - "...) failed: %s", - strerror(errno)); - # ifndef USE_WINSOCK diff --git a/unbound.spec b/unbound.spec index f60c607..895a054 100644 --- a/unbound.spec +++ b/unbound.spec @@ -5,12 +5,12 @@ Summary: Recursive, validating DNS resolver Summary(pl.UTF-8): Rekurencyjny, weryfikujący resolver DNS Name: unbound -Version: 1.5.1 -Release: 3 +Version: 1.5.2 +Release: 1 License: BSD Group: Applications/Network Source0: http://www.unbound.net/downloads/%{name}-%{version}.tar.gz -# Source0-md5: ed4c46476dcfb8a507cc08b1ba12a8f1 +# Source0-md5: 4aae09f78509eaf002f7869e19f29321 Source1: %{name}.init Source2: %{name}.service Source3: https://data.iana.org/root-anchors/icannbundle.pem @@ -18,7 +18,6 @@ Source3: https://data.iana.org/root-anchors/icannbundle.pem Source4: ftp://ftp.internic.net/domain/named.cache # Source4-md5: 89241448b08af70dd5715e7ef12d71f6 Patch0: %{name}-default_trust_anchor.patch -Patch1: %{name}-IP_PMTUDISC_OMIT.patch URL: http://unbound.net/ BuildRequires: expat-devel BuildRequires: libevent-devel @@ -115,7 +114,6 @@ Pythonowy interfejs do biblioteki unbound. %prep %setup -q %patch0 -p1 -%patch1 -p1 %build %configure \ -- 2.43.0