+. /etc/sysconfig/connman
+
PROGRAM=/usr/sbin/connmand
PROGRAM_VPND=/usr/sbin/connman-vpnd
ARGS="$CONNMAND_ARGS"
diff --git a/net/dnsmasq/BUILD b/net/dnsmasq/BUILD
index 59bb137..79a8884 100755
--- a/net/dnsmasq/BUILD
+++ b/net/dnsmasq/BUILD
@@ -1,5 +1,15 @@
-COPTS="$COPTS $DNSMASQ_RTC $DNSMASQ_TFTP $DNSMASQ_DHCP $DNSMASQ_SCRIPT"
-make COPTS="$OPTS $COPTS" &&
+if [[ "${DNSMASQ_RTC}" == y ]]; then
+ OPTS="-DHAVE_BROKEN_RTC ${OPTS}"
+fi &&
+
+if [[ "${DNSMASQ_NO_ID}" == y ]]; then
+ OPTS="-DNO_ID ${OPTS}"
+fi &&
+
+local i18_target &&
+
if is_depends_enabled $SPELL gettext; then
- make all-i18n
-fi
+ i18_target="all-i18n"
+fi &&
+
+make COPTS="${DNSMASQ_OPTS} ${OPTS}" CFLAGS="${CFLAGS}"
PREFIX="${INSTALL_ROOT}/usr" $i18n_target
diff --git a/net/dnsmasq/CONFIGURE b/net/dnsmasq/CONFIGURE
index c30d83d..c0c8995 100755
--- a/net/dnsmasq/CONFIGURE
+++ b/net/dnsmasq/CONFIGURE
@@ -1,13 +1,49 @@
message "Dnsmasq can use uptime instead of RTC for timing, enable this when"
&&
message "your RTC is broken or if your leasefiles are on a flash filesystem"
&&
-config_query_option DNSMASQ_RTC "Use uptime instead of RTC for timing?" \
- n "-DHAVE_BROKEN_RTC" "" &&
+config_query DNSMASQ_RTC "Use uptime instead of RTC for timing?" n &&
-config_query_option DNSMASQ_TFTP "Enable the built-in TFTP server?" \
- y "-DHAVE_TFTP" "-DNO_TFTP" &&
+config_query DNSMASQ_NO_ID "Don't report *.bind CHAOS info to clients,
forward such requests upstream instead?" n &&
-config_query_option DNSMASQ_DHCP "Enable the built-in DHCP server?" \
- y "-DHAVE_DHCP" "-DNO_DHCP" &&
+config_query_option DNSMASQ_OPTS "Enable authoritative DNS server support?"
y \
+ "-DHAVE_AUTH" \
+ "-DNO_AUTH" &&