diff options
Diffstat (limited to 'extra')
| -rwxr-xr-x | extra/source/sendmail/SlackBuild-sendmail | 5 | ||||
| -rwxr-xr-x | extra/source/sendmail/SlackBuild-sendmail-cf | 2 | ||||
| -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, 27 insertions, 3 deletions
diff --git a/extra/source/sendmail/SlackBuild-sendmail b/extra/source/sendmail/SlackBuild-sendmail index f2fc73b06..7777e8779 100755 --- a/extra/source/sendmail/SlackBuild-sendmail +++ b/extra/source/sendmail/SlackBuild-sendmail @@ -21,7 +21,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. VERSION=8.17.1 -BUILD=${BUILD:-3_slack15.0} +BUILD=${BUILD:-4_slack15.0} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -79,6 +79,9 @@ 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 76d32629c..5a2dafcfc 100755 --- a/extra/source/sendmail/SlackBuild-sendmail-cf +++ b/extra/source/sendmail/SlackBuild-sendmail-cf @@ -22,7 +22,7 @@ VERSION=8.17.1 ARCH=noarch -BUILD=${BUILD:-3_slack15.0} +BUILD=${BUILD:-4_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 new file mode 100644 index 000000000..2701fc349 --- /dev/null +++ b/extra/source/sendmail/sendmail.sasl.auth.fix.patch @@ -0,0 +1,21 @@ +--- 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 1142d2c7c..36a692f6b 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 -DUSE_EAI')dnl +APPENDDEF(`confENVDEF', `-DNETINET6 -DHAS_GETHOSTBYNAME2=1 -DNEWDB -DSTARTTLS -DDANE -DSASL=2 -DTCPWRAPPERS -DNIS -DMAP_REGEX -DSOCKETMAP -DTLS_EC')dnl |