diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2022-04-25 20:55:17 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2022-04-26 06:59:45 +0200 |
commit | f0048b99862439c8f968371f12dade3470e803ab (patch) | |
tree | 44e9a0029b998bd4913438a22b6c4ce08846cad2 /source | |
parent | 33bcf3987f7635a5515f6b21d939a90bc9f4e900 (diff) | |
download | current-f0048b99862439c8f968371f12dade3470e803ab.tar.gz |
Mon Apr 25 20:55:17 UTC 202220220425205517
a/kernel-firmware-20220425_ac21ab5-noarch-1.txz: Upgraded.
d/meson-0.62.1-x86_64-1.txz: Upgraded.
d/parallel-20220422-noarch-1.txz: Upgraded.
l/harfbuzz-4.2.1-x86_64-1.txz: Upgraded.
l/imagemagick-7.1.0_31-x86_64-1.txz: Upgraded.
l/libseccomp-2.5.4-x86_64-1.txz: Upgraded.
l/libusb-1.0.26-x86_64-1.txz: Upgraded.
l/openal-soft-1.22.0-x86_64-1.txz: Upgraded.
n/proftpd-1.3.7d-x86_64-1.txz: Upgraded.
x/xdg-desktop-portal-1.14.3-x86_64-1.txz: Upgraded.
xap/freerdp-2.7.0-x86_64-1.txz: Upgraded.
This update is a security and maintenance release.
For more information, see:
https://github.com/FreeRDP/FreeRDP/blob/2.7.0/ChangeLog
(* Security fix *)
testing/packages/gcc-11.3.0-x86_64-1.txz: Added.
testing/packages/gcc-brig-11.3.0-x86_64-1.txz: Added.
testing/packages/gcc-g++-11.3.0-x86_64-1.txz: Added.
testing/packages/gcc-gdc-11.3.0-x86_64-1.txz: Added.
testing/packages/gcc-gfortran-11.3.0-x86_64-1.txz: Added.
testing/packages/gcc-gnat-11.3.0-x86_64-1.txz: Added.
testing/packages/gcc-go-11.3.0-x86_64-1.txz: Added.
testing/packages/gcc-objc-11.3.0-x86_64-1.txz: Added.
Diffstat (limited to 'source')
-rwxr-xr-x | source/l/harfbuzz/harfbuzz.SlackBuild | 2 | ||||
-rw-r--r-- | source/l/libusb/f6d2cb561402c3b6d3627c0eb89e009b503d9067.patch | 65 | ||||
-rwxr-xr-x | source/l/libusb/libusb.SlackBuild | 10 | ||||
-rwxr-xr-x | source/l/openal-soft/openal-soft.SlackBuild | 2 | ||||
-rwxr-xr-x | source/n/proftpd/proftpd.SlackBuild | 4 |
5 files changed, 12 insertions, 71 deletions
diff --git a/source/l/harfbuzz/harfbuzz.SlackBuild b/source/l/harfbuzz/harfbuzz.SlackBuild index f8dd7827..c8e41715 100755 --- a/source/l/harfbuzz/harfbuzz.SlackBuild +++ b/source/l/harfbuzz/harfbuzz.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=harfbuzz 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/l/libusb/f6d2cb561402c3b6d3627c0eb89e009b503d9067.patch b/source/l/libusb/f6d2cb561402c3b6d3627c0eb89e009b503d9067.patch deleted file mode 100644 index 739d41c4..00000000 --- a/source/l/libusb/f6d2cb561402c3b6d3627c0eb89e009b503d9067.patch +++ /dev/null @@ -1,65 +0,0 @@ -From f6d2cb561402c3b6d3627c0eb89e009b503d9067 Mon Sep 17 00:00:00 2001 -From: Chris Dickens <christopher.a.dickens@gmail.com> -Date: Sun, 13 Dec 2020 15:49:19 -0800 -Subject: [PATCH] linux_usbfs: Fix parsing of descriptors for - multi-configuration devices - -Commit e2be556bd2 ("linux_usbfs: Parse config descriptors during device -initialization") introduced a regression for devices with multiple -configurations. The logic that verifies the reported length of the -configuration descriptors failed to count the length of the -configuration descriptor itself and would truncate the actual length by -9 bytes, leading to a parsing error for subsequent descriptors. - -Closes #825 - -Signed-off-by: Chris Dickens <christopher.a.dickens@gmail.com> ---- - libusb/os/linux_usbfs.c | 12 ++++++++---- - libusb/version_nano.h | 2 +- - 2 files changed, 9 insertions(+), 5 deletions(-) - -diff --git a/libusb/os/linux_usbfs.c b/libusb/os/linux_usbfs.c -index fb2ed53a..4d2dc8d6 100644 ---- a/libusb/os/linux_usbfs.c -+++ b/libusb/os/linux_usbfs.c -@@ -641,7 +641,12 @@ static int seek_to_next_config(struct libusb_context *ctx, - uint8_t *buffer, size_t len) - { - struct usbi_descriptor_header *header; -- int offset = 0; -+ int offset; -+ -+ /* Start seeking past the config descriptor */ -+ offset = LIBUSB_DT_CONFIG_SIZE; -+ buffer += LIBUSB_DT_CONFIG_SIZE; -+ len -= LIBUSB_DT_CONFIG_SIZE; - - while (len > 0) { - if (len < 2) { -@@ -718,7 +723,7 @@ static int parse_config_descriptors(struct libusb_device *dev) - } - - if (priv->sysfs_dir) { -- /* -+ /* - * In sysfs wTotalLength is ignored, instead the kernel returns a - * config descriptor with verified bLength fields, with descriptors - * with an invalid bLength removed. -@@ -727,8 +732,7 @@ static int parse_config_descriptors(struct libusb_device *dev) - int offset; - - if (num_configs > 1 && idx < num_configs - 1) { -- offset = seek_to_next_config(ctx, buffer + LIBUSB_DT_CONFIG_SIZE, -- remaining - LIBUSB_DT_CONFIG_SIZE); -+ offset = seek_to_next_config(ctx, buffer, remaining); - if (offset < 0) - return offset; - sysfs_config_len = (uint16_t)offset; -diff --git a/libusb/version_nano.h b/libusb/version_nano.h -index 61a0a700..578b0979 100644 ---- a/libusb/version_nano.h -+++ b/libusb/version_nano.h -@@ -1 +1 @@ --#define LIBUSB_NANO 11584 -+#define LIBUSB_NANO 11586 diff --git a/source/l/libusb/libusb.SlackBuild b/source/l/libusb/libusb.SlackBuild index c8c429c6..45df6096 100755 --- a/source/l/libusb/libusb.SlackBuild +++ b/source/l/libusb/libusb.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libusb VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-4} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -77,7 +77,13 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -zcat $CWD/f6d2cb561402c3b6d3627c0eb89e009b503d9067.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 CFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/source/l/openal-soft/openal-soft.SlackBuild b/source/l/openal-soft/openal-soft.SlackBuild index 714a6e34..607f4001 100755 --- a/source/l/openal-soft/openal-soft.SlackBuild +++ b/source/l/openal-soft/openal-soft.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=openal-soft 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/proftpd/proftpd.SlackBuild b/source/n/proftpd/proftpd.SlackBuild index fb46f5c9..4f9069b3 100755 --- a/source/n/proftpd/proftpd.SlackBuild +++ b/source/n/proftpd/proftpd.SlackBuild @@ -23,8 +23,8 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=proftpd -VERSION=1.3.7c -DIRVER=1.3.7c +VERSION=1.3.7d +DIRVER=1.3.7d BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} |