Accepting request 1169688 from server:proxy

(forwarded request 1169687 from hillwood)

OBS-URL: https://build.opensuse.org/request/show/1169688
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/shadowsocks-rust?expand=0&rev=7

fix-boo-1223239.patch

@@ -0,0 +1,232 @@
+diff -Nur shadowsocks-rust-1.18.3/Cargo.lock shadowsocks-rust-1.18.3-new/Cargo.lock
+--- shadowsocks-rust-1.18.3/Cargo.lock	2024-04-21 21:53:26.000000000 +0800
++++ shadowsocks-rust-1.18.3-new/Cargo.lock	2024-04-22 21:33:04.838410992 +0800
+@@ -389,12 +389,13 @@
+ 
+ [[package]]
+ name = "cc"
+-version = "1.0.94"
++version = "1.0.95"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "17f6e324229dc011159fcc089755d1e2e216a90d43a7dea6853ca740b84f35e7"
++checksum = "d32a725bc159af97c3e629873bb9f88fb8cf8a4867175f76dc987815ea07c83b"
+ dependencies = [
+  "jobserver",
+  "libc",
++ "once_cell",
+ ]
+ 
+ [[package]]
+@@ -1254,7 +1255,7 @@
+  "once_cell",
+  "quinn",
+  "rand",
+- "rustls 0.21.10",
++ "rustls 0.21.11",
+  "rustls-native-certs 0.6.3",
+  "rustls-pemfile 1.0.4",
+  "serde",
+@@ -1283,7 +1284,7 @@
+  "parking_lot 0.12.1",
+  "rand",
+  "resolv-conf",
+- "rustls 0.21.10",
++ "rustls 0.21.11",
+  "rustls-native-certs 0.6.3",
+  "serde",
+  "smallvec",
+@@ -1427,7 +1428,7 @@
+  "http 1.1.0",
+  "hyper",
+  "hyper-util",
+- "rustls 0.22.3",
++ "rustls 0.22.4",
+  "rustls-pki-types",
+  "tokio",
+  "tokio-rustls 0.25.0",
+@@ -2443,7 +2444,7 @@
+  "quinn-proto",
+  "quinn-udp",
+  "rustc-hash",
+- "rustls 0.21.10",
++ "rustls 0.21.11",
+  "thiserror",
+  "tokio",
+  "tracing",
+@@ -2459,7 +2460,7 @@
+  "rand",
+  "ring 0.16.20",
+  "rustc-hash",
+- "rustls 0.21.10",
++ "rustls 0.21.11",
+  "slab",
+  "thiserror",
+  "tinyvec",
+@@ -2593,9 +2594,9 @@
+ 
+ [[package]]
+ name = "reqwest"
+-version = "0.12.3"
++version = "0.12.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "3e6cc1e89e689536eb5aeede61520e874df5a4707df811cd5da4aa5fbb2aae19"
++checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10"
+ dependencies = [
+  "base64 0.22.0",
+  "bytes",
+@@ -2619,7 +2620,7 @@
+  "once_cell",
+  "percent-encoding",
+  "pin-project-lite",
+- "rustls 0.22.3",
++ "rustls 0.22.4",
+  "rustls-native-certs 0.7.0",
+  "rustls-pemfile 2.1.2",
+  "rustls-pki-types",
+@@ -2754,9 +2755,9 @@
+ 
+ [[package]]
+ name = "rustix"
+-version = "0.38.32"
++version = "0.38.33"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89"
++checksum = "e3cc72858054fcff6d7dea32df2aeaee6a7c24227366d7ea429aada2f26b16ad"
+ dependencies = [
+  "bitflags 2.5.0",
+  "errno",
+@@ -2767,9 +2768,9 @@
+ 
+ [[package]]
+ name = "rustls"
+-version = "0.21.10"
++version = "0.21.11"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba"
++checksum = "7fecbfb7b1444f477b345853b1fce097a2c6fb637b2bfb87e6bc5db0f043fae4"
+ dependencies = [
+  "log",
+  "ring 0.17.8",
+@@ -2779,29 +2780,29 @@
+ 
+ [[package]]
+ name = "rustls"
+-version = "0.22.3"
++version = "0.22.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "99008d7ad0bbbea527ec27bddbc0e432c5b87d8175178cee68d2eec9c4a1813c"
++checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432"
+ dependencies = [
+  "log",
+  "ring 0.17.8",
+  "rustls-pki-types",
+- "rustls-webpki 0.102.2",
++ "rustls-webpki 0.102.3",
+  "subtle",
+  "zeroize",
+ ]
+ 
+ [[package]]
+ name = "rustls"
+-version = "0.23.4"
++version = "0.23.5"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "8c4d6d8ad9f2492485e13453acbb291dd08f64441b6609c491f1c2cd2c6b4fe1"
++checksum = "afabcee0551bd1aa3e18e5adbf2c0544722014b899adb31bd186ec638d3da97e"
+ dependencies = [
+  "aws-lc-rs",
+  "log",
+  "once_cell",
+  "rustls-pki-types",
+- "rustls-webpki 0.102.2",
++ "rustls-webpki 0.102.3",
+  "subtle",
+  "zeroize",
+ ]
+@@ -2868,9 +2869,9 @@
+ 
+ [[package]]
+ name = "rustls-webpki"
+-version = "0.102.2"
++version = "0.102.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610"
++checksum = "f3bce581c0dd41bce533ce695a1437fa16a7ab5ac3ccfa99fe1a620a7885eabf"
+ dependencies = [
+  "aws-lc-rs",
+  "ring 0.17.8",
+@@ -3223,9 +3224,9 @@
+ 
+ [[package]]
+ name = "signal-hook-registry"
+-version = "1.4.1"
++version = "1.4.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
++checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
+ dependencies = [
+  "libc",
+ ]
+@@ -3466,18 +3467,18 @@
+ 
+ [[package]]
+ name = "thiserror"
+-version = "1.0.58"
++version = "1.0.59"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297"
++checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa"
+ dependencies = [
+  "thiserror-impl",
+ ]
+ 
+ [[package]]
+ name = "thiserror-impl"
+-version = "1.0.58"
++version = "1.0.59"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7"
++checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+@@ -3598,7 +3599,7 @@
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
+ dependencies = [
+- "rustls 0.21.10",
++ "rustls 0.21.11",
+  "tokio",
+ ]
+ 
+@@ -3608,7 +3609,7 @@
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f"
+ dependencies = [
+- "rustls 0.22.3",
++ "rustls 0.22.4",
+  "rustls-pki-types",
+  "tokio",
+ ]
+@@ -3619,7 +3620,7 @@
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
+ dependencies = [
+- "rustls 0.23.4",
++ "rustls 0.23.5",
+  "rustls-pki-types",
+  "tokio",
+ ]
+diff -Nur shadowsocks-rust-1.18.3/target/CACHEDIR.TAG shadowsocks-rust-1.18.3-new/target/CACHEDIR.TAG
+--- shadowsocks-rust-1.18.3/target/CACHEDIR.TAG	1970-01-01 08:00:00.000000000 +0800
++++ shadowsocks-rust-1.18.3-new/target/CACHEDIR.TAG	2024-04-22 21:38:51.041528466 +0800
+@@ -0,0 +1,3 @@
++Signature: 8a477f597d28d172789f06886806bc55
++# This file is a cache directory tag created by cargo.
++# For information about cache directory tags see https://bford.info/cachedir/
+diff -Nur shadowsocks-rust-1.18.3/target/.rustc_info.json shadowsocks-rust-1.18.3-new/target/.rustc_info.json
+--- shadowsocks-rust-1.18.3/target/.rustc_info.json	1970-01-01 08:00:00.000000000 +0800
++++ shadowsocks-rust-1.18.3-new/target/.rustc_info.json	2024-04-22 21:40:53.264796378 +0800
+@@ -0,0 +1 @@
++{"rustc_fingerprint":104584649380407769,"outputs":{"4614504638168534921":{"success":true,"status":"","code":0,"stdout":"rustc 1.77.0 (aedd173a2 2024-03-17) (built from a source tarball)\nbinary: rustc\ncommit-hash: aedd173a2c086e558c2b66d3743b344f977621a7\ncommit-date: 2024-03-17\nhost: x86_64-unknown-linux-gnu\nrelease: 1.77.0\nLLVM version: 17.0.6\n","stderr":""},"1185988223601034215":{"success":true,"status":"","code":0,"stdout":"___\nlib___.rlib\nlib___.so\nlib___.so\nlib___.a\nlib___.so\n/usr\noff\npacked\nunpacked\n___\ndebug_assertions\npanic=\"unwind\"\nproc_macro\ntarget_arch=\"x86_64\"\ntarget_endian=\"little\"\ntarget_env=\"gnu\"\ntarget_family=\"unix\"\ntarget_feature=\"fxsr\"\ntarget_feature=\"sse\"\ntarget_feature=\"sse2\"\ntarget_has_atomic=\"16\"\ntarget_has_atomic=\"32\"\ntarget_has_atomic=\"64\"\ntarget_has_atomic=\"8\"\ntarget_has_atomic=\"ptr\"\ntarget_os=\"linux\"\ntarget_pointer_width=\"64\"\ntarget_vendor=\"unknown\"\nunix\n","stderr":""}},"successes":{}}
+\ 文件末尾没有换行符

shadowsocks-rust-1.17.1.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:97a1c8ebf7fd19de94cd6d0dfee398667e1f4e131ec8a37ecb7c3191af7cc75e
-size 311414

shadowsocks-rust-1.18.3.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0eb817d81e6827e65593c67d4eef6a1136ca84a1c33cf4c97b3a84e98e5a7f60
+size 444662

shadowsocks-rust.changes

@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Mon Apr 22 14:26:29 UTC 2024 - Hillwood Yang <hillwood@opensuse.org>
+
+- Update version to 1.18.3
+  * Support outbound_fwmark in server side to split outbound tunnel
+  * Default build for *-windows-* targets includes sswinservice
+  * local-fakedns: Add a basic implementation of Fake-DNS, which will
+    allocate IPs from pool for DNS queries. This experimental feature
+    could be useful when using local-tun, local-redir or other features
+    that could only receive IP destinations, the domain name that is
+    resolved by the Fake-DNS will be translated from IP back to domain
+    name when connecting to the remote
+  * Add launchd_udp_socket_name, launchd_tcp_socket_name to basic config format
+  * local-tun: Support tun_interface_destination configuration key
+  * Default logging framework changed to tracing-subscriber
+  * local: socks local server will support SOCKS5, SOCKS4a, HTTP proxy
+    protocols when local-http, local-socks4 features are enabled
+  * local: Support setting udp_mtu in configuration file to actively reject
+    packet.size > MTU
+  * Fix bugs
+- Add fix-boo-1223239.patch, fix CVE-2024-32650 boo#1223239
+
 -------------------------------------------------------------------
 Wed Dec 13 13:55:57 UTC 2023 - Hillwood Yang <hillwood@opensuse.org>
 

shadowsocks-rust.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package shadowsocks-rust
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,13 +17,16 @@
 
 
 Name:           shadowsocks-rust
-Version:        1.17.1
+Version:        1.18.3
 Release:        0
 Summary:        Rust port of Shadowsocks
 License:        MIT
 Group:          Productivity/Networking/Web/Proxy
 URL:            https://github.com/shadowsocks/shadowsocks-rust
 Source0:        https://github.com/shadowsocks/shadowsocks-rust/archive/v%{version}/%{name}-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM fix-boo-1223239.patch hillwood@opensuse.org - Fix CVE-2024-32650 boo#1223239
+# https://github.com/shadowsocks/shadowsocks-rust/pull/1513
+Patch0:         fix-boo-1223239.patch
 Source1:        vendor.tar.gz
 Source2:        %{name}.json
 Source3:        %{name}-client.service
@@ -45,7 +48,7 @@ shadowsocks is a lightweight secured SOCKS5 proxy for embedded devices and
 low-end boxes.
 
 %prep
-%setup -q -a1 -n %{name}-%{version}
+%autosetup -p1 -a1 -n %{name}-%{version}
 mkdir .cargo
 cat >>.cargo/config.toml <<EOF
 [source.crates-io]

vendor.tar.gz

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:11c5b7ad0fedcf2a81c5580d8f1b1f0bc81cc291c3041b84717948eccd2a17a7
-size 98663166
+oid sha256:9fcb5166eb269d62b6c74208bf8e40386ae0cce8f221f8f32190fb42600c897b
+size 99269719