diff --git a/combchar.diff b/combchar.diff deleted file mode 100644 index 2b2eb65..0000000 --- a/combchar.diff +++ /dev/null @@ -1,80 +0,0 @@ ---- ./ansi.c.orig 2017-10-23 11:32:41.000000000 +0000 -+++ ./ansi.c 2021-02-12 14:41:05.565447682 +0000 -@@ -692,10 +692,6 @@ register int len; - } - 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 @@ register int len; - } - 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 ---- ./encoding.c.orig 2017-10-23 11:32:41.000000000 +0000 -+++ ./encoding.c 2021-02-12 15:10:48.660858878 +0000 -@@ -43,7 +43,7 @@ static int encmatch __P((char *, char * - # 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)); -@@ -1256,6 +1256,8 @@ int c; - {0x30000, 0x3FFFD}, - }; - -+ if (c >= 0xdf00 && c <= 0xdfff) -+ return 1; /* dw combining sequence */ - return ((bisearch(c, wide, sizeof(wide) / sizeof(struct interval) - 1)) || - (cjkwidth && - bisearch(c, ambiguous, -@@ -1323,11 +1325,12 @@ int c; - } - - 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; -@@ -1389,9 +1392,9 @@ struct mchar *mc; - { - /* 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"); -@@ -1415,7 +1418,7 @@ struct mchar *mc; - 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/screen-4.8.0.tar.gz b/screen-4.8.0.tar.gz deleted file mode 100644 index 88f6120..0000000 --- a/screen-4.8.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6e11b13d8489925fde25dfb0935bf6ed71f9eb47eff233a181e078fde5655aa1 -size 854854 diff --git a/screen-4.8.0.tar.gz.sig b/screen-4.8.0.tar.gz.sig deleted file mode 100644 index 9e8aaee..0000000 Binary files a/screen-4.8.0.tar.gz.sig and /dev/null differ diff --git a/screen-4.9.0.tar.gz b/screen-4.9.0.tar.gz new file mode 100644 index 0000000..4786b3e --- /dev/null +++ b/screen-4.9.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f9335281bb4d1538ed078df78a20c2f39d3af9a4e91c57d084271e0289c730f4 +size 798229 diff --git a/screen-4.9.0.tar.gz.sig b/screen-4.9.0.tar.gz.sig new file mode 100644 index 0000000..da2d801 --- /dev/null +++ b/screen-4.9.0.tar.gz.sig @@ -0,0 +1,14 @@ +-----BEGIN PGP SIGNATURE----- + +iQGzBAABCAAdFiEEtFYP2Mny3jvjCOujkzrSGIb2n78FAmH5WV4ACgkQkzrSGIb2 +n7+KZQwA1OYxwIQlgkeAKdXp2ma3jVPqFq/UvrpM0uMU30i+gHz2Yu1jK9v+E+di +C6suW2fjazyTmI1pMdw0V1zJHQ7YDplUJyIEFhewe2xdh5gha4iiBQZc1mekT4pt +XO3WUHi31TPty8AJ6gObr9Bv5BePQ+1xilIWJUQpN6L4uQDp+sWyJDX3x+5g6Bx+ +E5hTzJfspAzPIWdXrIglxH006a8BpAyovJFYHn6FgRx/h2Vw9bS0oRdQYArqjLHv +4NkfQFDwjWMaxt3QQEDB2LGbDLANE9OqEaFOXqW1SEt07Esf2Tj5oot+Hjj2ZAps +LXDtmFHsmf0taluP1ULesH9d6Os3Ufb+etMmBgXkJPbhuhrQcgEiFjb/eXYLSiml +iEtdmCT2MzpUWDvdvPgE2hsAzkz/t9kye2BZDUrJcCl+Pue4yZK3hU0ic67eG10D +2O9XCSYCPn9j7ROfq6nJnXaneup6WTX5UkkQOgHmhJWxp6lu6DlR3Eqsb9l15Kpk +mr0jJwok +=QTsj +-----END PGP SIGNATURE----- diff --git a/screen.changes b/screen.changes index 6047318..4e8e80d 100644 --- a/screen.changes +++ b/screen.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Sat Feb 26 11:08:20 UTC 2022 - Andreas Stieger + +- GNU Screen 4.9.0: + * Hardstatus option for used encoding (escape string '%e') + * fix combining char handling that could lead to a segfault + * CVE-2021-26937: possible denial of service via a crafted UTF-8 + character sequence, upstream fix replacing dropped combchar.diff + (boo#1182092) + * make screen exit code be 0 when checking --help + * session names limit is 80 symbols + * option -X ignores specified user in multiuser env +- remove deprecated texinfo packaging macros + ------------------------------------------------------------------- Fri Feb 12 15:37:48 CET 2021 - mls@suse.de diff --git a/screen.keyring b/screen.keyring index 4201e79..4e0bbf5 100644 --- a/screen.keyring +++ b/screen.keyring @@ -1,107 +1,41 @@ -GPG keys of Amadeusz Sławiński ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v2.0.22 (GNU/Linux) - -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 -sBXW+7Q= -=+RA6 ------END PGP PUBLIC KEY BLOCK----- - -GPG keys of Alexander Naumov -----BEGIN PGP PUBLIC KEY BLOCK----- -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 -wlN767Yy1alaigI4FnBOe+rWTFyHCHTA -=ihYV ------END PGP PUBLIC KEY BLOCK----- +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 +=MrS5 +-----END PGP PUBLIC KEY BLOCK----- \ No newline at end of file diff --git a/screen.spec b/screen.spec index 75ed3f1..5950329 100644 --- a/screen.spec +++ b/screen.spec @@ -1,7 +1,7 @@ # # spec file for package screen # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,7 +22,7 @@ %define rundir %{_localstatedir}/run %endif Name: screen -Version: 4.8.0 +Version: 4.9.0 Release: 0 Summary: A program to allow multiple screens on a VT100/ANSI Terminal License: GPL-3.0-or-later @@ -31,28 +31,18 @@ URL: https://www.gnu.org/software/screen/ Source: https://ftp.gnu.org/gnu/screen/%{name}-%{version}.tar.gz Source1: screen.conf Source2: https://ftp.gnu.org/gnu/screen/%{name}-%{version}.tar.gz.sig -Source3: https://savannah.gnu.org/project/memberlist-gpgkeys.php?group=screen&download=1#/%{name}.keyring +Source3: https://savannah.gnu.org/people/viewgpg.php?user_id=99366#/%{name}.keyring Source4: screen.pam Patch0: global_screenrc.patch Patch6: libtinfo.diff -Patch7: combchar.diff BuildRequires: autoconf BuildRequires: automake +BuildRequires: makeinfo BuildRequires: ncurses-devel BuildRequires: pam-devel -Requires(post): permissions -Requires(post): %{install_info_prereq} -Requires(preun): %{install_info_prereq} -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} > 1140 -BuildRequires: makeinfo -%endif -%if 0%{?suse_version} > 1130 BuildRequires: utempter-devel -%else -BuildRequires: utempter -%endif Requires: terminfo-base +Requires(post): permissions %systemd_ordering %description @@ -68,7 +58,6 @@ Documentation: man page %patch0 # libtinfo.diff %patch6 -%patch7 %build sh ./autogen.sh @@ -87,19 +76,19 @@ CFLAGS="-DMAXWIN=1000 %{optflags}" %configure --prefix=%{_prefix} --infodir=%{_i # update Makefile so that make -j becomes reliable :> osdef.h # so that make depend has a chance :> comm.h # so that make depend has a chance -make %{?_smp_mflags} depend # FIXME: this should be self sufficient. +%make_build depend # FIXME: this should be self sufficient. rm osdef.h # so that make will use osdef.sh rm comm.h # so that make will use comm.sh -make %{?_smp_mflags} +%make_build %install %make_install rm -f %{buildroot}%{_bindir}/screen mv %{buildroot}%{_bindir}/screen-%{version} %{buildroot}%{_bindir}/screen chmod 755 %{buildroot}%{_bindir}/screen -mkdir -p %{buildroot}/etc -mkdir -p %{buildroot}/etc/pam.d +mkdir -p %{buildroot}%{_sysconfdir} +mkdir -p %{buildroot}%{_sysconfdir}/pam.d mkdir -p %{buildroot}%{_prefix}/lib mkdir -p %{buildroot}%{_tmpfilesdir} mkdir -p %{buildroot}%{rundir}/screens @@ -107,25 +96,20 @@ chmod 755 %{buildroot}%{rundir}/screens mkdir -p %{buildroot}%{rundir}/uscreens install -m 644 screenrc %{buildroot}%{_sysconfdir}/screenrc install -m 644 %{SOURCE1} %{buildroot}%{_tmpfilesdir} -install -m 644 %{SOURCE4} %{buildroot}/etc/pam.d/screen +install -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/pam.d/screen %files -%defattr(-,root,root) %config %{_sysconfdir}/screenrc -%config /etc/pam.d/screen +%config %{_sysconfdir}/pam.d/screen %attr(555,root,root) %{_bindir}/screen %dir %{_datadir}/screen %{_tmpfilesdir}/screen.conf %{_datadir}/screen/utf8encodings %{_infodir}/screen.info*%{ext_info} -%{_mandir}/man1/screen.1%{ext_man} +%{_mandir}/man1/screen.1%{?ext_man} %license COPYING %post -%install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz %tmpfiles_create %{_tmpfilesdir}/screen.conf -%preun -%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz - %changelog