Sun Jul 5 19:43:59 UTC 202020200705194359

ap/mpg123-1.26.2-x86_64-1.txz:  Upgraded.
l/imagemagick-7.0.10_23-x86_64-1.txz:  Upgraded.
l/libevent-2.1.12-x86_64-1.txz:  Upgraded.
extra/pure-alsa-system/mpg123-1.26.2-x86_64-1_alsa.txz:  Upgraded.
extra/sendmail/sendmail-8.16.1-x86_64-1.txz:  Upgraded.
extra/sendmail/sendmail-cf-8.16.1-noarch-1.txz:  Upgraded.

3 files changed, 10 insertions, 250 deletions

diff --git a/extra/source/sendmail/SlackBuild-sendmail b/extra/source/sendmail/SlackBuild-sendmail
index a477d16a..9bee21a8 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  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2012, 2013, 2014, 2015, 2020  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.15.2
-BUILD=${BUILD:-3}
+VERSION=8.16.1
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -51,6 +51,10 @@ else
   LIBDIRSUFFIX=""
 fi
 
+# Compile with DANE? Set to some whitespace to not build with DANE.
+DANE=${DANE:--DDANE}
+SLKCFLAGS="$SLKCFLAGS $DANE"
+
 rm -rf $PKG
 mkdir -p $TMP $PKG
 
@@ -65,11 +69,9 @@ echo "+=================+"
 OSCPU="`uname -srm | tr ' ' '.'`"
 cd $TMP
 rm -rf sendmail-$VERSION
-tar xvf $CWD/sendmail.$VERSION.tar.gz || exit 1
+tar xvf $CWD/sendmail.$VERSION.tar.?z || exit 1
 cd sendmail-$VERSION
 
-zcat $CWD/openssl-1.1.0.patch.gz | patch -p1 --verbose || exit 1
-
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
diff --git a/extra/source/sendmail/SlackBuild-sendmail-cf b/extra/source/sendmail/SlackBuild-sendmail-cf
index 32e88023..7c3f0ba0 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.15.2
+VERSION=8.16.1
 ARCH=noarch
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
diff --git a/extra/source/sendmail/openssl-1.1.0.patch b/extra/source/sendmail/openssl-1.1.0.patch
deleted file mode 100644
index bbca0454..00000000
--- a/extra/source/sendmail/openssl-1.1.0.patch
+++ /dev/null
@@ -1,242 +0,0 @@
-From: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
-Date: Sat, 10 Sep 2016 19:27:17 +0000
-Subject: [PATCH] sendmail: compile against openssl 1.1.0
-
-Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
----
-
---- a/sendmail/tls.c
-+++ b/sendmail/tls.c
-@@ -60,18 +60,58 @@ static unsigned char dh512_g[] =
- 	0x02
- };
- 
-+#if OPENSSL_VERSION_NUMBER < 0x10100000
-+
-+static inline int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g)
-+{
-+	/* If the fields p and g in d are NULL, the corresponding input
-+	 * parameters MUST be non-NULL.  q may remain NULL.
-+	 */
-+	if ((dh->p == NULL && p == NULL)
-+	    || (dh->g == NULL && g == NULL))
-+		return 0;
-+
-+	if (p != NULL) {
-+		BN_free(dh->p);
-+		dh->p = p;
-+	}
-+	if (q != NULL) {
-+		BN_free(dh->q);
-+		dh->q = q;
-+	}
-+	if (g != NULL) {
-+		BN_free(dh->g);
-+		dh->g = g;
-+	}
-+
-+	if (q != NULL) {
-+		dh->length = BN_num_bits(q);
-+	}
-+
-+	return 1;
-+}
-+#endif
-+
- static DH *
- get_dh512()
- {
- 	DH *dh = NULL;
-+	BIGNUM *p;
-+	BIGNUM *g;
- 
--	if ((dh = DH_new()) == NULL)
--		return NULL;
--	dh->p = BN_bin2bn(dh512_p, sizeof(dh512_p), NULL);
--	dh->g = BN_bin2bn(dh512_g, sizeof(dh512_g), NULL);
--	if ((dh->p == NULL) || (dh->g == NULL))
--		return NULL;
-+	dh = DH_new();
-+	p = BN_bin2bn(dh512_p, sizeof(dh512_p), NULL);
-+	g = BN_bin2bn(dh512_g, sizeof(dh512_g), NULL);
-+	if (!dh || !p || !g)
-+		goto err;
-+	if (!DH_set0_pqg(dh, p, NULL, g))
-+		goto err;
- 	return dh;
-+err:
-+	DH_free(dh);
-+	BN_free(p);
-+	BN_free(g);
-+	return NULL;
- }
- 
- #  if 0
-@@ -117,17 +157,22 @@ get_dh2048()
- 		};
- 	static unsigned char dh2048_g[]={ 0x02, };
- 	DH *dh;
-+	BIGNUM *p;
-+	BIGNUM *g;
- 
--	if ((dh=DH_new()) == NULL)
--		return(NULL);
--	dh->p=BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL);
--	dh->g=BN_bin2bn(dh2048_g,sizeof(dh2048_g),NULL);
--	if ((dh->p == NULL) || (dh->g == NULL))
--	{
--		DH_free(dh);
--		return(NULL);
--	}
-+	dh = DH_new();
-+	p = BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL);
-+	g = BN_bin2bn(dh2048_g,sizeof(dh2048_g),NULL);
-+	if (!dh || !p || !g)
-+		goto err;
-+	if (!DH_set0_pqg(dh, p, NULL, g))
-+		goto err;
- 	return(dh);
-+err:
-+	DH_free(dh);
-+	BN_free(p);
-+	BN_free(g);
-+	return NULL;
- }
- # endif /* !NO_DH */
- 
-@@ -926,7 +971,7 @@ inittls(ctx, req, options, srv, certfile
- 	{
- 		/* get a pointer to the current certificate validation store */
- 		store = SSL_CTX_get_cert_store(*ctx);	/* does not fail */
--		crl_file = BIO_new(BIO_s_file_internal());
-+		crl_file = BIO_new(BIO_s_file());
- 		if (crl_file != NULL)
- 		{
- 			if (BIO_read_filename(crl_file, CRLFile) >= 0)
-@@ -1000,26 +1045,43 @@ inittls(ctx, req, options, srv, certfile
- 	**  maybe we should do it only on demand...
- 	*/
- 
--	if (bitset(TLS_I_RSA_TMP, req)
- #  if SM_CONF_SHM
--	    && ShmId != SM_SHM_NO_ID &&
--	    (rsa_tmp = RSA_generate_key(RSA_KEYLENGTH, RSA_F4, NULL,
--					NULL)) == NULL
--#  else /* SM_CONF_SHM */
--	    && 0	/* no shared memory: no need to generate key now */
--#  endif /* SM_CONF_SHM */
--	   )
-+	if (bitset(TLS_I_RSA_TMP, req)
-+	    && ShmId != SM_SHM_NO_ID)
- 	{
--		if (LogLevel > 7)
-+		BIGNUM *bn;
-+
-+		bn = BN_new();
-+		rsa_tmp = RSA_new();
-+		if (!bn || !rsa_tmp || !BN_set_word(bn, RSA_F4)) {
-+			RSA_free(rsa_tmp);
-+			rsa_tmp = NULL;
-+		}
-+		if (rsa_tmp)
- 		{
--			sm_syslog(LOG_WARNING, NOQID,
--				  "STARTTLS=%s, error: RSA_generate_key failed",
--				  who);
--			if (LogLevel > 9)
--				tlslogerr(LOG_WARNING, who);
-+			if (!RSA_generate_key_ex(rsa_tmp, RSA_KEYLENGTH, bn, NULL))
-+			{
-+				RSA_free(rsa_tmp);
-+				rsa_tmp = NULL;
-+			}
-+		}
-+		BN_free(bn);
-+		if (!rsa_tmp)
-+		{
-+			if (LogLevel > 7)
-+			{
-+				sm_syslog(LOG_WARNING, NOQID,
-+					  "STARTTLS=%s, error: RSA_generate_key failed",
-+					  who);
-+				if (LogLevel > 9)
-+					tlslogerr(LOG_WARNING, who);
-+			}
-+			return false;
- 		}
--		return false;
- 	}
-+#  else /* SM_CONF_SHM */
-+	/* no shared memory: no need to generate key now */
-+#  endif /* SM_CONF_SHM */
- # endif /* !TLS_NO_RSA */
- 
- 	/*
-@@ -1210,9 +1272,15 @@ inittls(ctx, req, options, srv, certfile
- 				sm_dprintf("inittls: Generating %d bit DH parameters\n", bits);
- 
- 			/* this takes a while! */
--			dsa = DSA_generate_parameters(bits, NULL, 0, NULL,
--						      NULL, 0, NULL);
--			dh = DSA_dup_DH(dsa);
-+			dsa = DSA_new();
-+			if (dsa) {
-+				int r;
-+
-+				r = DSA_generate_parameters_ex(dsa, bits, NULL, 0,
-+							    NULL, NULL, NULL);
-+				if (r != 0)
-+					dh = DSA_dup_DH(dsa);
-+			}
- 			DSA_free(dsa);
- 		}
- 		else if (dh == NULL && bitset(TLS_I_DHFIXED, req))
-@@ -1733,6 +1801,9 @@ tmp_rsa_key(s, export, keylength)
- 	int export;
- 	int keylength;
- {
-+	BIGNUM *bn;
-+	int ret;
-+
- #   if SM_CONF_SHM
- 	extern int ShmId;
- 	extern int *PRSATmpCnt;
-@@ -1742,10 +1813,22 @@ tmp_rsa_key(s, export, keylength)
- 		return rsa_tmp;
- #   endif /* SM_CONF_SHM */
- 
--	if (rsa_tmp != NULL)
--		RSA_free(rsa_tmp);
--	rsa_tmp = RSA_generate_key(RSA_KEYLENGTH, RSA_F4, NULL, NULL);
--	if (rsa_tmp == NULL)
-+	if (rsa_tmp == NULL) {
-+		rsa_tmp = RSA_new();
-+		if (!rsa_tmp)
-+			return NULL;
-+	}
-+
-+	bn = BN_new();
-+	if (!bn)
-+		return NULL;
-+	if (!BN_set_word(bn, RSA_F4)) {
-+		BN_free(bn);
-+		return NULL;
-+	}
-+	ret = RSA_generate_key_ex(rsa_tmp, RSA_KEYLENGTH, bn, NULL);
-+	BN_free(bn);
-+	if (!ret)
- 	{
- 		if (LogLevel > 0)
- 			sm_syslog(LOG_ERR, NOQID,
-@@ -1971,9 +2054,9 @@ x509_verify_cb(ok, ctx)
- 	{
- 		if (LogLevel > 13)
- 			tls_verify_log(ok, ctx, "x509");
--		if (ctx->error == X509_V_ERR_UNABLE_TO_GET_CRL)
-+		if (X509_STORE_CTX_get_error(ctx) == X509_V_ERR_UNABLE_TO_GET_CRL)
- 		{
--			ctx->error = 0;
-+			X509_STORE_CTX_set_error(ctx, 0);
- 			return 1;	/* override it */
- 		}
- 	}