Hello community, here is the log from the commit of package screen for openSUSE:Factory checked in at 2014-04-30 15:00:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/screen (Old) and /work/SRC/openSUSE:Factory/.screen.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "screen" Changes: -------- --- /work/SRC/openSUSE:Factory/screen/screen.changes 2014-04-22 07:35:24.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.screen.new/screen.changes 2014-04-30 15:00:40.000000000 +0200 @@ -1,0 +2,22 @@ +Thu Apr 17 10:23:40 UTC 2014 - jw@suse.com + +- Update to 4.2.0 as released on screen-devel@gnu.org yesterday. + Thank you Amadeusz! + * keep libtinfo.diff (from coolo 2011, why exactly?) + * keep global_screenrc.patch (renamed from screen-4.0.2.dif) + * keep screen-man-loginshell.diff (to be upstreamed) + * dropped screen-__P.diff (not needed) + * keep term_too_long.diff (savannah#30880, to be upstreamed) + * keep use_locale.diff (from lnt-sysadmin@lists.lrz.de 2012, check?) + * keep screen-4.0.3-ipv6.patch (builtin telnet, to be upstreamed) + * keep screen_enhance_windows_list.patch (to be upstreamed) + * keep screen-poll-zombies.patch (to be upstreamed) + * keep xX_string_escape.patch (renamed from show_all_active.patch, to be upstreamed) + * keep sort_command.patch (from trenn 2011, to be upstreamed) + * added msg_version_3.patch (ouch, incompatible protocol, to be upstreamed) + +- added %rundir with /var/run for 1310 and before; but /run afterwards. + aj advocates /run for Factory; for 1310 it was banned by + suse-filelist-forbidden-fhs23 + +------------------------------------------------------------------- Old: ---- screen-4.0.2.dif screen-4.0.4.tar.gz screen-__P.diff show_all_active.patch New: ---- global_screenrc.patch msg_version_3.patch screen-4.2.0.tar.gz xX_string_escape.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ screen.spec ++++++ --- /var/tmp/diff_new_pack.edf0tV/_old 2014-04-30 15:00:42.000000000 +0200 +++ /var/tmp/diff_new_pack.edf0tV/_new 2014-04-30 15:00:42.000000000 +0200 @@ -16,6 +16,12 @@ # +%if 0%{?suse_version} > 1310 +%define rundir /run +%else +%define rundir /var/run +%endif + Url: http://www.gnu.org/software/screen/ Name: screen @@ -28,17 +34,18 @@ %else BuildRequires: utempter %endif +BuildRequires: autoconf +BuildRequires: automake PreReq: %install_info_prereq PreReq: coreutils -Version: 4.0.4 +Version: 4.2.0 Release: 0 Summary: A program to allow multiple screens on a VT100/ANSI Terminal License: GPL-2.0+ Group: System/Console Source: %{name}-%{version}.tar.gz Source1: screen.conf -Patch0: screen-4.0.2.dif -Patch1: screen-__P.diff +Patch0: global_screenrc.patch Patch2: screen-man-loginshell.diff Patch3: screen-4.0.3-ipv6.patch # upstream savannah#30880 @@ -47,8 +54,9 @@ Patch6: libtinfo.diff Patch9: use_locale.diff Patch10: screen-poll-zombies.patch -Patch11: show_all_active.patch +Patch11: xX_string_escape.patch Patch12: screen_enhance_windows_list.patch +Patch13: msg_version_3.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -60,28 +68,49 @@ %prep %setup +# global_screenrc.patch %patch0 -%patch1 +# screen-man-loginshell.diff %patch2 -p1 +# screen-4.0.3-ipv6.patch %patch3 +# term_too_long.diff %patch4 -p1 +# sort_command.patch %patch5 +# libtinfo.diff %patch6 +# use_locale.diff %patch9 -p1 +# screen-poll-zombies.patch %patch10 -p1 +# xX_string_escape.patch %patch11 +# screen_enhance_windows_list.patch %patch12 +# msg_version_3.patch +%patch13 -p1 %build +sh ./autogen.sh + CFLAGS="-DMAXWIN=1000 $RPM_OPT_FLAGS" %configure --prefix=/usr --infodir=%{_infodir} \ --mandir=%{_mandir} \ - --with-socket-dir='(eff_uid ? "/run/uscreens" : "/run/screens")' \ + --with-socket-dir='(eff_uid ? "%rundir/uscreens" : "%rundir/screens")' \ --with-sys-screenrc=/etc/screenrc \ --with-pty-group=5 \ --enable-use-locale \ --enable-telnet \ --enable-colors256 \ --verbose + +# 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. +rm osdef.h # so that make will use osdef.sh +rm comm.h # so that make will use comm.sh + make %{?_smp_mflags} %install @@ -92,10 +121,10 @@ 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/run/screens -chmod 755 $RPM_BUILD_ROOT/run/screens -mkdir -p $RPM_BUILD_ROOT/run/uscreens -chmod 1777 $RPM_BUILD_ROOT/run/uscreens +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 @@ -108,8 +137,8 @@ /usr/lib/tmpfiles.d/screen.conf /usr/share/screen/utf8encodings # Created via aaa_base or systemd on system boot -%ghost %dir /run/screens -%ghost %dir /run/uscreens +%ghost %dir %rundir/screens +%ghost %dir %rundir/uscreens %doc %{_infodir}/screen.info*.gz %doc %{_mandir}/man1/screen.1.gz @@ -118,8 +147,8 @@ # Create our dirs immediatly, after a manual package install. # After a reboot systemd/aaa_base will take care. -test -d /run/screens || mkdir -m 755 /run/screens -test -d /run/uscreens || mkdir -m 1777 /run/uscreens +test -d %rundir/screens || mkdir -m 755 %rundir/screens +test -d %rundir/uscreens || mkdir -m 1777 %rundir/uscreens %postun %install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz ++++++ global_screenrc.patch ++++++ Index: screenrc =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ screenrc 2011-11-21 15:47:46.649112381 +0100 @@ -0,0 +1,4 @@ +# this is the global screenrc file. Handle with care. + +termcapinfo xterm* G0:is=\E[?4l\E>:ti@:te@ +termcapinfo linux me=\E[m:AX ++++++ libtinfo.diff ++++++ --- /var/tmp/diff_new_pack.edf0tV/_old 2014-04-30 15:00:42.000000000 +0200 +++ /var/tmp/diff_new_pack.edf0tV/_new 2014-04-30 15:00:42.000000000 +0200 @@ -11,18 +11,3 @@ AC_TRY_LINK(,tgetent((char *)0, (char *)0);,, LIBS="-lncursesw $olibs" AC_CHECKING(libncursesw) ---- ./configure.orig 2012-06-11 14:43:37.000000000 +0000 -+++ ./configure 2012-06-11 14:45:41.000000000 +0000 -@@ -6296,9 +6296,9 @@ else - $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- LIBS="-ltermlib $olibs" --{ $as_echo "$as_me:$LINENO: checking libtermlib..." >&5 --$as_echo "$as_me: checking libtermlib..." >&6;} -+ LIBS="-ltinfo $olibs" -+{ $as_echo "$as_me:$LINENO: checking libtinfo..." >&5 -+$as_echo "$as_me: checking libtinfo..." >&6;} - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF ++++++ msg_version_3.patch ++++++ --- screen-4.2.0/screen.h 2014-04-16 23:38:41.000000000 +0200 +++ screen-4.2.0/screen.h.new 2014-04-17 12:13:38.014982957 +0200 @@ -182,8 +182,9 @@ * A few revisions after 8147d08 incorrectly * carried version 1, but should have carried 2. * 2: screen version 4.1.0devel (revisions 8b46d8a upto YYYYYYY) + * 3: screen version 4.2.0 (was incorrectly originally. Patched here) */ -#define MSG_VERSION 2 +#define MSG_VERSION 3 #define MSG_REVISION (('m'<<24) | ('s'<<16) | ('g'<<8) | MSG_VERSION) struct msg ++++++ screen-4.0.4.tar.gz -> screen-4.2.0.tar.gz ++++++ ++++ 15620 lines of diff (skipped) ++++++ screen-poll-zombies.patch ++++++ --- /var/tmp/diff_new_pack.edf0tV/_old 2014-04-30 15:00:43.000000000 +0200 +++ /var/tmp/diff_new_pack.edf0tV/_new 2014-04-30 15:00:43.000000000 +0200 @@ -25,16 +25,6 @@ + { "zombie", ARGS_012 }, + { "zombie_timeout", ARGS_1 } }; ---- ./comm.h.dist.orig 2013-09-13 13:23:15.271279615 +0000 -+++ ./comm.h.dist 2013-09-13 13:23:44.198279564 +0000 -@@ -237,5 +237,6 @@ struct action - #define RC_XON 180 - #define RC_ZMODEM 181 - #define RC_ZOMBIE 182 -+#define RC_ZOMBIE_TIMEOUT 183 - --#define RC_LAST 182 -+#define RC_LAST 183 --- ./doc/screen.1.orig 2013-09-13 13:22:50.993279658 +0000 +++ ./doc/screen.1 2013-09-13 13:23:15.266279615 +0000 @@ -3547,6 +3547,15 @@ Optionally you can put the word \*Qonerr ++++++ use_locale.diff ++++++ --- /var/tmp/diff_new_pack.edf0tV/_old 2014-04-30 15:00:43.000000000 +0200 +++ /var/tmp/diff_new_pack.edf0tV/_new 2014-04-30 15:00:43.000000000 +0200 @@ -1,15 +1,3 @@ -diff -Pdpru a/configure b/configure ---- a/configure 2012-09-19 14:44:09.593017471 +0200 -+++ b/configure 2012-09-19 15:20:44.406073384 +0200 -@@ -1338,7 +1339,7 @@ Optional Features: - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --disable-socket-dir disable system wide socket-dir and use ~/.screen instead - --enable-pam enable PAM support -- --enable-locale use localized month/day names -+ --enable-use-locale use localized month/day names - --enable-telnet enable builtin telnet - --enable-colors256 enable support for 256 colors - --enable-rxvt_osc enable support for rxvt OSC codes diff -Pdpru a/configure.in b/configure.in --- a/configure.in 2012-09-19 14:44:09.592017464 +0200 +++ b/configure.in 2012-09-19 15:21:45.555515336 +0200 ++++++ xX_string_escape.patch ++++++ screen: Introduce Xx string escape showing the executed command of a window either only the executed command ('X') or the whole command line ('x') of each window is shown. Signed-off-by: Thomas Renninger <trenn@suse.de> --- ./doc/screen.1.orig 2013-09-13 13:26:28.055279274 +0000 +++ ./doc/screen.1 2013-09-13 13:26:41.385279250 +0000 @@ -3747,6 +3747,10 @@ window; with '+' qualifier: starting wit one. .IP W all window numbers and names except the current one +.IP x +the executed command including arguments running in this windows +.IP X +the executed command without arguments running in this windows .IP y last two digits of the year number .IP Y --- ./screen.c.orig 2013-09-13 13:26:28.057279274 +0000 +++ ./screen.c 2013-09-13 13:34:30.151278421 +0000 @@ -2693,6 +2693,20 @@ int rec; } p += strlen(p) - 1; break; + case 'X': case 'x': + *p = 0; + for (i = 0; win && win->w_cmdargs[i]; i++) + { + if (l < strlen(win->w_cmdargs[i]) + 1) + break; + sprintf(p, i ? "%s" : " %s", win->w_cmdargs[i]); + l -= strlen(p); + p += strlen(p); + if (i == 0 && *s == 'X') + break; + } + p--; + break; case 'l': #ifdef LOADAV *p = 0; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org