Backporting changeset 22 from trunk upstream

Fixes problems with the session log file growing with debug information which causes the user to disconnect after it grows > 3MB


svn path=/testing/; revision=171

3 files changed, 21 insertions, 4 deletions

diff --git a/net-misc/nxserver-2xterminalserver/Manifest b/net-misc/nxserver-2xterminalserver/Manifest
index e7e0e22..edfe356 100644
--- a/net-misc/nxserver-2xterminalserver/Manifest
+++ b/net-misc/nxserver-2xterminalserver/Manifest
@@ -26,6 +26,10 @@ AUX 1.5.0/nxserver-2xterminalserver-1.5.0-insitu.patch 5041 RMD160 6b6c6f0b94615
 MD5 169b6124d6aa0095da9527f117a000ae files/1.5.0/nxserver-2xterminalserver-1.5.0-insitu.patch 5041
 RMD160 6b6c6f0b94615b5398dd3a87c46e2ec2c75e0b0f files/1.5.0/nxserver-2xterminalserver-1.5.0-insitu.patch 5041
 SHA256 5a7b4126f31b3bc637de3fdc5916bef74d6092c162f907eac10e5a94a72c79fb files/1.5.0/nxserver-2xterminalserver-1.5.0-insitu.patch 5041
+AUX 1.5.0/nxserver-2xterminalserver-1.5.0-nxagent-reduced-debugging.patch 508 RMD160 eda50d0819696b61e305c0aade4bd998c7580d89 SHA1 512a43c19fdf73eebc1ed98378f6a9377cdfd6af SHA256 6cb2078c36979e39b58b37f79468c3cac7e9334f88b96f8134b2db7945af40ac
+MD5 5c59d5b67aced2fb5a79ab9926184509 files/1.5.0/nxserver-2xterminalserver-1.5.0-nxagent-reduced-debugging.patch 508
+RMD160 eda50d0819696b61e305c0aade4bd998c7580d89 files/1.5.0/nxserver-2xterminalserver-1.5.0-nxagent-reduced-debugging.patch 508
+SHA256 6cb2078c36979e39b58b37f79468c3cac7e9334f88b96f8134b2db7945af40ac files/1.5.0/nxserver-2xterminalserver-1.5.0-nxagent-reduced-debugging.patch 508
 AUX 1.5.0/nxserver-2xterminalserver-1.5.0-setup.patch 2775 RMD160 1399d4e0a1e2da8f1e2c9203465bece738be6452 SHA1 dd8f6e7c43ac6a33dff2f84f4873606d1ffa0191 SHA256 f521231e67fe9e9aa1cbaa82a679483b5c4cdc01aac27b02cd72d5de350edfc6
 MD5 1eb7778fcae558d88ca6a16dc85e58e7 files/1.5.0/nxserver-2xterminalserver-1.5.0-setup.patch 2775
 RMD160 1399d4e0a1e2da8f1e2c9203465bece738be6452 files/1.5.0/nxserver-2xterminalserver-1.5.0-setup.patch 2775
@@ -33,10 +37,10 @@ SHA256 f521231e67fe9e9aa1cbaa82a679483b5c4cdc01aac27b02cd72d5de350edfc6 files/1.
 DIST linuxterminalserver-1.5.0-client-r21-src.tar.gz 2270147 RMD160 32fa31ee713d46e66c8a5e4aa14126995b225cfb SHA1 9295a232409b56ecb2fb4dccf81e6c05d65a7130 SHA256 70c7e3c9741b577b867e78524a1fb607aa2fae5d6f1bdda4b1a42eb9fd3d7bb3
 DIST linuxterminalserver-1.5.0-common-r21-src.tar.gz 34332949 RMD160 411291efa4bef31fbb5ff8128591514c687b9eeb SHA1 f63ed2816b13f1296db909b40ffb1c7d4cb5e109 SHA256 a6aaf7b1593d4df012ecefd1c8a6a176c0fde23cf9039401fe61f56197898555
 DIST linuxterminalserver-1.5.0-server-r21-src.tar.gz 4097853 RMD160 add7c5bcd2a4486d04c4c2b17815c4a449e2bd93 SHA1 14c2c04805889a08dfee9def45b07c3703db8d32 SHA256 79057d7fcf1fa3afd5f361eaac67d1f3d1fb339fa5a837f36eb7a6103d7662d3
-EBUILD nxserver-2xterminalserver-1.5.0.ebuild 5344 RMD160 4dd3a14772a683e75606d173f627c539e39238c2 SHA1 3399df669bc3f23be94f6369e3f6dc541c67e5de SHA256 9c1fd396a6dffce41d2ffa11b66eb6ada8eb9ef8ff7879714ca989a74127eb51
-MD5 e4be511d4b41ec47c4940e76de059637 nxserver-2xterminalserver-1.5.0.ebuild 5344
-RMD160 4dd3a14772a683e75606d173f627c539e39238c2 nxserver-2xterminalserver-1.5.0.ebuild 5344
-SHA256 9c1fd396a6dffce41d2ffa11b66eb6ada8eb9ef8ff7879714ca989a74127eb51 nxserver-2xterminalserver-1.5.0.ebuild 5344
+EBUILD nxserver-2xterminalserver-1.5.0.ebuild 5414 RMD160 64dbb0990f3a967303133f738d5bb64502e849c9 SHA1 ba1de4a3fa9cfd730484b6d7de8312b7a181bc8a SHA256 bdef44fe18899febc8e3e5b05d3b0c8992dea8c6ee8757112df65efc038ff89b
+MD5 86ba83881dd831acbda6e53564864f75 nxserver-2xterminalserver-1.5.0.ebuild 5414
+RMD160 64dbb0990f3a967303133f738d5bb64502e849c9 nxserver-2xterminalserver-1.5.0.ebuild 5414
+SHA256 bdef44fe18899febc8e3e5b05d3b0c8992dea8c6ee8757112df65efc038ff89b nxserver-2xterminalserver-1.5.0.ebuild 5414
 MD5 3dc8d122e49ff8f6c649a6ad0244eca4 files/digest-nxserver-2xterminalserver-1.5.0 978
 RMD160 b5de18eceeff699ee6d1e7a1354495b920980ec7 files/digest-nxserver-2xterminalserver-1.5.0 978
 SHA256 1918746ff308794d926375a4e2d5b62b3e1d0d176804f4dfdd3ea6c508d14f51 files/digest-nxserver-2xterminalserver-1.5.0 978
diff --git a/net-misc/nxserver-2xterminalserver/files/1.5.0/nxserver-2xterminalserver-1.5.0-nxagent-reduced-debugging.patch b/net-misc/nxserver-2xterminalserver/files/1.5.0/nxserver-2xterminalserver-1.5.0-nxagent-reduced-debugging.patch
new file mode 100644
index 0000000..c620df8
--- /dev/null
+++ b/net-misc/nxserver-2xterminalserver/files/1.5.0/nxserver-2xterminalserver-1.5.0-nxagent-reduced-debugging.patch
@@ -0,0 +1,12 @@
+--- common/nx-X11/programs/Xserver/hw/nxagent/Render.c.orig	2007-04-14 16:17:20.000000000 +0200
++++ common/nx-X11/programs/Xserver/hw/nxagent/Render.c	2007-04-14 16:18:12.000000000 +0200
+@@ -1195,7 +1195,9 @@
+   strncpy(szFilter, filter, name_size);
+   szFilter[name_size] = 0;
+ 
++  #ifdef TEST
+   fprintf(stderr, "nxagentSetPictureFilter: going to set filter [%s].\n", szFilter);
++  #endif
+ 
+   XRenderSetPictureFilter  (nxagentDisplay,
+                             nxagentPicturePriv(pPicture) -> picture,
diff --git a/net-misc/nxserver-2xterminalserver/nxserver-2xterminalserver-1.5.0.ebuild b/net-misc/nxserver-2xterminalserver/nxserver-2xterminalserver-1.5.0.ebuild
index 8de9bdf..62a5d82 100644
--- a/net-misc/nxserver-2xterminalserver/nxserver-2xterminalserver-1.5.0.ebuild
+++ b/net-misc/nxserver-2xterminalserver/nxserver-2xterminalserver-1.5.0.ebuild
@@ -50,6 +50,7 @@ src_unpack() {
 	epatch ${FILESDIR}/1.5.0/${P}-insitu.patch || die
 	epatch ${FILESDIR}/1.5.0/${P}-external-nxcomp.patch || die
 	epatch ${FILESDIR}/1.5.0/${P}-setup.patch || die
+	epatch ${FILESDIR}/1.5.0/${P}-nxagent-reduced-debugging.patch || die
 	sed -i 's/-Wnested-externs/-Wnested-externs -fPIC/' \
 		common/nxcompext/Makefile.in || die "sed failed"