[Pkg-ace-devel] r485 - in /trunk/debian: changelog patches/00list patches/07-ace-tao-ssliop-refcount.dpatch

[tgg-guest at users.alioth.debian.org]

Author: tgg-guest
Date: Mon Feb 26 12:43:31 2007
New Revision: 485

URL: http://svn.debian.org/wsvn/pkg-ace/?sc=1&rev=485
Log:
add a patch for ssliop.

Added:
    trunk/debian/patches/07-ace-tao-ssliop-refcount.dpatch   (with props)
Modified:
    trunk/debian/changelog
    trunk/debian/patches/00list

Modified: trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ace/trunk/debian/changelog?rev=485&op=diff
==============================================================================
--- trunk/debian/changelog (original)
+++ trunk/debian/changelog Mon Feb 26 12:43:31 2007
@@ -2,13 +2,17 @@
 
   * New upstream release. Closes: #381647.
   * Switch to the autotools method.  Since CIAO cannot yet be compiled this
-    way, CIAO packages are dropped for now.
+    way, CIAO packages are dropped for now. Likewise static libraries are
+    removed.
   * Drop obsolete patches and scripts.
   * We no longer ship TAO_ORB_Options.1 in libtao-orbsvcs.
+  * debian/patches/07-ace-tao-ssliop-refcount.dpatch: fix ssliop reference
+    counting problem.
+
   Konstantinos Margaritis:
     * changed URL in copyright to new one.
 
- -- Thomas Girard <thomas.g.girard at free.fr>  Tue, 13 Feb 2007 19:09:57 +0000
+ -- Thomas Girard <thomas.g.girard at free.fr>  Mon, 26 Feb 2007 11:54:12 +0000
 
 ace (5.4.7-11) unstable; urgency=low
 

Modified: trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ace/trunk/debian/patches/00list?rev=485&op=diff
==============================================================================
--- trunk/debian/patches/00list (original)
+++ trunk/debian/patches/00list Mon Feb 26 12:43:31 2007
@@ -4,6 +4,7 @@
 04-compile-ftrt
 05-prepatch-dummy-mark
 06-bootstrap
+07-ace-tao-ssliop-refcount
 08-fix-perl-shebang
 15-fix-fltk-include
 #21-always-inline

Added: trunk/debian/patches/07-ace-tao-ssliop-refcount.dpatch
URL: http://svn.debian.org/wsvn/pkg-ace/trunk/debian/patches/07-ace-tao-ssliop-refcount.dpatch?rev=485&op=file
==============================================================================
--- trunk/debian/patches/07-ace-tao-ssliop-refcount.dpatch (added)
+++ trunk/debian/patches/07-ace-tao-ssliop-refcount.dpatch Mon Feb 26 12:43:31 2007
@@ -1,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 07-ace-tao-ssliop-refcount.dpatch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix reference counter when using ssliop.
+ 
+ at DPATCH@
+--- ACE_wrappers/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp~	2007-01-25 10:04:11.000000000 -0800
++++ ACE_wrappers/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp	2007-02-19 21:10:00.000000000 -0800
+@@ -623,6 +623,11 @@
+                                               remote_address,
+                                               synch_options);
+ 
++      // base_connector_.connect() will increment the handler's #REFCOUNT#
++      // once more. This is not required as we already hold a reference to
++      // the handler, so we discard this second reference.
++      svc_handler->remove_reference ();
++
+       // There are three possibilities from calling connect(): (a)
+       // connection succeeds immediately - in this case, the
+       // #REFCOUNT# on the handler is two; (b) connection completion

Propchange: trunk/debian/patches/07-ace-tao-ssliop-refcount.dpatch
------------------------------------------------------------------------------
    svn:executable = *