View | Details | Raw Unified | Return to bug 258848 | Differences between
and this patch

Collapse All | Expand All

(-)g/mail/exim/Makefile (-1 / +1 lines)
Lines 131-137 Link Here
131
EXTRA_PATCHES+=	${FILESDIR}/extra-patch-Local-sa-exim.conf
131
EXTRA_PATCHES+=	${FILESDIR}/extra-patch-Local-sa-exim.conf
132
.endif
132
.endif
133
133
134
EXIM_VERSION=	4.94.2
134
EXIM_VERSION=	4.95
135
SA_EXIM_VERSION=4.2.1
135
SA_EXIM_VERSION=4.2.1
136
EXIM_INSTALL_ARG+=	"-no_chown" "-no_symlink"
136
EXIM_INSTALL_ARG+=	"-no_chown" "-no_symlink"
137
EXTRA_PATCHES+=	`${FIND} ${PATCHDIR} -name '74_*.patch'|${SORT} -h`
137
EXTRA_PATCHES+=	`${FIND} ${PATCHDIR} -name '74_*.patch'|${SORT} -h`
(-)g/mail/exim/distinfo (-3 / +3 lines)
Lines 1-5 Link Here
1
TIMESTAMP = 1620141511
1
TIMESTAMP = 1632918983
2
SHA256 (exim/exim-4.94.2.tar.bz2) = 902e611486400608691dff31e1d8725eb9e23602399ad75670ec18878643bc4f
2
SHA256 (exim/exim-4.95.tar.bz2) = 7f4716cc1b3fee66930d83b249f1c7b119fa1957f6f46e3f4372805cbc97ea63
3
SIZE (exim/exim-4.94.2.tar.bz2) = 2007178
3
SIZE (exim/exim-4.95.tar.bz2) = 2035738
4
SHA256 (exim/sa-exim-4.2.1.tar.gz) = 24d4bf7b0fdddaea11f132981cebb6a86a4ab20ef54111a8ebd481b421c6e2c1
4
SHA256 (exim/sa-exim-4.2.1.tar.gz) = 24d4bf7b0fdddaea11f132981cebb6a86a4ab20ef54111a8ebd481b421c6e2c1
5
SIZE (exim/sa-exim-4.2.1.tar.gz) = 68933
5
SIZE (exim/sa-exim-4.2.1.tar.gz) = 68933
(-)g/mail/exim/files/patch-src__EDITME (-22 / +24 lines)
Lines 1-6 Link Here
1
--- src/EDITME.orig	2012-05-31 04:40:15.000000000 +0400
1
--- src/EDITME.orig	2021-09-28 10:24:46.000000000 +0200
2
+++ src/EDITME	2012-06-28 18:43:50.000000000 +0400
2
+++ src/EDITME	2021-09-29 19:38:22.776161000 +0200
3
@@ -98,7 +98,7 @@
3
@@ -99,7 +99,7 @@
4
 # /usr/local/sbin. The installation script will try to create this directory,
4
 # /usr/local/sbin. The installation script will try to create this directory,
5
 # and any superior directories, if they do not exist.
5
 # and any superior directories, if they do not exist.
6
 
6
 
Lines 9-15 Link Here
9
 
9
 
10
 
10
 
11
 #------------------------------------------------------------------------------
11
 #------------------------------------------------------------------------------
12
@@ -114,7 +114,7 @@
12
@@ -115,7 +115,7 @@
13
 # don't exist. It will also install a default runtime configuration if this
13
 # don't exist. It will also install a default runtime configuration if this
14
 # file does not exist.
14
 # file does not exist.
15
 
15
 
Lines 18-24 Link Here
18
 
18
 
19
 # It is possible to specify a colon-separated list of files for CONFIGURE_FILE.
19
 # It is possible to specify a colon-separated list of files for CONFIGURE_FILE.
20
 # In this case, Exim will use the first of them that exists when it is run.
20
 # In this case, Exim will use the first of them that exists when it is run.
21
@@ -131,7 +131,7 @@
21
@@ -132,7 +132,7 @@
22
 # deliveries. (Local deliveries run as various non-root users, typically as the
22
 # deliveries. (Local deliveries run as various non-root users, typically as the
23
 # owner of a local mailbox.) Specifying these values as root is not supported.
23
 # owner of a local mailbox.) Specifying these values as root is not supported.
24
 
24
 
Lines 27-33 Link Here
27
 
27
 
28
 # If you specify EXIM_USER as a name, this is looked up at build time, and the
28
 # If you specify EXIM_USER as a name, this is looked up at build time, and the
29
 # uid number is built into the binary. However, you can specify that this
29
 # uid number is built into the binary. However, you can specify that this
30
@@ -152,7 +152,7 @@
30
@@ -153,7 +153,7 @@
31
 # for EXIM_USER (e.g. EXIM_USER=exim), you don't need to set EXIM_GROUP unless
31
 # for EXIM_USER (e.g. EXIM_USER=exim), you don't need to set EXIM_GROUP unless
32
 # you want to use a group other than the default group for the given user.
32
 # you want to use a group other than the default group for the given user.
33
 
33
 
Lines 36-42 Link Here
36
 
36
 
37
 # Many sites define a user called "exim", with an appropriate default group,
37
 # Many sites define a user called "exim", with an appropriate default group,
38
 # and use
38
 # and use
39
@@ -330,6 +330,7 @@
39
@@ -451,6 +451,7 @@
40
 # LDAP_LIB_TYPE=OPENLDAP2
40
 # LDAP_LIB_TYPE=OPENLDAP2
41
 # LDAP_LIB_TYPE=NETSCAPE
41
 # LDAP_LIB_TYPE=NETSCAPE
42
 # LDAP_LIB_TYPE=SOLARIS
42
 # LDAP_LIB_TYPE=SOLARIS
Lines 44-55 Link Here
44
 
44
 
45
 # If you don't set any of these, Exim assumes the original University of
45
 # If you don't set any of these, Exim assumes the original University of
46
 # Michigan (OpenLDAP 1) library.
46
 # Michigan (OpenLDAP 1) library.
47
@@ -361,8 +362,10 @@
47
@@ -491,9 +492,10 @@
48
 #
48
 #
49
 # You do not need to use this for any lookup information added via pkg-config.
49
 # You do not need to use this for any lookup information added via pkg-config.
50
 
50
 
51
-# LOOKUP_INCLUDE=-I /usr/local/ldap/include -I /usr/local/mysql/include -I /usr/local/pgsql/include
51
-# LOOKUP_INCLUDE=-I /usr/local/ldap/include -I /usr/local/mysql/include -I /usr/local/pgsql/include
52
-# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq -lgds -lsqlite3
52
-# LOOKUP_INCLUDE +=-I /usr/local/include
53
-# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq -lgds -lsqlite3 -llmdb
53
+INCLUDE=-IXX_LOCALBASE_XX/include XX_DB_INCLUDES_XX XX_LMDB_INCLUDES_XX
54
+INCLUDE=-IXX_LOCALBASE_XX/include XX_DB_INCLUDES_XX XX_LMDB_INCLUDES_XX
54
+LOOKUP_INCLUDE=XX_MYSQL_INCLUDE_XX XX_PGSQL_INCLUDE_XX XX_LDAP_INCLUDE_XX
55
+LOOKUP_INCLUDE=XX_MYSQL_INCLUDE_XX XX_PGSQL_INCLUDE_XX XX_LDAP_INCLUDE_XX
55
+LOOKUP_LIBS=XX_MYSQL_LIBS_XX XX_PGSQL_LIBS_XX XX_LDAP_LIBS_XX XX_LMDB_LIBS_XX
56
+LOOKUP_LIBS=XX_MYSQL_LIBS_XX XX_PGSQL_LIBS_XX XX_LDAP_LIBS_XX XX_LMDB_LIBS_XX
Lines 57-71 Link Here
57
 
58
 
58
 
59
 
59
 #------------------------------------------------------------------------------
60
 #------------------------------------------------------------------------------
60
@@ -454,6 +457,7 @@
61
@@ -633,6 +635,7 @@
62
 # Uncomment the following line to add queuefile transport support
63
 # EXPERIMENTAL_QUEUEFILE=yes
61
 
64
 
62
 
63
 
64
+# EXPERIMENTAL_DCC=yes
65
+# EXPERIMENTAL_DCC=yes
65
 ###############################################################################
66
 ###############################################################################
66
 #                 THESE ARE THINGS YOU MIGHT WANT TO SPECIFY                  #
67
 #                 THESE ARE THINGS YOU MIGHT WANT TO SPECIFY                  #
67
 ###############################################################################
68
 ###############################################################################
68
@@ -521,6 +525,7 @@
69
@@ -700,6 +703,7 @@
69
 
70
 
70
 # ALT_CONFIG_PREFIX=/some/directory/
71
 # ALT_CONFIG_PREFIX=/some/directory/
71
 # ALT_CONFIG_PREFIX=/some/directory/exim.conf-
72
 # ALT_CONFIG_PREFIX=/some/directory/exim.conf-
Lines 73-79 Link Here
73
 
74
 
74
 
75
 
75
 #------------------------------------------------------------------------------
76
 #------------------------------------------------------------------------------
76
@@ -607,7 +612,7 @@
77
@@ -802,7 +806,7 @@
77
 # one that is set in the headers_charset option. The default setting is
78
 # one that is set in the headers_charset option. The default setting is
78
 # defined by this setting:
79
 # defined by this setting:
79
 
80
 
Lines 82-88 Link Here
82
 
83
 
83
 # If you are going to make use of $header_xxx expansions in your configuration
84
 # If you are going to make use of $header_xxx expansions in your configuration
84
 # file, or if your users are going to use them in filter files, and the normal
85
 # file, or if your users are going to use them in filter files, and the normal
85
@@ -751,7 +756,7 @@
86
@@ -898,7 +902,7 @@
86
 # Once you have done this, "make install" will build the info files and
87
 # Once you have done this, "make install" will build the info files and
87
 # install them in the directory you have defined.
88
 # install them in the directory you have defined.
88
 
89
 
Lines 91-97 Link Here
91
 
92
 
92
 
93
 
93
 #------------------------------------------------------------------------------
94
 #------------------------------------------------------------------------------
94
@@ -764,7 +769,7 @@
95
@@ -911,7 +915,7 @@
95
 # %s. This will be replaced by one of the strings "main", "panic", or "reject"
96
 # %s. This will be replaced by one of the strings "main", "panic", or "reject"
96
 # to form the final file names. Some installations may want something like this:
97
 # to form the final file names. Some installations may want something like this:
97
 
98
 
Lines 100-106 Link Here
100
 
101
 
101
 # which results in files with names /var/log/exim_mainlog, etc. The directory
102
 # which results in files with names /var/log/exim_mainlog, etc. The directory
102
 # in which the log files are placed must exist; Exim does not try to create
103
 # in which the log files are placed must exist; Exim does not try to create
103
@@ -840,7 +845,7 @@
104
@@ -993,7 +997,7 @@
104
 # that the local_scan API is made available by the linker. You may also need
105
 # that the local_scan API is made available by the linker. You may also need
105
 # to add -ldl to EXTRALIBS so that dlopen() is available to Exim.
106
 # to add -ldl to EXTRALIBS so that dlopen() is available to Exim.
106
 
107
 
Lines 109-115 Link Here
109
 
110
 
110
 
111
 
111
 #------------------------------------------------------------------------------
112
 #------------------------------------------------------------------------------
112
@@ -937,6 +942,8 @@
113
@@ -1130,6 +1134,8 @@
113
 #
114
 #
114
 # but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM
115
 # but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM
115
 # as well.
116
 # as well.
Lines 118-124 Link Here
118
 #
119
 #
119
 # To use a name other than exim in the tcpwrappers config file,
120
 # To use a name other than exim in the tcpwrappers config file,
120
 # e.g. if you're running multiple daemons with different access lists,
121
 # e.g. if you're running multiple daemons with different access lists,
121
@@ -945,6 +952,14 @@
122
@@ -1138,7 +1144,15 @@
122
 #
123
 #
123
 # TCP_WRAPPERS_DAEMON_NAME="exim"
124
 # TCP_WRAPPERS_DAEMON_NAME="exim"
124
 
125
 
Lines 126-139 Link Here
126
+# one or two OS. See the file README.IPV6 for the current status of this
127
+# one or two OS. See the file README.IPV6 for the current status of this
127
+# support. Do not set this option unless you are working on IPv6 and know
128
+# support. Do not set this option unless you are working on IPv6 and know
128
+# what you are doing.
129
+# what you are doing.
129
+
130
 
130
+# HAVE_IPV6=YES
131
+# HAVE_IPV6=YES
131
+
132
+
132
+
133
+
133
 
134
+
134
 #------------------------------------------------------------------------------
135
 #------------------------------------------------------------------------------
135
 # The default action of the exim_install script (which is run by "make
136
 # The default action of the exim_install script (which is run by "make
136
@@ -1222,7 +1237,7 @@
137
 # install") is to install the Exim binary with a unique name such as
138
@@ -1424,7 +1438,7 @@
137
 # (process id) to a file so that it can easily be identified. The path of the
139
 # (process id) to a file so that it can easily be identified. The path of the
138
 # file can be specified here. Some installations may want something like this:
140
 # file can be specified here. Some installations may want something like this:
139
 
141
 

Return to bug 258848