Commit graph

76 commits

Author SHA1 Message Date
Matthias Andree
9a892f00e3 Update to new upstream release candidate #5.
Switch IDN support from libidn to libidn2.
Drop patches integrated upstream.
2017-05-22 22:53:11 +00:00
Matthias Andree
9016fa489d Update to upstream release candidate #4, with two more fixes.
Additionally, zero out *addrp in edns0.c, and fix two typoes in
forward.c where && should be &. These fixes have all been reported
upstream.

Note that the build rig is currently not up to using I18N and IDN2, so
we forgo IDN2 for now. Also reported upstream.

Changelog since -test5:

1835343 (tag: v2.77rc4) Update German translation.
2aaea18 Add .gitattributes to substitute VERSION on export.
7ab78b9 (tag: v2.77rc3) Fix c7be0164ce6ae89d6f2f0ffea14e2612418dd5da
c7be016 (tag: v2.77rc2) Suppress DHCP ping checks when allocating on the loopback interface.
d203af4 Add optional support for libidn2 and therefore IDNA2008.
05f76da Don't die() on failing to parse lease-script output.
bf05f8f Fix crash introduced by 09f3b2cd9c7b5b5e0e96ba41f666e69808862620.
09f3b2c (tag: v2.77rc1) Fix case of DS queries to domains marked as not doing DNSSEC.
2282787 Fix botch introduced by 561441320f0cb67ea97f81c59332da5c6d14b494
4583dd9 Replace obsolete utime() usage with utimes().
5614413 Fix a couple of crashes on malformed config files.
b2a9c57 Add "known-othernet" DHCP tag.
2017-05-21 11:05:56 +00:00
Matthias Andree
0fc229aba6 Update to new upstream test release -test5.
Diff from upstream CHANGELOG:
+           Allow use of MAC addresses with --tftp-unique-root. Thanks
+           to Floris Bos for the patch.
+
+            Add --dhcp-reply-delay option. Thanks to Floris Bos
+           for the patch.
+
+            Add mtu setting facility to --ra-param. Thanks to David
+           Flamand for the patch.
+
+           Capture STDOUT and STDERR output from dhcp-script and log
+           it as part of the dnsmasq log stream. Makes life easier
+           for diagnosing unexpected problems in scripts.
+           Thanks to Petr Mensik for the patch.
+
+           Generate fatal errors when failing to parse the output
+           of the dhcp-script in "init" mode. Avoids strange errors
+            when the script accidentally emits error messages.
+           Thanks to Petr Mensik for the patch.
+
+            Make --rev-server for an RFC1918 subnet work even in the
+            presence of the --bogus-priv flag. Thanks to
+           Vladislav Grishenko for the patch.
+
+           Extend --ra-param mtu: field to allow an interface name.
+           This allows the MTU of a WAN interface to be advertised on
+           the internal interfaces of a router. Thanks to
+           Vladislav Grishenko for the patch.
+
+            Do ICMP-ping check for address-in-use for DHCPv4 when
+           the client specifies an address in DHCPDISCOVER, and when
+           an address in configured locally. Thanks to Alin Năstac
+           for spotting the problem.

This change was reverted:
-            Implement RFC 6842. Thanks to Reddeiah Raju Konduru for
-            pointing out that this was missing.

Reported by:	portscout
2017-05-04 22:50:30 +00:00
Matthias Andree
b945d9912f Update to -test4 release, forward port IPSET [1]
Changes since -test3 release (edited diff from CHANGELOG):
* Improve logging of upstream servers when there are a lot of "local
  addresses only" entries.
* Implement RFC 6842.
* Make --bogus-priv apply to IPv6, for the prefixes specified in RFC6303.

Forward port IPSET option from ../dnsmasq port, to permit build on
PF-less systems.

PR:		217900 [1]
Submitted by:	Oliver Pinter <oliver.pinter@hardenedbsd.org>
2017-03-21 22:50:44 +00:00
Matthias Andree
7cadc1bd22 Update to 2.77.test3.
Simon Kelley (2):
      Improve connection handling when talking to TCP upsteam servers.
      Add forthcoming 2017 root zone trust anchor to trust-anchors.conf.
2017-02-12 13:02:41 +00:00
Matthias Andree
29d2af5ad9 Update to new 2.77test2 release.
Changelog:	<http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=blob_plain;f=CHANGELOG;hb=68f6312d4bae30b78daafcd6f51dc441b8685b1e>

Use readelf instead of objdump, unbreaking arm64 build. [1]
Submitted by:	emaste@ [1]
Differential Revision:	https://reviews.freebsd.org/D7881 [1]
2017-02-09 00:22:14 +00:00
Matthias Andree
4e49fb17bb Mark port IGNORE. 2016-05-24 06:27:03 +00:00
Dmitry Marakasov
c86e9d9724 Remove NLS, DOCS, EXAMPLES and IPV6 from OPTIONS_DEFAULT, they are enabled by default anyway and don't need to be listed
Approved by:	portmgr blanket
2016-05-23 20:35:01 +00:00
Matthias Andree
6913e4789a Update to new upstream release candidate #2.
Changes in upstream Git between releases (git shortlog):
Sergey Nechaev (1):
      Stricter command line args validation to dhcp_release6.

Simon Kelley (4):
      Fix error in PXE arch names and add ARM32 and ARM64.
      Tweak CSAs affected by UEFI PXE workaround code.
      Tweak UEFI workaround code.
      Merge messages into translation files.

Upstream CHANGELOG diff since rc #1:
      Swap the values if BC_EFI and x86-64_EFI in --pxe-service.
      These were previously wrong due to an error in RFC 4578.
      If you're using BC_EFI to boot 64-bit EFI machines, you
      will need to update your config.

      Add ARM32_EFI and ARM64_EFI as valid architectures in
      --pxe-service.
2016-05-16 22:57:23 +00:00
Matthias Andree
c3fbb070d1 Update to release candidate #1.
Changes since test#13:
+           Move the dhcp_release and dhcp_lease_time tools from
+           contrib/wrt to contrib/lease-tools.
+
+           Add dhcp_release6 to contrib/lease-tools. Many thanks
+           to Sergey Nechaev for this code.
+
+           To avoid filling logs in configurations which define
+           many upstream nameservers, don't log more that 30 servers.
+           The number to be logged can be changed as SERVERS_LOGGED
+           in src/config.h.

Changelog since v2.75 at:
http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=blob_plain;f=CHANGELOG;hb=8628cd603fd0c55c7d41b84488446db44f58ff5b
2016-05-11 21:37:50 +00:00
Matthias Andree
cef01879da Update to new upstream test release ...test13.
Upstream's CHANGELOG since test12:
* Check return-code of inet_pton() when parsing dhcp-option.  Bad
  addresses could fail to generate errors and result in garbage
  dhcp-options being sent. Thanks to Marc Branchaud for spotting this.

* Fix wrong value for EDNS UDP packet size when using --servers-file to
  define upstream DNS servers. Thanks to Scott Bonar for the bug report.
2016-05-05 12:37:15 +00:00
Mathieu Arnold
4e1b79a0a6 Remove ${PORTSDIR}/ from dependencies, categories d, e, f, and g.
With hat:	portmgr
Sponsored by:	Absolight
2016-04-01 14:00:51 +00:00
Matthias Andree
65ddf807a8 New upstream test release #12.
Git shortlog since test release #10:

Simon Kelley (14):
      Add TTL parameter to --host-record and --cname.
      Add --dhcp-ttl option.
      Update CHANGELOG.
      Add --tftp-mtu option.
      Apply ceiling of lease length to TTL when --dhcp-ttl in use.
      Fix --add-subnet when returning empty or default subnet.
      Replace incoming EDNS0_OPTION_NOMDEVICEID and EDNS0_OPTION_NOMCPEID options.
      Fix typo in last commit.
      Check return code from open()
      format fix.
      Fix pointer declaration botch.
      Tidy parsing code.
      Fix broken DNSMASQ_USER<x> envvars in script with more than one class.
      Tighten syntax checking for dhcp-range and clarify man page.
2016-03-04 08:49:12 +00:00
Matthias Andree
72b091c005 Upgrade to -test10 release.
Upstream's CHANGELOG since -test8:
  Don't crash with divide-by-zero if an IPv6 dhcp-range is declared as a
  whole /64.  (ie xx::0 to xx::ffff:ffff:ffff:ffff)
  Thanks to Laurent Bendel for spotting this problem.
2016-02-19 08:54:49 +00:00
Matthias Andree
1865eecb1c Upgrade to upstream -test8 pre-release.
Changes per diff of the CHANGELOG file:

  Fix wrong answer to simple name query when --domain-needed set, but no
  upstream servers configured. Dnsmasq returned REFUSED, in this case,
  when it should be the same as when upstream servers are configured -
  NOERROR. Thanks to Allain Legacy for spotting the problem.

  Return REFUSED when running out of forwarding table slots, not SERVFAIL.

  Add --max-port configuration. Thanks to Hans Dedecker for the patch.

  Add --script-arp and two new functions for the dhcp-script.  These are
  "arp" and "arp-old" which announce the arrival and removal of entries
  in the ARP or nieghbour tables.

  Extend --add-mac to allow a new encoding of the MAC address as base64,
  by configurting --add-mac=base64

  Add --add-cpe-id option.
2016-02-17 08:12:11 +00:00
Johan van Selst
c590f0bad9 Bump versions to chase Nettle shared library update 2016-01-23 21:14:18 +00:00
Matthias Andree
fd90678072 Update to new test5 release.
Changes, taken from Git shortlog:

André Glüpker (1):
      Fix bad cache-size calculation when hosts-file read fails.

Simon Kelley (7):
      Handle building with script support enabled and DHCP disabled.
      Update copyright notices. Happy new year!
      Fix FTBFS when scripts excluded at compilation time.
      Inhibit DNSSEC validation when forwarding to private servers for a domain.
      DNSSEC: Handle non-root trust anchors, and check we have a root trust anchor.
      Disable DNSSEC for server=/domain/.. servers unless trust-anchor provided.
      arp.c tidy up.
2016-01-16 18:30:04 +00:00
Matthias Andree
fa37eb9813 Update to -test4 release.
Changelog: <http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=blob;f=CHANGELOG;h=93c73d01e19562d27d5c56a3a87c8211422f20a1;hb=d917275e481add809cd5c40650f339ae994ee35f#l1>
2016-01-04 19:02:23 +00:00
Matthias Andree
f0ff3d317c Quench unused-parameter warnings during build. 2015-12-29 11:14:59 +00:00
Matthias Andree
197e2ba892 Update to 2.76test1. 2015-12-21 23:22:35 +00:00
Matthias Andree
e614d8f474 Update to new release candidate #4 and mark IGNORE since 2.74 is out. 2015-07-30 18:47:52 +00:00
Matthias Andree
0634dfbcfc Update to new release candidate #3
DNSSEC fix, signed wildcard CNAME to unsigned domain.
      Update Polish translation.
2015-07-18 12:58:18 +00:00
Matthias Andree
c95b6b67fe Update to new upstream release candidate 2.74rc1.
To fix three regressions in 2.73:

1) The meaning of --conf-file without an argument changed from "don't
read any conf-file" to "read the default conf-file"

2) A resolv-file which was dangling symlink at startup causes
problems, up to and including a segmentation fault.

3) Under some circumstances, dnsmasq can use more file descriptors,
and this shows up that the code doesn't handle the limit (normally
1024) in the number of descriptors handled by the select() system call.
2015-07-15 00:57:19 +00:00
Matthias Andree
bc024d4800 Upgrade dnsmasq to new release 2.73.
Changelog: http://www.thekelleys.org.uk/dnsmasq/CHANGELOGDisable dnsmasq-devel (older than stable).
Switch to using @sample keyword [1].

PR:           200717 [1]
Submitted by: Jimmy Olgeni
2015-06-16 00:48:01 +00:00
Matthias Andree
c7bae50093 Update to new upstream release candidate #10.
Git shortlog since rc #9:

Neil Jerram (6):
      Fix logging of unknown interface in --bridge-interface, DHPCv4.
      Extend --bridge-interface aliasing to DHCPv6.
      Allow router advertisements to have the "off-link" bit set.
      Upply --bridge-interface aliasing to solicited router advertisements.
      Apply --bridge-interfaces to unsolicited router advertisements.
      Documenation updates for --bridge-interface and "off-link".

Nicolas Cavallari (1):
      Add Dbus methods to create and delete DHCP leases.

Simon Kelley (2):
      Add a couple of missed logging strings to the catalogue.
      Merge messages and fix makefile process to do this.
2015-06-12 06:17:43 +00:00
Matthias Andree
5f61df7059 Update to new release candidate -rc9.
Relevant Git shortlog excerpt since -rc8:

Christian Demsar (1):
      Man page typo.

John Hanks (1):
      Add infiniband to example config file.

Simon Kelley (8):
      Remove support for DNS Extended Label Types.
      Select correct DHCP context when in PXE bootserver mode.
      DHCPv6: DHCPCONFIRM should be OK for any address on link, not just dynamic addresses.
      Handle corner cases in NSEC coverage checks.

swigger (1):
      Correctly sanitise DNS header bits in answer when recreating query for retry.
2015-06-10 17:36:16 +00:00
Matthias Andree
919a8134f0 Upgrade to new release candidate #8, fixing buffer overflow since rc6. [1]
Add CPE information [2].

Extract from shortlog, omitting irrelevant entries:

Nicolas Cavallari (1):
      Constify some DHCP lease management functions.

Simon Kelley (10):
      Don't remove RRSIG RR from answers to ANY queries when the do bit is not set.
      Handle UDP packet loss when fragmentation of large packets is broken.
      Check IPv4-mapped IPv6 addresses with --stop-rebind.
      Tweak EDNS timeout code.
      Pointer to mail-archive mailing list mirror in doc.html.
      Allow T1 and T2 DHCPv4 options to be set.
      Use correct DHCP context for PXE-proxy server-id.
      Fix buffer overflow introduced in 2.73rc6.

PR:		199955 [2]
Submitted by:	shun, amdmi3 [2]
Reviewed by:	amdmi3 [2]
Security:	7927165a-0126-11e5-9d98-080027ef73ec
2015-05-23 08:45:02 +00:00
Matthias Andree
16ed4b7452 Upgrade to release candidate #7.
Git shortlog:
Johnny S. Lee (1):
      Make get-version work when repo is a git submodule.

Simon Kelley (2):
      Logs in DHCPv6 not suppressed by dhcp6-quiet.
      Fix argument-order botch which broke DNSSEC for TCP queries.
2015-05-03 02:47:10 +00:00
Matthias Andree
0d057249e8 Update to new release candidate #6.
Git shortlog since release candidate #4:

Moshe Levi (1):
      Check IP address command line arg in dhcp_release.c

Simon Kelley (7):
      Fix crash in auth code with odd configuration.
      Auth: correct replies to NS and SOA in .arpa zones.
      Note CVE-2015-3294
      Log domain when reporting DNSSEC validation failure.
      Revert 61b838dd574c51d96fef100285a0d225824534f9 and just quieten log inste
      Handle domain names with '.' or /000 within labels.
      Tweaks to previous, DNS label charset commit.

Stefan Tomanek (1):
      Fix (srk induced) crash in new tftp_no_fail code.
2015-04-22 22:25:44 +00:00
Matthias Andree
8fdb54ab44 Upgrade to new release candidate #4.
Resolves checksum trouble.
Git shortlog between rc#3 and rc#4:

Simon Kelley (4):
      Return INSECURE, rather than BOGUS when DS proved not to exist.
      Fix compiler warning when not including DNSSEC.
      Fix crash caused by looking up servers.bind when many servers defined.
      Fix crash on receipt of certain malformed DNS requests.

Stefan Tomanek (2):
      add --tftp-no-fail to ignore missing tftp root
2015-04-12 11:15:49 +00:00
Baptiste Daroussin
a9a4b8f402 Mark as broken unfetchable ports 2015-04-05 20:50:42 +00:00
Matthias Andree
2fba1cb34d Upgrade to new release candidate #3 (skipping rc2).
Changes since rc1 (git shortlog):

 +    Don't fail DNSSEC when a signed CNAME dangles into an unsigned zone.
 +    Return SERVFAIL when validation abandoned.
 +    Protect against broken DNSSEC upstreams.
 +    DNSSEC fix for non-ascii characters in labels.
 +    Allow control characters in names in the cache, handle when logging.
2015-03-31 21:05:22 +00:00
Matthias Andree
7fbec003ad Update to upstream 2.73rc1 (pending rc2 upload)
Changes from previous 2.73test6 (taken from CHANGELOG's Git repo):

           Don't reply to DHCPv6 SOLICIT messages if we're not
           configured to do stateful DHCPv6. Thanks to Win King Wan
           for the patch.

           Fix broken DNSSEC validation of ECDSA signatures.

           Add --dnssec-timestamp option, which provides an automatic
           way to detect when the system time becomes valid after boot
           on systems without an RTC, whilst allowing DNS queries before the
           clock is valid so that NTP can run. Thanks to
           Kevin Darbyshire-Bryant for developing this idea.
2015-03-30 17:39:50 +00:00
Matthias Andree
83f8dd7bc1 Update to new 2.73test6 pre-release
Changes since test3, from CHANGELOG file:

           Add --log-queries=extra option, which makes logs easier
           to search automatically.

           Add --min-cache-ttl option. I've resisted this for a long
           time, on the grounds that disbelieving TTLs is never a
           good idea, but I've been persuaded that there are
           sometimes reasons to do it. (Step forward, GFW).
           To avoid misuse, there's a hard limit on the TTL
           floor of one hour. Thansk to RinSatsuki for the patch.

           Cope with multiple interfaces with the same link-local
           address. (IPv6 addresses are scoped, so this is allowed.)
           Thanks to Cory Benfield for help with this.

           Add --dhcp-hostsdir. This allows addition of new host
           configurations to a running dnsmasq instance much more
           cheaply than having dnsmasq re-read all its existing
           configuration each time.
2015-01-22 22:48:56 +00:00
Matthias Andree
d78e5a106c Update to new test release.
Changes: the two items at the end of v2.73 here:
<http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=blob;f=CHANGELOG;h=e8bf80f81baac3366dfecbdb6e80c4102fb21574;hb=424c4a8a53c8aa5d6ac899c95803b97410abec8f#l26>
2015-01-09 16:41:32 +00:00
Matthias Andree
b9350fe243 Package 2.73test2, with one additional patch to make it build
(also reported upstream).

CHANGELOG at:
<http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=blob_plain;f=CHANGELOG;hb=fbc5205702c7f6f431d9f1043c553d7fb62ddfdb>
2014-12-23 23:04:34 +00:00
Matthias Andree
f51674ab77 Update to new upstream version 2.72, disabling dnsmasq-devel again.
Remove @dir* stuff from pkg-plist.  @sample isn't documented properly
and isn't up to handling files with non-.sample suffix, so stay
away from that part of pkg-plist.

ChangeLog:	http://www.thekelleys.org.uk/dnsmasq/CHANGELOG
2014-09-25 18:27:56 +00:00
Matthias Andree
2bc0294b58 Upgrade to 2.72rc2.
+ Fix bug when resulted in NXDOMAIN answers instead of NODATA in some
  circumstances.
+ Fix bug which caused dnsmasq to become unresponsive if it failed to
  send packets due to a network interface disappearing.
+ Fix problem with --local-service option on big-endian platforms.
2014-09-20 22:24:59 +00:00
Matthias Andree
a853833cf3 Forward port dnsmasq changes from previous versions, to update the port and fix 10/11 build issues. 2014-09-10 21:12:08 +00:00
Matthias Andree
5ee8785640 Update to 2.72rc1.
Announcement with ChangeLog:
http://lists.thekelleys.org.uk/pipermail/dnsmasq-discuss/2014q3/008793.html

Submitted by:	portscout
2014-09-10 15:47:57 +00:00
Tijl Coosemans
f1655c7b7a dns/libidn:
- Add USES=libtool and bump dependent ports
- Add INSTALL_TARGET=install-strip
- Always install libidn-components.png because it is used by libidn.info
- Add -lintl to Libs.private instead of Libs in libidn.pc
2014-08-30 18:18:14 +00:00
Adam Weinberger
123723612f Add DOCS to OPTIONS_DEFINE to ports that check for PORT_OPTIONS:MDOCS. 2014-07-15 15:09:58 +00:00
Baptiste Daroussin
fcc4bbdec1 Switch to use lua 5.2 2014-04-21 21:56:54 +00:00
Matthias Andree
f7b5eecf90 Ignore this port while the release is newer than the candidates. 2014-04-10 20:45:04 +00:00
Matthias Andree
dbeab6dea0 Upgrade to new upstream release candidate #rc4.
Fixes ipset logging patch.

Known issue: The executable identifies as #rc3.
2014-03-31 20:19:29 +00:00
Matthias Andree
0febb81409 Update to new upstream release candidate #2.
Git shortlog between 2.69 rc1 and rc2:

Simon Kelley (7):
      Add dnssec-check-unsigned to example config file.
      Reorder sanity checks on UDP packet reception, to cope with failed recvfro
      SERVFAIL is an expected error return, don't try all servers.
      Terminate DS-search when reaching the root via cache entries.
      Cache stats availble in CHAOS .bind domain.
      Ensure ->sentto is valid for DNSSEC forwards. Otherwise retries SEGV.
      Add --dnssec-no-timecheck

Tomas Hozza (2):
      Memory leak in error path.
      Handle failure of hash_questions()

Wang Jian (1):
      Log IPSET actions.
2014-03-30 00:42:43 +00:00
Matthias Andree
b9207f1d4f Upgrade to release candidate #1. 2014-03-22 22:06:07 +00:00
Matthias Andree
ae7708b169 Upgrade to new upstream test release #11.
Git shortlog since test release #9:

      Speeling.
      Strip DNSSEC RRs when query doesn't have DO bit set.
      Return INSECURE when validation fails with proved non-existent DS.
      Negative caching for DS records.
      Check that unsigned replies come from unsigned zones if --dnssec-check-uns
      Tidy.
      Fix off-by-one overwrite.
      Don't free blockdata for negative DS cache entries.
      Handle replies with no answers and no NS in validate_reply.
      Tweak tuning params.
      Don't cache secure replies which we've messsed with.
      Mass edit of INSECURE->BOGUS returns for server failure/bad input.
      Can have local DS records (trust anchors).
2014-03-10 17:01:14 +00:00
Matthias Andree
d230d75106 Update to new test9 release.
Relevant excerpt from git shortlog between test8 and test9:

      Add RFC-6605 ECDSA DNSSEC verification.
      Don't mess with the TTL of DNSSEC RRs.
      No CD in forwarded queries unless dnssec-debug for TCP too.
      Log BOGUS validation result when upstream sends SERVFAIL.
      --rev-server option. Syntactic sugar for PTR queries.
      Omit ECC from DNSSEC if nettle library is old.
      Add --servers-file option.
      NSEC3 validation. First pass.
      Check signer name in RRSIGs.
      An NSEC record cannot attest to its own non-existance!
2014-02-27 22:55:27 +00:00
Matthias Andree
b49cb6994c Upgrade to test8 release, bringing these upstream fixes:
ee41586 Use DS records as trust anchors, not DNSKEYs.
83349b8 Further tidying of AD and DO bit handling.
7fa836e Handle validation when more one key is needed.
1633e30 Fix Byte-order botch: broke DNSSEC on big-endian platforms.
c8ca33f Fix DNSSEC caching problems: incomplete RRSIG RRsets.
e243c07 AD bit in queries handled as RFC6840 p5.7
2014-02-12 21:12:37 +00:00