update to neomutt-20170907

This commit is contained in:
sthen 2017-09-07 16:19:08 +00:00
parent 4f42cdeb84
commit cabacbffb9
7 changed files with 28 additions and 33 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.16 2017/07/14 21:16:20 sthen Exp $
# $OpenBSD: Makefile,v 1.17 2017/09/07 16:19:08 sthen Exp $
COMMENT= tty-based e-mail client, Mutt with patches
GH_ACCOUNT= neomutt
GH_PROJECT= neomutt
GH_TAGNAME= neomutt-20170714
GH_TAGNAME= neomutt-20170907
DISTNAME= ${GH_TAGNAME}
CATEGORIES= mail

View File

@ -1,2 +1,2 @@
SHA256 (neomutt-20170714.tar.gz) = QNSJIPlcpJq5brEJtlj1z24cIiMgxYvdA3acE1XXo4M=
SIZE (neomutt-20170714.tar.gz) = 2509160
SHA256 (neomutt-20170907.tar.gz) = JN8RtKlhcnNv+UoCu25MMQvqrk0UEplyAglReFrTW1A=
SIZE (neomutt-20170907.tar.gz) = 2532041

View File

@ -1,11 +1,11 @@
$OpenBSD: patch-main_c,v 1.7 2017/07/10 10:17:27 sthen Exp $
$OpenBSD: patch-main_c,v 1.8 2017/09/07 16:19:08 sthen Exp $
Pledge
Index: main.c
--- main.c.orig
+++ main.c
@@ -413,6 +413,30 @@ int main(int argc, char **argv, char **env)
@@ -427,6 +427,30 @@ int main(int argc, char **argv, char **env)
}
}

View File

@ -1,14 +1,14 @@
$OpenBSD: patch-mutt_sasl_c,v 1.5 2017/07/10 10:17:27 sthen Exp $
$OpenBSD: patch-mutt_sasl_c,v 1.6 2017/09/07 16:19:08 sthen Exp $
Pledge
Index: mutt_sasl.c
--- mutt_sasl.c.orig
+++ mutt_sasl.c
@@ -126,7 +126,7 @@ static int mutt_sasl_cb_log(void *context, int priorit
/* mutt_sasl_start: called before doing a SASL exchange - initialises library
* (if necessary). */
@@ -140,7 +140,7 @@ static int mutt_sasl_cb_log(void *context, int priorit
*
* Call before doing an SASL exchange - initialises library (if necessary).
*/
-static int mutt_sasl_start(void)
+int mutt_sasl_start(void)
{

View File

@ -1,11 +1,11 @@
$OpenBSD: patch-mutt_sasl_h,v 1.5 2017/07/10 10:17:27 sthen Exp $
$OpenBSD: patch-mutt_sasl_h,v 1.6 2017/09/07 16:19:08 sthen Exp $
Pledge
Index: mutt_sasl.h
--- mutt_sasl.h.orig
+++ mutt_sasl.h
@@ -27,6 +27,7 @@ struct Connection;
@@ -33,6 +33,7 @@ struct Connection;
int mutt_sasl_client_new(struct Connection *conn, sasl_conn_t **saslconn);
int mutt_sasl_interact(sasl_interact_t *interaction);

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-newsrc_c,v 1.1 2017/09/07 16:19:08 sthen Exp $
Index: newsrc.c
--- newsrc.c.orig
+++ newsrc.c
@@ -593,7 +593,7 @@ static int active_get_cache(struct NntpServer *nserv)
if (!fp)
return -1;
- if (fgets(buf, sizeof(buf), fp) == NULL || sscanf(buf, "%ld%s", &t, file) != 1 || t == 0)
+ if (fgets(buf, sizeof(buf), fp) == NULL || sscanf(buf, "%lld%s", &t, file) != 1 || t == 0)
{
safe_fclose(&fp);
return -1;

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.6 2017/07/10 10:17:27 sthen Exp $
@comment $OpenBSD: PLIST,v 1.7 2017/09/07 16:19:08 sthen Exp $
@conflict mutt-*
@bin bin/mutt
@bin bin/pgpewrap
@ -80,25 +80,6 @@ share/examples/neomutt/Tin.rc
share/examples/neomutt/colors.default
share/examples/neomutt/colors.linux
share/examples/neomutt/gpg.rc
share/examples/neomutt/iconv/
share/examples/neomutt/iconv/iconv.aix-3.2.5.rc
share/examples/neomutt/iconv/iconv.aix-4.1.5.rc
share/examples/neomutt/iconv/iconv.aix-4.2.0.rc
share/examples/neomutt/iconv/iconv.aix-4.3.2.rc
share/examples/neomutt/iconv/iconv.freebsd-3.3.rc
share/examples/neomutt/iconv/iconv.glibc-2.1.3.rc
share/examples/neomutt/iconv/iconv.glibc-2.1.90.rc
share/examples/neomutt/iconv/iconv.hpux-10.01.rc
share/examples/neomutt/iconv/iconv.hpux-10.20.rc
share/examples/neomutt/iconv/iconv.hpux-11.00.rc
share/examples/neomutt/iconv/iconv.irix-6.5.rc
share/examples/neomutt/iconv/iconv.osf1-4.0a.rc
share/examples/neomutt/iconv/iconv.osf1-4.0d.rc
share/examples/neomutt/iconv/iconv.solaris-2.4.rc
share/examples/neomutt/iconv/iconv.solaris-2.5.1.rc
share/examples/neomutt/iconv/iconv.solaris-2.6-cjk.rc
share/examples/neomutt/iconv/iconv.solaris-2.6.rc
share/examples/neomutt/iconv/iconv.solaris-2.7.rc
@comment share/examples/neomutt/mime.types
share/examples/neomutt/mime.types.dist
@sample ${SYSCONFDIR}/mime.types