avahi: Disable custom stack protector configuration

[ipfire-2.x.git] / lfs / avahi

diff --git a/lfs/avahi b/lfs/avahi
index 0ffbd32499a649d0d50a38cba20052c9742e71a0..2ed13dd4440217aadff28723a4166701ca04782b 100644 (file)
--- 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.8
 
 THISAPP    = avahi-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,9 +32,9 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET = $(DIR_INFO)/$(THISAPP)
 PROG       = avahi
-PAK_VER    = 4
+PAK_VER    = 7
 
-DEPS      = "dbus libdaemon"
+DEPS       = dbus libdaemon
 
 ###############################################################################
 # Top-level Rules
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 2f22745b8f7368ad5a0a3fddac343f2d
+$(DL_FILE)_MD5 = 229c6aa30674fc43c202b22c5f8c2be7
 
 install : $(TARGET)
 
@@ -82,18 +82,27 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                --sysconfdir=/etc \
                --localstatedir=/var \
                --with-avahi-user=avahi \
+               --disable-stack-protector \
                --disable-qt3 \
                --disable-qt4 \
+               --disable-qt5 \
                --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)