summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
Diffstat (limited to 'source')
-rwxr-xr-xsource/a/gptfdisk/gptfdisk.SlackBuild8
-rw-r--r--source/a/gptfdisk/popt-1.19-follow-up.patch37
-rw-r--r--source/a/gptfdisk/popt-1.19.patch37
-rw-r--r--source/a/gptfdisk/util-linux-2.38.patch22
-rw-r--r--source/a/mkinitrd/README.initrd2
-rw-r--r--source/d/cmake/cmake.url1
-rw-r--r--source/kde/kde/build/calligra2
-rw-r--r--source/kde/kde/build/cantor2
-rw-r--r--source/kde/kde/build/kfilemetadata2
-rw-r--r--source/kde/kde/build/kile2
-rw-r--r--source/kde/kde/build/kitinerary2
-rw-r--r--source/kde/kde/build/krita2
-rw-r--r--source/kde/kde/build/okular2
-rw-r--r--source/l/glib2/glib.g_str_equal.diff11
-rwxr-xr-xsource/l/glib2/glib2.SlackBuild5
15 files changed, 112 insertions, 25 deletions
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 <starfire24680@gmail.com>
+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 <rodsmith@rodsbooks.com>
+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 <stdlib.h>
+ #include <string>
+
+-#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 <rodsmith@rodsbooks.com>
+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);
diff --git a/source/a/mkinitrd/README.initrd b/source/a/mkinitrd/README.initrd
index c10bb6306..eddc2be7a 100644
--- a/source/a/mkinitrd/README.initrd
+++ b/source/a/mkinitrd/README.initrd
@@ -7,7 +7,7 @@ This document describes how to create and install an initrd, which may be
required to use some features of the kernel. Also see "man mkinitrd".
1. What is an initrd?
-2. Why to I need an initrd?
+2. Why do I need an initrd?
3. How do I build the initrd?
4. Now that I've built an initrd, how do I use it?
diff --git a/source/d/cmake/cmake.url b/source/d/cmake/cmake.url
index 12d4154c3..95c153292 100644
--- a/source/d/cmake/cmake.url
+++ b/source/d/cmake/cmake.url
@@ -1 +1,2 @@
https://github.com/Kitware/CMake/releases
+https://github.com/Kitware/CMake/releases/download/v3.25.1/cmake-3.25.1.tar.gz
diff --git a/source/kde/kde/build/calligra b/source/kde/kde/build/calligra
index 409940768..a45fd52cc 100644
--- a/source/kde/kde/build/calligra
+++ b/source/kde/kde/build/calligra
@@ -1 +1 @@
-23
+24
diff --git a/source/kde/kde/build/cantor b/source/kde/kde/build/cantor
index d00491fd7..0cfbf0888 100644
--- a/source/kde/kde/build/cantor
+++ b/source/kde/kde/build/cantor
@@ -1 +1 @@
-1
+2
diff --git a/source/kde/kde/build/kfilemetadata b/source/kde/kde/build/kfilemetadata
index d00491fd7..0cfbf0888 100644
--- a/source/kde/kde/build/kfilemetadata
+++ b/source/kde/kde/build/kfilemetadata
@@ -1 +1 @@
-1
+2
diff --git a/source/kde/kde/build/kile b/source/kde/kde/build/kile
index aabe6ec39..2bd5a0a98 100644
--- a/source/kde/kde/build/kile
+++ b/source/kde/kde/build/kile
@@ -1 +1 @@
-21
+22
diff --git a/source/kde/kde/build/kitinerary b/source/kde/kde/build/kitinerary
index d00491fd7..0cfbf0888 100644
--- a/source/kde/kde/build/kitinerary
+++ b/source/kde/kde/build/kitinerary
@@ -1 +1 @@
-1
+2
diff --git a/source/kde/kde/build/krita b/source/kde/kde/build/krita
index d00491fd7..0cfbf0888 100644
--- a/source/kde/kde/build/krita
+++ b/source/kde/kde/build/krita
@@ -1 +1 @@
-1
+2
diff --git a/source/kde/kde/build/okular b/source/kde/kde/build/okular
index d00491fd7..0cfbf0888 100644
--- a/source/kde/kde/build/okular
+++ b/source/kde/kde/build/okular
@@ -1 +1 @@
-1
+2
diff --git a/source/l/glib2/glib.g_str_equal.diff b/source/l/glib2/glib.g_str_equal.diff
deleted file mode 100644
index 88fcdd3d9..000000000
--- a/source/l/glib2/glib.g_str_equal.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./glib/ghash.h.orig 2022-11-24 06:29:05.000000000 -0600
-+++ ./glib/ghash.h 2022-11-28 13:41:03.250650020 -0600
-@@ -162,7 +162,7 @@
- gconstpointer v2);
-
- /* Macro for optimization in the case it is not used as callback function */
--#define g_str_equal(v1, v2) (strcmp ((gconstpointer) (v1), (gconstpointer) (v2)) == 0)
-+#define g_str_equal(v1, v2) (strcmp ((const char*) (gconstpointer) (v1),(const char*) (gconstpointer) (v2)) == 0)
-
- GLIB_AVAILABLE_IN_ALL
- guint g_str_hash (gconstpointer v);
diff --git a/source/l/glib2/glib2.SlackBuild b/source/l/glib2/glib2.SlackBuild
index aa034997e..c3ff80303 100755
--- a/source/l/glib2/glib2.SlackBuild
+++ b/source/l/glib2/glib2.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=glib2
VERSION=${VERSION:-$(echo glib-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
@@ -77,9 +77,6 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
-# Fix C++ API:
-zcat $CWD/glib.g_str_equal.diff.gz | patch -p1 --verbose || exit 1
-
# Configure, build, and install:
export CFLAGS="$SLKCFLAGS"
export CXXFLAGS="$SLKCFLAGS"
generated by cgit v1.2.3 (git 2.26.2) at 2024-05-10 19:40:10 +0000