Menu
▾
▴
[Astlinux-commits] SF.net SVN: astlinux:[7703] branches/1.0
|
From: <abe...@us...> - 2016-06-04 22:55:32
|
Revision: 7703
http://sourceforge.net/p/astlinux/code/7703
Author: abelbeck
Date: 2016-06-04 22:55:30 +0000 (Sat, 04 Jun 2016)
Log Message:
-----------
Migrate from mdnsresponder to avahi for mDNS support
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux-ast13.config
branches/1.0/astlinux18.config
branches/1.0/package/avahi/avahi.init
branches/1.0/package/mdnsresponder/Config.in
branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
branches/1.0/x86_64-configs/astlinux-ast11.config
branches/1.0/x86_64-configs/astlinux-ast13.config
branches/1.0/x86_64-configs/astlinux18.config
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2016-06-03 23:33:17 UTC (rev 7702)
+++ branches/1.0/astlinux-ast11.config 2016-06-04 22:55:30 UTC (rev 7703)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7604-dirty Configuration
-# Tue Mar 22 12:22:57 2016
+# Buildroot 2011.08-svn7702-dirty Configuration
+# Sat Jun 4 17:22:10 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -625,7 +625,7 @@
# BR2_PACKAGE_ARGP_STANDALONE is not set
# BR2_PACKAGE_LIBATOMIC_OPS is not set
# BR2_PACKAGE_LIBCAP is not set
-# BR2_PACKAGE_LIBDAEMON is not set
+BR2_PACKAGE_LIBDAEMON=y
BR2_PACKAGE_LIBELF=y
# BR2_PACKAGE_LIBEVENT is not set
# BR2_PACKAGE_LIBFB is not set
@@ -682,7 +682,10 @@
# BR2_PACKAGE_ARGUS is not set
BR2_PACKAGE_ARNOFW=y
BR2_PACKAGE_ARP_SCAN=y
-# BR2_PACKAGE_AVAHI is not set
+BR2_PACKAGE_AVAHI=y
+# BR2_PACKAGE_AVAHI_AUTOIPD is not set
+BR2_PACKAGE_AVAHI_DAEMON=y
+# BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY is not set
# BR2_PACKAGE_AXEL is not set
# BR2_PACKAGE_BLUEZ_UTILS is not set
# BR2_PACKAGE_BIND is not set
@@ -733,7 +736,6 @@
# BR2_PACKAGE_LIGHTTPD_WEBDAV is not set
# BR2_PACKAGE_LINKS is not set
# BR2_PACKAGE_LRZSZ is not set
-BR2_PACKAGE_MDNSRESPONDER=y
# BR2_PACKAGE_MII_DIAG is not set
BR2_PACKAGE_MINIUPNPD=y
# BR2_PACKAGE_MROUTED is not set
Modified: branches/1.0/astlinux-ast13.config
===================================================================
--- branches/1.0/astlinux-ast13.config 2016-06-03 23:33:17 UTC (rev 7702)
+++ branches/1.0/astlinux-ast13.config 2016-06-04 22:55:30 UTC (rev 7703)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7604-dirty Configuration
-# Tue Mar 22 12:22:57 2016
+# Buildroot 2011.08-svn7702-dirty Configuration
+# Sat Jun 4 17:22:15 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -625,7 +625,7 @@
# BR2_PACKAGE_ARGP_STANDALONE is not set
# BR2_PACKAGE_LIBATOMIC_OPS is not set
# BR2_PACKAGE_LIBCAP is not set
-# BR2_PACKAGE_LIBDAEMON is not set
+BR2_PACKAGE_LIBDAEMON=y
BR2_PACKAGE_LIBELF=y
# BR2_PACKAGE_LIBEVENT is not set
# BR2_PACKAGE_LIBFB is not set
@@ -682,7 +682,10 @@
# BR2_PACKAGE_ARGUS is not set
BR2_PACKAGE_ARNOFW=y
BR2_PACKAGE_ARP_SCAN=y
-# BR2_PACKAGE_AVAHI is not set
+BR2_PACKAGE_AVAHI=y
+# BR2_PACKAGE_AVAHI_AUTOIPD is not set
+BR2_PACKAGE_AVAHI_DAEMON=y
+# BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY is not set
# BR2_PACKAGE_AXEL is not set
# BR2_PACKAGE_BLUEZ_UTILS is not set
# BR2_PACKAGE_BIND is not set
@@ -733,7 +736,6 @@
# BR2_PACKAGE_LIGHTTPD_WEBDAV is not set
# BR2_PACKAGE_LINKS is not set
# BR2_PACKAGE_LRZSZ is not set
-BR2_PACKAGE_MDNSRESPONDER=y
# BR2_PACKAGE_MII_DIAG is not set
BR2_PACKAGE_MINIUPNPD=y
# BR2_PACKAGE_MROUTED is not set
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2016-06-03 23:33:17 UTC (rev 7702)
+++ branches/1.0/astlinux18.config 2016-06-04 22:55:30 UTC (rev 7703)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7604-dirty Configuration
-# Tue Mar 22 12:22:57 2016
+# Buildroot 2011.08-svn7702-dirty Configuration
+# Sat Jun 4 17:22:04 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -625,7 +625,7 @@
# BR2_PACKAGE_ARGP_STANDALONE is not set
# BR2_PACKAGE_LIBATOMIC_OPS is not set
# BR2_PACKAGE_LIBCAP is not set
-# BR2_PACKAGE_LIBDAEMON is not set
+BR2_PACKAGE_LIBDAEMON=y
BR2_PACKAGE_LIBELF=y
# BR2_PACKAGE_LIBEVENT is not set
# BR2_PACKAGE_LIBFB is not set
@@ -682,7 +682,10 @@
# BR2_PACKAGE_ARGUS is not set
BR2_PACKAGE_ARNOFW=y
BR2_PACKAGE_ARP_SCAN=y
-# BR2_PACKAGE_AVAHI is not set
+BR2_PACKAGE_AVAHI=y
+# BR2_PACKAGE_AVAHI_AUTOIPD is not set
+BR2_PACKAGE_AVAHI_DAEMON=y
+# BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY is not set
# BR2_PACKAGE_AXEL is not set
# BR2_PACKAGE_BLUEZ_UTILS is not set
# BR2_PACKAGE_BIND is not set
@@ -733,7 +736,6 @@
# BR2_PACKAGE_LIGHTTPD_WEBDAV is not set
# BR2_PACKAGE_LINKS is not set
# BR2_PACKAGE_LRZSZ is not set
-BR2_PACKAGE_MDNSRESPONDER=y
# BR2_PACKAGE_MII_DIAG is not set
BR2_PACKAGE_MINIUPNPD=y
# BR2_PACKAGE_MROUTED is not set
Modified: branches/1.0/package/avahi/avahi.init
===================================================================
--- branches/1.0/package/avahi/avahi.init 2016-06-03 23:33:17 UTC (rev 7702)
+++ branches/1.0/package/avahi/avahi.init 2016-06-04 22:55:30 UTC (rev 7703)
@@ -8,9 +8,48 @@
exit
fi
+gen_initial_setup_mdns()
+{
+ echo "## Autogenerated. Do not edit.
+[server]
+use-ipv4=yes
+use-ipv6=no
+ratelimit-interval-usec=1000000
+ratelimit-burst=1000
+
+[wide-area]
+enable-wide-area=no
+
+[publish]
+publish-hinfo=no
+publish-workstation=no
+publish-aaaa-on-ipv4=no
+publish-a-on-ipv6=no
+
+[reflector]
+enable-reflector=no
+
+[rlimits]
+rlimit-core=0
+rlimit-data=4194304
+rlimit-fsize=0
+rlimit-nofile=768
+rlimit-stack=4194304
+rlimit-nproc=3
+"
+}
+
init ()
{
if [ "$AVAHI_ENABLE" != "yes" ]; then
+ if [ -n "$ADNAME" ]; then
+ if [ -d /tmp/etc/avahi ]; then
+ rm -rf /tmp/etc/avahi
+ fi
+ mkdir -p /tmp/etc/avahi/services
+ gen_initial_setup_mdns > /tmp/etc/avahi/avahi-daemon.conf
+ return
+ fi
exit
fi
@@ -21,13 +60,19 @@
fi
fi
+ if [ -d /tmp/etc/avahi ]; then
+ rm -rf /tmp/etc/avahi
+ fi
ln -snf /mnt/kd/avahi /tmp/etc/avahi
}
start ()
{
- if [ "$AVAHI_ENABLE" = "yes" ] && ! $DAEMON --check; then
+ if [ "$AVAHI_ENABLE" = "yes" -o -n "$ADNAME" ] && ! $DAEMON --check; then
echo "Starting Avahi mDNS/DNS-SD..."
+ if [ "$AVAHI_ENABLE" != "yes" -a -n "$ADNAME" ]; then
+ echo " Warning: ADNAME is active."
+ fi
$DAEMON --daemonize
fi
}
Modified: branches/1.0/package/mdnsresponder/Config.in
===================================================================
--- branches/1.0/package/mdnsresponder/Config.in 2016-06-03 23:33:17 UTC (rev 7702)
+++ branches/1.0/package/mdnsresponder/Config.in 2016-06-04 22:55:30 UTC (rev 7703)
@@ -1,4 +1,5 @@
config BR2_PACKAGE_MDNSRESPONDER
+ depends on !BR2_PACKAGE_AVAHI
bool "mdnsresponder"
default n
help
Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2016-06-03 23:33:17 UTC (rev 7702)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2016-06-04 22:55:30 UTC (rev 7703)
@@ -492,11 +492,14 @@
#STUNNEL_DEBUGLEVEL="5" # "0" is no debug, "2" is critical, "3" is errors, "5" is notice, "7" is full debugging
#STUNNELUSER="root" # defaults to "nobody", do not change unless binding fails
-## Service Advertisement (mDNS)
-## If you define ADNAME, I will advertise all of the available services on
-## your AstLinux machine in a way that is compatible with bonjour/rendezvous.
-## THIS IS VERY INSECURE, THIS SHOULD BE THE FIRST THING YOU DISABLE
-## ADNAME is automatically (always) disabled whenever the web interface Network Tab is saved.
+## Bonjour/mDNS Service Discovery (Avahi)
+## Configuration stored in /mnt/kd/avahi/ symlinked from /etc/avahi/
+## Enable mDNS/DNS-SD by setting AVAHI_ENABLE="yes"
+#AVAHI_ENABLE="yes"
+##
+## Defining ADNAME when AVAHI_ENABLE="no" (or undefined) will advertise pbx.local on all interfaces.
+## Use only for initial setup. THIS IS VERY INSECURE, THIS SHOULD BE THE FIRST THING YOU DISABLE
+## Note: ADNAME is automatically (always) disabled whenever the web interface Network Tab is saved.
ADNAME="AstLinux PBX"
## Universal Plug and Play (UPnP)
@@ -907,10 +910,9 @@
#UPS_NOTIFY_FROM="up...@my..." # Optional, From: email address
## Additionally, custom files in /mnt/kd/ups/ will override auto-generated 'ups*' files if any exist.
-## NetJet Emulation (P910ND)
+## NetJet Emulation (P910ND) - Non-spooling printer daemon using 9100/tcp to USB printer
+## Note: Enable Bonjour/mDNS discovery with AVAHI_ENABLE="yes" and configuring /mnt/kd/avahi/
#P910ND_DEVICE0="/dev/usblp0"
-## Enable Bonjour/mDNS Broadcasts
-#P910ND_ADNAME0="HP Officejet 6200"
## Redfone foneBRIDGE (PRI-to-Ethernet bridge)
## If the package "fonulator" is built, Redfone foneBRIDGE configuration support is added.
Modified: branches/1.0/x86_64-configs/astlinux-ast11.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast11.config 2016-06-03 23:33:17 UTC (rev 7702)
+++ branches/1.0/x86_64-configs/astlinux-ast11.config 2016-06-04 22:55:30 UTC (rev 7703)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7604-dirty Configuration
-# Tue Mar 22 12:22:58 2016
+# Buildroot 2011.08-svn7702-dirty Configuration
+# Sat Jun 4 17:22:35 2016
#
BR2_HAVE_DOT_CONFIG=y
BR2_ARCH_IS_64=y
@@ -606,7 +606,7 @@
# BR2_PACKAGE_ARGP_STANDALONE is not set
# BR2_PACKAGE_LIBATOMIC_OPS is not set
# BR2_PACKAGE_LIBCAP is not set
-# BR2_PACKAGE_LIBDAEMON is not set
+BR2_PACKAGE_LIBDAEMON=y
BR2_PACKAGE_LIBELF=y
# BR2_PACKAGE_LIBEVENT is not set
# BR2_PACKAGE_LIBFB is not set
@@ -663,7 +663,10 @@
# BR2_PACKAGE_ARGUS is not set
BR2_PACKAGE_ARNOFW=y
BR2_PACKAGE_ARP_SCAN=y
-# BR2_PACKAGE_AVAHI is not set
+BR2_PACKAGE_AVAHI=y
+# BR2_PACKAGE_AVAHI_AUTOIPD is not set
+BR2_PACKAGE_AVAHI_DAEMON=y
+# BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY is not set
# BR2_PACKAGE_AXEL is not set
# BR2_PACKAGE_BLUEZ_UTILS is not set
# BR2_PACKAGE_BIND is not set
@@ -714,7 +717,6 @@
# BR2_PACKAGE_LIGHTTPD_WEBDAV is not set
# BR2_PACKAGE_LINKS is not set
# BR2_PACKAGE_LRZSZ is not set
-BR2_PACKAGE_MDNSRESPONDER=y
# BR2_PACKAGE_MII_DIAG is not set
BR2_PACKAGE_MINIUPNPD=y
# BR2_PACKAGE_MROUTED is not set
Modified: branches/1.0/x86_64-configs/astlinux-ast13.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast13.config 2016-06-03 23:33:17 UTC (rev 7702)
+++ branches/1.0/x86_64-configs/astlinux-ast13.config 2016-06-04 22:55:30 UTC (rev 7703)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7604-dirty Configuration
-# Tue Mar 22 12:22:58 2016
+# Buildroot 2011.08-svn7702-dirty Configuration
+# Sat Jun 4 17:22:37 2016
#
BR2_HAVE_DOT_CONFIG=y
BR2_ARCH_IS_64=y
@@ -606,7 +606,7 @@
# BR2_PACKAGE_ARGP_STANDALONE is not set
# BR2_PACKAGE_LIBATOMIC_OPS is not set
# BR2_PACKAGE_LIBCAP is not set
-# BR2_PACKAGE_LIBDAEMON is not set
+BR2_PACKAGE_LIBDAEMON=y
BR2_PACKAGE_LIBELF=y
# BR2_PACKAGE_LIBEVENT is not set
# BR2_PACKAGE_LIBFB is not set
@@ -663,7 +663,10 @@
# BR2_PACKAGE_ARGUS is not set
BR2_PACKAGE_ARNOFW=y
BR2_PACKAGE_ARP_SCAN=y
-# BR2_PACKAGE_AVAHI is not set
+BR2_PACKAGE_AVAHI=y
+# BR2_PACKAGE_AVAHI_AUTOIPD is not set
+BR2_PACKAGE_AVAHI_DAEMON=y
+# BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY is not set
# BR2_PACKAGE_AXEL is not set
# BR2_PACKAGE_BLUEZ_UTILS is not set
# BR2_PACKAGE_BIND is not set
@@ -714,7 +717,6 @@
# BR2_PACKAGE_LIGHTTPD_WEBDAV is not set
# BR2_PACKAGE_LINKS is not set
# BR2_PACKAGE_LRZSZ is not set
-BR2_PACKAGE_MDNSRESPONDER=y
# BR2_PACKAGE_MII_DIAG is not set
BR2_PACKAGE_MINIUPNPD=y
# BR2_PACKAGE_MROUTED is not set
Modified: branches/1.0/x86_64-configs/astlinux18.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux18.config 2016-06-03 23:33:17 UTC (rev 7702)
+++ branches/1.0/x86_64-configs/astlinux18.config 2016-06-04 22:55:30 UTC (rev 7703)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7604-dirty Configuration
-# Tue Mar 22 12:22:58 2016
+# Buildroot 2011.08-svn7702-dirty Configuration
+# Sat Jun 4 17:22:30 2016
#
BR2_HAVE_DOT_CONFIG=y
BR2_ARCH_IS_64=y
@@ -606,7 +606,7 @@
# BR2_PACKAGE_ARGP_STANDALONE is not set
# BR2_PACKAGE_LIBATOMIC_OPS is not set
# BR2_PACKAGE_LIBCAP is not set
-# BR2_PACKAGE_LIBDAEMON is not set
+BR2_PACKAGE_LIBDAEMON=y
BR2_PACKAGE_LIBELF=y
# BR2_PACKAGE_LIBEVENT is not set
# BR2_PACKAGE_LIBFB is not set
@@ -663,7 +663,10 @@
# BR2_PACKAGE_ARGUS is not set
BR2_PACKAGE_ARNOFW=y
BR2_PACKAGE_ARP_SCAN=y
-# BR2_PACKAGE_AVAHI is not set
+BR2_PACKAGE_AVAHI=y
+# BR2_PACKAGE_AVAHI_AUTOIPD is not set
+BR2_PACKAGE_AVAHI_DAEMON=y
+# BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY is not set
# BR2_PACKAGE_AXEL is not set
# BR2_PACKAGE_BLUEZ_UTILS is not set
# BR2_PACKAGE_BIND is not set
@@ -714,7 +717,6 @@
# BR2_PACKAGE_LIGHTTPD_WEBDAV is not set
# BR2_PACKAGE_LINKS is not set
# BR2_PACKAGE_LRZSZ is not set
-BR2_PACKAGE_MDNSRESPONDER=y
# BR2_PACKAGE_MII_DIAG is not set
BR2_PACKAGE_MINIUPNPD=y
# BR2_PACKAGE_MROUTED is not set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
