[gentoo-commits] repo/gentoo:master commit in: net-analyzer/openbsd-netcat/files/, net-analyzer/openbsd-netcat/

["Sam James" <sam@gentoo.org>]

commit:     094258d6ac18a136540bd6e5b65257fa5556db5f
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Apr  5 16:45:28 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Apr  5 23:41:23 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=094258d6

net-analyzer/openbsd-netcat: fix patching

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/20267
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../openbsd-netcat/files/openbsd-netcat-1.105-darwin.patch     | 10 ++++------
 net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild     |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.105-darwin.patch b/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.105-darwin.patch
index 8c68a66ad54..a6f805af1a6 100644
--- a/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.105-darwin.patch
+++ b/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.105-darwin.patch
@@ -1,7 +1,5 @@
-Allow compilation on Darwin
-
---- netcat.c
-+++ netcat.c
+--- a/netcat.c
++++ b/netcat.c
 @@ -43,11 +43,13 @@
  #include <arpa/telnet.h>
  #include <arpa/inet.h>
@@ -73,8 +71,8 @@ Allow compilation on Darwin
  int
  main(int argc, char *argv[])
  {
---- socks.c
-+++ socks.c
+--- a/socks.c
++++ b/socks.c
 @@ -38,7 +38,7 @@
  #include <string.h>
  #include <unistd.h>

diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild
index 7a6f5c18460..9b84922f8b7 100644
--- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild
+++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild
@@ -29,7 +29,7 @@ src_prepare() {
 	default
 	if [[ ${CHOST} == *-darwin* ]] ; then
 		# this undoes some of the Debian/Linux changes
-		epatch "${FILESDIR}"/${P}-darwin.patch
+		eapply "${FILESDIR}"/${P}-darwin.patch
 	fi
 }