[arch-commits] Commit in unbound/trunk (PKGBUILD lts.patch)

[Gaetan Bisson]

    Date: Wednesday, February 25, 2015 @ 23:18:37
  Author: bisson
Revision: 128236

upstream update

Modified:
  unbound/trunk/PKGBUILD
Deleted:
  unbound/trunk/lts.patch

-----------+
 PKGBUILD  |   13 ++---------
 lts.patch |   67 ------------------------------------------------------------
 2 files changed, 3 insertions(+), 77 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-02-25 22:00:59 UTC (rev 128235)
+++ PKGBUILD	2015-02-25 22:18:37 UTC (rev 128236)
@@ -4,8 +4,8 @@
 # Contributor: Massimiliano Torromeo <massimiliano DOT torromeo AT google mail service>
 
 pkgname=unbound
-pkgver=1.5.1
-pkgrel=4
+pkgver=1.5.2
+pkgrel=1
 pkgdesc='Validating, recursive, and caching DNS resolver'
 url='http://unbound.net/'
 license=('custom:BSD')
@@ -15,21 +15,14 @@
 depends=('openssl' 'ldns' 'libevent' 'dnssec-anchors')
 backup=('etc/unbound/unbound.conf')
 source=("http://unbound.net/downloads/${pkgname}-${pkgver}.tar.gz"
-        'lts.patch'
         'service'
         'conf')
-sha1sums=('5606c2246e7394bce88cc4f16edbd6b964237ea2'
-          '456c91a253f9102e00e4a46a2f1b936aa2e3ed7c'
+sha1sums=('91c805af3fc702eb98ec2679a586cacd05fc4268'
           '63fcc187cec6f262d81600e66c6747285c72ad15'
           '98515708441cb831890a0b6d1986fd40649646c0')
 
 install=install
 
-prepare() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	patch -p1 -l -i ../lts.patch
-}
-
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	./configure \

Deleted: lts.patch
===================================================================
--- lts.patch	2015-02-25 22:00:59 UTC (rev 128235)
+++ lts.patch	2015-02-25 22:18:37 UTC (rev 128236)
@@ -1,67 +0,0 @@
-diff -ru unbound-1.5.1/services/listen_dnsport.c unbound-1.5.1-rga/services/listen_dnsport.c
---- unbound-1.5.1/services/listen_dnsport.c	2014-12-10 10:59:31.726514857 +0100
-+++ unbound-1.5.1-rga/services/listen_dnsport.c	2014-12-10 11:08:45.009071300 +0100
-@@ -368,30 +368,47 @@
-  * (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 omit_set = 0;
-+#   if defined(IP_PMTUDISC_OMIT)
- 		int action = IP_PMTUDISC_OMIT;
--#    else
--		int action = IP_PMTUDISC_DONT;
--#    endif
- 		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) {
-+   		        int 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;
- 		if (setsockopt(s, IPPROTO_IP, IP_DONTFRAG,