screen: update to 4.9.1 & use ncurses (from OmniOS)

Andreas Wacknitz

2023-08-19 aebb560dd91bc592baf69038519d7d1835748048

screen: update to 4.9.1 & use ncurses (from OmniOS)

 components/sysutils/screen/Makefile

@@ -24,36 +24,36 @@
#

BUILD_BITS=        64

include ../../../make-rules/shared-macros.mk

COMPONENT_NAME=        screen
COMPONENT_VERSION=    4.9.0
COMPONENT_VERSION=    4.9.1
COMPONENT_SUMMARY=    GNU Screen terminal multiplexer
COMPONENT_PROJECT_URL=    https://www.gnu.org/software/screen/
COMPONENT_FMRI=        terminal/screen
COMPONENT_CLASSIFICATION= Applications/System Utilities
COMPONENT_SRC=        $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE=    $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH=    sha256:f9335281bb4d1538ed078df78a20c2f39d3af9a4e91c57d084271e0289c730f4
COMPONENT_ARCHIVE_HASH=    sha256:26cef3e3c42571c0d484ad6faf110c5c15091fbf872b06fa7aa4766c7405ac69
COMPONENT_ARCHIVE_URL=    https://ftp.gnu.org/gnu/screen/$(COMPONENT_ARCHIVE)
COMPONENT_SIG_URL=    $(COMPONENT_ARCHIVE_URL).sig    
COMPONENT_LICENSE=     GPLv3+
COMPONENT_LICENSE_FILE=    COPYING

TEST_TARGET=        $(NO_TESTS)
TEST_TARGET= $(NO_TESTS)
include $(WS_MAKE_RULES)/common.mk

LDFLAGS           +=    -lutempter
CFLAGS += $(CPP_XPG6MODE)
LDFLAGS += -lutempter

COMPONENT_PREP_ACTION += ( cd $(@D) ; $(CONFIG_SHELL) autogen.sh );

CONFIGURE_OPTIONS +=    --enable-colors256
CONFIGURE_OPTIONS +=    --with-sys-screenrc=/etc/screenrc
CONFIGURE_OPTIONS +=    --disable-socket-dir
CONFIGURE_OPTIONS +=    --infodir=$(CONFIGURE_INFODIR)
CONFIGURE_OPTIONS += --enable-colors256
CONFIGURE_OPTIONS += --with-sys-screenrc=/etc/screenrc
CONFIGURE_OPTIONS += --disable-socket-dir
CONFIGURE_OPTIONS += --infodir=$(CONFIGURE_INFODIR)

PROTOTERMINFODIR=$(PROTOUSRSHAREDIR)/lib/terminfo
PROTOTERMINFODIR= $(PROTOUSRSHAREDIR)/lib/terminfo

$(PROTOTERMINFODIR):
    $(MKDIR) $@
@@ -64,5 +64,6 @@
REQUIRED_PACKAGES += text/texinfo

# Auto-generated dependencies
REQUIRED_PACKAGES += library/ncurses
REQUIRED_PACKAGES += system/library
REQUIRED_PACKAGES += system/library/libutempter

 components/sysutils/screen/manifests/sample-manifest.p5m

@@ -10,10 +10,11 @@
#

#
# Copyright 2017 <contributor>
# Copyright 2023 <contributor>
#

set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.human-version value=$(HUMAN_VERSION)
set name=pkg.summary value="$(COMPONENT_SUMMARY)"
set name=info.classification value="$(COMPONENT_CLASSIFICATION)"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
@@ -22,8 +23,8 @@

license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'

link path=usr/bin/screen target=screen-$(COMPONENT_VERSION)
file path=usr/bin/screen-$(COMPONENT_VERSION)
link path=usr/bin/screen target=screen-$(HUMAN_VERSION)
file path=usr/bin/screen-$(HUMAN_VERSION)
file path=usr/share/info/dir
file path=usr/share/info/screen.info
file path=usr/share/lib/terminfo/s/screen

 components/sysutils/screen/patches/01-terminfo.patch

 components/sysutils/screen/patches/02-ncurses.patch

New file
@@ -0,0 +1,25 @@
This patch makes configure check for ncurses before curses so that screen
can take advantage of the latest terminal type information from our
ncurses package.

diff -wpruN --no-dereference '--exclude=*.orig' a~/configure.ac a/configure.ac
--- a~/configure.ac    1970-01-01 00:00:00
+++ a/configure.ac    1970-01-01 00:00:00
@@ -669,7 +669,7 @@ AC_TRY_LINK([
     tgetent((char *)0, (char *)0);
 ],,
 olibs="$LIBS"
-LIBS="-lcurses $olibs"
+LIBS="-lncurses $olibs"
 AC_CHECKING(libcurses)
 AC_TRY_LINK([
     #include <curses.h>
@@ -713,7 +713,7 @@ AC_TRY_LINK([
 ],[
     tgetent((char *)0, (char *)0);
 ],,
-LIBS="-lncurses $olibs"
+LIBS="-lcurses $olibs"
 AC_CHECKING(libncurses)
 AC_TRY_LINK([
     #include <curses.h>

 components/sysutils/screen/patches/03-unneededlibs.patch

New file
@@ -0,0 +1,21 @@
diff -wpruN --no-dereference '--exclude=*.orig' a~/configure.ac a/configure.ac
--- a~/configure.ac    1970-01-01 00:00:00
+++ a/configure.ac    1970-01-01 00:00:00
@@ -189,7 +189,7 @@ AC_EGREP_CPP(yes,
 ], AC_NOTE(- you have a SVR4 system) AC_DEFINE(SVR4) svr4=1)
 if test -n "$svr4" ; then
 oldlibs="$LIBS"
-LIBS="$LIBS -lelf"
+LIBS="$LIBS"
 AC_CHECKING(SVR4)
 AC_TRY_LINK([
     #include <utmpx.h>
@@ -206,7 +206,7 @@ AC_EGREP_CPP(YES_IS_DEFINED,
 [#if defined(SVR4) && defined(sun)
   YES_IS_DEFINED;
 #endif
-], LIBS="$LIBS -lsocket -lnsl -lkstat")
+], LIBS="$LIBS -lsocket")
 
 dnl
 dnl    ****  typedefs ****

 components/sysutils/screen/patches/CVE-2021-26937.patch

File was deleted

 components/sysutils/screen/patches/socket.patch

File was deleted

 components/sysutils/screen/pkg5

@@ -1,6 +1,6 @@
{
    "dependencies": [
        "SUNWcs",
        "library/ncurses",
        "system/library",
        "system/library/libutempter",
        "text/texinfo"

 components/sysutils/screen/screen.p5m

@@ -14,6 +14,7 @@
#

set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.human-version value=$(HUMAN_VERSION)
set name=pkg.summary value="$(COMPONENT_SUMMARY)"
set name=info.classification value="$(COMPONENT_CLASSIFICATION)"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
@@ -22,7 +23,7 @@

license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'

file usr/bin/screen-$(COMPONENT_VERSION) path=usr/bin/screen
file usr/bin/screen-$(HUMAN_VERSION) path=usr/bin/screen
file path=usr/share/info/screen.info
file path=usr/share/man/man1/screen.1
file path=usr/share/screen/utf8encodings/01