Fix H323 for real wrt #176259

Package-Manager: portage-2.1.2.2

3 files changed, 43 insertions, 14 deletions

diff --git a/net-misc/asterisk/ChangeLog b/net-misc/asterisk/ChangeLog
index d69c2878b33e..b288187b786a 100644
--- a/net-misc/asterisk/ChangeLog
+++ b/net-misc/asterisk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/asterisk
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.160 2007/04/26 22:14:26 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.161 2007/04/27 19:38:08 gustavoz Exp $
+
+  27 Apr 2007; Gustavo Zacarias <gustavoz@gentoo.org>
+  files/1.2.0/asterisk-1.2.17-h323-dumb-makefile.diff:
+  Fix H323 for real wrt #176259
 
   26 Apr 2007; Gustavo Zacarias <gustavoz@gentoo.org>
   -files/1.2.0/asterisk-1.2.17-ASA-2007-011.patch,
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 60fcc0bb1ddd..583901e1a4ab 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -129,10 +129,10 @@ AUX 1.2.0/asterisk-1.2.14-chan_sip2.patch 1405 RMD160 39c94dbf22e4cad57ed6e8df42
 MD5 21bd9e85ce8f705cec65e5aa583479f7 files/1.2.0/asterisk-1.2.14-chan_sip2.patch 1405
 RMD160 39c94dbf22e4cad57ed6e8df42fd1f87a5f9943e files/1.2.0/asterisk-1.2.14-chan_sip2.patch 1405
 SHA256 a23edceff270a7e68730da9f5f3564c41db335e673dd5415a490e421ccf09c5a files/1.2.0/asterisk-1.2.14-chan_sip2.patch 1405
-AUX 1.2.0/asterisk-1.2.17-h323-dumb-makefile.diff 402 RMD160 4cb7347c6721b8532dbc83ba8292d1a3cf585ee4 SHA1 d27d1adf41737f6cb16188ce5bd4d910cc624fa4 SHA256 bd628fc94996fd003a60ed3dcfb482c3411ee437a69b0b3efa2ab73c42bbbe22
-MD5 05c16aac70b8c5c9debc198fd2879598 files/1.2.0/asterisk-1.2.17-h323-dumb-makefile.diff 402
-RMD160 4cb7347c6721b8532dbc83ba8292d1a3cf585ee4 files/1.2.0/asterisk-1.2.17-h323-dumb-makefile.diff 402
-SHA256 bd628fc94996fd003a60ed3dcfb482c3411ee437a69b0b3efa2ab73c42bbbe22 files/1.2.0/asterisk-1.2.17-h323-dumb-makefile.diff 402
+AUX 1.2.0/asterisk-1.2.17-h323-dumb-makefile.diff 1084 RMD160 10fefffa08c8d03c50c556e4abe6054285d96121 SHA1 7fd4f329010c6f2103d5524d87a7e75826a5fda4 SHA256 a250d1b1536fb832476f8fd83c4adf085e5b9e7d4b6d7e4f00a798c462742fed
+MD5 c3accb07897c2fe489e0f50a763f92f2 files/1.2.0/asterisk-1.2.17-h323-dumb-makefile.diff 1084
+RMD160 10fefffa08c8d03c50c556e4abe6054285d96121 files/1.2.0/asterisk-1.2.17-h323-dumb-makefile.diff 1084
+SHA256 a250d1b1536fb832476f8fd83c4adf085e5b9e7d4b6d7e4f00a798c462742fed files/1.2.0/asterisk-1.2.17-h323-dumb-makefile.diff 1084
 AUX 1.2.0/asterisk-updater 3127 RMD160 41ea584081c3e565205e59771e24a8715d7e2042 SHA1 1c11d9ce286972b6f98c15a16cbb7f1c943414eb SHA256 93e6862361a320c7f7f30525b4209366190dd2bc21eedbd3654ffb4b991af5fd
 MD5 b3b1dced30f74b9475ca7d3a8155385d files/1.2.0/asterisk-updater 3127
 RMD160 41ea584081c3e565205e59771e24a8715d7e2042 files/1.2.0/asterisk-updater 3127
@@ -188,10 +188,10 @@ EBUILD asterisk-1.2.17.ebuild 12237 RMD160 3e919b48e5410b5c503f40482c3791fbadb69
 MD5 e3454fec5414364880174f66a16a17e0 asterisk-1.2.17.ebuild 12237
 RMD160 3e919b48e5410b5c503f40482c3791fbadb69ef4 asterisk-1.2.17.ebuild 12237
 SHA256 ff0db9d700162b94df431822af90d9c0e52a8c9457a67e6af3f27806655dba4d asterisk-1.2.17.ebuild 12237
-MISC ChangeLog 31150 RMD160 48800c202ad2b7e20a91f722fcc20690343b7a4a SHA1 7ee9472e2abd9ea39377c6aa5d1981d3542d4914 SHA256 8c095526da6479847292474fcb3459c432351e37bfe8f07f329e3ef1d744602b
-MD5 6b18f36eabe92b9fefc569d0214b82e5 ChangeLog 31150
-RMD160 48800c202ad2b7e20a91f722fcc20690343b7a4a ChangeLog 31150
-SHA256 8c095526da6479847292474fcb3459c432351e37bfe8f07f329e3ef1d744602b ChangeLog 31150
+MISC ChangeLog 31292 RMD160 13712db495385f9ad811c4d7219f824f4fb86e96 SHA1 eaf1da0abf88c13780d49c2a826b73beac0e54fa SHA256 71b9ab57c2de1841f454c91ebe30fe4ef1928ab2c16776599cc7cbd450ec0b79
+MD5 3f4fba4ddf80261db015cc52da0176ee ChangeLog 31292
+RMD160 13712db495385f9ad811c4d7219f824f4fb86e96 ChangeLog 31292
+SHA256 71b9ab57c2de1841f454c91ebe30fe4ef1928ab2c16776599cc7cbd450ec0b79 ChangeLog 31292
 MISC metadata.xml 384 RMD160 f5de78add5676233b8e0b9e111eab08970443582 SHA1 0441844fb3a715d6979e6c548147ada23d73fec2 SHA256 674224368cb2be6f72655cd67ee19d4d2d0f3425d560aff22b698269e0adc6d8
 MD5 488aea6fbdb7537394cc049b0ff9e5d5 metadata.xml 384
 RMD160 f5de78add5676233b8e0b9e111eab08970443582 metadata.xml 384
@@ -220,7 +220,7 @@ SHA256 ff33779248cf0127b0bb2e460291a5bf237ab8e7c34eacc173c21b59f25c4847 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6-ecc01.6 (GNU/Linux)
 
-iD8DBQFGMSRQKRy60XGEcJIRAmz7AJ0RPfGhpuGWGJv3HyfssxCWRRfiYgCgkSka
-X01kTvfrnK92+tNiAykDEI4=
-=pk8a
+iD8DBQFGMlEtKRy60XGEcJIRAlmZAJ94pEAXLi8dkTIeoJxZ7UgjhoeJ8wCgocSc
+IOkk4OvNr8b3+LuImikxzk8=
+=rh51
 -----END PGP SIGNATURE-----
diff --git a/net-misc/asterisk/files/1.2.0/asterisk-1.2.17-h323-dumb-makefile.diff b/net-misc/asterisk/files/1.2.0/asterisk-1.2.17-h323-dumb-makefile.diff
index 56205288050c..51fec7433aa3 100644
--- a/net-misc/asterisk/files/1.2.0/asterisk-1.2.17-h323-dumb-makefile.diff
+++ b/net-misc/asterisk/files/1.2.0/asterisk-1.2.17-h323-dumb-makefile.diff
@@ -1,7 +1,25 @@
 diff -Nura asterisk-1.2.17/channels/h323/Makefile asterisk-1.2.17.h323/channels/h323/Makefile
 --- asterisk-1.2.17/channels/h323/Makefile	2007-03-06 12:17:16.000000000 -0300
-+++ asterisk-1.2.17.h323/channels/h323/Makefile	2007-04-19 16:33:25.113788190 -0300
-@@ -31,7 +32,6 @@
++++ asterisk-1.2.17.h323/channels/h323/Makefile	2007-04-27 16:08:27.481923054 -0300
+@@ -12,15 +12,13 @@
+ STDCCFLAGS	+= -fPIC
+ #OPTCCFLAGS	+=
+ CFLAGS		+= -pipe
++CXXFLAGS	+= -I/usr/include/openh323
+ TARGET		+= libchanh323.a
+ TARGET		+= Makefile.ast
+ SOURCES		= ast_h323.cxx
++OBJS		= ast_h323.o
+ OBJDIR		= .
+ 
+-ifndef OPENH323DIR
+-OPENH323DIR=$(HOME)/openh323
+-endif
+-
+ clean:
+ 	rm -f *.so *.o .depend
+ 
+@@ -31,13 +29,12 @@
  	touch $(SOURCES)
  
  libchanh323.a:	$(OBJS)
@@ -9,3 +27,10 @@ diff -Nura asterisk-1.2.17/channels/h323/Makefile asterisk-1.2.17.h323/channels/
  	ar crv $@ $(OBJS)
  
  Makefile.ast:	FORCE
+ 	@echo H323CFLAGS  = $(STDCCFLAGS) $(OPTCCFLAGS) $(CFLAGS) >$@.tmp
+ 	@echo H323LDFLAGS = $(CFLAGS) $(LDFLAGS) >>$@.tmp
+-	@echo H323LDLIBS  = $(LDLIBS) $(ENDLDLIBS) $(ENDLDFLAGS) >>$@.tmp
++	@echo H323LDLIBS  = $(LDLIBS) $(ENDLDLIBS) $(ENDLDFLAGS) -lopenh323 -lpt >>$@.tmp
+ 	@if [ -r $@ ] && cmp -s $@ $@.tmp; then rm -f $@.tmp; else mv -f $@.tmp $@; fi
+ 
+ FORCE: