summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2020-06-19 19:59:04 +0000
committer Eric Hameleers <alien@slackware.com>2020-06-19 22:41:30 +0200
commitb25c84154fbea96dc71b06605c8447a47342bedb (patch)
tree0629044b7c7fc5cb0bf820bef8ffd2f973e8b339 /source
parent0ded95a6619bb151727096c01a30879455d04374 (diff)
downloadcurrent-b25c84154fbea96dc71b06605c8447a47342bedb.tar.gz
current-b25c84154fbea96dc71b06605c8447a47342bedb.tar.xz
Fri Jun 19 19:59:04 UTC 202020200619195904
a/haveged-1.9.12-x86_64-1.txz: Upgraded. a/kernel-firmware-20200619_3890db3-noarch-1.txz: Upgraded. a/sysvinit-scripts-2.1-noarch-34.txz: Rebuilt. rc.M: check for elogind first so that we can ignore a stale CK2 package. ap/sudo-1.9.1-x86_64-1.txz: Upgraded. l/alsa-lib-1.2.3.1-x86_64-1.txz: Upgraded. l/desktop-file-utils-0.26-x86_64-1.txz: Upgraded. n/mutt-1.14.4-x86_64-1.txz: Upgraded. x/libinput-1.15.6-x86_64-1.txz: Upgraded. x/xinit-1.4.1-x86_64-2.txz: Rebuilt. When using elogind, start the session on the current console. Thanks to alienBOB.
Diffstat (limited to 'source')
-rw-r--r--source/a/sysvinit-scripts/scripts/rc.M6
-rwxr-xr-xsource/a/sysvinit-scripts/sysvinit-scripts.SlackBuild2
-rwxr-xr-xsource/ap/sudo/sudo.SlackBuild2
-rw-r--r--source/ap/sudo/sudo.url2
-rwxr-xr-xsource/l/desktop-file-utils/desktop-file-utils.SlackBuild6
-rw-r--r--source/x/x11/build/xinit2
-rw-r--r--source/x/x11/patch/xinit/xinit.remove.systemd.kludge.diff2
7 files changed, 13 insertions, 9 deletions
diff --git a/source/a/sysvinit-scripts/scripts/rc.M b/source/a/sysvinit-scripts/scripts/rc.M
index 5bdf6ed43..d02452eaf 100644
--- a/source/a/sysvinit-scripts/scripts/rc.M
+++ b/source/a/sysvinit-scripts/scripts/rc.M
@@ -117,10 +117,10 @@ if [ -x /etc/rc.d/rc.messagebus ]; then
fi
# Start the session/seat daemon:
-if [ -x /etc/rc.d/rc.consolekit -a -x /usr/sbin/console-kit-daemon ]; then
- /etc/rc.d/rc.consolekit start
-elif [ -x /etc/rc.d/rc.elogind ]; then
+if [ -x /etc/rc.d/rc.elogind ]; then
/etc/rc.d/rc.elogind start
+elif [ -x /etc/rc.d/rc.consolekit -a -x /usr/sbin/console-kit-daemon ]; then
+ /etc/rc.d/rc.consolekit start
fi
# Start Bluetooth:
diff --git a/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild b/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild
index e33b54caf..3f08aad90 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:-33}
+BUILD=${BUILD:-34}
# 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
diff --git a/source/ap/sudo/sudo.SlackBuild b/source/ap/sudo/sudo.SlackBuild
index 984c7e0bd..a47e63e6a 100755
--- a/source/ap/sudo/sudo.SlackBuild
+++ b/source/ap/sudo/sudo.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=sudo
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
diff --git a/source/ap/sudo/sudo.url b/source/ap/sudo/sudo.url
index 78308974b..a80c5d324 100644
--- a/source/ap/sudo/sudo.url
+++ b/source/ap/sudo/sudo.url
@@ -1 +1 @@
-ftp://ftp.sudo.ws/pub/sudo
+https://www.sudo.ws/dist
diff --git a/source/l/desktop-file-utils/desktop-file-utils.SlackBuild b/source/l/desktop-file-utils/desktop-file-utils.SlackBuild
index 9bc520c16..c82c5eaa3 100755
--- a/source/l/desktop-file-utils/desktop-file-utils.SlackBuild
+++ b/source/l/desktop-file-utils/desktop-file-utils.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2006, 2008, 2009, 2010, 2018 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2008, 2009, 2010, 2018, 2020 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -76,6 +76,10 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
+if [ ! -r configure ]; then
+ NOCONFIGURE=1 ./autogen.sh
+fi
+
# Configure:
CFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/source/x/x11/build/xinit b/source/x/x11/build/xinit
index d00491fd7..0cfbf0888 100644
--- a/source/x/x11/build/xinit
+++ b/source/x/x11/build/xinit
@@ -1 +1 @@
-1
+2
diff --git a/source/x/x11/patch/xinit/xinit.remove.systemd.kludge.diff b/source/x/x11/patch/xinit/xinit.remove.systemd.kludge.diff
index 792238074..a431c9008 100644
--- a/source/x/x11/patch/xinit/xinit.remove.systemd.kludge.diff
+++ b/source/x/x11/patch/xinit/xinit.remove.systemd.kludge.diff
@@ -4,7 +4,7 @@
server=$defaultserver
#ifdef __linux__
-+ if [ -x /usr/lib/systemd/systemd -o -x /lib/systemd/systemd ]; then
++ if [ -x /lib/elogind/elogind -o -x /lib64/elogind/elogind ]; then
XCOMM When starting the defaultserver start X on the current tty to avoid
XCOMM the startx session being seen as inactive:
XCOMM "https://bugzilla.redhat.com/show_bug.cgi?id=806491"