update to 12.3: python-jinja2

README.md

@@ -3,3 +3,12 @@
 This is my repository for Linux from Scratch, and designed for the package manager [leaf](https://gitea.phywyj.dynv6.net/wyj/leaf).
 
 Warning: `leaf` won't deal with the dependence relation, and currently won't check file confliction. You have to deal with these problems as the maintainer of your own LFS system.
+
+## Different with LFS book
+- Use `ensurepip` in *Chapter 7.10. Python-3.13.2*
+- Use `SBINDIR=/usr/bin/` to install `iproute2`. `ip` command should be avaliable for non-root
+- We won't install TeX files in *Chapter 8.72. Texinfo-7.2*. We will install TexLive.
+
+## issues
+- `lfs/vim-9.1.1166` has `Test_write_backup_symlink` failed, which can pass if `call assert_true(filereadable('./Xbackup/Xwbsfile.bak'))
+` is commented. Seams like cannot create this backup file.

app-misc/neofetch-7.1.1.PKGBUILD

@@ -4,12 +4,12 @@ pkgdesc="A CLI system information tool written in BASH that supports displaying
 arch=('any')
 homepage="https://gitea.phywyj.dynv6.net/wyj/neofetch"
 license=('MIT')
-sources=("${pkgver}.tar.gz")
+sources=("${pkgname}-${pkgver}.tar.gz")
 urls=("https://gitea.phywyj.dynv6.net/wyj/neofetch/archive/${pkgver}.tar.gz")
 md5sums=("421b7dc986ffb23bd8b0d74bcf20325b")
 
 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }
 
 src_install() {

app-shells/zsh-5.9.PKGBUILD

@@ -9,7 +9,7 @@ md5sums=("182e37ca3fe3fa6a44f69ad462c5c30e")
 
 
 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
   sed -e 's/set_from_init_file/texinfo_&/' -i Doc/Makefile.in
   sed 's|/etc/z|/etc/zsh/z|g' -i Doc/*.*
 }

dev-vcs/git-2.44.0.PKGBUILD

@@ -7,10 +7,10 @@ sources=("${pkgname}-${pkgver}.tar.xz")
 urls=("https://www.kernel.org/pub/software/scm/git/git-2.44.0.tar.xz")
 md5sums=("7e4eb7c45e9ba7c90fa51deeea49732f")
 
-distdir=${DIST_DIR}/${pkgname}-${pkgver}
+distdir=${distdir}
 
 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }
 
 src_check(){

lfs-12.2-systemd/kmod-33.PKGBUILD

@@ -1,34 +0,0 @@
-pkgname=kmod
-pkgver=33
-pkgdesc="Linux kernel module management tools and library"
-url="https://github.com/kmod-project/kmod"
-license=('LGPL-2.1-or-later' 'GPL-2.0-or-later')
-sources=("${pkgname}-${pkgver}.tar.xz")
-urls=("https://www.kernel.org/pub/linux/utils/kernel/${pkgname}/${sources[0]}")
-md5sums=("c451c4aa61521adbe8af147f498046f8")
-
-src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
-}
-
-src_build() {
-  ./configure --prefix=/usr     \
-              --sysconfdir=/etc \
-              --with-openssl    \
-              --with-xz         \
-              --with-zstd       \
-              --with-zlib       \
-              --disable-manpages
-  make
-}
-
-src_install() {
-  make DESTDIR="${pkgdir}" install
-  install -d -m 755 "${pkgdir}/usr/sbin"
-  install -dm0755 "${pkgdir}"/{etc,usr/lib}/{depmod,modprobe}.d
-  for target in depmod insmod modinfo modprobe rmmod; do
-    ln -sfv ../bin/kmod "${pkgdir}/usr/sbin/$target"
-    rm -fv "${pkgdir}/usr/bin/$target"
-  done
-}
-

lfs-12.2-systemd/man-pages-6.9.1.PKGBUILD

@@ -1,26 +0,0 @@
-pkgname="man-pages"
-pkgver="6.9.1"
-pkgdesc="Linux man pages"
-license=("GPL2")
-sources=("${pkgname}-${pkgver}.tar.xz")
-urls=("https://www.kernel.org/pub/linux/docs/man-pages/man-pages-6.9.1.tar.xz")
-md5sums=("4d56775b6cce4edf1e496249e7c01c1a")
-
-distdir=${DIST_DIR}/${pkgname}-${pkgver}
-
-src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
-}
-
-src_check(){
-  return 0
-}
-
-src_build() {
-  cd "$srcdir"
-  rm -v man3/crypt*
-}
-
-src_install() {
-  make prefix=/usr DESTDIR="$pkgdir" install
-}

lfs-12.2-systemd/shadow-4.16.0/useradd

@@ -1,11 +0,0 @@
-# useradd defaults file
-GROUP=999
-GROUPS=
-HOME=/home
-INACTIVE=-1
-EXPIRE=
-SHELL=/bin/bash
-SKEL=/etc/skel
-USRSKEL=/usr/etc/skel
-CREATE_MAIL_SPOOL=no
-LOG_INIT=yes

lfs-12.2-systemd/tcl-8.6.14.PKGBUILD

@@ -1,64 +0,0 @@
-pkgname=tcl
-pkgver=8.6.14
-pkgdesc='Powerful, easy-to-learn dynamic programming language'
-homepage='http://tcl.sourceforge.net/'
-license=(TCL)
-_archive="$pkgname$pkgver"
-sources=("${_archive}-src.tar.gz"
-  "${_archive}-html.tar.gz"
-)
-urls=("https://downloads.sourceforge.net/sourceforge/tcl/$_archive-src.tar.gz"
-  "https://downloads.sourceforge.net/sourceforge/tcl/$_archive-html.tar.gz"
-)
-md5sums=("c30b57c6051be28fa928d09aca82841e"
-  "5467198f8d57c54835bf80b98ffb0170"
-)
-
-
-src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
-}
-
-src_build() {
-  SRCDIR=$(pwd)
-  cd unix
-  ./configure --prefix=/usr         \
-            --mandir=/usr/share/man \
-            --disable-rpath
-  make
-
-  sed -e "s|$SRCDIR/unix|/usr/lib|" \
-      -e "s|$SRCDIR|/usr/include|"  \
-      -i tclConfig.sh
-
-  sed -e "s|$SRCDIR/unix/pkgs/tdbc1.1.7|/usr/lib/tdbc1.1.7|" \
-      -e "s|$SRCDIR/pkgs/tdbc1.1.7/generic|/usr/include|"    \
-      -e "s|$SRCDIR/pkgs/tdbc1.1.7/library|/usr/lib/tcl8.6|" \
-      -e "s|$SRCDIR/pkgs/tdbc1.1.7|/usr/include|"            \
-      -i pkgs/tdbc1.1.7/tdbcConfig.sh
-
-  sed -e "s|$SRCDIR/unix/pkgs/itcl4.2.4|/usr/lib/itcl4.2.4|" \
-      -e "s|$SRCDIR/pkgs/itcl4.2.4/generic|/usr/include|"    \
-      -e "s|$SRCDIR/pkgs/itcl4.2.4|/usr/include|"            \
-      -i pkgs/itcl4.2.4/itclConfig.sh
-
-  unset SRCDIR
-}
-
-src_check() {
-  cd "${srcdir}/unix"
-  make test
-}
-
-src_install() {
-  cd "${srcdir}/unix"
-  make INSTALL_ROOT="${pkgdir}" install install-private-headers
-  chmod -v u+w "${pkgdir}/usr/lib/libtcl8.6.so"
-  ln -sfv tclsh8.6 "${pkgdir}/usr/bin/tclsh"
-  mv "${pkgdir}"/usr/share/man/man3/{Thread,Tcl_Thread}.3
-  
-  cd ..
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[1]} --strip-components=1
-  mkdir -v -p "${pkgdir}/usr/share/doc/tcl-8.6.14"
-  cp -v -r  ./html/* "${pkgdir}/usr/share/doc/tcl-8.6.14"
-}

lfs/acl-2.3.2.PKGBUILD

@@ -9,7 +9,7 @@ md5sums=("590765dee95907dbc3c856f7255bd669")
 
 
 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }
 
 src_build() {
@@ -19,6 +19,11 @@ src_build() {
   make
 }
 
+src_check() {
+  leaf_record_message "test/cp.test is known to fail."
+  make check
+}
+
 src_install() {
   make DESTDIR="${pkgdir}" install
 }

lfs/attr-2.5.2.PKGBUILD

@@ -17,7 +17,7 @@ md5sums=("227043ec2f6ca03c0948df5517f9c927")
 
 
 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
   sed -i '/nfs/d' xattr.conf
 }
 

lfs/autoconf-2.72.PKGBUILD

@@ -8,7 +8,7 @@ urls=("https://ftp.gnu.org/gnu/${pkgname}/${sources[0]}")
 md5sums=("1be79f7106ab6767f18391c5e22be701")
 
 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }
 
 src_build() {

lfs/automake-1.17.PKGBUILD

@@ -8,7 +8,7 @@ urls=("https://ftp.gnu.org/gnu/${pkgname}/${sources[0]}")
 md5sums=("7ab3a02318fee6f5bd42adfc369abf10")
 
 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }
 
 src_build() {

lfs/bash-5.2.37.PKGBUILD

@@ -1,16 +1,16 @@
 pkgname=bash
 _basever=5.2
-_patchlevel=32
+_patchlevel=37
 pkgver=${_basever}.${_patchlevel}
 pkgdesc='The GNU Bourne Again shell'
 license=('GPL-3.0-or-later')
 url='https://www.gnu.org/software/bash'
 sources=("${pkgname}-${pkgver}.tar.gz")
 urls=("https://ftp.gnu.org/gnu/${pkgname}/${sources[0]}")
-md5sums=("f204835b2e06c06e37b5ad776ff907f4")
+md5sums=("9c28f21ff65de72ca329c1779684a972")
 
 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }
 
 src_build() {

lfs/bc-7.0.3.PKGBUILD

@@ -1,16 +1,16 @@
 pkgname=bc
-pkgver=6.7.6
+pkgver=7.0.3
 pkgdesc='An arbitrary precision calculator language'
 homepage="https://git.gavinhoward.com/gavin/bc"
 license=('GPL-3.0-only')
 sources=("${pkgname}-${pkgver}.tar.xz")
-urls=("https://github.com/gavinhoward/bc/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.xz")
-md5sums=("a47aa5e4e7395fbcd159a9228613b97b")
+urls=("https://github.com/gavinhoward/bc/releases/download/${pkgver}/${sources[0]}")
+md5sums=("ad4db5a0eb4fdbb3f6813be4b6b3da74")
 
 options=(!strip)
 
 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }
 
 src_build() {

lfs/binutils-2.44.PKGBUILD

@@ -1,15 +1,15 @@
 pkgname=binutils
-pkgver=2.43.1
+pkgver=2.44
 pkgdesc='A set of programs to assemble and manipulate binary and object files'
 homepage='https://www.gnu.org/software/binutils/'
 license=(GPL-2.0-or-later GPL-3.0-or-later LGPL-2.0-or-later LGPL-3.0-or-later GFDL-1.3 FSFAP)
 sources=("${pkgname}-${pkgver}.tar.xz")
 urls=("https://sourceware.org/pub/binutils/releases/${sources[0]}")
-md5sums=("9202d02925c30969d1917e4bad5a2320")
+md5sums=("49912ce774666a30806141f106124294")
 
 
 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
   mkdir -v build
   cd       build
 }
@@ -17,7 +17,6 @@ src_prepare() {
 src_build() {
   ../configure --prefix=/usr                           \
                --sysconfdir="${pkgdir}"/etc            \
-	       --with-lib-path=/usr/lib:/usr/local/lib \
                --enable-gold                           \
                --enable-ld=default                     \
                --enable-plugins                        \

lfs/bison-3.8.2.PKGBUILD

@@ -8,11 +8,11 @@ urls=("https://ftp.gnu.org/gnu/${pkgname}/${sources[0]}")
 md5sums=("c28f119f405a2304ff0a7ccdcc629713")
 
 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }
 
 src_build() {
-  ./configure --prefix=/usr --docdir=/usr/share/doc/bison-3.8.2
+  ./configure --prefix=/usr --docdir=/usr/share/doc/${pkgname}-${pkgver}
   make
 }
 

lfs/bzip2-1.0.8.PKGBUILD

@@ -15,8 +15,8 @@ md5sums=("67e051268d0c475ea773822f7500d0e5"
 
 
 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
-  patch -Np1 -i "${DIST_DIR}/${pkgname}-${pkgver}/${sources[1]}"
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
+  patch -Np1 -i "${distdir}/${sources[1]}"
 }
 
 src_build() {

lfs/check-0.15.2.PKGBUILD

@@ -0,0 +1,26 @@
+pkgname=check
+pkgver=0.15.2
+pkgdesc="A unit testing framework for C"
+homepage="https://libcheck.github.io/check/"
+arch=(x86_64)
+license=(LGPL)
+sources=("${pkgname}-${pkgver}.tar.gz")
+urls=("https://github.com/libcheck/check/releases/download/${pkgver}/${sources[0]}")
+md5sums=("50fcafcecde5a380415b12e9c574e0b2")
+
+src_prepare() {
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
+}
+
+src_build() {
+  ./configure --prefix=/usr --disable-static
+  make
+}
+
+src_check() {
+  make check
+}
+
+src_install() {
+  make DESTDIR="${pkgdir}" docdir=/usr/share/doc/check-${pkgver} install
+}

lfs/coreutils-9.6.PKGBUILD

@@ -0,0 +1,49 @@
+pkgname=coreutils
+pkgver=9.6
+pkgdesc='The basic file, shell and text manipulation utilities of the GNU operating system'
+arch=('x86_64')
+license=(
+  GPL-3.0-or-later
+  GFDL-1.3-or-later
+)
+homepage='https://www.gnu.org/software/coreutils/'
+sources=("${pkgname}-${pkgver}.tar.xz"
+  "${pkgname}-${pkgver}-i18n-1.patch"
+)
+urls=("https://ftp.gnu.org/gnu/${pkgname}/${sources[0]}"
+  "https://www.linuxfromscratch.org/patches/lfs/12.3/coreutils-9.6-i18n-1.patch"
+)
+md5sums=("0ed6cc983fe02973bc98803155cc1733"
+  "6aee45dd3e05b7658971c321d92f44b7"
+)
+
+src_prepare() {
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
+  patch -Np1 -i ${distdir}/${sources[1]}
+}
+
+src_build() {
+  autoreconf -fv
+  automake -af
+  FORCE_UNSAFE_CONFIGURE=1 ./configure \
+              --prefix=/usr            \
+              --enable-no-install-program=kill,uptime
+  make
+}
+
+src_check() {
+  make NON_ROOT_USERNAME=leaf check-root
+  # non-root test
+  chown -R leaf .
+  su leaf -c "PATH=$PATH make -k RUN_EXPENSIVE_TESTS=yes check" \
+   < /dev/null
+}
+
+src_install() {
+  make DESTDIR=${pkgdir} install
+  install -d -m 755 ${pkgdir}/usr/sbin/
+  mv -v ${pkgdir}/usr/bin/chroot ${pkgdir}/usr/sbin
+  install -d -m 755 ${pkgdir}/usr/share/man/man8/
+  mv -v ${pkgdir}/usr/share/man/man1/chroot.1 ${pkgdir}/usr/share/man/man8/chroot.8
+  sed -i 's/"1"/"8"/' ${pkgdir}/usr/share/man/man8/chroot.8
+}

lfs/dejagnu-1.6.3.PKGBUILD

@@ -4,12 +4,12 @@ pkgdesc='Framework for testing other programs'
 homepage='https://www.gnu.org/software/dejagnu/'
 license=(GPL)
 sources=("${pkgname}-${pkgver}.tar.gz")
-urls=(https://ftp.gnu.org/gnu/dejagnu/${pkgname}-${pkgver}.tar.gz)
+urls=("https://ftp.gnu.org/gnu/dejagnu/${sources[0]}")
 md5sums=("68c5208c58236eba447d7d6d1326b821")
 
 
 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
   mkdir -v build
   cd       build
 }

lfs/diffutils-3.11.PKGBUILD

@@ -0,0 +1,26 @@
+pkgname=diffutils
+pkgver=3.11
+pkgdesc='Utility programs used for creating patch files'
+arch=('x86_64')
+homepage='https://www.gnu.org/software/diffutils'
+license=('GPL-3.0-or-later')
+sources=("${pkgname}-${pkgver}.tar.xz")
+urls=("https://ftp.gnu.org/gnu/${pkgname}/${sources[0]}")
+md5sums=("75ab2bb7b5ac0e3e10cece85bd1780c2")
+
+src_prepare() {
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
+}
+
+src_build() {
+  ./configure --prefix=/usr
+  make
+}
+
+src_check() {
+  make check
+}
+
+src_install() {
+  make DESTDIR="${pkgdir}" install
+}

lfs/expat-2.6.4.PKGBUILD

@@ -8,7 +8,7 @@ urls=("https://prdownloads.sourceforge.net/${pkgname}/${sources[0]}")
 md5sums=("101fe3e320a2800f36af8cf4045b45c7")
 
 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }
 
 src_build() {

lfs/expect-5.45.4.PKGBUILD

@@ -3,11 +3,12 @@ pkgver=5.45.4
 pkgdesc='A tool for automating interactive applications'
 homepage='https://www.nist.gov/el/msid/expect.cfm'
 license=(custom)
-sources=("${pkgname}${pkgver}.tar.gz"
-  "expect-5.45.4-gcc14-1.patch"
+_archive=${pkgname}${pkgver}
+sources=("${_archive}.tar.gz"
+  "${pkgname}-${pkgver}-gcc14-1.patch"
 )
-urls=("https://prdownloads.sourceforge.net/expect/expect${pkgver}.tar.gz"
-  "https://www.linuxfromscratch.org/patches/lfs/12.2/expect-5.45.4-gcc14-1.patch"
+urls=("https://prdownloads.sourceforge.net/expect/${sources[0]}"
+  "https://www.linuxfromscratch.org/patches/lfs/12.2/${sources[1]}"
 )
 md5sums=("00fce8de158422f5ccd2666512329bd2"
   "0b8b5ac411d011263ad40b0664c669f0"
@@ -18,8 +19,8 @@ src_prepare() {
   if ! python3 -c 'from pty import spawn; spawn(["echo", "ok"])'; then
     leaf_error "PTY issue. Cannot build."
   fi
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
-  patch -Np1 -i ${DIST_DIR}/${pkgname}-${pkgver}/${sources[1]}
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
+  patch -Np1 -i ${distdir}/${sources[1]}
 }
 
 src_build() {
@@ -38,7 +39,7 @@ src_check() {
 
 src_install() {
   make DESTDIR="$pkgdir" install
-  ln -svf expect5.45.4/libexpect5.45.4.so "${pkgdir}/usr/lib"
+  ln -svf ${pkgname}${pkgver}/libexpect${pkgver}.so "${pkgdir}/usr/lib"
 
   install -Dm644 README "$pkgdir/usr/share/licenses/$pkgname/README"
   # avoid file conflict with the more powerful mkpasswd from the whois package

lfs/file-5.46.PKGBUILD

@@ -1,14 +1,14 @@
 pkgname=file
-pkgver=5.45
+pkgver=5.46
 pkgdesc='File type identification utility'
 license=('custom')
 homepage='https://www.darwinsys.com/file/'
 sources=("$pkgname-$pkgver.tar.gz")
-urls=("https://astron.com/pub/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=("26b2a96d4e3a8938827a1e572afd527a")
+urls=("https://astron.com/pub/$pkgname/${sources[0]}")
+md5sums=("459da2d4b534801e2e2861611d823864")
 
 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }
 
 src_build() {

lfs/findutils-4.10.0.PKGBUILD

@@ -0,0 +1,27 @@
+pkgname=findutils
+pkgver=4.10.0
+pkgrel=2
+pkgdesc="GNU utilities to locate files"
+arch=('x86_64')
+license=('GPL-3.0-or-later')
+sources=("${pkgname}-${pkgver}.tar.xz")
+urls=("https://ftp.gnu.org/gnu/${pkgname}/${sources[0]}")
+md5sums=("870cfd71c07d37ebe56f9f4aaf4ad872")
+
+src_prepare() {
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
+}
+
+src_build() {
+  ./configure --prefix=/usr --localstatedir=/var/lib/locate
+  make
+}
+
+src_check() {
+  chown -R leaf .
+  su leaf -c "PATH=$PATH make check"
+}
+
+src_install() {
+  make DESTDIR="${pkgdir}" install
+}

lfs/flex-2.6.4.PKGBUILD

@@ -5,18 +5,18 @@ url="https://github.com/westes/flex"
 license=('custom')
 sources=("${pkgname}-${pkgver}.tar.gz")
 urls=(
-  "https://github.com/westes/flex/releases/download/v$pkgver/flex-$pkgver.tar.gz"
+  "https://github.com/westes/flex/releases/download/v${pkgver}/${sources[0]}"
 )
 md5sums=("2882e3179748cc9f9c23ec593d6adc8d")
 
 
 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }
 
 src_build() {
   ./configure --prefix=/usr \
-            --docdir=/usr/share/doc/flex-2.6.4 \
+            --docdir=/usr/share/doc/${pkgname}-${pkgver} \
             --disable-static
   make
 }

lfs/gawk-5.3.1.PKGBUILD

@@ -0,0 +1,30 @@
+pkgname=gawk
+pkgver=5.3.1
+pkgdesc="GNU version of awk"
+arch=('x86_64')
+homepage="https://www.gnu.org/software/gawk/"
+license=('GPL-3.0-or-later')
+sources=("${pkgname}-${pkgver}.tar.xz")
+urls=("https://ftp.gnu.org/gnu/${pkgname}/${sources[0]}")
+md5sums=("4e9292a06b43694500e0620851762eec")
+
+src_prepare() {
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
+  sed -i 's/extras//' Makefile.in
+}
+
+src_build() {
+  ./configure --prefix=/usr
+  make
+}
+
+src_check() {
+  chown -R leaf .
+  su leaf -c "PATH=$PATH make check"
+}
+
+src_install() {
+  make DESTDIR="${pkgdir}" install
+  ln -sv gawk.1 "${pkgdir}"/usr/share/man/man1/awk.1
+  install -vDm644 doc/{awkforai.txt,*.{eps,pdf,jpg}} -t "${pkgdir}"/usr/share/doc/gawk-5.3.1
+}

lfs/gcc-14.2.0.PKGBUILD

@@ -1,13 +1,13 @@
 pkgname="gcc"
 pkgver="14.2.0"
-pkgdesc=""
+pkgdesc="The GNU Compiler Collection"
 homepage="https://gcc.gnu.org"
 sources=("${pkgname}-${pkgver}.tar.xz")
 urls=("https://ftp.gnu.org/gnu/gcc/${pkgname}-${pkgver}/${sources[0]}")
 md5sums=("2268420ba02dc01821960e274711bde0")
 
 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1 
+  tar -xf ${distdir}/${sources[0]} --strip-components=1 
   case $(uname -m) in
     x86_64)
       sed -e '/m64=/s/lib64/lib/' \
@@ -17,6 +17,7 @@ src_prepare() {
 }
 
 src_build() {
+  leaf_clear_flags
   mkdir -v build
   pushd build > /dev/null
   ../configure --prefix=/usr            \
@@ -52,11 +53,11 @@ src_install() {
   pushd build > /dev/null
   make DESTDIR="$pkgdir" install
   chown -R root:root \
-    "$pkgdir"/usr/lib/gcc/$(gcc -dumpmachine)/14.2.0/include{,-fixed}
+    "$pkgdir"/usr/lib/gcc/$(${pkgdir}/usr/bin/gcc -dumpmachine)/14.2.0/include{,-fixed}
   ln -sv ../bin/cpp "$pkgdir"/usr/lib
   ln -sv gcc.1 "$pkgdir"/usr/share/man/man1/cc.1
   install -d -v -m755 "$pkgdir/usr/lib/bfd-plugins"
-  ln -sfv ../../libexec/gcc/$(gcc -dumpmachine)/14.2.0/liblto_plugin.so \
+  ln -sfv ../../libexec/gcc/$(${pkgdir}/usr/bin/gcc -dumpmachine)/14.2.0/liblto_plugin.so \
         "$pkgdir"/usr/lib/bfd-plugins/
   mkdir -pv "$pkgdir"/usr/share/gdb/auto-load/usr/lib
   mv -v "$pkgdir"/usr/lib/*gdb.py "$pkgdir"/usr/share/gdb/auto-load/usr/lib

lfs/gdbm-1.24.PKGBUILD

@@ -8,7 +8,7 @@ urls=("https://ftp.gnu.org/gnu/${pkgname}/${sources[0]}")
 md5sums=("c780815649e52317be48331c1773e987")
 
 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }
 
 src_build() {

lfs/gettext-0.24.PKGBUILD

@@ -1,5 +1,5 @@
 pkgname=gettext
-pkgver=0.22.5
+pkgver=0.24
 pkgdesc="GNU internationalization library"
 homepage="https://www.gnu.org/software/gettext/"
 license=(
@@ -10,21 +10,20 @@ license=(
 )
 sources=("${pkgname}-${pkgver}.tar.xz")
 urls=("https://ftp.gnu.org/gnu/${pkgname}/${sources[0]}")
-md5sums=("3ae5580599d84be93e6213930facb2db")
+md5sums=("87aea3013802a3c60fa3feb5c7164069")
 
 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }
 
 src_build() {
   ./configure --prefix=/usr    \
               --disable-static \
-              --docdir=/usr/share/doc/gettext-0.22.5
+              --docdir=/usr/share/doc/${pkgname}-${pkgver}
   make
 }
 
 src_check() {
-  leaf_record_message "If zh_CN.UTF-8 has been defined, then 5 tests are known to fail without libunistring:\n\ttest-ctype_alnum\n\ttest-ctype_alpha\n\ttest-ctype_graph\n\ttest-ctype_print\n\ttest-ctype_punct"
   make -k check
 }
 

lfs/glibc-2.41.PKGBUILD

@@ -1,40 +1,41 @@
 pkgname="glibc"
-pkgver=2.40
-sources=("glibc-2.40.tar.xz"
-  "glibc-2.40-fhs-1.patch"
-  "nsswitch.conf"
-  "ld.so.conf"
-  "tzdata2024a.tar.gz"
+pkgver=2.41
+sources=("${pkgname}-${pkgver}.tar.xz"
+  "${pkgname}-${pkgver}-fhs-1.patch"
+  "${pkgname}-${pkgver}/nsswitch.conf"
+  "${pkgname}-${pkgver}/ld.so.conf"
+  "${pkgname}-${pkgver}/tzdata2025a.tar.gz"
 )
-urls=("https://ftp.gnu.org/gnu/glibc/glibc-2.40.tar.xz"
-  "https://www.linuxfromscratch.org/patches/lfs/12.2/glibc-2.40-fhs-1.patch"
-  "https://gitea.phywyj.dynv6.net/wyj/LFS-PKGBUILDs/raw/branch/main/lfs-12.2-systemd/glibc-2.40/nsswitch.conf"
-  "https://gitea.phywyj.dynv6.net/wyj/LFS-PKGBUILDs/raw/branch/main/lfs-12.2-systemd/glibc-2.40/ld.so.conf"
-  "https://www.iana.org/time-zones/repository/releases/tzdata2024a.tar.gz"
+urls=("https://ftp.gnu.org/gnu/glibc/${sources[0]}"
+  "https://www.linuxfromscratch.org/patches/lfs/12.3/${pkgname}-${pkgver}-fhs-1.patch"
+  "https://gitea.phywyj.dynv6.net/wyj/LFS-PKGBUILDs/raw/branch/main/lfs/${pkgname}-${pkgver}/nsswitch.conf"
+  "https://gitea.phywyj.dynv6.net/wyj/LFS-PKGBUILDs/raw/branch/main/lfs/${pkgname}-${pkgver}/ld.so.conf"
+  "https://www.iana.org/time-zones/repository/releases/tzdata2025a.tar.gz"
 )
-md5sums=("b390feef233022114950317f10c4fa97"
+md5sums=("19862601af60f73ac69e067d3e9267d4"
   "9a5997c3452909b1769918c759eff8a2"
   "4caf37ca10aacf7f7bfabddf915e9d25"
   "79220f5a36182b7160e0cf567dc64129"
-  "2349edd8335245525cc082f2755d5bf4"
+  "404229390c06b7440f5e48d12c1a3251"
 )
 license=(GPL-2.0-or-later LGPL-2.1-or-later)
 
 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
-  patch -Np1 -i "${DIST_DIR}/${pkgname}-${pkgver}/${sources[1]}"
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
+  patch -Np1 -i "${distdir}/${sources[1]}"
 }
 
 src_build() {
+  leaf_clear_flags
   mkdir -pv build
   cd build
   echo "rootsbindir=/usr/sbin" > configparms
-  ../configure --prefix=/usr                          \
-             --disable-werror                         \
-             --enable-kernel=4.19                     \
-             --enable-stack-protector=strong          \
-             --disable-nscd                           \
-             libc_cv_slibdir=/usr/lib
+  ../configure --prefix=/usr                            \
+               --disable-werror                         \
+               --enable-kernel=5.4                      \
+               --enable-stack-protector=strong          \
+               --disable-nscd                           \
+               libc_cv_slibdir=/usr/lib
   make
 }
 
@@ -46,6 +47,7 @@ _skip_test() {
 
 src_check() {
   _skip_test tst-lchmod io/Makefile
+
   make check
 }
 
@@ -94,11 +96,9 @@ src_install() {
   localedef -i zh_TW -f UTF-8 zh_TW.UTF-8
   localedef -i zh_CN -f UTF-8 zh_CN.UTF-8
 
-  if [ ! -f /etc/nsswitch.conf ]; then
-    install -m644 "${DIST_DIR}/${pkgname}-${pkgver}/nsswitch.conf" "${pkgdir}/etc/nsswitch.conf"
-  fi
+  install -m644 "${distdir}/${sources[2]}" "${pkgdir}/etc/nsswitch.conf"
 
-  tar -xf "${DIST_DIR}/${pkgname}-${pkgver}/tzdata2024a.tar.gz"
+  tar -xf "${distdir}/${sources[4]}"
   ZONEINFO=${pkgdir}/usr/share/zoneinfo
   mkdir -pv $ZONEINFO/{posix,right}
   for tz in etcetera southamerica northamerica europe africa antarctica  \
@@ -111,9 +111,7 @@ src_install() {
   zic -d $ZONEINFO -p America/New_York
   unset ZONEINFO
 
-  if [ ! -f /etc/ld.so.conf ]; then
-    install -m644 "${DIST_DIR}/${pkgname}-${pkgver}/ld.so.conf" "${pkgdir}/etc/ld.so.conf"
-  fi
+  install -m644 "${distdir}/${sources[3]}" "${pkgdir}/etc/ld.so.conf"
 }
 
 src_preinstall() {

lfs/gmp-6.3.0.PKGBUILD

@@ -4,20 +4,20 @@ pkgdesc='A free library for arbitrary precision arithmetic'
 homepage='https://gmplib.org/'
 license=(GPL-2.0-or-later
          LGPL-3.0-or-later)
-sources=(gmp-$pkgver.tar.xz)
+sources=("${pkgname}-$pkgver.tar.xz")
 urls=("https://ftp.gnu.org/gnu/gmp/${sources[0]}")
 md5sums=("956dc04e864001a9c22429f761f2c283")
 
 
 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }
 
 src_build() {
   ./configure --prefix=/usr    \
               --enable-cxx     \
               --disable-static \
-              --docdir=/usr/share/doc/gmp-6.3.0
+              --docdir=/usr/share/doc/${pkgname}-${pkgver}
   make
   make html
 }

lfs/gperf-3.1.PKGBUILD

@@ -8,11 +8,11 @@ urls=("https://ftp.gnu.org/gnu/${pkgname}/${sources[0]}")
 md5sums=("9e251c0a618ad0824b51117d5d9db87e")
 
 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }
 
 src_build() {
-  ./configure --prefix=/usr --docdir=/usr/share/doc/gperf-3.1
+  ./configure --prefix=/usr --docdir=/usr/share/doc/${pkgname}-${pkgver}
   make
 }
 

lfs/grep-3.11.PKGBUILD

@@ -8,7 +8,7 @@ urls=("https://ftp.gnu.org/gnu/${pkgname}/${sources[0]}")
 md5sums=('7c9bbd74492131245f7cdb291fa142c0')
 
 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }
 
 src_build() {

lfs/groff-1.23.0.PKGBUILD

@@ -0,0 +1,26 @@
+pkgname=groff
+pkgver=1.23.0
+pkgdesc='GNU troff text-formatting system'
+arch=('x86_64')
+homepage='https://www.gnu.org/software/groff/groff.html'
+license=('GPL-3.0-or-later')
+sources=("${pkgname}-${pkgver}.tar.gz")
+urls=("https://ftp.gnu.org/gnu/${pkgname}/${sources[0]}")
+md5sums=("5e4f40315a22bb8a158748e7d5094c7d")
+
+src_prepare() {
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
+}
+
+src_build() {
+  PAGE=A4 ./configure --prefix=/usr
+  make
+}
+
+src_check() {
+  make check
+}
+
+src_install() {
+  make DESTDIR="${pkgdir}" install
+}

lfs/gzip-1.13.PKGBUILD

@@ -0,0 +1,26 @@
+pkgname=gzip
+pkgver=1.13
+pkgdesc='GNU compression utility'
+arch=('x86_64')
+homepage='https://www.gnu.org/software/gzip/'
+license=('GPL-3.0-or-later')
+sources=("${pkgname}-${pkgver}.tar.xz")
+urls=("https://ftp.gnu.org/gnu/${pkgname}/${sources[0]}")
+md5sums=("d5c9fc9441288817a4a0be2da0249e29")
+
+src_prepare() {
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
+}
+
+src_build() {
+  ./configure --prefix=/usr
+  make
+}
+
+src_check() {
+  make check
+}
+
+src_install() {
+  make DESTDIR="${pkgdir}" install
+}

lfs/iana-etc-20250123.PKGBUILD

@@ -1,16 +1,14 @@
 pkgname="iana-etc"
-pkgver="20240806"
+pkgver="20250123"
 pkgdesc='/etc/protocols and /etc/services provided by IANA'
 homepage="https://www.iana.org/protocols"
 sources=("${pkgname}-${pkgver}.tar.gz")
-urls=('https://github.com/Mic92/iana-etc/releases/download/20240806/iana-etc-20240806.tar.gz')
-md5sums=("ea3c37c00d22f1159fc3b7d988de8476")
+urls=("https://github.com/Mic92/iana-etc/releases/download/${pkgver}/${sources[0]}")
+md5sums=("f8a0ebdc19a5004cf42d8bdcf614fa5d")
 license=('custom:none')
 
-distdir=${DIST_DIR}/${pkgname}-${pkgver}
-
 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }
 
 src_build() {

lfs/inetutils-2.6.PKGBUILD

@@ -1,14 +1,14 @@
 pkgname=inetutils
-pkgver=2.5
+pkgver=2.6
 pkgdesc="A collection of common network programs"
 homepage="https://www.gnu.org/software/inetutils/"
 license=('GPL-3.0-or-later')
 sources=("${pkgname}-${pkgver}.tar.xz")
 urls=("https://ftp.gnu.org/gnu/${pkgname}/${sources[0]}")
-md5sums=("9e5a6dfd2d794dc056a770e8ad4a9263")
+md5sums=("401d7d07682a193960bcdecafd03de94")
 
 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
   sed -i 's/def HAVE_TERMCAP_TGETENT/ 1/' telnet/telnet.c
 }
 

lfs/intltool-0.51.0.PKGBUILD

@@ -8,7 +8,7 @@ urls=("https://launchpad.net/intltool/trunk/0.51.0/+download/${sources[0]}")
 md5sums=("12e517cac2b57a0121cda351570f1e63")
 
 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
   sed -i 's:\\\${:\\\$\\{:' intltool-update.in
 }
 

lfs/iproute2-6.13.0.PKGBUILD

@@ -0,0 +1,25 @@
+pkgname=iproute2
+pkgver=6.13.0
+pkgdesc='IP Routing Utilities'
+arch=('x86_64')
+license=('GPL-2.0-or-later')
+homepage='https://www.kernel.org/pub/linux/utils/net/iproute2/'
+sources=("${pkgname}-${pkgver}.tar.xz")
+urls=("https://www.kernel.org/pub/linux/utils/net/${pkgname}/${sources[0]}")
+md5sums=("1603d25120d03feeaba9b360d03ffaec")
+
+src_prepare() {
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
+}
+
+src_build() {
+  sed -i /ARPD/d Makefile
+  rm -fv man/man8/arpd.8
+  ./configure --color auto
+  make NETNS_RUN_DIR=/run/netns
+}
+
+src_install() {
+  make DESTDIR="${pkgdir}" SBINDIR=/usr/bin/ install
+  install -vDm644 COPYING README* -t "${pkgdir}"/usr/share/doc/iproute2-6.13.0
+}

lfs/kbd-2.7.1.PKGBUILD

@@ -0,0 +1,37 @@
+pkgname=kbd
+pkgver=2.7.1
+pkgdesc="Keytable files and keyboard utilities"
+arch=('x86_64')
+homepage="http://www.kbd-project.org"
+license=('GPL-2.0-or-later')
+sources=("${pkgname}-${pkgver}.tar.xz"
+  "kbd-2.7.1-backspace-1.patch"
+)
+urls=("https://www.kernel.org/pub/linux/utils/${pkgname}/${sources[0]}"
+  "https://www.linuxfromscratch.org/patches/lfs/12.3/kbd-2.7.1-backspace-1.patch"
+)
+md5sums=("f15673d9f748e58f82fa50cff0d0fd20"
+  "f75cca16a38da6caa7d52151f7136895"
+)
+
+src_prepare() {
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
+  patch -Np1 -i ${distdir}/${sources[1]}
+  sed -i '/RESIZECONS_PROGS=/s/yes/no/' configure
+  sed -i 's/resizecons.8 //' docs/man/man8/Makefile.in
+}
+
+src_build() {
+  ./configure --prefix=/usr --disable-vlock
+  make
+}
+
+src_check() {
+  make check
+}
+
+src_install() {
+  make DESTDIR="${pkgdir}" install
+  install -d -v "${pkgdir}/usr/share/doc/kbd-2.7.1"
+  cp -R -v docs/doc -T "${pkgdir}/usr/share/doc/kbd-2.7.1"
+}

lfs/kmod-34.PKGBUILD

@@ -0,0 +1,27 @@
+pkgname=kmod
+pkgver=34
+pkgdesc="Linux kernel module management tools and library"
+arch=('x86_64')
+homepage='https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git'
+license=('LGPL-2.1-or-later' 'GPL-2.0-or-later')
+sources=("${pkgname}-${pkgver}.tar.xz")
+urls=("https://www.kernel.org/pub/linux/utils/kernel/${pkgname}/${sources[0]}")
+md5sums=("3e6c5c9ad9c7367ab9c3cc4f08dfde62")
+
+src_prepare() {
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
+}
+
+src_build() {
+  mkdir -p build
+  cd       build
+  meson setup --prefix=/usr ..    \
+              --sbindir=/usr/sbin \
+              --buildtype=release \
+              -D manpages=false
+  ninja
+}
+
+src_install() {
+  DESTDIR=${pkgdir} ninja install
+}

lfs/less-668.PKGBUILD

@@ -1,14 +1,14 @@
 pkgname=less
-pkgver=661
+pkgver=668
 pkgdesc='A terminal based program for viewing text files'
 license=('GPL-3.0-or-later' 'BSD-2-Clause')
 homepage='https://www.greenwoodsoftware.com/less/'
 sources=("${pkgname}-${pkgver}.tar.gz")
 urls=("https://www.greenwoodsoftware.com/${pkgname}/${sources[0]}")
-md5sums=("44f54b6313c5d71fa1ac224d8d84766a")
+md5sums=("d72760386c5f80702890340d2f66c302")
 
 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }
 
 src_build() {

lfs/libcap-2.73.PKGBUILD

@@ -1,15 +1,15 @@
 pkgname=libcap
-pkgver=2.70
+pkgver=2.73
 pkgdesc="POSIX 1003.1e capabilities"
 homepage="https://sites.google.com/site/fullycapable/"
 license=('BSD-3-Clause OR GPL-2.0-only')
 sources=("${pkgname}-${pkgver}.tar.xz")
 urls=("https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/${sources[0]}")
-md5sums=("df0e20c6eeca849347b87d5d6a8870c0")
+md5sums=("0e186df9de9b1e925593a96684fe2e32")
 
 
 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
   sed -i '/install -m.*STA/d' libcap/Makefile
 }
 

lfs/libelf-0.192.PKGBUILD

@@ -1,18 +1,19 @@
 pkgname="libelf"
 _pkgbase="elfutils"
-pkgver=0.191
+pkgver=0.192
 pkgdesc="Handle ELF object files and DWARF debugging information (lib)"
 license=("GPL-2.0-or-later OR LGPL-3.0-or-later")
 homepage="https://sourceware.org/elfutils/"
 sources=("${_pkgbase}-${pkgver}.tar.bz2")
 urls=("https://sourceware.org/ftp/${_pkgbase}/${pkgver}/${sources[0]}")
-md5sums="636547248fb3fae58ec48030298d3ef7"
+md5sums="a6bb1efc147302cfc15b5c2b827f186a"
 
 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }
 
 src_build() {
+  CFLAGS+=" -g"
   ./configure --prefix=/usr                \
               --disable-debuginfod         \
               --enable-libdebuginfod=dummy

lfs/libffi-3.4.7.PKGBUILD

@@ -1,14 +1,14 @@
 pkgname=libffi
-pkgver=3.4.6
+pkgver=3.4.7
 pkgdesc='Portable foreign function interface library'
 homepage='https://sourceware.org/libffi/'
 license=(MIT)
 sources=("${pkgname}-${pkgver}.tar.gz")
 urls=("https://github.com/libffi/libffi/releases/download/v${pkgver}/${sources[0]}")
-md5sums=("b9cac6c5997dca2b3787a59ede34e0eb")
+md5sums=("696a1d483a1174ce8a477575546a5284")
 
 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }
 
 src_build() {

lfs/libpipeline-1.5.8.PKGBUILD

@@ -0,0 +1,26 @@
+pkgname=libpipeline
+pkgver=1.5.8
+pkgdesc="a C library for manipulating pipelines of subprocesses in a flexible and convenient way"
+arch=('x86_64')
+homepage="https://nongnu.org/libpipeline/"
+license=('GPL-3.0-or-later')
+sources=("${pkgname}-${pkgver}.tar.gz")
+urls=("https://download.savannah.gnu.org/releases/${pkgname}/${sources[0]}")
+md5sums=("17ac6969b2015386bcb5d278a08a40b5")
+
+src_prepare() {
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
+}
+
+src_build() {
+  ./configure --prefix=/usr
+  make
+}
+
+src_check() {
+  make check
+}
+
+src_install() {
+  make DESTDIR="${pkgdir}" install
+}

lfs/libtool-2.5.4.PKGBUILD

@@ -1,23 +1,22 @@
 pkgname=libtool
-pkgver=2.4.7
+pkgver=2.5.4
 pkgdesc='A generic library support script'
 homepage='https://www.gnu.org/software/libtool'
 license=('LGPL-2.0-or-later WITH Libtool-exception')
 sources=("${pkgname}-${pkgver}.tar.xz")
 urls=("https://ftp.gnu.org/gnu/${pkgname}/${sources[0]}")
-md5sums=("2fc0b6ddcd66a89ed6e45db28fa44232")
+md5sums=("22e0a29df8af5fdde276ea3a7d351d30")
 
 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }
 
 src_build() {
-  ./configure --prefix=/usr lt_cv_sys_lib_dlsearch_path_spec="/usr/lib /usr/lib32"
+  ./configure --prefix=/usr
   make
 }
 
 src_check() {
-  leaf_record_message "Two of the tests are known to fail. See LFS handbook."
   make -k check
 }
 

lfs/libxcrypt-4.4.38.PKGBUILD

@@ -1,15 +1,15 @@
 pkgname=libxcrypt
-pkgver=4.4.36
+pkgver=4.4.38
 pkgdesc='Modern library for one-way hashing of passwords'
 homepage='https://github.com/besser82/libxcrypt/'
 license=('LGPL')
 sources=("${pkgname}-${pkgver}.tar.xz")
 urls=("${homepage}/releases/download/v${pkgver}/${sources[0]}")
-md5sums=("b84cd4104e08c975063ec6c4d0372446")
+md5sums=("1796a5d20098e9dd9e3f576803c83000")
 
 
 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }
 
 src_build() {

lfs/libxcrypt-compat-4.4.38.PKGBUILD

@@ -1,16 +1,16 @@
 pkgname=libxcrypt-compat
 _pkgbase=libxcrypt
-pkgver=4.4.36
+pkgver=4.4.38
 pkgdesc='Modern library for one-way hashing of passwords - legacy API functions'
 homepage='https://github.com/besser82/libxcrypt/'
 license=('LGPL')
 sources=("${_pkgbase}-${pkgver}.tar.xz")
 urls=("${homepage}/releases/download/v${pkgver}/${sources[0]}")
-md5sums=("b84cd4104e08c975063ec6c4d0372446")
+md5sums=("1796a5d20098e9dd9e3f576803c83000")
 
 
 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }
 
 src_build() {

lfs/lz4-1.10.0.PKGBUILD

@@ -3,12 +3,12 @@ pkgver="1.10.0"
 pkgdesc='Extremely fast compression algorithm'
 homepage="https://lz4.org/"
 license=('GPL-2.0-or-later')
-sources=("lz4-1.10.0.tar.gz")
-urls=("https://github.com/lz4/lz4/releases/download/v1.10.0/lz4-1.10.0.tar.gz")
+sources=("${pkgname}-${pkgver}.tar.gz")
+urls=("https://github.com/lz4/lz4/releases/download/v${pkgver}/${sources[0]}")
 md5sums=("dead9f5f1966d9ae56e1e32761e4e675")
 
 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }
 
 src_build() {

lfs/m4-1.4.19.PKGBUILD

@@ -3,13 +3,13 @@ pkgver=1.4.19
 pkgdesc="The GNU macro processor"
 homepage="https://www.gnu.org/software/m4"
 license=('GPL3')
-sources=("$pkgname-$pkgver.tar.xz")
-urls=("https://ftp.gnu.org/gnu/m4/$pkgname-$pkgver.tar.xz")
+sources=("${pkgname}-${pkgver}.tar.xz")
+urls=("https://ftp.gnu.org/gnu/m4/${sources[0]}")
 md5sums=("0d90823e1426f1da2fd872df0311298d")
 
 
 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }
 
 src_build() {

lfs/make-4.4.1.PKGBUILD

@@ -0,0 +1,27 @@
+pkgname=make
+pkgver=4.4.1
+pkgdesc="GNU make utility to maintain groups of programs"
+arch=('x86_64')
+homepage="https://www.gnu.org/software/make"
+license=('GPL3')
+sources=("${pkgname}-${pkgver}.tar.gz")
+urls=("https://ftp.gnu.org/gnu/${pkgname}/${sources[0]}")
+md5sums=("c8469a3713cbbe04d955d4ae4be23eeb")
+
+src_prepare() {
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
+}
+
+src_build() {
+  ./configure --prefix=/usr
+  make
+}
+
+src_check() {
+  chown -R leaf .
+  su leaf -c "PATH=$PATH make check"
+}
+
+src_install() {
+  make DESTDIR="${pkgdir}" install
+}

lfs/man-pages-6.12.PKGBUILD

@@ -0,0 +1,26 @@
+pkgname="man-pages"
+pkgver="6.12"
+pkgdesc="Linux man pages"
+license=("GPL2")
+sources=("${pkgname}-${pkgver}.tar.xz")
+urls=("https://www.kernel.org/pub/linux/docs/man-pages/${sources[0]}")
+md5sums=("44de430a598605eaba3e36dd43f24298")
+
+distdir=${distdir}
+
+src_prepare() {
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
+}
+
+src_check(){
+  return 0
+}
+
+src_build() {
+  cd "$srcdir"
+  rm -v man3/crypt*
+}
+
+src_install() {
+  make -R GIT=false prefix=/usr DESTDIR="$pkgdir" install
+}

lfs/meson-1.7.0.PKGBUILD

@@ -0,0 +1,23 @@
+pkgname=meson
+pkgver=1.7.0
+pkgdesc="High productivity build system"
+homepage="https://mesonbuild.com/"
+arch=(any)
+license=(Apache-2.0)
+sources=("${pkgname}-${pkgver}.tar.gz")
+urls=("https://github.com/mesonbuild/meson/releases/download/${pkgver}/${sources[0]}")
+md5sums=("c20f3e5ebbb007352d22f4fd6ceb925c")
+
+src_prepare() {
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
+}
+
+src_build() {
+  pip3 wheel -w dist --no-cache-dir --no-build-isolation --no-deps $PWD
+}
+
+src_install() {
+  pip3 install --no-deps --no-warn-script-location --no-index --no-cache-dir --no-user --force-reinstall --root ${pkgdir} --find-links dist ${pkgname}
+  install -vDm644 data/shell-completions/bash/meson ${pkgdir}/usr/share/bash-completion/completions/meson
+  install -vDm644 data/shell-completions/zsh/_meson ${pkgdir}/usr/share/zsh/site-functions/_meson
+}

lfs/mpc-1.3.1.PKGBUILD

@@ -3,13 +3,13 @@ pkgver=1.3.1
 pkgdesc="Minimalist command line interface to MPD"
 homepage="https://www.musicpd.org/clients/mpc/"
 license=(GPL-2.0-or-later)
-sources=($pkgname-$pkgver.tar.gz)
+sources=("${pkgname}-${pkgver}.tar.gz")
 urls=("https://ftp.gnu.org/gnu/${pkgname}/${sources[0]}")
 md5sums=("5c9bc658c9fd0f940e8e3e0f09530c62")
 
 
 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }
 
 src_build() {

lfs/mpfr-4.2.1.PKGBUILD

@@ -11,12 +11,12 @@ homepage='https://www.mpfr.org/'
 # NOTE: download potentially existing patches from upstream:
 # `curl patches.diff -o https://www.mpfr.org/mpfr-${_pkgver}/allpatches`
 sources=("${pkgname}-${_pkgver}.tar.xz")
-urls=(https://ftp.gnu.org/gnu/$pkgname/$pkgname-$_pkgver.tar.xz)
+urls=("https://ftp.gnu.org/gnu/${pkgname}/${sources[0]}")
 md5sums=("523c50c6318dde6f9dc523bc0244690a")
 
 
 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }
 
 src_build() {

lfs/ncurses-6.5.PKGBUILD

@@ -8,7 +8,7 @@ urls=("https://invisible-mirror.net/archives/ncurses/${sources[0]}")
 md5sums=("ac2d2629296f04c8537ca706b6977687")
 
 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }
 
 src_build() {

lfs/ninja-1.12.1.PKGBUILD

@@ -0,0 +1,30 @@
+pkgname=ninja
+pkgver=1.12.1
+pkgdesc='Small build system with a focus on speed'
+arch=(x86_64)
+homepage='https://ninja-build.org/'
+license=(Apache-2.0)
+sources=("${pkgname}-${pkgver}.tar.gz")
+urls=("https://github.com/ninja-build/ninja/archive/v${pkgver}/${sources[0]}")
+md5sums=("6288992b05e593a391599692e2f7e490")
+
+src_prepare() {
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
+  sed -i '/int Guess/a \
+  int   j = 0;\
+  char* jobs = getenv( "NINJAJOBS" );\
+  if ( jobs != NULL ) j = atoi( jobs );\
+  if ( j > 0 ) return j;\
+' src/ninja.cc
+}
+
+src_build() {
+  python3 configure.py --bootstrap --verbose
+}
+
+src_install() {
+  install -d -v -m755 ${pkgdir}/usr/bin/
+  install -vm755 ninja ${pkgdir}/usr/bin/
+  install -vDm644 misc/bash-completion ${pkgdir}/usr/share/bash-completion/completions/ninja
+  install -vDm644 misc/zsh-completion  ${pkgdir}/usr/share/zsh/site-functions/_ninja
+}

lfs/openssl-3.4.1.PKGBUILD

@@ -1,15 +1,15 @@
 pkgname=openssl
-pkgver=3.3.1
+pkgver=3.4.1
 pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer Security'
 arch=('x86_64')
 homepage='https://www.openssl.org'
 license=('Apache-2.0')
 sources=("${pkgname}-${pkgver}.tar.gz")
 urls=("https://www.openssl.org/source/${sources[0]}")
-md5sums=("8a4342b399c18f870ca6186299195984")
+md5sums=("fb7a747ac6793a7ad7118eaba45db379")
 
 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }
 
 src_build() {
@@ -29,6 +29,7 @@ src_check() {
 src_install() {
   sed -i '/INSTALL_LIBS/s/libcrypto.a libssl.a//' Makefile
   make DESTDIR="${pkgdir}" MANSUFFIX=ssl install
+  mv -v "${pkgdir}/usr/share/doc/openssl" "${pkgdir}/usr/share/doc/openssl-${pkgver}"
   install -D -m644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE.txt"
 }
 

lfs/patch-2.7.6.PKGBUILD

@@ -0,0 +1,27 @@
+pkgname=patch
+pkgver=2.7.6
+pkgrel=10
+pkgdesc='A utility to apply patch files to original sources'
+arch=('x86_64')
+url='https://www.gnu.org/software/patch/'
+license=('GPL')
+sources=("${pkgname}-${pkgver}.tar.xz")
+urls=("https://ftp.gnu.org/gnu/${pkgname}/${sources[0]}")
+md5sums=("78ad9937e4caadcba1526ef1853730d5")
+
+src_prepare() {
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
+}
+
+src_build() {
+  ./configure --prefix=/usr
+  make
+}
+
+src_check() {
+  make check
+}
+
+src_install() {
+  make DESTDIR="${pkgdir}" install
+}

lfs/perl-5.40.1.PKGBUILD

@@ -1,15 +1,15 @@
 pkgname=perl
-pkgver=5.40.0
+pkgver=5.40.1
 _basever="${pkgver%.*}"
 pkgdesc="A highly capable, feature-rich programming language"
 license=('GPL' 'PerlArtistic')
 homepage="https://www.perl.org"
 sources=("${pkgname}-${pkgver}.tar.xz")
 urls=("https://www.cpan.org/src/5.0/${sources[0]}")
-md5sums=("cfe14ef0709b9687f9c514042e8e1e82")
+md5sums=("bab3547a5cdf2302ee0396419d74a42e")
 
 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }
 
 src_build() {

lfs/perl-xml-parser-2.47.PKGBUILD

@@ -8,7 +8,7 @@ urls=("https://cpan.metacpan.org/authors/id/T/TO/TODDR/${sources[0]}")
 md5sums=("89a8e82cfd2ad948b349c0a69c494463")
 
 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }
 
 src_build() {

lfs/pkgconf-2.3.0.PKGBUILD

@@ -4,12 +4,12 @@ pkgdesc="Package compiler and linker metadata toolkit"
 homepage="https://github.com/pkgconf/pkgconf"
 license=(ISC)
 sources=("${pkgname}-${pkgver}.tar.xz")
-urls=("https://distfiles.ariadne.space/pkgconf/${pkgname}-${pkgver}.tar.xz")
+urls=("https://distfiles.ariadne.space/pkgconf/${sources[0]}")
 md5sums=("833363e77b5bed0131c7bc4cc6f7747b")
 
 
 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }
 
 src_build() {

lfs/psmisc-23.7.PKGBUILD

@@ -7,7 +7,7 @@ urls="https://sourceforge.net/projects/psmisc/files/${pkgname}/${sources[0]}"
 md5sums="53eae841735189a896d614cba440eb10"
 
 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }
 
 src_build() {

lfs/python-3.13.2.PKGBUILD

@@ -1,5 +1,5 @@
 pkgname=python
-pkgver=3.12.5
+pkgver=3.13.2
 pkgdesc="The Python programming language"
 license=('PSF-2.0')
 homepage="https://www.python.org/"
@@ -9,13 +9,13 @@ sources=("Python-${pkgver}.tar.xz"
 urls=("https://www.python.org/ftp/${pkgname}/${pkgver}/${sources[0]}"
   "https://www.python.org/ftp/${pkgname}/doc/${pkgver}/${sources[1]}"
 )
-md5sums=("02c7d269e077f4034963bba6befdc715"
-  "52274d813236ca4a972fb6988480dc56"
+md5sums=("4c2d9202ab4db02c9d0999b14655dfe5"
+  "d6aede88f480a018d26b3206f21654ae"
 )
 
 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
-  tar --no-same-owner -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[1]}
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
+  tar --no-same-owner -xf ${distdir}/${sources[1]}
 }
 
 src_build() {

lfs/python-flit-core-3.11.0.PKGBUILD

@@ -0,0 +1,22 @@
+pkgname=python-flit-core
+_name=${pkgname#python-}
+pkgver=3.11.0
+pkgdesc="A PEP 517 build backend for packages using Flit"
+homepage="https://github.com/pypa/flit/tree/main/flit_core"
+license=(BSD-3-Clause)
+sources=("flit_core-${pkgver}.tar.gz")
+urls=("https://pypi.org/packages/source/f/${_name}/${sources[0]}")
+md5sums=("6d677b1acef1769c4c7156c7508e0dbd")
+
+src_prepare() {
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
+}
+
+src_build() {
+  pip3 wheel -w dist --no-cache-dir --no-build-isolation --no-deps $PWD
+}
+
+src_install() {
+  pip3 install --no-deps --no-warn-script-location --no-index --no-cache-dir --no-user --force-reinstall --root ${pkgdir} --find-links dist flit_core
+}
+

lfs/python-jinja2-3.1.5.PKGBUILD

@@ -0,0 +1,27 @@
+pkgname=python-jinja2
+_name="${pkgname#python-}"
+pkgver=3.1.5
+pkgdesc="A simple pythonic template language written in Python"
+arch=('any')
+homepage="https://palletsprojects.com/p/jinja/"
+license=('BSD-3-Clause')
+sources=("${_name}-${pkgver}.tar.gz")
+urls=("https://pypi.org/packages/source/J/Jinja2/${sources[0]}")
+md5sums=("083d64f070f6f1b5f75971ae60240785")
+
+src_prepare() {
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
+}
+
+src_build() {
+  pip3 wheel -w dist --no-cache-dir --no-build-isolation --no-deps $PWD
+}
+
+src_check() {
+  :
+}
+
+src_install() {
+  pip3 install --no-deps --no-warn-script-location --no-index --no-cache-dir --no-user --force-reinstall --root ${pkgdir} --find-links dist Jinja2
+  install -vDm 644 LICENSE.txt -t "$pkgdir/usr/share/licenses/$pkgname/"
+}

lfs/python-markupsafe-3.0.2.PKGBUILD

@@ -0,0 +1,27 @@
+pkgname=python-markupsafe
+_name=${pkgname#python-}
+pkgver=3.0.2
+pkgdesc="Implements a XML/HTML/XHTML Markup safe string for Python"
+arch=('x86_64')
+homepage="https://pypi.python.org/pypi/MarkupSafe"
+license=('BSD-3-Clause')
+sources=("${_name}-${pkgver}.tar.gz")
+urls=("https://pypi.org/packages/source/M/MarkupSafe/${sources[0]}")
+md5sums=("cb0071711b573b155cc8f86e1de72167")
+
+src_prepare() {
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
+}
+
+src_build() {
+  pip3 wheel -w dist --no-cache-dir --no-build-isolation --no-deps $PWD
+}
+
+src_check() {
+  :
+}
+
+src_install() {
+  pip3 install --no-deps --no-warn-script-location --no-index --no-cache-dir --no-user --force-reinstall --root ${pkgdir} --find-links dist ${_name}
+  install -Dm644 LICENSE.txt -t "$pkgdir"/usr/share/licenses/$pkgname/
+}

lfs/python-setuptools-75.8.1.PKGBUILD

@@ -1,19 +1,20 @@
 pkgname=python-setuptools
 _name=${pkgname#python-}
-pkgver=72.2.0
+pkgver=75.8.1
 pkgdesc="Easily download, build, install, upgrade, and uninstall Python packages"
 homepage="https://pypi.org/project/setuptools/"
 license=('MIT')
 sources=("${_name}-${pkgver}.tar.gz")
 urls=("https://pypi.org/packages/source/s/${_name}/${sources[0]}")
-md5sums=("2e0ffd0f6fc632a11442b79d9b1c68bd")
+md5sums=("7dc3d3f529b76b10e35326e25c676b30")
 
 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }
 
 src_build() {
-  python3 setup.py build
+  #python3 setup.py build
+  pip3 wheel -w dist --no-cache-dir --no-build-isolation --no-deps $PWD
 }
 
 src_check() {
@@ -21,7 +22,8 @@ src_check() {
 }
 
 src_install() {
-  python setup.py install --prefix=/usr --root="$pkgdir" --optimize=1 --skip-build
+  #python setup.py install --prefix=/usr --root="$pkgdir" --optimize=1 --skip-build
+  pip3 install --no-deps --no-warn-script-location --no-index --no-cache-dir --no-user --force-reinstall --root ${pkgdir} --find-links dist ${_name}
   install -vDm 644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname/"
 }
 

lfs/python-wheel-0.45.1.PKGBUILD

@@ -0,0 +1,23 @@
+pkgname=python-wheel
+_name=${pkgname#python-}
+pkgver=0.45.1
+pkgrel=1
+pkgdesc="A built-package format for Python"
+arch=(any)
+homepage="https://pypi.python.org/pypi/wheel"
+license=('MIT')
+sources=("${_name}-${pkgver}.tar.gz")
+urls=("https://pypi.org/packages/source/w/${_name}/${sources[0]}")
+md5sums=("dddc505d0573d03576c7c6c5a4fe0641")
+
+src_prepare() {
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
+}
+
+src_build() {
+  pip3 wheel -w dist --no-cache-dir --no-build-isolation --no-deps $PWD
+}
+
+src_install() {
+  pip3 install --no-deps --no-warn-script-location --no-index --no-cache-dir --no-user --force-reinstall --root ${pkgdir} --find-links dist ${_name}
+}

lfs/readline-8.2.13.PKGBUILD

@@ -6,11 +6,11 @@ pkgdesc='GNU readline library'
 homepage='https://tiswww.case.edu/php/chet/readline/rltop.html'
 license=('GPL-3.0-only')
 sources=("${pkgname}-${pkgver}.tar.gz")
-urls=("https://ftp.gnu.org/gnu/readline/readline-${pkgver}.tar.gz")
+urls=("https://ftp.gnu.org/gnu/readline/${sources[0]}")
 md5sums=("05080bf3801e6874bb115cd6700b708f")
 
 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
   sed -i '/MV.*old/d' Makefile.in
   sed -i '/{OLDSUFF}/c:' support/shlib-install
   sed -i 's/-Wl,-rpath,[^ ]*//' support/shobj-conf
@@ -20,11 +20,11 @@ src_build() {
   ./configure --prefix=/usr  \
             --disable-static \
             --with-curses    \
-            --docdir=/usr/share/doc/readline-8.2.13
+            --docdir=/usr/share/doc/${pkgname}-${pkgver}
   make SHLIB_LIBS="-lncursesw"
 }
 
 src_install() {
   make SHLIB_LIBS="-lncursesw" DESTDIR="$pkgdir" install
-  install -v -m644 doc/*.{ps,pdf,html,dvi} ${pkgdir}/usr/share/doc/readline-8.2.13
+  install -v -m644 doc/*.{ps,pdf,html,dvi} ${pkgdir}/usr/share/doc/${pkgname}-${pkgver}
 }

lfs/sed-4.9.PKGBUILD

@@ -8,7 +8,7 @@ urls=("https://ftp.gnu.org/gnu/${pkgname}/${sources[0]}")
 md5sums=("6aac9b2dbafcd5b7a67a8a9bcb8036c3")
 
 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }
 
 src_build() {

lfs/shadow-4.17.3.PKGBUILD

@@ -1,21 +1,18 @@
 pkgname=shadow
-pkgver=4.16.0
+pkgver=4.17.3
 pkgdesc="Password and account management tool suite with support for shadow files and PAM"
 homepage="https://github.com/shadow-maint/shadow"
 license=(BSD-3-Clause)
 sources=("${pkgname}-${pkgver}.tar.xz"
-	"useradd"
 )
 urls=("https://github.com/shadow-maint/shadow/releases/download/${pkgver}/${sources[0]}"
-	"https://gitea.phywyj.dynv6.net/wyj/LFS-PKGBUILDs/raw/branch/main/lfs-12.2-systemd/shadow-4.16.0/useradd"
 )
-md5sums=("eb70bad3316d08f0d3bb3d4bbeccb3b4"
-	"87ed6b2e7cdf479e05d4fe2510adb77f"
+md5sums=("0da190e53ecee76237e4c8f3f39531ed"
 )
 
 
 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 
   sed -i 's/groups$(EXEEXT) //' src/Makefile.in
   find man -name Makefile.in -exec sed -i 's/groups\.1 / /'   {} \;
@@ -41,5 +38,18 @@ src_install() {
   make exec_prefix=/usr DESTDIR="${pkgdir}" install
   make DESTDIR="${pkgdir}" -C man install-man
   install -vDm 644 COPYING -t "$pkgdir/usr/share/licenses/$pkgname/"
-  install -vDm 600 "${DIST_DIR}/${pkgname}-${pkgver}/useradd" -t "${pkgdir}/etc/default/"
+  #install -vDm 600 "${distdir}/useradd" -t "${pkgdir}/etc/default/"
+  mkdir -pv "${pkgdir}/etc/default"
+  cat > "${pkgdir}/etc/default/useradd" << EOF
+GROUP=999
+GROUPS=
+HOME=/home
+INACTIVE=-1
+EXPIRE=
+SHELL=/bin/bash
+SKEL=/etc/skel
+USRSKEL=/usr/etc/skel
+CREATE_MAIL_SPOOL=no
+LOG_INIT=yes
+EOF
 }

lfs/tar-1.35.PKGBUILD

@@ -0,0 +1,28 @@
+pkgname=tar
+pkgver=1.35
+pkgdesc='Utility used to store, backup, and transport files'
+arch=('x86_64')
+homepage='https://www.gnu.org/software/tar/'
+license=('GPL3')
+sources=("${pkgname}-${pkgver}.tar.xz")
+urls=("https://ftp.gnu.org/gnu/${pkgname}/${sources[0]}")
+md5sums=("a2d8042658cfd8ea939e6d911eaf4152")
+
+src_prepare() {
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
+}
+
+src_build() {
+  FORCE_UNSAFE_CONFIGURE=1 ./configure --prefix=/usr
+  make
+}
+
+src_check() {
+  leaf_record_message "capabilities: binary store/restore is known to fail. See LFS handbook."
+  make check
+}
+
+src_install() {
+  make DESTDIR="${pkgdir}" install
+  make DESTDIR="${pkgdir}" -C doc install-html docdir=/usr/share/doc/tar-${pkgver}
+}

lfs/tcl-8.6.16.PKGBUILD

@@ -0,0 +1,67 @@
+pkgname=tcl
+_basever=8.6
+pkgver=${_basever}.16
+pkgdesc='Powerful, easy-to-learn dynamic programming language'
+homepage='http://tcl.sourceforge.net/'
+license=(TCL)
+_archive="$pkgname$pkgver"
+sources=("${_archive}-src.tar.gz"
+  "${_archive}-html.tar.gz"
+)
+urls=("https://downloads.sourceforge.net/sourceforge/tcl/${sources[0]}"
+  "https://downloads.sourceforge.net/sourceforge/tcl/${sources[0]}"
+)
+md5sums=("eaef5d0a27239fb840f04af8ec608242"
+  "750c221bcb6f8737a6791c1fbe98b684"
+)
+
+
+src_prepare() {
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
+}
+
+src_build() {
+  SRCDIR=$(pwd)
+  cd unix
+  ./configure --prefix=/usr         \
+            --mandir=/usr/share/man \
+            --disable-rpath
+  make
+
+  tdbcver=1.1.10
+  itcver=4.3.2
+  sed -e "s|$SRCDIR/unix|/usr/lib|" \
+      -e "s|$SRCDIR|/usr/include|"  \
+      -i tclConfig.sh
+
+  sed -e "s|$SRCDIR/unix/pkgs/tdbc${tdbcver}|/usr/lib/tdbc${tdbcver}|" \
+      -e "s|$SRCDIR/pkgs/tdbc${tdbcver}/generic|/usr/include|"    \
+      -e "s|$SRCDIR/pkgs/tdbc${tdbcver}/library|/usr/lib/tcl${_basever}|" \
+      -e "s|$SRCDIR/pkgs/tdbc${tdbcver}|/usr/include|"            \
+      -i pkgs/tdbc${tdbcver}/tdbcConfig.sh
+
+  sed -e "s|$SRCDIR/unix/pkgs/itcl${itcver}|/usr/lib/itcl${itcver}|" \
+      -e "s|$SRCDIR/pkgs/itcl${itcver}/generic|/usr/include|"    \
+      -e "s|$SRCDIR/pkgs/itcl${itcver}|/usr/include|"            \
+      -i pkgs/itcl${itcver}/itclConfig.sh
+
+  unset SRCDIR
+}
+
+src_check() {
+  cd "${srcdir}/unix"
+  make test
+}
+
+src_install() {
+  cd "${srcdir}/unix"
+  make INSTALL_ROOT="${pkgdir}" install install-private-headers
+  chmod -v u+w "${pkgdir}/usr/lib/libtcl${_basever}.so"
+  ln -sfv tclsh${_basever} "${pkgdir}/usr/bin/tclsh"
+  mv "${pkgdir}"/usr/share/man/man3/{Thread,Tcl_Thread}.3
+  
+  cd ..
+  tar -xf ${distdir}/${sources[1]} --strip-components=1
+  mkdir -v -p "${pkgdir}/usr/share/doc/${pkgname}-${pkgver}"
+  cp -v -r  ./html/* "${pkgdir}/usr/share/doc/${pkgname}-${pkgver}"
+}

lfs/texinfo-7.2.PKGBUILD

@@ -0,0 +1,38 @@
+pkgname=texinfo
+pkgver=7.2
+pkgdesc='GNU documentation system for on-line information and printed output'
+arch=(x86_64)
+homepage='https://www.gnu.org/software/texinfo/'
+license=(GPL3)
+sources=("${pkgname}-${pkgver}.tar.xz")
+urls=("https://ftp.gnu.org/gnu/${pkgname}/${sources[0]}")
+md5sums=("11939a7624572814912a18e76c8d8972")
+
+src_prepare() {
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
+  cat > texinfo.HOOK << "EOF"
+target=(/usr/share/info/*.info*)
+triggers=(install remove)
+operation() {
+  echo -e "${GREEN_COLOR}>>>HOOK: update info cache${CLEAR_COLOR}"
+  rm -fv /usr/share/info/dir
+  for _info in /usr/share/info/*.info*; do
+    /usr/bin/install-info $_info /usr/share/info/dir
+  done
+}
+EOF
+}
+
+src_build() {
+  ./configure --prefix=/usr
+  make
+}
+
+src_check() {
+  make check
+}
+
+src_install() {
+  make DESTDIR="${pkgdir}" install
+  leaf_install_hook texinfo.HOOK
+}

lfs/vim-9.1.1166.PKGBUILD

@@ -0,0 +1,60 @@
+pkgname=vim
+pkgver=9.1.1166
+_versiondir=91
+pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor'
+home='https://www.vim.org'
+arch=('x86_64')
+license=('custom:vim')
+sources=("${pkgname}-${pkgver}.tar.gz")
+urls=("https://github.com/vim/vim/archive/v${pkgver}/${sources[0]}")
+md5sums=("718d43ce957ab7c81071793de176c2eb")
+
+src_prepare() {
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
+  echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h
+  cat > vimrc << "EOF"
+" Begin /etc/vimrc
+
+" Ensure defaults are set before customizing settings, not after
+source $VIMRUNTIME/defaults.vim
+let skip_defaults_vim=1
+
+set nocompatible
+set backspace=2
+set mouse=
+syntax on
+if (&term == "xterm") || (&term == "putty")
+  set background=dark
+endif
+
+" End /etc/vimrc
+EOF
+}
+
+src_build() {
+  ./configure --prefix=/usr   \
+              --disable-gui   \
+              --with-x=no     \
+              --with-compiledby='LFS'
+  make
+}
+
+src_check() {
+  leaf_record_message "Tests require at least 24 lines with 80 characters."
+  chown -R leaf .
+  sed '/test_plugin_glvs/d' -i src/testdir/Make_all.mak
+  echo "Testing... May take a while..."
+  su leaf -c "TERM=xterm-256color LANG=en_US.UTF-8 make -j1 test" \
+   &> vim-test.log
+}
+
+src_install() {
+  make DESTDIR="${pkgdir}" install
+  ln -sv vim ${pkgdir}/usr/bin/vi
+  for L in  ${pkgdir}/usr/share/man/{,*/}man1/vim.1; do
+    ln -sv vim.1 $(dirname $L)/vi.1
+  done
+  install -Dv vimrc ${pkgdir}/etc/vimrc
+  install -dv ${pkgdir}/usr/share/doc/
+  ln -sv ../vim/vim${_versiondir}/doc ${pkgdir}/usr/share/doc/vim-${pkgver}
+}

lfs/xz-5.6.4.PKGBUILD

@@ -1,20 +1,20 @@
 pkgname="xz"
-pkgver="5.6.2"
+pkgver="5.6.4"
 pkgdesc='Library and command line tools for XZ and LZMA compressed files'
 homepage="https://tukaani.org/xz"
 license=('GPL' 'LGPL' 'custom')
-sources=("xz-5.6.2.tar.xz")
-urls=("https://github.com//tukaani-project/xz/releases/download/v5.6.2/xz-5.6.2.tar.xz")
-md5sums=("bbf73fb28425cebb854328599f85c4cf")
+sources=("${pkgname}-${pkgver}.tar.xz")
+urls=("https://github.com//tukaani-project/xz/releases/download/v${pkgver}/${sources[0]}")
+md5sums=("4b1cf07d45ec7eb90a01dd3c00311a3e")
 
 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }
 
 src_build() {
   ./configure --prefix=/usr  \
             --disable-static \
-            --docdir=/usr/share/doc/xz-5.6.2 &&
+            --docdir=/usr/share/doc/${pkgname}-${pkgver} &&
   make
 }
 

lfs/zlib-1.3.1.PKGBUILD

@@ -4,11 +4,11 @@ pkgdesc='Compression library implementing the deflate compression method found i
 homepage="https://www.zlib.net/"
 license=("Zlib")
 sources=("zlib-1.3.1.tar.gz")
-urls=("https://zlib.net/fossils/zlib-1.3.1.tar.gz")
+urls=("https://zlib.net/fossils/${sources[0]}")
 md5sums=("9855b6d802d7fe5b7bd5b196a2271655")
 
 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }
 
 src_build() {

lfs/zstd-1.5.7.PKGBUILD

@@ -1,17 +1,17 @@
 pkgname=zstd
-pkgver=1.5.6
+pkgver=1.5.7
 pkgdesc='Zstandard - Fast real-time compression algorithm'
 url='https://facebook.github.io/zstd/'
 license=(
   BSD-3-Clause
   GPL-2.0-only
 )
-sources=("zstd-${pkgver}.tar.gz")
-urls=("https://github.com/facebook/zstd/releases/download/v1.5.6/zstd-1.5.6.tar.gz")
-md5sums=("5a473726b3445d0e5d6296afd1ab6854")
+sources=("${pkgname}-${pkgver}.tar.gz")
+urls=("https://github.com/facebook/zstd/releases/download/v${pkgver}/${sources[0]}")
+md5sums=("780fc1896922b1bc52a4e90980cdda48")
 
 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }
 
 src_build() {

net-misc/wget-1.25.0.PKGBUILD

@@ -1,14 +1,14 @@
 pkgname=wget
-pkgver=1.24.5
+pkgver=1.25.0
 pkgdesc='Network utility to retrieve files from the Web'
 homepage='https://www.gnu.org/software/wget/wget.html'
 license=('GPL3')
 sources=("${pkgname}-${pkgver}.tar.gz")
-urls=(https://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('271bf949384d0858c2c3d419f6311365')
+urls=(https://ftp.gnu.org/gnu/${pkgname}/${sources[0]})
+md5sums=('c70ba58b36f944e8ba1d655ace552881')
 
 src_prepare() {
-  tar -xf ${DIST_DIR}/${pkgname}-${pkgver}/${sources[0]} --strip-components=1
+  tar -xf ${distdir}/${sources[0]} --strip-components=1
 }
 
 src_build() {

test/hello-1.0.PKGBUILD

@@ -0,0 +1,25 @@
+pkgname="hello"
+pkgver="1.0"
+homepage="https://gitea.phywyj.dynv6.net"
+pkgdesc="Just a hello world"
+license=("GPL")
+sourses=()
+urls=()
+md5sums=()
+
+src_prepare() {
+  cat > "hello.c" << "EOF"
+#include <stdio.h>
+int main(){
+  printf("Hello! LFS!\n");
+}
+EOF
+}
+
+src_build() {
+  cc ${CFLAGS} hello.c -o hello
+}
+
+src_install() {
+  install -Dm755 hello ${pkgdir}/usr/bin/hello
+}

test/just-env-1.0.PKGBUILD

@@ -0,0 +1,30 @@
+
+pkgname="just-env"
+pkgver="1.0"
+pkgdesc="print env"
+homepage=""
+license=("GPL")
+sources=()
+urls=()
+md5sums=()
+
+src_prepare() {
+  echo ">>> in src_prepare"
+  env
+  leaf_clear_flags
+}
+
+src_build() {
+  echo ">>> in src_build"
+  env
+}
+
+src_check() {
+  echo ">>> in src_check"
+  env
+}
+
+src_install() {
+  echo ">>> in src_install"
+  env
+}

test/just-hook-1.0.PKGBUILD

@@ -0,0 +1,26 @@
+pkgname="just-hook"
+pkgver="1.0"
+homepage="https://gitea.phywyj.dynv6.net"
+pkgdesc="Just a Hook file"
+license=("GPL")
+sourses=()
+urls=()
+md5sums=()
+
+src_prepare() {
+  cat > test.HOOK << "EOF"
+target=(/usr/*)
+triggers=("install" "remove")
+operation() {
+  echo "This is a hook."
+}
+EOF
+}
+
+src_build() {
+  :
+}
+
+src_install() {
+  leaf_install_hook test.HOOK
+}

test/just-vars-1.0.PKGBUILD

@@ -0,0 +1,28 @@
+pkgname="just-vars"
+pkgver="1.0"
+pkgdesc="print vars"
+homepage=""
+license=("GPL")
+sources=()
+urls=()
+md5sums=()
+
+src_prepare() {
+  echo ">>> in src_prepare"
+  echo "distdir is ${distdir}"
+}
+
+src_build() {
+  echo ">>> in src_build"
+  echo "distdir is ${distdir}"
+}
+
+src_check() {
+  echo ">>> in src_check"
+  echo "distdir is ${distdir}"
+}
+
+src_install() {
+  echo ">>> in src_install"
+  echo "distdir is ${distdir}"
+}