From 71e3c6e4bed81abbc2856c278bd5d929cfd61224 Mon Sep 17 00:00:00 2001 From: davidovski Date: Wed, 23 Feb 2022 14:42:35 +0000 Subject: fixed additionals --- repo/devel/autoconf2-13.xibuild | 4 ++-- repo/devel/docbook-xsl.xibuild | 4 ++-- repo/devel/sgml-common.xibuild | 4 ++-- repo/linux/linux.xibuild | 4 ++-- repo/media/audiofile.xibuild | 4 ++-- repo/media/flac.xibuild | 4 ++-- repo/system/acpid.xibuild | 4 ++-- repo/system/binutils.xibuild | 4 ++-- repo/system/dbus.xibuild | 4 ++-- repo/system/dhcp.xibuild | 4 ++-- repo/system/efivar.xibuild | 4 ++-- repo/system/glibc.xibuild | 4 ++-- repo/system/gobject-introspection.xibuild | 4 ++-- repo/system/grub.xibuild | 4 ++-- repo/system/js78.xibuild | 4 ++-- repo/system/libnl.xibuild | 4 ++-- repo/system/lua.xibuild | 4 ++-- repo/system/networkmanager.xibuild | 4 ++-- repo/system/nss.xibuild | 4 ++-- repo/system/polkit.xibuild | 4 ++-- repo/system/sysvinit.xibuild | 4 ++-- repo/util/lynx.xibuild | 4 ++-- repo/util/unzip.xibuild | 4 ++-- repo/util/wireless-tools.xibuild | 4 ++-- repo/util/wpa_supplicant.xibuild | 4 ++-- repo/x11/mesa.xibuild | 4 ++-- repo/x11/xf86-video-ati.xibuild | 4 ++-- 27 files changed, 54 insertions(+), 54 deletions(-) diff --git a/repo/devel/autoconf2-13.xibuild b/repo/devel/autoconf2-13.xibuild index ac66134..2bd4e7c 100644 --- a/repo/devel/autoconf2-13.xibuild +++ b/repo/devel/autoconf2-13.xibuild @@ -5,9 +5,9 @@ DEPS="perl" PKG_VER=2.13 SOURCE=https://ftp.gnu.org/gnu/autoconf/autoconf-$PKG_VER.tar.gz -ADDITIONAL=( +ADDITIONAL=" https://www.linuxfromscratch.org/patches/blfs/svn/autoconf-$PKG_VER-consolidated_fixes-1.patch - ) + " DESC="GNU programs for producing shell scripts that can automatically configure source code, legacy $PKG_VER version" diff --git a/repo/devel/docbook-xsl.xibuild b/repo/devel/docbook-xsl.xibuild index 895b155..e3dcccc 100644 --- a/repo/devel/docbook-xsl.xibuild +++ b/repo/devel/docbook-xsl.xibuild @@ -5,9 +5,9 @@ DEPS="libxml2 libxslt docbook-xml" PKG_VER=1.79.2 SOURCE=https://github.com/docbook/xslt10-stylesheets/releases/download/release/$PKG_VER/docbook-xsl-nons-$PKG_VER.tar.bz2 -ADDITIONAL=( +ADDITIONAL=" https://www.linuxfromscratch.org/patches/blfs/svn/docbook-xsl-nons-$PKG_VER-stack_fix-1.patch -) +" DESC="XML stylesheets for Docbook-xml transformations" diff --git a/repo/devel/sgml-common.xibuild b/repo/devel/sgml-common.xibuild index b62f243..752a44d 100644 --- a/repo/devel/sgml-common.xibuild +++ b/repo/devel/sgml-common.xibuild @@ -5,9 +5,9 @@ DEPS="libxml2 sgml-common" PKG_VER=0.6.3 SOURCE=https://sourceware.org/ftp/docbook-tools/new-trials/SOURCES/sgml-common-$PKG_VER.tgz -ADDITIONAL=( +ADDITIONAL=" https://www.linuxfromscratch.org/patches/blfs/svn/sgml-common-$PKG_VER-manpage-1.patch - ) + " DESC="Tools for maintaining centralized SGML catalogs." diff --git a/repo/linux/linux.xibuild b/repo/linux/linux.xibuild index a416cad..7f0de00 100644 --- a/repo/linux/linux.xibuild +++ b/repo/linux/linux.xibuild @@ -5,9 +5,9 @@ DEPS="coreutils kmod" PKG_VER=5.15.14 SOURCE=https://cdn.kernel.org/pub/linux/kernel/v$(echo $PKG_VER | cut -d. -f1).x/linux-$PKG_VER.tar.xz -ADDITIONAL=( +ADDITIONAL=" https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/linux/trunk/config - ) + " prepare () { mv config .config diff --git a/repo/media/audiofile.xibuild b/repo/media/audiofile.xibuild index 2f11228..3a7de56 100644 --- a/repo/media/audiofile.xibuild +++ b/repo/media/audiofile.xibuild @@ -8,9 +8,9 @@ DESC="Libraries to support basic sound file formats" PKG_VER=0.3.6 SOURCE=https://download.gnome.org/sources/audiofile/${PKG_VER%.*}/audiofile-$PKG_VER.tar.xz -ADDITIONAL=( +ADDITIONAL=" https://www.linuxfromscratch.org/patches/blfs/svn/audiofile-$PKG_VER-consolidated_patches-1.patch - ) + " prepare () { patch -Np1 -i audiofile-$PKG_VER-consolidated_patches-1.patch diff --git a/repo/media/flac.xibuild b/repo/media/flac.xibuild index 2b3d174..dd1ab98 100644 --- a/repo/media/flac.xibuild +++ b/repo/media/flac.xibuild @@ -8,9 +8,9 @@ DESC="Free Lossless Audio Codec" PKG_VER=1.3.3 SOURCE=https://downloads.xiph.org/releases/flac/flac-$PKG_VER.tar.xz -ADDITIONAL=( +ADDITIONAL=" https://www.linuxfromscratch.org/patches/blfs/svn/flac-$PKG_VER-security_fixes-1.patch - ) + " prepare () { patch -Np1 -i flac-$PKG_VER-security_fixes-1.patch diff --git a/repo/system/acpid.xibuild b/repo/system/acpid.xibuild index 0477ce0..209c8e5 100644 --- a/repo/system/acpid.xibuild +++ b/repo/system/acpid.xibuild @@ -8,9 +8,9 @@ SOURCE=https://downloads.sourceforge.net/acpid2/acpid-$PKG_VER.tar.xz DESC="Daemon for battery, power, and thermal readings" BOOTSCRIPTS=blfs-bootscripts-20210826 -ADDITIONAL=( +ADDITIONAL=" https://anduin.linuxfromscratch.org/BLFS/blfs-bootscripts/$BOOTSCRIPTS.tar.xz - ) + " build () { ./configure --prefix=/usr \ diff --git a/repo/system/binutils.xibuild b/repo/system/binutils.xibuild index e8f3299..9d659a6 100644 --- a/repo/system/binutils.xibuild +++ b/repo/system/binutils.xibuild @@ -5,9 +5,9 @@ DEPS="glibc zlib elfutils" PKG_VER=2.37 SOURCE=https://ftp.gnu.org/gnu/binutils/binutils-$PKG_VER.tar.xz -ADDITIONAL=( +ADDITIONAL=" https://www.linuxfromscratch.org/patches/lfs/development/binutils-$PKG_VER-upstream_fix-1.patch - ) + " DESC="tools for handling object files" diff --git a/repo/system/dbus.xibuild b/repo/system/dbus.xibuild index d65978e..96f6264 100644 --- a/repo/system/dbus.xibuild +++ b/repo/system/dbus.xibuild @@ -6,9 +6,9 @@ DEPS="elogind" PKG_VER=1.12.20 SOURCE=https://dbus.freedesktop.org/releases/dbus/dbus-$PKG_VER.tar.gz BOOTSCRIPTS=blfs-bootscripts-20210826 -ADDITIONAL=( +ADDITIONAL=" https://anduin.linuxfromscratch.org/BLFS/blfs-bootscripts/$BOOTSCRIPTS.tar.xz - ) + " DESC="A message bus system allowing applications to talk to one another" diff --git a/repo/system/dhcp.xibuild b/repo/system/dhcp.xibuild index 93eef22..f786c32 100644 --- a/repo/system/dhcp.xibuild +++ b/repo/system/dhcp.xibuild @@ -7,9 +7,9 @@ PKG_VER=4.4.3b1 SOURCE=https://ftp.isc.org/isc/dhcp/$PKG_VER/dhcp-$PKG_VER.tar.gz BOOTSCRIPTS=blfs-bootscripts-20210826 -ADDITIONAL=( +ADDITIONAL=" https://anduin.linuxfromscratch.org/BLFS/blfs-bootscripts/$BOOTSCRIPTS.tar.xz - ) + " DESC="A DHCP server, client and relay" diff --git a/repo/system/efivar.xibuild b/repo/system/efivar.xibuild index 948afdd..d19bc3f 100644 --- a/repo/system/efivar.xibuild +++ b/repo/system/efivar.xibuild @@ -5,9 +5,9 @@ DEPS="glibc" PKG_VER=37 SOURCE=https://github.com/rhboot/efivar/releases/download/$PKG_VER/efivar-$PKG_VER.tar.bz2 -ADDITIONAL=( +ADDITIONAL=" https://www.linuxfromscratch.org/patches/blfs/svn/efivar-$PKG_VER-gcc_9-1.patch - ) + " DESC="Tools and libraries to manupulate EFI variables" diff --git a/repo/system/glibc.xibuild b/repo/system/glibc.xibuild index f2fdc61..8b3e626 100644 --- a/repo/system/glibc.xibuild +++ b/repo/system/glibc.xibuild @@ -6,10 +6,10 @@ DEPS="glibc" PKG_VER=2.34 SOURCE=https://ftp.gnu.org/gnu/glibc/glibc-$PKG_VER.tar.xz -ADDITIONAL=( +ADDITIONAL=" https://www.linuxfromscratch.org/patches/lfs/development/glibc-$PKG_VER-fhs-1.patch https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/glibc/trunk/locale-gen - ) +" DESC="The main gnu C library providing basic routines and procedures" diff --git a/repo/system/gobject-introspection.xibuild b/repo/system/gobject-introspection.xibuild index dd8d01b..071dfbe 100644 --- a/repo/system/gobject-introspection.xibuild +++ b/repo/system/gobject-introspection.xibuild @@ -5,9 +5,9 @@ DEPS="python-mako python-markdown glib" PKG_VER=1.70.0 SOURCE=https://download.gnome.org/sources/gobject-introspection/$(echo $PKG_VER | cut -d. -f-2)/gobject-introspection-$PKG_VER.tar.xz -ADDITIONAL=( +ADDITIONAL=" https://www.linuxfromscratch.org/patches/blfs/svn/gobject-introspection-$PKG_VER-build_fix-1.patch - ) + " DESC="Introspection system for GObject-based libraries" diff --git a/repo/system/grub.xibuild b/repo/system/grub.xibuild index d167cf8..7bedae9 100644 --- a/repo/system/grub.xibuild +++ b/repo/system/grub.xibuild @@ -5,9 +5,9 @@ DEPS="sh xz gettext device-mapper efibootmgr freetype2" PKG_VER=2.06 SOURCE=https://ftp.gnu.org/gnu/grub/grub-$PKG_VER.tar.xz -ADDITIONAL=( +ADDITIONAL=" https://unifoundry.com/pub/unifont/unifont-13.0.06/font-builds/unifont-13.0.06.pcf.gz - ) + " DESC="GNU GRand Unified Bootloader v2" diff --git a/repo/system/js78.xibuild b/repo/system/js78.xibuild index 72bfad2..0a88142 100644 --- a/repo/system/js78.xibuild +++ b/repo/system/js78.xibuild @@ -5,9 +5,9 @@ DEPS="readline bash zlib" PKG_VER=78.15.0 SOURCE=https://archive.mozilla.org/pub/firefox/releases/${PKG_VER}esr/source/firefox-${PKG_VER}esr.source.tar.xz -ADDITIONAL=( +ADDITIONAL=" https://www.linuxfromscratch.org/patches/blfs/svn/js-$PKG_VER-python_3_10-1.patch - ) + " DESC="JavaScript interpreter and libraries - Version 78" diff --git a/repo/system/libnl.xibuild b/repo/system/libnl.xibuild index ecd18ae..ba639bb 100644 --- a/repo/system/libnl.xibuild +++ b/repo/system/libnl.xibuild @@ -5,9 +5,9 @@ DEPS="glibc" PKG_VER=3.5.0 SOURCE=https://github.com/thom311/libnl/releases/download/libnl$(echo $PKG_VER | sed 's/\./_/g')/libnl-$PKG_VER.tar.gz -ADDITIONAL=( +ADDITIONAL=" https://github.com/thom311/libnl/releases/download/libnl$(echo $PKG_VER | sed 's/\./_/g')/libnl-doc-$PKG_VER.tar.gz -) +" DESC="Library for applications dealing with netlink sockets" diff --git a/repo/system/lua.xibuild b/repo/system/lua.xibuild index 1e4f0b0..6a9d521 100644 --- a/repo/system/lua.xibuild +++ b/repo/system/lua.xibuild @@ -5,9 +5,9 @@ DEPS="readline" PKG_VER=5.4.4 SOURCE=https://www.lua.org/ftp/lua-$PKG_VER.tar.gz -ADDITIONAL=( +ADDITIONAL=" https://www.linuxfromscratch.org/patches/blfs/svn/lua-$PKG_VER-shared_library-1.patch - ) + " DESC="A powerful lightweight scripting language" prepare () { diff --git a/repo/system/networkmanager.xibuild b/repo/system/networkmanager.xibuild index 84d2baa..7abd804 100644 --- a/repo/system/networkmanager.xibuild +++ b/repo/system/networkmanager.xibuild @@ -7,9 +7,9 @@ PKG_VER=1.35.5 SOURCE=https://download.gnome.org/sources/NetworkManager/$(echo $PKG_VER | cut -d. -f-2)/NetworkManager-$PKG_VER.tar.xz BOOTSCRIPTS=blfs-bootscripts-20210826 -ADDITIONAL=( +ADDITIONAL=" https://anduin.linuxfromscratch.org/BLFS/blfs-bootscripts/$BOOTSCRIPTS.tar.xz - ) + " DESC="Network connection manager and user applications" diff --git a/repo/system/nss.xibuild b/repo/system/nss.xibuild index 5757bf3..182b452 100644 --- a/repo/system/nss.xibuild +++ b/repo/system/nss.xibuild @@ -6,9 +6,9 @@ DEPS="nspr libp11-kit bash zlib" PKG_VER=3.74 SOURCE=https://archive.mozilla.org/pub/security/nss/releases/NSS_$(echo $PKG_VER | sed 's/\./_/g')_RTM/src/nss-$PKG_VER.tar.gz -ADDITIONAL=( +ADDITIONAL=" https://www.linuxfromscratch.org/patches/blfs/svn/nss-$PKG_VER-standalone-1.patch - ) + " DESC="Network Security Services" diff --git a/repo/system/polkit.xibuild b/repo/system/polkit.xibuild index 2f891f4..3f48cd0 100644 --- a/repo/system/polkit.xibuild +++ b/repo/system/polkit.xibuild @@ -5,9 +5,9 @@ DEPS="expat glib js78 pam" PKG_VER=0.120 SOURCE=https://www.freedesktop.org/software/polkit/releases/polkit-$PKG_VER.tar.gz -ADDITIONAL=( +ADDITIONAL=" https://www.linuxfromscratch.org/patches/blfs/svn/polkit-$PKG_VER-security_fix-1.patch - ) + " DESC="Application development toolkit for controlling system-wide privileges" diff --git a/repo/system/sysvinit.xibuild b/repo/system/sysvinit.xibuild index 62cee1b..d3c0282 100644 --- a/repo/system/sysvinit.xibuild +++ b/repo/system/sysvinit.xibuild @@ -5,9 +5,9 @@ DEPS="sh glibc" PKG_VER=3.01 SOURCE=http://download.savannah.nongnu.org/releases/sysvinit/sysvinit-$PKG_VER.tar.xz -ADDITIONAL=( +ADDITIONAL=" https://www.linuxfromscratch.org/patches/lfs/development/sysvinit-$PKG_VER-consolidated-1.patch - ) + " DESC="The sysvinit system for controlling startup, running and shutdown of the system" diff --git a/repo/util/lynx.xibuild b/repo/util/lynx.xibuild index e43a83d..b669c9b 100644 --- a/repo/util/lynx.xibuild +++ b/repo/util/lynx.xibuild @@ -6,9 +6,9 @@ DEPS="libidn openssl" PKG_VER=2.8.9rel.1 SOURCE=https://invisible-mirror.net/archives/lynx/tarballs/lynx$PKG_VER.tar.bz2 -ADDITIONAL=( +ADDITIONAL=" https://www.linuxfromscratch.org/patches/blfs/svn/lynx-$PKG_VER-security_fix-1.patch - ) + " DESC="A text only browser for the WWW" diff --git a/repo/util/unzip.xibuild b/repo/util/unzip.xibuild index dbd17d4..51bbff7 100644 --- a/repo/util/unzip.xibuild +++ b/repo/util/unzip.xibuild @@ -5,9 +5,9 @@ DEPS="bzip2 bash" PKG_VER=60 SOURCE=https://downloads.sourceforge.net/infozip/unzip$PKG_VER.tar.gz -ADDITIONAL=( +ADDITIONAL=" https://www.linuxfromscratch.org/patches/blfs/svn/unzip-$PKG_VER-consolidated_fixes-1.patch - ) + " DESC="Compressor/archiver for creating and modifying zipfiles" diff --git a/repo/util/wireless-tools.xibuild b/repo/util/wireless-tools.xibuild index e33c0e0..e461eb2 100644 --- a/repo/util/wireless-tools.xibuild +++ b/repo/util/wireless-tools.xibuild @@ -7,9 +7,9 @@ PKG_VER=29 SOURCE=https://hewlettpackard.github.io/wireless-tools/wireless_tools.$PKG_VER.tar.gz DESC="Tools allowing to manipulate the Wireless Extensions" -ADDITIONAL=( +ADDITIONAL=" https://www.linuxfromscratch.org/patches/blfs/svn/wireless_tools-$PKG_VER-fix_iwlist_scanning-1.patch - ) + " prepare () { sed -i "s/ldconfig/echo/g" Makefile diff --git a/repo/util/wpa_supplicant.xibuild b/repo/util/wpa_supplicant.xibuild index b55fadd..b79237e 100644 --- a/repo/util/wpa_supplicant.xibuild +++ b/repo/util/wpa_supplicant.xibuild @@ -8,9 +8,9 @@ PKG_VER=2.10 SOURCE=https://w1.fi/releases/wpa_supplicant-$PKG_VER.tar.gz DESC="A utility providng key negotiation for WPA wireless networks" BOOTSCRIPTS=blfs-bootscripts-20210826 -ADDITIONAL=( +ADDITIONAL=" https://anduin.linuxfromscratch.org/BLFS/blfs-bootscripts/$BOOTSCRIPTS.tar.xz - ) + " prepare () { diff --git a/repo/x11/mesa.xibuild b/repo/x11/mesa.xibuild index 8d0bfa4..b9592cc 100644 --- a/repo/x11/mesa.xibuild +++ b/repo/x11/mesa.xibuild @@ -5,10 +5,10 @@ DEPS="xorg-libs libdrm" PKG_VER=21.3.6 SOURCE=https://mesa.freedesktop.org/archive/mesa-$PKG_VER.tar.xz -ADDITIONAL=( +ADDITIONAL=" https://www.linuxfromscratch.org/patches/blfs/svn/mesa-$PKG_VER-add_xdemos-1.patch https://www.linuxfromscratch.org/patches/blfs/svn/mesa-$PKG_VER-nouveau_fixes-1.patch -) +" DESC="An implementation of the OpenGL specification" diff --git a/repo/x11/xf86-video-ati.xibuild b/repo/x11/xf86-video-ati.xibuild index 1bcdcda..421bf3e 100644 --- a/repo/x11/xf86-video-ati.xibuild +++ b/repo/x11/xf86-video-ati.xibuild @@ -8,9 +8,9 @@ DESC="X.org ATI video driver" PKG_VER=19.1.0 SOURCE=https://www.x.org/pub/individual/driver/xf86-video-ati-$PKG_VER.tar.bz2 -ADDITIONAL=( +ADDITIONAL=" https://www.linuxfromscratch.org/patches/blfs/svn/xf86-video-ati-$PKG_VER-upstream_fixes-1.patch - ) + " prepare () { patch -Np1 -i xf86-video-ati-$PKG_VER-upstream_fixes-1.patch -- cgit v1.2.1