From 44b9a53b2d3d62f095438d84565bd8f8a4d8d435 Mon Sep 17 00:00:00 2001
From: Diego Viola <diego.viola@gmail.com>
Date: Fri, 31 May 2024 16:11:07 +0000
Subject: [PATCH 1/2] Fix spelling of environment

---
 NEWS                    | 10 +++++-----
 doc/repo-add.8.asciidoc |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/NEWS b/NEWS
index 89936409..b67fe49b 100644
--- a/NEWS
+++ b/NEWS
@@ -15,7 +15,7 @@ VERSION         DESCRIPTION
               - makepkg:
                 - Replace libdepends and libprovides with autodeps
                 - Support configuration via makepkg.conf.d drop-ins
-                - Add GITFLAGS environmental variable to customize checkouts
+                - Add GITFLAGS environment variable to customize checkouts
                 - Add -D option to change directory before building
                 - Implement verify() function for custom source verificaton
                 - Add checksum support for git/mercurial/bzr sources
@@ -585,8 +585,8 @@ VERSION         DESCRIPTION
                 - remove --asroot and enforce fakeroot usage
                 - all PKGBUILDs require a package() function
                 - PKGBUILDs can no longer be read from stdin
-                - enable make style environmental overrides
-                - Read CARCH environmental variable (FS#35030)
+                - enable make-style environment variable overrides
+                - Read CARCH environment variable (FS#35030)
                 - makedepends and checkdepends are installed together (FS#31557)
                 - added support for sha224 checksums (FS#36776)
                 - remove warning when license is not specified in PKGBUILD
@@ -683,7 +683,7 @@ VERSION         DESCRIPTION
                 - pkgrel must be in decimal format
                 - PKGBUILDs without package() functions are deprecated
                 - support specifying CPPFLAGS in makepkg.conf
-                - support PACKAGER environmental variable
+                - support PACKAGER environment variable
                 - allow source renaming to work on signature files
                 - configurable compression options (FS#27430)
                 - allow multiple packages to be build when using
@@ -697,7 +697,7 @@ VERSION         DESCRIPTION
                 - add LOGDEST configuration option
                 - install makedepends with --repackage
               - repo-add:
-                - honor TMPDIR environmental variable
+                - honor TMPDIR environment variable
                 - add makedepends/checkdepends information to database
               - pacman-key:
                 - fix importing keys with quotes in file name (FS#28445)
diff --git a/doc/repo-add.8.asciidoc b/doc/repo-add.8.asciidoc
index 0b8eab49..a6f77cd4 100644
--- a/doc/repo-add.8.asciidoc
+++ b/doc/repo-add.8.asciidoc
@@ -48,7 +48,7 @@ Common Options
 
 *-k, \--key* <key>::
 	Specify a key to use when signing packages. Can also be specified using
-	the GPGKEY environmental variable. If not specified in either location, the
+	the GPGKEY environment variable. If not specified in either location, the
 	default key from the keyring will be used.
 
 *-v, \--verify*::

From b013ca4221852edf920d1c7b0a910de303ce9826 Mon Sep 17 00:00:00 2001
From: Allan McRae <allan@archlinux.org>
Date: Mon, 20 May 2024 20:50:43 +1000
Subject: [PATCH 2/2] makepkg: provide environment variable to disable PKGBUILD
 linting

On Windows based systems (e.g. msys), running PKGBUILD linting is very
slow due to time taken spawning bash subshells.  Additionally, some packages
have extreme amounts of (usually procedurally generated) splitting, which
also causes linting to be extremely slow.  Provide an environment variable
to disable PKGBUILD linting.

Signed-off-by: Allan McRae <allan@archlinux.org>
---
 doc/makepkg.8.asciidoc | 5 +++++
 scripts/makepkg.sh.in  | 6 +++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/doc/makepkg.8.asciidoc b/doc/makepkg.8.asciidoc
index a2ad5279..bb5e2f4a 100644
--- a/doc/makepkg.8.asciidoc
+++ b/doc/makepkg.8.asciidoc
@@ -297,6 +297,11 @@ Environment Variables
 **BUILDTOOLVER=**"<version>"::
 	The version of the '$BUILDTOOL' used.
 
+**MAKEPKG_LINT_PKGBUILD=**0
+	Setting to 0 disables PKGBUILD linting within makepkg. Useful on systems
+	with slow bash subshell operations, or on PKGBUILDs with extreme amounts of
+	package splitting.
+
 
 Configuration
 -------------
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index d5976434..75df3650 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -87,6 +87,8 @@ else
 fi
 export SOURCE_DATE_EPOCH
 
+MAKEPKG_LINT_PKGBUILD=${MAKEPKG_LINT_PKGBUILD:-1}
+
 PACMAN_OPTS=()
 
 shopt -s extglob
@@ -1151,7 +1153,9 @@ fi
 pkgbase=${pkgbase:-${pkgname[0]}}
 
 # check the PKGBUILD for some basic requirements
-lint_pkgbuild || exit $E_PKGBUILD_ERROR
+if (( MAKEPKG_LINT_PKGBUILD != 0 )); then
+	lint_pkgbuild || exit $E_PKGBUILD_ERROR
+fi
 
 if (( !SOURCEONLY && !PRINTSRCINFO )); then
 	merge_arch_attrs