- up to 1.6.2.10

Changed files:
    asterisk.spec -> 1.175
    external-libedit.patch -> 1.4
    lpc10-system.patch -> 1.3
    lua51-path.patch -> 1.2
    mxml-system.patch -> 1.2

diff --git a/asterisk.spec b/asterisk.spec
index 890d286d0d47a5e1d3038248cc5d4b13e55defdd..e47d972c0f52bd0583d62986cd36b00cfbef9b40 100644 (file)
--- a/asterisk.spec
+++ b/asterisk.spec
@@ -5,13 +5,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
@@ -31,16 +24,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
@@ -68,7 +61,6 @@ Patch14:      %{name}-bristuff-build.patch
 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
@@ -553,7 +545,6 @@ cp %{SOURCE11} .
 %endif
 %patch16 -p1
 %patch17 -p1
-%patch18 -p0
 
 # Fixup makefile so sound archives aren't downloaded/installed
 %{__sed} -i -e 's/^all:.*$/all:/' sounds/Makefile

diff --git a/external-libedit.patch b/external-libedit.patch
index fab16bc8f266667a28b0cc9b971bc6dd52249997..91028f3b000332cbecfbc27bbf4643605c95d4e1 100644 (file)
--- a/external-libedit.patch
+++ b/external-libedit.patch
@@ -19,9 +19,9 @@ Index: configure.ac
  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])

diff --git a/lpc10-system.patch b/lpc10-system.patch
index d0007b281d39e3fa1a341403cd8ab80b935bd61c..9a466bf1e21ab1db6dab390030cf8fe3a7f2ae8d 100644 (file)
--- a/lpc10-system.patch
+++ b/lpc10-system.patch
@@ -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

diff --git a/lua51-path.patch b/lua51-path.patch
index c217406247076d22e22d1122a623070ae630fa64..4760450d54f452581dd97def2983504cd5f5f488 100644 (file)
--- a/lua51-path.patch
+++ b/lua51-path.patch
@@ -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>

diff --git a/mxml-system.patch b/mxml-system.patch
index bd02265a919ad739c98a581106ffddfd6092a914..f4c3409fba55db5c65cc26ef62cb50b0f5c3fc65 100644 (file)
--- a/mxml-system.patch
+++ b/mxml-system.patch
@@ -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"