From 98a2af52ab6e58ce7291726d2b5a040e81eff242343f5b302e3d509edec97e79 Mon Sep 17 00:00:00 2001 From: Hillwood Yang Date: Sun, 16 Jun 2024 09:11:57 +0000 Subject: [PATCH 1/3] Accepting request 1181099 from home:hillwood:branches:server:proxy - Update version to 1.20.0 * Making HTTP requests with local-http's HttpClient implementation, mainly for supporting outbound_* socket configurations. * Support SIP008 Online Configuration. Pull servers from remote servers automatically. (Experimental) * Add basic, full, full-extra features makes building command line arguments shorter * Binaries support --plugin-mode command line argument * local-tun is enabled by default for Windows targets in CI builds * Fix bugs - Drop fix-boo-1223239.patch, merged by upstream OBS-URL: https://build.opensuse.org/request/show/1181099 OBS-URL: https://build.opensuse.org/package/show/server:proxy/shadowsocks-rust?expand=0&rev=25 --- shadowsocks-rust-1.20.0.tar.gz | 3 +++ shadowsocks-rust.changes | 15 +++++++++++++++ shadowsocks-rust.spec | 5 +---- vendor.tar.gz | 4 ++-- 4 files changed, 21 insertions(+), 6 deletions(-) create mode 100644 shadowsocks-rust-1.20.0.tar.gz diff --git a/shadowsocks-rust-1.20.0.tar.gz b/shadowsocks-rust-1.20.0.tar.gz new file mode 100644 index 0000000..f0dd99b --- /dev/null +++ b/shadowsocks-rust-1.20.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c818124252528886dd2a26c0f4730a34cdeb5764c3812cae0d98e9fc9c1d8ce9 +size 451311 diff --git a/shadowsocks-rust.changes b/shadowsocks-rust.changes index 815d96f..ef5c6d5 100644 --- a/shadowsocks-rust.changes +++ b/shadowsocks-rust.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Sun Jun 16 09:07:43 UTC 2024 - Hillwood Yang + +- Update version to 1.20.0 + * Making HTTP requests with local-http's HttpClient implementation, mainly + for supporting outbound_* socket configurations. + * Support SIP008 Online Configuration. Pull servers from remote servers + automatically. (Experimental) + * Add basic, full, full-extra features makes building command line arguments + shorter + * Binaries support --plugin-mode command line argument + * local-tun is enabled by default for Windows targets in CI builds + * Fix bugs +- Drop fix-boo-1223239.patch, merged by upstream + ------------------------------------------------------------------- Mon Apr 22 14:26:29 UTC 2024 - Hillwood Yang diff --git a/shadowsocks-rust.spec b/shadowsocks-rust.spec index 83ff7a6..080d068 100644 --- a/shadowsocks-rust.spec +++ b/shadowsocks-rust.spec @@ -17,16 +17,13 @@ Name: shadowsocks-rust -Version: 1.18.3 +Version: 1.20.0 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 diff --git a/vendor.tar.gz b/vendor.tar.gz index c1e8076..1935e9a 100644 --- a/vendor.tar.gz +++ b/vendor.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9fcb5166eb269d62b6c74208bf8e40386ae0cce8f221f8f32190fb42600c897b -size 99269719 +oid sha256:2f9ea72699b8e813c755be6067826151782aed5dcf9d9b27fdc66f6c1db594b0 +size 93151494 From 90a38790d3b34c611639e2331527dec3974d1d557147050f8341b25459f0bc97 Mon Sep 17 00:00:00 2001 From: Hillwood Yang Date: Sun, 16 Jun 2024 12:08:14 +0000 Subject: [PATCH 2/3] Accepting request 1181164 from home:hillwood:branches:server:proxy OBS-URL: https://build.opensuse.org/request/show/1181164 OBS-URL: https://build.opensuse.org/package/show/server:proxy/shadowsocks-rust?expand=0&rev=26 --- _constraints | 1 + fix-boo-1223239.patch | 232 --------------------------------- shadowsocks-rust-1.18.3.tar.gz | 3 - 3 files changed, 1 insertion(+), 235 deletions(-) delete mode 100644 fix-boo-1223239.patch delete mode 100644 shadowsocks-rust-1.18.3.tar.gz diff --git a/_constraints b/_constraints index 835fdea..17e924e 100644 --- a/_constraints +++ b/_constraints @@ -3,6 +3,7 @@ x86_64 + s390x diff --git a/fix-boo-1223239.patch b/fix-boo-1223239.patch deleted file mode 100644 index 2c5faa2..0000000 --- a/fix-boo-1223239.patch +++ /dev/null @@ -1,232 +0,0 @@ -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":{}} -\ 文件末尾没有换行符 diff --git a/shadowsocks-rust-1.18.3.tar.gz b/shadowsocks-rust-1.18.3.tar.gz deleted file mode 100644 index e4f9534..0000000 --- a/shadowsocks-rust-1.18.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0eb817d81e6827e65593c67d4eef6a1136ca84a1c33cf4c97b3a84e98e5a7f60 -size 444662 From 7a2e13b66d1195e6e22e2493decb5fa264c4cc409aeb4a1e2e9240d9494d9882 Mon Sep 17 00:00:00 2001 From: Hillwood Yang Date: Sun, 16 Jun 2024 12:43:41 +0000 Subject: [PATCH 3/3] Accepting request 1181166 from home:hillwood:branches:server:proxy OBS-URL: https://build.opensuse.org/request/show/1181166 OBS-URL: https://build.opensuse.org/package/show/server:proxy/shadowsocks-rust?expand=0&rev=27 --- _constraints | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_constraints b/_constraints index 17e924e..1444f5b 100644 --- a/_constraints +++ b/_constraints @@ -3,7 +3,6 @@ x86_64 - s390x @@ -15,6 +14,7 @@ aarch64 + s390x