From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 10 Aug 2018 10:19:25 +0000 (+0100)
Subject: avahi: Update to 0.7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=467581b8ab2c9a62a2239a7dcea4fe40fe70093c;p=people%2Fms%2Fipfire-2.x.git

avahi: Update to 0.7

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/config/rootfiles/packages/avahi b/config/rootfiles/packages/avahi
index 4a3b572322..a394cc20a6 100644
--- a/config/rootfiles/packages/avahi
+++ b/config/rootfiles/packages/avahi
@@ -56,7 +56,6 @@ usr/bin/avahi-set-host-name
 #usr/include/avahi-gobject/ga-service-browser.h
 #usr/include/avahi-gobject/ga-service-resolver.h
 #usr/lib/avahi
-usr/lib/avahi/service-types.db
 #usr/lib/libavahi-client.a
 #usr/lib/libavahi-client.la
 #usr/lib/libavahi-client.so
@@ -81,19 +80,16 @@ usr/lib/libavahi-glib.so.1.0.2
 #usr/lib/libavahi-gobject.la
 #usr/lib/libavahi-gobject.so
 usr/lib/libavahi-gobject.so.0
-usr/lib/libavahi-gobject.so.0.0.4
+usr/lib/libavahi-gobject.so.0.0.5
 #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/python2.7/site-packages/avahi
-usr/lib/python2.7/site-packages/avahi/ServiceTypeDatabase.py
 usr/sbin/avahi-autoipd
 usr/sbin/avahi-daemon
 usr/sbin/avahi-dnsconfd
 usr/share/avahi
 usr/share/avahi/avahi-service.dtd
-usr/share/avahi/service-types
 #usr/share/dbus-1/interfaces
 usr/share/dbus-1/interfaces/org.freedesktop.Avahi.AddressResolver.xml
 usr/share/dbus-1/interfaces/org.freedesktop.Avahi.DomainBrowser.xml
@@ -139,6 +135,7 @@ usr/share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceTypeBrowser.xml
 #usr/share/locale/lv/LC_MESSAGES/avahi.mo
 #usr/share/locale/ms/LC_MESSAGES/avahi.mo
 #usr/share/locale/nl/LC_MESSAGES/avahi.mo
+#usr/share/locale/oc/LC_MESSAGES/avahi.mo
 #usr/share/locale/pl/LC_MESSAGES/avahi.mo
 #usr/share/locale/pt_BR/LC_MESSAGES/avahi.mo
 #usr/share/locale/ro/LC_MESSAGES/avahi.mo
@@ -152,7 +149,6 @@ usr/share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceTypeBrowser.xml
 #usr/share/locale/uk/LC_MESSAGES/avahi.mo
 #usr/share/locale/zh_CN/LC_MESSAGES/avahi.mo
 #usr/share/locale/zh_TW/LC_MESSAGES/avahi.mo
-#usr/share/man/man1/avahi-bookmarks.1
 #usr/share/man/man1/avahi-browse-domains.1
 #usr/share/man/man1/avahi-browse.1
 #usr/share/man/man1/avahi-publish-address.1
diff --git a/lfs/avahi b/lfs/avahi
index adcb84c54e..ff171f0015 100644
--- a/lfs/avahi
+++ b/lfs/avahi
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.6.32
+VER        = 0.7
 
 THISAPP    = avahi-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 22b5e705d3eabb31d26f2e1e7b074013
+$(DL_FILE)_MD5 = d76c59d0882ac6c256d70a2a585362a6
 
 install : $(TARGET)
 
@@ -87,13 +87,20 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 		--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)
diff --git a/lfs/cups b/lfs/cups
index 47f71f876f..ae0c603b71 100644
--- a/lfs/cups
+++ b/lfs/cups
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/cups-$(VER)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = cups
-PAK_VER    = 15
+PAK_VER    = 17
 
 DEPS       = "avahi cups-filters dbus ghostscript krb5 libtiff"
 
diff --git a/config/avahi/avahi b/src/initscripts/packages/avahi
similarity index 100%
rename from config/avahi/avahi
rename to src/initscripts/packages/avahi