diff options
| author |   Zhai Edwin <edwin.zhai@intel.com> | 2011-04-13 10:46:02 +0800 |
|---|---|---|
| committer |   Saul Wold <sgw@linux.intel.com> | 2011-04-22 22:03:56 -0700 |
| commit | b52e9922e8d9acaa9b94b0f19c54bdee18ae49f1 (patch) | |
| tree | 08007b1c2754d035a764892d9fb5a8d8d99168c1 | |
| parent | f3af51af2fff544e743104d19313294ad85aa58a (diff) | |
| download | openembedded-core-b52e9922e8d9acaa9b94b0f19c54bdee18ae49f1.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.
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
| -rw-r--r-- | meta/recipes-connectivity/avahi/avahi.inc | 2 | ||||
| -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.patch | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc index 6d4b8304dc..b2fa8ca949 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" SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \ file://00avahi-autoipd \ file://99avahi-autoipd \ - file://initscript.patch;patch=1" + file://initscript.patch" inherit autotools pkgconfig update-rc.d gettext diff --git a/meta/recipes-connectivity/avahi/avahi_0.6.28.bb b/meta/recipes-connectivity/avahi/avahi_0.6.30.bb index 6e034b0508..1084c0452e 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 \ file://avahi-client/client.h;endline=23;md5=f4ac741a25c4f434039ba3e18c8674cf" RDEPENDS_avahi-daemon = "sysvinit-pidof" -PR = "r2" +PR = "r0" EXTRA_OECONF += "--disable-gtk3" @@ -15,5 +15,5 @@ FILES_avahi-autoipd = "${sbindir}/avahi-autoipd \ ${sysconfdir}/avahi/avahi-autoipd.action \ ${sysconfdir}/dhcp3/*/avahi-autoipd" -SRC_URI[md5sum] = "d0143a5aa3265019072e53ab497818d0" -SRC_URI[sha256sum] = "a0d80aac88212b9f9d5331c248091d3c9c9209f0e41985421636ebd14230fc91" +SRC_URI[md5sum] = "e4db89a2a403ff4c47d66ac66fad1f43" +SRC_URI[sha256sum] = "f9e4316c2339d0020726edd846d01bee0c39980906db0c247479e5807457ff1f" diff --git a/meta/recipes-connectivity/avahi/files/initscript.patch b/meta/recipes-connectivity/avahi/files/initscript.patch index f76a965b85..193889eb5c 100644 --- a/meta/recipes-connectivity/avahi/files/initscript.patch +++ b/meta/recipes-connectivity/avahi/files/initscript.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + diff --git a/initscript/debian/avahi-daemon.in b/initscript/debian/avahi-daemon.in index 30a2c2f..b5848a8 100755 --- a/initscript/debian/avahi-daemon.in |