From 7849a88d6da22b2381c062a9c7b3dcced73524c6 Mon Sep 17 00:00:00 2001 From: Zhai Edwin Date: Wed, 13 Apr 2011 10:46:02 +0800 Subject: 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 Signed-off-by: Richard Purdie --- meta/recipes-connectivity/avahi/avahi.inc | 2 +- meta/recipes-connectivity/avahi/avahi_0.6.28.bb | 19 ------------------- meta/recipes-connectivity/avahi/avahi_0.6.30.bb | 19 +++++++++++++++++++ .../recipes-connectivity/avahi/files/initscript.patch | 2 ++ 4 files changed, 22 insertions(+), 20 deletions(-) delete mode 100644 meta/recipes-connectivity/avahi/avahi_0.6.28.bb create mode 100644 meta/recipes-connectivity/avahi/avahi_0.6.30.bb (limited to 'meta/recipes-connectivity/avahi') 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.28.bb deleted file mode 100644 index 6e034b0508..0000000000 --- a/meta/recipes-connectivity/avahi/avahi_0.6.28.bb +++ /dev/null @@ -1,19 +0,0 @@ -require avahi.inc - -LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \ - file://avahi-common/address.h;endline=25;md5=b1d1d2cda1c07eb848ea7d6215712d9d \ - file://avahi-core/dns.h;endline=23;md5=6fe82590b81aa0ddea5095b548e2fdcb \ - file://avahi-daemon/main.c;endline=21;md5=9ee77368c5407af77caaef1b07285969 \ - file://avahi-client/client.h;endline=23;md5=f4ac741a25c4f434039ba3e18c8674cf" - -RDEPENDS_avahi-daemon = "sysvinit-pidof" -PR = "r2" - -EXTRA_OECONF += "--disable-gtk3" - -FILES_avahi-autoipd = "${sbindir}/avahi-autoipd \ - ${sysconfdir}/avahi/avahi-autoipd.action \ - ${sysconfdir}/dhcp3/*/avahi-autoipd" - -SRC_URI[md5sum] = "d0143a5aa3265019072e53ab497818d0" -SRC_URI[sha256sum] = "a0d80aac88212b9f9d5331c248091d3c9c9209f0e41985421636ebd14230fc91" diff --git a/meta/recipes-connectivity/avahi/avahi_0.6.30.bb b/meta/recipes-connectivity/avahi/avahi_0.6.30.bb new file mode 100644 index 0000000000..1084c0452e --- /dev/null +++ b/meta/recipes-connectivity/avahi/avahi_0.6.30.bb @@ -0,0 +1,19 @@ +require avahi.inc + +LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \ + file://avahi-common/address.h;endline=25;md5=b1d1d2cda1c07eb848ea7d6215712d9d \ + file://avahi-core/dns.h;endline=23;md5=6fe82590b81aa0ddea5095b548e2fdcb \ + file://avahi-daemon/main.c;endline=21;md5=9ee77368c5407af77caaef1b07285969 \ + file://avahi-client/client.h;endline=23;md5=f4ac741a25c4f434039ba3e18c8674cf" + +RDEPENDS_avahi-daemon = "sysvinit-pidof" +PR = "r0" + +EXTRA_OECONF += "--disable-gtk3" + +FILES_avahi-autoipd = "${sbindir}/avahi-autoipd \ + ${sysconfdir}/avahi/avahi-autoipd.action \ + ${sysconfdir}/dhcp3/*/avahi-autoipd" + +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 -- cgit v1.2.3-54-g00ecf