diff options
Diffstat (limited to 'extra')
-rwxr-xr-x | extra/source/sendmail/SlackBuild-sendmail | 9 | ||||
-rwxr-xr-x | extra/source/sendmail/SlackBuild-sendmail-cf | 4 | ||||
-rw-r--r-- | extra/source/sendmail/sendmail.sasl.auth.fix.patch | 21 | ||||
-rw-r--r-- | extra/source/sendmail/site.config.m4 | 2 |
4 files changed, 6 insertions, 30 deletions
diff --git a/extra/source/sendmail/SlackBuild-sendmail b/extra/source/sendmail/SlackBuild-sendmail index 7777e8779..f74ecfffe 100755 --- a/extra/source/sendmail/SlackBuild-sendmail +++ b/extra/source/sendmail/SlackBuild-sendmail @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010, 2012, 2013, 2014, 2015, 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2012, 2013, 2014, 2015, 2020, 2023 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,8 +20,8 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=8.17.1 -BUILD=${BUILD:-4_slack15.0} +VERSION=8.17.2 +BUILD=${BUILD:-1_slack15.0} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -79,9 +79,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Patch from FreeBSD to fix SASL auth: -zcat $CWD/sendmail.sasl.auth.fix.patch.gz | patch -p0 --verbose || exit 1 - # Add TLS support to the sendmail binary: cat $CWD/site.config.m4 > devtools/Site/site.config.m4 diff --git a/extra/source/sendmail/SlackBuild-sendmail-cf b/extra/source/sendmail/SlackBuild-sendmail-cf index 5a2dafcfc..6c8eb817e 100755 --- a/extra/source/sendmail/SlackBuild-sendmail-cf +++ b/extra/source/sendmail/SlackBuild-sendmail-cf @@ -20,9 +20,9 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=8.17.1 +VERSION=8.17.2 ARCH=noarch -BUILD=${BUILD:-4_slack15.0} +BUILD=${BUILD:-1_slack15.0} CWD=$(pwd) TMP=${TMP:-/tmp} diff --git a/extra/source/sendmail/sendmail.sasl.auth.fix.patch b/extra/source/sendmail/sendmail.sasl.auth.fix.patch deleted file mode 100644 index 2701fc349..000000000 --- a/extra/source/sendmail/sendmail.sasl.auth.fix.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- sendmail/sendmail.h.orig 2022-04-19 21:07:42 UTC -+++ sendmail/sendmail.h -@@ -760,7 +760,7 @@ extern bool filesys_free __P((long)); - # define SASL_IS_AUTH 2 /* authenticated */ - - /* SASL options */ --# define SASL_AUTH_AUTH 0x1000 /* use auth= only if authenticated */ -+# define SASL_AUTH_AUTH 0x10000 /* use auth= only if authenticated */ - # if SASL >= 20101 - # define SASL_SEC_MASK SASL_SEC_MAXIMUM /* mask for SASL_SEC_* values: sasl.h */ - # else /* SASL >= 20101 */ -@@ -775,6 +775,9 @@ extern bool filesys_free __P((long)); - # endif /* SASL_SEC_NOPLAINTEXT & SASL_SEC_MASK) == 0 ... */ - # endif /* SASL >= 20101 */ - # define MAXOUTLEN 8192 /* length of output buffer, should be 2^n */ -+# if (SASL_AUTH_AUTH & SASL_SEC_MASK) != 0 -+# ERROR "change SASL_AUTH_AUTH notify sendmail.org!" -+# endif - - /* functions */ - extern char *intersect __P((char *, char *, SM_RPOOL_T *)); diff --git a/extra/source/sendmail/site.config.m4 b/extra/source/sendmail/site.config.m4 index 36a692f6b..1142d2c7c 100644 --- a/extra/source/sendmail/site.config.m4 +++ b/extra/source/sendmail/site.config.m4 @@ -2,5 +2,5 @@ APPENDDEF(`confMAPDEF', `-DNEWDB') APPENDDEF(`confLIBS', `-lnsl -lssl -lcrypto -lsasl2 -lwrap -lm -ldb -lresolv -licui18n -licuuc -licudata') APPENDDEF(`conf_libmilter_ENVDEF', `-DMILTER') APPENDDEF(`conf_sendmail_ENVDEF', `-DMILTER') -APPENDDEF(`confENVDEF', `-DNETINET6 -DHAS_GETHOSTBYNAME2=1 -DNEWDB -DSTARTTLS -DDANE -DSASL=2 -DTCPWRAPPERS -DNIS -DMAP_REGEX -DSOCKETMAP -DTLS_EC')dnl +APPENDDEF(`confENVDEF', `-DNETINET6 -DHAS_GETHOSTBYNAME2=1 -DNEWDB -DSTARTTLS -DDANE -DSASL=2 -DTCPWRAPPERS -DNIS -DMAP_REGEX -DSOCKETMAP -DTLS_EC -DUSE_EAI')dnl |