From 6fc3b9dc3e84abb1371424efbc8b01ccd41e27f6 Mon Sep 17 00:00:00 2001 From: davidovski Date: Sun, 16 Jan 2022 16:03:29 +0000 Subject: changed patch to prepare --- repo/devel/gcc.xibuild | 2 +- repo/devel/texinfo.xibuild | 2 +- repo/system/binutils.xibuild | 4 ++-- repo/system/bzip2.xibuild | 2 +- repo/system/glibc.xibuild | 2 +- repo/system/gmp.xibuild | 2 +- repo/system/kbd.xibuild | 2 +- repo/system/krb5.xibuild | 2 +- repo/system/libarchive.xibuild | 2 +- repo/system/libcap.xibuild | 2 +- repo/system/libp11-kit.xibuild | 3 +-- repo/system/libpsl.xibuild | 2 +- repo/system/libxslt.xibuild | 2 +- repo/system/nspr.xibuild | 2 +- repo/system/pam.xibuild | 2 +- repo/system/readline.xibuild | 2 +- repo/system/rtmpdump.xibuild | 2 +- repo/system/shadow.xibuild | 2 +- repo/system/sysvinit.xibuild | 2 +- repo/util/vim.xibuild | 2 +- 20 files changed, 21 insertions(+), 22 deletions(-) diff --git a/repo/devel/gcc.xibuild b/repo/devel/gcc.xibuild index 30a0698..2628f34 100644 --- a/repo/devel/gcc.xibuild +++ b/repo/devel/gcc.xibuild @@ -7,7 +7,7 @@ SOURCE=https://mirrorservice.org/sites/sourceware.org/pub/gcc/releases/gcc-$PKG_ DESC="The GNU Compiler Collection - C and C++ frontends" -patch () { +prepare () { #fix an issue breaking libasan.a sed -e '/static.*SIGSTKSZ/d' \ diff --git a/repo/devel/texinfo.xibuild b/repo/devel/texinfo.xibuild index cfc6653..24fa43c 100644 --- a/repo/devel/texinfo.xibuild +++ b/repo/devel/texinfo.xibuild @@ -6,7 +6,7 @@ PKG_VER=6.8 SOURCE=https://ftp.gnu.org/gnu/texinfo/texinfo-$PKG_VER.tar.xz DESC="GNU documentation system for reading, writing and converting info pages" -patch () { +prepare () { # fix an issue when building with glibc-2.34 or later sed -e 's/__attribute_nonnull__/__nonnull/' \ -i gnulib/lib/malloc/dynarray-skeleton.c diff --git a/repo/system/binutils.xibuild b/repo/system/binutils.xibuild index 7988f12..009e56f 100644 --- a/repo/system/binutils.xibuild +++ b/repo/system/binutils.xibuild @@ -6,9 +6,9 @@ PKG_VER=2.37 SOURCE=https://ftp.gnu.org/gnu/binutils/binutils-$PKG_VER.tar.xz DESC="tools for handling object files" -patch () { +prepare () { curl -sSL 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 + /usr/bin/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 fc2e887..946c24a 100644 --- a/repo/system/bzip2.xibuild +++ b/repo/system/bzip2.xibuild @@ -8,7 +8,7 @@ BRANCH=bzip2-$PKG_VER DESC="a selection of programs for compressing and decompressing bzip2 files" -patch () { +prepare () { #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-$PKG_VER-install_docs-1.patch diff --git a/repo/system/glibc.xibuild b/repo/system/glibc.xibuild index 50e5ec9..484ce6f 100644 --- a/repo/system/glibc.xibuild +++ b/repo/system/glibc.xibuild @@ -6,7 +6,7 @@ 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" -patch () { +prepare () { # patches as recommended by lfs sed -e '/NOTIFY_REMOVED)/s/)/ \&\& data.attr != NULL)/' -i sysdeps/unix/sysv/linux/mq_notify.c diff --git a/repo/system/gmp.xibuild b/repo/system/gmp.xibuild index 8e1fe54..aeab9d4 100644 --- a/repo/system/gmp.xibuild +++ b/repo/system/gmp.xibuild @@ -6,7 +6,7 @@ PKG_VER=6.2.1 SOURCE=https://gmplib.org/download/gmp/gmp-$PKG_VER.tar.xz DESC="a collection of mathematical libraries" -patch () { +prepare () { cp -v configfsf.guess config.guess cp -v configfsf.sub config.sub } diff --git a/repo/system/kbd.xibuild b/repo/system/kbd.xibuild index 8136769..aca0429 100644 --- a/repo/system/kbd.xibuild +++ b/repo/system/kbd.xibuild @@ -6,7 +6,7 @@ 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" -patch () { +prepare () { # remove redundant resizecons program sed -i '/RESIZECONS_PROGS=/s/yes/no/' configure sed -i 's/resizecons.8 //' docs/man/man8/Makefile.in diff --git a/repo/system/krb5.xibuild b/repo/system/krb5.xibuild index 2012fbc..013218a 100644 --- a/repo/system/krb5.xibuild +++ b/repo/system/krb5.xibuild @@ -6,7 +6,7 @@ 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" -patch () { +prepare () { # fix denial of service vulnerability sed -i '210a if (sprinc == NULL) {\ status = "NULL_SERVER";\ diff --git a/repo/system/libarchive.xibuild b/repo/system/libarchive.xibuild index 6f0d686..7ad225a 100644 --- a/repo/system/libarchive.xibuild +++ b/repo/system/libarchive.xibuild @@ -6,7 +6,7 @@ SOURCE=https://github.com/libarchive/libarchive/releases/download/v3.5.2/libarch DESC="A library that provides a single interface for reading and writing various compression formats" -patch () { +prepare () { sed -i '436a if ((OSSL_PROVIDER_load(NULL, "legacy")) == NULL) \ return (ARCHIVE_FAILED);' libarchive/archive_digest.c } diff --git a/repo/system/libcap.xibuild b/repo/system/libcap.xibuild index 42c2e9f..d0a75c2 100644 --- a/repo/system/libcap.xibuild +++ b/repo/system/libcap.xibuild @@ -7,7 +7,7 @@ SOURCE=https://git.kernel.org/pub/scm/libs/libcap/libcap.git/snapshot/libcap-$PK DESC="POSIX 1003.1e capabilities" -patch () { +prepare () { sed -i '/install -m.*STA/d' libcap/Makefile } diff --git a/repo/system/libp11-kit.xibuild b/repo/system/libp11-kit.xibuild index 8f6906b..9045671 100644 --- a/repo/system/libp11-kit.xibuild +++ b/repo/system/libp11-kit.xibuild @@ -5,8 +5,7 @@ DEPS=(glibc libtasn1 libffi) SOURCE=https://github.com/p11-glue/p11-kit DESC="Loads and enumerates PKCS#11 modules" -patch () { - +prepare () { sed '20,$ d' -i trust/trust-extract-compat && cat >> trust/trust-extract-compat << "EOF" # Copy existing anchor modifications to /etc/ssl/local diff --git a/repo/system/libpsl.xibuild b/repo/system/libpsl.xibuild index 78ac850..9cddf64 100644 --- a/repo/system/libpsl.xibuild +++ b/repo/system/libpsl.xibuild @@ -6,7 +6,7 @@ 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" -patch () { +prepare () { sed -i 's/env python/&3/' src/psl-make-dafsa } diff --git a/repo/system/libxslt.xibuild b/repo/system/libxslt.xibuild index 80bda77..7020767 100644 --- a/repo/system/libxslt.xibuild +++ b/repo/system/libxslt.xibuild @@ -7,7 +7,7 @@ SOURCE=http://xmlsoft.org/sources/libxslt-$PKG_VER.tar.gz DESC="XML stylesheet transformation library" -patch () { +prepare () { sed -i s/3000/5000/ libxslt/transform.c doc/xsltproc.{1,xml} && sed -i -r '/max(Parser)?Depth/d' ./tests/fuzz/fuzz.c && } diff --git a/repo/system/nspr.xibuild b/repo/system/nspr.xibuild index 9ce0d68..2f51f2b 100644 --- a/repo/system/nspr.xibuild +++ b/repo/system/nspr.xibuild @@ -7,7 +7,7 @@ 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" -patch () { +prepare () { sed -ri '/^RELEASE/s/^/#/' pr/src/misc/Makefile.in sed -i 's#$(LIBRARY) ##' config/rules.mk } diff --git a/repo/system/pam.xibuild b/repo/system/pam.xibuild index b0c18c5..79c14c5 100644 --- a/repo/system/pam.xibuild +++ b/repo/system/pam.xibuild @@ -6,7 +6,7 @@ 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" -patch() { +prepare () { # prevent install of an uneeded systemd file sed -e /service_DATA/d \ -i modules/pam_namespace/Makefile.am && diff --git a/repo/system/readline.xibuild b/repo/system/readline.xibuild index db34667..a1e1521 100644 --- a/repo/system/readline.xibuild +++ b/repo/system/readline.xibuild @@ -8,7 +8,7 @@ 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" -patch () { +prepare () { sed -i '/MV.*old/d' Makefile.in sed -i '/{OLDSUFF}/c:' support/shlib-install } diff --git a/repo/system/rtmpdump.xibuild b/repo/system/rtmpdump.xibuild index a9f561a..a8597fb 100644 --- a/repo/system/rtmpdump.xibuild +++ b/repo/system/rtmpdump.xibuild @@ -6,7 +6,7 @@ SOURCE=git://git.ffmpeg.org/rtmpdump BRANCH="fa8646d" DESC="Tool to download rtmp streams" -patch () { +prepare () { sed -e 's/^CRYPTO=OPENSSL/#CRYPTO=OPENSSL/' -e 's/#CRYPTO=GNUTLS/CRYPTO=GNUTLS/' -i Makefile -i librtmp/Makefile } diff --git a/repo/system/shadow.xibuild b/repo/system/shadow.xibuild index ea32c22..cb53b59 100644 --- a/repo/system/shadow.xibuild +++ b/repo/system/shadow.xibuild @@ -7,7 +7,7 @@ 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" -patch () { +prepare () { 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 diff --git a/repo/system/sysvinit.xibuild b/repo/system/sysvinit.xibuild index 7a52901..3c3b76c 100644 --- a/repo/system/sysvinit.xibuild +++ b/repo/system/sysvinit.xibuild @@ -6,7 +6,7 @@ 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" -patch () { +prepare () { 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 } diff --git a/repo/util/vim.xibuild b/repo/util/vim.xibuild index 06c05a1..31cd202 100644 --- a/repo/util/vim.xibuild +++ b/repo/util/vim.xibuild @@ -5,7 +5,7 @@ DEPS=(gpm acl glibc libgcrypt pcre zlib) SOURCE=https://github.com/vim/vim.git DESC="Vi Improved" -patch () { +prepare () { echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h } -- cgit v1.2.1