[vnc-reflector/f16] Fix a crash when running on foreground

[Petr Pisar]

commit c6ae4a7c41b576ca74b330f0d2059d2f27108e34
Author: Petr Písař <ppisar at redhat.com>
Date:   Fri Apr 6 14:28:03 2012 +0200

    Fix a crash when running on foreground

 vnc-reflector-1.2.4-loggingfix.patch |   37 ++++++++++++++++++++++++++++++++++
 vnc-reflector.spec                   |    9 +++++++-
 2 files changed, 45 insertions(+), 1 deletions(-)
---
diff --git a/vnc-reflector-1.2.4-loggingfix.patch b/vnc-reflector-1.2.4-loggingfix.patch
new file mode 100644
index 0000000..a31c8fc
--- /dev/null
+++ b/vnc-reflector-1.2.4-loggingfix.patch
@@ -0,0 +1,37 @@
+Fix crash when running on foreground
+
+http://sourceforge.net/tracker/?func=detail&aid=2984246&group_id=38605&atid=422840
+--- logging.c	2003-04-21 10:20:35.000000000 -0700
++++ logging.c.new	2010-04-08 19:31:40.068876565 -0700
+@@ -138,8 +138,6 @@
+   char time_buf[32];
+   char level_char = ' ';
+ 
+-  va_start(arg_list, format);
+-
+   if ( (log_fp != NULL && level <= log_file_level) ||
+        level <= log_stderr_level ) {
+     now = time(NULL);
+@@ -150,18 +148,20 @@
+ 
+     if (level <= log_file_level) {
+       fprintf(log_fp, "%s %c ", time_buf, (int)level_char);
++      va_start(arg_list, format);
+       vfprintf(log_fp, format, arg_list);
++      va_end(arg_list);
+       fprintf(log_fp, "\n");
+       fflush(log_fp);
+     }
+     if (level <= log_stderr_level) {
+       fprintf(stderr, "%s %c ", time_buf, (int)level_char);
++      va_start(arg_list, format);
+       vfprintf(stderr, format, arg_list);
++      va_end(arg_list);
+       fprintf(stderr, "\n");
+       fflush(stderr);
+     }
+   }
+-
+-  va_end(arg_list);
+ }
+ 
diff --git a/vnc-reflector.spec b/vnc-reflector.spec
index 20a8629..22585e7 100644
--- a/vnc-reflector.spec
+++ b/vnc-reflector.spec
@@ -1,12 +1,15 @@
 Name:      vnc-reflector
 Version:   1.2.4 
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:   A specialized, multiplexing vnc proxy server
 
 Group:     Applications/Internet
 License:   BSD 
 URL:       http://sourceforge.net/projects/vnc-reflector
 Source0:   http://dl.sf.net/vnc-reflector/vnc_reflector-%{version}.tar.gz
+# Bug #569350, submitted to upstream
+# <http://sourceforge.net/tracker/?func=detail&aid=2984246&group_id=38605&atid=422840>
+Patch0:    %{name}-1.2.4-loggingfix.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libjpeg-devel, zlib-devel 
@@ -18,6 +21,7 @@ efficiently with large number of clients.
 
 %prep
 %setup -q -n vnc_reflector
+%patch0 -p0 -b .logging
 
 
 %build
@@ -43,6 +47,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Apr 06 2012 Petr Pisar <ppisar at redhat.com> - 1.2.4-9
+- Fix a crash when running on foreground (bug #569350)
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.4-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild