PR/36778: Yakovetsky Vladimir: Fix linux build; many thanks.

5 files changed, 52 insertions, 20 deletions

diff --git a/sysutils/strace/Makefile b/sysutils/strace/Makefile
index 285844c8df0..e984b9aef4b 100644
--- a/sysutils/strace/Makefile
+++ b/sysutils/strace/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2007/12/05 16:30:59 christos Exp $
+# $NetBSD: Makefile,v 1.11 2007/12/06 16:59:37 christos Exp $
 #
 
 DISTNAME=		strace-4.5.15
-#PKGREVISION=		1
+PKGREVISION=		1
 CATEGORIES=		sysutils
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=strace/}
 EXTRACT_SUFX=		.tar.bz2
@@ -22,4 +22,11 @@ GNU_CONFIGURE=		yes
 
 REPLACE_PERL=		strace-graph
 
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} == "Linux"
+USE_TOOLS+=		autoconf
+pre-configure:
+	cd ${WRKSRC} && autoconf
+.endif
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/strace/distinfo b/sysutils/strace/distinfo
index 6a00f01d193..db784e5ba4d 100644
--- a/sysutils/strace/distinfo
+++ b/sysutils/strace/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2007/12/05 16:31:00 christos Exp $
+$NetBSD: distinfo,v 1.8 2007/12/06 16:59:37 christos Exp $
 
 SHA1 (strace-4.5.15.tar.bz2) = a6bd153eeb1a25a50bb5a1d92887a4911ec9ad48
 RMD160 (strace-4.5.15.tar.bz2) = 0c6aaa8820a0985d89b21a5da9578b27435c8906
@@ -7,16 +7,16 @@ SHA1 (patch-aa) = 16c7a70bccbebfcf24640cd4e632ff127586e6c9
 SHA1 (patch-ab) = d8adac8ba330ecdfd573e2b14f49a445de1d2452
 SHA1 (patch-ac) = 8af13f7db2812538a4d34ddf6e15f679c92b4776
 SHA1 (patch-ad) = 091b7a2b555d3e5c8d2c4f338b929c7792ea5b0b
-SHA1 (patch-ae) = 397b0c84a267d8cd3f6b45d8fb19d290b1327895
+SHA1 (patch-ae) = f10bdf45432bc9a09f33f4fd94009bf9ed097a7f
 SHA1 (patch-af) = 5e12fe5d4087275e889a49a63ce4d0e0b565b5d8
-SHA1 (patch-ag) = 02c6ce49d7bcefb97e69acc630b5bf82a8bb8a1d
+SHA1 (patch-ag) = 3368bd7a2fca807cc093090c6a1a9e2d3c81bfb0
 SHA1 (patch-ah) = 72d6fd1cd92c22b5215f87fcf268fd375b3f7803
 SHA1 (patch-ai) = 01430e21dd0e6d2e19f93fab8846a3464ee5e7a0
 SHA1 (patch-aj) = b5adc80e0d3f949e8d4d1c9fcbd49839a6b4d907
 SHA1 (patch-ak) = 1b82f68c3a21bc24ce464f64bc91081a71f36199
 SHA1 (patch-al) = ea408e93a15c5fdd8054a65b409c60536ca928eb
 SHA1 (patch-am) = edb9a6a4b76b6f0a39427562fe96a73fea3ecf4a
-SHA1 (patch-an) = ef091e116a7ae9f3b2736d7d7ec49147a69d3ad9
+SHA1 (patch-an) = 23b55878f0f7c6b83b937219a3c730ec5c6cb7ea
 SHA1 (patch-ao) = f85b132184318367a04652d67540428e4d73db3e
 SHA1 (patch-ap) = 8ed16f25eb9ef1c9c1499a77e7f39bf23d50e209
 SHA1 (patch-aq) = 41aa25ad9c1603e3202ec6dd381d4f6687ff5df0
diff --git a/sysutils/strace/patches/patch-ae b/sysutils/strace/patches/patch-ae
index 55526fb7d16..df007f9bf3d 100644
--- a/sysutils/strace/patches/patch-ae
+++ b/sysutils/strace/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.2 2007/04/27 19:45:01 christos Exp $
+$NetBSD: patch-ae,v 1.3 2007/12/06 16:59:37 christos Exp $
 
---- configure.ac.orig	2006-01-12 06:18:27.000000000 -0500
-+++ configure.ac	2007-04-27 11:31:50.000000000 -0400
+--- configure.ac.orig	2007-01-11 06:37:55.000000000 -0500
++++ configure.ac	2007-12-06 11:55:17.000000000 -0500
 @@ -33,6 +33,12 @@
  freebsd*)
  	opsys=freebsd
@@ -24,3 +24,13 @@ $NetBSD: patch-ae,v 1.2 2007/04/27 19:45:01 christos Exp $
  
  AC_PROG_CC
  AC_GNU_SOURCE
+@@ -194,7 +202,8 @@
+ AC_CHECK_FUNCS(sigaction strerror strsignal pread sys_siglist _sys_siglist getdents mctl prctl sendmsg inet_ntop if_indextoname)
+ AC_CHECK_HEADERS([sys/reg.h sys/filio.h sys/acl.h sys/asynch.h sys/door.h stropts.h sys/conf.h sys/stream.h sys/tihdr.h sys/tiuser.h sys/sysconfig.h ioctls.h sys/ioctl.h sys/ptrace.h termio.h linux/ptrace.h asm/reg.h sys/uio.h sys/aio.h poll.h sys/poll.h sys/vfs.h asm/sysmips.h linux/utsname.h sys/nscsys.h mqueue.h sys/epoll.h libaio.h inttypes.h], [], [])
+ AC_CHECK_HEADERS([linux/icmp.h linux/in6.h linux/netlink.h linux/if_packet.h],
+-                 [], [], [#include <linux/socket.h>])
++                 [], [], [#include <stddef.h>
++#include <linux/socket.h>])
+ AC_CHECK_HEADERS([asm/sigcontext.h], [], [], [#include <signal.h>])
+ AC_CHECK_HEADERS([netinet/tcp.h netinet/udp.h],,, [#include <netinet/in.h>])
+ 
diff --git a/sysutils/strace/patches/patch-ag b/sysutils/strace/patches/patch-ag
index a85e2236c3e..b389dad5829 100644
--- a/sysutils/strace/patches/patch-ag
+++ b/sysutils/strace/patches/patch-ag
@@ -1,11 +1,12 @@
-$NetBSD: patch-ag,v 1.2 2007/04/27 19:45:01 christos Exp $
+$NetBSD: patch-ag,v 1.3 2007/12/06 16:59:37 christos Exp $
 
---- defs.h.orig	2006-01-12 05:18:53.000000000 -0500
-+++ defs.h	2007-04-27 11:31:50.000000000 -0400
-@@ -267,6 +267,37 @@
+--- defs.h.orig	2007-01-15 15:25:52.000000000 -0500
++++ defs.h	2007-12-06 11:54:37.000000000 -0500
+@@ -267,6 +267,39 @@
  #define PR_FAULTED      S_CORE
  #endif
  
++#ifndef LINUX
 +#if !defined(PTRACE_ATTACH) && defined(PT_ATTACH)
 +#define PTRACE_ATTACH PT_ATTACH
 +#endif
@@ -36,11 +37,12 @@ $NetBSD: patch-ag,v 1.2 2007/04/27 19:45:01 christos Exp $
 +#if !defined(PTRACE_SETREGS) && defined(PT_SETREGS)
 +#define PTRACE_SETREGS PT_SETREGS
 +#endif
++#endif
 +
  /* Trace Control Block */
  struct tcb {
  	short flags;		/* See below for TCB_ values */
-@@ -309,6 +340,8 @@
+@@ -309,6 +342,8 @@
  #endif
  #ifdef FREEBSD
  	struct procfs_status status;
diff --git a/sysutils/strace/patches/patch-an b/sysutils/strace/patches/patch-an
index b63d2ae56be..5ecbcc13b9f 100644
--- a/sysutils/strace/patches/patch-an
+++ b/sysutils/strace/patches/patch-an
@@ -1,7 +1,7 @@
-$NetBSD: patch-an,v 1.4 2007/12/05 16:31:00 christos Exp $
+$NetBSD: patch-an,v 1.5 2007/12/06 16:59:38 christos Exp $
 
 --- net.c.orig	2006-12-13 14:57:23.000000000 -0500
-+++ net.c	2007-12-05 11:19:06.000000000 -0500
++++ net.c	2007-12-06 11:54:11.000000000 -0500
 @@ -35,7 +35,6 @@
  #include <sys/stat.h>
  #include <sys/socket.h>
@@ -32,7 +32,20 @@ $NetBSD: patch-an,v 1.4 2007/12/05 16:31:00 christos Exp $
  #include <arpa/inet.h>
  #include <net/if.h>
  #if defined(LINUX)
-@@ -1099,7 +1105,7 @@
+@@ -800,8 +806,12 @@
+ 
+ #ifdef SOL_PACKET
+ static const struct xlat sockpacketoptions[] = {
++#if defined(PACKET_ADD_MEMBERSHIP)
+ 	{ PACKET_ADD_MEMBERSHIP,	"PACKET_ADD_MEMBERSHIP"	},
++#endif
++#if defined(PACKET_DROP_MEMBERSHIP)
+ 	{ PACKET_DROP_MEMBERSHIP,	"PACKET_DROP_MEMBERSHIP"},
++#endif
+ #if defined(PACKET_RECV_OUTPUT)
+ 	{ PACKET_RECV_OUTPUT,		"PACKET_RECV_OUTPUT"	},
+ #endif
+@@ -1099,7 +1109,7 @@
  		return;
  	}
  
@@ -41,7 +54,7 @@ $NetBSD: patch-an,v 1.4 2007/12/05 16:31:00 christos Exp $
  	printxval(socketlayers, cmsg->cmsg_level, "SOL_???");
  	tprintf(", cmsg_type=");
  
-@@ -1125,12 +1131,21 @@
+@@ -1125,12 +1135,21 @@
  			free(cmsg);
  			return;
  		}
@@ -63,7 +76,7 @@ $NetBSD: patch-an,v 1.4 2007/12/05 16:31:00 christos Exp $
  			free(cmsg);
  			return;
  		}
-@@ -1472,7 +1487,7 @@
+@@ -1472,7 +1491,7 @@
  		else
  			tprintf("[%u, %u]", fds[0], fds[1]);
  	}
@@ -72,7 +85,7 @@ $NetBSD: patch-an,v 1.4 2007/12/05 16:31:00 christos Exp $
  	if (exiting(tcp))
  		tprintf("[%lu, %lu]", tcp->u_rval, getrval2(tcp));
  #endif
-@@ -1519,9 +1534,9 @@
+@@ -1519,9 +1538,9 @@
  		else
  			tprintf(", [%u, %u]", fds[0], fds[1]);
  #endif /* LINUX */