shell will now default to dash asap

14 files changed, 169 insertions, 10 deletions

diff --git a/repo/system/guile.xibuild b/repo/system/guile.xibuild
index 7ad2514..5873f37 100644
--- a/repo/system/guile.xibuild
+++ b/repo/system/guile.xibuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MAKEDEPS="make "
-DEPS="gmp libltdl ncurses texinfo libunistring gc libffi"
+DEPS="gmp libtool ncurses texinfo libunistring gc libffi"
 
 
 PKG_VER=2.2.7
diff --git a/repo/system/jsoncpp.xibuild b/repo/system/jsoncpp.xibuild
new file mode 100644
index 0000000..01d3bb6
--- /dev/null
+++ b/repo/system/jsoncpp.xibuild
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+MAKEDEPS="make meson"
+DEPS="gcc musl"
+
+PKG_VER=1.9.5
+SOURCE=https://github.com/open-source-parsers/jsoncpp/archive/$PKG_VER.tar.gz
+DESC="JSON C++ library"
+
+build () {
+    mkdir build &&
+    cd build &&
+
+    meson --prefix=/usr \
+          --buildtype=release \
+          .. &&
+    ninja
+        
+}
+
+package () {
+    DESTDIR=$PKG_DEST ninja install
+}
+
+
diff --git a/repo/system/libarchive.xibuild b/repo/system/libarchive.xibuild
index 29c8095..c03c225 100644
--- a/repo/system/libarchive.xibuild
+++ b/repo/system/libarchive.xibuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-MAKEDEPS="make autoconf libtool libpth libiconv"
+MAKEDEPS="make autoconf libtool"
 DEPS="acl bzip2 expat lz4 openssl xz zlib zstd"
 
 PKG_VER=3.5.2
diff --git a/repo/system/libedit.xibuild b/repo/system/libedit.xibuild
new file mode 100644
index 0000000..b594d83
--- /dev/null
+++ b/repo/system/libedit.xibuild
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+MAKEDEPS="make automake autoconf"
+DEPS="musl ncurses"
+
+PKG_VER=20210910-3.1
+SOURCE=https://www.thrysoee.dk/editline/libedit-20210910-3.1.tar.gz
+DESC="BSD line editing library"
+
+prepare () {
+    autoreconf -fi
+}
+
+build () {
+    ./configure --prefix=/usr 
+    make
+}
+
+package () {
+    make DESTDIR=$PKG_DEST install
+}
+
+
diff --git a/repo/system/libgcrypt.xibuild b/repo/system/libgcrypt.xibuild
new file mode 100644
index 0000000..4c90552
--- /dev/null
+++ b/repo/system/libgcrypt.xibuild
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+MAKEDEPS="make"
+DEPS="musl libgpg-error"
+
+PKG_VER=1.9.4
+SOURCE=https://www.gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-$PKG_VER.tar.bz2
+DESC="General purpose crypto library based on the code used in GnuPG"
+
+build () {
+	./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--localstatedir=/var \
+		--enable-static
+    make
+}
+
+package () {
+    make DESTDIR=$PKG_DEST install
+}
+
+
diff --git a/repo/system/libgpg-error.xibuild b/repo/system/libgpg-error.xibuild
new file mode 100644
index 0000000..7498665
--- /dev/null
+++ b/repo/system/libgpg-error.xibuild
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+MAKEDEPS="make"
+DEPS="musl"
+
+PKG_VER=1.42
+SOURCE=https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-$PKG_VER.tar.bz2
+DESC="Support library for libgcrypt"
+
+prepare() {
+	default_prepare
+	aclocal
+	automake
+}
+
+build () {
+    ./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--localstatedir=/var \
+		--enable-static \
+		--disable-nls
+	make
+
+}
+
+package () {
+    make DESTDIR=$PKG_DEST install
+}
+
+
diff --git a/repo/system/libnsl.xibuild b/repo/system/libnsl.xibuild
new file mode 100644
index 0000000..051272b
--- /dev/null
+++ b/repo/system/libnsl.xibuild
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+MAKEDEPS="make autoconf automake gettext libtirpc libtool"
+DEPS="libintl libtirpc musl"
+
+PKG_VER=1.2.0
+SOURCE=https://github.com/thkukuk/libnsl/archive/v$PKG_VER.tar.gz
+
+DESC="Public client interface for NIS(YP) and NIS+ in a IPv6 ready version"
+
+prepare () {
+	autoreconf -vfi
+}
+
+build () {
+    ./configure --prefix=/usr     \
+            --sysconfdir=/etc \
+            --disable-static  &&
+    make
+}
+
+package () {
+    make DESTDIR=$PKG_DEST install 
+}
diff --git a/repo/system/libuv.xibuild b/repo/system/libuv.xibuild
new file mode 100644
index 0000000..b5e65b6
--- /dev/null
+++ b/repo/system/libuv.xibuild
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+MAKEDEPS="automake autoconf libtool make"
+DEPS="musl"
+
+PKG_VER=1.44.1
+SOURCE=https://dist.libuv.org/dist/v$PKG_VER/libuv-v$PKG_VER.tar.gz
+DESC="Cross-platform asychronous I/O"
+
+prepare () {
+    sh autogen.sh
+}
+
+build () {
+    ./configure --prefix=/usr 
+    make CFLAGS="$CFLAGS -D__USE_MISC" BUILDTYPE=Release
+}
+
+package () {
+    make DESTDIR=$PKG_DEST install
+}
+
+
diff --git a/repo/system/networkmanager.xibuild b/repo/system/networkmanager.xibuild
index 63400e0..f48cca3 100644
--- a/repo/system/networkmanager.xibuild
+++ b/repo/system/networkmanager.xibuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MAKEDEPS="grep meson ninja python intltool glib"
-DEPS="jansson libndp curl wpa_supplicant newt nss polkit libpsl audit dbus gobject-introspection dhcp"
+DEPS="jansson libndp curl wpa_supplicant newt nss polkit libpsl dbus gobject-introspection dhcp"
 
 PKG_VER=1.35.5
 SOURCE=https://download.gnome.org/sources/NetworkManager/${PKG_VER%.*}/NetworkManager-$PKG_VER.tar.xz
diff --git a/repo/system/pam.xibuild b/repo/system/pam.xibuild
index 7fdccff..2637e30 100644
--- a/repo/system/pam.xibuild
+++ b/repo/system/pam.xibuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MAKEDEPS="make automake"
-DEPS="musl audit libxcrypt"
+DEPS="musl libxcrypt"
 
 PKG_VER=1.5.2
 SOURCE=https://github.com/linux-pam/linux-pam/releases/download/v$PKG_VER/Linux-PAM-$PKG_VER.tar.xz
diff --git a/repo/system/perl.xibuild b/repo/system/perl.xibuild
index 821a1f5..f31b57f 100644
--- a/repo/system/perl.xibuild
+++ b/repo/system/perl.xibuild
@@ -11,8 +11,8 @@ prepare () {
     export BUILD_ZLIB=False
     export BUILD_BZIP2=0
     export CF_OLD=$CFLAGS
-    export CFLAGS+=" -DNO_POSIX_2008_LOCALE"
-    export CFLAGS+=" -D_GNU_SOURCE"
+    export CFLAGS="$CFLAGS -DNO_POSIX_2008_LOCALE"
+    export CFLAGS="$CFLAGS -D_GNU_SOURCE"
 
     rm -rf cpan/Compress-Raw-Zlib/zlib-src
     sed -i '/\(bzip2\|zlib\)-src/d' MANIFEST
diff --git a/repo/system/sh.xibuild b/repo/system/sh.xibuild
new file mode 100644
index 0000000..db37812
--- /dev/null
+++ b/repo/system/sh.xibuild
@@ -0,0 +1,6 @@
+#!/bin/sh
+DEPS="dash"
+MAKEDEPS=""
+
+DESC="The system shell"
+
diff --git a/repo/system/shadow.xibuild b/repo/system/shadow.xibuild
index 6518971..9441221 100644
--- a/repo/system/shadow.xibuild
+++ b/repo/system/shadow.xibuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MAKEDEPS="make "
-DEPS="acl audit libcap libxcrypt"
+DEPS="acl libcap libxcrypt"
 
 PKG_VER=4.11.1
 
diff --git a/repo/system/utmps.xibuild b/repo/system/utmps.xibuild
index c92c210..c5c5922 100644
--- a/repo/system/utmps.xibuild
+++ b/repo/system/utmps.xibuild
@@ -4,7 +4,7 @@ MAKEDEPS=""
 DEPS="skalibs"
 
 PKG_VER=0.1.1.0
-SOURCE=https://skarnet.org/software/utmps/utmps-0.1.1.0.tar.gz
+SOURCE=https://skarnet.org/software/utmps/utmps-$PKG_VER.tar.gz
 
 DESC="Library implementing utmpx.h family of functions"
 
@@ -22,7 +22,6 @@ package () {
     make DESTDIR=$PKG_DEST install
     ln -s utmps/utmpx.h $PKG_DEST/usr/include/utmpx.h
     install -d $PKG_DEST/usr/lib/pkgconfig
-
     cat > $PKG_DEST/usr/lib/pkgconfig/utmps.pc << EOF
 Name: utmps
 Description: A secure implementation of the utmp mechanism.
@@ -37,9 +36,12 @@ EOF
 }
 
 postinstall () {
+    # check that shadow exists
+    command -v useradd || exit 1
+    command -v chown || exit 1
+
     useradd -c "utmps user" -d /run/utmps \
         -u 984 -g utmp -s /bin/false utmp
     [ -d /var/log/utmps ] || mkdir -p /var/log/utmps
     chown -R utmp:utmp /var/log/utmps
-    
 }