[arch-commits] Commit in bind/trunk (01-fix-forgotten-log.patch PKGBUILD)

[Sébastien Luttringer]

    Date: Sunday, May 11, 2014 @ 02:58:17
  Author: seblu
Revision: 110958

upgpkg: bind 9.10.0.P1-1

Added:
  bind/trunk/01-fix-forgotten-log.patch
Modified:
  bind/trunk/PKGBUILD

----------------------------+
 01-fix-forgotten-log.patch |   41 +++++++++++++++++++++++++++++++++++++++++
 PKGBUILD                   |   10 +++++++---
 2 files changed, 48 insertions(+), 3 deletions(-)

Added: 01-fix-forgotten-log.patch
===================================================================
--- 01-fix-forgotten-log.patch	                        (rev 0)
+++ 01-fix-forgotten-log.patch	2014-05-11 00:58:17 UTC (rev 110958)
@@ -0,0 +1,41 @@
+# https://lists.isc.org/pipermail/bind-users/2014-May/093124.html
+From 73a2c0ec42c0915bde0275c81861f57645daf683 Mon Sep 17 00:00:00 2001
+From: Tony Finch <dot at dotat.at>
+Date: Thu, 28 Nov 2013 17:23:57 +0000
+Subject: [PATCH] Disable XXXMPA verbose packet logging in EDNS fallback code.
+
+---
+ lib/dns/resolver.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
+index 11c805f..e50071e 100644
+--- a/lib/dns/resolver.c
++++ b/lib/dns/resolver.c
+@@ -7339,9 +7339,11 @@ resquery_response(isc_task_t *task, isc_event_t *event) {
+ 				    sizeof(addrbuf));
+ 		snprintf(buf, sizeof(buf), "received packet from %s "
+ 			 "(bad edns):\n", addrbuf);
++/*
+ 		dns_message_logpacket(message, buf,
+ 			      DNS_LOGCATEGORY_RESOLVER, DNS_LOGMODULE_RESOLVER,
+ 			      ISC_LOG_NOTICE, fctx->res->mctx);
++*/
+ 		dns_adb_changeflags(fctx->adb, query->addrinfo,
+ 				    DNS_FETCHOPT_NOEDNS0,
+ 				    DNS_FETCHOPT_NOEDNS0);
+@@ -7369,9 +7371,11 @@ resquery_response(isc_task_t *task, isc_event_t *event) {
+ 				    sizeof(addrbuf));
+ 		snprintf(buf, sizeof(buf), "received packet from %s (no opt):\n",
+ 			 addrbuf);
++/*
+ 		dns_message_logpacket(message, buf,
+ 			      DNS_LOGCATEGORY_RESOLVER, DNS_LOGMODULE_RESOLVER,
+ 			      ISC_LOG_NOTICE, fctx->res->mctx);
++*/
+ 		dns_adb_changeflags(fctx->adb, query->addrinfo,
+ 				    DNS_FETCHOPT_NOEDNS0,
+ 				    DNS_FETCHOPT_NOEDNS0);
+-- 
+1.9.1
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-05-10 16:52:31 UTC (rev 110957)
+++ PKGBUILD	2014-05-11 00:58:17 UTC (rev 110958)
@@ -5,8 +5,8 @@
 # Contributor: Mario Vazquez <mario_vazq at hotmail.com>
 
 pkgname=bind
-_pkgver=9.10.0
-pkgver=9.10.0
+_pkgver=9.10.0-P1
+pkgver=${_pkgver//-/.}
 pkgrel=1
 pkgdesc='The ISC BIND nameserver'
 url='http://www.isc.org/software/bind/'
@@ -19,6 +19,7 @@
         'etc/named.conf')
 install=$pkgname.install
 source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"{,.asc}
+        '01-fix-forgotten-log.patch'
         'root.hint::http://www.internic.net/zones/named.root'
         'tmpfiles.d'
         'named.conf'
@@ -26,8 +27,9 @@
         'named.logrotate'
         'localhost.zone'
         '127.0.0.zone')
-sha1sums=('75776823efc5fa6fed1618030854b6a265694abd'
+sha1sums=('2404524f321107d7654e4c64f4174f6c464debb9'
           'SKIP'
+          '4d96c9b9ef0aebdad7e79c749536858a344779b5'
           '029f89c49550c40ec7a95116b6a33f0e5a041094'
           'c5a2bcd9b0f009ae71f3a03fbdbe012196962a11'
           'c71a7fc02d4bf0d55e8e29d1e014607ac1d58726'
@@ -39,6 +41,8 @@
 prepare() {
   # remove dig to avoid conflict with dnsutils
   sed -i 's/dig//' $pkgname-$_pkgver/bin/Makefile.in
+  # https://lists.isc.org/pipermail/bind-users/2014-May/093124.html
+  patch -p1 -d bind-$_pkgver < 01-fix-forgotten-log.patch
 }
 
 build() {