Package: screen
Version: 4.0.3-13
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu jaunty ubuntu-patch
See:
* https://bugs.edge.launchpad.net/ubuntu/+source/screen-profiles/+bug/323756
* https://bugs.edge.launchpad.net/screen-profiles/+bug/311443
* https://bugs.edge.launchpad.net/ubuntu/+source/screen/+bug/315871
*** /tmp/tmpYfWYpP
In Ubuntu, we've applied the attached patch to achieve the following:
[ Patches from Ubuntu ]
* debian/patches/55-increase_max_winmsg_renditions.dpatch: Increase
MAX_WINMSG_REND constant from 16 to 80, LP: #315871
* debian/patches/56-source-file-not-found-warning.dpatch: When sourcing a
file in a screenrc which is not found, fail more gracefully by not
interrupting normal operation; instead, print a debug message. LP: #323756
* debian/patches/57-screen-invoked-with-a-command.dpatch: Cherry pick from
upstream source; fixes LP: #311443
* debian/patches/00list: updated accordingly
We thought you might be interested in doing the same.
-- System Information:
Debian Release: 5.0
APT prefers jaunty-updates
APT policy: (500, 'jaunty-updates'), (500, 'jaunty-security'), (500, 'jaunty')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.28-11-generic (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u screen-4.0.3/debian/changelog screen-4.0.3/debian/changelog
diff -u screen-4.0.3/debian/patches/00list screen-4.0.3/debian/patches/00list
--- screen-4.0.3/debian/patches/00list
+++ screen-4.0.3/debian/patches/00list
@@ -39,0 +40,3 @@
+55-increase_max_winmsg_renditions.dpatch
+56-source-file-not-found-warning.dpatch
+57-screen-invoked-with-a-command.dpatch
only in patch2:
unchanged:
--- screen-4.0.3.orig/debian/patches/57-screen-invoked-with-a-command.dpatch
+++ screen-4.0.3/debian/patches/57-screen-invoked-with-a-command.dpatch
@@ -0,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 57-screen-invoked-with-a-command.dpatch
+## DP: From 25c4f34d19c9f7d7262ef2a173238fdab7e283be Mon Sep 17 00:00:00 2001
+## DP: From: Sadrul Habib Chowdhury <sad...@users.sourceforge.net>
+## DP: Date: Mon, 26 Jan 2009 21:19:47 +0000
+## DP: Subject: Don't forget the startup command.
+
+## DP:Fixes savannah bug #25348, launchpad bug #311443.
+## DP:---
+## DP:diff --git a/src/screen.c b/src/screen.c
+## DP:index c914c59..7239560 100644
+
+...@dpatch@
+
+--- src/screen.c
++++ src/screen.c
+@@ -1420,6 +1420,10 @@ char **av;
+ /* NOTREACHED */
+ }
+ }
++ else if (ac) /* Screen was invoked with a command */
++ {
++ MakeWindow(&nwin);
++ }
+
+ #ifdef HAVE_BRAILLE
+ StartBraille();
+--
+cgit v0.8.2
only in patch2:
unchanged:
--- screen-4.0.3.orig/debian/patches/56-source-file-not-found-warning.dpatch
+++ screen-4.0.3/debian/patches/56-source-file-not-found-warning.dpatch
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 56-source-file-not-found-warning.dpatch
+## by Dustin Kirkland <kirkl...@canonical.com>
+##
+## DP: sourcing a file that's not found should fail more gracefully,
+## DP: by emitting a debug message rather than a work-flow-interrupting
+## DP: error message directly to the screen
+## DP: https://bugs.launchpad.net/ubuntu/+source/screen/+bug/323756
+
+...@dpatch@
+--- screen-4.0.3/fileio.c 2003-09-08 16:25:28.000000000 +0200
++++ screen-4.0.3/fileio.c.new 2009-02-01 20:15:12.479816708 +0100
+@@ -261,7 +261,7 @@ char *rcfilename;
+ if ((fp = secfopen(rc_name, "r")) == NULL)
+ {
+ if (rc_recursion)
+- Msg(errno, "%s: source %s", oldrc_name, rc_name);
++ debug2("%s: source %s\n", oldrc_name, rc_name);
+ else if (RcFileName && !strcmp(RcFileName, rc_name))
+ {
+ /*
only in patch2:
unchanged:
--- screen-4.0.3.orig/debian/patches/55-increase_max_winmsg_renditions.dpatch
+++ screen-4.0.3/debian/patches/55-increase_max_winmsg_renditions.dpatch
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 55-increase_max_winmsg_renditions.dpatch
+## by Dustin Kirkland <kirkl...@canonical.com>
+##
+## DP: Increase MAX_WINMSG_REND constant from 16 to 80
+## DP: Allows for up to 64 formatting changes on a status line
+## DP: https://bugs.launchpad.net/ubuntu/+source/screen/+bug/315871
+
+...@dpatch@
+diff -uprN screen-4.0.3.orig/screen.c screen-4.0.3/screen.c
+--- screen-4.0.3.orig/screen.c 2003-09-08 09:26:41.000000000 -0500
++++ screen-4.0.3/screen.c 2009-01-10 12:06:34.698560196 -0600
+@@ -2026,7 +2026,7 @@ static const char months[] = "JanFebMarA
+ #endif
+
+ static char winmsg_buf[MAXSTR];
+-#define MAX_WINMSG_REND 16 /* rendition changes */
++#define MAX_WINMSG_REND 80 /* rendition changes */
+ static int winmsg_rend[MAX_WINMSG_REND];
+ static int winmsg_rendpos[MAX_WINMSG_REND];
+ static int winmsg_numrend;
