mirrors/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2025-08-05 21:37:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

main/dnsmasq: add DNSMASQ_LISTEN_BRIDGE_ADDR option

Browse Source 
some setups with tinc may have two different adresses with same(!) ip
addr. This confuses dnsmasq if --listen-address is specified. We make it
possible to work around it by making it possible to disable
--listen-address via DNSMASQ_LISTEN_BRIGE_ADDR=no.
This commit is contained in:
Natanael Copa 2018-04-20 16:53:28 +00:00
parent 65bc9c2886
commit 563c1afc36
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
main/dnsmasq/APKBUILD
View File

@ -15,7 +15,7 @@
# #
pkgname=dnsmasq pkgname=dnsmasq
pkgver=2.79 pkgver=2.79
pkgrel=0 pkgrel=1
pkgdesc="A lightweight DNS, DHCP, RA, TFTP and PXE server" pkgdesc="A lightweight DNS, DHCP, RA, TFTP and PXE server"
url="http://www.thekelleys.org.uk/dnsmasq/" url="http://www.thekelleys.org.uk/dnsmasq/"
arch="all" arch="all"
@ -74,6 +74,6 @@ dnssec() {
} }
sha512sums="c808abc8f24f302cac3609a78fa5a402019a397a248156cda9ce60e6cd706b9f689772af5301c8d1475c3cbbe39ea1528c1e1406f9ec0b7e8153a0899be02352 dnsmasq-2.79.tar.gz sha512sums="c808abc8f24f302cac3609a78fa5a402019a397a248156cda9ce60e6cd706b9f689772af5301c8d1475c3cbbe39ea1528c1e1406f9ec0b7e8153a0899be02352 dnsmasq-2.79.tar.gz
fe6155ff79f06d1813b5c65eb00c69ed41749882ce9f8458da95797c8d870b635aa1df04335cdab068018432c74b87e2166096fcf60597f1c4594279f31c38e6 dnsmasq.initd 296c58359f2deb9f7a48fa8d12205e07fd977b322f489a7a6a4f1a36f16d8fcf527593daeb80ae304e8acc4e075c491a1dbfca42dd46e0137f400a47a11ef2d7 dnsmasq.initd
9a401bfc408bf1638645c61b8ca734bea0a09ef79fb36648ec7ef21666257234254bbe6c73c82cc23aa1779ddcdda0e6baa2c041866f16dfb9c4e0ba9133eab8 dnsmasq.confd 9a401bfc408bf1638645c61b8ca734bea0a09ef79fb36648ec7ef21666257234254bbe6c73c82cc23aa1779ddcdda0e6baa2c041866f16dfb9c4e0ba9133eab8 dnsmasq.confd
d01077f39e1240041a6700137810f254daf683b2d58dafecb6b162e94d694992e57d45964a57993b298f97c2b589eedcf9fb1506692730a38b7f06b5f55ba8d8 uncomment-conf-dir.patch" d01077f39e1240041a6700137810f254daf683b2d58dafecb6b162e94d694992e57d45964a57993b298f97c2b589eedcf9fb1506692730a38b7f06b5f55ba8d8 uncomment-conf-dir.patch"

6
main/dnsmasq/dnsmasq.initd
View File

@ -25,6 +25,7 @@ if [ "${RC_SVCNAME#*.}" != "$RC_SVCNAME" ]; then
: ${BRIDGE_DHCP_RANGE:="10.0.3.2,10.0.3.254"} : ${BRIDGE_DHCP_RANGE:="10.0.3.2,10.0.3.254"}
: ${BRIDGE_DHCP_MAX:="253"} : ${BRIDGE_DHCP_MAX:="253"}
: ${BRIDGE_MAC:="00:16:3e:00:00:00" } : ${BRIDGE_MAC:="00:16:3e:00:00:00" }
: ${DNSMASQ_LISTEN_BRIDGE_ADDR:=yes}
fi fi
. .
@ -86,7 +87,10 @@ start_pre() {
if [ -z "$DISABLE_IPTABLES" ]; then if [ -z "$DISABLE_IPTABLES" ]; then
setup_firewall -I -A setup_firewall -I -A
fi fi
command_args="$command_args --strict-order --bind-interfaces --listen-address ${BRIDGE_ADDR} --except-interface=lo --interface=$BRIDGE --dhcp-range $BRIDGE_DHCP_RANGE --dhcp-lease-max=$BRIDGE_DHCP_MAX --dhcp-no-override --dhcp-leasefile=$leasefile --dhcp-authoritative" if yesno "$DNSMASQ_LISTEN_BRIDGE_ADDR"; then
command_args="$command_args --listen-address ${BRIDGE_ADDR}"
fi
command_args="$command_args --strict-order --bind-interfaces --except-interface=lo --interface=$BRIDGE --dhcp-range $BRIDGE_DHCP_RANGE --dhcp-lease-max=$BRIDGE_DHCP_MAX --dhcp-no-override --dhcp-leasefile=$leasefile --dhcp-authoritative"
} }
stop_post() { stop_post() {