summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
Diffstat (limited to 'source')
-rwxr-xr-xsource/a/tcsh/tcsh.SlackBuild7
-rw-r--r--source/a/tcsh/tcsh.sh.hist.diff11
-rw-r--r--source/d/rust/link_libffi.diff7
-rwxr-xr-xsource/d/rust/rust.SlackBuild10
-rw-r--r--source/d/rust/rust.url14
-rwxr-xr-xsource/l/libcap-ng/libcap-ng.SlackBuild2
6 files changed, 18 insertions, 33 deletions
diff --git a/source/a/tcsh/tcsh.SlackBuild b/source/a/tcsh/tcsh.SlackBuild
index eeee6f18..5bbf788a 100755
--- a/source/a/tcsh/tcsh.SlackBuild
+++ b/source/a/tcsh/tcsh.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2008, 2009, 2010, 2012, 2013, 2015, 2018, 2019 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2012, 2013, 2015, 2018, 2019, 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=tcsh
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -69,9 +69,6 @@ cd ${PKGNAM}-$VERSION || exit 1
# built-in color ls:
zcat $CWD/${PKGNAM}.nobuiltincolorls.diff.gz | patch -p1 --verbose || exit 1
-# Fix history merging:
-zcat $CWD/tcsh.sh.hist.diff.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/tcsh/tcsh.sh.hist.diff b/source/a/tcsh/tcsh.sh.hist.diff
deleted file mode 100644
index efd5a953..00000000
--- a/source/a/tcsh/tcsh.sh.hist.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./sh.hist.c.orig 2019-12-04 11:51:54.000000000 -0600
-+++ ./sh.hist.c 2020-03-18 14:14:31.488245707 -0500
-@@ -1292,7 +1292,7 @@
- #endif
- }
- getexit(osetexit);
-- if (setexit())
-+ if (!setexit())
- loadhist(fname, 1);
- resexit(osetexit);
- }
diff --git a/source/d/rust/link_libffi.diff b/source/d/rust/link_libffi.diff
index 38e0113e..dd5a3e0f 100644
--- a/source/d/rust/link_libffi.diff
+++ b/source/d/rust/link_libffi.diff
@@ -1,7 +1,6 @@
-diff -Naur rustc-1.21.0-src.bak/src/librustc_llvm/build.rs rustc-1.21.0-src/src/librustc_llvm/build.rs
---- rustc-1.21.0-src.bak/src/librustc_llvm/build.rs 2017-10-10 09:04:51.000000000 +1300
-+++ rustc-1.21.0-src/src/librustc_llvm/build.rs 2017-10-14 15:28:56.761081727 +1300
-@@ -221,6 +221,8 @@
+--- ./compiler/rustc_llvm/build.rs.orig 2020-11-16 08:01:53.000000000 -0600
++++ ./compiler/rustc_llvm/build.rs 2020-11-19 13:46:21.222785372 -0600
+@@ -234,6 +234,8 @@
println!("cargo:rustc-link-lib={}={}", kind, name);
}
diff --git a/source/d/rust/rust.SlackBuild b/source/d/rust/rust.SlackBuild
index 6e8e6af1..6c3aa640 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.47.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.48.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}
# Bootstrap variables (might not be kept updated for latest Rust):
-RSTAGE0_VERSION=${RSTAGE0_VERSION:-1.46.0}
-RSTAGE0_DIR=${RSTAGE0_DIR:-2020-08-27}
-CSTAGE0_VERSION=${CSTAGE0_VERSION:-0.47.0}
+RSTAGE0_VERSION=${RSTAGE0_VERSION:-1.47.0}
+RSTAGE0_DIR=${RSTAGE0_DIR:-2020-10-08}
+CSTAGE0_VERSION=${CSTAGE0_VERSION:-0.48.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 c9982da0..5c5e8f14 100644
--- a/source/d/rust/rust.url
+++ b/source/d/rust/rust.url
@@ -1,5 +1,5 @@
# Source code (repacked to .tar.lz):
-VERSION=1.47.0
+VERSION=1.48.0
rm -f rustc-${VERSION}-src.tar.*
lftpget https://static.rust-lang.org/dist/rustc-${VERSION}-src.tar.gz
lftpget https://static.rust-lang.org/dist/rustc-${VERSION}-src.tar.gz.asc
@@ -21,12 +21,12 @@ fi
exit 0
# i686 bootstrap:
-lftpget https://static.rust-lang.org/dist/2020-08-27/cargo-0.47.0-i686-unknown-linux-gnu.tar.gz
-lftpget https://static.rust-lang.org/dist/2020-08-27/rust-std-1.46.0-i686-unknown-linux-gnu.tar.gz
-lftpget https://static.rust-lang.org/dist/2020-08-27/rustc-1.46.0-i686-unknown-linux-gnu.tar.gz
+lftpget https://static.rust-lang.org/dist/2020-10-08/cargo-0.48.0-i686-unknown-linux-gnu.tar.gz
+lftpget https://static.rust-lang.org/dist/2020-10-08/rust-std-1.47.0-i686-unknown-linux-gnu.tar.gz
+lftpget https://static.rust-lang.org/dist/2020-10-08/rustc-1.47.0-i686-unknown-linux-gnu.tar.gz
# x86_64 bootstrap:
-lftpget https://static.rust-lang.org/dist/2020-08-27/cargo-0.47.0-x86_64-unknown-linux-gnu.tar.gz
-lftpget https://static.rust-lang.org/dist/2020-08-27/rust-std-1.46.0-x86_64-unknown-linux-gnu.tar.gz
-lftpget https://static.rust-lang.org/dist/2020-08-27/rustc-1.46.0-x86_64-unknown-linux-gnu.tar.gz
+lftpget https://static.rust-lang.org/dist/2020-10-08/cargo-0.48.0-x86_64-unknown-linux-gnu.tar.gz
+lftpget https://static.rust-lang.org/dist/2020-10-08/rust-std-1.47.0-x86_64-unknown-linux-gnu.tar.gz
+lftpget https://static.rust-lang.org/dist/2020-10-08/rustc-1.47.0-x86_64-unknown-linux-gnu.tar.gz
diff --git a/source/l/libcap-ng/libcap-ng.SlackBuild b/source/l/libcap-ng/libcap-ng.SlackBuild
index 0180bd42..7d58ec18 100755
--- a/source/l/libcap-ng/libcap-ng.SlackBuild
+++ b/source/l/libcap-ng/libcap-ng.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=libcap-ng
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