- Updating patches for 1.8.0, NFY

Changed files:
    asterisk.spec -> 1.179
    external-libedit.patch -> 1.5
    mxml-system.patch -> 1.3

diff --git a/asterisk.spec b/asterisk.spec
index f30758d046804732cb7cfb494ee6f10b7c74ebb2..92cd9605742dcd918ef10ed4e0c9ca3f3fe6d28a 100644 (file)
--- a/asterisk.spec
+++ b/asterisk.spec
@@ -30,23 +30,23 @@
 %bcond_without verbose         # verbose build
 
 %define                spandsp_version 0.0.2pre26
-%define                rel     2
+%define                rel     0.1
 Summary:       Asterisk PBX
 Summary(pl.UTF-8):     Centralka (PBX) Asterisk
 Name:          asterisk
-Version:       1.6.2.10
+Version:       1.8.0
 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: 50412a90942ae7306fb8dcc31a05c2ce
+# Source0-md5: 83203b43aaf12f36bdc953d6b04d18a4
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 Source5:       %{name}.logrotate
 Source10:      http://soft-switch.org/downloads/spandsp/spandsp-%{spandsp_version}/asterisk-1.2.x/app_txfax.c
-# Source10-md5:        8c8fcb263b76897022b4c28052a7b439
+# Source10-md5:        9bb9a4b904f47de0ef8caf1670df9952
 Source11:      http://soft-switch.org/downloads/spandsp/spandsp-%{spandsp_version}/asterisk-1.2.x/app_rxfax.c
-# Source11-md5:        ab6983b51c412883545b36993d704999
+# Source11-md5:        f2f060c287e145dad29167e8ef116d0e
 Patch0:                mxml-system.patch
 Patch1:                lua51-path.patch
 Patch2:                %{name}-no_k6_on_sparc.patch

diff --git a/external-libedit.patch b/external-libedit.patch
index 91028f3b000332cbecfbc27bbf4643605c95d4e1..174382bf342b93100668589987d221b242a7f35b 100644 (file)
--- a/external-libedit.patch
+++ b/external-libedit.patch
@@ -1,15 +1,15 @@
 Index: build_tools/menuselect-deps.in
 ===================================================================
---- build_tools/menuselect-deps.in     (revision 226061)
-+++ build_tools/menuselect-deps.in     (working copy)
-@@ -17,6 +17,7 @@
- IXJUSER=@PBX_IXJUSER@
+--- build_tools/menuselect-deps.in.orig        2010-07-28 01:30:38.000000000 +0300
++++ build_tools/menuselect-deps.in     2010-10-23 12:28:17.140817003 +0300
+@@ -23,6 +23,7 @@
  JACK=@PBX_JACK@
+ KQUEUE=@PBX_KQUEUE@
  LDAP=@PBX_LDAP@
 +LIBEDIT=@PBX_LIBEDIT@
+ LIBXML2=@PBX_LIBXML2@
  LTDL=@PBX_LTDL@
  LUA=@PBX_LUA@
- MISDN=@PBX_MISDN@
 Index: configure.ac
 ===================================================================
 --- configure.ac       (revision 226061)
@@ -50,9 +50,21 @@ Index: configure.ac
  # possible places for video4linux version 1
  AC_CHECK_HEADER([linux/videodev.h],
        [AC_DEFINE_UNQUOTED([HAVE_VIDEODEV_H], 1, [Define to 1 if your system has linux/videodev.h.])])
---- main/Makefile~     2010-04-26 14:11:33.000000000 +0300
-+++ main/Makefile      2010-04-26 14:14:24.419527855 +0300
-@@ -129,6 +129,8 @@
+--- main/Makefile.orig 2010-08-02 17:41:46.000000000 +0300
++++ main/Makefile      2010-10-23 12:25:20.520816998 +0300
+@@ -103,9 +103,9 @@
+ 
+ CHECK_SUBDIR: # do nothing, just make sure that we recurse in the subdir/
+ 
+-editline/libedit.a: CHECK_SUBDIR
++$(LIBEDIT_OBJ): CHECK_SUBDIR
+       cd editline && test -f config.h || CFLAGS="$(PTHREAD_CFLAGS) $(subst $(ASTTOPDIR),../../,$(_ASTCFLAGS:-Werror=) $(ASTCFLAGS))" LDFLAGS="$(_ASTLDFLAGS) $(ASTLDFLAGS)" ./configure --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --with-ncurses=$(NCURSES_DIR) --with-curses=$(CURSES_DIR) --with-termcap=$(TERMCAP_DIR) --with-tinfo=$(TINFO_DIR)
+-      $(MAKE) -C editline libedit.a
++      $(MAKE) -C editline $(LIBEDIT_OBJ)
+ 
+ db1-ast/libdb1.a: CHECK_SUBDIR
+       _ASTCFLAGS="$(_ASTCFLAGS) -Wno-strict-aliasing" ASTCFLAGS="$(ASTCFLAGS)" $(MAKE) -C db1-ast libdb1.a
+@@ -139,6 +139,8 @@
        $(CC) -g -o testexpr2 ast_expr2f.o ast_expr2.o -lm
        rm ast_expr2.o ast_expr2f.o 
  
@@ -61,22 +73,24 @@ Index: configure.ac
  ifneq ($(findstring ENABLE_UPLOADS,$(MENUSELECT_CFLAGS)),)
  http.o: _ASTCFLAGS+=$(GMIME_INCLUDE)
  endif
-@@ -176,13 +176,13 @@
- GMIMELDFLAGS+=$(GMIME_LIB)
- endif
+@@ -173,13 +175,13 @@
+ 
+ $(OBJS): _ASTCFLAGS+=-DAST_MODULE=\"core\"
  
 -$(MAIN_TGT): $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS)
 +$(MAIN_TGT): $(OBJS) $(LIBEDIT_OBJ) db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS)
        @$(CC) -c -o buildinfo.o $(_ASTCFLAGS) buildinfo.c $(ASTCFLAGS)
-       $(ECHO_PREFIX) echo "   [LD] $^ -> $@"
+-      $(ECHO_PREFIX) echo "   [LD] $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) -> $@"
++      $(ECHO_PREFIX) echo "   [LD] $(OBJS) $(LIBEDIT_OBJ) db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) -> $@"
  ifneq ($(findstring chan_h323,$(MENUSELECT_CHANNELS)),)
--      $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS)
-+      $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS) $(LIBEDIT_LIB)
+-      $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS)
++      $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $(OBJS) $(LIBEDIT_OBJ) db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS) $(LIBEDIT_LIB)
  else
--      $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS)
-+      $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS) $(LIBEDIT_LIB)
+-      $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS)
++      $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $(OBJS) $(LIBEDIT_OBJ) db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS) $(LIBEDIT_LIB)
  endif
-       $(CMD_PREFIX) $(ASTTOPDIR)/build_tools/strip_nonapi $@ || rm $@
+ 
+ ifeq ($(GNU_LD),1)
  
 Index: main/cli.c
 ===================================================================

diff --git a/mxml-system.patch b/mxml-system.patch
index f4c3409fba55db5c65cc26ef62cb50b0f5c3fc65..41abc5ecaa9bdb57a5bd44df9ee13e69b63c5ec6 100644 (file)
--- a/mxml-system.patch
+++ b/mxml-system.patch
@@ -40,15 +40,14 @@
  
  ifdef C_OBJS
  menuselect_curses.o: CFLAGS+=$(C_INCLUDE)
---- 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 <unistd.h>
- #include <stdarg.h>
+--- asterisk-1.8.0/menuselect/menuselect.c.orig        2010-08-25 04:42:41.000000000 +0300
++++ asterisk-1.8.0/menuselect/menuselect.c     2010-10-23 12:10:31.077483673 +0300
+@@ -32,7 +32,7 @@
  #include <getopt.h>
-+#include <mxml.h>
  
+ #include "autoconfig.h"
 -#include "mxml/mxml.h"
++#include "mxml.h"
  #include "linkedlists.h"
  #include "menuselect.h"