From 81b49595078d38239bb3f907a7e7814e5d30bb16 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Sun, 24 Dec 2006 09:34:49 +0000 Subject: Merge avahi 0.6.15 from OE, to enable builds against DBus 1 git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1092 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- .../patch-avahi-daemon_dbus-protocol.c.patch | 28 +++++++++ meta/packages/avahi/avahi.inc | 66 ++++++++++++++++++++ meta/packages/avahi/avahi_0.6.13.bb | 70 ---------------------- meta/packages/avahi/avahi_0.6.15.bb | 10 ++++ 4 files changed, 104 insertions(+), 70 deletions(-) create mode 100644 meta/packages/avahi/avahi-0.6.15/patch-avahi-daemon_dbus-protocol.c.patch create mode 100644 meta/packages/avahi/avahi.inc delete mode 100644 meta/packages/avahi/avahi_0.6.13.bb create mode 100644 meta/packages/avahi/avahi_0.6.15.bb diff --git a/meta/packages/avahi/avahi-0.6.15/patch-avahi-daemon_dbus-protocol.c.patch b/meta/packages/avahi/avahi-0.6.15/patch-avahi-daemon_dbus-protocol.c.patch new file mode 100644 index 0000000000..0971a9eea8 --- /dev/null +++ b/meta/packages/avahi/avahi-0.6.15/patch-avahi-daemon_dbus-protocol.c.patch @@ -0,0 +1,28 @@ +marcus 2006-11-11 02:56:18 UTC + + FreeBSD ports repository + + Modified files: + net/avahi Makefile distinfo + Added files: + net/avahi/files patch-avahi-daemon_dbus-protocol.c + Log: + Update to 0.6.15, and fix the build with D-BUS 1.0. + + Revision Changes Path + 1.43 +3 -3 ports/net/avahi/Makefile + 1.12 +3 -3 ports/net/avahi/distinfo + 1.3 +11 -0 ports/net/avahi/files/patch-avahi-daemon_dbus-protocol.c (new) + +--- avahi-daemon/dbus-protocol.c.orig Fri Nov 10 21:50:07 2006 ++++ avahi-daemon/dbus-protocol.c Fri Nov 10 21:50:55 2006 +@@ -1067,7 +1067,7 @@ static int dbus_connect(void) { + if (dbus_bus_request_name( + server->bus, + AVAHI_DBUS_NAME, +-#if (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR >= 60) ++#if ((DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR >= 60)) || DBUS_VERSION_MAJOR > 0 + DBUS_NAME_FLAG_DO_NOT_QUEUE, + #else + DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT, + diff --git a/meta/packages/avahi/avahi.inc b/meta/packages/avahi/avahi.inc new file mode 100644 index 0000000000..19ef64f0e1 --- /dev/null +++ b/meta/packages/avahi/avahi.inc @@ -0,0 +1,66 @@ +DESCRIPTION = "Avahi implements the DNS-SD over Multicast DNS" +AUTHOR = "Lennart Poettering " +HOMEPAGE = "http://avahi.org" +SECTION = "network" +PRIORITY = "optional" +LICENSE = "GPL" + +DEPENDS = "expat libdaemon dbus" +RRECOMMENDS = "libnss-mdns" +RRECOMMENDS_avahi-daemon = "libnss-mdns" + +SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz" + +inherit autotools pkgconfig update-rc.d + +EXTRA_OECONF = "--with-distro=debian --disable-gdbm --disable-gtk --disable-mono --disable-monodoc --disable-qt3 --disable-qt4 --disable-python" + +PACKAGES =+ "avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib avahi-autoipd avahi-utils" + +FILES_libavahi-common = "${libdir}/libavahi-common.so.*" +FILES_libavahi-core = "${libdir}/libavahi-core.so.*" +FILES_avahi-daemon = "${sbindir}/avahi-daemon \ + ${sysconfdir}/avahi/avahi-daemon.conf \ + ${sysconfdir}/avahi/hosts \ + ${sysconfdir}/avahi/services \ + ${sysconfdir}/dbus-1 \ + ${sysconfdir}/init.d/avahi-daemon \ + ${datadir}/avahi/introspection/*.introspect \ + ${datadir}/avahi/avahi-service.dtd \ + ${datadir}/avahi/service-types" +FILES_libavahi-client = "${libdir}/libavahi-client.so.*" +FILES_avahi-dnsconfd = "${sbindir}/avahi-dnsconfd \ + ${sysconfdir}/avahi/avahi-dnsconfd.action \ + ${sysconfdir}/init.d/avahi-dnsconfd" +FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*" +FILES_avahi-utils = "${bindir}/avahi-*" + +CONFFILES_avahi-daemon = "${sysconfdir}/avahi/avahi-daemon.conf" + +INITSCRIPT_PACKAGES = "avahi-daemon avahi-dnsconfd" +INITSCRIPT_NAME_avahi-daemon = "avahi-daemon" +INITSCRIPT_PARAMS_avahi-daemon = "defaults 21 19" +INITSCRIPT_NAME_avahi-dnsconfd = "avahi-dnsconfd" +INITSCRIPT_PARAMS_avahi-dnsconfd = "defaults 22 19" + +# At the time the postinst runs, dbus might not be setup so only restart if running + +pkg_postinst_avahi-daemon () { + # can't do this offline + if [ "x$D" != "x" ]; then + exit 1 + fi + grep avahi /etc/group || addgroup avahi + grep avahi /etc/passwd || adduser --disabled-password --system --home /var/run/avahi-daemon --no-create-home avahi --ingroup avahi -g Avahi + + DBUSPID=`pidof dbus-daemon` + + if [ "x$DBUSPID" != "x" ]; then + /etc/init.d/dbus-1 force-reload + fi +} + +pkg_postrm_avahi-daemon () { + deluser avahi || true + delgroup avahi || true +} diff --git a/meta/packages/avahi/avahi_0.6.13.bb b/meta/packages/avahi/avahi_0.6.13.bb deleted file mode 100644 index a758997b4c..0000000000 --- a/meta/packages/avahi/avahi_0.6.13.bb +++ /dev/null @@ -1,70 +0,0 @@ -DESCRIPTION = "Avahi implements the DNS-SD over Multicast DNS" -SECTION = "network" -PRIORITY = "optional" -AUTHOR = "Lennart Poettering " -HOMEPAGE = "http://avahi.org" -LICENSE= "GPL" -PR = "r1" - -DEPENDS = "expat libdaemon dbus" -RRECOMMENDS = "libnss-mdns" - -SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz" - -PACKAGES =+ "avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib avahi-dev avahi-doc avahi-utils" - -FILES_libavahi-common = "${libdir}/libavahi-common.so.*" -FILES_libavahi-core= "${libdir}/libavahi-core.so.*" -FILES_avahi-daemon = "${sbindir}/avahi-daemon \ - ${sysconfdir}/avahi/avahi-daemon.conf \ - ${sysconfdir}/avahi/hosts \ - ${sysconfdir}/avahi/services \ - ${sysconfdir}/dbus-1 \ - ${sysconfdir}/init.d/avahi-daemon \ - ${datadir}/avahi/introspection/*.introspect \ - ${datadir}/avahi/avahi-service.dtd \ - ${datadir}/avahi/service-types" -FILES_libavahi-client = "${libdir}/libavahi-client.so.*" -FILES_avahi-dnsconfd = "${sbindir}/avahi-dnsconfd \ - ${sysconfdir}/avahi/avahi-dnsconfd.action \ - ${sysconfdir}/init.d/avahi-dnsconfd" -FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*" -FILES_avahi-utils = "${bindir}/avahi-*" - -CONFFILES_avahi-daemon = "${sysconfdir}/avahi/avahi-daemon.conf" - -EXTRA_OECONF = "--with-distro=debian --disable-gdbm --disable-gtk --disable-mono --disable-monodoc --disable-qt3 --disable-qt4 --disable-python" -inherit autotools pkgconfig update-rc.d - - -do_stage() { - autotools_stage_all -} - -INITSCRIPT_PACKAGES = "avahi-daemon avahi-dnsconfd" -INITSCRIPT_NAME_avahi-daemon = "avahi-daemon" -INITSCRIPT_PARAMS_avahi-daemon = "defaults 21 19" -INITSCRIPT_NAME_avahi-dnsconfd = "avahi-dnsconfd" -INITSCRIPT_PARAMS_avahi-dnsconfd = "defaults 22 19" - -# At the time the postinst runs, dbus might not be setup so only restart if running - -pkg_postinst_avahi-daemon () { - # can't do this offline - if [ "x$D" != "x" ]; then - exit 1 - fi - grep avahi /etc/group || addgroup avahi - grep avahi /etc/passwd || adduser --disabled-password --system --home /var/run/avahi-daemon --no-create-home avahi --ingroup avahi -g Avahi - - DBUSPID=`pidof dbus-daemon` - - if [ "x$DBUSPID" != "x" ]; then - /etc/init.d/dbus-1 force-reload - fi -} - -pkg_postrm_avahi-daemon () { - deluser avahi || true - delgroup avahi || true -} diff --git a/meta/packages/avahi/avahi_0.6.15.bb b/meta/packages/avahi/avahi_0.6.15.bb new file mode 100644 index 0000000000..07a429e133 --- /dev/null +++ b/meta/packages/avahi/avahi_0.6.15.bb @@ -0,0 +1,10 @@ +require avahi.inc + +SRC_URI += "file://patch-avahi-daemon_dbus-protocol.c.patch;patch=1;pnum=0" + +FILES_avahi-autoipd = "${sbindir}/avahi-autoipd \ + ${sysconfdir}/avahi/avahi-autoipd.action" + +do_stage() { + autotools_stage_all +} -- cgit v1.2.3-54-g00ecf