From a42add207638d421804aed50118dace4ea814b02 Mon Sep 17 00:00:00 2001
From: Petr Menšík <pemensik@redhat.com>
Date: Jan 12 2022 22:49:49 +0000
Subject: Update to 20211221 (#2011469)


* VERSION (_MAKE_VERSION): 20211221
Merge with NetBSD make, pick up
o more unit-tests
o style cleanup
o in CLEANUP mode, free interned strings at the very end
o fix memory leak for filenames in .for loops
o buf.c: avoid memory leak
o cond.c: condense CondParser_ComparisonOp
o hash.c: change return type of HashTable_Set to void
o job.c: change return type of Compat_RunCommand from int to bool
o main.c: remove bmake_free
o parse.c: condense repetetive code in ParseDirective
remove dead code for handling traditional include directives
clean up parsing of variable assignments
remove unreachable code for parsing the dependency operator
clean up loading of files
fix memory leak in IncludeFile
o var.c: fix memory leak when parsing a variable name
fix memory leak from ${.SUFFIXES}
reduce memory allocation in modifier ':?' and ':C'
condense RegexReplace for the modifier ':C' and avoid strlen
merge duplicate code for memory handling in Var_Parse
distinguish between short-lived and environment variables
rename VarFreeEnv to VarFreeShortLived

---

diff --git a/.gitignore b/.gitignore
index 4ede82b..3162637 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,5 @@
 /bmake-20210110.tar.gz
 /bmake-20210803.tar.gz
 /bmake-20210803.tar.gz.asc
+/bmake-20211221.tar.gz
+/bmake-20211221.tar.gz.asc
diff --git a/bmake.spec b/bmake.spec
index 8704c95..65eefdb 100644
--- a/bmake.spec
+++ b/bmake.spec
@@ -1,6 +1,6 @@
 Summary:       The NetBSD make(1) tool
 Name:          bmake
-Version:       20210803
+Version:       20211221
 Release:       1%{?dist}
 License:       BSD
 URL:           https://ftp.netbsd.org/pub/NetBSD/misc/sjg/
@@ -69,6 +69,9 @@ chmod a-x %{buildroot}%{_datadir}/mk/mkopt.sh
 %{_datadir}/mk
 
 %changelog
+* Wed Jan 12 2022 Petr Menšík <pemensik@redhat.com> - 20211221-1
+- Update to 20211221
+
 * Wed Aug 11 2021 Petr Menšík <pemensik@redhat.com> - 20210803-1
 - Update to 20210803
 
diff --git a/sources b/sources
index 35a5762..b59383e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (bmake-20210803.tar.gz) = 3b93413fca2038f5a9dda5456b1b33aa8c9d21c98236628c9084f540b8caca5b57f47ffeb22c2768a8a928cfa1c0141853634c55219d33d282b8e24ca406b413
-SHA512 (bmake-20210803.tar.gz.asc) = deba18225caae0aded3811a7fa23aea633a0874345be2ed5a73222d5dc4916394da0669bcb468705c01dca1cecd764fdf3d628da7f5cb48d73fa902935185fd5
+SHA512 (bmake-20211221.tar.gz) = 51f316c8784dfbb9221cfe6c80baf8b65b08c798a17d75ad4cb3e9ad90ce4b3d780da57ca6b15027854b93c78c67e9a4f8c135c452cf87aa2e06c4e1820a2a03
+SHA512 (bmake-20211221.tar.gz.asc) = f113bbcbd7dcdccfc207eba17f0cad906d61dfcf539226d0b441d98fa4d204a3721a87601c5f064acdc724235ed58204da43efd17f48d8a37847118a61274606