diff --git a/gawk-5.1.1-Disable-racy-test-in-test-iolint.awk.patch b/gawk-5.1.1-Disable-racy-test-in-test-iolint.awk.patch deleted file mode 100644 index f9d1373..0000000 --- a/gawk-5.1.1-Disable-racy-test-in-test-iolint.awk.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 0ed67a4f4f043acc08e3982a2648e3082e1f245a Mon Sep 17 00:00:00 2001 -From: "Arnold D. Robbins" -Date: Sun, 14 Nov 2021 09:33:44 +0200 -Subject: [PATCH] Disable racy test in test/iolint.awk. - ---- - test/iolint.awk | 13 ++++++++----- - test/iolint.ok | 6 +----- - 3 files changed, 14 insertions(+), 10 deletions(-) - -diff --git a/test/iolint.awk b/test/iolint.awk -index 257678ed..58fd746f 100644 ---- a/test/iolint.awk -+++ b/test/iolint.awk -@@ -55,12 +55,15 @@ BEGIN { - print close("cat") - fflush() - -+ # 11/2021: Disable this test since it's a race condition -+ # and fails intermittently on some systems. -+ # - # `%.*s' used for input pipe and output pipe -- "echo hello" | getline junk -- print "hello" | "echo hello" -- print close("echo hello") -- print close("echo hello") -- fflush() -+ # "echo hello" | getline junk -+ # print "hello" | "echo hello" -+ # print close("echo hello") -+ # print close("echo hello") -+ # fflush() - - # `%.*s' used for output file and output pipe" - BINMODE = 2 -diff --git a/test/iolint.ok b/test/iolint.ok -index fbf514c2..620a70f3 100644 ---- a/test/iolint.ok -+++ b/test/iolint.ok -@@ -23,11 +23,7 @@ gawk: iolint.awk:53: warning: `cat' used for output file and output pipe - 0 - hello - 0 --gawk: iolint.awk:60: warning: `echo hello' used for input pipe and output pipe --hello --0 --0 --gawk: iolint.awk:68: warning: `cksum' used for output file and output pipe -+gawk: iolint.awk:71: warning: `cksum' used for output file and output pipe - 3015617425 6 - 0 - 0 --- -2.33.1 - diff --git a/gawk-5.1.1.tar.xz b/gawk-5.1.1.tar.xz deleted file mode 100644 index 37e77d4..0000000 --- a/gawk-5.1.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d87629386e894bbea11a5e00515fc909dc9b7249529dad9e6a3a2c77085f7ea2 -size 3250860 diff --git a/gawk-5.1.1.tar.xz.sig b/gawk-5.1.1.tar.xz.sig deleted file mode 100644 index c174cae..0000000 --- a/gawk-5.1.1.tar.xz.sig +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCgAdFiEE0ZZ8Y3iHExd9hh7X31l4FZN+wNIFAmF65ToACgkQ31l4FZN+ -wNJwRggAtKZ0m67mGQqs3osUO+utsWyA0tt+9nJvWtawLqSpok1LojBzac8kdgyl -1gRLRpiI/PNCyZ0ZC+DTNTloMwIwNAJxYxrm/KWaTYFFS6cdn/aZ2DI/S55fo2Ur -0WWOmEbazWn0tjaOuXFvf1jrh8kEAxO0QrNQO266DWcYPoIc98NIIuaHQnkjS8zk -G80LwNJlgL0JVA4J8QgR5u9nYIz+VSLMW5Tr93LWqecCeEIq7z17wbjkZelTXO5h -gCLMyMsLOvVSSA/ZUjVq81WDVNU2hGFcwBcuGjkk8q0sYFLzfXvHB7gxjWmfbKfF -60cIKodwu+3abDOnXEXJ+pQLhhtpXQ== -=66o6 ------END PGP SIGNATURE----- diff --git a/gawk-5.2.0.tar.xz b/gawk-5.2.0.tar.xz new file mode 100644 index 0000000..231fe1d --- /dev/null +++ b/gawk-5.2.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e4ddbad1c2ef10e8e815ca80208d0162d4c983e6cca16f925e8418632d639018 +size 3385496 diff --git a/gawk-5.2.0.tar.xz.sig b/gawk-5.2.0.tar.xz.sig new file mode 100644 index 0000000..ce83f9e --- /dev/null +++ b/gawk-5.2.0.tar.xz.sig @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCgAdFiEE0ZZ8Y3iHExd9hh7X31l4FZN+wNIFAmMU5PsACgkQ31l4FZN+ +wNLLZgf/RDts4gLdvVPD2ZJVHDm25ePV1VLZuexuCkR6e3/m8L2kjpDfX0Vz1URS +p7H9ZIPmRRsz//l8eO+gXqxJiZiDEh73KdZo+ksJbDtCAwS8j+vE3YaF+PjxMJiA +OMJwaCHm6/yA7xNJ7YA11ybSpSnqb5lIvoXrnfqax0WNwrH5T+XcubQxa7xJC/1E +MYpM7fYo9NjCEAM+jSOifkh8TcPhblZQl3hpS0iGmqbCJWVF/8d/um6QWt0WnpKl +8ZmyK95X8vYO5jzL+7UX//MP2TI53jpK2hf3BAKBU1TgsqN28p4qwMtKKHI5Ro7J +xWENFQV96WWnoIKJlNHaciIRyzJKvQ== +=vgeQ +-----END PGP SIGNATURE----- diff --git a/gawk.changes b/gawk.changes index 2658b4e..045d9b8 100644 --- a/gawk.changes +++ b/gawk.changes @@ -1,3 +1,33 @@ +------------------------------------------------------------------- +Tue Sep 13 17:43:05 UTC 2022 - Andreas Schwab + +- upref.patch: Add missing UPREF + +------------------------------------------------------------------- +Mon Sep 5 08:49:14 UTC 2022 - Andreas Schwab + +- Update to gawk 5.2.0 + * Numeric scalars now compare in the same way as C for the relational + operators. Comparison order for sorting has not changed + * If the AWK_HASH environment variable is set to "fnv1a" gawk will + use the FNV1-A hash function for associative arrays + * There is now a new function, mkbool(), that creates Boolean-typed + values + * As BWK awk has supported interval expressions since 2019, they are + now enabled even if --traditional is supplied + * The rwarray extension has two new functions, writeall() and readall() + * The new `gawkbug' script should be used for reporting bugs + * The manual page (doc/gawk.1) has been considerably reduced in size + * Gawk now supports Terence Kelly's "persistent malloc" (pma), + allowing gawk to preserve its variables, arrays and user-defined + functions between runs + * Some subtle issues with untyped array elements being passed to + functions have been fixed + * Syntax errors are now immediately fatal +- gawk-5.1.1-Disable-racy-test-in-test-iolint.awk.patch: removed +- pma.patch: Handle hole bigger than half the address space +- nan-tests.patch: fix non-portable NaN tests + ------------------------------------------------------------------- Sun Nov 14 17:10:48 UTC 2021 - Andreas Stieger diff --git a/gawk.spec b/gawk.spec index d1e978d..0a85baf 100644 --- a/gawk.spec +++ b/gawk.spec @@ -1,7 +1,7 @@ # # spec file for package gawk # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: gawk -Version: 5.1.1 +Version: 5.2.0 Release: 0 Summary: Domain-specific language for text processing License: GPL-3.0-or-later @@ -27,7 +27,9 @@ Source: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz Source2: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz.sig Source3: http://savannah.gnu.org/people/viewgpg.php?user_id=80653#/gawk.keyring Source4: gawk.rpmlintrc -Patch0: gawk-5.1.1-Disable-racy-test-in-test-iolint.awk.patch +Patch0: pma.patch +Patch1: nan-tests.patch +Patch2: upref.patch Provides: awk BuildRequires: mpfr-devel BuildRequires: readline-devel @@ -47,7 +49,12 @@ almost completely POSIX 1003.2 compliant. %make_build %check -%make_build check +# Disable pma tests when running in linux-user emulation (bsc#1203140) +%make_build check \ +%if 0%{?qemu_user_space_build} + NEED_PMA= \ +%endif + %nil %install %make_install @@ -78,12 +85,15 @@ ln -sfv %{_mandir}/man1/gawk.1%{?ext_man} %{buildroot}%{_mandir}/man1/awk.1%{?ex %license COPYING* %doc AUTHORS NEWS POSIX.STD README ChangeLog* %{_bindir}/gawk +%{_bindir}/gawkbug %{_libexecdir}/awk %{_libdir}/gawk %{_datadir}/awk %{_includedir}/gawkapi.h %{_infodir}/*.info%{?ext_info} %{_mandir}/man1/gawk.1%{?ext_man} +%{_mandir}/man1/gawkbug.1%{?ext_man} +%{_mandir}/man1/pm-gawk.1%{?ext_man} %{_mandir}/man3/*%{?ext_man} %changelog diff --git a/nan-tests.patch b/nan-tests.patch new file mode 100644 index 0000000..8b93555 --- /dev/null +++ b/nan-tests.patch @@ -0,0 +1,20 @@ +Index: gawk-5.2.0/test/inf-nan-torture.in +=================================================================== +--- gawk-5.2.0.orig/test/inf-nan-torture.in ++++ gawk-5.2.0/test/inf-nan-torture.in +@@ -1 +1 @@ +--inf -inform inform -nan -nancy nancy -123 0 123 +123 nancy +nancy +nan inform +inform +inf ++-inf -inform inform +nan -nancy nancy -123 0 123 +123 nancy +nancy +nan inform +inform +inf +Index: gawk-5.2.0/test/inf-nan-torture.ok +=================================================================== +--- gawk-5.2.0.orig/test/inf-nan-torture.ok ++++ gawk-5.2.0/test/inf-nan-torture.ok +@@ -1,7 +1,7 @@ + 1 -inf -inf + 2 -inform 0 + 3 inform 0 +-4 -nan -nan ++4 +nan +nan + 5 -nancy 0 + 6 nancy 0 + 7 -123 -123 diff --git a/pma.patch b/pma.patch new file mode 100644 index 0000000..cb9cb76 --- /dev/null +++ b/pma.patch @@ -0,0 +1,12 @@ +Index: gawk-5.2.0/support/pma.c +=================================================================== +--- gawk-5.2.0.orig/support/pma.c ++++ gawk-5.2.0/support/pma.c +@@ -346,6 +346,7 @@ static void * addrgap(off_t n) { // fin + for (U = 1; ; U *= 2) // double upper bound until failure + if (MAP_FAILED == (A = MMAP(U))) break; + else MUNMAP(A, U); ++ if (U == 0) U = -1; + while (1 + L < U) { // binary search between bounds + size_t M = L + (U - L) / 2; // avoid overflow + if (MAP_FAILED == (A = MMAP(M))) { U = M; } diff --git a/upref.patch b/upref.patch new file mode 100644 index 0000000..baed65f --- /dev/null +++ b/upref.patch @@ -0,0 +1,12 @@ +Index: gawk-5.2.0/interpret.h +=================================================================== +--- gawk-5.2.0.orig/interpret.h ++++ gawk-5.2.0/interpret.h +@@ -238,6 +238,7 @@ uninitialized_scalar: + _("reference to uninitialized argument `%s'") : + _("reference to uninitialized variable `%s'"), + save_symbol->vname); ++ UPREF(m); + PUSH(m); + break; +