[rpms/gdb] gdb-17.2-rebase-f44: remove gdb-bz634108-solib_address.patch

[Andrew Burgess <aburgess@redhat.com>]

            A new commit has been pushed.

            Repo   : rpms/gdb
            Branch : gdb-17.2-rebase-f44
            Commit : 94829f02adff5bb756f64b039a5e8a5681ab47ae
            Author : Andrew Burgess <aburgess@redhat.com>
            Date   : 2024-03-19T16:13:28+00:00
            Stats  : +38/-81 in 5 file(s)
            URL    : https://src.fedoraproject.org/rpms/gdb/c/94829f02adff5bb756f64b039a5e8a5681ab47ae?branch=gdb-17.2-rebase-f44

            Log:
            remove gdb-bz634108-solib_address.patch

Remove gdb-bz634108-solib_address.patch.  This is a test only patch.
I've pushed this upstream commit:

  commit 52ca06e807be411af8cdfeafbe36a86e26c628af
  Date:   Fri Mar 15 11:14:05 2024 +0000

      gdb/python: test exception case for gdb.solib_name

which covers this test case.  We'll pick up the upstream commit next
time Fedora is rebased, until then I think we can just drop this test
from the Fedora tree.

---
diff --git a/_gdb.spec.Patch.include b/_gdb.spec.Patch.include
index aad0a91..25064f6 100644
--- a/_gdb.spec.Patch.include
+++ b/_gdb.spec.Patch.include
@@ -77,62 +77,58 @@ Patch018: gdb-archer-next-over-throw-cxx-exec.patch
 #=fedoratest
 Patch019: gdb-test-bt-cfi-without-die.patch
 
-# Verify GDB Python built-in function gdb.solib_address exists (BZ # 634108).
-#=fedoratest
-Patch020: gdb-bz634108-solib_address.patch
-
 # [archer-tromey-delayed-symfile] New test gdb.dwarf2/dw2-aranges.exp.
 #=fedoratest
-Patch021: gdb-test-dw2-aranges.patch
+Patch020: gdb-test-dw2-aranges.patch
 
 # Workaround PR libc/14166 for inferior calls of strstr.
 #=fedoratest: Compatibility with RHELs (unchecked which ones).
-Patch022: gdb-glibc-strstr-workaround.patch
+Patch021: gdb-glibc-strstr-workaround.patch
 
 # Testcase for `Setting solib-absolute-prefix breaks vDSO' (BZ 818343).
 #=fedoratest
-Patch023: gdb-rhbz-818343-set-solib-absolute-prefix-testcase.patch
+Patch022: gdb-rhbz-818343-set-solib-absolute-prefix-testcase.patch
 
 # Import regression test for `gdb/findvar.c:417: internal-error:
 # read_var_value: Assertion `frame' failed.' (RH BZ 947564) from RHEL 6.5.
 #=fedoratest
-Patch024: gdb-rhbz947564-findvar-assertion-frame-failed-testcase.patch
+Patch023: gdb-rhbz947564-findvar-assertion-frame-failed-testcase.patch
 
 # Fix 'memory leak in infpy_read_memory()' (RH BZ 1007614)
 #=fedoratest
-Patch025: gdb-rhbz1007614-memleak-infpy_read_memory-test.patch
+Patch024: gdb-rhbz1007614-memleak-infpy_read_memory-test.patch
 
 # Fix 'gdb gives highly misleading error when debuginfo pkg is present,
 # but not corresponding binary pkg' (RH BZ 981154).
 #=push+jan
-Patch026: gdb-6.6-buildid-locate-misleading-warning-missing-debuginfo-rhbz981154.patch
+Patch025: gdb-6.6-buildid-locate-misleading-warning-missing-debuginfo-rhbz981154.patch
 
 # Testcase for '[SAP] Recursive dlopen causes SAP HANA installer to
 # crash.' (RH BZ 1156192).
 #=fedoratest
-Patch027: gdb-rhbz1156192-recursive-dlopen-test.patch
+Patch026: gdb-rhbz1156192-recursive-dlopen-test.patch
 
 # Fix '`catch syscall' doesn't work for parent after `fork' is called'
 # (Philippe Waroquiers, RH BZ 1149205).
 #=fedoratest
-Patch028: gdb-rhbz1149205-catch-syscall-after-fork-test.patch
+Patch027: gdb-rhbz1149205-catch-syscall-after-fork-test.patch
 
 # Fix '[ppc64] and [s390x] wrong prologue skip on -O2 -g code' (Jan
 # Kratochvil, RH BZ 1084404).
 #=fedoratest
-Patch029: gdb-rhbz1084404-ppc64-s390x-wrong-prologue-skip-O2-g-3of3.patch
+Patch028: gdb-rhbz1084404-ppc64-s390x-wrong-prologue-skip-O2-g-3of3.patch
 
 # Force libncursesw over libncurses to match the includes (RH BZ 1270534).
 #=push+jan
-Patch030: gdb-fedora-libncursesw.patch
+Patch029: gdb-fedora-libncursesw.patch
 
 # [aarch64] Fix hardware watchpoints (RH BZ 1261564).
 #=fedoratest
-Patch031: gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch
+Patch030: gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch
 
 # [dts+el7] [x86*] Bundle linux_perf.h for libipt (RH BZ 1256513).
 #=fedora
-Patch032: gdb-linux_perf-bundle.patch
+Patch031: gdb-linux_perf-bundle.patch
 
 # Update gdb-add-index.sh such that, when the GDB environment
 # variable is not set, the script is smarter than just looking for
@@ -146,72 +142,72 @@ Patch032: gdb-linux_perf-bundle.patch
 #   https://fedoraproject.org/wiki/Changes/Minimal_GDB_in_buildroot
 #
 #=fedora
-Patch033: gdb-add-index.patch
+Patch032: gdb-add-index.patch
 
 # Back-port upstream commit 1f0fab7ff86 as part of a fix for
 # non-deterministic gdb-index generation (RH BZ 2232086).
-Patch034: gdb-rhbz2232086-refactor-selftest-support.patch
+Patch033: gdb-rhbz2232086-refactor-selftest-support.patch
 
 # Back-port upstream commit aa19bc1d259 as part of a fix for
 # non-deterministic gdb-index generation (RH BZ 2232086).
-Patch035: gdb-rhbz-2232086-reduce-size-of-gdb-index.patch
+Patch034: gdb-rhbz-2232086-reduce-size-of-gdb-index.patch
 
 # Back-port upstream commit acc117b57f7 as part of a fix for
 # non-deterministic gdb-index generation (RH BZ 2232086).
-Patch036: gdb-rhbz-2232086-cpp-ify-mapped-symtab.patch
+Patch035: gdb-rhbz-2232086-cpp-ify-mapped-symtab.patch
 
 # Back-port upstream commit aff250145af as part of a fix for
 # non-deterministic gdb-index generation (RH BZ 2232086).
-Patch037: gdb-rhbz-2232086-generate-gdb-index-consistently.patch
+Patch036: gdb-rhbz-2232086-generate-gdb-index-consistently.patch
 
 # Back-port upstream commit 3644f41dc80 as part of a fix for
 # non-deterministic gdb-index generation (RH BZ 2232086).
-Patch038: gdb-rhbz-2232086-generate-dwarf-5-index-consistently.patch
+Patch037: gdb-rhbz-2232086-generate-dwarf-5-index-consistently.patch
 
 
-Patch039: gdb-rhbz2250652-gdbpy_gil.patch
+Patch038: gdb-rhbz2250652-gdbpy_gil.patch
 
 
-Patch040: gdb-rhbz2250652-avoid-PyOS_ReadlineTState.patch
+Patch039: gdb-rhbz2250652-avoid-PyOS_ReadlineTState.patch
 
 
-Patch041: gdb-ftbs-swapped-calloc-args.patch
+Patch040: gdb-ftbs-swapped-calloc-args.patch
 
 # Backport upstream workaround for GCC 14 problem which cause assertion
 # failures in GDB.
-Patch042: gdb-rhbz2261580-intrusive_list-assertion-fix.patch
+Patch041: gdb-rhbz2261580-intrusive_list-assertion-fix.patch
 
 # Backport upstream commit 7628a997f27.
-Patch043: gdb-sync-coffread-with-elfread.patch
+Patch042: gdb-sync-coffread-with-elfread.patch
 
 # Backport upstream commit 27807da5849.
-Patch044: gdb-merge-debug-symbol-lookup.patch
+Patch043: gdb-merge-debug-symbol-lookup.patch
 
 # Backport upstream commit 6234ba17598.
-Patch045: gdb-refactor-find-and-add-separate-symbol-file.patch
+Patch044: gdb-refactor-find-and-add-separate-symbol-file.patch
 
 # Backport upstream commit 661d98a3331.
-Patch046: gdb-add-missing-debug-ext-lang-hook.patch
+Patch045: gdb-add-missing-debug-ext-lang-hook.patch
 
 # Backport upstream commit 8f6c452b5a4.
-Patch047: gdb-add-missing-debug-info-python-hook.patch
+Patch046: gdb-add-missing-debug-info-python-hook.patch
 
 # Backport upstream commit 7db795bc67a.
-Patch048: gdb-remove-use-of-py-isascii
+Patch047: gdb-remove-use-of-py-isascii
 
 # Backport upstream commit 1146d27749f.
-Patch049: gdb-remove-path-in-test-name.patch
+Patch048: gdb-remove-path-in-test-name.patch
 
 # Backport upstream commit e8c3dafa5f5.
-Patch050: gdb-do-not-import-py-curses-ascii-module.patch
+Patch049: gdb-do-not-import-py-curses-ascii-module.patch
 
 # Backport upstream commit dd5516bf98f.
-Patch051: gdb-reformat-missing-debug-py-file.patch
+Patch050: gdb-reformat-missing-debug-py-file.patch
 
 # Backport upstream commit 7d21600b31fe.
-Patch052: gdb-handle-no-python-gdb-module.patch
+Patch051: gdb-handle-no-python-gdb-module.patch
 
 # Not a backport.  Add a new script which hooks into GDB and suggests
 # RPMs to install when GDB finds an objfile with no debug info.
-Patch053: gdb-add-rpm-suggestion-script.patch
+Patch052: gdb-add-rpm-suggestion-script.patch
 

diff --git a/_gdb.spec.patch.include b/_gdb.spec.patch.include
index 8ec13e9..d954063 100644
--- a/_gdb.spec.patch.include
+++ b/_gdb.spec.patch.include
@@ -50,4 +50,3 @@
 %patch -p1 -P050
 %patch -p1 -P051
 %patch -p1 -P052
-%patch -p1 -P053

diff --git a/_patch_order b/_patch_order
index 8644d5b..d7864b9 100644
--- a/_patch_order
+++ b/_patch_order
@@ -17,7 +17,6 @@ gdb-simultaneous-step-resume-breakpoint-test.patch
 gdb-core-open-vdso-warning.patch
 gdb-archer-next-over-throw-cxx-exec.patch
 gdb-test-bt-cfi-without-die.patch
-gdb-bz634108-solib_address.patch
 gdb-test-dw2-aranges.patch
 gdb-glibc-strstr-workaround.patch
 gdb-rhbz-818343-set-solib-absolute-prefix-testcase.patch

diff --git a/gdb-bz634108-solib_address.patch b/gdb-bz634108-solib_address.patch
deleted file mode 100644
index 131e1c1..0000000
--- a/gdb-bz634108-solib_address.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
-From: Fedora GDB patches <invalid@email.com>
-Date: Fri, 27 Oct 2017 21:07:50 +0200
-Subject: gdb-bz634108-solib_address.patch
-
-;; Verify GDB Python built-in function gdb.solib_address exists (BZ # 634108).
-;;=fedoratest
-
-Fix gdb.solib_address (fix by Phil Muldoon).
-
-s/solib_address/solib_name/ during upstreaming.
-
-diff --git a/gdb/testsuite/gdb.python/rh634108-solib_address.exp b/gdb/testsuite/gdb.python/rh634108-solib_address.exp
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.python/rh634108-solib_address.exp
-@@ -0,0 +1,25 @@
-+# Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
-+
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 3 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+
-+# https://bugzilla.redhat.com/show_bug.cgi?id=634108
-+
-+load_lib gdb-python.exp
-+
-+require allow_python_tests
-+
-+gdb_exit
-+gdb_start
-+
-+gdb_test "python print (gdb.solib_name(-1))" "None" "gdb.solib_name exists"

diff --git a/gdb.spec b/gdb.spec
index a5ceae7..cc94a59 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -1251,6 +1251,11 @@ fi
 
 %changelog
 * Tue Mar 19 2024 Andrew Burgess <aburgess@redhat.com>
+- Drop gdb-bz634108-solib_address.patch.  This is a test only patch.
+  I've pushed upstream commit 52ca06e807b which covers this test case,
+  we'll pick up the upstream test next time Fedora is rebased.
+
+* Tue Mar 19 2024 Andrew Burgess <aburgess@redhat.com>
 - Drop gdb-container-rh-pkg.patch.  This patch gave a warning when
   connecting to very old gdbserver.  The warning mentioned specific
   RHEL versions, all of which are no longer supported.  As such the