Merge gettext 0.14.3 update from branch, to match 6.2.9-rc10. Found by Sunil Shetye.

svn path=/branches/BRANCH_6-3/; revision=4513

diff --git a/NEWS b/NEWS
index 4ad573be33a85c6e10dc2f3b623fb239a6d76def..cd0f1cec38a13ae71e6b60da04558a81d5c8f410 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -10,12 +10,14 @@ change.  MA = Matthias Andree, ESR = Eric S. Raymond, RF = Rob Funk.)
 fetchmail 6.3.1 (not yet released):
 
 * Fix broken default port in POP2. Patch by Stanislav Brabec, SUSE [CZ]. (MA)
+* Fix manual page, some lines starting with ' were escaped by \&. (MA)
+* Ship with gettext-0.14.3 again, as 6.2.9-rc10 did. Found by Sunil Shetye. (MA)
 
 fetchmail 6.3.0 (released 2005-11-30):
 
 # SECURITY FIXES IN THIS RELEASE
-* CVE-2005-2335: The POP3 UIDL code doesn't sufficiently validate/truncate the input
-  length, so a (malicious or compromised) server that sends UIDs longer
+* CVE-2005-2335: The POP3 UIDL code doesn't sufficiently validate/truncate the
+  input length, so a (malicious or compromised) server that sends UIDs longer
   than 128 bytes can corrupt fetchmail's stack and crash fetchmail.
   This vulnerability is remotely exploitable to inject code run in a
   root shell. Edward J. Shornock, Ludwig Nussel. fetchmail-SA-2005-01.txt
@@ -458,4 +460,4 @@ fetchmail-6.0.0 (Tue Sep 17 19:48:25 EDT 2002), 21972 lines:
 
 There are 520 people on fetchmail-friends and 683 on fetchmail-announce.
 
- vim:tw=79 com=bf\:* ts=8 sts=8 sw=8 ai:
+ vim:tw=80 com=bf\:* ts=8 sts=8 sw=8 ai:

diff --git a/configure.ac b/configure.ac
index f7441904640978e12db8ecc59be7a003cc33d114..222b21d7d00efe45585e79c79597f869c3abdccb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -91,7 +91,7 @@ esac
 
 dnl i18n
 AM_GNU_GETTEXT([external], [need-ngettext])
-AM_GNU_GETTEXT_VERSION(0.14.1)
+AM_GNU_GETTEXT_VERSION(0.14.3)
 dnl end i18n
 
 # Under sysV68, socket and friends are provided by the C library.