diff options
Diffstat (limited to 'source')
21 files changed, 538 insertions, 174 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 diff --git a/source/d/cmake/cmake.url b/source/d/cmake/cmake.url index 20dd3cfc1..eb8145ec4 100644 --- a/source/d/cmake/cmake.url +++ b/source/d/cmake/cmake.url @@ -1,2 +1,2 @@ https://github.com/Kitware/CMake/releases -https://github.com/Kitware/CMake/releases/download/v3.25.2/cmake-3.25.2.tar.gz +https://github.com/Kitware/CMake/releases/download/v3.25.3/cmake-3.25.3.tar.gz diff --git a/source/l/imagemagick/imagemagick.SlackBuild b/source/l/imagemagick/imagemagick.SlackBuild index 254d9c7ea..21e77f538 100755 --- a/source/l/imagemagick/imagemagick.SlackBuild +++ b/source/l/imagemagick/imagemagick.SlackBuild @@ -23,7 +23,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=imagemagick -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # NOTE: This is to cope with ImageMagick version numbers such as 5.4.7-4, # which occur fairly often (but not always). If these numbers are all the same, diff --git a/source/l/libieee1284/libieee1284-add-more-python-bindings.patch b/source/l/libieee1284/libieee1284-add-more-python-bindings.patch new file mode 100644 index 000000000..eea4cb4fc --- /dev/null +++ b/source/l/libieee1284/libieee1284-add-more-python-bindings.patch @@ -0,0 +1,62 @@ +From b4d63327dfef8dbf12aabf4bba0f6818a3519995 Mon Sep 17 00:00:00 2001 +From: Tim Waugh <twaugh@redhat.com> +Date: Tue, 8 Mar 2011 15:07:04 +0000 +Subject: [PATCH] 2011-03-08 Tim Waugh <twaugh@redhat.com> + +* src/ieee1284module.c: Added bindings for get_irq_fd and +clear_irq. Patch by Sergey Temerkhanov. +--- + src/ieee1284module.c | 33 +++++++++++++++++++++++++++++++++ + 2 files changed, 38 insertions(+) + +diff --git a/src/ieee1284module.c b/src/ieee1284module.c +index 0093d6f..23c1f29 100644 +--- a/src/ieee1284module.c ++++ b/src/ieee1284module.c +@@ -189,6 +189,33 @@ Parport_open (ParportObject *self, PyObject *args) + return PyInt_FromLong (capabilities); + } + ++static PyObject * ++Parport_get_irq_fd (ParportObject *self) ++{ ++ int fd = ieee1284_get_irq_fd (self->port); ++ if (fd < 0) { ++ handle_error (fd); ++ return NULL; ++ } ++ ++ return PyInt_FromLong (fd); ++} ++ ++static PyObject * ++Parport_clear_irq (ParportObject *self) ++{ ++ int portcount = 0; ++ int r; ++ ++ int fd = ieee1284_clear_irq (self->port, &portcount); ++ if (r < 0) { ++ handle_error (r); ++ return NULL; ++ } ++ ++ return PyInt_FromLong (portcount); ++} ++ + static PyObject * + Parport_close (ParportObject *self) + { +@@ -484,6 +511,12 @@ PyMethodDef Parport_methods[] = { + { "close", (PyCFunction) Parport_close, METH_NOARGS, + "close() -> None\n" + "Closes a port." }, ++ { "get_irq_fd", (PyCFunction) Parport_get_irq_fd, METH_VARARGS, ++ "get_irq_fd() -> int\n" ++ "Returns a pollable IRQ file descriptor." }, ++ { "clear_irq", (PyCFunction) Parport_clear_irq, METH_NOARGS, ++ "clear_irq(portcount) -> int\n" ++ "Clears IRQ and returns number of IRQs raised." }, + { "claim", (PyCFunction) Parport_claim, METH_NOARGS, + "claim() -> None\n" + "Claims a port." }, diff --git a/source/l/libieee1284/libieee1284-fix-warnings.patch b/source/l/libieee1284/libieee1284-fix-warnings.patch new file mode 100644 index 000000000..b65824c8a --- /dev/null +++ b/source/l/libieee1284/libieee1284-fix-warnings.patch @@ -0,0 +1,103 @@ +From c48855528beee1397d883f9c8a5df7aed5c917a6 Mon Sep 17 00:00:00 2001 +From: Tim Waugh <twaugh@redhat.com> +Date: Wed, 23 Jun 2010 11:58:04 +0000 +Subject: [PATCH] 2010-06-23 Tim Waugh <twaugh@redhat.com> + +* src/ieee1284module.c: Fixed warnings. +--- + src/ieee1284module.c | 37 ++++++++++++++++++++++++++++--------- + 2 files changed, 29 insertions(+), 9 deletions(-) + +diff --git a/src/ieee1284module.c b/src/ieee1284module.c +index 30972f8..0093d6f 100644 +--- a/src/ieee1284module.c ++++ b/src/ieee1284module.c +@@ -28,6 +28,17 @@ typedef struct { + struct parport *port; + } ParportObject; + ++static PyObject * ++Parport_new (PyTypeObject *type, PyObject *args, PyObject *kwds) ++{ ++ ParportObject *self; ++ self = (ParportObject *) type->tp_alloc (type, 0); ++ if (self != NULL) ++ self->port = NULL; ++ ++ return (PyObject *) self; ++} ++ + static int + Parport_init (ParportObject *self, PyObject *args, PyObject *kwds) + { +@@ -215,7 +226,6 @@ Parport_release (ParportObject *self) + static PyObject * + Parport_read_data (ParportObject *self) + { +- unsigned char b[2]; + int r = ieee1284_read_data (self->port); + if (r < 0) { + handle_error (r); +@@ -258,7 +268,6 @@ Parport_data_dir (ParportObject *self, PyObject *args) + static PyObject * + Parport_read_status (ParportObject *self) + { +- unsigned char b[2]; + int r = ieee1284_read_status (self->port); + if (r < 0) { + handle_error (r); +@@ -293,7 +302,6 @@ Parport_wait_status (ParportObject *self, PyObject *args) + static PyObject * + Parport_read_control (ParportObject *self) + { +- unsigned char b[2]; + int r = ieee1284_read_control (self->port); + if (r < 0) { + handle_error (r); +@@ -435,7 +443,6 @@ Parport_##x (ParportObject *self, PyObject *args) \ + int len; \ + char *buffer; \ + ssize_t wrote; \ +- PyObject *ret; \ + \ + if (!PyArg_ParseTuple (args, "s#|i", &buffer, &len, &flags)) \ + return NULL; \ +@@ -562,6 +569,23 @@ static PyTypeObject ParportType = { + 0, /* tp_as_buffer */ + Py_TPFLAGS_DEFAULT, /* tp_flags */ + "parallel port object", /* tp_doc */ ++ 0, /* tp_traverse */ ++ 0, /* tp_clear */ ++ 0, /* tp_richcompare */ ++ 0, /* tp_weaklistoffset */ ++ 0, /* tp_iter */ ++ 0, /* tp_iternext */ ++ Parport_methods, /* tp_methods */ ++ 0, /* tp_members */ ++ Parport_getseters, /* tp_getset */ ++ 0, /* tp_base */ ++ 0, /* tp_dict */ ++ 0, /* tp_descr_get */ ++ 0, /* tp_descr_set */ ++ 0, /* tp_dictoffset */ ++ (initproc)Parport_init, /* tp_init */ ++ 0, /* tp_alloc */ ++ Parport_new, /* tp_new */ + }; + + static PyObject * +@@ -625,14 +649,9 @@ initieee1284 (void) + PyObject *d = PyModule_GetDict (m); + PyObject *c; + +- ParportType.tp_new = PyType_GenericNew; +- ParportType.tp_init = (initproc) Parport_init; +- ParportType.tp_getset = Parport_getseters; +- ParportType.tp_methods = Parport_methods; + if (PyType_Ready (&ParportType) < 0) + return; + +- Py_INCREF (&ParportType); + PyModule_AddObject (m, "Parport", (PyObject *) &ParportType); + + pyieee1284_error = PyErr_NewException("ieee1284.error", NULL, NULL); diff --git a/source/l/libieee1284/libieee1284-python3.patch b/source/l/libieee1284/libieee1284-python3.patch new file mode 100644 index 000000000..bed2be230 --- /dev/null +++ b/source/l/libieee1284/libieee1284-python3.patch @@ -0,0 +1,266 @@ +diff --git a/src/ieee1284module.c b/src/ieee1284module.c +index 23c1f29..c6d6928 100644 +--- a/src/ieee1284module.c ++++ b/src/ieee1284module.c +@@ -52,33 +52,32 @@ Parport_dealloc (ParportObject *self) + { + if (self->port) + ieee1284_unref (self->port); +- +- self->ob_type->tp_free ((PyObject *) self); ++ Py_TYPE(self)->tp_free((PyObject *) self); + } + + static PyObject * + Parport_getname (ParportObject *self, void *closure) + { +- return PyString_FromString (self->port->name); ++ return PyBytes_FromString (self->port->name); + } + + static PyObject * + Parport_getbase_addr (ParportObject *self, void *closure) + { +- return PyInt_FromLong (self->port->base_addr); ++ return PyLong_FromLong (self->port->base_addr); + } + + static PyObject * + Parport_gethibase_addr (ParportObject *self, void *closure) + { +- return PyInt_FromLong (self->port->hibase_addr); ++ return PyLong_FromLong (self->port->hibase_addr); + } + + static PyObject * + Parport_getfilename (ParportObject *self, void *closure) + { + if (self->port->filename) +- return PyString_FromString (self->port->filename); ++ return PyBytes_FromString (self->port->filename); + + Py_INCREF (Py_None); + return Py_None; +@@ -168,7 +167,7 @@ Parport_get_deviceid (ParportObject *self, PyObject *args) + return NULL; + } + +- return PyString_FromStringAndSize (buffer, r); ++ return PyBytes_FromStringAndSize (buffer, r); + } + + static PyObject * +@@ -186,7 +185,7 @@ Parport_open (ParportObject *self, PyObject *args) + return NULL; + } + +- return PyInt_FromLong (capabilities); ++ return PyLong_FromLong (capabilities); + } + + static PyObject * +@@ -198,7 +197,7 @@ Parport_get_irq_fd (ParportObject *self) + return NULL; + } + +- return PyInt_FromLong (fd); ++ return PyLong_FromLong (fd); + } + + static PyObject * +@@ -213,7 +212,7 @@ Parport_clear_irq (ParportObject *self) + return NULL; + } + +- return PyInt_FromLong (portcount); ++ return PyLong_FromLong (portcount); + } + + static PyObject * +@@ -259,7 +258,7 @@ Parport_read_data (ParportObject *self) + return NULL; + } + +- return PyInt_FromLong (r); ++ return PyLong_FromLong (r); + } + + static PyObject * +@@ -301,7 +300,7 @@ Parport_read_status (ParportObject *self) + return NULL; + } + +- return PyInt_FromLong (r); ++ return PyLong_FromLong (r); + } + + static PyObject * +@@ -335,7 +334,7 @@ Parport_read_control (ParportObject *self) + return NULL; + } + +- return PyInt_FromLong (r); ++ return PyLong_FromLong (r); + } + + static PyObject * +@@ -452,7 +451,7 @@ Parport_##x (ParportObject *self, PyObject *args) \ + return NULL; \ + } \ + \ +- ret = PyString_FromStringAndSize (buffer, got); \ ++ ret = PyBytes_FromStringAndSize (buffer, got); \ + free (buffer); \ + return ret; \ + } +@@ -480,7 +479,7 @@ Parport_##x (ParportObject *self, PyObject *args) \ + return NULL; \ + } \ + \ +- return PyInt_FromLong (wrote); \ ++ return PyLong_FromLong (wrote); \ + } + + #define WRITE_METHOD(x) \ +@@ -581,44 +580,53 @@ WRITE_METHOD(ecp_write_addr) + + static PyTypeObject ParportType = { + PyObject_HEAD_INIT(NULL) +- 0, /* ob_size */ +- "ieee1284.Parport", /* tp_name */ +- sizeof (ParportObject), /* tp_basicsize */ +- 0, /* tp_itemsize */ +- (destructor)Parport_dealloc, /* tp_dealloc */ +- 0, /* tp_print */ +- 0, /* tp_getattr */ +- 0, /* tp_setattr */ +- 0, /* tp_compare */ +- 0, /* tp_repr */ +- 0, /* tp_as_number */ +- 0, /* tp_as_sequence */ +- 0, /* tp_as_mapping */ +- 0, /* tp_hash */ +- 0, /* tp_call */ +- 0, /* tp_str */ +- 0, /* tp_getattro */ +- 0, /* tp_setattro */ +- 0, /* tp_as_buffer */ +- Py_TPFLAGS_DEFAULT, /* tp_flags */ +- "parallel port object", /* tp_doc */ +- 0, /* tp_traverse */ +- 0, /* tp_clear */ +- 0, /* tp_richcompare */ +- 0, /* tp_weaklistoffset */ +- 0, /* tp_iter */ +- 0, /* tp_iternext */ +- Parport_methods, /* tp_methods */ +- 0, /* tp_members */ +- Parport_getseters, /* tp_getset */ +- 0, /* tp_base */ +- 0, /* tp_dict */ +- 0, /* tp_descr_get */ +- 0, /* tp_descr_set */ +- 0, /* tp_dictoffset */ +- (initproc)Parport_init, /* tp_init */ +- 0, /* tp_alloc */ +- Parport_new, /* tp_new */ ++ "ieee1284.Parport", /* const char *tp_name; */ ++ sizeof (ParportObject), /* Py_ssize_t tp_basicsize */ ++ 0, /* Py_ssize_t tp_itemsize; */ ++ (destructor)Parport_dealloc, /* destructor tp_dealloc; */ ++ 0, /* printfunc tp_print; */ ++ 0, /* getattrfunc tp_getattr; */ ++ 0, /* setattrfunc tp_setattr; */ ++ 0, /* PyAsyncMethods *tp_as_async; */ ++ 0, /* reprfunc tp_repr; */ ++ 0, /* PyNumberMethods *tp_as_number; */ ++ 0, /* PySequenceMethods *tp_as_sequence; */ ++ 0, /* PyMappingMethods *tp_as_mapping; */ ++ 0, /* hashfunc tp_hash; */ ++ 0, /* ternaryfunc tp_call; */ ++ 0, /* reprfunc tp_str; */ ++ 0, /* getattrofunc tp_getattro; */ ++ 0, /* setattrofunc tp_setattro; */ ++ 0, /* PyBufferProcs *tp_as_buffer; */ ++ Py_TPFLAGS_DEFAULT, /* unsigned long tp_flags; */ ++ "parallel port object", /* const char *tp_doc; */ ++ 0, /* traverseproc tp_traverse; */ ++ 0, /* inquiry tp_clear; */ ++ 0, /* richcmpfunc tp_richcompare; */ ++ 0, /* Py_ssize_t tp_weaklistoffset; */ ++ 0, /* getiterfunc tp_iter; */ ++ 0, /* iternextfunc tp_iternext; */ ++ Parport_methods, /* struct PyMethodDef *tp_methods; */ ++ 0, /* struct PyMemberDef *tp_members; */ ++ Parport_getseters, /* struct PyGetSetDef *tp_getset; */ ++ 0, /* struct _typeobject *tp_base; */ ++ 0, /* PyObject *tp_dict; */ ++ 0, /* descrgetfunc tp_descr_get; */ ++ 0, /* descrsetfunc tp_descr_set; */ ++ 0, /* Py_ssize_t tp_dictoffset; */ ++ (initproc)Parport_init, /* initproc tp_init; */ ++ 0, /* allocfunc tp_alloc; */ ++ Parport_new, /* newfunc tp_new; */ ++ 0, /* freefunc tp_free; */ ++ 0, /* inquiry tp_is_gc; */ ++ 0, /* PyObject *tp_bases; */ ++ 0, /* PyObject *tp_mro; */ ++ 0, /* PyObject *tp_cache; */ ++ 0, /* PyObject *tp_subclasses; */ ++ 0, /* PyObject *tp_weaklist; */ ++ 0, /* destructor tp_del; */ ++ 0, /* unsigned int tp_version_tag; */ ++ 0 /* destructor tp_finalize; */ + }; + + static PyObject * +@@ -672,18 +680,30 @@ static PyMethodDef Ieee1284Methods[] = { + {NULL, NULL, 0, NULL} + }; + ++static struct PyModuleDef Ieee1284Module = { ++ PyModuleDef_HEAD_INIT, ++ "ieee1284", ++ NULL, /* documentation */ ++ -1, ++ Ieee1284Methods, ++ NULL, ++ NULL, ++ NULL, ++ NULL ++}; ++ + #ifndef PyMODINIT_FUNC + #define PyMODINIT_FUNC void + #endif + PyMODINIT_FUNC +-initieee1284 (void) ++PyInit_ieee1284module (void) + { +- PyObject *m = Py_InitModule ("ieee1284", Ieee1284Methods); ++ PyObject *m = PyModule_Create (&Ieee1284Module); + PyObject *d = PyModule_GetDict (m); + PyObject *c; + + if (PyType_Ready (&ParportType) < 0) +- return; ++ return NULL; + + PyModule_AddObject (m, "Parport", (PyObject *) &ParportType); + +@@ -693,7 +713,7 @@ initieee1284 (void) + + #define CONSTANT(x) \ + do { \ +- c = PyInt_FromLong (x); \ ++ c = PyLong_FromLong (x); \ + PyDict_SetItemString (d, #x, c); \ + Py_DECREF (c); \ + } while (0) +@@ -740,4 +760,6 @@ initieee1284 (void) + CONSTANT (F1284_SWE); + CONSTANT (F1284_RLE); + CONSTANT (F1284_FASTEPP); ++ ++ return m; + } diff --git a/source/l/libieee1284/libieee1284.SlackBuild b/source/l/libieee1284/libieee1284.SlackBuild index 326b6573e..1827ffda3 100755 --- a/source/l/libieee1284/libieee1284.SlackBuild +++ b/source/l/libieee1284/libieee1284.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2006, 2007, 2008, 2009, 2010, 2018 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2007, 2008, 2009, 2010, 2018, 2023 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libieee1284 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-6} +BUILD=${BUILD:-7} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -78,8 +78,20 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +# Upstream commits around better python bindings support +zcat $CWD/libieee1284-fix-warnings.patch.gz | patch -p1 --verbose || exit 1 +zcat $CWD/libieee1284-add-more-python-bindings.patch.gz | patch -p1 --verbose || exit 1 + +# Arch patch to update python bindings to python3 +zcat $CWD/libieee1284-python3.patch.gz | patch -p1 --verbose || exit 1 + +sed -i "s|print sys.version\[:3\]|print(sys.version\[:3\])|" ./configure +sed -i "s|print sys.platform|print(sys.platform)|" ./configure +sed -i "s|lib/python|lib$LIBDIRSUFFIX/python|" ./configure + # Configure: CFLAGS="$SLKCFLAGS" \ +PYTHON="/usr/bin/python3" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/source/l/libieee1284/libieee1284.url b/source/l/libieee1284/libieee1284.url new file mode 100644 index 000000000..3e23f17bb --- /dev/null +++ b/source/l/libieee1284/libieee1284.url @@ -0,0 +1 @@ +https://github.com/twaugh/libieee1284 diff --git a/source/l/libplist/libplist.SlackBuild b/source/l/libplist/libplist.SlackBuild index 1c1080094..0a1f68ad7 100755 --- a/source/l/libplist/libplist.SlackBuild +++ b/source/l/libplist/libplist.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2011, 2014, 2018, 2019 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2011, 2014, 2018, 2019, 2023 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libplist VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -90,15 +90,13 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -# Ignore Python 2.7 EOL for now. We want to get rid of it ASAP, but not sooner: -export PYTHONWARNINGS=ignore:::pkg_resources.py2_warn - if [ ! -r configure ]; then NOCONFIGURE=1 ./autogen.sh fi CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ +PYTHON="/usr/bin/python3" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/source/l/pipewire/pipewire.SlackBuild b/source/l/pipewire/pipewire.SlackBuild index 2819363ff..a601917b7 100755 --- a/source/l/pipewire/pipewire.SlackBuild +++ b/source/l/pipewire/pipewire.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=pipewire VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/ModemManager/ModemManager.SlackBuild b/source/n/ModemManager/ModemManager.SlackBuild index 50371f7cc..c89663ad5 100755 --- a/source/n/ModemManager/ModemManager.SlackBuild +++ b/source/n/ModemManager/ModemManager.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for ModemManager # Copyright 2010, 2011 Robby Workman, Tuscaloosa, Alabama, USA -# Copyright 2021 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2021, 2023 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -82,6 +82,14 @@ find . \ zcat $CWD/WeDoNotHaveSystemD.patch.gz | patch -p1 --verbose || exit 1 +if [ ! -r configure ]; then + if [ -x ./autogen.sh ]; then + NOCONFIGURE=1 ./autogen.sh + else + autoreconf -vif + fi +fi + LIBSYSTEMD_LOGIN_CFLAGS="$(pkg-config --cflags libelogind)" \ LIBSYSTEMD_LOGIN_LIBS="$(pkg-config --libs libelogind)" \ CFLAGS="$SLKCFLAGS -Wno-incompatible-pointer-types" \ @@ -124,4 +132,3 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PKGNAM-$VERSION-$ARCH-$BUILD.txz - diff --git a/source/n/openssl/0024-load-legacy-prov.patch b/source/n/openssl/0024-load-legacy-prov.patch new file mode 100644 index 000000000..bb6f84ebe --- /dev/null +++ b/source/n/openssl/0024-load-legacy-prov.patch @@ -0,0 +1,55 @@ +--- ./apps/openssl.cnf.orig 2023-03-09 12:18:42.039633050 -0600 ++++ ./apps/openssl.cnf 2023-03-09 12:26:32.614607021 -0600 +@@ -42,35 +42,33 @@ + tsa_policy2 = 1.2.3.4.5.6 + tsa_policy3 = 1.2.3.4.5.7 + +-# For FIPS +-# Optionally include a file that is generated by the OpenSSL fipsinstall +-# application. This file contains configuration data required by the OpenSSL +-# fips provider. It contains a named section e.g. [fips_sect] which is +-# referenced from the [provider_sect] below. +-# Refer to the OpenSSL security policy for more information. +-# .include fipsmodule.cnf +- + [openssl_init] + providers = provider_sect + +-# List of providers to load +-[provider_sect] +-default = default_sect +-# The fips section name should match the section name inside the +-# included fipsmodule.cnf. +-# fips = fips_sect +- +-# If no providers are activated explicitly, the default one is activated implicitly. +-# See man 7 OSSL_PROVIDER-default for more details. +-# ++# List of providers to load: ++# Uncomment the sections that start with ## below to enable the legacy provider. ++# Loading the legacy provider enables support for the following algorithms: ++# Hashing Algorithms / Message Digests: MD2, MD4, MDC2, WHIRLPOOL, RIPEMD160 ++# Symmetric Ciphers: Blowfish, CAST, DES, IDEA, RC2, RC4,RC5, SEED ++# Key Derivation Function (KDF): PBKDF1 ++# In general it is not recommended to use the above mentioned algorithms for ++# security critical operations, as they are cryptographically weak or vulnerable ++# to side-channel attacks and as such have been deprecated. + # If you add a section explicitly activating any other provider(s), you most + # probably need to explicitly activate the default provider, otherwise it + # becomes unavailable in openssl. As a consequence applications depending on + # OpenSSL may not work correctly which could lead to significant system + # problems including inability to remotely access the system. ++ ++[provider_sect] ++default = default_sect ++##legacy = legacy_sect ++ + [default_sect] +-# activate = 1 ++activate = 1 + ++##[legacy_sect] ++##activate = 1 + + #################################################################### + [ ca ] diff --git a/source/n/openssl/openssl.SlackBuild b/source/n/openssl/openssl.SlackBuild index 690807a4d..a4a42c259 100755 --- a/source/n/openssl/openssl.SlackBuild +++ b/source/n/openssl/openssl.SlackBuild @@ -28,7 +28,7 @@ TMP=${TMP:-/tmp} PKGNAM=openssl VERSION=${VERSION:-$(echo openssl-*.tar.gz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -65,13 +65,7 @@ rm -rf $PKG1 $PKG2 openssl-$VERSION tar xvf $CWD/openssl-$VERSION.tar.gz || exit 1 cd openssl-$VERSION - -# Fix pod syntax errors which are fatal wih a newer perl: -find . -name "*.pod" -exec sed -i "s/^\=item \([0-9]\)\(\ \|$\)/\=item C<\1>/g" {} \; - -## For openssl-1.1.x, don't try to change the soname. -## Use .so.1, not .so.1.0.0: -#sed -i "s/soname=\$\$SHLIB\$\$SHLIB_SOVER\$\$SHLIB_SUFFIX/soname=\$\$SHLIB.1/g" Makefile.shared +chown -R root:root . if [ "$ARCH" = "i586" ]; then # Build with -march=i586 -mtune=i686: @@ -85,17 +79,11 @@ elif [ "$ARCH" = "x86_64" ]; then LIBDIRSUFFIX="64" fi -# NOT USED for openssl3... -# OpenSSL has a (nasty?) habit of bumping the internal version number with -# every release. This wouldn't be so bad, but some applications are so -# paranoid that they won't run against a different OpenSSL version than -# what they were compiled against, whether or not the ABI has changed. -# -# So, we will use the OPENSSL_VERSION_NUMBER from openssl-1.1.1 unless ABI -# breakage forces it to change. Yes, we're finally using this old trick. :) -#sed -i "s/#define OPENSSL_VERSION_NUMBER.*/\/* Use 0x1010100fL (1.1.1) below to avoid pointlessly breaking the ABI *\/\n#define OPENSSL_VERSION_NUMBER 0x1010100fL/g" include/openssl/opensslv.h || exit 1 +# Patch openssl.cnf to remove useless FIPS documentation, and to provide +# examples for enabling legacy algorithms. These are considered weaker, but +# some applications may still require them. +zcat $CWD/0024-load-legacy-prov.patch.gz | patch -p1 --verbose || exit 1 -chown -R root:root . mkdir -p $PKG1/usr/doc/openssl-$VERSION cp -a ACKNOWLEDGEMENTS* AUTHORS* CHANGES* CONTRIBUTING* FAQ* INSTALL* \ LICENSE* NEWS* NOTES* README* doc \ @@ -135,7 +123,8 @@ fi no-weak-ssl-ciphers \ no-mdc2 \ no-ec2m \ - no-idea \ + no-sm2 \ + no-sm4 \ no-sse2 \ shared @@ -186,18 +175,6 @@ rm -f $PKG1/etc/ssl/openssl.cnf.dist mv $PKG1/usr/share/man $PKG1/usr rmdir $PKG1/usr/share -# Fix manpage name collisions, and relink anything that linked to the old name: -( cd $PKG1/usr/man/man1 - mv passwd.1 ssl_passwd.1 - for file in *.1 ; do - if [ -L $file ]; then - if [ "$(readlink $file)" = "passwd.1" ]; then - rm -f $file - ln -sf ssl_passwd.1 $file - fi - fi - done ) - # Compress and symlink the man pages: if [ -d $PKG1/usr/man ]; then ( cd $PKG1/usr/man @@ -207,7 +184,7 @@ if [ -d $PKG1/usr/man ]; then ln -s $( readlink $eachpage ).gz $eachpage.gz rm $eachpage done - gzip -9 *.ossl? + gzip -9 *.?ossl ) done ) diff --git a/source/n/openvpn/openvpn.SlackBuild b/source/n/openvpn/openvpn.SlackBuild index f136d02a2..21406b8b4 100755 --- a/source/n/openvpn/openvpn.SlackBuild +++ b/source/n/openvpn/openvpn.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=openvpn VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/x/ibus-libpinyin/96042887815b4700c7cafa64cf88942af438ea98.patch b/source/x/ibus-libpinyin/96042887815b4700c7cafa64cf88942af438ea98.patch deleted file mode 100644 index ee3f8b220..000000000 --- a/source/x/ibus-libpinyin/96042887815b4700c7cafa64cf88942af438ea98.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 96042887815b4700c7cafa64cf88942af438ea98 Mon Sep 17 00:00:00 2001 -From: Dominique Leuenberger <dimstar@opensuse.org> -Date: Fri, 24 Feb 2023 13:38:56 +0100 -Subject: [PATCH] build: fix awk scripts to work properly when used againts - sqlite 3.41.0 - -The SQL standard requires double-quotes around identifiers and -single-quotes around string literals. For example: - - "this is a legal SQL column name" - 'this is an SQL string literal' - -With sqlite 3.41.0, this is being enforced on the CLI ---- - data/english.awk | 8 ++++---- - data/table.awk | 2 +- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/data/english.awk b/data/english.awk -index c5dc0aa2..8b32f3f2 100644 ---- a/data/english.awk -+++ b/data/english.awk -@@ -5,9 +5,9 @@ BEGIN { - print "BEGIN TRANSACTION;" - - # Create english table -- print "CREATE TABLE IF NOT EXISTS \"english\" ( " \ -- "\"word\" TEXT NOT NULL PRIMARY KEY," \ -- "\"freq\" FLOAT NOT NULL DEFAULT(0)" \ -+ print "CREATE TABLE IF NOT EXISTS 'english' ( " \ -+ "'word' TEXT NOT NULL PRIMARY KEY," \ -+ "'freq' FLOAT NOT NULL DEFAULT(0)" \ - ");"; - - # Create desc table -@@ -16,7 +16,7 @@ BEGIN { - } - - # Insert data into english table -- { printf "INSERT INTO english (word, freq) VALUES (\"%s\", %f);\n", $1, $2} -+ { printf "INSERT INTO english (word, freq) VALUES ('%s', %f);\n", $1, $2} - - #quit sqlite3 - END { -diff --git a/data/table.awk b/data/table.awk -index 700529cf..c097ec26 100644 ---- a/data/table.awk -+++ b/data/table.awk -@@ -21,7 +21,7 @@ BEGIN { - - # Insert data into phrases table - NF == 4 { -- printf "INSERT INTO phrases (id, tabkeys, phrase) VALUES (%d, \"%s\", \"%s\");\n", id, $3, $1; -+ printf "INSERT INTO phrases (id, tabkeys, phrase) VALUES (%d, '%s', '%s');\n", id, $3, $1; - id++; - } - diff --git a/source/x/ibus-libpinyin/ibus-libpinyin.SlackBuild b/source/x/ibus-libpinyin/ibus-libpinyin.SlackBuild index bd0f8e45d..3465e8c90 100755 --- a/source/x/ibus-libpinyin/ibus-libpinyin.SlackBuild +++ b/source/x/ibus-libpinyin/ibus-libpinyin.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=ibus-libpinyin VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -94,8 +94,6 @@ if [ ! -r configure ]; then fi fi -cat $CWD/96042887815b4700c7cafa64cf88942af438ea98.patch | patch -p1 --verbose || exit 1 - CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/source/x/mesa/mesa.SlackBuild b/source/x/mesa/mesa.SlackBuild index eb8a61779..6f42f6607 100755 --- a/source/x/mesa/mesa.SlackBuild +++ b/source/x/mesa/mesa.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=mesa VERSION=${VERSION:-$(echo $PKGNAM-[0-9]*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} AMBERVERS=${AMBERVERS:-21.3.9} DEMOVERS=${DEMOVERS:-8.5.0} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} BUILD_AMBER=${BUILD_AMBER:-YES} BUILD_DEMOS=${BUILD_DEMOS:-YES} CODECS=${CODECS:-h264dec,h264enc,h265dec,h265enc,vc1dec} |