diff options
| -rw-r--r-- | misc/tmux/Makefile | 4 | ||||
| -rw-r--r-- | misc/tmux/distinfo | 13 | ||||
| -rw-r--r-- | misc/tmux/patches/patch-configure | 20 | ||||
| -rw-r--r-- | misc/tmux/patches/patch-osdep-darwin.c | 14 |
4 files changed, 35 insertions, 16 deletions
diff --git a/misc/tmux/Makefile b/misc/tmux/Makefile index 18bde2f7210..6c836d095a3 100644 --- a/misc/tmux/Makefile +++ b/misc/tmux/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.55 2020/11/01 05:15:35 khorben Exp $ +# $NetBSD: Makefile,v 1.56 2021/04/17 10:11:04 leot Exp $ -DISTNAME= tmux-3.1c +DISTNAME= tmux-3.2 CATEGORIES= misc MASTER_SITES= ${MASTER_SITE_GITHUB:=tmux/} GITHUB_RELEASE= ${PKGVERSION_NOREV} diff --git a/misc/tmux/distinfo b/misc/tmux/distinfo index 20d13f36abf..ca7f04aec63 100644 --- a/misc/tmux/distinfo +++ b/misc/tmux/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.48 2020/11/01 05:15:35 khorben Exp $ +$NetBSD: distinfo,v 1.49 2021/04/17 10:11:04 leot Exp $ -SHA1 (tmux-3.1c.tar.gz) = 7cf2736fd9c1cc9daf614679e4084d2746a15390 -RMD160 (tmux-3.1c.tar.gz) = 3c1ab6dcb1120129f66a6639214126565a7388e8 -SHA512 (tmux-3.1c.tar.gz) = aad2e6457dd350369f245f711f1936a575d0588b72e660d10e7abc7d373da0d322903b451ad00b96a3e0e6847ca855673da6a4c5447cea91fa756edd23659397 -Size (tmux-3.1c.tar.gz) = 561323 bytes +SHA1 (tmux-3.2.tar.gz) = 181d726792e0ac3c4b7ebe5befd5f995c57fbc9b +RMD160 (tmux-3.2.tar.gz) = 25a9c3db68f423d8f828207759f66f785ee10121 +SHA512 (tmux-3.2.tar.gz) = 63165495e838871c7f42ac1a6229ec2404acfa7d42c7a0070c89cb38712ac933676930392b0a10cbdd6059910ae46129257b90135c5846e85142e786482fd75e +Size (tmux-3.2.tar.gz) = 646457 bytes SHA1 (patch-compat_daemon-darwin.c) = e8feeb4b100e73ab197eb2fd776fa648a1da28e4 -SHA1 (patch-osdep-darwin.c) = 4bcb0705e3ffa87df614e0946121b0ae66ad3f53 +SHA1 (patch-configure) = 45515d95ea6fa2672b52463383161bba05d1635a +SHA1 (patch-osdep-darwin.c) = 715b1e206add7d911edec381942706220ea2fbb6 diff --git a/misc/tmux/patches/patch-configure b/misc/tmux/patches/patch-configure new file mode 100644 index 00000000000..a9bc492be56 --- /dev/null +++ b/misc/tmux/patches/patch-configure @@ -0,0 +1,20 @@ +$NetBSD: patch-configure,v 1.4 2021/04/17 10:11:04 leot Exp $ + +Avoid unportable `==' test(1) operator. + +--- configure.orig 2021-04-17 09:58:34.124050016 +0000 ++++ configure +@@ -3030,10 +3030,10 @@ fi + if test "x$enable_fuzzing" = xyes; then + $as_echo "#define NEED_FUZZING 1" >>confdefs.h + +- test "x$CC" == x && CC=clang +- test "x$FUZZING_LIBS" == x && \ ++ test "x$CC" = x && CC=clang ++ test "x$FUZZING_LIBS" = x && \ + FUZZING_LIBS="-fsanitize=fuzzer" +- test "x$SAVED_CFLAGS" == x && \ ++ test "x$SAVED_CFLAGS" = x && \ + AM_CFLAGS="-g -fsanitize=fuzzer-no-link,address" + fi + diff --git a/misc/tmux/patches/patch-osdep-darwin.c b/misc/tmux/patches/patch-osdep-darwin.c index d5595b1a31c..c4c4d3170dd 100644 --- a/misc/tmux/patches/patch-osdep-darwin.c +++ b/misc/tmux/patches/patch-osdep-darwin.c @@ -1,23 +1,21 @@ -$NetBSD: patch-osdep-darwin.c,v 1.3 2020/07/17 13:21:46 hauke Exp $ +$NetBSD: patch-osdep-darwin.c,v 1.4 2021/04/17 10:11:04 leot Exp $ No such fanciness in early (ppc) MacOS X ---- osdep-darwin.c.orig 2020-05-04 08:06:23.000000000 +0000 +--- osdep-darwin.c.orig 2021-03-02 12:07:17.000000000 +0000 +++ osdep-darwin.c -@@ -19,9 +19,11 @@ +@@ -19,8 +19,10 @@ #include <sys/types.h> #include <sys/sysctl.h> +#if !defined (__POWERPC__) #include <Availability.h> --#include <event.h> #include <libproc.h> +#endif /*__POWERPC__*/ -+#include <event.h> #include <stdlib.h> #include <string.h> #include <unistd.h> -@@ -37,7 +39,9 @@ struct event_base *osdep_event_init(void +@@ -38,7 +40,9 @@ struct event_base *osdep_event_init(void char * osdep_get_name(int fd, __unused char *tty) { @@ -28,7 +26,7 @@ No such fanciness in early (ppc) MacOS X struct proc_bsdshortinfo bsdinfo; pid_t pgrp; int ret; -@@ -71,6 +75,7 @@ osdep_get_name(int fd, __unused char *tt +@@ -72,6 +76,7 @@ osdep_get_name(int fd, __unused char *tt char * osdep_get_cwd(int fd) { @@ -36,7 +34,7 @@ No such fanciness in early (ppc) MacOS X static char wd[PATH_MAX]; struct proc_vnodepathinfo pathinfo; pid_t pgrp; -@@ -85,6 +90,7 @@ osdep_get_cwd(int fd) +@@ -86,6 +91,7 @@ osdep_get_cwd(int fd) strlcpy(wd, pathinfo.pvi_cdir.vip_path, sizeof wd); return (wd); } |