From 971a59904df2d8cf0c6ce3f2cfab2e50d178d067b0ae3575c7dd3964177f7828 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 23 Apr 2014 05:35:29 +0000 Subject: [PATCH] Accepting request 230477 from home:jnweiger:branches:Base:System - 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 OBS-URL: https://build.opensuse.org/request/show/230477 OBS-URL: https://build.opensuse.org/package/show/Base:System/screen?expand=0&rev=53 --- screen-4.0.2.dif => global_screenrc.patch | 0 libtinfo.diff | 15 ----- msg_version_3.patch | 13 +++++ screen-4.0.4.tar.gz | 3 - screen-4.2.0.tar.gz | 3 + screen-__P.diff | 16 ------ screen-poll-zombies.patch | 10 ---- screen.changes | 22 +++++++ screen.spec | 57 ++++++++++++++----- use_locale.diff | 12 ---- ...all_active.patch => xX_string_escape.patch | 0 11 files changed, 81 insertions(+), 70 deletions(-) rename screen-4.0.2.dif => global_screenrc.patch (100%) create mode 100644 msg_version_3.patch delete mode 100644 screen-4.0.4.tar.gz create mode 100644 screen-4.2.0.tar.gz delete mode 100644 screen-__P.diff rename show_all_active.patch => xX_string_escape.patch (100%) diff --git a/screen-4.0.2.dif b/global_screenrc.patch similarity index 100% rename from screen-4.0.2.dif rename to global_screenrc.patch diff --git a/libtinfo.diff b/libtinfo.diff index cef4d64..1aca90e 100644 --- a/libtinfo.diff +++ b/libtinfo.diff @@ -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 diff --git a/msg_version_3.patch b/msg_version_3.patch new file mode 100644 index 0000000..d065c0c --- /dev/null +++ b/msg_version_3.patch @@ -0,0 +1,13 @@ +--- 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 diff --git a/screen-4.0.4.tar.gz b/screen-4.0.4.tar.gz deleted file mode 100644 index a97726b..0000000 --- a/screen-4.0.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:be724e27b918a1ba3172194b1082c2efb7bfa668a4f2e030d7cbdb168cee7d14 -size 846413 diff --git a/screen-4.2.0.tar.gz b/screen-4.2.0.tar.gz new file mode 100644 index 0000000..03df903 --- /dev/null +++ b/screen-4.2.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7dc1b7a3e7669eefe7e65f32e201704d7a11cc688244fcf71757f7792a5ff413 +size 786565 diff --git a/screen-__P.diff b/screen-__P.diff deleted file mode 100644 index 7c89e85..0000000 --- a/screen-__P.diff +++ /dev/null @@ -1,16 +0,0 @@ ---- - screen.h | 1 + - 1 file changed, 1 insertion(+) - -Index: screen.h -=================================================================== ---- screen.h.orig -+++ screen.h -@@ -24,6 +24,7 @@ - - #include "os.h" - -+#undef __P - #if defined(__STDC__) - # ifndef __P - # define __P(a) a diff --git a/screen-poll-zombies.patch b/screen-poll-zombies.patch index be47eb2..dbcab82 100644 --- a/screen-poll-zombies.patch +++ b/screen-poll-zombies.patch @@ -25,16 +25,6 @@ Signed-off-by: Thomas Renninger + { "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 diff --git a/screen.changes b/screen.changes index aaa01c7..2778ad4 100644 --- a/screen.changes +++ b/screen.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +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 + ------------------------------------------------------------------- Tue Apr 15 14:27:09 UTC 2014 - aj@suse.com diff --git a/screen.spec b/screen.spec index 94e9a5a..1e362c2 100644 --- a/screen.spec +++ b/screen.spec @@ -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 @@ BuildRequires: utempter-devel %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 @@ Patch5: sort_command.patch 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 @@ Documentation: man page %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 @@ 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/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 @@ install -m 644 %SOURCE1 $RPM_BUILD_ROOT/usr/lib/tmpfiles.d /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 @@ install -m 644 %SOURCE1 $RPM_BUILD_ROOT/usr/lib/tmpfiles.d # 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 diff --git a/use_locale.diff b/use_locale.diff index 6d07a37..958e196 100644 --- a/use_locale.diff +++ b/use_locale.diff @@ -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 diff --git a/show_all_active.patch b/xX_string_escape.patch similarity index 100% rename from show_all_active.patch rename to xX_string_escape.patch