diff options
Diffstat (limited to '')
-rw-r--r-- | source/a/bash/bash-5.0-patches/bash50-017 | 289 | ||||
-rwxr-xr-x | source/d/rust/rust.SlackBuild | 12 | ||||
-rw-r--r-- | source/d/rust/rust.url | 14 | ||||
-rw-r--r-- | source/k/kernel-configs/config-generic-5.4.35 (renamed from source/k/kernel-configs/config-generic-5.4.34) | 2 | ||||
-rw-r--r-- | source/k/kernel-configs/config-generic-5.4.35.x64 (renamed from source/k/kernel-configs/config-generic-5.4.34.x64) | 2 | ||||
-rw-r--r-- | source/k/kernel-configs/config-generic-smp-5.4.35-smp (renamed from source/k/kernel-configs/config-generic-smp-5.4.34-smp) | 2 | ||||
-rw-r--r-- | source/k/kernel-configs/config-huge-5.4.35 (renamed from source/k/kernel-configs/config-huge-5.4.34) | 2 | ||||
-rw-r--r-- | source/k/kernel-configs/config-huge-5.4.35.x64 (renamed from source/k/kernel-configs/config-huge-5.4.34.x64) | 2 | ||||
-rw-r--r-- | source/k/kernel-configs/config-huge-smp-5.4.35-smp (renamed from source/k/kernel-configs/config-huge-smp-5.4.34-smp) | 2 | ||||
-rw-r--r-- | source/l/gmm/gmm.url | 2 | ||||
-rwxr-xr-x | source/l/sip/sip.SlackBuild | 2 | ||||
-rw-r--r-- | source/n/dhcpcd/dhcpcd-8.1.8.tar.xz.distinfo | 1 | ||||
-rw-r--r-- | source/n/dhcpcd/dhcpcd-8.1.9.tar.xz.distinfo | 1 | ||||
-rwxr-xr-x | source/x/mesa/mesa.SlackBuild | 2 |
14 files changed, 312 insertions, 23 deletions
diff --git a/source/a/bash/bash-5.0-patches/bash50-017 b/source/a/bash/bash-5.0-patches/bash50-017 new file mode 100644 index 000000000..adfcb6a86 --- /dev/null +++ b/source/a/bash/bash-5.0-patches/bash50-017 @@ -0,0 +1,289 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 5.0 +Patch-ID: bash50-017 + +Bug-Reported-by: Valentin Lab <valentin.lab@kalysto.org> +Bug-Reference-ID: <ab981b9c-60a5-46d0-b7e6-a6d88b80df50@kalysto.org> +Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2020-03/msg00062.html + +Bug-Description: + +There were cases where patch 16 reaped process substitution file descriptors +(or FIFOs) and processes to early. This is a better fix for the problem that +bash50-016 attempted to solve. + +Patch (apply with `patch -p0'): + +*** ../bash-5.0-patched/subst.c 2019-08-29 11:16:49.000000000 -0400 +--- subst.c 2020-04-02 16:24:19.000000000 -0400 +*************** +*** 5337,5341 **** + } + +! char * + copy_fifo_list (sizep) + int *sizep; +--- 5337,5341 ---- + } + +! void * + copy_fifo_list (sizep) + int *sizep; +*************** +*** 5343,5347 **** + if (sizep) + *sizep = 0; +! return (char *)NULL; + } + +--- 5343,5347 ---- + if (sizep) + *sizep = 0; +! return (void *)NULL; + } + +*************** +*** 5409,5414 **** + if (fifo_list[i].file) + { +! fifo_list[j].file = fifo_list[i].file; +! fifo_list[j].proc = fifo_list[i].proc; + j++; + } +--- 5409,5419 ---- + if (fifo_list[i].file) + { +! if (i != j) +! { +! fifo_list[j].file = fifo_list[i].file; +! fifo_list[j].proc = fifo_list[i].proc; +! fifo_list[i].file = (char *)NULL; +! fifo_list[i].proc = 0; +! } + j++; + } +*************** +*** 5426,5433 **** + void + close_new_fifos (list, lsize) +! char *list; + int lsize; + { + int i; + + if (list == 0) +--- 5431,5439 ---- + void + close_new_fifos (list, lsize) +! void *list; + int lsize; + { + int i; ++ char *plist; + + if (list == 0) +*************** +*** 5437,5442 **** + } + +! for (i = 0; i < lsize; i++) +! if (list[i] == 0 && i < fifo_list_size && fifo_list[i].proc != -1) + unlink_fifo (i); + +--- 5443,5448 ---- + } + +! for (plist = (char *)list, i = 0; i < lsize; i++) +! if (plist[i] == 0 && i < fifo_list_size && fifo_list[i].proc != -1) + unlink_fifo (i); + +*************** +*** 5560,5568 **** + } + +! char * + copy_fifo_list (sizep) + int *sizep; + { +! char *ret; + + if (nfds == 0 || totfds == 0) +--- 5566,5574 ---- + } + +! void * + copy_fifo_list (sizep) + int *sizep; + { +! void *ret; + + if (nfds == 0 || totfds == 0) +*************** +*** 5570,5579 **** + if (sizep) + *sizep = 0; +! return (char *)NULL; + } + + if (sizep) + *sizep = totfds; +! ret = (char *)xmalloc (totfds * sizeof (pid_t)); + return (memcpy (ret, dev_fd_list, totfds * sizeof (pid_t))); + } +--- 5576,5585 ---- + if (sizep) + *sizep = 0; +! return (void *)NULL; + } + + if (sizep) + *sizep = totfds; +! ret = xmalloc (totfds * sizeof (pid_t)); + return (memcpy (ret, dev_fd_list, totfds * sizeof (pid_t))); + } +*************** +*** 5648,5655 **** + void + close_new_fifos (list, lsize) +! char *list; + int lsize; + { + int i; + + if (list == 0) +--- 5654,5662 ---- + void + close_new_fifos (list, lsize) +! void *list; + int lsize; + { + int i; ++ pid_t *plist; + + if (list == 0) +*************** +*** 5659,5664 **** + } + +! for (i = 0; i < lsize; i++) +! if (list[i] == 0 && i < totfds && dev_fd_list[i]) + unlink_fifo (i); + +--- 5666,5671 ---- + } + +! for (plist = (pid_t *)list, i = 0; i < lsize; i++) +! if (plist[i] == 0 && i < totfds && dev_fd_list[i]) + unlink_fifo (i); + +*** ../bash-5.0-patched/subst.h 2018-10-21 18:46:09.000000000 -0400 +--- subst.h 2020-04-02 16:29:28.000000000 -0400 +*************** +*** 274,280 **** + extern void unlink_fifo __P((int)); + +! extern char *copy_fifo_list __P((int *)); +! extern void unlink_new_fifos __P((char *, int)); +! extern void close_new_fifos __P((char *, int)); + + extern void clear_fifo_list __P((void)); +--- 274,279 ---- + extern void unlink_fifo __P((int)); + +! extern void *copy_fifo_list __P((int *)); +! extern void close_new_fifos __P((void *, int)); + + extern void clear_fifo_list __P((void)); +*** ../bash-5.0-patched/execute_cmd.c 2020-02-06 20:16:48.000000000 -0500 +--- execute_cmd.c 2020-04-02 17:00:10.000000000 -0400 +*************** +*** 565,569 **** + #if defined (PROCESS_SUBSTITUTION) + volatile int ofifo, nfifo, osize, saved_fifo; +! volatile char *ofifo_list; + #endif + +--- 565,569 ---- + #if defined (PROCESS_SUBSTITUTION) + volatile int ofifo, nfifo, osize, saved_fifo; +! volatile void *ofifo_list; + #endif + +*************** +*** 751,760 **** + # endif + +! if (variable_context != 0) /* XXX - also if sourcelevel != 0? */ + { + ofifo = num_fifos (); + ofifo_list = copy_fifo_list ((int *)&osize); + begin_unwind_frame ("internal_fifos"); +! add_unwind_protect (xfree, ofifo_list); + saved_fifo = 1; + } +--- 751,762 ---- + # endif + +! /* XXX - also if sourcelevel != 0? */ +! if (variable_context != 0) + { + ofifo = num_fifos (); + ofifo_list = copy_fifo_list ((int *)&osize); + begin_unwind_frame ("internal_fifos"); +! if (ofifo_list) +! add_unwind_protect (xfree, ofifo_list); + saved_fifo = 1; + } +*************** +*** 1100,1123 **** + nfifo = num_fifos (); + if (nfifo > ofifo) +! close_new_fifos ((char *)ofifo_list, osize); + free ((void *)ofifo_list); + 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 + +--- 1102,1109 ---- + nfifo = num_fifos (); + if (nfifo > ofifo) +! close_new_fifos ((void *)ofifo_list, osize); + free ((void *)ofifo_list); + discard_unwind_frame ("internal_fifos"); + } + #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 16 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 17 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/d/rust/rust.SlackBuild b/source/d/rust/rust.SlackBuild index 57d454398..189d1c0f9 100755 --- a/source/d/rust/rust.SlackBuild +++ b/source/d/rust/rust.SlackBuild @@ -26,17 +26,17 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=rust SRCNAM="${PKGNAM}c" -VERSION=${VERSION:-1.42.0} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.43.0} +BUILD=${BUILD:-1} # Set this to YES to build with the system LLVM, or NO to use the bundled LLVM. # YES is probably better (when it works...) -SYSTEM_LLVM=${SYSTEM_LLVM:-YES} +SYSTEM_LLVM=${SYSTEM_LLVM:-NO} # Bootstrap variables (might not be kept updated for latest Rust): -RSTAGE0_VERSION=${RSTAGE0_VERSION:-1.41.1} -RSTAGE0_DIR=${RSTAGE0_DIR:-2020-02-27} -CSTAGE0_VERSION=${CSTAGE0_VERSION:-0.42.0} +RSTAGE0_VERSION=${RSTAGE0_VERSION:-1.42.0} +RSTAGE0_DIR=${RSTAGE0_DIR:-2020-03-12} +CSTAGE0_VERSION=${CSTAGE0_VERSION:-0.43.0} CSTAGE0_DIR=${CSTAGE0_DIR:-$RSTAGE0_DIR} # Automatically determine the architecture we're building on: diff --git a/source/d/rust/rust.url b/source/d/rust/rust.url index 39781b5df..625a8470c 100644 --- a/source/d/rust/rust.url +++ b/source/d/rust/rust.url @@ -1,5 +1,5 @@ # Source code (repacked to .tar.xz): -lftpget https://static.rust-lang.org/dist/rustc-1.42.0-src.tar.gz +lftpget https://static.rust-lang.org/dist/rustc-1.43.0-src.tar.gz gzip -d rustc-*tar.gz plzip -9 -v rustc-*tar @@ -12,12 +12,12 @@ plzip -9 -v rustc-*tar exit 0 # i686 bootstrap: -lftpget https://static.rust-lang.org/dist/2020-02-27/cargo-0.42.0-i686-unknown-linux-gnu.tar.gz -lftpget https://static.rust-lang.org/dist/2020-02-27/rust-std-1.41.1-i686-unknown-linux-gnu.tar.gz -lftpget https://static.rust-lang.org/dist/2020-02-27/rustc-1.41.1-i686-unknown-linux-gnu.tar.gz +lftpget https://static.rust-lang.org/dist/2020-03-12/cargo-0.43.0-i686-unknown-linux-gnu.tar.gz +lftpget https://static.rust-lang.org/dist/2020-03-12/rust-std-1.42.0-i686-unknown-linux-gnu.tar.gz +lftpget https://static.rust-lang.org/dist/2020-03-12/rustc-1.42.0-i686-unknown-linux-gnu.tar.gz # x86_64 bootstrap: -lftpget https://static.rust-lang.org/dist/2020-02-27/cargo-0.42.0-x86_64-unknown-linux-gnu.tar.gz -lftpget https://static.rust-lang.org/dist/2020-02-27/rust-std-1.41.1-x86_64-unknown-linux-gnu.tar.gz -lftpget https://static.rust-lang.org/dist/2020-02-27/rustc-1.41.1-x86_64-unknown-linux-gnu.tar.gz +lftpget https://static.rust-lang.org/dist/2020-03-12/cargo-0.43.0-x86_64-unknown-linux-gnu.tar.gz +lftpget https://static.rust-lang.org/dist/2020-03-12/rust-std-1.42.0-x86_64-unknown-linux-gnu.tar.gz +lftpget https://static.rust-lang.org/dist/2020-03-12/rustc-1.42.0-x86_64-unknown-linux-gnu.tar.gz diff --git a/source/k/kernel-configs/config-generic-5.4.34 b/source/k/kernel-configs/config-generic-5.4.35 index 4fa10b4bc..776f4e6e5 100644 --- a/source/k/kernel-configs/config-generic-5.4.34 +++ b/source/k/kernel-configs/config-generic-5.4.35 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.4.34 Kernel Configuration +# Linux/x86 5.4.35 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-generic-5.4.34.x64 b/source/k/kernel-configs/config-generic-5.4.35.x64 index 4c0bf04a3..2bad9b9d5 100644 --- a/source/k/kernel-configs/config-generic-5.4.34.x64 +++ b/source/k/kernel-configs/config-generic-5.4.35.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.4.34 Kernel Configuration +# Linux/x86 5.4.35 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-generic-smp-5.4.34-smp b/source/k/kernel-configs/config-generic-smp-5.4.35-smp index 813d65f12..81466590d 100644 --- a/source/k/kernel-configs/config-generic-smp-5.4.34-smp +++ b/source/k/kernel-configs/config-generic-smp-5.4.35-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.4.34 Kernel Configuration +# Linux/x86 5.4.35 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-huge-5.4.34 b/source/k/kernel-configs/config-huge-5.4.35 index 2eae7dee8..7bb69aedb 100644 --- a/source/k/kernel-configs/config-huge-5.4.34 +++ b/source/k/kernel-configs/config-huge-5.4.35 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.4.34 Kernel Configuration +# Linux/x86 5.4.35 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-huge-5.4.34.x64 b/source/k/kernel-configs/config-huge-5.4.35.x64 index d8b82b0e5..73358832a 100644 --- a/source/k/kernel-configs/config-huge-5.4.34.x64 +++ b/source/k/kernel-configs/config-huge-5.4.35.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.4.34 Kernel Configuration +# Linux/x86 5.4.35 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-huge-smp-5.4.34-smp b/source/k/kernel-configs/config-huge-smp-5.4.35-smp index 570da40f3..209156bfe 100644 --- a/source/k/kernel-configs/config-huge-smp-5.4.34-smp +++ b/source/k/kernel-configs/config-huge-smp-5.4.35-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.4.34 Kernel Configuration +# Linux/x86 5.4.35 Kernel Configuration # # diff --git a/source/l/gmm/gmm.url b/source/l/gmm/gmm.url index 86398a109..cb3a37e4b 100644 --- a/source/l/gmm/gmm.url +++ b/source/l/gmm/gmm.url @@ -1,2 +1,2 @@ http://getfem.org/gmm/index.html -http://download-mirror.savannah.gnu.org/releases/getfem/stable/gmm-4.3.tar.gz +http://download-mirror.savannah.gnu.org/releases/getfem/stable/ diff --git a/source/l/sip/sip.SlackBuild b/source/l/sip/sip.SlackBuild index c722f9ed2..9863095ab 100755 --- a/source/l/sip/sip.SlackBuild +++ b/source/l/sip/sip.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=sip VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/n/dhcpcd/dhcpcd-8.1.8.tar.xz.distinfo b/source/n/dhcpcd/dhcpcd-8.1.8.tar.xz.distinfo deleted file mode 100644 index b24c26c40..000000000 --- a/source/n/dhcpcd/dhcpcd-8.1.8.tar.xz.distinfo +++ /dev/null @@ -1 +0,0 @@ -SHA256 (dhcpcd-8.1.8.tar.xz) = ea7aa5b86b42fa4d8da7df07166085dd4afa1f14b5bc9571b3eba5035a379c30 diff --git a/source/n/dhcpcd/dhcpcd-8.1.9.tar.xz.distinfo b/source/n/dhcpcd/dhcpcd-8.1.9.tar.xz.distinfo new file mode 100644 index 000000000..395b1162b --- /dev/null +++ b/source/n/dhcpcd/dhcpcd-8.1.9.tar.xz.distinfo @@ -0,0 +1 @@ +SHA256 (dhcpcd-8.1.9.tar.xz) = 8e2a505eb2bd8007d7c6fd855fcb4dd28cced8fc28886c7ce41fb4fc5630fbcf diff --git a/source/x/mesa/mesa.SlackBuild b/source/x/mesa/mesa.SlackBuild index ea18f8bfe..da435062d 100755 --- a/source/x/mesa/mesa.SlackBuild +++ b/source/x/mesa/mesa.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=mesa VERSION=${VERSION:-$(echo $PKGNAM-[0-9]*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} DEMOVERS=${DEMOVERS:-8.4.0} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} BUILD_DEMOS=${BUILD_DEMOS:-YES} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} |