Merge branch 'legacy_64' (6.4.0 release) into legacy_6x:

* legacy_64:
  Update website after 6.4.0 release.
  Prepare for 6.4.0 release.
  env.c: make FETCHMAILHOME (fmhome) absolute.
  socket.c: Make SockKeepalive static, and readability variable renames.
  Decode .po's author name to locale according to Content-Type header.
  Update <ca> Catalan translation to fetchmail 6.4.0.rc4
  Update <vi> Vietnamese translation to fetchmail 6.4.0.rc4
  Update <sv> Swedish translation to fetchmail 6.4.0.rc4
  Update <pl> Polish translation to fetchmail 6.4.0.rc4
  Update <ja> Japanese translation to fetchmail 6.4.0.rc4
  Update <fr> French translation to fetchmail-6.4.0.rc4
  Update <cs> Czech translation to fetchmail 6.4.0.rc4
  website/host-scripts/: Waive local mirror for now.
  website/: Update for -rc4, update links, and remove dead references.
  Add two translations.
  Bump version to -rc4.
  po/: Commit new line numbers.
  dist-tools/git-commit-po-updates.sh updates
  Update <eo> Esperanto translation to fetchmail 6.4.0.rc3
  fr.po: Translate two new messages.
  Update <fr> French translation to fetchmail-6.4.0.rc3
  Upated header for sq.po
  Refer to PO checkin helper.
  Update <vi> Vietnamese translation to fetchmail-6.4.0.rc3
  Update <sv> Swedish translation to fetchmail 6.4.0.rc3
  Update <cs> Czech translation to fetchmail 6.4.0.rc3
  Helper script to commit PO updates to Git.

diff --cc Makefile.am
Simple merge

diff --cc NEWS
index b05a2c7d41e7d834c65a6cd1902d0cf519aae008,6108e139929bf517b5ee333ff91020455c7f48da..d9c45d85a9c848daaf348798a6740fb83ebb851e
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -60,34 -63,7 +60,34 @@@ removed from a 6.6.0 or newer release.
  
  --------------------------------------------------------------------------------
  
- fetchmail-6.4.0 (not yet released):
 +fetchmail-6.5.0 (not yet released):
 +
 +## REMOVED FEATURES
 +* fetchmail no longer supports using an MDA as SMTP fallback. This
 +  is required to make deliveries consistent.  The --enable-fallback configure
 +  option is gone.
 +
 +## CHANGED REQUIREMENTS
 +* fetchmail 6.5.0 is written in C99 and requires a SUSv3 (Single Unix
 +  Specification v3, a superset of POSIX.1-2001 aka. IEEE Std 1003.1-2001 with
 +  XSI extension) compliant system.
 +
 +  In particular, older fetchmail versions had workarounds or replacement code
 +  for several functions standardized in the Single Unix Specification v3, these 
 +  have been removed.
 +
 +  The trio/ library has been removed from the distribution.
 +  The libesmtp/getaddrinfo.? library has been removed from the distribution.
 +  The KAME/getnameinfo.c file has been removed from the distribution.
 +
 +## BUG FIXES
 +* fetchmail can now report mailbox sizes of 2^31 octets and beyond.
 +  This requires C99 support (for the long long type).
 +  Fixes Debian Bug#873668, reported by Andreas Schmidt.
 +
 +--------------------------------------------------------------------------------
 +
+ fetchmail-6.4.0 (released 2019-09-27, 27429 LoC):
  
  # NOTE THAT FETCHMAIL IS NO LONGER PUBLISHED THROUGH IBIBLIO.
  * They have stopped accepting submissions and consider themselves an archive.

diff --cc README
Simple merge

diff --cc configure.ac
index c3694b48ac90f7eea71d94fdce267c5d5b132a33,c72331051a9fcc28ed32002b55639f20ff4e04b2..db922b3ad05a230f7c31ee821336a2a0b4839d9d
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -9,7 -9,7 +9,7 @@@ dnl Process this file with autoconf to 
  dnl
  
  dnl XXX - if bumping version here, check fetchmail.man, too!
- AC_INIT([fetchmail],[6.5.0.dev201908],[fetchmail-users@lists.sourceforge.net])
 -AC_INIT([fetchmail],[6.4.0],[fetchmail-users@lists.sourceforge.net])
++AC_INIT([fetchmail],[6.5.0.dev201909],[fetchmail-devel@lists.sourceforge.net])
  AC_CONFIG_SRCDIR([fetchmail.h])
  AC_CONFIG_HEADERS([config.h])
  AC_CONFIG_LIBOBJ_DIR([.])

diff --cc env.c
index cdc16ab47cd578934dd656311784333fdc1da440,06cfcb38014b1b000d04f0759a46502dfaf7703d..ceb1ffd39d599055aae55daf1d93aa04052fe75f
--- 1/env.c
--- 2/env.c
+++ b/env.c
@@@ -17,12 -19,22 +17,13 @@@
  #include <netdb.h>
  #include <sys/types.h>
  #include <sys/socket.h>
 -#include "fetchmail.h"
 -#include "getaddrinfo.h"
  
  #include "i18n.h"
 -#if defined(HAVE_SETLOCALE) && defined(ENABLE_NLS) && defined(HAVE_STRFTIME)
 +#if defined(ENABLE_NLS)
  #include <locale.h>
  #endif
+ #include <limits.h>
  
 -#ifndef HAVE_DECL_GETENV
 -extern char *getenv(const char *);    /* needed on sysV68 R3V7.1. */
 -#endif
 -
  void envquery(int argc, char **argv)
  /* set up basic stuff from the environment (including the rc file name) */
  {

diff --cc socket.c
index 29f62994a44b95d5dd5871199443aee3975df413,c034f393054e38fc343dfafdccc59a8803306a87..3b852d6c05f46860ef331943416917fc9653f9c4
--- 1/socket.c
--- 2/socket.c
+++ b/socket.c
@@@ -170,9 -204,10 +170,9 @@@ static int handle_plugin(const char *ho
      (void) close(fds[0]);
      return fds[1];
  }
 -#endif /* HAVE_SOCKETPAIR */
  
  /** Set socket to SO_KEEPALIVE. \return 0 for success. */
- int SockKeepalive(int sock) {
+ static int SockKeepalive(int sock) {
      int keepalive = 1;
      return setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE, &keepalive, sizeof keepalive);
  }