From: fsLeg <fsleg@t-rg.ws>
Date: Sun, 17 Mar 2024 10:35:42 +0000 (+0300)
Subject: shadowsocks-rust: updated to version 1.18.2. Switched from extra/rust-for-mozilla... 
X-Git-Url: https://git.t-rg.ws/?a=commitdiff_plain;h=d0a3ede6768486ccf7fc34b7a67c685a82a5c882;p=slackbuilds.git

shadowsocks-rust: updated to version 1.18.2. Switched from extra/rust-for-mozilla to rust16 from SBo
---

diff --git a/shadowsocks-rust/README b/shadowsocks-rust/README
index 15f7305..51baed5 100644
--- a/shadowsocks-rust/README
+++ b/shadowsocks-rust/README
@@ -2,8 +2,6 @@ A Rust port of shadowsocks that superceded shadowsocks-libev.
 
 Shadowsocks is a fast tunnel proxy that helps you bypass firewalls.
 
-rust >=1.70 from extra/ is required to build this package.
-
 This SlackBuild downloads nessessary crates to build the binaries,
 so internet connection is required. Then again, if you're going to
 use Shadowsocks, it shouldn't be a problem.
diff --git a/shadowsocks-rust/shadowsocks-rust.SlackBuild b/shadowsocks-rust/shadowsocks-rust.SlackBuild
index 5477434..da554f1 100755
--- a/shadowsocks-rust/shadowsocks-rust.SlackBuild
+++ b/shadowsocks-rust/shadowsocks-rust.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=shadowsocks-rust
-VERSION=${VERSION:-1.17.1}
+VERSION=${VERSION:-1.18.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-fsleg}
 
@@ -43,12 +43,16 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 set -e # Exit on most errors
@@ -73,6 +77,14 @@ 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 {} \;
 
+# Use rust16 instead of system rust
+export PATH="/opt/rust16/bin:$PATH"
+if [ -z "$LD_LIBRARY_PATH" ]; then
+  export LD_LIBRARY_PATH="/opt/rust16/lib$LIBDIRSUFFIX"
+else
+  export LD_LIBRARY_PATH="/opt/rust16/lib$LIBDIRSUFFIX:$LD_LIBRARY_PATH"
+fi
+
 # Compile the binaries; internet access is required
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
diff --git a/shadowsocks-rust/shadowsocks-rust.info b/shadowsocks-rust/shadowsocks-rust.info
index a972cbe..1878bac 100644
--- a/shadowsocks-rust/shadowsocks-rust.info
+++ b/shadowsocks-rust/shadowsocks-rust.info
@@ -1,10 +1,10 @@
 PRGNAM="shadowsocks-rust"
-VERSION="1.17.1"
+VERSION="1.18.2"
 HOMEPAGE="https://github.com/shadowsocks/shadowsocks-rust"
-DOWNLOAD="https://github.com/shadowsocks/shadowsocks-rust/archive/refs/tags/v1.17.1.tar.gz"
-MD5SUM="c7530785e031a5a4da052a049eb108e8"
+DOWNLOAD="https://github.com/shadowsocks/shadowsocks-rust/archive/refs/tags/v1.18.2.tar.gz"
+MD5SUM="dadb97cd3157dcbef9b25beabdd549e2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="rust16"
 MAINTAINER="Vladislav Borisov"
 EMAIL="fsleg@t-rg.ws"