Commit Graph

229 Commits

Author SHA1 Message Date
Brooks Davis
f61a22193c Key decleration of union semun on src version
__FreeBSD__ is defined by the compiler derived from the triple. When
building FreeBSD 11 on a FreeBSD 12 with a CROSS_TOOLCHAIN=llvm10,
__FreeBSD__ was set to 12 when building lib32 (for some reason no triple
is being passed which seems to mean that we're taking default values
from the build system).  This in turn meant we end up with a double
decleration of union semun which is a build error.

Reviewed by:	gshapiro, dim
Differential Revision:	https://reviews.freebsd.org/D26902
2020-10-26 17:52:28 +00:00
Gregory Neil Shapiro
5b0945b570 Merge sendmail 8.16.1 to HEAD: See contrib/sendmail/RELEASE_NOTES for details
Includes build infrastructure & config updates required for changes in 8.16.1

MFC after:	5 days
2020-07-15 18:28:54 +00:00
Jung-uk Kim
8c9735fbe0 Plug possible memory leaks in the previous patch.
Two DH_free() calls were accidentally removed.

Pointyhat to:	jkim
2020-02-27 23:06:12 +00:00
Jung-uk Kim
a5f8e6f658 Do not free p and g parameters after calling DH_set0_pqg(3).
It is specifically mentioned in the manual page.  Note it has no functional
change in reality because DH_set0_pqg() cannot fail when both p and g are
not NULL.
2020-02-27 22:36:16 +00:00
Jung-uk Kim
a33b334336 Fix style inconsistencies near our OpenSSL 1.1.x patch. 2020-02-27 22:02:00 +00:00
Jung-uk Kim
3ab9782ad3 Fix a white space. 2020-02-27 20:46:30 +00:00
Hiroki Sato
9b429e2192 Fix broken STARTTLS when SharedMemoryKey is enabled.
OpenSSL 1.1 API patch for sendmail had a bug which
prevented sm_RSA_generate_key() function from working.
This function is used to generate a temporary RSA key
for a shared memory region used for TLS processing.
Note that 12.0 and 12.1-RELEASE include this bug.

This affects only if SM_CONF_SHM compile-time
option (enabled by default) and SharedMemoryKey
run-time option (not enabled by default) in a .cf file are
specified.  The latter corresponds to confSHARED_MEMORY_KEY in
a .mc file.

PR:		242861
MFC after:	3 days
Differential Revision:	https://reviews.freebsd.org/D23734
2020-02-27 19:40:29 +00:00
Brooks Davis
f189761366 Fix various -Wpointer-compare warnings
This warning (comparing a pointer against a zero character literal
rather than NULL) has existed since GCC 7.1.0, and was recently added to
Clang trunk.

Almost all of these are harmless, except for fwcontrol's str2node, which
needs to both guard against dereferencing a NULL pointer (though in
practice it appears none of the callers will ever pass one in), as well
as ensure it doesn't parse the empty string as node 0 due to strtol's
awkward interface.

Submitted by:	James Clarke <jtrc27@jrtc27.com>
Obtained from:	CheriBSD
Sponsored by:	DARPA, AFRL
Differential Revision:	https://reviews.freebsd.org/D21914
2019-10-08 21:14:09 +00:00
Hiroki Sato
76d46bbb0e MFV r351553:
Fix a problem which prevented -OServerSSLOptions or -OClientSSLOptions
specified in the command-line option from working.

This patch has been accepted by the upstream.

Reviewed by and discussed with:	gshapiro
2019-08-27 20:11:45 +00:00
Jung-uk Kim
41451aa34f Make sendmail work with OpenSSL 1.1 API. Taken from the ports tree.
https://svnweb.freebsd.org/ports/head/mail/sendmail/files/patch-tls.c?revision=466240

Requested by:	gshapiro
2018-10-01 20:55:01 +00:00
Jung-uk Kim
9f5609e914 Revert r338773. A patch from the ports tree will be committed.
Requested by:	gshapiro
2018-10-01 20:51:26 +00:00
Jung-uk Kim
b7aeb266b0 Make sendmail(8) buildable. 2018-09-19 06:48:45 +00:00
Brooks Davis
6d0fe480a8 Don't declare union semun in userspace unless _WANT_SEMUN is defined.
POSIX explicitly states that the application must declare union semun.
This makes no sense, but it is what it is.  This brings us into line
with Linux, MacOS/Darwin, and NetBSD.

In a ports exp-run a moderate number of ports fail due to a lack of
approprate autotools-like discovery mechanisms or local patches.  A
commit to address them will follow shortly.

PR:		224300, 224443 (exp-run)
Reviewed by:	emaste, jhb, kib
Exp-run by:	antoine
Sponsored by:	DARPA, AFRL
Differential Revision:	https://reviews.freebsd.org/D14492
2018-03-02 22:32:53 +00:00
Warner Losh
fbbd9655e5 Renumber copyright clause 4
Renumber cluase 4 to 3, per what everybody else did when BSD granted
them permission to remove clause 3. My insistance on keeping the same
numbering for legal reasons is too pedantic, so give up on that point.

Submitted by:	Jan Schaumann <jschauma@stevens.edu>
Pull Request:	https://github.com/freebsd/freebsd/pull/96
2017-02-28 23:42:47 +00:00
Bryan Drewery
6a270e17f3 Remove unneeded libutil dependency for sendmail.
It included libutil.h for setproctitle(3), which was moved from libutil to libc
in r65353 in 2000.

Reviewed by:	gshapiro [sendmail change]
Sponsored by:	EMC / Isilon Storage Division
Differential Revision:	https://reviews.freebsd.org/D4261
2015-11-24 04:19:55 +00:00
Gregory Neil Shapiro
1caaaaf09e Reminder to check tools/build/mk/OptionalObsoleteFiles.inc on new
version imports.

Obtained from:	garga@
2015-08-07 04:58:35 +00:00
Gregory Neil Shapiro
382cb225f1 Update for sendmail 8.15.2 import
MFC after:	3 days
2015-07-07 03:02:07 +00:00
Gregory Neil Shapiro
da7d7b9c86 Merge sendmail 8.15.2 to HEAD
MFC after:	3 days
2015-07-07 02:59:02 +00:00
Gregory Neil Shapiro
3df48792f2 An additional fix for the openssl Weak DH remediation:
The import of openssl to address the FreeBSD-SA-15:10.openssl security
advisory includes a change which rejects handshakes with DH parameters
below 768 bits.  sendmail releases prior to 8.15.2 (not yet released),
defaulted to a 512 bit DH parameter setting for client connections.

The first fix committed last week changed the default to 1024 bits.

This commit fixes the case where the DHParameters option is set to a
file which doesn't exist, which is the case on newer versions of
FreeBSD which enable STARTTLS by default by auto-creating TLS
certificates.

MFC after:	2 days
2015-06-23 04:33:54 +00:00
Gregory Neil Shapiro
d815a37dda The import of openssl to address the FreeBSD-SA-15:10.openssl security
advisory includes a change which rejects handshakes with DH parameters
below 768 bits.  sendmail releases prior to 8.15.2 (not yet released),
defaulted to a 512 bit DH parameter setting for client connections.
This commit chages that default to 1024 bits.  sendmail 8.15.2, when
released well use a default of 2048 bits.

MFC after:	1 day
2015-06-16 02:58:50 +00:00
Gregory Neil Shapiro
0232255f90 Default to turning off OpenSSL SSL_OP_TLSEXT_PADDING as it breaks
compatibility with some sites

This change comes from 8.15 but is being backported to FreeBSD releases
not yet using 8.15.

MFC after:	3 days
Noted by:	julian@
2015-03-16 20:24:37 +00:00
Gregory Neil Shapiro
e18480699e Remove build specific details from sendmail.cf/submit.cf in support of
https://wiki.freebsd.org/ReproducibleBuilds

The contrib/sendmail change will be made in the upstream source for a
future sendmail release.

Reviewed by:	des
MFC after:	3 days
2015-01-27 04:06:47 +00:00
Gregory Neil Shapiro
10b240b765 Update for sendmail 8.14.9 import
MFC after:	3 days
2014-05-22 04:41:11 +00:00
Gregory Neil Shapiro
4313cc8344 Merge sendmail 8.14.9 to HEAD
MFC after:	3 days
2014-05-22 04:39:17 +00:00
Gregory Neil Shapiro
9d59bad1e4 Update for sendmail 8.14.8 import
MFC after:	5 days
2014-01-26 23:44:12 +00:00
Gregory Neil Shapiro
1689ae4380 Remove local FreeBSD workaround now that upstream project has a better fix.
MFC after:	5 days
2014-01-26 23:42:40 +00:00
Gregory Neil Shapiro
5dd76dd0cc Merge sendmail 8.14.8 to HEAD
MFC after:	5 days
2014-01-26 23:39:11 +00:00
Gregory Neil Shapiro
e2cd7d5314 Update link to vendor import instructions 2014-01-26 20:13:28 +00:00
Gregory Neil Shapiro
c4190e0fcf Temporarily revert sendmail 8.14.7 change to getipnodebyname() flags to
prevent problems between the resolver and Microsoft DNS servers with
AAAA lookups.  The upstream open source project will work on a more
permanent fix for the next release.  Issue noted by Pavel Timofeev.

MFC after:	3 days
2013-08-12 17:22:39 +00:00
Gregory Neil Shapiro
b0b88fe82d Update for sendmail 8.14.7
MFC after:	4 days
2013-04-21 17:09:51 +00:00
Gregory Neil Shapiro
552d4955b8 Merge sendmail 8.14.7 to HEAD
MFC after:	4 days
2013-04-21 17:08:44 +00:00
Gregory Neil Shapiro
69b95e367f Merge sendmail 8.14.6 errata issue
MFC after:	3 days
2013-02-18 19:33:07 +00:00
Gregory Neil Shapiro
14597e761a Update import info based on recent experiences and sendmail 8.14.6 import.
MFC after:	4 days
2012-12-29 20:38:57 +00:00
Gregory Neil Shapiro
ba00ec3d53 Merge sendmail 8.14.6 to HEAD
MFC after:	4 days
2012-12-29 20:30:46 +00:00
Hajimu UMEMOTO
a944d3c61e cyrus-sasl 2.1.26 was released. In this version, the type of callback
functions was changed from "unsigned long" to "size_t".

Reviewed by:	gshapiro
MFC after:	3 days
2012-11-28 11:47:47 +00:00
Gregory Neil Shapiro
0d3a0b40cd Properly define true/false when defining __bool_true_false_are_defined
for filters which pull in mfapi.h before stdbool.h.  Issue reported by
Petr Rehor, maintainer of amavisd-milter port.

MFC after:	3 days
2012-09-10 01:15:51 +00:00
Hajimu UMEMOTO
35954bbaba Shut up warnings with Cyrus SASL 2.1.25.
Spotted by:	ache
Tested by:	ache
2011-10-01 18:20:10 +00:00
Edward Tomasz Napierala
906a940ee5 Make Sendmail properly set login class and cpumask. 2011-06-30 20:55:16 +00:00
Gregory Neil Shapiro
ed7a8a80d8 Update notes regarding FreeBSD import 2011-06-14 06:44:42 +00:00
Gregory Neil Shapiro
6f9c8e5b07 Merge sendmail 8.14.5 to HEAD
MFC after:	4 days
2011-06-14 04:20:18 +00:00
Ulrich Spörlein
aa64588d28 Remove -mdoc macros from -man page
Neither groff nor mandoc render these when in -man mode.
This was introduced in r38083 as a local change, therefore no commit to
the vendor branch.
2010-06-09 08:53:50 +00:00
Gregory Neil Shapiro
0096258bda Update FreeBSD information
MFC after:	4 days
2010-01-26 04:45:26 +00:00
Gregory Neil Shapiro
9bd497b835 Merge sendmail 8.14.4 to HEAD
MFC after:	4 days
2010-01-26 04:41:15 +00:00
Colin Percival
7d845dde8d Remove build timestamps from the following files:
/boot/kernel/hptrr.ko
/etc/mail/*.cf
/lib/libcrypto.so.5
/usr/bin/ntpq
/usr/sbin/amd
/usr/sbin/iasl
/usr/sbin/ntpd
/usr/sbin/ntpdate
/usr/sbin/ntpdc

There does not appear to be any purpose to having these timestamps, and
they have the irritating consequence that the aforementioned files will
be different every time they are rebuilt.

After this commit, the only remaining build timestamps are in the kernel,
the boot loaders, /usr/include/osreldate.h (the year in the copyright
notice), and lib*.a (the timestamps on all of the included .o files).

Reviewed by:	scottl (hptrr), gshapiro (sendmail), simon (openssl),
		roberto (ntp), jkim (acpica)
Approved by:	re (kib)
2009-07-11 22:30:37 +00:00
Gregory Neil Shapiro
3513e2fba4 Merge from vendor dist: Bring in a change already in the sendmail
repository that will allow sendmail to be built with the c99 compiler.

Submitted by: rdivacky
2008-11-15 04:43:54 +00:00
Gregory Neil Shapiro
dbe6d91e5c Fix an ABI breakage found after the import that will be part of the
next version of sendmail.  Putting it in now for the upcoming 7-BETA
and 6-BETA test releases.

Submitted by:	Mike Tancsa
2008-09-02 04:53:24 +00:00
Gregory Neil Shapiro
9aa98a5913 Update import/merge instructions for the svn repo 2008-08-28 06:20:43 +00:00
Gregory Neil Shapiro
e3793f7654 Merge sendmail 8.14.3 into HEAD.
Note: As the first merge since the conversion to svn, it includes many
propset changes to get the proper svn:eol-style and svn:mime-type on the
files (as merged from the fixed up vendor/dist area).

MFC after:	3 days
2008-08-28 06:08:29 +00:00
Peter Wemm
eeb6d312f5 Stage 1 of sendmail dist tree flattening. contrib/sendmail/contrib
prevents doing this in one pass.
2008-08-28 02:25:51 +00:00
Gregory Neil Shapiro
7c4f8c3c41 Update for sendmail 8.14.2
MFC after:	1 week
2007-11-05 00:21:32 +00:00