summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2023-08-12 19:03:36 +0000
committer Eric Hameleers <alien@slackware.com>2023-08-12 21:28:55 +0200
commit93c204c5c0cec86fe853217f6023c7ee507be98f (patch)
tree8a7d2cf704f6b9d207b1949e20261cc77d362ca2 /source
parent6d1056f924fda951cbdd3418468f560273b6980a (diff)
downloadcurrent-93c204c5c0cec86fe853217f6023c7ee507be98f.tar.gz
current-93c204c5c0cec86fe853217f6023c7ee507be98f.tar.xz
Sat Aug 12 19:03:36 UTC 202320230812190336
a/libcgroup-0.41-x86_64-11.txz: Rebuilt. rc.cgconfig: set and use $CONFIG_DIR (/etc/cgconfig.d). Thanks to ZlatkO. a/openssl-solibs-3.1.2-x86_64-2.txz: Rebuilt. ap/vim-9.0.1697-x86_64-1.txz: Upgraded. d/cmake-3.27.2-x86_64-1.txz: Upgraded. l/fmt-10.1.0-x86_64-1.txz: Upgraded. n/openssl-3.1.2-x86_64-2.txz: Rebuilt. certwatch: use a persistent $STATEDIR. Thanks to ZlatkO. xap/vim-gvim-9.0.1697-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source')
-rwxr-xr-xsource/a/libcgroup/libcgroup.SlackBuild2
-rw-r--r--source/a/libcgroup/libcgroup.init.diff147
-rw-r--r--source/d/cmake/cmake.url2
-rw-r--r--source/kde/kde/noarch1
-rw-r--r--source/n/openssl/certwatch7
-rwxr-xr-xsource/n/openssl/openssl.SlackBuild2
6 files changed, 86 insertions, 75 deletions
diff --git a/source/a/libcgroup/libcgroup.SlackBuild b/source/a/libcgroup/libcgroup.SlackBuild
index 83720f47d..e093f2807 100755
--- a/source/a/libcgroup/libcgroup.SlackBuild
+++ b/source/a/libcgroup/libcgroup.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=libcgroup
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-10}
+BUILD=${BUILD:-11}
# Without this, we get syntax errors starting rc.cgred:
LANG=C
diff --git a/source/a/libcgroup/libcgroup.init.diff b/source/a/libcgroup/libcgroup.init.diff
index 1d1be2cc0..d3e6e7bad 100644
--- a/source/a/libcgroup/libcgroup.init.diff
+++ b/source/a/libcgroup/libcgroup.init.diff
@@ -1,70 +1,10 @@
---- ./scripts/init.d/cgred.in.orig 2014-01-13 08:05:56.000000000 -0600
-+++ ./scripts/init.d/cgred.in 2017-02-28 12:41:11.307424565 -0600
-@@ -39,13 +39,12 @@
- # Sanity checks
- [ -x $CGRED_BIN ] || exit 1
-
--# Source function library & LSB routines
-+# Source function library
- . /etc/rc.d/init.d/functions
--. /lib/lsb/init-functions
-
- # Read in configuration options.
--if [ -f "/etc/sysconfig/cgred.conf" ] ; then
-- . /etc/sysconfig/cgred.conf
-+if [ -f /etc/cgred.conf ] ; then
-+ . /etc/cgred.conf
- OPTIONS="$NODAEMON $LOG"
- if [ -n "$LOG_FILE" ]; then
- OPTIONS="$OPTIONS --logfile=$LOG_FILE"
-@@ -70,13 +69,13 @@
- {
- echo -n $"Starting CGroup Rules Engine Daemon: "
- if [ -f "$lockfile" ]; then
-- log_failure_msg "$servicename is already running with PID `cat ${pidfile}`"
-+ echo "$servicename is already running with PID `cat ${pidfile}`"
- return 0
- fi
- num=`grep "cgroup" /proc/mounts | awk '$3=="cgroup"' | wc -l`
- if [ $num -eq 0 ]; then
- echo
-- log_failure_msg $"Cannot find cgroups, is cgconfig service running?"
-+ echo $"Cannot find cgroups, is cgconfig service running?"
- return 1
- fi
- daemon --check $servicename --pidfile $pidfile $CGRED_BIN $OPTIONS
-@@ -97,7 +96,7 @@
- {
- echo -n $"Stopping CGroup Rules Engine Daemon..."
- if [ ! -f $pidfile ]; then
-- log_success_msg
-+ #log_success_msg
- return 0
- fi
- killproc -p $pidfile -TERM "$processname"
-@@ -143,13 +142,13 @@
- echo $"Reloading rules configuration..."
- kill -s 12 `cat ${pidfile}`
- RETVAL=$?
-- if [ $RETVAL -eq 0 ] ; then
-- log_success_msg
-- else
-- log_failure_msg
-- fi
-+ #if [ $RETVAL -eq 0 ] ; then
-+ # log_success_msg
-+ #else
-+ # log_failure_msg
-+ #fi
- else
-- log_failure_msg "$servicename is not running."
-+ echo "$servicename is not running."
- fi
- ;;
- *)
--- ./scripts/init.d/cgconfig.in.orig 2014-01-13 08:05:56.000000000 -0600
-+++ ./scripts/init.d/cgconfig.in 2017-02-28 12:42:13.278423245 -0600
-@@ -36,11 +36,6 @@
++++ ./scripts/init.d/cgconfig.in 2023-08-12 12:55:10.109117713 -0500
+@@ -33,14 +33,10 @@
+ prefix=@prefix@;exec_prefix=@exec_prefix@;sbindir=@sbindir@
+ CGCONFIGPARSER_BIN=$sbindir/cgconfigparser
+ CONFIG_FILE=/etc/cgconfig.conf
++CONFIG_DIR=/etc/cgconfig.d
servicename=cgconfig
lockfile=/var/lock/subsys/$servicename
@@ -76,7 +16,7 @@
# read the config
CREATE_DEFAULT=yes
if [ -e /etc/sysconfig/cgconfig ]; then
-@@ -54,8 +49,8 @@
+@@ -54,8 +50,8 @@
read user ctrl defaultcgroup <<< \
$(grep -m1 '^\*[[:space:]]\+' /etc/cgrules.conf)
if [ -n "$defaultcgroup" -a "$defaultcgroup" = "*" ]; then
@@ -87,7 +27,7 @@
defaultcgroup=
fi
fi
-@@ -98,20 +93,20 @@
+@@ -98,20 +94,20 @@
start() {
echo -n "Starting cgconfig service: "
if [ -f "$lockfile" ]; then
@@ -103,7 +43,8 @@
return 6
fi
- $CGCONFIGPARSER_BIN -l $CONFIG_FILE
+- $CGCONFIGPARSER_BIN -l $CONFIG_FILE
++ $CGCONFIGPARSER_BIN -l $CONFIG_FILE -L $CONFIG_DIR
retval=$?
if [ $retval -ne 0 ]; then
- log_failure_msg "Failed to parse " $CONFIG_FILE
@@ -111,7 +52,7 @@
return 1
fi
fi
-@@ -123,18 +118,18 @@
+@@ -123,18 +119,18 @@
touch "$lockfile"
retval=$?
if [ $retval -ne 0 ]; then
@@ -127,10 +68,74 @@
stop() {
echo -n "Stopping cgconfig service: "
- cgclear
-+ /usr/sbin/cgclear -l /etc/cgconfig.conf
++ /usr/sbin/cgclear -l $CONFIG_FILE -L $CONFIG_DIR
rm -f "$lockfile"
- log_success_msg
+ #log_success_msg
return 0
}
+--- ./scripts/init.d/cgred.in.orig 2014-01-13 08:05:56.000000000 -0600
++++ ./scripts/init.d/cgred.in 2023-08-12 12:53:58.042116101 -0500
+@@ -39,13 +39,12 @@
+ # Sanity checks
+ [ -x $CGRED_BIN ] || exit 1
+
+-# Source function library & LSB routines
++# Source function library
+ . /etc/rc.d/init.d/functions
+-. /lib/lsb/init-functions
+
+ # Read in configuration options.
+-if [ -f "/etc/sysconfig/cgred.conf" ] ; then
+- . /etc/sysconfig/cgred.conf
++if [ -f /etc/cgred.conf ] ; then
++ . /etc/cgred.conf
+ OPTIONS="$NODAEMON $LOG"
+ if [ -n "$LOG_FILE" ]; then
+ OPTIONS="$OPTIONS --logfile=$LOG_FILE"
+@@ -70,13 +69,13 @@
+ {
+ echo -n $"Starting CGroup Rules Engine Daemon: "
+ if [ -f "$lockfile" ]; then
+- log_failure_msg "$servicename is already running with PID `cat ${pidfile}`"
++ echo "$servicename is already running with PID `cat ${pidfile}`"
+ return 0
+ fi
+ num=`grep "cgroup" /proc/mounts | awk '$3=="cgroup"' | wc -l`
+ if [ $num -eq 0 ]; then
+ echo
+- log_failure_msg $"Cannot find cgroups, is cgconfig service running?"
++ echo $"Cannot find cgroups, is cgconfig service running?"
+ return 1
+ fi
+ daemon --check $servicename --pidfile $pidfile $CGRED_BIN $OPTIONS
+@@ -97,7 +96,7 @@
+ {
+ echo -n $"Stopping CGroup Rules Engine Daemon..."
+ if [ ! -f $pidfile ]; then
+- log_success_msg
++ #log_success_msg
+ return 0
+ fi
+ killproc -p $pidfile -TERM "$processname"
+@@ -143,13 +142,13 @@
+ echo $"Reloading rules configuration..."
+ kill -s 12 `cat ${pidfile}`
+ RETVAL=$?
+- if [ $RETVAL -eq 0 ] ; then
+- log_success_msg
+- else
+- log_failure_msg
+- fi
++ #if [ $RETVAL -eq 0 ] ; then
++ # log_success_msg
++ #else
++ # log_failure_msg
++ #fi
+ else
+- log_failure_msg "$servicename is not running."
++ echo "$servicename is not running."
+ fi
+ ;;
+ *)
diff --git a/source/d/cmake/cmake.url b/source/d/cmake/cmake.url
index 2d2a01adf..d6101a099 100644
--- a/source/d/cmake/cmake.url
+++ b/source/d/cmake/cmake.url
@@ -1,2 +1,2 @@
https://github.com/Kitware/CMake/releases
-https://github.com/Kitware/CMake/releases/download/v3.27.1/cmake-3.27.1.tar.gz
+https://github.com/Kitware/CMake/releases/download/v3.27.2/cmake-3.27.2.tar.gz
diff --git a/source/kde/kde/noarch b/source/kde/kde/noarch
index a1dd4c697..7e5f3e215 100644
--- a/source/kde/kde/noarch
+++ b/source/kde/kde/noarch
@@ -6,4 +6,5 @@ kde-wallpapers
oxygen-fonts
oxygen-icons
oxygen-icons5
+plasma-workspace-wallpapers
diff --git a/source/n/openssl/certwatch b/source/n/openssl/certwatch
index d52dc3dc4..c6a342b65 100644
--- a/source/n/openssl/certwatch
+++ b/source/n/openssl/certwatch
@@ -17,13 +17,18 @@ MAILADDR=root
# Directory with certificates to check
CERTDIR=/etc/ssl/certs
# Directory where to keep state files if this script isnt executed with "stdout"
-STATEDIR=/var/run
+STATEDIR=/var/run/certwatch
########################### CONFIGURATION SECTION END ##########################
PATH=/bin:/usr/bin:/sbin:/usr/sbin
DAY_IN_SECS=$((60*60*24))
DATE_CURRENT=$(date '+%s')
+# Ensure $STATEDIR exists:
+if [ ! -d $STATEDIR ]; then
+ mkdir -p $STATEDIR
+fi
+
usage()
{
echo "Usage: $0 [stdout]"
diff --git a/source/n/openssl/openssl.SlackBuild b/source/n/openssl/openssl.SlackBuild
index 1e01d1289..a4a42c259 100755
--- a/source/n/openssl/openssl.SlackBuild
+++ b/source/n/openssl/openssl.SlackBuild
@@ -28,7 +28,7 @@ TMP=${TMP:-/tmp}
PKGNAM=openssl
VERSION=${VERSION:-$(echo openssl-*.tar.gz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then