summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
Diffstat (limited to 'source')
-rwxr-xr-xsource/a/sdparm/sdparm.SlackBuild2
-rwxr-xr-xsource/ap/nvme-cli/nvme-cli.SlackBuild2
-rw-r--r--source/installer/ChangeLog.txt3
-rwxr-xr-xsource/installer/sources/initrd/usr/lib/setup/setup2
-rw-r--r--source/kde/kde/build/cantor2
-rw-r--r--source/kde/kde/build/kig2
-rw-r--r--source/kde/kde/build/kitinerary2
-rw-r--r--source/kde/kde/build/kopeninghours1
-rw-r--r--source/kde/kde/build/okular2
-rw-r--r--source/kde/kde/modules/all-packaged-applications1
-rw-r--r--source/kde/kde/modules/kdepim1
-rw-r--r--source/kde/kde/patch/kate/kate_runasroot.patch53
-rw-r--r--source/kde/kde/patch/ktorrent/ktorrent.use.package.geoip.database.diff14
-rw-r--r--source/kde/kde/slack-desc/kopeninghours19
14 files changed, 67 insertions, 39 deletions
diff --git a/source/a/sdparm/sdparm.SlackBuild b/source/a/sdparm/sdparm.SlackBuild
index 6503818af..e330eb2d3 100755
--- a/source/a/sdparm/sdparm.SlackBuild
+++ b/source/a/sdparm/sdparm.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=sdparm
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
diff --git a/source/ap/nvme-cli/nvme-cli.SlackBuild b/source/ap/nvme-cli/nvme-cli.SlackBuild
index fa9bcbff6..027d7afc3 100755
--- a/source/ap/nvme-cli/nvme-cli.SlackBuild
+++ b/source/ap/nvme-cli/nvme-cli.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=nvme-cli
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
diff --git a/source/installer/ChangeLog.txt b/source/installer/ChangeLog.txt
index e40e0c179..6f035d8f7 100644
--- a/source/installer/ChangeLog.txt
+++ b/source/installer/ChangeLog.txt
@@ -1,3 +1,6 @@
+Thu Apr 22 16:56:28 UTC 2021
+ setup: fix running ldconfig. Thanks to alienBOB and MoZes.
++--------------------------+
Tue Apr 20 18:46:38 UTC 2021
setup: run ldconfig after the packages are installed.
Thanks to average_user.
diff --git a/source/installer/sources/initrd/usr/lib/setup/setup b/source/installer/sources/initrd/usr/lib/setup/setup
index a77349838..520b9dbcd 100755
--- a/source/installer/sources/initrd/usr/lib/setup/setup
+++ b/source/installer/sources/initrd/usr/lib/setup/setup
@@ -324,7 +324,7 @@ to choose packages individually." 4 60
fi
# Run ldconfig on the newly installed system:
if [ -x $T_PX/sbin/ldconfig ]; then
- ( chroot $T_PX ; /sbin/ldconfig )
+ $T_PX/sbin/ldconfig -r $T_PX
fi
if [ $MODE = terse ]; then
# Let's pause a moment and then restore the terminal settings
diff --git a/source/kde/kde/build/cantor b/source/kde/kde/build/cantor
index 0cfbf0888..d00491fd7 100644
--- a/source/kde/kde/build/cantor
+++ b/source/kde/kde/build/cantor
@@ -1 +1 @@
-2
+1
diff --git a/source/kde/kde/build/kig b/source/kde/kde/build/kig
index 0cfbf0888..d00491fd7 100644
--- a/source/kde/kde/build/kig
+++ b/source/kde/kde/build/kig
@@ -1 +1 @@
-2
+1
diff --git a/source/kde/kde/build/kitinerary b/source/kde/kde/build/kitinerary
index 0cfbf0888..d00491fd7 100644
--- a/source/kde/kde/build/kitinerary
+++ b/source/kde/kde/build/kitinerary
@@ -1 +1 @@
-2
+1
diff --git a/source/kde/kde/build/kopeninghours b/source/kde/kde/build/kopeninghours
new file mode 100644
index 000000000..d00491fd7
--- /dev/null
+++ b/source/kde/kde/build/kopeninghours
@@ -0,0 +1 @@
+1
diff --git a/source/kde/kde/build/okular b/source/kde/kde/build/okular
index 0cfbf0888..d00491fd7 100644
--- a/source/kde/kde/build/okular
+++ b/source/kde/kde/build/okular
@@ -1 +1 @@
-2
+1
diff --git a/source/kde/kde/modules/all-packaged-applications b/source/kde/kde/modules/all-packaged-applications
index 8c214c71c..55d82462e 100644
--- a/source/kde/kde/modules/all-packaged-applications
+++ b/source/kde/kde/modules/all-packaged-applications
@@ -32,6 +32,7 @@ messagelib
mailcommon
kleopatra
kpkpass
+kopeninghours
kitinerary
kdepim-addons
kdepim-runtime
diff --git a/source/kde/kde/modules/kdepim b/source/kde/kde/modules/kdepim
index 2f051e12b..b36ce2582 100644
--- a/source/kde/kde/modules/kdepim
+++ b/source/kde/kde/modules/kdepim
@@ -36,6 +36,7 @@ messagelib
mailcommon
kleopatra
kpkpass
+kopeninghours
kitinerary
kdepim-addons
kdepim-runtime
diff --git a/source/kde/kde/patch/kate/kate_runasroot.patch b/source/kde/kde/patch/kate/kate_runasroot.patch
index f549fc342..aa067ce61 100644
--- a/source/kde/kde/patch/kate/kate_runasroot.patch
+++ b/source/kde/kde/patch/kate/kate_runasroot.patch
@@ -1,45 +1,48 @@
-The user gets to decide whether she wants to run kate as root.
-Please developers, do not presume that a Slackware user is dumb.
-
-diff -uar kate-19.04.1.orig/kate/main.cpp kate-19.04.1/kate/main.cpp
---- kate-19.04.1.orig/kate/main.cpp 2019-05-02 12:44:53.000000000 +0200
-+++ kate-19.04.1/kate/main.cpp 2019-05-08 21:26:07.196338144 +0200
-@@ -59,14 +59,12 @@
- int main(int argc, char **argv)
+--- ./kwrite/main.cpp.orig 2021-04-22 13:26:42.398123759 -0500
++++ ./kwrite/main.cpp 2021-04-22 13:29:08.356127024 -0500
+@@ -38,20 +38,18 @@
+ extern "C" Q_DECL_EXPORT int main(int argc, char **argv)
{
#ifndef Q_OS_WIN
- // Prohibit using sudo or kdesu (but allow using the root user directly)
+ // Warn using sudo or kdesu (but allow using the root user directly)
if (getuid() == 0) {
if (!qEnvironmentVariableIsEmpty("SUDO_USER")) {
-- std::cout << "Executing Kate with sudo is not possible due to unfixable security vulnerabilities." << std::endl;
+- std::cout << "Executing KWrite with sudo is not possible due to unfixable security vulnerabilities. "
++ std::cout << "Executing KWrite with sudo is UNSAFE due to unfixable security vulnerabilities. "
+ "It is also not necessary; simply use KWrite normally, and you will be prompted for "
+ "elevated privileges when saving documents if needed."
+ << std::endl;
- return EXIT_FAILURE;
-+ std::cout << "Executing Kate with sudo is UNSAFE due to unfixable security vulnerabilities." << std::endl;
} else if (!qEnvironmentVariableIsEmpty("KDESU_USER")) {
-- std::cout << "Executing Kate with kdesu is not possible due to unfixable security vulnerabilities." << std::endl;
+- std::cout << "Executing KWrite with kdesu is not possible due to unfixable security vulnerabilities. "
++ std::cout << "Executing KWrite with kdesu is UNSAFE due to unfixable security vulnerabilities. "
+ "It is also not necessary; simply use KWrite normally, and you will be prompted for "
+ "elevated privileges when saving documents if needed."
+ << std::endl;
- return EXIT_FAILURE;
-+ std::cout << "Executing Kate with kdesu is UNSAFE due to unfixable security vulnerabilities." << std::endl;
}
}
#endif
-diff -uar kate-19.04.1.orig/kwrite/main.cpp kate-19.04.1/kwrite/main.cpp
---- kate-19.04.1.orig/kwrite/main.cpp 2019-05-02 12:44:53.000000000 +0200
-+++ kate-19.04.1/kwrite/main.cpp 2019-05-08 21:27:52.034134472 +0200
-@@ -51,14 +51,12 @@
- extern "C" Q_DECL_EXPORT int main(int argc, char **argv)
- {
- #ifndef Q_OS_WIN
-- // Prohibit using sudo or kdesu (but allow using the root user directly)
-+ // Warn using sudo or kdesu (but allow using the root user directly)
+--- ./kate/main.cpp.orig 2021-04-22 13:26:42.397123759 -0500
++++ ./kate/main.cpp 2021-04-22 13:30:18.674128597 -0500
+@@ -49,17 +49,15 @@
+ // Prohibit using sudo or kdesu (but allow using the root user directly)
if (getuid() == 0) {
if (!qEnvironmentVariableIsEmpty("SUDO_USER")) {
-- std::cout << "Executing KWrite with sudo is not possible due to unfixable security vulnerabilities." << std::endl;
+- std::cout << "Executing Kate with sudo is not possible due to unfixable security vulnerabilities. "
++ std::cout << "Executing Kate with sudo is UNSAFE due to unfixable security vulnerabilities. "
+ "It is also not necessary; simply use Kate normally, and you will be prompted for "
+ "elevated privileges when saving documents if needed."
+ << std::endl;
- return EXIT_FAILURE;
-+ std::cout << "Executing KWrite with sudo is UNSAFE due to unfixable security vulnerabilities." << std::endl;
} else if (!qEnvironmentVariableIsEmpty("KDESU_USER")) {
-- std::cout << "Executing KWrite with kdesu is not possible due to unfixable security vulnerabilities." << std::endl;
+- std::cout << "Executing Kate with kdesu is not possible due to unfixable security vulnerabilities. "
++ std::cout << "Executing Kate with kdesu is UNSAFE due to unfixable security vulnerabilities. "
+ "It is also not necessary; simply use Kate normally, and you will be prompted for "
+ "elevated privileges when saving documents if needed."
+ << std::endl;
- return EXIT_FAILURE;
-+ std::cout << "Executing KWrite with kdesu is UNSAFE due to unfixable security vulnerabilities." << std::endl;
}
}
#endif
diff --git a/source/kde/kde/patch/ktorrent/ktorrent.use.package.geoip.database.diff b/source/kde/kde/patch/ktorrent/ktorrent.use.package.geoip.database.diff
index 2a944c10c..cf6d114c7 100644
--- a/source/kde/kde/patch/ktorrent/ktorrent.use.package.geoip.database.diff
+++ b/source/kde/kde/patch/ktorrent/ktorrent.use.package.geoip.database.diff
@@ -1,6 +1,6 @@
---- ./plugins/infowidget/geoipmanager.cpp.orig 2020-12-11 11:37:19.450009584 -0600
-+++ ./plugins/infowidget/geoipmanager.cpp 2020-12-11 11:39:48.834012926 -0600
-@@ -42,7 +42,7 @@
+--- ./plugins/infowidget/geoipmanager.cpp.orig 2021-04-14 10:30:03.000000000 -0500
++++ ./plugins/infowidget/geoipmanager.cpp 2021-04-22 14:25:11.954202268 -0500
+@@ -45,7 +45,7 @@
#ifdef USE_SYSTEM_GEOIP
geo_ip = GeoIP_open_type(GEOIP_COUNTRY_EDITION, GEOIP_STANDARD);
#else
@@ -9,7 +9,7 @@
if (geoip_data_file.isEmpty())
geoip_data_file = QStandardPaths::locate(QStandardPaths::AppDataLocation, QStringLiteral("GeoIP.dat"));
-@@ -53,11 +53,6 @@
+@@ -56,11 +56,6 @@
if (geo_ip) {
QFileInfo fi(geoip_data_file);
QDateTime now = QDateTime::currentDateTime();
@@ -21,16 +21,16 @@
}
}
#endif
-@@ -101,12 +96,6 @@
+@@ -104,12 +99,6 @@
void GeoIPManager::downloadDataBase()
{
-#ifndef USE_SYSTEM_GEOIP
- Out(SYS_INW | LOG_NOTICE) << "Downloading GeoIP database: " << geoip_url << endl;
- download_destination = kt::DataDir(CreateIfNotExists) + geoip_url.fileName();
-- KIO::CopyJob* job = KIO::copy(geoip_url, QUrl::fromLocalFile(download_destination), KIO::Overwrite | KIO::HideProgressInfo);
+- KIO::CopyJob *job = KIO::copy(geoip_url, QUrl::fromLocalFile(download_destination), KIO::Overwrite | KIO::HideProgressInfo);
- connect(job, &KIO::CopyJob::result, this, &GeoIPManager::databaseDownloadFinished);
-#endif
}
- void GeoIPManager::databaseDownloadFinished(KJob* job)
+ void GeoIPManager::databaseDownloadFinished(KJob *job)
diff --git a/source/kde/kde/slack-desc/kopeninghours b/source/kde/kde/slack-desc/kopeninghours
new file mode 100644
index 000000000..087ff5913
--- /dev/null
+++ b/source/kde/kde/slack-desc/kopeninghours
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description. Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in. You must
+# make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+ |-----handy-ruler------------------------------------------------------|
+kopeninghours: kopeninghours (OSM opening hours expressions library)
+kopeninghours:
+kopeninghours: A library for parsing and evaluating OSM opening hours expressions.
+kopeninghours: OSM opening hours expressions are used to describe when a feature is
+kopeninghours: open/available or closed. This format is not only used in
+kopeninghours: OpenStreetMap itself, but in various other data sources or APIs
+kopeninghours: needing such a description as well.
+kopeninghours:
+kopeninghours: Homepage: https://github.com/KDE/kopeninghours
+kopeninghours:
+kopeninghours:
generated by cgit v1.2.3 (git 2.26.2) at 2024-04-27 16:14:50 +0000