From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Nov 20 17:30:02 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 853931065672 for ; Thu, 20 Nov 2008 17:30:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 5CB1C8FC17 for ; Thu, 20 Nov 2008 17:30:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id mAKHU1gI024664 for ; Thu, 20 Nov 2008 17:30:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id mAKHU16e024663; Thu, 20 Nov 2008 17:30:01 GMT (envelope-from gnats) Resent-Date: Thu, 20 Nov 2008 17:30:01 GMT Resent-Message-Id: <200811201730.mAKHU16e024663@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Yi-Jheng Lin Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 66F51106564A for ; Thu, 20 Nov 2008 17:26:43 +0000 (UTC) (envelope-from yzlin@cs.nctu.edu.tw) Received: from csmailgate.cs.nctu.edu.tw (csmailgate.cs.nctu.edu.tw [140.113.235.103]) by mx1.freebsd.org (Postfix) with ESMTP id EF4918FC0C for ; Thu, 20 Nov 2008 17:26:42 +0000 (UTC) (envelope-from yzlin@cs.nctu.edu.tw) Received: from bsd5.cs.nctu.edu.tw (bsd5 [140.113.235.135]) by csmailgate.cs.nctu.edu.tw (Postfix) with ESMTP id 0E61E104A65; Fri, 21 Nov 2008 01:26:42 +0800 (CST) Received: (from yzlin@localhost) by bsd5.cs.nctu.edu.tw (8.14.2/8.14.2/Submit) id mAKHQcP9086508; Fri, 21 Nov 2008 01:26:38 +0800 (CST) (envelope-from yzlin) Message-Id: <200811201726.mAKHQcP9086508@bsd5.cs.nctu.edu.tw> Date: Fri, 21 Nov 2008 01:26:38 +0800 (CST) From: Yi-Jheng Lin To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: pgollucci@FreeBSD.org Subject: ports/129019: [PATCH] devel/strace: update to 4.5.18 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Nov 2008 17:30:02 -0000 >Number: 129019 >Category: ports >Synopsis: [PATCH] devel/strace: update to 4.5.18 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Thu Nov 20 17:30:01 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Yi-Jheng Lin >Release: FreeBSD 7.0-RELEASE-p4 i386 >Organization: NCTU CS >Environment: System: FreeBSD bsd5 7.0-RELEASE-p4 FreeBSD 7.0-RELEASE-p4 #2: Thu Sep 4 09:56:24 CST >Description: - Update to 4.5.18 Added file(s): - files/patch-net.c - files/patch-syscall.c - files/patch-time.c Port maintainer (pgollucci@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- strace-4.5.18.patch begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/devel/strace/Makefile,v retrieving revision 1.24 diff -u -r1.24 Makefile --- Makefile 21 Aug 2008 06:16:51 -0000 1.24 +++ Makefile 20 Nov 2008 17:24:13 -0000 @@ -6,7 +6,7 @@ # PORTNAME= strace -PORTVERSION= 4.5.7 +PORTVERSION= 4.5.18 CATEGORIES= devel sysutils MASTER_SITES= SF @@ -23,24 +23,22 @@ MAN1= strace.1 .if !defined(NOPORTDOCS) -PORTDOCS= * +PORTDOCS= AUTHORS COPYRIGHT CREDITS ChangeLog NEWS PORTING \ + README README-freebsd README-svr4 TODO .endif post-patch: ${REINPLACE_CMD} 's,/usr/bin/perl,${PERL},' ${WRKSRC}/strace-graph do-install: - ${MKDIR} ${PREFIX}/bin + @${MKDIR} ${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/strace ${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/strace-graph ${PREFIX}/bin - ${MKDIR} ${PREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/strace.1 ${PREFIX}/man/man1 + @${MKDIR} ${MANPREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/strace.1 ${MANPREFIX}/man/man1 .if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} -.for i in AUTHORS COPYRIGHT CREDITS ChangeLog NEWS PORTING \ - README README-freebsd README-svr4 TODO - ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} -.endfor + @${MKDIR} ${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR} .endif .include Index: distinfo =================================================================== RCS file: /home/ncvs/ports/devel/strace/distinfo,v retrieving revision 1.11 diff -u -r1.11 distinfo --- distinfo 30 Dec 2007 15:49:07 -0000 1.11 +++ distinfo 20 Nov 2008 17:24:13 -0000 @@ -1,3 +1,3 @@ -MD5 (strace-4.5.7.tar.bz2) = b1829d858b6cd7072f9b2fa9c17a2346 -SHA256 (strace-4.5.7.tar.bz2) = 4545d7118869c143d9875dfc8414eb6eb2176c35ec5d7f1e327372bd40a6ef1e -SIZE (strace-4.5.7.tar.bz2) = 414738 +MD5 (strace-4.5.18.tar.bz2) = e9449fcee97e6a8ed73934c883c870e0 +SHA256 (strace-4.5.18.tar.bz2) = 95e7b7470e04f22c3ec8dc6d0b1fdd8944306cb5313c84c4545cd83abada26d0 +SIZE (strace-4.5.18.tar.bz2) = 480973 Index: files/patch-file.c =================================================================== RCS file: /home/ncvs/ports/devel/strace/files/patch-file.c,v retrieving revision 1.1 diff -u -r1.1 patch-file.c --- files/patch-file.c 4 Jan 2004 19:37:55 -0000 1.1 +++ files/patch-file.c 20 Nov 2008 17:24:13 -0000 @@ -1,6 +1,6 @@ ---- file.c.orig Thu Nov 13 23:32:27 2003 -+++ file.c Fri Jan 2 19:11:23 2004 -@@ -1387,7 +1387,7 @@ +--- file.c.orig 2008-08-01 09:13:10.000000000 +0800 ++++ file.c 2008-11-21 00:16:35.000000000 +0800 +@@ -1656,7 +1656,7 @@ statbuf.f_bsize, statbuf.f_blocks, statbuf.f_bfree); tprintf("f_bavail=%u, f_files=%u, f_ffree=%u, f_fsid={%d, %d}, f_namelen=%u", statbuf.f_bavail,statbuf.f_files, statbuf.f_ffree, @@ -9,7 +9,7 @@ statbuf.f_namelen); #else /* !ALPHA */ tprintf("{f_type=%s, f_bsize=%lu, f_blocks=%lu, f_bfree=%lu, ", -@@ -1399,7 +1399,7 @@ +@@ -1668,7 +1668,7 @@ (unsigned long)statbuf.f_bavail, (unsigned long)statbuf.f_files, (unsigned long)statbuf.f_ffree, @@ -18,3 +18,35 @@ #ifdef LINUX tprintf(", f_namelen=%lu", (unsigned long)statbuf.f_namelen); #endif /* LINUX */ +@@ -2856,6 +2856,7 @@ + } + + ++#ifdef LINUX + static const struct xlat advise[] = { + { POSIX_FADV_NORMAL, "POSIX_FADV_NORMAL" }, + { POSIX_FADV_RANDOM, "POSIX_FADV_RANDOM" }, +@@ -2865,6 +2866,7 @@ + { POSIX_FADV_NOREUSE, "POSIX_FADV_NOREUSE" }, + { 0, NULL } + }; ++#endif + + + #ifdef LINUX +@@ -2888,6 +2890,7 @@ + #endif + + ++#ifdef LINUX + int + sys_fadvise64_64(tcp) + struct tcb *tcp; +@@ -2909,6 +2912,7 @@ + } + return 0; + } ++#endif + + #ifdef LINUX + static const struct xlat inotify_modes[] = { Index: files/patch-net.c =================================================================== RCS file: files/patch-net.c diff -N files/patch-net.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-net.c 20 Nov 2008 17:24:13 -0000 @@ -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(", ...}"); Index: files/patch-sock.c =================================================================== RCS file: /home/ncvs/ports/devel/strace/files/patch-sock.c,v retrieving revision 1.1 diff -u -r1.1 patch-sock.c --- files/patch-sock.c 20 Dec 2007 20:40:26 -0000 1.1 +++ files/patch-sock.c 20 Nov 2008 17:24:13 -0000 @@ -1,10 +1,39 @@ ---- sock.c.orig 2007-12-20 16:31:01.000000000 +0000 -+++ sock.c 2007-12-20 16:31:23.000000000 +0000 -@@ -44,6 +44,7 @@ +--- sock.c.orig 2007-05-24 14:33:11.000000000 +0800 ++++ sock.c 2008-11-21 00:51:02.000000000 +0800 +@@ -45,7 +45,9 @@ #include #endif #endif +#include #include ++#include + + extern const struct xlat addrfams[]; + +@@ -55,16 +57,26 @@ + { IFF_DEBUG, "IFF_DEBUG" }, + { IFF_LOOPBACK, "IFF_LOOPBACK" }, + { IFF_POINTOPOINT, "IFF_POINTOPOINT" }, ++#ifdef IFF_NOTRAILERS + { IFF_NOTRAILERS, "IFF_NOTRAILERS" }, ++#endif + { IFF_RUNNING, "IFF_RUNNING" }, + { IFF_NOARP, "IFF_NOARP" }, + { IFF_PROMISC, "IFF_PROMISC" }, + { IFF_ALLMULTI, "IFF_ALLMULTI" }, ++#ifdef IFF_MASTER + { IFF_MASTER, "IFF_MASTER" }, ++#endif ++#ifdef IFF_SLAVE + { IFF_SLAVE, "IFF_SLAVE" }, ++#endif + { IFF_MULTICAST, "IFF_MULTICAST" }, ++#ifdef IFF_PORTSEL + { IFF_PORTSEL, "IFF_PORTSEL" }, ++#endif ++#ifdef IFF_AUTOMEDIA + { IFF_AUTOMEDIA, "IFF_AUTOMEDIA" }, ++#endif + { 0, NULL } + }; - extern struct xlat addrfams[]; Index: files/patch-strace.c =================================================================== RCS file: /home/ncvs/ports/devel/strace/files/patch-strace.c,v retrieving revision 1.1 diff -u -r1.1 patch-strace.c --- files/patch-strace.c 12 Apr 2005 07:55:40 -0000 1.1 +++ files/patch-strace.c 20 Nov 2008 17:24:13 -0000 @@ -1,26 +1,26 @@ ---- strace.c.orig Sun Dec 26 14:49:34 2004 -+++ strace.c Sun Dec 26 16:33:21 2004 -@@ -539,6 +539,23 @@ - cleanup(); - exit(1); - } +--- strace.c.orig 2008-08-19 12:47:50.000000000 +0800 ++++ strace.c 2008-11-20 22:48:39.000000000 +0800 +@@ -604,6 +604,23 @@ + cleanup(); + exit(1); + } +#ifdef FREEBSD -+ { -+ int status; -+ pid_t err; ++ { ++ int status; ++ pid_t err; + -+ do { -+ err = waitpid(pid, &status, WUNTRACED); -+ } while (err == -1 && errno == EINTR); -+ if (err == -1) { -+ fprintf(stderr, -+ "waitpid() failed: %s\n", -+ strerror(errno)); -+ cleanup(); -+ exit(1); -+ } ++ do { ++ err = waitpid(pid, &status, WUNTRACED); ++ } while (err == -1 && errno == EINTR); ++ if (err == -1) { ++ fprintf(stderr, ++ "waitpid() failed: %s\n", ++ strerror(errno)); ++ cleanup(); ++ exit(1); + } ++ } +#endif #ifdef USE_PROCFS - if (proc_open(tcp, 0) < 0) { - fprintf(stderr, "trouble opening proc file\n"); + if (proc_open(tcp, 0) < 0) { + fprintf(stderr, "trouble opening proc file\n"); Index: files/patch-syscall.c =================================================================== RCS file: files/patch-syscall.c diff -N files/patch-syscall.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-syscall.c 20 Nov 2008 17:24:13 -0000 @@ -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 Index: files/patch-time.c =================================================================== RCS file: files/patch-time.c diff -N files/patch-time.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-time.c 20 Nov 2008 17:24:13 -0000 @@ -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 + #include + #include ++#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 + { --- strace-4.5.18.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: