Compare commits
2 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
0a6c336bd5 |
|||
|
943de33dec |
5 changed files with 54 additions and 1 deletions
33
coreutils-ctor-1_x.diff
Normal file
33
coreutils-ctor-1_x.diff
Normal file
|
|
@ -0,0 +1,33 @@
|
||||||
|
--- a/tests/test_util_name.rs
|
||||||
|
+++ b/tests/test_util_name.rs
|
||||||
|
@@ -16,7 +16,7 @@ pub const TESTS_BINARY: &str = env!("CAR
|
||||||
|
// Set the environment variable for any tests
|
||||||
|
|
||||||
|
// Use the ctor attribute to run this function before any tests
|
||||||
|
-#[ctor::ctor]
|
||||||
|
+#[ctor::ctor(unsafe)]
|
||||||
|
fn init() {
|
||||||
|
// No need for unsafe here
|
||||||
|
unsafe {
|
||||||
|
--- a/tests/test_uudoc.rs
|
||||||
|
+++ b/tests/test_uudoc.rs
|
||||||
|
@@ -23,7 +23,7 @@ pub const TESTS_BINARY: &str = env!("CAR
|
||||||
|
// Set the environment variable for any tests
|
||||||
|
|
||||||
|
// Use the ctor attribute to run this function before any tests
|
||||||
|
-#[ctor::ctor]
|
||||||
|
+#[ctor::ctor(unsafe)]
|
||||||
|
fn init() {
|
||||||
|
// No need for unsafe here
|
||||||
|
unsafe {
|
||||||
|
--- a/tests/tests.rs
|
||||||
|
+++ b/tests/tests.rs
|
||||||
|
@@ -8,7 +8,7 @@ use std::env;
|
||||||
|
pub const TESTS_BINARY: &str = env!("CARGO_BIN_EXE_coreutils");
|
||||||
|
|
||||||
|
// Use the ctor attribute to run this function before any tests
|
||||||
|
-#[ctor::ctor]
|
||||||
|
+#[ctor::ctor(unsafe)]
|
||||||
|
fn init() {
|
||||||
|
unsafe {
|
||||||
|
// Necessary for uutests to be able to find the binary
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
--- coreutils-0.7.0/Cargo.toml 2006-07-24T01:21:28+00:00
|
--- coreutils-0.7.0/Cargo.toml 2006-07-24T01:21:28+00:00
|
||||||
+++ coreutils-0.7.0/Cargo.toml 2026-04-14T19:49:54.150000+00:00
|
+++ coreutils-0.7.0/Cargo.toml 2026-08-06T11:26:04.426642+00:00
|
||||||
@@ -719,7 +719,7 @@
|
@@ -719,7 +719,7 @@
|
||||||
package = "uu_runcon"
|
package = "uu_runcon"
|
||||||
|
|
||||||
|
|
@ -9,3 +9,12 @@
|
||||||
optional = true
|
optional = true
|
||||||
|
|
||||||
[dependencies.seq]
|
[dependencies.seq]
|
||||||
|
@@ -930,7 +930,7 @@
|
||||||
|
version = "0.6.8"
|
||||||
|
|
||||||
|
[dev-dependencies.ctor]
|
||||||
|
-version = "0.6.0"
|
||||||
|
+version = "1"
|
||||||
|
|
||||||
|
[dev-dependencies.filetime]
|
||||||
|
version = "0.2.23"
|
||||||
|
|
|
||||||
|
|
@ -33,7 +33,10 @@ URL: https://crates.io/crates/coreutils
|
||||||
Source: %{crates_source}
|
Source: %{crates_source}
|
||||||
# Manually created patch for downstream crate metadata changes
|
# Manually created patch for downstream crate metadata changes
|
||||||
# * loosen selinux version bound from =0.6.0 to 0.6.0
|
# * loosen selinux version bound from =0.6.0 to 0.6.0
|
||||||
|
# * bump ctor from 0.6 to 1
|
||||||
Patch: coreutils-fix-metadata.diff
|
Patch: coreutils-fix-metadata.diff
|
||||||
|
# * compatibility fixes for ctor 1.x
|
||||||
|
Patch2: coreutils-ctor-1_x.diff
|
||||||
|
|
||||||
# leaf package, SIGABRT on compile
|
# leaf package, SIGABRT on compile
|
||||||
ExcludeArch: %{ix86}
|
ExcludeArch: %{ix86}
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,7 @@ description = "coreutils ~ GNU coreutils (updated); implemented as universal (cr
|
||||||
|
|
||||||
cargo-toml-patch-comments = [
|
cargo-toml-patch-comments = [
|
||||||
"loosen selinux version bound from =0.6.0 to 0.6.0",
|
"loosen selinux version bound from =0.6.0 to 0.6.0",
|
||||||
|
"bump ctor from 0.6 to 1",
|
||||||
]
|
]
|
||||||
|
|
||||||
bin-package-name = "uutils-coreutils"
|
bin-package-name = "uutils-coreutils"
|
||||||
|
|
@ -19,6 +20,11 @@ extra-files = [
|
||||||
[package.bin-renames]
|
[package.bin-renames]
|
||||||
coreutils = "uutils-coreutils"
|
coreutils = "uutils-coreutils"
|
||||||
|
|
||||||
|
[[package.extra-patches]]
|
||||||
|
number = 2
|
||||||
|
file = "uutests-ctor-1_x.diff"
|
||||||
|
comments = ["compatibility fixes for ctor 1.x"]
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
enable = [
|
enable = [
|
||||||
"feat_os_unix",
|
"feat_os_unix",
|
||||||
|
|
|
||||||
2
series
Normal file
2
series
Normal file
|
|
@ -0,0 +1,2 @@
|
||||||
|
coreutils-fix-metadata.diff
|
||||||
|
coreutils-ctor-1_x.diff
|
||||||
Loading…
Add table
Add a link
Reference in a new issue