Update to avrdude 6.4

Version 6.4:

  * Major changes compared to the previous version:

    - libhidapi support (part of patch #8717)
    - use libhidapi as (optional) transport for CMSIS-DAP compliant
      debuggers (JTAGICE3 with firmware 3+, AtmelICE, EDBG, mEDBG)
    - UPDI support added (AVR8X family)
    - TPI support for USBtinyISP
    - TPI support for ft245r
    - TPI support for linuxgpio
    - AVR Doper uses libhidapi rather than raw libusb (patch #9033)
    - -P net:host:port can use IPv6 now (Posix systems only)
    - New configure option: -disable-libusb_1_0
    - extended UPDI device context (> 64 Ki flash)
    - major overhaul of ft245r driver (patch #9327/#9328)
    - some improvements in linuxspi driver
    - Use -B <bitclock> rather than -b <baudrate> for linuxspi driver
    - unused lock byte bits are not masked on read anymore
    - parport support disabled by default; configure with
      --enable-parport to explicitly enable it

  * New devices supported:

    - ATmega328PB
    - AVR8X family, ATtiny1617, ATtiny817, ATtiny202, ATtiny204,
      ATtiny402, ATtiny404, ATtiny406, ATtiny804, ATtiny806,
      ATtiny807, ATtiny1604, ATtiny1606, ATtiny1607, ATtiny212,
      ATtiny214, ATtiny412, ATTiny414, ATtiny416, ATtiny417,
      ATtiny814, ATtiny816, ATtiny1614, ATtiny1616, ATtiny3214,
      ATtiny3216, ATtiny3217, ATmega3208, ATmega3209, ATmega4808,
      ATmega4809
    - ATtiny841, ATtiny441
    - ATmega64M1
    - ATmega324A
    - ATmega808, ATmega809, ATmega1608, ATmega1609, AVR DA, AVR DB
    - LGT8FX88P, LGT8FX168P, LGT8FX328P
    - ATmega324PB
    - ATmega8A

  * New programmers supported:

    - ehajo-isp (commercial version of USBtiny)
    - XplainedPro in UPDI mode
    - XplainedMini in UPDI mode
    - JTAGICE3 in UPDI mode
    - Atmel Powerdebugger in all modes (JTAG, PDI, UPDI, debugWIRE, ISP)
    - linuxspi (direct SPI bus e.g. on Raspberry Pi devices)
    - PICkit4, Snap, PKoB
    - iseavrprog
    - XBeeBoot

  * Bugfixes:
    bug #47550: Linux GPIO broken
    bug #47718: "lfuse reads as" not displayed in verbose mode - SOLUTION
    bug #48084: Avoid compiled-in timestamp for reproducible release builds
    bug #47376: ATtiny841 description missing in configuration file
    bug #49455: support for tiny441
    bug #57428: document when 'arduino' or 'wiring' should be used, and -D requirement of latter
    bug #58095: error setting efuse on atmega328pb variant
    bug #51409: Can't program EFUSE on ATmega32M1
    bug #60753: Patch #1436 breaks multiple programmer/device combinations on MacOS BigSur
    bug #59525: Bogus error message because Copy/Paste typo in stk500.c
    bug #58078: [PATCH] buspirate: remove compound literals (fixes GCC>=9)
    bug #57453: [PATCH] fix reference to nonexistant -m option by changing to -U
    bug #59227: Add new part. How does one get a part added to the CONF file?
    bug #55009: no efuses for m164a/pa
    bug #55734: USBtiny programming of ATmega328p broken by Patch #9278
    bug #58495: Add atmega324pb support to avrdude.conf.in
    bug #60863: avrftdi programming error probably caused by multiple, consecutive empty pages
    bug #50517: Reading fails if "immediate mode" for output file format is selected - fileio: invalid operation=1
    bug #50630: Erase Cycle Counter options ( -y -Y n ) should be removed from usage Message
    bug #48767: ser_drain() for TCP on Windows doesn't work
    bug #46759: avrdude 6.1 -> 6.2 regression: lock byte verification error
    bug #58440: linuxgpio PIN limit too low
    bug #55462: wrong programmer id check in jtag3_getsync() and jtag3_close()
    bug #58994: VPP PWM still enabled at the end of programming process
    bug #57338: if safemode has to change fuses avrdude should exit with non-zero exit code
    bug #60575: Permission denied on macOS Big Sur

  * Patches:
    patch #9482: Add support for UPDI and AVR8X
    patch #9508: Add PowerDebugger and XPlained Mini in UPDI mode
    patch #9507: Fix UPDI chip erase
    patch #9506: Script to create device configuration stub from Atmel
                 ATDF files
    patch #9423: Support ATtiny841 and ATtiny441
    patch #9530: Update URL to Ladyada's USBtinyISP page.
    patch #9317: Support atmega64m1 as part
    patch #9222: Enable silent build
    patch #8924: Enable TPI for usbtiny
    patch #9033: avrdoper backend uses libhidapi instead of libusb
    patch #8580: FT245r support to select device by serial number
    patch #8910: ATxmega32c4 and ATxmega16c4 have wrong signatures
    patch #8219: Fix boot_start for xmega devices on jtagmkII
    patch #9185: Add extended_param to usbasp.c - erasing
    patch #8311: Add IPv6 support to the -Pnet:host:port option
    patch #9542: Correct "usersig" on avr8x devices
    patch #8128: Added new option to configure.ac script
    patch #8444: Proposal for modifications in -B and -U command options managment (partially)
    patch #9735: spelling error fix: psuedo -> pseudo
    patch #9893: [PATCH] Reader reads ftdi handle after main thread close it
    patch #9819: Address several leaks in SVN rev 1429
    patch #9820: Fix some out-of-bounds/uninitialized issues
    patch #9818: correct typos in SVN rev 1429
    patch #9732: usbtiny_paged_load overflows buffer e.g. when reading EEPROM
    patch #9966: Add JTAGICE3 in UPDI mode
    patch #9963: UsbAsp 3 MHz patch for UsbAsp-flash firmware
    patch #9816: Implement new programmer type: linuxspi
    patch #9811: ATmega328pb has efuse bit 3
    patch #9744: Patch for ATMega324A support
    patch #10000: Add support for extended UPDI device context
    patch #9697: Add iseavrprog support
    patch #10017: uspasp / tpi: Automatically clear configuration byte (fuse) before writing it
    patch #8957: Allow reading prodsig memory from stk500v2 on xmega devices
    patch #9110: Let reserved fuse bits to be read as *don't care*
    patch #9253: Fix for giving terminal_mode commands more than 20 arguments
    patch #9320: fix TPI RESET in bitbang.c
    patch #9079: Fix ftdi_syncbb teardown (supersedes #9893, superseded by #9328)
    patch #9122: Fixed MISO sampling in ftdi_syncbb
    patch #9123: ftdi_syncbb: use FT245R_CYCLES in ft245r_set_bitclock()
    patch #8719: Support Over-the-Air bootloading with XBeeBoot
    patch #9757: Fix ATtiny817 Xplained Mini programmer
    patch #9327: ft245r.c: add TPI support (patches 1-4)
    patch #9328: ft245r.c: add TPI support (patches 5-7)
    patch #10027: linuxspi: Add reset pulse, according to AVR programming algorithm
    patch #10028: linuxspi: close() only when necessary
    patch #10029: linuxspi: Report GPIO_GET_LINEHANDLE_IOCTL errors
    patch #10030: linuxspi: Support inverted GPIO pin
    patch #10031: linuxspi: Support GPIO uAPI v2
    (no-id): Improve documentation of linuxspi driver, provide portname default
    (no-id): Use -B <bitclock> rather than -b <baudrate> for linuxspi driver
    patch #9304: [Bug #48767] Implemented WinSock variation of "ser_drain(...)" functionality
    patch #8996: Remove lock byte read mask (bug#21954, bug#46759)
    patch #8923: Enable TPI for linuxgpio
    patch #10153: linuxspi: Support "-E reset" and "-E noreset"

  * Internals:
    - New avrdude.conf keyword "family_id", used to verify SIB attributes
      on AVR8X architecture if device is locked.

3 files changed, 10 insertions, 22 deletions

diff --git a/cross/avrdude/Makefile b/cross/avrdude/Makefile
index 7bb0c7f31e6..0dbd0db170f 100644
--- a/cross/avrdude/Makefile
+++ b/cross/avrdude/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.49 2020/08/02 21:22:29 tnn Exp $
+# $NetBSD: Makefile,v 1.50 2021/12/29 23:03:21 dsainty Exp $
 
-DISTNAME=		avrdude-6.3
-PKGREVISION=		2
+DISTNAME=		avrdude-6.4
 CATEGORIES=		cross
 MASTER_SITES=		http://download.savannah.gnu.org/releases/avrdude/
 
diff --git a/cross/avrdude/distinfo b/cross/avrdude/distinfo
index 4b6a8cfd242..580852a78f2 100644
--- a/cross/avrdude/distinfo
+++ b/cross/avrdude/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.16 2021/10/26 10:07:51 nia Exp $
+$NetBSD: distinfo,v 1.17 2021/12/29 23:03:21 dsainty Exp $
 
-BLAKE2s (avrdude-6.3.tar.gz) = d9733f1e17fc0c8bcbea4852a391dc850d87d3d7b966d85f51abc2d48b4be1cb
-SHA512 (avrdude-6.3.tar.gz) = b671008388d6a552e71066fec46429bc7f6639e8eac41113bcbba5a56212b78be31fcf04956b31e11c6b14888b0f6e825f7458395b9ff4fc28406074c7ded2b2
-Size (avrdude-6.3.tar.gz) = 909744 bytes
+BLAKE2s (avrdude-6.4.tar.gz) = 78159892e27c160f5f4993b191a2f29fb0b023dae07c6599df2b8ee5ae5cd5f7
+SHA512 (avrdude-6.4.tar.gz) = ce6127c212a83c5079d3bd80a7a0127220f9652201595a24b991916556eb8fc69d2910f7e112d7025a5aeec8d341e72293467ac1dc1a62be1f391dd9408f9a06
+Size (avrdude-6.4.tar.gz) = 986871 bytes
 SHA1 (patch-aa) = 619f682af2e8eff36684993b331ba37cd1b446b6
 SHA1 (patch-ab) = a9105ae562c078eec5c87df6e7f27a80184bb6d4
 SHA1 (patch-ac) = df871808200e5732f77d50ef2d7fb51234173445
 SHA1 (patch-ad) = f9e7465b355f5b3feda8868287d6aaa5cd1dcd28
-SHA1 (patch-ae) = 8268734c36c02dfded64addba99e542747e746c7
+SHA1 (patch-ae) = 204f628bf5a67a9f48f01330fb7f43d4f6037a22
 SHA1 (patch-af) = 4ae54ce739ff41964fe56bc1b3e85611288a6e0c
 SHA1 (patch-ag) = fa8828a50faa835fa957de036af925dafd5584cb
diff --git a/cross/avrdude/patches/patch-ae b/cross/avrdude/patches/patch-ae
index 80461475149..ed83e9e5690 100644
--- a/cross/avrdude/patches/patch-ae
+++ b/cross/avrdude/patches/patch-ae
@@ -1,12 +1,9 @@
-$NetBSD: patch-ae,v 1.9 2017/01/29 02:24:54 mef Exp $
+$NetBSD: patch-ae,v 1.10 2021/12/29 23:03:21 dsainty Exp $
 
 - ERROR: [check-portability.awk] => Found test ... == ...:
 
 - automake-1.13 compat.
 
-- add missing AM_PROG_CC_C_O that automake wants for the yacc
-  sources.
-
 - allow a different default serial/parallel port to be specified
   which is useful for pkgsrc (since we have defaults for various
   platforms available and they're not the same for different
@@ -14,7 +11,7 @@ $NetBSD: patch-ae,v 1.9 2017/01/29 02:24:54 mef Exp $
 
 --- configure.ac.orig	2016-02-17 06:29:19.000000000 +0900
 +++ configure.ac	2017-01-29 11:15:27.000000000 +0900
-@@ -49,7 +49,7 @@ AC_PROG_AR
+@@ -51,7 +51,7 @@ AC_PROG_AR
  AH_TEMPLATE([HAVE_YYLEX_DESTROY],
              [Define if lex/flex has yylex_destroy])
  # flex should have this
@@ -23,15 +20,7 @@ $NetBSD: patch-ae,v 1.9 2017/01/29 02:24:54 mef Exp $
     AC_MSG_CHECKING([whether yylex_destroy is generated by flex])
     flex_version=`$LEX -V -v --version 2>/dev/null | $SED -e 's/^.* //'`
     case $flex_version in
-@@ -189,6 +189,7 @@ AC_CHECK_HEADERS([ddk/hidsdi.h],,,[#incl
- 
- # Checks for typedefs, structures, and compiler characteristics.
- AC_C_CONST
-+AM_PROG_CC_C_O
- AC_HEADER_TIME
- 
- # WinSock2
-@@ -318,32 +319,44 @@ AC_SUBST(DIST_SUBDIRS_AC, $DIST_SUBDIRS_
+@@ -365,32 +365,44 @@ AC_SUBST(DIST_SUBDIRS_AC, $DIST_SUBDIRS_
  # If a system doesn't have a PC style parallel, mark it as unknown.
  case $target in
  	i[[3456]]86-*-linux*|x86_64-*-linux*)