[packages/exim] - rel 12; fixes from upstream (+ rediff for rpm.org)
arekm
arekm at pld-linux.org
Fri Nov 27 08:36:04 CET 2020
commit 0473fda3970625f6505b98f91af55b1a1f955ccd
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Fri Nov 27 08:35:29 2020 +0100
- rel 12; fixes from upstream (+ rediff for rpm.org)
exim.spec | 4 +-
exim4-cflags.patch | 12 ++--
exim4-monitor-EDITME.patch | 7 +--
localscan_dlopen_exim_4.20_or_better.patch | 91 +++++++++++++++---------------
4 files changed, 54 insertions(+), 60 deletions(-)
---
diff --git a/exim.spec b/exim.spec
index 78b0146..e117972 100644
--- a/exim.spec
+++ b/exim.spec
@@ -24,7 +24,7 @@ Summary(pl.UTF-8): Agent Transferu Poczty Uniwersytetu w Cambridge
Summary(pt_BR.UTF-8): Servidor de correio eletrônico exim
Name: exim
Version: 4.94
-Release: 11
+Release: 12
Epoch: 2
License: GPL v2+
Group: Networking/Daemons/SMTP
@@ -50,7 +50,7 @@ Source15: %{name}4-smtp.pamd
Source16: %{name}on.png
# sh branch.sh
Patch100: %{name}-git.patch
-# Patch100-md5: c1230b5b9e34fdafd71dd310bf53e461
+# Patch100-md5: 03d5992e2766e0dad13ea8a675c332ab
Patch0: %{name}4-EDITME.patch
Patch1: %{name}4-monitor-EDITME.patch
Patch2: %{name}4-cflags.patch
diff --git a/exim4-cflags.patch b/exim4-cflags.patch
index aa265dc..242e0fc 100644
--- a/exim4-cflags.patch
+++ b/exim4-cflags.patch
@@ -1,13 +1,11 @@
-diff -urN exim-4.60.org/OS/Makefile-Linux exim-4.60/OS/Makefile-Linux
---- exim-4.60.org/OS/Makefile-Linux 2005-11-28 11:57:32.000000000 +0100
-+++ exim-4.60/OS/Makefile-Linux 2006-02-17 20:17:00.698452750 +0100
-@@ -13,7 +13,7 @@
- CHMOD_COMMAND=look_for_it
-
+--- exim-4.94.org/OS/Makefile-Linux 2020-05-30 22:35:38.000000000 +0200
++++ exim-4.94/OS/Makefile-Linux 2020-11-27 08:08:51.397823884 +0100
+@@ -16,7 +16,7 @@ CHMOD_COMMAND=look_for_it
+ # The system cc may be gcc or clang; do not force gcc
+ CC=cc
# Preserve CFLAGS and CFLAGS_DYNAMIC from the caller/environment
-CFLAGS ?= -O -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+CFLAGS ?= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $(CUSTOM_CFLAGS)
CFLAGS_DYNAMIC ?= -shared -rdynamic
DBMLIB = -ldb
-
diff --git a/exim4-monitor-EDITME.patch b/exim4-monitor-EDITME.patch
index e9b36cb..730c7b4 100644
--- a/exim4-monitor-EDITME.patch
+++ b/exim4-monitor-EDITME.patch
@@ -1,6 +1,5 @@
-diff -urN exim-3.15.orig/exim_monitor/EDITME exim-3.15/exim_monitor/EDITME
---- exim-3.15.orig/exim_monitor/EDITME Wed Jun 14 09:57:45 2000
-+++ exim-3.15/exim_monitor/EDITME Sat Jul 15 18:45:44 2000
+--- exim-4.94.org/exim_monitor/EDITME 2020-05-30 22:35:38.000000000 +0200
++++ exim-4.94/exim_monitor/EDITME 2020-11-27 08:07:47.762469263 +0100
@@ -149,7 +149,7 @@
# will be displayed as the second stripchart. This can be used to keep
# a display of a mail spool partition on the screen.
@@ -8,5 +7,5 @@ diff -urN exim-3.15.orig/exim_monitor/EDITME exim-3.15/exim_monitor/EDITME
-# SIZE_STRIPCHART=/var/mail
+SIZE_STRIPCHART=/var/spool/exim
- # The name of the size stripchar will be the last component of SIZE_STRIPCHART
+ # The name of the size stripchart will be the last component of SIZE_STRIPCHART
# unless the following variable is set to override it.
diff --git a/localscan_dlopen_exim_4.20_or_better.patch b/localscan_dlopen_exim_4.20_or_better.patch
index 10339dd..d1d223a 100644
--- a/localscan_dlopen_exim_4.20_or_better.patch
+++ b/localscan_dlopen_exim_4.20_or_better.patch
@@ -1,16 +1,19 @@
-Description: Allow one to use and switch between different local_scan functions
- without recompiling exim.
- http://marc.merlins.org/linux/exim/files/sa-exim-current/ Original patch from
- David Woodhouse, modified first by Derrick 'dman' Hudson and then by Marc
- MERLIN for SA-Exim and minor/major API version tracking
-Author: David Woodhouse, Derrick 'dman' Hudson, Marc MERLIN
-Origin: other, http://marc.merlins.org/linux/exim/files/sa-exim-current/
-Forwarded: no
-Last-Update: 2019-10-20
-
---- a/src/EDITME
-+++ b/src/EDITME
-@@ -868,6 +868,21 @@ HEADERS_CHARSET="ISO-8859-1"
+diff -urN exim-4.94.org/src/config.h.defaults exim-4.94/src/config.h.defaults
+--- exim-4.94.org/src/config.h.defaults 2020-05-30 22:35:38.000000000 +0200
++++ exim-4.94/src/config.h.defaults 2020-11-27 08:10:34.967732017 +0100
+@@ -33,6 +33,8 @@
+
+ #define AUTH_VARS 3
+
++#define DLOPEN_LOCAL_SCAN
++
+ #define BIN_DIRECTORY
+
+ #define CONFIGURE_FILE
+diff -urN exim-4.94.org/src/EDITME exim-4.94/src/EDITME
+--- exim-4.94.org/src/EDITME 2020-11-27 08:10:27.727507700 +0100
++++ exim-4.94/src/EDITME 2020-11-27 08:10:34.967732017 +0100
+@@ -878,6 +878,21 @@
#------------------------------------------------------------------------------
@@ -32,20 +35,10 @@ Last-Update: 2019-10-20
# The default distribution of Exim contains only the plain text form of the
# documentation. Other forms are available separately. If you want to install
# the documentation in "info" format, first fetch the Texinfo documentation
---- a/src/config.h.defaults
-+++ b/src/config.h.defaults
-@@ -33,6 +33,8 @@ Do not put spaces between # and the 'def
-
- #define AUTH_VARS 3
-
-+#define DLOPEN_LOCAL_SCAN
-+
- #define BIN_DIRECTORY
-
- #define CONFIGURE_FILE
---- a/src/globals.c
-+++ b/src/globals.c
-@@ -115,6 +115,10 @@ int dsn_ret = 0;
+diff -urN exim-4.94.org/src/globals.c exim-4.94/src/globals.c
+--- exim-4.94.org/src/globals.c 2020-11-27 08:10:27.714173954 +0100
++++ exim-4.94/src/globals.c 2020-11-27 08:10:34.967732017 +0100
+@@ -117,6 +117,10 @@
const pcre *regex_DSN = NULL;
uschar *dsn_advertise_hosts = NULL;
@@ -56,9 +49,10 @@ Last-Update: 2019-10-20
#ifndef DISABLE_TLS
BOOL gnutls_compat_mode = FALSE;
BOOL gnutls_allow_auto_pkcs11 = FALSE;
---- a/src/globals.h
-+++ b/src/globals.h
-@@ -144,6 +144,9 @@ extern int dsn_ret; /
+diff -urN exim-4.94.org/src/globals.h exim-4.94/src/globals.h
+--- exim-4.94.org/src/globals.h 2020-11-27 08:10:27.714173954 +0100
++++ exim-4.94/src/globals.h 2020-11-27 08:10:34.967732017 +0100
+@@ -148,6 +148,9 @@
extern const pcre *regex_DSN; /* For recognizing DSN settings */
extern uschar *dsn_advertise_hosts; /* host for which TLS is advertised */
@@ -68,8 +62,9 @@ Last-Update: 2019-10-20
/* Input-reading functions for messages, so we can use special ones for
incoming TCP/IP. */
---- a/src/local_scan.c
-+++ b/src/local_scan.c
+diff -urN exim-4.94.org/src/local_scan.c exim-4.94/src/local_scan.c
+--- exim-4.94.org/src/local_scan.c 2020-05-30 22:35:38.000000000 +0200
++++ exim-4.94/src/local_scan.c 2020-11-27 08:10:34.967732017 +0100
@@ -6,22 +6,6 @@
/* See the file NOTICE for conditions of use and distribution. */
@@ -93,7 +88,7 @@ Last-Update: 2019-10-20
/* This is the only Exim header that you should include. The effect of
including any other Exim header is not defined, and may change from release to
release. Use only the documented interface! */
-@@ -29,37 +13,130 @@ release. Use only the documented interfa
+@@ -29,37 +13,130 @@
#include "local_scan.h"
@@ -249,9 +244,10 @@ Last-Update: 2019-10-20
+
+
/* End of local_scan.c */
---- a/src/local_scan.h
-+++ b/src/local_scan.h
-@@ -17,6 +17,7 @@ settings, and the store functions. */
+diff -urN exim-4.94.org/src/local_scan.h exim-4.94/src/local_scan.h
+--- exim-4.94.org/src/local_scan.h 2020-05-30 22:35:38.000000000 +0200
++++ exim-4.94/src/local_scan.h 2020-11-27 08:10:34.967732017 +0100
+@@ -27,6 +27,7 @@
#include <stdarg.h>
#include <sys/types.h>
@@ -259,7 +255,7 @@ Last-Update: 2019-10-20
#include "config.h"
#include "mytypes.h"
#include "store.h"
-@@ -149,6 +150,9 @@ extern header_line *header_list; /
+@@ -166,6 +167,9 @@
extern BOOL host_checking; /* Set when checking a host */
extern uschar *interface_address; /* Interface for incoming call */
extern int interface_port; /* Port number for incoming call */
@@ -269,16 +265,17 @@ Last-Update: 2019-10-20
extern uschar *message_id; /* Internal id of message being handled */
extern uschar *received_protocol; /* Name of incoming protocol */
extern int recipients_count; /* Number of recipients */
-@@ -207,4 +211,6 @@ extern uschar * string_copyn_function(co
- extern uschar * string_copy_taint_function(const uschar *, BOOL tainted);
+@@ -235,4 +239,6 @@
+ extern pid_t child_open_function(uschar **, uschar **, int, int *, int *, BOOL, const uschar *);
#endif
+#pragma GCC visibility pop
+
/* End of local_scan.h */
---- a/src/readconf.c
-+++ b/src/readconf.c
-@@ -203,6 +203,9 @@ static optionlist optionlist_config[] =
+diff -urN exim-4.94.org/src/readconf.c exim-4.94/src/readconf.c
+--- exim-4.94.org/src/readconf.c 2020-11-27 08:10:27.704173644 +0100
++++ exim-4.94/src/readconf.c 2020-11-27 08:10:34.967732017 +0100
+@@ -205,6 +205,9 @@
{ "local_from_prefix", opt_stringptr, {&local_from_prefix} },
{ "local_from_suffix", opt_stringptr, {&local_from_suffix} },
{ "local_interfaces", opt_stringptr, {&local_interfaces} },
@@ -288,9 +285,10 @@ Last-Update: 2019-10-20
#ifdef HAVE_LOCAL_SCAN
{ "local_scan_timeout", opt_time, {&local_scan_timeout} },
#endif
---- a/src/string.c
-+++ b/src/string.c
-@@ -413,6 +413,7 @@ return ss;
+diff -urN exim-4.94.org/src/string.c exim-4.94/src/string.c
+--- exim-4.94.org/src/string.c 2020-11-27 08:10:27.704173644 +0100
++++ exim-4.94/src/string.c 2020-11-27 08:10:34.971065453 +0100
+@@ -418,6 +418,7 @@
#if (defined(HAVE_LOCAL_SCAN) || defined(EXPAND_DLFUNC)) \
&& !defined(MACRO_PREDEF) && !defined(COMPILE_UTILITY)
@@ -298,7 +296,7 @@ Last-Update: 2019-10-20
/*************************************************
* Copy and save string *
*************************************************/
-@@ -465,6 +466,7 @@ Ustrncpy(ss, s, n);
+@@ -470,6 +471,7 @@
ss[n] = 0;
return ss;
}
@@ -306,4 +304,3 @@ Last-Update: 2019-10-20
#endif
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/exim.git/commitdiff/0473fda3970625f6505b98f91af55b1a1f955ccd
More information about the pld-cvs-commit
mailing list