Fix cal display with dumb terminals #112406 by Chris Smith.

Package-Manager: portage-2.0.53

2 files changed, 41 insertions, 0 deletions

diff --git a/sys-apps/util-linux/files/digest-util-linux-2.12r-r2 b/sys-apps/util-linux/files/digest-util-linux-2.12r-r2
new file mode 100644
index 000000000000..0cc9d98a8dd3
--- /dev/null
+++ b/sys-apps/util-linux/files/digest-util-linux-2.12r-r2
@@ -0,0 +1,4 @@
+MD5 ab453b8d81bd36d5e56e391ee36ec5d6 loop-AES-v3.1b.tar.bz2 167804
+MD5 dee120b17425e1edf0a0c64f0e249c20 util-linux-2.12i-cryptoapi-losetup.patch.bz2 4800
+MD5 6e0deccf97db98d2ae751577d019efa4 util-linux-2.12i.tar.gz 1975468
+MD5 c261230b27fc0fbcc287c76884caf2d3 util-linux-2.12r.tar.gz 1992725
diff --git a/sys-apps/util-linux/files/util-linux-2.12r-cal-dumb-terminal.patch b/sys-apps/util-linux/files/util-linux-2.12r-cal-dumb-terminal.patch
new file mode 100644
index 000000000000..073506ec7e87
--- /dev/null
+++ b/sys-apps/util-linux/files/util-linux-2.12r-cal-dumb-terminal.patch
@@ -0,0 +1,37 @@
+If you try to use cal on a terminal which doesnt support highlighting,
+Senter and Sexit will be set to NULL instead of "" which will cause the
+resulting output to be off:
+
+$ env TERM=dumb cal
+   December 2005
+Su Mo Tu We Th Fr Sa
+             1  2  3
+ 4  5  6  7  8  9 10
+111 13 14 15 16 17
+18 19 20 21 22 23 24
+25 26 27 28 29 30 31
+
+http://bugs.gentoo.org/112406
+
+--- util-linux/misc-utils/cal.c
++++ util-linux/misc-utils/cal.c
+@@ -89,7 +89,8 @@
+ 
+ static char *
+ my_tgetstr(char *s, char *ss) {
+-     return tigetstr(ss);
++     char *ret = tigetstr(ss);
++     return (ret == NULL ? "" : ret);
+ }
+ 
+ #elif defined(HAVE_termcap)
+@@ -112,7 +113,8 @@
+ 
+ static char *
+ my_tgetstr(char *s, char *ss) {
+-     return tgetstr(s, &strbuf);
++     char *ret = tgetstr(s, &strbuf);
++     return (ret == NULL ? "" : ret);
+ }
+ 
+ #endif