Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package rustdesk-server for openSUSE:Factory
checked in at 2024-03-05 18:51:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rustdesk-server (Old)
and /work/SRC/openSUSE:Factory/.rustdesk-server.new.1770 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rustdesk-server"
Tue Mar 5 18:51:05 2024 rev:2 rq:1155025 version:1.1.10+3
Changes:
--------
--- /work/SRC/openSUSE:Factory/rustdesk-server/rustdesk-server.changes
2024-01-22 20:34:17.697372677 +0100
+++
/work/SRC/openSUSE:Factory/.rustdesk-server.new.1770/rustdesk-server.changes
2024-03-05 18:51:15.858355220 +0100
@@ -1,0 +2,8 @@
+Tue Feb 20 15:53:19 UTC 2024 - Richard Rahl <[email protected]>
+
+- add minimum version 1.70 for rust
+- update to 1.1.10-3
+ * fix trailing issue in private key file
+
+
+-------------------------------------------------------------------
Old:
----
rustdesk-server-1.1.9.tar.gz
New:
----
rustdesk-server-1.1.103.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rustdesk-server.spec ++++++
--- /var/tmp/diff_new_pack.wekP9y/_old 2024-03-05 18:51:19.246478237 +0100
+++ /var/tmp/diff_new_pack.wekP9y/_new 2024-03-05 18:51:19.246478237 +0100
@@ -17,23 +17,24 @@
Name: rustdesk-server
-Version: 1.1.9
+Version: 1.1.10+3
Release: 0
Summary: RustDesk Server Program
License: AGPL-3.0-only
URL: https://github.com/rustdesk/rustdesk-server
-Source0: %{name}-%{version}.tar.gz
+Source0: %{name}-1.1.103.tar.gz
Source1: vendor.tar.zst
Source2: rustdesk-server.sysusers
Source3: hbbr.service
Source4: hbbs.service
BuildRequires: cargo-packaging
-BuildRequires: sysuser-tools
BuildRequires: pkgconfig
-Requires: system-user-rustdesk == %{version}
+BuildRequires: rust >= 1.70
+BuildRequires: sysuser-tools
Requires: %{name}-hbbr == %{version}
Requires: %{name}-hbbs == %{version}
Requires: %{name}-utils == %{version}
+Requires: system-user-rustdesk == %{version}
%package -n system-user-rustdesk
Summary: System user for rustdesk-server
@@ -67,7 +68,7 @@
Self-host your own RustDesk server.
%prep
-%autosetup -a1
+%autosetup -a1 -n %{name}-1.1.103
%build
%sysusers_generate_pre %{SOURCE2} system-user-rustdesk
system-user-rustdesk.conf
++++++ _service ++++++
--- /var/tmp/diff_new_pack.wekP9y/_old 2024-03-05 18:51:19.270479109 +0100
+++ /var/tmp/diff_new_pack.wekP9y/_new 2024-03-05 18:51:19.274479253 +0100
@@ -3,7 +3,7 @@
<service name="obs_scm" mode="manual">
<param name="url">https://github.com/rustdesk/rustdesk-server.git</param>
<param name="scm">git</param>
- <param name="revision">refs/tags/1.1.9</param>
+ <param name="revision">refs/tags/1.1.10-3</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="changesgenerate">disable</param>
</service>
@@ -15,6 +15,7 @@
</service>
<service name="cargo_vendor" mode="manual">
<param name="srcdir">rustdesk-server</param>
+ <param name="update">true</param>
</service>
</services>
++++++ rustdesk-server-1.1.9.tar.gz -> rustdesk-server-1.1.103.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rustdesk-server-1.1.9/Cargo.lock
new/rustdesk-server-1.1.103/Cargo.lock
--- old/rustdesk-server-1.1.9/Cargo.lock 2023-12-05 10:22:40.000000000
+0100
+++ new/rustdesk-server-1.1.103/Cargo.lock 2024-01-31 04:30:42.000000000
+0100
@@ -779,7 +779,7 @@
[[package]]
name = "hbbs"
-version = "1.1.9"
+version = "1.1.10-3"
dependencies = [
"async-speed-limit",
"async-trait",
@@ -1111,9 +1111,9 @@
[[package]]
name = "mac_address"
-version = "1.1.3"
+version = "1.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "df1d1bc1084549d60725ccc53a2bfa07f67fe4689fda07b05a36531f2988104a"
+checksum = "4863ee94f19ed315bf3bc00299338d857d4b5bc856af375cc97d237382ad3856"
dependencies = [
"nix",
"winapi",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rustdesk-server-1.1.9/Cargo.toml
new/rustdesk-server-1.1.103/Cargo.toml
--- old/rustdesk-server-1.1.9/Cargo.toml 2023-12-05 10:22:40.000000000
+0100
+++ new/rustdesk-server-1.1.103/Cargo.toml 2024-01-31 04:30:42.000000000
+0100
@@ -1,6 +1,6 @@
[package]
name = "hbbs"
-version = "1.1.9"
+version = "1.1.10-3"
authors = ["rustdesk <[email protected]>"]
edition = "2021"
build = "build.rs"
@@ -26,7 +26,7 @@
rust-ini = "0.18"
minreq = { version = "2.4", features = ["punycode"] }
machine-uid = "0.2"
-mac_address = "1.1"
+mac_address = "1.1.5"
whoami = "1.2"
base64 = "0.13"
axum = { version = "0.5", features = ["headers"] }
Binary files old/rustdesk-server-1.1.9/db_v2.sqlite3 and
new/rustdesk-server-1.1.103/db_v2.sqlite3 differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rustdesk-server-1.1.9/debian/changelog
new/rustdesk-server-1.1.103/debian/changelog
--- old/rustdesk-server-1.1.9/debian/changelog 2023-12-05 10:22:40.000000000
+0100
+++ new/rustdesk-server-1.1.103/debian/changelog 2024-01-31
04:30:42.000000000 +0100
@@ -1,3 +1,11 @@
+rustdesk-server (1.1.10-3) UNRELEASED; urgency=medium
+ * fix on -2
+
+rustdesk-server (1.1.10-2) UNRELEASED; urgency=medium
+
+ * fix hangup signal exit when run with nohup
+ * some minors
+
rustdesk-server (1.1.9) UNRELEASED; urgency=medium
* remove unsafe
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rustdesk-server-1.1.9/docker-classic/Dockerfile
new/rustdesk-server-1.1.103/docker-classic/Dockerfile
--- old/rustdesk-server-1.1.9/docker-classic/Dockerfile 2023-12-05
10:22:40.000000000 +0100
+++ new/rustdesk-server-1.1.103/docker-classic/Dockerfile 2024-01-31
04:30:42.000000000 +0100
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM scratch
COPY hbbs /usr/bin/hbbs
COPY hbbr /usr/bin/hbbr
WORKDIR /root
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rustdesk-server-1.1.9/src/common.rs
new/rustdesk-server-1.1.103/src/common.rs
--- old/rustdesk-server-1.1.9/src/common.rs 2023-12-05 10:22:40.000000000
+0100
+++ new/rustdesk-server-1.1.103/src/common.rs 2024-01-31 04:30:42.000000000
+0100
@@ -78,7 +78,7 @@
}
}
for (k, v) in matches.args {
- if let Some(v) = v.vals.get(0) {
+ if let Some(v) = v.vals.first() {
std::env::set_var(arg_name(k), v.to_string_lossy().to_string());
}
}
@@ -113,13 +113,18 @@
if let Ok(mut file) = std::fs::File::open(sk_file) {
let mut contents = String::new();
if file.read_to_string(&mut contents).is_ok() {
- let sk = base64::decode(&contents).unwrap_or_default();
+ let contents = contents.trim();
+ let sk = base64::decode(contents).unwrap_or_default();
if sk.len() == sign::SECRETKEYBYTES {
let mut tmp = [0u8; sign::SECRETKEYBYTES];
tmp[..].copy_from_slice(&sk);
let pk = base64::encode(&tmp[sign::SECRETKEYBYTES / 2..]);
log::info!("Private key comes from {}", sk_file);
return (pk, Some(sign::SecretKey(tmp)));
+ } else {
+ // don't use log here, since it is async
+ println!("Fatal error: malformed private key in {sk_file}.");
+ std::process::exit(1);
}
}
} else {
@@ -156,8 +161,6 @@
use hbb_common::tokio::signal::unix::{signal, SignalKind};
tokio::spawn(async {
- let mut s = signal(SignalKind::hangup())?;
- let hangup = s.recv();
let mut s = signal(SignalKind::terminate())?;
let terminate = s.recv();
let mut s = signal(SignalKind::interrupt())?;
@@ -166,9 +169,6 @@
let quit = s.recv();
tokio::select! {
- _ = hangup => {
- log::info!("signal hangup");
- }
_ = terminate => {
log::info!("signal terminate");
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rustdesk-server-1.1.9/ui/setup.nsi
new/rustdesk-server-1.1.103/ui/setup.nsi
--- old/rustdesk-server-1.1.9/ui/setup.nsi 2023-12-05 10:22:40.000000000
+0100
+++ new/rustdesk-server-1.1.103/ui/setup.nsi 2024-01-31 04:30:42.000000000
+0100
@@ -15,7 +15,7 @@
!define PRODUCT_NAME "rustdesk_server"
!define PRODUCT_DESCRIPTION "Installer for ${PRODUCT_NAME}"
!define COPYRIGHT "Copyright © 2021"
-!define VERSION "1.1.8"
+!define VERSION "1.1.10"
VIProductVersion "${VERSION}.0"
VIAddVersionKey "ProductName" "${PRODUCT_NAME}"
++++++ vendor.tar.zst ++++++
Binary files /var/tmp/diff_new_pack.wekP9y/_old and
/var/tmp/diff_new_pack.wekP9y/_new differ
