diff options
| author | wiz <wiz@pkgsrc.org> | 2009-09-13 22:47:30 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2009-09-13 22:47:30 +0000 |
| commit | 28ea4fc1fbda1385e38cbddb160fad9481fa7931 (patch) | |
| tree | b564a15fbabc9ddb6ea21a6ea2f3030487573b9d /mail | |
| parent | fdd568c891e1c71686550a47365b43fa91500d4a (diff) | |
| download | pkgsrc-28ea4fc1fbda1385e38cbddb160fad9481fa7931.tar.gz | |
Add two patches from upstream bug tracking that fix MH box handling
that was broken in 1.5.20.
Tracked down by tonio@ with help from Antonio Radici.
Bump PKGREVISION.
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/mutt-devel/Makefile | 4 | ||||
| -rw-r--r-- | mail/mutt-devel/distinfo | 3 | ||||
| -rw-r--r-- | mail/mutt-devel/patches/patch-ai | 37 |
3 files changed, 41 insertions, 3 deletions
diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile index 06e5edcad91..cf0e4668c42 100644 --- a/mail/mutt-devel/Makefile +++ b/mail/mutt-devel/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.76 2009/08/10 14:18:12 apb Exp $ +# $NetBSD: Makefile,v 1.77 2009/09/13 22:47:30 wiz Exp $ DISTNAME= mutt-1.5.20 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= mail MUTT_SITES= ftp://ftp.mutt.org/mutt/ \ ftp://ftp.stealth.net/pub/mirrors/ftp.mutt.org/pub/mutt/ \ diff --git a/mail/mutt-devel/distinfo b/mail/mutt-devel/distinfo index 5863ae85287..11e52b98ad4 100644 --- a/mail/mutt-devel/distinfo +++ b/mail/mutt-devel/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.63 2009/08/27 10:38:19 wiz Exp $ +$NetBSD: distinfo,v 1.64 2009/09/13 22:47:30 wiz Exp $ SHA1 (mutt-1.5.20.tar.gz) = d2bec7a33771f128ca49b1723b06b6d248a35d31 RMD160 (mutt-1.5.20.tar.gz) = df582f79364b9fd70a0001e76a119d8f78275ebb @@ -14,6 +14,7 @@ SHA1 (patch-ae) = 9523ec98ceeb410f5e9ab468e29727da3ac6bfb5 SHA1 (patch-af) = 36ca7b54d42537b1d23d87e58d6e31dbad032c0e SHA1 (patch-ag) = 2b76839be18271a72cb9e407f54879736f2a7ad6 SHA1 (patch-ah) = dfe747c30a44bb309cccaca1bd5174fccc3c2bed +SHA1 (patch-ai) = 7ddb35fd4565d37b169c7a45a6a75c649d5beaf5 SHA1 (patch-al) = 4de61597f439731e664599b8b0d9f3fe5da557cd SHA1 (patch-am) = f7f20860bccb63ed5464e3a1225719ffc3fa504f SHA1 (patch-an) = eae26290a7a03b3ba31d058cd154c4de8effcf98 diff --git a/mail/mutt-devel/patches/patch-ai b/mail/mutt-devel/patches/patch-ai new file mode 100644 index 00000000000..708fd31f122 --- /dev/null +++ b/mail/mutt-devel/patches/patch-ai @@ -0,0 +1,37 @@ +$NetBSD: patch-ai,v 1.5 2009/09/13 22:47:30 wiz Exp $ + +Two patches from +http://bugs.mutt.org/3308 +and +http://bugs.mutt.org/3312 +fixing bugs in MH handling. + +--- mh.c.orig 2009-06-01 16:29:32.000000000 +0000 ++++ mh.c +@@ -146,7 +146,7 @@ static int mh_read_token (char *t, int * + if ((p = strchr (t, '-'))) + { + *p++ = '\0'; +- if (mutt_atoi (t, first) < 0 || mutt_atoi (t, last) < 0) ++ if (mutt_atoi (t, first) < 0 || mutt_atoi (p, last) < 0) + return -1; + } + else +@@ -207,7 +207,7 @@ static int mh_read_sequences (struct mh_ + out: + FREE (&buff); + safe_fclose (&fp); +- return 0; ++ return rc; + } + + static inline mode_t mh_umask (CONTEXT* ctx) +@@ -1155,7 +1155,7 @@ int mh_read_dir (CONTEXT * ctx, const ch + + if (ctx->magic == M_MH) + { +- if (mh_read_sequences (&mhs, ctx->path) >= 0) ++ if (mh_read_sequences (&mhs, ctx->path) < 0) + return -1; + mh_update_maildir (md, &mhs); + mhs_free_sequences (&mhs); |