summaryrefslogtreecommitdiff
path: root/source/a
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2020-12-20 03:10:57 +0000
committerEric Hameleers <alien@slackware.com>2020-12-20 08:59:51 +0100
commit98f1ac1fd7a1b5643d4040c9d18276576a7d759a (patch)
treeed148154f5e837b482889bf99527bbc97aa707c0 /source/a
parentc9a25f18230e4de74520105a1310ca50c9f30239 (diff)
downloadcurrent-98f1ac1fd7a1b5643d4040c9d18276576a7d759a.tar.gz
Sun Dec 20 03:10:57 UTC 202020201220031057
Linus didn't think this was a scary kernel and in spite of skipping a few branches here before getting to this one, I don't either. Not scary enough to make me think I need to start it out in /testing, anyway. I have a good feeling about this kernel. Enjoy! :-) a/bash-5.1.004-x86_64-1.txz: Upgraded. a/elogind-246.9-x86_64-1.txz: Upgraded. Don't make 10-enable-session-power.rules a .new file. Thanks to Robby Workman. a/kernel-firmware-20201218_646f159-noarch-1.txz: Upgraded. a/kernel-generic-5.10.1-x86_64-1.txz: Upgraded. a/kernel-huge-5.10.1-x86_64-1.txz: Upgraded. a/kernel-modules-5.10.1-x86_64-1.txz: Upgraded. a/ndctl-71-x86_64-1.txz: Upgraded. a/sysvinit-scripts-2.1-noarch-37.txz: Rebuilt. rc.S: don't start cgmanager/cgproxy. rc.6: don't stop cgmanager/cgproxy. d/kernel-headers-5.10.1-x86-1.txz: Upgraded. k/kernel-source-5.10.1-noarch-1.txz: Upgraded. l/libtiff-4.2.0-x86_64-1.txz: Upgraded. l/zstd-1.4.8-x86_64-1.txz: Upgraded. n/ca-certificates-20201219-noarch-1.txz: Upgraded. This update provides the latest CA certificates to check for the authenticity of SSL connections. xap/libnma-1.8.30-x86_64-1.txz: Upgraded. isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source/a')
-rw-r--r--source/a/bash/bash-5.1-patches/bash51-00180
-rw-r--r--source/a/bash/bash-5.1-patches/bash51-00257
-rw-r--r--source/a/bash/bash-5.1-patches/bash51-00353
-rw-r--r--source/a/bash/bash-5.1-patches/bash51-004126
-rw-r--r--source/a/elogind/doinst.sh13
-rwxr-xr-xsource/a/elogind/elogind.SlackBuild7
-rw-r--r--source/a/sysvinit-scripts/scripts/rc.65
-rw-r--r--source/a/sysvinit-scripts/scripts/rc.S5
-rwxr-xr-xsource/a/sysvinit-scripts/sysvinit-scripts.SlackBuild2
9 files changed, 320 insertions, 28 deletions
diff --git a/source/a/bash/bash-5.1-patches/bash51-001 b/source/a/bash/bash-5.1-patches/bash51-001
new file mode 100644
index 00000000..6f29981d
--- /dev/null
+++ b/source/a/bash/bash-5.1-patches/bash51-001
@@ -0,0 +1,80 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 5.1
+Patch-ID: bash51-001
+
+Bug-Reported-by: Fazal Majid <fazal@majid.org>
+Bug-Reference-ID: <DEAB7D2C-C626-450C-B2E5-281AFF2D26D4@majid.org>
+Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2020-12/msg00000.html
+
+Bug-Description:
+
+There is a missing dependency on a constructed file, which can cause highly
+parellel builds to fail.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-5.1-patched/Makefile.in 2020-12-04 09:51:19.000000000 -0500
+--- Makefile.in 2020-12-16 11:28:36.000000000 -0500
+***************
+*** 1316,1319 ****
+--- 1316,1320 ----
+ bashline.o: pcomplete.h ${BASHINCDIR}/chartypes.h input.h
+ bashline.o: ${BASHINCDIR}/shmbutil.h ${BASHINCDIR}/shmbchar.h
++ bashline.o: ${DEFDIR}/builtext.h
+ bracecomp.o: config.h bashansi.h ${BASHINCDIR}/ansi_stdlib.h
+ bracecomp.o: shell.h syntax.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h
+***************
+*** 1436,1439 ****
+--- 1437,1441 ----
+ builtins/evalstring.o: jobs.h builtins.h flags.h input.h execute_cmd.h
+ builtins/evalstring.o: bashhist.h $(DEFSRC)/common.h pathnames.h
++ builtins/evalstring.o: ${DEFDIR}/builtext.h
+ builtins/getopt.o: config.h ${BASHINCDIR}/memalloc.h
+ builtins/getopt.o: shell.h syntax.h bashjmp.h command.h general.h xmalloc.h error.h
+
+*** ../bash-5.1-patched/builtins/Makefile.in 2019-07-25 08:03:45.000000000 -0400
+--- builtins/Makefile.in 2020-12-16 11:29:29.000000000 -0500
+***************
+*** 362,366 ****
+ evalstring.o: $(topdir)/flags.h $(topdir)/input.h $(topdir)/execute_cmd.h
+ evalstring.o: $(topdir)/bashhist.h $(srcdir)/common.h
+! evalstring.o: $(topdir)/trap.h $(topdir)/redir.h ../pathnames.h
+ #evalstring.o: $(topdir)/y.tab.h
+ getopt.o: ../config.h $(BASHINCDIR)/memalloc.h
+--- 362,366 ----
+ evalstring.o: $(topdir)/flags.h $(topdir)/input.h $(topdir)/execute_cmd.h
+ evalstring.o: $(topdir)/bashhist.h $(srcdir)/common.h
+! evalstring.o: $(topdir)/trap.h $(topdir)/redir.h ../pathnames.h ./builtext.h
+ #evalstring.o: $(topdir)/y.tab.h
+ getopt.o: ../config.h $(BASHINCDIR)/memalloc.h
+
+*** ../bash-5.1/patchlevel.h 2020-06-22 14:51:03.000000000 -0400
+--- patchlevel.h 2020-10-01 11:01:28.000000000 -0400
+***************
+*** 1,5 ****
+ /* patchlevel.h -- current bash patch level */
+
+! /* Copyright (C) 2001-2016 Free Software Foundation, Inc.
+
+ This file is part of GNU Bash, the Bourne Again SHell.
+--- 1,5 ----
+ /* patchlevel.h -- current bash patch level */
+
+! /* Copyright (C) 2001-2020 Free Software Foundation, Inc.
+
+ This file is part of GNU Bash, the Bourne Again SHell.
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 0
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 1
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/source/a/bash/bash-5.1-patches/bash51-002 b/source/a/bash/bash-5.1-patches/bash51-002
new file mode 100644
index 00000000..8c991649
--- /dev/null
+++ b/source/a/bash/bash-5.1-patches/bash51-002
@@ -0,0 +1,57 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 5.1
+Patch-ID: bash51-002
+
+Bug-Reported-by: oguzismailuysal@gmail.com
+Bug-Reference-ID: <CAH7i3LoHFUa4aSF5-AD2r80HG-p-YzD_9ZxomarZkhP8NMq63g@mail.gmail.com>
+Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2020-12/msg00037.html
+
+Bug-Description:
+
+If there are no jobs, and the `-n' and `-p' options are both supplied to
+`wait', bash can assign a value to the variable name specified with `-p'
+instead of leaving it unset.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-5.1-patched/builtins/wait.def 2020-04-09 15:13:57.000000000 -0400
+--- builtins/wait.def 2020-12-11 09:46:49.000000000 -0500
+***************
+*** 214,222 ****
+
+ status = wait_for_any_job (wflags, &pstat);
+- if (status < 0)
+- status = 127;
+-
+ if (vname && status >= 0)
+ bind_var_to_int (vname, pstat.pid);
+ if (list)
+ unset_waitlist ();
+--- 214,222 ----
+
+ status = wait_for_any_job (wflags, &pstat);
+ if (vname && status >= 0)
+ bind_var_to_int (vname, pstat.pid);
++
++ if (status < 0)
++ status = 127;
+ if (list)
+ unset_waitlist ();
+
+*** ../bash-5.1/patchlevel.h 2020-06-22 14:51:03.000000000 -0400
+--- patchlevel.h 2020-10-01 11:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 1
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 2
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/source/a/bash/bash-5.1-patches/bash51-003 b/source/a/bash/bash-5.1-patches/bash51-003
new file mode 100644
index 00000000..68e5dce6
--- /dev/null
+++ b/source/a/bash/bash-5.1-patches/bash51-003
@@ -0,0 +1,53 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 5.1
+Patch-ID: bash51-003
+
+Bug-Reported-by: oguzismailuysal@gmail.com
+Bug-Reference-ID: <CAH7i3LpG91BnNcDtaTUm2Ph7a+PnJkuh6nAc87cVL7_38tOaMQ@mail.gmail.com>
+Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2020-12/msg00050.html
+
+Bug-Description:
+
+Bash does not put a command substitution process that is started to perform an
+expansion in a child process into the right process group where it can receive
+keyboard-generated signals.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-5.1-patched/subst.c 2020-11-16 10:33:15.000000000 -0500
+--- subst.c 2020-12-12 13:50:11.000000000 -0500
+***************
+*** 6357,6362 ****
+ #if defined (JOB_CONTROL)
+ old_pipeline_pgrp = pipeline_pgrp;
+! /* Don't reset the pipeline pgrp if we're already a subshell in a pipeline. */
+! if ((subshell_environment & SUBSHELL_PIPE) == 0)
+ pipeline_pgrp = shell_pgrp;
+ cleanup_the_pipeline ();
+--- 6357,6364 ----
+ #if defined (JOB_CONTROL)
+ old_pipeline_pgrp = pipeline_pgrp;
+! /* Don't reset the pipeline pgrp if we're already a subshell in a pipeline or
+! we've already forked to run a disk command (and are expanding redirections,
+! for example). */
+! if ((subshell_environment & (SUBSHELL_FORK|SUBSHELL_PIPE)) == 0)
+ pipeline_pgrp = shell_pgrp;
+ cleanup_the_pipeline ();
+
+*** ../bash-5.1/patchlevel.h 2020-06-22 14:51:03.000000000 -0400
+--- patchlevel.h 2020-10-01 11:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 2
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 3
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/source/a/bash/bash-5.1-patches/bash51-004 b/source/a/bash/bash-5.1-patches/bash51-004
new file mode 100644
index 00000000..39a6c647
--- /dev/null
+++ b/source/a/bash/bash-5.1-patches/bash51-004
@@ -0,0 +1,126 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 5.1
+Patch-ID: bash51-004
+
+Bug-Reported-by: oguzismailuysal@gmail.com
+Bug-Reference-ID: <CAH7i3LoHGmwaghDpCWRUfcY04gQmeDTH3RiG=bf2b=KbU=gyhw@mail.gmail.com>
+Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2020-12/msg00039.html
+
+Bug-Description:
+
+If a key-value compound array assignment to an associative array is supplied
+as an assignment statement argument to the `declare' command that declares the
+array, the assignment doesn't perform the correct word expansions.
+
+This patch makes key-value assignment and subscript assignment perform the
+same expansions when they're supplied as an argument to `declare'.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-5.1-patched/arrayfunc.c 2020-10-09 11:38:58.000000000 -0400
+--- arrayfunc.c 2020-12-11 15:12:22.000000000 -0500
+***************
+*** 598,601 ****
+--- 598,622 ----
+ }
+ }
++
++ /* Return non-zero if L appears to be a key-value pair associative array
++ compound assignment. */
++ int
++ kvpair_assignment_p (l)
++ WORD_LIST *l;
++ {
++ return (l && (l->word->flags & W_ASSIGNMENT) == 0 && l->word->word[0] != '['); /*]*/
++ }
++
++ char *
++ expand_and_quote_kvpair_word (w)
++ char *w;
++ {
++ char *t, *r;
++
++ t = w ? expand_assignment_string_to_string (w, 0) : 0;
++ r = sh_single_quote (t ? t : "");
++ free (t);
++ return r;
++ }
+ #endif
+
+***************
+*** 641,645 ****
+
+ #if ASSOC_KVPAIR_ASSIGNMENT
+! if (assoc_p (var) && nlist && (nlist->word->flags & W_ASSIGNMENT) == 0 && nlist->word->word[0] != '[') /*]*/
+ {
+ iflags = flags & ~ASS_APPEND;
+--- 662,666 ----
+
+ #if ASSOC_KVPAIR_ASSIGNMENT
+! if (assoc_p (var) && kvpair_assignment_p (nlist))
+ {
+ iflags = flags & ~ASS_APPEND;
+*** ../bash-5.1-patched/arrayfunc.h 2020-04-29 17:24:15.000000000 -0400
+--- arrayfunc.h 2020-12-11 14:23:50.000000000 -0500
+***************
+*** 68,71 ****
+--- 68,74 ----
+ extern void quote_compound_array_list PARAMS((WORD_LIST *, int));
+
++ extern int kvpair_assignment_p PARAMS((WORD_LIST *));
++ extern char *expand_and_quote_kvpair_word PARAMS((char *));
++
+ extern int unbind_array_element PARAMS((SHELL_VAR *, char *, int));
+ extern int skipsubscript PARAMS((const char *, int, int));
+*** ../bash-5.1-patched/subst.c 2020-11-16 10:33:15.000000000 -0500
+--- subst.c 2020-12-11 15:11:10.000000000 -0500
+***************
+*** 11605,11608 ****
+--- 11605,11609 ----
+ WORD_LIST *l, *nl;
+ char *t;
++ int kvpair;
+
+ if (flags == 0)
+***************
+*** 11619,11622 ****
+--- 11620,11627 ----
+ /* Associative array */
+ l = parse_string_to_word_list (value, 1, "array assign");
++ #if ASSOC_KVPAIR_ASSIGNMENT
++ kvpair = kvpair_assignment_p (l);
++ #endif
++
+ /* For associative arrays, with their arbitrary subscripts, we have to
+ expand and quote in one step so we don't have to search for the
+***************
+*** 11624,11627 ****
+--- 11629,11638 ----
+ for (nl = l; nl; nl = nl->next)
+ {
++ #if ASSOC_KVPAIR_ASSIGNMENT
++ if (kvpair)
++ /* keys and values undergo the same set of expansions */
++ t = expand_and_quote_kvpair_word (nl->word->word);
++ else
++ #endif
+ if ((nl->word->flags & W_ASSIGNMENT) == 0)
+ t = sh_single_quote (nl->word->word ? nl->word->word : "");
+
+*** ../bash-5.1/patchlevel.h 2020-06-22 14:51:03.000000000 -0400
+--- patchlevel.h 2020-10-01 11:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 3
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 4
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/source/a/elogind/doinst.sh b/source/a/elogind/doinst.sh
index d920f664..3f15bbd8 100644
--- a/source/a/elogind/doinst.sh
+++ b/source/a/elogind/doinst.sh
@@ -28,22 +28,9 @@ preserve_perms() {
# Preserve permissions while moving into place:
preserve_perms etc/rc.d/rc.elogind.new
config etc/elogind/logind.conf.new
-config usr/share/polkit-1/rules.d/10-enable-session-power.rules.new
if pgrep -f elogind-daemon | grep -q 'elogind-daemon'; then
echo "Reloading elogind-daemon..."
pkill -HUP -f elogind-daemon
fi
-## Now taken care of in Slackware's /etc/rc.d/rc.M:
-##
-## Update rc.local so that elogind will be functional after boot:
-#if ! grep "rc.elogind" etc/rc.d/rc.local 1>/dev/null 2>/dev/null ; then
-# cat <<_EOM_ >> etc/rc.d/rc.local
-#
-#if [ -x /etc/rc.d/rc.elogind ]; then
-# # Create runtime for elogind (standalone logind extracted from systemd):
-# /etc/rc.d/rc.elogind start
-#fi
-#_EOM_
-#fi
diff --git a/source/a/elogind/elogind.SlackBuild b/source/a/elogind/elogind.SlackBuild
index 1cf2e5c6..9438d08b 100755
--- a/source/a/elogind/elogind.SlackBuild
+++ b/source/a/elogind/elogind.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=elogind
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
@@ -169,9 +169,8 @@ mkdir -p $PKG/etc/elogind/logind.conf.d/ $PKG/etc/elogind/sleep.conf.d/
# Add login1 policy file that allows users in the 'power' group
# to shutdown/reboot the computer:
mkdir -p $PKG/usr/share/polkit-1/rules.d
-install -m 0644 -o root \
- $CWD/10-enable-elogind-power.rules \
- $PKG/usr/share/polkit-1/rules.d/10-enable-session-power.rules.new
+zcat $CWD/10-enable-elogind-power.rules.gz > \
+ $PKG/usr/share/polkit-1/rules.d/10-enable-session-power.rules
# We don't need the hidden files to make inferior package managers keep dirs:
find $PKG -type f -name ".keep_dir" -exec rm -f {} \;
diff --git a/source/a/sysvinit-scripts/scripts/rc.6 b/source/a/sysvinit-scripts/scripts/rc.6
index e3e71bef..b95c35c4 100644
--- a/source/a/sysvinit-scripts/scripts/rc.6
+++ b/source/a/sysvinit-scripts/scripts/rc.6
@@ -231,11 +231,6 @@ if [ ! "$(cat /proc/swaps | wc -l)" = "1" ]; then
/bin/sync
fi
-# Stop cgmanager and cgproxy:
-if [ -x /etc/rc.d/rc.cgmanager ]; then
- /etc/rc.d/rc.cgmanager stop
-fi
-
# Umount all tmpfs mounts except /dev/shm and under /run:
cat /proc/mounts | grep " tmpfs " | grep -v -e " /run " -e " /run/" -e " /dev/shm " | while read mount ; do
umount --recursive -v $(echo $mount | cut -f 2 -d ' ') 2> /dev/null
diff --git a/source/a/sysvinit-scripts/scripts/rc.S b/source/a/sysvinit-scripts/scripts/rc.S
index e0188a10..aa40bac1 100644
--- a/source/a/sysvinit-scripts/scripts/rc.S
+++ b/source/a/sysvinit-scripts/scripts/rc.S
@@ -379,11 +379,6 @@ mount -o bind /run /var/run
# mounted read-write.
/sbin/swapon -a 2> /dev/null
-# Start cgmanager (or cgproxy in a container):
-if [ -x /etc/rc.d/rc.cgmanager -a -d /sys/fs/cgroup ]; then
- /etc/rc.d/rc.cgmanager start
-fi
-
# Start libcgroup services:
if [ -x /etc/rc.d/rc.cgconfig -a -x /etc/rc.d/rc.cgred -a -d /sys/fs/cgroup ]; then
/etc/rc.d/rc.cgconfig start ; echo " /usr/sbin/cgconfigparser -l /etc/cgconfig.conf"
diff --git a/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild b/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild
index 78e1381c..a0dc04e3 100755
--- a/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild
+++ b/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=sysvinit-scripts
VERSION=${VERSION:-2.1}
ARCH=noarch
-BUILD=${BUILD:-36}
+BUILD=${BUILD:-37}
# 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