minidlna: Addition of patches to fix CVE-2022-26505

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

diff --git a/lfs/avahi b/lfs/avahi
index 41357f64445b4fb85be3c019e8e71a1efc1309a7..9f2e355782b5ea545186623a77e9b201a0f4e53e 100644 (file)
--- a/lfs/avahi
+++ b/lfs/avahi
@@ -24,7 +24,9 @@
 
 include Config
 
-VER        = 0.7
+SUMMARY    = D-Bus Service for Zeroconf and Bonjour
+
+VER        = 0.8
 
 THISAPP    = avahi-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,11 +34,11 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET = $(DIR_INFO)/$(THISAPP)
 PROG       = avahi
-PAK_VER    = 5
+PAK_VER    = 9
 
 DEPS       = dbus libdaemon
 
-CFLAGS    += -U_FORTIFY_SOURCE
+SERVICES   = avahi
 
 ###############################################################################
 # Top-level Rules
@@ -46,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = d76c59d0882ac6c256d70a2a585362a6
+$(DL_FILE)_BLAKE2 = 9b57a3e5781abc7acf25c6cfd2d1871b7c2f330bd5bd08214baa60bfee849841b69cd9d322fafaec1ba72c953c3464f017e1870a7d95fa2f27fcd2401ddd24df
 
 install : $(TARGET)
 
@@ -54,13 +56,13 @@ check : $(patsubst %,$(DIR_CHK)/%,$(objects))
 
 download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
-md5 : $(subst %,%_MD5,$(objects))
+b2 : $(subst %,%_BLAKE2,$(objects))
 
-dist: 
+dist:
        @$(PAK)
 
 ###############################################################################
-# Downloading, checking, md5sum
+# Downloading, checking, b2sum
 ###############################################################################
 
 $(patsubst %,$(DIR_CHK)/%,$(objects)) :
@@ -69,8 +71,8 @@ $(patsubst %,$(DIR_CHK)/%,$(objects)) :
 $(patsubst %,$(DIR_DL)/%,$(objects)) :
        @$(LOAD)
 
-$(subst %,%_MD5,$(objects)) :
-       @$(MD5)
+$(subst %,%_BLAKE2,$(objects)) :
+       @$(B2SUM)
 
 ###############################################################################
 # Installation Details
@@ -84,11 +86,12 @@ $(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 \
@@ -102,7 +105,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cp -avf $(DIR_SRC)/config/avahi/smb.service /etc/avahi/services/smb.service
 
        # Install initscript
-       $(call INSTALL_INITSCRIPT,avahi)
+       $(call INSTALL_INITSCRIPTS,$(SERVICES))
+
+       #install backup definition
+       install -v -m 644 ${DIR_SRC}/config/backup/includes/avahi \
+                       /var/ipfire/backup/addons/includes/avahi
 
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)