summaryrefslogtreecommitdiff
path: root/package/dnsmasq
diff options
context:
space:
mode:
Diffstat (limited to 'package/dnsmasq')
-rw-r--r--package/dnsmasq/Makefile88
-rw-r--r--package/dnsmasq/files/dhcp.conf31
-rw-r--r--package/dnsmasq/files/dnsmasq.conf37
-rw-r--r--package/dnsmasq/files/dnsmasq.init529
-rw-r--r--package/dnsmasq/patches/0001-Set-prefix-on-link-bit-in-RAs.patch42
-rw-r--r--package/dnsmasq/patches/100-fix-dhcp-no-address-warning.patch49
6 files changed, 0 insertions, 776 deletions
diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile
deleted file mode 100644
index 4ad0f37742..0000000000
--- a/package/dnsmasq/Makefile
+++ /dev/null
@@ -1,88 +0,0 @@
-#
-# Copyright (C) 2006-2012 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=dnsmasq
-PKG_VERSION:=2.62
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq
-PKG_MD5SUM:=f47e5cb8f5bac6343f24b2dbe317ab40
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_INSTALL:=1
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/dnsmasq/Default
- SECTION:=net
- CATEGORY:=Base system
- TITLE:=A lightweight DNS and DHCP server
- URL:=http://www.thekelleys.org.uk/dnsmasq/
-endef
-
-define Package/dnsmasq
-$(call Package/dnsmasq/Default)
- VARIANT:=nodhcpv6
-endef
-
-define Package/dnsmasq-dhcpv6
-$(call Package/dnsmasq/Default)
- TITLE += (with DHCPv6 support)
- DEPENDS:=@IPV6 +kmod-ipv6
- VARIANT:=dhcpv6
-endef
-
-define Package/dnsmasq/description
- It is intended to provide coupled DNS and DHCP service to a LAN.
-endef
-
-define Package/dnsmasq-dhcpv6/description
-$(call Package/dnsmasq/description)
-
-This is a variant with DHCPv6 support
-endef
-
-define Package/dnsmasq/conffiles
-/etc/config/dhcp
-/etc/dnsmasq.conf
-endef
-
-Package/dnsmasq-dhcpv6/conffiles = $(Package/dnsmasq/conffiles)
-
-TARGET_CFLAGS += \
- -ffunction-sections -fdata-sections \
- $(if $(CONFIG_IPV6),,-DNO_IPV6)
-
-ifeq ($(BUILD_VARIANT),nodhcpv6)
- TARGET_CFLAGS += -DNO_DHCP6
-endif
-
-MAKE_FLAGS := \
- $(TARGET_CONFIGURE_OPTS) \
- CFLAGS="$(TARGET_CFLAGS)" \
- LDFLAGS="-Wl,--gc-sections" \
- PREFIX="/usr"
-
-define Package/dnsmasq/install
- $(INSTALL_DIR) $(1)/usr/sbin
- $(CP) $(PKG_INSTALL_DIR)/usr/sbin/dnsmasq $(1)/usr/sbin/
- $(INSTALL_DIR) $(1)/etc/config
- $(INSTALL_DATA) ./files/dhcp.conf $(1)/etc/config/dhcp
- $(INSTALL_DATA) ./files/dnsmasq.conf $(1)/etc/dnsmasq.conf
- $(INSTALL_DIR) $(1)/etc/init.d
- $(INSTALL_BIN) ./files/dnsmasq.init $(1)/etc/init.d/dnsmasq
-endef
-
-Package/dnsmasq-dhcpv6/install = $(Package/dnsmasq/install)
-
-$(eval $(call BuildPackage,dnsmasq))
-$(eval $(call BuildPackage,dnsmasq-dhcpv6))
diff --git a/package/dnsmasq/files/dhcp.conf b/package/dnsmasq/files/dhcp.conf
deleted file mode 100644
index 660b06ad4f..0000000000
--- a/package/dnsmasq/files/dhcp.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-config dnsmasq
- option domainneeded 1
- option boguspriv 1
- option filterwin2k 0 # enable for dial on demand
- option localise_queries 1
- option rebind_protection 1 # disable if upstream must serve RFC1918 addresses
- option rebind_localhost 1 # enable for RBL checking and similar services
- #list rebind_domain example.lan # whitelist RFC1918 responses for domains
- option local '/lan/'
- option domain 'lan'
- option expandhosts 1
- option nonegcache 0
- option authoritative 1
- option readethers 1
- option leasefile '/tmp/dhcp.leases'
- option resolvfile '/tmp/resolv.conf.auto'
- #list server '/mycompany.local/1.2.3.4'
- #option nonwildcard 1
- #list interface br-lan
- #list notinterface lo
- #list bogusnxdomain '64.94.110.11'
-
-config dhcp lan
- option interface lan
- option start 100
- option limit 150
- option leasetime 12h
-
-config dhcp wan
- option interface wan
- option ignore 1
diff --git a/package/dnsmasq/files/dnsmasq.conf b/package/dnsmasq/files/dnsmasq.conf
deleted file mode 100644
index bf5816be56..0000000000
--- a/package/dnsmasq/files/dnsmasq.conf
+++ /dev/null
@@ -1,37 +0,0 @@
-# Change the following lines if you want dnsmasq to serve SRV
-# records.
-# You may add multiple srv-host lines.
-# The fields are <name>,<target>,<port>,<priority>,<weight>
-
-# A SRV record sending LDAP for the example.com domain to
-# ldapserver.example.com port 289
-#srv-host=_ldap._tcp.example.com,ldapserver.example.com,389
-
-# Two SRV records for LDAP, each with different priorities
-#srv-host=_ldap._tcp.example.com,ldapserver.example.com,389,1
-#srv-host=_ldap._tcp.example.com,ldapserver.example.com,389,2
-
-# A SRV record indicating that there is no LDAP server for the domain
-# example.com
-#srv-host=_ldap._tcp.example.com
-
-# The following line shows how to make dnsmasq serve an arbitrary PTR
-# record. This is useful for DNS-SD.
-# The fields are <name>,<target>
-#ptr-record=_http._tcp.dns-sd-services,"New Employee Page._http._tcp.dns-sd-services"
-
-# Change the following lines to enable dnsmasq to serve TXT records.
-# These are used for things like SPF and zeroconf.
-# The fields are <name>,<text>,<text>...
-
-#Example SPF.
-#txt-record=example.com,"v=spf1 a -all"
-
-#Example zeroconf
-#txt-record=_http._tcp.example.com,name=value,paper=A4
-
-# Provide an alias for a "local" DNS name. Note that this _only_ works
-# for targets which are names from DHCP or /etc/hosts. Give host
-# "bert" another name, bertrand
-# The fields are <cname>,<target>
-#cname=bertand,bert
diff --git a/package/dnsmasq/files/dnsmasq.init b/package/dnsmasq/files/dnsmasq.init
deleted file mode 100644
index 85c22c3745..0000000000
--- a/package/dnsmasq/files/dnsmasq.init
+++ /dev/null
@@ -1,529 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2007-2012 OpenWrt.org
-
-START=60
-
-SERVICE_USE_PID=1
-
-DNS_SERVERS=""
-DOMAIN=""
-
-ADD_LOCAL_DOMAIN=1
-ADD_LOCAL_HOSTNAME=1
-
-CONFIGFILE="/var/etc/dnsmasq.conf"
-
-xappend() {
- local value="$1"
-
- echo "${value#--}" >> $CONFIGFILE
-}
-
-dhcp_calc() {
- local ip="$1"
- local res=0
-
- while [ -n "$ip" ]; do
- part="${ip%%.*}"
- res="$(($res * 256))"
- res="$(($res + $part))"
- [ "${ip%.*}" != "$ip" ] && ip="${ip#*.}" || ip=
- done
- echo "$res"
-}
-
-append_bool() {
- local section="$1"
- local option="$2"
- local value="$3"
- local _loctmp
- config_get_bool _loctmp "$section" "$option" 0
- [ $_loctmp -gt 0 ] && xappend "$value"
-}
-
-append_parm() {
- local section="$1"
- local option="$2"
- local switch="$3"
- local _loctmp
- config_get _loctmp "$section" "$option"
- [ -z "$_loctmp" ] && return 0
- xappend "$switch=$_loctmp"
-}
-
-append_server() {
- xappend "--server=$1"
-}
-
-append_address() {
- xappend "--address=$1"
-}
-
-append_interface() {
- local ifname=$(uci_get_state network "$1" ifname "$1")
- xappend "--interface=$ifname"
-}
-
-append_notinterface() {
- local ifname=$(uci_get_state network "$1" ifname "$1")
- xappend "--except-interface=$ifname"
-}
-
-append_addnhosts() {
- xappend "--addn-hosts=$1"
-}
-
-append_bogusnxdomain() {
- xappend "--bogus-nxdomain=$1"
-}
-
-dnsmasq() {
- local cfg="$1"
- append_bool "$cfg" authoritative "--dhcp-authoritative"
- append_bool "$cfg" nodaemon "--no-daemon"
- append_bool "$cfg" domainneeded "--domain-needed"
- append_bool "$cfg" filterwin2k "--filterwin2k"
- append_bool "$cfg" nohosts "--no-hosts"
- append_bool "$cfg" nonegcache "--no-negcache"
- append_bool "$cfg" strictorder "--strict-order"
- append_bool "$cfg" logqueries "--log-queries"
- append_bool "$cfg" noresolv "--no-resolv"
- append_bool "$cfg" localise_queries "--localise-queries"
- append_bool "$cfg" readethers "--read-ethers"
- append_bool "$cfg" dbus "--enable-dbus"
- append_bool "$cfg" boguspriv "--bogus-priv"
- append_bool "$cfg" expandhosts "--expand-hosts"
- append_bool "$cfg" enable_tftp "--enable-tftp"
- append_bool "$cfg" nonwildcard "--bind-interfaces"
- append_bool "$cfg" fqdn "--dhcp-fqdn"
-
- append_parm "$cfg" dhcpscript "--dhcp-script"
- append_parm "$cfg" cachesize "--cache-size"
- append_parm "$cfg" dnsforwardmax "--dns-forward-max"
- append_parm "$cfg" port "--port"
- append_parm "$cfg" ednspacket_max "--edns-packet-max"
- append_parm "$cfg" dhcpleasemax "--dhcp-lease-max"
- append_parm "$cfg" "queryport" "--query-port"
- append_parm "$cfg" "domain" "--domain"
- append_parm "$cfg" "local" "--server"
- config_list_foreach "$cfg" "server" append_server
- config_list_foreach "$cfg" "address" append_address
- config_list_foreach "$cfg" "interface" append_interface
- config_list_foreach "$cfg" "notinterface" append_notinterface
- config_list_foreach "$cfg" "addnhosts" append_addnhosts
- config_list_foreach "$cfg" "bogusnxdomain" append_bogusnxdomain
- append_parm "$cfg" "leasefile" "--dhcp-leasefile"
- append_parm "$cfg" "resolvfile" "--resolv-file"
- append_parm "$cfg" "tftp_root" "--tftp-root"
- append_parm "$cfg" "dhcp_boot" "--dhcp-boot"
- append_parm "$cfg" "local_ttl" "--local-ttl"
-
- config_get DOMAIN "$cfg" domain
-
- config_get_bool ADD_LOCAL_DOMAIN "$cfg" add_local_domain 1
- config_get_bool ADD_LOCAL_HOSTNAME "$cfg" add_local_hostname 1
-
- config_get_bool readethers "$cfg" readethers
- [ "$readethers" = "1" -a \! -e "/etc/ethers" ] && touch /etc/ethers
-
- config_get leasefile $cfg leasefile
- [ -n "$leasefile" -a \! -e "$leasefile" ] && touch "$leasefile"
- config_get_bool cachelocal "$cfg" cachelocal 1
-
- config_get hostsfile "$cfg" dhcphostsfile
- [ -e "$hostsfile" ] && xappend "--dhcp-hostsfile=$hostsfile"
-
- local rebind
- config_get_bool rebind "$cfg" rebind_protection 1
- [ $rebind -gt 0 ] && {
- logger -t dnsmasq \
- "DNS rebinding protection is active," \
- "will discard upstream RFC1918 responses!"
- xappend "--stop-dns-rebind"
-
- local rebind_localhost
- config_get_bool rebind_localhost "$cfg" rebind_localhost 0
- [ $rebind_localhost -gt 0 ] && {
- logger -t dnsmasq "Allowing 127.0.0.0/8 responses"
- xappend "--rebind-localhost-ok"
- }
-
- append_rebind_domain() {
- logger -t dnsmasq "Allowing RFC1918 responses for domain $1"
- xappend "--rebind-domain-ok=$1"
- }
-
- config_list_foreach "$cfg" rebind_domain append_rebind_domain
- }
-
- dhcp_option_add "$cfg" "" 0
-
- echo >> $CONFIGFILE
-}
-
-dhcp_subscrid_add() {
- local cfg="$1"
-
- config_get networkid "$cfg" networkid
- [ -n "$networkid" ] || return 0
-
- config_get subscriberid "$cfg" subscriberid
- [ -n "$subscriberid" ] || return 0
-
- xappend "--dhcp-subscrid=$networkid,$subscriberid"
-
- config_get_bool force "$cfg" force 0
-
- dhcp_option_add "$cfg" "$networkid" "$force"
-}
-
-dhcp_remoteid_add() {
- local cfg="$1"
-
- config_get networkid "$cfg" networkid
- [ -n "$networkid" ] || return 0
-
- config_get remoteid "$cfg" remoteid
- [ -n "$remoteid" ] || return 0
-
- xappend "--dhcp-remoteid=$networkid,$remoteid"
-
- config_get_bool force "$cfg" force 0
-
- dhcp_option_add "$cfg" "$networkid" "$force"
-}
-
-dhcp_circuitid_add() {
- local cfg="$1"
-
- config_get networkid "$cfg" networkid
- [ -n "$networkid" ] || return 0
-
- config_get circuitid "$cfg" circuitid
- [ -n "$circuitid" ] || return 0
-
- xappend "--dhcp-circuitid=$networkid,$circuitid"
-
- config_get_bool force "$cfg" force 0
-
- dhcp_option_add "$cfg" "$networkid" "$force"
-}
-
-dhcp_userclass_add() {
- local cfg="$1"
-
- config_get networkid "$cfg" networkid
- [ -n "$networkid" ] || return 0
-
- config_get userclass "$cfg" userclass
- [ -n "$userclass" ] || return 0
-
- xappend "--dhcp-userclass=$networkid,$userclass"
-
- config_get_bool force "$cfg" force 0
-
- dhcp_option_add "$cfg" "$networkid" "$force"
-}
-
-dhcp_vendorclass_add() {
- local cfg="$1"
-
- config_get networkid "$cfg" networkid
- [ -n "$networkid" ] || return 0
-
- config_get vendorclass "$cfg" vendorclass
- [ -n "$vendorclass" ] || return 0
-
- xappend "--dhcp-vendorclass=$networkid,$vendorclass"
-
- config_get_bool force "$cfg" force 0
-
- dhcp_option_add "$cfg" "$networkid" "$force"
-}
-
-dhcp_host_add() {
- local cfg="$1"
-
- config_get_bool force "$cfg" force 0
-
- config_get networkid "$cfg" networkid
- [ -n "$networkid" ] && dhcp_option_add "$cfg" "$networkid" "$force"
-
- config_get name "$cfg" name
- config_get ip "$cfg" ip
- [ -n "$ip" -o -n "$name" ] || return 0
-
- macs=""
- config_get mac "$cfg" mac
- for m in $mac; do append macs "$m" ","; done
- [ -n "$macs" ] || return 0
-
- config_get tag "$cfg" tag
-
- xappend "--dhcp-host=$macs${networkid:+,net:$networkid}${tag:+,set:$tag}${ip:+,$ip}${name:+,$name}"
-}
-
-dhcp_tag_add() {
- local cfg="$1"
-
- tag="$cfg"
-
- [ -n "$tag" ] || return 0
-
- config_get_bool force "$cfg" force 0
- [ "$force" = "0" ] && force=
-
- config_get option "$cfg" dhcp_option
- for o in $option; do
- xappend "--dhcp-option${force:+-force}=tag:$tag,$o"
- done
-}
-
-dhcp_mac_add() {
- local cfg="$1"
-
- config_get networkid "$cfg" networkid
- [ -n "$networkid" ] || return 0
-
- config_get mac "$cfg" mac
- [ -n "$mac" ] || return 0
-
- xappend "--dhcp-mac=$networkid,$mac"
-
- dhcp_option_add "$cfg" "$networkid"
-}
-
-dhcp_boot_add() {
- local cfg="$1"
-
- config_get networkid "$cfg" networkid
-
- config_get filename "$cfg" filename
- [ -n "$filename" ] || return 0
-
- config_get servername "$cfg" servername
- [ -n "$servername" ] || return 0
-
- config_get serveraddress "$cfg" serveraddress
- [ -n "$serveraddress" ] || return 0
-
- xappend "--dhcp-boot=${networkid:+net:$networkid,}$filename,$servername,$serveraddress"
-
- config_get_bool force "$cfg" force 0
-
- dhcp_option_add "$cfg" "$networkid" "$force"
-}
-
-
-dhcp_add() {
- local cfg="$1"
- config_get net "$cfg" interface
- [ -n "$net" ] || return 0
-
- config_get networkid "$cfg" networkid
- [ -n "$networkid" ] || networkid="$net"
-
- config_get ifname "$net" ifname
- [ -n "$ifname" ] || return 0
-
- config_get dnsserver "$net" dns
- [ "$cachelocal" = "0" -a -n "$dnsserver" ] && {
- DNS_SERVERS="$DNS_SERVERS $dnsserver"
- }
-
- append_bool "$cfg" ignore "--no-dhcp-interface=$ifname" && return 0
-
- config_get proto "$net" proto
- [ static = "$proto" ] || return 0
-
- config_get ipaddr "$net" ipaddr
- config_get netmask "$cfg" netmask
- [ -n "$netmask" ] || config_get netmask "$net" netmask
-
- #check for an already active dhcp server on the interface, unless 'force' is set
- config_get_bool force "$cfg" force 0
- [ $force -gt 0 ] || {
- udhcpc -n -q -s /bin/true -t 1 -i $ifname >&- && {
- logger -t dnsmasq \
- "found already running DHCP-server on interface '$ifname'" \
- "refusing to start, use 'option force 1' to override"
- return 0
- }
- }
-
- config_get start "$cfg" start
- config_get limit "$cfg" limit
- config_get leasetime "$cfg" leasetime
- config_get options "$cfg" options
- config_get_bool dynamicdhcp "$cfg" dynamicdhcp 1
-
- leasetime="${leasetime:-12h}"
- start="$(dhcp_calc "${start:-100}")"
- limit="${limit:-150}"
- [ "$limit" -gt 0 ] && limit=$((limit-1))
- eval "$(ipcalc.sh $ipaddr $netmask $start $limit)"
- if [ "$dynamicdhcp" = "0" ]; then END="static"; fi
- xappend "--dhcp-range=$networkid,$START,$END,$NETMASK,$leasetime${options:+ $options}"
-
- dhcp_option_add "$cfg" "$networkid"
-}
-
-dhcp_option_add() {
- local cfg="$1"
- local networkid="$2"
- local force="$3"
-
- [ "$force" = "0" ] && force=
-
- config_get dhcp_option "$cfg" dhcp_option
- for o in $dhcp_option; do
- xappend "--dhcp-option${force:+-force}=${networkid:+$networkid,}$o"
- done
-
-}
-
-dhcp_domain_add() {
- local cfg="$1"
- local ip name names
-
- config_get names "$cfg" name "$2"
- [ -n "$names" ] || return 0
-
- config_get ip "$cfg" ip "$3"
- [ -n "$ip" ] || return 0
-
- local oIFS="$IFS"; IFS="."; set -- $ip; IFS="$oIFS"
- local raddr="${4:+$4.$3.$2.$1.in-addr.arpa}"
-
- for name in $names; do
- local fqdn="$name"
-
- [ "${fqdn%.*}" == "$fqdn" ] && \
- fqdn="$fqdn${DOMAIN:+.$DOMAIN}"
-
- xappend "--address=/$fqdn/$ip"
-
- [ -n "$raddr" ] && {
- xappend "--ptr-record=$raddr,$fqdn"
- raddr=""
- }
- done
-}
-
-dhcp_srv_add() {
- local cfg="$1"
-
- config_get srv "$cfg" srv
- [ -n "$srv" ] || return 0
-
- config_get target "$cfg" target
- [ -n "$target" ] || return 0
-
- config_get port "$cfg" port
- [ -n "$port" ] || return 0
-
- config_get class "$cfg" class
- config_get weight "$cfg" weight
-
- local service="$srv,$target,$port${class:+,$class${weight:+,$weight}}"
-
- xappend "--srv-host=$service"
-}
-
-dhcp_mx_add() {
- local cfg="$1"
- local domain relay pref
-
- config_get domain "$cfg" domain
- [ -n "$domain" ] || return 0
-
- config_get relay "$cfg" relay
- [ -n "$relay" ] || return 0
-
- config_get pref "$cfg" pref 0
-
- local service="$domain,$relay,$pref"
-
- xappend "--mx-host=$service"
-}
-
-dhcp_cname_add() {
- local cfg="$1"
- local cname target
-
- config_get cname "$cfg" cname
- [ -n "$cname" ] || return 0
-
- config_get target "$cfg" target
- [ -n "$target" ] || return 0
-
- xappend "--cname=${cname},${target}"
-}
-
-start() {
- include /lib/network
- scan_interfaces
-
- local lanaddr
- config_get lanaddr "lan" ipaddr
-
- config_load dhcp
-
- # before we can call xappend
- mkdir -p $(dirname $CONFIGFILE)
-
- echo "# auto-generated config file from /etc/config/dhcp" > $CONFIGFILE
-
- # if we did this last, we could override auto-generated config
- [ -f /etc/dnsmasq.conf ] && {
- xappend "--conf-file=/etc/dnsmasq.conf"
- }
-
- args=""
- config_foreach dnsmasq dnsmasq
- config_foreach dhcp_host_add host
- echo >> $CONFIGFILE
- config_foreach dhcp_boot_add boot
- config_foreach dhcp_mac_add mac
- config_foreach dhcp_tag_add tag
- config_foreach dhcp_vendorclass_add vendorclass
- config_foreach dhcp_userclass_add userclass
- config_foreach dhcp_circuitid_add circuitid
- config_foreach dhcp_remoteid_add remoteid
- config_foreach dhcp_subscrid_add subscrid
- config_foreach dhcp_domain_add domain
- echo >> $CONFIGFILE
- config_foreach dhcp_srv_add srvhost
- config_foreach dhcp_mx_add mxhost
- echo >> $CONFIGFILE
- config_foreach dhcp_add dhcp
- echo >> $CONFIGFILE
- config_foreach dhcp_cname_add cname
- echo >> $CONFIGFILE
-
- # add own hostname
- [ $ADD_LOCAL_HOSTNAME -eq 1 ] && [ -n "$lanaddr" ] && {
- local hostname="$(uci_get system.@system[0].hostname)"
- dhcp_domain_add "" "${hostname:-OpenWrt}" "$lanaddr"
- }
-
- service_start /usr/sbin/dnsmasq -C $CONFIGFILE && {
- rm -f /tmp/resolv.conf
- [ $ADD_LOCAL_DOMAIN -eq 1 ] && [ -n "$DOMAIN" ] && {
- echo "search $DOMAIN" >> /tmp/resolv.conf
- }
- DNS_SERVERS="$DNS_SERVERS 127.0.0.1"
- for DNS_SERVER in $DNS_SERVERS ; do
- echo "nameserver $DNS_SERVER" >> /tmp/resolv.conf
- done
- }
-}
-
-stop() {
- service_stop /usr/sbin/dnsmasq && {
- [ -f /tmp/resolv.conf ] && {
- rm -f /tmp/resolv.conf
- ln -s /tmp/resolv.conf.auto /tmp/resolv.conf
- }
- }
-}
diff --git a/package/dnsmasq/patches/0001-Set-prefix-on-link-bit-in-RAs.patch b/package/dnsmasq/patches/0001-Set-prefix-on-link-bit-in-RAs.patch
deleted file mode 100644
index 8ead9afa59..0000000000
--- a/package/dnsmasq/patches/0001-Set-prefix-on-link-bit-in-RAs.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From fd05f127909bbf4f6983a4de2dcb611947488dee Mon Sep 17 00:00:00 2001
-From: Simon Kelley <simon@thekelleys.org.uk>
-Date: Sun, 12 Aug 2012 17:48:50 +0100
-Subject: [PATCH] Set prefix on-link bit in RAs
-
----
- CHANGELOG | 3 +++
- src/radv.c | 4 ++--
- 2 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/CHANGELOG b/CHANGELOG
-index 8828694..e1daeef 100644
---- a/CHANGELOG
-+++ b/CHANGELOG
-@@ -45,6 +45,9 @@ version 2.63
- uk.org.thekelleys.dnsmasq. Thanks to Mathieu
- Trudel-Lapierre for the patch.
-
-+ Set the "prefix on-link" bit in Router
-+ Advertisements. Thanks to Gui Iribarren for the patch.
-+
-
- version 2.62
- Update German translation. Thanks to Conrad Kostecki.
-diff --git a/src/radv.c b/src/radv.c
-index a3e691a..d1f5268 100644
---- a/src/radv.c
-+++ b/src/radv.c
-@@ -412,8 +412,8 @@ static int add_prefixes(struct in6_addr *local, int prefix,
- opt->type = ICMP6_OPT_PREFIX;
- opt->len = 4;
- opt->prefix_len = prefix;
-- /* autonomous only if we're not doing dhcp */
-- opt->flags = do_slaac ? 0x40 : 0x00;
-+ /* autonomous only if we're not doing dhcp, always set "on-link" */
-+ opt->flags = do_slaac ? 0xC0 : 0x80;
- opt->valid_lifetime = htonl(time);
- opt->preferred_lifetime = htonl(deprecate ? 0 : time);
- opt->reserved = 0;
---
-1.7.10.GIT
-
diff --git a/package/dnsmasq/patches/100-fix-dhcp-no-address-warning.patch b/package/dnsmasq/patches/100-fix-dhcp-no-address-warning.patch
deleted file mode 100644
index d108a7d3bc..0000000000
--- a/package/dnsmasq/patches/100-fix-dhcp-no-address-warning.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- a/src/dhcp.c
-+++ b/src/dhcp.c
-@@ -134,7 +134,7 @@ void dhcp_packet(time_t now, int pxe_fd)
- struct iovec iov;
- ssize_t sz;
- int iface_index = 0, unicast_dest = 0, is_inform = 0;
-- struct in_addr iface_addr;
-+ struct in_addr iface_addr, *addrp = NULL;
- struct iface_param parm;
- #ifdef HAVE_LINUX_NETWORK
- struct arpreq arp_req;
-@@ -246,11 +246,9 @@ void dhcp_packet(time_t now, int pxe_fd)
-
- ifr.ifr_addr.sa_family = AF_INET;
- if (ioctl(daemon->dhcpfd, SIOCGIFADDR, &ifr) != -1 )
-- iface_addr = ((struct sockaddr_in *) &ifr.ifr_addr)->sin_addr;
-- else
- {
-- my_syslog(MS_DHCP | LOG_WARNING, _("DHCP packet received on %s which has no address"), ifr.ifr_name);
-- return;
-+ addrp = &iface_addr;
-+ iface_addr = ((struct sockaddr_in *) &ifr.ifr_addr)->sin_addr;
- }
-
- for (tmp = daemon->dhcp_except; tmp; tmp = tmp->next)
-@@ -272,7 +270,7 @@ void dhcp_packet(time_t now, int pxe_fd)
- parm.current = NULL;
- parm.ind = iface_index;
-
-- if (!iface_check(AF_INET, (struct all_addr *)&iface_addr, ifr.ifr_name))
-+ if (!iface_check(AF_INET, (struct all_addr *)addrp, ifr.ifr_name))
- {
- /* If we failed to match the primary address of the interface, see if we've got a --listen-address
- for a secondary */
-@@ -291,7 +289,13 @@ void dhcp_packet(time_t now, int pxe_fd)
- there is more than one address on the interface in the same subnet */
- complete_context(match.addr, iface_index, match.netmask, match.broadcast, &parm);
- }
--
-+
-+ if (!addrp)
-+ {
-+ my_syslog(MS_DHCP | LOG_WARNING, _("DHCP packet received on %s which has no address"), ifr.ifr_name);
-+ return;
-+ }
-+
- if (!iface_enumerate(AF_INET, &parm, complete_context))
- return;
-
generated by cgit v1.2.3 (git 2.46.0) at 2024-12-25 07:17:29 +0000