shell will now default to dash asap

5 files changed, 98 insertions, 4 deletions

diff --git a/repo/util/bash.xibuild b/repo/util/bash.xibuild
index edb8748..fbaf390 100644
--- a/repo/util/bash.xibuild
+++ b/repo/util/bash.xibuild
@@ -14,12 +14,11 @@ build () {
 
 package () {
     make DESTDIR=$PKG_DEST install
-
-    # favouring dash as /bin/sh
-    #ln $PKG_DEST/usr/bin/bash $PKG_DEST/usr/bin/sh
 }
 
 postinstall () {
+    command -v bash || exit 1
+
     if [ -f /etc/shells ] || grep -vq "bash" /etc/shells; then
         echo "/bin/bash" >> /etc/shells
     fi
diff --git a/repo/util/dash.xibuild b/repo/util/dash.xibuild
index c85eeb8..a63eb4d 100644
--- a/repo/util/dash.xibuild
+++ b/repo/util/dash.xibuild
@@ -15,11 +15,13 @@ build () {
 package () {
     make DESTDIR=$PKG_DEST install
 
-
     ln -s dash $PKG_DEST/usr/bin/sh
 }
 
 postinstall () {
+    command -v grep || exit 1
+    command -v echo || exit 1
+
     if [ -f /etc/shells ] || grep -vq "dash" /etc/shells; then
         echo "/bin/bash" >> /etc/shells
     fi
diff --git a/repo/util/net-tools.xibuild b/repo/util/net-tools.xibuild
new file mode 100644
index 0000000..af7cf61
--- /dev/null
+++ b/repo/util/net-tools.xibuild
@@ -0,0 +1,70 @@
+#!/bin/sh
+
+MAKEDEPS="make "
+DEPS="pam libcap readline ncurses libxcrypt utmps iana-etc net-tools"
+
+PKG_VER=2.10
+SOURCE=https://downloads.sourceforge.net/project/net-tools/net-tools-$PKG_VER.tar.xz
+ADDITIONAL="
+    musl-fixes.patch
+"
+
+DESC="Linux networking base tools"
+
+prepare () {
+    apply_patches
+    cat > config.make <<EOF
+# I18N=0
+HAVE_AFUNIX=1
+HAVE_AFINET=1
+HAVE_AFINET6=1
+# HAVE_AFIPX=0
+# HAVE_AFATALK=0
+# HAVE_AFAX25=0
+HAVE_AFNETROM=1
+# HAVE_AFROSE=0
+# HAVE_AFX25=0
+# HAVE_AFECONET=0
+# HAVE_AFDECnet=0
+# HAVE_AFASH=0
+# HAVE_AFBLUETOOTH=0
+HAVE_HWETHER=1
+# HAVE_HWARC=0
+HAVE_HWSLIP=1
+HAVE_HWPPP=1
+HAVE_HWTUNNEL=1
+# HAVE_HWSTRIP=0
+# HAVE_HWTR=0
+# HAVE_HWAX25=0
+# HAVE_HWROSE=0
+HAVE_HWNETROM=1
+# HAVE_HWX25=0
+# HAVE_HWFR=0
+# HAVE_HWSIT=0
+# HAVE_HWFDDI=0
+# HAVE_HWHIPPI=0
+# HAVE_HWASH=0
+# HAVE_HWHDLCLAPB=0
+# HAVE_HWIRDA=0
+# HAVE_HWEC=0
+# HAVE_HWEUI64=0
+# HAVE_HWIB=0
+HAVE_FW_MASQUERADE=1
+HAVE_ARP_TOOLS=1
+HAVE_HOSTNAME_TOOLS=1
+HAVE_HOSTNAME_SYMLINKS=1
+HAVE_IP_TOOLS=1
+HAVE_MII=1
+HAVE_PLIP_TOOLS=1
+HAVE_SERIAL_TOOLS=1
+EOF
+	sed -n -e 's/^\(HAVE.*\)=\(.*\)/#define \1 \2/p' config.make > config.h
+}
+
+build () {
+    make
+}
+
+package () {
+    make DESTDIR=$PKG_DEST install 
+}
diff --git a/repo/util/procps-ng.xibuild b/repo/util/procps-ng.xibuild
index faae1e3..0bdcfd5 100644
--- a/repo/util/procps-ng.xibuild
+++ b/repo/util/procps-ng.xibuild
@@ -13,6 +13,7 @@ ADDITIONAL="
 
 prepare () {
     patch -Np1 -i use_utmpx.patch
+
     sed -i '1i#include <langinfo.h>' proc/escape.c
 }
 
diff --git a/repo/util/rhash.xibuild b/repo/util/rhash.xibuild
new file mode 100644
index 0000000..a35a820
--- /dev/null
+++ b/repo/util/rhash.xibuild
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+MAKEDEPS="make openssl"
+DEPS="musl"
+
+PKG_VER=1.4.2
+SOURCE=https://downloads.sourceforge.net/rhash/rhash-$PKG_VER-src.tar.gz
+DESC="Utility for calculation and verification of hash sums and magnet links"
+
+build () {
+    ./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--enable-openssl \
+		--disable-openssl-runtime
+
+    make
+}
+
+package () {
+    make DESTDIR=$PKG_DEST install
+}