diff options
Diffstat (limited to 'repo/system')
31 files changed, 236 insertions, 132 deletions
diff --git a/repo/system/binutils.xibuild b/repo/system/binutils.xibuild index 03880d5..e65314f 100644 --- a/repo/system/binutils.xibuild +++ b/repo/system/binutils.xibuild @@ -44,6 +44,7 @@ build () { --enable-64-bit-bfd \ --enable-plugins \ --enable-relro \ + --enable-install-libiberty \ --enable-deterministic-archives \ --enable-targets=x86_64-pep \ --enable-default-hash-style=gnu \ diff --git a/repo/system/bootscripts.xibuild b/repo/system/bootscripts.xibuild index 72121f9..f133786 100644 --- a/repo/system/bootscripts.xibuild +++ b/repo/system/bootscripts.xibuild @@ -1,7 +1,7 @@ #!/bin/sh -MAKEDEPS="make s6-linux-init s6-rc" -DEPS="sh eudev s6 s6-rc s6-linux-utils s6-protable-utils s6-linux-init" +MAKEDEPS="make s6-linux-init s6-rc utmps" +DEPS="sh eudev s6 s6-rc s6-linux-utils s6-portable-utils s6-linux-init" SOURCE=https://xi.davidovski.xyz/git/bootscripts.git DESC="Bootscripts to initiate the system on boot" @@ -9,46 +9,15 @@ DESC="Bootscripts to initiate the system on boot" package () { make DESTDIR=$PKG_DEST bootscripts - cat > $PKG_DEST/etc/inittab << "EOF" -# Begin /etc/inittab - -id:3:initdefault: - -si::sysinit:/etc/rc.d/init.d/rc S - -l0:0:wait:/etc/rc.d/init.d/rc 0 -l1:S1:wait:/etc/rc.d/init.d/rc 1 -l2:2:wait:/etc/rc.d/init.d/rc 2 -l3:3:wait:/etc/rc.d/init.d/rc 3 -l4:4:wait:/etc/rc.d/init.d/rc 4 -l5:5:wait:/etc/rc.d/init.d/rc 5 -l6:6:wait:/etc/rc.d/init.d/rc 6 - -ca:12345:ctrlaltdel:/sbin/shutdown -t1 -a -r now - -su:S016:once:/sbin/sulogin - -1:2345:respawn:/sbin/agetty --noclear tty1 9600 -2:2345:respawn:/sbin/agetty tty2 9600 -3:2345:respawn:/sbin/agetty tty3 9600 -4:2345:respawn:/sbin/agetty tty4 9600 -5:2345:respawn:/sbin/agetty tty5 9600 -6:2345:respawn:/sbin/agetty tty6 9600 - -# End /etc/inittab -EOF - # Compile a basic database for boot - s6-rc-compile /etc/s6/db/basic /etc/s6/sv - ln -s /etc/s6/db/basic /etc/s6/db/current + s6-rc-compile $PKG_DEST/etc/s6/db/basic $PKG_DEST/etc/s6/sv + ln -s /etc/s6/db/basic $PKG_DEST/etc/s6/db/current # initialize s6 init base. s6-linux-init-maker -1 -t 2 -L \ - -f $PKG_DEST/etc/s6linux-init/skel \ + -f $PKG_DEST/etc/s6/skel \ -p "/usr/bin:/usr/sbin:/bin:/sbin" \ -D default \ -G "/sbin/agetty -L -8 tty1 115200" \ -c $PKG_DEST/etc/s6/base -u root -U utmp $PKG_DEST/etc/s6/base - - } diff --git a/repo/system/cacerts.xibuild b/repo/system/cacerts.xibuild index 40a37f5..9c0198d 100644 --- a/repo/system/cacerts.xibuild +++ b/repo/system/cacerts.xibuild @@ -1,18 +1,24 @@ #!/bin/sh -MAKEDEPS="sbase sed" -DEPS="libnghttp" +MAKEDEPS="sbase bash sed" +DEPS="libnghttp libp11-kit" PKG_VER=1.7 SOURCE=https://github.com/djlucas/make-ca/releases/download/v$PKG_VER/make-ca-$PKG_VER.tar.xz +ADDITIONAL=" + fix-sbase-coreutils.patch +" + DESC="Root certificates needed by ssl built using make-ca" + prepare () { + apply_patches sed -i "s/grep/ggrep/g" make-ca + } package () { - # TODO check why this doesnt package /etc/ssl/certs the first time in some occasions 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" diff --git a/repo/system/dbus.xibuild b/repo/system/dbus.xibuild index 96f6264..e1a0e72 100644 --- a/repo/system/dbus.xibuild +++ b/repo/system/dbus.xibuild @@ -32,8 +32,8 @@ build () { package () { make DESTDIR=$PKG_DEST install - chown -v root:messagebus $PKG_DEST/usr/libexec/dbus-daemon-launch-helper && - chmod -v 4750 $PKG_DEST/usr/libexec/dbus-daemon-launch-helper + chown root:messagebus $PKG_DEST/usr/libexec/dbus-daemon-launch-helper && + chmod 4750 $PKG_DEST/usr/libexec/dbus-daemon-launch-helper cat > $PKG_DEST/etc/dbus-1/session-local.conf << "EOF" <!DOCTYPE busconfig PUBLIC diff --git a/repo/system/dhcp.xibuild b/repo/system/dhcp.xibuild index aba51fa..b8f5d9d 100644 --- a/repo/system/dhcp.xibuild +++ b/repo/system/dhcp.xibuild @@ -41,9 +41,9 @@ make -j1 package () { make -C client DESTDIR=$PKG_DEST install && - install -v -m755 client/scripts/linux $PKG_DEST/usr/sbin/dhclient-script + install -m755 client/scripts/linux $PKG_DEST/usr/sbin/dhclient-script - install -vdm755 /etc/dhcp && + install -dm755 /etc/dhcp && cat > $PKG_DEST/etc/dhcp/dhclient.conf << "EOF" # Begin /etc/dhcp/dhclient.conf # @@ -63,7 +63,7 @@ require subnet-mask, domain-name-servers; # End /etc/dhcp/dhclient.conf EOF - install -v -dm 755 $PKG_DEST/var/lib/dhclient + install -dm 755 $PKG_DEST/var/lib/dhclient tar xf $BOOTSCRIPTS.tar.xz cd $BOOTSCRIPTS diff --git a/repo/system/efivar.xibuild b/repo/system/efivar.xibuild index 5bbe926..2b5b666 100644 --- a/repo/system/efivar.xibuild +++ b/repo/system/efivar.xibuild @@ -5,14 +5,25 @@ DEPS="musl" PKG_VER=37 SOURCE=https://github.com/rhboot/efivar/releases/download/$PKG_VER/efivar-$PKG_VER.tar.bz2 + ADDITIONAL=" - https://www.linuxfromscratch.org/patches/blfs/svn/efivar-$PKG_VER-gcc_9-1.patch - " + patches/musl-bswap.patch + patches/efivar-fix-format_guid.patch + patches/efivar-fix-packed.patch + patches/efivar-fix-ucs2.patch +" DESC="Tools and libraries to manupulate EFI variables" -prepare () { - patch -Np1 -i efivar-$PKG_VER-gcc_9-1.patch +prepare() { + apply_patches + + # remove verbosity in ln commands + for f in Makefile src/Makefile src/test/Makefile docs/Makefile Make.rules; do + echo "patching $f" + sed -i "s@-vfs@-fs@g" $f + sed -i "s@-rfv@-rf@g" $f + done } build () { diff --git a/repo/system/elfutils.xibuild b/repo/system/elfutils.xibuild new file mode 100644 index 0000000..a68827f --- /dev/null +++ b/repo/system/elfutils.xibuild @@ -0,0 +1,54 @@ +#!/bin/sh + +MAKEDEPS="bison flex zlib bzip2 xz argp-standalone libtool fts musl-obstack" +DEPS="musl zlib" + +PKG_VER=0.186 +SOURCE=https://sourceware.org/elfutils/ftp/$PKG_VER/elfutils-$PKG_VER.tar.bz2 +ADDITIONAL=" + files/error.h + patches/fix-aarch64_fregs.patch + patches/fix-uninitialized.patch + patches/musl-macros.patch + patches/musl-strndupa.patch + patches/musl-asm-ptrace-h.patch +" + +DESC="Utilities and DSOs to handle ELF files and DWARF data" + +prepare () { + apply_patches + + cp error.h lib + cp error.h src + + cat > lib/libintl.h <<-EOF + #ifndef LIBINTL_H + #define LIBINTL_H + #define _(x) (x) + #endif + EOF + +} + +build () { + CFLAGS="$CFLAGS -Wno-error -Wno-null-dereference" \ + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --disable-werror \ + --program-prefix=eu- \ + --enable-deterministic-archives \ + --disable-nls \ + --disable-libdebuginfod \ + --disable-debuginfod + make +} + +package() { + make DESTDIR=$PKG_DEST install + rm -r "$PKG_DEST"/usr/lib/libelf.so.* + rm -r "$PKG_DEST"/usr/include/libelf.h +} diff --git a/repo/system/gmp.xibuild b/repo/system/gmp.xibuild index c3f14ee..0bfd3f4 100644 --- a/repo/system/gmp.xibuild +++ b/repo/system/gmp.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="make perl" -DEPS="bash procps-ng" +DEPS="sh procps-ng" PKG_VER=6.2.1 SOURCE=https://gmplib.org/download/gmp/gmp-$PKG_VER.tar.xz diff --git a/repo/system/grub.xibuild b/repo/system/grub.xibuild index 7bedae9..cf224bb 100644 --- a/repo/system/grub.xibuild +++ b/repo/system/grub.xibuild @@ -15,7 +15,7 @@ DESC="GNU GRand Unified Bootloader v2" prepare () { gunzip -c unifont-13.0.06.pcf.gz > $PKG_DEST/usr/share/fonts/unifont/unifont.pcf - unset {C,CPP,CXX,LD}FLAGS + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS } build () { @@ -26,6 +26,6 @@ build () { package () { make DESTDIR=$PKG_DEST install - mkdir -pv $PKG_DEST/usr/share/bash-completion/completions - mv -v $PKG_DEST/etc/bash_completion.d/grub $PKG_DEST/usr/share/bash-completion/completions + mkdir -p $PKG_DEST/usr/share/bash-completion/completions + mv $PKG_DEST/etc/bash_completion.d/grub $PKG_DEST/usr/share/bash-completion/completions } diff --git a/repo/system/gzip.xibuild b/repo/system/gzip.xibuild index d82471d..8e3c78a 100644 --- a/repo/system/gzip.xibuild +++ b/repo/system/gzip.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="make " -DEPS="musl bash less" +DEPS="musl sh less" PKG_VER=1.11 SOURCE=https://ftp.gnu.org/gnu/gzip/gzip-$PKG_VER.tar.xz diff --git a/repo/system/imlib2.xibuild b/repo/system/imlib2.xibuild index 7d57dff..5e734a5 100644 --- a/repo/system/imlib2.xibuild +++ b/repo/system/imlib2.xibuild @@ -15,7 +15,8 @@ build () { package () { make DESTDIR=$PKG_DEST install - install -v -m755 -d /usr/share/doc/imlib2-$PKG_VER && - install -v -m644 doc/{*.gif,index.html} /usr/share/doc/imlib2-$PKG_VER + install -m755 -d /usr/share/doc/imlib2-$PKG_VER && + install -m644 doc/index.html /usr/share/doc/imlib2-$PKG_VER + install -m644 doc/*.gif /usr/share/doc/imlib2-$PKG_VER } diff --git a/repo/system/intltool.xibuild b/repo/system/intltool.xibuild index 7530db9..da4d84d 100644 --- a/repo/system/intltool.xibuild +++ b/repo/system/intltool.xibuild @@ -18,5 +18,5 @@ check () { package () { make DESTDIR=$PKG_DEST install - install -v -Dm644 doc/I18N-HOWTO $PKG_DEST/usr/share/doc/intltool-$PKG_VER/I18N-HOWTO + install -Dm644 doc/I18N-HOWTO $PKG_DEST/usr/share/doc/intltool-$PKG_VER/I18N-HOWTO } diff --git a/repo/system/js78.xibuild b/repo/system/js78.xibuild index 26716d9..199740a 100644 --- a/repo/system/js78.xibuild +++ b/repo/system/js78.xibuild @@ -6,10 +6,10 @@ DEPS="readline nspr bash zlib" PKG_VER=78.15.0 SOURCE=https://archive.mozilla.org/pub/firefox/releases/${PKG_VER}esr/source/firefox-${PKG_VER}esr.source.tar.xz ADDITIONAL=" - patches/js78/disable-jslint.patch - patches/js78/fd6847c9416f9eebde636e21d794d25d1be8791d.patch - patches/js78/fix-musl-build.patch - patches/js78/fix-python3.10-compilation.patch + patches/disable-jslint.patch + patches/fd6847c9416f9eebde636e21d794d25d1be8791d.patch + patches/fix-musl-build.patch + patches/fix-python3.10-compilation.patch " DESC="JavaScript interpreter and libraries - Version 78" @@ -49,7 +49,7 @@ build () { --disable-strip - make -j1 + make } check () { diff --git a/repo/system/libcap.xibuild b/repo/system/libcap.xibuild index f3a5ee3..dab917e 100644 --- a/repo/system/libcap.xibuild +++ b/repo/system/libcap.xibuild @@ -10,6 +10,7 @@ DESC="POSIX 1003.1e capabilities" prepare () { sed -i '/install -m.*STA/d' libcap/Makefile + sed -i 's/xargs -e/xargs /g' pam_cap/Makefile } build () { diff --git a/repo/system/libdwarf.xibuild b/repo/system/libdwarf.xibuild new file mode 100644 index 0000000..66aec4f --- /dev/null +++ b/repo/system/libdwarf.xibuild @@ -0,0 +1,25 @@ +#!/bin/sh + +MAKEDEPS="elfutils zlib" +DEPS="musl zlib libelf" + +PKG_VER=20210528 +SOURCE=http://www.prevanders.net/libdwarf-$PKG_VER.tar.gz +DESC="Parsing library for DWARF2 and later debugging file format" + +build () { + ./configure \ + --prefix=/usr \ + --enable-shared \ + --enable-dwarfgen + make +} + +check () { + make check +} + + +package () { + make DESTDIR=$PKG_DEST install +} diff --git a/repo/system/libelf.xibuild b/repo/system/libelf.xibuild index 52d9f7c..5ec93b0 100644 --- a/repo/system/libelf.xibuild +++ b/repo/system/libelf.xibuild @@ -14,7 +14,7 @@ prepare() { cp error.h lib/ cp error.h src/ - autoreconf -ifv + autoreconf -if } diff --git a/repo/system/liblinear.xibuild b/repo/system/liblinear.xibuild index de47b0e..7a20846 100644 --- a/repo/system/liblinear.xibuild +++ b/repo/system/liblinear.xibuild @@ -12,8 +12,9 @@ build () { } package () { - mkdir -pv ${PKG_DEST}/usr/{include,lib} - install -vm644 linear.h $PKG_DEST/usr/include && - install -vm755 liblinear.so.4 $PKG_DEST/usr/lib && - ln -sfv liblinear.so.4 $PKG_DEST/usr/lib/liblinear.so + mkdir -p ${PKG_DEST}/usr/include + mkdir -p ${PKG_DEST}/usr/lib + install -m644 linear.h $PKG_DEST/usr/include && + install -m755 liblinear.so.4 $PKG_DEST/usr/lib && + ln -sf liblinear.so.4 $PKG_DEST/usr/lib/liblinear.so } diff --git a/repo/system/lua.xibuild b/repo/system/lua.xibuild index 6a9d521..c8c992f 100644 --- a/repo/system/lua.xibuild +++ b/repo/system/lua.xibuild @@ -43,16 +43,17 @@ build () { } package () { - make install make INSTALL_TOP=/usr \ - DESTDIR=$PKG_DEST \ - INSTALL_DATA="cp -d" \ - INSTALL_MAN=/usr/share/man/man1 \ - TO_LIB="liblua.so liblua.so.${PKG_VER} liblua.so.5.4.4" \ - install && - - mkdir -pv $PKG_DEST/usr/share/doc/lua-$PKG_VER && - cp -v doc/*.{html,css,gif,png} $PKG_DEST/usr/share/doc/lua-$PKG_VER && - - install -v -m644 -D lua.pc $PKG_DEST/usr/lib/pkgconfig/lua.pc + DESTDIR=$PKG_DEST \ + INSTALL="install" \ + INSTALL_MAN=/usr/share/man/man1 \ + TO_LIB="liblua.so liblua.so.${PKG_VER} liblua.so.5.4.4" \ + install && + + mkdir -p $PKG_DEST/usr/share/doc/lua-$PKG_VER && + for s in html css gif png; do + cp doc/*.$s $PKG_DEST/usr/share/doc/lua-$PKG_VER + done + + install -m644 -D lua.pc $PKG_DEST/usr/lib/pkgconfig/lua.pc } diff --git a/repo/system/musl-legacy-compat.xibuild b/repo/system/musl-legacy-compat.xibuild index 33d0e45..00ecaa1 100644 --- a/repo/system/musl-legacy-compat.xibuild +++ b/repo/system/musl-legacy-compat.xibuild @@ -15,7 +15,7 @@ DESC="Legacy compatibility headers for musl" package () { for h in cdefs queue tree do - install -v -D -m644 $h.h $PKG_DEST/usr/include/sys + install -D -m644 $h.h $PKG_DEST/usr/include/sys done } diff --git a/repo/system/networkmanager.xibuild b/repo/system/networkmanager.xibuild index 7abd804..63400e0 100644 --- a/repo/system/networkmanager.xibuild +++ b/repo/system/networkmanager.xibuild @@ -4,7 +4,7 @@ MAKEDEPS="grep meson ninja python intltool glib" DEPS="jansson libndp curl wpa_supplicant newt nss polkit libpsl audit dbus gobject-introspection dhcp" PKG_VER=1.35.5 -SOURCE=https://download.gnome.org/sources/NetworkManager/$(echo $PKG_VER | cut -d. -f-2)/NetworkManager-$PKG_VER.tar.xz +SOURCE=https://download.gnome.org/sources/NetworkManager/${PKG_VER%.*}/NetworkManager-$PKG_VER.tar.xz BOOTSCRIPTS=blfs-bootscripts-20210826 ADDITIONAL=" @@ -14,7 +14,7 @@ ADDITIONAL=" DESC="Network connection manager and user applications" prepare () { - grep -rl '^#!.*python$' | xargs sed -i '1s/python/&3/' + ggrep -rl '^#!.*python$' | xargs sed -i '1s/python/&3/' dbus-uuidgen --ensure } @@ -22,7 +22,6 @@ build () { mkdir build && cd build && - CXXFLAGS+="-O2 -fPIC" \ meson --prefix=/usr \ --buildtype=release \ -Dlibaudit=no \ @@ -42,7 +41,8 @@ build () { package () { DESTDIR=$PKG_DEST ninja install && - mv -v $PKG_DEST/usr/share/doc/NetworkManager{,-$PKG_VER} + mv $PKG_DEST/usr/share/doc/NetworkManager \ + $PKG_DEST/usr/share/doc/NetworkManager-$PKG_VER} # create minimum config file cat >> $PKG_DEST/etc/NetworkManager/NetworkManager.conf << "EOF" diff --git a/repo/system/nss.xibuild b/repo/system/nss.xibuild index 06b70d0..5d549e7 100644 --- a/repo/system/nss.xibuild +++ b/repo/system/nss.xibuild @@ -7,6 +7,13 @@ PKG_VER=3.74 SOURCE=https://archive.mozilla.org/pub/security/nss/releases/NSS_$(echo $PKG_VER | sed 's/\./_/g')_RTM/src/nss-$PKG_VER.tar.gz +ADDITIONAL=" + nss-util.pc.in + nss-softokn.pc.in + nss-config.in + nss.pc.in +" + DESC="Network Security Services" build () { @@ -46,4 +53,21 @@ package () { install -m644 Linux*/lib/pkgconfig/nss.pc $PKG_DEST/usr/lib/pkgconfig ln -sf ./pkcs11/p11-kit-trust.so $PKG_DEST/usr/lib/libnssckbi.so + + cd .. + local _pc; for _pc in nss.pc nss-util.pc nss-softokn.pc; do + sed $_pc.in \ + -e "s,%libdir%,/usr/lib,g" \ + -e "s,%prefix%,/usr,g" \ + -e "s,%exec_prefix%,/usr/bin,g" \ + -e "s,%includedir%,/usr/include/nss,g" \ + -e "s,%SOFTOKEN_VERSION%,$PKG_VER,g" \ + -e "s,%NSPR_VERSION%,$PKG_VER,g" \ + -e "s,%NSS_VERSION%,$PKG_VER,g" \ + -e "s,%NSSUTIL_VERSION%,$PKG_VER,g" \ + > "$PKG_DEST"/usr/lib/pkgconfig/$_pc + done + ln -sf nss.pc "$PKG_DEST"/usr/lib/pkgconfig/mozilla-nss.pc + chmod 644 "$PKG_DEST"/usr/lib/pkgconfig/*.pc + } diff --git a/repo/system/openssl.xibuild b/repo/system/openssl.xibuild index 396710b..b30ea90 100644 --- a/repo/system/openssl.xibuild +++ b/repo/system/openssl.xibuild @@ -15,6 +15,6 @@ build () { package () { sed -i '/INSTALL_LIBS/s/libcrypto.a libssl.a//' Makefile make MANSUFFIX=ssl DESTDIR=$PKG_DEST install - mkdir -pv $PKG_DEST/usr/share/doc/openssl - cp -vfr doc/* $PKG_DEST/usr/share/doc/openssl + mkdir -p $PKG_DEST/usr/share/doc/openssl + cp -fr doc/* $PKG_DEST/usr/share/doc/openssl } diff --git a/repo/system/pahole.xibuild b/repo/system/pahole.xibuild index e9b4f99..6b57291 100644 --- a/repo/system/pahole.xibuild +++ b/repo/system/pahole.xibuild @@ -1,26 +1,22 @@ #!/bin/sh -MAKEDEPS="cmake python make " -DEPS="libelf python" +MAKEDEPS="cmake-modules python make " +DEPS="libelf python elfutils libdwarf musl-obstack argp-standalone libbpf" -PKG_VER=1.23 +PKG_VER=1.22 SOURCE=https://git.kernel.org/pub/scm/devel/pahole/pahole.git BRANCH=v$PKG_VER DESC="Pahole and other DWARF Utils" build () { - cmake -S . -B build \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=None \ - -D__LIB=lib + cmake -B build -G Ninja . \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=None \ + -D__LIB=lib cmake --build build } package () { DESTDIR="$PKG_DEST" cmake --install build - - - python -m compileall -d / "$PKG_DEST" - python -O -m compileall -d / "$PKG_DEST" } diff --git a/repo/system/pcre2.xibuild b/repo/system/pcre2.xibuild index 4f9b783..770ad58 100644 --- a/repo/system/pcre2.xibuild +++ b/repo/system/pcre2.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="make " -DEPS="musl readline zlib bzip2 bash" +DEPS="musl readline zlib bzip2 sh" PKG_VER=10.39 SOURCE=https://github.com/PhilipHazel/pcre2/releases/download/pcre2-$PKG_VER/pcre2-$PKG_VER.tar.gz diff --git a/repo/system/polkit.xibuild b/repo/system/polkit.xibuild index 567e316..de414cc 100644 --- a/repo/system/polkit.xibuild +++ b/repo/system/polkit.xibuild @@ -1,6 +1,6 @@ #!/bin/sh -MAKEDEPS="git gobject-introspection meson libxslt patch elogind" +MAKEDEPS="git gobject-introspection meson libxslt patch elogind gtk-doc autoconf-archive" DEPS="expat glib js78 pam" PKG_VER=0.120 @@ -8,42 +8,46 @@ SOURCE=https://www.freedesktop.org/software/polkit/releases/polkit-$PKG_VER.tar. DESC="Application development toolkit for controlling system-wide privileges" +ADDITIONAL=" + files/polkit-1 + patches/CVE-2021-4034.patch + patches/make-innetgr-optional.patch +" + prepare () { - sed '/0,/s/^/#/' -i meson_post_install.py && - sed '/policy,/d' -i actions/meson.build \ - -i src/examples/meson.build + apply_patches + autoreconf -fi } build () { mkdir build && cd build && - # TODO fix man - meson --prefix=/usr \ - -Dman=false \ - -Dsession_tracking=libelogind \ - -Dsystemdsystemunitdir=/tmp \ - --buildtype=release \ - .. && - ninja + ../configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --libexecdir=/usr/lib/polkit-1 \ + --localstatedir=/var \ + --disable-static \ + --enable-introspection \ + --with-authfw=pam \ + --with-os-type=alpine \ + --disable-gtk-doc \ + --disable-gtk-doc-html \ + --disable-gtk-doc-pdf \ + --disable-libelogind \ + --disable-systemd \ + --enable-libsystemd-login + make } package () { - DESTDIR=$PKG_DEST ninja install && - - - cat > $PKG_DEST/etc/pam.d/polkit-1 << "EOF" -# Begin /etc/pam.d/polkit-1 - -auth include system-auth -account include system-account -password include system-password -session include system-session - -# End /etc/pam.d/polkit-1 -EOF - + make DESTDIR=$PKG_DEST install && + cd .. && + install -m644 polkit-1 $PKG_DEST/etc/pam.d/polkit-1 } postinstall() { diff --git a/repo/system/psmisc.xibuild b/repo/system/psmisc.xibuild index ed3ba78..61d767f 100644 --- a/repo/system/psmisc.xibuild +++ b/repo/system/psmisc.xibuild @@ -1,14 +1,13 @@ #!/bin/sh -MAKEDEPS="make" +MAKEDEPS="make gettext-tiny libintl" DEPS="ncurses" PKG_VER=23.4 -SOURCE=https://gitlab.com/psmisc/psmisc/-/archive/v$PKG_VER/psmisc-v$PKG_VER.tar.gz +SOURCE=https://downloads.sourceforge.net/psmisc/psmisc-$PKG_VER.tar.xz DESC="Miscellaneous procfs tools" build () { - ./autogen.sh ./configure --prefix=/usr make } diff --git a/repo/system/rtmpdump.xibuild b/repo/system/rtmpdump.xibuild index a994c34..cac7356 100644 --- a/repo/system/rtmpdump.xibuild +++ b/repo/system/rtmpdump.xibuild @@ -17,9 +17,9 @@ build () { } package () { - mkdir -pv $PKG_DEST/usr/bin - mkdir -pv $PKG_DEST/usr/share - mkdir -pv $PKG_DEST/usr/lib/pkgconfig + mkdir -p $PKG_DEST/usr/bin + mkdir -p $PKG_DEST/usr/share + mkdir -p $PKG_DEST/usr/lib/pkgconfig make \ prefix='/usr' \ sbindir='/usr/bin' \ diff --git a/repo/system/s6-linux-init.xibuild b/repo/system/s6-linux-init.xibuild index 737aed3..fa68b90 100644 --- a/repo/system/s6-linux-init.xibuild +++ b/repo/system/s6-linux-init.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="make" -DEPS="s6 skalibs" +DEPS="s6 skalibs nsss" PKG_VER=1.0.7.0 SOURCE=https://skarnet.org/software/s6-linux-init/s6-linux-init-$PKG_VER.tar.gz @@ -16,7 +16,7 @@ build () { --libdir=/usr/lib \ --libexecdir=/usr/lib/s6-linux-init \ --with-dynlib=/usr/lib \ - --enable-utmps ${OPARG} + --enable-utmps make } diff --git a/repo/system/sysklogd.xibuild b/repo/system/sysklogd.xibuild index 6c9393d..ac71d5f 100644 --- a/repo/system/sysklogd.xibuild +++ b/repo/system/sysklogd.xibuild @@ -13,7 +13,7 @@ build () { package () { make DESTDIR=$PKG_DEST install - mkdir -pv $PKG_DEST/etc + mkdir -p $PKG_DEST/etc cat > $PKG_DEST/etc/syslog.conf << "EOF" # Begin /etc/syslog.conf diff --git a/repo/system/tomlc99.xibuild b/repo/system/tomlc99.xibuild index b6b6f63..6387c96 100644 --- a/repo/system/tomlc99.xibuild +++ b/repo/system/tomlc99.xibuild @@ -12,7 +12,8 @@ build () { } package () { - mkdir -pv $PKG_DEST/usr/{include,lib} + mkdir -p $PKG_DEST/usr/lib + mkdir -p $PKG_DEST/usr/include install toml.h $PKG_DEST/usr/include install libtoml.so.$PKG_VER $PKG_DEST/usr/lib ln -s libtoml.so.$PKG_VER $PKG_DEST/usr/lib/libtoml.so diff --git a/repo/system/utmps.xibuild b/repo/system/utmps.xibuild index 0d45319..c92c210 100644 --- a/repo/system/utmps.xibuild +++ b/repo/system/utmps.xibuild @@ -32,4 +32,14 @@ Requires.private: skalibs Libs: -lutmps Cflags: -I/usr/include/utmps EOF + + #ln -s utmps/wtmp /var/log/wtmp +} + +postinstall () { + 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 + } |