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

(-)/usr/home/pi/myp/mail/exim/Makefile (-2 / +2 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	exim
4
PORTNAME=	exim
5
PORTVERSION?=	${EXIM_VERSION}
5
PORTVERSION?=	${EXIM_VERSION}
6
PORTREVISION?=	2
6
PORTREVISION?=	0
7
CATEGORIES=	mail ipv6
7
CATEGORIES=	mail ipv6
8
MASTER_SITES=	${MASTER_SITE_EXIM:S/$/:exim/}
8
MASTER_SITES=	${MASTER_SITE_EXIM:S/$/:exim/}
9
MASTER_SITE_SUBDIR=	exim4/:exim
9
MASTER_SITE_SUBDIR=	exim4/:exim
Lines 85-91 Link Here
85
DISTFILES+=	sa-exim-${SA_EXIM_VERSION}.tar.gz:sa_exim
85
DISTFILES+=	sa-exim-${SA_EXIM_VERSION}.tar.gz:sa_exim
86
.endif
86
.endif
87
87
88
EXIM_VERSION=	4.84
88
EXIM_VERSION=	4.85
89
SA_EXIM_VERSION=4.2
89
SA_EXIM_VERSION=4.2
90
EXIM_INSTALL_ARG+=	"-no_chown" "-no_symlink"
90
EXIM_INSTALL_ARG+=	"-no_chown" "-no_symlink"
91
91
(-)/usr/home/pi/myp/mail/exim/distinfo (-2 / +2 lines)
Lines 1-4 Link Here
1
SHA256 (exim/exim-4.84.tar.bz2) = 78ea22be87fb6df880e7fd482f3bec9ef6ceca0c9dedd50f8a26cae0b38b9e9c
1
SHA256 (exim/exim-4.85.tar.bz2) = 13211f2bbc5400d095a9b4be075eb1347e0d98676fdfe4be8a3b4d56281daaa4
2
SIZE (exim/exim-4.84.tar.bz2) = 1761790
2
SIZE (exim/exim-4.85.tar.bz2) = 1784150
3
SHA256 (exim/sa-exim-4.2.tar.gz) = 72e0a735547f18b05785e6c58a71d24623858f0f5234a5dc0e24cb453999e99a
3
SHA256 (exim/sa-exim-4.2.tar.gz) = 72e0a735547f18b05785e6c58a71d24623858f0f5234a5dc0e24cb453999e99a
4
SIZE (exim/sa-exim-4.2.tar.gz) = 66575
4
SIZE (exim/sa-exim-4.2.tar.gz) = 66575
(-)/usr/home/pi/myp/mail/exim/files/patch-src__mime.c (-52 lines)
Lines 1-52 Link Here
1
diff -urN ../exim-4.84.orig/src/mime.c ../exim-4.84/src/mime.c
2
--- ../exim-4.84.orig/src/mime.c	2014-08-09 15:44:29.000000000 +0300
3
+++ ../exim-4.84/src/mime.c	2014-11-12 02:36:21.000000000 +0200
4
@@ -620,12 +620,18 @@
5
 		else
6
 		  param_value = string_cat(param_value, &size, &ptr, q++, 1);
7
 		}
8
-	      param_value[ptr++] = '\0';
9
-	      param_value_len = ptr;
10
-
11
-	      param_value = rfc2047_decode(param_value, check_rfc2047_length, NULL, 32, &param_value_len, &q);
12
-	      debug_printf("Found %s MIME parameter in %s header, value is '%s'\n", mp->name, mime_header_list[i].name, param_value);
13
-	      *((uschar **)(mp->value)) = param_value;
14
+	      if (param_value)
15
+		{
16
+		param_value[ptr++] = '\0';
17
+		param_value_len = ptr;
18
+
19
+		param_value = rfc2047_decode(param_value,
20
+		      check_rfc2047_length, NULL, 32, &param_value_len, &q);
21
+		debug_printf("Found %s MIME parameter in %s header, "
22
+		      "value is '%s'\n", mp->name, mime_header_list[i].name,
23
+		      param_value);
24
+		}
25
+	      *mp->value = param_value;
26
 	      p += (mp->namelen + param_value_len + 1);
27
 	      goto NEXT_PARAM_SEARCH;
28
 	    }
29
diff -urN ../exim-4.84.orig/src/mime.h ../exim-4.84/src/mime.h
30
--- ../exim-4.84.orig/src/mime.h	2014-08-09 15:44:29.000000000 +0300
31
+++ ../exim-4.84/src/mime.h	2014-11-12 02:36:13.000000000 +0200
32
@@ -40,15 +40,15 @@
33
 
34
 
35
 typedef struct mime_parameter {
36
-  uschar *name;
37
-  int    namelen;
38
-  void   *value;
39
+  uschar *  name;
40
+  int       namelen;
41
+  uschar ** value;
42
 } mime_parameter;
43
 
44
 static mime_parameter mime_parameter_list[] = {
45
-  { US"name=", 5, &mime_filename },
46
+  { US"name=",     5, &mime_filename },
47
   { US"filename=", 9, &mime_filename },
48
-  { US"charset=", 8, &mime_charset },
49
+  { US"charset=",  8, &mime_charset },
50
   { US"boundary=", 9, &mime_boundary }
51
 };
52
 

Return to bug 196670