Compare commits

...

No commits in common. "devel" and "factory" have entirely different histories.

6 changed files with 3 additions and 89 deletions

View File

@ -1,48 +0,0 @@
From 853a860dd9095b7ed2f95d5aac62f8f1dcc0d229 Mon Sep 17 00:00:00 2001
From: "Bernhard M. Wiedemann" <bwiedemann@suse.de>
Date: Wed, 28 Jun 2023 16:48:35 +0200
Subject: [PATCH] Allow to override build date with SOURCE_DATE_EPOCH
in order to make builds reproducible.
See https://reproducible-builds.org/ for why this is good
and https://reproducible-builds.org/specs/source-date-epoch/
for the definition of this variable.
This patch was done while working on reproducible builds for openSUSE.
Index: shadowsocks-rust-1.20.4/Cargo.toml
===================================================================
--- shadowsocks-rust-1.20.4.orig/Cargo.toml
+++ shadowsocks-rust-1.20.4/Cargo.toml
@@ -281,3 +281,6 @@ byteorder = "1.5"
env_logger = "0.11"
byte_string = "1.0"
tokio = { version = "1", features = ["net", "time", "macros", "io-util"] }
+
+[patch.crates-io]
+build-time = { path="vendor/build-time" }
diff --git a/build-time/src/lib.rs b/build-time/src/lib.rs
index c3484307..7ae9e03e 100644
--- a/vendor/build-time/src/lib.rs
+++ b/vendor/build-time/src/lib.rs
@@ -28,14 +28,18 @@ let local_build_time = build_time_local!("%Y-%m-%dT%H:%M:%S%.f%:z");
```
*/
-use chrono::{DateTime, Local, Utc};
+use chrono::{DateTime, Local, TimeZone, Utc};
use once_cell::sync::Lazy;
use proc_macro::TokenStream;
use proc_macro2::Span;
use quote::quote;
+use std::env;
use syn::{parse_macro_input, LitStr};
-static BUILD_TIME: Lazy<DateTime<Utc>> = Lazy::new(Utc::now);
+static BUILD_TIME: Lazy<DateTime<Utc>> = Lazy::new(|| match env::var("SOURCE_DATE_EPOCH") {
+ Ok(val) => { Utc.timestamp_opt(val.parse::<i64>().unwrap(), 0).unwrap() }
+ Err(_) => Utc::now(),
+ });
/// Build time in UTC.
///

View File

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

View File

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

View File

@ -1,33 +1,3 @@
-------------------------------------------------------------------
Fri Nov 22 13:00:48 UTC 2024 - Hillwood Yang <hillwood@opensuse.org>
- Update version to 1.21.2
* supports generic I/O socket type
* Support OpenBSD Packet-Filter (pf)
* Fix bugs
-------------------------------------------------------------------
Wed Nov 13 06:18:54 UTC 2024 - Bernhard Wiedemann <bwiedemann@suse.com>
- Add reproducible.patch to override build date (boo#1047218)
-------------------------------------------------------------------
Thu Sep 12 13:19:28 UTC 2024 - Hillwood Yang <hillwood@opensuse.org>
- Update version to 1.20.4
* Updated rustls to v0.23 with ring backend
* local-redir, server: Better approach to check current platform IP stack
capabilities like Go (IPv4, IPv6, IPv4-mapped-IPv6 supports)
* Explicitly enable dual-stack if listen addresses (server, local_address)
are IPv4-mapped-IPv6, by setting IPV6_V6ONLY=0
* PingBalancer check Firefox portal allowing 200 HTTP status
* Ping Balancer scores replaced standard deviation with median absolute
deviation, which should help focusing less on outlying observations in
latency samples
* local: Allow configuring SOCKS5 UDP_ASSOCIATE address
* ProxyServerStream::from_stream made public
* Fix bugs
-------------------------------------------------------------------
Sun Jun 16 09:07:43 UTC 2024 - Hillwood Yang <hillwood@opensuse.org>

View File

@ -17,7 +17,7 @@
Name: shadowsocks-rust
Version: 1.21.2
Version: 1.20.0
Release: 0
Summary: Rust port of Shadowsocks
License: MIT
@ -29,8 +29,6 @@ Source2: %{name}.json
Source3: %{name}-client.service
Source4: %{name}-server.service
Source5: %{name}-manager.service
# PATCH-FIX-UPSTREAM https://github.com/AlephAlpha/build-time/pull/5
Patch0: reproducible.patch
BuildRequires: cargo
BuildRequires: cargo-packaging
BuildRequires: systemd-rpm-macros

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4d00851a12afd2655c1a75f0947136c2bf5d2c370c1f4d462fb88f15cdf412d5
size 84245103
oid sha256:2f9ea72699b8e813c755be6067826151782aed5dcf9d9b27fdc66f6c1db594b0
size 93151494