fixed network manager

31 files changed, 636 insertions, 49 deletions

diff --git a/repo/apps/vim.xibuild b/repo/apps/vim.xibuild
index 3079058..d396eb2 100644
--- a/repo/apps/vim.xibuild
+++ b/repo/apps/vim.xibuild
@@ -3,7 +3,7 @@
 MAKEDEPS="make "
 DEPS="gpm acl musl libgcrypt pcre2 zlib"
 
-PKG_VER=8.2.4257
+PKG_VER=8.2.4656
 SOURCE=https://github.com/vim/vim/archive/refs/tags/v$PKG_VER.tar.gz
 DESC="Vi Improved"
 
@@ -18,7 +18,7 @@ build () {
 
 
 package () {
-    make DESTDIR=$PKG_DEST install 
+    make -j1 DESTDIR=$PKG_DEST install 
     mkdir -p $PKG_DEST/etc
     cat > $PKG_DEST/etc/vimrc << "EOF"
 " Begin /etc/vimrc
diff --git a/repo/apps/xterm.xibuild b/repo/apps/xterm.xibuild
index 09b5b6b..a6d6a52 100644
--- a/repo/apps/xterm.xibuild
+++ b/repo/apps/xterm.xibuild
@@ -7,8 +7,12 @@ DESC="X Terminal Emulator"
 
 PKG_VER=370
 SOURCE=https://invisible-mirror.net/archives/xterm/xterm-$PKG_VER.tgz
+ADDITIONAL="
+    posix-ptys.patch
+"
 
 prepare () {
+    apply_pacthes
     sed -i '/v0/{n;s/new:/new:kb=^?:/}' termcap &&
     printf '\tkbs=\\177,\n' >> terminfo &&
 
@@ -16,7 +20,27 @@ prepare () {
 }
 
 build () {
-    ./configure $XORG_CONFIG 
+    ./configure $XORG_CONFIG \
+        --with-tty-group=tty \
+        --enable-ansi-color \
+        --enable-88-color \
+        --enable-256-color \ 
+        --enable-broken-st \
+        --enable-broken-osc \
+        --enable-load-vt-fonts \
+        --enable-i18n \
+        --enable-wide-chars \
+        --enable-doublechars \
+        --enable-warnings \
+        --enable-tcap-query \ 
+        --enable-logging \
+        --enable-dabbrev \ 
+        --enable-freetype \
+        --enable-luit \
+        --enable-mini-luit \ 
+        --enable-narrowproto \
+        --enable-exec-xterm \
+        --with-utempter
     make
 }
 
diff --git a/repo/devel/gdb.xibuild b/repo/devel/gdb.xibuild
index 055576e..31d9b7c 100644
--- a/repo/devel/gdb.xibuild
+++ b/repo/devel/gdb.xibuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MAKEDEPS="make expat guile ncurses python xz texinfo"
-DEPS="python-six doxygen gcc guile python rustc valgrind systemtap"
+DEPS="python-six doxygen gcc guile rustc python valgrind systemtap"
 
 PKG_VER=11.2
 SOURCE=https://ftp.gnu.org/gnu/gdb/gdb-$PKG_VER.tar.xz
diff --git a/repo/devel/vala.xibuild b/repo/devel/vala.xibuild
new file mode 100644
index 0000000..a457cca
--- /dev/null
+++ b/repo/devel/vala.xibuild
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+MAKEDEPS="libxslt bash flex bison gobject-introspection graphviz"
+DEPS="glib graphviz musl pkgconf"
+
+PKG_VER=0.54.7
+SOURCE=https://download.gnome.org/sources/vala/${PKG_VER%.*}/vala-$PKG_VER.tar.xz
+DESC="Compiler for the GObject type system"
+
+prepare () {
+	sed -i "/constants\/member-access/d" \
+		tests/Makefile.in
+}
+
+build () {
+    ./configure \
+		--prefix=/usr
+	make
+
+}
+package () {
+    make DESTDIR=$PKG_DEST install
+}
diff --git a/repo/python/python-gobject.xibuild b/repo/python/python-gobject.xibuild
new file mode 100644
index 0000000..348724a
--- /dev/null
+++ b/repo/python/python-gobject.xibuild
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+MAKEDEPS="python python-cairo libffi"
+DEPS="python libffi cairo glib gobject-introspection musl"
+
+PKG_VER=3.42.0
+SOURCE=https://download.gnome.org/sources/pygobject/${PKG_VER%.*}/pygobject-$PKG_VER.tar.xz
+DESC="Python bindings for the GObject library"
+
+build() {
+    mkdir build &&
+    cd build
+
+    meson \
+		-Dpython=python3 \
+		.. 
+
+    ninja
+}
+
+package () {
+    DESTDIR=$PKG_DEST ninja install
+}
diff --git a/repo/skip/ppp.xibuild b/repo/skip/ppp.xibuild
new file mode 100644
index 0000000..b6db516
--- /dev/null
+++ b/repo/skip/ppp.xibuild
@@ -0,0 +1,78 @@
+#!/bin/sh
+
+MAKEDEPS="linux-headers libpcap"
+DEPS="musl"
+
+PKG_VER=2.4.9
+SOURCE=https://github.com/paulusmack/ppp/archive/ppp-$PKG_VER.tar.gz
+
+ADDITIONAL="
+0011-build-sys-don-t-put-connect-errors-log-to-etc-ppp.patch
+fix-paths.patch
+fix-pppd-magic.h.patch
+musl-fix-headers.patch
+pppd.initd
+
+"
+
+DESC="A daemon which implements the PPP protocol for dial-up networking"
+
+prepare () {
+    apply_patches
+    # bug about missing sys/cdefs.h
+    find ./ -name "*.c" -o -name "*.h" | xargs sed -i "s/__BEGIN_DECLS/#ifdef __cplusplus\nextern \"C\" {\n#endif/g"
+    find ./ -name "*.c" -o -name "*.h" | xargs sed -i "s/__END_DECLS/#ifdef __cplusplus\n}\n#endif/g"
+    find ./ -name "*.c" -o -name "*.h" | xargs sed -i "s,#include <sys/cdefs.h>,,g"
+}
+
+build () {
+    # fix CFLAGS
+	# -D_GNU_SOURCE is needed for IPv6 to work apparently
+	export CFLAGS="$CFLAGS -D_GNU_SOURCE"
+	sed -i "s:-O2 -pipe -Wall -g:${CFLAGS}:" pppd/Makefile.linux
+	sed -i "s:-g -O2:${CFLAGS}:" pppd/plugins/Makefile.linux
+	sed -i "s:-O2:${CFLAGS}:" pppstats/Makefile.linux
+	sed -i "s:-O2 -g -pipe:${CFLAGS}:" chat/Makefile.linux
+	sed -i "s:-O:${CFLAGS}:" pppdump/Makefile.linux
+	# enable active filter
+	sed -i "s:^#FILTER=y:FILTER=y:" pppd/Makefile.linux
+	# enable ipv6 support
+	sed -i "s:^#HAVE_INET6=y:HAVE_INET6=y:" pppd/Makefile.linux
+	# Enable Microsoft proprietary Callback Control Protocol
+	sed -i "s:^#CBCP=y:CBCP=y:" pppd/Makefile.linux
+	sed -i "s:^#CBCP=y:CBCP=y:" pppd/Makefile.linux
+	sed -i "s:^#USE_CRYPT=y:USE_CRYPT=y:" pppd/Makefile.linux
+	./configure \
+		--prefix=/usr \
+		--localstatedir=/var
+	make COPTS="$CFLAGS"
+
+}
+
+package () {
+    make INSTROOT=$PKG_DEST install
+	install -Dm644 include/net/ppp_defs.h \
+		$PKG_DEST/usr/include/net/ppp_defs.h
+	install -D -m755 ip-up $PKG_DEST/etc/ppp/ip-up
+	install -D -m755 ip-down $PKG_DEST/etc/ppp/ip-down
+	install -D -m755 pppd.initd $PKG_DEST/etc/init.d/pppd
+	install -D -m644 etc.ppp/options $PKG_DEST/etc/ppp/options
+	install -D -m600 etc.ppp/pap-secrets $PKG_DEST/etc/ppp/pap-secrets
+	install -D -m600 etc.ppp/chap-secrets $PKG_DEST/etc/ppp/chap-secrets
+
+	# busybox ifup/ifdown needs pon/poff
+	install -D -m644 scripts/pon.1 $PKG_DEST/usr/share/man/man1/pon.1
+	install -D -m755 scripts/pon $PKG_DEST/usr/bin/pon
+	install -D -m755 scripts/poff $PKG_DEST/usr/bin/poff
+
+	install -d $PKG_DEST/usr/share/doc/ppp
+	for i in scripts/*; do
+		case $i in
+		pon|poff|*.1) continue;
+		esac
+		if [ -f "$i" ]; then
+			cp $i $PKG_DEST/usr/share/doc/ppp/
+		fi
+	done
+	install -d $PKG_DEST/etc/ppp/peers
+}
diff --git a/repo/system/cacerts.xibuild b/repo/system/cacerts.xibuild
index 9c0198d..9fef8e1 100644
--- a/repo/system/cacerts.xibuild
+++ b/repo/system/cacerts.xibuild
@@ -22,4 +22,9 @@ package () {
     mkdir -p $PKG_DEST/etc/ssl/certs
     bash make-ca -g --force -D $PKG_DEST
     chmod -R 777 $PKG_DEST || echo "couldnt change permissions for $PKG_DEST"
+
+    install -d $PKG_DEST/usr/bin
+    install -d $PKG_DEST/usr/libexec/make-ca
+    install -m755 make-ca $PKG_DEST/usr/bin/
+    install -m700 copy-trust-modifications $PKG_DEST/usr/libexec/make-ca
 }
diff --git a/repo/system/cairo.xibuild b/repo/system/cairo.xibuild
new file mode 100644
index 0000000..4bc7041
--- /dev/null
+++ b/repo/system/cairo.xibuild
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+MAKEDEPS="make"
+DEPS="musl libx11 freetype libpng libxcb libxext libxrender pixman zlib glib"
+
+PKG_VER=1.17.4
+SOURCE=https://cairographics.org/snapshots/cairo-$PKG_VER.tar.xz
+DESC="A vector graphics library"
+
+ADDITIONAL="
+fix-mask-usage-in-image-compositor.patch
+musl-stacksize.patch
+pdf-font-subset-Generate-valid-font-names.patch
+"
+
+build () {
+    ./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--enable-ft \
+		--enable-gobject \
+		--enable-pdf \
+		--enable-png \
+		--enable-ps \
+		--enable-svg \
+		--enable-tee \
+		--enable-x \
+		--enable-xcb \
+		--enable-xcb-shm \
+		--enable-xlib \
+		--enable-xlib-xrender \
+		--disable-xlib-xcb
+	make
+}
+
+package () {
+    make DESTDIR=$PKG_DEST install 
+}
diff --git a/repo/system/glib.xibuild b/repo/system/glib.xibuild
index 2dcffeb..3b7a4c4 100644
--- a/repo/system/glib.xibuild
+++ b/repo/system/glib.xibuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MAKEDEPS="meson ninja docbook-xsl docbook-dtd"
-DEPS="pcre libffi zlib musl libxslt gdb "
+DEPS="pcre libffi zlib musl libxslt gdbm"
 
 PKG_VER=2.70.3
 SOURCE=https://download.gnome.org/sources/glib/$(echo $PKG_VER | cut -d. -f-2)/glib-$PKG_VER.tar.xz
diff --git a/repo/system/jansson.xibuild b/repo/system/jansson.xibuild
new file mode 100644
index 0000000..9f82843
--- /dev/null
+++ b/repo/system/jansson.xibuild
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+MAKEDEPS="make "
+DEPS="musl"
+
+PKG_VER=2.14
+SOURCE=https://github.com/akheron/jansson/releases/download/v$PKG_VER/jansson-$PKG_VER.tar.gz
+
+DESC="Library for encoding, decoding and manipulating JSON data"
+
+build () {
+    ./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localstatedir=/var
+	make
+}
+
+package () {
+    make DESTDIR=$PKG_DEST install
+}
+
diff --git a/repo/system/libluv.xibuild b/repo/system/libluv.xibuild
new file mode 100644
index 0000000..fabd348
--- /dev/null
+++ b/repo/system/libluv.xibuild
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+MAKEDEPS="make luajit"
+DEPS="musl libuv"
+
+PKG_VER=1.42.0-0
+SOURCE=https://github.com/luvit/luv/releases/download/$PKG_VER/luv-$PKG_VER.tar.gz
+DESC="Bare libuv bindings for lua"
+
+build() {
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=None \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DWITH_SHARED_LIBUV=ON \
+		-DLUA_BUILD_TYPE=System \
+		-DBUILD_MODULE=OFF \
+		-DBUILD_SHARED_LIBS=ON \
+		-DBUILD_STATIC_LIBS=OFF
+	cmake --build build
+}
+
+package() {
+	DESTDIR="$PKG_DEST" cmake --install build
+}
diff --git a/repo/system/libmbim.xibuild b/repo/system/libmbim.xibuild
new file mode 100644
index 0000000..8fe1d88
--- /dev/null
+++ b/repo/system/libmbim.xibuild
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+MAKEDEPS="make "
+DEPS="musl"
+
+PKG_VER=1.26.2
+SOURCE=https://www.freedesktop.org/software/libmbim/libmbim-$PKG_VER.tar.xz
+DESC="MBIM modem protocol helper library"
+
+build () {
+    ./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--disable-static \
+		--enable-introspection=yes
+	make
+}
+
+package () {
+    make DESTDIR=$PKG_DEST install 
+}
diff --git a/repo/system/libmpack.xibuild b/repo/system/libmpack.xibuild
new file mode 100644
index 0000000..3685876
--- /dev/null
+++ b/repo/system/libmpack.xibuild
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+MAKEDEPS="make "
+DEPS="musl"
+
+PKG_VER=1.0.5
+SOURCE=https://github.com/libmpack/libmpack/archive/$PKG_VER.tar.gz
+DESC="Simple implementation of msgpack in C"
+
+build () {
+    make
+}
+
+package () {
+    make DESTDIR=$PKG_DEST PREFIX=/usr install 
+}
diff --git a/repo/system/libqmi.xibuild b/repo/system/libqmi.xibuild
new file mode 100644
index 0000000..7439f1f
--- /dev/null
+++ b/repo/system/libqmi.xibuild
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+MAKEDEPS="make gtk-doc glib libgudev "
+DEPS="musl libqrtr libmbim "
+
+PKG_VER=1.30.4
+SOURCE=https://www.freedesktop.org/software/libqmi/libqmi-$PKG_VER.tar.xz
+DESC="QMI modem protocol helper library"
+
+build () {
+    ./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--disable-static \
+		--enable-mbim-qmux \
+		--enable-qrtr \
+		--enable-gtk-doc
+	make
+}
+
+package () {
+    make DESTDIR=$PKG_DEST install 
+}
diff --git a/repo/system/libqrtr.xibuild b/repo/system/libqrtr.xibuild
new file mode 100644
index 0000000..7c4de5a
--- /dev/null
+++ b/repo/system/libqrtr.xibuild
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+MAKEDEPS="glib gobject-introspection gtk-doc linux-headers meson"
+DEPS="musl glib"
+
+PKG_VER=1.2.2
+SOURCE=https://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib/-/archive/$PKG_VER/libqrtr-glib-$PKG_VER.tar.gz
+DESC="Qualcomm IPC Router protocol helper library"
+
+build () {
+    mkdir build &&
+    cd build
+    meson --prefix=/usr ..
+    ninja 
+}
+
+package () {
+    DESTDIR=$PKG_DEST ninja install 
+}
diff --git a/repo/system/libtermkey.xibuild b/repo/system/libtermkey.xibuild
new file mode 100644
index 0000000..b73a16e
--- /dev/null
+++ b/repo/system/libtermkey.xibuild
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+MAKEDEPS="make "
+DEPS="musl"
+
+PKG_VER=0.22
+SOURCE=http://www.leonerd.org.uk/code/libtermkey/libtermkey-$PKG_VER.tar.gz
+DESC="Library for easy processing of keyboard entry from terminal-based programs"
+
+build () {
+    make PREFIX=/usr
+}
+
+package () {
+    make PREFIX=/usr DESTDIR=$PKG_DEST install 
+}
diff --git a/repo/system/libuv.xibuild b/repo/system/libuv.xibuild
index b5e65b6..976b2b9 100644
--- a/repo/system/libuv.xibuild
+++ b/repo/system/libuv.xibuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-MAKEDEPS="automake autoconf libtool make"
+MAKEDEPS="make "
 DEPS="musl"
 
 PKG_VER=1.44.1
@@ -12,12 +12,15 @@ prepare () {
 }
 
 build () {
-    ./configure --prefix=/usr 
-    make CFLAGS="$CFLAGS -D__USE_MISC" BUILDTYPE=Release
+    ./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--localstatedir=/var
+	make BUILDTYPE=Release
+
 }
 
 package () {
-    make DESTDIR=$PKG_DEST install
+    	make DESTDIR="$PKG_DEST" install
 }
-
-
diff --git a/repo/system/libvterm.xibuild b/repo/system/libvterm.xibuild
new file mode 100644
index 0000000..d212ccc
--- /dev/null
+++ b/repo/system/libvterm.xibuild
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+MAKEDEPS="make "
+DEPS="musl"
+
+PKG_VER=0.1.4
+SOURCE=http://www.leonerd.org.uk/code/libvterm/libvterm-$PKG_VER.tar.gz
+DESC="Abstract library implementation of a VT220/xterm/ECMA-48 terminal emulator"
+
+build () {
+    make PREFIX=/usr
+}
+
+package () {
+    make PREFIX=/usr DESTDIR="$PKG_DEST/" install
+	rm -f $PKG_DEST/usr/lib/*.a
+}
diff --git a/repo/system/mobile-broadband-provider-info.xibuild b/repo/system/mobile-broadband-provider-info.xibuild
new file mode 100644
index 0000000..618feb3
--- /dev/null
+++ b/repo/system/mobile-broadband-provider-info.xibuild
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+MAKEDEPS="autoconf automake libxml2 libxslt"
+DEPS="pkgconf"
+
+PKG_VER=20201225
+SOURCE=https://download.gnome.org/sources/mobile-broadband-provider-info/$PKG_VER/mobile-broadband-provider-info-$PKG_VER.tar.xz
+DESC="Mobile broadband settings for various service providers"
+
+build () {
+    ./configure --prefix=/usr --disable-static &&
+    make
+}
+
+package () {
+    make DESTDIR=$PKG_DEST install
+}
+
diff --git a/repo/system/modemmanager.xibuild b/repo/system/modemmanager.xibuild
new file mode 100644
index 0000000..b2d5c5d
--- /dev/null
+++ b/repo/system/modemmanager.xibuild
@@ -0,0 +1,50 @@
+#!/bin/sh
+
+MAKEDEPS="gobject-introspection gtk-doc vala libgudev polkit libmbim libqmi linux-headers"
+DEPS="dbus musl glib polkit"
+
+PKG_VER=1.18.6
+SOURCE=https://www.freedesktop.org/software/ModemManager/ModemManager-$PKG_VER.tar.xz
+
+ADDITIONAL="
+modemmanager.initd
+modemmanager.rules
+"
+
+DESC="ModemManager library"
+
+build () {
+    ./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localstatedir=/var \
+		--with-polkit=permissive \
+		--enable-plugin-qcom-soc \
+		--enable-gtk-doc \
+		--disable-static \
+		--enable-vala=yes \
+		--with-systemd-suspend-resume=yes
+	make
+
+
+
+}
+
+package () {
+    make DESTDIR="$PKG_DEST" install
+	rm -rf "$PKG_DEST"/usr/share/dbus-1/system-services #systemd-service
+	mkdir -p "$PKG_DEST/usr/share/polkit-1/rules.d"
+	install -m644 -D "modemmanager.rules" \
+		"$PKG_DEST/usr/share/polkit-1/rules.d/01-org.freedesktop.ModemManager.rules"
+	install -m755 -D "modemmanager.initd" \
+		"$PKG_DEST/etc/init.d/modemmanager"
+	mkdir -p "$PKG_DEST/usr/share/doc/modemmanager"
+	cat > $PKG_DEST/usr/share/doc/modemmanager/README <<EOF
+If your USB modem shows up as a Flash drive when you plug it in:
+
+install 'usb-modeswitch' to automatically switch to USB modem mode whenever you plug it in.
+To control your modem without the root password: add your user account to the 'plugdev' group.
+EOF
+}
diff --git a/repo/system/msgpack-c.xibuild b/repo/system/msgpack-c.xibuild
new file mode 100644
index 0000000..e0f8b8f
--- /dev/null
+++ b/repo/system/msgpack-c.xibuild
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+MAKEDEPS="make "
+DEPS="musl"
+
+PKG_VER=4.0.0
+SOURCE=https://github.com/msgpack/msgpack-c/releases/download/c-$PKG_VER/msgpack-c-$PKG_VER.tar.gz
+DESC="An efficient object serialization library for C"
+
+build () {
+    cmake -G Ninja -B build . \
+		-DCMAKE_BUILD_TYPE=MinSizeRel \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_VERBOSE_MAKEFILE=TRUE
+	cmake --build build
+}
+
+package () {
+    DESTDIR="$PKG_DEST" cmake --install build
+}
diff --git a/repo/system/musl.xibuild b/repo/system/musl.xibuild
index d986ae7..13879f0 100644
--- a/repo/system/musl.xibuild
+++ b/repo/system/musl.xibuild
@@ -23,6 +23,7 @@ prepare () {
 }
 
 build () {
+    CARCH=x86_64
     LDFLAGS="$LDFLAGS -Wl,-soname,libc.musl-${CARCH}.so.1" \
 ./configure --prefix=/usr \
             --sysconfdir=/etc \
diff --git a/repo/system/networkmanager.xibuild b/repo/system/networkmanager.xibuild
index c2c8fbd..05fd136 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 dbus gobject-introspection dhcp"
+DEPS="libndp curl wpa_supplicant newt nss polkit libpsl dbus gobject-introspection dhcp eudev libintl modemmanager nspr mobile-broadband-provider-info python-gobject"
 
 PKG_VER=1.35.5
 SOURCE=https://download.gnome.org/sources/NetworkManager/${PKG_VER%.*}/NetworkManager-$PKG_VER.tar.xz
@@ -23,21 +23,31 @@ prepare () {
 build () {
     mkdir build &&
     cd    build &&
-
-    meson --prefix=/usr              \
-          --buildtype=release        \
-          -Dlibaudit=no              \
-          -Dlibpsl=false             \
-          -Dnmtui=true               \
-          -Dovs=false                \
-          -Dppp=false                \
-          -Dselinux=false            \
-          -Dsession_tracking=elogind \
-          -Dmodem_manager=false      \
-          -Dsystemdsystemunitdir=no  \
-          -Dsystemd_journal=false    \
-          -Dqt=false                 \
-          .. &&
+    meson \
+        --prefix=/usr \
+		-Dsystemdsystemunitdir=no \
+		-Dudev_dir=/lib/udev \
+		-Dmodify_system=true \
+		-Dselinux=false \
+		-Dsystemd_journal=false \
+		-Dlibaudit=no \
+		-Diwd=true \
+		-Dppp=false \
+		-Dconfig_plugins_default=ifupdown \
+		-Difupdown=true \
+		-Ddhcpcd=true \
+		-Dconfig_dhcp_default=internal \
+		-Dvapi=true \
+		-Dtests="no" \
+		-Dpolkit=true \
+		-Dsession_tracking=no \
+		-Dqt=false \
+        -Dovs=false \
+		-Dofono=true \
+		-Dcrypto=nss \
+		-Ddbus_conf_dir=/usr/share/dbus-1/system.d \
+		-Ddocs=false \
+		.. 
     ninja
 }
 
diff --git a/repo/system/openrc.xibuild b/repo/system/openrc.xibuild
index ac23b5e..f60598f 100644
--- a/repo/system/openrc.xibuild
+++ b/repo/system/openrc.xibuild
@@ -29,6 +29,7 @@ ADDITIONAL="
 	sysctl.initd
 	machine-id.initd
 	test-networking.sh
+    rc.conf
 "
 
 DESC="Dependency based init system that works with sysvinit"
@@ -102,6 +103,8 @@ package () {
       ln -sf agetty $PKG_DEST/etc/init.d/agetty.$x
     done
 
+    rm $PKG_DEST/etc/rc.conf
+	install -m644 rc.conf $PKG_DEST/etc/rc.conf
 }
 
 postinstall () {
diff --git a/repo/system/pcre.xibuild b/repo/system/pcre.xibuild
index 89ef437..c92f242 100644
--- a/repo/system/pcre.xibuild
+++ b/repo/system/pcre.xibuild
@@ -8,7 +8,7 @@ SOURCE=https://sourceforge.net/projects/pcre/files/pcre/$PKG_VER/pcre-$PKG_VER.t
 DESC="A library that implements regular expressions in a perl style (old version)"
 
 build () {
-    CC=gcc ./configure --prefix=/usr 
+    CC=gcc ./configure --prefix=/usr --enable-utf --enable-unicode-properties
     make
 }
 
diff --git a/repo/system/pcre2.xibuild b/repo/system/pcre2.xibuild
index 770ad58..46e35e9 100644
--- a/repo/system/pcre2.xibuild
+++ b/repo/system/pcre2.xibuild
@@ -8,7 +8,7 @@ SOURCE=https://github.com/PhilipHazel/pcre2/releases/download/pcre2-$PKG_VER/pcr
 DESC="A library that implements regular expressions in a perl style"
 
 build () {
-    CC=gcc ./configure --prefix=/usr 
+    CC=gcc ./configure --prefix=/usr --enable-utf --enable-unicode-properties
     make
 }
 
diff --git a/repo/system/pcsc-lite.xibuild b/repo/system/pcsc-lite.xibuild
new file mode 100644
index 0000000..86d86d1
--- /dev/null
+++ b/repo/system/pcsc-lite.xibuild
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+MAKEDEPS="make perl lipcap-ng"
+DEPS="musl sbase eudev"
+
+PKG_VER=1.9.4
+SOURCE=https://pcsclite.apdu.fr/files/pcsc-lite-$PKG_VER.tar.bz2
+DESC="Middleware to access a smart card using SCard API (PC/SC)"
+
+build () {
+    ./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localstatedir=/var \
+		--disable-libusb \
+		--enable-libudev \
+		--disable-maintainer-mode \
+		--disable-silent-rules \
+		--without-systemdsystemunitdir \
+		--enable-ipcdir=/run/pcscd \
+		--enable-usbdropdir=/usr/lib/pcsc/drivers \
+		--disable-libsystemd \
+		--disable-polkit
+    make
+}
+
+package () {
+    make DESTDIR=$PKG_DEST install
+}
diff --git a/repo/system/unibilium.xibuild b/repo/system/unibilium.xibuild
new file mode 100644
index 0000000..9c170f7
--- /dev/null
+++ b/repo/system/unibilium.xibuild
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+MAKEDEPS="make "
+DEPS="musl"
+
+PKG_VER=2.1.1
+SOURCE=https://github.com/neovim/unibilium/archive/v$PKG_VER.tar.gz
+DESC="Terminfo parsing library"
+
+build () {
+    make PREFIX=/usr
+}
+
+check () {
+    make test
+}
+
+package () {
+    make PREFIX=/usr DESTDIR=$PKG_DEST install 
+}
diff --git a/repo/util/graphviz.xibuild b/repo/util/graphviz.xibuild
new file mode 100644
index 0000000..1a701b2
--- /dev/null
+++ b/repo/util/graphviz.xibuild
@@ -0,0 +1,60 @@
+#!/bin/sh
+
+MAKEDEPS="make flex swig m4 libtool libxaw bison lua tcl autoconf automake bash"
+DEPS="cairo expat glib libx11 musl pango zlib"
+
+PKG_VER=2.50.0
+SOURCE=https://gitlab.com/graphviz/graphviz/-/archive/$PKG_VER/graphviz-$PKG_VER.tar.gz
+DESC="Graph Visualization Tools"
+
+
+prepare () {
+	./autogen.sh NOCONFIG
+}
+
+build () {
+    	CONFIG_SHELL=/bin/bash \
+	LIBPOSTFIX=/ \
+	LUA=lua \
+	./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--disable-silent-rules \
+		--disable-static \
+		--disable-dependency-tracking \
+		--enable-ltdl \
+		--enable-sharp=no \
+		--enable-go=no \
+		--enable-guile=no \
+		--enable-java=no \
+		--enable-lua=yes \
+		--enable-ocaml=no \
+		--enable-perl=no \
+		--enable-php=no \
+		--enable-python=yes \
+		--enable-r=no \
+		--enable-ruby=no \
+		--enable-tcl=no \
+		--with-x \
+		--with-rsvg=yes \
+		--with-pangocairo=yes \
+		--with-gdk-pixbuf=yes \
+		--with-libgd=no \
+		--with-ipsepcola=yes
+
+		sed -i -e '/HAVE_SINCOS/d' config.h
+
+	make
+
+}
+
+package () {
+    make -j1 DESTDIR="$PKG_DEST" \
+    pkgconfigdir=/usr/lib/pkgconfig \
+    install
+
+	mkdir -p "$PKG_DEST"/usr/share/doc
+	mv "$PKG_DEST"/usr/share/graphviz/doc \
+		"$PKG_DEST"/usr/share/doc/graphviz
+
+}
diff --git a/repo/util/wpa_supplicant.xibuild b/repo/util/wpa_supplicant.xibuild
index 1b5184a..a1fb282 100644
--- a/repo/util/wpa_supplicant.xibuild
+++ b/repo/util/wpa_supplicant.xibuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-MAKEDEPS="make libxml2"
+MAKEDEPS="make libxml2 pcsc-lite"
 DEPS="libnl openssl readline dbus"
 
 PKG_VER=2.10
@@ -17,34 +17,50 @@ wpa_supplicant.initd
 
 prepare () {
     cat > wpa_supplicant/.config << "EOF"
-CONFIG_BACKEND=file
-CONFIG_CTRL_IFACE=y
-CONFIG_DEBUG_FILE=y
-CONFIG_DEBUG_SYSLOG=y
-CONFIG_DEBUG_SYSLOG_FACILITY=LOG_DAEMON
-CONFIG_DRIVER_NL80211=y
 CONFIG_DRIVER_WEXT=y
+CONFIG_DRIVER_NL80211=y
+CONFIG_LIBNL32=y
 CONFIG_DRIVER_WIRED=y
-CONFIG_EAP_GTC=y
-CONFIG_EAP_LEAP=y
+CONFIG_IEEE8021X_EAPOL=y
 CONFIG_EAP_MD5=y
 CONFIG_EAP_MSCHAPV2=y
-CONFIG_EAP_OTP=y
-CONFIG_EAP_PEAP=y
 CONFIG_EAP_TLS=y
+CONFIG_EAP_PEAP=y
 CONFIG_EAP_TTLS=y
-CONFIG_IEEE8021X_EAPOL=y
-CONFIG_IPV6=y
-CONFIG_LIBNL32=y
-CONFIG_PEERKEY=y
+CONFIG_EAP_FAST=y
+CONFIG_EAP_GTC=y
+CONFIG_EAP_OTP=y
+CONFIG_EAP_SIM=y
+CONFIG_EAP_PSK=y
+CONFIG_EAP_PWD=y
+CONFIG_EAP_PAX=y
+CONFIG_EAP_LEAP=y
+CONFIG_EAP_AKA=y
+CONFIG_EAP_AKA_PRIME=y
+CONFIG_WPS=y
 CONFIG_PKCS12=y
-CONFIG_READLINE=y
 CONFIG_SMARTCARD=y
-CONFIG_WPS=y
-CFLAGS += -I/usr/include/libnl3
-CONFIG_CTRL_IFACE_DBUS=y
+CONFIG_PCSC=y
+CONFIG_HT_OVERRIDES=y
+CONFIG_VHT_OVERRIDES=y
+CONFIG_IPV6=y
+CONFIG_CTRL_IFACE=y
+CONFIG_WPA_CLI_EDIT=y
+CONFIG_SAE=y
+CONFIG_BACKEND=file
+CONFIG_IEEE80211W=y
+CONFIG_TLS=openssl
+CONFIG_TLSV11=y
+CONFIG_TLSV12=y
 CONFIG_CTRL_IFACE_DBUS_NEW=y
 CONFIG_CTRL_IFACE_DBUS_INTRO=y
+CONFIG_DELAYED_MIC_ERROR_REPORT=y
+CONFIG_AP=y
+CONFIG_P2P=y
+CONFIG_AUTOSCAN_PERIODIC=y
+CONFIG_IBSS_RSN=y
+CONFIG_BGSCAN_SIMPLE=y
+
 EOF
 
 }
diff --git a/repo/xi/xipkg.xibuild b/repo/xi/xipkg.xibuild
index 7c82593..06ad176 100644
--- a/repo/xi/xipkg.xibuild
+++ b/repo/xi/xipkg.xibuild
@@ -3,7 +3,7 @@
 MAKEDEPS="make"
 DEPS="openssl curl dash xiutils findutils diffutils sed xichroot grep base64"
 
-PKG_VER=1.1.4
+PKG_VER=1.1.6
 SOURCE=https://git.davidovski.xyz/xilinux/xipkg.git
 BRANCH="v$PKG_VER"