pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/sysutils/strace make this compile again.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/4c3c718a3382
branches:  trunk
changeset: 390543:4c3c718a3382
user:      christos <christos%pkgsrc.org@localhost>
date:      Tue Jan 22 22:07:33 2019 +0000

description:
make this compile again.

diffstat:

 sysutils/strace/Makefile                |    4 +-
 sysutils/strace/distinfo                |   10 +-
 sysutils/strace/patches/patch-ao        |  184 ----------------
 sysutils/strace/patches/patch-aq        |  126 -----------
 sysutils/strace/patches/patch-au        |  308 ----------------------------
 sysutils/strace/patches/patch-ba        |   69 ------
 sysutils/strace/patches/patch-process.c |  191 +++++++++++++++++
 sysutils/strace/patches/patch-signal.c  |  128 +++++++++++
 sysutils/strace/patches/patch-syscall.c |  349 ++++++++++++++++++++++++++++++++
 sysutils/strace/patches/patch-util.c    |   71 ++++++
 10 files changed, 746 insertions(+), 694 deletions(-)

diffs (truncated from 1506 to 300 lines):

diff -r a514b60a7039 -r 4c3c718a3382 sysutils/strace/Makefile
--- a/sysutils/strace/Makefile  Tue Jan 22 21:50:58 2019 +0000
+++ b/sysutils/strace/Makefile  Tue Jan 22 22:07:33 2019 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2018/08/22 09:46:41 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2019/01/22 22:07:33 christos Exp $
 #
 
 DISTNAME=              strace-4.5.15
-PKGREVISION=           11
+PKGREVISION=           12
 CATEGORIES=            sysutils
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=strace/}
 EXTRACT_SUFX=          .tar.bz2
diff -r a514b60a7039 -r 4c3c718a3382 sysutils/strace/distinfo
--- a/sysutils/strace/distinfo  Tue Jan 22 21:50:58 2019 +0000
+++ b/sysutils/strace/distinfo  Tue Jan 22 22:07:33 2019 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2017/06/29 06:33:29 wiz Exp $
+$NetBSD: distinfo,v 1.23 2019/01/22 22:07:33 christos Exp $
 
 SHA1 (strace-4.5.15.tar.bz2) = a6bd153eeb1a25a50bb5a1d92887a4911ec9ad48
 RMD160 (strace-4.5.15.tar.bz2) = 0c6aaa8820a0985d89b21a5da9578b27435c8906
@@ -18,20 +18,20 @@
 SHA1 (patch-al) = ea408e93a15c5fdd8054a65b409c60536ca928eb
 SHA1 (patch-am) = edb9a6a4b76b6f0a39427562fe96a73fea3ecf4a
 SHA1 (patch-an) = 23b55878f0f7c6b83b937219a3c730ec5c6cb7ea
-SHA1 (patch-ao) = 90c47a7437204258b7d17986f5a5a94a196d0a38
 SHA1 (patch-ap) = 8ed16f25eb9ef1c9c1499a77e7f39bf23d50e209
-SHA1 (patch-aq) = e900e4025525a598b0b1c7ce9586cd5fecd63093
 SHA1 (patch-ar) = 12b13f8b7e2054cbe57da6b502f3fe49b91de9ff
 SHA1 (patch-as) = b241a70fb33aabb8282578a124b04aca05f0d3f2
 SHA1 (patch-at) = 22107308d404984f6b1231ddca10bbc05bec864f
-SHA1 (patch-au) = f457bd074e88dd457c16b921645f42fd744d3cb7
 SHA1 (patch-av) = 7356db4dfc2f49d75f6bd2e7968ec053f2f3cbff
 SHA1 (patch-aw) = 31f8ddd02911ce083afe7927e99d9f76994a8451
 SHA1 (patch-ax) = c1202f287e53a7b94fa4778692192de3ae06de7c
 SHA1 (patch-ay) = 9a6942117fc4d26a9256a573559597560295d9c0
 SHA1 (patch-az) = af6272c48668785dffd7c5b42b8fa2c8edb562d0
-SHA1 (patch-ba) = be8e2f79bd8818b99bdce63fb73802f1a4014b2f
 SHA1 (patch-bb) = e7e309d96ec9fa2398a968f29f7e6549ff81e37e
 SHA1 (patch-bc) = 7eece85b62383a0f6cb3b8e9dbe2a9a0316c6c02
 SHA1 (patch-bd) = 6ad13b8b0130886cc87218d9acfe46d8f9fc82ef
 SHA1 (patch-be) = 6326b50b3d9be0524d67770d67530069866edd9e
+SHA1 (patch-process.c) = 99c20ea1b267f94e9d544a6ed60b0d840c86fa82
+SHA1 (patch-signal.c) = 414f003437f2b249c2c1d654c0db78a23ca37231
+SHA1 (patch-syscall.c) = d53b6515215a22ce560186a0d11081e02b939fa9
+SHA1 (patch-util.c) = fe19e41c4e7893c1b06d59f68969a2246a4f65f9
diff -r a514b60a7039 -r 4c3c718a3382 sysutils/strace/patches/patch-ao
--- a/sysutils/strace/patches/patch-ao  Tue Jan 22 21:50:58 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,184 +0,0 @@
-$NetBSD: patch-ao,v 1.4 2009/12/29 22:03:41 spz Exp $
-
---- process.c.orig     2007-01-11 23:08:38.000000000 +0100
-+++ process.c  2009-12-29 21:57:56.000000000 +0100
-@@ -40,6 +40,7 @@
- #include "defs.h"
- 
- #include <fcntl.h>
-+#include <sys/param.h>
- #include <sys/stat.h>
- #include <sys/time.h>
- #include <sys/wait.h>
-@@ -52,7 +53,7 @@
- #include <machine/reg.h>
- #endif /* SUNOS4 */
- 
--#ifdef FREEBSD
-+#ifdef ALLBSD
- #include <sys/ptrace.h>
- #endif
- 
-@@ -305,7 +306,7 @@
- 
- #endif /* HAVE_PRCTL */
- 
--#if defined(FREEBSD) || defined(SUNOS4) || defined(SVR4)
-+#if defined(ALLBSD) || defined(SUNOS4) || defined(SVR4)
- int
- sys_gethostid(tcp)
- struct tcb *tcp;
-@@ -314,7 +315,7 @@
-               return RVAL_HEX;
-       return 0;
- }
--#endif /* FREEBSD || SUNOS4 || SVR4 */
-+#endif /* ALLBSD || SUNOS4 || SVR4 */
- 
- int
- sys_sethostname(tcp)
-@@ -327,7 +328,7 @@
-       return 0;
- }
- 
--#if defined(ALPHA) || defined(FREEBSD) || defined(SUNOS4) || defined(SVR4)
-+#if defined(ALPHA) || defined(ALLBSD) || defined(SUNOS4) || defined(SVR4)
- int
- sys_gethostname(tcp)
- struct tcb *tcp;
-@@ -341,7 +342,7 @@
-       }
-       return 0;
- }
--#endif /* ALPHA || FREEBSD || SUNOS4 || SVR4 */
-+#endif /* ALPHA || ALLBSD || SUNOS4 || SVR4 */
- 
- int
- sys_setdomainname(tcp)
-@@ -1058,7 +1059,7 @@
- 
- #endif /* !USE_PROCFS */
- 
--#if defined(SUNOS4) || defined(LINUX) || defined(FREEBSD)
-+#if defined(SUNOS4) || defined(LINUX) || defined(ALLBSD)
- 
- int
- sys_vfork(tcp)
-@@ -1069,7 +1070,7 @@
-       return 0;
- }
- 
--#endif /* SUNOS4 || LINUX || FREEBSD */
-+#endif /* SUNOS4 || LINUX || ALLBSD */
- 
- #ifndef LINUX
- 
-@@ -2051,7 +2052,7 @@
- 
- #endif /* SVR4 */
- 
--#ifdef FREEBSD
-+#ifdef ALLBSD
- int
- sys_wait(tcp)
- struct tcb *tcp;
-@@ -2070,12 +2071,14 @@
- }
- #endif
- 
-+#ifndef NETBSD
- int
- sys_waitpid(tcp)
- struct tcb *tcp;
- {
-       return printwaitn(tcp, 3, 0);
- }
-+#endif
- 
- int
- sys_wait4(tcp)
-@@ -2205,7 +2208,7 @@
- #ifndef SVR4
- 
- static const struct xlat ptrace_cmds[] = {
--#ifndef FREEBSD
-+#ifndef ALLBSD
-       { PTRACE_TRACEME,       "PTRACE_TRACEME"        },
-       { PTRACE_PEEKTEXT,      "PTRACE_PEEKTEXT",      },
-       { PTRACE_PEEKDATA,      "PTRACE_PEEKDATA",      },
-@@ -2271,7 +2274,7 @@
- #endif /* !I386 */
-       { PTRACE_GETUCODE,      "PTRACE_GETUCODE"       },
- #endif /* SUNOS4 */
--#else /* FREEBSD */
-+#else /* ALLBSD */
-       { PT_TRACE_ME,          "PT_TRACE_ME"           },
-       { PT_READ_I,            "PT_READ_I"             },
-       { PT_READ_D,            "PT_READ_D"             },
-@@ -2282,20 +2285,26 @@
- #endif
-       { PT_CONTINUE,          "PT_CONTINUE"           },
-       { PT_KILL,              "PT_KILL"               },
-+#if !(defined(NETBSD) && (defined(ALPHA) || defined(SPARC) || defined(SPARC64)))
-       { PT_STEP,              "PT_STEP"               },
-+#endif
-       { PT_ATTACH,            "PT_ATTACH"             },
-       { PT_DETACH,            "PT_DETACH"             },
-       { PT_GETREGS,           "PT_GETREGS"            },
-       { PT_SETREGS,           "PT_SETREGS"            },
-       { PT_GETFPREGS,         "PT_GETFPREGS"          },
-       { PT_SETFPREGS,         "PT_SETFPREGS"          },
-+#ifdef PT_GETDBREGS
-       { PT_GETDBREGS,         "PT_GETDBREGS"          },
-+#endif
-+#ifdef PT_SETDBREGS
-       { PT_SETDBREGS,         "PT_SETDBREGS"          },
--#endif /* FREEBSD */
-+#endif
-+#endif /* ALLBSD */
-       { 0,                    NULL                    },
- };
- 
--#ifndef FREEBSD
-+#ifndef ALLBSD
- #ifndef SUNOS4_KERNEL_ARCH_KLUDGE
- static
- #endif /* !SUNOS4_KERNEL_ARCH_KLUDGE */
-@@ -2982,12 +2991,14 @@
- sys_ptrace(tcp)
- struct tcb *tcp;
- {
-+#ifndef NETBSD
-       const struct xlat *x;
-+#endif
-       long addr;
- 
-       if (entering(tcp)) {
-               printxval(ptrace_cmds, tcp->u_arg[0],
--#ifndef FREEBSD
-+#ifndef ALLBSD
-                         "PTRACE_???"
- #else
-                         "PT_???"
-@@ -2995,7 +3006,7 @@
-                       );
-               tprintf(", %lu, ", tcp->u_arg[1]);
-               addr = tcp->u_arg[2];
--#ifndef FREEBSD
-+#ifndef ALLBSD
-               if (tcp->u_arg[0] == PTRACE_PEEKUSER
-                       || tcp->u_arg[0] == PTRACE_POKEUSER) {
-                       for (x = struct_user_offsets; x->str; x++) {
-@@ -3057,10 +3068,10 @@
-               }
-       }
- #endif /* SUNOS4 */
--#ifdef FREEBSD
-+#ifdef ALLBSD
-               tprintf("%lu", tcp->u_arg[3]);
-       }
--#endif /* FREEBSD */
-+#endif /* ALLBSD */
-       return 0;
- }
- 
diff -r a514b60a7039 -r 4c3c718a3382 sysutils/strace/patches/patch-aq
--- a/sysutils/strace/patches/patch-aq  Tue Jan 22 21:50:58 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,126 +0,0 @@
-$NetBSD: patch-aq,v 1.4 2011/08/30 10:43:11 christos Exp $
-
---- signal.c.orig      2007-01-12 00:08:38.000000000 +0200
-+++ signal.c   2011-08-30 12:50:29.000000000 +0300
-@@ -36,12 +36,27 @@
- #include "defs.h"
- 
- #include <signal.h>
-+#include <sys/param.h>
- #include <sys/user.h>
- #include <fcntl.h>
- 
--#ifdef SVR4
-+#if defined(SVR4) || defined(NETBSD)
- #include <sys/ucontext.h>
- #endif /* SVR4 */
-+#ifdef NETBSD
-+#if !defined(UC_CPU) && defined(_UC_CPU)
-+#define UC_CPU _UC_CPU
-+#endif
-+#if !defined(UC_SIGMASK) && defined(_UC_SIGMASK)
-+#define UC_SIGMASK _UC_SIGMASK
-+#endif
-+#if !defined(UC_STACK) && defined(_UC_STACK)
-+#define UC_STACK _UC_STACK
-+#endif
-+#if !defined(UC_FPU) && defined(_UC_FPU)
-+#define UC_FPU _UC_FPU
-+#endif
-+#endif
- 
- #ifdef HAVE_SYS_REG_H
- # include <sys/reg.h>
-@@ -1056,14 +1071,14 @@
-       return 0;
- }
- 
--#if defined(SUNOS4) || defined(FREEBSD)
-+#if defined(SUNOS4) || defined(ALLBSD)
- int
- sys_sigblock(tcp)
- struct tcb *tcp;
- {
-       return sys_sigsetmask(tcp);
- }
--#endif /* SUNOS4 || FREEBSD */
-+#endif /* SUNOS4 || ALLBSD */
- 
- #endif /* !SVR4 */
- 
-@@ -1165,13 +1180,13 @@
-               printsignal(tcp->u_arg[0]);
-               tprintf(", ");
-               switch (tcp->u_arg[1]) {
--              case (int) SIG_ERR:
-+              case (long) SIG_ERR:
-                       tprintf("SIG_ERR");
-                       break;
--              case (int) SIG_DFL:
-+              case (long) SIG_DFL:



Home | Main Index | Thread Index | Old Index