summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
Diffstat (limited to 'source')
-rwxr-xr-xsource/ap/nano/nano.SlackBuild2
-rwxr-xr-xsource/ap/qpdf/qpdf.SlackBuild2
-rw-r--r--source/kde/kde/build/libksysguard2
-rw-r--r--source/kde/kde/patch/libksysguard.patch2
-rw-r--r--source/kde/kde/patch/libksysguard/libksysguard.nosystemd.patch97
-rw-r--r--source/n/bind/bind-9.16.11.CVE-2020-8625.diff12
-rwxr-xr-xsource/n/bind/bind.SlackBuild6
-rwxr-xr-xsource/n/openvpn/openvpn.SlackBuild2
-rwxr-xr-xsource/n/s-nail/s-nail.SlackBuild2
-rw-r--r--source/n/s-nail/s-nail.url4
-rwxr-xr-xsource/x/libinput/libinput.SlackBuild2
-rwxr-xr-xsource/x/libwacom/libwacom.SlackBuild2
-rw-r--r--source/xap/mozilla-thunderbird/0041-bmo-1684261-Fix-build-with-rust-1.50.0.patch58
-rwxr-xr-xsource/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild5
14 files changed, 27 insertions, 171 deletions
diff --git a/source/ap/nano/nano.SlackBuild b/source/ap/nano/nano.SlackBuild
index 004c269d2..a9b7b28a8 100755
--- a/source/ap/nano/nano.SlackBuild
+++ b/source/ap/nano/nano.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=nano
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | cut -d - -f 2 | rev | cut -f 3- -d . | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
diff --git a/source/ap/qpdf/qpdf.SlackBuild b/source/ap/qpdf/qpdf.SlackBuild
index df2b61344..72377daf6 100755
--- a/source/ap/qpdf/qpdf.SlackBuild
+++ b/source/ap/qpdf/qpdf.SlackBuild
@@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=qpdf
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
diff --git a/source/kde/kde/build/libksysguard b/source/kde/kde/build/libksysguard
index 0cfbf0888..d00491fd7 100644
--- a/source/kde/kde/build/libksysguard
+++ b/source/kde/kde/build/libksysguard
@@ -1 +1 @@
-2
+1
diff --git a/source/kde/kde/patch/libksysguard.patch b/source/kde/kde/patch/libksysguard.patch
deleted file mode 100644
index d14bc7127..000000000
--- a/source/kde/kde/patch/libksysguard.patch
+++ /dev/null
@@ -1,2 +0,0 @@
-# Fix crash without systemd:
-cat $CWD/patch/libksysguard/libksysguard.nosystemd.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/kde/patch/libksysguard/libksysguard.nosystemd.patch b/source/kde/kde/patch/libksysguard/libksysguard.nosystemd.patch
deleted file mode 100644
index ea0423f5d..000000000
--- a/source/kde/kde/patch/libksysguard/libksysguard.nosystemd.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From 76a3570ab2f9fab98aa6ccc9ceafbbc29323db06 Mon Sep 17 00:00:00 2001
-From: David Edmundson <kde@davidedmundson.co.uk>
-Date: Thu, 4 Feb 2021 10:47:43 +0000
-Subject: [PATCH] Add method CGroupDataModel::isAvailable
-
-This returns true if the root is pointing to a valid path. The idea
-being that non-systemd systems won't have applications scoped correctly,
-nor a relevant user slice.
-
-By communicating this we can dislpay the entry as not working in the UI.
-
-
-(cherry picked from commit 6d42960456f145d178579a1debb726bd0c7dcee6)
----
- processcore/cgroup_data_model.cpp | 21 ++++++++++++++++++++-
- processcore/cgroup_data_model.h | 5 +++++
- 2 files changed, 25 insertions(+), 1 deletion(-)
-
-diff --git a/processcore/cgroup_data_model.cpp b/processcore/cgroup_data_model.cpp
-index 46a36c3..4278a2c 100644
---- a/processcore/cgroup_data_model.cpp
-+++ b/processcore/cgroup_data_model.cpp
-@@ -48,6 +48,7 @@ public:
- QHash<QString, KSysGuard::ProcessAttribute* > m_availableAttributes;
- QVector<KSysGuard::ProcessAttribute* > m_enabledAttributes;
-
-+ bool m_available = false;
- QString m_root;
- QScopedPointer<CGroup> m_rootGroup;
-
-@@ -367,9 +368,22 @@ void CGroupDataModel::setRoot(const QString &root)
- return;
- }
- d->m_root = root;
-- d->m_rootGroup.reset(new CGroup(root));
- emit rootChanged();
- QMetaObject::invokeMethod(this, [this] {update();}, Qt::QueuedConnection);
-+
-+ const QString path = CGroup::cgroupSysBasePath() + root;
-+ bool available = QFile::exists(path);
-+
-+ if (available) {
-+ d->m_rootGroup.reset(new CGroup(root));
-+ } else {
-+ d->m_rootGroup.reset();
-+ }
-+
-+ if (available != d->m_available) {
-+ d->m_available = available;
-+ emit availableChanged();
-+ }
- }
-
- void CGroupDataModel::update()
-@@ -443,6 +457,11 @@ void CGroupDataModel::update(CGroup *node)
- }
- }
-
-+bool CGroupDataModel::isAvailable() const
-+{
-+ return d->m_available;
-+}
-+
- QVector<Process*> CGroupDataModelPrivate::processesFor(CGroup *app)
- {
- if (m_processMap.contains(app)) {
-diff --git a/processcore/cgroup_data_model.h b/processcore/cgroup_data_model.h
-index 5ce58aa..1f7d28d 100644
---- a/processcore/cgroup_data_model.h
-+++ b/processcore/cgroup_data_model.h
-@@ -59,6 +59,8 @@ class Q_DECL_EXPORT CGroupDataModel : public QAbstractItemModel
- */
- Q_PROPERTY(QString setRoot READ root WRITE setRoot NOTIFY rootChanged)
-
-+ Q_PROPERTY(bool available READ isAvailable NOTIFY availableChanged)
-+
- public:
- CGroupDataModel(QObject *parent = nullptr);
- CGroupDataModel(const QString &root, QObject *parent = nullptr);
-@@ -114,10 +116,13 @@ public:
- */
- void update();
-
-+ bool isAvailable() const;
-+
- Q_SIGNALS:
- void enabledAttributesChanged();
- void enabledChanged();
- void rootChanged();
-+ void availableChanged();
-
- protected:
- virtual bool filterAcceptsCGroup(const QString &id);
---
-GitLab
-
-
diff --git a/source/n/bind/bind-9.16.11.CVE-2020-8625.diff b/source/n/bind/bind-9.16.11.CVE-2020-8625.diff
new file mode 100644
index 000000000..419b5bea0
--- /dev/null
+++ b/source/n/bind/bind-9.16.11.CVE-2020-8625.diff
@@ -0,0 +1,12 @@
+diff -u -r --new-file bind-9.16.11.orig/lib/dns/spnego.c bind-9.16.11/lib/dns/spnego.c
+--- bind-9.16.11.orig/lib/dns/spnego.c 2021-01-11 07:23:31.000000000 -0600
++++ bind-9.16.11/lib/dns/spnego.c 2021-02-24 13:57:17.199873321 -0600
+@@ -848,7 +848,7 @@
+ return (ASN1_OVERRUN);
+ }
+
+- data->components = malloc(len * sizeof(*data->components));
++ data->components = malloc((len + 1) * sizeof(*data->components));
+ if (data->components == NULL) {
+ return (ENOMEM);
+ }
diff --git a/source/n/bind/bind.SlackBuild b/source/n/bind/bind.SlackBuild
index 1b7af8957..a77c53178 100755
--- a/source/n/bind/bind.SlackBuild
+++ b/source/n/bind/bind.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=bind
VERSION=${VERSION:-$(echo ${PKGNAM}-[0-9]*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-3}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -82,6 +82,10 @@ else
GSSAPI=" "
fi
+# Fix a security vulnerability. This is fixed in 9.16.12, but we can't use
+# that version due to other regressions.
+zcat $CWD/bind-9.16.11.CVE-2020-8625.diff.gz | patch -p1 --verbose || exit 1
+
# Configure:
CFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/source/n/openvpn/openvpn.SlackBuild b/source/n/openvpn/openvpn.SlackBuild
index f136d02a2..21406b8b4 100755
--- a/source/n/openvpn/openvpn.SlackBuild
+++ b/source/n/openvpn/openvpn.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=openvpn
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/n/s-nail/s-nail.SlackBuild b/source/n/s-nail/s-nail.SlackBuild
index 567acd577..ccb0f4e20 100755
--- a/source/n/s-nail/s-nail.SlackBuild
+++ b/source/n/s-nail/s-nail.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=s-nail
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-1}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
diff --git a/source/n/s-nail/s-nail.url b/source/n/s-nail/s-nail.url
index 6395063b6..01af6a6a7 100644
--- a/source/n/s-nail/s-nail.url
+++ b/source/n/s-nail/s-nail.url
@@ -1,2 +1,2 @@
-http://ftp.sdaoden.eu/s-nail-14.9.21.tar.xz
-http://ftp.sdaoden.eu/s-nail-14.9.21.tar.xz.asc
+http://ftp.sdaoden.eu/s-nail-14.9.22.tar.xz
+http://ftp.sdaoden.eu/s-nail-14.9.22.tar.xz.asc
diff --git a/source/x/libinput/libinput.SlackBuild b/source/x/libinput/libinput.SlackBuild
index 3e3837b38..54b37bada 100755
--- a/source/x/libinput/libinput.SlackBuild
+++ b/source/x/libinput/libinput.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=libinput
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | 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/x/libwacom/libwacom.SlackBuild b/source/x/libwacom/libwacom.SlackBuild
index 35f5c302c..207b2374f 100755
--- a/source/x/libwacom/libwacom.SlackBuild
+++ b/source/x/libwacom/libwacom.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=libwacom
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/xap/mozilla-thunderbird/0041-bmo-1684261-Fix-build-with-rust-1.50.0.patch b/source/xap/mozilla-thunderbird/0041-bmo-1684261-Fix-build-with-rust-1.50.0.patch
deleted file mode 100644
index 73dec34cc..000000000
--- a/source/xap/mozilla-thunderbird/0041-bmo-1684261-Fix-build-with-rust-1.50.0.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From eb88f36f108a201d531f82789a86a4281f37b3b0 Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi@gentoo.org>
-Date: Sun, 14 Feb 2021 14:57:47 +0100
-Subject: [PATCH 41/41] bmo#1684261: Fix build with rust 1.50.0
-
-Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
----
- .cargo/config.in | 2 +-
- Cargo.lock | 2 +-
- Cargo.toml | 4 ++--
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/.cargo/config.in b/.cargo/config.in
-index 0ee86efe40..1accd1ef72 100644
---- a/.cargo/config.in
-+++ b/.cargo/config.in
-@@ -3,9 +3,9 @@
- # Please do not edit.
-
- [source."https://github.com/shravanrn/nix/"]
--branch = "r0.13.1"
- git = "https://github.com/shravanrn/nix/"
- replace-with = "vendored-sources"
-+rev = "4af6c367603869a30fddb5ffb0aba2b9477ba92e"
-
- [source."https://github.com/mozilla/rkv"]
- git = "https://github.com/mozilla/rkv"
-diff --git a/Cargo.lock b/Cargo.lock
-index d6dffc0133..e7b0247088 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -3200,7 +3200,7 @@ dependencies = [
- [[package]]
- name = "nix"
- version = "0.13.1"
--source = "git+https://github.com/shravanrn/nix/?branch=r0.13.1#4af6c367603869a30fddb5ffb0aba2b9477ba92e"
-+source = "git+https://github.com/shravanrn/nix/?rev=4af6c367603869a30fddb5ffb0aba2b9477ba92e#4af6c367603869a30fddb5ffb0aba2b9477ba92e"
- dependencies = [
- "bitflags",
- "cc",
-diff --git a/Cargo.toml b/Cargo.toml
-index 2c162e6567..3173ef840c 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -68,8 +68,8 @@ panic = "abort"
- libudev-sys = { path = "dom/webauthn/libudev-sys" }
- packed_simd = { git = "https://github.com/hsivonen/packed_simd", rev="0917fe780032a6bbb23d71be545f9c1834128d75" }
- rlbox_lucet_sandbox = { git = "https://github.com/PLSysSec/rlbox_lucet_sandbox/", rev="d510da5999a744c563b0acd18056069d1698273f" }
--nix = { git = "https://github.com/shravanrn/nix/", branch = "r0.13.1", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" }
--spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu3", rev = "20191ad2f370afd6d247edcb9ff9da32d3bedb9c" }
-+nix = { git = "https://github.com/shravanrn/nix/", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" }
-+spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu3" }
- # failure's backtrace feature might break our builds, see bug 1608157.
- failure = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }
- failure_derive = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }
---
-2.30.1
-
diff --git a/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild b/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild
index 0e760a4b4..be4305f4a 100755
--- a/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild
+++ b/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild
@@ -30,7 +30,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=mozilla-thunderbird
VERSION=$(basename $(ls thunderbird-*.tar.?z | cut -d - -f 2 | rev | cut -f 3- -d . | rev) .source)
RELEASEVER=$(echo $VERSION | cut -f 1 -d e | cut -f 1 -d b)
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
# Specify this variable for a localized build.
# For example, to build a version of Thunderbird with Italian support, run
@@ -172,9 +172,6 @@ zcat $CWD/tb.ui.scrollToClick.diff.gz | patch -p1 --verbose || exit 1
# Bypass a test that fails the build:
zcat $CWD/gkrust.a.no.networking.check.diff.gz | patch -p1 --verbose || exit 1
-# Fix building with rust-1.50.0:
-zcat $CWD/0041-bmo-1684261-Fix-build-with-rust-1.50.0.patch.gz | patch -p1 --verbose || exit 1
-
# Fetch localization, if requested:
if [ ! -z $MOZLOCALIZE ]; then
LOC_TAG="THUNDERBIRD_$( echo $VERSION | tr \. _ )_RELEASE"
generated by cgit v1.2.3 (git 2.26.2) at 2024-04-28 04:40:25 +0000