Summary:	ASTERISK-12075: [patch] chan_ooh323 trunk missed some updates on 30 Jan 2007
Reporter:	Tony Mountifield (softins)	Labels:
Date Opened:	2008-05-23 15:47:24	Date Closed:	2008-05-28 09:45:34
Priority:	Minor	Regression?	No
Status:	Closed/Complete	Components:	Addons/chan_ooh323
Versions:		Frequency of Occurrence
Related Issues:
Environment:		Attachments:	( 0) ooh323-1.4-diff.txt ( 1) ooh323-1.6.0-trunk-diff.txt ( 2) ooh323-trunk-diff.txt
Description:	I've just been doing some work on chan_ooh323.c, and have discovered that revisions 332-336 were applied to the 1.2 branch, and then promoted to the 1.4 branch as rev 337, but then NOT promoted to trunk. So those updates are neither in trunk nor 1.6.0. ****** ADDITIONAL INFORMATION ****** I have another bug to report with a patch for 1.4, but cannot produce a patch for trunk until the above missing updates have been applied.
Comments:	By: Tony Mountifield (softins) 2008-05-23 16:26:41 On looking further, I see there were also revisions 370-372 (20 Apr 2007) and 378 (30 Apr 2007) that were applied to 1.2, but not even promoted to 1.4. By: Digium Subversion (svnbot) 2008-05-23 17:49:31 Repository: asterisk-addons Revision: 599 _U  branches/1.4/ U   branches/1.4/channels/chan_ooh323.c ------------------------------------------------------------------------ r599 | tilghman | 2008-05-23 17:49:30 -0500 (Fri, 23 May 2008) | 3 lines Merging changes to ooh323 driver, as requested by softins (Related to issue ASTERISK-12075) ------------------------------------------------------------------------ http://svn.digium.com/view/asterisk-addons?view=rev&revision=599 By: Tilghman Lesher (tilghman) 2008-05-23 18:59:57 I've brought forward the changes from 1.2 to 1.4; however the rest of it needs a patch.  Would you be so kind as to assemble that patch, please? The main reason I can't merge it forward is that the paths changed since then, and the merge won't happen cleanly (it mostly just skips the files). By: Tony Mountifield (softins) 2008-05-27 05:25:17 OK, I'll make a patch to bring trunk up to the same standard, and then raise a separate bug report for my other changes. Thanks! By: Tony Mountifield (softins) 2008-05-28 08:55:11 I have uploaded three patches to bring 1.4, 1.6.0 and trunk up to the same standard. The 1.4 patch just includes a couple of things that had been updated only in trunk, plus a few other trivial fixes, and should be applied only to 1.4. The 1.6.0-trunk patch brings both the channel driver and the ooh323c stack up to the same standard as 1.4. It should be applied to 1.6.0 and then merged into trunk. The trunk patch should be applied last, and just contains two API changes that are in trunk but not 1.6.0 I have compiled and run 1.4, 1.6.0 and trunk with the above changes, and done some simple tests successfully, but not exhaustive tests of everything. By: Digium Subversion (svnbot) 2008-05-28 09:36:22 Repository: asterisk-addons Revision: 601 U   branches/1.4/channels/chan_ooh323.c ------------------------------------------------------------------------ r601 | tilghman | 2008-05-28 09:36:22 -0500 (Wed, 28 May 2008) | 6 lines Bring 1.4 up to date (related to issue ASTERISK-12075) Reported by: softins Patches:       ooh323-1.4-diff.txt uploaded by softins (license 197) ------------------------------------------------------------------------ http://svn.digium.com/view/asterisk-addons?view=rev&revision=601 By: Digium Subversion (svnbot) 2008-05-28 09:37:10 Repository: asterisk-addons Revision: 602 _U  trunk/ ------------------------------------------------------------------------ r602 | tilghman | 2008-05-28 09:37:09 -0500 (Wed, 28 May 2008) | 13 lines Blocked revisions 601 via svnmerge ........ r601 | tilghman | 2008-05-28 09:42:48 -0500 (Wed, 28 May 2008) | 6 lines Bring 1.4 up to date (related to issue ASTERISK-12075) Reported by: softins Patches:       ooh323-1.4-diff.txt uploaded by softins (license 197) ........ ------------------------------------------------------------------------ http://svn.digium.com/view/asterisk-addons?view=rev&revision=602 By: Digium Subversion (svnbot) 2008-05-28 09:40:13 Repository: asterisk-addons Revision: 603 U   trunk/channels/chan_ooh323.c U   trunk/channels/chan_ooh323.h U   trunk/channels/ooh323c/src/ooCapability.c U   trunk/channels/ooh323c/src/ooGkClient.c U   trunk/channels/ooh323c/src/ooLogChan.c U   trunk/channels/ooh323c/src/ooSocket.c U   trunk/channels/ooh323c/src/ooh323.c U   trunk/channels/ooh323c/src/ooq931.c U   trunk/channels/ooh323c/src/ootrace.c U   trunk/channels/ooh323c/src/ootypes.h U   trunk/channels/ooh323cDriver.c ------------------------------------------------------------------------ r603 | tilghman | 2008-05-28 09:40:11 -0500 (Wed, 28 May 2008) | 6 lines Bring trunk up to date. (related to issue ASTERISK-12075) Reported by: softins Patches:       ooh323-1.6.0-trunk-diff.txt uploaded by softins (license 197) ------------------------------------------------------------------------ http://svn.digium.com/view/asterisk-addons?view=rev&revision=603 By: Digium Subversion (svnbot) 2008-05-28 09:42:39 Repository: asterisk-addons Revision: 604 _U  branches/1.6.0/ U   branches/1.6.0/channels/chan_ooh323.c U   branches/1.6.0/channels/chan_ooh323.h U   branches/1.6.0/channels/ooh323c/src/ooCapability.c U   branches/1.6.0/channels/ooh323c/src/ooGkClient.c U   branches/1.6.0/channels/ooh323c/src/ooLogChan.c U   branches/1.6.0/channels/ooh323c/src/ooSocket.c U   branches/1.6.0/channels/ooh323c/src/ooh323.c U   branches/1.6.0/channels/ooh323c/src/ooq931.c U   branches/1.6.0/channels/ooh323c/src/ootrace.c U   branches/1.6.0/channels/ooh323c/src/ootypes.h U   branches/1.6.0/channels/ooh323cDriver.c ------------------------------------------------------------------------ r604 | tilghman | 2008-05-28 09:42:37 -0500 (Wed, 28 May 2008) | 14 lines Merged revisions 603 via svnmerge from https://origsvn.digium.com/svn/asterisk-addons/trunk ........ r603 | tilghman | 2008-05-28 09:45:23 -0500 (Wed, 28 May 2008) | 6 lines Bring trunk up to date. (related to issue ASTERISK-12075) Reported by: softins Patches:       ooh323-1.6.0-trunk-diff.txt uploaded by softins (license 197) ........ ------------------------------------------------------------------------ http://svn.digium.com/view/asterisk-addons?view=rev&revision=604 By: Tilghman Lesher (tilghman) 2008-05-28 09:45:34 The last patch appears to be unnecessary, as the changes were already made.