summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/avahi
diff options
context:
space:
mode:
authorZhai Edwin <edwin.zhai@intel.com>2011-04-13 02:46:02 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-04-24 21:48:28 (GMT)
commit7849a88d6da22b2381c062a9c7b3dcced73524c6 (patch)
tree8c6bad27d79470d3256df36a3b98228e2e1d12a0 /meta/recipes-connectivity/avahi
parent9a6e6353b4a2d2c206984ba1a4147b7c26a919d3 (diff)
downloadpoky-7849a88d6da22b2381c062a9c7b3dcced73524c6.tar.gz
avahi: Upgrade to 0.6.30 (from 0.6.28)
This upgrade fix the one security issue: http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2011-1002 [YOCTO #975] fixed. This should be included in the Bernard point-release. (From OE-Core rev: b52e9922e8d9acaa9b94b0f19c54bdee18ae49f1) Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/avahi')
-rw-r--r--meta/recipes-connectivity/avahi/avahi.inc2
-rw-r--r--meta/recipes-connectivity/avahi/avahi_0.6.30.bb (renamed from meta/recipes-connectivity/avahi/avahi_0.6.28.bb)6
-rw-r--r--meta/recipes-connectivity/avahi/files/initscript.patch2
3 files changed, 6 insertions, 4 deletions
diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc
index 6d4b830..b2fa8ca 100644
--- a/meta/recipes-connectivity/avahi/avahi.inc
+++ b/meta/recipes-connectivity/avahi/avahi.inc
@@ -24,7 +24,7 @@ RRECOMMENDS_${PN}_append_libc-glibc = "libnss-mdns"
24SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \ 24SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \
25 file://00avahi-autoipd \ 25 file://00avahi-autoipd \
26 file://99avahi-autoipd \ 26 file://99avahi-autoipd \
27 file://initscript.patch;patch=1" 27 file://initscript.patch"
28 28
29inherit autotools pkgconfig update-rc.d gettext 29inherit autotools pkgconfig update-rc.d gettext
30 30
diff --git a/meta/recipes-connectivity/avahi/avahi_0.6.28.bb b/meta/recipes-connectivity/avahi/avahi_0.6.30.bb
index 6e034b0..1084c04 100644
--- a/meta/recipes-connectivity/avahi/avahi_0.6.28.bb
+++ b/meta/recipes-connectivity/avahi/avahi_0.6.30.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \
7 file://avahi-client/client.h;endline=23;md5=f4ac741a25c4f434039ba3e18c8674cf" 7 file://avahi-client/client.h;endline=23;md5=f4ac741a25c4f434039ba3e18c8674cf"
8 8
9RDEPENDS_avahi-daemon = "sysvinit-pidof" 9RDEPENDS_avahi-daemon = "sysvinit-pidof"
10PR = "r2" 10PR = "r0"
11 11
12EXTRA_OECONF += "--disable-gtk3" 12EXTRA_OECONF += "--disable-gtk3"
13 13
@@ -15,5 +15,5 @@ FILES_avahi-autoipd = "${sbindir}/avahi-autoipd \
15 ${sysconfdir}/avahi/avahi-autoipd.action \ 15 ${sysconfdir}/avahi/avahi-autoipd.action \
16 ${sysconfdir}/dhcp3/*/avahi-autoipd" 16 ${sysconfdir}/dhcp3/*/avahi-autoipd"
17 17
18SRC_URI[md5sum] = "d0143a5aa3265019072e53ab497818d0" 18SRC_URI[md5sum] = "e4db89a2a403ff4c47d66ac66fad1f43"
19SRC_URI[sha256sum] = "a0d80aac88212b9f9d5331c248091d3c9c9209f0e41985421636ebd14230fc91" 19SRC_URI[sha256sum] = "f9e4316c2339d0020726edd846d01bee0c39980906db0c247479e5807457ff1f"
diff --git a/meta/recipes-connectivity/avahi/files/initscript.patch b/meta/recipes-connectivity/avahi/files/initscript.patch
index f76a965..193889e 100644
--- a/meta/recipes-connectivity/avahi/files/initscript.patch
+++ b/meta/recipes-connectivity/avahi/files/initscript.patch
@@ -1,3 +1,5 @@
1Upstream-Status: Pending
2
1diff --git a/initscript/debian/avahi-daemon.in b/initscript/debian/avahi-daemon.in 3diff --git a/initscript/debian/avahi-daemon.in b/initscript/debian/avahi-daemon.in
2index 30a2c2f..b5848a8 100755 4index 30a2c2f..b5848a8 100755
3--- a/initscript/debian/avahi-daemon.in 5--- a/initscript/debian/avahi-daemon.in