From ad2793d4e282e492fe6f055f0ff1fdcac3855cb2 Mon Sep 17 00:00:00 2001 From: antoine Date: Sun, 1 Oct 2017 08:10:52 +0000 Subject: Unbreak, it seems the patch was applied twice Reported by: pkg-fallout --- devel/radare2/files/patch-kinfo_file.c | 29 +++-------------------------- 1 file changed, 3 insertions(+), 26 deletions(-) diff --git a/devel/radare2/files/patch-kinfo_file.c b/devel/radare2/files/patch-kinfo_file.c index 51292ac..6d441bd 100644 --- a/devel/radare2/files/patch-kinfo_file.c +++ b/devel/radare2/files/patch-kinfo_file.c @@ -1,29 +1,6 @@ ---- libr/debug/p/debug_native.c 2017-08-08 00:36:25.502447000 +0200 -+++ libr/debug/p/debug_native.c 2017-08-08 00:39:41.234685000 +0200 -@@ -1487,15 +1487,15 @@ - type = 's'; - if (kve->kf_sock_domain == AF_LOCAL) { - struct sockaddr_un *sun = -- (struct sockaddr_un *)&kve->kf_sa_local; -+ (struct sockaddr_un *)&kve->kf_un.kf_sock.kf_sa_local; - if (sun->sun_path[0] != 0) -- addr_to_string (&kve->kf_sa_local, path, sizeof(path)); -+ addr_to_string (&kve->kf_un.kf_sock.kf_sa_local, path, sizeof(path)); - else -- addr_to_string (&kve->kf_sa_peer, path, sizeof(path)); -+ addr_to_string (&kve->kf_un.kf_sock.kf_sa_peer, path, sizeof(path)); - } else { -- addr_to_string (&kve->kf_sa_local, path, sizeof(path)); -+ addr_to_string (&kve->kf_un.kf_sock.kf_sa_local, path, sizeof(path)); - strcat (path, " "); -- addr_to_string (&kve->kf_sa_peer, path + strlen (path), -+ addr_to_string (&kve->kf_un.kf_sock.kf_sa_peer, path + strlen (path), - sizeof (path)); - } - str = path; ---- libr/debug/p/debug_native.c 2017-08-08 00:36:25.502447000 +0200 -+++ libr/debug/p/debug_native.c 2017-08-08 00:39:41.234685000 +0200 -@@ -1487,15 +1487,15 @@ +--- libr/debug/p/debug_native.c.orig 2016-11-10 16:17:54 UTC ++++ libr/debug/p/debug_native.c +@@ -1487,15 +1487,15 @@ static RList *r_debug_desc_native_list ( type = 's'; if (kve->kf_sock_domain == AF_LOCAL) { struct sockaddr_un *sun = -- cgit v1.1