diff options
| author | davidovski <david@davidovski.xyz> | 2022-01-16 02:27:41 +0000 |
|---|---|---|
| committer | davidovski <david@davidovski.xyz> | 2022-01-16 02:27:41 +0000 |
| commit | 91ed29d7dda0c5764bfc991985bf98adab0890f0 (patch) | |
| tree | 936e59025c55e921ec06ad202991c5b66710abc2 | |
| parent | cb447620084a20be80d116c81c2e9ec110be7118 (diff) | |
added PKG_VER to xibuilds
65 files changed, 169 insertions, 99 deletions
diff --git a/repo/system/acl.xibuild b/repo/system/acl.xibuild index 7b86fe6..8411379 100644 --- a/repo/system/acl.xibuild +++ b/repo/system/acl.xibuild @@ -2,11 +2,12 @@ DEPS=(attr) -SOURCE=http://download.savannah.nongnu.org/releases/acl/acl-2.3.1.tar.xz +PKG_VER=2.3.1 +SOURCE=http://download.savannah.nongnu.org/releases/acl/acl-$PKG_VER.tar.xz DESC="Access control list utilities, libraries and headers" build () { - ./configure --prefix=/usr --disable-static --docdir=/usr/share/doc/acl-2.3.1 + ./configure --prefix=/usr --disable-static --docdir=/usr/share/doc/acl-$PKG_VER make make DESTDIR=$PKG_DEST install diff --git a/repo/system/attr.xibuild b/repo/system/attr.xibuild index 6aa9673..715f404 100644 --- a/repo/system/attr.xibuild +++ b/repo/system/attr.xibuild @@ -1,13 +1,15 @@ #!/bin/bash DEPS=(glibc) -SOURCE=http://download.savannah.nongnu.org/releases/attr/attr-2.5.1.tar.xz + +PKG_VER=2.5.1 +SOURCE=http://download.savannah.nongnu.org/releases/attr/attr-$PKG_VER.tar.xz DESC="Extended attribute support library for ACL support" build () { - ./configure --prefix=/usr --disable-static --sysconfdir=/etc --docdir=/usr/share/doc/attr-2.5.1 + ./configure --prefix=/usr --disable-static --sysconfdir=/etc --docdir=/usr/share/doc/attr-$PKG_VER make make check diff --git a/repo/system/binutils.xibuild b/repo/system/binutils.xibuild index 874257c..d305d56 100644 --- a/repo/system/binutils.xibuild +++ b/repo/system/binutils.xibuild @@ -2,12 +2,13 @@ DEPS=(glib zlib elfutils) -SOURCE=https://ftp.gnu.org/gnu/binutils/binutils-2.37.tar.xz +PKG_VER=2.37 +SOURCE=https://ftp.gnu.org/gnu/binutils/binutils-$PKG_VER.tar.xz DESC="tools for handling object files" build () { - curl https://www.linuxfromscratch.org/patches/lfs/development/binutils-2.37-upstream_fix-1.patch > binutils-2.37-upstream_fix-1.patch - patch -Np1 -i binutils-2.37-upstream_fix-1.patch + curl https://www.linuxfromscratch.org/patches/lfs/development/binutils-$PKG_VER-upstream_fix-1.patch > binutils-$PKG_VER-upstream_fix-1.patch + patch -Np1 -i binutils-$PKG_VER-upstream_fix-1.patch # An error in the building system causes the shipped man pages to be empty. Workaround the issue and remove the shipped man pages, so the man pages will be regenerated correctly: diff --git a/repo/system/bzip2.xibuild b/repo/system/bzip2.xibuild index f60aece..f01a6b7 100644 --- a/repo/system/bzip2.xibuild +++ b/repo/system/bzip2.xibuild @@ -2,15 +2,16 @@ DEPS=(glibc sh) +PKG_VER=1.0.8 SOURCE=git://sourceware.org/git/bzip2.git -BRANCH=bzip2-1.0.8 +BRANCH=bzip2-$PKG_VER DESC="a selection of programs for compressing and decompressing bzip2 files" build () { - #curl https://www.linuxfromscratch.org/patches/lfs/development/bzip2-1.0.8-install_docs-1.patch > bzip2-1.0.8-install_docs-1.patch + #curl https://www.linuxfromscratch.org/patches/lfs/development/bzip2-$PKG_VER-install_docs-1.patch > bzip2-$PKG_VER-install_docs-1.patch - #patch -Np1 -i bzip2-1.0.8-install_docs-1.patch + #patch -Np1 -i bzip2-$PKG_VER-install_docs-1.patch # ensure symbolic links are relative @@ -28,7 +29,7 @@ build () { package () { cp -av libbz2.so* $PKG_DEST/usr/lib - cp -av libbz2.so.1.0.8 $PKG_DEST/usr/lib/libbz2.so + cp -av libbz2.so.$PKG_VER $PKG_DEST/usr/lib/libbz2.so cp -v bzip2-shared $PKG_DEST/usr/bin/bzip2 for i in $PKG_DEST/usr/bin/{bzcat,bunzip2}; do diff --git a/repo/system/cacerts.xibuild b/repo/system/cacerts.xibuild index 9ebe9bd..86db4f2 100644 --- a/repo/system/cacerts.xibuild +++ b/repo/system/cacerts.xibuild @@ -2,7 +2,8 @@ DEPS=(make-ca) -SOURCE=https://github.com/djlucas/make-ca/releases/download/v1.7/make-ca-1.7.tar.xz +PKG_VER=1.7 +SOURCE=https://github.com/djlucas/make-ca/releases/download/v$PKG_VER/make-ca-$PKG_VER.tar.xz DESC="Root certificates needed by ssl built using make-ca" package () { diff --git a/repo/system/coreutils.xibuild b/repo/system/coreutils.xibuild index 3e0e023..71aebe8 100644 --- a/repo/system/coreutils.xibuild +++ b/repo/system/coreutils.xibuild @@ -2,7 +2,8 @@ DEPS=(glibc acl attr gmp libcap openssl) -SOURCE=https://ftp.gnu.org/gnu/coreutils/coreutils-9.0.tar.xz +PKG_VER=9.0 +SOURCE=https://ftp.gnu.org/gnu/coreutils/coreutils-$PKG_VER.tar.xz DESC="The GNU coreutilities" build () { diff --git a/repo/system/eudev.xibuild b/repo/system/eudev.xibuild index 848191c..c1ba119 100644 --- a/repo/system/eudev.xibuild +++ b/repo/system/eudev.xibuild @@ -2,7 +2,8 @@ DEPS=() -SOURCE=https://dev.gentoo.org/~blueness/eudev/eudev-3.2.10.tar.gz +PKG_VER=3.2.10 +SOURCE=https://dev.gentoo.org/~blueness/eudev/eudev-$PKG_VER.tar.gz DESC="Programs for dynamic creation of device nodes" build () { diff --git a/repo/system/expat.xibuild b/repo/system/expat.xibuild index bf9c49f..79fdb2d 100644 --- a/repo/system/expat.xibuild +++ b/repo/system/expat.xibuild @@ -2,15 +2,16 @@ DEPS=(glibc) -SOURCE=https://github.com/libexpat/libexpat/releases/download/R_2_4_1/expat-2.4.1.tar.xz +PKG_VER=2.4.1 +SOURCE=https://github.com/libexpat/libexpat/releases/download/R_$PKG_VER/expat-$PKG_VER.tar.xz DESC="An XML parser library" build () { - ./configure --prefix=/usr --disable-static --docdir=/usr/share/doc/expat-2.4.1 + ./configure --prefix=/usr --disable-static --docdir=/usr/share/doc/expat-$PKG_VER make make check make DESTDIR=$PKG_DEST install - install -v -m644 doc/*{.html,png,css} $PKG_DEST/usr/share/doc/expat-2.4.1 + install -v -m644 doc/*{.html,png,css} $PKG_DEST/usr/share/doc/expat-$PKG_VER } diff --git a/repo/system/findutils.xibuild b/repo/system/findutils.xibuild index d8fd39c..7ac8bfd 100644 --- a/repo/system/findutils.xibuild +++ b/repo/system/findutils.xibuild @@ -2,7 +2,8 @@ DEPS=(glibc sh) -SOURCE=https://ftp.gnu.org/gnu/findutils/findutils-4.8.0.tar.xz +PKG_VER=4.8.0 +SOURCE=https://ftp.gnu.org/gnu/findutils/findutils-$PKG_VER.tar.xz DESC="GNU utilities to locate files" build () { diff --git a/repo/system/gc.xibuild b/repo/system/gc.xibuild index d06a08d..11f30af 100644 --- a/repo/system/gc.xibuild +++ b/repo/system/gc.xibuild @@ -2,7 +2,8 @@ DEPS=(gcc-libs) -SOURCE=https://github.com/ivmai/bdwgc/releases/download/v8.0.6/gc-8.0.6.tar.gz +PKG_VER=8.0.6 +SOURCE=https://github.com/ivmai/bdwgc/releases/download/v$PKG_VER/gc-$PKG_VER.tar.gz DESC="A garbage collector for C and C++" build () { diff --git a/repo/system/gdbm.xibuild b/repo/system/gdbm.xibuild index ddeecca..a5e11b9 100644 --- a/repo/system/gdbm.xibuild +++ b/repo/system/gdbm.xibuild @@ -2,7 +2,8 @@ DEPS=(glibc sh readline) -SOURCE=https://ftp.gnu.org/gnu/gdbm/gdbm-1.21.tar.gz +PKG_VER=1.21 +SOURCE=https://ftp.gnu.org/gnu/gdbm/gdbm-$PKG_VER.tar.gz DESC="GNU database library" build () { diff --git a/repo/system/gettext.xibuild b/repo/system/gettext.xibuild index e0f6d37..4a1118e 100644 --- a/repo/system/gettext.xibuild +++ b/repo/system/gettext.xibuild @@ -2,11 +2,12 @@ DEPS=(acl sh glib2) -SOURCE=https://ftp.gnu.org/pub/gnu/gettext/gettext-0.21.tar.gz +PKG_VER=0.21 +SOURCE=https://ftp.gnu.org/pub/gnu/gettext/gettext-$PKG_VER.tar.gz DESC="GNU internationalization library" build () { - ./configure --prefix=/usr --disable-static --docdir=/usr/share/doc/gettext-0.21 + ./configure --prefix=/usr --disable-static --docdir=/usr/share/doc/gettext-$PKG_VER make make check } diff --git a/repo/system/glibc.xibuild b/repo/system/glibc.xibuild index 61e5a0a..557a533 100644 --- a/repo/system/glibc.xibuild +++ b/repo/system/glibc.xibuild @@ -2,16 +2,17 @@ DEPS=(glibc) -SOURCE=https://ftp.gnu.org/gnu/glibc/glibc-2.34.tar.xz +PKG_VER=2.34 +SOURCE=https://ftp.gnu.org/gnu/glibc/glibc-$PKG_VER.tar.xz DESC="The main gnu C library providing basic routines and procedures" build () { # patches as recommended by lfs sed -e '/NOTIFY_REMOVED)/s/)/ \&\& data.attr != NULL)/' -i sysdeps/unix/sysv/linux/mq_notify.c - curl https://www.linuxfromscratch.org/patches/lfs/development/glibc-2.34-fhs-1.patch > glibc-2.34-fhs-1.patch + curl https://www.linuxfromscratch.org/patches/lfs/development/glibc-$PKG_VER-fhs-1.patch > glibc-$PKG_VER-fhs-1.patch - patch -Np1 -i glibc-2.34-fhs-1.patch + patch -Np1 -i glibc-$PKG_VER-fhs-1.patch mkdir -v build cd build diff --git a/repo/system/gmp.xibuild b/repo/system/gmp.xibuild index 6c426bc..2678312 100644 --- a/repo/system/gmp.xibuild +++ b/repo/system/gmp.xibuild @@ -2,7 +2,8 @@ DEPS=(gcc-libs sh) -SOURCE=https://gmplib.org/download/gmp/gmp-6.2.1.tar.xz +PKG_VER=6.2.1 +SOURCE=https://gmplib.org/download/gmp/gmp-$PKG_VER.tar.xz DESC="a collection of mathematical libraries" build () { diff --git a/repo/system/gnutls.xibuild b/repo/system/gnutls.xibuild index b2e0fa3..bf06240 100644 --- a/repo/system/gnutls.xibuild +++ b/repo/system/gnutls.xibuild @@ -2,7 +2,8 @@ DEPS=(libtasn readline zlib nettle p11-kit libidn2 libunistring) -SOURCE=https://www.gnupg.org/ftp/gcrypt/gnutls/v3.6/gnutls-3.6.16.tar.xz +PKG_VER=3.6.16 +SOURCE=https://www.gnupg.org/ftp/gcrypt/gnutls/v$(echo $PKG_VER | cut -d. -f-2)/gnutls-$PKG_VER.tar.xz DESC="Library which provides a secure layer over a transport layer" build () { diff --git a/repo/system/gperf.xibuild b/repo/system/gperf.xibuild index 0f08d60..b9abc88 100644 --- a/repo/system/gperf.xibuild +++ b/repo/system/gperf.xibuild @@ -2,11 +2,12 @@ DEPS=(glibc) -SOURCE=http://ftp.gnu.org/pub/gnu/gperf/gperf-3.1.tar.gz +PKG_VER=3.1 +SOURCE=http://ftp.gnu.org/pub/gnu/gperf/gperf-$PKG_VER.tar.gz DESC="Perfect hash function generator" build () { - ./configure --prefix=/usr --docdir=/usr/share/doc/gperf-3.1 + ./configure --prefix=/usr --docdir=/usr/share/doc/gperf-$PKG_VER make make -j1 check diff --git a/repo/system/grub.xibuild b/repo/system/grub.xibuild index 37b4da9..80d172f 100644 --- a/repo/system/grub.xibuild +++ b/repo/system/grub.xibuild @@ -2,7 +2,8 @@ DEPS=(sh xz gettext device-mapper) -SOURCE=https://ftp.gnu.org/gnu/grub/grub-2.06.tar.xz +PKG_VER=2.06 +SOURCE=https://ftp.gnu.org/gnu/grub/grub-$PKG_VER.tar.xz DESC="GNU GRand Unified Bootloader v2" build () { diff --git a/repo/system/guile.xibuild b/repo/system/guile.xibuild index fd65daa..c5413ff 100644 --- a/repo/system/guile.xibuild +++ b/repo/system/guile.xibuild @@ -2,7 +2,9 @@ DEPS=(gmp libltdl ncurses texinfo libunistring gc libffi) -SOURCE=https://ftp.gnu.org/gnu/guile/guile-2.2.7.tar.gz + +PKG_VER=2.2.7 +SOURCE=https://ftp.gnu.org/gnu/guile/guile-$PKG_VER.tar.gz DESC="Portable, embeddable Scheme implementation written in C" build () { diff --git a/repo/system/gzip.xibuild b/repo/system/gzip.xibuild index 15376a1..7831021 100644 --- a/repo/system/gzip.xibuild +++ b/repo/system/gzip.xibuild @@ -2,7 +2,8 @@ DEPS=(glibc bash less) -SOURCE=https://ftp.gnu.org/gnu/gzip/gzip-1.11.tar.xz +PKG_VER=1.11 +SOURCE=https://ftp.gnu.org/gnu/gzip/gzip-$PKG_VER.tar.xz DESC="GNU compression utilities" build () { diff --git a/repo/system/intltool.xibuild b/repo/system/intltool.xibuild index ec0a774..c861168 100644 --- a/repo/system/intltool.xibuild +++ b/repo/system/intltool.xibuild @@ -2,7 +2,8 @@ DEPS=(perl-xml-parser) -SOURCE=https://launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz +PKG_VER=0.51.0 +SOURCE=https://launchpad.net/intltool/trunk/$PKG_VER/+download/intltool-$PKG_VER.tar.gz DESC="The internationalization tool collection" build () { @@ -10,5 +11,5 @@ build () { make make check make DESTDIR=$PKG_DEST install - install -v -Dm644 doc/I18N-HOWTO $PKG_DEST/usr/share/doc/intltool-0.51.0/I18N-HOWTO + install -v -Dm644 doc/I18N-HOWTO $PKG_DEST/usr/share/doc/intltool-$PKG_VER/I18N-HOWTO } diff --git a/repo/system/kbd.xibuild b/repo/system/kbd.xibuild index 8612f4a..5892d90 100644 --- a/repo/system/kbd.xibuild +++ b/repo/system/kbd.xibuild @@ -2,7 +2,8 @@ DEPS=(glibc pam) -SOURCE=https://mirrors.edge.kernel.org/pub/linux/utils/kbd/kbd-2.4.0.tar.xz +PKG_VER=2.4.0 +SOURCE=https://mirrors.edge.kernel.org/pub/linux/utils/kbd/kbd-$PKG_VER.tar.xz DESC="Keytable files and keyboard utilities" build () { diff --git a/repo/system/kmod.xibuild b/repo/system/kmod.xibuild index b6f873e..62268b3 100644 --- a/repo/system/kmod.xibuild +++ b/repo/system/kmod.xibuild @@ -2,7 +2,8 @@ DEPS=(glibc zlib openssl xz zstd) -SOURCE=https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-29.tar.xz +PKG_VER=29 +SOURCE=https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-$PKG_VER.tar.xz DESC="Libraries and utilities for managing kernel modules" build () { diff --git a/repo/system/krb5.xibuild b/repo/system/krb5.xibuild index 8769e1f..c4f3abe 100644 --- a/repo/system/krb5.xibuild +++ b/repo/system/krb5.xibuild @@ -2,7 +2,8 @@ DEPS=(glibc e2fsprogs libldap keyutils) -SOURCE=https://kerberos.org/dist/krb5/1.19/krb5-1.19.2.tar.gz +PKG_VER=1.19.2 +SOURCE=https://kerberos.org/dist/krb5/$(echo $PKG_VER | cut -d. -f-2)/krb5-$PKG_VER.tar.gz DESC="The Kerberos network authentication system" build () { @@ -30,6 +31,6 @@ build () { make make DESTDIR=$PKG_DEST install - install -v -dm755 $PKG_DEST/usr/share/doc/krb5-1.19.2 && - cp -vfr ../doc/* $PKG_DEST/usr/share/doc/krb5-1.19.2 + install -v -dm755 $PKG_DEST/usr/share/doc/krb5-$PKG_VER && + cp -vfr ../doc/* $PKG_DEST/usr/share/doc/krb5-$PKG_VER } diff --git a/repo/system/libcap-ng.xibuild b/repo/system/libcap-ng.xibuild index eaad150..d0cc911 100644 --- a/repo/system/libcap-ng.xibuild +++ b/repo/system/libcap-ng.xibuild @@ -2,7 +2,8 @@ DEPS=(glibc) -SOURCE=https://github.com/stevegrubb/libcap-ng/archive/refs/tags/v0.8.2.tar.gz +PKG_VER=0.8.2 +SOURCE=https://github.com/stevegrubb/libcap-ng/archive/refs/tags/v$PKG_VER.tar.gz DESC="A library for linux that makes posix capabilities easy" diff --git a/repo/system/libcap.xibuild b/repo/system/libcap.xibuild index 01bc414..934af99 100644 --- a/repo/system/libcap.xibuild +++ b/repo/system/libcap.xibuild @@ -2,7 +2,8 @@ DEPS=(glibc pam) -SOURCE=https://git.kernel.org/pub/scm/libs/libcap/libcap.git/snapshot/libcap-2.62.tar.gz +PKG_VER=2.62 +SOURCE=https://git.kernel.org/pub/scm/libs/libcap/libcap.git/snapshot/libcap-$PKG_VER.tar.gz DESC="POSIX 1003.1e capabilities" diff --git a/repo/system/libffi.xibuild b/repo/system/libffi.xibuild index 872cb83..707ad04 100644 --- a/repo/system/libffi.xibuild +++ b/repo/system/libffi.xibuild @@ -2,7 +2,8 @@ DEPS=(glibc) -SOURCE=https://github.com/libffi/libffi/releases/download/v3.4.2/libffi-3.4.2.tar.gz +PKG_VER=3.4.2 +SOURCE=https://github.com/libffi/libffi/releases/download/v$PKG_VER/libffi-$PKG_VER.tar.gz DESC="Portable foreign function interface library" build () { diff --git a/repo/system/libiconv.xibuild b/repo/system/libiconv.xibuild index 52b45ef..e1c10ed 100644 --- a/repo/system/libiconv.xibuild +++ b/repo/system/libiconv.xibuild @@ -2,7 +2,8 @@ DEPS=(glibc) -SOURCE=https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.16.tar.gz +PKG_VER=1.16 +SOURCE=https://ftp.gnu.org/pub/gnu/libiconv/libiconv-$PKG_VER.tar.gz DESC="GNU charset conversion library" diff --git a/repo/system/libidn.xibuild b/repo/system/libidn.xibuild index ddb9d08..c5575bf 100644 --- a/repo/system/libidn.xibuild +++ b/repo/system/libidn.xibuild @@ -2,7 +2,8 @@ DEPS=(glibc) -SOURCE=https://ftp.gnu.org/gnu/libidn/libidn2-2.3.2.tar.gz +PKG_VER=2.3.2 +SOURCE=https://ftp.gnu.org/gnu/libidn/libidn2-$PKG_VER.tar.gz DESC="Free software implementation of IDNA2008, Punycode and TR46" build () { @@ -12,6 +13,6 @@ build () { find doc -name "Makefile*" -delete && rm -rf -v doc/{gdoc,idn.1,stamp-vti,man,texi} && - mkdir -pv $PKG_DEST/usr/share/doc/libidn-2.3.2 && - cp -r -v doc/* $PKG_DEST/usr/share/doc/libidn-2.3.2 + mkdir -pv $PKG_DEST/usr/share/doc/libidn-$PKG_VER && + cp -r -v doc/* $PKG_DEST/usr/share/doc/libidn-$PKG_VER } diff --git a/repo/system/libldap.xibuild b/repo/system/libldap.xibuild index f6caccb..9889496 100644 --- a/repo/system/libldap.xibuild +++ b/repo/system/libldap.xibuild @@ -2,7 +2,8 @@ DEPS=(libidn libsasl) -SOURCE=http://repository.linagora.org/OpenLDAP/openldap-release/openldap-2.6.0.tgz +PKG_VER=2.6.0 +SOURCE=http://repository.linagora.org/OpenLDAP/openldap-release/openldap-$PKG_VER.tgz DESC="An open source implementation of the Lightweight Directory Access Protocol" build () { diff --git a/repo/system/libnghttp.xibuild b/repo/system/libnghttp.xibuild index b90f3ed..65b9af0 100644 --- a/repo/system/libnghttp.xibuild +++ b/repo/system/libnghttp.xibuild @@ -2,7 +2,9 @@ DEPS=(glibc) -SOURCE=https://github.com/nghttp2/nghttp2/releases/download/v1.46.0/nghttp2-1.46.0.tar.xz +PKG_VER=1.46.0 + +SOURCE=https://github.com/nghttp2/nghttp2/releases/download/v$PKG_VER/nghttp2-$PKG_VER.tar.xz DESC="Framing layer of HTTP implemented as a C library" @@ -10,7 +12,7 @@ build () { ./configure --prefix=/usr \ --disable-static \ --enable-lib-only \ - --docdir=/usr/share/doc/nghttp2-1.46.0 && + --docdir=/usr/share/doc/nghttp2-$PKG_VER && make make DESTDIR=$PKG_DEST install } diff --git a/repo/system/libpsl.xibuild b/repo/system/libpsl.xibuild index 9b40f2a..5ecd701 100644 --- a/repo/system/libpsl.xibuild +++ b/repo/system/libpsl.xibuild @@ -2,7 +2,8 @@ DEPS=(libidn) -SOURCE=https://github.com/rockdaboot/libpsl/releases/download/0.21.1/libpsl-0.21.1.tar.gz +PKG_VER=0.21.1 +SOURCE=https://github.com/rockdaboot/libpsl/releases/download/$PKG_VER/libpsl-$PKG_VER.tar.gz DESC="C library to handle the Public Suffix List" build () { diff --git a/repo/system/libsasl.xibuild b/repo/system/libsasl.xibuild index 8cb4491..5df48a8 100644 --- a/repo/system/libsasl.xibuild +++ b/repo/system/libsasl.xibuild @@ -2,7 +2,8 @@ DEPS=(gmp) -SOURCE=https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-2.1.27/cyrus-sasl-2.1.27.tar.gz +PKG_VER=2.1.27 +SOURCE=https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-$PKG_VER/cyrus-sasl-$PKG_VER.tar.gz DESC="A library for Simple Authentication and Security Layer" build () { diff --git a/repo/system/libseccomp.xibuild b/repo/system/libseccomp.xibuild index 1d5fe3a..2fda78c 100644 --- a/repo/system/libseccomp.xibuild +++ b/repo/system/libseccomp.xibuild @@ -2,7 +2,8 @@ DEPS=(glibc) -SOURCE=https://github.com/seccomp/libseccomp/releases/download/v2.5.3/libseccomp-2.5.3.tar.gz +PKG_VER=2.5.3 +SOURCE=https://github.com/seccomp/libseccomp/releases/download/v$PKG_VER/libseccomp-$PKG_VER.tar.gz DESC="Enhanced seccomp library" diff --git a/repo/system/libsigsegv.xibuild b/repo/system/libsigsegv.xibuild index 559e1eb..89b9ea6 100644 --- a/repo/system/libsigsegv.xibuild +++ b/repo/system/libsigsegv.xibuild @@ -2,7 +2,8 @@ DEPS=(libtasn readline zlib nettle p11-kit libidn2 libunistring) -SOURCE=https://ftp.gnu.org/gnu/libsigsegv/libsigsegv-2.13.tar.gz +PKG_VER=2.13 +SOURCE=https://ftp.gnu.org/gnu/libsigsegv/libsigsegv-$PKG_VER.tar.gz DESC="A library for handling page faults in user mode" build () { diff --git a/repo/system/libtasn1.xibuild b/repo/system/libtasn1.xibuild index 2f6fccd..64cdaad 100644 --- a/repo/system/libtasn1.xibuild +++ b/repo/system/libtasn1.xibuild @@ -2,7 +2,8 @@ DEPS=(glibc) -SOURCE=https://ftp.gnu.org/gnu/libtasn1/libtasn1-4.18.0.tar.gz +PKG_VER=4.18.0 +SOURCE=https://ftp.gnu.org/gnu/libtasn1/libtasn1-$PKG_VER.tar.gz DESC="The ASN.1 library used in GNUTLS" build () { diff --git a/repo/system/libtool.xibuild b/repo/system/libtool.xibuild index 3e41c00..86710dc 100644 --- a/repo/system/libtool.xibuild +++ b/repo/system/libtool.xibuild @@ -2,7 +2,8 @@ DEPS=(sh tar glibc) -SOURCE=https://ftpmirror.gnu.org/libtool/libtool-2.4.6.tar.gz +PKG_VER=2.4.6 +SOURCE=https://ftpmirror.gnu.org/libtool/libtool-$PKG_VER.tar.gz DESC="A generic library support script" build () { diff --git a/repo/system/libunistring.xibuild b/repo/system/libunistring.xibuild index 3a5b3d4..b236e0f 100644 --- a/repo/system/libunistring.xibuild +++ b/repo/system/libunistring.xibuild @@ -2,7 +2,8 @@ DEPS=(glibc) -SOURCE=https://ftp.gnu.org/gnu/libunistring/libunistring-0.9.10.tar.gz +PKG_VER=0.9.10 +SOURCE=https://ftp.gnu.org/gnu/libunistring/libunistring-$PKG_VER.tar.gz DESC="Library for manipulating Unicode strings and C strings" build () { diff --git a/repo/system/libxcrypt.xibuild b/repo/system/libxcrypt.xibuild index a4b5a3e..8fd8dd3 100644 --- a/repo/system/libxcrypt.xibuild +++ b/repo/system/libxcrypt.xibuild @@ -2,7 +2,8 @@ DEPS=(glibc) -SOURCE=https://github.com/besser82/libxcrypt/releases/download/v4.4.26/libxcrypt-4.4.26.tar.xz +PKG_VER=4.4.26 +SOURCE=https://github.com/besser82/libxcrypt/releases/download/v$PKG_VER/libxcrypt-$PKG_VER.tar.xz DESC="A modern library for one-way hashing of passwords" build () { diff --git a/repo/system/libxml2.xibuild b/repo/system/libxml2.xibuild index e5c149e..d5a1440 100644 --- a/repo/system/libxml2.xibuild +++ b/repo/system/libxml2.xibuild @@ -2,7 +2,8 @@ DEPS=(zlib readline ncurses xz icu) -SOURCE=http://xmlsoft.org/sources/libxml2-2.9.12.tar.gz +PKG_VER=2.9.12 +SOURCE=http://xmlsoft.org/sources/libxml2-$PKG_VER.tar.gz DESC="XML parsing library" build () { diff --git a/repo/system/libxslt.xibuild b/repo/system/libxslt.xibuild index b079be1..4971372 100644 --- a/repo/system/libxslt.xibuild +++ b/repo/system/libxslt.xibuild @@ -2,7 +2,8 @@ DEPS=(libxml2 libgcrypt) -SOURCE=http://xmlsoft.org/sources/libxslt-1.1.34.tar.gz +PKG_VER=1.1.34 +SOURCE=http://xmlsoft.org/sources/libxslt-$PKG_VER.tar.gz DESC="XML stylesheet transformation library" diff --git a/repo/system/lz4.xibuild b/repo/system/lz4.xibuild index 9e1dbad..f49053f 100644 --- a/repo/system/lz4.xibuild +++ b/repo/system/lz4.xibuild @@ -2,7 +2,8 @@ DEPS=(sh) -SOURCE=https://github.com/lz4/lz4/archive/refs/tags/v1.9.3.tar.gz +PKG_VER=1.9.3 +SOURCE=https://github.com/lz4/lz4/archive/refs/tags/v$PKG_VER.tar.gz DESC="A lossless compression algorithm, providing high compression speeds" diff --git a/repo/system/lzo.xibuild b/repo/system/lzo.xibuild index 17c404b..f66328d 100644 --- a/repo/system/lzo.xibuild +++ b/repo/system/lzo.xibuild @@ -2,12 +2,13 @@ DEPS=(glibc) -SOURCE=https://www.oberhumer.com/opensource/lzo/download/lzo-2.10.tar.gz +PKG_VER=2.10 +SOURCE=https://www.oberhumer.com/opensource/lzo/download/lzo-$PKG_VER.tar.gz DESC="Portable lossless data compression library" build () { - ./configure --prefix=/usr --disable-static --enable-shared --docdir=/usr/share/doc/lzo-2.10 + ./configure --prefix=/usr --disable-static --enable-shared --docdir=/usr/share/doc/lzo-$PKG_VER make } diff --git a/repo/system/mpfr.xibuild b/repo/system/mpfr.xibuild index 4895dc9..629c230 100644 --- a/repo/system/mpfr.xibuild +++ b/repo/system/mpfr.xibuild @@ -1,12 +1,14 @@ #!/bin/bash DEPS=(glibc gmp) -SOURCE=https://www.mpfr.org/mpfr-current/mpfr-4.1.0.tar.xz + +PKG_VER=4.1.0 +SOURCE=https://www.mpfr.org/mpfr-current/mpfr-$PKG_VER.tar.xz DESC="Multiple-precision floating-point library" build () { - ./configure --prefix=/usr --disable-static --enable-thread-safe --docdir=/usr/share/doc/mpfr-4.1.0 + ./configure --prefix=/usr --disable-static --enable-thread-safe --docdir=/usr/share/doc/mpfr-$PKG_VER make make html diff --git a/repo/system/ncurses.xibuild b/repo/system/ncurses.xibuild index c42d402..c02f7c4 100644 --- a/repo/system/ncurses.xibuild +++ b/repo/system/ncurses.xibuild @@ -2,7 +2,8 @@ DEPS=(glibc) -SOURCE=https://invisible-mirror.net/archives/ncurses/ncurses-6.3.tar.gz +PKG_VER=6.3 +SOURCE=https://invisible-mirror.net/archives/ncurses/ncurses-$PKG_VER.tar.gz DESC="curses emulation library" @@ -28,6 +29,6 @@ package () { ln -sfv libncurses.so $PKG_DEST/usr/lib/libcurses.so # install docs - mkdir -pv $PKG_DEST/usr/share/doc/ncurses-6.3 - cp -v -R doc/* $PKG_DEST/usr/share/doc/ncurses-6.3 + mkdir -pv $PKG_DEST/usr/share/doc/ncurses-$PKG_VER + cp -v -R doc/* $PKG_DEST/usr/share/doc/ncurses-$PKG_VER } diff --git a/repo/system/nettle.xibuild b/repo/system/nettle.xibuild index 398a722..afd0ba7 100644 --- a/repo/system/nettle.xibuild +++ b/repo/system/nettle.xibuild @@ -2,7 +2,8 @@ DEPS=(gmp) -SOURCE=https://ftp.gnu.org/gnu/nettle/nettle-3.7.tar.gz +PKG_VER=3.7 +SOURCE=https://ftp.gnu.org/gnu/nettle/nettle-$PKG_VER.tar.gz DESC="A low-level cryptographic library" build () { diff --git a/repo/system/nspr.xibuild b/repo/system/nspr.xibuild index 733c333..f7a3d55 100644 --- a/repo/system/nspr.xibuild +++ b/repo/system/nspr.xibuild @@ -2,7 +2,9 @@ DEPS=(glibc bash) -SOURCE=https://archive.mozilla.org/pub/nspr/releases/v4.33/src/nspr-4.33.tar.gz +PKG_VER=4.33 + +SOURCE=https://archive.mozilla.org/pub/nspr/releases/v$PKG_VER/src/nspr-$PKG_VER.tar.gz DESC="Netscape Portable Runtime" build () { diff --git a/repo/system/openssl.xibuild b/repo/system/openssl.xibuild index 5b52fd5..f057063 100644 --- a/repo/system/openssl.xibuild +++ b/repo/system/openssl.xibuild @@ -2,9 +2,9 @@ DEPS=(glibc) -SOURCE=https://github.com/openssl/openssl/archive/refs/tags/openssl-3.0.1.tar.gz +PKG_VER=3.0.1 +SOURCE=https://github.com/openssl/openssl/archive/refs/tags/openssl-$PKG_VER.tar.gz DESC="The open source management tools and libraries for cryptography" -BRANCH="OpenSSL_1_1_1-stable" build () { ./config --prefix=/usr --openssldir=/etc/ssl --libdir=lib shared zlib-dynamic diff --git a/repo/system/pam.xibuild b/repo/system/pam.xibuild index 732909a..3166ad2 100644 --- a/repo/system/pam.xibuild +++ b/repo/system/pam.xibuild @@ -2,7 +2,8 @@ DEPS=(glibc libtirpc pambase audit libxcrypt) -SOURCE=https://github.com/linux-pam/linux-pam/releases/download/v1.5.2/Linux-PAM-1.5.2.tar.xz +PKG_VER=1.5.2 +SOURCE=https://github.com/linux-pam/linux-pam/releases/download/v$PKG_VER/Linux-PAM-$PKG_VER.tar.xz DESC="PAM (Pluggable Authentication Modules) library" build () { @@ -16,7 +17,7 @@ build () { --sysconfdir=/etc \ --libdir=/usr/lib \ --enable-securedir=/usr/lib/security \ - --docdir=/usr/share/doc/Linux-PAM-1.5.2 && + --docdir=/usr/share/doc/Linux-PAM-$PKG_VER && make make DESTDIR=$PKG_DEST install diff --git a/repo/system/pcre.xibuild b/repo/system/pcre.xibuild index facf5fe..cf6a4f9 100644 --- a/repo/system/pcre.xibuild +++ b/repo/system/pcre.xibuild @@ -2,7 +2,8 @@ DEPS=(glibc) -SOURCE=https://github.com/PhilipHazel/pcre2/releases/download/pcre2-10.39/pcre2-10.39.tar.bz2 +PGK_VER=10.39 +SOURCE=https://github.com/PhilipHazel/pcre2/releases/download/pcre2-$PKG_VER/pcre2-$PKG_VER.tar.bz2 DESC="A library that implements regular expressions in a perl style" build () { diff --git a/repo/system/perl-xml-parser.xibuild b/repo/system/perl-xml-parser.xibuild index d4b9682..d5cdba6 100644 --- a/repo/system/perl-xml-parser.xibuild +++ b/repo/system/perl-xml-parser.xibuild @@ -2,7 +2,8 @@ DEPS=(perl expat) -SOURCE=https://cpan.metacpan.org/authors/id/T/TO/TODDR/XML-Parser-2.46.tar.gz +PKG_VER=2.46 +SOURCE=https://cpan.metacpan.org/authors/id/T/TO/TODDR/XML-Parser-$PKG_VER.tar.gz DESC="A perl interface for the expat XML parser" build () { diff --git a/repo/system/perl.xibuild b/repo/system/perl.xibuild index cd3c884..8833465 100644 --- a/repo/system/perl.xibuild +++ b/repo/system/perl.xibuild @@ -2,7 +2,8 @@ DEPS=(gdbm glibc libxcrypt) -SOURCE=https://www.cpan.org/src/5.0/perl-5.34.0.tar.gz +PKG_VER=5.34.0 +SOURCE=https://www.cpan.org/src/5.0/perl-$PKG_VER.tar.gz DESC="The Practical Extraction and Report Language" build () { diff --git a/repo/system/psmisc.xibuild b/repo/system/psmisc.xibuild index 560cf20..9b8a71e 100644 --- a/repo/system/psmisc.xibuild +++ b/repo/system/psmisc.xibuild @@ -2,7 +2,8 @@ DEPS=(ncurses) -SOURCE=https://gitlab.com/psmisc/psmisc/-/archive/v23.4/psmisc-v23.4.tar.gz +PKG_VER=23.4 +SOURCE=https://gitlab.com/psmisc/psmisc/-/archive/v$PKG_VER/psmisc-v$PKG_VER.tar.gz DESC="Miscellaneous procfs tools" build () { diff --git a/repo/system/python.xibuild b/repo/system/python.xibuild index 7e71733..88b3fff 100644 --- a/repo/system/python.xibuild +++ b/repo/system/python.xibuild @@ -2,7 +2,8 @@ DEPS=(bzip2 expat gdbm libffi libnsl libxcrypt openssl zlib) -SOURCE=https://www.python.org/ftp/python/3.10.0/Python-3.10.0.tgz +PKG_VER=3.10.0 +SOURCE=https://www.python.org/ftp/python/$PKG_VER/Python-$PKG_VER.tgz DESC="The Python development environment" build () { diff --git a/repo/system/readline.xibuild b/repo/system/readline.xibuild index 8b47463..4c1f4ed 100644 --- a/repo/system/readline.xibuild +++ b/repo/system/readline.xibuild @@ -2,7 +2,9 @@ DEPS=(glibc ncurses) -SOURCE=https://ftp.gnu.org/gnu/readline/readline-8.1.tar.gz +PKG_VER=8.1 + +SOURCE=https://ftp.gnu.org/gnu/readline/readline-$PKG_VER.tar.gz DESC="a set of libraries that offer command line editing and history capabilities" diff --git a/repo/system/sed.xibuild b/repo/system/sed.xibuild index 0384f6c..90af25e 100644 --- a/repo/system/sed.xibuild +++ b/repo/system/sed.xibuild @@ -2,7 +2,8 @@ DEPS=(glibc acl attr) -SOURCE=https://ftp.gnu.org/gnu/sed/sed-4.8.tar.xz +PKG_VER=4.8 +SOURCE=https://ftp.gnu.org/gnu/sed/sed-$PKG_VER.tar.xz DESC="GNU stream editor" build () { @@ -14,6 +15,6 @@ build () { package () { make DESTDIR=$PKG_DEST install - install -d -m755 $PKG_DEST/usr/share/doc/sed-4.8 - install -m644 doc/sed.html $PKG_DEST/usr/share/doc/sed-4.8 + install -d -m755 $PKG_DEST/usr/share/doc/sed-$PKG_VER + install -m644 doc/sed.html $PKG_DEST/usr/share/doc/sed-$PKG_VER } diff --git a/repo/system/shadow.xibuild b/repo/system/shadow.xibuild index 6af5cbb..e190686 100644 --- a/repo/system/shadow.xibuild +++ b/repo/system/shadow.xibuild @@ -2,13 +2,15 @@ DEPS=(pam acl audit libcap libxcrypt) -SOURCE=https://github.com/shadow-maint/shadow/releases/download/v4.10/shadow-4.10.tar.xz +PKG_VER=4.10 + +SOURCE=https://github.com/shadow-maint/shadow/releases/download/v$PKG_VER/shadow-$PKG_VER.tar.xz DESC="Password and account management tool suite with support for shadow files and PAM" build () { - curl https://www.linuxfromscratch.org/patches/lfs/development/shadow-4.10-useradd_segfault-1.patch > shadow-4.10-useradd_segfault-1.patch - patch -Np1 -i shadow-4.10-useradd_segfault-1.patch + curl https://www.linuxfromscratch.org/patches/lfs/development/shadow-$PKG_VER-useradd_segfault-1.patch > shadow-$PKG_VER-useradd_segfault-1.patch + patch -Np1 -i shadow-$PKG_VER-useradd_segfault-1.patch sed -i 's/groups$(EXEEXT) //' src/Makefile.in diff --git a/repo/system/sysklogd.xibuild b/repo/system/sysklogd.xibuild index 44e59ce..bf1a021 100644 --- a/repo/system/sysklogd.xibuild +++ b/repo/system/sysklogd.xibuild @@ -2,7 +2,8 @@ DEPS=(glibc) -SOURCE=https://github.com/troglobit/sysklogd/releases/download/v2.3.0/sysklogd-2.3.0.tar.gz +PKG_VER=2.3.0 +SOURCE=https://github.com/troglobit/sysklogd/releases/download/v$PKG_VER/sysklogd-$PKG_VER.tar.gz DESC="Programs for logging system messages" build () { diff --git a/repo/system/sysvinit.xibuild b/repo/system/sysvinit.xibuild index a6d4d97..fc4cb18 100644 --- a/repo/system/sysvinit.xibuild +++ b/repo/system/sysvinit.xibuild @@ -2,12 +2,13 @@ DEPS=(sh glibc) -SOURCE=http://download.savannah.nongnu.org/releases/sysvinit/sysvinit-3.00.tar.xz +PKG_VER=3.01 +SOURCE=http://download.savannah.nongnu.org/releases/sysvinit/sysvinit-$PKG_VER.tar.xz DESC="The sysvinit system for controlling startup, running and shutdown of the system" build () { - curl https://www.linuxfromscratch.org/patches/lfs/development/sysvinit-3.01-consolidated-1.patch > sysvinit-3.0.1-consolidated-1.patch - patch -Np1 -i ysvinit-3.01-consolidated-1.patch + curl https://www.linuxfromscratch.org/patches/lfs/development/sysvinit-$PKG_VER-consolidated-1.patch > sysvinit-$PKG_VER-consolidated-1.patch + patch -Np1 -i sysvinit-$PKG_VER-consolidated-1.patch make make ROOT=$PKG_DEST install diff --git a/repo/system/tar.xibuild b/repo/system/tar.xibuild index 5e8074f..66f297d 100644 --- a/repo/system/tar.xibuild +++ b/repo/system/tar.xibuild @@ -2,7 +2,8 @@ DEPS=(glibc) -SOURCE=https://ftp.gnu.org/gnu/tar/tar-1.34.tar.xz +PKG_VER=1.34 +SOURCE=https://ftp.gnu.org/gnu/tar/tar-$PKG_VER.tar.xz DESC="Utility used to store, backup and transport files" build () { diff --git a/repo/system/tcl.xibuild b/repo/system/tcl.xibuild index f9bebaa..cdd1455 100644 --- a/repo/system/tcl.xibuild +++ b/repo/system/tcl.xibuild @@ -2,7 +2,8 @@ DEPS=(zlib) -SOURCE=https://github.com/tcltk/tcl/archive/refs/tags/core-8-6-11.tar.gz +PKG_VER=8.6.11 +SOURCE=https://github.com/tcltk/tcl/archive/refs/tags/core-$( echo $PKG_VER | sed "s|\.|-|g").tar.gz DESC="the Tool Command language, a robust general purpose scripting language" @@ -37,7 +38,7 @@ build () { package () { make DESTDIR=$PKG_DEST install - chmod -v u+w $PKG_DEST/usr/lib/libtcl8.6.so + chmod -v u+w $PKG_DEST/usr/lib/libtcl$(echo $PKG_DEST | cut -d. -f-2).so make DESTDIR=$PKG_DEST install-private-headers diff --git a/repo/system/xxhash.xibuild b/repo/system/xxhash.xibuild index 1b8fe5a..ef0e347 100644 --- a/repo/system/xxhash.xibuild +++ b/repo/system/xxhash.xibuild @@ -2,7 +2,8 @@ DEPS=(sh) -SOURCE=https://github.com/Cyan4973/xxHash/archive/refs/tags/v0.8.1.tar.gz +PKG_VER=0.8.1 +SOURCE=https://github.com/Cyan4973/xxHash/archive/refs/tags/v$PKG_VER.tar.gz DESC="xxHash is an Extremely fast Hash algorithm" diff --git a/repo/system/xz.xibuild b/repo/system/xz.xibuild index 5748c65..bf48653 100644 --- a/repo/system/xz.xibuild +++ b/repo/system/xz.xibuild @@ -2,14 +2,15 @@ DEPS=(sh) +PKG_VER=5.2.5 SOURCE=https://git.tukaani.org/xz.git -BRANCH=v5.2.5 +BRANCH=v$PKG_VER DESC="a selection of programs for compressing and decompressing files with the lzma and xz compression formats" build () { ./autogen.sh - ./configure --prefix=/usr --disable-static --docdir=/usr/share/doc/xz-5.2.5 + ./configure --prefix=/usr --disable-static --docdir=/usr/share/doc/xz-$PKG_VER make make check make DESTDIR=$PKG_DEST install diff --git a/repo/system/zip.xibuild b/repo/system/zip.xibuild index 87bb35e..3c1f1e1 100644 --- a/repo/system/zip.xibuild +++ b/repo/system/zip.xibuild @@ -2,7 +2,8 @@ DEPS=(glibc bzip2) -SOURCE=https://downloads.sourceforge.net/infozip/zip30.tar.gz +PKG_VER=30 +SOURCE=https://downloads.sourceforge.net/infozip/zip$PKG_VER.tar.gz DESC="Compressor/archiver for creating and modifying zipfiles" build () { diff --git a/repo/system/zlib.xibuild b/repo/system/zlib.xibuild index 9402a1d..d22e0c1 100644 --- a/repo/system/zlib.xibuild +++ b/repo/system/zlib.xibuild @@ -2,7 +2,8 @@ DEPS=(glibc) -SOURCE=https://github.com/madler/zlib/archive/refs/tags/v1.2.11.tar.gz +PKG_VER=1.2.11 +SOURCE=https://github.com/madler/zlib/archive/refs/tags/v$PKG_VER.tar.gz DESC="compression and decompression routines used by some programs" @@ -14,7 +15,6 @@ build () { } package () { - # Remove a useless static library (lfs recommended) rm -fv $PKG_DEST/usr/lib/libz.a } diff --git a/repo/system/zstd.xibuild b/repo/system/zstd.xibuild index 40a7a5a..2fd4bfc 100644 --- a/repo/system/zstd.xibuild +++ b/repo/system/zstd.xibuild @@ -2,7 +2,8 @@ DEPS=(glibc gcc-libs zlib xz lz4) -SOURCE=https://github.com/facebook/zstd/releases/download/v1.5.1/zstd-1.5.1.tar.gz +PKG_VER=1.5.1 +SOURCE=https://github.com/facebook/zstd/releases/download/v$PKG_VER/zstd-$PKG_VER.tar.gz DESC="the Zstandard real-time compression algorithm" build () { |