From 24b8c3fb40be5fdfb0ba861b2050bb770090e521 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Feb 16 2016 10:36:38 +0000
Subject: import avahi-0.6.31-15.el7_2.1


---

diff --git a/SOURCES/0006-Silently-ignore-invalid-DNS-packets.patch b/SOURCES/0006-Silently-ignore-invalid-DNS-packets.patch
new file mode 100644
index 0000000..af92991
--- /dev/null
+++ b/SOURCES/0006-Silently-ignore-invalid-DNS-packets.patch
@@ -0,0 +1,31 @@
+From a372e0bfb25f9f8f0d5878d317be7b614f5a4571 Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Thu, 17 Dec 2015 17:12:07 +0100
+Subject: [PATCH] Silently ignore invalid DNS packets
+
+Resolves: #1290890
+---
+ avahi-core/server.c | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/avahi-core/server.c b/avahi-core/server.c
+index 86fd4a5..4acf5fc 100644
+--- a/avahi-core/server.c
++++ b/avahi-core/server.c
+@@ -972,11 +972,9 @@ static void dispatch_packet(AvahiServer *s, AvahiDnsPacket *p, const AvahiAddres
+             return;
+         }
+ 
+-        if (avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_QDCOUNT) != 0 ||
+-            avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_ANCOUNT) == 0 ||
+-            avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_NSCOUNT) != 0) {
++        if (avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_ANCOUNT) == 0) {
+ 
+-            avahi_log_warn("Invalid response packet from host %s.", avahi_address_snprint(t, sizeof(t), src_address));
++            avahi_log_debug("Invalid response packet from host %s.", avahi_address_snprint(t, sizeof(t), src_address));
+             return;
+         }
+ 
+-- 
+2.5.0
+
diff --git a/SOURCES/avahi-0.6.31-no-deprecations.patch b/SOURCES/avahi-0.6.31-no-deprecations.patch
new file mode 100644
index 0000000..9ca9d38
--- /dev/null
+++ b/SOURCES/avahi-0.6.31-no-deprecations.patch
@@ -0,0 +1,22 @@
+--- avahi-0.6.31/avahi-ui/Makefile.am.orig	2013-09-21 16:47:28.677659361 +0200
++++ avahi-0.6.31/avahi-ui/Makefile.am	2013-09-21 16:47:34.852520537 +0200
+@@ -15,7 +15,7 @@
+ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ # USA.
+ 
+-AM_CFLAGS=-I$(top_srcdir) -DG_DISABLE_DEPRECATED=1 -DGDK_DISABLE_DEPRECATED=1 -DGTK_DISABLE_DEPRECATED=1
++AM_CFLAGS=-I$(top_srcdir)
+ 
+ # This cool debug trap works on i386/gcc only
+ AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
+--- avahi-0.6.31/configure.ac.orig	2013-09-21 16:46:43.750669413 +0200
++++ avahi-0.6.31/configure.ac	2013-09-21 16:47:02.566246400 +0200
+@@ -92,7 +92,7 @@
+     AC_MSG_CHECKING([whether stack-smashing protection is available])
+     ssp_old_cflags="$CFLAGS"
+     ssp_old_ldflags="$LDFLAGS"
+-    CFLAGS="$CFLAGS -Werror -fstack-protector-all -fPIC"
++    CFLAGS="$CFLAGS -fstack-protector-all -fPIC"
+     LDFLAGS="$LDFLAGS -Wl,-z,defs"
+     cat confdefs.h > conftest.c
+     cat >>conftest.c <<_ACEOF
diff --git a/SPECS/avahi.spec b/SPECS/avahi.spec
index d381405..558e18f 100644
--- a/SPECS/avahi.spec
+++ b/SPECS/avahi.spec
@@ -12,7 +12,7 @@
 
 Name:             avahi
 Version:          0.6.31
-Release:          15%{?dist}
+Release:          15%{?dist}.1
 Summary:          Local network service discovery
 License:          LGPLv2+
 URL:              http://avahi.org
@@ -27,6 +27,7 @@ Requires(pre):    /usr/bin/getent
 Requires(pre):    /usr/sbin/groupadd
 Requires:         %{name}-libs = %{version}-%{release}
 BuildRequires:    automake
+BuildRequires:    autoconf
 BuildRequires:    libtool
 BuildRequires:    dbus-devel >= 0.90
 BuildRequires:    dbus-glib-devel >= 0.70
@@ -59,12 +60,16 @@ Requires(postun): systemd
 Requires(post):   systemd-sysv
 
 Source0:          http://avahi.org/download/%{name}-%{version}.tar.gz
-Patch0:           avahi-0.6.30-mono-libdir.patch
-Patch1:           0001-man-correct-short-option-to-print-version-string.patch
-Patch2:           0002-man-add-description-for-t-option.patch
-Patch3:           0003-dbus-don-t-crash-if-we-can-t-determine-alternative-s.patch
-Patch4:           0004-avahi-core-reserve-space-for-record-data-when-size-e.patch
-Patch5:           0005-Remove-prefix-home-lennart-tmp-avahi-from-references.patch
+Patch0000:        avahi-0.6.30-mono-libdir.patch
+Patch0001:        0001-man-correct-short-option-to-print-version-string.patch
+Patch0002:        0002-man-add-description-for-t-option.patch
+Patch0003:        0003-dbus-don-t-crash-if-we-can-t-determine-alternative-s.patch
+Patch0004:        0004-avahi-core-reserve-space-for-record-data-when-size-e.patch
+Patch0005:        0005-Remove-prefix-home-lennart-tmp-avahi-from-references.patch
+Patch0006:        0006-Silently-ignore-invalid-DNS-packets.patch
+
+# due to FTBFS caused by Gtk changes introduced in RHEL-7.2
+Patch1000:        avahi-0.6.31-no-deprecations.patch
 
 %description
 Avahi is a system which facilitates service discovery on
@@ -344,6 +349,7 @@ fashion with mDNS.
 %autosetup -S git
 
 %build
+autoreconf -fi
 %configure \
         --with-distro=fedora \
         --disable-monodoc \
@@ -649,6 +655,9 @@ fi
 %endif
 
 %changelog
+* Thu Dec 17 2015 Michal Sekletar <msekleta@redhat.com> - 0.6.31-15.1
+- silently ignore non-valid DNS response packets (#1292727)
+
 * Tue Apr 21 2015 Michal Sekletar <msekleta@redhat.com> - 0.6.31-15
 - enable hardened build (#1092506)
 - fix short option for --version, document -t option of avahi-autoipd (#948583)