git: 184ca6958aea - main - sysutils/screen50: Update to 5.0.1

From: Cy Schubert <cy_at_FreeBSD.org>
Date: Mon, 12 May 2025 21:38:31 UTC
The branch main has been updated by cy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=184ca6958aeaa95bf62c04c68dca2be4236b1bd6

commit 184ca6958aeaa95bf62c04c68dca2be4236b1bd6
Author:     Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2025-05-12 21:22:30 +0000
Commit:     Cy Schubert <cy@FreeBSD.org>
CommitDate: 2025-05-12 21:38:11 +0000

    sysutils/screen50: Update to 5.0.1
    
    As the tarball is not availalble from the normal download sites,
    rebase to the upstream git repo.
    
    This includes secuity fixes documented at
    https://security.opensuse.org/2025/05/12/screen-security-issues.html
    
    PR:             286743
    MFH:            2025Q2
---
 sysutils/screen50/Makefile           | 31 +++++++++++++++++++++----------
 sysutils/screen50/distinfo           |  6 +++---
 sysutils/screen50/files/patch-misc.h | 12 ------------
 sysutils/screen50/pkg-plist          |  2 +-
 4 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/sysutils/screen50/Makefile b/sysutils/screen50/Makefile
index 2cc390901d9b..137529c420a2 100644
--- a/sysutils/screen50/Makefile
+++ b/sysutils/screen50/Makefile
@@ -1,14 +1,14 @@
 PORTNAME=	screen
-DISTVERSION=	5.0.0
+DISTVERSION=	5.0.1
 CATEGORIES=	sysutils
-MASTER_SITES=	GNU \
-	        ftp://ftp.gnu.org/gnu/screen/ \
-	        ftp://gnu.mirror.iweb.com/screen/ \
-	        http://gnu.mirror.iweb.com/screen/ \
-	        http://mirror.sdunix.com/gnu/ \
-	        ftp://mirrors.kernel.org/gnu/screen/ \
-	        http://cschubert.com/distfiles/ \
-	        LOCAL/cy
+# MASTER_SITES=	GNU \
+# 	        ftp://ftp.gnu.org/gnu/screen/ \
+# 	        ftp://gnu.mirror.iweb.com/screen/ \
+# 	        http://gnu.mirror.iweb.com/screen/ \
+# 	        http://mirror.sdunix.com/gnu/ \
+# 	        ftp://mirrors.kernel.org/gnu/screen/ \
+# 	        http://cschubert.com/distfiles/ \
+# 	        LOCAL/cy
 .if !defined(MASTERDIR)
 PKGNAMESUFFIX=	50
 CONFLICTS=      screen-* screen49*
@@ -20,6 +20,10 @@ WWW=		https://www.gnu.org/software/screen/
 
 CONFLICTS+=	screen-devel
 
+GIT_TAGNAME=	v.${DISTVERSION}
+
+WRKSRC=		${WRKDIR}/${PORTNAME}-${GIT_TAGNAME}-ad9db35/src
+
 LICENSE=	GPLv3
 
 OPTIONS_DEFINE=		INFO NETHACK XTERM_256 SYSTEM_SCREENRC MULTIUSER \
@@ -57,7 +61,7 @@ CPE_VENDOR=	gnu
 
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share
-CFLAGS+=	-I${NCURSESINC}
+CFLAGS+=	-I${NCURSESINC} -DSVR4 -DGETUTENT
 LDFLAGS+=	-L${NCURSESLIB}
 
 .if ${PORT_OPTIONS:MINFO}
@@ -86,6 +90,13 @@ CONFIGURE_ARGS+=	--disable-socket-dir
 CONFIGURE_ARGS+=	--with-socket-dir=${SCREEN_SOCKET_DIR}
 .endif
 
+do-fetch:
+	@cd ${DISTDIR} && \
+	if [ ! -f ${DISTNAME}${EXTRACT_SUFX} ]; then \
+		fetch -o ${DISTNAME}${EXTRACT_SUFX} \
+		    "https://git.savannah.gnu.org/gitweb/?p=screen.git;a=snapshot;h=${GIT_TAGNAME};sf=tgz"; \
+	fi    
+
 post-patch:
 	@${RM} ${WRKSRC}/doc/screen.info*
 
diff --git a/sysutils/screen50/distinfo b/sysutils/screen50/distinfo
index 94c47f76c8ea..9e15a22d3ae3 100644
--- a/sysutils/screen50/distinfo
+++ b/sysutils/screen50/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1724900361
-SHA256 (screen-5.0.0.tar.gz) = f04a39d00a0e5c7c86a55338808903082ad5df4d73df1a2fd3425976aed94971
-SIZE (screen-5.0.0.tar.gz) = 895882
+TIMESTAMP = 1747082803
+SHA256 (screen-5.0.1.tar.gz) = 0ac9682fcfca3c02d84e8402c49396eb7ace9383234aeb62a4c267a8480bf35b
+SIZE (screen-5.0.1.tar.gz) = 723528
diff --git a/sysutils/screen50/files/patch-misc.h b/sysutils/screen50/files/patch-misc.h
deleted file mode 100644
index 818c716ad6cf..000000000000
--- a/sysutils/screen50/files/patch-misc.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- misc.h.orig	2024-03-26 16:41:57.000000000 -0700
-+++ misc.h	2024-04-03 11:30:19.350562000 -0700
-@@ -28,6 +28,9 @@
- int   AddXChar (char *, int);
- int   AddXChars (char *, int, char *);
- 
-+time_t SessionCreationTime(const char *fifo);
-+
-+
- #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
- 
- #endif /* SCREEN_MISC_H */
diff --git a/sysutils/screen50/pkg-plist b/sysutils/screen50/pkg-plist
index 827afbb2d2d1..aabb61708efd 100644
--- a/sysutils/screen50/pkg-plist
+++ b/sysutils/screen50/pkg-plist
@@ -1,5 +1,5 @@
 bin/screen
-%%MULTISUID%%bin/screen-5.0.0
+%%MULTISUID%%bin/screen-5.0.1
 share/man/man1/screen.1.gz
 %%DATADIR%%/utf8encodings/01
 %%DATADIR%%/utf8encodings/02