rev 5453 - in branches/etch/packages/kdenetwork/debian: . patches

Sun Jan 28 23:56:41 CET 2007

Author: modax-guest
Date: 2007-01-28 23:56:41 +0100 (Sun, 28 Jan 2007)
New Revision: 5453

Added:
   branches/etch/packages/kdenetwork/debian/patches/21_krfb_httpd_mac_to_unix_endl.diff
Modified:
   branches/etch/packages/kdenetwork/debian/changelog
Log:
Patch from trunk to fix #401018 "krfb_httpd eating 100% CPU" in etch

Modified: branches/etch/packages/kdenetwork/debian/changelog
===================================================================

--- branches/etch/packages/kdenetwork/debian/changelog	2007-01-28 22:55:00 UTC (rev 5452)
+++ branches/etch/packages/kdenetwork/debian/changelog	2007-01-28 22:56:41 UTC (rev 5453)
@@ -1,3 +1,13 @@
+kdenetwork (4:3.5.5-5) unstable; urgency=medium
+
+  +++ Changes Modestas Vainius:
+  * Add 21_krfb_httpd_mac_to_unix_endl.diff patch:
+    Convert "end of line" symbols from Mac to Unix style in krfb_httpd
+    script. This should resolve problems with krfb_httpd eating 100% CPU
+    while running in the background (Closes: #401018).
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 29 Jan 2007 00:50:11 +0200
+
 kdenetwork (4:3.5.5-4) unstable; urgency=high
 
   +++ Changes by Ana Beatriz Guerrero Lopez:

Added: branches/etch/packages/kdenetwork/debian/patches/21_krfb_httpd_mac_to_unix_endl.diff
===================================================================
--- branches/etch/packages/kdenetwork/debian/patches/21_krfb_httpd_mac_to_unix_endl.diff	2007-01-28 22:55:00 UTC (rev 5452)
+++ branches/etch/packages/kdenetwork/debian/patches/21_krfb_httpd_mac_to_unix_endl.diff	2007-01-28 22:56:41 UTC (rev 5453)
@@ -0,0 +1,82 @@
+diff -uNr kdenetwork-3.5.5.old/krfb/krfb_httpd/krfb_httpd kdenetwork-3.5.5/krfb/krfb_httpd/krfb_httpd
+--- kdenetwork-3.5.5.old/krfb/krfb_httpd/krfb_httpd	2006-03-17 12:12:23.000000000 +0200
++++ kdenetwork-3.5.5/krfb/krfb_httpd/krfb_httpd	2007-01-29 00:04:49.000000000 +0200
+@@ -1 +1,76 @@
+-#! /usr/bin/env bash

if [ "$1" = "--kinetd" ]; then
	# redirect stdin and stdout to the inetd socket.
	exec <&$2 >&$2
fi

read request url httptype || exit 0
url="${url/
/}"
httptype="${httptype/
/}"

if [ "x$httptype" != "x" ]; then
	line="x"
	while [ -n "$line" ]; do
		read line || exit 0
		line="${line/
/}"
	done
fi
# echo "url = $url, request = $request" >> /tmp/httpd.log
case "$url" in
/)
	# We need the size of the display for the current applet.
	size=`xdpyinfo -display :0| grep dimensions:|head -n 1|sed -e "s/.*dimensions: *//" -e "s/ pixels.*//"`
	width=`echo $size|sed -e "s/x.*//"`
	height=`echo $size|sed -e "s/.*x//"`
	# The VNC menubar is 20 pixels high ...
	height=$((height+20))

	port=`dcop kded kinetd port krfb`
	if [ "$port" == "-1" ]; then
		port=5900
	fi

	ctype="text/html"
	content="
<HTML><HEAD><TITLE>$LOGNAME's desktop</TITLE></HEAD>
<BODY>
<APPLET CODE=VncViewer.class ARCHIVE=VncViewer.jar WIDTH=$width HEIGHT=$height>
	<param name=PORT value=$port>
</APPLET>
</BODY></HTML>"
	;;
*.jar|*.class)
	# Use basename to make sure we have just a filename, not ../../...
	url="`basename "$url"`"
	ctype="application/octet-stream"
	cfile="/usr/share/vnc/classes/$url"
	content="FILE"
	;;
esac

if [ "x$httptype" != "x" ]; then
	echo "HTTP/1.0 200 OK"
	echo "Content-Type: $ctype"
	if [ "$content" == "FILE" ]; then
		clen=`wc -c "$cfile"`
	else
		clen=`echo "$content"|wc -c`
	fi
	echo "Content-Length: $clen"
	echo "Connection: close"
	echo
fi

if [ "$request" == "GET" ]; then
	if [ "$content" == "FILE" ]; then
		cat "$cfile"
	else
		echo "$content"
	fi
fi
exit 0
+\ No newline at end of file
++#! /usr/bin/env bash
++
++if [ "$1" = "--kinetd" ]; then
++	# redirect stdin and stdout to the inetd socket.
++	exec <&$2 >&$2
++fi
++
++read request url httptype || exit 0
++url="${url/
++/}"
++httptype="${httptype/
++/}"
++
++if [ "x$httptype" != "x" ]; then
++	line="x"
++	while [ -n "$line" ]; do
++		read line || exit 0
++		line="${line/
++/}"
++	done
++fi
++# echo "url = $url, request = $request" >> /tmp/httpd.log
++case "$url" in
++/)
++	# We need the size of the display for the current applet.
++	size=`xdpyinfo -display :0| grep dimensions:|head -n 1|sed -e "s/.*dimensions: *//" -e "s/ pixels.*//"`
++	width=`echo $size|sed -e "s/x.*//"`
++	height=`echo $size|sed -e "s/.*x//"`
++	# The VNC menubar is 20 pixels high ...
++	height=$((height+20))
++
++	port=`dcop kded kinetd port krfb`
++	if [ "$port" == "-1" ]; then
++		port=5900
++	fi
++
++	ctype="text/html"
++	content="
++<HTML><HEAD><TITLE>$LOGNAME's desktop</TITLE></HEAD>
++<BODY>
++<APPLET CODE=VncViewer.class ARCHIVE=VncViewer.jar WIDTH=$width HEIGHT=$height>
++	<param name=PORT value=$port>
++</APPLET>
++</BODY></HTML>"
++	;;
++*.jar|*.class)
++	# Use basename to make sure we have just a filename, not ../../...
++	url="`basename "$url"`"
++	ctype="application/octet-stream"
++	cfile="/usr/share/vnc/classes/$url"
++	content="FILE"
++	;;
++esac
++
++if [ "x$httptype" != "x" ]; then
++	echo "HTTP/1.0 200 OK"
++	echo "Content-Type: $ctype"
++	if [ "$content" == "FILE" ]; then
++		clen=`wc -c "$cfile"`
++	else
++		clen=`echo "$content"|wc -c`
++	fi
++	echo "Content-Length: $clen"
++	echo "Connection: close"
++	echo
++fi
++
++if [ "$request" == "GET" ]; then
++	if [ "$content" == "FILE" ]; then
++		cat "$cfile"
++	else
++		echo "$content"
++	fi
++fi
++exit 0
++


