From 2e5b678f5497e7ee0f2f6ae61f971feb5e225e4f421d6b11e8ef199db461a852 Mon Sep 17 00:00:00 2001 From: Alexander Naumov Date: Sun, 26 Feb 2017 11:05:40 +0000 Subject: [PATCH] Accepting request 460452 from home:AndreasStieger:branches:Base:System GNU Screen 4.5.1 OBS-URL: https://build.opensuse.org/request/show/460452 OBS-URL: https://build.opensuse.org/package/show/Base:System/screen?expand=0&rev=70 --- ...to-bc5ea98-fix-texinfo-syntax-errors.patch | 34 ++++++ fix_enable_logfile.patch | 72 ------------ screen-4.5.0.tar.gz | 3 - screen-4.5.0.tar.gz.sig | 16 --- screen-4.5.1.tar.gz | 3 + screen-4.5.1.tar.gz.sig | 16 +++ screen.changes | 10 ++ screen.keyring | Bin 5674 -> 8139 bytes screen.spec | 107 +++++++++--------- 9 files changed, 118 insertions(+), 143 deletions(-) create mode 100644 0001-Follow-up-to-bc5ea98-fix-texinfo-syntax-errors.patch delete mode 100644 fix_enable_logfile.patch delete mode 100644 screen-4.5.0.tar.gz delete mode 100644 screen-4.5.0.tar.gz.sig create mode 100644 screen-4.5.1.tar.gz create mode 100644 screen-4.5.1.tar.gz.sig diff --git a/0001-Follow-up-to-bc5ea98-fix-texinfo-syntax-errors.patch b/0001-Follow-up-to-bc5ea98-fix-texinfo-syntax-errors.patch new file mode 100644 index 0000000..852f50b --- /dev/null +++ b/0001-Follow-up-to-bc5ea98-fix-texinfo-syntax-errors.patch @@ -0,0 +1,34 @@ +From 675b877d4f21a8ff3bcb91afb19277bf6c2c0cda Mon Sep 17 00:00:00 2001 +From: Andreas Stieger +Date: Sat, 25 Feb 2017 21:30:59 +0100 +Subject: [PATCH] Follow-up to bc5ea98, fix texinfo syntax errors + +--- + src/doc/screen.texinfo | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/doc/screen.texinfo b/src/doc/screen.texinfo +index bc4cbae..aadad33 100644 +--- a/src/doc/screen.texinfo ++++ b/src/doc/screen.texinfo +@@ -5795,7 +5795,7 @@ and Alexander Naumov . + Contributors @* + ============ + +-@example ++@verbatim + Thomas Renninger , + Axel Beckert , + Ken Beal , +@@ -5826,7 +5826,7 @@ Contributors @* + Jason Merrill , + Johannes Zellner , + Pablo Averbuj . +-@end example ++@end verbatim + + @noindent + Version @* +-- +2.12.0 + diff --git a/fix_enable_logfile.patch b/fix_enable_logfile.patch deleted file mode 100644 index ecce830..0000000 --- a/fix_enable_logfile.patch +++ /dev/null @@ -1,72 +0,0 @@ -From: Alexander Naumov -Date: Thu, 26 Jan 2017 23:44:43 +0100 -Subject: [PATCH] Adding "-L logfile" option for setting new logfile's name -References: bnc#1020870 - -Now it's possible to set your own lofile name with -this option ONLY. It fixes API of old versions. - -Signed-off-by: Alexander Naumov ---- -diff --git a/src/doc/screen.1 b/src/doc/screen.1 -index 23b4d7b..5b14d91 100644 ---- doc/screen.1 -+++ doc/screen.1 -@@ -261,9 +261,12 @@ Ask your system administrator if you are not sure. Remove sessions with the - .B \-L - tells - .I screen --to turn on automatic output logging for the windows. By default, logfile's name --is screenlog.1. You can sets new name: add it right after -L option e.g. "screen ---L my_logfile". -+to turn on automatic output logging for the windows. -+.TP 5 -+.BI "\-L logfile " file -+By default logfile name is \*Qscreenlog.0\*Q. You can also set new logfile name -+with the \*Qlogfile\*Q option. Keep in mind that logfile name can not start with -+the "-" symbol. - .TP 5 - .B \-m - causes -diff --git a/src/screen.c b/src/screen.c -index 64650e9..9e1072a 100644 ---- screen.c -+++ screen.c -@@ -302,7 +302,7 @@ struct passwd *ppp; - pw_try_again: - #endif - n = 0; -- if (ppp->pw_passwd[0] == '#' && ppp->pw_passwd[1] == '#' & strcmp(ppp->pw_passwd + 2, ppp->pw_name) == 0) -+ if (ppp->pw_passwd[0] == '#' && ppp->pw_passwd[1] == '#' && strcmp(ppp->pw_passwd + 2, ppp->pw_name) == 0) - n = 13; - for (; n < 13; n++) { - char c = ppp->pw_passwd[n]; -@@ -667,18 +667,16 @@ int main(int ac, char** av) - break; - - case 'L': -- if (--ac != 0) { -- screenlogfile = SaveStr(*++av); -- if (screenlogfile[0] == '-') -+ if (--ac > 0 && !strcmp(*++av, "logfile")) { -+ *++av; // Now '*av' is a logfile parameter -+ -+ if (strlen(*av) > PATH_MAX) -+ Panic(1, "-L: logfile name too long. (max. %d char)", PATH_MAX); -+ -+ if (*av[0] == '-') - Panic(0, "-L: logfile name can not start with \"-\" symbol"); -- if (strlen(screenlogfile) > PATH_MAX) -- Panic(0, "-L: logfile name too long. (max. %d char)", PATH_MAX); -- -- FILE *w_check; -- if ((w_check = fopen(screenlogfile, "w")) == NULL) -- Panic(0, "-L: logfile name access problem"); -- else -- fclose(w_check); -+ -+ screenlogfile = SaveStr(*av); - } - nwin_options.Lflag = 1; - break; - diff --git a/screen-4.5.0.tar.gz b/screen-4.5.0.tar.gz deleted file mode 100644 index 068b1a4..0000000 --- a/screen-4.5.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:01c3a7c362185f35d6a95dff52d64337076496acd034d717de3c263500cfefb0 -size 963233 diff --git a/screen-4.5.0.tar.gz.sig b/screen-4.5.0.tar.gz.sig deleted file mode 100644 index 4aa2f78..0000000 --- a/screen-4.5.0.tar.gz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEcaoJ2eiHD9sKp7YeIflo3vdHq9cFAlh+cg4ACgkQIflo3vdH -q9d1Uw//QEEy4vceIdg0LhAek6GwBsEk6BYra6Jne4UMwJKJnD7Pe9FFbDGFsUKK -d8CpeTBXHQJf4skaxxgfcthJmdVzxukakrhpFNNxV0KhCqkwuzq/+DmuIpniJH4O -ln41dbw3B+88hyrxiYT38qMwB9baNVqNf3nS58p1MbAGpDEZTV9DxfWV+prAMEJ8 -wuGjYSu6CgKMBuBHymGp8K2jEEaXHlWP0AmZyIc5BPi8ojNkCt6rh9OXWShmQj7d -pVbpNCFQB2g+Q5G6B3WlPj01pfln/JfX43Wahwn9OvZ9sUvmtkYy2WgNYEkYQqIo -zVetjgu59IZBVjZBc4/JhfcPNdxNaZHugkU4Nabw6W6uMKUMzA19EIvtQ4AkEAbX -1DAPsFQGA2COUQdgDhkuGPM0PjXov8R/YR6FSkb3EECyw9vUmpywU/yyMdvC74lG -Ulcm6Xd5G6xt4i2BlAHO9qv9UlRJpSmeKj+kluRUQB4UUsyNeMcDuOYfQhPy0fy8 -8B424D/ukhmhT/FxMoPTyLND7SSGFFH6Rueeqojm6kCM3CuDnf2g+LEo6j6psH+4 -zJVHyc/A26UF+60/lv+ScZ1TXI9JZE0XjwwaYGav4gUitQ0ASuZsWMJeIE4o6FzX -n4Slk/gE3fwMfhrHVocpipQFsFTb6Z5+xTjyLzO16PuJwL0O6Do= -=fhpd ------END PGP SIGNATURE----- diff --git a/screen-4.5.1.tar.gz b/screen-4.5.1.tar.gz new file mode 100644 index 0000000..10ed4c6 --- /dev/null +++ b/screen-4.5.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:97db2114dd963b016cd4ded34831955dcbe3251e5eee45ac2606e67e9f097b2d +size 963153 diff --git a/screen-4.5.1.tar.gz.sig b/screen-4.5.1.tar.gz.sig new file mode 100644 index 0000000..114f34b --- /dev/null +++ b/screen-4.5.1.tar.gz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEcaoJ2eiHD9sKp7YeIflo3vdHq9cFAlixp7cACgkQIflo3vdH +q9cu7A//eU/bJpZhfi4PRPZymBgACAKNi4KIaKzyL0+hxFoABMrbp5fvZRgG2llT +dLBZjQ0azi+kDXM+LR4pJvkeNFhv2S/kUqkcr0AATLf4YfCY+JJrKGpOIublHG/i +eCu8PgEZYd1nQxkh6Si8R6+voogAw9z8f2QnenN3zdv0SiEMVEOtgo8pvotIIpS8 +pnF0lTNBIuYcauL5wKgxzY9r07qiPa47t0RSr7N40dCjJWV9h1bkj/em5nQ+B4ap +Nv4HJBI/wDQkdrB+kgWsvioJkyL8fWG6Z5lYBzWcQ0Sy0zdgSnLiEGwbnVk/Sm0R +eD0DEIZjeHiqVRqJUSECDRxPTqKzqMErkDw97pCeuds6tPBd/eghhczfLEjP8jTg +6QqgNJeNQ1Uul9g+LfkAmo20D6nXizW88m1OQuat2bsEE8nk2T6wVEsS1S2skm8L +R4GEwTly20HTX95oVgga5svNFbIH3KDQ/gXQfnhCvJC19fKeFgKl2ySO7mtZsHSv +aHF0HRmKsVCIMY+rjJ1tSFO8DLItoua7rwFNvsdqsu1ZyisHUygjEgFYxkkbwAcu +oFnxipwPxB8YvY6DDKEMl4pi+2qX+0uC8IU9HlKT5PdOU6ZVfoIzN2hTUmPqZ50L +Z0gEYgDvOYih9LieUV7JhuktoWpykoe4FpWPuYvIXP4h1Kj6y9Y= +=TjxB +-----END PGP SIGNATURE----- diff --git a/screen.changes b/screen.changes index 523245b..df26f8b 100644 --- a/screen.changes +++ b/screen.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sat Feb 25 20:34:40 UTC 2017 - astieger@suse.com + +- GNU Screen 4.5.1: + * logfile permissions problem (CVE-2017-5618) bsc#1021743 + This issues does not affect the SUSE package as setuid/setid + is not used. +- drop upstreamed fix_enable_logfile.patch +- add 0001-Follow-up-to-bc5ea98-fix-texinfo-syntax-errors.patch + ------------------------------------------------------------------- Fri Jan 27 22:32:17 UTC 2017 - alexander_naumov@opensuse.org diff --git a/screen.keyring b/screen.keyring index 8da51986643de03c69d764365d00731d983d5e279abdcfd0af8d5e56d2aafa64..2ea45fcda9760e0afab1abeda567f71bb6374c423d2b1d330a216abdfc2e03b2 100644 GIT binary patch literal 8139 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 literal 5674 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 1310 %define rundir /run %else -%define rundir /var/run +%define rundir %{_localstatedir}/run %endif - -Url: http://www.gnu.org/software/screen/ - Name: screen -%if 0%{?suse_version} > 1140 -BuildRequires: makeinfo -%endif -BuildRequires: ncurses-devel -%if 0%{?suse_version} > 1130 -BuildRequires: utempter-devel -%else -BuildRequires: utempter -%endif -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: pam-devel -PreReq: %install_info_prereq -PreReq: coreutils -Version: 4.5.0 +Version: 4.5.1 Release: 0 Summary: A program to allow multiple screens on a VT100/ANSI Terminal License: GPL-3.0+ Group: System/Console +Url: http://www.gnu.org/software/screen/ Source: http://ftp.gnu.org/gnu/screen/%{name}-%{version}.tar.gz Source1: screen.conf Source2: http://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 Patch0: global_screenrc.patch -Patch1: fix_enable_logfile.patch Patch6: libtinfo.diff +Patch7: 0001-Follow-up-to-bc5ea98-fix-texinfo-syntax-errors.patch +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: ncurses-devel +BuildRequires: pam-devel +# FIXME: use proper Requires(pre/post/preun/...) +PreReq: %{install_info_prereq} +PreReq: coreutils +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 %description With this program you can take advantage of the multitasking abilities @@ -61,21 +62,20 @@ sessions can also be detached and resumed from another login terminal. Documentation: man page %prep -%setup +%setup -q # global_screenrc.patch %patch0 -# PATCH-FEATURE-UPSTREAM fix_enable_logfile.patch -%patch1 # libtinfo.diff %patch6 +%patch7 -p2 %build sh ./autogen.sh -CFLAGS="-DMAXWIN=1000 $RPM_OPT_FLAGS" %configure --prefix=/usr --infodir=%{_infodir} \ +CFLAGS="-DMAXWIN=1000 %{optflags}" %configure --prefix=%{_prefix} --infodir=%{_infodir} \ --mandir=%{_mandir} \ - --with-socket-dir='(eff_uid ? "%rundir/uscreens" : "%rundir/screens")' \ - --with-sys-screenrc=/etc/screenrc \ + --with-socket-dir='(eff_uid ? "%{rundir}/uscreens" : "%{rundir}/screens")' \ + --with-sys-screenrc=%{_sysconfdir}/screenrc \ --with-pty-group=5 \ --enable-use-locale \ --enable-telnet \ @@ -86,48 +86,51 @@ CFLAGS="-DMAXWIN=1000 $RPM_OPT_FLAGS" %configure --prefix=/usr --infodir=%{_info # 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 depend # FIXME: this should be self sufficient. +make %{?_smp_mflags} 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} %install -make install DESTDIR=$RPM_BUILD_ROOT -rm -f $RPM_BUILD_ROOT/usr/bin/screen -mv $RPM_BUILD_ROOT/usr/bin/screen-%version $RPM_BUILD_ROOT/usr/bin/screen -chmod 755 $RPM_BUILD_ROOT/usr/bin/screen -mkdir -p $RPM_BUILD_ROOT/etc -mkdir -p $RPM_BUILD_ROOT/usr/lib -mkdir -p $RPM_BUILD_ROOT/usr/lib/tmpfiles.d -mkdir -p $RPM_BUILD_ROOT%rundir/screens -chmod 755 $RPM_BUILD_ROOT%rundir/screens -mkdir -p $RPM_BUILD_ROOT%rundir/uscreens -chmod 1777 $RPM_BUILD_ROOT%rundir/uscreens -install -m 644 screenrc $RPM_BUILD_ROOT/etc/screenrc -install -m 644 %SOURCE1 $RPM_BUILD_ROOT/usr/lib/tmpfiles.d +%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}%{_prefix}/lib +mkdir -p %{buildroot}%{_prefix}/lib/tmpfiles.d +mkdir -p %{buildroot}%{rundir}/screens +chmod 755 %{buildroot}%{rundir}/screens +mkdir -p %{buildroot}%{rundir}/uscreens +chmod 1777 %{buildroot}%{rundir}/uscreens +install -m 644 screenrc %{buildroot}%{_sysconfdir}/screenrc +install -m 644 %{SOURCE1} %{buildroot}%{_prefix}/lib/tmpfiles.d %files %defattr(-,root,root) -%config /etc/screenrc -%attr(555,root,root) /usr/bin/screen -%dir /usr/share/screen -%dir /usr/lib/tmpfiles.d -/usr/lib/tmpfiles.d/screen.conf -/usr/share/screen/utf8encodings +%config %{_sysconfdir}/screenrc +%attr(555,root,root) %{_bindir}/screen +%dir %{_datadir}/screen +%dir %{_prefix}/lib/tmpfiles.d +%{_prefix}/lib/tmpfiles.d/screen.conf +%{_datadir}/screen/utf8encodings # Created via aaa_base or systemd on system boot -%ghost %dir %rundir/screens -%ghost %dir %rundir/uscreens -%doc %{_infodir}/screen.info*.gz -%doc %{_mandir}/man1/screen.1.gz +%ghost %dir %{rundir}/screens +%ghost %dir %{rundir}/uscreens +%{_infodir}/screen.info*%{ext_info} +%{_mandir}/man1/screen.1%{ext_man} %doc COPYING %post %install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz +%preun +%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz + # Create our dirs immediatly, after a manual package install. # After a reboot systemd/aaa_base will take care. -test -d %rundir/screens || mkdir -m 755 %rundir/screens -test -d %rundir/uscreens || mkdir -m 1777 %rundir/uscreens +test -d %{rundir}/screens || mkdir -m 755 %{rundir}/screens +test -d %{rundir}/uscreens || mkdir -m 1777 %{rundir}/uscreens %changelog