[pkgsrc/trunk]: pkgsrc/mail upgrade to 6.2.5. incorporates security patch (w...

[itojun <itojun%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9920a940d060
branches:  trunk
changeset: 463294:9920a940d060
user:      itojun <itojun%pkgsrc.org@localhost>
date:      Wed Nov 05 05:20:36 2003 +0000

description:
upgrade to 6.2.5.  incorporates security patch (was in patches/patch-ag).
IMAP and some other improvements.

diffstat:

 mail/fetchmail/Makefile         |    5 +-
 mail/fetchmail/distinfo         |    8 +-
 mail/fetchmail/patches/patch-ae |  129 ----------------------------------------
 mail/fetchmail/patches/patch-ag |   22 ------
 mail/fetchmailconf/Makefile     |    5 +-
 5 files changed, 7 insertions(+), 162 deletions(-)

diffs (203 lines):

diff -r 017400cbd7d8 -r 9920a940d060 mail/fetchmail/Makefile
--- a/mail/fetchmail/Makefile   Wed Nov 05 04:51:46 2003 +0000
+++ b/mail/fetchmail/Makefile   Wed Nov 05 05:20:36 2003 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.134 2003/10/08 20:23:42 itojun Exp $
+# $NetBSD: Makefile,v 1.135 2003/11/05 05:20:36 itojun Exp $
 
-DISTNAME=      fetchmail-6.2.4
-PKGREVISION=   2
+DISTNAME=      fetchmail-6.2.5
 CATEGORIES=    mail
 MASTER_SITES=  http://catb.org/~esr/fetchmail/ \
                http://sunsite.unc.edu/pub/Linux/system/mail/pop/
diff -r 017400cbd7d8 -r 9920a940d060 mail/fetchmail/distinfo
--- a/mail/fetchmail/distinfo   Wed Nov 05 04:51:46 2003 +0000
+++ b/mail/fetchmail/distinfo   Wed Nov 05 05:20:36 2003 +0000
@@ -1,11 +1,9 @@
-$NetBSD: distinfo,v 1.25 2003/10/08 20:23:56 itojun Exp $
+$NetBSD: distinfo,v 1.26 2003/11/05 05:20:36 itojun Exp $
 
-SHA1 (fetchmail-6.2.4.tar.gz) = 99b1b1c41e9853e1c9e88c57b51ec83a08a18adc
-Size (fetchmail-6.2.4.tar.gz) = 1247210 bytes
+SHA1 (fetchmail-6.2.5.tar.gz) = 4656ec4393ccd1c137fe7b331f77cb26b576ac0e
+Size (fetchmail-6.2.5.tar.gz) = 1257376 bytes
 SHA1 (patch-aa) = 3c8aaac5d53c1069995ab74ad99bc5e64843a507
 SHA1 (patch-ab) = 009a97639502365f8b6ec4e854622620391a812f
 SHA1 (patch-ac) = ef0e651807bb0942ca79ed3b10ffc000f71bd330
 SHA1 (patch-ad) = b6bffc59f28992fa0d3de0f9dad250c73bbeffc6
-SHA1 (patch-ae) = 1b7a2e5a2e32cf54a9c690939dae3cac7e2a00cc
 SHA1 (patch-af) = 06e7b84566b0d3ed50b56f88baf23f15ae21eb21
-SHA1 (patch-ag) = de01d6f2eaadac72f0610c62b2926ebad9e7c67c
diff -r 017400cbd7d8 -r 9920a940d060 mail/fetchmail/patches/patch-ae
--- a/mail/fetchmail/patches/patch-ae   Wed Nov 05 04:51:46 2003 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,129 +0,0 @@
-$NetBSD: patch-ae,v 1.11 2003/09/02 12:27:47 frueauf Exp $
-
---- po/cs.po-orig      Fri Jul 18 00:05:55 2003
-+++ po/cs.po   Sun Jul 20 16:31:26 2003
-@@ -63,12 +63,12 @@
- #: driver.c:354
- #, 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:450
- #, 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ù)"
- 
- #.
- #. * Invalid lengths are produced by Post Office/NT's
-@@ -97,12 +97,12 @@
- #: driver.c:501
- #, fuzzy, c-format
- msgid "reading message %s@%s:%d of %d"
--msgstr "ètu %d. zprávu z %d"
-+msgstr "ètu zprávu %s@%s:%d z %d"
- 
- #: driver.c:506
- #, c-format
- msgid " (%d %soctets)"
--msgstr " (poèet bajtù: %d %s)"
-+msgstr " (%d bajtù%s)"
- 
- #: driver.c:507
- msgid "header "
-@@ -111,31 +111,31 @@
- #: driver.c:579
- #, c-format
- msgid " (%d body octets) "
--msgstr " (poèet bajtù v tìle: %d)"
-+msgstr " (%d bajtù tìla)"
- 
- #: driver.c:637
- #, 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 %s@%s:%d nemá oèekávanou velikost (%d skuteèných != %d oèekávaných)\n"
- 
- #: driver.c:667
- msgid " retained\n"
--msgstr "zachována(y)\n"
-+msgstr "zachováno\n"
- 
- #: driver.c:676
- msgid " flushed\n"
--msgstr "smazána(y)\n"
-+msgstr "smazáno\n"
- 
- #: driver.c:693
- msgid " not flushed\n"
--msgstr " nesmazána(y)\n"
-+msgstr " nesmazáno\n"
- 
- #: driver.c:709
- #, 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 %s:%s XXX\n"
- 
- #: driver.c:769
- msgid "SIGPIPE thrown from an MDA or a stream socket error\n"
-@@ -390,7 +390,7 @@
- #: driver.c:1263
- #, fuzzy, c-format
- msgid "%d %s (%d %s) 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:1264 driver.c:1271
- msgid "messages"
-@@ -407,12 +407,12 @@
- #: driver.c:1270
- #, 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:1276
- #, c-format
- msgid " (%d octets).\n"
--msgstr " (poèet bajtù: %d).\n"
-+msgstr " (%d bajtù).\n"
- 
- #: driver.c:1282
- #, c-format
-@@ -462,12 +462,12 @@
- #: driver.c:1494
- #, 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:1496
- #, 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:1504
- #, c-format
-@@ -884,7 +884,7 @@
- #: fetchmail.c:1326
- #, 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 XXX\n"
- 
- #: fetchmail.c:1351
- msgid "POP2 support is not configured.\n"
-@@ -2691,7 +2691,7 @@
- 
- #: transact.c:514
- 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:535
- #, fuzzy
diff -r 017400cbd7d8 -r 9920a940d060 mail/fetchmail/patches/patch-ag
--- a/mail/fetchmail/patches/patch-ag   Wed Nov 05 04:51:46 2003 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2003/10/08 20:23:43 itojun Exp $
-
---- rfc822.c-  2003-10-06 13:28:06.000000000 +0900
-+++ rfc822.c   2003-10-06 13:28:41.000000000 +0900
-@@ -176,7 +176,7 @@
-           case 3:     /* we're in a <>-enclosed address */
-               if (*from == '@' || *from == '!')
-                   has_host_part = TRUE;
--              else if (*from == '>' && from[-1] != '<')
-+              else if (*from == '>' && (from > buf && from[-1] != '<'))
-               {
-                   state = 1;
-                   if (!has_host_part)
-@@ -198,7 +198,7 @@
-       /*
-        * If we passed a comma, reset everything.
-        */
--      if (from[-1] == ',' && !parendepth) {
-+      if ((from > buf && from[-1] == ',') && !parendepth) {
-         has_host_part = has_bare_name_part = FALSE;
-         parens_from = NULL;
-       }
diff -r 017400cbd7d8 -r 9920a940d060 mail/fetchmailconf/Makefile
--- a/mail/fetchmailconf/Makefile       Wed Nov 05 04:51:46 2003 +0000
+++ b/mail/fetchmailconf/Makefile       Wed Nov 05 05:20:36 2003 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.54 2003/10/08 20:25:01 itojun Exp $
+# $NetBSD: Makefile,v 1.55 2003/11/05 05:20:36 itojun Exp $
 
-DISTNAME=      fetchmail-6.2.4
-PKGREVISION=   2
+DISTNAME=      fetchmail-6.2.5
 PKGNAME=       ${DISTNAME:S/fetchmail/fetchmailconf/}
 CATEGORIES=    mail
 MASTER_SITES=  http://catb.org/~esr/fetchmail/ \