packages: asterisk/asterisk.spec, asterisk/external-libedit.patch, asterisk...

zbyniu zbyniu at pld-linux.org
Sat Jul 24 14:11:53 CEST 2010 

Author: zbyniu                       Date: Sat Jul 24 12:11:53 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 1.6.2.10

---- Files affected:
packages/asterisk:
   asterisk.spec (1.174 -> 1.175) , external-libedit.patch (1.3 -> 1.4) , lpc10-system.patch (1.2 -> 1.3) , lua51-path.patch (1.1 -> 1.2) , mxml-system.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/asterisk/asterisk.spec
diff -u packages/asterisk/asterisk.spec:1.174 packages/asterisk/asterisk.spec:1.175
--- packages/asterisk/asterisk.spec:1.174	Tue Jun 15 10:47:54 2010
+++ packages/asterisk/asterisk.spec	Sat Jul 24 14:11:47 2010
@@ -6,13 +6,6 @@
 # - fix bluetooth patch
 # - ~/.asterisk_history gets encoded with \xxx on exit, each time yet again
 # - make package for moh sound files
-# - likely odbc and imap broken:
-#   *** WARNING: identical binaries are copied, not linked:
-#     %attr(755,root,root) %{_libdir}/asterisk/modules/app_directory_odbc.so
-#   and  /usr/lib64/asterisk/modules/app_directory_imap.so
-#   *** WARNING: identical binaries are copied, not linked:
-#     %attr(755,root,root) %{_libdir}/asterisk/modules/app_directory_plain.so
-#   and  /usr/lib64/asterisk/modules/app_directory_imap.so
 # - ncurses dep gone for good (replaced by libedit)?
 # - missing/failed features:
 # $ grep =0 build_tools/menuselect-deps
@@ -32,16 +25,16 @@
 %bcond_without	verbose		# verbose build
 
 %define		spandsp_version 0.0.2pre26
-%define		rel	3
+%define		rel	1
 Summary:	Asterisk PBX
 Summary(pl.UTF-8):	Centralka (PBX) Asterisk
 Name:		asterisk
-Version:	1.6.2.6
+Version:	1.6.2.10
 Release:	%{rel}%{?with_bristuff:.bristuff}
 License:	GPL v2
 Group:		Applications/System
 Source0:	http://downloads.digium.com/pub/asterisk/releases/%{name}-%{version}.tar.gz
-# Source0-md5:	f068ef2433eebdc7f6dd635986f36d77
+# Source0-md5:	50412a90942ae7306fb8dcc31a05c2ce
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 Source5:	%{name}.logrotate
@@ -69,7 +62,6 @@
 Patch15:	%{name}-bristuff-libpri.patch
 Patch16:	lpc10-system.patch
 Patch17:	gsm-libpoison.patch
-Patch18:	bug-17017.patch
 URL:		http://www.asterisk.org/
 BuildRequires:	OSPToolkit-devel
 BuildRequires:	SDL_image-devel
@@ -554,7 +546,6 @@
 %endif
 %patch16 -p1
 %patch17 -p1
-%patch18 -p0
 
 # Fixup makefile so sound archives aren't downloaded/installed
 %{__sed} -i -e 's/^all:.*$/all:/' sounds/Makefile
@@ -1304,6 +1295,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.175  2010/07/24 12:11:47  zbyniu
+- up to 1.6.2.10
+
 Revision 1.174  2010/06/15 08:47:54  hawk
 - release 3
 

================================================================
Index: packages/asterisk/external-libedit.patch
diff -u packages/asterisk/external-libedit.patch:1.3 packages/asterisk/external-libedit.patch:1.4
--- packages/asterisk/external-libedit.patch:1.3	Mon Apr 26 13:30:33 2010
+++ packages/asterisk/external-libedit.patch	Sat Jul 24 14:11:48 2010
@@ -19,9 +19,9 @@
  AST_EXT_LIB_SETUP([JACK], [Jack Audio Connection Kit], [jack])
  AST_EXT_LIB_SETUP([LDAP], [OpenLDAP], [ldap])
 +AST_EXT_LIB_SETUP([LIBEDIT], [NetBSD Editline library], [libedit])
+ AST_LIBCURL_CHECK_CONFIG([], [7.10.1])
  AST_EXT_LIB_SETUP([LIBXML2], [LibXML2], [libxml2])
  AST_EXT_LIB_SETUP([LTDL], [libtool], [ltdl])
- AST_EXT_LIB_SETUP([LUA], [Lua], [lua])
 @@ -1593,6 +1594,27 @@
  AST_EXT_LIB_CHECK([SDL_IMAGE], [SDL_image], [IMG_Load], [SDL_image.h], [${SDL_LIB}], [${SDL_INCLUDE}])
  AST_EXT_LIB_CHECK([FFMPEG], [avcodec], [sws_getContext], [ffmpeg/avcodec.h], [-lpthread -lz -lm])

================================================================
Index: packages/asterisk/lpc10-system.patch
diff -u packages/asterisk/lpc10-system.patch:1.2 packages/asterisk/lpc10-system.patch:1.3
--- packages/asterisk/lpc10-system.patch:1.2	Thu Dec 31 19:49:09 2009
+++ packages/asterisk/lpc10-system.patch	Sat Jul 24 14:11:48 2010
@@ -58,11 +58,11 @@
 +++ asterisk-1.6.1.12/configure.ac	2009-12-31 13:09:33.900041134 +0200
 @@ -237,6 +237,7 @@
  AST_EXT_LIB_SETUP([DAHDI], [DAHDI], [dahdi])
- AST_EXT_LIB_SETUP([FFMPEG], [Ffmpeg and avcodec library], [avcodec])
- AST_EXT_LIB_SETUP([GSM], [External GSM library], [gsm], [, use 'internal' GSM otherwise])
+ AST_EXT_LIB_SETUP([BKTR], [Stack Backtrace], [execinfo])
+ AST_EXT_LIB_SETUP([GSM], [External GSM], [gsm], [, use 'internal' GSM otherwise])
 +AST_EXT_LIB_SETUP([LPC10], [External lpc10 library], [lpc10], [, use 'internal' lpc10 otherwise])
- AST_EXT_LIB_SETUP([GTK], [gtk libraries], [gtk])
- AST_EXT_LIB_SETUP([GTK2], [gtk2 libraries], [gtk2])
+ AST_EXT_LIB_SETUP([GTK], [gtk], [gtk])
+ AST_EXT_LIB_SETUP([GTK2], [gtk2], [gtk2])
  AST_EXT_LIB_SETUP([GMIME], [GMime library], [gmime])
 @@ -712,6 +713,72 @@
     fi

================================================================
Index: packages/asterisk/lua51-path.patch
diff -u packages/asterisk/lua51-path.patch:1.1 packages/asterisk/lua51-path.patch:1.2
--- packages/asterisk/lua51-path.patch:1.1	Wed Dec 30 20:30:33 2009
+++ packages/asterisk/lua51-path.patch	Sat Jul 24 14:11:48 2010
@@ -1,29 +1,18 @@
---- asterisk-1.6.1.12/configure.ac~	2009-12-30 19:53:27.000000000 +0200
-+++ asterisk-1.6.1.12/configure.ac	2009-12-30 20:01:28.604197217 +0200
-@@ -1400,9 +1400,9 @@
+--- asterisk-1.6.2.10/configure.ac~	2010-06-08 00:13:04.000000000 +0200
++++ asterisk-1.6.2.10/configure.ac	2010-07-24 11:23:03.842706054 +0200
+@@ -1559,12 +1559,12 @@
  		[${PWLIB_INCLUDE}], [${PWLIB_LIB}])
  fi
  
 -AST_EXT_LIB_CHECK([LUA], [lua5.1], [luaL_newstate], [lua5.1/lua.h], [-lm]) 
 +AST_EXT_LIB_CHECK([LUA], [lua51], [luaL_newstate], [lua51/lua.h], [-lm]) 
  if test "x${PBX_LUA}" = "x1" ; then
--	AC_DEFINE_UNQUOTED([LUA51_PREFIX], [1], [Define to 1 if lua is found with a lua5.1 prefix])
-+	AC_DEFINE_UNQUOTED([LUA51_PREFIX], [1], [Define to 1 if lua is found with a lua51 prefix])
+ 	if test x"${LUA_DIR}" = x; then
+-		LUA_INCLUDE="${LUA_INCLUDE} -I/usr/include/lua5.1"
++		LUA_INCLUDE="${LUA_INCLUDE} -I/usr/include/lua51"
+ 	else
+-		LUA_INCLUDE="${LUA_INCLUDE} -I${LUA_DIR}/lua5.1"
++		LUA_INCLUDE="${LUA_INCLUDE} -I${LUA_DIR}/lua51"
+ 	fi
  fi
  	
- # Some distributions (like SuSE) remove the 5.1 suffix.
---- asterisk-1.6.1.12/pbx/pbx_lua.c~	2009-11-25 17:44:45.000000000 +0200
-+++ asterisk-1.6.1.12/pbx/pbx_lua.c	2009-12-30 20:01:48.084048158 +0200
-@@ -43,9 +43,9 @@
- #include "asterisk/hashtab.h"
- 
- #ifdef LUA51_PREFIX
--#include <lua5.1/lua.h>
--#include <lua5.1/lauxlib.h>
--#include <lua5.1/lualib.h>
-+#include <lua51/lua.h>
-+#include <lua51/lauxlib.h>
-+#include <lua51/lualib.h>
- #else
- #include <lua.h>
- #include <lauxlib.h>

================================================================
Index: packages/asterisk/mxml-system.patch
diff -u packages/asterisk/mxml-system.patch:1.1 packages/asterisk/mxml-system.patch:1.2
--- packages/asterisk/mxml-system.patch:1.1	Wed Dec 30 22:23:03 2009
+++ packages/asterisk/mxml-system.patch	Sat Jul 24 14:11:48 2010
@@ -43,9 +43,9 @@
 --- asterisk-1.6.1.12/menuselect/menuselect.c~	2009-06-03 02:21:48.000000000 +0300
 +++ asterisk-1.6.1.12/menuselect/menuselect.c	2009-12-30 23:18:45.881616815 +0200
 @@ -29,8 +29,8 @@
- #include <string.h>
  #include <unistd.h>
  #include <stdarg.h>
+ #include <getopt.h>
 +#include <mxml.h>
  
 -#include "mxml/mxml.h"
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/asterisk/asterisk.spec?r1=1.174&r2=1.175&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/asterisk/external-libedit.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/asterisk/lpc10-system.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/asterisk/lua51-path.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/asterisk/mxml-system.patch?r1=1.1&r2=1.2&f=u

More information about the pld-cvs-commit mailing list