From 1536fa30896938c9d8fa6d5e1fc2d8b9dcb12b241fce175b10a292e2f4ff34d3 Mon Sep 17 00:00:00 2001 From: Alexander Naumov Date: Tue, 17 Jan 2017 22:41:54 +0000 Subject: [PATCH 1/3] Accepting request 451044 from home:Alexander_Naumov:branches:Base:System Update: GNU Screen v.4.5.0 OBS-URL: https://build.opensuse.org/request/show/451044 OBS-URL: https://build.opensuse.org/package/show/Base:System/screen?expand=0&rev=66 --- screen-4.4.0.tar.gz | 3 --- screen-4.4.0.tar.gz.sig | Bin 543 -> 0 bytes screen-4.5.0.tar.gz | 3 +++ screen-4.5.0.tar.gz.sig | 16 ++++++++++++++++ screen.changes | 15 +++++++++++++++ screen.spec | 4 ++-- 6 files changed, 36 insertions(+), 5 deletions(-) delete mode 100644 screen-4.4.0.tar.gz delete mode 100644 screen-4.4.0.tar.gz.sig create mode 100644 screen-4.5.0.tar.gz create mode 100644 screen-4.5.0.tar.gz.sig diff --git a/screen-4.4.0.tar.gz b/screen-4.4.0.tar.gz deleted file mode 100644 index 6323b2a..0000000 --- a/screen-4.4.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ef722a54759a3bf23aad272bbf33c414c1078cad6bcd982fada93c0d7917218b -size 846010 diff --git a/screen-4.4.0.tar.gz.sig b/screen-4.4.0.tar.gz.sig deleted file mode 100644 index 8d80125014ed1a88dc64ba32c47829b2ee1b280b60b4cfed0de0c40a20a56972..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 543 zcmV+)0^t3L0vrSY0SW*H1p-%R0z&`_2@tmkql3jh^Q2+$5B@S>qp?s`2$CuHTtZ64 zjIP@%9BtNk%;KA`$(@(d5GaD62Xq1;P^x%~si=%6z<3kQlK9hNH-?ht4Hu&mpal@< zL#FTgBYdk=nXG2$PvD`^3>6amwKG&0DcC961ZmG8-N81FFM zCyyu%>GS6@QZ=Tuu&6!skQ`phmI15reI9Xa)b&?TiM>#;vaK5)EH zo)=o~n-H+g-~DWic?tz^AH@&k{O3%=o)s9_G!vkm0 zoJ08BDXy;(@Kc~95F#5c_eJ>1D~shj4Hw<_05E}7etZ)KUu{}vkmr&i2dd@B(3WW; zsWMh8#1S5S`4?9i5}_L>o$1?7kS4O;{JlHYKv|sTN{yx&jxHhy1Xg<@FkPd3F2yU|d1jb0b*3CTXj`<5N`OF+14LJ9DR?g{DXlHiO&6M2 zVN={IHj71^a;$E5m6gaG7Tk#MtU?2n^;AJx*1{tCSVk+x6I8jNj?A?AinFkvXbOq} h%0W~ Date: Wed, 18 Jan 2017 00:07:31 +0000 Subject: [PATCH 2/3] Accepting request 451051 from home:Alexander_Naumov:branches:Base:System update gpg keyring OBS-URL: https://build.opensuse.org/request/show/451051 OBS-URL: https://build.opensuse.org/package/show/Base:System/screen?expand=0&rev=67 --- screen.keyring | Bin 3394 -> 5674 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/screen.keyring b/screen.keyring index c5a953dc22d06f45cfc9b7575d506b6459561f33ece9f209d4a8dd7a5e598fc9..8da51986643de03c69d764365d00731d983d5e279abdcfd0af8d5e56d2aafa64 100644 GIT binary patch delta 2305 zcmajfc{~#i1IO_h!<@N>5yF)FtkB4nYZ8sf91Rmnn@!HNBsmg_O;qwDxsM!EDmS5# zYi@I&tCsL%TKPTC?|J=R&-35&@8|XU{`Y;o+o5F|H5P)z9H1bVJ5D`~;|PGM`7^xD z2{g@<`oJbkDREdMG&X}TAL(1HU`uJqUfne;x5_P4C%ib7HA3>NR%+PM!z(SDoG)bJ zLg?+OcG*&iWZ1bmc>BZ{)u^=5J3vM^EIv3?%A^6jC2D{A`z7Yb%LS83W=;(F+**Dg zd%%I`dnxe*WyDc*8iMw-HS4pHs+yGAI=_3?n3ydS(e_j!Js1DS`%KGNtBIKW*}5@k zoJ;O4_7UYiEFwlH5O&PG1FnA*N|Gg{CvzCzTZKqD!2#mh@3a8P2PO zk1x}r*I#&F^u`HN!7IgTQf}c~La2GUjKaKl{{1)hAGBECR+)ZDq-$l*O)LC1?wH{$ zxHGtlb#lvF?Bd9xZ)7j=(ruhxK$5XgNt$+i&N4K?_*CXhP^bqvpNW1dIiy;c&I{DZOxUjG5M5xQ!W`wpjt3SJubK03W#QtHsn+8%FHckhL^uE(^*ZL)F_GvS z{usQ1Bl>0tHe3OY{-^ld_`8^4ahMx~n*@v&7Jt<=8R)_##=#3Pg&gAwEdx)kCkjvV z6;tGnu>$FPHs#|W;J-fxl;H${MX8(s5I>lg2gohK3nudM1GykTP7a_P2T<}3fDe4+ zpUsK>BY^u!yBpPezEH)Co}wW;>cGlR91i!LgXa%;_P|GC^0v zQ)=-sMrr|6NflhSil{fEa!<&k)PtM2U3hFloSFSQSU2*j))~dfxU6a*D!l;cF|(}B zC|U+BQl6ZM@^pLCKhmiFJlJ_nQ^qsctv_Zp1;Nml?!CO)z~0HghVh0X2~Y!sY|3|C zW#lzzm&KJDZjfxmz*@N1OoEpO7NJ73cQin45=30jN&eYG>YCeF41`TwFeaW!qp|6q z45iE22|^GI#biO(VJ5T9XqH@KTjhcWIt^hS%u**gy;}Cg9pkoR{ec6#BrTIxWz9Z4 z17EX4wj7GufKqmVV2QA!M(}luGu|$RS#!b;WMRgoF>KfMDHru5nZr-T`Cd{bd%k0K{%`*) z)KEnr#M0g%*u?4z`9y#|^)hP8$ekV0dQe@M)iN>D@p$^MyO?#7bv?Ef3olCvNP4e0 z96+ON#$evMUTXT4?=!8@jz3wMd2xW7-gXz1%5jP~fF_3mx&avRM=e6bP;pu;6mP_6+|4l<5gaMP__!$mgd}2 zy<^8%ZmmdDP=lq3l1{{j7t~r@gY~7QKg`}S%zTGma+|tf8t2;c^fs68GufZ4pMzKN zaH|rcyuXC)qG*8XrS!eXx^Z+m}6yRBDAcr9f3`(dT;&OTIVrU zF_Q#y4p@8YU$a!D*o)%gmv8L*%$i?ryw1H*H4d56;C4{a<#jEoMys~#%r60L=da%d zB}7qjGg;DJt(ji*1WxvAal|hVk#8ZlKqW*$$2^RS?Vd^yU!;E8v1vp7lqSwp4;nUco5jxHly4YqS__ z7~2}K3-BU(sBL+J_}T6&V-o|_vmsTV4py$cOI6!JiyHyRce2K@FxLHLdkpkI_xhFgM8p0LCN0r}1>f=2xphP^w(X7uI2;s{rcb9^B` z@u4>g7T64NJWlfT>3fuf)$=SJb*6-pnIvm4K&`Fb%*>($_{78#j?<^MoAiI;3rJb4 z+?kM-dYbObFkeSF^rk;{vQNBNyimx;#H&R1;ahkfSID}-c39ZuD8f&LC*<-c=y&h- zbssjb(VRbNCpA6DM+n*nrq%=ZEaixI=WKKQ0#~&)7Z&rGXxb4IU-j{vYSOM zf@V9K$;jL>%0dp(#O!2>?hw%F>t_zFvUMq>Lhhkj<`(#Au$b6PBbtSmG(GTiM4*PL6J~?=F+Q;u__Aqfp}Y zeyngy{Ka7fW@}@!ZedF zc9aff7Twkf>o?0r&}Vwzg9erWJAkS1iG7JY6_-1 Date: Fri, 27 Jan 2017 22:05:16 +0000 Subject: [PATCH 3/3] Accepting request 453044 from home:Alexander_Naumov:branches:Base:System fix GNU Screen API: bnc#1020870 OBS-URL: https://build.opensuse.org/request/show/453044 OBS-URL: https://build.opensuse.org/package/show/Base:System/screen?expand=0&rev=68 --- fix_enable_logfile.patch | 72 ++++++++++++++++++++++++++++++++++++++++ screen.changes | 7 ++++ screen.spec | 3 ++ 3 files changed, 82 insertions(+) create mode 100644 fix_enable_logfile.patch diff --git a/fix_enable_logfile.patch b/fix_enable_logfile.patch new file mode 100644 index 0000000..ecce830 --- /dev/null +++ b/fix_enable_logfile.patch @@ -0,0 +1,72 @@ +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.changes b/screen.changes index 85f4e31..523245b 100644 --- a/screen.changes +++ b/screen.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Jan 27 22:32:17 UTC 2017 - alexander_naumov@opensuse.org + +- Add fix_enable_logfile.patch + * fix loging screen API (bnc#1020870) + * fix privilege escalation + ------------------------------------------------------------------- Thu Jan 17 23:11:38 UTC 2017 - alexander_naumov@opensuse.org diff --git a/screen.spec b/screen.spec index e7361fa..5450ee9 100644 --- a/screen.spec +++ b/screen.spec @@ -49,6 +49,7 @@ 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 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -63,6 +64,8 @@ Documentation: man page %setup # global_screenrc.patch %patch0 +# PATCH-FEATURE-UPSTREAM fix_enable_logfile.patch +%patch1 # libtinfo.diff %patch6