15 files changed, 89 insertions, 64 deletions
diff --git a/network/MEGAsync/MEGAsync.SlackBuild b/network/MEGAsync/MEGAsync.SlackBuild
index 4d804db29e..bc2acaaf87 100644
--- a/network/MEGAsync/MEGAsync.SlackBuild
+++ b/network/MEGAsync/MEGAsync.SlackBuild
@@ -26,8 +26,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=MEGAsync
-VERSION=${VERSION:-4.5.3.0}
-SDK=${SDK:-3.8.2c}
+VERSION=${VERSION:-4.7.2.0}
+SDK=${SDK:-4.5.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -83,7 +83,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-patch -p1 < $CWD/megasync-4.5.0.0_ffmpeg.patch
+# Apply ffmpeg5 fix patch
+patch -p1 < $CWD/megasync-4.7.1.0_ffmpeg5.patch
 cd src/MEGASync/mega
 patch -p1 < $CWD/megasync-4.5.0.0_pdfium.patch
 
diff --git a/network/MEGAsync/MEGAsync.info b/network/MEGAsync/MEGAsync.info
index db02860be9..210577a829 100644
--- a/network/MEGAsync/MEGAsync.info
+++ b/network/MEGAsync/MEGAsync.info
@@ -1,10 +1,10 @@
 PRGNAM="MEGAsync"
-VERSION="4.5.3.0"
+VERSION="4.7.2.0"
 HOMEPAGE="https://github.com/meganz/MEGAsync/"
-DOWNLOAD="https://github.com/meganz/MEGAsync/archive/v4.5.3.0_Linux/MEGAsync-4.5.3.0_Linux.tar.gz \
-          https://github.com/meganz/sdk/archive/v3.8.2c/sdk-3.8.2c.tar.gz"
-MD5SUM="be0f1e070b6990c19d766990758ef997 \
-        ded79c86d1ddbe2572f0562fa1dc15fc"
+DOWNLOAD="https://github.com/meganz/MEGAsync/archive/v4.7.2.0_Linux/MEGAsync-4.7.2.0_Linux.tar.gz \ 
+          https://github.com/meganz/sdk/archive/v4.5.0/sdk-4.5.0.tar.gz"
+MD5SUM="b1734bf785e279dd0d01d8ff254c7587 \
+        e9f17a8679f3d50d66d76ffc1ce94ac2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="FreeImage libmediainfo"
diff --git a/network/MEGAsync/megasync-4.5.0.0_ffmpeg.patch b/network/MEGAsync/megasync-4.5.0.0_ffmpeg.patch
deleted file mode 100644
index a30d4a1eff..0000000000
--- a/network/MEGAsync/megasync-4.5.0.0_ffmpeg.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur a/src/MEGASync/mega/src/gfx/freeimage.cpp b/src/MEGASync/mega/src/gfx/freeimage.cpp
---- a/src/MEGASync/mega/src/gfx/freeimage.cpp	2021-05-23 02:28:08.694081111 +0100
-+++ b/src/MEGASync/mega/src/gfx/freeimage.cpp	2021-05-23 02:29:56.189964969 +0100
-@@ -188,7 +188,7 @@
- 
-     // Force seeking to key frames
-     formatContext->seek2any = false;
--    videoStream->skip_to_keyframe = true;
-+    //videoStream->skip_to_keyframe = true;
-     if (decoder->capabilities & CAP_TRUNCATED)
-     {
-         codecContext.flags |= CAP_TRUNCATED;
-diff -Naur a/src/MEGASync/mega/src/gfx/qt.cpp b/src/MEGASync/mega/src/gfx/qt.cpp
---- a/src/MEGASync/mega/src/gfx/qt.cpp	2021-05-23 02:28:08.694081111 +0100
-+++ b/src/MEGASync/mega/src/gfx/qt.cpp	2021-05-23 02:29:36.172545153 +0100
-@@ -1209,7 +1209,7 @@
- 
-     // Force seeking to key frames
-     formatContext->seek2any = false;
--    videoStream->skip_to_keyframe = true;
-+    //videoStream->skip_to_keyframe = true;
-     if (decoder->capabilities & CAP_TRUNCATED)
-     {
-         codecContext.flags |= CAP_TRUNCATED;
diff --git a/network/MEGAsync/megasync-4.7.1.0_ffmpeg5.patch b/network/MEGAsync/megasync-4.7.1.0_ffmpeg5.patch
new file mode 100644
index 0000000000..ea5ad2a3e3
--- /dev/null
+++ b/network/MEGAsync/megasync-4.7.1.0_ffmpeg5.patch
@@ -0,0 +1,19 @@
+--- MEGAsync-4.7.1.0_Win/src/MEGASync/mega/src/gfx/freeimage.cpp	2022-09-27 20:24:16.000000000 +0900
++++ MEGAsync-4.7.1.0_Win.New/src/MEGASync/mega/src/gfx/freeimage.cpp	2022-10-12 10:30:22.849460973 +0900
+@@ -313,7 +313,7 @@
+ 
+     // Find decoder for video stream
+     AVCodecID codecId = codecParm->codec_id;
+-    AVCodec* decoder = avcodec_find_decoder(codecId);
++    auto decoder = avcodec_find_decoder(codecId);
+     if (!decoder)
+     {
+         LOG_warn << "Codec not found: " << codecId;
+@@ -330,7 +330,6 @@
+ 
+     // Force seeking to key frames
+     formatContext->seek2any = false;
+-    videoStream->skip_to_keyframe = true;
+     if (decoder->capabilities & CAP_TRUNCATED)
+     {
+         codecContext->flags |= CAP_TRUNCATED;
diff --git a/network/ettercap/curl-8.patch b/network/ettercap/curl-8.patch
new file mode 100644
index 0000000000..52426d3db7
--- /dev/null
+++ b/network/ettercap/curl-8.patch
@@ -0,0 +1,34 @@
+From 40534662043b7d831d1f6c70448afa9d374a9b63 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Thu, 23 Mar 2023 10:23:14 -0700
+Subject: [PATCH] sslstrip: Enhance the libcurl version check to consider
+ version 8+
+
+Lately curl has released version 8 and hence LIBCURL_VERSION_MAJOR is
+reset to 0, current check assumes major version to be 7 at max and hence
+on systems with libcurl 8+ this check breaks and build fails
+
+Fixes
+
+TOPDIR/build/tmp/work/cortexa15t2hf-neon-yoe-linux-gnueabi/ettercap/0.8.3.1-r0/git/plug-ins/sslstrip/sslstrip.c:57:2: error: libcurl 7.26.0 or up is needed
+ ^
+1 error generated.
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ plug-ins/sslstrip/sslstrip.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plug-ins/sslstrip/sslstrip.c b/plug-ins/sslstrip/sslstrip.c
+index 327bf58af..d9b67c8b6 100644
+--- a/plug-ins/sslstrip/sslstrip.c
++++ b/plug-ins/sslstrip/sslstrip.c
+@@ -51,7 +51,7 @@
+ 
+ #include <curl/curl.h>
+ 
+-#if (LIBCURL_VERSION_MAJOR < 7) || (LIBCURL_VERSION_MINOR < 26)
++#if (LIBCURL_VERSION_MAJOR < 7) || (LIBCURL_VERSION_MAJOR == 7 && LIBCURL_VERSION_MINOR < 26)
+ #error libcurl 7.26.0 or up is needed
+ #endif
+ 
diff --git a/network/ettercap/ettercap.SlackBuild b/network/ettercap/ettercap.SlackBuild
index b8b6ec2321..c2aff5dbf0 100644
--- a/network/ettercap/ettercap.SlackBuild
+++ b/network/ettercap/ettercap.SlackBuild
@@ -82,6 +82,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+patch -p1 < $CWD/curl-8.patch
+
 mkdir -p build
 cd build
   cmake \
diff --git a/network/memcached/memcached.SlackBuild b/network/memcached/memcached.SlackBuild
index bc6a680fcf..4817634557 100644
--- a/network/memcached/memcached.SlackBuild
+++ b/network/memcached/memcached.SlackBuild
@@ -92,7 +92,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -Wno-error=array-bounds" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
diff --git a/network/mumble-server/mumble-server.SlackBuild b/network/mumble-server/mumble-server.SlackBuild
index 499b9aa415..4c82e8d1b3 100644
--- a/network/mumble-server/mumble-server.SlackBuild
+++ b/network/mumble-server/mumble-server.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=mumble-server
 SRCNAM=mumble
-VERSION=${VERSION:-1.4.287}
+VERSION=${VERSION:-1.5.517}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -89,10 +89,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
+rm -rf $SRCNAM-$VERSION
 tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-mv $SRCNAM-$VERSION.src $PRGNAM-$VERSION
-cd $PRGNAM-$VERSION
+cd $SRCNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -131,7 +130,7 @@ sed \
   -e "s,;logfile=.*,logfile=/var/log/$PRGNAM/$PRGNAM.log," \
   -e "s,;pidfile=.*,pidfile=/var/run/$PRGNAM/$PRGNAM.pid," \
   -e "s,uname=.*,uname=$MURMUR_USER," \
- $TMP/$PRGNAM-$VERSION/scripts/murmur.ini > $PKG/etc/$PRGNAM.ini.new
+ $TMP/$SRCNAM-$VERSION/auxiliary_files/$PRGNAM.ini > $PKG/etc/$PRGNAM.ini.new
 
 # Slackware style logrotate
 sed \
@@ -159,8 +158,8 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 (
-cd $TMP/$PRGNAM-$VERSION
-cp -a AUTHORS CHANGES CODE_OF_CONDUCT.md COMMIT_GUIDELINES.md LICENSE README.md SECURITY.md $PKG/usr/doc/$PRGNAM-$VERSION
+cd $TMP/$SRCNAM-$VERSION
+cp -a CODE_OF_CONDUCT.md COMMIT_GUIDELINES.md LICENSE README.md SECURITY.md $PKG/usr/doc/$PRGNAM-$VERSION
 )
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/network/mumble-server/mumble-server.info b/network/mumble-server/mumble-server.info
index e00b5956a1..f904930b1d 100644
--- a/network/mumble-server/mumble-server.info
+++ b/network/mumble-server/mumble-server.info
@@ -1,8 +1,8 @@
 PRGNAM="mumble-server"
-VERSION="1.4.287"
+VERSION="1.5.517"
 HOMEPAGE="https://wiki.mumble.info/wiki/Main_Page"
-DOWNLOAD="https://github.com/mumble-voip/mumble/releases/download/v1.4.287/mumble-1.4.287.tar.gz"
-MD5SUM="c9a2eb6413d165da606fb8d4657a1697"
+DOWNLOAD="https://github.com/mumble-voip/mumble/releases/download/v1.5.517/mumble-1.5.517.tar.gz"
+MD5SUM="23ebbda45eeaca3048536cd0629056b9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="protobuf3"
diff --git a/network/mumble/mumble.SlackBuild b/network/mumble/mumble.SlackBuild
index 6797b201cb..a68e72a242 100644
--- a/network/mumble/mumble.SlackBuild
+++ b/network/mumble/mumble.SlackBuild
@@ -27,7 +27,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=mumble
-VERSION=${VERSION:-1.4.287}
+VERSION=${VERSION:-1.5.517}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -112,7 +112,6 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-mv $PRGNAM-$VERSION.src $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -156,7 +155,7 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 (
 cd $TMP/$PRGNAM-$VERSION
-cp -a AUTHORS CHANGES CODE_OF_CONDUCT.md COMMIT_GUIDELINES.md LICENSE README.md SECURITY.md $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CODE_OF_CONDUCT.md COMMIT_GUIDELINES.md LICENSE README.md SECURITY.md $PKG/usr/doc/$PRGNAM-$VERSION
 )
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/network/mumble/mumble.info b/network/mumble/mumble.info
index 553d27e33f..8d8609c6ae 100644
--- a/network/mumble/mumble.info
+++ b/network/mumble/mumble.info
@@ -1,8 +1,8 @@
 PRGNAM="mumble"
-VERSION="1.4.287"
+VERSION="1.5.517"
 HOMEPAGE="https://wiki.mumble.info/wiki/Main_Page"
-DOWNLOAD="https://github.com/mumble-voip/mumble/releases/download/v1.4.287/mumble-1.4.287.tar.gz"
-MD5SUM="c9a2eb6413d165da606fb8d4657a1697"
+DOWNLOAD="https://github.com/mumble-voip/mumble/releases/download/v1.5.517/mumble-1.5.517.tar.gz"
+MD5SUM="23ebbda45eeaca3048536cd0629056b9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="protobuf3 poco"
diff --git a/network/x2goclient/x2goclient.SlackBuild b/network/x2goclient/x2goclient.SlackBuild
index 8fb5f09e1a..5a33c46b1e 100644
--- a/network/x2goclient/x2goclient.SlackBuild
+++ b/network/x2goclient/x2goclient.SlackBuild
@@ -26,7 +26,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=x2goclient
-VERSION=${VERSION:-4.1.2.2}
+VERSION=${VERSION:-20230117_1ca4381}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -71,7 +71,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -80,12 +80,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# The newer libssh doesn't ship this library anymore
-[[ "$(pkg-config --modversion libssh)" > "0.8" ]] && \
-  sed -i "s| -lssh_threads||" x2goclient.pro
-
-sed -i -e '/^QMAKE_BINARY=/s@qmake-qt4@qmake@' Makefile
-sed -i -e '/^LRELEASE_BINARY=/s@lrelease-qt4@lrelease@' Makefile
+export QT_VERSION=5
 
 make
 
diff --git a/network/x2goclient/x2goclient.info b/network/x2goclient/x2goclient.info
index c360e03d0d..fa98c1c0a2 100644
--- a/network/x2goclient/x2goclient.info
+++ b/network/x2goclient/x2goclient.info
@@ -1,8 +1,8 @@
 PRGNAM="x2goclient"
-VERSION="4.1.2.2"
+VERSION="20230117_1ca4381"
 HOMEPAGE="http://www.x2go.org"
-DOWNLOAD="https://code.x2go.org/releases/source/x2goclient/x2goclient-4.1.2.2.tar.gz"
-MD5SUM="1390b794b0a10f0a885dd7cf00f2acef"
+DOWNLOAD="https://ponce.cc/slackware/sources/repo/x2goclient-20230117_1ca4381.tar.xz"
+MD5SUM="31a87c976ed3143f7d638f2faaaff16c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="nx-libs"
diff --git a/network/x2goserver/x2goserver.SlackBuild b/network/x2goserver/x2goserver.SlackBuild
index caa42c4eaa..4dd49ff3ab 100644
--- a/network/x2goserver/x2goserver.SlackBuild
+++ b/network/x2goserver/x2goserver.SlackBuild
@@ -26,7 +26,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=x2goserver
-VERSION=${VERSION:-20201227_08aa5e6}
+VERSION=${VERSION:-20230525_a166907}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
diff --git a/network/x2goserver/x2goserver.info b/network/x2goserver/x2goserver.info
index 7dfbf73d3a..26ab9687c4 100644
--- a/network/x2goserver/x2goserver.info
+++ b/network/x2goserver/x2goserver.info
@@ -1,8 +1,8 @@
 PRGNAM="x2goserver"
-VERSION="20201227_08aa5e6"
+VERSION="20230525_a166907"
 HOMEPAGE="http://www.x2go.org"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/x2goserver-20201227_08aa5e6.tar.xz"
-MD5SUM="46aad829313b85218841e1f818244a06"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/x2goserver-20230525_a166907.tar.xz"
+MD5SUM="fdaa77c477dcd8f1c23bf46c9caf5f11"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="nx-libs perl-Config-Simple perl-File-ReadBackwards perl-DBD-SQLite perl-Capture-Tiny perl-Try-Tiny perl-Unix-Syslog perl-file-basedir perl-Switch"