Wed Feb 24 20:34:08 UTC 2021

ap/nano-5.6-x86_64-1.txz:  Upgraded.
ap/qpdf-10.2.0-x86_64-1.txz:  Upgraded.
d/cmake-3.19.6-x86_64-1.txz:  Upgraded.
kde/bluedevil-5.21.1-x86_64-1.txz:  Upgraded.
kde/breeze-5.21.1-x86_64-1.txz:  Upgraded.
kde/breeze-grub-5.21.1-x86_64-1.txz:  Upgraded.
kde/breeze-gtk-5.21.1-x86_64-1.txz:  Upgraded.
kde/drkonqi-5.21.1-x86_64-1.txz:  Upgraded.
kde/kactivitymanagerd-5.21.1-x86_64-1.txz:  Upgraded.
kde/kde-cli-tools-5.21.1-x86_64-1.txz:  Upgraded.
kde/kde-gtk-config-5.21.1-x86_64-1.txz:  Upgraded.
kde/kdecoration-5.21.1-x86_64-1.txz:  Upgraded.
kde/kdeplasma-addons-5.21.1-x86_64-1.txz:  Upgraded.
kde/kgamma5-5.21.1-x86_64-1.txz:  Upgraded.
kde/khotkeys-5.21.1-x86_64-1.txz:  Upgraded.
kde/kinfocenter-5.21.1-x86_64-1.txz:  Upgraded.
kde/kmenuedit-5.21.1-x86_64-1.txz:  Upgraded.
kde/kscreen-5.21.1-x86_64-1.txz:  Upgraded.
kde/kscreenlocker-5.21.1-x86_64-1.txz:  Upgraded.
kde/ksshaskpass-5.21.1-x86_64-1.txz:  Upgraded.
kde/ksysguard-5.21.1-x86_64-1.txz:  Upgraded.
kde/kwallet-pam-5.21.1-x86_64-1.txz:  Upgraded.
kde/kwayland-integration-5.21.1-x86_64-1.txz:  Upgraded.
kde/kwayland-server-5.21.1-x86_64-1.txz:  Upgraded.
kde/kwin-5.21.1-x86_64-1.txz:  Upgraded.
kde/kwrited-5.21.1-x86_64-1.txz:  Upgraded.
kde/libkscreen-5.21.1-x86_64-1.txz:  Upgraded.
kde/libksysguard-5.21.1-x86_64-1.txz:  Upgraded.
kde/milou-5.21.1-x86_64-1.txz:  Upgraded.
kde/oxygen-5.21.1-x86_64-1.txz:  Upgraded.
kde/plasma-browser-integration-5.21.1-x86_64-1.txz:  Upgraded.
kde/plasma-desktop-5.21.1-x86_64-1.txz:  Upgraded.
kde/plasma-disks-5.21.1-x86_64-1.txz:  Upgraded.
kde/plasma-firewall-5.21.1-x86_64-1.txz:  Upgraded.
kde/plasma-integration-5.21.1-x86_64-1.txz:  Upgraded.
kde/plasma-nm-5.21.1-x86_64-1.txz:  Upgraded.
kde/plasma-pa-5.21.1-x86_64-1.txz:  Upgraded.
kde/plasma-sdk-5.21.1-x86_64-1.txz:  Upgraded.
kde/plasma-systemmonitor-5.21.1-x86_64-1.txz:  Upgraded.
kde/plasma-vault-5.21.1-x86_64-1.txz:  Upgraded.
kde/plasma-workspace-5.21.1-x86_64-1.txz:  Upgraded.
kde/plasma-workspace-wallpapers-5.21.1-x86_64-1.txz:  Upgraded.
kde/polkit-kde-agent-1-5.21.1-x86_64-1.txz:  Upgraded.
kde/powerdevil-5.21.1-x86_64-1.txz:  Upgraded.
kde/qqc2-breeze-style-5.21.1-x86_64-1.txz:  Upgraded.
kde/sddm-kcm-5.21.1-x86_64-1.txz:  Upgraded.
kde/systemsettings-5.21.1-x86_64-1.txz:  Upgraded.
kde/xdg-desktop-portal-kde-5.21.1-x86_64-1.txz:  Upgraded.
n/bind-9.16.11-x86_64-3.txz:  Rebuilt.
  Reverted to bind-9.16.11 plus a patch for CVE-2020-8625 to fix a
  regression in bind-9.16.12 that can cause the name server to crash.
  Thanks to nobodino.
n/openvpn-2.5.1-x86_64-1.txz:  Upgraded.
n/s-nail-14.9.22-x86_64-1.txz:  Upgraded.
x/libinput-1.16.5-x86_64-1.txz:  Upgraded.
x/libwacom-1.9-x86_64-1.txz:  Upgraded.
xap/mozilla-thunderbird-78.8.0-x86_64-1.txz:  Upgraded.
  This release contains security fixes and improvements.
  For more information, see:
    https://www.mozilla.org/en-US/thunderbird/78.8.0/releasenotes/
    https://www.mozilla.org/en-US/security/advisories/mfsa2021-09/
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-23969
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-23968
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-23973
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-23978
  (* Security fix *)
This commit is contained in:
Patrick J Volkerding 2021-02-24 20:34:08 +00:00 committed by Eric Hameleers
parent 5a128f821e
commit fb4e47bf78
18 changed files with 513 additions and 516 deletions

View file

@ -11,9 +11,85 @@
<description>Tracking Slackware development in git.</description>
<language>en-us</language>
<id xmlns="http://www.w3.org/2005/Atom">urn:uuid:c964f45e-6732-11e8-bbe5-107b4450212f</id>
<pubDate>Tue, 23 Feb 2021 22:04:52 GMT</pubDate>
<lastBuildDate>Wed, 24 Feb 2021 08:00:59 GMT</lastBuildDate>
<pubDate>Wed, 24 Feb 2021 20:34:08 GMT</pubDate>
<lastBuildDate>Thu, 25 Feb 2021 07:59:44 GMT</lastBuildDate>
<generator>maintain_current_git.sh v 1.12</generator>
<item>
<title>Wed, 24 Feb 2021 20:34:08 GMT</title>
<pubDate>Wed, 24 Feb 2021 20:34:08 GMT</pubDate>
<link>https://git.slackware.nl/current/tag/?h=20210224203408</link>
<guid isPermaLink="false">20210224203408</guid>
<description>
<![CDATA[<pre>
ap/nano-5.6-x86_64-1.txz: Upgraded.
ap/qpdf-10.2.0-x86_64-1.txz: Upgraded.
d/cmake-3.19.6-x86_64-1.txz: Upgraded.
kde/bluedevil-5.21.1-x86_64-1.txz: Upgraded.
kde/breeze-5.21.1-x86_64-1.txz: Upgraded.
kde/breeze-grub-5.21.1-x86_64-1.txz: Upgraded.
kde/breeze-gtk-5.21.1-x86_64-1.txz: Upgraded.
kde/drkonqi-5.21.1-x86_64-1.txz: Upgraded.
kde/kactivitymanagerd-5.21.1-x86_64-1.txz: Upgraded.
kde/kde-cli-tools-5.21.1-x86_64-1.txz: Upgraded.
kde/kde-gtk-config-5.21.1-x86_64-1.txz: Upgraded.
kde/kdecoration-5.21.1-x86_64-1.txz: Upgraded.
kde/kdeplasma-addons-5.21.1-x86_64-1.txz: Upgraded.
kde/kgamma5-5.21.1-x86_64-1.txz: Upgraded.
kde/khotkeys-5.21.1-x86_64-1.txz: Upgraded.
kde/kinfocenter-5.21.1-x86_64-1.txz: Upgraded.
kde/kmenuedit-5.21.1-x86_64-1.txz: Upgraded.
kde/kscreen-5.21.1-x86_64-1.txz: Upgraded.
kde/kscreenlocker-5.21.1-x86_64-1.txz: Upgraded.
kde/ksshaskpass-5.21.1-x86_64-1.txz: Upgraded.
kde/ksysguard-5.21.1-x86_64-1.txz: Upgraded.
kde/kwallet-pam-5.21.1-x86_64-1.txz: Upgraded.
kde/kwayland-integration-5.21.1-x86_64-1.txz: Upgraded.
kde/kwayland-server-5.21.1-x86_64-1.txz: Upgraded.
kde/kwin-5.21.1-x86_64-1.txz: Upgraded.
kde/kwrited-5.21.1-x86_64-1.txz: Upgraded.
kde/libkscreen-5.21.1-x86_64-1.txz: Upgraded.
kde/libksysguard-5.21.1-x86_64-1.txz: Upgraded.
kde/milou-5.21.1-x86_64-1.txz: Upgraded.
kde/oxygen-5.21.1-x86_64-1.txz: Upgraded.
kde/plasma-browser-integration-5.21.1-x86_64-1.txz: Upgraded.
kde/plasma-desktop-5.21.1-x86_64-1.txz: Upgraded.
kde/plasma-disks-5.21.1-x86_64-1.txz: Upgraded.
kde/plasma-firewall-5.21.1-x86_64-1.txz: Upgraded.
kde/plasma-integration-5.21.1-x86_64-1.txz: Upgraded.
kde/plasma-nm-5.21.1-x86_64-1.txz: Upgraded.
kde/plasma-pa-5.21.1-x86_64-1.txz: Upgraded.
kde/plasma-sdk-5.21.1-x86_64-1.txz: Upgraded.
kde/plasma-systemmonitor-5.21.1-x86_64-1.txz: Upgraded.
kde/plasma-vault-5.21.1-x86_64-1.txz: Upgraded.
kde/plasma-workspace-5.21.1-x86_64-1.txz: Upgraded.
kde/plasma-workspace-wallpapers-5.21.1-x86_64-1.txz: Upgraded.
kde/polkit-kde-agent-1-5.21.1-x86_64-1.txz: Upgraded.
kde/powerdevil-5.21.1-x86_64-1.txz: Upgraded.
kde/qqc2-breeze-style-5.21.1-x86_64-1.txz: Upgraded.
kde/sddm-kcm-5.21.1-x86_64-1.txz: Upgraded.
kde/systemsettings-5.21.1-x86_64-1.txz: Upgraded.
kde/xdg-desktop-portal-kde-5.21.1-x86_64-1.txz: Upgraded.
n/bind-9.16.11-x86_64-3.txz: Rebuilt.
Reverted to bind-9.16.11 plus a patch for CVE-2020-8625 to fix a
regression in bind-9.16.12 that can cause the name server to crash.
Thanks to nobodino.
n/openvpn-2.5.1-x86_64-1.txz: Upgraded.
n/s-nail-14.9.22-x86_64-1.txz: Upgraded.
x/libinput-1.16.5-x86_64-1.txz: Upgraded.
x/libwacom-1.9-x86_64-1.txz: Upgraded.
xap/mozilla-thunderbird-78.8.0-x86_64-1.txz: Upgraded.
This release contains security fixes and improvements.
For more information, see:
https://www.mozilla.org/en-US/thunderbird/78.8.0/releasenotes/
https://www.mozilla.org/en-US/security/advisories/mfsa2021-09/
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-23969
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-23968
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-23973
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-23978
(* Security fix *)
</pre>]]>
</description>
</item>
<item>
<title>Tue, 23 Feb 2021 22:04:52 GMT</title>
<pubDate>Tue, 23 Feb 2021 22:04:52 GMT</pubDate>

View file

@ -1,3 +1,71 @@
Wed Feb 24 20:34:08 UTC 2021
ap/nano-5.6-x86_64-1.txz: Upgraded.
ap/qpdf-10.2.0-x86_64-1.txz: Upgraded.
d/cmake-3.19.6-x86_64-1.txz: Upgraded.
kde/bluedevil-5.21.1-x86_64-1.txz: Upgraded.
kde/breeze-5.21.1-x86_64-1.txz: Upgraded.
kde/breeze-grub-5.21.1-x86_64-1.txz: Upgraded.
kde/breeze-gtk-5.21.1-x86_64-1.txz: Upgraded.
kde/drkonqi-5.21.1-x86_64-1.txz: Upgraded.
kde/kactivitymanagerd-5.21.1-x86_64-1.txz: Upgraded.
kde/kde-cli-tools-5.21.1-x86_64-1.txz: Upgraded.
kde/kde-gtk-config-5.21.1-x86_64-1.txz: Upgraded.
kde/kdecoration-5.21.1-x86_64-1.txz: Upgraded.
kde/kdeplasma-addons-5.21.1-x86_64-1.txz: Upgraded.
kde/kgamma5-5.21.1-x86_64-1.txz: Upgraded.
kde/khotkeys-5.21.1-x86_64-1.txz: Upgraded.
kde/kinfocenter-5.21.1-x86_64-1.txz: Upgraded.
kde/kmenuedit-5.21.1-x86_64-1.txz: Upgraded.
kde/kscreen-5.21.1-x86_64-1.txz: Upgraded.
kde/kscreenlocker-5.21.1-x86_64-1.txz: Upgraded.
kde/ksshaskpass-5.21.1-x86_64-1.txz: Upgraded.
kde/ksysguard-5.21.1-x86_64-1.txz: Upgraded.
kde/kwallet-pam-5.21.1-x86_64-1.txz: Upgraded.
kde/kwayland-integration-5.21.1-x86_64-1.txz: Upgraded.
kde/kwayland-server-5.21.1-x86_64-1.txz: Upgraded.
kde/kwin-5.21.1-x86_64-1.txz: Upgraded.
kde/kwrited-5.21.1-x86_64-1.txz: Upgraded.
kde/libkscreen-5.21.1-x86_64-1.txz: Upgraded.
kde/libksysguard-5.21.1-x86_64-1.txz: Upgraded.
kde/milou-5.21.1-x86_64-1.txz: Upgraded.
kde/oxygen-5.21.1-x86_64-1.txz: Upgraded.
kde/plasma-browser-integration-5.21.1-x86_64-1.txz: Upgraded.
kde/plasma-desktop-5.21.1-x86_64-1.txz: Upgraded.
kde/plasma-disks-5.21.1-x86_64-1.txz: Upgraded.
kde/plasma-firewall-5.21.1-x86_64-1.txz: Upgraded.
kde/plasma-integration-5.21.1-x86_64-1.txz: Upgraded.
kde/plasma-nm-5.21.1-x86_64-1.txz: Upgraded.
kde/plasma-pa-5.21.1-x86_64-1.txz: Upgraded.
kde/plasma-sdk-5.21.1-x86_64-1.txz: Upgraded.
kde/plasma-systemmonitor-5.21.1-x86_64-1.txz: Upgraded.
kde/plasma-vault-5.21.1-x86_64-1.txz: Upgraded.
kde/plasma-workspace-5.21.1-x86_64-1.txz: Upgraded.
kde/plasma-workspace-wallpapers-5.21.1-x86_64-1.txz: Upgraded.
kde/polkit-kde-agent-1-5.21.1-x86_64-1.txz: Upgraded.
kde/powerdevil-5.21.1-x86_64-1.txz: Upgraded.
kde/qqc2-breeze-style-5.21.1-x86_64-1.txz: Upgraded.
kde/sddm-kcm-5.21.1-x86_64-1.txz: Upgraded.
kde/systemsettings-5.21.1-x86_64-1.txz: Upgraded.
kde/xdg-desktop-portal-kde-5.21.1-x86_64-1.txz: Upgraded.
n/bind-9.16.11-x86_64-3.txz: Rebuilt.
Reverted to bind-9.16.11 plus a patch for CVE-2020-8625 to fix a
regression in bind-9.16.12 that can cause the name server to crash.
Thanks to nobodino.
n/openvpn-2.5.1-x86_64-1.txz: Upgraded.
n/s-nail-14.9.22-x86_64-1.txz: Upgraded.
x/libinput-1.16.5-x86_64-1.txz: Upgraded.
x/libwacom-1.9-x86_64-1.txz: Upgraded.
xap/mozilla-thunderbird-78.8.0-x86_64-1.txz: Upgraded.
This release contains security fixes and improvements.
For more information, see:
https://www.mozilla.org/en-US/thunderbird/78.8.0/releasenotes/
https://www.mozilla.org/en-US/security/advisories/mfsa2021-09/
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-23969
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-23968
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-23973
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-23978
(* Security fix *)
+--------------------------+
Tue Feb 23 22:04:52 UTC 2021
a/kernel-generic-5.10.18-x86_64-1.txz: Upgraded.
a/kernel-huge-5.10.18-x86_64-1.txz: Upgraded.

File diff suppressed because it is too large Load diff

View file

@ -571,6 +571,7 @@ gzip ./source/n/s-nail/s-nail.no.emptystart.diff
gzip ./source/n/iputils/iputils.docbook.revert.diff
gzip ./source/n/dhcpcd/doinst.sh
gzip ./source/n/bind/doinst.sh
gzip ./source/n/bind/bind-9.16.11.CVE-2020-8625.diff
gzip ./source/n/wireless_tools/doinst.sh
gzip ./source/n/wireless_tools/wireless_tools.nowhine.diff
gzip ./source/n/irssi/doinst.sh
@ -912,7 +913,6 @@ gzip ./source/l/mozjs78/patches/init_patch.patch
gzip ./source/l/mozjs78/patches/spidermonkey_style_check_disable_s390x.patch
gzip ./source/l/mozjs78/patches/spidermonkey_checks_disable.patch
gzip ./source/xap/hexchat/doinst.sh
gzip ./source/xap/mozilla-thunderbird/0041-bmo-1684261-Fix-build-with-rust-1.50.0.patch
gzip ./source/xap/mozilla-thunderbird/autoconf/autoconf-2.13-consolidated_fixes-1.patch
gzip ./source/xap/mozilla-thunderbird/build-deps/autoconf/autoconf-2.13-consolidated_fixes-1.patch
gzip ./source/xap/mozilla-thunderbird/tb.ui.scrollToClick.diff

View file

@ -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) "}

View file

@ -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

View file

@ -1 +1 @@
2
1

View file

@ -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 ; }

View file

@ -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

View file

@ -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);
}

View file

@ -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 \

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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"