>Number:         20790
>Category:       pkg
>Synopsis:       Updated package: fetchmail-6.2.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Tue Mar 18 15:09:00 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Quentin Garnier
>Release:        NetBSD 1.6P
>Organization:
Quentin Garnier - cube@cubidou.net
"Feels like I'm fiddling while Rome is burning down.
Should I lay my fiddle down and take a rifle from the ground ?"
Leigh Nash/Sixpence None The Richer, Paralyzed, Divine Discontents, 2002.
>Environment:
System: NetBSD padme 1.6P NetBSD 1.6P (NVIDIA_ACPI-$Revision: 1.2 $) #14: Thu Mar 6 10:39:28 CET 2003 cube@padme:/home/cube/src/nv-netbsd/netvidia/src/sys/arch/i386/compile/NVIDIA_ACPI i386
Architecture: i386
Machine: i386
>Description:
fetchmail-6.2.2 (Fri Feb 28 21:34:26 EST 2003), 22345 lines:

* Sunil Shetye's patch to imprive behavior in empty messages.
* Conform to RFC2595; reissue capability probes after successful 
  STARTTLS negotiation.
* Sunil's patch to make handling of failed STARTTLS more graceful.
* Sunil's JF2 fix patch for .fetchmailrc security fix.
* Christophe GIAUME <christophe@giaume.com> finished the implementation
  of RFC2177 IDLE.
* Jason Tishler's fix patch for Cygwin.
* Support ssh-style authentication in POP3
* Fix for Debian bug #108977, clean up config file evaluation,
  by Benjamin Drieu.
>How-To-Repeat:
>Fix:
To frueauf@netbsd.org : I adapted as I could patch-ae, I guess
you will have to review it anyway (I added XXXs, but there may be
new translations you want to change).

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/mail/fetchmail/Makefile,v
retrieving revision 1.125
diff -u -r1.125 Makefile
--- Makefile	2003/02/21 11:22:03	1.125
+++ Makefile	2003/03/18 23:03:08
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.125 2003/02/21 11:22:03 mycroft Exp $
 
-DISTNAME=	fetchmail-6.2.1
+DISTNAME=	fetchmail-6.2.2
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.ccil.org/pub/esr/fetchmail/ \
 		http://www.tuxedo.org/~esr/fetchmail/ \
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/mail/fetchmail/distinfo,v
retrieving revision 1.21
diff -u -r1.21 distinfo
--- distinfo	2003/02/21 11:22:03	1.21
+++ distinfo	2003/03/18 23:03:08
@@ -1,10 +1,10 @@
 $NetBSD: distinfo,v 1.21 2003/02/21 11:22:03 mycroft Exp $
 
-SHA1 (fetchmail-6.2.1.tar.gz) = acb17ff86ca52f58829ec4b369b13a18f308a927
-Size (fetchmail-6.2.1.tar.gz) = 1139251 bytes
+SHA1 (fetchmail-6.2.2.tar.gz) = 184a3ec71938ac99abbe1adafa4c4f541d143f7d
+Size (fetchmail-6.2.2.tar.gz) = 1205198 bytes
 SHA1 (patch-aa) = 3c8aaac5d53c1069995ab74ad99bc5e64843a507
 SHA1 (patch-ab) = 009a97639502365f8b6ec4e854622620391a812f
 SHA1 (patch-ac) = ef0e651807bb0942ca79ed3b10ffc000f71bd330
 SHA1 (patch-ad) = b6bffc59f28992fa0d3de0f9dad250c73bbeffc6
-SHA1 (patch-ae) = 838c55f73457fca88587c8251e36cf16b291230d
+SHA1 (patch-ae) = d105d57974e1fb69b54f2baba6293088188d3359
 SHA1 (patch-af) = 06e7b84566b0d3ed50b56f88baf23f15ae21eb21
Index: patches/patch-ae
===================================================================
RCS file: /cvsroot/pkgsrc/mail/fetchmail/patches/patch-ae,v
retrieving revision 1.8
diff -u -r1.8 patch-ae
--- patches/patch-ae	2002/11/06 18:39:55	1.8
+++ patches/patch-ae	2003/03/18 23:03:08
@@ -1,136 +1,129 @@
-$NetBSD: patch-ae,v 1.8 2002/11/06 18:39:55 frueauf Exp $
+$NetBSD$
 
---- po/cs.po-orig	Fri Oct 18 14:40:36 2002
-+++ po/cs.po	Wed Nov  6 19:32:01 2002
-@@ -70,7 +70,7 @@
- 
- #: driver.c:863
- msgid "message delimiter found while scanning headers\n"
--msgstr "při prohledávání hlaviček byl nalezen oddělovač zprávy\n"
-+msgstr "při prohledávání hlaviček byl nalezen oddělovač zpráv\n"
- 
- #: driver.c:999
- #, c-format
-@@ -131,7 +131,7 @@
- #: driver.c:1528
+--- po/cs.po.orig	2003-03-01 06:18:35.000000000 +0100
++++ po/cs.po
+@@ -63,12 +63,12 @@ msgstr ""
+ #: driver.c:351
  #, c-format
  msgid "\t%d msg %d octets long skipped by fetchmail.\n"
 -msgstr "\t%d. zpráva o délce %d v bajtech byla fetchmailem přeskočena.\n"
 +msgstr "\t%d. zpráva o délce %d bajtů byla fetchmailem přeskočena.\n"
- 
- #: driver.c:1595
- msgid "SIGPIPE thrown from an MDA or a stream socket error\n"
-@@ -359,7 +359,7 @@
- #: driver.c:1975
- #, c-format
- msgid "%d %s (%d seen) for %s"
--msgstr "počet %2$s pro uživatele %4$s: %1$d (%3$d přečtených)"
-+msgstr "%d %s (%d přečtených) pro %s"
  
- #: driver.c:1976 driver.c:1981
- msgid "messages"
-@@ -372,12 +372,12 @@
- #: driver.c:1980
- #, c-format
- msgid "%d %s for %s"
--msgstr "počet %2$s pro uživatele %3$s: %1$d"
-+msgstr "%d %s pro %s"
- 
- #: driver.c:1986
- #, c-format
- msgid " (%d octets).\n"
--msgstr " (počet bajtů: %d).\n"
-+msgstr " (%d bajtů).\n"
- 
- #: driver.c:1992
- #, c-format
-@@ -392,22 +392,22 @@
- #: driver.c:2115
- #, c-format
- msgid "skipping message %d (%d octets)"
+ #: driver.c:444
+ #, fuzzy, c-format
+ msgid "skipping message %s@%s:%d (%d octets)"
 -msgstr "zprávu %d (počet oktetů: %d) vynechávám"
 +msgstr "vynechána zpráva %d (%d bajtů)"
- 
- #: driver.c:2161
- #, c-format
- msgid " (oversized, %d octets)"
--msgstr " (nadměrná velikost, počet bajtů: %d)"
-+msgstr " (nadměrná velikost, %d bajtů)"
  
--#: driver.c:2184
-+#: driver.c:473
- #, c-format
--msgid "reading message %d of %d"
+ #.
+ #. * Invalid lengths are produced by Post Office/NT's
+@@ -97,12 +97,12 @@ msgstr ""
+ #: driver.c:494
+ #, fuzzy, c-format
+ msgid "reading message %s@%s:%d of %d"
 -msgstr "čtu %d. zprávu z %d"
-+msgid "reading message %s@%s:%d of %d"
 +msgstr "čtu zprávu %s@%s:%d z %d"
  
- #: driver.c:2188
+ #: driver.c:499
  #, c-format
  msgid " (%d %soctets)"
 -msgstr " (počet bajtů: %d %s)"
 +msgstr " (%d bajtů%s)"
  
- #: driver.c:2189
+ #: driver.c:500
  msgid "header "
-@@ -416,30 +416,30 @@
- #: driver.c:2247
+@@ -111,31 +111,31 @@ msgstr "v hlavičce "
+ #: driver.c:576
  #, c-format
  msgid " (%d body octets) "
 -msgstr " (počet bajtů v těle: %d)"
-+msgstr " (%d bajtů těla) "
++msgstr " (%d bajtů těla)"
  
- #: driver.c:2319
- #, c-format
- msgid "message %d was not the expected length (%d actual != %d expected)\n"
+ #: driver.c:644
+ #, fuzzy, c-format
+ msgid ""
+ "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
 -msgstr "zpráva %d má neočekávanou velikost (velikost je %d, očekáváno %d)\n"
-+msgstr "zpráva %d nemá očekávanou velikost (%d skutečných != %d očekávaných)\n"
++msgstr "zpráva %s@%s:%d nemá očekávanou velikost (%d skutečných != %d očekávaných)\n"
  
- #: driver.c:2358
+ #: driver.c:674
  msgid " retained\n"
 -msgstr "zachována(y)\n"
 +msgstr "zachováno\n"
  
- #: driver.c:2366
+ #: driver.c:682
  msgid " flushed\n"
 -msgstr "smazána(y)\n"
-+msgstr " smazáno\n"
++msgstr "smazáno\n"
  
- #: driver.c:2375
+ #: driver.c:699
  msgid " not flushed\n"
 -msgstr " nesmazána(y)\n"
 +msgstr " nesmazáno\n"
  
- #: driver.c:2380
- #, c-format
- msgid "fetchlimit %d reached; %d messages left on server\n"
+ #: driver.c:715
+ #, fuzzy, c-format
+ msgid "fetchlimit %d reached; %d messages left on server %s account %s\n"
  msgstr ""
 -"hranice pro stažení (%d) dosažena; počet zpráv ponechaných na serveru: %d\n"
-+"hranice pro stažení (%d) dosažena; %d zpráv ponechaných na serveru\n"
++"hranice pro stažení (%d) dosažena; %d zpráv ponechaných na serveru %s:%s XXX\n"
+ 
+ #: driver.c:775
+ msgid "SIGPIPE thrown from an MDA or a stream socket error\n"
+@@ -390,7 +390,7 @@ msgstr "Stahuji z %s\n"
+ #: driver.c:1268
+ #, c-format
+ msgid "%d %s (%d seen) for %s"
+-msgstr "počet %2$s pro uživatele %4$s: %1$d (%3$d přečtených)"
++msgstr "%d %s (%d přečtených) pro %s"
  
- #: driver.c:2429
- msgid "socket"
-@@ -480,12 +480,12 @@
- #: driver.c:2464
+ #: driver.c:1269 driver.c:1274
+ msgid "messages"
+@@ -403,12 +403,12 @@ msgstr "zpráv"
+ #: driver.c:1273
  #, c-format
+ msgid "%d %s for %s"
+-msgstr "počet %2$s pro uživatele %3$s: %1$d"
++msgstr "%d %s pro %s"
+ 
+ #: driver.c:1279
+ #, c-format
+ msgid " (%d octets).\n"
+-msgstr " (počet bajtů: %d).\n"
++msgstr " (%d bajtů).\n"
+ 
+ #: driver.c:1285
+ #, c-format
+@@ -458,12 +458,12 @@ msgstr "nedefinovaná\n"
+ #: driver.c:1497
+ #, c-format
  msgid "%s error while delivering to SMTP host %s\n"
 -msgstr "při odesílání SMTP protokolem na %2$s nastala chyba %1$s\n"
 +msgstr "chyba %s při doručování na SMTP server %s\n"
  
- #: driver.c:2466
+ #: driver.c:1499
  #, c-format
  msgid "%s error while fetching from %s\n"
 -msgstr "při stahování z %2$s nastala chyba %1$s\n"
 +msgstr "chyba %s při stahování z %s\n"
  
- #: driver.c:2474
+ #: driver.c:1507
  #, c-format
-@@ -890,7 +890,7 @@
- #: fetchmail.c:1380
- #, c-format
- msgid "%s querying %s (protocol %s) at %s\n"
+@@ -880,7 +880,7 @@ msgstr "ukončen signálem %d\n"
+ #: fetchmail.c:1317
+ #, fuzzy, c-format
+ msgid "%s querying %s (protocol %s) at %s: poll started\n"
 -msgstr "v %4$s %1$s stahuje protokolem %3$s z %2$s\n"
-+msgstr "v %s %s stahuje protokolem %s z %s\n"
++msgstr "v %s %s stahuje protokolem %s z %s XXX\n"
  
- #: fetchmail.c:1400
+ #: fetchmail.c:1342
  msgid "POP2 support is not configured.\n"
+@@ -2723,7 +2723,7 @@ msgstr "SMTP démon odmítl tyto místní ad
+ 
+ #: transact.c:1250
+ msgid "message delimiter found while scanning headers\n"
+-msgstr "při prohledávání hlaviček byl nalezen oddělovač zprávy\n"
++msgstr "při prohledávání hlaviček byl nalezen oddělovač zpráv\n"
+ 
+ #: transact.c:1350
+ msgid "writing message text\n"
>Release-Note:
>Audit-Trail:
>Unformatted: