Signed-off-by: Michael Tremer michael.tremer@ipfire.org --- config/rootfiles/packages/avahi | 12 ++++++++++-- lfs/avahi | 9 ++++----- 2 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/config/rootfiles/packages/avahi b/config/rootfiles/packages/avahi index d8636ca7d..e6ab0c0ff 100644 --- a/config/rootfiles/packages/avahi +++ b/config/rootfiles/packages/avahi @@ -56,6 +56,8 @@ usr/bin/avahi-set-host-name #usr/include/avahi-gobject/ga-record-browser.h #usr/include/avahi-gobject/ga-service-browser.h #usr/include/avahi-gobject/ga-service-resolver.h +#usr/include/avahi-libevent +#usr/include/avahi-libevent/libevent-watch.h #usr/lib/avahi #usr/lib/libavahi-client.a #usr/lib/libavahi-client.la @@ -66,12 +68,12 @@ usr/lib/libavahi-client.so.3.2.9 #usr/lib/libavahi-common.la #usr/lib/libavahi-common.so usr/lib/libavahi-common.so.3 -usr/lib/libavahi-common.so.3.5.3 +usr/lib/libavahi-common.so.3.5.4 #usr/lib/libavahi-core.a #usr/lib/libavahi-core.la #usr/lib/libavahi-core.so usr/lib/libavahi-core.so.7 -usr/lib/libavahi-core.so.7.0.2 +usr/lib/libavahi-core.so.7.1.0 #usr/lib/libavahi-glib.a #usr/lib/libavahi-glib.la #usr/lib/libavahi-glib.so @@ -82,10 +84,16 @@ usr/lib/libavahi-glib.so.1.0.2 #usr/lib/libavahi-gobject.so usr/lib/libavahi-gobject.so.0 usr/lib/libavahi-gobject.so.0.0.5 +#usr/lib/libavahi-libevent.a +#usr/lib/libavahi-libevent.la +#usr/lib/libavahi-libevent.so +usr/lib/libavahi-libevent.so.1 +usr/lib/libavahi-libevent.so.1.0.0 #usr/lib/pkgconfig/avahi-client.pc #usr/lib/pkgconfig/avahi-core.pc #usr/lib/pkgconfig/avahi-glib.pc #usr/lib/pkgconfig/avahi-gobject.pc +#usr/lib/pkgconfig/avahi-libevent.pc usr/sbin/avahi-autoipd usr/sbin/avahi-daemon usr/sbin/avahi-dnsconfd diff --git a/lfs/avahi b/lfs/avahi index 41357f644..6807a080d 100644 --- a/lfs/avahi +++ b/lfs/avahi @@ -24,7 +24,7 @@
include Config
-VER = 0.7 +VER = 0.8
THISAPP = avahi-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,12 +32,10 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = avahi -PAK_VER = 5 +PAK_VER = 6
DEPS = dbus libdaemon
-CFLAGS += -U_FORTIFY_SOURCE - ############################################################################### # Top-level Rules ############################################################################### @@ -46,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = d76c59d0882ac6c256d70a2a585362a6 +$(DL_FILE)_MD5 = 229c6aa30674fc43c202b22c5f8c2be7
install : $(TARGET)
@@ -86,6 +84,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --with-avahi-user=avahi \ --disable-qt3 \ --disable-qt4 \ + --disable-qt5 \ --disable-gtk \ --disable-gtk3 \ --disable-pygtk \