diff options
Diffstat (limited to 'source')
-rwxr-xr-x | source/a/cryptsetup/cryptsetup.SlackBuild | 2 | ||||
-rw-r--r-- | source/a/cryptsetup/rc.luks | 2 | ||||
-rwxr-xr-x | source/a/sysvinit/sysvinit.SlackBuild | 3 | ||||
-rw-r--r-- | source/kde/kde/build/umbrello | 2 | ||||
-rw-r--r-- | source/kde/kde/modules/all-packaged-applications | 2 | ||||
-rw-r--r-- | source/kde/kde/modules/applications | 2 |
6 files changed, 6 insertions, 7 deletions
diff --git a/source/a/cryptsetup/cryptsetup.SlackBuild b/source/a/cryptsetup/cryptsetup.SlackBuild index fea2faf99..b200dd533 100755 --- a/source/a/cryptsetup/cryptsetup.SlackBuild +++ b/source/a/cryptsetup/cryptsetup.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=cryptsetup VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/a/cryptsetup/rc.luks b/source/a/cryptsetup/rc.luks index 243244969..7125b6fed 100644 --- a/source/a/cryptsetup/rc.luks +++ b/source/a/cryptsetup/rc.luks @@ -83,7 +83,7 @@ if [ -f /etc/crypttab -a -x /sbin/cryptsetup ]; then # If any of the volumes is to be used as encrypted swap, # then encrypt it using a random key and run mkswap: echo "Creating encrypted swap volume '${LUKS}' on device '$DEV':" - /sbin/cryptsetup --cipher=aes --key-file=/dev/urandom --key-size=256 create $LUKS $DEV + /sbin/cryptsetup --batch-mode --cipher=aes --key-file=/dev/urandom --key-size=256 create $LUKS $DEV mkswap /dev/mapper/$LUKS fi done 3< <(grep -vE '^(#|$)' /etc/crypttab) diff --git a/source/a/sysvinit/sysvinit.SlackBuild b/source/a/sysvinit/sysvinit.SlackBuild index 9f1a0ac3f..472af2e51 100755 --- a/source/a/sysvinit/sysvinit.SlackBuild +++ b/source/a/sysvinit/sysvinit.SlackBuild @@ -52,7 +52,7 @@ mkdir -p $TMP $PKG cd $TMP rm -rf sysvinit-$VERSION -tar xvf $CWD/sysvinit-$VERSION.tar.xz || exit 1 +tar xvf $CWD/sysvinit-$VERSION.tar.?z || exit 1 cd sysvinit-$VERSION chown -R root:root . @@ -132,4 +132,3 @@ cat $CWD/slack-desc > $PKG/install/slack-desc # Build the package: cd $PKG makepkg -l y -c n $TMP/sysvinit-$VERSION-$ARCH-$BUILD.txz - diff --git a/source/kde/kde/build/umbrello b/source/kde/kde/build/umbrello index d00491fd7..0cfbf0888 100644 --- a/source/kde/kde/build/umbrello +++ b/source/kde/kde/build/umbrello @@ -1 +1 @@ -1 +2 diff --git a/source/kde/kde/modules/all-packaged-applications b/source/kde/kde/modules/all-packaged-applications index 8e290c0d0..ff6cd8697 100644 --- a/source/kde/kde/modules/all-packaged-applications +++ b/source/kde/kde/modules/all-packaged-applications @@ -94,7 +94,6 @@ libkomparediff2 kompare lokalize poxml -umbrello kdegraphics-mobipocket okular kdegraphics-thumbnailers @@ -210,6 +209,7 @@ skanlite kdevelop kdev-php kdev-python +umbrello zanshin falkon kalendar diff --git a/source/kde/kde/modules/applications b/source/kde/kde/modules/applications index 26b9d681b..cee2530c4 100644 --- a/source/kde/kde/modules/applications +++ b/source/kde/kde/modules/applications @@ -58,7 +58,6 @@ libkomparediff2 kompare lokalize poxml -umbrello # Rest of kdegraphics: kdegraphics-mobipocket @@ -211,6 +210,7 @@ skanlite kdevelop kdev-php kdev-python +umbrello # New in 21.12.0: zanshin |