commit f4355ae1a7cccc8e0f5faabbfbff3ff4e4fbbe1d
Author: Jan Rękorajski <[email protected]>
Date: Tue Oct 12 23:34:44 2021 +0200
- up to 8.17.1
sendmail-hprescan-dos.patch | 11 ++++++-----
sendmail-os-paths.patch | 9 +++++----
sendmail-redirect.patch | 12 ++++++------
sendmail-rmail.patch | 9 +++++----
sendmail-smrsh-paths.patch | 42 +++++++++++++++++++++++-------------------
sendmail.spec | 7 ++++---
6 files changed, 49 insertions(+), 41 deletions(-)
---
diff --git a/sendmail.spec b/sendmail.spec
index b54963b..a43c882 100644
--- a/sendmail.spec
+++ b/sendmail.spec
@@ -21,12 +21,12 @@ Summary(ru.UTF-8): Почтовый транспортный агент sendmail
Summary(tr.UTF-8): Elektronik posta hizmetleri sunucusu
Summary(uk.UTF-8): Поштовий транспортний агент sendmail
Name: sendmail
-Version: 8.16.1
+Version: 8.17.1
Release: 1
License: BSD
Group: Networking/Daemons/SMTP
Source0: ftp://ftp.sendmail.org/pub/sendmail/%{name}.%{version}.tar.gz
-# Source0-md5: 055f1d76c8027993a01ab6425aea4ae7
+# Source0-md5: cd3c3f7b2db60c362f07eecbebd99bf4
Source1: %{name}.init
Source2: %{name}.sysconfig
Source3: %{name}.aliases
@@ -55,7 +55,7 @@ Patch7: %{name}-cyrus.patch
Patch8: bluelabs-smpgsql-8.14.3.patch
URL: http://www.sendmail.org/
BuildRequires: cyrus-sasl-devel >= 2.1.21
-BuildRequires: db-devel >= 4.2
+BuildRequires: db-devel >= 5.0
BuildRequires: libnsl-devel
# man or man-db
BuildRequires: man-db
@@ -212,6 +212,7 @@ echo "APPENDDEF(\`confENVDEF', \`-DSTARTTLS')" >> config.m4
echo "APPENDDEF(\`confENVDEF', \`-D_FFR_TLS_1')" >> config.m4
echo "APPENDDEF(\`confLIBS', \`-lssl -lcrypto')" >> config.m4
%endif
+echo "APPENDDEF(\`confENVDEF', \`-DHASFLOCK')" >> config.m4
%ifarch sparc
%define Build sparc32 sh Build
diff --git a/sendmail-hprescan-dos.patch b/sendmail-hprescan-dos.patch
index 4b74550..5ee25c6 100644
--- a/sendmail-hprescan-dos.patch
+++ b/sendmail-hprescan-dos.patch
@@ -1,15 +1,16 @@
---- sendmail-8.13.3/sendmail/collect.c~ 2004-12-01 00:29:15.000000000
+0100
-+++ sendmail-8.13.3/sendmail/collect.c 2005-03-08 09:43:40.848804648 +0100
+diff -urNp -x '*.orig' sendmail-8.16.1.org/sendmail/collect.c
sendmail-8.16.1/sendmail/collect.c
+--- sendmail-8.16.1.org/sendmail/collect.c 2020-05-19 21:54:33.000000000
+0200
++++ sendmail-8.16.1/sendmail/collect.c 2021-10-03 22:30:58.038924399 +0200
@@ -15,6 +15,8 @@
- SM_RCSID("@(#)$Id$")
+ #include <sm/sendmail.h>
+#define MAXHDRZ 512
+
static void eatfrom __P((char *volatile, ENVELOPE *));
static void collect_doheader __P((ENVELOPE *));
static SM_FILE_T *collect_dfopen __P((ENVELOPE *));
-@@ -283,6 +285,7 @@
+@@ -283,6 +285,7 @@ collect(fp, smtpmode, hdrp, e, rsetsize)
register ENVELOPE *e;
bool rsetsize;
{
@@ -17,7 +18,7 @@
register SM_FILE_T *df;
bool ignrdot;
int dbto;
-@@ -613,6 +616,16 @@
+@@ -612,6 +615,16 @@ nextstate:
mstate = MS_BODY;
goto nextstate;
}
diff --git a/sendmail-os-paths.patch b/sendmail-os-paths.patch
index a0c8688..09dc186 100644
--- a/sendmail-os-paths.patch
+++ b/sendmail-os-paths.patch
@@ -1,8 +1,9 @@
---- sendmail-8.12.0/devtools/OS/Linux.orig Mon Sep 24 09:48:15 2001
-+++ sendmail-8.12.0/devtools/OS/Linux Mon Sep 24 09:56:53 2001
-@@ -1,9 +1,10 @@
- # $Id$
+diff -urNp -x '*.orig' sendmail-8.16.1.org/devtools/OS/Linux
sendmail-8.16.1/devtools/OS/Linux
+--- sendmail-8.16.1.org/devtools/OS/Linux 2020-05-19 21:54:32.000000000
+0200
++++ sendmail-8.16.1/devtools/OS/Linux 2021-10-03 22:30:57.502258314 +0200
+@@ -6,9 +6,10 @@ dnl Place personal settings in devtools/
define(`confDEPEND_TYPE', `CC-M')
+ define(`confCCOPTS_SO', `-fPIC')
define(`confSM_OS_HEADER', `sm_os_linux')
-define(`confMANROOT', `/usr/man/man')
+define(`confMANROOT', `/usr/share/man/man')
diff --git a/sendmail-redirect.patch b/sendmail-redirect.patch
index 32ede6b..df235dc 100644
--- a/sendmail-redirect.patch
+++ b/sendmail-redirect.patch
@@ -1,11 +1,11 @@
-diff -Nur sendmail-8.9.2/cf/feature/redirect.m4
sendmail-8.9.2.pld/cf/feature/redirect.m4
---- sendmail-8.9.2/cf/feature/redirect.m4 Tue Dec 29 18:42:11 1998
-+++ sendmail-8.9.2.pld/cf/feature/redirect.m4 Sun Jan 17 13:06:26 1999
-@@ -18,6 +18,7 @@
+diff -urNp -x '*.orig' sendmail-8.16.1.org/cf/feature/redirect.m4
sendmail-8.16.1/cf/feature/redirect.m4
+--- sendmail-8.16.1.org/cf/feature/redirect.m4 2020-05-19 21:54:31.000000000
+0200
++++ sendmail-8.16.1/cf/feature/redirect.m4 2021-10-03 22:30:57.858924594
+0200
+@@ -18,6 +18,7 @@ divert(-1)
- PUSHDIVERT(3)
+ LOCAL_RULE_0
# addresses sent to [email protected] will give a 551 error code
+R$*@$*@$* $#error $@ 5.7.1 $: "551 What is your problem,
Willy?"
R$* < @ $+ .REDIRECT. > $: $1 < @ $2 . REDIRECT . > < ${opMode}
>
R$* < @ $+ .REDIRECT. > <i> $: $1 < @ $2 . REDIRECT. >
- R$* < @ $+ .REDIRECT. > < $- > $# error $@ 5.1.1 $: "551 User has
moved; please try " <$1@$2>
+ R$* < @ $+ .REDIRECT. > < $- > $#error $@ 5.1.1 $: "551 User has
moved; please try " <$1@$2>
diff --git a/sendmail-rmail.patch b/sendmail-rmail.patch
index 35472cd..37dd6a5 100644
--- a/sendmail-rmail.patch
+++ b/sendmail-rmail.patch
@@ -1,8 +1,9 @@
---- sendmail-8.8.7/rmail/rmail.c.rmail Mon Feb 9 14:30:13 1998
-+++ sendmail-8.8.7/rmail/rmail.c Mon Feb 9 14:30:42 1998
-@@ -232,7 +232,6 @@
- i = 0;
+diff -urNp -x '*.orig' sendmail-8.16.1.org/rmail/rmail.c
sendmail-8.16.1/rmail/rmail.c
+--- sendmail-8.16.1.org/rmail/rmail.c 2020-05-19 21:54:33.000000000 +0200
++++ sendmail-8.16.1/rmail/rmail.c 2021-10-03 22:30:57.328925167 +0200
+@@ -276,7 +276,6 @@ main(argc, argv)
args[i++] = _PATH_SENDMAIL; /* Build sendmail's argument list. */
+ args[i++] = "-G"; /* relay submission */
args[i++] = "-oee"; /* No errors, just status. */
- args[i++] = "-odq"; /* Queue it, don't try to deliver. */
args[i++] = "-oi"; /* Ignore '.' on a line by itself. */
diff --git a/sendmail-smrsh-paths.patch b/sendmail-smrsh-paths.patch
index 114ff4d..1798d8b 100644
--- a/sendmail-smrsh-paths.patch
+++ b/sendmail-smrsh-paths.patch
@@ -1,6 +1,7 @@
---- ./smrsh/README.org Tue Sep 30 09:59:46 2003
-+++ ./smrsh/README Tue Sep 30 10:04:24 2003
-@@ -6,7 +6,7 @@
+diff -urNp -x '*.orig' sendmail-8.16.1.org/smrsh/README
sendmail-8.16.1/smrsh/README
+--- sendmail-8.16.1.org/smrsh/README 2020-05-19 21:54:33.000000000 +0200
++++ sendmail-8.16.1/smrsh/README 2021-10-03 22:30:57.155592021 +0200
+@@ -6,7 +6,7 @@ Software Engineering Institute, Carnegie
intended as a supplement to the CERT advisory CA-93:16.sendmail.vulnerability,
and to the software, smrsh.c, written by Eric Allman.
@@ -9,7 +10,7 @@
The smrsh(8) program is intended as a replacement for /bin/sh in the
program mailer definition of sendmail(8). This README file describes
-@@ -47,24 +47,24 @@
+@@ -47,24 +47,24 @@ With gcc, the GNU C compiler, use the -s
The following C defines can be set defined to change the search path and
the bin directory used by smrsh.
@@ -40,7 +41,7 @@
-@@ -79,14 +79,14 @@
+@@ -79,14 +79,14 @@ to run. This list of allowable commands
See the man page for aliases(5) if you are unfamiliar with the format of
these specifications. Additionally, you should include in the list,
@@ -57,7 +58,7 @@
it with the programs that your site feels are allowable for sendmail
to execute. This directory is explicitly specified in the source
code for smrsh, so changing this directory must be accompanied with
-@@ -95,22 +95,22 @@
+@@ -95,22 +95,22 @@ a change in smrsh.c.
You will have to be root to make these modifications.
@@ -86,7 +87,7 @@
sendmail to use the restricted shell. Save the current sendmail.cf
file prior to modifying it, as a prudent precaution.
-@@ -125,7 +125,7 @@
+@@ -125,7 +125,7 @@ help to locate it.
In order to configure sendmail to use smrsh, you must modify the Mprog
definition in the sendmail.cf file, by replacing the /bin/sh specification
@@ -95,7 +96,7 @@
As an example:
-@@ -133,14 +133,14 @@
+@@ -133,14 +133,14 @@ In most Sun Microsystems' sendmail.cf fi
Mprog, P=/bin/sh, F=lsDFMeuP, S=10, R=20, A=sh -c $u
which should be changed to:
@@ -112,7 +113,7 @@
After modifying the Mprog definition in the sendmail.cf file, if a frozen
-@@ -151,7 +151,7 @@
+@@ -151,7 +151,7 @@ or /etc/mail directories. The specific
a search of the strings(1) output of the sendmail binary.
In order to create a new frozen configuration, if it is required:
@@ -121,9 +122,10 @@
Now re-start the sendmail process. An example of how to do this on
a typical system follows:
---- ./smrsh/smrsh.8.org Tue Sep 30 10:04:39 2003
-+++ ./smrsh/smrsh.8 Tue Sep 30 10:12:49 2003
-@@ -39,7 +39,7 @@
+diff -urNp -x '*.orig' sendmail-8.16.1.org/smrsh/smrsh.8
sendmail-8.16.1/smrsh/smrsh.8
+--- sendmail-8.16.1.org/smrsh/smrsh.8 2020-05-19 21:54:33.000000000 +0200
++++ sendmail-8.16.1/smrsh/smrsh.8 2021-10-03 22:30:57.155592021 +0200
+@@ -39,7 +39,7 @@ Briefly,
.I smrsh
limits programs to be in a single directory,
by default
@@ -132,7 +134,7 @@
allowing the system administrator to choose the set of acceptable commands,
and to the shell builtin commands ``exec'', ``exit'', and ``echo''.
It also rejects any commands with the characters
-@@ -50,16 +50,16 @@
+@@ -50,16 +50,16 @@ It allows ``||'' and ``&&'' to enable co
``"|exec /usr/local/bin/filter || exit 75"''
.PP
Initial pathnames on programs are stripped,
@@ -152,7 +154,7 @@
For example, a reasonable additions is
.IR vacation (1),
and the like.
-@@ -68,10 +68,10 @@
+@@ -68,10 +68,10 @@ never include any shell or shell-like pr
(such as
.IR perl (1))
in the
@@ -165,7 +167,7 @@
it simply disallows execution of arbitrary programs.
Also, including mail filtering programs such as
.IR procmail (1)
-@@ -79,15 +79,7 @@
+@@ -79,16 +79,8 @@ is a very bad idea.
.IR procmail (1)
allows users to run arbitrary programs in their
.IR procmailrc (5).
@@ -182,9 +184,11 @@
+/etc/smrsh \- directory for restricted programs
.PP
/var/adm/sm.bin \- directory for restricted programs on HP UX and Solaris
---- sendmail-8.16.1/smrsh/smrsh.c.orig 2020-08-28 23:00:20.515734197 +0200
-+++ sendmail-8.16.1/smrsh/smrsh.c 2020-08-29 09:13:31.036422852 +0200
-@@ -77,7 +77,7 @@
+ .PP
+diff -urNp -x '*.orig' sendmail-8.16.1.org/smrsh/smrsh.c
sendmail-8.16.1/smrsh/smrsh.c
+--- sendmail-8.16.1.org/smrsh/smrsh.c 2020-05-19 21:54:33.000000000 +0200
++++ sendmail-8.16.1/smrsh/smrsh.c 2021-10-03 22:30:57.155592021 +0200
+@@ -77,7 +77,7 @@ SM_IDSTR(id, "@(#)$Id: smrsh.c,v 8.66 20
# ifdef SMRSH_CMDDIR
# define CMDDIR SMRSH_CMDDIR
# else
@@ -193,7 +197,7 @@
# endif
#endif /* ! CMDDIR */
-@@ -89,7 +89,7 @@
+@@ -89,7 +89,7 @@ SM_IDSTR(id, "@(#)$Id: smrsh.c,v 8.66 20
# ifdef SMRSH_PATH
# define PATH SMRSH_PATH
# else
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/sendmail.git/commitdiff/f4355ae1a7cccc8e0f5faabbfbff3ff4e4fbbe1d
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
