public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/screen] rawhide: Resolves: #2499433 - new upstream release 5.0.2
@ 2026-07-13  7:56 Josef Ridky
  0 siblings, 0 replies; only message in thread
From: Josef Ridky @ 2026-07-13  7:56 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/screen
            Branch : rawhide
            Commit : 4c1f95f35a0a01b36ac60cc6a2a198871fed2733
            Author : Josef Ridky <jridky@redhat.com>
            Date   : 2026-07-13T09:56:12+02:00
            Stats  : +7/-263 in 5 file(s)
            URL    : https://src.fedoraproject.org/rpms/screen/c/4c1f95f35a0a01b36ac60cc6a2a198871fed2733?branch=rawhide

            Log:
            Resolves: #2499433 - new upstream release 5.0.2

Signed-off-by: Josef Ridky <jridky@redhat.com>

---
diff --git a/.gitignore b/.gitignore
index 2c7e283..6878e70 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ screen-4.0.3.tar.gz
 /screen-4.9.1.tar.gz
 /screen-5.0.0.tar.gz
 /screen-5.0.1.tar.gz
+/screen-5.0.2.tar.gz

diff --git a/screen-5.0.1-big-endian.patch b/screen-5.0.1-big-endian.patch
deleted file mode 100644
index 9245125..0000000
--- a/screen-5.0.1-big-endian.patch
+++ /dev/null
@@ -1,231 +0,0 @@
-From ccd0b27504707e4f3099f0b9fd7a89489c6973fb Mon Sep 17 00:00:00 2001
-From: Alexander Naumov <alexander_naumov@opensuse.org>
-Date: Sat, 3 Jan 2026 17:26:27 +0100
-Subject: Fix: unable to type in screen on big-endian systems
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Thanks to Petr Sumbera <petr.sumbera@oracle.com>
-and Dan Horák <dan@danny.cz>
-
-bug#67607
----
- src/telnet.c |  2 +-
- src/telnet.h |  2 +-
- src/window.c | 38 +++++++++++++++++++-------------------
- src/window.h |  6 +++---
- 4 files changed, 24 insertions(+), 24 deletions(-)
-
-diff --git a/src/telnet.c b/src/telnet.c
-index 69d75ee..c70e2da 100644
---- a/telnet.c
-+++ b/telnet.c
-@@ -228,7 +228,7 @@ void TelProcessLine(char **bufpp, size_t *lenp)
- 	*lenp = 0;
- }
- 
--int DoTelnet(char *buf, size_t *lenp, int f)
-+int DoTelnet(char *buf, int *lenp, int f)
- {
- 	int echo = !fore->w_telropts[TO_ECHO];
- 	int cmode = fore->w_telropts[TO_SGA];
-diff --git a/src/telnet.h b/src/telnet.h
-index fefcc0a..792a93a 100644
---- a/telnet.h
-+++ b/telnet.h
-@@ -9,7 +9,7 @@
- int TelOpenAndConnect(Window *);
- int TelIsline(Window *);
- void TelProcessLine(char **, size_t *);
--int DoTelnet(char *, size_t *, int);
-+int DoTelnet(char *, int *, int);
- int TelIn(Window *, char *, size_t, int);
- void TelBreak(Window *);
- void TelWindowSize(Window *);
-diff --git a/src/window.c b/src/window.c
-index cee06fd..68fc006 100644
---- a/window.c
-+++ b/window.c
-@@ -61,7 +61,7 @@ static void WinRedisplayLine(int, int, int, int);
- static void WinClearLine(int, int, int, int);
- static int WinResize(int, int);
- static void WinRestore(void);
--static int DoAutolf(char *, size_t *, int);
-+static int DoAutolf(char *, int *, int);
- static void ZombieProcess(char **, size_t *);
- static void win_readev_fn(Event *, void *);
- static void win_writeev_fn(Event *, void *);
-@@ -74,9 +74,9 @@ static void win_silenceev_fn(Event *, void *);
- static void win_destroyev_fn(Event *, void *);
- 
- static int ForkWindow(Window *, char **, char *);
--static void zmodem_found(Window *, int, char *, size_t);
-+static void zmodem_found(Window *, int, char *, int);
- static void zmodemFin(char *, size_t, void *);
--static int zmodem_parse(Window *, char *, size_t);
-+static int zmodem_parse(Window *, char *, int);
- 
- bool VerboseCreate = false;		/* XXX move this to user.h */
- 
-@@ -191,10 +191,10 @@ const struct LayFuncs WinLf = {
- 	NULL
- };
- 
--static int DoAutolf(char *buf, size_t *lenp, int fr)
-+static int DoAutolf(char *buf, int *lenp, int fr)
- {
- 	char *p;
--	size_t len = *lenp;
-+	int len = *lenp;
- 	int trunc = 0;
- 
- 	for (p = buf; len > 0; p++, len--) {
-@@ -215,7 +215,7 @@ static int DoAutolf(char *buf, size_t *lenp, int fr)
- 
- static void WinProcess(char **bufpp, size_t *lenp)
- {
--	size_t l2 = 0, f, *ilen, l = *lenp, trunc;
-+	int l2 = 0, f, *ilen, l = *lenp, trunc;
- 	char *ibuf;
- 
- 	fore = (Window *)flayer->l_data;
-@@ -291,7 +291,7 @@ static void WinProcess(char **bufpp, size_t *lenp)
- 
- static void ZombieProcess(char **bufpp, size_t *lenp)
- {
--	size_t l = *lenp;
-+	int l = *lenp;
- 	char *buf = *bufpp, b1[10], b2[10];
- 
- 	fore = (Window *)flayer->l_data;
-@@ -699,7 +699,7 @@ int MakeWindow(struct NewWindow *newwin)
- 	p->w_readev.data = p->w_writeev.data = (char *)p;
- 	p->w_readev.handler = win_readev_fn;
- 	p->w_writeev.handler = win_writeev_fn;
--	p->w_writeev.condpos = (int *)&p->w_inlen;
-+	p->w_writeev.condpos = &p->w_inlen;
- 	evenq(&p->w_readev);
- 	evenq(&p->w_writeev);
- 	p->w_paster.pa_slowev.type = EV_TIMEOUT;
-@@ -1344,7 +1344,7 @@ int winexec(char **av)
- 	pwin->p_readev.data = pwin->p_writeev.data = (char *)w;
- 	pwin->p_readev.handler = pseu_readev_fn;
- 	pwin->p_writeev.handler = pseu_writeev_fn;
--	pwin->p_writeev.condpos = (int *)&pwin->p_inlen;
-+	pwin->p_writeev.condpos = &pwin->p_inlen;
- 	if (pwin->p_fdpat & (F_PFRONT << F_PSHIFT * 2 | F_PFRONT << F_PSHIFT))
- 		evenq(&pwin->p_readev);
- 	evenq(&pwin->p_writeev);
-@@ -1378,7 +1378,7 @@ void FreePseudowin(Window *w)
- 	}
- 	evdeq(&pwin->p_readev);
- 	evdeq(&pwin->p_writeev);
--	if (w->w_readev.condneg == (int *)&pwin->p_inlen)
-+	if (w->w_readev.condneg == &pwin->p_inlen)
- 		w->w_readev.condpos = w->w_readev.condneg = NULL;
- 	evenq(&w->w_readev);
- 	free((char *)pwin);
-@@ -1484,7 +1484,7 @@ static void win_readev_fn(Event *event, void *data)
- 		size = IOSIZE - p->w_pwin->p_inlen;
- 		if (size <= 0) {
- 			event->condpos = &const_IOSIZE;
--			event->condneg = (int *)&p->w_pwin->p_inlen;
-+			event->condneg = &p->w_pwin->p_inlen;
- 			return;
- 		}
- 	}
-@@ -1563,7 +1563,7 @@ static void win_resurrect_zombie_fn(Event *event, void *data)
- static void win_writeev_fn(Event *event, void *data)
- {
- 	Window *p = (Window *)data;
--	size_t len;
-+	int len;
- 	if (p->w_inlen) {
- 		if ((len = write(event->fd, p->w_inbuf, p->w_inlen)) <= 0)
- 			len = p->w_inlen;	/* dead window */
-@@ -1600,7 +1600,7 @@ static void pseu_readev_fn(Event *event, void *data)
- 		size = IOSIZE - p->w_inlen;
- 		if (size <= 0) {
- 			event->condpos = &const_IOSIZE;
--			event->condneg = (int *)&p->w_inlen;
-+			event->condneg = &p->w_inlen;
- 			return;
- 		}
- 	}
-@@ -1643,7 +1643,7 @@ static void pseu_writeev_fn(Event *event, void *data)
- {
- 	Window *p = (Window *)data;
- 	struct pseudowin *pw = p->w_pwin;
--	size_t len;
-+	int len;
- 
- 	if (pw->p_inlen == 0)
- 		return;
-@@ -1683,10 +1683,10 @@ static void win_destroyev_fn(Event *event, void *data)
- 	WindowDied(p, p->w_exitstatus, 1);
- }
- 
--static int zmodem_parse(Window *p, char *bp, size_t len)
-+static int zmodem_parse(Window *p, char *bp, int len)
- {
- 	char *b2 = bp;
--	for (size_t i = 0; i < len; i++, b2++) {
-+	for (int i = 0; i < len; i++, b2++) {
- 		if (p->w_zauto == 0) {
- 			for (; i < len; i++, b2++)
- 				if (*b2 == 030)
-@@ -1756,14 +1756,14 @@ static void zmodemFin(char *buf, size_t len, void *data)
- 	}
- }
- 
--static void zmodem_found(Window *p, int send, char *bp, size_t len)
-+static void zmodem_found(Window *p, int send, char *bp, int len)
- {
- 	char *s;
- 	size_t n;
- 
- 	/* check for abort sequence */
- 	n = 0;
--	for (size_t i = 0; i < len; i++)
-+	for (int i = 0; i < len; i++)
- 		if (bp[i] != 030)
- 			n = 0;
- 		else if (++n > 4)
-@@ -1792,7 +1792,7 @@ static void zmodem_found(Window *p, int send, char *bp, size_t len)
- 		display = d;
- 		evdeq(&D_blockedev);
- 		D_readev.condpos = &const_IOSIZE;
--		D_readev.condneg = (int *)&p->w_inlen;
-+		D_readev.condneg = &p->w_inlen;
- 		ClearAll();
- 		GotoPos(0, 0);
- 		SetRendition(&mchar_blank);
-diff --git a/src/window.h b/src/window.h
-index 3834650..e1c1a68 100644
---- a/window.h
-+++ b/window.h
-@@ -79,7 +79,7 @@ struct pseudowin {
- 	char	p_cmd[MAXSTR];
- 	char	p_tty[MAXSTR];
- 	char	p_inbuf[IOSIZE];	/* buffered writing to p_ptyfd */
--	size_t	p_inlen;
-+	int	p_inlen;
- };
- 
- /* bits for fdpat: */
-@@ -157,9 +157,9 @@ struct Window {
- 	int	 w_poll_zombie_timeout;
- 	int	 w_ptyfd;		/* fd of the master pty */
- 	char	 w_inbuf[IOSIZE];
--	size_t	 w_inlen;
-+	int	 w_inlen;
- 	char	 w_outbuf[IOSIZE];
--	size_t	 w_outlen;
-+	int	 w_outlen;
- 	bool	 w_aflag;		/* (-a option) */
- 	bool	 w_dynamicaka;		/* should we change name */
- 	char	*w_title;		/* name of the window */
--- 
-cgit v1.2.3
-

diff --git a/screen-5.0.1-fix-unescaped-in-email-address.patch b/screen-5.0.1-fix-unescaped-in-email-address.patch
deleted file mode 100644
index 4811bd6..0000000
--- a/screen-5.0.1-fix-unescaped-in-email-address.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 7333452aa52d61a170b1fc199869ea6059849058 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Holger=20Hoffst=C3=A4tte?= <holger@applied-asynchrony.com>
-Date: Thu, 15 May 2025 13:54:44 +0200
-Subject: [PATCH] Fix: unescaped @ in email address
-
-bug#67126
----
- doc/screen.texinfo | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/doc/screen.texinfo b/doc/screen.texinfo
-index b3568b9..76d0588 100644
---- a/doc/screen.texinfo
-+++ b/doc/screen.texinfo
-@@ -5940,7 +5940,7 @@ of @code{Screen} which you are using.  Also include in your message the
- hardware and operating system, the compiler used to compile, a
- description of the bug behavior, and the conditions that triggered the
- bug. In case of security issue please send an mail to
--@w{@samp{alexander_naumov@opensuse.org}}.
-+@w{@samp{alexander_naumov@@opensuse.org}}.
- 
- @node Availability,  , Reporting Bugs, Bugs
- @section Availability
--- 
-2.49.0
-

diff --git a/screen.spec b/screen.spec
index 54a288b..16623cc 100644
--- a/screen.spec
+++ b/screen.spec
@@ -3,8 +3,8 @@
 
 Summary:        A screen manager that supports multiple logins on one terminal
 Name:           screen
-Version:        5.0.1
-Release:        6%{?dist}
+Version:        5.0.2
+Release:        1%{?dist}
 License:        GPL-3.0-or-later
 URL:            http://www.gnu.org/software/screen
 BuildRequires: make
@@ -19,9 +19,6 @@ Source1:        screen.pam
 
 Patch1:         screen-5.0.0-screenrc.patch
 Patch2:         screen-5.0.0-suppress_remap.patch
-Patch3:         screen-5.0.1-fix-unescaped-in-email-address.patch
-# https://cgit.git.savannah.gnu.org/cgit/screen.git/commit/?h=screen-v5&id=ccd0b27504707e4f3099f0b9fd7a89489c6973fb
-Patch4:        screen-5.0.1-big-endian.patch
 
 %description
 The screen utility allows you to have multiple logins on just one
@@ -117,6 +114,9 @@ install -m0644 -D screen.sysusers.conf %{buildroot}%{_sysusersdir}/screen.conf
 %{_sysusersdir}/screen.conf
 
 %changelog
+* Mon Jul 13 2026 Josef Ridky <jridky@redhat.com> - 5.0.2-1
+- new upstream release 5.0.2 (rhbz#2499433)
+
 * Mon Jan 05 2026 Dan Horák <dan[at]danny.cz> - 5.0.1-6
 - fix big-endian platforms (rhbz#2418337)
 

diff --git a/sources b/sources
index 8ac5f0b..69d2c16 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (screen-5.0.1.tar.gz) = 9bda35689d73a816515df30f50101531cf3af8906cb47f086d1f97c464cb729f4ee6e3d4aca220acc4c6125d81e923ee3a11fb3a85fe6994002bf1e0f3cc46fb
+SHA512 (screen-5.0.2.tar.gz) = 21f1bd395059b2c47fd26cfe71371996e81e2656c77620f4d894bac44dd55bc5bf95f0e60c2650d7c3f97691c4aaf071d96e43a2fa79c7f96205ddce36e4ef01

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-07-13  7:56 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-13  7:56 [rpms/screen] rawhide: Resolves: #2499433 - new upstream release 5.0.2 Josef Ridky

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox