Attachment #188937 for bug #224133

Lines 2-11 Link Here

(-)devel/radare2/Makefile (-2 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= radare2	4	PORTNAME= radare2
5	PORTVERSION= 2.0.1	5	PORTVERSION= 2.1.0
6	CATEGORIES= devel	6	CATEGORIES= devel
7		7
8	MAINTAINER= torres.73a@gmail.com	8	MAINTAINER= mizhka@gmail.com
9	COMMENT= Tools to disasm, debug, analyze, and manipulate binary files	9	COMMENT= Tools to disasm, debug, analyze, and manipulate binary files
10		10
11	LICENSE= GPLv3	11	LICENSE= GPLv3

Lines 1-3 Link Here

(-)devel/radare2/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1510597281	1	TIMESTAMP = 1512509044
2	SHA256 (radare-radare2-2.0.1_GH0.tar.gz) = d8f7e1ab96028fc8bd62d4f92fbbe8bbf48c6cda8112e6eaec93bf5ffbbbd1dd	2	SHA256 (radare-radare2-2.1.0_GH0.tar.gz) = cf34e6260fafb543edb919ed0b80b57b431817e91b624843fc1b82aa4bbf5f7a
3	SIZE (radare-radare2-2.0.1_GH0.tar.gz) = 6001927	3	SIZE (radare-radare2-2.1.0_GH0.tar.gz) = 5954222




--- libr/debug/p/debug_native.c.orig	2017-11-13 19:15:44 UTC
+++ libr/debug/p/debug_native.c
@@ -1620,6 +1620,7 @@ static RList *r_debug_desc_native_list (
 		case KF_TYPE_VNODE: type = 'v'; break;
 		case KF_TYPE_SOCKET:
 			type = 's';
+#if __FreeBSD_version < 1200031
 			if (kve->kf_sock_domain == AF_LOCAL) {
 				struct sockaddr_un *sun =
 					(struct sockaddr_un *)&kve->kf_sa_local;
@@ -1633,6 +1634,21 @@ static RList *r_debug_desc_native_list (
 				addr_to_string (&kve->kf_sa_peer, path + strlen (path),
 						sizeof (path));
 			}
+#else
+			if (kve->kf_sock_domain == AF_LOCAL) {
+				struct sockaddr_un *sun =
+					(struct sockaddr_un *)&kve->kf_un.kf_sock.kf_sa_local;;
+				if (sun->sun_path[0] != 0)
+					addr_to_string (&kve->kf_un.kf_sock.kf_sa_local, path, sizeof(path));
+				else
+					addr_to_string (&kve->kf_un.kf_sock.kf_sa_peer, path, sizeof(path));
+			} else {
+				addr_to_string (&kve->kf_un.kf_sock.kf_sa_local, path, sizeof(path));
+				strcat (path, " ");
+				addr_to_string (&kve->kf_un.kf_sock.kf_sa_peer, path + strlen (path),
+						sizeof (path));
+			}	
+#endif
 			str = path;
 			break;
 		case KF_TYPE_PIPE: type = 'p'; break;




bin/r2
bin/r2-docker
bin/r2-indent
bin/r2agent
bin/r2pm
bin/rabin2

%%PORTDOCS%%%%DOCSDIR%%/dospart
%%PORTDOCS%%%%DOCSDIR%%/dwarf-line.rsc
%%PORTDOCS%%%%DOCSDIR%%/emscripten
%%PORTDOCS%%%%DOCSDIR%%/endian
%%PORTDOCS%%%%DOCSDIR%%/esil
%%PORTDOCS%%%%DOCSDIR%%/flirt
%%PORTDOCS%%%%DOCSDIR%%/fortunes.creepy

%%PORTDOCS%%%%DOCSDIR%%/kvast
%%PORTDOCS%%%%DOCSDIR%%/lang-plugins
%%PORTDOCS%%%%DOCSDIR%%/license
%%PORTDOCS%%%%DOCSDIR%%/macos.md
%%PORTDOCS%%%%DOCSDIR%%/macros
%%PORTDOCS%%%%DOCSDIR%%/maemo
%%PORTDOCS%%%%DOCSDIR%%/objc.pl
%%PORTDOCS%%%%DOCSDIR%%/oo
%%PORTDOCS%%%%DOCSDIR%%/osx.md
%%PORTDOCS%%%%DOCSDIR%%/plugins
%%PORTDOCS%%%%DOCSDIR%%/portscan.r2
%%PORTDOCS%%%%DOCSDIR%%/qnx

%%PORTDOCS%%%%DOCSDIR%%/releases
%%PORTDOCS%%%%DOCSDIR%%/repo
%%PORTDOCS%%%%DOCSDIR%%/rgraph
%%PORTDOCS%%%%DOCSDIR%%/sdb_ordinal.md
%%PORTDOCS%%%%DOCSDIR%%/siol.md
%%PORTDOCS%%%%DOCSDIR%%/solaris
%%PORTDOCS%%%%DOCSDIR%%/static

%%DATADIR%%/%%PORTVERSION%%/cons/behelit
%%DATADIR%%/%%PORTVERSION%%/cons/cga
%%DATADIR%%/%%PORTVERSION%%/cons/consonance
%%DATADIR%%/%%PORTVERSION%%/cons/cutter
%%DATADIR%%/%%PORTVERSION%%/cons/dark
%%DATADIR%%/%%PORTVERSION%%/cons/focus
%%DATADIR%%/%%PORTVERSION%%/cons/lima

%%DATADIR%%/%%PORTVERSION%%/fcnsign/types-arm-ios-64.sdb
%%DATADIR%%/%%PORTVERSION%%/fcnsign/types-linux.sdb
%%DATADIR%%/%%PORTVERSION%%/fcnsign/types-windows.sdb
%%DATADIR%%/%%PORTVERSION%%/fcnsign/types-x86-macos-64.sdb
%%DATADIR%%/%%PORTVERSION%%/fcnsign/types-x86-windows-32.sdb
%%DATADIR%%/%%PORTVERSION%%/fcnsign/types-x86-windows-64.sdb
%%DATADIR%%/%%PORTVERSION%%/fcnsign/types.sdb

%%DATADIR%%/%%PORTVERSION%%/format/elf32
%%DATADIR%%/%%PORTVERSION%%/format/elf64
%%DATADIR%%/%%PORTVERSION%%/format/elf_enums
%%DATADIR%%/%%PORTVERSION%%/format/mz
%%DATADIR%%/%%PORTVERSION%%/format/pe32
%%DATADIR%%/%%PORTVERSION%%/format/trx
%%DATADIR%%/%%PORTVERSION%%/hud/main

Return to bug 224133

Lines 1-32 Link Here

(-)devel/radare2/files/patch-libr_debug_p_debug__native.c (-32 lines)
1	--- libr/debug/p/debug_native.c.orig 2017-11-13 19:15:44 UTC
2	+++ libr/debug/p/debug_native.c
3	@@ -1620,6 +1620,7 @@ static RList *r_debug_desc_native_list (
4	case KF_TYPE_VNODE: type = 'v'; break;
5	case KF_TYPE_SOCKET:
6	type = 's';
7	+#if __FreeBSD_version < 1200031
8	if (kve->kf_sock_domain == AF_LOCAL) {
9	struct sockaddr_un *sun =
10	(struct sockaddr_un *)&kve->kf_sa_local;
11	@@ -1633,6 +1634,21 @@ static RList *r_debug_desc_native_list (
12	addr_to_string (&kve->kf_sa_peer, path + strlen (path),
13	sizeof (path));
14	}
15	+#else
16	+ if (kve->kf_sock_domain == AF_LOCAL) {
17	+ struct sockaddr_un *sun =
18	+ (struct sockaddr_un *)&kve->kf_un.kf_sock.kf_sa_local;;
19	+ if (sun->sun_path[0] != 0)
20	+ addr_to_string (&kve->kf_un.kf_sock.kf_sa_local, path, sizeof(path));
21	+ else
22	+ addr_to_string (&kve->kf_un.kf_sock.kf_sa_peer, path, sizeof(path));
23	+ } else {
24	+ addr_to_string (&kve->kf_un.kf_sock.kf_sa_local, path, sizeof(path));
25	+ strcat (path, " ");
26	+ addr_to_string (&kve->kf_un.kf_sock.kf_sa_peer, path + strlen (path),
27	+ sizeof (path));
28	+ }
29	+#endif
30	str = path;
31	break;
32	case KF_TYPE_PIPE: type = 'p'; break;

Lines 1-6 Link Here

(-)devel/radare2/pkg-plist (-5 / +5 lines)
1	bin/r2	1	bin/r2
2	bin/r2-docker
3	bin/r2-indent
4	bin/r2agent	2	bin/r2agent
5	bin/r2pm	3	bin/r2pm
6	bin/rabin2	4	bin/rabin2
Lines 240-246 Link Here
240	%%PORTDOCS%%%%DOCSDIR%%/dospart	238	%%PORTDOCS%%%%DOCSDIR%%/dospart
241	%%PORTDOCS%%%%DOCSDIR%%/dwarf-line.rsc	239	%%PORTDOCS%%%%DOCSDIR%%/dwarf-line.rsc
242	%%PORTDOCS%%%%DOCSDIR%%/emscripten	240	%%PORTDOCS%%%%DOCSDIR%%/emscripten
243	%%PORTDOCS%%%%DOCSDIR%%/endian
244	%%PORTDOCS%%%%DOCSDIR%%/esil	241	%%PORTDOCS%%%%DOCSDIR%%/esil
245	%%PORTDOCS%%%%DOCSDIR%%/flirt	242	%%PORTDOCS%%%%DOCSDIR%%/flirt
246	%%PORTDOCS%%%%DOCSDIR%%/fortunes.creepy	243	%%PORTDOCS%%%%DOCSDIR%%/fortunes.creepy
Lines 261-271 Link Here
261	%%PORTDOCS%%%%DOCSDIR%%/kvast	258	%%PORTDOCS%%%%DOCSDIR%%/kvast
262	%%PORTDOCS%%%%DOCSDIR%%/lang-plugins	259	%%PORTDOCS%%%%DOCSDIR%%/lang-plugins
263	%%PORTDOCS%%%%DOCSDIR%%/license	260	%%PORTDOCS%%%%DOCSDIR%%/license
		261	%%PORTDOCS%%%%DOCSDIR%%/macos.md
264	%%PORTDOCS%%%%DOCSDIR%%/macros	262	%%PORTDOCS%%%%DOCSDIR%%/macros
265	%%PORTDOCS%%%%DOCSDIR%%/maemo	263	%%PORTDOCS%%%%DOCSDIR%%/maemo
266	%%PORTDOCS%%%%DOCSDIR%%/objc.pl	264	%%PORTDOCS%%%%DOCSDIR%%/objc.pl
267	%%PORTDOCS%%%%DOCSDIR%%/oo	265	%%PORTDOCS%%%%DOCSDIR%%/oo
268	%%PORTDOCS%%%%DOCSDIR%%/osx.md
269	%%PORTDOCS%%%%DOCSDIR%%/plugins	266	%%PORTDOCS%%%%DOCSDIR%%/plugins
270	%%PORTDOCS%%%%DOCSDIR%%/portscan.r2	267	%%PORTDOCS%%%%DOCSDIR%%/portscan.r2
271	%%PORTDOCS%%%%DOCSDIR%%/qnx	268	%%PORTDOCS%%%%DOCSDIR%%/qnx
Lines 275-280 Link Here
275	%%PORTDOCS%%%%DOCSDIR%%/releases	272	%%PORTDOCS%%%%DOCSDIR%%/releases
276	%%PORTDOCS%%%%DOCSDIR%%/repo	273	%%PORTDOCS%%%%DOCSDIR%%/repo
277	%%PORTDOCS%%%%DOCSDIR%%/rgraph	274	%%PORTDOCS%%%%DOCSDIR%%/rgraph
		275	%%PORTDOCS%%%%DOCSDIR%%/sdb_ordinal.md
278	%%PORTDOCS%%%%DOCSDIR%%/siol.md	276	%%PORTDOCS%%%%DOCSDIR%%/siol.md
279	%%PORTDOCS%%%%DOCSDIR%%/solaris	277	%%PORTDOCS%%%%DOCSDIR%%/solaris
280	%%PORTDOCS%%%%DOCSDIR%%/static	278	%%PORTDOCS%%%%DOCSDIR%%/static
Lines 294-299 Link Here
294	%%DATADIR%%/%%PORTVERSION%%/cons/behelit	292	%%DATADIR%%/%%PORTVERSION%%/cons/behelit
295	%%DATADIR%%/%%PORTVERSION%%/cons/cga	293	%%DATADIR%%/%%PORTVERSION%%/cons/cga
296	%%DATADIR%%/%%PORTVERSION%%/cons/consonance	294	%%DATADIR%%/%%PORTVERSION%%/cons/consonance
		295	%%DATADIR%%/%%PORTVERSION%%/cons/cutter
297	%%DATADIR%%/%%PORTVERSION%%/cons/dark	296	%%DATADIR%%/%%PORTVERSION%%/cons/dark
298	%%DATADIR%%/%%PORTVERSION%%/cons/focus	297	%%DATADIR%%/%%PORTVERSION%%/cons/focus
299	%%DATADIR%%/%%PORTVERSION%%/cons/lima	298	%%DATADIR%%/%%PORTVERSION%%/cons/lima
Lines 328-334 Link Here
328	%%DATADIR%%/%%PORTVERSION%%/fcnsign/types-arm-ios-64.sdb	327	%%DATADIR%%/%%PORTVERSION%%/fcnsign/types-arm-ios-64.sdb
329	%%DATADIR%%/%%PORTVERSION%%/fcnsign/types-linux.sdb	328	%%DATADIR%%/%%PORTVERSION%%/fcnsign/types-linux.sdb
330	%%DATADIR%%/%%PORTVERSION%%/fcnsign/types-windows.sdb	329	%%DATADIR%%/%%PORTVERSION%%/fcnsign/types-windows.sdb
331	%%DATADIR%%/%%PORTVERSION%%/fcnsign/types-x86-osx-64.sdb	330	%%DATADIR%%/%%PORTVERSION%%/fcnsign/types-x86-macos-64.sdb
332	%%DATADIR%%/%%PORTVERSION%%/fcnsign/types-x86-windows-32.sdb	331	%%DATADIR%%/%%PORTVERSION%%/fcnsign/types-x86-windows-32.sdb
333	%%DATADIR%%/%%PORTVERSION%%/fcnsign/types-x86-windows-64.sdb	332	%%DATADIR%%/%%PORTVERSION%%/fcnsign/types-x86-windows-64.sdb
334	%%DATADIR%%/%%PORTVERSION%%/fcnsign/types.sdb	333	%%DATADIR%%/%%PORTVERSION%%/fcnsign/types.sdb
Lines 373-378 Link Here
373	%%DATADIR%%/%%PORTVERSION%%/format/elf32	372	%%DATADIR%%/%%PORTVERSION%%/format/elf32
374	%%DATADIR%%/%%PORTVERSION%%/format/elf64	373	%%DATADIR%%/%%PORTVERSION%%/format/elf64
375	%%DATADIR%%/%%PORTVERSION%%/format/elf_enums	374	%%DATADIR%%/%%PORTVERSION%%/format/elf_enums
		375	%%DATADIR%%/%%PORTVERSION%%/format/mz
376	%%DATADIR%%/%%PORTVERSION%%/format/pe32	376	%%DATADIR%%/%%PORTVERSION%%/format/pe32
377	%%DATADIR%%/%%PORTVERSION%%/format/trx	377	%%DATADIR%%/%%PORTVERSION%%/format/trx
378	%%DATADIR%%/%%PORTVERSION%%/hud/main	378	%%DATADIR%%/%%PORTVERSION%%/hud/main