From e58b77e31a34523361340bd6298391f73800f8e1 Mon Sep 17 00:00:00 2001 From: EnumDev Date: Sun, 3 Aug 2025 18:48:54 +0300 Subject: [PATCH] Update package version to 0.1.0 --- check-version.sh | 15 ++++ pkg.info | 5 +- source-files/bump-onig-version.patch | 126 +++++++++++++++++++++++++++ source.sh | 22 +++-- 4 files changed, 159 insertions(+), 9 deletions(-) create mode 100644 check-version.sh create mode 100644 source-files/bump-onig-version.patch diff --git a/check-version.sh b/check-version.sh new file mode 100644 index 0000000..b5d4ffb --- /dev/null +++ b/check-version.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +# Github repository +REPO="uutils/coreutils" + +# Get tag name using Github Rest API +TAG_NAME=$(curl -s -L -H "Accept: application/vnd.github+json" -H "X-GitHub-Api-Version: 2022-11-28" https://api.github.com/repos/"$REPO"/releases/latest | jq -r '.tag_name') + +# Get version number from tag name +VERSION=$(echo "$TAG_NAME" | rev | cut -d'-' -f1 | rev) + +# Trim 'v' character in VERSION variable +VERSION=$(echo "$VERSION" | tr -d 'v') + +echo "$VERSION" diff --git a/pkg.info b/pkg.info index 0754e1b..358dabc 100644 --- a/pkg.info +++ b/pkg.info @@ -1,11 +1,10 @@ name: uutils-coreutils description: Cross-platform Rust rewrite of the GNU coreutils -version: 0.0.30 -revision: 2 +version: 0.1.0 url: https://github.com/uutils/coreutils license: MIT architecture: any -depends: ["acl","attr","glibc","gmp","libcap","openssl"] +depends: ["gcc","glibc","oniguruma"] make_depends: ["rustc"] provides: ["coreutils"] conflicts: ["gnu-coreutils"] diff --git a/source-files/bump-onig-version.patch b/source-files/bump-onig-version.patch new file mode 100644 index 0000000..47b1e19 --- /dev/null +++ b/source-files/bump-onig-version.patch @@ -0,0 +1,126 @@ +From a0cf06ea8c3b698bda57dfdb181274078a489cf0 Mon Sep 17 00:00:00 2001 +From: Daniel Hofstetter +Date: Sat, 24 May 2025 07:43:10 +0200 +Subject: [PATCH] Bump onig from 6.4.0 to 6.5.1 + +--- + Cargo.lock | 10 +++++----- + Cargo.toml | 2 +- + fuzz/Cargo.lock | 22 ++++++++-------------- + 3 files changed, 14 insertions(+), 20 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index 63ec9c208c5..5a6fac1689f 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1620,11 +1620,11 @@ checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e" + + [[package]] + name = "onig" +-version = "6.4.0" ++version = "6.5.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8c4b31c8722ad9171c6d77d3557db078cab2bd50afcc9d09c8b315c59df8ca4f" ++checksum = "336b9c63443aceef14bea841b899035ae3abe89b7c486aaf4c5bd8aafedac3f0" + dependencies = [ +- "bitflags 1.3.2", ++ "bitflags 2.9.0", + "libc", + "once_cell", + "onig_sys", +@@ -1632,9 +1632,9 @@ dependencies = [ + + [[package]] + name = "onig_sys" +-version = "69.8.1" ++version = "69.9.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7b829e3d7e9cc74c7e315ee8edb185bf4190da5acde74afd7fc59c35b1f086e7" ++checksum = "c7f86c6eef3d6df15f23bcfb6af487cbd2fed4e5581d58d5bf1f5f8b7f6727dc" + dependencies = [ + "cc", + "pkg-config", +diff --git a/Cargo.toml b/Cargo.toml +index a4c9d3200f2..9d1b732be34 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -318,7 +318,7 @@ num-bigint = "0.4.4" + num-prime = "0.4.4" + num-traits = "0.2.19" + number_prefix = "0.4" +-onig = { version = "~6.4", default-features = false } ++onig = { version = "~6.5.1", default-features = false } + parse_datetime = "0.9.0" + phf = "0.11.2" + phf_codegen = "0.11.2" +diff --git a/fuzz/Cargo.lock b/fuzz/Cargo.lock +index 06faf0f5f98..c946c32255e 100644 +--- a/fuzz/Cargo.lock ++++ b/fuzz/Cargo.lock +@@ -122,12 +122,6 @@ dependencies = [ + "compare", + ] + +-[[package]] +-name = "bitflags" +-version = "1.3.2" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +- + [[package]] + name = "bitflags" + version = "2.9.1" +@@ -660,7 +654,7 @@ version = "0.30.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6" + dependencies = [ +- "bitflags 2.9.1", ++ "bitflags", + "cfg-if", + "cfg_aliases", + "libc", +@@ -723,11 +717,11 @@ checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad" + + [[package]] + name = "onig" +-version = "6.4.0" ++version = "6.5.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8c4b31c8722ad9171c6d77d3557db078cab2bd50afcc9d09c8b315c59df8ca4f" ++checksum = "336b9c63443aceef14bea841b899035ae3abe89b7c486aaf4c5bd8aafedac3f0" + dependencies = [ +- "bitflags 1.3.2", ++ "bitflags", + "libc", + "once_cell", + "onig_sys", +@@ -735,9 +729,9 @@ dependencies = [ + + [[package]] + name = "onig_sys" +-version = "69.8.1" ++version = "69.9.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7b829e3d7e9cc74c7e315ee8edb185bf4190da5acde74afd7fc59c35b1f086e7" ++checksum = "c7f86c6eef3d6df15f23bcfb6af487cbd2fed4e5581d58d5bf1f5f8b7f6727dc" + dependencies = [ + "cc", + "pkg-config", +@@ -969,7 +963,7 @@ version = "1.0.7" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266" + dependencies = [ +- "bitflags 2.9.1", ++ "bitflags", + "errno", + "libc", + "linux-raw-sys", +@@ -1632,7 +1626,7 @@ version = "0.39.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1" + dependencies = [ +- "bitflags 2.9.1", ++ "bitflags", + ] + + [[package]] diff --git a/source.sh b/source.sh index 19dae5d..25df15b 100644 --- a/source.sh +++ b/source.sh @@ -5,28 +5,38 @@ DOWNLOAD="https://github.com/uutils/coreutils/archive/refs/tags/${BPM_PKG_VERSION}.tar.gz" FILENAME="${DOWNLOAD##*/}" -SKIPPED_UTILS="hostname kill more uptime" +SKIPPED_UTILS="hostname kill more uptime runcon chcon" # The prepare function is executed in the root of the temp directory # This function is used for downloading files and putting them into the correct location prepare() { wget "$DOWNLOAD" tar -xvf "$FILENAME" --strip-components=1 -C "$BPM_SOURCE" + + # Apply patches + cd "$BPM_SOURCE" + # Add stty to makefile + patch GNUmakefile < "$BPM_WORKDIR"/add_stty_to_makefile.patch + # Bump onig version from 6.4.0 to 6.5.1 + patch -Np1 -i "$BPM_WORKDIR"/bump-onig-version.patch } # The build function is executed in the source directory # This function is used to compile the source code build() { - # Apply patch to add stty to makefile - patch GNUmakefile < "$BPM_WORKDIR"/add_stty_to_makefile.patch - - make PREFIX=/usr MANDIR=/share/man/man1 PROFILE=release SKIP_UTILS="$SKIPPED_UTILS" + export RUSTONIG_DYNAMIC_LIBONIG=1 + make PROFILE=release MULTICALL=y SKIP_UTILS="$SKIPPED_UTILS" } # The package function is executed in the source directory # This function is used to move the compiled files into the output directory package() { - make PREFIX=/usr MANDIR=/share/man/man1 MULTICALL=y SKIP_UTILS="$SKIPPED_UTILS" DESTDIR="$BPM_OUTPUT" install + make PREFIX=/usr \ + MANDIR=/share/man/man1 \ + MULTICALL=y \ + SKIP_UTILS="$SKIPPED_UTILS" \ + DESTDIR="$BPM_OUTPUT" \ + install # Add symlinks to missing binaries local binaries=(