summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
Diffstat (limited to 'source')
-rw-r--r--source/a/bash/bash-5.0-patches/bash50-01264
-rw-r--r--source/a/bash/bash-5.0-patches/bash50-01373
-rw-r--r--source/a/bash/bash-5.0-patches/bash50-01452
-rw-r--r--source/a/bash/bash-5.0-patches/bash50-01578
-rw-r--r--source/a/bash/bash-5.0-patches/bash50-01658
-rwxr-xr-xsource/a/bash/bash.SlackBuild8
-rwxr-xr-xsource/ap/nvme-cli/nvme-cli.SlackBuild125
-rw-r--r--source/ap/nvme-cli/nvme-cli.url1
-rw-r--r--source/ap/nvme-cli/slack-desc19
-rwxr-xr-xsource/d/gdb/gdb.SlackBuild24
-rw-r--r--source/d/gdb/gdb.python38.patch129
-rwxr-xr-xsource/l/ConsoleKit2/ConsoleKit2.SlackBuild17
-rw-r--r--source/l/ConsoleKit2/patches/0001-Revert-Minor-code-refactoring.patch477
-rw-r--r--source/l/ConsoleKit2/patches/0002-Fix-some-libdir-scripts-stuff-missed-in-4d87a25ea0af.patch42
-rw-r--r--source/l/ConsoleKit2/patches/0003-Filter-out-the-kdm-user.patch29
-rw-r--r--source/l/ConsoleKit2/patches/0004-Apply-overlooked-prefix-lib-libdir-substitution.patch22
-rwxr-xr-xsource/l/mozilla-nss/mozilla-nss.SlackBuild4
-rw-r--r--source/l/readline/readline-8.0-patches/readline80-00260
-rw-r--r--source/l/readline/readline-8.0-patches/readline80-00369
-rw-r--r--source/l/readline/readline-8.0-patches/readline80-00447
-rwxr-xr-xsource/n/libgpg-error/libgpg-error.SlackBuild5
-rw-r--r--source/n/libgpg-error/libgpg-error.gawk5.diff49
-rw-r--r--source/n/libgpg-error/libgpg-error.url1
23 files changed, 674 insertions, 779 deletions
diff --git a/source/a/bash/bash-5.0-patches/bash50-012 b/source/a/bash/bash-5.0-patches/bash50-012
new file mode 100644
index 00000000..7470e766
--- /dev/null
+++ b/source/a/bash/bash-5.0-patches/bash50-012
@@ -0,0 +1,64 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 5.0
+Patch-ID: bash50-012
+
+Bug-Reported-by: lessbug@qq.com
+Bug-Reference-ID: <tencent_6AA531D9A5CC4121D86BD5CDA2E0DA98C605@qq.com>
+Bug-Reference-URL:
+
+Bug-Description:
+
+When using previous-history to go back beyond the beginning of the history list,
+it's possible to move to an incorrect partial line.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-5.0-patched/lib/readline/misc.c 2017-07-07 17:30:12.000000000 -0400
+--- lib/readline/misc.c 2019-05-16 11:43:46.000000000 -0400
+***************
+*** 577,580 ****
+--- 590,594 ----
+ {
+ HIST_ENTRY *old_temp, *temp;
++ int had_saved_line;
+
+ if (count < 0)
+***************
+*** 589,592 ****
+--- 603,607 ----
+
+ /* If we don't have a line saved, then save this one. */
++ had_saved_line = _rl_saved_line_for_history != 0;
+ rl_maybe_save_line ();
+
+***************
+*** 612,616 ****
+ if (temp == 0)
+ {
+! rl_maybe_unsave_line ();
+ rl_ding ();
+ }
+--- 627,632 ----
+ if (temp == 0)
+ {
+! if (had_saved_line == 0)
+! _rl_free_saved_history_line ();
+ rl_ding ();
+ }
+*** ../bash-5.0/patchlevel.h 2016-06-22 14:51:03.000000000 -0400
+--- patchlevel.h 2016-10-01 11:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 11
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 12
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/source/a/bash/bash-5.0-patches/bash50-013 b/source/a/bash/bash-5.0-patches/bash50-013
new file mode 100644
index 00000000..e44fdb50
--- /dev/null
+++ b/source/a/bash/bash-5.0-patches/bash50-013
@@ -0,0 +1,73 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 5.0
+Patch-ID: bash50-013
+
+Bug-Reported-by: HIROSE Masaaki <hirose31@gmail.com>
+Bug-Reference-ID: <CAGSOfA-RqiTe=+GsXsDKyZrrMWH4bDbXgMVVegMa6OjqC5xbnQ@mail.gmail.com>
+Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2019-05/msg00038.html
+
+Bug-Description:
+
+Reading history entries with timestamps can result in history entries joined
+by linefeeds.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-5.0-patched/lib/readline/histfile.c 2018-06-11 09:14:52.000000000 -0400
+--- lib/readline/histfile.c 2019-05-16 15:55:57.000000000 -0400
+***************
+*** 370,376 ****
+
+ has_timestamps = HIST_TIMESTAMP_START (buffer);
+! history_multiline_entries += has_timestamps && history_write_timestamps;
+
+ /* Skip lines until we are at FROM. */
+ for (line_start = line_end = buffer; line_end < bufend && current_line < from; line_end++)
+ if (*line_end == '\n')
+--- 370,378 ----
+
+ has_timestamps = HIST_TIMESTAMP_START (buffer);
+! history_multiline_entries += has_timestamps && history_write_timestamps;
+
+ /* Skip lines until we are at FROM. */
++ if (has_timestamps)
++ last_ts = buffer;
+ for (line_start = line_end = buffer; line_end < bufend && current_line < from; line_end++)
+ if (*line_end == '\n')
+***************
+*** 381,385 ****
+--- 383,398 ----
+ if (HIST_TIMESTAMP_START(p) == 0)
+ current_line++;
++ else
++ last_ts = p;
+ line_start = p;
++ /* If we are at the last line (current_line == from) but we have
++ timestamps (has_timestamps), then line_start points to the
++ text of the last command, and we need to skip to its end. */
++ if (current_line >= from && has_timestamps)
++ {
++ for (line_end = p; line_end < bufend && *line_end != '\n'; line_end++)
++ ;
++ line_start = (*line_end == '\n') ? line_end + 1 : line_end;
++ }
+ }
+
+
+*** ../bash-5.0/patchlevel.h 2016-06-22 14:51:03.000000000 -0400
+--- patchlevel.h 2016-10-01 11:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 12
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 13
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/source/a/bash/bash-5.0-patches/bash50-014 b/source/a/bash/bash-5.0-patches/bash50-014
new file mode 100644
index 00000000..6cb49aae
--- /dev/null
+++ b/source/a/bash/bash-5.0-patches/bash50-014
@@ -0,0 +1,52 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 5.0
+Patch-ID: bash50-014
+
+Bug-Reported-by: Johannes Hielscher <jhielscher@posteo.de>
+Bug-Reference-ID: <20190208205048.77c25a83@hordevm>
+Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2019-02/msg00032.html
+
+Bug-Description:
+
+If the current line is empty, using the emacs C-xC-e binding to enter the
+editor will edit the previous command instead of the current (empty) one.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-5.0-patched/bashline.c 2019-01-16 16:13:21.000000000 -0500
+--- bashline.c 2019-02-11 11:18:57.000000000 -0500
+***************
+*** 962,970 ****
+ finished with the command, so we should not ignore the last command */
+ using_history ();
+! if (rl_line_buffer[0])
+! {
+! current_command_line_count++; /* for rl_newline above */
+! bash_add_history (rl_line_buffer);
+! }
+ current_command_line_count = 0; /* for dummy history entry */
+ bash_add_history ("");
+--- 965,970 ----
+ finished with the command, so we should not ignore the last command */
+ using_history ();
+! current_command_line_count++; /* for rl_newline above */
+! bash_add_history (rl_line_buffer);
+ current_command_line_count = 0; /* for dummy history entry */
+ bash_add_history ("");
+*** ../bash-5.0/patchlevel.h 2016-06-22 14:51:03.000000000 -0400
+--- patchlevel.h 2016-10-01 11:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 13
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 14
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/source/a/bash/bash-5.0-patches/bash50-015 b/source/a/bash/bash-5.0-patches/bash50-015
new file mode 100644
index 00000000..ff6e5e69
--- /dev/null
+++ b/source/a/bash/bash-5.0-patches/bash50-015
@@ -0,0 +1,78 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 5.0
+Patch-ID: bash50-015
+
+Bug-Reported-by: Yu Kou <ckyoog@gmail.com>
+Bug-Reference-ID: <CAAqoF9Ko3nAShJXGzucafs-ByUagzZ4nbQonwEkwC7s9UqfWKw@mail.gmail.com>
+Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2019-05/msg00032.html
+
+Bug-Description:
+
+If alias expansion is enabled when processing the command argument to the
+`-c' option, an alias is defined in that command, and the command ends with
+the invocation of that alias, the shell's command parser can prematurely
+terminate before the entire command is executed.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-20190426/builtins/evalstring.c 2019-01-29 14:15:19.000000000 -0500
+--- builtins/evalstring.c 2019-05-15 14:19:36.000000000 -0400
+***************
+*** 92,95 ****
+--- 92,96 ----
+ running_trap == 0 &&
+ *bash_input.location.string == '\0' &&
++ parser_expanding_alias () == 0 &&
+ command->type == cm_simple &&
+ signal_is_trapped (EXIT_TRAP) == 0 &&
+***************
+*** 106,109 ****
+--- 107,111 ----
+ {
+ return (*bash_input.location.string == '\0' &&
++ parser_expanding_alias () == 0 &&
+ (command->value.Connection->connector == AND_AND || command->value.Connection->connector == OR_OR || command->value.Connection->connector == ';') &&
+ command->value.Connection->second->type == cm_simple);
+***************
+*** 291,295 ****
+ with_input_from_string (string, from_file);
+ clear_shell_input_line ();
+! while (*(bash_input.location.string))
+ {
+ command = (COMMAND *)NULL;
+--- 293,297 ----
+ with_input_from_string (string, from_file);
+ clear_shell_input_line ();
+! while (*(bash_input.location.string) || parser_expanding_alias ())
+ {
+ command = (COMMAND *)NULL;
+***************
+*** 546,550 ****
+
+ with_input_from_string (string, from_file);
+! while (*(bash_input.location.string))
+ {
+ command = (COMMAND *)NULL;
+--- 548,552 ----
+
+ with_input_from_string (string, from_file);
+! while (*(bash_input.location.string)) /* XXX - parser_expanding_alias () ? */
+ {
+ command = (COMMAND *)NULL;
+*** ../bash-5.0/patchlevel.h 2016-06-22 14:51:03.000000000 -0400
+--- patchlevel.h 2016-10-01 11:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 14
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 15
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/source/a/bash/bash-5.0-patches/bash50-016 b/source/a/bash/bash-5.0-patches/bash50-016
new file mode 100644
index 00000000..87f232d7
--- /dev/null
+++ b/source/a/bash/bash-5.0-patches/bash50-016
@@ -0,0 +1,58 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 5.0
+Patch-ID: bash50-016
+
+Bug-Reported-by: sunnycemetery@gmail.com
+Bug-Reference-ID: <20190316041534.GB22884@midnight>
+Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2019-03/msg00070.html
+
+Bug-Description:
+
+Bash waits too long to reap /dev/fd process substitutions used as redirections
+with loops and group commands, which can lead to file descriptor exhaustion.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-5.0-patched/execute_cmd.c 2019-04-19 15:46:36.000000000 -0400
+--- execute_cmd.c 2019-07-01 16:45:49.000000000 -0400
+***************
+*** 1104,1107 ****
+--- 1085,1104 ----
+ discard_unwind_frame ("internal_fifos");
+ }
++ # if defined (HAVE_DEV_FD)
++ /* Reap process substitutions at the end of loops */
++ switch (command->type)
++ {
++ case cm_while:
++ case cm_until:
++ case cm_for:
++ case cm_group:
++ # if defined (ARITH_FOR_COMMAND)
++ case cm_arith_for:
++ # endif
++ reap_procsubs ();
++ default:
++ break;
++ }
++ # endif /* HAVE_DEV_FD */
+ #endif
+
+
+*** ../bash-5.0/patchlevel.h 2016-06-22 14:51:03.000000000 -0400
+--- patchlevel.h 2016-10-01 11:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 15
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 16
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/source/a/bash/bash.SlackBuild b/source/a/bash/bash.SlackBuild
index 0277ac15..5d58965b 100755
--- a/source/a/bash/bash.SlackBuild
+++ b/source/a/bash/bash.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2005-2015 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2005-2020 Patrick J. Volkerding, Sebeka, Minnesota, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -100,13 +100,13 @@ chown -R root:root .
find . -perm 664 | xargs chmod 644
find . -perm 775 | xargs chmod 755
+# Fix .so errors in manpages (needed for strict implementations such as mandoc):
+zcat $CWD/bash_manpages.patch.gz | patch -p1 --verbose || exit 1
+
if [ -d $CWD/bash-${VERSION}-patches ]; then
( cd $CWD/bash-${VERSION}-patches ; cat bash5?-??? ) | patch -p0 --verbose || exit 1
fi
-# Fix .so errors in manpages (needed for strict implementations such as mandoc):
-zcat $CWD/bash_manpages.patch.gz | patch -p1 --verbose || exit 1
-
# End of preparations
if echo "$*" | grep -qw -- --prep ; then
exit 0
diff --git a/source/ap/nvme-cli/nvme-cli.SlackBuild b/source/ap/nvme-cli/nvme-cli.SlackBuild
new file mode 100755
index 00000000..2d6ebd13
--- /dev/null
+++ b/source/ap/nvme-cli/nvme-cli.SlackBuild
@@ -0,0 +1,125 @@
+#!/bin/bash
+
+# Copyright 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PKGNAM=nvme-cli
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+ case "$(uname -m)" in
+ i?86) ARCH=i586 ;;
+ arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
+ # Unless $ARCH is already set, use uname -m for all other archs:
+ *) ARCH=$(uname -m) ;;
+ esac
+ export ARCH
+fi
+
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+ exit 0
+fi
+
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
+
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+ SLKCFLAGS="-O2 -march=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "s390" ]; then
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+ SLKCFLAGS="-O2 -fPIC"
+ LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "armv7hl" ]; then
+ SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16"
+ LIBDIRSUFFIX=""
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
+fi
+
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
+cd $PKGNAM-$VERSION || exit 1
+
+chown -R root:root .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \+ -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \+
+
+# Build and install:
+make CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" PREFIX=/usr SBINDIR=/usr/sbin || exit 1
+make install CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" PREFIX=/usr SBINDIR=/usr/sbin DESTDIR=$PKG || exit 1
+
+# Don't ship build-host specific files:
+rm -f $PKG/etc/nvme/*
+
+# Don't ship systemd udev rules:
+rm -r $PKG/etc/udev
+
+# Remove dracut and system libdir files:
+rm -r $PKG/usr/lib/{dracut,systemd}
+rmdir $PKG/usr/lib 2> /dev/null
+
+# Move man pages:
+mv $PKG/usr/share/man $PKG/usr/man
+
+# Strip binaries:
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+# Compress manual pages:
+find $PKG/usr/man -type f -exec gzip -9 {} \+
+for i in $( find $PKG/usr/man -type l ) ; do
+ ln -s $( readlink $i ).gz $i.gz
+ rm $i
+done
+
+# Add a documentation directory:
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+ CONTRIBUTING* LICENSE* README* \
+ $PKG/usr/doc/${PKGNAM}-$VERSION
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/ap/nvme-cli/nvme-cli.url b/source/ap/nvme-cli/nvme-cli.url
new file mode 100644
index 00000000..a02230df
--- /dev/null
+++ b/source/ap/nvme-cli/nvme-cli.url
@@ -0,0 +1 @@
+https://github.com/linux-nvme/nvme-cli
diff --git a/source/ap/nvme-cli/slack-desc b/source/ap/nvme-cli/slack-desc
new file mode 100644
index 00000000..c6da79c6
--- /dev/null
+++ b/source/ap/nvme-cli/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+ |-----handy-ruler------------------------------------------------------|
+nvme-cli: nvme-cli (NVMe storage command line utility)
+nvme-cli:
+nvme-cli: The nvme program is a user space utility to provide standards
+nvme-cli: compliant tooling for NVM-Express drives. The utility has sub-commands
+nvme-cli: for all admin and io commands defined in the specification and for
+nvme-cli: displaying controller registers.
+nvme-cli:
+nvme-cli: Homepage: https://github.com/linux-nvme/nvme-cli
+nvme-cli:
+nvme-cli:
+nvme-cli:
diff --git a/source/d/gdb/gdb.SlackBuild b/source/d/gdb/gdb.SlackBuild
index 8f7947f5..fae55a98 100755
--- a/source/d/gdb/gdb.SlackBuild
+++ b/source/d/gdb/gdb.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=gdb
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
@@ -72,18 +72,15 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
-# Currently broken in this version, but keep trying:
-if [ "$VERSION" = "8.3.1" ]; then
- GUILE_OPTION="--without-guile"
-else
- # Might as well try it to see if it compiles this time:
- GUILE_OPTION="--with-guile"
-fi
+# This has been perpetually broken, so we'll default to turning it off:
+GUILE_OPTION=${GUILE_OPTION:"--without-guile"}
-# Fix for Python 3.8.x:
-zcat $CWD/gdb.python38.patch.gz | patch -p1 --verbose || exit 1
+# Make a build directory:
+mkdir build-gdb
+cd build-gdb
-./configure \
+# Configure:
+../configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--mandir=/usr/man \
@@ -94,6 +91,7 @@ zcat $CWD/gdb.python38.patch.gz | patch -p1 --verbose || exit 1
--with-system-zlib \
--build=$ARCH-slackware-linux || exit 1
+# Build and install:
make $NUMJOBS || make || exit 1
make install DESTDIR=$PKG || exit 1
@@ -103,6 +101,9 @@ rmdir $PKG/usr/lib${LIBDIRSUFFIX} 2> /dev/null
rm -f $PKG/usr/info/{annotate*,bfd*,configure*,standards*}
rm -rf $PKG/usr/include
+# Head back out of the build-gdb directory..
+cd ..
+
mkdir -p $PKG/usr/doc/gdb-$VERSION/gdb
cp -a COPYING* README $PKG/usr/doc/gdb-$VERSION
cd gdb
@@ -143,4 +144,3 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
# Build the package:
cd $PKG
/sbin/makepkg -l y -c n $TMP/gdb-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source/d/gdb/gdb.python38.patch b/source/d/gdb/gdb.python38.patch
deleted file mode 100644
index 96b3ad4a..00000000
--- a/source/d/gdb/gdb.python38.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-From b6484282f85bf7f11451b2441599c241d302ad9d Mon Sep 17 00:00:00 2001
-From: Raul Tambre <raul@tambre.ee>
-Date: Sat, 4 May 2019 15:48:17 -0400
-Subject: [PATCH] Fix incorrect use of 'is' operator for comparison in
- python/lib/gdb/command/prompt.py
-
-The 'is' operator is not meant to be used for comparisons. It currently working
-is an implementation detail of CPython. CPython 3.8 has added a SyntaxWarning
-for this.
-
-diff --git a/gdb/python/lib/gdb/command/prompt.py b/gdb/python/lib/gdb/command/prompt.py
-index 3d662a7..04b9e49 100644
---- a/gdb/python/lib/gdb/command/prompt.py
-+++ b/gdb/python/lib/gdb/command/prompt.py
-@@ -45,7 +45,7 @@ The currently defined substitutions are:
- self.hook_set = False
-
- def get_show_string (self, pvalue):
-- if self.value is not '':
-+ if self.value:
- return "The extended prompt is: " + self.value
- else:
- return "The extended prompt is not set."
-@@ -57,7 +57,7 @@ The currently defined substitutions are:
- return ""
-
- def before_prompt_hook(self, current):
-- if self.value is not '':
-+ if self.value:
- return gdb.prompt.substitute_prompt(self.value)
- else:
- return None
-
-From d9c4ba536c522b8dc2194d4100270a159be7894a Mon Sep 17 00:00:00 2001
-From: Sergio Durigan Junior <sergiodj@redhat.com>
-Date: Sun, 25 Aug 2019 12:10:35 -0400
-Subject: [PATCH] Use raw strings on gdb.python/py-xmethods.exp (and fix Python
- 3.8's "SyntaxWarning: invalid escape sequence")
-
-The way unrecognized escape sequences are handled has changed in
-Python 3.8: users now see a SyntaxWarning message, which will
-eventually become a SyntaxError in future versions of Python:
-
- (gdb) source /blabla/gdb.python/py-xmethods/py-xmethods.py
- /blabla/gdb.python/py-xmethods/py-xmethods.py:204: SyntaxWarning: invalid escape seque
- nce \+
- 'operator\+',
- /blabla/gdb.python/py-xmethods/py-xmethods.py:211: SyntaxWarning: invalid escape seque
- nce \+
- 'operator\+\+',
-
-One of our testcases, gdb.python/py-xmethods.exp, contains strings in
-the form of "operator\+". This is not recognized by Python, but is
-still needed by the testsuite to work properly. The solution is
-simple: we just have to make sure these strings are marked as
-raw (i.e, r""). This is what this patch does. I took the opportunity
-to also convert other strings to raw, which, in two cases, allowed the
-removal of an extra backslash.
-
-I tested this using Python 3.7 and Python 3.8, and everything works
-fine.
-
-I think I could push this as obvious, but decided to send it to
-gdb-patches just in case.
-
-gdb/testsuite/ChangeLog:
-2019-08-26 Sergio Durigan Junior <sergiodj@redhat.com>
-
- * gdb.python/py-xmethods.exp: Use raw strings when passing
- arguments to SimpleXMethodMatcher.
-
-diff --git a/gdb/testsuite/gdb.python/py-xmethods.py b/gdb/testsuite/gdb.python/py-xmethods.py
-index 587842d7360..cea48b80d8c 100644
---- a/gdb/testsuite/gdb.python/py-xmethods.py
-+++ b/gdb/testsuite/gdb.python/py-xmethods.py
-@@ -199,34 +199,34 @@ def match(self, class_type, method_name):
-
-
- global_dm_list = [
-- SimpleXMethodMatcher('A_plus_A',
-- '^dop::A$',
-- 'operator\+',
-+ SimpleXMethodMatcher(r'A_plus_A',
-+ r'^dop::A$',
-+ r'operator\+',
- A_plus_A,
- # This is a replacement, hence match the arg type
- # exactly!
- type_A.const().reference()),
-- SimpleXMethodMatcher('plus_plus_A',
-- '^dop::A$',
-- 'operator\+\+',
-+ SimpleXMethodMatcher(r'plus_plus_A',
-+ r'^dop::A$',
-+ r'operator\+\+',
- plus_plus_A),
-- SimpleXMethodMatcher('A_geta',
-- '^dop::A$',
-- '^geta$',
-+ SimpleXMethodMatcher(r'A_geta',
-+ r'^dop::A$',
-+ r'^geta$',
- A_geta),
-- SimpleXMethodMatcher('A_getarrayind',
-- '^dop::A$',
-- '^getarrayind$',
-+ SimpleXMethodMatcher(r'A_getarrayind',
-+ r'^dop::A$',
-+ r'^getarrayind$',
- A_getarrayind,
- type_int),
-- SimpleXMethodMatcher('A_indexoper',
-- '^dop::A$',
-- 'operator\\[\\]',
-+ SimpleXMethodMatcher(r'A_indexoper',
-+ r'^dop::A$',
-+ r'operator\[\]',
- A_indexoper,
- type_int),
-- SimpleXMethodMatcher('B_indexoper',
-- '^dop::B$',
-- 'operator\\[\\]',
-+ SimpleXMethodMatcher(r'B_indexoper',
-+ r'^dop::B$',
-+ r'operator\[\]',
- B_indexoper,
- type_int)
- ]
-
diff --git a/source/l/ConsoleKit2/ConsoleKit2.SlackBuild b/source/l/ConsoleKit2/ConsoleKit2.SlackBuild
index ea604833..ccea00b2 100755
--- a/source/l/ConsoleKit2/ConsoleKit2.SlackBuild
+++ b/source/l/ConsoleKit2/ConsoleKit2.SlackBuild
@@ -27,10 +27,11 @@
cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=ConsoleKit2
-VERSION=${VERSION:-1.0.0}
-BUILD=${BUILD:-4}
+VERSION=${VERSION:-1.2.1}
+BUILD=${BUILD:-1}
-NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
+# Maximum storage quota for XDG_RUNTIME_DIR:
+XDG_RUNTIME_QUOTA=${XDG_RUNTIME_QUOTA:-size=100M}
TMP=${TMP:-/tmp}
PKG=$TMP/package-$PKGNAM
@@ -54,6 +55,8 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
exit 0
fi
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
+
if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
SLKLDFLAGS=""
@@ -88,10 +91,8 @@ rm -rf $PKGNAM-$VERSION
tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
cd $PKGNAM-$VERSION || exit 1
-zcat $CWD/patches/0001-Revert-Minor-code-refactoring.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/0002-Fix-some-libdir-scripts-stuff-missed-in-4d87a25ea0af.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/0003-Filter-out-the-kdm-user.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/0004-Apply-overlooked-prefix-lib-libdir-substitution.patch.gz | patch -p1 --verbose || exit 1
+# Apply a reasonable maximum size for the user's XDG_RUNTIME_DIR:
+sed -i "s/mode=0700,uid=%d/mode=0700,$XDG_RUNTIME_QUOTA,uid=%d/g" src/ck-sysdeps-linux.c
chown -R root:root .
find . \
@@ -100,8 +101,6 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
-autoreconf -vif
-
# Choose correct options depending on whether PAM is installed:
if [ -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then
PAM_OPTIONS="--enable-pam-module=yes"
diff --git a/source/l/ConsoleKit2/patches/0001-Revert-Minor-code-refactoring.patch b/source/l/ConsoleKit2/patches/0001-Revert-Minor-code-refactoring.patch
deleted file mode 100644
index b6cadb3f..00000000
--- a/source/l/ConsoleKit2/patches/0001-Revert-Minor-code-refactoring.patch
+++ /dev/null
@@ -1,477 +0,0 @@
-From 1e3f7f9862dceec3fa11ee4205c343ed64ce5b63 Mon Sep 17 00:00:00 2001
-From: Eric Koegel <eric.koegel@gmail.com>
-Date: Sat, 22 Aug 2015 10:51:20 +0300
-Subject: [PATCH 1/5] Revert "Minor code refactoring"
-
-This reverts commit bee63889f4a0b8f57807a61d8396346cec8cd5b1.
-
-There are some cases where ConsoleKit2 would crash after successfully
-suspending so revert this commit.
----
- src/ck-manager.c | 160 ++++++++++++++++++++++++++++++++++----------------
- src/ck-session.c | 56 +++++++++++++++++-
- src/ck-sysdeps-unix.c | 59 -------------------
- src/ck-sysdeps.h | 6 --
- tools/Makefile.am | 3 -
- 5 files changed, 163 insertions(+), 121 deletions(-)
-
-diff --git a/src/ck-manager.c b/src/ck-manager.c
-index db5f906..66da8b2 100644
---- a/src/ck-manager.c
-+++ b/src/ck-manager.c
-@@ -960,11 +960,13 @@ logind_ready_cb (PolkitAuthority *authority,
- g_object_unref (ret);
- }
-
-+/* We use this to avoid breaking API compability with ConsoleKit1 for
-+ * CanStop and CanRestart, but this method emulates how logind
-+ * presents it's API */
- static void
--get_polkit_permissions_for_callback (CkManager *manager,
-- const char *action,
-- GDBusMethodInvocation *context,
-- GAsyncReadyCallback callback)
-+get_polkit_logind_permissions (CkManager *manager,
-+ const char *action,
-+ GDBusMethodInvocation *context)
- {
- const char *sender;
- PolkitSubject *subject;
-@@ -980,37 +982,96 @@ get_polkit_permissions_for_callback (CkManager *manager,
- NULL,
- 0,
- NULL,
-- callback,
-+ (GAsyncReadyCallback) logind_ready_cb,
- context);
- g_object_unref (subject);
- }
-
--/* We use this to avoid breaking API compability with ConsoleKit1 for
-- * CanStop and CanRestart, but this method emulates how logind
-- * presents it's API */
--static void
--get_polkit_logind_permissions (CkManager *manager,
-- const char *action,
-- GDBusMethodInvocation *context)
--{
-- get_polkit_permissions_for_callback (manager,
-- action,
-- context,
-- (GAsyncReadyCallback) logind_ready_cb);
--}
--
- static void
- get_polkit_permissions (CkManager *manager,
- const char *action,
- GDBusMethodInvocation *context)
- {
-- get_polkit_permissions_for_callback (manager,
-- action,
-- context,
-- (GAsyncReadyCallback) ready_cb);
-+ const char *sender;
-+ PolkitSubject *subject;
-+
-+ g_debug ("get permissions for action %s", action);
-+
-+ sender = g_dbus_method_invocation_get_sender (context);
-+ subject = polkit_system_bus_name_new (sender);
-+
-+ polkit_authority_check_authorization (manager->priv->pol_ctx,
-+ subject,
-+ action,
-+ NULL,
-+ 0,
-+ NULL,
-+ (GAsyncReadyCallback) ready_cb,
-+ context);
-+ g_object_unref (subject);
- }
- #endif
-
-+/* adapted from PolicyKit */
-+static gboolean
-+get_caller_info (CkManager *manager,
-+ const char *sender,
-+ uid_t *calling_uid,
-+ pid_t *calling_pid)
-+{
-+ gboolean res = FALSE;
-+ GVariant *value = NULL;
-+ GError *error = NULL;
-+
-+ if (sender == NULL) {
-+ g_debug ("sender == NULL");
-+ goto out;
-+ }
-+
-+ if (manager->priv->bus_proxy == NULL) {
-+ g_debug ("manager->priv->bus_proxy == NULL");
-+ goto out;
-+ }
-+
-+ value = g_dbus_proxy_call_sync (manager->priv->bus_proxy, "GetConnectionUnixUser",
-+ g_variant_new ("(s)", sender),
-+ G_DBUS_CALL_FLAGS_NONE,
-+ 2000,
-+ NULL,
-+ &error);
-+
-+ if (value == NULL) {
-+ g_warning ("GetConnectionUnixUser() failed: %s", error->message);
-+ g_error_free (error);
-+ goto out;
-+ }
-+ g_variant_get (value, "(u)", calling_uid);
-+ g_variant_unref (value);
-+
-+ value = g_dbus_proxy_call_sync (manager->priv->bus_proxy, "GetConnectionUnixProcessID",
-+ g_variant_new ("(s)", sender),
-+ G_DBUS_CALL_FLAGS_NONE,
-+ 2000,
-+ NULL,
-+ &error);
-+
-+ if (value == NULL) {
-+ g_warning ("GetConnectionUnixProcessID() failed: %s", error->message);
-+ g_error_free (error);
-+ goto out;
-+ }
-+ g_variant_get (value, "(u)", calling_pid);
-+ g_variant_unref (value);
-+
-+ res = TRUE;
-+
-+ g_debug ("uid = %d", *calling_uid);
-+ g_debug ("pid = %d", *calling_pid);
-+
-+out:
-+ return res;
-+}
-+
- static char *
- get_user_name (uid_t uid)
- {
-@@ -1118,7 +1179,7 @@ check_rbac_permissions (CkManager *manager,
-
- username = NULL;
- sender = g_dbus_method_invocation_get_sender (context);
-- res = get_caller_info (manager->priv->bus_proxy,
-+ res = get_caller_info (manager,
- sender,
- &uid,
- &pid);
-@@ -2055,7 +2116,7 @@ dbus_inhibit (ConsoleKitManager *ckmanager,
- priv = CK_MANAGER_GET_PRIVATE (CK_MANAGER (ckmanager));
-
- sender = g_dbus_method_invocation_get_sender (context);
-- res = get_caller_info (priv->bus_proxy,
-+ res = get_caller_info (CK_MANAGER (ckmanager),
- sender,
- &uid,
- &pid);
-@@ -2698,7 +2759,7 @@ create_session_for_sender (CkManager *manager,
-
- g_debug ("CkManager: create session for sender: %s", sender);
-
-- res = get_caller_info (manager->priv->bus_proxy,
-+ res = get_caller_info (manager,
- sender,
- &uid,
- &pid);
-@@ -2767,7 +2828,7 @@ dbus_get_session_for_cookie (ConsoleKitManager *ckmanager,
-
- sender = g_dbus_method_invocation_get_sender (context);
-
-- res = get_caller_info (manager->priv->bus_proxy,
-+ res = get_caller_info (manager,
- sender,
- &calling_uid,
- &calling_pid);
-@@ -2852,7 +2913,7 @@ dbus_get_session_for_unix_process (ConsoleKitManager *ckmanager,
- TRACE ();
- g_debug ("pid: %u", pid);
-
-- res = get_caller_info (manager->priv->bus_proxy,
-+ res = get_caller_info (manager,
- sender,
- &calling_uid,
- &calling_pid);
-@@ -2900,7 +2961,7 @@ dbus_get_current_session (ConsoleKitManager *ckmanager,
-
- g_debug ("CkManager: get current session");
-
-- res = get_caller_info (manager->priv->bus_proxy,
-+ res = get_caller_info (manager,
- sender,
- &calling_uid,
- &calling_pid);
-@@ -3100,7 +3161,7 @@ dbus_close_session (ConsoleKitManager *ckmanager,
- manager = CK_MANAGER (ckmanager);
-
- sender = g_dbus_method_invocation_get_sender (context);
-- res = get_caller_info (manager->priv->bus_proxy,
-+ res = get_caller_info (manager,
- sender,
- &calling_uid,
- &calling_pid);
-@@ -3443,17 +3504,6 @@ create_seats (CkManager *manager)
- }
-
- static void
--cancel_timeout_and_call_system_action (CkManagerPrivate *priv)
--{
-- /* The inhibit lock for this action was removed.
-- * Stop the timeout and call the system action now.
-- */
-- g_source_remove (priv->system_action_idle_id);
-- priv->system_action_idle_id = 0;
-- system_action_idle_cb (priv->system_action_data);
--}
--
--static void
- on_inhibit_manager_changed_event (CkInhibitManager *manager, gint inhibit_mode, gint event, gboolean enabled, gpointer user_data)
- {
- CkManagerPrivate *priv;
-@@ -3472,6 +3522,17 @@ on_inhibit_manager_changed_event (CkInhibitManager *manager, gint inhibit_mode,
- return;
- }
-
-+ /* this system action must be for a sleep or shutdown operation */
-+ if (priv->system_action_data->signal != PREPARE_FOR_SLEEP &&
-+ priv->system_action_data->signal != PREPARE_FOR_SHUTDOWN) {
-+ return;
-+ }
-+
-+ /* the inhibit change must be for sleep or shutdown */
-+ if (event != CK_INHIBIT_EVENT_SUSPEND && event != CK_INHIBIT_EVENT_SHUTDOWN) {
-+ return;
-+ }
-+
- /* must be a delay inhibitor */
- if (inhibit_mode != CK_INHIBIT_MODE_DELAY) {
- return;
-@@ -3482,17 +3543,12 @@ on_inhibit_manager_changed_event (CkInhibitManager *manager, gint inhibit_mode,
- return;
- }
-
-- /* Did we stop inhibiting sleep? */
-- if (priv->system_action_data->signal == PREPARE_FOR_SLEEP &&
-- event == CK_INHIBIT_EVENT_SUSPEND) {
-- cancel_timeout_and_call_system_action (priv);
-- }
--
-- /* Did we stop inhibiting shutdown? */
-- if (priv->system_action_data->signal == PREPARE_FOR_SHUTDOWN &&
-- event == CK_INHIBIT_EVENT_SHUTDOWN) {
-- cancel_timeout_and_call_system_action (priv);
-- }
-+ /* The inhibit lock for this action was removed.
-+ * Stop the timeout and call the system action now.
-+ */
-+ g_source_remove (priv->system_action_idle_id);
-+ priv->system_action_idle_id = 0;
-+ system_action_idle_cb (priv->system_action_data);
- }
-
- static void
-diff --git a/src/ck-session.c b/src/ck-session.c
-index 478dce2..ca0f8ca 100644
---- a/src/ck-session.c
-+++ b/src/ck-session.c
-@@ -248,6 +248,60 @@ dbus_unlock (ConsoleKitSession *cksession,
- return TRUE;
- }
-
-+/* adapted from PolicyKit */
-+static gboolean
-+get_caller_info (CkSession *session,
-+ const char *sender,
-+ uid_t *calling_uid,
-+ pid_t *calling_pid)
-+{
-+ gboolean res = FALSE;
-+ GVariant *value = NULL;
-+ GError *error = NULL;
-+
-+ if (sender == NULL) {
-+ goto out;
-+ }
-+
-+ value = g_dbus_proxy_call_sync (session->priv->bus_proxy, "GetConnectionUnixUser",
-+ g_variant_new ("(s)", sender),
-+ G_DBUS_CALL_FLAGS_NONE,
-+ 2000,
-+ NULL,
-+ &error);
-+
-+ if (value == NULL) {
-+ g_warning ("GetConnectionUnixUser() failed: %s", error->message);
-+ g_error_free (error);
-+ goto out;
-+ }
-+ g_variant_get (value, "(u)", calling_uid);
-+ g_variant_unref (value);
-+
-+ value = g_dbus_proxy_call_sync (session->priv->bus_proxy, "GetConnectionUnixProcessID",
-+ g_variant_new ("(s)", sender),
-+ G_DBUS_CALL_FLAGS_NONE,
-+ 2000,
-+ NULL,
-+ &error);
-+
-+ if (value == NULL) {
-+ g_warning ("GetConnectionUnixProcessID() failed: %s", error->message);
-+ g_error_free (error);
-+ goto out;
-+ }
-+ g_variant_get (value, "(u)", calling_pid);
-+ g_variant_unref (value);
-+
-+ res = TRUE;
-+
-+ g_debug ("uid = %d", *calling_uid);
-+ g_debug ("pid = %d", *calling_pid);
-+
-+out:
-+ return res;
-+}
-+
- static gboolean
- session_set_idle_hint_internal (CkSession *session,
- gboolean idle_hint)
-@@ -326,7 +380,7 @@ dbus_set_idle_hint (ConsoleKitSession *cksession,
-
- sender = g_dbus_method_invocation_get_sender (context);
-
-- res = get_caller_info (session->priv->bus_proxy,
-+ res = get_caller_info (session,
- sender,
- &calling_uid,
- &calling_pid);
-diff --git a/src/ck-sysdeps-unix.c b/src/ck-sysdeps-unix.c
-index 87333d1..0f751b9 100644
---- a/src/ck-sysdeps-unix.c
-+++ b/src/ck-sysdeps-unix.c
-@@ -132,65 +132,6 @@ ck_get_socket_peer_credentials (int socket_fd,
- return ret;
- }
-
--/* adapted from PolicyKit */
--gboolean
--get_caller_info (GDBusProxy *bus_proxy,
-- const char *sender,
-- uid_t *calling_uid,
-- pid_t *calling_pid)
--{
-- gboolean res = FALSE;
-- GVariant *value = NULL;
-- GError *error = NULL;
--
-- if (sender == NULL) {
-- g_debug ("sender == NULL");
-- goto out;
-- }
--
-- if (bus_proxy == NULL) {
-- g_debug ("bus_proxy == NULL");
-- goto out;
-- }
--
-- value = g_dbus_proxy_call_sync (bus_proxy, "GetConnectionUnixUser",
-- g_variant_new ("(s)", sender),
-- G_DBUS_CALL_FLAGS_NONE,
-- 2000,
-- NULL,
-- &error);
--
-- if (value == NULL) {
-- g_warning ("GetConnectionUnixUser() failed: %s", error->message);
-- g_error_free (error);
-- goto out;
-- }
-- g_variant_get (value, "(u)", calling_uid);
-- g_variant_unref (value);
--
-- value = g_dbus_proxy_call_sync (bus_proxy, "GetConnectionUnixProcessID",
-- g_variant_new ("(s)", sender),
-- G_DBUS_CALL_FLAGS_NONE,
-- 2000,
-- NULL,
-- &error);
--
-- if (value == NULL) {
-- g_warning ("GetConnectionUnixProcessID() failed: %s", error->message);
-- g_error_free (error);
-- goto out;
-- }
-- g_variant_get (value, "(u)", calling_pid);
-- g_variant_unref (value);
--
-- res = TRUE;
--
-- g_debug ("uid = %d", *calling_uid);
-- g_debug ("pid = %d", *calling_pid);
--
--out:
-- return res;
--}
-
- /*
- * getfd.c
-diff --git a/src/ck-sysdeps.h b/src/ck-sysdeps.h
-index 66df581..bc32631 100644
---- a/src/ck-sysdeps.h
-+++ b/src/ck-sysdeps.h
-@@ -24,7 +24,6 @@
- #include "config.h"
-
- #include <glib.h>
--#include <gio/gio.h>
-
- G_BEGIN_DECLS
-
-@@ -55,11 +54,6 @@ gboolean ck_get_socket_peer_credentials (int socket_fd,
- uid_t *uid,
- GError **error);
-
--gboolean get_caller_info (GDBusProxy *bus_proxy,
-- const char *sender,
-- uid_t *calling_uid,
-- pid_t *calling_pid);
--
- int ck_get_a_console_fd (void);
-
- gboolean ck_fd_is_a_console (int fd);
-diff --git a/tools/Makefile.am b/tools/Makefile.am
-index 69dd1eb..81f4d1f 100644
---- a/tools/Makefile.am
-+++ b/tools/Makefile.am
-@@ -131,7 +131,6 @@ ck_collect_session_info_SOURCES = \
- $(NULL)
-
- ck_collect_session_info_LDADD = \
-- $(CONSOLE_KIT_LIBS) \
- $(TOOLS_LIBS) \
- $(top_builddir)/src/libck.la \
- $(NULL)
-@@ -141,7 +140,6 @@ ck_get_x11_server_pid_SOURCES = \
- $(NULL)
-
- ck_get_x11_server_pid_LDADD = \
-- $(CONSOLE_KIT_LIBS) \
- $(TOOLS_LIBS) \
- $(XLIB_LIBS) \
- $(top_builddir)/src/libck.la \
-@@ -152,7 +150,6 @@ ck_get_x11_display_device_SOURCES = \
- $(NULL)
-
- ck_get_x11_display_device_LDADD = \
-- $(CONSOLE_KIT_LIBS) \
- $(TOOLS_LIBS) \
- $(top_builddir)/src/libck.la \
- $(NULL)
---
-2.5.1
-
diff --git a/source/l/ConsoleKit2/patches/0002-Fix-some-libdir-scripts-stuff-missed-in-4d87a25ea0af.patch b/source/l/ConsoleKit2/patches/0002-Fix-some-libdir-scripts-stuff-missed-in-4d87a25ea0af.patch
deleted file mode 100644
index 2c46bbd8..00000000
--- a/source/l/ConsoleKit2/patches/0002-Fix-some-libdir-scripts-stuff-missed-in-4d87a25ea0af.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From b045a4245199b12dfc04f03b22bc1e9b1f80aae9 Mon Sep 17 00:00:00 2001
-From: Robby Workman <rworkman@slackware.com>
-Date: Sun, 23 Aug 2015 16:53:52 -0500
-Subject: [PATCH 2/5] Fix some libdir/scripts stuff missed in 4d87a25ea0af
-
----
- src/ck-seat.c | 2 +-
- tools/Makefile.am | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/ck-seat.c b/src/ck-seat.c
-index ead6425..47e6933 100644
---- a/src/ck-seat.c
-+++ b/src/ck-seat.c
-@@ -1443,7 +1443,7 @@ ck_seat_run_programs (CkSeat *seat,
- g_assert(n <= G_N_ELEMENTS(extra_env));
-
- ck_run_programs (SYSCONFDIR "/ConsoleKit/run-seat.d", action, extra_env);
-- ck_run_programs (PREFIX "/lib/ConsoleKit/run-seat.d", action, extra_env);
-+ ck_run_programs (LIBDIR "/ConsoleKit/run-seat.d", action, extra_env);
-
- for (n = 0; extra_env[n] != NULL; n++) {
- g_free (extra_env[n]);
-diff --git a/tools/Makefile.am b/tools/Makefile.am
-index 69dd1eb..d61b845 100644
---- a/tools/Makefile.am
-+++ b/tools/Makefile.am
-@@ -171,9 +171,9 @@ udev_acl_CFLAGS = \
- $(NULL)
-
- install-exec-hook:
-- mkdir -p $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d
-+ mkdir -p $(DESTDIR)$(libdir)/ConsoleKit/run-seat.d
- mkdir -p $(DESTDIR)$(UDEVDIR)
-- ln -sf $(libexecdir)/udev-acl $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d/udev-acl.ck
-+ ln -sf $(libexecdir)/udev-acl $(DESTDIR)$(libdir)/ConsoleKit/run-seat.d/udev-acl.ck
- ln -sf $(libexecdir)/udev-acl $(DESTDIR)$(UDEVDIR)/udev-acl
- endif
-
---
-2.5.1
-
diff --git a/source/l/ConsoleKit2/patches/0003-Filter-out-the-kdm-user.patch b/source/l/ConsoleKit2/patches/0003-Filter-out-the-kdm-user.patch
deleted file mode 100644
index c0ec63d8..00000000
--- a/source/l/ConsoleKit2/patches/0003-Filter-out-the-kdm-user.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From f848c1de94ef2f5ae7d53358d30e26400a69d3d4 Mon Sep 17 00:00:00 2001
-From: Ivailo Monev <xakepa10@gmail.com>
-Date: Mon, 24 Aug 2015 20:18:50 +0300
-Subject: [PATCH 5/5] Filter out the kdm user
-
----
- src/ck-manager.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/ck-manager.c b/src/ck-manager.c
-index 66da8b2..4a6e511 100644
---- a/src/ck-manager.c
-+++ b/src/ck-manager.c
-@@ -1111,9 +1111,10 @@ session_is_real_user (CkSession *session,
-
- username = get_user_name (uid);
-
-- /* filter out GDM/SDDM user */
-+ /* filter out GDM/SDDM/KDM user */
- if (g_strcmp0 (username, "gdm") == 0 ||
-- g_strcmp0 (username, "sddm") == 0) {
-+ g_strcmp0 (username, "sddm") == 0 ||
-+ g_strcmp0 (username, "kdm") == 0) {
- ret = FALSE;
- goto out;
- }
---
-2.5.1
-
diff --git a/source/l/ConsoleKit2/patches/0004-Apply-overlooked-prefix-lib-libdir-substitution.patch b/source/l/ConsoleKit2/patches/0004-Apply-overlooked-prefix-lib-libdir-substitution.patch
deleted file mode 100644
index ee3b1e23..00000000
--- a/source/l/ConsoleKit2/patches/0004-Apply-overlooked-prefix-lib-libdir-substitution.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 22958330535c9e26ed537d1568925f64e3bafe4d Mon Sep 17 00:00:00 2001
-From: Eric Hameleers <alien@slackware.com>
-Date: Thu, 10 Sep 2015 14:19:43 +0200
-Subject: [PATCH] Apply overlooked PREFIX/lib -> LIBDIR substitution
-
----
- src/ck-session.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/ck-session.c b/src/ck-session.c
-index ca0f8ca..1b58889 100644
---- a/src/ck-session.c
-+++ b/src/ck-session.c
-@@ -1273,7 +1273,7 @@ ck_session_run_programs (CkSession *session,
- g_assert(n <= G_N_ELEMENTS(extra_env));
-
- ck_run_programs (SYSCONFDIR "/ConsoleKit/run-session.d", action, extra_env);
-- ck_run_programs (PREFIX "/lib/ConsoleKit/run-session.d", action, extra_env);
-+ ck_run_programs (LIBDIR "/ConsoleKit/run-session.d", action, extra_env);
-
- for (n = 0; extra_env[n] != NULL; n++) {
- g_free (extra_env[n]);
diff --git a/source/l/mozilla-nss/mozilla-nss.SlackBuild b/source/l/mozilla-nss/mozilla-nss.SlackBuild
index 1963cad1..7be3b07b 100755
--- a/source/l/mozilla-nss/mozilla-nss.SlackBuild
+++ b/source/l/mozilla-nss/mozilla-nss.SlackBuild
@@ -26,8 +26,8 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=mozilla-nss
SRCNAM=nss
-VERSION=${VERSION:-3.49.2}
-NSPR=${NSPR:-4.24}
+VERSION=${VERSION:-3.50}
+NSPR=${NSPR:-4.25}
BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
diff --git a/source/l/readline/readline-8.0-patches/readline80-002 b/source/l/readline/readline-8.0-patches/readline80-002
new file mode 100644
index 00000000..7923d9d1
--- /dev/null
+++ b/source/l/readline/readline-8.0-patches/readline80-002
@@ -0,0 +1,60 @@
+ READLINE PATCH REPORT
+ =====================
+
+Readline-Release: 8.0
+Patch-ID: readline80-002
+
+Bug-Reported-by: lessbug@qq.com
+Bug-Reference-ID: <tencent_6AA531D9A5CC4121D86BD5CDA2E0DA98C605@qq.com>
+Bug-Reference-URL:
+
+Bug-Description:
+
+When using previous-history to go back beyond the beginning of the history list,
+it's possible to move to an incorrect partial line.
+
+Patch (apply with `patch -p0'):
+
+*** ../readline-8.0-patched/misc.c 2017-07-07 17:30:12.000000000 -0400
+--- misc.c 2019-05-16 11:43:46.000000000 -0400
+***************
+*** 577,580 ****
+--- 590,594 ----
+ {
+ HIST_ENTRY *old_temp, *temp;
++ int had_saved_line;
+
+ if (count < 0)
+***************
+*** 589,592 ****
+--- 603,607 ----
+
+ /* If we don't have a line saved, then save this one. */
++ had_saved_line = _rl_saved_line_for_history != 0;
+ rl_maybe_save_line ();
+
+***************
+*** 612,616 ****
+ if (temp == 0)
+ {
+! rl_maybe_unsave_line ();
+ rl_ding ();
+ }
+--- 627,632 ----
+ if (temp == 0)
+ {
+! if (had_saved_line == 0)
+! _rl_free_saved_history_line ();
+ rl_ding ();
+ }
+*** ../readline-8.0/patchlevel 2013-11-15 08:11:11.000000000 -0500
+--- patchlevel 2014-03-21 08:28:40.000000000 -0400
+***************
+*** 1,3 ****
+ # Do not edit -- exists only for use by patch
+
+! 1
+--- 1,3 ----
+ # Do not edit -- exists only for use by patch
+
+! 2
diff --git a/source/l/readline/readline-8.0-patches/readline80-003 b/source/l/readline/readline-8.0-patches/readline80-003
new file mode 100644
index 00000000..b3714581
--- /dev/null
+++ b/source/l/readline/readline-8.0-patches/readline80-003
@@ -0,0 +1,69 @@
+ READLINE PATCH REPORT
+ =====================
+
+Readline-Release: 8.0
+Patch-ID: readline80-003
+
+Bug-Reported-by: HIROSE Masaaki <hirose31@gmail.com>
+Bug-Reference-ID: <CAGSOfA-RqiTe=+GsXsDKyZrrMWH4bDbXgMVVegMa6OjqC5xbnQ@mail.gmail.com>
+Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2019-05/msg00038.html
+
+Bug-Description:
+
+Reading history entries with timestamps can result in history entries joined
+by linefeeds.
+
+Patch (apply with `patch -p0'):
+
+*** ../readline-8.0-patched/histfile.c 2018-06-11 09:14:52.000000000 -0400
+--- histfile.c 2019-05-16 15:55:57.000000000 -0400
+***************
+*** 370,376 ****
+
+ has_timestamps = HIST_TIMESTAMP_START (buffer);
+! history_multiline_entries += has_timestamps && history_write_timestamps;
+
+ /* Skip lines until we are at FROM. */
+ for (line_start = line_end = buffer; line_end < bufend && current_line < from; line_end++)
+ if (*line_end == '\n')
+--- 370,378 ----
+
+ has_timestamps = HIST_TIMESTAMP_START (buffer);
+! history_multiline_entries += has_timestamps && history_write_timestamps;
+
+ /* Skip lines until we are at FROM. */
++ if (has_timestamps)
++ last_ts = buffer;
+ for (line_start = line_end = buffer; line_end < bufend && current_line < from; line_end++)
+ if (*line_end == '\n')
+***************
+*** 381,385 ****
+--- 383,398 ----
+ if (HIST_TIMESTAMP_START(p) == 0)
+ current_line++;
++ else
++ last_ts = p;
+ line_start = p;
++ /* If we are at the last line (current_line == from) but we have
++ timestamps (has_timestamps), then line_start points to the
++ text of the last command, and we need to skip to its end. */
++ if (current_line >= from && has_timestamps)
++ {
++ for (line_end = p; line_end < bufend && *line_end != '\n'; line_end++)
++ ;
++ line_start = (*line_end == '\n') ? line_end + 1 : line_end;
++ }
+ }
+
+
+*** ../readline-8.0/patchlevel 2013-11-15 08:11:11.000000000 -0500
+--- patchlevel 2014-03-21 08:28:40.000000000 -0400
+***************
+*** 1,3 ****
+ # Do not edit -- exists only for use by patch
+
+! 2
+--- 1,3 ----
+ # Do not edit -- exists only for use by patch
+
+! 3
diff --git a/source/l/readline/readline-8.0-patches/readline80-004 b/source/l/readline/readline-8.0-patches/readline80-004
new file mode 100644
index 00000000..8a40ebe9
--- /dev/null
+++ b/source/l/readline/readline-8.0-patches/readline80-004
@@ -0,0 +1,47 @@
+ READLINE PATCH REPORT
+ =====================
+
+Readline-Release: 8.0
+Patch-ID: readline80-004
+
+Bug-Reported-by: auroralanes@protonmail.ch
+Bug-Reference-ID: <WikEDKluAyoha9IDLp83rbN7_Uinr2rrpvSV_z4wmt9qur9piN-FNOn17P0cAizEVah1Fvc9d641vIIWX_7SC6EUTz0CatnOH-C-UK3rPYc=@protonmail.ch>
+Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-readline/2020-01/msg00008.html
+
+Bug-Description:
+
+If writing the history file fails, and renaming the backup history file fails,
+it's possible for readline's history code to return the wrong error to its
+caller.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-20200124/lib/readline/histfile.c 2019-11-19 10:31:58.000000000 -0500
+--- histfile.c 2020-02-01 16:28:29.000000000 -0500
+***************
+*** 621,624 ****
+--- 621,625 ----
+ if (rv != 0)
+ {
++ rv = errno;
+ if (tempname)
+ unlink (tempname);
+***************
+*** 768,771 ****
+--- 769,773 ----
+ if (rv != 0)
+ {
++ rv = errno;
+ if (tempname)
+ unlink (tempname);
+*** ../readline-8.0/patchlevel 2013-11-15 08:11:11.000000000 -0500
+--- patchlevel 2014-03-21 08:28:40.000000000 -0400
+***************
+*** 1,3 ****
+ # Do not edit -- exists only for use by patch
+
+! 3
+--- 1,3 ----
+ # Do not edit -- exists only for use by patch
+
+! 4
diff --git a/source/n/libgpg-error/libgpg-error.SlackBuild b/source/n/libgpg-error/libgpg-error.SlackBuild
index 654d94df..5fb69ab7 100755
--- a/source/n/libgpg-error/libgpg-error.SlackBuild
+++ b/source/n/libgpg-error/libgpg-error.SlackBuild
@@ -1,7 +1,7 @@
#!/bin/bash
# Copyright 2006, 2009 Robby Workman, Northport, AL, USA
-# Copyright 2007, 2008, 2009, 2010, 2015, 2017, 2018, 2019 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2007, 2008, 2009, 2010, 2015, 2017, 2018, 2019, 2020 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -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 {} \+
-# 'namespace' is a builtin in gawk5, so change it to 'libgpg_error_namespace':
-zcat $CWD/libgpg-error.gawk5.diff.gz | patch -p1 --verbose || exit 1
-
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/source/n/libgpg-error/libgpg-error.gawk5.diff b/source/n/libgpg-error/libgpg-error.gawk5.diff
deleted file mode 100644
index d8842db4..00000000
--- a/source/n/libgpg-error/libgpg-error.gawk5.diff
+++ /dev/null
@@ -1,49 +0,0 @@
---- ./src/Makefile.in.orig 2019-03-19 03:58:04.000000000 -0500
-+++ ./src/Makefile.in 2019-04-13 13:58:45.614800729 -0500
-@@ -1615,7 +1615,7 @@
-
- errnos-sym.h: Makefile mkstrtable.awk errnos.in
- $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \
-- -v prefix=GPG_ERR_ -v namespace=errnos_ \
-+ -v prefix=GPG_ERR_ -v libgpg_error_namespace=errnos_ \
- $(srcdir)/errnos.in >$@
-
- mkheader$(EXEEXT_FOR_BUILD): mkheader.c Makefile
---- ./src/mkstrtable.awk.orig 2013-03-15 14:24:25.000000000 -0500
-+++ ./src/mkstrtable.awk 2019-04-13 13:57:47.141800103 -0500
-@@ -77,7 +77,7 @@
- #
- # The variable prefix can be used to prepend a string to each message.
- #
--# The variable namespace can be used to prepend a string to each
-+# The variable libgpg_error_namespace can be used to prepend a string to each
- # variable and macro name.
-
- BEGIN {
-@@ -102,7 +102,7 @@
- print "/* The purpose of this complex string table is to produce";
- print " optimal code with a minimum of relocations. */";
- print "";
-- print "static const char " namespace "msgstr[] = ";
-+ print "static const char " libgpg_error_namespace "msgstr[] = ";
- header = 0;
- }
- else
-@@ -150,7 +150,7 @@
- else
- print " gettext_noop (\"" last_msgstr "\");";
- print "";
-- print "static const int " namespace "msgidx[] =";
-+ print "static const int " libgpg_error_namespace "msgidx[] =";
- print " {";
- for (i = 0; i < coded_msgs; i++)
- print " " pos[i] ",";
-@@ -158,7 +158,7 @@
- print " };";
- print "";
- print "static GPG_ERR_INLINE int";
-- print namespace "msgidxof (int code)";
-+ print libgpg_error_namespace "msgidxof (int code)";
- print "{";
- print " return (0 ? 0";
-
diff --git a/source/n/libgpg-error/libgpg-error.url b/source/n/libgpg-error/libgpg-error.url
new file mode 100644
index 00000000..69afe7b1
--- /dev/null
+++ b/source/n/libgpg-error/libgpg-error.url
@@ -0,0 +1 @@
+ftp://ftp.gnupg.org:/gcrypt/libgpg-error