[packages/asterisk/ASTERISK_12] patches updated for Asterisk 12
jajcus
jajcus at pld-linux.org
Tue Jan 7 16:36:10 CET 2014
commit 707c94d9262d2956bb524bc553aaf1e29ee5187f
Author: Jacek Konieczny <j.konieczny at eggsoft.pl>
Date: Tue Jan 7 10:48:22 2014 +0100
patches updated for Asterisk 12
Updated:
– lua51-path.patch
Dropped, as fixed upstream:
– external-libedit.patch
– libedit-history.patch
– Fix-history-loading-when-using-external-libedit.patch
– ptlib-check.patch
Dropped, as they were not previously applied anyway:
– asterisk-no_k6_on_sparc.patch
– pkg-config-gmime.patch
– gsm-libpoison.patch
...story-loading-when-using-external-libedit.patch | 49 --------
asterisk-no_k6_on_sparc.patch | 20 ----
asterisk.spec | 33 ++----
external-libedit.patch | 128 ---------------------
gsm-libpoison.patch | 25 ----
libedit-history.patch | 38 ------
lua51-path.patch | 13 ++-
pkg-config-gmime.patch | 22 ----
ptlib-check.patch | 11 --
9 files changed, 16 insertions(+), 323 deletions(-)
---
diff --git a/asterisk.spec b/asterisk.spec
index 4d1fb75..de2bf37 100644
--- a/asterisk.spec
+++ b/asterisk.spec
@@ -42,18 +42,11 @@ Source12: menuselect.makedeps
Source13: menuselect.makeopts
Patch0: mxml-system.patch
Patch1: lua51-path.patch
-#atch2: %{name}-no_k6_on_sparc.patch
-Patch3: %{name}-lib.patch
-Patch4: %{name}-ppc.patch
-Patch5: external-libedit.patch
-Patch6: pkg-config-gmime.patch
-Patch7: FHS-paths.patch
-Patch8: libedit-history.patch
-Patch9: pld-banner.patch
-Patch16: lpc10-system.patch
-Patch17: gsm-libpoison.patch
-Patch18: Fix-history-loading-when-using-external-libedit.patch
-Patch19: ptlib-check.patch
+Patch2: %{name}-lib.patch
+Patch3: %{name}-ppc.patch
+Patch4: FHS-paths.patch
+Patch5: pld-banner.patch
+Patch6: lpc10-system.patch
URL: http://www.asterisk.org/
BuildRequires: OSPToolkit-devel >= 3.6.1
BuildRequires: SDL_image-devel
@@ -500,18 +493,11 @@ API documentation for Asterisk.
%setup -q
%patch0 -p1
%patch1 -p1
-#patch2 -p1
+%patch2 -p1
%patch3 -p1
%patch4 -p1
-%patch5 -p0
-#%patch6 -p0
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch16 -p1
-#%patch17 -p1
-%patch18 -p1
-%patch19 -p1
+%patch5 -p1
+%patch6 -p1
# Fixup makefile so sound archives aren't downloaded/installed
%{__sed} -i -e 's/^all:.*$/all:/' sounds/Makefile
@@ -555,8 +541,7 @@ cd ..
--with-imap=system \
--with-gsm=/usr \
%{!?with_h323:--without-h323} \
- --with-lpc10=/usr \
- --with-libedit=yes
+ --with-lpc10=/usr
cp -f .cleancount .lastclean
diff --git a/Fix-history-loading-when-using-external-libedit.patch b/Fix-history-loading-when-using-external-libedit.patch
deleted file mode 100644
index 71a8748..0000000
--- a/Fix-history-loading-when-using-external-libedit.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 346965149827844aa5a5f06ab155787e54a70e30 Mon Sep 17 00:00:00 2001
-From: Jeffrey C. Ollie <jeff at ocjtech.us>
-Date: Mon, 8 Mar 2010 12:38:56 -0600
-Subject: [PATCH 2/2] Use the library function for loading command history rather than
- implementing our own.
-
----
- main/asterisk.c | 21 ++-------------------
- 1 files changed, 2 insertions(+), 19 deletions(-)
-
-diff --git a/main/asterisk.c b/main/asterisk.c
-index e27f685..b8176c5 100644
---- a/main/asterisk.c
-+++ b/main/asterisk.c
-@@ -2567,29 +2567,12 @@ static int ast_el_write_history(char *filename)
-
- static int ast_el_read_history(char *filename)
- {
-- char buf[MAX_HISTORY_COMMAND_LENGTH];
-- FILE *f;
-- int ret = -1;
-+ HistEvent ev;
-
- if (el_hist == NULL || el == NULL)
- ast_el_initialize();
-
-- if ((f = fopen(filename, "r")) == NULL)
-- return ret;
--
-- while (!feof(f)) {
-- if (!fgets(buf, sizeof(buf), f))
-- break;
-- if (!strcmp(buf, "_HiStOrY_V2_\n"))
-- continue;
-- if (ast_all_zeros(buf))
-- continue;
-- if ((ret = ast_el_add_history(buf)) == -1)
-- break;
-- }
-- fclose(f);
--
-- return ret;
-+ return (history(el_hist, &ev, H_LOAD, filename));
- }
-
- static void ast_remotecontrol(char *data)
---
-1.6.6.1
-
diff --git a/asterisk-no_k6_on_sparc.patch b/asterisk-no_k6_on_sparc.patch
deleted file mode 100644
index 775596a..0000000
--- a/asterisk-no_k6_on_sparc.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- asterisk-1.6.1.12/codecs/gsm/Makefile~ 2009-12-29 20:48:57.000000000 +0200
-+++ asterisk-1.6.1.12/codecs/gsm/Makefile 2009-12-29 20:49:58.084691177 +0200
-@@ -208,7 +208,7 @@
- # XXX Keep a space after each findstring argument
- # XXX should merge with GSM_OBJECTS
- ifeq ($(OSARCH),linux-gnu)
--ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc s390 ))
-+ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 sparc parisc s390 ))
- ifeq (,$(findstring $(PROC) , arm armv5b armeb powerpc ia64 s390 bfin mipsel mips ))
- GSM_SOURCES+= $(SRC)/k6opt.s
- endif
-@@ -261,7 +261,7 @@
- $(SRC)/table.o
-
- ifeq ($(OSARCH),linux-gnu)
--ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc ))
-+ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 sparc parisc ))
- ifeq (,$(findstring $(PROC) , arm armv5b armeb powerpc ia64 bfin mipsel mips ))
- GSM_OBJECTS+= $(SRC)/k6opt.o
- endif
diff --git a/external-libedit.patch b/external-libedit.patch
deleted file mode 100644
index c70a7a5..0000000
--- a/external-libedit.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-Index: build_tools/menuselect-deps.in
-===================================================================
---- 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@
-Index: configure.ac
-===================================================================
---- configure.ac (revision 226061)
-+++ configure.ac (working copy)
-@@ -267,6 +267,7 @@
- AST_EXT_LIB_SETUP([ISDNNET], [ISDN4Linux Library], [isdnnet])
- 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])
-@@ -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])
-
-+PBX_LIBEDIT=0
-+LIBEDIT_INCLUDE=-Ieditline/readline
-+LIBEDIT_LIB=
-+LIBEDIT_OBJ=editline/libedit.a
-+if test "${USE_LIBEDIT}" != "no"; then
-+ AC_CHECK_TOOL(PKGCONFIG, pkg-config, no)
-+ if test "${PKGCONFIG}" != "no"; then
-+ if ${PKGCONFIG} --exists libedit; then
-+ LIBEDIT_INCLUDE=$(${PKGCONFIG} libedit --cflags)
-+ LIBEDIT_LIB=$(${PKGCONFIG} libedit --libs)
-+ LIBEDIT_OBJ=
-+ PBX_LIBEDIT=1
-+ AC_DEFINE([HAVE_LIBEDIT], 1, [Define if your system has the NetBSD Editline libraries.])
-+ fi
-+ fi
-+fi
-+AC_SUBST(PBX_LIBEDIT)
-+AC_SUBST(LIBEDIT_INCLUDE)
-+AC_SUBST(LIBEDIT_LIB)
-+AC_SUBST(LIBEDIT_OBJ)
-+
- # 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.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
-
-+cli.o: ASTCFLAGS+=$(LIBEDIT_INCLUDE)
-+
- ifneq ($(findstring ENABLE_UPLOADS,$(MENUSELECT_CFLAGS)),)
- http.o: _ASTCFLAGS+=$(GMIME_INCLUDE)
- endif
-@@ -173,13 +175,13 @@
-
- $(OBJS): _ASTCFLAGS+=-DAST_MODULE=\"core\"
-
--$(MAIN_TGT): $(OBJS) editline/libedit.a $(AST_EMBED_LDSCRIPTS)
-+$(MAIN_TGT): $(OBJS) $(LIBEDIT_OBJ) $(AST_EMBED_LDSCRIPTS)
- @$(CC) -c -o buildinfo.o $(_ASTCFLAGS) buildinfo.c $(ASTCFLAGS)
-- $(ECHO_PREFIX) echo " [LD] $(OBJS) editline/libedit.a $(AST_EMBED_LDSCRIPTS) -> $@"
-+ $(ECHO_PREFIX) echo " [LD] $(OBJS) $(LIBEDIT_OBJ) $(AST_EMBED_LDSCRIPTS) -> $@"
- ifneq ($(findstring chan_h323,$(MENUSELECT_CHANNELS)),)
-- $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $(OBJS) editline/libedit.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) $(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) $(OBJS) editline/libedit.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) $(AST_EMBED_LDSCRIPTS) buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS) $(LIBEDIT_LIB)
- endif
-
- ifeq ($(GNU_LD),1)
-
-Index: main/cli.c
-===================================================================
---- main/cli.c (revision 226061)
-+++ main/cli.c (working copy)
-@@ -34,6 +34,8 @@
- #include <ctype.h>
- #include <regex.h>
-
-+#include <readline.h>
-+
- #include "asterisk/cli.h"
- #include "asterisk/linkedlists.h"
- #include "asterisk/module.h"
-@@ -42,7 +44,6 @@
- #include "asterisk/utils.h"
- #include "asterisk/app.h"
- #include "asterisk/lock.h"
--#include "editline/readline/readline.h"
- #include "asterisk/threadstorage.h"
-
- /*!
-Index: makeopts.in
-===================================================================
---- makeopts.in (revision 226061)
-+++ makeopts.in (working copy)
-@@ -263,3 +263,8 @@
- # if poll is not present, let the makefile know.
- POLL_AVAILABLE=@HAS_POLL@
- TIMERFD_INCLUDE=@TIMERFD_INCLUDE@
-+
-+LIBEDIT_INCLUDE=@LIBEDIT_INCLUDE@
-+LIBEDIT_LIB=@LIBEDIT_LIB@
-+LIBEDIT_OBJ=@LIBEDIT_OBJ@
-+
diff --git a/gsm-libpoison.patch b/gsm-libpoison.patch
deleted file mode 100644
index 5960aa9..0000000
--- a/gsm-libpoison.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- asterisk-1.6.1.12/configure.ac~ 2009-12-31 20:48:16.000000000 +0200
-+++ asterisk-1.6.1.12/configure.ac 2009-12-31 20:50:47.660532467 +0200
-@@ -657,10 +657,20 @@
- GSM_INTERNAL="no"
- fi
- if test "${GSM_SYSTEM}" = "yes"; then
-+
-+ case "$host_cpu" in
-+ x86_64|s390x)
-+ _lib=lib64
-+ ;;
-+ *)
-+ _lib=lib
-+ ;;
-+ esac
-+
- gsmlibdir=""
- if test "x${GSM_DIR}" != "x"; then
-- if test -d ${GSM_DIR}/lib; then
-- gsmlibdir="-L${GSM_DIR}/lib"
-+ if test -d ${GSM_DIR}/${_lib}; then
-+ gsmlibdir="-L${GSM_DIR}/${_lib}"
- else
- gsmlibdir="-L${GSM_DIR}"
- fi
diff --git a/libedit-history.patch b/libedit-history.patch
deleted file mode 100644
index c667596..0000000
--- a/libedit-history.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- 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;
- }
diff --git a/lua51-path.patch b/lua51-path.patch
index 4760450..a10bf6b 100644
--- a/lua51-path.patch
+++ b/lua51-path.patch
@@ -1,11 +1,12 @@
---- 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 @@
+diff -dur asterisk-12.0.0.orig/configure.ac asterisk-12.0.0/configure.ac
+--- asterisk-12.0.0.orig/configure.ac 2013-12-03 18:59:41.000000000 +0100
++++ asterisk-12.0.0/configure.ac 2014-01-07 09:42:07.000000000 +0100
+@@ -2113,12 +2113,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])
+-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
if test x"${LUA_DIR}" = x; then
- LUA_INCLUDE="${LUA_INCLUDE} -I/usr/include/lua5.1"
@@ -15,4 +16,4 @@
+ LUA_INCLUDE="${LUA_INCLUDE} -I${LUA_DIR}/lua51"
fi
fi
-
+
diff --git a/pkg-config-gmime.patch b/pkg-config-gmime.patch
deleted file mode 100644
index 68858b3..0000000
--- a/pkg-config-gmime.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: configure.ac
---- configure.ac.orig 2010-10-23 12:47:26.000000000 +0300
-+++ configure.ac 2010-10-23 12:51:26.460817000 +0300
-@@ -1968,7 +1968,17 @@
- CFLAGS="${saved_cflags}"
- fi
-
--AST_EXT_TOOL_CHECK([GMIME], [gmime-config], [], [], [#include <gmime/gmime.h>], [gboolean q = g_mime_check_version(0,0,0);])
-+PBX_GMIME=0
-+AC_CHECK_TOOL(PKGCONFIG, pkg-config, No)
-+if test ! "x${PKGCONFIG}" = xNo; then
-+ GMIME_INCLUDE=$(${PKGCONFIG} gmime-2.0 --cflags 2>/dev/null)
-+ GMIME_LIB=$(${PKGCONFIG} gmime-2.0 --libs)
-+ PBX_GMIME=1
-+ AC_DEFINE([HAVE_GMIME], 1, [Define if your system has the GMIME libraries.])
-+fi
-+AC_SUBST(PBX_GMIME)
-+AC_SUBST(GMIME_INCLUDE)
-+AC_SUBST(GMIME_LIB)
-
- AST_EXT_LIB_CHECK([HOARD], [hoard], [malloc], [])
-
diff --git a/ptlib-check.patch b/ptlib-check.patch
deleted file mode 100644
index 710ae09..0000000
--- a/ptlib-check.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- asterisk-10.0.1/configure.ac~ 2012-11-18 11:14:49.723296429 +0100
-+++ asterisk-10.0.1/configure.ac 2012-11-18 11:21:06.196616485 +0100
-@@ -1978,8 +1978,6 @@
- PWLIBDIR="${PWLIB_DIR}"
- fi
- AST_CHECK_PWLIB()
-- AST_CHECK_PWLIB_VERSION([PWLib], [PWLIB], [ptbuildopts.h], [1], [9], [2], [P[[WT]]LIB_VERSION])
--
- if test "${HAS_PWLIB:-unset}" != "unset"; then
- AST_CHECK_PWLIB_PLATFORM()
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/asterisk.git/commitdiff/ae59ee51a1d34f333d714ea6c75bea73657d6d5b
More information about the pld-cvs-commit
mailing list