gdb-netbsd: Drop bfd/merge.c patch

[Kamil Rytarowski <n54%gmx.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sat Mar 14 19:37:12 2020 +0100
Changeset:	f6751910fe27dac2fb212f3bbf89a02d02290b49

Modified Files:
	gdb-netbsd/distinfo
Removed Files:
	gdb-netbsd/patches/patch-bfd_merge.c

Log Message:
gdb-netbsd: Drop bfd/merge.c patch

It looks like a false positive 'fix'.

Module Name:	src
Committed By:	christos
Date:		Fri Feb 26 16:28:14 UTC 2016

Modified Files:
	src/external/gpl3/gdb/dist/bfd: merge.c

Log Message:
CID 420802: Avoid NULL deref.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f6751910fe27dac2fb212f3bbf89a02d02290b49

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 gdb-netbsd/distinfo                  |  1 -
 gdb-netbsd/patches/patch-bfd_merge.c | 13 -------------
 2 files changed, 14 deletions(-)

diffs:
diff --git a/gdb-netbsd/distinfo b/gdb-netbsd/distinfo
index 9c3ad8115a..2e294cfc61 100644
--- a/gdb-netbsd/distinfo
+++ b/gdb-netbsd/distinfo
@@ -5,7 +5,6 @@ RMD160 (gdb-8.2.1-7e24fb63e7db33d3627623629b0e99fe322e26f9.tar.gz) = 96040eb8f7e
 SHA512 (gdb-8.2.1-7e24fb63e7db33d3627623629b0e99fe322e26f9.tar.gz) = d7a8692ee1b27aecac64bf4176e5fa3e44e315e88da079c24107f3e5318e0e335f35b38426e72c118bd044d547fdd94650781fb1dd1297d33dd5a54c77e78988
 Size (gdb-8.2.1-7e24fb63e7db33d3627623629b0e99fe322e26f9.tar.gz) = 59113538 bytes
 SHA1 (patch-bfd_config.bfd) = 0fd42301a1577e353381a0bf677a7bcb5d32c3d8
-SHA1 (patch-bfd_merge.c) = dcb36bfd014e0b5bec17d6b6d475bf988021daee
 SHA1 (patch-gdb_Makefile.in) = dc465eda202863a23ce660ae5f8065a74e5c8fb4
 SHA1 (patch-gdb_aarch64-nbsd-nat.c) = 04ffc8ed696cb2349a67d302c2f8fa596484a9e6
 SHA1 (patch-gdb_aarch64-nbsd-tdep.c) = 7720b954f12031b60e1fa0a48ce668b104e09d41
diff --git a/gdb-netbsd/patches/patch-bfd_merge.c b/gdb-netbsd/patches/patch-bfd_merge.c
deleted file mode 100644
index ed7c9f262c..0000000000
--- a/gdb-netbsd/patches/patch-bfd_merge.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- bfd/merge.c.orig	2019-07-16 00:00:27.000000000 +0000
-+++ bfd/merge.c
-@@ -338,7 +338,7 @@ sec_merge_emit (bfd *abfd, struct sec_me
- 
-   /* Trailing alignment needed?  */
-   off = sec->size - off;
--  if (off != 0)
-+  if (pad != NULL && off != 0)
-     {
-       BFD_ASSERT (off <= pad_len);
-       if (contents)