packages: asterisk/asterisk.spec, asterisk/libedit-history.patch (NEW) - nu...

[glen]

Author: glen                         Date: Wed Dec 30 23:39:03 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- nuke editline copy
- make menuselect only needed for building

---- Files affected:
packages/asterisk:
   asterisk.spec (1.153 -> 1.154) , libedit-history.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/asterisk/asterisk.spec
diff -u packages/asterisk/asterisk.spec:1.153 packages/asterisk/asterisk.spec:1.154
--- packages/asterisk/asterisk.spec:1.153	Wed Dec 30 22:23:03 2009
+++ packages/asterisk/asterisk.spec	Thu Dec 31 00:38:58 2009
@@ -4,7 +4,6 @@
 # - use shared versions of lpc10, gsm,...
 # - CFLAGS passing
 # - fix bluetooth patch
-# - system mxml
 # - ~/.asterisk_history gets encoded with \xxx on exit, each time yet again
 # - libpath:
 #   /usr/bin/ld: skipping incompatible /usr/lib/libpthread.so when searching for -lpthread
@@ -34,7 +33,7 @@
 %bcond_without	verbose		# verbose build
 
 %define		spandsp_version 0.0.2pre26
-%define		rel	0.32
+%define		rel	0.34
 Summary:	Asterisk PBX
 Summary(pl.UTF-8):	Centralka (PBX) Asterisk
 Name:		asterisk
@@ -59,6 +58,8 @@
 Patch5:		external-libedit.patch
 Patch6:		pkg-config-gmime.patch
 Patch7:		FHS-paths.patch
+Patch8:		libedit-history.patch
+Patch9:		pld-banner.patch
 # http://soft-switch.org/downloads/spandsp/spandsp-%{spandsp_version}/asterisk-1.2.x/apps_Makefile.patch
 Patch10:	%{name}-txfax-Makefile.patch
 Patch12:	%{name}-chan_bluetooth.patch
@@ -239,12 +240,15 @@
 speech.
 
 %package h323
-Summary:	h323 resources for Asterisk
+Summary:	H.323 protocol support for Asterisk
 Group:		Applications/Networking
 Requires:	%{name} = %{version}-%{release}
 
 %description h323
-h323 resources for Asterisk.
+This channel driver (chan_h323) provides support for the H.323 protocol for
+Asterisk. This is an implementation originally contributed by NuFone and
+nowdays maintained and distributed by Digium, Inc. Hence, it is considered the
+official H.323 chanel driver.
 
 %package ices
 Summary:	Stream audio from Asterisk to an IceCast server
@@ -459,6 +463,8 @@
 %patch5 -p0
 %patch6 -p0
 %patch7 -p0
+%patch8 -p1
+%patch9 -p1
 
 %if %{with zhone}
 sed -i -e 's|.*#define.*ZHONE_HACK.*|#define ZHONE_HACK 1|g' channels/chan_zap.c
@@ -485,7 +491,7 @@
 %{__sed} -i -e 's/^install:.*$/install:/' sounds/Makefile
 
 # avoid using it
-rm -rf imap menuselect/mxml
+rm -rf imap menuselect/mxml main/editline
 
 %build
 rm -f pbx/.depend
@@ -500,16 +506,17 @@
 
 # be sure to invoke ./configure with our flags
 cd menuselect
-%{__aclocal}
+%{__aclocal} -I ../autoconf
 %{__autoheader}
 %{__autoconf}
-%configure
+# we need just plain cli for building
+%configure \
+  --without-newt \
+  --without-gtk2 \
+  --without-curses \
+  --without-ncurses
 cd ..
 
-cd main/editline
-%configure2_13
-cd ../..
-
 %configure \
 	%{?with_bristuff:--with-gsmat=%{_prefix}} \
 	--with-imap=system \
@@ -1180,6 +1187,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.154  2009/12/30 23:38:58  glen
+- nuke editline copy
+- make menuselect only needed for building
+
 Revision 1.153  2009/12/30 21:23:03  glen
 - build with system mlxm
 

================================================================
Index: packages/asterisk/libedit-history.patch
diff -u /dev/null packages/asterisk/libedit-history.patch:1.1
--- /dev/null	Thu Dec 31 00:39:03 2009
+++ packages/asterisk/libedit-history.patch	Thu Dec 31 00:38:58 2009
@@ -0,0 +1,38 @@
+--- asterisk-1.6.1.12/main/asterisk.c~	2009-12-30 23:34:17.000000000 +0200
++++ asterisk-1.6.1.12/main/asterisk.c	2009-12-30 23:34:19.095481746 +0200
+@@ -110,7 +110,7 @@
+ #include "asterisk/utils.h"
+ #include "asterisk/file.h"
+ #include "asterisk/io.h"
+-#include "editline/histedit.h"
++#include <histedit.h>
+ #include "asterisk/config.h"
+ #include "asterisk/ast_version.h"
+ #include "asterisk/linkedlists.h"
+@@ -2291,7 +2291,7 @@
+ 			int mlen = 0, maxmbuf = 2048;
+ 			/* Start with a 2048 byte buffer */			
+ 			if (!(mbuf = ast_malloc(maxmbuf))) {
+-				lf->cursor[0] = savechr;
++//				lf->cursor[0] = savechr; // this is readonly variable
+ 				return (char *)(CC_ERROR);
+ 			}
+ 			snprintf(buf, sizeof(buf), "_COMMAND MATCHESARRAY \"%s\" \"%s\"", lf->buffer, ptr); 
+@@ -2303,7 +2303,7 @@
+ 					/* Every step increment buffer 1024 bytes */
+ 					maxmbuf += 1024;					
+ 					if (!(mbuf = ast_realloc(mbuf, maxmbuf))) {
+-						lf->cursor[0] = savechr;
++//						lf->cursor[0] = savechr; // this is readonly variable
+ 						return (char *)(CC_ERROR);
+ 					}
+ 				}
+@@ -2365,7 +2365,7 @@
+ 		ast_free(matches);
+ 	}
+ 
+-	lf->cursor[0] = savechr;
++//	lf->cursor[0] = savechr; // this is readonly variable
+ 
+ 	return (char *)(long)retval;
+ }
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/asterisk/asterisk.spec?r1=1.153&r2=1.154&f=u