diff options
31 files changed, 335 insertions, 32 deletions
diff --git a/repo/devel/bison.xibuild b/repo/devel/bison.xibuild index 8624062..2f96141 100644 --- a/repo/devel/bison.xibuild +++ b/repo/devel/bison.xibuild @@ -12,10 +12,6 @@ build () { make } -check () { - make check -} - package () { make DESTDIR=$PKG_DEST install } diff --git a/repo/devel/clang.xibuild b/repo/devel/clang.xibuild index f917868..8ee7c38 100644 --- a/repo/devel/clang.xibuild +++ b/repo/devel/clang.xibuild @@ -1,6 +1,6 @@ #!/bin/sh -MAKEDEPS="cmake llvm libxml2 ninja python3 python-markupsafe python-pygments" +MAKEDEPS="cmake llvm libxml2 ninja python python-markupsafe python-pygments" DEPS="curl gcc libssh2 openssl" PKG_VER=13.0.1 diff --git a/repo/devel/flex.xibuild b/repo/devel/flex.xibuild index 623f963..abf55f4 100644 --- a/repo/devel/flex.xibuild +++ b/repo/devel/flex.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="make help2man" -DEPS="musl m4 sh libiconv" +DEPS="musl m4 sh" PKG_VER=2.6.4 SOURCE=https://github.com/westes/flex/releases/download/v$PKG_VER/flex-$PKG_VER.tar.gz diff --git a/repo/devel/gcc.xibuild b/repo/devel/gcc.xibuild index 25e2ad5..e0176cb 100644 --- a/repo/devel/gcc.xibuild +++ b/repo/devel/gcc.xibuild @@ -1,6 +1,6 @@ #!/bin/sh -MAKEDEPS="grep make dejagnu inetutils flex" +MAKEDEPS="grep make dejagnu flex" DEPS="zstd musl binutils mpc mpfr gmp" diff --git a/repo/devel/gdb.xibuild b/repo/devel/gdb.xibuild index e16ac37..49d8d49 100644 --- a/repo/devel/gdb.xibuild +++ b/repo/devel/gdb.xibuild @@ -1,6 +1,6 @@ #!/bin/sh -MAKEDEPS="make expat guile pmfr ncurses python xz texinfo" +MAKEDEPS="make expat guile ncurses python xz texinfo" DEPS="python-six doxygen gcc guile python rustc valgrind systemtap" PKG_VER=11.2 diff --git a/repo/devel/pkg-config.xibuild b/repo/devel/pkg-config.xibuild index 29feb3b..3db8dfd 100644 --- a/repo/devel/pkg-config.xibuild +++ b/repo/devel/pkg-config.xibuild @@ -1,7 +1,7 @@ #!/bin/sh -MAKEDEPS="make " -DEPS="musl libiconv" +MAKEDEPS="make" +DEPS="musl" PKG_VER=0.29.2 SOURCE=https://pkg-config.freedesktop.org/releases/pkg-config-$PKG_VER.tar.gz diff --git a/repo/devel/swig.xibuild b/repo/devel/swig.xibuild new file mode 100644 index 0000000..5d2471c --- /dev/null +++ b/repo/devel/swig.xibuild @@ -0,0 +1,20 @@ +#!/bin/sh + +MAKEDEPS="make autoconf bison" +DEPS="guile gcc musl pcre zlib" + +PKG_VER=4.0.2 +SOURCE=https://downloads.sourceforge.net/swig/swig-$PKG_VER.tar.gz +DESC="A compiler that makes it easy to integrate C and C++ code with scripting languages" + +build () { + ./configure --prefix=/usr + make +} + +package () { + make DESTDIR=$PKG_DEST install + + # backwards compatibility? + ln -s /usr/bin/aclocal $PKG_DEST/usr/bin/aclocal-1.15 +} diff --git a/repo/python/python-sphinx.xibuild b/repo/python/python-sphinx.xibuild index 544c8c8..7d24130 100644 --- a/repo/python/python-sphinx.xibuild +++ b/repo/python/python-sphinx.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="python" -DEPS="python-sphinxcontrib-applehelp python-sphinxcontrib-devhelp python-python-jsmath python-sphinxcontrib-htmlhelp python-sphinxcontrib-serializinghtml python-sphinxcontrib-qthelp python-Jinja2 python-Pygments python-docutils python-snowballstemmer python-babel python-alabaster python-imagesize python-requests python-packaging python-importlib-metadata python-colorama python-python-websupport python-flake8 python-isort python-mypy python-docutils-stubs python-types-typed-python-ast python-types-requests python-pytest python-python-cov python-html5lib python-cython python-typed-ast" +DEPS="python-sphinxcontrib-applehelp python-sphinxcontrib-devhelp python-sphinxcontrib-htmlhelp python-sphinxcontrib-serializinghtml python-sphinxcontrib-qthelp python-Jinja2 python-docutils python-snowballstemmer python-babel python-alabaster python-imagesize python-requests python-packaging python-importlib-metadata python-mypy python-html5lib" PKG_VER=4.4.0 SOURCE=https://files.pythonhosted.org/packages/c9/08/c2932e66460cfbc8973928d276dc82ccde2d24b365055eeda9f0afc1951e/Sphinx-$PKG_VER.tar.gz diff --git a/repo/python/python-webencodings.xibuild b/repo/python/python-webencodings.xibuild index 33693c3..5a29aa8 100644 --- a/repo/python/python-webencodings.xibuild +++ b/repo/python/python-webencodings.xibuild @@ -1,11 +1,11 @@ #!/bin/sh -MAKEDEPS="python" +MAKEDEPS="python python-setuptools" DEPS="" PKG_VER=0.5.1 SOURCE=https://files.pythonhosted.org/packages/0b/02/ae6ceac1baeda530866a85075641cec12989bd8d31af6d5ab4a3e8c92f47/webencodings-$PKG_VER.tar.gz -DESC="Character encoding aliases for legacy web content" +DESC="Character encoding for legacy web content" build() { python setup.py build diff --git a/repo/python/python.xibuild b/repo/python/python.xibuild index 91e0d9e..3876d8b 100644 --- a/repo/python/python.xibuild +++ b/repo/python/python.xibuild @@ -1,7 +1,6 @@ #!/bin/sh - -MAKEDEPS="make autoconf automake autoconf-archive sqlite" +MAKEDEPS="make autoconf automake autoconf-archive sqlite3" DEPS="bzip2 expat gdbm libffi libnsl libxcrypt openssl zlib grep" PKG_VER=3.10.2 diff --git a/repo/skip/audit.xibuild b/repo/skip/audit.xibuild new file mode 100644 index 0000000..fcfd2ec --- /dev/null +++ b/repo/skip/audit.xibuild @@ -0,0 +1,41 @@ +#!/bin/sh + +MAKEDEPS="make swig" +DEPS="sbase libcap-ng musl" + +PKG_VER=3.0.6 +SOURCE=https://people.redhat.com/sgrubb/audit/audit-$PKG_VER.tar.gz +ADDITIONAL=" + 0003-all-get-rid-of-strndupa.patch + 0004-fix-path-in-au-remote-conf.patch + auditd.initd + auditd.confd + " + +DESC="User space tools for 2.6 kernel auditing" + +prepare () { + apply_patches +} + +build () { + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --disable-zos-remote \ + --enable-shared=audit + make +} + +check () { + make -j1 check +} + +package () { + make DESTDIR="$PKG_DEST" install + install -Dm755 /auditd.initd "$PKG_DEST"/etc/init.d/auditd + install -Dm644 /auditd.confd "$PKG_DEST"/etc/conf.d/auditd + +} 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/meta/sh.xibuild b/repo/system/sh.xibuild index db37812..db37812 100644 --- a/repo/meta/sh.xibuild +++ b/repo/system/sh.xibuild 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 - } 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 +} diff --git a/repo/x11/mesa.xibuild b/repo/x11/mesa.xibuild index 09d34d7..37a976b 100644 --- a/repo/x11/mesa.xibuild +++ b/repo/x11/mesa.xibuild @@ -3,11 +3,11 @@ MAKEDEPS="meson ninja python-mako libva libvdpau llvm libxxf86vm libelf lm_sensors libexpat libvulkan wayland-protocols" DEPS="xorg-libs libdrm" -PKG_VER=21.3.6 +PKG_VER=21.3.7 SOURCE=https://mesa.freedesktop.org/archive/mesa-$PKG_VER.tar.xz ADDITIONAL=" - https://www.linuxfromscratch.org/patches/blfs/svn/mesa-$PKG_VER-add_xdemos-1.patch - https://www.linuxfromscratch.org/patches/blfs/svn/mesa-$PKG_VER-nouveau_fixes-1.patch + mesa-$PKG_VER-add_xdemos-1.patch + mesa-$PKG_VER-nouveau_fixes-1.patch " DESC="An implementation of the OpenGL specification" |