Attachment #177705 for bug #215084

View | Details | Raw Unified | Return to bug 215084
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	mutt
PORTVERSION=	1.7.2
PORTREVISION?=	0
CATEGORIES+=	mail ipv6
MASTER_SITES=	ftp://ftp.mutt.org/pub/mutt/ \
		ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \

.include <bsd.port.options.mk>

# un/comment as each VERSION is created for PORTVERSION
VVV_PATCH_VERSION=	1.7.1
RR_PATCH_VERSION=	1.7.1
#GREETING_PATCH_VERSION=	1.7.0

.if !defined(VVV_PATCH_VERSION)

Lines 1-6 Link Here

(-)b/mail/mutt/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1476585934	1	TIMESTAMP = 1480971443
2	SHA256 (mutt/mutt-1.7.1.tar.gz) = e9c6f88e83d48690033f0d862a70293ac746286b77241554f5448bc23bd0d6df	2	SHA256 (mutt/mutt-1.7.2.tar.gz) = 1553501687cd22d5b8aaee4dc5a7d9dcf6cc61d7956f6aabaadd252d10cd5ff9
3	SIZE (mutt/mutt-1.7.1.tar.gz) = 4025008	3	SIZE (mutt/mutt-1.7.2.tar.gz) = 4025880
4	SHA256 (mutt/patch-1.7.1.rr.compressed.gz) = 97bc56bbc6b0312b87e8dfb68dd9b551edb9d6771bb1b52b1c6f63f51d0bd05b	4	SHA256 (mutt/patch-1.7.1.rr.compressed.gz) = 97bc56bbc6b0312b87e8dfb68dd9b551edb9d6771bb1b52b1c6f63f51d0bd05b
5	SIZE (mutt/patch-1.7.1.rr.compressed.gz) = 9985	5	SIZE (mutt/patch-1.7.1.rr.compressed.gz) = 9985
6	SHA256 (mutt/patch-1.7.1.vvv.nntp.gz) = 798db983e3d63d954bfd88e0b8771f806afddf0ae07cc9a03d27def355675687	6	SHA256 (mutt/patch-1.7.1.vvv.nntp.gz) = 798db983e3d63d954bfd88e0b8771f806afddf0ae07cc9a03d27def355675687




Use gpgme hg commit 84ad86e8b8ab to support gpgme 1.8.0.  This patch
should be removed once mutt hg commit 84ad86e8b8ab is in an official
release.

--- crypt-gpgme.c.orig	2016-11-27 02:22:51 UTC
+++ crypt-gpgme.c
@@ -4946,7 +4946,7 @@ int smime_gpgme_verify_sender (HEADER *h
   return verify_sender (h, GPGME_PROTOCOL_CMS);
 }
 
-void gpgme_set_sender (const char *sender)
+void mutt_gpgme_set_sender (const char *sender)
 {
   mutt_error ("[setting sender] mailbox: %s\n", sender);
   FREE (&current_sender);
--- crypt-gpgme.h.orig	2016-11-27 02:22:51 UTC
+++ crypt-gpgme.h
@@ -53,6 +53,6 @@ int smime_gpgme_send_menu (HEADER *msg, 
 
 int smime_gpgme_verify_sender (HEADER *h);
 
-void gpgme_set_sender (const char *sender);
+void mutt_gpgme_set_sender (const char *sender);
 
 #endif
--- crypt-mod-pgp-gpgme.c.orig	2016-11-27 02:22:51 UTC
+++ crypt-mod-pgp-gpgme.c
@@ -104,7 +104,7 @@ static BODY *crypt_mod_pgp_make_key_atta
 
 static void crypt_mod_pgp_set_sender (const char *sender)
 {
-  gpgme_set_sender (sender);
+  mutt_gpgme_set_sender (sender);
 }
 
 struct crypt_module_specs crypt_mod_pgp_gpgme =
- 

Return to bug 215084

Lines 2-9 Link Here

(-)b/mail/mutt/Makefile (-4 / +4 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= mutt	4	PORTNAME= mutt
5	PORTVERSION= 1.7.1	5	PORTVERSION= 1.7.2
6	PORTREVISION?= 2	6	PORTREVISION?= 0
7	CATEGORIES+= mail ipv6	7	CATEGORIES+= mail ipv6
8	MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ \	8	MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ \
9	ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \	9	ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \
Lines 218-225 DOCS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-doc-ref Link Here
218	.include <bsd.port.options.mk>	218	.include <bsd.port.options.mk>
219		219
220	# un/comment as each VERSION is created for PORTVERSION	220	# un/comment as each VERSION is created for PORTVERSION
221	#VVV_PATCH_VERSION= 1.7.0	221	VVV_PATCH_VERSION= 1.7.1
222	#RR_PATCH_VERSION= 1.7.0	222	RR_PATCH_VERSION= 1.7.1
223	#GREETING_PATCH_VERSION= 1.7.0	223	#GREETING_PATCH_VERSION= 1.7.0
224		224
225	.if !defined(VVV_PATCH_VERSION)	225	.if !defined(VVV_PATCH_VERSION)

Removed Link Here

(-)a/mail/mutt/files/patch-gpgme180 (-37 lines)
1	Use gpgme hg commit 84ad86e8b8ab to support gpgme 1.8.0. This patch
2	should be removed once mutt hg commit 84ad86e8b8ab is in an official
3	release.
4
5	--- crypt-gpgme.c.orig 2016-11-27 02:22:51 UTC
6	+++ crypt-gpgme.c
7	@@ -4946,7 +4946,7 @@ int smime_gpgme_verify_sender (HEADER *h
8	return verify_sender (h, GPGME_PROTOCOL_CMS);
9	}
10
11	-void gpgme_set_sender (const char *sender)
12	+void mutt_gpgme_set_sender (const char *sender)
13	{
14	mutt_error ("[setting sender] mailbox: %s\n", sender);
15	FREE (&current_sender);
16	--- crypt-gpgme.h.orig 2016-11-27 02:22:51 UTC
17	+++ crypt-gpgme.h
18	@@ -53,6 +53,6 @@ int smime_gpgme_send_menu (HEADER *msg,
19
20	int smime_gpgme_verify_sender (HEADER *h);
21
22	-void gpgme_set_sender (const char *sender);
23	+void mutt_gpgme_set_sender (const char *sender);
24
25	#endif
26	--- crypt-mod-pgp-gpgme.c.orig 2016-11-27 02:22:51 UTC
27	+++ crypt-mod-pgp-gpgme.c
28	@@ -104,7 +104,7 @@ static BODY *crypt_mod_pgp_make_key_atta
29
30	static void crypt_mod_pgp_set_sender (const char *sender)
31	{
32	- gpgme_set_sender (sender);
33	+ mutt_gpgme_set_sender (sender);
34	}
35
36	struct crypt_module_specs crypt_mod_pgp_gpgme =
37	-