-DAVAHI_DAEMON_RUNTIME_DIR=\"$(avahi_runtime_dir)/avahi-daemon/\" \
-DAVAHI_SOCKET=\"$(avahi_socket)\" \
-DAVAHI_SERVICE_DIRECTORY=\"$(servicedir)\" \
- -DAVAHI_CONFIG_FILE=\"$(pkgsysconfdir)/avahi.conf\"
+ -DAVAHI_CONFIG_FILE=\"$(pkgsysconfdir)/avahi-daemon.conf\"
AM_LDADD=-lexpat
AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
bin_PROGRAMS = \
- avahi
+ avahi-daemon
-avahi_SOURCES = \
+avahi_daemon_SOURCES = \
main.c main.h \
simple-protocol.c simple-protocol.h \
static-services.c static-services.h
pkgsysconf_DATA = \
- avahi.conf
+ avahi-daemon.conf
service_DATA = \
example.service
pkgdata_DATA = \
avahi-service.dtd
-EXTRA_DIST = avahi-service.dtd avahi.conf example.service
+EXTRA_DIST = avahi-service.dtd avahi-daemon.conf example.service
if ENABLE_DBUS
-avahi_SOURCES += dbus-protocol.c dbus-protocol.h
+avahi_daemon_SOURCES += dbus-protocol.c dbus-protocol.h
dbusservicedir = $(DBUS_SYS_DIR)
dbusservice_DATA = avahi-dbus.conf
EXTRA_DIST += $(dbusservice_DATA)
endif
-avahi_CFLAGS = $(AM_CFLAGS)
-avahi_LDADD = $(AM_LDADD) ../avahi-core/libavahi-core.la ../avahi-common/libavahi-common.la
+avahi_daemon_CFLAGS = $(AM_CFLAGS)
+avahi_daemon_LDADD = $(AM_LDADD) ../avahi-core/libavahi-core.la ../avahi-common/libavahi-common.la
xmllint:
xmllint --noout --valid example.service
+++ /dev/null
-On most systems you will need to setup a security policy for avahi to allow it to own the Avahi service on the system d-bus.
-
-You can find an example in avahi.conf.example, this usually goes in /etc/dbus-1/system.d
-You will need to change the username 'lathiat' to whatever username you use for testing this code (later it will be a dedicated 'avahi' user)
-
-In future this stuff should be handled automatically but for now some manual setup is required.
--- /dev/null
+[server]
+#host-name=foo
+#domain-name=local
+use-ipv4=yes
+use-ipv6=no
+check-response-ttl=no
+use-iff-running=yes
+enable-dbus=yes
+
+[publish]
+publish-addresses=yes
+publish-hinfo=yes
+publish-workstation=yes
+publish-domain=yes
+#publish-dns-servers=192.168.50.1,192.168.50.2
+#publish-resolv-conf-dns-servers=yes
+
+[reflector]
+enable-reflector=no
+reflect-ipv=no
+++ /dev/null
-[server]
-#host-name=foo
-#domain-name=local
-use-ipv4=yes
-use-ipv6=no
-check-response-ttl=no
-use-iff-running=yes
-enable-dbus=yes
-
-[publish]
-publish-addresses=yes
-publish-hinfo=yes
-publish-workstation=yes
-publish-domain=yes
-#publish-dns-servers=192.168.50.1,192.168.50.2
-#publish-resolv-conf-dns-servers=yes
-
-[reflector]
-enable-reflector=no
-reflect-ipv=no
+++ /dev/null
-#! /bin/sh
-#
-# avahi avahi daemon
-# Daemon for ZeroConf
-#
-# Authors: <sebastien.estienne@gmail.com>
-#
-
-if [ -f /lib/lsb/init-functions ]
-then
- . /lib/lsb/init-functions
-else
- # int log_begin_message (char *message)
- log_begin_msg () {
- if [ -z "$1" ]; then
- return 1
- fi
- echo " * $@"
- }
-
- # int log_end_message (int exitstatus)
- log_end_msg () {
-
- # If no arguments were passed, return
- [ -z "$1" ] && return 1
-
- # Only do the fancy stuff if we have an appropriate terminal
- # and if /usr is already mounted
- TPUT=/usr/bin/tput
- EXPR=/usr/bin/expr
- if [ -x $TPUT ] && [ -x $EXPR ] && $TPUT hpa 60 >/dev/null 2>&1; then
- COLS=`$TPUT cols`
- if [ -n "$COLS" ]; then
- COL=`$EXPR $COLS - 7`
- else
- COL=73
- fi
- UP=`$TPUT cuu1`
- END=`$TPUT hpa $COL`
- START=`$TPUT hpa 0`
- RED=`$TPUT setaf 1`
- NORMAL=`$TPUT op`
- if [ $1 -eq 0 ]; then
- echo "$UP$END[ ok ]"
- else
- echo -e "$UP$START $RED*$NORMAL$END[${RED}fail${NORMAL}]"
- fi
- else
- if [ $1 -eq 0 ]; then
- echo " ...done."
- else
- echo " ...fail!"
- fi
- fi
- return $1
- }
-
-fi
-
-#set -e
-
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
-DESC="Avahi ZeroConf daemon"
-NAME="avahi"
-DAEMON=/usr/bin/$NAME
-
-# Gracefully exit if the package has been removed.
-test -x $DAEMON || exit 0
-
-#
-# Function that starts the daemon/service.
-#
-d_start() {
- $DAEMON -D
-}
-
-#
-# Function that stops the daemon/service.
-#
-d_stop() {
- $DAEMON -k || /bin/true
-}
-
-#
-# Function that reload the config file for the daemon/service.
-#
-d_reload() {
- $DAEMON -r
-}
-
-
-case "$1" in
- start)
- log_begin_msg "Starting $DESC: $NAME"
- d_start
- log_end_msg $?
- ;;
- stop)
- log_begin_msg "Stopping $DESC: $NAME"
- d_stop
- log_end_msg $?
- ;;
- reload)
- log_begin_msg "Reloading config file for $DESC: $NAME"
- d_reload
- log_end_msg $?
- ;;
- restart|force-reload)
- log_begin_msg "Restarting $DESC: $NAME"
- d_stop
- sleep 1
- d_start
- log_end_msg $?
- ;;
- *)
- echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload|reload}" >&2
- exit 1
- ;;
-esac
-
-exit 0
--- /dev/null
+#! /bin/sh
+#
+# avahi avahi daemon
+# Daemon for ZeroConf
+#
+# Authors: <sebastien.estienne@gmail.com>
+#
+
+if [ -f /lib/lsb/init-functions ]
+then
+ . /lib/lsb/init-functions
+else
+ # int log_begin_message (char *message)
+ log_begin_msg () {
+ if [ -z "$1" ]; then
+ return 1
+ fi
+ echo " * $@"
+ }
+
+ # int log_end_message (int exitstatus)
+ log_end_msg () {
+
+ # If no arguments were passed, return
+ [ -z "$1" ] && return 1
+
+ # Only do the fancy stuff if we have an appropriate terminal
+ # and if /usr is already mounted
+ TPUT=/usr/bin/tput
+ EXPR=/usr/bin/expr
+ if [ -x $TPUT ] && [ -x $EXPR ] && $TPUT hpa 60 >/dev/null 2>&1; then
+ COLS=`$TPUT cols`
+ if [ -n "$COLS" ]; then
+ COL=`$EXPR $COLS - 7`
+ else
+ COL=73
+ fi
+ UP=`$TPUT cuu1`
+ END=`$TPUT hpa $COL`
+ START=`$TPUT hpa 0`
+ RED=`$TPUT setaf 1`
+ NORMAL=`$TPUT op`
+ if [ $1 -eq 0 ]; then
+ echo "$UP$END[ ok ]"
+ else
+ echo -e "$UP$START $RED*$NORMAL$END[${RED}fail${NORMAL}]"
+ fi
+ else
+ if [ $1 -eq 0 ]; then
+ echo " ...done."
+ else
+ echo " ...fail!"
+ fi
+ fi
+ return $1
+ }
+
+fi
+
+#set -e
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+DESC="Avahi ZeroConf daemon"
+NAME="avahi-daemon"
+DAEMON=/usr/bin/$NAME
+
+# Gracefully exit if the package has been removed.
+test -x $DAEMON || exit 0
+
+#
+# Function that starts the daemon/service.
+#
+d_start() {
+ $DAEMON -D
+}
+
+#
+# Function that stops the daemon/service.
+#
+d_stop() {
+ $DAEMON -k || /bin/true
+}
+
+#
+# Function that reload the config file for the daemon/service.
+#
+d_reload() {
+ $DAEMON -r
+}
+
+
+case "$1" in
+ start)
+ log_begin_msg "Starting $DESC: $NAME"
+ d_start
+ log_end_msg $?
+ ;;
+ stop)
+ log_begin_msg "Stopping $DESC: $NAME"
+ d_stop
+ log_end_msg $?
+ ;;
+ reload)
+ log_begin_msg "Reloading config file for $DESC: $NAME"
+ d_reload
+ log_end_msg $?
+ ;;
+ restart|force-reload)
+ log_begin_msg "Restarting $DESC: $NAME"
+ d_stop
+ sleep 1
+ d_start
+ log_end_msg $?
+ ;;
+ *)
+ echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload|reload}" >&2
+ exit 1
+ ;;
+esac
+
+exit 0
dbusinitddir = $(sysconfdir)/dbus-1/event.d
-dbusinitd_SCRIPTS = 75avahi
+dbusinitd_SCRIPTS = 75avahi-daemon
initddir = $(sysconfdir)/init.d
initd_SCRIPTS = avahi-dnsconfd
dbusinitddir = $(sysconfdir)/init.d
-dbusinitd_SCRIPTS = avahi
+dbusinitd_SCRIPTS = avahi-daemon
EXTRA_DIST = $(dbusinitd_SCRIPTS)
+++ /dev/null
-#!/sbin/runscript
-# Avahi ZeroConf Daemon init script
-# Many thanks to the Avahi developer's and Sebastien Estienne
-
-DAEMON=/usr/bin/avahi
-
-depend () {
- need dbus
-}
-
-start() {
- ebegin "Starting avahi"
- $DAEMON -D
- eend $?
-}
-
-stop() {
- ebegin "Stopping avahi"
- $DAEMON -k || /bin/true
- eend $?
-}
-
-reload() {
- ebegin "Reloading avahi configuration"
- $DAEMON -r
- eend $?
-}
-
--- /dev/null
+#!/sbin/runscript
+# Avahi ZeroConf Daemon init script
+# Many thanks to the Avahi developer's and Sebastien Estienne
+
+DAEMON=/usr/bin/avahi-daemon
+
+depend () {
+ need dbus
+}
+
+start() {
+ ebegin "Starting avahi"
+ $DAEMON -D
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping avahi"
+ $DAEMON -k || /bin/true
+ eend $?
+}
+
+reload() {
+ ebegin "Reloading avahi configuration"
+ $DAEMON -r
+ eend $?
+}
+
dbusinitddir = $(sysconfdir)/init.d
-dbusinitd_SCRIPTS = avahi
+dbusinitd_SCRIPTS = avahi-daemon
EXTRA_DIST = $(dbusinitd_SCRIPTS)
+++ /dev/null
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides: avahi
-# Required-Start: $network dbus
-# Default-Start: 3 5
-# Default-Stop:
-# Description: Avahi, a ZeroConf daemon for mDNS and service registration
-### END INIT INFO
-
-AVAHI_BIN=/usr/bin/avahi
-test -x $AVAHI_BIN || exit 5
-
-. /etc/rc.status
-rc_reset
-
-case "$1" in
- start)
- echo -n "Starting Avahi daemon"
- startproc $AVAHI_BIN -D
- rc_status -v
- ;;
- stop)
- echo -n "Shutting down Avahi daemon"
- killproc -TERM $AVAHI_BIN
- rc_status -v
- ;;
- restart)
- $0 stop
- $0 start
- rc_status
- ;;
- force-reload|reload)
- echo -n "Reloading Avahi daemon"
- killproc -HUP $AVAHI_BIN
- rc_status -v
- ;;
- status)
- echo -n "Checking for Avahi daemon: "
- checkproc $AVAHI_BIN
- rc_status -v
- ;;
- *)
- echo "Usage: $0 {start|stop|status|restart|force-reload|reload}"
- exit 1
- ;;
-esac
-
--- /dev/null
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides: avahi
+# Required-Start: $network dbus
+# Default-Start: 3 5
+# Default-Stop:
+# Description: Avahi, a ZeroConf daemon for mDNS and service registration
+### END INIT INFO
+
+AVAHI_BIN=/usr/bin/avahi-daemon
+test -x $AVAHI_BIN || exit 5
+
+. /etc/rc.status
+rc_reset
+
+case "$1" in
+ start)
+ echo -n "Starting Avahi daemon"
+ startproc $AVAHI_BIN -D
+ rc_status -v
+ ;;
+ stop)
+ echo -n "Shutting down Avahi daemon"
+ killproc -TERM $AVAHI_BIN
+ rc_status -v
+ ;;
+ restart)
+ $0 stop
+ $0 start
+ rc_status
+ ;;
+ force-reload|reload)
+ echo -n "Reloading Avahi daemon"
+ killproc -HUP $AVAHI_BIN
+ rc_status -v
+ ;;
+ status)
+ echo -n "Checking for Avahi daemon: "
+ checkproc $AVAHI_BIN
+ rc_status -v
+ ;;
+ *)
+ echo "Usage: $0 {start|stop|status|restart|force-reload|reload}"
+ exit 1
+ ;;
+esac
+
projects / catta / commitdiff