X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Favahi;h=26508adbe073061788381963acf58a2c6a74a696;hp=88263a19a885cc602b687b950a5989e3dd15c361;hb=15b1a3e360a277dc7481103f8ddcbf189033e3a6;hpb=8999627f8abfc83172728c2e3d0f3cfbe1f1f1c4

diff --git a/lfs/avahi b/lfs/avahi
index 88263a19a8..26508adbe0 100644
--- a/lfs/avahi
+++ b/lfs/avahi
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.6.31
+VER        = 0.7
 
 THISAPP    = avahi-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,9 +32,11 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET = $(DIR_INFO)/$(THISAPP)
 PROG       = avahi
-PAK_VER    = 3
+PAK_VER    = 5
 
-DEPS	   = "libdaemon"
+DEPS	   = "dbus libdaemon"
+
+CFLAGS    += -U_FORTIFY_SOURCE
 
 ###############################################################################
 # Top-level Rules
@@ -44,7 +46,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 2f22745b8f7368ad5a0a3fddac343f2d
+$(DL_FILE)_MD5 = d76c59d0882ac6c256d70a2a585362a6
 
 install : $(TARGET)
 
@@ -77,13 +79,30 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr --with-avahi-user=avahi \
-	--disable-qt3 --disable-qt4 --disable-gtk --disable-gtk3 \
-	--disable-pygtk --disable-python-dbus --disable-mono \
-	--disable-monodoc --with-distro=none --sysconfdir=/etc
+	cd $(DIR_APP) && ./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--with-avahi-user=avahi \
+		--disable-qt3 \
+		--disable-qt4 \
+		--disable-gtk \
+		--disable-gtk3 \
+		--disable-pygtk \
+		--disable-python \
+		--disable-pygobject \
+		--disable-python-dbus \
+		--disable-mono \
+		--disable-monodoc \
+		--with-distro=none
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
-	cp -avf $(DIR_SRC)/config/avahi/avahi /etc/init.d/
+
+	# Install configuration for samba
 	cp -avf $(DIR_SRC)/config/avahi/smb.service /etc/avahi/services/smb.service
+
+	# Install initscript
+	$(call INSTALL_INITSCRIPT,avahi)
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)