refactor: package rename and pkgdesc changes

7 files changed, 47 insertions, 16 deletions

diff --git a/coreutils-uutils-selinux/.SRCINFO b/coreutils-uutils-libselinux/.SRCINFO
index d2548c8..82dba08 100644
--- a/coreutils-uutils-selinux/.SRCINFO
+++ b/coreutils-uutils-libselinux/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = coreutils-uutils-selinux
+pkgbase = coreutils-uutils-libselinux
 	pkgdesc = (warning: use at own risk) Cross-platform Rust rewrite of the GNU coreutils installed as system core utilities. Built with libselinux for the chcon, runcon, and stty binaries
 	pkgver = 0.1.0
 	pkgrel = 1
@@ -25,4 +25,4 @@ pkgbase = coreutils-uutils-selinux
 	sha256sums = 55c528f2b53c1b30cb704550131a806e84721c87b3707b588a961a6c97f110d8
 	sha256sums = d8290988c9c8275e2087f1a63d63c420c88ebcf7c50aed0ef53d9dcd46517b36
 
-pkgname = coreutils-uutils-selinux
+pkgname = coreutils-uutils-libselinux
diff --git a/coreutils-uutils-selinux/.gitignore b/coreutils-uutils-libselinux/.gitignore
index 8d78c83..8d78c83 100644
--- a/coreutils-uutils-selinux/.gitignore
+++ b/coreutils-uutils-libselinux/.gitignore
diff --git a/coreutils-uutils-selinux/0001-update-selinux-progs.patch b/coreutils-uutils-libselinux/0001-update-selinux-progs.patch
index aee086f..aee086f 100644
--- a/coreutils-uutils-selinux/0001-update-selinux-progs.patch
+++ b/coreutils-uutils-libselinux/0001-update-selinux-progs.patch
diff --git a/coreutils-uutils-selinux/PKGBUILD b/coreutils-uutils-libselinux/PKGBUILD
index 31445eb..d5c7a84 100644
--- a/coreutils-uutils-selinux/PKGBUILD
+++ b/coreutils-uutils-libselinux/PKGBUILD
@@ -1,11 +1,11 @@
 # Maintainer: kj_sh604 <406hs_jk@proton.me>
 
-pkgname=coreutils-uutils-selinux
+pkgname=coreutils-uutils-libselinux
 pkgver=0.1.0
 pkgrel=1
 pkgdesc='(warning: use at own risk) Cross-platform Rust rewrite of the GNU
 coreutils installed as system core utilities. Built with libselinux for the
-chcon, runcon, and stty binaries'
+chcon and runcon binaries'
 arch=('x86_64')
 license=('GPL3' 'MIT')
 url='https://github.com/uutils/coreutils'
@@ -37,13 +37,13 @@ sha256sums=('55c528f2b53c1b30cb704550131a806e84721c87b3707b588a961a6c97f110d8'
             'd8290988c9c8275e2087f1a63d63c420c88ebcf7c50aed0ef53d9dcd46517b36')
 
  prepare() {
-   cd ${pkgname%-uutils-selinux}-${pkgver}
+   cd ${pkgname%-uutils-libselinux}-${pkgver}
   # patch SELINUX_PROGS to include stty
   patch -Np1 -i ../../0001-update-selinux-progs.patch
 }
 
 package() {
-  cd ${pkgname%-uutils-selinux}-${pkgver}
+  cd ${pkgname%-uutils-libselinux}-${pkgver}
   export RUSTONIG_DYNAMIC_LIBONIG=1
   make install \
       USE=selinux \
@@ -55,7 +55,7 @@ package() {
       MULTICALL=y
   # add libstdbuf.so
   mkdir -p $pkgdir/usr/lib/coreutils
-  cd $srcdir && cd ${pkgname%-uutils-selinux}-${pkgver}/target/release/deps
+  cd $srcdir && cd ${pkgname%-uutils-libselinux}-${pkgver}/target/release/deps
   mv liblibstdbuf.so $pkgdir/usr/lib/coreutils/libstdbuf.so
   # clean conflicts (archlinux ships these in other apps)
   cd $pkgdir/usr/bin
diff --git a/coreutils-uutils/.SRCINFO b/coreutils-uutils/.SRCINFO
index bfe88c7..4bfe942 100644
--- a/coreutils-uutils/.SRCINFO
+++ b/coreutils-uutils/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = coreutils-uutils
-	pkgdesc = (warning: use at own risk) Cross-platform Rust rewrite of the GNU coreutils installed as system core utilities. This package does NOT build chcon, runcon, and stty
+	pkgdesc = (warning: use at own risk) Cross-platform Rust rewrite of the GNU coreutils installed as system core utilities. This PKGBUID does NOT build chcon and runcon
 	pkgver = 0.1.0
 	pkgrel = 3
 	url = https://github.com/uutils/coreutils
@@ -21,6 +21,7 @@ pkgbase = coreutils-uutils
 	conflicts = sha3sum
 	source = uutils-coreutils-0.1.0.tar.gz::https://github.com/uutils/coreutils/archive/0.1.0.tar.gz
 	source = disable_selinux.patch
+	source = build-stty.patch
 	sha256sums = 55c528f2b53c1b30cb704550131a806e84721c87b3707b588a961a6c97f110d8
 	sha256sums = 302614165d99f04600627222ddad0444a0144fcad6a1ff59ad43fb0b3162060e
 
diff --git a/coreutils-uutils/PKGBUILD b/coreutils-uutils/PKGBUILD
index 7c9ef65..5456438 100644
--- a/coreutils-uutils/PKGBUILD
+++ b/coreutils-uutils/PKGBUILD
@@ -4,8 +4,8 @@ pkgname=coreutils-uutils
 pkgver=0.1.0
 pkgrel=3
 pkgdesc='(warning: use at own risk) Cross-platform Rust rewrite of the GNU
-coreutils installed as system core utilities. This package does NOT build
-chcon, runcon, and stty'
+coreutils installed as system core utilities. This PKGBUID does NOT build
+chcon and runcon'
 arch=('x86_64')
 license=('GPL3' 'MIT')
 url='https://github.com/uutils/coreutils'
@@ -31,16 +31,16 @@ makedepends=(
   rust
 )
 source=("uutils-coreutils-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz"
-         disable_selinux.patch)
+         disable_selinux.patch
+         build-stty.patch)
 sha256sums=('55c528f2b53c1b30cb704550131a806e84721c87b3707b588a961a6c97f110d8'
             '302614165d99f04600627222ddad0444a0144fcad6a1ff59ad43fb0b3162060e')
 
 prepare() {
-   cd ${pkgname%-uutils}-${pkgver}
-  # the following is derived from the latest uutils-coreutils changes from Tobias Powalowski:
-    # disable selinux in Makefile, upstream seems broken in parameter parsing
-    # SELINUX_ENABLE=0 should not enable SELINUX but fails
-  patch -Np1 -i ../../disable_selinux.patch
+  cd ${pkgname%-uutils}-${pkgver}
+  patch -Np1 -i $srcdir/disable_selinux.patch
+  patch -Np1 -i $srcdir/build-stty.patch
+
 }
 
 package() {
diff --git a/coreutils-uutils/build-stty.patch b/coreutils-uutils/build-stty.patch
new file mode 100644
index 0000000..b08c8fd
--- /dev/null
+++ b/coreutils-uutils/build-stty.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 \