summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMaxin B. John <maxin.john@intel.com>2016-02-17 16:00:19 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-18 07:39:32 +0000
commit3a82e2e5ddc759be9b2ce88bf1002764a0fbad6c (patch)
tree15bd65db5ff6a731189e320610fa1822d663f386 /meta
parent14daeb51c1132ec2af8b4ecb124451428bb93f79 (diff)
downloadpoky-3a82e2e5ddc759be9b2ce88bf1002764a0fbad6c.tar.gz
avahi: update to version 0.6.32
0.6.31 -> 0.6.32 a. Switched to the new repository hosted in github. b. Removed the following Upstreamed/Backported patches 1. 0001-Don-t-log-warnings-about-invalid-packets-Fixes-lathi.patch 2. 0001-avahi-fix-avahi-status-command-error-prompt.patch 3. avahi_fix_install_issue.patch 4. fix_for_automake_1.12.x.patch 5. out-of-tree.patch 6. reuseport-check.patch c. Added UPSTREAM_CHECK_URI [YOCTO #7553] (From OE-Core rev: 5ba7df63c4f0ac56f8513f9aecdbf3b12a121cd1) Signed-off-by: Maxin B. John <maxin.john@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb (renamed from meta/recipes-connectivity/avahi/avahi-ui_0.6.31.bb)6
-rw-r--r--meta/recipes-connectivity/avahi/avahi.inc14
-rw-r--r--meta/recipes-connectivity/avahi/avahi_0.6.32.bb (renamed from meta/recipes-connectivity/avahi/avahi_0.6.31.bb)6
-rw-r--r--meta/recipes-connectivity/avahi/files/0001-Don-t-log-warnings-about-invalid-packets-Fixes-lathi.patch158
-rw-r--r--meta/recipes-connectivity/avahi/files/0001-avahi-fix-avahi-status-command-error-prompt.patch52
-rw-r--r--meta/recipes-connectivity/avahi/files/avahi_fix_install_issue.patch32
-rw-r--r--meta/recipes-connectivity/avahi/files/fix_for_automake_1.12.x.patch34
-rw-r--r--meta/recipes-connectivity/avahi/files/out-of-tree.patch32
-rw-r--r--meta/recipes-connectivity/avahi/files/reuseport-check.patch30
9 files changed, 8 insertions, 356 deletions
diff --git a/meta/recipes-connectivity/avahi/avahi-ui_0.6.31.bb b/meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb
index 604ee9ec37..aafb52e934 100644
--- a/meta/recipes-connectivity/avahi/avahi-ui_0.6.31.bb
+++ b/meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb
@@ -12,10 +12,8 @@ ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}"
12PACKAGECONFIG ??= "python" 12PACKAGECONFIG ??= "python"
13PACKAGECONFIG[python] = "--enable-python,--disable-python,python-native python" 13PACKAGECONFIG[python] = "--enable-python,--disable-python,python-native python"
14 14
15PR = "${INC_PR}.0" 15SRC_URI[md5sum] = "22b5e705d3eabb31d26f2e1e7b074013"
16 16SRC_URI[sha256sum] = "d54991185d514a0aba54ebeb408d7575b60f5818a772e28fa0e18b98bc1db454"
17SRC_URI[md5sum] = "2f22745b8f7368ad5a0a3fddac343f2d"
18SRC_URI[sha256sum] = "8372719b24e2dd75de6f59bb1315e600db4fd092805bd1201ed0cb651a2dab48"
19 17
20DEPENDS += "avahi gtk+ libglade" 18DEPENDS += "avahi gtk+ libglade"
21 19
diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc
index 3d22e4cd77..faa8ee87e5 100644
--- a/meta/recipes-connectivity/avahi/avahi.inc
+++ b/meta/recipes-connectivity/avahi/avahi.inc
@@ -7,28 +7,21 @@ configuration from the link-local 169.254.0.0/16 range without the need for a ce
7server.' 7server.'
8AUTHOR = "Lennart Poettering <lennart@poettering.net>" 8AUTHOR = "Lennart Poettering <lennart@poettering.net>"
9HOMEPAGE = "http://avahi.org" 9HOMEPAGE = "http://avahi.org"
10BUGTRACKER = "http://avahi.org/report" 10BUGTRACKER = "https://github.com/lathiat/avahi/issues"
11SECTION = "network" 11SECTION = "network"
12 12
13# major part is under LGPLv2.1+, but several .dtd, .xsl, initscripts and 13# major part is under LGPLv2.1+, but several .dtd, .xsl, initscripts and
14# python scripts are under GPLv2+ 14# python scripts are under GPLv2+
15LICENSE = "GPLv2+ & LGPLv2.1+" 15LICENSE = "GPLv2+ & LGPLv2.1+"
16 16
17INC_PR = "r11"
18
19DEPENDS = "expat libcap libdaemon dbus glib-2.0" 17DEPENDS = "expat libcap libdaemon dbus glib-2.0"
20 18
21SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \ 19SRC_URI = "https://github.com/lathiat/avahi/releases/download/v${PV}/avahi-${PV}.tar.gz \
22 file://00avahi-autoipd \ 20 file://00avahi-autoipd \
23 file://99avahi-autoipd \ 21 file://99avahi-autoipd \
24 file://initscript.patch \ 22 file://initscript.patch \
25 file://avahi_fix_install_issue.patch \
26 file://fix_for_automake_1.12.x.patch \
27 file://out-of-tree.patch \
28 file://0001-avahi-fix-avahi-status-command-error-prompt.patch \
29 file://reuseport-check.patch \
30 file://0001-Don-t-log-warnings-about-invalid-packets-Fixes-lathi.patch \
31 " 23 "
24UPSTREAM_CHECK_URI = "https://github.com/lathiat/avahi/releases/"
32 25
33USERADD_PACKAGES = "avahi-daemon avahi-autoipd" 26USERADD_PACKAGES = "avahi-daemon avahi-autoipd"
34USERADD_PARAM_avahi-daemon = "--system --home /var/run/avahi-daemon \ 27USERADD_PARAM_avahi-daemon = "--system --home /var/run/avahi-daemon \
@@ -53,6 +46,7 @@ EXTRA_OECONF = "--disable-introspection \
53 --disable-qt4 \ 46 --disable-qt4 \
54 --disable-python \ 47 --disable-python \
55 --disable-doxygen-doc \ 48 --disable-doxygen-doc \
49 --disable-manpages \
56 ${EXTRA_OECONF_SYSVINIT} \ 50 ${EXTRA_OECONF_SYSVINIT} \
57 ${EXTRA_OECONF_SYSTEMD} \ 51 ${EXTRA_OECONF_SYSTEMD} \
58 ${AVAHI_GTK} \ 52 ${AVAHI_GTK} \
diff --git a/meta/recipes-connectivity/avahi/avahi_0.6.31.bb b/meta/recipes-connectivity/avahi/avahi_0.6.32.bb
index 5d796a202b..6670106b1b 100644
--- a/meta/recipes-connectivity/avahi/avahi_0.6.31.bb
+++ b/meta/recipes-connectivity/avahi/avahi_0.6.32.bb
@@ -12,10 +12,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \
12 file://avahi-daemon/main.c;endline=21;md5=9ee77368c5407af77caaef1b07285969 \ 12 file://avahi-daemon/main.c;endline=21;md5=9ee77368c5407af77caaef1b07285969 \
13 file://avahi-client/client.h;endline=23;md5=f4ac741a25c4f434039ba3e18c8674cf" 13 file://avahi-client/client.h;endline=23;md5=f4ac741a25c4f434039ba3e18c8674cf"
14 14
15PR = "${INC_PR}.1" 15SRC_URI[md5sum] = "22b5e705d3eabb31d26f2e1e7b074013"
16 16SRC_URI[sha256sum] = "d54991185d514a0aba54ebeb408d7575b60f5818a772e28fa0e18b98bc1db454"
17SRC_URI[md5sum] = "2f22745b8f7368ad5a0a3fddac343f2d"
18SRC_URI[sha256sum] = "8372719b24e2dd75de6f59bb1315e600db4fd092805bd1201ed0cb651a2dab48"
19 17
20DEPENDS += "intltool-native" 18DEPENDS += "intltool-native"
21 19
diff --git a/meta/recipes-connectivity/avahi/files/0001-Don-t-log-warnings-about-invalid-packets-Fixes-lathi.patch b/meta/recipes-connectivity/avahi/files/0001-Don-t-log-warnings-about-invalid-packets-Fixes-lathi.patch
deleted file mode 100644
index 25a0a0e40f..0000000000
--- a/meta/recipes-connectivity/avahi/files/0001-Don-t-log-warnings-about-invalid-packets-Fixes-lathi.patch
+++ /dev/null
@@ -1,158 +0,0 @@
1From de7cde877e4daa5d9d4fb5b1a349299eaa94969d Mon Sep 17 00:00:00 2001
2From: Trent Lloyd <trent@lloyd.id.au>
3Date: Sat, 10 Oct 2015 06:20:46 +0800
4Subject: [PATCH] Don't log warnings about invalid packets (Fixes
5 lathiat/avahi#10)
6
7Various invalid packets would generate a warning, in particular
8Windows 10 generates response packets with no answer records and
9generally seemingly empty. Unsure why at this stage.
10
11This results in spamming syslog quite a lot on busy networks,
12similar issues like this have occured over time due to changes
13in various operating systems and specs (e.g. Avahi #284, #282)
14
15Rather than just disable this single message or case, I have
16pre-emptively turned the majority of these bad packet messages
17into debug messages. They can still be output on production
18builds if reuqired using the --debug option (no rebuild required).
19
20External References:
21https://bugs.launchpad.net/ubuntu/+source/avahi/+bug/1342400
22https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=794145
23https://bugzilla.redhat.com/show_bug.cgi?id=1240711
24
25Pulled from git://github.com/lathiat/avahi de7cde87, which
26is slated for avahi 0.6.32.
27
28Signed-off-by: Brad Mouring <brad.mouring@ni.com>
29Upstream-Status: Backport
30
31---
32 avahi-core/server.c | 28 ++++++++++++++--------------
33 1 file changed, 14 insertions(+), 14 deletions(-)
34
35diff --git a/avahi-core/server.c b/avahi-core/server.c
36index e87f035..a2cb19a 100644
37--- a/avahi-core/server.c
38+++ b/avahi-core/server.c
39@@ -587,7 +587,7 @@ static void handle_query_packet(AvahiServer *s, AvahiDnsPacket *p, AvahiInterfac
40 int unicast_response = 0;
41
42 if (!(key = avahi_dns_packet_consume_key(p, &unicast_response))) {
43- avahi_log_warn(__FILE__": Packet too short or invalid while reading question key. (Maybe a UTF-8 problem?)");
44+ avahi_log_debug(__FILE__": Packet too short or invalid while reading question key. (Maybe a UTF-8 problem?)");
45 goto fail;
46 }
47
48@@ -615,7 +615,7 @@ static void handle_query_packet(AvahiServer *s, AvahiDnsPacket *p, AvahiInterfac
49 int unique = 0;
50
51 if (!(record = avahi_dns_packet_consume_record(p, &unique))) {
52- avahi_log_warn(__FILE__": Packet too short or invalid while reading known answer record. (Maybe a UTF-8 problem?)");
53+ avahi_log_debug(__FILE__": Packet too short or invalid while reading known answer record. (Maybe a UTF-8 problem?)");
54 goto fail;
55 }
56
57@@ -632,7 +632,7 @@ static void handle_query_packet(AvahiServer *s, AvahiDnsPacket *p, AvahiInterfac
58 int unique = 0;
59
60 if (!(record = avahi_dns_packet_consume_record(p, &unique))) {
61- avahi_log_warn(__FILE__": Packet too short or invalid while reading probe record. (Maybe a UTF-8 problem?)");
62+ avahi_log_debug(__FILE__": Packet too short or invalid while reading probe record. (Maybe a UTF-8 problem?)");
63 goto fail;
64 }
65
66@@ -669,7 +669,7 @@ static void handle_response_packet(AvahiServer *s, AvahiDnsPacket *p, AvahiInter
67 int cache_flush = 0;
68
69 if (!(record = avahi_dns_packet_consume_record(p, &cache_flush))) {
70- avahi_log_warn(__FILE__": Packet too short or invalid while reading response record. (Maybe a UTF-8 problem?)");
71+ avahi_log_debug(__FILE__": Packet too short or invalid while reading response record. (Maybe a UTF-8 problem?)");
72 break;
73 }
74
75@@ -901,13 +901,13 @@ static void dispatch_packet(AvahiServer *s, AvahiDnsPacket *p, const AvahiAddres
76
77 if (!(i = avahi_interface_monitor_get_interface(s->monitor, iface, src_address->proto)) ||
78 !i->announcing) {
79- avahi_log_warn("Received packet from invalid interface.");
80+ avahi_log_debug("Received packet from invalid interface.");
81 return;
82 }
83
84 if (port <= 0) {
85 /* This fixes RHBZ #475394 */
86- avahi_log_warn("Received packet from invalid source port %u.", (unsigned) port);
87+ avahi_log_debug("Received packet from invalid source port %u.", (unsigned) port);
88 return;
89 }
90
91@@ -924,7 +924,7 @@ static void dispatch_packet(AvahiServer *s, AvahiDnsPacket *p, const AvahiAddres
92 from_local_iface = originates_from_local_iface(s, iface, src_address, port);
93
94 if (avahi_dns_packet_check_valid_multicast(p) < 0) {
95- avahi_log_warn("Received invalid packet.");
96+ avahi_log_debug("Received invalid packet.");
97 return;
98 }
99
100@@ -940,7 +940,7 @@ static void dispatch_packet(AvahiServer *s, AvahiDnsPacket *p, const AvahiAddres
101
102 if ((avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_ANCOUNT) != 0 ||
103 avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_NSCOUNT) != 0)) {
104- avahi_log_warn("Invalid legacy unicast query packet.");
105+ avahi_log_debug("Invalid legacy unicast query packet.");
106 return;
107 }
108
109@@ -956,19 +956,19 @@ static void dispatch_packet(AvahiServer *s, AvahiDnsPacket *p, const AvahiAddres
110 char t[AVAHI_ADDRESS_STR_MAX];
111
112 if (port != AVAHI_MDNS_PORT) {
113- avahi_log_warn("Received response from host %s with invalid source port %u on interface '%s.%i'", avahi_address_snprint(t, sizeof(t), src_address), port, i->hardware->name, i->protocol);
114+ avahi_log_debug("Received response from host %s with invalid source port %u on interface '%s.%i'", avahi_address_snprint(t, sizeof(t), src_address), port, i->hardware->name, i->protocol);
115 return;
116 }
117
118 if (ttl != 255 && s->config.check_response_ttl) {
119- avahi_log_warn("Received response from host %s with invalid TTL %u on interface '%s.%i'.", avahi_address_snprint(t, sizeof(t), src_address), ttl, i->hardware->name, i->protocol);
120+ avahi_log_debug("Received response from host %s with invalid TTL %u on interface '%s.%i'.", avahi_address_snprint(t, sizeof(t), src_address), ttl, i->hardware->name, i->protocol);
121 return;
122 }
123
124 if (!is_mdns_mcast_address(dst_address) &&
125 !avahi_interface_address_on_link(i, src_address)) {
126
127- avahi_log_warn("Received non-local response from host %s on interface '%s.%i'.", avahi_address_snprint(t, sizeof(t), src_address), i->hardware->name, i->protocol);
128+ avahi_log_debug("Received non-local response from host %s on interface '%s.%i'.", avahi_address_snprint(t, sizeof(t), src_address), i->hardware->name, i->protocol);
129 return;
130 }
131
132@@ -976,7 +976,7 @@ static void dispatch_packet(AvahiServer *s, AvahiDnsPacket *p, const AvahiAddres
133 avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_ANCOUNT) == 0 ||
134 avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_NSCOUNT) != 0) {
135
136- avahi_log_warn("Invalid response packet from host %s.", avahi_address_snprint(t, sizeof(t), src_address));
137+ avahi_log_debug("Invalid response packet from host %s.", avahi_address_snprint(t, sizeof(t), src_address));
138 return;
139 }
140
141@@ -992,12 +992,12 @@ static void dispatch_legacy_unicast_packet(AvahiServer *s, AvahiDnsPacket *p) {
142 assert(p);
143
144 if (avahi_dns_packet_check_valid(p) < 0 || avahi_dns_packet_is_query(p)) {
145- avahi_log_warn("Received invalid packet.");
146+ avahi_log_debug("Received invalid packet.");
147 return;
148 }
149
150 if (!(slot = find_slot(s, avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_ID)))) {
151- avahi_log_warn("Received legacy unicast response with unknown id");
152+ avahi_log_debug("Received legacy unicast response with unknown id");
153 return;
154 }
155
156--
1572.6.4
158
diff --git a/meta/recipes-connectivity/avahi/files/0001-avahi-fix-avahi-status-command-error-prompt.patch b/meta/recipes-connectivity/avahi/files/0001-avahi-fix-avahi-status-command-error-prompt.patch
deleted file mode 100644
index 7590df79f0..0000000000
--- a/meta/recipes-connectivity/avahi/files/0001-avahi-fix-avahi-status-command-error-prompt.patch
+++ /dev/null
@@ -1,52 +0,0 @@
1From f774ac25f436a782ccccc4dbe68378a684596799 Mon Sep 17 00:00:00 2001
2From: Lu Chong <Chong.Lu@windriver.com>
3Date: Thu, 7 Nov 2013 14:36:28 +0800
4Subject: [PATCH] avahi: fix avahi status command error prompt
5
6service --status-all command will display wrong status for avahi-daemon.
7This commit fix this error prompt and make service display right status
8for avahi-daemon.
9
10Upstream-Status: Pending
11
12Signed-off-by: Lu Chong <Chong.Lu@windriver.com>
13---
14 initscript/debian/avahi-daemon.in | 14 +++++++++++---
15 1 file changed, 11 insertions(+), 3 deletions(-)
16
17diff --git a/initscript/debian/avahi-daemon.in b/initscript/debian/avahi-daemon.in
18index 4793b46..49ec358 100755
19--- a/initscript/debian/avahi-daemon.in
20+++ b/initscript/debian/avahi-daemon.in
21@@ -153,7 +153,15 @@ d_reload() {
22 # Function that check the status of the daemon/service.
23 #
24 d_status() {
25- $DAEMON -c && echo "$DESC is running" || echo "$DESC is not running"
26+ $DAEMON -c
27+ status=$?
28+ if [ $status = 0 ]; then
29+ echo "$DESC is running"
30+ return 0
31+ else
32+ echo "$DESC is not running"
33+ return 3
34+ fi
35 }
36
37 case "$1" in
38@@ -182,9 +190,9 @@ case "$1" in
39 d_status
40 ;;
41 *)
42- echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload|reload}" >&2
43+ echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload|reload|status}" >&2
44 exit 1
45 ;;
46 esac
47
48-exit 0
49+exit $?
50--
511.7.9.5
52
diff --git a/meta/recipes-connectivity/avahi/files/avahi_fix_install_issue.patch b/meta/recipes-connectivity/avahi/files/avahi_fix_install_issue.patch
deleted file mode 100644
index 32f20ece43..0000000000
--- a/meta/recipes-connectivity/avahi/files/avahi_fix_install_issue.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1Upstream-Status: Pending
2
3Fixes this install issue
4#| /bin/sh: line 0: cd: /srv/home/nitin/builds/build-gcc47/tmp/work/i586-poky-linux/avahi-0.6.31-r3.0/image//usr/bin: No such file or directory
5
6Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
72012/05/03
8
9Index: avahi-0.6.31/avahi-utils/Makefile.am
10===================================================================
11--- avahi-0.6.31.orig/avahi-utils/Makefile.am
12+++ avahi-0.6.31/avahi-utils/Makefile.am
13@@ -54,6 +54,7 @@ avahi_set_host_name_CFLAGS = $(AM_CFLAGS
14 avahi_set_host_name_LDADD = $(AM_LDADD) ../avahi-client/libavahi-client.la ../avahi-common/libavahi-common.la
15
16 install-exec-local:
17+ $(MKDIR_P) $(DESTDIR)/$(bindir) && \
18 cd $(DESTDIR)/$(bindir) && \
19 rm -f avahi-resolve-host-name avahi-resolve-address avahi-browse-domains avahi-publish-address avahi-publish-service && \
20 $(LN_S) avahi-resolve avahi-resolve-host-name && \
21Index: avahi-0.6.31/avahi-utils/Makefile.in
22===================================================================
23--- avahi-0.6.31.orig/avahi-utils/Makefile.in
24+++ avahi-0.6.31/avahi-utils/Makefile.in
25@@ -906,6 +906,7 @@ uninstall-am: uninstall-binPROGRAMS
26
27
28 @HAVE_DBUS_TRUE@install-exec-local:
29+@HAVE_DBUS_TRUE@ $(MKDIR_P) $(DESTDIR)/$(bindir) && \
30 @HAVE_DBUS_TRUE@ cd $(DESTDIR)/$(bindir) && \
31 @HAVE_DBUS_TRUE@ rm -f avahi-resolve-host-name avahi-resolve-address avahi-browse-domains avahi-publish-address avahi-publish-service && \
32 @HAVE_DBUS_TRUE@ $(LN_S) avahi-resolve avahi-resolve-host-name && \
diff --git a/meta/recipes-connectivity/avahi/files/fix_for_automake_1.12.x.patch b/meta/recipes-connectivity/avahi/files/fix_for_automake_1.12.x.patch
deleted file mode 100644
index 0fc4c290c4..0000000000
--- a/meta/recipes-connectivity/avahi/files/fix_for_automake_1.12.x.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1Upstream-Status: Pending
2
3autoamke 1.12.x has depricated use of mkdir_p , and recommends use of MKDIR_P
4instead. Fixed the automake files accordingly to avoid warning-errors.
5Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
62012/07/09
7
8
9Index: avahi-0.6.31/avahi-daemon/Makefile.am
10===================================================================
11--- avahi-0.6.31.orig/avahi-daemon/Makefile.am
12+++ avahi-0.6.31/avahi-daemon/Makefile.am
13@@ -169,7 +169,7 @@ xmllint:
14 done
15
16 install-data-local:
17- test -z "$(localstatedir)/run" || $(mkdir_p) "$(DESTDIR)$(localstatedir)/run"
18+ test -z "$(localstatedir)/run" || $(MKDIR_P) "$(DESTDIR)$(localstatedir)/run"
19
20 update-systemd:
21 curl http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.c > sd-daemon.c
22Index: avahi-0.6.31/avahi-autoipd/Makefile.am
23===================================================================
24--- avahi-0.6.31.orig/avahi-autoipd/Makefile.am
25+++ avahi-0.6.31/avahi-autoipd/Makefile.am
26@@ -76,7 +76,7 @@ dhcliententerdir = $(sysconfdir)/dhcp/dh
27 dhclientexitdir = $(sysconfdir)/dhcp/dhclient-exit-hooks.d
28
29 install-exec-hook: dhclient-exit-hook dhclient-enter-hook
30- $(mkdir_p) $(DESTDIR)$(dhcliententerdir) $(DESTDIR)$(dhclientexitdir)
31+ $(MKDIR_P) $(DESTDIR)$(dhcliententerdir) $(DESTDIR)$(dhclientexitdir)
32 $(INSTALL) dhclient-enter-hook $(DESTDIR)$(dhcliententerdir)/avahi-autoipd
33 $(INSTALL) dhclient-exit-hook $(DESTDIR)$(dhclientexitdir)/avahi-autoipd
34
diff --git a/meta/recipes-connectivity/avahi/files/out-of-tree.patch b/meta/recipes-connectivity/avahi/files/out-of-tree.patch
deleted file mode 100644
index 43476cde05..0000000000
--- a/meta/recipes-connectivity/avahi/files/out-of-tree.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1Upstream-Status: Pending
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From a62dc95d75691ea4aefa86d8bbe54c62afd78ff6 Mon Sep 17 00:00:00 2001
5From: Ross Burton <ross.burton@intel.com>
6Date: Tue, 17 Sep 2013 12:27:36 +0100
7Subject: [PATCH] build-sys: fix out-of-tree builds without xmltoman
8
9If manpages are enabled but xmltoman isn't present, out-of-tree builds fail
10because it checks inside the build directory for the pre-generated manpages.
11
12Fix this by using $srcdir when looking for files inside the source directory.
13---
14 configure.ac | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/configure.ac b/configure.ac
18index 9debce2..047c7ae 100644
19--- a/configure.ac
20+++ b/configure.ac
21@@ -1021,7 +1021,7 @@ if test x$manpages = xyes ; then
22 fi
23
24 if test x$have_xmltoman = xno -o x$xmltoman = xno; then
25- if ! test -e man/avahi-daemon.8 ; then
26+ if ! test -e $srcdir/man/avahi-daemon.8 ; then
27 AC_MSG_ERROR([*** xmltoman was not found or was disabled, it is required to build the manpages as they have not been pre-built, install xmltoman, pass --disable-manpages or dont pass --disable-xmltoman])
28 exit 1
29 fi
30--
311.7.10.4
32
diff --git a/meta/recipes-connectivity/avahi/files/reuseport-check.patch b/meta/recipes-connectivity/avahi/files/reuseport-check.patch
deleted file mode 100644
index bb81c2cb4e..0000000000
--- a/meta/recipes-connectivity/avahi/files/reuseport-check.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1Fix avahi-daemon when running on kernel < 3.9 (patch taken from Ubuntu).
2
3Upstream-Status: Pending (unmaintained upstream)
4Signed-off-by: Ross Burton <ross.burton@intel.com>
5
6Description: SO_REUSEPORT may not exist in running kernel
7 When userspace defines SO_REUSEPORT we will attempt to enable socket
8 port number reuse. However if the running kernel does not support
9 this call it will fail preventing daemon startup. If this call is
10 present but fails ENOPROTOOPT then we know that actually the kernel
11 does not support it and we should continue as if we did not have the
12 call at all. (LP: #1228204)
13 .
14 This patch could be removed from the debian package after jessie release.
15Author: Andy Whitcroft <apw@canonical.com>
16
17Index: avahi-0.6.31/avahi-core/socket.c
18===================================================================
19--- avahi-0.6.31.orig/avahi-core/socket.c 2013-09-20 16:36:50.000000000 +0100
20+++ avahi-0.6.31/avahi-core/socket.c 2013-09-20 16:38:23.781863644 +0100
21@@ -177,7 +177,8 @@
22 yes = 1;
23 if (setsockopt(fd, SOL_SOCKET, SO_REUSEPORT, &yes, sizeof(yes)) < 0) {
24 avahi_log_warn("SO_REUSEPORT failed: %s", strerror(errno));
25- return -1;
26+ if (errno != ENOPROTOOPT)
27+ return -1;
28 }
29 #endif
30