From fbb877cf5de8e94544f16370a4e610298bf32339 Mon Sep 17 00:00:00 2001
From: pgollucci <pgollucci@FreeBSD.org>
Date: Sat, 27 Dec 2008 04:15:26 +0000
Subject: - Update to 4.5.18 - Add forgotten new files

PR:             ports/129019
Reported by:    erwinbot
Pointyhat to:   pgollucci
---
 devel/strace/Makefile              |  1 +
 devel/strace/files/patch-net.c     | 18 ++++++++++++++++++
 devel/strace/files/patch-syscall.c | 15 +++++++++++++++
 devel/strace/files/patch-time.c    | 18 ++++++++++++++++++
 4 files changed, 52 insertions(+)
 create mode 100644 devel/strace/files/patch-net.c
 create mode 100644 devel/strace/files/patch-syscall.c
 create mode 100644 devel/strace/files/patch-time.c

diff --git a/devel/strace/Makefile b/devel/strace/Makefile
index b81d4603b371..3f4e424cd18b 100644
--- a/devel/strace/Makefile
+++ b/devel/strace/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	strace
 PORTVERSION=	4.5.18
+PORTREVISION=	1
 CATEGORIES=	devel sysutils
 MASTER_SITES=	SF
 
diff --git a/devel/strace/files/patch-net.c b/devel/strace/files/patch-net.c
new file mode 100644
index 000000000000..4190aa1801af
--- /dev/null
+++ b/devel/strace/files/patch-net.c
@@ -0,0 +1,18 @@
+--- net.c.orig	2008-11-21 00:18:27.000000000 +0800
++++ net.c	2008-11-21 00:18:47.000000000 +0800
+@@ -1134,6 +1134,7 @@
+ 			free(cmsg);
+ 			return;
+ 		}
++#ifdef SCM_CREDENTIALS
+ 		if (cmsg->cmsg_type == SCM_CREDENTIALS
+ 		    && CMSG_LEN(sizeof(struct ucred)) <= cmsg_len) {
+ 			struct ucred *uc = (struct ucred *) CMSG_DATA (cmsg);
+@@ -1143,6 +1144,7 @@
+ 			free(cmsg);
+ 			return;
+ 		}
++#endif
+ 	}
+ 	free(cmsg);
+ 	tprintf(", ...}");
diff --git a/devel/strace/files/patch-syscall.c b/devel/strace/files/patch-syscall.c
new file mode 100644
index 000000000000..0a7333a2a782
--- /dev/null
+++ b/devel/strace/files/patch-syscall.c
@@ -0,0 +1,15 @@
+--- syscall.c.orig	2008-11-20 23:43:57.000000000 +0800
++++ syscall.c	2008-11-20 23:46:37.000000000 +0800
+@@ -716,8 +716,10 @@
+ 	   )
+ 		return internal_exec(tcp);
+ 
+-	if (   sys_waitpid == func
+-	    || sys_wait4 == func
++	if (   sys_wait4 == func
++#if defined(LINUX)
++	    || sys_waitpid == func
++#endif
+ #if defined(SVR4) || defined(FREEBSD) || defined(SUNOS4)
+ 	    || sys_wait == func
+ #endif
diff --git a/devel/strace/files/patch-time.c b/devel/strace/files/patch-time.c
new file mode 100644
index 000000000000..16cf7619da0e
--- /dev/null
+++ b/devel/strace/files/patch-time.c
@@ -0,0 +1,18 @@
+--- time.c.orig	2008-11-21 01:06:16.000000000 +0800
++++ time.c	2008-11-21 01:06:46.000000000 +0800
+@@ -36,6 +36,7 @@
+ #include <sys/timex.h>
+ #include <linux/ioctl.h>
+ #include <linux/rtc.h>
++#endif /* LINUX */
+ 
+ #ifndef UTIME_NOW
+ #define UTIME_NOW ((1l << 30) - 1l)
+@@ -43,7 +44,6 @@
+ #ifndef UTIME_OMIT
+ #define UTIME_OMIT ((1l << 30) - 2l)
+ #endif
+-#endif /* LINUX */
+ 
+ struct timeval32
+ {
-- 
cgit