Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 383987 - net-misc/asterisk-1.8.7.0_rc2: Updated patches for new release of asterisk
Summary: net-misc/asterisk-1.8.7.0_rc2: Updated patches for new release of asterisk
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: [OLD] Server (show other bugs)
Hardware: All Linux
: Normal normal
Assignee: Tony Vroon (RETIRED)
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-09-21 16:45 UTC by Erik Wallin
Modified: 2011-09-22 13:06 UTC (History)
0 users

See Also:
Package list:
Runtime testing required: ---


Attachments
Updated version of 02-uclibc-1.8.7.0_rc2.patchto match new context (02-uclibc-1.8.7.0_rc2.patch,803 bytes, patch)
2011-09-21 16:45 UTC, Erik Wallin
Details | Diff
Updated 05-pbxstart-failed-spurious-bye.patch to match new context (05-pbxstart-failed-spurious-bye-1.8.7.0_rc2.patch,735 bytes, patch)
2011-09-21 16:45 UTC, Erik Wallin
Details | Diff
Updated 10-dahdi-chanvars.patch to match new context (10-dahdi-chanvars-1.8.7.0_rc2.patch,1.29 KB, patch)
2011-09-21 16:47 UTC, Erik Wallin
Details | Diff
New ac_config_aux_dir.patch to correct issue with creation of `pwd` directory (12-ac_config_aux_dir.patch,886 bytes, patch)
2011-09-21 16:50 UTC, Erik Wallin
Details | Diff
t38gateway-1.8.patch T.30-T.38 gateway backported to 1.8 from 10 (13-t38gateway-1.8.patch,120.44 KB, patch)
2011-09-21 17:11 UTC, Erik Wallin
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Erik Wallin 2011-09-21 16:45:13 UTC
Created attachment 287313 [details, diff]
Updated version of 02-uclibc-1.8.7.0_rc2.patchto match new context

To build 1.8.7.0_rc2, the gentoo patchset needs updating to reflect changes upstream. The patches below refer to the gentoo-asterisk-patchset-1.2.tar.bz2.

The 1.8.6.0 ebuild can be used as it is, but with the new patch-set file.

The following changes are suggested for 1.8.7.0_rc2:

02-uclibc.patch
05-pbxstart-failed-spurious-bye.patch
Applies, but with a certain fuzz. Made new diffs so we don't loose the context and keep ugly warnings out.

10-dahdi-chanvars.patch
Context has changed too much, so the patch fails. It looks as upstream has added some more error checking and debug info.

11-refer-deadlock-segfault.patch
This has been applied upstream and can be removed.

The attached 12-ac_config_aux_dir.patch corrects an issue I reported in bug 382149. It turns out the right way to handle it is to correct configure.ac in asterisk.
Comment 1 Erik Wallin 2011-09-21 16:45:40 UTC
Created attachment 287315 [details, diff]
Updated 05-pbxstart-failed-spurious-bye.patch to match new context
Comment 2 Erik Wallin 2011-09-21 16:46:33 UTC
Comment on attachment 287313 [details, diff]
Updated version of 02-uclibc-1.8.7.0_rc2.patchto match new context

>Gentoo bug 66557
>Link: http://bugs.gentoo.org/show_bug.cgi?id=66557
>Patch-By: REdOG
>
>Submitted upstream: No
>
>The uclibc environment, as opposed to the glibc environment, needs explicit 
>linking with the pthread & dl libraries. Without these, name resolution is 
>not functional.
>
>diff -uNr asterisk-1.8.7.0-rc2.orig/Makefile asterisk-1.8.7.0-rc2/Makefile
>--- asterisk-1.8.7.0-rc2.orig/Makefile	2011-08-25 21:00:55.000000000 +0200
>+++ asterisk-1.8.7.0-rc2/Makefile	2011-09-21 14:13:12.823076046 +0200
>@@ -247,6 +247,10 @@
>   _ASTCFLAGS+=-pthread -ftrampolines
> endif
> 
>+ifeq ($(OSARCH),linux-uclibc)
>+  AST_LIBS+=-lpthread -ldl
>+endif
>+
> ifeq ($(OSARCH),SunOS)
>   _ASTCFLAGS+=-Wcast-align -DSOLARIS -I../include/solaris-compat -I/opt/ssl/include -I/usr/local/ssl/include -D_XPG4_2 -D__EXTENSIONS__
> endif
Comment 3 Erik Wallin 2011-09-21 16:47:52 UTC
Created attachment 287317 [details, diff]
Updated 10-dahdi-chanvars.patch to match new context
Comment 4 Erik Wallin 2011-09-21 16:50:39 UTC
Created attachment 287319 [details, diff]
New ac_config_aux_dir.patch to correct issue with creation of `pwd` directory
Comment 5 Erik Wallin 2011-09-21 17:10:11 UTC
There was also a request to include the following patch.

http://svnview.digium.com/svn/asterisk/team/irroot/patches/t38gateway-1.8.patch?view=log

I've uploaded that as an attachment. It applies with a few offsets, but no fuzz.
Comment 6 Erik Wallin 2011-09-21 17:11:00 UTC
Created attachment 287321 [details, diff]
t38gateway-1.8.patch T.30-T.38 gateway backported to 1.8 from 10
Comment 7 Jaco Kroon 2011-09-21 17:30:25 UTC
Tony,

I'm happy.
Comment 8 Tony Vroon (RETIRED) gentoo-dev 2011-09-22 13:06:04 UTC
+*asterisk-1.8.7.0_rc2 (22 Sep 2011)
+
+  22 Sep 2011; Tony Vroon <chainsaw@gentoo.org> +asterisk-1.8.7.0_rc2.ebuild:
+  Release candidate which should be a big step up from 1.8.6.0; backported T38
+  gateway support as requested by Jaco Kroon in bug #383979. All patches either
+  rediffed by or created by Erik Wallin in bug #383987.