[vttest/f14/master] updated to latest upstream, added patch from dkutalek at redhat.com (patch sent upstream)

Adam Miller maxamillion at fedoraproject.org
Tue Apr 5 16:16:06 UTC 2011


commit 9fbcab2e87e307c3aaef201a030ef66851adb6db
Author: Adam Miller <maxamillion at fedoraproject.org>
Date:   Tue Apr 5 11:14:26 2011 -0500

    updated to latest upstream, added patch from dkutalek at redhat.com (patch sent upstream)

 .gitignore             |    1 +
 20100830_unix_io.patch |   44 ++++++++++++++++++++++++++++++++++++++++++++
 sources                |    2 +-
 vttest.spec            |   12 ++++++++++--
 4 files changed, 56 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7f0473c..6ccdd54 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 vttest-20071216.tgz
+/vttest-20100830.tgz
diff --git a/20100830_unix_io.patch b/20100830_unix_io.patch
new file mode 100644
index 0000000..d0a5fbc
--- /dev/null
+++ b/20100830_unix_io.patch
@@ -0,0 +1,44 @@
+--- ./unix_io.c.orig    2011-03-29 06:17:19.000000000 -0400
++++ ./unix_io.c 2011-03-29 06:27:52.000000000 -0400
+@@ -34,6 +34,7 @@
+ {
+   int lval;
+   int ch = '\0';
++  char one_byte = '\0';
+
+   fflush(stdout);
+   lval = last_char;
+@@ -43,8 +44,10 @@
+   signal(SIGALRM, give_up);
+   alarm(60);    /* timeout after 1 minute, in case user's keyboard is hung */
+ #endif
+-  if (read(0, &ch, (size_t) 1) < 0)
++  if (read(0, &one_byte, (size_t) 1) < 0)
+     ch = EOF;
++  else
++    ch = (int) one_byte;
+ #ifdef HAVE_ALARM
+   alarm(0);
+ #endif
+@@ -204,15 +207,19 @@
+ readnl(void)
+ {
+   int ch = '\0';
++  char one_byte = '\0';
+
+   fflush(stdout);
+   brkrd = FALSE;
+   reading = TRUE;
+   do {
+-    if (read(0, &ch, (size_t) 1) < 0) {
++    if (read(0, &one_byte, (size_t) 1) < 0) {
+       ch = EOF;
+       break;
+     }
++    else {
++      ch = (int) one_byte;
++    }
+   } while (ch != '\n' && !brkrd);
+   if (brkrd)
+     give_up(SIGTERM);
+
diff --git a/sources b/sources
index 284f89b..f46882b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-490cebc85e531c833dcf14c32790184b  vttest-20071216.tgz
+17c5e669699b489a97510536df878de1  vttest-20100830.tgz
diff --git a/vttest.spec b/vttest.spec
index 505652e..068be53 100644
--- a/vttest.spec
+++ b/vttest.spec
@@ -1,6 +1,6 @@
 Name:           vttest
-Version:        20071216
-Release:        5%{?dist}
+Version:        20100830
+Release:        1%{?dist}
 Summary:        Test the compatibility of so-called "VT100-compatible" terminals
 
 Group:          Applications/System
@@ -9,6 +9,8 @@ URL:            http://invisible-island.net/vttest/vttest.html
 Source0:        ftp://invisible-island.net/vttest/vttest-%{version}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+
+Patch0:         20100830_unix_io.patch
 #BuildRequires:  
 #Requires:       
 
@@ -19,6 +21,8 @@ non-compatibility) of so-called "VT100-compatible" terminals.
 %prep
 %setup -q
 
+%patch0
+
 #fix character encoding
 for f in README; do
         iconv -f ISO-8859-15 -t UTF-8 $f > ${f}.tmp && \
@@ -48,6 +52,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man?/*
 
 %changelog
+* Tue Apr 05 2011 Adam Miller <maxamillion at fedoraproject.org> - 20100830-1
+- Updated to latest upstream release
+- Added patch from dkutalek at redhat.com
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20071216-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


More information about the scm-commits mailing list