[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 397d627eab8f6fa3e87996902089237f9acd728f

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 397d627eab8f6fa3e87996902089237f9acd728f

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 3015 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  397d627eab8f6fa3e87996902089237f9acd728f (commit)
      from  8defa50e7395714930dd3a813ad4c509711c0b57 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 397d627eab8f6fa3e87996902089237f9acd728f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Aug 13 18:59:10 2018 +0100

    Revert "avahi: Build without dbus"
    
    This reverts commit 5221a852e80526d188306b05202e595616f0c065.
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/packages/avahi | 11 +++++++++++
 lfs/avahi                       |  3 +--
 2 files changed, 12 insertions(+), 2 deletions(-)

Difference in files:
diff --git a/config/rootfiles/packages/avahi b/config/rootfiles/packages/avahi
index bf8a387c3..a394cc20a 100644
--- a/config/rootfiles/packages/avahi
+++ b/config/rootfiles/packages/avahi
@@ -7,6 +7,7 @@ etc/avahi/services
 etc/avahi/services/sftp-ssh.service
 etc/avahi/services/smb.service
 etc/avahi/services/ssh.service
+etc/dbus-1/system.d/avahi-dbus.conf
 etc/rc.d/init.d/avahi
 usr/bin/avahi-browse
 usr/bin/avahi-browse-domains
@@ -89,6 +90,16 @@ usr/sbin/avahi-daemon
 usr/sbin/avahi-dnsconfd
 usr/share/avahi
 usr/share/avahi/avahi-service.dtd
+#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
+usr/share/dbus-1/interfaces/org.freedesktop.Avahi.EntryGroup.xml
+usr/share/dbus-1/interfaces/org.freedesktop.Avahi.HostNameResolver.xml
+usr/share/dbus-1/interfaces/org.freedesktop.Avahi.RecordBrowser.xml
+usr/share/dbus-1/interfaces/org.freedesktop.Avahi.Server.xml
+usr/share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceBrowser.xml
+usr/share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceResolver.xml
+usr/share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceTypeBrowser.xml
 #usr/share/locale/ach
 #usr/share/locale/ach/LC_MESSAGES
 #usr/share/locale/ach/LC_MESSAGES/avahi.mo
diff --git a/lfs/avahi b/lfs/avahi
index c476e7e45..cc1d5c336 100644
--- a/lfs/avahi
+++ b/lfs/avahi
@@ -34,7 +34,7 @@ TARGET = $(DIR_INFO)/$(THISAPP)
 PROG       = avahi
 PAK_VER    = 5
 
-DEPS	   = "libdaemon"
+DEPS	   = "dbus libdaemon"
 
 CFLAGS    += -U_FORTIFY_SOURCE
 
@@ -89,7 +89,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 		--disable-gtk \
 		--disable-gtk3 \
 		--disable-pygtk \
-		--disable-dbus \
 		--disable-python \
 		--disable-pygobject \
 		--disable-python-dbus \


hooks/post-receive
--
IPFire 2.x development tree