diff options
Diffstat (limited to 'repo/util')
-rw-r--r-- | repo/util/curl.xibuild | 2 | ||||
-rw-r--r-- | repo/util/e2fsprogs.xibuild | 19 | ||||
-rw-r--r-- | repo/util/elfutils.xibuild | 20 | ||||
-rw-r--r-- | repo/util/grep.xibuild | 2 | ||||
-rw-r--r-- | repo/util/groff.xibuild | 2 | ||||
-rw-r--r-- | repo/util/inetutils.xibuild | 14 | ||||
-rw-r--r-- | repo/util/lynx.xibuild | 32 | ||||
-rw-r--r-- | repo/util/make-ca.xibuild | 16 | ||||
-rw-r--r-- | repo/util/openssh.xibuild | 8 | ||||
-rw-r--r-- | repo/util/procps-ng.xibuild | 11 | ||||
-rw-r--r-- | repo/util/util-linux.xibuild | 2 |
11 files changed, 45 insertions, 83 deletions
diff --git a/repo/util/curl.xibuild b/repo/util/curl.xibuild index eee52b6..e5c1264 100644 --- a/repo/util/curl.xibuild +++ b/repo/util/curl.xibuild @@ -10,7 +10,7 @@ DESC="A utility for transfering files with URL syntax" build () { ./configure --prefix=/usr \ --disable-static \ - --with-libressl \ + --with-openssl \ --enable-threaded-resolver \ --with-ca-path=/etc/ssl/certs && make diff --git a/repo/util/e2fsprogs.xibuild b/repo/util/e2fsprogs.xibuild index f1ae91b..641d5ff 100644 --- a/repo/util/e2fsprogs.xibuild +++ b/repo/util/e2fsprogs.xibuild @@ -1,15 +1,21 @@ #!/bin/sh -MAKEDEPS="make " +MAKEDEPS="make gzip" # TODO requires util-linux-libs -DEPS="sh " +DEPS="sh util-linux" PKG_VER=1.46.4 SOURCE=https://mirrors.edge.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v$PKG_VER/e2fsprogs-$PKG_VER.tar.xz DESC="Ext2/3/4 filesystem utils" +prepare () { + # use system's install command + rm config/install-sh + ln -s /usr/bin/install config/install-sh +} + build () { - mkdir -v build + mkdir build cd build ../configure --prefix=/usr \ --sysconfdir=/etc \ @@ -23,7 +29,10 @@ build () { package () { make DESTDIR=$PKG_DEST install - rm -fv $PKG_DEST/usr/lib/{libcom_err,libe2p,libext2fs,libss}.a - gunzip -v $PKG_DEST/usr/share/info/libext2fs.info.gz + rm -f $PKG_DEST/usr/lib/libcom_err.a + rm -f $PKG_DEST/usr/lib/libe2p.a + rm -f $PKG_DEST/usr/lib/libext2fs.a + rm -f $PKG_DEST/usr/lib/libss.a + gunzip $PKG_DEST/usr/share/info/libext2fs.info.gz install-info --dir-file=$PKG_DEST/usr/share/info/dir $PKG_DEST/usr/share/info/libext2fs.info } diff --git a/repo/util/elfutils.xibuild b/repo/util/elfutils.xibuild deleted file mode 100644 index 53e32d0..0000000 --- a/repo/util/elfutils.xibuild +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -MAKEDEPS="make " -DEPS="musl" - -SOURCE=https://sourceware.org/elfutils/ftp/elfutils-latest.tar.bz2 -DESC="Handle ELF object files and DWARF debugging information" - -build () { - ./configure --prefix=/usr --disable-debuginfod --enable-libdebuginfod=dummy - make -} - -check () { - make check || true -} - -package () { - make DESTDIR=$PKG_DEST install -} diff --git a/repo/util/grep.xibuild b/repo/util/grep.xibuild index 1ab6fd3..0ce778a 100644 --- a/repo/util/grep.xibuild +++ b/repo/util/grep.xibuild @@ -18,4 +18,6 @@ check () { package () { make DESTDIR=$PKG_DEST install + mv $PKG_DEST/bin/grep $PKG_DEST/bin/ggrep + } diff --git a/repo/util/groff.xibuild b/repo/util/groff.xibuild index 27ae4a2..5ee99cf 100644 --- a/repo/util/groff.xibuild +++ b/repo/util/groff.xibuild @@ -1,6 +1,6 @@ #!/bin/sh -MAKEDEPS="make " +MAKEDEPS="make" DEPS="perl" PKG_VER=1.22.4 diff --git a/repo/util/inetutils.xibuild b/repo/util/inetutils.xibuild index 47c60c8..05b1dd3 100644 --- a/repo/util/inetutils.xibuild +++ b/repo/util/inetutils.xibuild @@ -1,14 +1,24 @@ #!/bin/sh MAKEDEPS="make " -DEPS="pam libcap readline ncurses libxcrypt" +DEPS="pam libcap readline ncurses libxcrypt utmps iana-etc net-tools" PKG_VER=2.2 SOURCE=https://ftp.gnu.org/gnu/inetutils/inetutils-$PKG_VER.tar.xz DESC="A collection of common programs for basic networking" +prepare () { + sed -i 's|_GL_WARN_ON_USE (gets|//_GL_WARN_ON_USE (gets|' lib/stdio.in.h + echo '#define PATH_PROCNET_DEV "/proc/net/dev"' >> ifconfig/system/linux.h + sed -i 's|port : "whois"|port : "nicname"|' whois/whois.c + + # this might need to be changed in include/utmpx.h instead + sed -i '35s/char/char const/g' libinetutils/logwtmpko.c + touch man/whois.1 +} + build () { - ./configure --prefix=/usr --bindir=/usr/bin --localstatedir=/var --disable-logger --disable-whois --disable-rcp --disable-rexec --disable-rlogin --disable-rsh + ./configure --prefix=/usr --disable-rcp --disable-rlogin --disable-rlogind --disable-rsh --disable-rshd --disable-talk --disable-talkd make } diff --git a/repo/util/lynx.xibuild b/repo/util/lynx.xibuild deleted file mode 100644 index d5a0dab..0000000 --- a/repo/util/lynx.xibuild +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh - -MAKEDEPS="make " -DEPS="libidn libressl" - -PKG_VER=2.8.9rel.1 - -SOURCE=https://invisible-mirror.net/archives/lynx/tarballs/lynx$PKG_VER.tar.bz2 -ADDITIONAL=" - https://www.linuxfromscratch.org/patches/blfs/svn/lynx-$PKG_VER-security_fix-1.patch - " - -DESC="A text only browser for the WWW" - -build () { - ./configure --prefix=/usr \ - --sysconfdir=/etc/lynx \ - --datadir=/usr/share/doc/lynx-$PKG_VER \ - --with-zlib \ - --with-bzlib \ - --with-ssl \ - --with-screen=ncursesw \ - --enable-locale-charset && - make - -} - -package () { - make DESTDIR=$PKG_DEST install-full - chgrp -v -R root $PKG_DEST/usr/share/doc/lynx-$PKG_VER/lynx_doc - -} diff --git a/repo/util/make-ca.xibuild b/repo/util/make-ca.xibuild deleted file mode 100644 index ff49b05..0000000 --- a/repo/util/make-ca.xibuild +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -MAKEDEPS="make " -DEPS="libp11-kit nss libressl" - -PKG_VER=1.7 -SOURCE=https://github.com/djlucas/make-ca/releases/download/v$PKG_VER/make-ca-$PKG_VER.tar.xz -DESC="A utility to deliver and manage a complete PKI configuration" - -build () { - make DESTDIR=$PKG_DEST install -} - -package () { - install -vdm755 $PKG_DEST/etc/ssl/local -} diff --git a/repo/util/openssh.xibuild b/repo/util/openssh.xibuild index a9bc017..662fc23 100644 --- a/repo/util/openssh.xibuild +++ b/repo/util/openssh.xibuild @@ -21,12 +21,12 @@ build () { package () { make DESTDIR=$PKG_DEST install - install -v -m755 contrib/ssh-copy-id $PKG_DEST/usr/bin + install -m755 contrib/ssh-copy-id $PKG_DEST/usr/bin - install -v -m644 contrib/ssh-copy-id.1 \ + install -m644 contrib/ssh-copy-id.1 \ $PKG_DEST/usr/share/man/man1 - install -v -m755 -d $PKG_DEST/usr/share/doc/openssh-$PKG_VER - install -v -m644 INSTALL LICENCE OVERVIEW README* \ + install -m755 -d $PKG_DEST/usr/share/doc/openssh-$PKG_VER + install -m644 INSTALL LICENCE OVERVIEW README* \ $PKG_DEST/usr/share/doc/openssh-$PKG_VER } diff --git a/repo/util/procps-ng.xibuild b/repo/util/procps-ng.xibuild index 1c928aa..faae1e3 100644 --- a/repo/util/procps-ng.xibuild +++ b/repo/util/procps-ng.xibuild @@ -1,12 +1,21 @@ #!/bin/sh MAKEDEPS="make " -DEPS="musl ncurses" +DEPS="utmps ncurses" PKG_VER=3.3.17 SOURCE=https://sourceforge.net/projects/procps-ng/files/Production/procps-ng-$PKG_VER.tar.xz DESC="Utilities for monitoring your system and its processes" +ADDITIONAL=" + https://raw.githubusercontent.com/dslm4515/Musl-LFS/master/patches/procps-mlfs/use_utmpx.patch +" + +prepare () { + patch -Np1 -i use_utmpx.patch + sed -i '1i#include <langinfo.h>' proc/escape.c +} + build () { ./configure --prefix=/usr \ --docdir=/usr/share/doc/procps-ng-$PKG_VER \ diff --git a/repo/util/util-linux.xibuild b/repo/util/util-linux.xibuild index c4b245e..a97f3ef 100644 --- a/repo/util/util-linux.xibuild +++ b/repo/util/util-linux.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="make " -DEPS="shadow coreutils libcap libxcrypt readline" +DEPS="coreutils libcap libxcrypt readline" PKG_VER=2.37.2 SOURCE=https://cdn.kernel.org/pub/linux/utils/util-linux/v$(echo $PKG_VER | cut -d. -f-2)/util-linux-$PKG_VER.tar.xz |