Thu Mar 9 20:28:23 UTC 202320230309202823

a/openssl-solibs-3.0.8-x86_64-2.txz:  Rebuilt.
ap/dc3dd-7.3.0-x86_64-1.txz:  Upgraded.
ap/mariadb-10.11.2-x86_64-1.txz:  Upgraded.
d/cmake-3.25.3-x86_64-1.txz:  Upgraded.
l/imagemagick-7.1.1_1-x86_64-1.txz:  Upgraded.
l/libieee1284-0.2.11-x86_64-7.txz:  Rebuilt.
  Rebuilt for python3. Thanks to Heinz Wiesinger.
l/libplist-2.2.0-x86_64-4.txz:  Rebuilt.
  Rebuilt for python3. Thanks to Heinz Wiesinger.
l/pipewire-0.3.67-x86_64-1.txz:  Upgraded.
n/ModemManager-1.20.6-x86_64-1.txz:  Upgraded.
n/NetworkManager-1.42.4-x86_64-1.txz:  Upgraded.
n/openssl-3.0.8-x86_64-2.txz:  Rebuilt.
  Fixed man pages. Thanks to marav.
  Add example for enabling the legacy algorithms to /etc/ssl/openssl.cnf.
  Thanks to ctrlaltca.
n/openvpn-2.6.1-x86_64-1.txz:  Upgraded.
x/ibus-libpinyin-1.15.2-x86_64-1.txz:  Upgraded.
x/mesa-22.3.7-x86_64-1.txz:  Upgraded.

5 files changed, 10 insertions, 68 deletions

diff --git a/source/ap/dc3dd/dc3dd.SlackBuild b/source/ap/dc3dd/dc3dd.SlackBuild
index 9ad8fcc2a..c3451ad70 100755
--- a/source/ap/dc3dd/dc3dd.SlackBuild
+++ b/source/ap/dc3dd/dc3dd.SlackBuild
@@ -2,8 +2,8 @@
 
 # Slackware build script for dc3dd
 
-# Copyright 2008 Barry J. Grundy <http://www.linuxleo.com>
-# Copyright 2010, 2018 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008  Barry J. Grundy <http://www.linuxleo.com>
+# Copyright 2010, 2018, 2023  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=dc3dd		
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -78,8 +78,6 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \+
 
-zcat $CWD/dc3dd.glibc228.diff.gz | patch -p1 --verbose || exit 1
-
 chmod +x ./configure
 
 CFLAGS="$SLKCFLAGS" \
diff --git a/source/ap/dc3dd/dc3dd.glibc228.diff b/source/ap/dc3dd/dc3dd.glibc228.diff
deleted file mode 100644
index cd5f2bda9..000000000
--- a/source/ap/dc3dd/dc3dd.glibc228.diff
+++ /dev/null
@@ -1,57 +0,0 @@
---- ./lib/stdio-impl.h.orig	2012-11-06 05:42:58.000000000 -0600
-+++ ./lib/stdio-impl.h	2018-09-18 18:43:39.324058680 -0500
-@@ -92,3 +92,10 @@
- # endif
- 
- #endif
-+
-+/* Glibc 2.28 made _IO_IN_BACKUP private.  For now, work around this
-+   problem by defining it ourselves.  FIXME: Do not rely on glibc
-+   internals.  */
-+#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN
-+# define _IO_IN_BACKUP 0x100
-+#endif
---- ./lib/freadahead.c.orig	2012-11-06 05:42:58.000000000 -0600
-+++ ./lib/freadahead.c	2018-09-18 18:43:39.319058680 -0500
-@@ -24,7 +24,7 @@
- size_t
- freadahead (FILE *fp)
- {
--#if defined _IO_ferror_unlocked || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */
-+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */
-   if (fp->_IO_write_ptr > fp->_IO_write_base)
-     return 0;
-   return (fp->_IO_read_end - fp->_IO_read_ptr)
---- ./lib/freadseek.c.orig	2012-11-06 05:42:58.000000000 -0600
-+++ ./lib/freadseek.c	2018-09-18 18:43:39.322058680 -0500
-@@ -34,7 +34,7 @@
- freadptrinc (FILE *fp, size_t increment)
- {
-   /* Keep this code in sync with freadptr!  */
--#if defined _IO_ferror_unlocked || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */
-+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */
-   fp->_IO_read_ptr += increment;
- #elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */
-   fp_->_p += increment;
---- ./lib/fseterr.c.orig	2012-11-06 05:42:58.000000000 -0600
-+++ ./lib/fseterr.c	2018-09-18 18:43:39.323058680 -0500
-@@ -29,7 +29,7 @@
-   /* Most systems provide FILE as a struct and the necessary bitmask in
-      <stdio.h>, because they need it for implementing getc() and putc() as
-      fast macros.  */
--#if defined _IO_ferror_unlocked || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */
-+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */
-   fp->_flags |= _IO_ERR_SEEN;
- #elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */
-   fp_->_flags |= __SERR;
---- ./lib/freadptr.c.orig	2012-11-06 05:42:58.000000000 -0600
-+++ ./lib/freadptr.c	2018-09-18 18:43:39.321058680 -0500
-@@ -29,7 +29,7 @@
-   size_t size;
- 
-   /* Keep this code in sync with freadahead!  */
--#if defined _IO_ferror_unlocked || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */
-+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */
-   if (fp->_IO_write_ptr > fp->_IO_write_base)
-     return NULL;
-   size = fp->_IO_read_end - fp->_IO_read_ptr;
diff --git a/source/ap/dc3dd/slack-desc b/source/ap/dc3dd/slack-desc
index 5350464be..0b29ac8fa 100644
--- a/source/ap/dc3dd/slack-desc
+++ b/source/ap/dc3dd/slack-desc
@@ -14,6 +14,6 @@ dc3dd: dcfldd, but were rewritten for dc3dd. Added features include robust
 dc3dd: error handling, logging, progress meter, image verification, split 
 dc3dd: output and more.
 dc3dd:
-dc3dd: http://sourceforge.net/projects/dc3dd/
+dc3dd: https://sourceforge.net/projects/dc3dd/
 dc3dd:
 dc3dd:
diff --git a/source/ap/mariadb/doinst.sh b/source/ap/mariadb/doinst.sh
index b106e2fed..f65d4269f 100644
--- a/source/ap/mariadb/doinst.sh
+++ b/source/ap/mariadb/doinst.sh
@@ -22,11 +22,12 @@ config etc/rc.d/rc.mysqld.new
 config etc/mysqlaccess.conf.new
 config etc/my.cnf.new
 config etc/my.cnf.d/client.cnf.new
+config etc/my.cnf.d/hashicorp_key_management.cnf.new
 config etc/my.cnf.d/mysql-clients.cnf.new
 config etc/my.cnf.d/s3.cnf.new
 config etc/my.cnf.d/server.cnf.new
 config etc/my.cnf.d/spider.cnf.new
-config etc/logrotate.d/mysql.new
+config etc/logrotate.d/mariadb.new
 
 # This one is only comments, so remove it if it's left behind:
 if [ -r etc/security/user_map.conf.new ]; then
diff --git a/source/ap/mariadb/mariadb.SlackBuild b/source/ap/mariadb/mariadb.SlackBuild
index 4b8cc818e..e89014d08 100755
--- a/source/ap/mariadb/mariadb.SlackBuild
+++ b/source/ap/mariadb/mariadb.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2008, 2009, 2010, 2012, 2013, 2014, 2017, 2018, 2020, 2021, 2022  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2012, 2013, 2014, 2017, 2018, 2020, 2021, 2022, 2023  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # Copyright 2011, 2012, 2013, 2014, 2017  Heinz Wiesinger, Amsterdam, The Netherlands
 # All rights reserved.
 #
@@ -30,7 +30,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=mariadb
 VERSION=${VERSION:-$(echo ${PKGNAM}-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 # To reduce the package size, the embedded server may be omitted.  Currently
 # only amarok uses this.  To build without embedded support, set this to NO.
@@ -211,8 +211,8 @@ install -m 644 scripts/mysqlaccess.conf $PKG/etc/mysqlaccess.conf.new
 # Mark config files under /etc as .new
 mv $PKG/etc/my.cnf $PKG/etc/my.cnf.new
 mv $PKG/etc/security/user_map.conf $PKG/etc/security/user_map.conf.new
-mv $PKG/etc/logrotate.d/mysql $PKG/etc/logrotate.d/mysql.new
-for i in client mysql-clients s3 server spider ; do
+mv $PKG/etc/logrotate.d/mariadb $PKG/etc/logrotate.d/mariadb.new
+for i in client hashicorp_key_management mysql-clients s3 server spider ; do
   mv $PKG/etc/my.cnf.d/$i.cnf $PKG/etc/my.cnf.d/$i.cnf.new
 done