Merge lp:~logan/ubuntu/raring/nxcomp/3.5.0-2 into lp:ubuntu/raring/nxcomp

[Logan Rosen]

[Dimitri John Ledkov (xnox)]

W: nxcomp source: out-of-date-standards-version 3.9.2 (current is 3.9.4)
P: libxcomp-dev: copyright-refers-to-symlink-license usr/share/common-licenses/GPL
I: libxcomp-dev: extended-description-is-probably-too-short
P: libxcomp-dev: no-homepage-field
I: libxcomp3: spelling-error-in-binary usr/lib/libXcomp.so.3.5.0 accomodate accommodate
W: libxcomp3: hardening-no-fortify-functions usr/lib/libXcomp.so.3.5.0
P: libxcomp3: copyright-refers-to-symlink-license usr/share/common-licenses/GPL
I: libxcomp3: extended-description-is-probably-too-short
P: libxcomp3: no-homepage-field
I: libxcomp3: no-symbols-control-file usr/lib/libXcomp.so.3.5.0

Bzr commit not tagged (e.g. bzr mark-uploaded or debcommit --release or just bzr tag)

Nonetheless, it's all minor things. Uploading.

review: Approve

=== modified file 'CHANGELOG'
--- CHANGELOG	2011-05-20 10:26:48 +0000
+++ CHANGELOG	2013-01-12 05:09:21 +0000
@@ -1,5 +1,9 @@
 ChangeLog:
 
+nxcomp-3.5.0-2
+
+- Fixed TR11H02398. Solved a race condition when creating channels.
+
 nxcomp-3.5.0-1
 
 - Opened the 3.5.0 branch based on nxcomp-3.4.0-7.

=== modified file 'Proxy.cpp'
--- Proxy.cpp	2011-05-20 10:26:48 +0000
+++ Proxy.cpp	2013-01-12 05:09:21 +0000
@@ -1626,6 +1626,23 @@
   int channelId = *(message + 2);
 
   //
+  // Check if the channel has been dropped.
+  //
+
+  if (channels_[channelId] != NULL &&
+          (channels_[channelId] -> getDrop() == 1 ||
+              channels_[channelId] -> getClosing() == 1))
+  {
+    #ifdef TEST
+    *logofs << "Proxy: Dropping the descriptor FD#"
+            << getFd(channelId) << " channel ID#"
+            << channelId << ".\n" << logofs_flush;
+    #endif
+
+    handleDrop(channelId);
+  }
+
+  //
   // Check if the channel is in the valid
   // range.
   //

=== modified file 'debian/changelog'
--- debian/changelog	2011-11-21 16:20:05 +0000
+++ debian/changelog	2013-01-12 05:09:21 +0000
@@ -1,3 +1,9 @@
+nxcomp (3.5.0-2-0ubuntu1) raring; urgency=low
+
+  * New upstream release.
+
+ -- Logan Rosen <[e-mail]>  Sat, 12 Jan 2013 00:07:15 -0500
+
 nxcomp (3.5.0-1-0ubuntu2) precise; urgency=low
 
   * Rebuild for libjpeg8.