Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

package updates #1587

Merged
merged 17 commits into from
Feb 23, 2025
15 changes: 15 additions & 0 deletions build/atuin/patches/libc.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
diff -wpruN --no-dereference '--exclude=*.orig' a~/Cargo.lock a/Cargo.lock
--- a~/Cargo.lock 1970-01-01 00:00:00
+++ a/Cargo.lock 1970-01-01 00:00:00
@@ -2128,9 +2128,9 @@ dependencies = [

[[package]]
name = "libc"
-version = "0.2.155"
+version = "0.2.169"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"

[[package]]
name = "libloading"
1 change: 1 addition & 0 deletions build/atuin/patches/series
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
libc.patch
15 changes: 15 additions & 0 deletions build/bat/patches/libc.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
diff -wpruN --no-dereference '--exclude=*.orig' a~/Cargo.lock a/Cargo.lock
--- a~/Cargo.lock 1970-01-01 00:00:00
+++ a/Cargo.lock 1970-01-01 00:00:00
@@ -723,9 +723,9 @@ checksum = "e2abad23fbc42b3700f2f279844d

[[package]]
name = "libc"
-version = "0.2.161"
+version = "0.2.169"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"
+checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"

[[package]]
name = "libgit2-sys"
1 change: 1 addition & 0 deletions build/bat/patches/series
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
do-not-strip-symbol-table.patch
libc.patch
2 changes: 1 addition & 1 deletion build/cargo-c/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
. ../../lib/build.sh

PROG=cargo-c
VER=0.10.8
VER=0.10.11
PKG=ooce/developer/cargo-c
SUMMARY="build and install C-ABI compatible dynamic and static libraries"
DESC="produces and installs a correct pkg-config file, a static library and "
Expand Down
2 changes: 1 addition & 1 deletion build/dav1d/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
. ../../lib/build.sh

PROG=dav1d
VER=1.5.0
VER=1.5.1
PKG=ooce/multimedia/dav1d
SUMMARY="AV1 decoder"
DESC="AV1 cross-platform decoder, open-source, and focused on speed, "
Expand Down
15 changes: 15 additions & 0 deletions build/fd/patches/libc.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
diff -wpruN --no-dereference '--exclude=*.orig' a~/Cargo.lock a/Cargo.lock
--- a~/Cargo.lock 1970-01-01 00:00:00
+++ a/Cargo.lock 1970-01-01 00:00:00
@@ -469,9 +469,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9

[[package]]
name = "libc"
-version = "0.2.158"
+version = "0.2.169"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
+checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"

[[package]]
name = "libredox"
1 change: 1 addition & 0 deletions build/fd/patches/series
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
do-not-strip-symbol-table.patch
libc.patch
15 changes: 15 additions & 0 deletions build/git-absorb/patches/libc.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
diff -wpruN --no-dereference '--exclude=*.orig' a~/Cargo.lock a/Cargo.lock
--- a~/Cargo.lock 1970-01-01 00:00:00
+++ a/Cargo.lock 1970-01-01 00:00:00
@@ -294,9 +294,9 @@ dependencies = [

[[package]]
name = "libc"
-version = "0.2.155"
+version = "0.2.169"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"

[[package]]
name = "libgit2-sys"
1 change: 1 addition & 0 deletions build/git-absorb/patches/series
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
libc.patch
12 changes: 8 additions & 4 deletions build/helix/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
. ../../lib/build.sh

PROG=helix
VER=25.01
VER=25.01.1
PKG=ooce/editor/helix
SUMMARY="A post-modern modal text editor."
DESC="A kakoune / neovim inspired editor, written in Rust."
Expand All @@ -37,8 +37,13 @@ XFORM_ARGS="
SKIP_SSP_CHECK=1
NO_SONAME_EXPECTED=1 # files in runtime dir

install_helix_runtime() {
pushd $DESTDIR/$PREFIX >/dev/null || logerr "chdir $DESTDIR/$PREFIX"
post_install() {
typeset arch=$1

destdir=$DESTDIR
cross_arch $arch && destdir+=.$arch

pushd $destdir/$PREFIX >/dev/null || logerr "chdir $destdir/$PREFIX"

logcmd $MKDIR -p "share/runtime" || logerr "Failed to create runtime dir"

Expand All @@ -60,7 +65,6 @@ download_source -nodir $PROG $PROG $VER-source
patch_source
build_rust
install_rust hx
install_helix_runtime
strip_install
make_package
clean_up
Expand Down
15 changes: 15 additions & 0 deletions build/hyperfine/patches/libc.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
diff -wpruN --no-dereference '--exclude=*.orig' a~/Cargo.lock a/Cargo.lock
--- a~/Cargo.lock 1970-01-01 00:00:00
+++ a/Cargo.lock 1970-01-01 00:00:00
@@ -489,9 +489,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9

[[package]]
name = "libc"
-version = "0.2.162"
+version = "0.2.169"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18d287de67fe55fd7e1581fe933d965a5a9477b38e949cfa9f8574ef01506398"
+checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"

[[package]]
name = "linux-raw-sys"
1 change: 1 addition & 0 deletions build/hyperfine/patches/series
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
libc.patch
2 changes: 1 addition & 1 deletion build/isc-bind9/build-918.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
. ../../lib/build.sh

PROG=bind
VER=9.18.33
VER=9.18.34
PKG=ooce/network/bind-918
SUMMARY="ISC BIND DNS Server & Tools"
DESC="Server & Client Utilities for DNS"
Expand Down
2 changes: 1 addition & 1 deletion build/isc-bind9/build-920.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
. ../../lib/build.sh

PROG=bind
VER=9.20.5
VER=9.20.6
PKG=ooce/network/bind-920
SUMMARY="ISC BIND DNS Server & Tools"
DESC="Server & Client Utilities for DNS"
Expand Down
2 changes: 1 addition & 1 deletion build/mattermost/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
. ../../lib/build.sh

PROG=mattermost
VER=9.11.8
VER=9.11.9
# check for the current morph version/commit hash and create a patched branch in
# https://github.com/omniosorg/morph; then point to that branch
MORPHBRANCH=il_1.1.0
Expand Down
4 changes: 2 additions & 2 deletions build/php/build-83.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

PROG=php
PKG=ooce/application/php-83
VER=8.3.16
VER=8.3.17
SUMMARY="PHP 8.3"
DESC="A popular general-purpose scripting language"

Expand Down Expand Up @@ -158,7 +158,7 @@ CONFIGURE_OPTS[amd64]="

CPPFLAGS+=" -I/usr/include/gmp"
CPPFLAGS+=" -I$OPREFIX/libzip/include"
LDFLAGS+=" -static-libgcc -L$OPREFIX/lib/amd64 -R$OPREFIX/lib/amd64"
LDFLAGS+=" -static-libgcc -L$OPREFIX/lib/amd64"

post_configure() {
for tok in \
Expand Down
2 changes: 1 addition & 1 deletion build/php/build-84.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

PROG=php
PKG=ooce/application/php-84
VER=8.4.3
VER=8.4.4
SUMMARY="PHP 8.4"
DESC="A popular general-purpose scripting language"

Expand Down
4 changes: 2 additions & 2 deletions build/postfix/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
# }}}

# Copyright 2011-2013 OmniTI Computer Consulting, Inc. All rights reserved.
# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.
# Copyright 2025 OmniOS Community Edition (OmniOSce) Association.

. ../../lib/build.sh

PROG=postfix
VER=3.9.1
VER=3.10.0
PKG=ooce/network/smtp/postfix
SUMMARY="Postfix MTA"
DESC="Wietse Venema's mail server alternative to sendmail"
Expand Down
15 changes: 15 additions & 0 deletions build/rav1e/patches/libc.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
diff -wpruN --no-dereference '--exclude=*.orig' a~/Cargo.lock a/Cargo.lock
--- a~/Cargo.lock 1970-01-01 00:00:00
+++ a/Cargo.lock 1970-01-01 00:00:00
@@ -817,9 +817,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0e

[[package]]
name = "libc"
-version = "0.2.152"
+version = "0.2.169"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7"
+checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"

[[package]]
name = "libdav1d-sys"
1 change: 1 addition & 0 deletions build/rav1e/patches/series
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
libc.patch
4 changes: 2 additions & 2 deletions build/rust/build-arch-aarch64.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
# http://www.illumos.org/license/CDDL.
# }}}

# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.
# Copyright 2025 OmniOS Community Edition (OmniOSce) Association.

. ../../lib/build.sh

PROG=rust
PKG=ooce/developer/rust
VER=1.84.0
VER=1.85.0
SUMMARY="Rust systems programming language"
DESC="Rust is a systems programming language that runs blazingly fast, "
DESC+="prevents segfaults, and guarantees thread safety."
Expand Down
4 changes: 2 additions & 2 deletions build/rust/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
# http://www.illumos.org/license/CDDL.
# }}}

# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.
# Copyright 2025 OmniOS Community Edition (OmniOSce) Association.

. ../../lib/arch.sh
. ../../lib/build.sh

PROG=rust
PKG=ooce/developer/rust
VER=1.84.0
VER=1.85.0
SUMMARY="Rust systems programming language"
DESC="Rust is a systems programming language that runs blazingly fast, "
DESC+="prevents segfaults, and guarantees thread safety."
Expand Down
8 changes: 5 additions & 3 deletions build/rustdesk-server/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
# http://www.illumos.org/license/CDDL.
# }}}

# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.
# Copyright 2025 OmniOS Community Edition (OmniOSce) Association.

. ../../lib/build.sh

PROG=rustdesk-server
VER=1.1.12
VER=1.1.14
PKG=ooce/application/rustdesk-server
SUMMARY="$PROG - remote control"
DESC="Full-featured open source remote control alternative for self-hosting "
Expand Down Expand Up @@ -51,7 +51,9 @@ pre_build() {
}

init
download_source $PROG $VER
clone_github_source $PROG "$GITHUB/rustdesk/$PROG" $VER
append_builddir $PROG
run_inbuild $GIT submodule update --init --recursive
patch_source
prep_build
SODIUM_USE_PKG_CONFIG=1 build_rust
Expand Down
48 changes: 48 additions & 0 deletions build/rustdesk-server/patches/0001-add-illumos-support.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
From 073bae1e73f31f0f5a6acb6903cd88136dd1f41c Mon Sep 17 00:00:00 2001
From: Dominik Hassler <hadfl@omnios.org>
Date: Sat, 22 Feb 2025 19:16:00 +0000
Subject: [PATCH] add illumos support

diff -wpruN --no-dereference '--exclude=*.orig' a~/libs/hbb_common/src/tcp.rs a/libs/hbb_common/src/tcp.rs
--- a~/libs/hbb_common/src/tcp.rs 1970-01-01 00:00:00
+++ a/libs/hbb_common/src/tcp.rs 1970-01-01 00:00:00
@@ -68,10 +68,11 @@ pub(crate) fn new_socket(addr: std::net:
std::net::SocketAddr::V6(..) => TcpSocket::new_v6()?,
};
if reuse {
- // windows has no reuse_port, but it's reuse_address
+ // windows has no reuse_port, but its reuse_address
// almost equals to unix's reuse_port + reuse_address,
// though may introduce nondeterministic behavior
- #[cfg(unix)]
+ // illumos has no support for SO_REUSEPORT
+ #[cfg(all(unix, not(target_os = "illumos")))]
socket.set_reuseport(true).ok();
socket.set_reuseaddr(true).ok();
}
@@ -226,6 +227,8 @@ pub async fn listen_any(port: u16) -> Re
if let Ok(mut socket) = TcpSocket::new_v6() {
#[cfg(unix)]
{
+ // illumos has no support for SO_REUSEPORT
+ #[cfg(not(target_os = "illumos"))]
socket.set_reuseport(true).ok();
socket.set_reuseaddr(true).ok();
use std::os::unix::io::{FromRawFd, IntoRawFd};
diff -wpruN --no-dereference '--exclude=*.orig' a~/libs/hbb_common/src/udp.rs a/libs/hbb_common/src/udp.rs
--- a~/libs/hbb_common/src/udp.rs 1970-01-01 00:00:00
+++ a/libs/hbb_common/src/udp.rs 1970-01-01 00:00:00
@@ -20,10 +20,11 @@ fn new_socket(addr: SocketAddr, reuse: b
SocketAddr::V6(..) => Socket::new(Domain::ipv6(), Type::dgram(), None),
}?;
if reuse {
- // windows has no reuse_port, but it's reuse_address
+ // windows has no reuse_port, but its reuse_address
// almost equals to unix's reuse_port + reuse_address,
// though may introduce nondeterministic behavior
- #[cfg(unix)]
+ // illumos has no support for SO_REUSEPORT
+ #[cfg(all(unix, not(target_os = "illumos")))]
socket.set_reuse_port(true).ok();
socket.set_reuse_address(true).ok();
}
24 changes: 12 additions & 12 deletions build/rustdesk-server/patches/illumos.patch
Original file line number Diff line number Diff line change
Expand Up @@ -20,23 +20,23 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/Cargo.toml a/Cargo.toml
+dns-lookup = "2.0.4"
ping = "0.4.0"

[build-dependencies]
@@ -58,3 +58,6 @@ hbb_common = { path = "libs/hbb_common"
[workspace]
members = ["libs/hbb_common"]
exclude = ["ui"]
[target.'cfg(any(target_os = "macos", target_os = "windows"))'.dependencies]
@@ -75,3 +75,6 @@ panic = 'abort'
strip = true
#opt-level = 'z' # only have smaller size after strip # Default is 3, better performance
#rpath = true # Not needed
+
+[patch.crates-io]
+machine-uid = { git = "https://github.com/hadfl/machine-uid.git", branch = "illumos" }
diff -wpruN --no-dereference '--exclude=*.orig' a~/libs/hbb_common/Cargo.toml a/libs/hbb_common/Cargo.toml
--- a~/libs/hbb_common/Cargo.toml 1970-01-01 00:00:00
+++ a/libs/hbb_common/Cargo.toml 1970-01-01 00:00:00
@@ -34,7 +34,7 @@ chrono = "0.4"

@@ -48,7 +48,7 @@ sha2 = "0.10"
[target.'cfg(not(any(target_os = "android", target_os = "ios")))'.dependencies]
mac_address = "1.1"
-machine-uid = "0.2"
+machine-uid = "0.5.1"

[features]
quic = []
default_net = { git = "https://github.com/rustdesk-org/default_net" }
-machine-uid = { git = "https://github.com/rustdesk-org/machine-uid" }
+machine-uid = { git = "https://github.com/hadfl/machine-uid.git", branch = "illumos" }
[target.'cfg(not(any(target_os = "macos", target_os = "windows")))'.dependencies]
tokio-rustls = { version = "0.26", features = ["logging", "tls12", "ring"], default-features = false }
rustls-platform-verifier = "0.3.1"
1 change: 1 addition & 0 deletions build/rustdesk-server/patches/series
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
illumos.patch
0001-add-illumos-support.patch
15 changes: 15 additions & 0 deletions build/tree-sitter/patches/libc.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
diff -wpruN --no-dereference '--exclude=*.orig' a~/Cargo.lock a/Cargo.lock
--- a~/Cargo.lock 1970-01-01 00:00:00
+++ a/Cargo.lock 1970-01-01 00:00:00
@@ -814,9 +814,9 @@ checksum = "884e2677b40cc8c339eaefcb701c

[[package]]
name = "libc"
-version = "0.2.159"
+version = "0.2.169"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"
+checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"

[[package]]
name = "libgit2-sys"
1 change: 1 addition & 0 deletions build/tree-sitter/patches/series
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
libc.patch
Loading