added and patched broken packages

13 files changed, 52 insertions, 27 deletions

diff --git a/repo/util/cpio.xibuild b/repo/util/cpio.xibuild
index 8aa3a45..2c3a41d 100644
--- a/repo/util/cpio.xibuild
+++ b/repo/util/cpio.xibuild
@@ -23,10 +23,12 @@ build () {
 
 package () {
     make DESTDIR=$PKG_DEST install &&
-        install -v -m755 -d $PKG_DEST/usr/share/doc/cpio-2.13/html &&
-    install -v -m644    doc/html/* \
-                        $PKG_DEST/usr/share/doc/cpio-2.13/html &&
-    install -v -m644    doc/cpio.{html,txt} \
-    $PKG_DEST/usr/share/doc/cpio-2.13
+        install -m755 -d $PKG_DEST/usr/share/doc/cpio-$PKG_VER/html &&
+    install -m644    doc/html/* \
+                        $PKG_DEST/usr/share/doc/cpio-$PKG_VER/html &&
+    install -m644    doc/cpio.txt \
+    $PKG_DEST/usr/share/doc/cpio-$PKG_VER
+    install -m644    doc/cpio.html \
+    $PKG_DEST/usr/share/doc/cpio-$PKG_VER
 }
 
diff --git a/repo/util/diffutils.xibuild b/repo/util/diffutils.xibuild
index 08a5a39..0087a0d 100644
--- a/repo/util/diffutils.xibuild
+++ b/repo/util/diffutils.xibuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MAKEDEPS="make"
-DEPS="musl bash"
+DEPS="musl sh"
 
 PKG_VER=3.8
 SOURCE=https://ftp.gnu.org/gnu/diffutils/diffutils-$PKG_VER.tar.xz
diff --git a/repo/util/dracut.xibuild b/repo/util/dracut.xibuild
index 17d514e..30b8641 100644
--- a/repo/util/dracut.xibuild
+++ b/repo/util/dracut.xibuild
@@ -1,12 +1,19 @@
 #!/bin/sh
 
-MAKEDEPS="make asciidoc"
+MAKEDEPS="make asciidoc musl-fts"
 DEPS="bash sbase cpio findutils grep gzip kmod pkgconf procps-ng sed util-linux xz"
 
 DESC="An initramfs infastructure aimin gto have as little possible hardcoded into the initramfs"
 
 PKG_VER=055
 SOURCE=https://mirrors.edge.kernel.org/pub/linux/utils/boot/dracut/dracut-$PKG_VER.tar.xz
+ADDITIONAL="
+    fix-sbase-coreutils.patch
+"
+
+prepare () {
+    apply_patches
+}
 
 build () {
     ./configure --prefix=/usr
diff --git a/repo/util/fzf.xibuild b/repo/util/fzf.xibuild
index a149337..a144f28 100644
--- a/repo/util/fzf.xibuild
+++ b/repo/util/fzf.xibuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MAKEDEPS="git go"
-DEPS="bash"
+DEPS="sh"
 
 PKG_VER=0.29.0
 SOURCE=https://github.com/junegunn/fzf.git
diff --git a/repo/util/genfstab.xibuild b/repo/util/genfstab.xibuild
index c263b32..46249a3 100644
--- a/repo/util/genfstab.xibuild
+++ b/repo/util/genfstab.xibuild
@@ -7,8 +7,17 @@ PKG_VER=24
 SOURCE=https://github.com/archlinux/arch-install-scripts.git
 BRANCH=v$PKG_VER
 
+ADDITIONAL="
+    remove-extra-flags.patch
+"
+
 DESC="A tool for generating /etc/fstab files from archlinux"
 
+
+prepare () {
+    apply_patches
+}
+
 package () {
     make PREFIX=/usr BINPROGS=genfstab MANS=doc/genfstab.8 DESTDIR=$PKG_DEST install
 }
diff --git a/repo/util/iproute2.xibuild b/repo/util/iproute2.xibuild
index e5a9c78..3d0062d 100644
--- a/repo/util/iproute2.xibuild
+++ b/repo/util/iproute2.xibuild
@@ -8,8 +8,7 @@ DESC="IP Routing Utilities"
 
 build () {
     sed -i /ARPD/d Makefile
-    rm -fv man/man8/arpd.8
-
+    rm -f man/man8/arpd.8
     make
 }
 
diff --git a/repo/util/lm-sensors.xibuild b/repo/util/lm-sensors.xibuild
index 71add17..c301161 100644
--- a/repo/util/lm-sensors.xibuild
+++ b/repo/util/lm-sensors.xibuild
@@ -21,7 +21,7 @@ package () {
          BUILD_STATIC_LIB=0 \
          MANDIR=/usr/share/man install &&
 
-    install -v -m755 -d /usr/share/doc/lm_sensors-$PKG_VER &&
-    cp -rv              README INSTALL doc/* \
+    install -m755 -d /usr/share/doc/lm_sensors-$PKG_VER &&
+    cp -r              README INSTALL doc/* \
                         /usr/share/doc/lm_sensors-$PKG_VER
 }
diff --git a/repo/util/pciutils.xibuild b/repo/util/pciutils.xibuild
index 9ae5311..8eaa657 100644
--- a/repo/util/pciutils.xibuild
+++ b/repo/util/pciutils.xibuild
@@ -19,9 +19,9 @@ package () {
      SHAREDIR=/usr/share/hwdata \
      SHARED=yes                 \
      install install-lib        &&
-     chmod -v 755 $PKG_DEST/usr/lib/libpci.so
+     chmod 755 $PKG_DEST/usr/lib/libpci.so
 
-     mkdir -pv $PKG_DEST/etc/cron.weekly/
+     mkdir -p $PKG_DEST/etc/cron.weekly/
     cat > $PKG_DEST/etc/cron.weekly/update-pciids.sh << "EOF" &&
 #!/bin/sh
 /usr/sbin/update-pciids
diff --git a/repo/util/sudo.xibuild b/repo/util/sudo.xibuild
index 3f54bfa..7d0ba6e 100644
--- a/repo/util/sudo.xibuild
+++ b/repo/util/sudo.xibuild
@@ -21,14 +21,14 @@ build () {
 
 package () {
     make DESTDIR=$PKG_DEST install &&
-    ln -sfv libsudo_util.so.0.0.0 $PKG_DEST/usr/lib/sudo/libsudo_util.so.0
+    ln -sf libsudo_util.so.0.0.0 $PKG_DEST/usr/lib/sudo/libsudo_util.so.0
 
     cat > $PKG_DEST/etc/sudoers.d/00-sudo << "EOF"
 Defaults secure_path="/usr/sbin:/usr/bin"
 %wheel ALL="ALL" ALL
 EOF
 
-    mkdir -pv $PKG_DEST/etc/pam.d
+    mkdir -p $PKG_DEST/etc/pam.d
     cat > $PKG_DEST/etc/pam.d/sudo << "EOF"
 # Begin /etc/pam.d/sudo
 
diff --git a/repo/util/unzip.xibuild b/repo/util/unzip.xibuild
index 51bbff7..d3fea41 100644
--- a/repo/util/unzip.xibuild
+++ b/repo/util/unzip.xibuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MAKEDEPS="make"
-DEPS="bzip2 bash"
+DEPS="bzip2 sh"
 
 PKG_VER=60
 SOURCE=https://downloads.sourceforge.net/infozip/unzip$PKG_VER.tar.gz
diff --git a/repo/util/webfs.xibuild b/repo/util/webfs.xibuild
index 5b09682..ab76812 100644
--- a/repo/util/webfs.xibuild
+++ b/repo/util/webfs.xibuild
@@ -7,11 +7,14 @@ PKG_VER=1.21
 SOURCE=https://www.kraxel.org/releases/webfs/webfs-$PKG_VER.tar.gz
 DESC="A simple instant server for static http content"
 
+prepare () {
+    mv GNUmakefile Makefile
+}
+
 build() {
-    ./configure --prefix=/usr
     make
 }
 
 package () {
-    make DESTDIR=$PKG_DEST install 
+    make prefix=/usr DESTDIR=$PKG_DEST install 
 }
diff --git a/repo/util/wireless-tools.xibuild b/repo/util/wireless-tools.xibuild
index e461eb2..dc7e19f 100644
--- a/repo/util/wireless-tools.xibuild
+++ b/repo/util/wireless-tools.xibuild
@@ -13,6 +13,7 @@ ADDITIONAL="
 
 prepare () {
     sed -i "s/ldconfig/echo/g" Makefile
+    sed -i "s/ln -sfn/ln -sf/g" Makefile
     patch -Np1 -i wireless_tools-$PKG_VER-fix_iwlist_scanning-1.patch
 }
 
diff --git a/repo/util/wpa_supplicant.xibuild b/repo/util/wpa_supplicant.xibuild
index b79237e..a9dca1f 100644
--- a/repo/util/wpa_supplicant.xibuild
+++ b/repo/util/wpa_supplicant.xibuild
@@ -53,15 +53,19 @@ build () {
 }
 
 package () {
-    mkdir -pv $PKG_DEST/usr/sbin
-    mkdir -pv $PKG_DEST/usr/share/dbus-1/system-services
-    install -v -m755 wpa_{cli,passphrase,supplicant} $PKG_DEST/usr/sbin/ &&
-    install -v -m644 doc/docbook/wpa_supplicant.conf.5 $PKG_DEST/usr/share/man/man5/ &&
-    install -v -m644 doc/docbook/wpa_{cli,passphrase,supplicant}.8 $PKG_DEST/usr/share/man/man8/
-    install -v -m644 dbus/fi.w1.wpa_supplicant1.service \
+    mkdir -p $PKG_DEST/usr/sbin
+    mkdir -p $PKG_DEST/usr/share/dbus-1/system-services
+    install -m755 wpa_cli $PKG_DEST/usr/sbin/ &&
+    install -m755 wpa_passphrase $PKG_DEST/usr/sbin/ &&
+    install -m755 wpa_supplicant $PKG_DEST/usr/sbin/ &&
+    install -m644 doc/docbook/wpa_supplicant.conf.5 $PKG_DEST/usr/share/man/man5/ &&
+    install -m644 doc/docbook/wpa_cli.8 $PKG_DEST/usr/share/man/man8/
+    install -m644 doc/docbook/wpa_passphrase.8 $PKG_DEST/usr/share/man/man8/
+    install -m644 doc/docbook/wpa_supplicant.8 $PKG_DEST/usr/share/man/man8/
+    install -m644 dbus/fi.w1.wpa_supplicant1.service \
         $PKG_DEST/usr/share/dbus-1/system-services/ &&
-    install -v -d -m755 $PKG_DEST/etc/dbus-1/system.d &&
-    install -v -m644 dbus/dbus-wpa_supplicant.conf \
+    install -d -m755 $PKG_DEST/etc/dbus-1/system.d &&
+    install -m644 dbus/dbus-wpa_supplicant.conf \
                      $PKG_DEST/etc/dbus-1/system.d/wpa_supplicant.conf
     
     cd ..