[asterisk-commits] bebuild: tag certified-1.8.11-cert5-rc2 r369966 - in /certified/tags/1.8.11-c...

[SVN commits to the Asterisk project]

Author: bebuild
Date: Wed Jul 11 14:55:21 2012
New Revision: 369966

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=369966
Log:
Merge 369964 for 1.8.11-cert5-rc2

Removed:
    certified/tags/1.8.11-cert5-rc2/certified-asterisk-1.8.11-cert5-rc1-summary.html
    certified/tags/1.8.11-cert5-rc2/certified-asterisk-1.8.11-cert5-rc1-summary.txt
Modified:
    certified/tags/1.8.11-cert5-rc2/   (props changed)
    certified/tags/1.8.11-cert5-rc2/.version
    certified/tags/1.8.11-cert5-rc2/ChangeLog
    certified/tags/1.8.11-cert5-rc2/channels/sig_analog.c

Propchange: certified/tags/1.8.11-cert5-rc2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 11 14:55:21 2012
@@ -1,1 +1,2 @@
 /branches/1.8:357665,358162,359656,359706,359979,360086,360884,367781,367843,368604,368759
+/certified/branches/1.8.11:369964

Modified: certified/tags/1.8.11-cert5-rc2/.version
URL: http://svnview.digium.com/svn/asterisk/certified/tags/1.8.11-cert5-rc2/.version?view=diff&rev=369966&r1=369965&r2=369966
==============================================================================
--- certified/tags/1.8.11-cert5-rc2/.version (original)
+++ certified/tags/1.8.11-cert5-rc2/.version Wed Jul 11 14:55:21 2012
@@ -1,1 +1,1 @@
-1.8.11-cert5-rc1
+1.8.11-cert5-rc2

Modified: certified/tags/1.8.11-cert5-rc2/ChangeLog
URL: http://svnview.digium.com/svn/asterisk/certified/tags/1.8.11-cert5-rc2/ChangeLog?view=diff&rev=369966&r1=369965&r2=369966
==============================================================================
--- certified/tags/1.8.11-cert5-rc2/ChangeLog (original)
+++ certified/tags/1.8.11-cert5-rc2/ChangeLog Wed Jul 11 14:55:21 2012
@@ -1,4 +1,23 @@
-2012-07-09  Asterisk Development Team
+2012-07-11  Asterisk Development Team <asteriskteam at digium.com>
+
+	* Certified Asterisk 1.8.11-cert5-rc2 Released.
+
+	* channels/sig_analog.c: Fix bad merge of r368759 in sig_analog
+
+	  The patch for r368759 in Asterisk 1.8 relied upon the methods
+	  analog_unlock_private/analog_lock_private.  In earlier versions of
+	  1.8, including the Certified Asterisk 1.8.11 branch, those two
+	  methods were unused, and hence were undefined out of the source.
+	  When the patch was made for 1.8.11-cert5, those two functions were
+	  not re-defined back in.  This caused linking errors when sig_analog
+	  was loaded.
+
+	  This patch properly restores those two methods, such that the fix
+	  for AST-891 works correctly.
+
+	  (issue AST-891)
+
+2012-07-09  Asterisk Development Team <asteriskteam at digium.com>
 
 	* Certified Asterisk 1.8.11-cert5-rc1 Released.
 

Modified: certified/tags/1.8.11-cert5-rc2/channels/sig_analog.c
URL: http://svnview.digium.com/svn/asterisk/certified/tags/1.8.11-cert5-rc2/channels/sig_analog.c?view=diff&rev=369966&r1=369965&r2=369966
==============================================================================
--- certified/tags/1.8.11-cert5-rc2/channels/sig_analog.c (original)
+++ certified/tags/1.8.11-cert5-rc2/channels/sig_analog.c Wed Jul 11 14:55:21 2012
@@ -535,23 +535,19 @@
 	}
 }
 
-#if 0
 static void analog_unlock_private(struct analog_pvt *p)
 {
 	if (p->calls->unlock_private) {
 		p->calls->unlock_private(p->chan_pvt);
 	}
 }
-#endif
-
-#if 0
+
 static void analog_lock_private(struct analog_pvt *p)
 {
 	if (p->calls->lock_private) {
 		p->calls->lock_private(p->chan_pvt);
 	}
 }
-#endif
 
 /*!
  * \internal