pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/sysutils/strace
Module Name: pkgsrc
Committed By: christos
Date: Sun Oct 6 17:45:50 UTC 2019
Modified Files:
pkgsrc/sysutils/strace: distinfo
Added Files:
pkgsrc/sysutils/strace/patches: patch-desc.c patch-sock.c
Removed Files:
pkgsrc/sysutils/strace/patches: patch-ar patch-bd
Log Message:
make this compile again
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 pkgsrc/sysutils/strace/distinfo
cvs rdiff -u -r1.3 -r0 pkgsrc/sysutils/strace/patches/patch-ar
cvs rdiff -u -r1.1 -r0 pkgsrc/sysutils/strace/patches/patch-bd
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/strace/patches/patch-desc.c \
pkgsrc/sysutils/strace/patches/patch-sock.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/sysutils/strace/distinfo
diff -u pkgsrc/sysutils/strace/distinfo:1.23 pkgsrc/sysutils/strace/distinfo:1.24
--- pkgsrc/sysutils/strace/distinfo:1.23 Tue Jan 22 17:07:33 2019
+++ pkgsrc/sysutils/strace/distinfo Sun Oct 6 13:45:50 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.23 2019/01/22 22:07:33 christos Exp $
+$NetBSD: distinfo,v 1.24 2019/10/06 17:45:50 christos Exp $
SHA1 (strace-4.5.15.tar.bz2) = a6bd153eeb1a25a50bb5a1d92887a4911ec9ad48
RMD160 (strace-4.5.15.tar.bz2) = 0c6aaa8820a0985d89b21a5da9578b27435c8906
@@ -19,7 +19,6 @@ SHA1 (patch-al) = ea408e93a15c5fdd8054a6
SHA1 (patch-am) = edb9a6a4b76b6f0a39427562fe96a73fea3ecf4a
SHA1 (patch-an) = 23b55878f0f7c6b83b937219a3c730ec5c6cb7ea
SHA1 (patch-ap) = 8ed16f25eb9ef1c9c1499a77e7f39bf23d50e209
-SHA1 (patch-ar) = 12b13f8b7e2054cbe57da6b502f3fe49b91de9ff
SHA1 (patch-as) = b241a70fb33aabb8282578a124b04aca05f0d3f2
SHA1 (patch-at) = 22107308d404984f6b1231ddca10bbc05bec864f
SHA1 (patch-av) = 7356db4dfc2f49d75f6bd2e7968ec053f2f3cbff
@@ -29,9 +28,10 @@ SHA1 (patch-ay) = 9a6942117fc4d26a9256a5
SHA1 (patch-az) = af6272c48668785dffd7c5b42b8fa2c8edb562d0
SHA1 (patch-bb) = e7e309d96ec9fa2398a968f29f7e6549ff81e37e
SHA1 (patch-bc) = 7eece85b62383a0f6cb3b8e9dbe2a9a0316c6c02
-SHA1 (patch-bd) = 6ad13b8b0130886cc87218d9acfe46d8f9fc82ef
SHA1 (patch-be) = 6326b50b3d9be0524d67770d67530069866edd9e
+SHA1 (patch-desc.c) = b07f195ce3e31523d9bfcd620747bc2b5e1bdc7b
SHA1 (patch-process.c) = 99c20ea1b267f94e9d544a6ed60b0d840c86fa82
SHA1 (patch-signal.c) = 414f003437f2b249c2c1d654c0db78a23ca37231
+SHA1 (patch-sock.c) = 476f74a4d8cc970bc738955eb4654d6da0446c43
SHA1 (patch-syscall.c) = d53b6515215a22ce560186a0d11081e02b939fa9
SHA1 (patch-util.c) = fe19e41c4e7893c1b06d59f68969a2246a4f65f9
Added files:
Index: pkgsrc/sysutils/strace/patches/patch-desc.c
diff -u /dev/null pkgsrc/sysutils/strace/patches/patch-desc.c:1.1
--- /dev/null Sun Oct 6 13:45:50 2019
+++ pkgsrc/sysutils/strace/patches/patch-desc.c Sun Oct 6 13:45:50 2019
@@ -0,0 +1,50 @@
+$NetBSD: patch-desc.c,v 1.1 2019/10/06 17:45:50 christos Exp $
+
+--- desc.c.orig 2007-01-15 15:25:52.000000000 -0500
++++ desc.c 2019-10-06 13:19:12.944039233 -0400
+@@ -425,14 +425,14 @@
+ return 0;
+ }
+
+-#if defined(ALPHA) || defined(FREEBSD) || defined(SUNOS4)
++#if defined(ALPHA) || defined(ALLBSD) || defined(SUNOS4)
+ int
+ sys_getdtablesize(tcp)
+ struct tcb *tcp;
+ {
+ return 0;
+ }
+-#endif /* ALPHA || FREEBSD || SUNOS4 */
++#endif /* ALPHA || ALLBSD || SUNOS4 */
+
+ static int
+ decode_select(struct tcb *tcp, long *args, enum bitness_t bitness)
+@@ -498,7 +498,7 @@
+ outstr[0] = '\0';
+ for (i = 0; i < 3; i++) {
+ int first = 1;
+- char str[20];
++ char str[64];
+
+ tcp->auxstr = outstr;
+ arg = args[i+1];
+@@ -508,7 +508,8 @@
+ for (j = 0; j < args[0]; j++) {
+ if (FD_ISSET(j, fds)) {
+ if (first) {
+- sprintf(str, "%s%s [%u", sep,
++ snprintf(str, sizeof(str),
++ "%s%s [%u", sep,
+ i == 0 ? "in" :
+ i == 1 ? "out" :
+ "except", j);
+@@ -516,7 +517,8 @@
+ sep = ", ";
+ }
+ else
+- sprintf(str, " %u", j);
++ snprintf(str, sizeof(str),
++ " %u", j);
+ cumlen += strlen(str);
+ if (cumlen < sizeof(outstr))
+ strcat(outstr, str);
Index: pkgsrc/sysutils/strace/patches/patch-sock.c
diff -u /dev/null pkgsrc/sysutils/strace/patches/patch-sock.c:1.1
--- /dev/null Sun Oct 6 13:45:50 2019
+++ pkgsrc/sysutils/strace/patches/patch-sock.c Sun Oct 6 13:45:50 2019
@@ -0,0 +1,69 @@
+$NetBSD: patch-sock.c,v 1.1 2019/10/06 17:45:50 christos Exp $
+
+--- sock.c.orig 2005-06-01 15:02:37.000000000 -0400
++++ sock.c 2019-10-06 13:24:24.592475134 -0400
+@@ -55,20 +55,42 @@
+ { 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_SIMPLEX
++ { IFF_SIMPLEX, "IFF_SIMPLEX" },
++#endif
++#ifdef IFF_LINK0
++ { IFF_LINK0, "IFF_LINK0" },
++#endif
++#ifdef IFF_LINK1
++ { IFF_LINK1, "IFF_LINK1" },
++#endif
++#ifdef IFF_LINK2
++ { IFF_LINK2, "IFF_LINK2" },
++#endif
++#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 }
+ };
+
+-
++#ifndef ALLBSD
+ static void
+ print_addr(tcp, addr, ifr)
+ struct tcb *tcp;
+@@ -82,16 +104,19 @@
+ } else
+ printstr(tcp, addr, sizeof(ifr->ifr_addr.sa_data));
+ }
++#endif
+
+ int
+ sock_ioctl(tcp, code, arg)
+ struct tcb *tcp;
+ long code, arg;
+ {
+- struct ifreq ifr;
+ struct ifconf ifc;
++#ifndef ALLBSD
++ struct ifreq ifr;
+ const char *str = NULL;
+ unsigned char *bytes;
++#endif
+
+ if (entering(tcp)) {
+ if (code == SIOCGIFCONF) {
Home |
Main Index |
Thread Index |
Old Index