upgpkg: 0.1.0-1

3 files changed, 30 insertions, 18 deletions

diff --git a/coreutils-uutils/.SRCINFO b/coreutils-uutils/.SRCINFO
index fea3ded..502e0ee 100644
--- a/coreutils-uutils/.SRCINFO
+++ b/coreutils-uutils/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = coreutils-uutils
 	pkgdesc = (warning: use at own risk) Cross-platform Rust rewrite of the GNU coreutils being used as actual system coreutils
-	pkgver = 0.0.30
-	pkgrel = 4
+	pkgver = 0.1.0
+	pkgrel = 1
 	url = https://github.com/uutils/coreutils
 	arch = x86_64
 	license = GPL3
@@ -25,8 +25,10 @@ pkgbase = coreutils-uutils
 	conflicts = b3sum
 	conflicts = sha3sum
 	source = https://ftp.gnu.org/gnu/coreutils/coreutils-9.7.tar.xz
-	source = uutils-coreutils-0.0.30.tar.gz::https://github.com/uutils/coreutils/archive/0.0.30.tar.gz
+	source = uutils-coreutils-0.1.0.tar.gz::https://github.com/uutils/coreutils/archive/0.1.0.tar.gz
+	source = disable_selinux.patch
 	sha256sums = e8bb26ad0293f9b5a1fc43fb42ba970e312c66ce92c1b0b16713d7500db251bf
-	sha256sums = 732c0ac646be7cc59a51cdfdb2d0ff1a4d2501c28f900a2d447c77729fdfca22
+	sha256sums = 55c528f2b53c1b30cb704550131a806e84721c87b3707b588a961a6c97f110d8
+	sha256sums = 302614165d99f04600627222ddad0444a0144fcad6a1ff59ad43fb0b3162060e
 
 pkgname = coreutils-uutils
diff --git a/coreutils-uutils/PKGBUILD b/coreutils-uutils/PKGBUILD
index 93fd9be..2cf7635 100644
--- a/coreutils-uutils/PKGBUILD
+++ b/coreutils-uutils/PKGBUILD
@@ -2,9 +2,9 @@
 
 pkgname=coreutils-uutils
 _gnuver=9.7
-_uuver=0.0.30
+_uuver=0.1.0
 pkgver=${_uuver}
-pkgrel=4
+pkgrel=1
 pkgdesc='(warning: use at own risk) Cross-platform Rust rewrite of the GNU coreutils being used as actual system coreutils'
 arch=('x86_64')
 license=('GPL3' 'MIT')
@@ -15,21 +15,18 @@ conflicts=('coreutils' 'b3sum' 'sha3sum')
 provides=('coreutils' 'b3sum' 'sha3sum')
 makedepends=('rust' 'cargo' 'python-sphinx')
 source=("https://ftp.gnu.org/gnu/coreutils/coreutils-$_gnuver.tar.xz"
-        "uutils-coreutils-$_uuver.tar.gz::$url/archive/$_uuver.tar.gz")
+        "uutils-coreutils-$_uuver.tar.gz::$url/archive/$_uuver.tar.gz"
+         disable_selinux.patch)
 sha256sums=('e8bb26ad0293f9b5a1fc43fb42ba970e312c66ce92c1b0b16713d7500db251bf'
-            '732c0ac646be7cc59a51cdfdb2d0ff1a4d2501c28f900a2d447c77729fdfca22')
+            '55c528f2b53c1b30cb704550131a806e84721c87b3707b588a961a6c97f110d8'
+            '302614165d99f04600627222ddad0444a0144fcad6a1ff59ad43fb0b3162060e')
 
 prepare() {
-  cd coreutils-$_gnuver
-  # apply patch from the source array (should be a pacman feature)
-  local filename
-  for filename in "${source[@]}"; do
-    if [[ "$filename" =~ \.patch$ ]]; then
-      echo "Applying patch ${filename##*/}"
-      patch -p1 -N -i "$srcdir/${filename##*/}"
-    fi
-  done
-  :
+  cd coreutils-$_uuver
+  sed 's|"bin"|"builduser"|g' -i tests/by-util/test_{chgrp,chown}.rs
+  # 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
 }
 
 build() {
diff --git a/coreutils-uutils/disable_selinux.patch b/coreutils-uutils/disable_selinux.patch
new file mode 100644
index 0000000..f6a5bff
--- /dev/null
+++ b/coreutils-uutils/disable_selinux.patch
@@ -0,0 +1,13 @@
+diff --git a/GNUmakefile b/GNUmakefile
+index f46126a82..58bf7fbdd 100644
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -181,8 +181,6 @@ SELINUX_PROGS := \
+ 
+ ifneq ($(OS),Windows_NT)
+ 	PROGS := $(PROGS) $(UNIX_PROGS)
+-# Build the selinux command even if not on the system
+-	PROGS := $(PROGS) $(SELINUX_PROGS)
+ endif
+ 
+ UTILS ?= $(PROGS)