rpms/kdenetwork/F-8 kdenetwork-3.5.9-krfb_httpd.patch, NONE, 1.1 kdenetwork.spec, 1.115, 1.116

Tue Feb 26 13:37:55 UTC 2008

Author: ltinkl

Update of /cvs/extras/rpms/kdenetwork/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30957/F-8

Modified Files:
	kdenetwork.spec 
Added Files:
	kdenetwork-3.5.9-krfb_httpd.patch 
Log Message:
- #433511: vnc server through krfb and accessing by http broken
- #433510: /usr/bin/krfb_httpd broken due to converted literal ^M chars


kdenetwork-3.5.9-krfb_httpd.patch:

--- NEW FILE kdenetwork-3.5.9-krfb_httpd.patch ---
diff -ur kdenetwork-orig/krfb/krfb_httpd/krfb_httpd kdenetwork-3.5.9/krfb/krfb_httpd/krfb_httpd
--- kdenetwork-orig/krfb/krfb_httpd/krfb_httpd	2007-05-14 09:40:05.000000000 +0200
+++ kdenetwork-3.5.9/krfb/krfb_httpd/krfb_httpd	2008-02-26 12:43:21.000000000 +0100
@@ -6,17 +6,14 @@
 fi
 
 read request url httptype || exit 0
-url="${url/
-/}"
-httptype="${httptype/
-/}"
+url="${url/
/}"
+httptype="${httptype/
/}"
 
 if [ "x$httptype" != "x" ]; then
 	line="x"
 	while [ -n "$line" ]; do
 		read line || exit 0
-		line="${line/
-/}"
+		line="${line/
/}"
 	done
 fi
 # echo "url = $url, request = $request" >> /tmp/httpd.log
@@ -38,7 +35,7 @@
 	content="
 <HTML><HEAD><TITLE>$LOGNAME's desktop</TITLE></HEAD>
 <BODY>
-<APPLET CODE=VncViewer.class ARCHIVE=VncViewer.jar WIDTH=$width HEIGHT=$height>
+<APPLET CODE=vncviewer/VNCViewer.class ARCHIVE=vncviewer.jar WIDTH=$width HEIGHT=$height>
 	<param name=PORT value=$port>
 </APPLET>
 </BODY></HTML>"


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/F-8/kdenetwork.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- kdenetwork.spec	16 Feb 2008 03:59:52 -0000	1.115
+++ kdenetwork.spec	26 Feb 2008 13:37:07 -0000	1.116
@@ -24,7 +24,7 @@
 Name:    kdenetwork
 Epoch:   7
 Version: 3.5.9
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: K Desktop Environment - Network Applications
 
 License: GPLv2
@@ -46,6 +46,7 @@
 Patch4: kdenetwork-3.2.3-resolv.patch
 # include more/proper ppp headers
 Patch5: kdenetwork-3.5.9-ppp.patch
+Patch6: kdenetwork-3.5.9-krfb_httpd.patch
 
 %if 0%{?libs}
 Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -169,6 +170,7 @@
 %endif
 %patch4 -p1 -b .resolv
 %patch5 -p1 -b .ppp
+%patch6 -p1 -b .krfb_httpd
 
 %if %{make_cvs}
   make -f admin/Makefile.common cvs
@@ -471,6 +473,10 @@
 
 
 %changelog
+* Tue Feb 26 2008 LukÃ¡Å¡ Tinkl <ltinkl at redhat.com> - 7:3.5.9-2
+- #433511: vnc server through krfb and accessing by http broken
+- #433510: /usr/bin/krfb_httpd broken due to converted literal ^M chars
+
 * Fri Feb 15 2008 Rex Dieter <rdieter at fedoraproject.org> - 7:3.5.9-1
 - kde-3.5.9
 


