[packages/sendmail] - up to 8.15.2
adwol
adwol at pld-linux.org
Wed Feb 21 13:04:12 CET 2018
commit a0e31d13603bdc71d5df3a59bbb08119f2a13109
Author: Adam Osuchowski <adwol at pld-linux.org>
Date: Wed Feb 21 13:03:59 2018 +0100
- up to 8.15.2
sendmail-db.patch | 11 ----
sendmail-format_string.patch | 124 +++++++++++++++++++++++++++++++++++++++++++
sendmail.spec | 8 +--
3 files changed, 128 insertions(+), 15 deletions(-)
---
diff --git a/sendmail.spec b/sendmail.spec
index 6751b8b..0a150b3 100644
--- a/sendmail.spec
+++ b/sendmail.spec
@@ -22,12 +22,12 @@ Summary(ru.UTF-8): Почтовый транспортный агент sendmail
Summary(tr.UTF-8): Elektronik posta hizmetleri sunucusu
Summary(uk.UTF-8): Поштовий транспортний агент sendmail
Name: sendmail
-Version: 8.14.8
-Release: 2
+Version: 8.15.2
+Release: 1
License: BSD
Group: Networking/Daemons/SMTP
Source0: ftp://ftp.sendmail.org/pub/sendmail/%{name}.%{version}.tar.gz
-# Source0-md5: 73bfc621c75dbdd3d719e54685d92577
+# Source0-md5: a824fa7dea4d3341efb6462ccd816f00
Source1: %{name}.init
Source2: %{name}.sysconfig
Source3: %{name}.aliases
@@ -50,7 +50,7 @@ Patch3: %{name}-os-paths.patch
Patch4: %{name}-m4path.patch
Patch5: %{name}-redirect.patch
Patch6: %{name}-hprescan-dos.patch
-Patch7: %{name}-db.patch
+Patch7: %{name}-format_string.patch
# originally from http://blue-labs.org/clue/bluelabs.patch-8.12.3
Patch8: bluelabs.patch-8.12.3
URL: http://www.sendmail.org/
diff --git a/sendmail-db.patch b/sendmail-db.patch
deleted file mode 100644
index 688b87e..0000000
--- a/sendmail-db.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- sendmail-8.14.7/include/sm/bdb.h.orig 2003-03-06 17:30:05.000000000 +0100
-+++ sendmail-8.14.7/include/sm/bdb.h 2013-11-17 16:28:54.048001259 +0100
-@@ -19,7 +19,7 @@
- # define DB_VERSION_MAJOR 1
- # endif /* ! DB_VERSION_MAJOR */
-
--# if DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 1
-+# if (DB_VERSION_MAJOR > 4) || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
-
- # define DBTXN NULL ,
-
diff --git a/sendmail-format_string.patch b/sendmail-format_string.patch
new file mode 100644
index 0000000..8c0e704
--- /dev/null
+++ b/sendmail-format_string.patch
@@ -0,0 +1,124 @@
+diff -ruNp sendmail-8.15.2.orig/sendmail/envelope.c sendmail-8.15.2/sendmail/envelope.c
+--- sendmail-8.15.2.orig/sendmail/envelope.c 2014-06-12 19:30:47.000000000 +0200
++++ sendmail-8.15.2/sendmail/envelope.c 2018-02-21 12:59:15.364725322 +0100
+@@ -323,7 +323,7 @@ dropenvelope(e, fulldrop, split)
+
+ /* don't free, allocated from e_rpool */
+ e->e_message = sm_rpool_strdup_x(e->e_rpool, buf);
+- message(buf);
++ message("%s", buf);
+ e->e_flags |= EF_CLRQUEUE;
+ }
+ if (msg_timeout == MSG_NOT_BY)
+@@ -420,7 +420,7 @@ dropenvelope(e, fulldrop, split)
+ /* don't free, allocated from e_rpool */
+ e->e_message = sm_rpool_strdup_x(e->e_rpool,
+ buf);
+- message(buf);
++ message("%s", buf);
+ e->e_flags |= EF_WARNING;
+ }
+ if (msg_timeout == MSG_WARN_BY)
+diff -ruNp sendmail-8.15.2.orig/sendmail/parseaddr.c sendmail-8.15.2/sendmail/parseaddr.c
+--- sendmail-8.15.2.orig/sendmail/parseaddr.c 2015-03-18 12:47:12.000000000 +0100
++++ sendmail-8.15.2/sendmail/parseaddr.c 2018-02-21 12:59:15.386725225 +0100
+@@ -218,7 +218,7 @@ parseaddr(addr, a, flags, delim, delimpt
+ msg = "Deferring message until queue run";
+ if (tTd(20, 1))
+ sm_dprintf("parseaddr: queueing message\n");
+- message(msg);
++ message("%s", msg);
+ if (e->e_message == NULL && e->e_sendmode != SM_DEFER)
+ e->e_message = sm_rpool_strdup_x(e->e_rpool, msg);
+ a->q_state = QS_QUEUEUP;
+diff -ruNp sendmail-8.15.2.orig/sendmail/srvrsmtp.c sendmail-8.15.2/sendmail/srvrsmtp.c
+--- sendmail-8.15.2.orig/sendmail/srvrsmtp.c 2015-03-18 12:47:12.000000000 +0100
++++ sendmail-8.15.2/sendmail/srvrsmtp.c 2018-02-21 12:59:15.409725123 +0100
+@@ -122,6 +122,26 @@ extern ENVELOPE BlankEnvelope;
+ #define SKIP_SPACE(s) while (isascii(*s) && isspace(*s)) \
+ (s)++
+
++static inline void
++message1(fmt)
++ char *fmt;
++{
++ if (strchr(fmt, '%') == NULL)
++ message(fmt, NULL);
++ else
++ message("%s", fmt);
++}
++
++static inline void
++usrerr1(fmt)
++ char *fmt;
++{
++ if (strchr(fmt, '%') == NULL)
++ usrerr(fmt, NULL);
++ else
++ usrerr("%s", fmt);
++}
++
+ /*
+ ** PARSE_ESMTP_ARGS -- parse EMSTP arguments (for MAIL, RCPT)
+ **
+@@ -578,13 +598,13 @@ static bool smtp_data __P((SMTP_T *, ENV
+ bool tsave = QuickAbort; \
+ \
+ QuickAbort = false; \
+- usrerr(response); \
++ usrerr1(response); \
+ QuickAbort = tsave; \
+ e->e_sendqueue = NULL; \
+ goto doquit; \
+ } \
+ else \
+- usrerr(response); \
++ usrerr1(response); \
+ break; \
+ \
+ case SMFIR_REJECT: \
+@@ -931,7 +951,7 @@ smtp(nullserver, d_flags, e)
+ }
+ else if (strncmp(nullserver, "421 ", 4) == 0)
+ {
+- message(nullserver);
++ message1(nullserver);
+ goto doquit;
+ }
+
+@@ -1849,7 +1869,7 @@ smtp(nullserver, d_flags, e)
+ if (nullserver != NULL)
+ {
+ if (ISSMTPREPLY(nullserver))
+- usrerr(nullserver);
++ usrerr1(nullserver);
+ else
+ usrerr("550 5.0.0 %s",
+ nullserver);
+@@ -2452,7 +2472,7 @@ smtp(nullserver, d_flags, e)
+ tempfail = true;
+ smtp.sm_milterize = false;
+ if (response != NULL)
+- usrerr(response);
++ usrerr1(response);
+ else
+ message("421 4.7.0 %s closing connection",
+ MyHostName);
+@@ -3659,7 +3679,7 @@ smtp_data(smtp, e)
+ (void) extenhsc(response + 4, ' ', e->e_enhsc);
+ #endif /* _FFR_MILTER_ENHSC */
+
+- usrerr(response);
++ usrerr1(response);
+ if (strncmp(response, "421 ", 4) == 0
+ || strncmp(response, "421-", 4) == 0)
+ {
+@@ -3779,7 +3799,7 @@ smtp_data(smtp, e)
+ if (ISSMTPCODE(response))
+ (void) extenhsc(response + 4, ' ', e->e_enhsc);
+ #endif /* _FFR_MILTER_ENHSC */
+- usrerr(response);
++ usrerr1(response);
+ if (strncmp(response, "421 ", 4) == 0
+ || strncmp(response, "421-", 4) == 0)
+ rv = false;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/sendmail.git/commitdiff/a0e31d13603bdc71d5df3a59bbb08119f2a13109
More information about the pld-cvs-commit
mailing list