12 changed files with 108 additions and 87 deletions
--- a/SOURCES/_gdb.spec.patch.include
+++ b/SOURCES/_gdb.spec.patch.include
@ -1,55 +1,55 @@
-%patch -p1 -P001
-%patch -p1 -P002
-%patch -p1 -P003
-%patch -p1 -P004
-%patch -p1 -P005
-%patch -p1 -P006
-%patch -p1 -P007
-%patch -p1 -P008
-%patch -p1 -P009
-%patch -p1 -P010
-%patch -p1 -P011
-%patch -p1 -P012
-%patch -p1 -P013
-%patch -p1 -P014
-%patch -p1 -P015
-%patch -p1 -P016
-%patch -p1 -P017
-%patch -p1 -P018
-%patch -p1 -P019
-%patch -p1 -P020
-%patch -p1 -P021
-%patch -p1 -P022
-%patch -p1 -P023
-%patch -p1 -P024
-%patch -p1 -P025
-%patch -p1 -P026
-%patch -p1 -P027
-%patch -p1 -P028
-%patch -p1 -P029
-%patch -p1 -P030
-%patch -p1 -P031
-%patch -p1 -P032
-%patch -p1 -P033
-%patch -p1 -P034
-%patch -p1 -P035
-%patch -p1 -P036
-%patch -p1 -P037
-%patch -p1 -P038
-%patch -p1 -P039
-%patch -p1 -P040
-%patch -p1 -P041
-%patch -p1 -P042
-%patch -p1 -P043
-%patch -p1 -P044
-%patch -p1 -P045
-%patch -p1 -P046
-%patch -p1 -P047
-%patch -p1 -P048
-%patch -p1 -P049
-%patch -p1 -P050
-%patch -p1 -P051
-%patch -p1 -P052
-%patch -p1 -P053
-%patch -p1 -P054
-%patch -p1 -P055
+%patch001 -p1
+%patch002 -p1
+%patch003 -p1
+%patch004 -p1
+%patch005 -p1
+%patch006 -p1
+%patch007 -p1
+%patch008 -p1
+%patch009 -p1
+%patch010 -p1
+%patch011 -p1
+%patch012 -p1
+%patch013 -p1
+%patch014 -p1
+%patch015 -p1
+%patch016 -p1
+%patch017 -p1
+%patch018 -p1
+%patch019 -p1
+%patch020 -p1
+%patch021 -p1
+%patch022 -p1
+%patch023 -p1
+%patch024 -p1
+%patch025 -p1
+%patch026 -p1
+%patch027 -p1
+%patch028 -p1
+%patch029 -p1
+%patch030 -p1
+%patch031 -p1
+%patch032 -p1
+%patch033 -p1
+%patch034 -p1
+%patch035 -p1
+%patch036 -p1
+%patch037 -p1
+%patch038 -p1
+%patch039 -p1
+%patch040 -p1
+%patch041 -p1
+%patch042 -p1
+%patch043 -p1
+%patch044 -p1
+%patch045 -p1
+%patch046 -p1
+%patch047 -p1
+%patch048 -p1
+%patch049 -p1
+%patch050 -p1
+%patch051 -p1
+%patch052 -p1
+%patch053 -p1
+%patch054 -p1
+%patch055 -p1
--- a/SOURCES/gdb-6.3-attach-see-vdso-test.patch
+++ b/SOURCES/gdb-6.3-attach-see-vdso-test.patch
@ -40,7 +40,7 @@ diff --git a/gdb/testsuite/gdb.base/attach-see-vdso.exp b/gdb/testsuite/gdb.base
 new file mode 100644
 --- /dev/null
 +++ b/gdb/testsuite/gdb.base/attach-see-vdso.exp
-@@ -0,0 +1,74 @@
+@@ -0,0 +1,77 @@
 +# Copyright 2007
 +
 +# This program is free software; you can redistribute it and/or modify
@ -64,7 +64,10 @@ new file mode 100644
 +    return 0
 +}
 +
-+require !use_gdb_stub
+if {[use_gdb_stub]} {
+    untested "skipping test because of use_gdb_stub"
+    return -1
+}
 +
 +set testfile "attach-see-vdso"
 +set srcfile  ${testfile}.c
--- a/SOURCES/gdb-6.5-bz218379-ppc-solib-trampoline-test.patch
+++ b/SOURCES/gdb-6.5-bz218379-ppc-solib-trampoline-test.patch
@ -45,7 +45,7 @@ diff --git a/gdb/testsuite/gdb.base/step-over-trampoline.exp b/gdb/testsuite/gdb
 new file mode 100644
 --- /dev/null
 +++ b/gdb/testsuite/gdb.base/step-over-trampoline.exp
-@@ -0,0 +1,56 @@
+@@ -0,0 +1,59 @@
 +# Copyright 2006 Free Software Foundation, Inc.
 +
 +# This program is free software; you can redistribute it and/or modify
@ -62,7 +62,10 @@ new file mode 100644
 +# along with this program; if not, write to the Free Software
 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 +
-+require !use_gdb_stub
+if {[use_gdb_stub]} {
+    untested "skipping test because of use_gdb_stub"
+    return -1
+}
 +
 +if $tracelevel then {
 +    strace $tracelevel
--- a/SOURCES/gdb-6.5-bz243845-stale-testing-zombie-test.patch
+++ b/SOURCES/gdb-6.5-bz243845-stale-testing-zombie-test.patch
@ -10,7 +10,7 @@ diff --git a/gdb/testsuite/gdb.base/tracefork-zombie.exp b/gdb/testsuite/gdb.bas
 new file mode 100644
 --- /dev/null
 +++ b/gdb/testsuite/gdb.base/tracefork-zombie.exp
-@@ -0,0 +1,73 @@
+@@ -0,0 +1,76 @@
 +# Copyright 2007 Free Software Foundation, Inc.
 +
 +# This program is free software; you can redistribute it and/or modify
@ -28,7 +28,10 @@ new file mode 100644
 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 +
 +# are we on a target board
-+require !use_gdb_stub
+if {[use_gdb_stub]} {
+    untested "skipping test because of use_gdb_stub"
+    return -1
+}
 +
 +# Start the program running and then wait for a bit, to be sure
 +# that it can be attached to.
--- a/SOURCES/gdb-6.5-gcore-buffer-limit-test.patch
+++ b/SOURCES/gdb-6.5-gcore-buffer-limit-test.patch
@ -52,7 +52,7 @@ diff --git a/gdb/testsuite/gdb.base/gcore-excessive-memory.exp b/gdb/testsuite/g
 new file mode 100644
 --- /dev/null
 +++ b/gdb/testsuite/gdb.base/gcore-excessive-memory.exp
-@@ -0,0 +1,96 @@
+@@ -0,0 +1,99 @@
 +# Copyright 2008 Free Software Foundation, Inc.
 +
 +# This program is free software; you can redistribute it and/or modify
@ -69,7 +69,10 @@ new file mode 100644
 +# along with this program; if not, write to the Free Software
 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 +
-+require !use_gdb_stub
+if {[use_gdb_stub]} {
+    untested "skipping test because of use_gdb_stub"
+    return -1
+}
 +
 +set testfile gcore-excessive-memory
 +set srcfile ${testfile}.c
--- a/SOURCES/gdb-6.5-section-num-fixup-test.patch
+++ b/SOURCES/gdb-6.5-section-num-fixup-test.patch
@ -68,7 +68,7 @@ diff --git a/gdb/testsuite/gdb.base/datalib.exp b/gdb/testsuite/gdb.base/datalib
 new file mode 100644
 --- /dev/null
 +++ b/gdb/testsuite/gdb.base/datalib.exp
-@@ -0,0 +1,53 @@
+@@ -0,0 +1,56 @@
 +# Copyright 2008 Free Software Foundation, Inc.
 +
 +# This program is free software; you can redistribute it and/or modify
@ -85,7 +85,10 @@ new file mode 100644
 +# along with this program; if not, write to the Free Software
 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 +
-+require !use_gdb_stub
+if {[use_gdb_stub]} {
+    untested "skipping test because of use_gdb_stub"
+    return -1
+}
 +
 +set testfile datalib
 +set srcfilemain ${testfile}-main.c
--- a/SOURCES/gdb-6.6-buildid-locate-solib-missing-ids.patch
+++ b/SOURCES/gdb-6.6-buildid-locate-solib-missing-ids.patch
@ -130,7 +130,7 @@ diff --git a/gdb/testsuite/gdb.base/gcore-buildid-exec-but-not-solib.exp b/gdb/t
 new file mode 100644
 --- /dev/null
 +++ b/gdb/testsuite/gdb.base/gcore-buildid-exec-but-not-solib.exp
-@@ -0,0 +1,103 @@
+@@ -0,0 +1,105 @@
 +# Copyright 2016 Free Software Foundation, Inc.
 +
 +# This program is free software; you can redistribute it and/or modify
@ -146,7 +146,9 @@ new file mode 100644
 +# You should have received a copy of the GNU General Public License
 +# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 +
-+require allow_shlib_tests
+if {[skip_shlib_tests]} {
+    return 0
+}
 +
 +set testfile "gcore-buildid-exec-but-not-solib"
 +set srcmainfile ${testfile}-main.c
--- a/SOURCES/gdb-bz634108-solib_address.patch
+++ b/SOURCES/gdb-bz634108-solib_address.patch
@ -36,6 +36,6 @@ new file mode 100644
 +gdb_start
 +
 +# Skip all tests if Python scripting is not enabled.
-+require allow_python_tests
+if { [skip_python_tests] } { continue }
 +
 +gdb_test "python print (gdb.solib_name(-1))" "None" "gdb.solib_name exists"
--- a/SOURCES/gdb-glibc-strstr-workaround.patch
+++ b/SOURCES/gdb-glibc-strstr-workaround.patch
@ -10,7 +10,7 @@ diff --git a/gdb/testsuite/gdb.base/gnu-ifunc-strstr-workaround.exp b/gdb/testsu
 new file mode 100644
 --- /dev/null
 +++ b/gdb/testsuite/gdb.base/gnu-ifunc-strstr-workaround.exp
-@@ -0,0 +1,117 @@
+@@ -0,0 +1,119 @@
 +# Copyright (C) 2012 Free Software Foundation, Inc.
 +
 +# This program is free software; you can redistribute it and/or modify
@ -30,7 +30,9 @@ new file mode 100644
 +# invalid IFUNC DW_AT_linkage_name: memmove strstr time
 +# http://sourceware.org/bugzilla/show_bug.cgi?id=14166
 +
-+require allow_shlib_tests
+if {[skip_shlib_tests]} {
+    return 0
+}
 +
 +set testfile "gnu-ifunc-strstr-workaround"
 +set executable ${testfile}
--- a/SOURCES/gdb-rhbz1007614-memleak-infpy_read_memory-test.patch
+++ b/SOURCES/gdb-rhbz1007614-memleak-infpy_read_memory-test.patch
@ -88,7 +88,7 @@ new file mode 100644
 +    return -1
 +}
 +
-+require allow_python_tests
+if { [skip_python_tests] } { continue }
 +
 +set pid_of_gdb [exp_pid -i [board_info host fileid]]
 +
--- a/SOURCES/gdb-rhbz1156192-recursive-dlopen-test.patch
+++ b/SOURCES/gdb-rhbz1156192-recursive-dlopen-test.patch
@ -211,7 +211,7 @@ diff --git a/gdb/testsuite/gdb.base/gdb-rhbz1156192-recursive-dlopen.exp b/gdb/t
 new file mode 100644
 --- /dev/null
 +++ b/gdb/testsuite/gdb.base/gdb-rhbz1156192-recursive-dlopen.exp
-@@ -0,0 +1,152 @@
+@@ -0,0 +1,157 @@
 +# Copyright 2014 Free Software Foundation, Inc.
 +#
 +# This program is free software; you can redistribute it and/or modify
@ -227,8 +227,13 @@ new file mode 100644
 +# You should have received a copy of the GNU General Public License
 +# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 +
-+require allow_shlib_tests
-+require !use_gdb_stub
+if {[skip_shlib_tests]} {
+    untested "skipping shlib tests"
+    return 0
+} elseif {[use_gdb_stub]} {
+    untested "skipping tests because of stub"
+    return 0
+}
 +
 +# Library foo
 +set libname1 "gdb-rhbz1156192-recursive-dlopen-libfoo"
--- a/SPECS/gdb.spec
+++ b/SPECS/gdb.spec
@ -57,7 +57,7 @@ Version: 14.2

 # The release always contains a leading reserved number, start it at 1.
 # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 2%{?dist}
+Release: 3%{?dist}

 License: GPL-3.0-or-later AND BSD-3-Clause AND FSFAP AND LGPL-2.1-or-later AND GPL-2.0-or-later AND LGPL-2.0-or-later AND LicenseRef-Fedora-Public-Domain AND GFDL-1.3-or-later AND LGPL-2.0-or-later WITH GCC-exception-2.0 AND GPL-3.0-or-later WITH GCC-exception-3.1 AND GPL-2.0-or-later WITH GNU-compiler-exception
 # Do not provide URL for snapshots as the file lasts there only for 2 days.
@ -571,7 +571,7 @@ find -name "*.orig" | xargs rm -f

 %endif

-# Change the version that gets printed by GDB.  The 'version' here is
+# 2hange the version that gets printed by GDB.  The 'version' here is
 # usually the same as the original upstream version on which we are
 # based.  The 'release' is new information we're adding and identifies
 # the modifications we've made to upstream.
@ -1250,17 +1250,14 @@ fi
 %endif

 %changelog
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com>
- Bump release for June 2024 mass rebuild
-
-* Wed May 29 2024 Keith Seitz <keiths@redhat.com> - 14.2-1.el10
- Rebase to gdb-14.2 and update all bug references:
-  RHEL-39326 "better support for $pc not saved"
-  RHEL-39325 "Infcalls from B/P conditions in multi-threaded inferiors"
-  RHEL-39324 "gdb: s390: Add arch14 record/replay support"
-  RHEL-24764 "Add support for Power11 options"
-  RHEL-34213 "Sync x86 disassembler with (proposed) gdb-15.1 release."
-  (Keith Seitz, RHEL-33256)
+* Fri May 31 2024 Guinevere Larsen <blarsen@redhat.com> - 14.2-1.el9
+- Rebase to gdb-14.2 and update all bug references
+  (Resolves: RHEL-39554)
+  (Resolves: RHEL-39553)
+  (Resolves: RHEL-10550)
+  (Resolves: RHEL-39555)
+  (Resolves: RHEL-39585)
+  (Resolves: RHEL-36211)

 * Wed May 29 2024 Guinevere Larsen <blarsen@redhat.com> - 14.2-3.el8
 - Remove riscv64-linux-gnu target. It was never meant to be added.