diff options
Diffstat (limited to 'source')
| -rwxr-xr-x | source/d/rust/rust.SlackBuild | 8 | ||||
| -rw-r--r-- | source/d/rust/rust.url | 6 | ||||
| -rw-r--r-- | source/kde/kde/build/plasma-workspace | 2 | ||||
| -rw-r--r-- | source/kde/kde/doinst.sh/plasma-workspace | 14 | ||||
| -rw-r--r-- | source/kde/kde/post-install/plasma-workspace.post-install | 2 |
5 files changed, 23 insertions, 9 deletions
diff --git a/source/d/rust/rust.SlackBuild b/source/d/rust/rust.SlackBuild index 2a960a8ed..372477104 100755 --- a/source/d/rust/rust.SlackBuild +++ b/source/d/rust/rust.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=rust SRCNAM="${PKGNAM}c" -VERSION=${VERSION:-1.60.0} +VERSION=${VERSION:-1.61.0} BUILD=${BUILD:-1} # Set this to YES to build with the system LLVM, or NO to use the bundled LLVM. @@ -34,9 +34,9 @@ BUILD=${BUILD:-1} SYSTEM_LLVM=${SYSTEM_LLVM:-YES} # Bootstrap variables (might not be kept updated for latest Rust): -RSTAGE0_VERSION=${RSTAGE0_VERSION:-1.59.0} -RSTAGE0_DIR=${RSTAGE0_DIR:-2022-02-24} -CSTAGE0_VERSION=${CSTAGE0_VERSION:-1.59.0} +RSTAGE0_VERSION=${RSTAGE0_VERSION:-1.60.0} +RSTAGE0_DIR=${RSTAGE0_DIR:-2022-04-07} +CSTAGE0_VERSION=${CSTAGE0_VERSION:-1.60.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 a292298d1..ae8f914c6 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.60.0 +VERSION=1.61.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 @@ -20,8 +20,8 @@ fi # update the settings below, look at src/stage0.json in the Rust sources. exit 0 -BOOTSTRAP_DATE=2022-02-24 -BOOTSTRAP_VERSION=1.59.0 +BOOTSTRAP_DATE=2022-04-07 +BOOTSTRAP_VERSION=1.60.0 BOOTSTRAP_CARGO=$BOOTSTRAP_VERSION # i686 bootstrap: diff --git a/source/kde/kde/build/plasma-workspace b/source/kde/kde/build/plasma-workspace index 0cfbf0888..00750edc0 100644 --- a/source/kde/kde/build/plasma-workspace +++ b/source/kde/kde/build/plasma-workspace @@ -1 +1 @@ -2 +3 diff --git a/source/kde/kde/doinst.sh/plasma-workspace b/source/kde/kde/doinst.sh/plasma-workspace new file mode 100644 index 000000000..cb5080698 --- /dev/null +++ b/source/kde/kde/doinst.sh/plasma-workspace @@ -0,0 +1,14 @@ +config() { + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + # If there's no config file by that name, mv it over: + if [ ! -r $OLD ]; then + mv $NEW $OLD + elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then + # toss the redundant copy + rm $NEW + fi + # Otherwise, we leave the .new copy for the admin to consider... +} + +config etc/pam.d/kde.new diff --git a/source/kde/kde/post-install/plasma-workspace.post-install b/source/kde/kde/post-install/plasma-workspace.post-install index 4ba279a20..8f3839ec2 100644 --- a/source/kde/kde/post-install/plasma-workspace.post-install +++ b/source/kde/kde/post-install/plasma-workspace.post-install @@ -46,7 +46,7 @@ if [ "$SLACKPAM" == "no" ]; then -i $PKG/usr/share/wayland-sessions/plasmawayland.desktop else # Install a PAM file for Plasma5 workspace: - install -Dm644 $CWD/post-install/plasma-workspace/pam.d/kde $PKG/etc/pam.d/kde + install -Dm644 $CWD/post-install/plasma-workspace/pam.d/kde $PKG/etc/pam.d/kde.new fi if [ "$SLKELOGIND" == "yes" ]; then |