diff options
author | kim <kim@pkgsrc.org> | 2017-07-18 23:02:18 +0000 |
---|---|---|
committer | kim <kim@pkgsrc.org> | 2017-07-18 23:02:18 +0000 |
commit | 6757caa14d676d9379874912f7392425fd7decb7 (patch) | |
tree | 59897c25dc3be5b3cda43bbdefffc5e546072604 | |
parent | 0f45e43f273e8b682d0ee77b66372b0b14ae732e (diff) | |
download | pkgsrc-6757caa14d676d9379874912f7392425fd7decb7.tar.gz |
Upgrade misc/screen to version 4.6.1
Version 4.6.1 (10/07/2017):
* Fixes:
- problems with starting session in some cases
- parallel make install
- segfault when querying info on nonUTF locale
Version 4.6.0 (28/06/2017):
* Update Unicode wide tables to 9.0
* Support more serial speeds
* Improved namespaces support
* Migrate from fifos to sockets
* Start viewing scrollback at first line of output
-rw-r--r-- | misc/screen/Makefile | 4 | ||||
-rw-r--r-- | misc/screen/distinfo | 27 | ||||
-rw-r--r-- | misc/screen/patches/patch-ae | 10 | ||||
-rw-r--r-- | misc/screen/patches/patch-ai | 4 | ||||
-rw-r--r-- | misc/screen/patches/patch-aj | 10 | ||||
-rw-r--r-- | misc/screen/patches/patch-ak | 10 | ||||
-rw-r--r-- | misc/screen/patches/patch-ap | 14 | ||||
-rw-r--r-- | misc/screen/patches/patch-doc_screen.texinfo | 15 | ||||
-rw-r--r-- | misc/screen/patches/patch-screen.c | 8 | ||||
-rw-r--r-- | misc/screen/patches/patch-socket.c | 12 | ||||
-rw-r--r-- | misc/screen/patches/patch-tty.sh | 10 |
11 files changed, 54 insertions, 70 deletions
diff --git a/misc/screen/Makefile b/misc/screen/Makefile index a2cdd2fef33..701dcde8164 100644 --- a/misc/screen/Makefile +++ b/misc/screen/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.102 2017/07/18 10:35:28 kim Exp $ +# $NetBSD: Makefile,v 1.103 2017/07/18 23:02:18 kim Exp $ -DISTNAME= screen-4.5.1 +DISTNAME= screen-4.6.1 #PKGREVISION= 1 CATEGORIES= misc shells MASTER_SITES= ${MASTER_SITE_GNU:=screen/} diff --git a/misc/screen/distinfo b/misc/screen/distinfo index 58709248a02..fdaf52a8e3c 100644 --- a/misc/screen/distinfo +++ b/misc/screen/distinfo @@ -1,21 +1,20 @@ -$NetBSD: distinfo,v 1.46 2017/04/15 22:31:49 kim Exp $ +$NetBSD: distinfo,v 1.47 2017/07/18 23:02:18 kim Exp $ -SHA1 (screen-4.5.1.tar.gz) = d096ea40c7a349ec46f3bd4fcc02fd6a873318e6 -RMD160 (screen-4.5.1.tar.gz) = 2e8aa5ec158fc7d240df176dff0b9ddfcbfc9056 -SHA512 (screen-4.5.1.tar.gz) = ca53477ad38264be38efb1d10a1337b647dd061127162c77533b17a30d046cd0caabe38e4a9e5389aac30d5dc62eb53e7877411e69adae36d0ca869bd0a82804 -Size (screen-4.5.1.tar.gz) = 963153 bytes +SHA1 (screen-4.6.1.tar.gz) = 444dae1c6d2ff0b7dfd774b4e53e49c69de811ee +RMD160 (screen-4.6.1.tar.gz) = a1177ec2938c06d9d660cc7c05d002c9a702b014 +SHA512 (screen-4.6.1.tar.gz) = e5d029400ed5b509ebddc1f55812c33536d6f5ce91119537c7d06e1fa7dee84939c43337df4638f61c818ce0412f4d08fe212202162a4483a9e84bbc4b3e4336 +Size (screen-4.6.1.tar.gz) = 848979 bytes SHA1 (patch-aa) = 39c6fa5bda62b2891cecf4a5e9598b179ea8b4dc SHA1 (patch-ab) = 40911979a540645db2a17861328292add22898d3 -SHA1 (patch-ae) = 8792f7877c0a29701d7d0643e93360813ed7db0f -SHA1 (patch-ai) = d93147f4e8a2026a1892c3cbd14a929d81e0e635 -SHA1 (patch-aj) = e9996135629085c44867b9264648b2b507e91f98 -SHA1 (patch-ak) = 31982e692cabf25be31bd1758fe1aeb1a4787629 +SHA1 (patch-ae) = 2a9b19c52cafe238c923977c9952af0ec0b0d9f6 +SHA1 (patch-ai) = edefc44e47066dc89bda22a94d417511f46f0190 +SHA1 (patch-aj) = 446b07f7f418dd0c83fb5bc6246a01cc4417b03b +SHA1 (patch-ak) = 1aaf82f7fe666d86a9f4ab7d6f7222e895a17bba SHA1 (patch-al) = caabc33ee51922d97edac19346ad9d80fabb164b SHA1 (patch-am) = a721e311e7dde7938de0e9546a7892bfd104ebd1 SHA1 (patch-an) = bda6c65148410a6c9a13afd8ad34f93e33731552 SHA1 (patch-ao) = 91eecb62351aff720447eb48ea85aae70b62f9b6 -SHA1 (patch-ap) = 4176e95502754206d6840ce228c61371df947650 -SHA1 (patch-doc_screen.texinfo) = ddce313668c7f9d27973e62042dcdc11f23307b5 -SHA1 (patch-screen.c) = fa54bfdbefcf74944a677ab4b6636d0072e57267 -SHA1 (patch-socket.c) = 09683cee3685a5c6d625e86aa97f6a09f4280b56 -SHA1 (patch-tty.sh) = 93b1fe856cf16640295cb822d60118dbd3734602 +SHA1 (patch-ap) = 1f11b50826b3e4d61540351911d21214d3ab83cc +SHA1 (patch-screen.c) = de5d8468100ab88cbdb842e21b04b00221e798b8 +SHA1 (patch-socket.c) = ef7d3cb14f0199383c0e750af48f19537eb0b36d +SHA1 (patch-tty.sh) = 6d0d8f60740a3f7167d3d064a8979858a9b01bb0 diff --git a/misc/screen/patches/patch-ae b/misc/screen/patches/patch-ae index 806f0534681..7c44eb926e3 100644 --- a/misc/screen/patches/patch-ae +++ b/misc/screen/patches/patch-ae @@ -1,13 +1,13 @@ -$NetBSD: patch-ae,v 1.6 2015/02/13 04:44:40 rodent Exp $ +$NetBSD: patch-ae,v 1.7 2017/07/18 23:02:18 kim Exp $ Don't pollute G1 to allow 8-bit encondings. The original code made the TERMCAP env var longer than 1023 bytes, which causes problems. This is a quick hack but works with our termcap. ---- termcap.c.orig 2014-04-26 10:58:35.000000000 +0000 -+++ termcap.c -@@ -80,7 +80,7 @@ static const char TermcapConst[] = "\\\n +--- termcap.c.orig 2017-07-10 19:26:25.000000000 +0000 ++++ termcap.c 2017-07-18 22:44:38.000000000 +0000 +@@ -79,7 +79,7 @@ \t:DO=\\E[%dB:LE=\\E[%dD:RI=\\E[%dC:UP=\\E[%dA:bs:bt=\\E[Z:\\\n\ \t:cd=\\E[J:ce=\\E[K:cl=\\E[H\\E[J:cm=\\E[%i%d;%dH:ct=\\E[3g:\\\n\ \t:do=^J:nd=\\E[C:pt:rc=\\E8:rs=\\Ec:sc=\\E7:st=\\EH:up=\\EM:\\\n\ @@ -16,7 +16,7 @@ which causes problems. This is a quick hack but works with our termcap. char * gettermcapstring(s) -@@ -826,7 +826,7 @@ char *s; +@@ -825,7 +825,7 @@ { register int n; diff --git a/misc/screen/patches/patch-ai b/misc/screen/patches/patch-ai index f741d0cf651..8402d3f1607 100644 --- a/misc/screen/patches/patch-ai +++ b/misc/screen/patches/patch-ai @@ -1,6 +1,6 @@ -$NetBSD: patch-ai,v 1.7 2016/06/20 16:04:44 ryoon Exp $ +$NetBSD: patch-ai,v 1.8 2017/07/18 23:02:18 kim Exp $ -This glues in the code from patch-am (see also path-al and patch-an). +This glues in the code from patch-am (see also patch-al and patch-an). --- os.h.orig 2016-06-19 19:41:03.000000000 +0000 +++ os.h diff --git a/misc/screen/patches/patch-aj b/misc/screen/patches/patch-aj index 728d1b7610f..91f7c162799 100644 --- a/misc/screen/patches/patch-aj +++ b/misc/screen/patches/patch-aj @@ -1,13 +1,13 @@ -$NetBSD: patch-aj,v 1.9 2015/09/01 13:34:47 kim Exp $ +$NetBSD: patch-aj,v 1.10 2017/07/18 23:02:18 kim Exp $ Include curses header when testing tgetent in order to prevent crash on 64-bit architectures. Detect getutent correctly on NetBSD with utmpx. ---- configure.ac.orig 2015-06-28 21:22:55.000000000 +0000 -+++ configure.ac 2015-09-01 12:49:26.000000000 +0000 -@@ -687,6 +687,8 @@ +--- configure.ac.orig 2017-07-10 19:26:25.000000000 +0000 ++++ configure.ac 2017-07-18 22:50:46.000000000 +0000 +@@ -661,6 +661,8 @@ AC_MSG_ERROR(!!! no tgetent - no screen))))))))) AC_TRY_RUN([ @@ -16,7 +16,7 @@ Detect getutent correctly on NetBSD with utmpx. main() { exit(strcmp(tgoto("%p1%d", 0, 1), "1") ? 0 : 1); -@@ -838,9 +840,16 @@ +@@ -812,9 +814,16 @@ AC_TRY_LINK([ #include <time.h> /* to get time_t on SCO */ #include <sys/types.h> diff --git a/misc/screen/patches/patch-ak b/misc/screen/patches/patch-ak index 8a71b401165..d1ca742c7fb 100644 --- a/misc/screen/patches/patch-ak +++ b/misc/screen/patches/patch-ak @@ -1,4 +1,4 @@ -$NetBSD: patch-ak,v 1.8 2015/09/01 13:34:47 kim Exp $ +$NetBSD: patch-ak,v 1.9 2017/07/18 23:02:18 kim Exp $ Patch configure after configure.ac (see patch-aj). @@ -7,9 +7,9 @@ crash on 64-bit architectures. Detect getutent correctly on NetBSD with utmpx. ---- configure.orig 2015-06-28 21:42:40.000000000 +0000 -+++ configure 2015-09-01 13:12:22.000000000 +0000 -@@ -5018,6 +5018,8 @@ +--- configure.orig 2017-07-10 19:26:25.000000000 +0000 ++++ configure 2017-07-18 22:50:46.000000000 +0000 +@@ -4985,6 +4985,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -18,7 +18,7 @@ Detect getutent correctly on NetBSD with utmpx. main() { exit(strcmp(tgoto("%p1%d", 0, 1), "1") ? 0 : 1); -@@ -5414,9 +5416,16 @@ +@@ -5381,9 +5383,16 @@ #include <time.h> /* to get time_t on SCO */ #include <sys/types.h> diff --git a/misc/screen/patches/patch-ap b/misc/screen/patches/patch-ap index f3a4cd9e5ed..e98e0b2deff 100644 --- a/misc/screen/patches/patch-ap +++ b/misc/screen/patches/patch-ap @@ -1,4 +1,4 @@ -$NetBSD: patch-ap,v 1.7 2016/06/20 16:04:44 ryoon Exp $ +$NetBSD: patch-ap,v 1.8 2017/07/18 23:02:18 kim Exp $ Replace configurable paths with tags. @@ -9,9 +9,9 @@ YOU MUST RUN DIFF BEFORE SUBSTITUTIONS! RUNNING "make patch" TAKES YOU TOO FAR. ---- doc/screen.1.orig 2016-06-19 19:41:03.000000000 +0000 -+++ doc/screen.1 -@@ -636,7 +636,7 @@ Show a listing of all currently attached +--- doc/screen.1.orig 2017-07-10 19:26:25.000000000 +0000 ++++ doc/screen.1 2017-07-18 22:44:38.000000000 +0000 +@@ -712,7 +712,7 @@ .SH CUSTOMIZATION The \*Qsocket directory\*U defaults either to $HOME/.screen or simply to @@ -20,7 +20,7 @@ RUNNING "make patch" TAKES YOU TOO FAR. .I screen is installed setuid-root, then the administrator should compile -@@ -649,7 +649,7 @@ in the environment variable $SCREENDIR. +@@ -725,7 +725,7 @@ When .I screen is invoked, it executes initialization commands from the files @@ -29,7 +29,7 @@ RUNNING "make patch" TAKES YOU TOO FAR. \*Q.screenrc\*U in the user's home directory. These are the \*Qprogrammer's defaults\*U that can be overridden in the following ways: for the global screenrc file -@@ -679,7 +679,7 @@ variable substitution shall be performed +@@ -755,7 +755,7 @@ protected from variable substitution. .PP Two configuration files are shipped as examples with your screen distribution: @@ -38,7 +38,7 @@ RUNNING "make patch" TAKES YOU TOO FAR. useful examples for various commands. .PP Customization can also be done 'on-line'. To enter the command mode type -@@ -4903,14 +4903,14 @@ Examples in the +@@ -5017,14 +5017,14 @@ .I screen distribution package for private and global initialization files. .IP $SYSSCREENRC diff --git a/misc/screen/patches/patch-doc_screen.texinfo b/misc/screen/patches/patch-doc_screen.texinfo deleted file mode 100644 index 65e1762e647..00000000000 --- a/misc/screen/patches/patch-doc_screen.texinfo +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-doc_screen.texinfo,v 1.1 2017/04/15 22:31:49 kim Exp $ - ---- doc/screen.texinfo.orig 2017-02-25 15:35:35.000000000 +0000 -+++ doc/screen.texinfo 2017-04-15 22:26:36.000000000 +0000 -@@ -5796,8 +5796,8 @@ - ============ - - @example -- Thomas Renninger <treen@suse.com>, -- Axel Beckert <abe@deuxchevaux.org>, -+ Thomas Renninger <treen@@suse.com>, -+ Axel Beckert <abe@@deuxchevaux.org>, - Ken Beal <kbeal@@amber.ssd.csd.harris.com>, - Rudolf Koenig <rfkoenig@@informatik.uni-erlangen.de>, - Toerless Eckert <eckert@@informatik.uni-erlangen.de>, diff --git a/misc/screen/patches/patch-screen.c b/misc/screen/patches/patch-screen.c index e3aa44a15f7..51bc04f7734 100644 --- a/misc/screen/patches/patch-screen.c +++ b/misc/screen/patches/patch-screen.c @@ -1,10 +1,10 @@ -$NetBSD: patch-screen.c,v 1.4 2017/04/15 22:31:49 kim Exp $ +$NetBSD: patch-screen.c,v 1.5 2017/07/18 23:02:18 kim Exp $ Use standard headers. ---- screen.c.orig 2017-01-17 19:28:29.000000000 +0000 -+++ screen.c -@@ -88,6 +88,8 @@ +--- screen.c.orig 2017-07-10 19:26:25.000000000 +0000 ++++ screen.c 2017-07-18 22:40:56.000000000 +0000 +@@ -95,6 +95,8 @@ # include <langinfo.h> #endif diff --git a/misc/screen/patches/patch-socket.c b/misc/screen/patches/patch-socket.c index 557e82db44a..16a5a18027c 100644 --- a/misc/screen/patches/patch-socket.c +++ b/misc/screen/patches/patch-socket.c @@ -1,15 +1,15 @@ -$NetBSD: patch-socket.c,v 1.2 2015/09/01 13:34:47 kim Exp $ +$NetBSD: patch-socket.c,v 1.3 2017/07/18 23:02:18 kim Exp $ ---- socket.c.orig 2015-06-28 21:22:56.000000000 +0000 -+++ socket.c 2015-09-01 12:42:34.000000000 +0000 -@@ -32,9 +32,7 @@ +--- socket.c.orig 2017-07-10 19:26:25.000000000 +0000 ++++ socket.c 2017-07-18 22:35:40.000000000 +0000 +@@ -34,9 +34,7 @@ + #include <sys/stat.h> #include <fcntl.h> - #if !defined(NAMEDPIPE) # include <sys/socket.h> -# ifdef _OpenBSD_ -# include <sys/uio.h> -# endif +# include <sys/uio.h> # include <sys/un.h> - #endif + #ifndef SIGINT diff --git a/misc/screen/patches/patch-tty.sh b/misc/screen/patches/patch-tty.sh index 168bf9010f2..96a0445dfda 100644 --- a/misc/screen/patches/patch-tty.sh +++ b/misc/screen/patches/patch-tty.sh @@ -1,13 +1,13 @@ -$NetBSD: patch-tty.sh,v 1.3 2016/06/20 16:04:44 ryoon Exp $ +$NetBSD: patch-tty.sh,v 1.4 2017/07/18 23:02:18 kim Exp $ Change condition for using TIOCSCTTY. NetBSD on the netbsd-5 branch insists on a non-NULL second argument to the realpath() function. Make it so. ---- tty.sh.orig 2016-06-19 19:41:03.000000000 +0000 -+++ tty.sh -@@ -813,7 +813,8 @@ int fd; +--- tty.sh.orig 2017-07-10 19:26:25.000000000 +0000 ++++ tty.sh 2017-07-18 22:40:56.000000000 +0000 +@@ -813,7 +813,8 @@ /* * Under BSD we have to set the controlling terminal again explicitly. */ @@ -17,7 +17,7 @@ to the realpath() function. Make it so. ioctl(fd, TIOCSCTTY, (char *)0); # endif -@@ -1510,8 +1511,10 @@ char *tty; +@@ -1521,8 +1522,10 @@ char realbuf[PATH_MAX]; const char *real; int rc; |