From 7c3990919292b4b5f761cb96642582289f65b42c Mon Sep 17 00:00:00 2001 From: kj-sh604 Date: Thu, 29 May 2025 12:54:50 -0400 Subject: refactor: update patch files --- .../0001-update-selinux-progs.patch | 12 --------- coreutils-uutils-selinux/PKGBUILD | 10 ++++---- coreutils-uutils-selinux/update-progs.patch | 30 ++++++++++++++++++++++ 3 files changed, 35 insertions(+), 17 deletions(-) delete mode 100644 coreutils-uutils-selinux/0001-update-selinux-progs.patch create mode 100644 coreutils-uutils-selinux/update-progs.patch diff --git a/coreutils-uutils-selinux/0001-update-selinux-progs.patch b/coreutils-uutils-selinux/0001-update-selinux-progs.patch deleted file mode 100644 index aee086f..0000000 --- a/coreutils-uutils-selinux/0001-update-selinux-progs.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/GNUmakefile -+++ b/GNUmakefile -@@ -177,7 +177,8 @@ - - SELINUX_PROGS := \ - chcon \ -- runcon -+ runcon \ -+ stty - - ifneq ($(OS),Windows_NT) - PROGS := $(PROGS) $(UNIX_PROGS) diff --git a/coreutils-uutils-selinux/PKGBUILD b/coreutils-uutils-selinux/PKGBUILD index 2b2c314..e891cd4 100644 --- a/coreutils-uutils-selinux/PKGBUILD +++ b/coreutils-uutils-selinux/PKGBUILD @@ -31,14 +31,14 @@ makedepends=( rust ) source=("uutils-coreutils-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz" - 0001-update-selinux-progs.patch) + update-progs.patch) sha256sums=('55c528f2b53c1b30cb704550131a806e84721c87b3707b588a961a6c97f110d8' - 'd8290988c9c8275e2087f1a63d63c420c88ebcf7c50aed0ef53d9dcd46517b36') + '0bd635cc349cfe133ddad0b1d05256c023b46f4a30f81aee123100119762df8e') prepare() { - cd ${pkgname%-uutils-selinux}-${pkgver} - # patch SELINUX_PROGS to include stty - patch -Np1 -i $srcdir/0001-update-selinux-progs.patch + cd ${pkgname%-uutils-selinux}-${pkgver} + # patch PROGS to include stty + patch -Np1 -i $srcdir/update-progs.patch } package() { diff --git a/coreutils-uutils-selinux/update-progs.patch b/coreutils-uutils-selinux/update-progs.patch new file mode 100644 index 0000000..b08c8fd --- /dev/null +++ b/coreutils-uutils-selinux/update-progs.patch @@ -0,0 +1,30 @@ +--- a/GNUmakefile ++++ b/GNUmakefile +@@ -75,8 +75,8 @@ + PROGS := \ + base32 \ + base64 \ +- basenc \ + basename \ ++ basenc \ + cat \ + cksum \ + comm \ +@@ -108,8 +108,8 @@ + more \ + mv \ + nl \ +- numfmt \ + nproc \ ++ numfmt \ + od \ + paste \ + pr \ +@@ -127,6 +127,7 @@ + sleep \ + sort \ + split \ ++ stty \ + sum \ + sync \ + tac \ -- cgit v1.2.3