summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2022-09-17 18:59:36 +0000
committer Eric Hameleers <alien@slackware.com>2022-09-18 07:00:12 +0200
commit74ad1fc784683f5733bbce69213f0c72a4e10267 (patch)
tree21ce052f3c8fd1bcbbb5d7f8cb73c2914318fd44 /source
parent4cd72b337e8e680b5838e09e30023ef23f535ffd (diff)
downloadcurrent-74ad1fc784683f5733bbce69213f0c72a4e10267.tar.gz
current-74ad1fc784683f5733bbce69213f0c72a4e10267.tar.xz
Sat Sep 17 18:59:36 UTC 202220220917185936
a/acpid-2.0.34-x86_64-1.txz: Upgraded. a/libblockdev-2.28-x86_64-1.txz: Upgraded. ap/lsof-4.96.3-x86_64-1.txz: Upgraded. ap/mariadb-10.6.10-x86_64-1.txz: Upgraded. kde/kio-extras-22.08.1-x86_64-2.txz: Rebuilt. [PATCH] smb/kio_smb_browse: Check error code `EINVAL` to prompt the password dialog. Thanks to marav. l/harfbuzz-5.2.0-x86_64-1.txz: Upgraded. l/kdsoap-2.1.1-x86_64-1.txz: Upgraded. l/mozilla-nss-3.83-x86_64-1.txz: Upgraded. l/pango-1.50.10-x86_64-1.txz: Upgraded. l/popt-1.19-x86_64-1.txz: Upgraded. n/libksba-1.6.1-x86_64-1.txz: Upgraded. x/ibus-libpinyin-1.13.1-x86_64-1.txz: Upgraded. x/libgee-0.20.6-x86_64-1.txz: Upgraded. xfce/xfce4-pulseaudio-plugin-0.4.5-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source')
-rw-r--r--source/kde/kde/build/kio-extras2
-rw-r--r--source/kde/kde/patch/kio-extras.patch1
-rw-r--r--source/kde/kde/patch/kio-extras/eea1ecae3624c90b63a0c1378313fe8d26b00db1.patch35
-rwxr-xr-xsource/l/mozilla-nss/mozilla-nss.SlackBuild4
-rwxr-xr-xsource/l/popt/popt.SlackBuild2
-rwxr-xr-xsource/n/libksba/libksba.SlackBuild6
6 files changed, 43 insertions, 7 deletions
diff --git a/source/kde/kde/build/kio-extras b/source/kde/kde/build/kio-extras
index d00491fd7..0cfbf0888 100644
--- a/source/kde/kde/build/kio-extras
+++ b/source/kde/kde/build/kio-extras
@@ -1 +1 @@
-1
+2
diff --git a/source/kde/kde/patch/kio-extras.patch b/source/kde/kde/patch/kio-extras.patch
new file mode 100644
index 000000000..6850e7142
--- /dev/null
+++ b/source/kde/kde/patch/kio-extras.patch
@@ -0,0 +1 @@
+cat $CWD/patch/kio-extras/eea1ecae3624c90b63a0c1378313fe8d26b00db1.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/kde/patch/kio-extras/eea1ecae3624c90b63a0c1378313fe8d26b00db1.patch b/source/kde/kde/patch/kio-extras/eea1ecae3624c90b63a0c1378313fe8d26b00db1.patch
new file mode 100644
index 000000000..8173094fe
--- /dev/null
+++ b/source/kde/kde/patch/kio-extras/eea1ecae3624c90b63a0c1378313fe8d26b00db1.patch
@@ -0,0 +1,35 @@
+From eea1ecae3624c90b63a0c1378313fe8d26b00db1 Mon Sep 17 00:00:00 2001
+From: Anthony Hung <anthonyhungck@gmail.com>
+Date: Wed, 22 Jun 2022 17:37:51 +0800
+Subject: [PATCH] smb/kio_smb_browse: Check error code `EINVAL` to prompt the
+ password dialog
+
+With `samba-libs` >= 4.16, when user connect to the windows file sharing with incorrect user credential, the error code is `EINVAL`.
+
+The user should get the password dialog to enter username and password if the error code is `EINVAL`.
+
+Reference URL:
+https://bugzilla.samba.org/show_bug.cgi?id=14983
+https://gitlab.gnome.org/GNOME/gvfs/-/issues/611
+
+BUG: 453090
+---
+ smb/kio_smb_browse.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/smb/kio_smb_browse.cpp b/smb/kio_smb_browse.cpp
+index 3bc25d83e..a773befa9 100644
+--- a/smb/kio_smb_browse.cpp
++++ b/smb/kio_smb_browse.cpp
+@@ -452,7 +452,7 @@ WorkerResult SMBWorker::listDir(const QUrl &kurl)
+ if (m_current_url.getType() != SMBURLTYPE_ENTIRE_NETWORK && smbc->error() != 0) {
+ // not smb:// and had an error -> handle it
+ const int err = smbc->error();
+- if (err == EPERM || err == EACCES || workaroundEEXIST(err)) {
++ if (err == EPERM || err == EACCES || err == EINVAL || workaroundEEXIST(err)) {
+ qCDebug(KIO_SMB_LOG) << "trying checkPassword";
+ const int passwordError = checkPassword(m_current_url);
+ if (passwordError == KJob::NoError) {
+--
+GitLab
+
diff --git a/source/l/mozilla-nss/mozilla-nss.SlackBuild b/source/l/mozilla-nss/mozilla-nss.SlackBuild
index 977b9bdae..6dd84cee1 100755
--- a/source/l/mozilla-nss/mozilla-nss.SlackBuild
+++ b/source/l/mozilla-nss/mozilla-nss.SlackBuild
@@ -26,8 +26,8 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=mozilla-nss
SRCNAM=nss
-VERSION=${VERSION:-3.82}
-NSPR=${NSPR:-4.34}
+VERSION=${VERSION:-3.83}
+NSPR=${NSPR:-4.34.1}
BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
diff --git a/source/l/popt/popt.SlackBuild b/source/l/popt/popt.SlackBuild
index 9aa118517..d65c0e27d 100755
--- a/source/l/popt/popt.SlackBuild
+++ b/source/l/popt/popt.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=popt
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
diff --git a/source/n/libksba/libksba.SlackBuild b/source/n/libksba/libksba.SlackBuild
index 6d00e1578..5bcf04cbd 100755
--- a/source/n/libksba/libksba.SlackBuild
+++ b/source/n/libksba/libksba.SlackBuild
@@ -1,7 +1,7 @@
#!/bin/bash
# Copyright 2006,2009, 2014 Robby Workman, Northport, AL, USA
-# Copyright 2007, 2008, 2009, 2010, 2018 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2007, 2008, 2009, 2010, 2018, 2022 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=libksba
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
@@ -68,7 +68,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG
cd $TMP
rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
cd $PKGNAM-$VERSION || exit 1
chown -R root:root .
find . \