From 668a929acfc230ed41c294c8cb99f9b39a10ab59 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Fri, 2 Dec 2022 06:58:38 +0000 Subject: Fri Dec 2 06:58:38 UTC 2022 a/gptfdisk-1.0.9-x86_64-2.txz: Rebuilt. Applied upstream patches to fix a crash and partition corruption caused by the popt upgrade: [PATCH] Updated guid.cc to deal with minor change in libuuid [PATCH] Fix failure & crash of sgdisk when compiled with latest popt [PATCH] Fix NULL dereference when duplicating string argument Thanks to jloco. d/cmake-3.25.1-x86_64-1.txz: Upgraded. kde/calligra-3.2.1-x86_64-24.txz: Rebuilt. Recompiled against poppler-22.12.0. kde/cantor-22.08.3-x86_64-2.txz: Rebuilt. Recompiled against poppler-22.12.0. kde/kfilemetadata-5.100.0-x86_64-2.txz: Rebuilt. Recompiled against poppler-22.12.0. kde/kile-2.9.93-x86_64-22.txz: Rebuilt. Recompiled against poppler-22.12.0. kde/kitinerary-22.08.3-x86_64-2.txz: Rebuilt. Recompiled against poppler-22.12.0. kde/krita-5.1.3-x86_64-2.txz: Rebuilt. Recompiled against poppler-22.12.0. kde/okular-22.08.3-x86_64-2.txz: Rebuilt. Recompiled against poppler-22.12.0. l/glib2-2.74.3-x86_64-1.txz: Upgraded. l/poppler-22.12.0-x86_64-1.txz: Upgraded. Shared library .so-version bump. n/NetworkManager-1.40.6-x86_64-1.txz: Upgraded. xap/NetworkManager-openvpn-1.10.2-x86_64-1.txz: Upgraded. xap/libnma-1.10.4-x86_64-1.txz: Upgraded. xap/network-manager-applet-1.30.0-x86_64-1.txz: Upgraded. --- source/a/gptfdisk/gptfdisk.SlackBuild | 8 +++++-- source/a/gptfdisk/popt-1.19-follow-up.patch | 37 +++++++++++++++++++++++++++++ source/a/gptfdisk/popt-1.19.patch | 37 +++++++++++++++++++++++++++++ source/a/gptfdisk/util-linux-2.38.patch | 22 +++++++++++++++++ 4 files changed, 102 insertions(+), 2 deletions(-) create mode 100644 source/a/gptfdisk/popt-1.19-follow-up.patch create mode 100644 source/a/gptfdisk/popt-1.19.patch create mode 100644 source/a/gptfdisk/util-linux-2.38.patch (limited to 'source/a/gptfdisk') diff --git a/source/a/gptfdisk/gptfdisk.SlackBuild b/source/a/gptfdisk/gptfdisk.SlackBuild index 431161a5d..96c74cbc2 100755 --- a/source/a/gptfdisk/gptfdisk.SlackBuild +++ b/source/a/gptfdisk/gptfdisk.SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 2011 Eric Hameleers, Eindhoven, NL -# Copyright 2011, 2012, 2017, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2011, 2012, 2017, 2018, 2022 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=gptfdisk VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | 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 @@ -72,6 +72,10 @@ rm -rf $PKGNAM-$VERSION tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 cd $PKGNAM-$VERSION || exit 1 +zcat $CWD/util-linux-2.38.patch.gz | patch -p1 --verbose || exit 1 +zcat $CWD/popt-1.19.patch.gz | patch -p1 --verbose || exit 1 +zcat $CWD/popt-1.19-follow-up.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/source/a/gptfdisk/popt-1.19-follow-up.patch b/source/a/gptfdisk/popt-1.19-follow-up.patch new file mode 100644 index 000000000..3cee7cc35 --- /dev/null +++ b/source/a/gptfdisk/popt-1.19-follow-up.patch @@ -0,0 +1,37 @@ +From f5de3401b974ce103ffd93af8f9d43505a04aaf9 Mon Sep 17 00:00:00 2001 +From: Damian Kurek +Date: Thu, 7 Jul 2022 03:39:16 +0000 +Subject: [PATCH] Fix NULL dereference when duplicating string argument + +poptGetArg can return NULL if there are no additional arguments, which +makes strdup dereference NULL on strlen +--- + gptcl.cc | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/gptcl.cc b/gptcl.cc +index 0d578eb..ab95239 100644 +--- a/gptcl.cc ++++ b/gptcl.cc +@@ -155,10 +155,11 @@ int GPTDataCL::DoOptions(int argc, char* argv[]) { + } // while + + // Assume first non-option argument is the device filename.... +- device = strdup((char*) poptGetArg(poptCon)); +- poptResetContext(poptCon); ++ device = (char*) poptGetArg(poptCon); + + if (device != NULL) { ++ device = strdup(device); ++ poptResetContext(poptCon); + JustLooking(); // reset as necessary + BeQuiet(); // Tell called functions to be less verbose & interactive + if (LoadPartitions((string) device)) { +@@ -498,6 +499,7 @@ int GPTDataCL::DoOptions(int argc, char* argv[]) { + cerr << "Error encountered; not saving changes.\n"; + retval = 4; + } // if ++ free(device); + } // if (device != NULL) + poptFreeContext(poptCon); + return retval; diff --git a/source/a/gptfdisk/popt-1.19.patch b/source/a/gptfdisk/popt-1.19.patch new file mode 100644 index 000000000..39468d35c --- /dev/null +++ b/source/a/gptfdisk/popt-1.19.patch @@ -0,0 +1,37 @@ +From 5d5e76d369a412bfb3d2cebb5fc0a7509cef878d Mon Sep 17 00:00:00 2001 +From: Rod Smith +Date: Fri, 15 Apr 2022 18:10:14 -0400 +Subject: [PATCH] Fix failure & crash of sgdisk when compiled with latest popt + (commit 740; presumably eventually release 1.19) + +--- + gptcl.cc | 2 +- + support.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gptcl.cc b/gptcl.cc +index 34c9421..0d578eb 100644 +--- a/gptcl.cc ++++ b/gptcl.cc +@@ -155,7 +155,7 @@ int GPTDataCL::DoOptions(int argc, char* argv[]) { + } // while + + // Assume first non-option argument is the device filename.... +- device = (char*) poptGetArg(poptCon); ++ device = strdup((char*) poptGetArg(poptCon)); + poptResetContext(poptCon); + + if (device != NULL) { +diff --git a/support.h b/support.h +index 8ba9ad1..f91f1bc 100644 +--- a/support.h ++++ b/support.h +@@ -8,7 +8,7 @@ + #include + #include + +-#define GPTFDISK_VERSION "1.0.9" ++#define GPTFDISK_VERSION "1.0.9.1" + + #if defined (__FreeBSD__) || defined (__FreeBSD_kernel__) || defined (__APPLE__) + // Darwin (Mac OS) & FreeBSD: disk IOCTLs are different, and there is no lseek64 diff --git a/source/a/gptfdisk/util-linux-2.38.patch b/source/a/gptfdisk/util-linux-2.38.patch new file mode 100644 index 000000000..1d4fbbda8 --- /dev/null +++ b/source/a/gptfdisk/util-linux-2.38.patch @@ -0,0 +1,22 @@ +From 6a8416cbd12d55f882bb751993b94f72d338d96f Mon Sep 17 00:00:00 2001 +From: Rod Smith +Date: Sat, 16 Apr 2022 09:32:04 -0400 +Subject: [PATCH] Updated guid.cc to deal with minor change in libuuid + +--- + guid.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/guid.cc b/guid.cc +index 1e73ab7..d3e4fd5 100644 +--- a/guid.cc ++++ b/guid.cc +@@ -141,7 +141,7 @@ void GUIDData::Zero(void) { + void GUIDData::Randomize(void) { + int i, uuidGenerated = 0; + +-#ifdef _UUID_UUID_H ++#if defined (_UUID_UUID_H) || defined (_UL_LIBUUID_UUID_H) + uuid_generate(uuidData); + ReverseBytes(&uuidData[0], 4); + ReverseBytes(&uuidData[4], 2); -- cgit v1.2.3-65-gdbad