Mark Drobnak 5ac423e353 Merge pull request #502 from pi-hole/release/v4.2.1 ...

Update development with hotfix v4.2.1

2019-02-06 22:48:29 -05:00

..

arp.c

Apply dnsmasq patch v2.78 -> v2.79

2018-03-18 19:47:22 +01:00

auth.c

Upgrade internal dnsmasq from v2.79 to v2.80

2018-10-22 21:35:16 +02:00

blockdata.c

Apply dnsmasq patch v2.78 -> v2.79

2018-03-18 19:47:22 +01:00

bpf.c

Upgrade internal dnsmasq from v2.79 to v2.80

2018-10-22 21:35:16 +02:00

cache.c

Merge branch 'release/4.1' into dnsmasq/v2.80

2018-11-10 21:24:41 +01:00

config.h

Clarify that the last commit was a Pi-hole specific modification

2019-02-05 19:51:19 +01:00

conntrack.c

Apply dnsmasq patch v2.78 -> v2.79

2018-03-18 19:47:22 +01:00

COPYING-v3

Initial commit for FTLDNS

2018-02-22 20:21:06 +01:00

crypto.c

Apply dnsmasq patch v2.78 -> v2.79

2018-03-18 19:47:22 +01:00

dbus.c

Upgrade internal dnsmasq from v2.79 to v2.80

2018-10-22 21:35:16 +02:00

dhcp6-protocol.h

Apply dnsmasq patch v2.78 -> v2.79

2018-03-18 19:47:22 +01:00

dhcp6.c

Fix failed merge conflict resolution when adding dnsmasq v2.80

2019-01-27 10:11:13 +01:00

dhcp-common.c

Upgrade internal dnsmasq from v2.79 to v2.80

2018-10-22 21:35:16 +02:00

dhcp-protocol.h

Upgrade internal dnsmasq from v2.79 to v2.80

2018-10-22 21:35:16 +02:00

dhcp.c

Upgrade internal dnsmasq from v2.79 to v2.80

2018-10-22 21:35:16 +02:00

dns-protocol.h

Upgrade internal dnsmasq from v2.79 to v2.80

2018-10-22 21:35:16 +02:00

dnsmasq.c

Upgrade internal dnsmasq from v2.79 to v2.80

2018-10-22 21:35:16 +02:00

dnsmasq.h

Merge branch 'release/4.1' into dnsmasq/v2.80

2018-11-10 21:24:41 +01:00

dnssec.c

Upgrade internal dnsmasq from v2.79 to v2.80

2018-10-22 21:35:16 +02:00

domain.c

Apply dnsmasq patch v2.78 -> v2.79

2018-03-18 19:47:22 +01:00

dump.c

Add new dnsmasq objects to tree

2018-10-22 22:49:36 +02:00

edns0.c

Apply dnsmasq patch v2.78 -> v2.79

2018-03-18 19:47:22 +01:00

forward.c

Bump shm version to version 2

2019-01-31 17:46:54 +01:00

helper.c

Apply dnsmasq patch v2.78 -> v2.79

2018-03-18 19:47:22 +01:00

inotify.c

Fix failed merge conflict resolution when adding dnsmasq v2.80

2019-01-27 10:11:13 +01:00

ip6addr.h

Apply dnsmasq patch v2.78 -> v2.79

2018-03-18 19:47:22 +01:00

ipset.c

Initial commit for FTLDNS

2018-02-22 20:21:06 +01:00

lease.c

Upgrade internal dnsmasq from v2.79 to v2.80

2018-10-22 21:35:16 +02:00

log.c

Upgrade internal dnsmasq from v2.79 to v2.80

2018-10-22 21:35:16 +02:00

loop.c

Apply dnsmasq patch v2.78 -> v2.79

2018-03-18 19:47:22 +01:00

metrics.c

Add new dnsmasq objects to tree

2018-10-22 22:49:36 +02:00

metrics.h

Add new dnsmasq objects to tree

2018-10-22 22:49:36 +02:00

netlink.c

Upgrade internal dnsmasq from v2.79 to v2.80

2018-10-22 21:35:16 +02:00

network.c

Fix failed merge conflict resolution when adding dnsmasq v2.80

2019-01-27 10:11:13 +01:00

option.c

Merge branch 'release/4.1' into dnsmasq/v2.80

2018-11-10 21:24:41 +01:00

outpacket.c

Apply dnsmasq patch v2.78 -> v2.79

2018-03-18 19:47:22 +01:00

poll.c

Apply dnsmasq patch v2.78 -> v2.79

2018-03-18 19:47:22 +01:00

radv-protocol.h

Apply dnsmasq patch v2.78 -> v2.79

2018-03-18 19:47:22 +01:00

radv.c

Apply dnsmasq patch v2.78 -> v2.79

2018-03-18 19:47:22 +01:00

rfc1035.c

Re-add source record passing to subroutines. This is a new bug that came up when merging dnsmasq v2.80 in #480

2019-02-05 06:08:03 +01:00

rfc2131.c

Upgrade internal dnsmasq from v2.79 to v2.80

2018-10-22 21:35:16 +02:00

rfc3315.c

Correct struct in6_addr pointer/variables

2018-10-25 20:52:27 +02:00

rrfilter.c

Apply dnsmasq patch v2.78 -> v2.79

2018-03-18 19:47:22 +01:00

slaac.c

Upgrade internal dnsmasq from v2.79 to v2.80

2018-10-22 21:35:16 +02:00

tables.c

Initial commit for FTLDNS

2018-02-22 20:21:06 +01:00

tftp.c

Upgrade internal dnsmasq from v2.79 to v2.80

2018-10-22 21:35:16 +02:00

ubus.c

Add new dnsmasq objects to tree

2018-10-22 22:49:36 +02:00

util.c

Fix failed merge conflict resolution when adding dnsmasq v2.80

2019-01-27 10:11:13 +01:00