From nobody Thu Mar 17 23:44:41 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 3D10D1A1DC9E; Thu, 17 Mar 2022 23:44:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KKNzF68Njz4lqZ; Thu, 17 Mar 2022 23:44:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647560681; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rqECcUyroJlouUH/N5kY3NSyuhF5ItRyQ0h395G7N5o=; b=UkA9V1Z2s1LAtQ9hTklz6PAhoEerj7Mu61SkB1cdTRNkhL+lpDPYUgH8ch2KSLAzDvbq47 zcCwdHFjSf5GE93aPtzBc3EIrTSGPVpyaogdkKSiqDbx2tMorG+hZHbwsbhbhyewSzx1q5 qf6Y6+KmnR4HZIPbUmrc18+qId+9NLhyo9QyCXDFrH8+1JVHJn+c0UC5k+nh4kyFK5ciSc Rdv3NyZ47DOFlvT3du0QE0cEEkJFS2GGRrqpAXSBDvssWWyDRTZO9/2maWTiIY6KEe9V1C +yOy6STvai8hLUOAsWnM9gAWp6Hn2i1mrFoIh8fm0vVonU9Dk2BFXm7v+7cidw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AF05714075; Thu, 17 Mar 2022 23:44:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22HNifxD099253; Thu, 17 Mar 2022 23:44:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22HNifI6099252; Thu, 17 Mar 2022 23:44:41 GMT (envelope-from git) Date: Thu, 17 Mar 2022 23:44:41 GMT Message-Id: <202203172344.22HNifI6099252@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: 9bdc78861688 - main - sysutils/screen: Update to 4.9.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9bdc788616889d0a2b3f9c8b8996610cdfe82be7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647560681; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rqECcUyroJlouUH/N5kY3NSyuhF5ItRyQ0h395G7N5o=; b=a/yZiMEvRcND+fmp3dkijpenugg9Q5lxGZbnaeITe3ROEfahVg9KndLEyEJQbThWi0h/nv 2Y45AxBQvxOfkenzkdumE+2RDN6nVHlh0X1bxRkZ/o/TDfs2etakTv5cFTVNK3HjOqAVoF O2OhyXbnuGakfptZ06vJn5HC4Bazg+gqA3FWg784Z3+evNxVe+0d8ucBOff6oAwBHkLhWy 4ONAE9+cO0vdayZk90fYyC+BSFbOxY4l+hJEsmx4PUdgFt6KOZ5SB6s+syuMFvHN8puLlG QYBnDjQHiQlBPnH51VfDj7KRnwqAhzrlGz2GOU8/l4OYtOWzqTfG0xD+AdqpLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647560681; a=rsa-sha256; cv=none; b=vZYsMIO4leGXNUaP7ReJUIjIG5KlGq/2mSR03eFBUxVRBCstTkGvlN3p0i8OnJMp2HRRLd 0mFbi7A2WO6ZzVC0vzFL2+REDUAWTysjD0RSEmNNKRvGMA3Q8WddpR/nZAWwGBPz2E6ZLI p7OWCkfRBBriZXURtPQir85/SOw1bktf4XRe/5Dfl8fOeg2oPXEkXYDVV5Nfh8npkXbcMB KVE2rh9o8dJTWtl3umz1Sa4N/CT88/Ar+NJ78mKSnUPzbmSYfk48Ued6XcJ5zWQfvifNt9 5V6dQzRGOvwvijy3xDkPV5Z/IxfvDK+6B4aTyXohoF6cEbv80vhaCFepyB36aQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=9bdc788616889d0a2b3f9c8b8996610cdfe82be7 commit 9bdc788616889d0a2b3f9c8b8996610cdfe82be7 Author: Cy Schubert AuthorDate: 2022-03-17 17:54:50 +0000 Commit: Cy Schubert CommitDate: 2022-03-17 23:44:10 +0000 sysutils/screen: Update to 4.9.0 Update screen to 4.9.0. From the release announcement: New in this release: * Hardstatus option for used encoding (escape string '%e') * Fixes: - fix combining char handling that could lead to a segfault - CVE-2021-26937: possible denial of service via a crafted UTF-8 character sequence (bug #60030) - make screen exit code be 0 when checking --help - session names limit is 80 symbols (bug #61534) - option -X ignores specified user in multiuser env (bug #37437) - a lot of reformations/fixes/cleanups (man page and source code) For full list of changes see https://git.savannah.gnu.org/cgit/screen.git/log/?h=v.4.9.0 Note that CVE-2021-26937 was fixed in the FreeBSD port in 2021. --- sysutils/screen/Makefile | 10 +- sysutils/screen/distinfo | 6 +- sysutils/screen/files/patch-Makefile.in | 48 --------- sysutils/screen/files/patch-ansi.c | 24 ----- sysutils/screen/files/patch-configure | 162 ------------------------------- sysutils/screen/files/patch-configure.ac | 50 ++++++++++ sysutils/screen/files/patch-encoding.c | 56 ----------- sysutils/screen/files/patch-osdef.h.in | 11 --- sysutils/screen/pkg-plist | 1 + 9 files changed, 60 insertions(+), 308 deletions(-) diff --git a/sysutils/screen/Makefile b/sysutils/screen/Makefile index 205f26d84370..e0cd0e7b650a 100644 --- a/sysutils/screen/Makefile +++ b/sysutils/screen/Makefile @@ -1,8 +1,7 @@ # Created by: Andrey Chernov PORTNAME= screen -PORTVERSION= 4.8.0 -PORTREVISION= 3 +PORTVERSION= 4.9.0 CATEGORIES= sysutils MASTER_SITES= GNU \ ftp://ftp.gnu.org/gnu/screen/ \ @@ -34,7 +33,7 @@ NCURSES_DEFAULT_DESC= Depend on ncurses (ports if installed, otherwise base) NCURSES_BASE_DESC= Depend on ncurses in base NCURSES_PORT_DESC= Depend on devel/ncurses in ports -NCURSES_DEFAULT_USES= ncurses +NCURSES_DEFAULT_USES= autoreconf:build ncurses NCURSES_BASE_USES= ncurses:base NCURSES_PORT_USES= ncurses:port @@ -81,13 +80,16 @@ EXTRA_PATCHES+= ${FILESDIR}/opt-showencoding post-patch: @${RM} ${WRKSRC}/doc/screen.info* - @${REINPLACE_CMD} -e 's|/dev/ptmx|/nonexistent|' ${WRKSRC}/configure # Bug 191029: Users can choose whether to use sockets or named pipes. # Choose sockets if you don't know what the difference is. # Choose named pipes if your environment is heterogeneous, # using both screen 4.0.3 and 4.2.1. # Bug 191017 + +pre-configure: + cd ${WRKSRC} && ./autogen.sh + post-configure-NAMED_PIPES-on: @${ECHO_CMD} '#define NAMEDPIPE 1' >> ${WRKSRC}/config.h @${ECHO_CMD} User selected named pipes override set. diff --git a/sysutils/screen/distinfo b/sysutils/screen/distinfo index 200f8a5cbbb4..203a25ac276f 100644 --- a/sysutils/screen/distinfo +++ b/sysutils/screen/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1581479972 -SHA256 (screen-4.8.0.tar.gz) = 6e11b13d8489925fde25dfb0935bf6ed71f9eb47eff233a181e078fde5655aa1 -SIZE (screen-4.8.0.tar.gz) = 854854 +TIMESTAMP = 1647532509 +SHA256 (screen-4.9.0.tar.gz) = f9335281bb4d1538ed078df78a20c2f39d3af9a4e91c57d084271e0289c730f4 +SIZE (screen-4.9.0.tar.gz) = 798229 diff --git a/sysutils/screen/files/patch-Makefile.in b/sysutils/screen/files/patch-Makefile.in deleted file mode 100644 index 101c1703295a..000000000000 --- a/sysutils/screen/files/patch-Makefile.in +++ /dev/null @@ -1,48 +0,0 @@ ---- Makefile.in.orig 2017-07-10 12:26:25.000000000 -0700 -+++ Makefile.in 2017-08-25 20:19:07.289437000 -0700 -@@ -83,19 +83,13 @@ - $(OPTIONS) $(CFLAGS) $< - - install_bin: .version screen installdirs -- -if [ -f $(DESTDIR)$(bindir)/$(SCREEN) ] && [ ! -f $(DESTDIR)$(bindir)/$(SCREEN).old ]; \ -- then mv $(DESTDIR)$(bindir)/$(SCREEN) $(DESTDIR)$(bindir)/$(SCREEN).old; fi -- $(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/$(SCREEN) -- -chown root $(DESTDIR)$(bindir)/$(SCREEN) && chmod 4755 $(DESTDIR)$(bindir)/$(SCREEN) --# This doesn't work if $(bindir)/screen is a symlink -- -if [ -f $(DESTDIR)$(bindir)/screen ] && [ ! -f $(DESTDIR)$(bindir)/screen.old ]; then mv $(DESTDIR)$(bindir)/screen $(DESTDIR)$(bindir)/screen.old; fi -- rm -f $(DESTDIR)$(bindir)/screen -- (cd $(DESTDIR)$(bindir) && ln -f -s $(SCREEN) screen) - cp $(srcdir)/utf8encodings/?? $(DESTDIR)$(SCREENENCODINGS) -+ $(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/screen -+ -chown root:wheel $(DESTDIR)$(bindir)/screen && chmod 4755 $(DESTDIR)$(bindir)/screen - - ############################################################################### - install: installdirs install_bin -- cd doc ; $(MAKE) install -+ cd doc ; $(MAKE) $(MAKE_ARGS) install - -if [ -d $(DESTDIR)/usr/lib/terminfo ]; then \ - PATH="$$PATH:/usr/5bin" tic ${srcdir}/terminfo/screeninfo.src; \ - chmod 644 $(DESTDIR)/usr/lib/terminfo/s/screen*; \ -@@ -108,7 +102,7 @@ - installdirs: - # Path leading to ETCSCREENRC and Socketdirectory not checked. - $(srcdir)/etc/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(SCREENENCODINGS) -- cd doc ; $(MAKE) installdirs -+ cd doc ; $(MAKE) $(MAKE_ARGS) installdirs - - uninstall: .version - rm -f $(DESTDIR)$(bindir)/$(SCREEN) -@@ -350,7 +344,10 @@ - viewport.o: layout.h viewport.h canvas.h viewport.c config.h screen.h os.h osdef.h ansi.h acls.h \ - comm.h layer.h term.h image.h display.h window.h extern.h \ - braille.h --list_generic.o: list_generic.h list_generic.c layer.h screen.h osdef.h --list_display.o: list_generic.h list_display.c layer.h screen.h osdef.h --list_window.o: list_generic.h list_window.c window.h layer.h screen.h osdef.h comm.h -+list_generic.o: list_generic.h list_generic.c layer.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h -+list_display.o: list_generic.h list_display.c layer.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h -+list_window.o: list_generic.h list_window.c window.h layer.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h - diff --git a/sysutils/screen/files/patch-ansi.c b/sysutils/screen/files/patch-ansi.c deleted file mode 100644 index 74ed96c079cd..000000000000 --- a/sysutils/screen/files/patch-ansi.c +++ /dev/null @@ -1,24 +0,0 @@ ---- ansi.c.orig 2020-02-05 12:09:38.000000000 -0800 -+++ ansi.c 2021-02-14 11:10:31.759160000 -0800 -@@ -692,10 +692,6 @@ - } - curr->w_rend.font = 0; - } --# ifdef DW_CHARS -- if (curr->w_encoding == UTF8 && utf8_isdouble(c)) -- curr->w_mbcs = 0xff; --# endif - if (curr->w_encoding == UTF8 && c >= 0x0300 && utf8_iscomb(c)) - { - int ox, oy; -@@ -730,6 +726,10 @@ - } - break; - } -+# ifdef DW_CHARS -+ if (curr->w_encoding == UTF8 && utf8_isdouble(c)) -+ curr->w_mbcs = 0xff; -+# endif - font = curr->w_rend.font; - # endif - # ifdef DW_CHARS diff --git a/sysutils/screen/files/patch-configure b/sysutils/screen/files/patch-configure deleted file mode 100644 index 00c34fc77d92..000000000000 --- a/sysutils/screen/files/patch-configure +++ /dev/null @@ -1,162 +0,0 @@ ---- configure.orig 2019-10-01 15:27:14.000000000 -0700 -+++ configure 2019-10-27 23:29:24.744163000 -0700 -@@ -4756,63 +4756,6 @@ - - else - olibs="$LIBS" --LIBS="-lcurses $olibs" --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking libcurses..." >&5 --$as_echo "$as_me: checking libcurses..." >&6;} --cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -- --int --main () --{ -- --#ifdef __hpux --__sorry_hpux_libcurses_is_totally_broken_in_10_10(); --#else --tgetent((char *)0, (char *)0); --#endif -- -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_link "$LINENO"; then : -- --else -- LIBS="-ltermcap $olibs" --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking libtermcap..." >&5 --$as_echo "$as_me: checking libtermcap..." >&6;} --cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -- --int --main () --{ --tgetent((char *)0, (char *)0); -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_link "$LINENO"; then : -- --else -- LIBS="-ltermlib $olibs" --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking libtermlib..." >&5 --$as_echo "$as_me: checking libtermlib..." >&6;} --cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -- --int --main () --{ --tgetent((char *)0, (char *)0); -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_link "$LINENO"; then : -- --else - LIBS="-lncursesw $olibs" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking libncursesw..." >&5 - $as_echo "$as_me: checking libncursesw..." >&6;} -@@ -4897,15 +4840,6 @@ - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext - - if test "$cross_compiling" = yes; then : - echo "- skipping check because we are cross compiling; assuming terminfo database is used" 1>&6 -@@ -4917,7 +4851,8 @@ - - main() - { -- exit(strcmp(tgoto("%p1%d", 0, 1), "1") ? 0 : 1); -+ char *tgoto(const char *, int, int); -+ exit(strcmp(tgoto("%d%d", 0, 1), "1") ? 0 : 1); - } - _ACEOF - if ac_fn_c_try_run "$LINENO"; then : -@@ -4967,7 +4902,7 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SVR4 ptys..." >&5 - $as_echo "$as_me: checking for SVR4 ptys..." >&6;} - sysvr4ptys= --if test -c /dev/ptmx ; then -+if test -c /nonexistent ; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -@@ -5080,19 +5015,17 @@ - fi - rm -f conftest* - --if test "$ptys" != "$pdir/pty??" ; then --p0=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\).$/\1/g' | sort -u | tr -d '\012'` --p1=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\)$/\1/g' | sort -u | tr -d '\012'` -+# XXX: hardcoded, since port must be devfs and various setups independent -+ - cat >>confdefs.h <<_ACEOF --#define PTYRANGE0 "$p0" -+#define PTYRANGE0 "pqrsPQRSlmnoLMNO" - _ACEOF - - cat >>confdefs.h <<_ACEOF --#define PTYRANGE1 "$p1" -+#define PTYRANGE1 "0123456789abcdefghijklmnopqrstuv" - _ACEOF - - fi --fi - - - # Check whether --with-pty-mode was given. -@@ -5315,9 +5248,11 @@ - - #include /* to get time_t on SCO */ - #include --#if defined(SVR4) && !defined(DGUX) -+#if (defined(SVR4) && !defined(DGUX)) || defined(__FreeBSD_cc_version) - #include - #define utmp utmpx -+#define pututline pututxline -+#define getutent getutxent - #else - #include - #endif -@@ -5346,7 +5281,7 @@ - - #include - #include --#if defined(SVR4) && !defined(DGUX) -+#if (defined(SVR4) && !defined(DGUX)) || defined(__FreeBSD_cc_version) - #include - #define utmp utmpx - #else -@@ -5383,9 +5318,13 @@ - - #include - #include --#if defined(SVR4) && !defined(DGUX) -+#if (defined(SVR4) && !defined(DGUX)) || defined(__FreeBSD_cc_version) - #include - #define utmp utmpx -+#define pututline pututxline -+#define getutent getutxent -+#define pututline pututxline -+#define getutent getutxent - #else - #include - #endif diff --git a/sysutils/screen/files/patch-configure.ac b/sysutils/screen/files/patch-configure.ac new file mode 100644 index 000000000000..cee1a130731e --- /dev/null +++ b/sysutils/screen/files/patch-configure.ac @@ -0,0 +1,50 @@ +--- configure.ac.orig 2022-01-28 06:06:02.670611602 -0800 ++++ configure.ac 2022-03-17 10:09:55.599298000 -0700 +@@ -811,11 +811,11 @@ + dnl + dnl **** utmp handling **** + dnl +-AC_CHECKING(getutent) ++AC_CHECKING(getutxent) + AC_TRY_LINK([ + #include /* to get time_t on SCO */ + #include +-#if defined(SVR4) && !defined(DGUX) ++#if (defined(SVR4) && !defined(DGUX)) || defined(__FreeBSD__) + #include + #define utmp utmpx + #else +@@ -825,14 +825,14 @@ + #define pututline _pututline + #endif + ], +-[int x = DEAD_PROCESS; pututline((struct utmp *)0); getutent();], AC_DEFINE(GETUTENT), ++[int x = DEAD_PROCESS; pututxline((struct utmp *)0); getutxent();], AC_DEFINE(GETUTENT), + olibs="$LIBS" + LIBS="$LIBS -lgen" +-AC_CHECKING(getutent with -lgen) ++AC_CHECKING(getutxent with -lgen) + AC_TRY_LINK([ + #include + #include +-#if defined(SVR4) && !defined(DGUX) ++#if defined(SVR4) && !defined(DGUX) || defined(__FreeBSD__) + #include + #define utmp utmpx + #else +@@ -842,13 +842,13 @@ + #define pututline _pututline + #endif + ], +-[int x = DEAD_PROCESS; pututline((struct utmp *)0); getutent();], AC_DEFINE(GETUTENT), LIBS="$olibs") ++[int x = DEAD_PROCESS; pututxline((struct utmp *)0); getutxent();], AC_DEFINE(GETUTENT), LIBS="$olibs") + ) + AC_CHECKING(ut_host) + AC_TRY_COMPILE([ + #include + #include +-#if defined(SVR4) && !defined(DGUX) ++#if defined(SVR4) && !defined(DGUX) || defined(__FreeBSD__) + #include + #define utmp utmpx + #else diff --git a/sysutils/screen/files/patch-encoding.c b/sysutils/screen/files/patch-encoding.c deleted file mode 100644 index 0702f6b0a05c..000000000000 --- a/sysutils/screen/files/patch-encoding.c +++ /dev/null @@ -1,56 +0,0 @@ ---- encoding.c.orig 2020-02-05 12:09:38.000000000 -0800 -+++ encoding.c 2021-02-14 11:15:26.074193000 -0800 -@@ -43,7 +43,7 @@ - # ifdef UTF8 - static int recode_char __P((int, int, int)); - static int recode_char_to_encoding __P((int, int)); --static void comb_tofront __P((int, int)); -+static void comb_tofront __P((int)); - # ifdef DW_CHARS - static int recode_char_dw __P((int, int *, int, int)); - static int recode_char_dw_to_encoding __P((int, int *, int)); -@@ -1263,6 +1263,8 @@ - {0x30000, 0x3FFFD}, - }; - -+ if (c >= 0xdf00 && c <= 0xdfff) -+ return 1; /* dw comining sequence */ - return ((bisearch(c, wide, sizeof(wide) / sizeof(struct interval) - 1)) || - (cjkwidth && - bisearch(c, ambiguous, -@@ -1330,11 +1332,12 @@ - } - - static void --comb_tofront(root, i) --int root, i; -+comb_tofront( i) -+int i; - { - for (;;) - { -+ int root = i >= 0x700 ? 0x801 : 0x800; - debug1("bring to front: %x\n", i); - combchars[combchars[i]->prev]->next = combchars[i]->next; - combchars[combchars[i]->next]->prev = combchars[i]->prev; -@@ -1396,9 +1399,9 @@ - { - /* full, recycle old entry */ - if (c1 >= 0xd800 && c1 < 0xe000) -- comb_tofront(root, c1 - 0xd800); -+ comb_tofront(c1 - 0xd800); - i = combchars[root]->prev; -- if (c1 == i + 0xd800) -+ if (i == 0x800 || i == 0x801 || c1 == i + 0xd800) - { - /* completely full, can't recycle */ - debug("utf8_handle_comp: completely full!\n"); -@@ -1422,7 +1425,7 @@ - mc->font = (i >> 8) + 0xd8; - mc->fontx = 0; - debug3("combinig char %x %x -> %x\n", c1, c, i + 0xd800); -- comb_tofront(root, i); -+ comb_tofront(i); - } - - #else /* !UTF8 */ diff --git a/sysutils/screen/files/patch-osdef.h.in b/sysutils/screen/files/patch-osdef.h.in deleted file mode 100644 index 72435743c0eb..000000000000 --- a/sysutils/screen/files/patch-osdef.h.in +++ /dev/null @@ -1,11 +0,0 @@ ---- osdef.h.in.orig Sat Apr 28 22:26:43 2001 -+++ osdef.h.in Tue Apr 9 10:24:18 2002 -@@ -111,7 +111,7 @@ - extern int setpgid __P((int, int)); - extern int tcsetpgrp __P((int, int)); - #endif --extern int ioctl __P((int, int, char *)); -+extern int ioctl __P((int, unsigned long, ...)); - - extern int kill __P((int, int)); - diff --git a/sysutils/screen/pkg-plist b/sysutils/screen/pkg-plist index c76c27110d29..faddf89b1799 100644 --- a/sysutils/screen/pkg-plist +++ b/sysutils/screen/pkg-plist @@ -1,4 +1,5 @@ bin/screen +bin/screen-4.9.0 man/man1/screen.1.gz %%DATADIR%%/utf8encodings/01 %%DATADIR%%/utf8encodings/02