From 3f66b9ab1859b678f1eee7b9d942c6328bae320a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio@serjux.com>
Date: Tue, 8 Jan 2019 03:38:04 +0000
Subject: [PATCH 01/43] Update to 0.1.9998.r3290-1.20190106 Add manpage (copied
 from Debian IIRC)

---
 .gitignore                 |  1 +
 kBuild.spec                | 37 +++++++++++++++++++++++--------------
 kbuild-dummy_noreturn.diff |  4 ++--
 kbuild-glob.patch          | 12 ------------
 sources                    |  2 +-
 5 files changed, 27 insertions(+), 29 deletions(-)
 delete mode 100644 kbuild-glob.patch

diff --git a/.gitignore b/.gitignore
index 494748d..03b3e57 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ kBuild-0.1.5-p2-src.tar.gz
 /kBuild-r3050.tar.gz
 /kBuild-r3127.tar.gz
 /kBuild-r3129.tar.gz
+/kBuild-r3290.20190106.tar.gz
diff --git a/kBuild.spec b/kBuild.spec
index ff8357b..5e69394 100644
--- a/kBuild.spec
+++ b/kBuild.spec
@@ -1,10 +1,12 @@
-%global svn_revision 3129
-%global svn_date 20180106
+%global svn_revision 3290
+%global svn_date 20190106
 
 Name:           kBuild
 Version:        0.1.9998%{?svn_revision:.r%{svn_revision}}
-Release:        4%{?svn_date:.%{svn_date}}%{?dist}
+Release:        1%{?svn_date:.%{svn_date}}%{?dist}
 Summary:        A cross-platform build environment
+#Building problems on s390x
+ExcludeArch: s390x
 
 Group:          Development/Tools
 License:        BSD and GPLv2+
@@ -12,19 +14,23 @@ License:        BSD and GPLv2+
 # and make and sed are from GNU
 URL:            http://svn.netlabs.org/kbuild
 #Generated with kBuild-snapshot.sh
-Source0:        kBuild-r%{svn_revision}.tar.gz
+Source0:        kBuild-r%{svn_revision}.%{svn_date}.tar.gz
 Patch0:         kBuild-0.1.3-escape.patch
 Patch1:         kBuild-pthread.patch
 Patch4:         kBuild-0.1.9998-ppc64le.patch
 Patch5:         kBuild-0.1.9998-aarch64.patch
 Patch6:         kbuild-dummy_noreturn.diff
-Patch7:         kbuild-glob.patch
 Patch8:         kBuild-0.1.9998-portme.patch
 
 BuildRequires:  gcc
-BuildRequires:  byacc libacl-devel flex
+BuildRequires:  automake
 BuildRequires:  bison
-BuildRequires:  autoconf automake gettext-devel
+BuildRequires:  gettext-devel
+BuildRequires:  libtool
+BuildRequires:  flex
+BuildRequires:  libacl-devel
+BuildRequires:  texinfo
+BuildRequires:  byacc
 
 %description
 This is a GNU make fork with a set of scripts to simplify
@@ -43,9 +49,6 @@ repository.
 %patch4 -p1 -b .ppc64le
 %patch5 -p1 -b .aarch64
 %patch6 -p1 -b .dummy_noreturn
-%if 0%{?fedora} > 27
-%patch7 -p1 -b .kbuild-glob.patch
-%endif
 %ifarch ppc64
 %if 0%{?rhel} && 0%{?rhel} < 7
 # Found the reason why compile fails in detection of powerpc64 in centos 6
@@ -78,8 +81,6 @@ echo KBUILD_SVN_REV := %{svn_revision} >>  SvnInfo.kmk
 find -name config.log -delete
 kBuild/env.sh --full make -f bootstrap.gmk %{bootstrap_mflags}
 kBuild/env.sh kmk %{mflags} rebuild
-#pod2man -c 'kBuild for Debian GNU/Linux' \
-#  -r kBuild-$(DEB_UPSTREAM_VERSION) debian/kmk.pod > debian/kmk.1
 
 
 %install
@@ -87,16 +88,24 @@ export KBUILD_VERBOSE=2
 kBuild/env.sh kmk %{mflags} PATH_INS=%{buildroot} install
 # These are included later in files section
 rm -r %{buildroot}%{_docdir}
+mkdir -p %{buildroot}/%{_mandir}/man1
+pod2man -c 'kBuild for Fedora/EPEL GNU/Linux' \
+  -r kBuild-%{version} ./dist/debian/kmk.pod > %{buildroot}/%{_mandir}/man1/kmk.1
 
 
 %files
-%{_bindir}/*
-%{_datadir}/*
 %doc ChangeLog kBuild/doc/QuickReference*
 %license COPYING kBuild/doc/COPYING-FDL-1.3
+%{_bindir}/*
+%{_datadir}/kBuild
+%{_mandir}/man1/*
 
 
 %changelog
+* Mon Jan 07 2019 Sérgio Basto <sergio@serjux.com> - 0.1.9998.r3290-1.20190106
+- Update to 0.1.9998.r3290-1.20190106
+- Add manpage (copied from Debian IIRC)
+
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998.r3129-4.20180106
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
diff --git a/kbuild-dummy_noreturn.diff b/kbuild-dummy_noreturn.diff
index d521fa9..929dc08 100644
--- a/kbuild-dummy_noreturn.diff
+++ b/kbuild-dummy_noreturn.diff
@@ -2,10 +2,10 @@ Index: src/kmk/kmkbuiltin/expr.c
 ===================================================================
 --- ./src/kmk/kmkbuiltin/expr.c.orig
 +++ ./src/kmk/kmkbuiltin/expr.c
-@@ -311,6 +311,8 @@ eval6(void)
+@@ -317,6 +317,8 @@ eval6(PEXPRINSTANCE pThis)
  		return v;
  	} else {
- 		error();
+ 		error(pThis);
 +        /* dummy return in order to make the build checks happy (this will never be reached) */
 +        return NULL;
  	}
diff --git a/kbuild-glob.patch b/kbuild-glob.patch
deleted file mode 100644
index 74c8c4f..0000000
--- a/kbuild-glob.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-glibc for F28 remove definition of __alloca
---- ./src/kmk/glob/glob.c	(revision 3127)
-+++ ./src/kmk/glob/glob.c	(working copy)
-@@ -209,7 +209,7 @@
- #endif /* __GNU_LIBRARY__ || __DJGPP__ */
- 
- 
--#if !defined __alloca && !defined __GNU_LIBRARY__
-+#if !defined __alloca
- 
- # ifdef	__GNUC__
- #  undef alloca
diff --git a/sources b/sources
index 49bf6b2..07f7a8d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (kBuild-r3129.tar.gz) = 2c90d6094b6e5e08eb5af8199456fa48526d8d39e49c833b769ed185745f5e86a6fd40154d6ed1c3e354e1a02c4263d825c5898c187f0819c492074372e2ae0c
+SHA512 (kBuild-r3290.20190106.tar.gz) = f8d8b6f7442ce1e0bde6856430f594bed1cada0abb69771d4c4a297dd5b3560101d5217d81eb45b930104cd6b1eb4660f95f729e8969466b4b813e9085daa7f0

From e33aae3d149aff458b045dffda4929df230a3a97 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Mon, 28 Jan 2019 20:17:50 +0100
Subject: [PATCH 02/43] Remove obsolete Group tag

References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
---
 kBuild.spec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/kBuild.spec b/kBuild.spec
index 5e69394..e6b77d5 100644
--- a/kBuild.spec
+++ b/kBuild.spec
@@ -8,7 +8,6 @@ Summary:        A cross-platform build environment
 #Building problems on s390x
 ExcludeArch: s390x
 
-Group:          Development/Tools
 License:        BSD and GPLv2+
 # most tools are from NetBSD, some are from FreeBSD,
 # and make and sed are from GNU

From c92f0b2ce54d2a761691ffbd9ba0da031c160360 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 1 Feb 2019 04:57:42 +0000
Subject: [PATCH 03/43] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 kBuild.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/kBuild.spec b/kBuild.spec
index e6b77d5..e02bfbc 100644
--- a/kBuild.spec
+++ b/kBuild.spec
@@ -3,7 +3,7 @@
 
 Name:           kBuild
 Version:        0.1.9998%{?svn_revision:.r%{svn_revision}}
-Release:        1%{?svn_date:.%{svn_date}}%{?dist}
+Release:        2%{?svn_date:.%{svn_date}}%{?dist}
 Summary:        A cross-platform build environment
 #Building problems on s390x
 ExcludeArch: s390x
@@ -101,6 +101,9 @@ pod2man -c 'kBuild for Fedora/EPEL GNU/Linux' \
 
 
 %changelog
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998.r3290-2.20190106
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
 * Mon Jan 07 2019 Sérgio Basto <sergio@serjux.com> - 0.1.9998.r3290-1.20190106
 - Update to 0.1.9998.r3290-1.20190106
 - Add manpage (copied from Debian IIRC)

From f7746fcc2b1eb431946df9cef9d7fafc0ec228dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio@serjux.com>
Date: Tue, 12 Feb 2019 04:38:16 +0000
Subject: [PATCH 04/43] Update to 0.1.9998.r3296-1.20190122

---
 .gitignore                    |  1 +
 kBuild-0.1.9998-aarch64.patch |  2 +-
 kBuild.spec                   | 11 ++++++-----
 sources                       |  2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 03b3e57..ec64730 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ kBuild-0.1.5-p2-src.tar.gz
 /kBuild-r3127.tar.gz
 /kBuild-r3129.tar.gz
 /kBuild-r3290.20190106.tar.gz
+/kBuild-r3296.20190122.tar.gz
diff --git a/kBuild-0.1.9998-aarch64.patch b/kBuild-0.1.9998-aarch64.patch
index 0ae6859..bf2c1d7 100644
--- a/kBuild-0.1.9998-aarch64.patch
+++ b/kBuild-0.1.9998-aarch64.patch
@@ -1,7 +1,7 @@
 --- ./kBuild/env.sh.aarch64	2017-12-03 01:09:31.241398236 +0000
 +++ ./kBuild/env.sh	2017-12-03 01:55:15.577568931 +0000
 @@ -365,9 +365,12 @@ if test -z "$KBUILD_HOST_ARCH"; then
-         aarch32|arm|arm1|arm2|arm3|arm6|armv1|armv2|armv3*|armv4*|armv5*|armv6*|armv7*)
+         aarch32|arm|arm1|arm2|arm3|arm6|armv1|armv2|armv3*|armv4*|armv5*|armv6*|armv7*|armv8*)
              KBUILD_HOST_ARCH='arm32'
              ;;
 -        aarch64*)
diff --git a/kBuild.spec b/kBuild.spec
index e02bfbc..8cc047a 100644
--- a/kBuild.spec
+++ b/kBuild.spec
@@ -1,12 +1,10 @@
-%global svn_revision 3290
-%global svn_date 20190106
+%global svn_revision 3296
+%global svn_date 20190122
 
 Name:           kBuild
 Version:        0.1.9998%{?svn_revision:.r%{svn_revision}}
-Release:        2%{?svn_date:.%{svn_date}}%{?dist}
+Release:        1%{?svn_date:.%{svn_date}}%{?dist}
 Summary:        A cross-platform build environment
-#Building problems on s390x
-ExcludeArch: s390x
 
 License:        BSD and GPLv2+
 # most tools are from NetBSD, some are from FreeBSD,
@@ -101,6 +99,9 @@ pod2man -c 'kBuild for Fedora/EPEL GNU/Linux' \
 
 
 %changelog
+* Mon Feb 11 2019 Sérgio Basto <sergio@serjux.com> - 0.1.9998.r3296-1.20190122
+- Update to 0.1.9998.r3296-1.20190122
+
 * Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998.r3290-2.20190106
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
diff --git a/sources b/sources
index 07f7a8d..a86a0d3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (kBuild-r3290.20190106.tar.gz) = f8d8b6f7442ce1e0bde6856430f594bed1cada0abb69771d4c4a297dd5b3560101d5217d81eb45b930104cd6b1eb4660f95f729e8969466b4b813e9085daa7f0
+SHA512 (kBuild-r3296.20190122.tar.gz) = 5c61edb916876de8ad356491cfe6ebc452dfb05a0eec14896fb6b53ca3b9a6e057848cc0132b36a23615fd8d859602a74bcdd1b34750eeced2f95d26b67899bd

From 349ade1acbf8e71cf9ea692cd71c59aebec15571 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio@serjux.com>
Date: Tue, 12 Feb 2019 05:19:52 +0000
Subject: [PATCH 05/43] Trust in the upstream that has the correct support for
 aarch64 and ppc64le

---
 kBuild-0.1.9998-aarch64.patch | 52 --------------------------
 kBuild-0.1.9998-ppc64le.patch | 69 -----------------------------------
 kBuild.spec                   |  9 ++---
 3 files changed, 4 insertions(+), 126 deletions(-)
 delete mode 100644 kBuild-0.1.9998-aarch64.patch
 delete mode 100644 kBuild-0.1.9998-ppc64le.patch

diff --git a/kBuild-0.1.9998-aarch64.patch b/kBuild-0.1.9998-aarch64.patch
deleted file mode 100644
index bf2c1d7..0000000
--- a/kBuild-0.1.9998-aarch64.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- ./kBuild/env.sh.aarch64	2017-12-03 01:09:31.241398236 +0000
-+++ ./kBuild/env.sh	2017-12-03 01:55:15.577568931 +0000
-@@ -365,9 +365,12 @@ if test -z "$KBUILD_HOST_ARCH"; then
-         aarch32|arm|arm1|arm2|arm3|arm6|armv1|armv2|armv3*|armv4*|armv5*|armv6*|armv7*|armv8*)
-             KBUILD_HOST_ARCH='arm32'
-             ;;
--        aarch64*)
-+        arm64)
-             KBUILD_HOST_ARCH='arm64'
-             ;;
-+        aarch64)
-+            KBUILD_HOST_ARCH='aarch64'
-+            ;;
-         hppa32|parisc32|parisc)
-             KBUILD_HOST_ARCH='hppa32'
-             ;;
---- ./kBuild/header.kmk.aarch64	2017-12-03 01:05:13.825744817 +0000
-+++ ./kBuild/header.kmk	2017-12-03 01:07:53.989395771 +0000
-@@ -197,8 +197,8 @@ KBUILD_BLD_TYPES := release profile debu
- # build types. (PORTME)
- #
- KBUILD_OSES      := darwin dos dragonfly freebsd gnuhurd gnukfbsd gnuknbsd haiku l4 linux netbsd nt openbsd os2 solaris win os-agnostic
--KBUILD_ARCHES    := x86 amd64 noarch alpha arm32 arm64 hppa32 hppa64 ia64 m68k mips32 mips64 ppc32 ppc64 ppc64le s390 s390x sh32 sh64 sparc32 sparc64 x32
--KBUILD_ARCHES_64 := amd64 alpha arm64 hppa64 ia64 mips64 ppc64 ppc64le s390x sh64 sparc64 x32
-+KBUILD_ARCHES    := x86 amd64 noarch alpha arm32 arm64 aarch64 hppa32 hppa64 ia64 m68k mips32 mips64 ppc32 ppc64 ppc64le s390 s390x sh32 sh64 sparc32 sparc64 x32
-+KBUILD_ARCHES_64 := amd64 alpha arm64 aarch64 hppa64 ia64 mips64 ppc64 ppc64le s390x sh64 sparc64 x32
- KBUILD_ARCHES_32 := x86 arm32 hppa32 m68k mips32 ppc32 s390 sh32 sparc32
- 
- 
---- ./src/lib/kStuff/include/k/kDefs.h.aarch64	2017-12-03 02:06:43.570680524 +0000
-+++ ./src/lib/kStuff/include/k/kDefs.h	2017-12-03 02:19:50.895923683 +0000
-@@ -162,6 +162,8 @@
- #define K_ARCH_ARM_32           ( 5 | K_ARCH_BIT_32 | K_ARCH_END_BI)
- /** 64-bit ARM. */
- #define K_ARCH_ARM_64           ( 5 | K_ARCH_BIT_64 | K_ARCH_END_BI)
-+/** 64-bit AARCH. */
-+#define K_ARCH_AARCH_64         ( 5 | K_ARCH_BIT_64 | K_ARCH_END_LITTLE)
- /** Motorola 68000 (32-bit). */
- #define K_ARCH_M68K             ( 6 | K_ARCH_BIT_32 | K_ARCH_END_BIG)
- /** 32-bit MIPS. */
-@@ -210,8 +212,10 @@
- #  define K_ARCH    K_ARCH_ALPHA
- # elif defined(__arm__) || defined(__arm32__)
- #  define K_ARCH    K_ARCH_ARM_32
--# elif defined(__aarch64__) || defined(__arm64__)
-+# elif defined(__arm64__)
- #  define K_ARCH    K_ARCH_ARM_64
-+# elif defined(__aarch64__)
-+#  define K_ARCH    K_ARCH_AARCH_64
- # elif defined(__hppa__) && defined(__LP64__)
- #  define K_ARCH    K_ARCH_PARISC_64
- # elif defined(__hppa__)
diff --git a/kBuild-0.1.9998-ppc64le.patch b/kBuild-0.1.9998-ppc64le.patch
deleted file mode 100644
index a349272..0000000
--- a/kBuild-0.1.9998-ppc64le.patch
+++ /dev/null
@@ -1,69 +0,0 @@
----
- kBuild/env.sh     |    3 +++
- kBuild/header.kmk |    6 +++---
- src/lib/k/kDefs.h |   16 ++++++++++------
- 3 files changed, 16 insertions(+), 9 deletions(-)
-
---- ./kBuild/env.sh.ppc64le	2017-12-03 01:09:31.236398185 +0000
-+++ ./kBuild/env.sh	2017-12-03 02:00:09.001601147 +0000
-@@ -380,9 +383,12 @@ if test -z "$KBUILD_HOST_ARCH"; then
-         ppc32|ppc|powerpc)
-             KBUILD_HOST_ARCH='ppc32'
-             ;;
--        ppc64|ppc64le|powerpc64|powerpc64le)
-+        ppc64|powerpc64)
-             KBUILD_HOST_ARCH='ppc64'
-             ;;
-+        ppc64le|powerpc64le)
-+            KBUILD_HOST_ARCH='ppc64le'
-+            ;;
-         m68k)
-             KBUILD_HOST_ARCH='m68k'
-             ;;
-Index: kbuild-0.1.9998svn3110/kBuild/header.kmk
-===================================================================
---- ./kBuild/header.kmk.ppc64le	2017-12-02 19:34:43.000000000 +0000
-+++ ./kBuild/header.kmk	2017-12-03 01:00:48.850013468 +0000
-@@ -197,8 +197,8 @@ KBUILD_BLD_TYPES := release profile debu
- # build types. (PORTME)
- #
- KBUILD_OSES      := darwin dos dragonfly freebsd gnuhurd gnukfbsd gnuknbsd haiku l4 linux netbsd nt openbsd os2 solaris win os-agnostic
--KBUILD_ARCHES    := x86 amd64 noarch alpha arm32 arm64 hppa32 hppa64 ia64 m68k mips32 mips64 ppc32 ppc64 s390 s390x sh32 sh64 sparc32 sparc64 x32
--KBUILD_ARCHES_64 := amd64 alpha arm64 hppa64 ia64 mips64 ppc64 s390x sh64 sparc64 x32
-+KBUILD_ARCHES    := x86 amd64 noarch alpha arm32 arm64 hppa32 hppa64 ia64 m68k mips32 mips64 ppc32 ppc64 ppc64le s390 s390x sh32 sh64 sparc32 sparc64 x32
-+KBUILD_ARCHES_64 := amd64 alpha arm64 hppa64 ia64 mips64 ppc64 ppc64le s390x sh64 sparc64 x32
- KBUILD_ARCHES_32 := x86 arm32 hppa32 m68k mips32 ppc32 s390 sh32 sparc32
- 
- 
-@@ -515,7 +515,7 @@ endif
- KBUILD_DEVTOOLS_TRG ?= $(KBUILD_DEVTOOLS)/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)
- KBUILD_DEVTOOLS_HST ?= $(KBUILD_DEVTOOLS)/$(KBUILD_HOST).$(KBUILD_HOST_ARCH)
- 
--if1of ($(KBUILD_TARGET_ARCH), amd64 hppa64 mips64 ppc64 s390x sparc64)
-+if1of ($(KBUILD_TARGET_ARCH), amd64 hppa64 mips64 ppc64 ppc64le s390x sparc64)
-  ifeq ($(KBUILD_TARGET_ARCH),amd64)
-   KBUILD_DEVTOOLS_TRG_ALT ?= $(KBUILD_DEVTOOLS)/$(KBUILD_TARGET).x86
-  else ifeq ($(KBUILD_TARGET_ARCH),hppa64)
---- ./src/lib/kStuff/include/k/kDefs.h.ppc64le	2017-12-02 19:34:47.000000000 +0000
-+++ ./src/lib/kStuff/include/k/kDefs.h	2017-12-03 02:29:08.217738931 +0000
-@@ -176,6 +178,8 @@
- #define K_ARCH_POWERPC_32       ( 9 | K_ARCH_BIT_32 | K_ARCH_END_BI)
- /** 64-bit PowerPC. */
- #define K_ARCH_POWERPC_64       ( 9 | K_ARCH_BIT_64 | K_ARCH_END_BI)
-+/** 64-bit PowerPC. */
-+#define K_ARCH_POWERPC_64LE     ( 9 | K_ARCH_BIT_64 | K_ARCH_END_LITTLE)
- /** 32(31)-bit S390. */
- #define K_ARCH_S390_32          (10 | K_ARCH_BIT_32 | K_ARCH_END_BIG)
- /** 64-bit S390. */
-@@ -220,8 +226,10 @@
- #  define K_ARCH    K_ARCH_MIPS_64
- # elif defined(__mips__)
- #  define K_ARCH    K_ARCH_MIPS_32
--# elif defined(__powerpc64__) || defined(__ppc64__) || defined(__PPC64__)
-+# elif (defined(__powerpc64__) && defined(__BIG_ENDIAN__))|| defined(__ppc64__) || defined(__PPC64__)
- #  define K_ARCH    K_ARCH_POWERPC_64
-+# elif (defined(__powerpc64__) && defined(__LITTLE_ENDIAN__))
-+#  define K_ARCH    K_ARCH_POWERPC_64LE
- # elif defined(__powerpc__) || defined(__ppc__) || defined(__PPC__)
- #  define K_ARCH    K_ARCH_POWERPC_32
- # elif defined(__sparcv9__) || defined(__sparcv9)
diff --git a/kBuild.spec b/kBuild.spec
index 8cc047a..fae9b3f 100644
--- a/kBuild.spec
+++ b/kBuild.spec
@@ -3,7 +3,7 @@
 
 Name:           kBuild
 Version:        0.1.9998%{?svn_revision:.r%{svn_revision}}
-Release:        1%{?svn_date:.%{svn_date}}%{?dist}
+Release:        2%{?svn_date:.%{svn_date}}%{?dist}
 Summary:        A cross-platform build environment
 
 License:        BSD and GPLv2+
@@ -14,8 +14,6 @@ URL:            http://svn.netlabs.org/kbuild
 Source0:        kBuild-r%{svn_revision}.%{svn_date}.tar.gz
 Patch0:         kBuild-0.1.3-escape.patch
 Patch1:         kBuild-pthread.patch
-Patch4:         kBuild-0.1.9998-ppc64le.patch
-Patch5:         kBuild-0.1.9998-aarch64.patch
 Patch6:         kbuild-dummy_noreturn.diff
 Patch8:         kBuild-0.1.9998-portme.patch
 
@@ -43,8 +41,6 @@ repository.
 %setup -q -n %{name}
 %patch0 -p1 -b .escape
 %patch1 -p1 -b .pthreads
-%patch4 -p1 -b .ppc64le
-%patch5 -p1 -b .aarch64
 %patch6 -p1 -b .dummy_noreturn
 %ifarch ppc64
 %if 0%{?rhel} && 0%{?rhel} < 7
@@ -99,6 +95,9 @@ pod2man -c 'kBuild for Fedora/EPEL GNU/Linux' \
 
 
 %changelog
+* Tue Feb 12 2019 Sérgio Basto <sergio@serjux.com> - 0.1.9998.r3296-2.20190122
+- Trust in the upstream that has the correct support for aarch64 and ppc64le
+
 * Mon Feb 11 2019 Sérgio Basto <sergio@serjux.com> - 0.1.9998.r3296-1.20190122
 - Update to 0.1.9998.r3296-1.20190122
 

From 087891c07d1ba760e40466c307aec692369b59bd Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 25 Jul 2019 11:00:30 +0000
Subject: [PATCH 06/43] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 kBuild.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/kBuild.spec b/kBuild.spec
index fae9b3f..883065f 100644
--- a/kBuild.spec
+++ b/kBuild.spec
@@ -3,7 +3,7 @@
 
 Name:           kBuild
 Version:        0.1.9998%{?svn_revision:.r%{svn_revision}}
-Release:        2%{?svn_date:.%{svn_date}}%{?dist}
+Release:        3%{?svn_date:.%{svn_date}}%{?dist}
 Summary:        A cross-platform build environment
 
 License:        BSD and GPLv2+
@@ -95,6 +95,9 @@ pod2man -c 'kBuild for Fedora/EPEL GNU/Linux' \
 
 
 %changelog
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998.r3296-3.20190122
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
 * Tue Feb 12 2019 Sérgio Basto <sergio@serjux.com> - 0.1.9998.r3296-2.20190122
 - Trust in the upstream that has the correct support for aarch64 and ppc64le
 

From 71f92878e3c2f1988562cf40212a9451b927d849 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 29 Jan 2020 06:35:00 +0000
Subject: [PATCH 07/43] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 kBuild.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/kBuild.spec b/kBuild.spec
index 883065f..334ceb3 100644
--- a/kBuild.spec
+++ b/kBuild.spec
@@ -3,7 +3,7 @@
 
 Name:           kBuild
 Version:        0.1.9998%{?svn_revision:.r%{svn_revision}}
-Release:        3%{?svn_date:.%{svn_date}}%{?dist}
+Release:        4%{?svn_date:.%{svn_date}}%{?dist}
 Summary:        A cross-platform build environment
 
 License:        BSD and GPLv2+
@@ -95,6 +95,9 @@ pod2man -c 'kBuild for Fedora/EPEL GNU/Linux' \
 
 
 %changelog
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998.r3296-4.20190122
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998.r3296-3.20190122
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 

From 06478756980b00ab8ff85d23647be915b672004e Mon Sep 17 00:00:00 2001
From: Gwyn Ciesla <gwync@protonmail.com>
Date: Tue, 26 May 2020 15:47:21 -0500
Subject: [PATCH 08/43] "Adding package.cfg file"

---
 package.cfg | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 package.cfg

diff --git a/package.cfg b/package.cfg
new file mode 100644
index 0000000..66ea79d
--- /dev/null
+++ b/package.cfg
@@ -0,0 +1,2 @@
+[koji]
+targets = epel8 epel8-playground
\ No newline at end of file

From 8c63e8e693376d1701fc180d89e623122c319d5c Mon Sep 17 00:00:00 2001
From: Jeff Law <law@redhat.com>
Date: Thu, 23 Jul 2020 20:38:15 -0600
Subject: [PATCH 09/43] - Use strsignal, not sys_siglist

---
 kBuild-strsignal.patch | 15 +++++++++++++++
 kBuild.spec            |  7 ++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 kBuild-strsignal.patch

diff --git a/kBuild-strsignal.patch b/kBuild-strsignal.patch
new file mode 100644
index 0000000..e757f77
--- /dev/null
+++ b/kBuild-strsignal.patch
@@ -0,0 +1,15 @@
+diff --git a/src/kash/jobs.c b/src/kash/jobs.c
+index 13a758d..2f9a156 100644
+--- a/src/kash/jobs.c
++++ b/src/kash/jobs.c
+@@ -396,8 +396,8 @@ showjob(shinstance *psh, struct output *out, struct job *jp, int mode)
+ #endif
+ 				st = WTERMSIG(ps->status);
+ 			st &= 0x7f;
+-			if (st < NSIG && sys_siglist[st])
+-				scopyn(sys_siglist[st], s + col, 32);
++			if (st < NSIG)
++				scopyn(strsignal(st), s + col, 32);
+ 			else
+ 				fmtstr(s + col, 16, "Signal %d", st);
+ 			if (WCOREDUMP(ps->status)) {
diff --git a/kBuild.spec b/kBuild.spec
index 334ceb3..ed7f927 100644
--- a/kBuild.spec
+++ b/kBuild.spec
@@ -3,7 +3,7 @@
 
 Name:           kBuild
 Version:        0.1.9998%{?svn_revision:.r%{svn_revision}}
-Release:        4%{?svn_date:.%{svn_date}}%{?dist}
+Release:        5%{?svn_date:.%{svn_date}}%{?dist}
 Summary:        A cross-platform build environment
 
 License:        BSD and GPLv2+
@@ -16,6 +16,7 @@ Patch0:         kBuild-0.1.3-escape.patch
 Patch1:         kBuild-pthread.patch
 Patch6:         kbuild-dummy_noreturn.diff
 Patch8:         kBuild-0.1.9998-portme.patch
+Patch9:		kBuild-strsignal.patch
 
 BuildRequires:  gcc
 BuildRequires:  automake
@@ -51,6 +52,7 @@ repository.
 %patch8 -p1 -b .portme
 %endif
 %endif
+%patch9 -p1 -b .strsignal
 
 
 %build
@@ -95,6 +97,9 @@ pod2man -c 'kBuild for Fedora/EPEL GNU/Linux' \
 
 
 %changelog
+* Thu Jul 23 2020 Jeff Law <law@redhat.com> - 0.1.9998.r3296-5.20190122
+- Use strsignal, not sys_siglist
+
 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998.r3296-4.20190122
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 

From a298ebff0505add59d9f7db8c6052197f00a216e Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Tue, 28 Jul 2020 02:40:01 +0000
Subject: [PATCH 10/43] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 kBuild.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/kBuild.spec b/kBuild.spec
index ed7f927..bfc9661 100644
--- a/kBuild.spec
+++ b/kBuild.spec
@@ -3,7 +3,7 @@
 
 Name:           kBuild
 Version:        0.1.9998%{?svn_revision:.r%{svn_revision}}
-Release:        5%{?svn_date:.%{svn_date}}%{?dist}
+Release:        6%{?svn_date:.%{svn_date}}%{?dist}
 Summary:        A cross-platform build environment
 
 License:        BSD and GPLv2+
@@ -97,6 +97,9 @@ pod2man -c 'kBuild for Fedora/EPEL GNU/Linux' \
 
 
 %changelog
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998.r3296-6.20190122
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
 * Thu Jul 23 2020 Jeff Law <law@redhat.com> - 0.1.9998.r3296-5.20190122
 - Use strsignal, not sys_siglist
 

From c68789eaffdeb25ec3de697db55362e680e4f2b9 Mon Sep 17 00:00:00 2001
From: Troy Dawson <tdawson@redhat.com>
Date: Thu, 24 Sep 2020 18:06:33 +0000
Subject: [PATCH 11/43] remove package.cfg per new epel-playground policy

---
 package.cfg | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 package.cfg

diff --git a/package.cfg b/package.cfg
deleted file mode 100644
index 66ea79d..0000000
--- a/package.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-[koji]
-targets = epel8 epel8-playground
\ No newline at end of file

From 66251e3c374517c97d60eae4094744166cb7068c Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar@redhat.com>
Date: Wed, 13 Jan 2021 02:37:05 +0000
Subject: [PATCH 12/43] Add BuildRequires: make

https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
---
 kBuild.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kBuild.spec b/kBuild.spec
index bfc9661..ced572d 100644
--- a/kBuild.spec
+++ b/kBuild.spec
@@ -18,6 +18,7 @@ Patch6:         kbuild-dummy_noreturn.diff
 Patch8:         kBuild-0.1.9998-portme.patch
 Patch9:		kBuild-strsignal.patch
 
+BuildRequires: make
 BuildRequires:  gcc
 BuildRequires:  automake
 BuildRequires:  bison

From 258abd6cd57da6c02a220a8c72d380a22531ad40 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Tue, 26 Jan 2021 15:08:21 +0000
Subject: [PATCH 13/43] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 kBuild.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/kBuild.spec b/kBuild.spec
index ced572d..b14604f 100644
--- a/kBuild.spec
+++ b/kBuild.spec
@@ -3,7 +3,7 @@
 
 Name:           kBuild
 Version:        0.1.9998%{?svn_revision:.r%{svn_revision}}
-Release:        6%{?svn_date:.%{svn_date}}%{?dist}
+Release:        7%{?svn_date:.%{svn_date}}%{?dist}
 Summary:        A cross-platform build environment
 
 License:        BSD and GPLv2+
@@ -98,6 +98,9 @@ pod2man -c 'kBuild for Fedora/EPEL GNU/Linux' \
 
 
 %changelog
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998.r3296-7.20190122
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
 * Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998.r3296-6.20190122
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 

From 707a553fcd88469c43520fb5210541c023f97b9d Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 22 Jul 2021 09:23:00 +0000
Subject: [PATCH 14/43] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 kBuild.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/kBuild.spec b/kBuild.spec
index b14604f..4c75d96 100644
--- a/kBuild.spec
+++ b/kBuild.spec
@@ -3,7 +3,7 @@
 
 Name:           kBuild
 Version:        0.1.9998%{?svn_revision:.r%{svn_revision}}
-Release:        7%{?svn_date:.%{svn_date}}%{?dist}
+Release:        8%{?svn_date:.%{svn_date}}%{?dist}
 Summary:        A cross-platform build environment
 
 License:        BSD and GPLv2+
@@ -98,6 +98,9 @@ pod2man -c 'kBuild for Fedora/EPEL GNU/Linux' \
 
 
 %changelog
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998.r3296-8.20190122
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998.r3296-7.20190122
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 

From 49f428f25ffd4dec4db2660b1b067593598c72ec Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 20 Jan 2022 14:05:23 +0000
Subject: [PATCH 15/43] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 kBuild.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/kBuild.spec b/kBuild.spec
index 4c75d96..583266a 100644
--- a/kBuild.spec
+++ b/kBuild.spec
@@ -3,7 +3,7 @@
 
 Name:           kBuild
 Version:        0.1.9998%{?svn_revision:.r%{svn_revision}}
-Release:        8%{?svn_date:.%{svn_date}}%{?dist}
+Release:        9%{?svn_date:.%{svn_date}}%{?dist}
 Summary:        A cross-platform build environment
 
 License:        BSD and GPLv2+
@@ -98,6 +98,9 @@ pod2man -c 'kBuild for Fedora/EPEL GNU/Linux' \
 
 
 %changelog
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998.r3296-9.20190122
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
 * Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998.r3296-8.20190122
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 

From b9cee838c10a3bfc036eebeb5cb472d4bfc43ca6 Mon Sep 17 00:00:00 2001
From: Gwyn Ciesla <gwync@protonmail.com>
Date: Tue, 26 May 2020 15:47:21 -0500
Subject: [PATCH 16/43] "Adding package.cfg file"

---
 package.cfg | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 package.cfg

diff --git a/package.cfg b/package.cfg
new file mode 100644
index 0000000..66ea79d
--- /dev/null
+++ b/package.cfg
@@ -0,0 +1,2 @@
+[koji]
+targets = epel8 epel8-playground
\ No newline at end of file

From 4d39bd5724d937273c13b087f037870e154c3c2f Mon Sep 17 00:00:00 2001
From: Troy Dawson <tdawson@redhat.com>
Date: Thu, 24 Sep 2020 18:06:33 +0000
Subject: [PATCH 17/43] remove package.cfg per new epel-playground policy

---
 package.cfg | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 package.cfg

diff --git a/package.cfg b/package.cfg
deleted file mode 100644
index 66ea79d..0000000
--- a/package.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-[koji]
-targets = epel8 epel8-playground
\ No newline at end of file

From 8159fd144ba0220b289f4e782ccfa6b22c8d1390 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio@serjux.com>
Date: Thu, 19 Aug 2021 10:58:27 +0100
Subject: [PATCH 18/43] Update to kBuild-r3499.20210510

---
 kBuild-strsignal.patch | 15 ---------------
 kBuild.spec            | 15 ++++++++-------
 2 files changed, 8 insertions(+), 22 deletions(-)
 delete mode 100644 kBuild-strsignal.patch

diff --git a/kBuild-strsignal.patch b/kBuild-strsignal.patch
deleted file mode 100644
index e757f77..0000000
--- a/kBuild-strsignal.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/kash/jobs.c b/src/kash/jobs.c
-index 13a758d..2f9a156 100644
---- a/src/kash/jobs.c
-+++ b/src/kash/jobs.c
-@@ -396,8 +396,8 @@ showjob(shinstance *psh, struct output *out, struct job *jp, int mode)
- #endif
- 				st = WTERMSIG(ps->status);
- 			st &= 0x7f;
--			if (st < NSIG && sys_siglist[st])
--				scopyn(sys_siglist[st], s + col, 32);
-+			if (st < NSIG)
-+				scopyn(strsignal(st), s + col, 32);
- 			else
- 				fmtstr(s + col, 16, "Signal %d", st);
- 			if (WCOREDUMP(ps->status)) {
diff --git a/kBuild.spec b/kBuild.spec
index 4c75d96..cc61847 100644
--- a/kBuild.spec
+++ b/kBuild.spec
@@ -1,9 +1,9 @@
-%global svn_revision 3296
-%global svn_date 20190122
+%global svn_revision 3541
+%global svn_date 20211221
 
 Name:           kBuild
 Version:        0.1.9998%{?svn_revision:.r%{svn_revision}}
-Release:        8%{?svn_date:.%{svn_date}}%{?dist}
+Release:        1%{?svn_date:.%{svn_date}}%{?dist}
 Summary:        A cross-platform build environment
 
 License:        BSD and GPLv2+
@@ -16,9 +16,8 @@ Patch0:         kBuild-0.1.3-escape.patch
 Patch1:         kBuild-pthread.patch
 Patch6:         kbuild-dummy_noreturn.diff
 Patch8:         kBuild-0.1.9998-portme.patch
-Patch9:		kBuild-strsignal.patch
 
-BuildRequires: make
+BuildRequires:  make
 BuildRequires:  gcc
 BuildRequires:  automake
 BuildRequires:  bison
@@ -53,7 +52,6 @@ repository.
 %patch8 -p1 -b .portme
 %endif
 %endif
-%patch9 -p1 -b .strsignal
 
 
 %build
@@ -98,9 +96,12 @@ pod2man -c 'kBuild for Fedora/EPEL GNU/Linux' \
 
 
 %changelog
+* Sat Jan 22 2022 Sérgio Basto <sergio@serjux.com> - 0.1.9998.r3541-1.20211221
+- Update to kBuild-r3499.20211221
+- Patch strsignal already applied
+
 * Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998.r3296-8.20190122
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998.r3296-7.20190122
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 

From 7c2c5b1ebe742a3b6a3e950200754039046c162d Mon Sep 17 00:00:00 2001
From: Gwyn Ciesla <gwync@protonmail.com>
Date: Tue, 26 May 2020 15:47:21 -0500
Subject: [PATCH 19/43] "Adding package.cfg file"

---
 package.cfg | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 package.cfg

diff --git a/package.cfg b/package.cfg
new file mode 100644
index 0000000..66ea79d
--- /dev/null
+++ b/package.cfg
@@ -0,0 +1,2 @@
+[koji]
+targets = epel8 epel8-playground
\ No newline at end of file

From 0e93f1d77a159d1a968de2cb15d83c40cc5e2d9b Mon Sep 17 00:00:00 2001
From: Troy Dawson <tdawson@redhat.com>
Date: Thu, 24 Sep 2020 18:06:33 +0000
Subject: [PATCH 20/43] remove package.cfg per new epel-playground policy

---
 package.cfg | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 package.cfg

diff --git a/package.cfg b/package.cfg
deleted file mode 100644
index 66ea79d..0000000
--- a/package.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-[koji]
-targets = epel8 epel8-playground
\ No newline at end of file

From e6429c26a7fb8aa3395b00b255f98998f23042ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio@serjux.com>
Date: Tue, 25 Jan 2022 11:57:07 +0000
Subject: [PATCH 21/43] Revert "Update to kBuild-r3499.20210510" was pushed by
 mistake

This reverts commit 8159fd144ba0220b289f4e782ccfa6b22c8d1390.
---
 kBuild-strsignal.patch | 15 +++++++++++++++
 kBuild.spec            | 15 +++++++--------
 2 files changed, 22 insertions(+), 8 deletions(-)
 create mode 100644 kBuild-strsignal.patch

diff --git a/kBuild-strsignal.patch b/kBuild-strsignal.patch
new file mode 100644
index 0000000..e757f77
--- /dev/null
+++ b/kBuild-strsignal.patch
@@ -0,0 +1,15 @@
+diff --git a/src/kash/jobs.c b/src/kash/jobs.c
+index 13a758d..2f9a156 100644
+--- a/src/kash/jobs.c
++++ b/src/kash/jobs.c
+@@ -396,8 +396,8 @@ showjob(shinstance *psh, struct output *out, struct job *jp, int mode)
+ #endif
+ 				st = WTERMSIG(ps->status);
+ 			st &= 0x7f;
+-			if (st < NSIG && sys_siglist[st])
+-				scopyn(sys_siglist[st], s + col, 32);
++			if (st < NSIG)
++				scopyn(strsignal(st), s + col, 32);
+ 			else
+ 				fmtstr(s + col, 16, "Signal %d", st);
+ 			if (WCOREDUMP(ps->status)) {
diff --git a/kBuild.spec b/kBuild.spec
index cc61847..4c75d96 100644
--- a/kBuild.spec
+++ b/kBuild.spec
@@ -1,9 +1,9 @@
-%global svn_revision 3541
-%global svn_date 20211221
+%global svn_revision 3296
+%global svn_date 20190122
 
 Name:           kBuild
 Version:        0.1.9998%{?svn_revision:.r%{svn_revision}}
-Release:        1%{?svn_date:.%{svn_date}}%{?dist}
+Release:        8%{?svn_date:.%{svn_date}}%{?dist}
 Summary:        A cross-platform build environment
 
 License:        BSD and GPLv2+
@@ -16,8 +16,9 @@ Patch0:         kBuild-0.1.3-escape.patch
 Patch1:         kBuild-pthread.patch
 Patch6:         kbuild-dummy_noreturn.diff
 Patch8:         kBuild-0.1.9998-portme.patch
+Patch9:		kBuild-strsignal.patch
 
-BuildRequires:  make
+BuildRequires: make
 BuildRequires:  gcc
 BuildRequires:  automake
 BuildRequires:  bison
@@ -52,6 +53,7 @@ repository.
 %patch8 -p1 -b .portme
 %endif
 %endif
+%patch9 -p1 -b .strsignal
 
 
 %build
@@ -96,12 +98,9 @@ pod2man -c 'kBuild for Fedora/EPEL GNU/Linux' \
 
 
 %changelog
-* Sat Jan 22 2022 Sérgio Basto <sergio@serjux.com> - 0.1.9998.r3541-1.20211221
-- Update to kBuild-r3499.20211221
-- Patch strsignal already applied
-
 * Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998.r3296-8.20190122
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998.r3296-7.20190122
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 

From bb6107af2dbed0399bb825a7381e6dcf878fcf66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio@serjux.com>
Date: Sat, 9 Apr 2022 00:35:00 +0100
Subject: [PATCH 22/43] Update kBuild to r3564.20220308

---
 .gitignore                              |  1 +
 kBuild-0.1.9998-breakpoint_portme.patch | 11 +++++++++++
 kBuild-strsignal.patch                  | 15 ---------------
 kBuild.spec                             | 13 ++++++++-----
 sources                                 |  2 +-
 5 files changed, 21 insertions(+), 21 deletions(-)
 create mode 100644 kBuild-0.1.9998-breakpoint_portme.patch
 delete mode 100644 kBuild-strsignal.patch

diff --git a/.gitignore b/.gitignore
index ec64730..8725149 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ kBuild-0.1.5-p2-src.tar.gz
 /kBuild-r3129.tar.gz
 /kBuild-r3290.20190106.tar.gz
 /kBuild-r3296.20190122.tar.gz
+/kBuild-r3564.20220308.tar.gz
diff --git a/kBuild-0.1.9998-breakpoint_portme.patch b/kBuild-0.1.9998-breakpoint_portme.patch
new file mode 100644
index 0000000..2f74d4d
--- /dev/null
+++ b/kBuild-0.1.9998-breakpoint_portme.patch
@@ -0,0 +1,11 @@
+--- ./src/lib/kStuff/include/k/kHlpAssert.h.orig	2022-04-09 00:15:35.491852286 +0100
++++ ./src/lib/kStuff/include/k/kHlpAssert.h	2022-04-09 00:17:27.465457543 +0100
+@@ -51,7 +51,7 @@ extern "C" {
+ # define kHlpAssertBreakpoint() do { __debugbreak(); } while (0)
+ #elif defined(__GNUC__) && K_OS == K_OS_SOLARIS && (K_ARCH == K_ARCH_AMD64 || K_ARCH == K_ARCH_X86_32)
+ # define kHlpAssertBreakpoint() do { __asm__ __volatile__ ("int $3"); } while (0)
+-#elif defined(__GNUC__) && (K_ARCH == K_ARCH_AMD64 || K_ARCH == K_ARCH_X86_32 || K_ARCH == K_ARCH_X86_16)
++#elif defined(__GNUC__) && (K_ARCH == K_ARCH_AMD64 || K_ARCH == K_ARCH_X86_32 || K_ARCH == K_ARCH_X86_16 || K_ARCH == K_ARCH_POWERPC_64 || K_ARCH == K_ARCH_S390_64 )
+ # define kHlpAssertBreakpoint() do { __asm__ __volatile__ ("int3"); } while (0)
+ #elif defined(__GNUC__) && (K_ARCH == K_ARCH_ARM_64 || K_ARCH == K_ARCH_ARM_32) /* probably not supported by older ARM CPUs */
+ # define kHlpAssertBreakpoint() do { __asm__ __volatile__ ("brk	#0x1"); } while (0)
diff --git a/kBuild-strsignal.patch b/kBuild-strsignal.patch
deleted file mode 100644
index e757f77..0000000
--- a/kBuild-strsignal.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/kash/jobs.c b/src/kash/jobs.c
-index 13a758d..2f9a156 100644
---- a/src/kash/jobs.c
-+++ b/src/kash/jobs.c
-@@ -396,8 +396,8 @@ showjob(shinstance *psh, struct output *out, struct job *jp, int mode)
- #endif
- 				st = WTERMSIG(ps->status);
- 			st &= 0x7f;
--			if (st < NSIG && sys_siglist[st])
--				scopyn(sys_siglist[st], s + col, 32);
-+			if (st < NSIG)
-+				scopyn(strsignal(st), s + col, 32);
- 			else
- 				fmtstr(s + col, 16, "Signal %d", st);
- 			if (WCOREDUMP(ps->status)) {
diff --git a/kBuild.spec b/kBuild.spec
index 583266a..3f5ce00 100644
--- a/kBuild.spec
+++ b/kBuild.spec
@@ -1,9 +1,9 @@
-%global svn_revision 3296
-%global svn_date 20190122
+%global svn_revision 3564
+%global svn_date 20220308
 
 Name:           kBuild
 Version:        0.1.9998%{?svn_revision:.r%{svn_revision}}
-Release:        9%{?svn_date:.%{svn_date}}%{?dist}
+Release:        1%{?svn_date:.%{svn_date}}%{?dist}
 Summary:        A cross-platform build environment
 
 License:        BSD and GPLv2+
@@ -16,7 +16,7 @@ Patch0:         kBuild-0.1.3-escape.patch
 Patch1:         kBuild-pthread.patch
 Patch6:         kbuild-dummy_noreturn.diff
 Patch8:         kBuild-0.1.9998-portme.patch
-Patch9:		kBuild-strsignal.patch
+Patch9:         kBuild-0.1.9998-breakpoint_portme.patch
 
 BuildRequires: make
 BuildRequires:  gcc
@@ -53,7 +53,7 @@ repository.
 %patch8 -p1 -b .portme
 %endif
 %endif
-%patch9 -p1 -b .strsignal
+%patch9 -p1 -b .portme2
 
 
 %build
@@ -98,6 +98,9 @@ pod2man -c 'kBuild for Fedora/EPEL GNU/Linux' \
 
 
 %changelog
+* Fri Apr 08 2022 Sérgio Basto <sergio@serjux.com> - 0.1.9998.r3564-1.20220308
+- Update kBuild to r3564.20220308
+
 * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998.r3296-9.20190122
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 
diff --git a/sources b/sources
index a86a0d3..ffa505e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (kBuild-r3296.20190122.tar.gz) = 5c61edb916876de8ad356491cfe6ebc452dfb05a0eec14896fb6b53ca3b9a6e057848cc0132b36a23615fd8d859602a74bcdd1b34750eeced2f95d26b67899bd
+SHA512 (kBuild-r3564.20220308.tar.gz) = 22da7f6ac4ecaa7712240b021205158412add998f870786d0b22ccbe85559e5f3a0c2a29ef2cfd7d44cf6bc84f21322c32a8535d8b9dfd7cb4a102892d8060f4

From 434b76661a7e2f02c2861ccb258ecb5affbaf2c9 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 21 Jul 2022 15:31:43 +0000
Subject: [PATCH 23/43] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 kBuild.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/kBuild.spec b/kBuild.spec
index 3f5ce00..09b36ee 100644
--- a/kBuild.spec
+++ b/kBuild.spec
@@ -3,7 +3,7 @@
 
 Name:           kBuild
 Version:        0.1.9998%{?svn_revision:.r%{svn_revision}}
-Release:        1%{?svn_date:.%{svn_date}}%{?dist}
+Release:        2%{?svn_date:.%{svn_date}}%{?dist}
 Summary:        A cross-platform build environment
 
 License:        BSD and GPLv2+
@@ -98,6 +98,9 @@ pod2man -c 'kBuild for Fedora/EPEL GNU/Linux' \
 
 
 %changelog
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998.r3564-2.20220308
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
 * Fri Apr 08 2022 Sérgio Basto <sergio@serjux.com> - 0.1.9998.r3564-1.20220308
 - Update kBuild to r3564.20220308
 

From 6cfc7c36fccab774cd96d32841c52879e10ab41b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio@serjux.com>
Date: Wed, 26 Oct 2022 10:12:35 +0100
Subject: [PATCH 24/43] Update to r3572.20221024

---
 .gitignore                              |  1 +
 kBuild-0.1.9998-breakpoint_portme.patch | 11 -----------
 kBuild.spec                             | 15 +++++++++------
 sources                                 |  2 +-
 4 files changed, 11 insertions(+), 18 deletions(-)
 delete mode 100644 kBuild-0.1.9998-breakpoint_portme.patch

diff --git a/.gitignore b/.gitignore
index 8725149..6fee010 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ kBuild-0.1.5-p2-src.tar.gz
 /kBuild-r3290.20190106.tar.gz
 /kBuild-r3296.20190122.tar.gz
 /kBuild-r3564.20220308.tar.gz
+/kBuild-r3572.20221024.tar.gz
diff --git a/kBuild-0.1.9998-breakpoint_portme.patch b/kBuild-0.1.9998-breakpoint_portme.patch
deleted file mode 100644
index 2f74d4d..0000000
--- a/kBuild-0.1.9998-breakpoint_portme.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/lib/kStuff/include/k/kHlpAssert.h.orig	2022-04-09 00:15:35.491852286 +0100
-+++ ./src/lib/kStuff/include/k/kHlpAssert.h	2022-04-09 00:17:27.465457543 +0100
-@@ -51,7 +51,7 @@ extern "C" {
- # define kHlpAssertBreakpoint() do { __debugbreak(); } while (0)
- #elif defined(__GNUC__) && K_OS == K_OS_SOLARIS && (K_ARCH == K_ARCH_AMD64 || K_ARCH == K_ARCH_X86_32)
- # define kHlpAssertBreakpoint() do { __asm__ __volatile__ ("int $3"); } while (0)
--#elif defined(__GNUC__) && (K_ARCH == K_ARCH_AMD64 || K_ARCH == K_ARCH_X86_32 || K_ARCH == K_ARCH_X86_16)
-+#elif defined(__GNUC__) && (K_ARCH == K_ARCH_AMD64 || K_ARCH == K_ARCH_X86_32 || K_ARCH == K_ARCH_X86_16 || K_ARCH == K_ARCH_POWERPC_64 || K_ARCH == K_ARCH_S390_64 )
- # define kHlpAssertBreakpoint() do { __asm__ __volatile__ ("int3"); } while (0)
- #elif defined(__GNUC__) && (K_ARCH == K_ARCH_ARM_64 || K_ARCH == K_ARCH_ARM_32) /* probably not supported by older ARM CPUs */
- # define kHlpAssertBreakpoint() do { __asm__ __volatile__ ("brk	#0x1"); } while (0)
diff --git a/kBuild.spec b/kBuild.spec
index 09b36ee..f6dce7a 100644
--- a/kBuild.spec
+++ b/kBuild.spec
@@ -1,9 +1,9 @@
-%global svn_revision 3564
-%global svn_date 20220308
+%global svn_revision 3572
+%global svn_date 20221024
 
 Name:           kBuild
 Version:        0.1.9998%{?svn_revision:.r%{svn_revision}}
-Release:        2%{?svn_date:.%{svn_date}}%{?dist}
+Release:        1%{?svn_date:.%{svn_date}}%{?dist}
 Summary:        A cross-platform build environment
 
 License:        BSD and GPLv2+
@@ -16,9 +16,9 @@ Patch0:         kBuild-0.1.3-escape.patch
 Patch1:         kBuild-pthread.patch
 Patch6:         kbuild-dummy_noreturn.diff
 Patch8:         kBuild-0.1.9998-portme.patch
-Patch9:         kBuild-0.1.9998-breakpoint_portme.patch
+Patch10:        assert.patch
 
-BuildRequires: make
+BuildRequires:  make
 BuildRequires:  gcc
 BuildRequires:  automake
 BuildRequires:  bison
@@ -53,7 +53,7 @@ repository.
 %patch8 -p1 -b .portme
 %endif
 %endif
-%patch9 -p1 -b .portme2
+%patch10 -p1 -b .portme3
 
 
 %build
@@ -98,6 +98,9 @@ pod2man -c 'kBuild for Fedora/EPEL GNU/Linux' \
 
 
 %changelog
+* Mon Oct 24 2022 Sérgio Basto <sergio@serjux.com> - 0.1.9998.r3572-2.20221024
+- Update to r3572.20221024
+
 * Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998.r3564-2.20220308
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 
diff --git a/sources b/sources
index ffa505e..5a4c893 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (kBuild-r3564.20220308.tar.gz) = 22da7f6ac4ecaa7712240b021205158412add998f870786d0b22ccbe85559e5f3a0c2a29ef2cfd7d44cf6bc84f21322c32a8535d8b9dfd7cb4a102892d8060f4
+SHA512 (kBuild-r3572.20221024.tar.gz) = 65f1c7f79c8daa5d4f6f7430f05e05081407ef03009fa8d20f794a450bb4b8ab7ad52a449f3700f2a3effde962a04a8fde6ee6c21db26ce9bdf5640c389ebc57

From fc8e871dde73128e1c260637b8e8194c2c5998a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio@serjux.com>
Date: Wed, 26 Oct 2022 10:56:33 +0100
Subject: [PATCH 25/43] add missing patch

---
 assert.patch | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 assert.patch

diff --git a/assert.patch b/assert.patch
new file mode 100644
index 0000000..9376b6d
--- /dev/null
+++ b/assert.patch
@@ -0,0 +1,18 @@
+Description: Use assert ehen kHlpAssertBreakpoint is not available
+Author: Gianfranco Costamagna <locutusofborg@debian.org>
+Last-Update: 2020-11-10
+
+Index: kbuild/src/lib/kStuff/include/k/kHlpAssert.h
+===================================================================
+--- kbuild.orig/src/lib/kStuff/include/k/kHlpAssert.h
++++ kbuild/src/lib/kStuff/include/k/kHlpAssert.h
+@@ -60,7 +60,8 @@
+ #elif defined(__GNUC__) && (K_ARCH == K_ARCH_SPARC_64)
+ # define kHlpAssertBreakpoint() do { __asm__ __volatile__ ("illtrap 0"); } while (0) /*??*/
+ #else
+-# error "Port Me"
++#include <assert.h> 
++# define kHlpAssertBreakpoint(cond) assert(cond)
+ #endif
+ 
+ /** @def K_FUNCTION

From 8c4d0d9aa80672573098bdfac720fcf136f3d274 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio@serjux.com>
Date: Sun, 30 Oct 2022 19:46:40 +0000
Subject: [PATCH 26/43] Allow build with automake 1.13.4 on epel7

---
 kBuild.spec                  |  5 +++++
 relax_automake_version.patch | 11 +++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 relax_automake_version.patch

diff --git a/kBuild.spec b/kBuild.spec
index f6dce7a..db31d20 100644
--- a/kBuild.spec
+++ b/kBuild.spec
@@ -17,6 +17,7 @@ Patch1:         kBuild-pthread.patch
 Patch6:         kbuild-dummy_noreturn.diff
 Patch8:         kBuild-0.1.9998-portme.patch
 Patch10:        assert.patch
+Patch11:        relax_automake_version.patch
 
 BuildRequires:  make
 BuildRequires:  gcc
@@ -54,6 +55,9 @@ repository.
 %endif
 %endif
 %patch10 -p1 -b .portme3
+%if 0%{?rhel} && 0%{?rhel} <= 7
+%patch11 -p1
+%endif
 
 
 %build
@@ -100,6 +104,7 @@ pod2man -c 'kBuild for Fedora/EPEL GNU/Linux' \
 %changelog
 * Mon Oct 24 2022 Sérgio Basto <sergio@serjux.com> - 0.1.9998.r3572-2.20221024
 - Update to r3572.20221024
+- Allow build with automake 1.13.4 on epel7
 
 * Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998.r3564-2.20220308
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
diff --git a/relax_automake_version.patch b/relax_automake_version.patch
new file mode 100644
index 0000000..82b7e46
--- /dev/null
+++ b/relax_automake_version.patch
@@ -0,0 +1,11 @@
+--- kBuild/src/kmk/configure.ac.orig	2022-10-30 19:36:49.966336934 +0000
++++ kBuild/src/kmk/configure.ac	2022-10-30 19:37:07.936270597 +0000
+@@ -30,7 +30,7 @@ AC_CONFIG_HEADERS([config.h])
+ # We cannot enable -Werror because gettext 0.18.1 has invalid content
+ # When we update gettext to 0.18.3 or better we can add it again.
+ # bird: Added subdir-objects
+-AM_INIT_AUTOMAKE([1.15 foreign -Werror -Wall subdir-objects])
++AM_INIT_AUTOMAKE([1.13.4 foreign -Werror -Wall subdir-objects])
+ 
+ # Checks for programs.
+ AC_USE_SYSTEM_EXTENSIONS

From 651c77ba796c294d73e26393a34a439d90c90e62 Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: Sat, 17 Dec 2022 17:44:14 +0100
Subject: [PATCH 27/43] C99 compatibility fixes (#2154544)

Related to:

  <https://fedoraproject.org/wiki/Changes/PortingToModernC>
  <https://fedoraproject.org/wiki/Toolchain/PortingToModernC>
---
 kBuild-c99.patch           | 151 +++++++++++++++++++++++++++++++++++++
 kBuild-configure-c99.patch |  48 ++++++++++++
 kBuild.spec                |  10 ++-
 3 files changed, 207 insertions(+), 2 deletions(-)
 create mode 100644 kBuild-c99.patch
 create mode 100644 kBuild-configure-c99.patch

diff --git a/kBuild-c99.patch b/kBuild-c99.patch
new file mode 100644
index 0000000..73dbb11
--- /dev/null
+++ b/kBuild-c99.patch
@@ -0,0 +1,151 @@
+Do not treat <strings.h> as an umbrella header for <string.h>
+The two are distinct on GNU/Linux.
+    
+Also add missing #include <string.h> in some files.
+
+diff --git a/src/sed/lib/getline.c b/src/sed/lib/getline.c
+index 4cb9d45b..f39c363f 100644
+--- a/src/sed/lib/getline.c
++++ b/src/sed/lib/getline.c
+@@ -9,10 +9,10 @@
+ #include <stdio.h>
+ #undef getline 			/* bird */
+ 
++#include <string.h>
++
+ #ifdef HAVE_STRINGS_H
+ # include <strings.h>
+-#else
+-# include <string.h>
+ #endif /* HAVE_STRINGS_H */
+ 
+ #ifdef HAVE_STDLIB_H
+diff --git a/src/sed/lib/mkstemp.c b/src/sed/lib/mkstemp.c
+index 5b00205c..f36f7ca4 100644
+--- a/src/sed/lib/mkstemp.c
++++ b/src/sed/lib/mkstemp.c
+@@ -2,10 +2,10 @@
+ #include "config.h"
+ #endif
+ 
++#include <string.h>
++
+ #ifdef HAVE_STRINGS_H
+ # include <strings.h>
+-#else
+-# include <string.h>
+ #endif /* HAVE_STRINGS_H */
+ 
+ #ifdef HAVE_STDLIB_H
+diff --git a/src/sed/lib/utils.c b/src/sed/lib/utils.c
+index 41c61aaf..48a8b57f 100644
+--- a/src/sed/lib/utils.c
++++ b/src/sed/lib/utils.c
+@@ -25,10 +25,10 @@
+   extern int errno;
+ #endif
+ 
++#include <string.h>
++
+ #ifdef HAVE_STRINGS_H
+ # include <strings.h>
+-#else
+-# include <string.h>
+ #endif /* HAVE_STRINGS_H */
+ 
+ #ifdef HAVE_STDLIB_H
+diff --git a/src/sed/sed/compile.c b/src/sed/sed/compile.c
+index 0ecc2fe2..064bb350 100644
+--- a/src/sed/sed/compile.c
++++ b/src/sed/sed/compile.c
+@@ -22,14 +22,13 @@
+ #include "strverscmp.h"
+ #include <stdio.h>
+ #include <ctype.h>
++#include <string.h>
+ 
+ #ifdef HAVE_STRINGS_H
+ # include <strings.h>
+ # ifdef HAVE_MEMORY_H
+ #  include <memory.h>
+ # endif
+-#else
+-# include <string.h>
+ #endif /* HAVE_STRINGS_H */
+ 
+ #ifdef HAVE_STDLIB_H
+diff --git a/src/sed/sed/execute.c b/src/sed/sed/execute.c
+index c9038f4f..09080b5b 100644
+--- a/src/sed/sed/execute.c
++++ b/src/sed/sed/execute.c
+@@ -24,6 +24,7 @@
+ 
+ #include <stdio.h>
+ #include <ctype.h>
++#include <string.h>
+ 
+ #include <errno.h>
+ #ifndef errno
+@@ -46,8 +47,6 @@ extern int errno;
+ 
+ #ifdef HAVE_STRINGS_H
+ # include <strings.h>
+-#else
+-# include <string.h>
+ #endif /*HAVE_STRINGS_H*/
+ #ifdef HAVE_MEMORY_H
+ # include <memory.h>
+diff --git a/src/sed/sed/fmt.c b/src/sed/sed/fmt.c
+index 64600a06..4374070e 100644
+--- a/src/sed/sed/fmt.c
++++ b/src/sed/sed/fmt.c
+@@ -22,6 +22,7 @@
+ #include <stdio.h>
+ #include <ctype.h>
+ #include <sys/types.h>
++#include <string.h>
+ 
+ #if HAVE_LIMITS_H
+ # include <limits.h>
+diff --git a/src/sed/sed/mbcs.c b/src/sed/sed/mbcs.c
+index 37565472..79e3f843 100644
+--- a/src/sed/sed/mbcs.c
++++ b/src/sed/sed/mbcs.c
+@@ -17,6 +17,7 @@
+ 
+ #include "sed.h"
+ #include <stdlib.h>
++#include <string.h>
+ 
+ int mb_cur_max;
+ 
+diff --git a/src/sed/sed/regexp.c b/src/sed/sed/regexp.c
+index d4e7437c..a007494d 100644
+--- a/src/sed/sed/regexp.c
++++ b/src/sed/sed/regexp.c
+@@ -19,6 +19,7 @@
+ 
+ #include <ctype.h>
+ #include <stdio.h>
++#include <string.h>
+ #ifdef HAVE_STDLIB_H
+ # include <stdlib.h>
+ #endif
+diff --git a/src/sed/sed/sed.c b/src/sed/sed/sed.c
+index b3bc2ea2..3829e2c6 100644
+--- a/src/sed/sed/sed.c
++++ b/src/sed/sed/sed.c
+@@ -22,12 +22,10 @@
+ 
+ #include "sed.h"
+ 
+-
+ #include <stdio.h>
++#include <string.h>
+ #ifdef HAVE_STRINGS_H
+ # include <strings.h>
+-#else
+-# include <string.h>
+ #endif /*HAVE_STRINGS_H*/
+ #ifdef HAVE_MEMORY_H
+ # include <memory.h>
diff --git a/kBuild-configure-c99.patch b/kBuild-configure-c99.patch
new file mode 100644
index 0000000..6749949
--- /dev/null
+++ b/kBuild-configure-c99.patch
@@ -0,0 +1,48 @@
+Fix some typical C99 compatibility issues in old configure scripts.
+
+diff --git a/src/sed/config/getline.m4 b/src/sed/config/getline.m4
+index ff8b5f4b..52d2e3e7 100644
+--- a/src/sed/config/getline.m4
++++ b/src/sed/config/getline.m4
+@@ -27,7 +27,7 @@ AC_DEFUN([AM_FUNC_GETLINE],
+       if (!in)
+ 	return 1;
+       len = getline (&line, &siz, in);
+-      exit ((len == 4 && line && strcmp (line, "foo\n") == 0) ? 0 : 1);
++      return (len == 4 && line && strcmp (line, "foo\n") == 0) ? 0 : 1;
+     }
+     ], am_cv_func_working_getline=yes dnl The library version works.
+     , am_cv_func_working_getline=no dnl The library version does NOT work.
+diff --git a/src/sed/configure b/src/sed/configure
+index 0b01618f..b1172113 100755
+--- a/src/sed/configure
++++ b/src/sed/configure
+@@ -2593,7 +2593,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   for ac_declaration in \
+-   '' \
++   '#include <stdlib.h>' \
+    'extern "C" void std::exit (int) throw (); using std::exit;' \
+    'extern "C" void std::exit (int); using std::exit;' \
+    'extern "C" void exit (int) throw ();' \
+@@ -3378,8 +3378,8 @@ main ()
+   for (i = 0; i < 256; i++)
+     if (XOR (islower (i), ISLOWER (i))
+ 	|| toupper (i) != TOUPPER (i))
+-      exit(2);
+-  exit (0);
++      return 2;
++  return 0;
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+@@ -5747,7 +5747,7 @@ cat >>conftest.$ac_ext <<_ACEOF
+       if (!in)
+ 	return 1;
+       len = getline (&line, &siz, in);
+-      exit ((len == 4 && line && strcmp (line, "foo\n") == 0) ? 0 : 1);
++      return (len == 4 && line && strcmp (line, "foo\n") == 0) ? 0 : 1;
+     }
+ 
+ _ACEOF
diff --git a/kBuild.spec b/kBuild.spec
index db31d20..5a871ed 100644
--- a/kBuild.spec
+++ b/kBuild.spec
@@ -3,7 +3,7 @@
 
 Name:           kBuild
 Version:        0.1.9998%{?svn_revision:.r%{svn_revision}}
-Release:        1%{?svn_date:.%{svn_date}}%{?dist}
+Release:        2%{?svn_date:.%{svn_date}}%{?dist}
 Summary:        A cross-platform build environment
 
 License:        BSD and GPLv2+
@@ -18,6 +18,8 @@ Patch6:         kbuild-dummy_noreturn.diff
 Patch8:         kBuild-0.1.9998-portme.patch
 Patch10:        assert.patch
 Patch11:        relax_automake_version.patch
+Patch12:        kBuild-configure-c99.patch
+Patch13:        kBuild-c99.patch
 
 BuildRequires:  make
 BuildRequires:  gcc
@@ -58,7 +60,8 @@ repository.
 %if 0%{?rhel} && 0%{?rhel} <= 7
 %patch11 -p1
 %endif
-
+%patch12 -p1
+%patch13 -p1
 
 %build
 echo KBUILD_SVN_URL := http://svn.netlabs.org/repos/kbuild/trunk  >  SvnInfo.kmk
@@ -102,6 +105,9 @@ pod2man -c 'kBuild for Fedora/EPEL GNU/Linux' \
 
 
 %changelog
+* Sat Dec 17 2022 Florian Weimer <fweimer@redhat.com> - 0.1.9998.r3572-2.20221024
+- C99 compatibility fixes (#2154544)
+
 * Mon Oct 24 2022 Sérgio Basto <sergio@serjux.com> - 0.1.9998.r3572-2.20221024
 - Update to r3572.20221024
 - Allow build with automake 1.13.4 on epel7

From 30cd678bd5f876f291d1b916f2fa9f310f75bd20 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 19 Jan 2023 14:01:07 +0000
Subject: [PATCH 28/43] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 kBuild.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/kBuild.spec b/kBuild.spec
index 5a871ed..4bdb40a 100644
--- a/kBuild.spec
+++ b/kBuild.spec
@@ -3,7 +3,7 @@
 
 Name:           kBuild
 Version:        0.1.9998%{?svn_revision:.r%{svn_revision}}
-Release:        2%{?svn_date:.%{svn_date}}%{?dist}
+Release:        3%{?svn_date:.%{svn_date}}%{?dist}
 Summary:        A cross-platform build environment
 
 License:        BSD and GPLv2+
@@ -105,6 +105,9 @@ pod2man -c 'kBuild for Fedora/EPEL GNU/Linux' \
 
 
 %changelog
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998.r3572-3.20221024
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
 * Sat Dec 17 2022 Florian Weimer <fweimer@redhat.com> - 0.1.9998.r3572-2.20221024
 - C99 compatibility fixes (#2154544)
 

From 2dff0c2f5ee368bc5caca3f503dc24222ddebfb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio@serjux.com>
Date: Thu, 9 Mar 2023 01:18:30 +0000
Subject: [PATCH 29/43] new version

revert changeset 3572 and 3566 to build VBox 6 on el7
---
 .gitignore                |   1 +
 changeset_3572.diff       |  47 +++
 changeset_trunk_3566.diff | 761 ++++++++++++++++++++++++++++++++++++++
 kBuild.spec               |  19 +-
 sources                   |   2 +-
 5 files changed, 825 insertions(+), 5 deletions(-)
 create mode 100644 changeset_3572.diff
 create mode 100644 changeset_trunk_3566.diff

diff --git a/.gitignore b/.gitignore
index 6fee010..098da8a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ kBuild-0.1.5-p2-src.tar.gz
 /kBuild-r3296.20190122.tar.gz
 /kBuild-r3564.20220308.tar.gz
 /kBuild-r3572.20221024.tar.gz
+/kBuild-r3589.20230220.tar.gz
diff --git a/changeset_3572.diff b/changeset_3572.diff
new file mode 100644
index 0000000..2abf95f
--- /dev/null
+++ b/changeset_3572.diff
@@ -0,0 +1,47 @@
+Index: trunk/Config.kmk
+===================================================================
+--- trunk/Config.kmk	(revision 3571)
++++ trunk/Config.kmk	(revision 3572)
+@@ -124,4 +124,11 @@
+  TOOL_FLEX_LEX = gflex
+ endif
++# Not all compiler tools currently do the same quoting of DEFS, so here's a
++# temporary workaround.
++ifn1of ($(KBUILD_TARGET), win)
++ TMP_QUOTE_SLASH :=
++else
++ TMP_QUOTE_SLASH := \$(NO_SUCH_VARIABLE)
++endif
+ 
+ #
+@@ -183,6 +190,6 @@
+ 
+ DEFS += \
+-	KBUILD_PATH=\"/$(patsubst %/,%,$(MY_INST_DATA))\" \
+-	KBUILD_BIN_PATH=\"/$(patsubst %/,%,$(MY_INST_BIN))\"
++	KBUILD_PATH=$(TMP_QUOTE_SLASH)"/$(patsubst %/,%,$(MY_INST_DATA))$(TMP_QUOTE_SLASH)" \
++	KBUILD_BIN_PATH=$(TMP_QUOTE_SLASH)"/$(patsubst %/,%,$(MY_INST_BIN))$(TMP_QUOTE_SLASH)"
+ endif
+ 
+Index: trunk/src/kmk/Makefile.kmk
+===================================================================
+--- trunk/src/kmk/Makefile.kmk	(revision 3571)
++++ trunk/src/kmk/Makefile.kmk	(revision 3572)
+@@ -39,5 +39,5 @@
+ 	$(TEMPLATE_BIN_DEFS) \
+ 	KBUILD_SVN_REV=$(KBUILD_SVN_REV) \
+-	KBUILD_TYPE=\"$(KBUILD_TYPE)\"
++	KBUILD_TYPE=$(TMP_QUOTE_SLASH)"$(KBUILD_TYPE)$(TMP_QUOTE_SLASH)"
+ TEMPLATE_BIN-KMK_DEPS = \
+ 	$(kmk_0_OUTDIR)/config.h \
+@@ -235,7 +235,7 @@
+ 	CONFIG_WITH_MEMORY_OPTIMIZATIONS \
+ 	\
+-	KBUILD_HOST=\"$(KBUILD_TARGET)\" \
+-	KBUILD_HOST_ARCH=\"$(KBUILD_TARGET_ARCH)\" \
+-	KBUILD_HOST_CPU=\"$(KBUILD_TARGET_CPU)\"
++	KBUILD_HOST=$(TMP_QUOTE_SLASH)"$(KBUILD_TARGET)$(TMP_QUOTE_SLASH)" \
++	KBUILD_HOST_ARCH=$(TMP_QUOTE_SLASH)"$(KBUILD_TARGET_ARCH)$(TMP_QUOTE_SLASH)" \
++	KBUILD_HOST_CPU=$(TMP_QUOTE_SLASH)"$(KBUILD_TARGET_CPU)$(TMP_QUOTE_SLASH)"
+ # kmk_DEFS += CONFIG_WITH_COMPILER  # experimental, doesn't work 101% right it seems.
+ kmk_DEFS.x86 = CONFIG_WITH_OPTIMIZATION_HACKS
diff --git a/changeset_trunk_3566.diff b/changeset_trunk_3566.diff
new file mode 100644
index 0000000..d225862
--- /dev/null
+++ b/changeset_trunk_3566.diff
@@ -0,0 +1,761 @@
+Index: trunk/kBuild/header.kmk
+===================================================================
+--- trunk/kBuild/header.kmk	(revision 3565)
++++ trunk/kBuild/header.kmk	(revision 3566)
+@@ -1714,5 +1714,5 @@
+ ##
+ # An internal define used by subheader.kmk, subfooter.kmk, and
+-# KB_FN_PASS_0_ON_TARGET.
++# KB_FN_DO_PASS0_ON_TARGET.
+ #
+ # @param target    The target to process.
+Index: trunk/kBuild/tools/GCC.kmk
+===================================================================
+--- trunk/kBuild/tools/GCC.kmk	(revision 3565)
++++ trunk/kBuild/tools/GCC.kmk	(revision 3566)
+@@ -106,5 +106,5 @@
+ define TOOL_GCC_COMPILE_C_CMDS
+ 	$(QUIET)$(TOOL_GCC_CC) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) \
+ 		-o $(obj)\
+@@ -132,5 +132,5 @@
+ define TOOL_GCC_COMPILE_CXX_CMDS
+ 	$(QUIET)$(TOOL_GCC_CXX) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) \
+ 		-o $(obj)\
+@@ -158,5 +158,5 @@
+ define TOOL_GCC_COMPILE_AS_CMDS
+ 	$(QUIET)$(TOOL_GCC_AS) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) \
+ 		-o $(obj)\
+Index: trunk/kBuild/tools/GCC3.kmk
+===================================================================
+--- trunk/kBuild/tools/GCC3.kmk	(revision 3565)
++++ trunk/kBuild/tools/GCC3.kmk	(revision 3566)
+@@ -138,5 +138,5 @@
+ 		--kObjCache-cpp $(outbase).i\
+ 		$(TOOL_GCC3_CC) -E -o -\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		$(abspath $(source))\
+@@ -152,5 +152,5 @@
+ define TOOL_GCC3_COMPILE_C_CMDS
+ 	$(QUIET)$(TOOL_GCC3_CC) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+@@ -182,5 +182,5 @@
+ 		--kObjCache-cpp $(outbase).ii\
+ 		$(TOOL_GCC3_CXX) -E -o -\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		$(abspath $(source))\
+@@ -196,5 +196,5 @@
+ define TOOL_GCC3_COMPILE_CXX_CMDS
+ 	$(QUIET)$(TOOL_GCC3_CXX) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+@@ -223,5 +223,5 @@
+ define TOOL_GCC3_COMPILE_AS_CMDS
+ 	$(QUIET)$(TOOL_GCC3_AS) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+Index: trunk/kBuild/tools/GCC32.kmk
+===================================================================
+--- trunk/kBuild/tools/GCC32.kmk	(revision 3565)
++++ trunk/kBuild/tools/GCC32.kmk	(revision 3566)
+@@ -138,5 +138,5 @@
+ 		--kObjCache-cpp $(outbase).i\
+ 		$(TOOL_GCC32_CC) -E -o -\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		$(abspath $(source))\
+@@ -152,5 +152,5 @@
+ define TOOL_GCC32_COMPILE_C_CMDS
+ 	$(QUIET)$(TOOL_GCC32_CC) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+@@ -182,5 +182,5 @@
+ 		--kObjCache-cpp $(outbase).ii\
+ 		$(TOOL_GCC32_CXX) -E -o -\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		$(abspath $(source))\
+@@ -197,5 +197,5 @@
+ define TOOL_GCC32_COMPILE_CXX_CMDS
+ 	$(QUIET)$(TOOL_GCC32_CXX) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+@@ -224,5 +224,5 @@
+ define TOOL_GCC32_COMPILE_AS_CMDS
+ 	$(QUIET)$(TOOL_GCC32_AS) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+Index: trunk/kBuild/tools/GCC3OMF.kmk
+===================================================================
+--- trunk/kBuild/tools/GCC3OMF.kmk	(revision 3565)
++++ trunk/kBuild/tools/GCC3OMF.kmk	(revision 3566)
+@@ -122,5 +122,5 @@
+ 		--kObjCache-cpp $(outbase).i\
+ 		$(TOOL_GCC3OMF_CC) -E -o -\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		$(abspath $(source))\
+@@ -136,5 +136,5 @@
+ define TOOL_GCC3OMF_COMPILE_C_CMDS
+ 	$(QUIET)$(TOOL_GCC3OMF_CC) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP \
+ 		-o $(obj)\
+@@ -167,5 +167,5 @@
+ 		--kObjCache-cpp $(outbase).ii\
+ 		$(TOOL_GCC3OMF_CXX) -E -o -\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		$(abspath $(source))\
+@@ -181,5 +181,5 @@
+ define TOOL_GCC3OMF_COMPILE_CXX_CMDS
+ 	$(QUIET)$(TOOL_GCC3OMF_CXX) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP \
+ 		-o $(obj)\
+@@ -208,5 +208,5 @@
+ define TOOL_GCC3OMF_COMPILE_AS_CMDS
+ 	$(QUIET)$(TOOL_GCC3OMF_AS) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+Index: trunk/kBuild/tools/GCC3PLAIN.kmk
+===================================================================
+--- trunk/kBuild/tools/GCC3PLAIN.kmk	(revision 3565)
++++ trunk/kBuild/tools/GCC3PLAIN.kmk	(revision 3566)
+@@ -123,5 +123,5 @@
+ 		--kObjCache-cpp $(outbase).i\
+ 		$(TOOL_GCC3PLAIN_CC) -E -o -\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		$(abspath $(source))\
+@@ -137,5 +137,5 @@
+ define TOOL_GCC3PLAIN_COMPILE_C_CMDS
+ 	$(QUIET)$(TOOL_GCC3PLAIN_CC) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+@@ -167,5 +167,5 @@
+ 		--kObjCache-cpp $(outbase).ii\
+ 		$(TOOL_GCC3PLAIN_CXX) -E -o -\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		$(abspath $(source))\
+@@ -181,5 +181,5 @@
+ define TOOL_GCC3PLAIN_COMPILE_CXX_CMDS
+ 	$(QUIET)$(TOOL_GCC3PLAIN_CXX) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+@@ -208,5 +208,5 @@
+ define TOOL_GCC3PLAIN_COMPILE_AS_CMDS
+ 	$(QUIET)$(TOOL_GCC3PLAIN_AS) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+Index: trunk/kBuild/tools/GCC42MACHO.kmk
+===================================================================
+--- trunk/kBuild/tools/GCC42MACHO.kmk	(revision 3565)
++++ trunk/kBuild/tools/GCC42MACHO.kmk	(revision 3566)
+@@ -165,5 +165,5 @@
+ 		--kObjCache-cpp $(outbase).i\
+ 		$(TOOL_GCC42MACHO_CC) -E -o -\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		$(abspath $(source))\
+@@ -179,5 +179,5 @@
+ define TOOL_GCC42MACHO_COMPILE_C_CMDS
+ 	$(QUIET)$(TOOL_GCC42MACHO_CC) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+@@ -209,5 +209,5 @@
+ 		--kObjCache-cpp $(outbase).ii\
+ 		$(TOOL_GCC42MACHO_CXX) -E -o -\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		$(abspath $(source))\
+@@ -223,5 +223,5 @@
+ define TOOL_GCC42MACHO_COMPILE_CXX_CMDS
+ 	$(QUIET)$(TOOL_GCC42MACHO_CXX) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+@@ -253,5 +253,5 @@
+ 		--kObjCache-cpp $(outbase).ii\
+ 		$(TOOL_GCC42MACHO_OBJC) -E -o -\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		$(abspath $(source))\
+@@ -267,5 +267,5 @@
+ define TOOL_GCC42MACHO_COMPILE_OBJC_CMDS
+ 	$(QUIET)$(TOOL_GCC42MACHO_OBJC) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+@@ -297,5 +297,5 @@
+ 		--kObjCache-cpp $(outbase).mii\
+ 		$(TOOL_GCC42MACHO_OBJCXX) -E -o -\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		$(abspath $(source))\
+@@ -311,5 +311,5 @@
+ define TOOL_GCC42MACHO_COMPILE_OBJCXX_CMDS
+ 	$(QUIET)$(TOOL_GCC42MACHO_OBJCXX) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+@@ -338,5 +338,5 @@
+ define TOOL_GCC42MACHO_COMPILE_AS_CMDS
+ 	$(QUIET)$(TOOL_GCC42MACHO_AS) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+Index: trunk/kBuild/tools/GCC4MACHO.kmk
+===================================================================
+--- trunk/kBuild/tools/GCC4MACHO.kmk	(revision 3565)
++++ trunk/kBuild/tools/GCC4MACHO.kmk	(revision 3566)
+@@ -165,5 +165,5 @@
+ 		--kObjCache-cpp $(outbase).i\
+ 		$(TOOL_GCC4MACHO_CC) -E -o -\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		$(abspath $(source))\
+@@ -179,5 +179,5 @@
+ define TOOL_GCC4MACHO_COMPILE_C_CMDS
+ 	$(QUIET)$(TOOL_GCC4MACHO_CC) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+@@ -209,5 +209,5 @@
+ 		--kObjCache-cpp $(outbase).ii\
+ 		$(TOOL_GCC4MACHO_CXX) -E -o -\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		$(abspath $(source))\
+@@ -223,5 +223,5 @@
+ define TOOL_GCC4MACHO_COMPILE_CXX_CMDS
+ 	$(QUIET)$(TOOL_GCC4MACHO_CXX) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+@@ -253,5 +253,5 @@
+ 		--kObjCache-cpp $(outbase).ii\
+ 		$(TOOL_GCC4MACHO_OBJC) -E -o -\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		$(abspath $(source))\
+@@ -267,5 +267,5 @@
+ define TOOL_GCC4MACHO_COMPILE_OBJC_CMDS
+ 	$(QUIET)$(TOOL_GCC4MACHO_OBJC) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+@@ -297,5 +297,5 @@
+ 		--kObjCache-cpp $(outbase).mii\
+ 		$(TOOL_GCC4MACHO_OBJCXX) -E -o -\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		$(abspath $(source))\
+@@ -311,5 +311,5 @@
+ define TOOL_GCC4MACHO_COMPILE_OBJCXX_CMDS
+ 	$(QUIET)$(TOOL_GCC4MACHO_OBJCXX) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+@@ -338,5 +338,5 @@
+ define TOOL_GCC4MACHO_COMPILE_AS_CMDS
+ 	$(QUIET)$(TOOL_GCC4MACHO_AS) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+Index: trunk/kBuild/tools/GCC64.kmk
+===================================================================
+--- trunk/kBuild/tools/GCC64.kmk	(revision 3565)
++++ trunk/kBuild/tools/GCC64.kmk	(revision 3566)
+@@ -137,5 +137,5 @@
+ 		--kObjCache-cpp $(outbase).i\
+ 		$(TOOL_GCC64_CC) -E -o -\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		$(abspath $(source))\
+@@ -151,5 +151,5 @@
+ define TOOL_GCC64_COMPILE_C_CMDS
+ 	$(QUIET)$(TOOL_GCC64_CC) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+@@ -181,5 +181,5 @@
+ 		--kObjCache-cpp $(outbase).ii\
+ 		$(TOOL_GCC64_CXX) -E -o -\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		$(abspath $(source))\
+@@ -195,5 +195,5 @@
+ define TOOL_GCC64_COMPILE_CXX_CMDS
+ 	$(QUIET)$(TOOL_GCC64_CXX) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+@@ -222,5 +222,5 @@
+ define TOOL_GCC64_COMPILE_AS_CMDS
+ 	$(QUIET)$(TOOL_GCC64_AS) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+Index: trunk/kBuild/tools/GXX.kmk
+===================================================================
+--- trunk/kBuild/tools/GXX.kmk	(revision 3565)
++++ trunk/kBuild/tools/GXX.kmk	(revision 3566)
+@@ -121,5 +121,5 @@
+ define TOOL_GXX_COMPILE_C_CMDS
+ 	$(QUIET)$(TOOL_GXX_CC) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) \
+ 		-o $(obj)\
+@@ -147,5 +147,5 @@
+ define TOOL_GXX_COMPILE_CXX_CMDS
+ 	$(QUIET)$(TOOL_GXX_CXX) -c\
+-		$(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj) $(if-expr defined($(target)_PCH_HDR) \
+@@ -173,5 +173,5 @@
+ define TOOL_GXX_COMPILE_PCH_CMDS
+ 	$(QUIET)$(TOOL_GXX_PCH) -c\
+-		$(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+@@ -200,5 +200,5 @@
+ define TOOL_GXX_COMPILE_AS_CMDS
+ 	$(QUIET)$(TOOL_GXX_AS) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) \
+ 		-o $(obj)\
+Index: trunk/kBuild/tools/GXX3.kmk
+===================================================================
+--- trunk/kBuild/tools/GXX3.kmk	(revision 3565)
++++ trunk/kBuild/tools/GXX3.kmk	(revision 3566)
+@@ -148,5 +148,5 @@
+ 		--kObjCache-cpp $(outbase).i\
+ 		$(TOOL_GXX3_CC) -E -o -\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		$(abspath $(source))\
+@@ -158,5 +158,5 @@
+ else
+ 	$(QUIET)$(TOOL_GXX3_CC) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+@@ -189,5 +189,5 @@
+ 		$(TOOL_GXX3_CXX) -E -o - $(if-expr defined($(target)_PCH_HDR)\
+ 		,-fpch-preprocess -Winvalid-pch -I$($(target)_1_GCC_PCH_DIR) -include $(basename $($(target)_1_GCC_PCH_FILE)),)\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		$(abspath $(source))\
+@@ -199,5 +199,5 @@
+ else
+ 	$(QUIET)$(TOOL_GXX3_CXX) -c\
+-		$(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj) $(if-expr defined($(target)_PCH_HDR) \
+@@ -226,5 +226,5 @@
+ define TOOL_GXX3_COMPILE_PCH_CMDS
+ 	$(QUIET)$(TOOL_GXX3_PCH) -c\
+-		$(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+@@ -253,5 +253,5 @@
+ define TOOL_GXX3_COMPILE_AS_CMDS
+ 	$(QUIET)$(TOOL_GXX3_AS) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+Index: trunk/kBuild/tools/GXX32.kmk
+===================================================================
+--- trunk/kBuild/tools/GXX32.kmk	(revision 3565)
++++ trunk/kBuild/tools/GXX32.kmk	(revision 3566)
+@@ -145,5 +145,5 @@
+ 		--kObjCache-cpp $(outbase).i\
+ 		$(TOOL_GXX32_CC) -E -o -\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		$(abspath $(source))\
+@@ -155,5 +155,5 @@
+ else
+ 	$(QUIET)$(TOOL_GXX32_CC) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+@@ -186,5 +186,5 @@
+ 		$(TOOL_GXX32_CXX) -E -o - $(if-expr defined($(target)_PCH_HDR)\
+ 		,-fpch-preprocess -Winvalid-pch -I$($(target)_1_GCC_PCH_DIR) -include $(basename $($(target)_1_GCC_PCH_FILE)),)\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		$(abspath $(source))\
+@@ -196,5 +196,5 @@
+ else
+ 	$(QUIET)$(TOOL_GXX32_CXX) -c\
+-		$(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj) $(if-expr defined($(target)_PCH_HDR) \
+@@ -223,5 +223,5 @@
+ define TOOL_GXX32_COMPILE_PCH_CMDS
+ 	$(QUIET)$(TOOL_GXX32_PCH) -c\
+-		$(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+@@ -250,5 +250,5 @@
+ define TOOL_GXX32_COMPILE_AS_CMDS
+ 	$(QUIET)$(TOOL_GXX32_AS) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+Index: trunk/kBuild/tools/GXX3OMF.kmk
+===================================================================
+--- trunk/kBuild/tools/GXX3OMF.kmk	(revision 3565)
++++ trunk/kBuild/tools/GXX3OMF.kmk	(revision 3566)
+@@ -134,5 +134,5 @@
+ 		--kObjCache-cpp $(outbase).i\
+ 		$(TOOL_GXX3OMF_CC) -E -o -\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		$(abspath $(source))\
+@@ -144,5 +144,5 @@
+ else
+ 	$(QUIET)$(TOOL_GXX3OMF_CC) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+@@ -175,5 +175,5 @@
+ 		$(TOOL_GXX3OMF_CXX) -E -o - $(if-expr defined($(target)_PCH_HDR)\
+ 		,-fpch-preprocess -Winvalid-pch -I$($(target)_1_GCC_PCH_DIR) -include $(basename $($(target)_1_GCC_PCH_FILE)),)\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		$(abspath $(source))\
+@@ -185,5 +185,5 @@
+ else
+ 	$(QUIET)$(TOOL_GXX3OMF_CXX) -c\
+-		$(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj) $(if-expr defined($(target)_PCH_HDR) \
+@@ -212,5 +212,5 @@
+ define TOOL_GXX3OMF_COMPILE_PCH_CMDS
+ 	$(QUIET)$(TOOL_GXX3OMF_PCH) -c\
+-		$(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+@@ -239,5 +239,5 @@
+ define TOOL_GXX3OMF_COMPILE_AS_CMDS
+ 	$(QUIET)$(TOOL_GXX3OMF_AS) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+Index: trunk/kBuild/tools/GXX3PLAIN.kmk
+===================================================================
+--- trunk/kBuild/tools/GXX3PLAIN.kmk	(revision 3565)
++++ trunk/kBuild/tools/GXX3PLAIN.kmk	(revision 3566)
+@@ -131,5 +131,5 @@
+ 		--kObjCache-cpp $(outbase).i\
+ 		$(TOOL_GXX3PLAIN_CC) -E -o -\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		$(abspath $(source))\
+@@ -141,5 +141,5 @@
+ else
+ 	$(QUIET)$(TOOL_GXX3PLAIN_CC) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+@@ -172,5 +172,5 @@
+ 		$(TOOL_GXX3PLAIN_CXX) -E -o - $(if-expr defined($(target)_PCH_HDR)\
+ 		,-fpch-preprocess -Winvalid-pch -I$($(target)_1_GCC_PCH_DIR) -include $(basename $($(target)_1_GCC_PCH_FILE)),)\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		$(abspath $(source))\
+@@ -182,5 +182,5 @@
+ else
+ 	$(QUIET)$(TOOL_GXX3PLAIN_CXX) -c\
+-		$(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj) $(if-expr defined($(target)_PCH_HDR) \
+@@ -209,5 +209,5 @@
+ define TOOL_GXX3PLAIN_COMPILE_PCH_CMDS
+ 	$(QUIET)$(TOOL_GXX3PLAIN_PCH) -c\
+-		$(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+@@ -236,5 +236,5 @@
+ define TOOL_GXX3PLAIN_COMPILE_AS_CMDS
+ 	$(QUIET)$(TOOL_GXX3PLAIN_AS) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+Index: trunk/kBuild/tools/GXX42MACHO.kmk
+===================================================================
+--- trunk/kBuild/tools/GXX42MACHO.kmk	(revision 3565)
++++ trunk/kBuild/tools/GXX42MACHO.kmk	(revision 3566)
+@@ -174,5 +174,5 @@
+ 		--kObjCache-cpp $(outbase).i\
+ 		$(TOOL_GXX42MACHO_CC) -E -o -\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		$(abspath $(source))\
+@@ -184,5 +184,5 @@
+ else
+ 	$(QUIET)$(TOOL_GXX42MACHO_CC) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+@@ -215,5 +215,5 @@
+ 		$(TOOL_GXX42MACHO_CXX) -E -o - $(if-expr defined($(target)_PCH_HDR)\
+ 		,-fpch-preprocess -Winvalid-pch -I$($(target)_1_GCC_PCH_DIR) -include $(basename $($(target)_1_GCC_PCH_FILE)),)\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		$(abspath $(source))\
+@@ -225,5 +225,5 @@
+ else
+ 	$(QUIET)$(TOOL_GXX42MACHO_CXX) -c\
+-		$(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj) $(if-expr defined($(target)_PCH_HDR) \
+@@ -252,5 +252,5 @@
+ define TOOL_GXX42MACHO_COMPILE_PCH_CMDS
+ 	$(QUIET)$(TOOL_GXX42MACHO_PCH) -c\
+-		$(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+@@ -282,5 +282,5 @@
+ 		--kObjCache-cpp $(outbase).ii\
+ 		$(TOOL_GXX42MACHO_OBJC) -E -o -\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		$(abspath $(source))\
+@@ -296,5 +296,5 @@
+ define TOOL_GXX42MACHO_COMPILE_OBJC_CMDS
+ 	$(QUIET)$(TOOL_GXX42MACHO_OBJC) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+@@ -326,5 +326,5 @@
+ 		--kObjCache-cpp $(outbase).mii\
+ 		$(TOOL_GXX42MACHO_OBJCXX) -E -o -\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		$(abspath $(source))\
+@@ -340,5 +340,5 @@
+ define TOOL_GXX42MACHO_COMPILE_OBJCXX_CMDS
+ 	$(QUIET)$(TOOL_GXX42MACHO_OBJCXX) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+@@ -367,5 +367,5 @@
+ define TOOL_GXX42MACHO_COMPILE_AS_CMDS
+ 	$(QUIET)$(TOOL_GXX42MACHO_AS) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+Index: trunk/kBuild/tools/GXX4MACHO.kmk
+===================================================================
+--- trunk/kBuild/tools/GXX4MACHO.kmk	(revision 3565)
++++ trunk/kBuild/tools/GXX4MACHO.kmk	(revision 3566)
+@@ -174,5 +174,5 @@
+ 		--kObjCache-cpp $(outbase).i\
+ 		$(TOOL_GXX4MACHO_CC) -E -o -\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		$(abspath $(source))\
+@@ -184,5 +184,5 @@
+ else
+ 	$(QUIET)$(TOOL_GXX4MACHO_CC) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+@@ -215,5 +215,5 @@
+ 		$(TOOL_GXX4MACHO_CXX) -E -o - $(if-expr defined($(target)_PCH_HDR)\
+ 		,-fpch-preprocess -Winvalid-pch -I$($(target)_1_GCC_PCH_DIR) -include $(basename $($(target)_1_GCC_PCH_FILE)),)\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		$(abspath $(source))\
+@@ -225,5 +225,5 @@
+ else
+ 	$(QUIET)$(TOOL_GXX4MACHO_CXX) -c\
+-		$(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj) $(if-expr defined($(target)_PCH_HDR) \
+@@ -252,5 +252,5 @@
+ define TOOL_GXX4MACHO_COMPILE_PCH_CMDS
+ 	$(QUIET)$(TOOL_GXX4MACHO_PCH) -c\
+-		$(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+@@ -282,5 +282,5 @@
+ 		--kObjCache-cpp $(outbase).mii\
+ 		$(TOOL_GXX4MACHO_OBJCXX) -E -o -\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		$(abspath $(source))\
+@@ -296,5 +296,5 @@
+ define TOOL_GXX4MACHO_COMPILE_OBJCXX_CMDS
+ 	$(QUIET)$(TOOL_GXX4MACHO_OBJCXX) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+@@ -323,5 +323,5 @@
+ define TOOL_GXX4MACHO_COMPILE_AS_CMDS
+ 	$(QUIET)$(TOOL_GXX4MACHO_AS) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+Index: trunk/kBuild/tools/GXX64.kmk
+===================================================================
+--- trunk/kBuild/tools/GXX64.kmk	(revision 3565)
++++ trunk/kBuild/tools/GXX64.kmk	(revision 3566)
+@@ -145,5 +145,5 @@
+ 		--kObjCache-cpp $(outbase).i\
+ 		$(TOOL_GXX64_CC) -E -o -\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		$(abspath $(source))\
+@@ -155,5 +155,5 @@
+ else
+ 	$(QUIET)$(TOOL_GXX64_CC) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+@@ -186,5 +186,5 @@
+ 		$(TOOL_GXX64_CXX) -E -o - $(if-expr defined($(target)_PCH_HDR)\
+ 		,-fpch-preprocess -Winvalid-pch -I$($(target)_1_GCC_PCH_DIR) -include $(basename $($(target)_1_GCC_PCH_FILE)),)\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		$(abspath $(source))\
+@@ -196,5 +196,5 @@
+ else
+ 	$(QUIET)$(TOOL_GXX64_CXX) -c\
+-		$(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj) $(if-expr defined($(target)_PCH_HDR) \
+@@ -223,5 +223,5 @@
+ define TOOL_GXX64_COMPILE_PCH_CMDS
+ 	$(QUIET)$(TOOL_GXX64_PCH) -c\
+-		$(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+@@ -250,5 +250,5 @@
+ define TOOL_GXX64_COMPILE_AS_CMDS
+ 	$(QUIET)$(TOOL_GXX64_AS) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
diff --git a/kBuild.spec b/kBuild.spec
index 4bdb40a..4ab65f1 100644
--- a/kBuild.spec
+++ b/kBuild.spec
@@ -1,9 +1,9 @@
-%global svn_revision 3572
-%global svn_date 20221024
+%global svn_revision 3589
+%global svn_date 20230220
 
 Name:           kBuild
 Version:        0.1.9998%{?svn_revision:.r%{svn_revision}}
-Release:        3%{?svn_date:.%{svn_date}}%{?dist}
+Release:        1%{?svn_date:.%{svn_date}}%{?dist}
 Summary:        A cross-platform build environment
 
 License:        BSD and GPLv2+
@@ -20,6 +20,8 @@ Patch10:        assert.patch
 Patch11:        relax_automake_version.patch
 Patch12:        kBuild-configure-c99.patch
 Patch13:        kBuild-c99.patch
+Patch14:        changeset_3572.diff
+Patch15:        changeset_trunk_3566.diff
 
 BuildRequires:  make
 BuildRequires:  gcc
@@ -62,6 +64,11 @@ repository.
 %endif
 %patch12 -p1
 %patch13 -p1
+%if 0%{?rhel} && 0%{?rhel} <= 7
+# we need revert this 2 commits to build VBox 6 on el7
+%patch14 -p1 -R -b .revert
+%patch15 -p1 -R -b .revert2
+%endif
 
 %build
 echo KBUILD_SVN_URL := http://svn.netlabs.org/repos/kbuild/trunk  >  SvnInfo.kmk
@@ -105,13 +112,17 @@ pod2man -c 'kBuild for Fedora/EPEL GNU/Linux' \
 
 
 %changelog
+* Thu Mar 09 2023 Sérgio Basto <sergio@serjux.com> - 0.1.9998.r3589-1.20230220
+- new version
+- revert changeset 3572 and 3566 to build VBox 6 on el7
+
 * Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998.r3572-3.20221024
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 
 * Sat Dec 17 2022 Florian Weimer <fweimer@redhat.com> - 0.1.9998.r3572-2.20221024
 - C99 compatibility fixes (#2154544)
 
-* Mon Oct 24 2022 Sérgio Basto <sergio@serjux.com> - 0.1.9998.r3572-2.20221024
+* Mon Oct 24 2022 Sérgio Basto <sergio@serjux.com> - 0.1.9998.r3572-1.20221024
 - Update to r3572.20221024
 - Allow build with automake 1.13.4 on epel7
 
diff --git a/sources b/sources
index 5a4c893..2c766e2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (kBuild-r3572.20221024.tar.gz) = 65f1c7f79c8daa5d4f6f7430f05e05081407ef03009fa8d20f794a450bb4b8ab7ad52a449f3700f2a3effde962a04a8fde6ee6c21db26ce9bdf5640c389ebc57
+SHA512 (kBuild-r3589.20230220.tar.gz) = f9703785c0322b0a27074b68dc2e4155d44f10db9af89f50d6d3e3d1ef5431e28b8c8260da9521b147a9dc43dab0c6fe3fa1078f4e8ea4697bcaa20d2aca811d

From 8ed62d21f89dafa536fc7c241c8220cdb007727a Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 20 Jul 2023 08:19:30 +0000
Subject: [PATCH 30/43] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 kBuild.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/kBuild.spec b/kBuild.spec
index 4ab65f1..73e5772 100644
--- a/kBuild.spec
+++ b/kBuild.spec
@@ -3,7 +3,7 @@
 
 Name:           kBuild
 Version:        0.1.9998%{?svn_revision:.r%{svn_revision}}
-Release:        1%{?svn_date:.%{svn_date}}%{?dist}
+Release:        2%{?svn_date:.%{svn_date}}%{?dist}
 Summary:        A cross-platform build environment
 
 License:        BSD and GPLv2+
@@ -112,6 +112,9 @@ pod2man -c 'kBuild for Fedora/EPEL GNU/Linux' \
 
 
 %changelog
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998.r3589-2.20230220
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
 * Thu Mar 09 2023 Sérgio Basto <sergio@serjux.com> - 0.1.9998.r3589-1.20230220
 - new version
 - revert changeset 3572 and 3566 to build VBox 6 on el7

From 8f7fd123fb8352ffa555a6b3d2d8777c0c031a74 Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: Wed, 20 Dec 2023 13:46:46 +0100
Subject: [PATCH 31/43] Fix another C compatibility issue (#2154544)

---
 kBuild-c99-2.patch | 16 ++++++++++++++++
 kBuild.spec        |  7 ++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 kBuild-c99-2.patch

diff --git a/kBuild-c99-2.patch b/kBuild-c99-2.patch
new file mode 100644
index 0000000..62fa544
--- /dev/null
+++ b/kBuild-c99-2.patch
@@ -0,0 +1,16 @@
+The eval_buffer function expects the end of the string as the
+(optional) last argument, not its length.
+
+Index: src/kmk/loadapi.c
+===================================================================
+--- src/kmk/loadapi.c	(revision 3600)
++++ src/kmk/loadapi.c	(working copy)
+@@ -59,7 +59,7 @@
+   install_variable_buffer (&pbuf, &plen);
+ 
+   s = xstrdup (buffer);
+-  eval_buffer (s, flp IF_WITH_VALUE_LENGTH_PARAM (strlen (s) /** @todo suboptimal */));
++  eval_buffer (s, flp IF_WITH_VALUE_LENGTH_PARAM (s + strlen (s) /** @todo suboptimal */));
+   free (s);
+ 
+   restore_variable_buffer (pbuf, plen);
diff --git a/kBuild.spec b/kBuild.spec
index 73e5772..4e46a68 100644
--- a/kBuild.spec
+++ b/kBuild.spec
@@ -3,7 +3,7 @@
 
 Name:           kBuild
 Version:        0.1.9998%{?svn_revision:.r%{svn_revision}}
-Release:        2%{?svn_date:.%{svn_date}}%{?dist}
+Release:        3%{?svn_date:.%{svn_date}}%{?dist}
 Summary:        A cross-platform build environment
 
 License:        BSD and GPLv2+
@@ -22,6 +22,7 @@ Patch12:        kBuild-configure-c99.patch
 Patch13:        kBuild-c99.patch
 Patch14:        changeset_3572.diff
 Patch15:        changeset_trunk_3566.diff
+Patch16:        kBuild-c99-2.patch
 
 BuildRequires:  make
 BuildRequires:  gcc
@@ -69,6 +70,7 @@ repository.
 %patch14 -p1 -R -b .revert
 %patch15 -p1 -R -b .revert2
 %endif
+%patch16 -p0
 
 %build
 echo KBUILD_SVN_URL := http://svn.netlabs.org/repos/kbuild/trunk  >  SvnInfo.kmk
@@ -112,6 +114,9 @@ pod2man -c 'kBuild for Fedora/EPEL GNU/Linux' \
 
 
 %changelog
+* Wed Dec 20 2023 Florian Weimer <fweimer@redhat.com> - 0.1.9998.r3589-3.20230220
+- Fix another C compatibility issue (#2154544)
+
 * Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998.r3589-2.20230220
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 

From 4f8555aa2265f5348b49d75889fece99fcdb72b6 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 20 Jan 2024 23:54:25 +0000
Subject: [PATCH 32/43] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 kBuild.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/kBuild.spec b/kBuild.spec
index 4e46a68..820add7 100644
--- a/kBuild.spec
+++ b/kBuild.spec
@@ -3,7 +3,7 @@
 
 Name:           kBuild
 Version:        0.1.9998%{?svn_revision:.r%{svn_revision}}
-Release:        3%{?svn_date:.%{svn_date}}%{?dist}
+Release:        4%{?svn_date:.%{svn_date}}%{?dist}
 Summary:        A cross-platform build environment
 
 License:        BSD and GPLv2+
@@ -114,6 +114,9 @@ pod2man -c 'kBuild for Fedora/EPEL GNU/Linux' \
 
 
 %changelog
+* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998.r3589-4.20230220
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Wed Dec 20 2023 Florian Weimer <fweimer@redhat.com> - 0.1.9998.r3589-3.20230220
 - Fix another C compatibility issue (#2154544)
 

From d0dc1d34aaea8afcbaf08f2068312c597a7f8534 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 24 Jan 2024 23:34:37 +0000
Subject: [PATCH 33/43] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 kBuild.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/kBuild.spec b/kBuild.spec
index 820add7..d505f42 100644
--- a/kBuild.spec
+++ b/kBuild.spec
@@ -3,7 +3,7 @@
 
 Name:           kBuild
 Version:        0.1.9998%{?svn_revision:.r%{svn_revision}}
-Release:        4%{?svn_date:.%{svn_date}}%{?dist}
+Release:        5%{?svn_date:.%{svn_date}}%{?dist}
 Summary:        A cross-platform build environment
 
 License:        BSD and GPLv2+
@@ -114,6 +114,9 @@ pod2man -c 'kBuild for Fedora/EPEL GNU/Linux' \
 
 
 %changelog
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998.r3589-5.20230220
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998.r3589-4.20230220
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 

From a20f882eb375a80e6aa82920567ebaacdd4ee791 Mon Sep 17 00:00:00 2001
From: Software Management Team <packaging-team-maint@redhat.com>
Date: Thu, 30 May 2024 12:46:47 +0200
Subject: [PATCH 34/43] Eliminate use of obsolete %patchN syntax (#2283636)

---
 kBuild.spec | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/kBuild.spec b/kBuild.spec
index d505f42..fce74e8 100644
--- a/kBuild.spec
+++ b/kBuild.spec
@@ -47,30 +47,30 @@ repository.
 %prep
 #%setup -q -n %{name}-%{version}%{?patchlevel:-%{patchlevel}}
 %setup -q -n %{name}
-%patch0 -p1 -b .escape
-%patch1 -p1 -b .pthreads
-%patch6 -p1 -b .dummy_noreturn
+%patch -P0 -p1 -b .escape
+%patch -P1 -p1 -b .pthreads
+%patch -P6 -p1 -b .dummy_noreturn
 %ifarch ppc64
 %if 0%{?rhel} && 0%{?rhel} < 7
 # Found the reason why compile fails in detection of powerpc64 in centos 6
 # kBuild/src/lib/kStuff/include/k/kDefs.h:356:4: error: #error "Port Me or define K_ENDIAN."
 # hack for gcc < 4.6 and ppc64 only
 # https://stackoverflow.com/a/40675229/778517
-%patch8 -p1 -b .portme
+%patch -P8 -p1 -b .portme
 %endif
 %endif
-%patch10 -p1 -b .portme3
+%patch -P10 -p1 -b .portme3
 %if 0%{?rhel} && 0%{?rhel} <= 7
-%patch11 -p1
+%patch -P11 -p1
 %endif
-%patch12 -p1
-%patch13 -p1
+%patch -P12 -p1
+%patch -P13 -p1
 %if 0%{?rhel} && 0%{?rhel} <= 7
 # we need revert this 2 commits to build VBox 6 on el7
-%patch14 -p1 -R -b .revert
-%patch15 -p1 -R -b .revert2
+%patch -P14 -p1 -R -b .revert
+%patch -P15 -p1 -R -b .revert2
 %endif
-%patch16 -p0
+%patch -P16 -p0
 
 %build
 echo KBUILD_SVN_URL := http://svn.netlabs.org/repos/kbuild/trunk  >  SvnInfo.kmk

From b350990a6850b605d2bba9f58c4dfe37e0ce4ea2 Mon Sep 17 00:00:00 2001
From: Michal Domonkos <mdomonko@redhat.com>
Date: Fri, 31 May 2024 14:25:44 +0200
Subject: [PATCH 35/43] Fix improperly commented out macros in %prep

Since RPM 4.20, %prep is no longer implemented as a special "hack" [1]
but is now a regular build scriptlet, meaning that %setup or %patch are
now treated as regular macros and thus will be expanded even in comments
(as documented in [2]).

Our spec has these so fix them up to unbreak the build on F41.

[1] https://github.com/rpm-software-management/rpm/issues/2205
[2] https://rpm-software-management.github.io/rpm/manual/spec.html
---
 kBuild.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kBuild.spec b/kBuild.spec
index fce74e8..d61c715 100644
--- a/kBuild.spec
+++ b/kBuild.spec
@@ -45,7 +45,7 @@ repository.
 
 
 %prep
-#%setup -q -n %{name}-%{version}%{?patchlevel:-%{patchlevel}}
+%dnl %setup -q -n %{name}-%{version}%{?patchlevel:-%{patchlevel}}
 %setup -q -n %{name}
 %patch -P0 -p1 -b .escape
 %patch -P1 -p1 -b .pthreads

From 93099b6453afd9e8e0d13b416186c4cce2ce496e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio@serjux.com>
Date: Wed, 5 Jun 2024 00:42:59 +0100
Subject: [PATCH 36/43] Update to Revision 3605

---
 .gitignore                   |  1 +
 kBuild-0.1.9998-portme.patch |  6 ++++++
 kBuild.spec                  |  9 ++++++---
 kbuild-dummy_noreturn.diff   | 25 -------------------------
 relax_automake_version.patch |  1 +
 sources                      |  2 +-
 6 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/.gitignore b/.gitignore
index 098da8a..63db71b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ kBuild-0.1.5-p2-src.tar.gz
 /kBuild-r3564.20220308.tar.gz
 /kBuild-r3572.20221024.tar.gz
 /kBuild-r3589.20230220.tar.gz
+/kBuild-r3605.20240424.tar.gz
diff --git a/kBuild-0.1.9998-portme.patch b/kBuild-0.1.9998-portme.patch
index 53b6462..9e490e3 100644
--- a/kBuild-0.1.9998-portme.patch
+++ b/kBuild-0.1.9998-portme.patch
@@ -1,3 +1,9 @@
+# Only used on el6
+# Found the reason why compile fails in detection of powerpc64 in centos 6
+# kBuild/src/lib/kStuff/include/k/kDefs.h:356:4: error: #error "Port Me or define K_ENDIAN."
+# hack for gcc < 4.6 and ppc64 only
+# https://stackoverflow.com/a/40675229/778517
+
 --- kBuild/src/lib/kStuff/include/k/kDefs.h.orig	2018-05-12 03:35:13.703342877 +0100
 +++ kBuild/src/lib/kStuff/include/k/kDefs.h	2018-05-12 04:24:52.034917011 +0100
 @@ -336,16 +336,19 @@
diff --git a/kBuild.spec b/kBuild.spec
index d61c715..f73503d 100644
--- a/kBuild.spec
+++ b/kBuild.spec
@@ -1,9 +1,9 @@
-%global svn_revision 3589
-%global svn_date 20230220
+%global svn_revision 3605
+%global svn_date 20240424
 
 Name:           kBuild
 Version:        0.1.9998%{?svn_revision:.r%{svn_revision}}
-Release:        5%{?svn_date:.%{svn_date}}%{?dist}
+Release:        1%{?svn_date:.%{svn_date}}%{?dist}
 Summary:        A cross-platform build environment
 
 License:        BSD and GPLv2+
@@ -114,6 +114,9 @@ pod2man -c 'kBuild for Fedora/EPEL GNU/Linux' \
 
 
 %changelog
+* Tue Jun 04 2024 Sérgio Basto <sergio@serjux.com> - 0.1.9998.r3605-1.20240424
+- Update to Revision 3605
+
 * Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998.r3589-5.20230220
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 
diff --git a/kbuild-dummy_noreturn.diff b/kbuild-dummy_noreturn.diff
index 929dc08..bf03e86 100644
--- a/kbuild-dummy_noreturn.diff
+++ b/kbuild-dummy_noreturn.diff
@@ -11,28 +11,3 @@ Index: src/kmk/kmkbuiltin/expr.c
  	}
  	/* NOTREACHED */
  }
-Index: src/kmk/kmkbuiltin/kbuild_protection.c
-===================================================================
---- ./src/kmk/kmkbuiltin/kbuild_protection.c.orig
-+++ ./src/kmk/kmkbuiltin/kbuild_protection.c
-@@ -29,6 +29,7 @@
- #include "config.h"
- #include <sys/types.h>
- #include <stdlib.h>
-+#include <unistd.h>
- #include <string.h>
- #include <ctype.h>
- #include <assert.h>
-# Fix one implicit-function-declaration
-Index: src/sed/lib/utils.c
-===================================================================
---- ./src/sed/lib/utils.c	(revision 3127)
-+++ ./src/sed/lib/utils.c	(working copy)
-@@ -19,6 +19,7 @@
- #include "config.h"
- 
- #include <stdio.h>
-+#include <unistd.h>
- 
- #include <errno.h>
- #ifndef errno
diff --git a/relax_automake_version.patch b/relax_automake_version.patch
index 82b7e46..8e6fc2f 100644
--- a/relax_automake_version.patch
+++ b/relax_automake_version.patch
@@ -1,3 +1,4 @@
+# Only for epel <= 7
 --- kBuild/src/kmk/configure.ac.orig	2022-10-30 19:36:49.966336934 +0000
 +++ kBuild/src/kmk/configure.ac	2022-10-30 19:37:07.936270597 +0000
 @@ -30,7 +30,7 @@ AC_CONFIG_HEADERS([config.h])
diff --git a/sources b/sources
index 2c766e2..84a6290 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (kBuild-r3589.20230220.tar.gz) = f9703785c0322b0a27074b68dc2e4155d44f10db9af89f50d6d3e3d1ef5431e28b8c8260da9521b147a9dc43dab0c6fe3fa1078f4e8ea4697bcaa20d2aca811d
+SHA512 (kBuild-r3605.20240424.tar.gz) = 54cee210840ae05819f8b80f4786d6196d55fb2d8237173c57c95905e224ed312daa3d32903bb858d08e6a8fabdd20bea7a1330104efeedbf5e31397f879c9c5

From 4ca0182e62018c81581d2819b6bdecc421610561 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 18 Jul 2024 11:16:24 +0000
Subject: [PATCH 37/43] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild

---
 kBuild.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/kBuild.spec b/kBuild.spec
index f73503d..452fcb8 100644
--- a/kBuild.spec
+++ b/kBuild.spec
@@ -3,7 +3,7 @@
 
 Name:           kBuild
 Version:        0.1.9998%{?svn_revision:.r%{svn_revision}}
-Release:        1%{?svn_date:.%{svn_date}}%{?dist}
+Release:        2%{?svn_date:.%{svn_date}}%{?dist}
 Summary:        A cross-platform build environment
 
 License:        BSD and GPLv2+
@@ -114,6 +114,9 @@ pod2man -c 'kBuild for Fedora/EPEL GNU/Linux' \
 
 
 %changelog
+* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998.r3605-2.20240424
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
 * Tue Jun 04 2024 Sérgio Basto <sergio@serjux.com> - 0.1.9998.r3605-1.20240424
 - Update to Revision 3605
 

From 4707d205537f0eebcc56a2d1e48796687af3bc8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miroslav=20Such=C3=BD?= <msuchy@redhat.com>
Date: Mon, 2 Sep 2024 09:11:13 +0200
Subject: [PATCH 38/43] convert license to SPDX

This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4
---
 kBuild.spec | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/kBuild.spec b/kBuild.spec
index 452fcb8..50058c7 100644
--- a/kBuild.spec
+++ b/kBuild.spec
@@ -3,10 +3,11 @@
 
 Name:           kBuild
 Version:        0.1.9998%{?svn_revision:.r%{svn_revision}}
-Release:        2%{?svn_date:.%{svn_date}}%{?dist}
+Release:        3%{?svn_date:.%{svn_date}}%{?dist}
 Summary:        A cross-platform build environment
 
-License:        BSD and GPLv2+
+# Automatically converted from old format: BSD and GPLv2+ - review is highly recommended.
+License:        LicenseRef-Callaway-BSD AND GPL-2.0-or-later
 # most tools are from NetBSD, some are from FreeBSD,
 # and make and sed are from GNU
 URL:            http://svn.netlabs.org/kbuild
@@ -114,6 +115,9 @@ pod2man -c 'kBuild for Fedora/EPEL GNU/Linux' \
 
 
 %changelog
+* Mon Sep 02 2024 Miroslav Suchý <msuchy@redhat.com> - 0.1.9998.r3605-3.20240424
+- convert license to SPDX
+
 * Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998.r3605-2.20240424
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
 

From 5bfbab5a3d0c65a534096c9d5fbfe2ab7de4fc13 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 17 Jan 2025 08:10:55 +0000
Subject: [PATCH 39/43] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild

---
 kBuild.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/kBuild.spec b/kBuild.spec
index 50058c7..37fec5d 100644
--- a/kBuild.spec
+++ b/kBuild.spec
@@ -3,7 +3,7 @@
 
 Name:           kBuild
 Version:        0.1.9998%{?svn_revision:.r%{svn_revision}}
-Release:        3%{?svn_date:.%{svn_date}}%{?dist}
+Release:        4%{?svn_date:.%{svn_date}}%{?dist}
 Summary:        A cross-platform build environment
 
 # Automatically converted from old format: BSD and GPLv2+ - review is highly recommended.
@@ -115,6 +115,9 @@ pod2man -c 'kBuild for Fedora/EPEL GNU/Linux' \
 
 
 %changelog
+* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998.r3605-4.20240424
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
 * Mon Sep 02 2024 Miroslav Suchý <msuchy@redhat.com> - 0.1.9998.r3605-3.20240424
 - convert license to SPDX
 

From de96d41a620a4decb4c0f3b9a95c580bfa14594a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio@serjux.com>
Date: Fri, 25 Apr 2025 22:05:42 +0100
Subject: [PATCH 40/43] Update to Revision 3674

---
 kBuild-c99-2.patch         |  16 ----
 kBuild-c99.patch           | 151 -------------------------------------
 kBuild-configure-c99.patch |  48 ------------
 kBuild.spec                |  15 ++--
 4 files changed, 6 insertions(+), 224 deletions(-)
 delete mode 100644 kBuild-c99-2.patch
 delete mode 100644 kBuild-c99.patch
 delete mode 100644 kBuild-configure-c99.patch

diff --git a/kBuild-c99-2.patch b/kBuild-c99-2.patch
deleted file mode 100644
index 62fa544..0000000
--- a/kBuild-c99-2.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-The eval_buffer function expects the end of the string as the
-(optional) last argument, not its length.
-
-Index: src/kmk/loadapi.c
-===================================================================
---- src/kmk/loadapi.c	(revision 3600)
-+++ src/kmk/loadapi.c	(working copy)
-@@ -59,7 +59,7 @@
-   install_variable_buffer (&pbuf, &plen);
- 
-   s = xstrdup (buffer);
--  eval_buffer (s, flp IF_WITH_VALUE_LENGTH_PARAM (strlen (s) /** @todo suboptimal */));
-+  eval_buffer (s, flp IF_WITH_VALUE_LENGTH_PARAM (s + strlen (s) /** @todo suboptimal */));
-   free (s);
- 
-   restore_variable_buffer (pbuf, plen);
diff --git a/kBuild-c99.patch b/kBuild-c99.patch
deleted file mode 100644
index 73dbb11..0000000
--- a/kBuild-c99.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-Do not treat <strings.h> as an umbrella header for <string.h>
-The two are distinct on GNU/Linux.
-    
-Also add missing #include <string.h> in some files.
-
-diff --git a/src/sed/lib/getline.c b/src/sed/lib/getline.c
-index 4cb9d45b..f39c363f 100644
---- a/src/sed/lib/getline.c
-+++ b/src/sed/lib/getline.c
-@@ -9,10 +9,10 @@
- #include <stdio.h>
- #undef getline 			/* bird */
- 
-+#include <string.h>
-+
- #ifdef HAVE_STRINGS_H
- # include <strings.h>
--#else
--# include <string.h>
- #endif /* HAVE_STRINGS_H */
- 
- #ifdef HAVE_STDLIB_H
-diff --git a/src/sed/lib/mkstemp.c b/src/sed/lib/mkstemp.c
-index 5b00205c..f36f7ca4 100644
---- a/src/sed/lib/mkstemp.c
-+++ b/src/sed/lib/mkstemp.c
-@@ -2,10 +2,10 @@
- #include "config.h"
- #endif
- 
-+#include <string.h>
-+
- #ifdef HAVE_STRINGS_H
- # include <strings.h>
--#else
--# include <string.h>
- #endif /* HAVE_STRINGS_H */
- 
- #ifdef HAVE_STDLIB_H
-diff --git a/src/sed/lib/utils.c b/src/sed/lib/utils.c
-index 41c61aaf..48a8b57f 100644
---- a/src/sed/lib/utils.c
-+++ b/src/sed/lib/utils.c
-@@ -25,10 +25,10 @@
-   extern int errno;
- #endif
- 
-+#include <string.h>
-+
- #ifdef HAVE_STRINGS_H
- # include <strings.h>
--#else
--# include <string.h>
- #endif /* HAVE_STRINGS_H */
- 
- #ifdef HAVE_STDLIB_H
-diff --git a/src/sed/sed/compile.c b/src/sed/sed/compile.c
-index 0ecc2fe2..064bb350 100644
---- a/src/sed/sed/compile.c
-+++ b/src/sed/sed/compile.c
-@@ -22,14 +22,13 @@
- #include "strverscmp.h"
- #include <stdio.h>
- #include <ctype.h>
-+#include <string.h>
- 
- #ifdef HAVE_STRINGS_H
- # include <strings.h>
- # ifdef HAVE_MEMORY_H
- #  include <memory.h>
- # endif
--#else
--# include <string.h>
- #endif /* HAVE_STRINGS_H */
- 
- #ifdef HAVE_STDLIB_H
-diff --git a/src/sed/sed/execute.c b/src/sed/sed/execute.c
-index c9038f4f..09080b5b 100644
---- a/src/sed/sed/execute.c
-+++ b/src/sed/sed/execute.c
-@@ -24,6 +24,7 @@
- 
- #include <stdio.h>
- #include <ctype.h>
-+#include <string.h>
- 
- #include <errno.h>
- #ifndef errno
-@@ -46,8 +47,6 @@ extern int errno;
- 
- #ifdef HAVE_STRINGS_H
- # include <strings.h>
--#else
--# include <string.h>
- #endif /*HAVE_STRINGS_H*/
- #ifdef HAVE_MEMORY_H
- # include <memory.h>
-diff --git a/src/sed/sed/fmt.c b/src/sed/sed/fmt.c
-index 64600a06..4374070e 100644
---- a/src/sed/sed/fmt.c
-+++ b/src/sed/sed/fmt.c
-@@ -22,6 +22,7 @@
- #include <stdio.h>
- #include <ctype.h>
- #include <sys/types.h>
-+#include <string.h>
- 
- #if HAVE_LIMITS_H
- # include <limits.h>
-diff --git a/src/sed/sed/mbcs.c b/src/sed/sed/mbcs.c
-index 37565472..79e3f843 100644
---- a/src/sed/sed/mbcs.c
-+++ b/src/sed/sed/mbcs.c
-@@ -17,6 +17,7 @@
- 
- #include "sed.h"
- #include <stdlib.h>
-+#include <string.h>
- 
- int mb_cur_max;
- 
-diff --git a/src/sed/sed/regexp.c b/src/sed/sed/regexp.c
-index d4e7437c..a007494d 100644
---- a/src/sed/sed/regexp.c
-+++ b/src/sed/sed/regexp.c
-@@ -19,6 +19,7 @@
- 
- #include <ctype.h>
- #include <stdio.h>
-+#include <string.h>
- #ifdef HAVE_STDLIB_H
- # include <stdlib.h>
- #endif
-diff --git a/src/sed/sed/sed.c b/src/sed/sed/sed.c
-index b3bc2ea2..3829e2c6 100644
---- a/src/sed/sed/sed.c
-+++ b/src/sed/sed/sed.c
-@@ -22,12 +22,10 @@
- 
- #include "sed.h"
- 
--
- #include <stdio.h>
-+#include <string.h>
- #ifdef HAVE_STRINGS_H
- # include <strings.h>
--#else
--# include <string.h>
- #endif /*HAVE_STRINGS_H*/
- #ifdef HAVE_MEMORY_H
- # include <memory.h>
diff --git a/kBuild-configure-c99.patch b/kBuild-configure-c99.patch
deleted file mode 100644
index 6749949..0000000
--- a/kBuild-configure-c99.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Fix some typical C99 compatibility issues in old configure scripts.
-
-diff --git a/src/sed/config/getline.m4 b/src/sed/config/getline.m4
-index ff8b5f4b..52d2e3e7 100644
---- a/src/sed/config/getline.m4
-+++ b/src/sed/config/getline.m4
-@@ -27,7 +27,7 @@ AC_DEFUN([AM_FUNC_GETLINE],
-       if (!in)
- 	return 1;
-       len = getline (&line, &siz, in);
--      exit ((len == 4 && line && strcmp (line, "foo\n") == 0) ? 0 : 1);
-+      return (len == 4 && line && strcmp (line, "foo\n") == 0) ? 0 : 1;
-     }
-     ], am_cv_func_working_getline=yes dnl The library version works.
-     , am_cv_func_working_getline=no dnl The library version does NOT work.
-diff --git a/src/sed/configure b/src/sed/configure
-index 0b01618f..b1172113 100755
---- a/src/sed/configure
-+++ b/src/sed/configure
-@@ -2593,7 +2593,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   for ac_declaration in \
--   '' \
-+   '#include <stdlib.h>' \
-    'extern "C" void std::exit (int) throw (); using std::exit;' \
-    'extern "C" void std::exit (int); using std::exit;' \
-    'extern "C" void exit (int) throw ();' \
-@@ -3378,8 +3378,8 @@ main ()
-   for (i = 0; i < 256; i++)
-     if (XOR (islower (i), ISLOWER (i))
- 	|| toupper (i) != TOUPPER (i))
--      exit(2);
--  exit (0);
-+      return 2;
-+  return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
-@@ -5747,7 +5747,7 @@ cat >>conftest.$ac_ext <<_ACEOF
-       if (!in)
- 	return 1;
-       len = getline (&line, &siz, in);
--      exit ((len == 4 && line && strcmp (line, "foo\n") == 0) ? 0 : 1);
-+      return (len == 4 && line && strcmp (line, "foo\n") == 0) ? 0 : 1;
-     }
- 
- _ACEOF
diff --git a/kBuild.spec b/kBuild.spec
index 37fec5d..72b2053 100644
--- a/kBuild.spec
+++ b/kBuild.spec
@@ -1,9 +1,9 @@
-%global svn_revision 3605
-%global svn_date 20240424
+%global svn_revision 3674
+%global svn_date 20250422
 
 Name:           kBuild
 Version:        0.1.9998%{?svn_revision:.r%{svn_revision}}
-Release:        4%{?svn_date:.%{svn_date}}%{?dist}
+Release:        1%{?svn_date:.%{svn_date}}%{?dist}
 Summary:        A cross-platform build environment
 
 # Automatically converted from old format: BSD and GPLv2+ - review is highly recommended.
@@ -19,11 +19,8 @@ Patch6:         kbuild-dummy_noreturn.diff
 Patch8:         kBuild-0.1.9998-portme.patch
 Patch10:        assert.patch
 Patch11:        relax_automake_version.patch
-Patch12:        kBuild-configure-c99.patch
-Patch13:        kBuild-c99.patch
 Patch14:        changeset_3572.diff
 Patch15:        changeset_trunk_3566.diff
-Patch16:        kBuild-c99-2.patch
 
 BuildRequires:  make
 BuildRequires:  gcc
@@ -64,14 +61,11 @@ repository.
 %if 0%{?rhel} && 0%{?rhel} <= 7
 %patch -P11 -p1
 %endif
-%patch -P12 -p1
-%patch -P13 -p1
 %if 0%{?rhel} && 0%{?rhel} <= 7
 # we need revert this 2 commits to build VBox 6 on el7
 %patch -P14 -p1 -R -b .revert
 %patch -P15 -p1 -R -b .revert2
 %endif
-%patch -P16 -p0
 
 %build
 echo KBUILD_SVN_URL := http://svn.netlabs.org/repos/kbuild/trunk  >  SvnInfo.kmk
@@ -115,6 +109,9 @@ pod2man -c 'kBuild for Fedora/EPEL GNU/Linux' \
 
 
 %changelog
+* Fri Apr 25 2025 Sérgio Basto <sergio@serjux.com> - 0.1.9998.r3674-1.20250422
+- Update to Revision 3674
+
 * Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998.r3605-4.20240424
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
 

From 827d0b102b60d08dfef32f0520152cfc82dc7ee8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio@serjux.com>
Date: Fri, 25 Apr 2025 23:34:19 +0100
Subject: [PATCH 41/43] (rhbz#2340684) Fix FTBFS

---
 kBuild-c23.patch | 14 ++++++++++++++
 kBuild.spec      |  3 +++
 2 files changed, 17 insertions(+)
 create mode 100644 kBuild-c23.patch

diff --git a/kBuild-c23.patch b/kBuild-c23.patch
new file mode 100644
index 0000000..fde7a93
--- /dev/null
+++ b/kBuild-c23.patch
@@ -0,0 +1,14 @@
+diff -Nurp kBuild.orig/src/kmk/glob/fnmatch.c kBuild/src/kmk/glob/fnmatch.c
+--- kBuild.orig/src/kmk/glob/fnmatch.c	2025-04-25 21:54:33.000000000 +0100
++++ kBuild/src/kmk/glob/fnmatch.c	2025-04-25 23:20:55.477680324 +0100
+@@ -120,10 +120,6 @@ USA.  */
+ /* Avoid depending on library functions or files
+    whose names are inconsistent.  */
+ 
+-# if !defined _LIBC && !defined getenv && !defined _MSC_VER
+-extern char *getenv ();
+-# endif
+-
+ # ifndef errno
+ extern int errno;
+ # endif
diff --git a/kBuild.spec b/kBuild.spec
index 72b2053..79b4621 100644
--- a/kBuild.spec
+++ b/kBuild.spec
@@ -21,6 +21,7 @@ Patch10:        assert.patch
 Patch11:        relax_automake_version.patch
 Patch14:        changeset_3572.diff
 Patch15:        changeset_trunk_3566.diff
+Patch16:        kBuild-c23.patch
 
 BuildRequires:  make
 BuildRequires:  gcc
@@ -66,6 +67,7 @@ repository.
 %patch -P14 -p1 -R -b .revert
 %patch -P15 -p1 -R -b .revert2
 %endif
+%patch -P16 -p1
 
 %build
 echo KBUILD_SVN_URL := http://svn.netlabs.org/repos/kbuild/trunk  >  SvnInfo.kmk
@@ -111,6 +113,7 @@ pod2man -c 'kBuild for Fedora/EPEL GNU/Linux' \
 %changelog
 * Fri Apr 25 2025 Sérgio Basto <sergio@serjux.com> - 0.1.9998.r3674-1.20250422
 - Update to Revision 3674
+- (rhbz#2340684) Fix FTBFS
 
 * Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998.r3605-4.20240424
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild

From b7e1b28dbd19c5cede855fffbef430a575c3df61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio@serjux.com>
Date: Fri, 25 Apr 2025 23:48:35 +0100
Subject: [PATCH 42/43] Upload the new sources

---
 .gitignore | 1 +
 sources    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 63db71b..b15196c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ kBuild-0.1.5-p2-src.tar.gz
 /kBuild-r3572.20221024.tar.gz
 /kBuild-r3589.20230220.tar.gz
 /kBuild-r3605.20240424.tar.gz
+/kBuild-r3674.20250422.tar.gz
diff --git a/sources b/sources
index 84a6290..7b1bdf3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (kBuild-r3605.20240424.tar.gz) = 54cee210840ae05819f8b80f4786d6196d55fb2d8237173c57c95905e224ed312daa3d32903bb858d08e6a8fabdd20bea7a1330104efeedbf5e31397f879c9c5
+SHA512 (kBuild-r3674.20250422.tar.gz) = dfb52548f896281ac7473a2ebed93e939ae65e6b22101f16a27d36367a90304a3b0aa67f5470d50af1a37333865f570cc447ac7537250fc0fe57746d6c6ba219

From b6d275a31ad828df179ec4e6ebe7fa5bdcb3779d Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 24 Jul 2025 18:10:08 +0000
Subject: [PATCH 43/43] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild

---
 kBuild.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/kBuild.spec b/kBuild.spec
index 79b4621..b8c234f 100644
--- a/kBuild.spec
+++ b/kBuild.spec
@@ -3,7 +3,7 @@
 
 Name:           kBuild
 Version:        0.1.9998%{?svn_revision:.r%{svn_revision}}
-Release:        1%{?svn_date:.%{svn_date}}%{?dist}
+Release:        2%{?svn_date:.%{svn_date}}%{?dist}
 Summary:        A cross-platform build environment
 
 # Automatically converted from old format: BSD and GPLv2+ - review is highly recommended.
@@ -111,6 +111,9 @@ pod2man -c 'kBuild for Fedora/EPEL GNU/Linux' \
 
 
 %changelog
+* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998.r3674-2.20250422
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
 * Fri Apr 25 2025 Sérgio Basto <sergio@serjux.com> - 0.1.9998.r3674-1.20250422
 - Update to Revision 3674
 - (rhbz#2340684) Fix FTBFS