head	1.4;
access;
symbols
	pkgsrc-2015Q2:1.3.0.4
	pkgsrc-2015Q2-base:1.3
	pkgsrc-2015Q1:1.3.0.2
	pkgsrc-2015Q1-base:1.3
	pkgsrc-2014Q4:1.2.0.2
	pkgsrc-2014Q4-base:1.2
	pkgsrc-2014Q3:1.1.0.42
	pkgsrc-2014Q3-base:1.1
	pkgsrc-2014Q2:1.1.0.40
	pkgsrc-2014Q2-base:1.1
	pkgsrc-2014Q1:1.1.0.38
	pkgsrc-2014Q1-base:1.1
	pkgsrc-2013Q4:1.1.0.36
	pkgsrc-2013Q4-base:1.1
	pkgsrc-2013Q3:1.1.0.34
	pkgsrc-2013Q3-base:1.1
	pkgsrc-2013Q2:1.1.0.32
	pkgsrc-2013Q2-base:1.1
	pkgsrc-2013Q1:1.1.0.30
	pkgsrc-2013Q1-base:1.1
	pkgsrc-2012Q4:1.1.0.28
	pkgsrc-2012Q4-base:1.1
	pkgsrc-2012Q3:1.1.0.26
	pkgsrc-2012Q3-base:1.1
	pkgsrc-2012Q2:1.1.0.24
	pkgsrc-2012Q2-base:1.1
	pkgsrc-2012Q1:1.1.0.22
	pkgsrc-2012Q1-base:1.1
	pkgsrc-2011Q4:1.1.0.20
	pkgsrc-2011Q4-base:1.1
	pkgsrc-2011Q3:1.1.0.18
	pkgsrc-2011Q3-base:1.1
	pkgsrc-2011Q2:1.1.0.16
	pkgsrc-2011Q2-base:1.1
	pkgsrc-2011Q1:1.1.0.14
	pkgsrc-2011Q1-base:1.1
	pkgsrc-2010Q4:1.1.0.12
	pkgsrc-2010Q4-base:1.1
	pkgsrc-2010Q3:1.1.0.10
	pkgsrc-2010Q3-base:1.1
	pkgsrc-2010Q2:1.1.0.8
	pkgsrc-2010Q2-base:1.1
	pkgsrc-2010Q1:1.1.0.6
	pkgsrc-2010Q1-base:1.1
	pkgsrc-2009Q4:1.1.0.4
	pkgsrc-2009Q4-base:1.1
	pkgsrc-2009Q3:1.1.0.2
	pkgsrc-2009Q3-base:1.1;
locks; strict;
comment	@# @;


1.4
date	2015.09.03.14.49.40;	author wiz;	state dead;
branches;
next	1.3;
commitid	mZ3WCaTFX3ICJOzy;

1.3
date	2015.02.19.10.50.44;	author jperkin;	state Exp;
branches;
next	1.2;
commitid	UaZRMv4lKVkzHBay;

1.2
date	2014.12.19.20.45.53;	author tron;	state Exp;
branches;
next	1.1;
commitid	i5v7xW8qRs6UZG2y;

1.1
date	2009.08.10.14.18.12;	author apb;	state Exp;
branches;
next	;


desc
@@


1.4
log
@Remove mutt-devel, used for updating mail/mutt.
@
text
@$NetBSD: patch-af,v 1.3 2015/02/19 10:50:44 jperkin Exp $

1.) On some systems, curses.h defines TRUE and FALSE, so conditionalise
    them here to avoid compiler complaints about duplicate definitions.

--- lib.h.orig	2014-03-12 16:03:45.000000000 +0000
+++ lib.h	2014-12-19 20:41:07.000000000 +0000
@@@@ -54,8 +54,12 @@@@
 #  define N_(a) a
 # endif
 
-# define TRUE 1
-# define FALSE 0
+# ifndef TRUE
+#  define TRUE 1
+# endif
+# ifndef FALSE
+#  define FALSE 0
+# endif
 
 # define HUGE_STRING	5120
 # define LONG_STRING     1024
@


1.3
log
@Use the official upstream fix for CVE-2014-9116.  The proposed patch that
we were previously using has unwanted side-effects, such as appending ","
to To/Cc/Mail-Followup-To, and other spacing issues.

Bump PKGREVISION.
@
text
@d1 1
a1 1
$NetBSD: patch-af,v 1.2 2014/12/19 20:45:53 tron Exp $
@


1.2
log
@Add fix for the security vulnerability reported in CVE-2014-9116 taken
from the mutt GIT repository.
@
text
@d1 1
a1 1
$NetBSD: patch-af,v 1.1 2009/08/10 14:18:12 apb Exp $
a5 4
2.) Fix CVE-2014-9116, patch take from here:

    http://dev.mutt.org/trac/attachment/ticket/3716/ticket-3716-dev.patch

a22 9
@@@@ -98,7 +102,7 @@@@
    on some systems */
 # define SKIPWS(c) while (*(c) && isspace ((unsigned char) *(c))) c++;
 
-#define EMAIL_WSP " \t\r\n"
+#define EMAIL_WSP " \t"
 
 /* skip over WSP as defined by RFC5322.  This is used primarily for parsing
  * header fields. */
@


1.1
log
@Add two patches:
* On some systems, curses.h defines TRUE and FALSE, so conditionalise
  them in lib.h to avoid compiler complaints about duplicate definitions.
* mutt_curses.h refers to event_t from mutt.h, and SHORT_STRING from lib.h,
  so include those headers fom mutt_curses.h.

These patches allow mutt-devel to build on NetBSD-5.99.15.

Bump PKGREVISION to 1.
@
text
@d1 1
a1 1
$NetBSD$
d3 2
a4 2
On some systems, curses.h defines TRUE and FALSE, so conditionalise
them here to avoid compiler complaints about duplicate definitions.
d6 6
a11 2
--- lib.h.orig	2009-06-01 18:29:32.000000000 +0200
+++ lib.h
d27 9
@