From 4707d205537f0eebcc56a2d1e48796687af3bc8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Mon, 2 Sep 2024 09:11:13 +0200 Subject: [PATCH 1/6] 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ý - 0.1.9998.r3605-3.20240424 +- convert license to SPDX + * Thu Jul 18 2024 Fedora Release Engineering - 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 Date: Fri, 17 Jan 2025 08:10:55 +0000 Subject: [PATCH 2/6] 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 - 0.1.9998.r3605-4.20240424 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Mon Sep 02 2024 Miroslav Suchý - 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?= Date: Fri, 25 Apr 2025 22:05:42 +0100 Subject: [PATCH 3/6] 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 as an umbrella header for -The two are distinct on GNU/Linux. - -Also add missing #include 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 - #undef getline /* bird */ - -+#include -+ - #ifdef HAVE_STRINGS_H - # include --#else --# include - #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 -+ - #ifdef HAVE_STRINGS_H - # include --#else --# include - #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 -+ - #ifdef HAVE_STRINGS_H - # include --#else --# include - #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 - #include -+#include - - #ifdef HAVE_STRINGS_H - # include - # ifdef HAVE_MEMORY_H - # include - # endif --#else --# include - #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 - #include -+#include - - #include - #ifndef errno -@@ -46,8 +47,6 @@ extern int errno; - - #ifdef HAVE_STRINGS_H - # include --#else --# include - #endif /*HAVE_STRINGS_H*/ - #ifdef HAVE_MEMORY_H - # include -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 - #include - #include -+#include - - #if HAVE_LIMITS_H - # include -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 -+#include - - 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 - #include -+#include - #ifdef HAVE_STDLIB_H - # include - #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 -+#include - #ifdef HAVE_STRINGS_H - # include --#else --# include - #endif /*HAVE_STRINGS_H*/ - #ifdef HAVE_MEMORY_H - # include 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 ' \ - '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 - 0.1.9998.r3674-1.20250422 +- Update to Revision 3674 + * Fri Jan 17 2025 Fedora Release Engineering - 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?= Date: Fri, 25 Apr 2025 23:34:19 +0100 Subject: [PATCH 4/6] (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 - 0.1.9998.r3674-1.20250422 - Update to Revision 3674 +- (rhbz#2340684) Fix FTBFS * Fri Jan 17 2025 Fedora Release Engineering - 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?= Date: Fri, 25 Apr 2025 23:48:35 +0100 Subject: [PATCH 5/6] 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 Date: Thu, 24 Jul 2025 18:10:08 +0000 Subject: [PATCH 6/6] 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 - 0.1.9998.r3674-2.20250422 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Apr 25 2025 Sérgio Basto - 0.1.9998.r3674-1.20250422 - Update to Revision 3674 - (rhbz#2340684) Fix FTBFS