Sun Jan 4 05:05:44 UTC 2009

Author: jcollie

Update of /cvs/pkgs/rpms/asterisk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19799

Modified Files:
	.cvsignore 
	0001-Modify-init-scripts-for-better-Fedora-compatibility.patch 
	0002-Modify-modules.conf-so-that-different-voicemail-modu.patch 
	0003-Add-chan_mobile-from-asterisk-addons.patch 
	0004-Use-pkgconfig-to-check-for-Lua.patch asterisk.spec 
	sources 
Added Files:
	0005-Build-using-external-libedit.patch 
	0006-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch 
	0007-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch 
	0008-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch 
	0009-my-guess-as-replacements-for-the-missing-broken-stuf.patch 
	0010-Update-autoconf.patch 
Removed Files:
	0005-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch 
	0006-Build-using-external-libedit.patch 
	0007-Update-autoconf.patch 
	0008-sys-io.h-is-not-available-on-PPC-systems.patch 
	0009-Define-missing-variable-when-compiling-on-PPC.patch 
Log Message:
* Sat Jan  3 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1-0.8.beta4
- Update to 1.6.1-beta4


0005-Build-using-external-libedit.patch:

--- NEW FILE 0005-Build-using-external-libedit.patch ---
>From 1fc4e0fd9d7d24fd087a1c0d6f4dff5a1fec010f Mon Sep 17 00:00:00 2001
From: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Tue, 25 Mar 2008 00:50:27 -0500
Subject: [PATCH 05/10] Build using external libedit.

---
 build_tools/menuselect-deps.in |    1 +
 configure.ac                   |   22 ++++++++++++++++++++++
 main/Makefile                  |    8 +++++---
 main/cli.c                     |    3 ++-
 makeopts.in                    |    4 ++++
 5 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/build_tools/menuselect-deps.in b/build_tools/menuselect-deps.in
index 6d94984..7832687 100644
--- a/build_tools/menuselect-deps.in
+++ b/build_tools/menuselect-deps.in
@@ -18,6 +18,7 @@ ISDNNET=@PBX_ISDNNET@
 IXJUSER=@PBX_IXJUSER@
 JACK=@PBX_JACK@
 LDAP=@PBX_LDAP@
+LIBEDIT=@PBX_LIBEDIT@
 LTDL=@PBX_LTDL@
 LUA=@PBX_LUA@
 MISDN=@PBX_MISDN@
diff --git a/configure.ac b/configure.ac
index 4519ec9..891548f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -230,6 +230,7 @@ AST_EXT_LIB_SETUP([IMAP_TK], [UW IMAP Toolkit], [imap])
 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_EXT_LIB_SETUP([LTDL], [libtool], [ltdl])
 AST_EXT_LIB_SETUP([LUA], [Lua], [lua])
 AST_EXT_LIB_SETUP([MISDN], [mISDN User Library], [misdn])
@@ -1602,6 +1603,27 @@ AC_SUBST(PBX_GTK2)
 AC_SUBST(GTK2_INCLUDE)
 AC_SUBST(GTK2_LIB)
 
+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)
+
 if test "${USE_CURL}" != "no"; then
    AC_PATH_TOOL([CURL_CONFIG], [curl-config], No)
    if test ! x"${CURL_CONFIG}" = xNo; then
diff --git a/main/Makefile b/main/Makefile
index 446bbb2..86a0f3c 100644
--- a/main/Makefile
+++ b/main/Makefile
@@ -138,6 +138,8 @@ testexpr2: ast_expr2f.c ast_expr2.c ast_expr2.h
 	$(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
@@ -170,13 +172,13 @@ ifneq ($(findstring ENABLE_UPLOADS,$(MENUSELECT_CFLAGS)),)
 GMIMELDFLAGS+=$(GMIME_LIB)
 endif
 
-$(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
 	$(ECHO_PREFIX) echo "   [LD] $^ -> $@"
 ifneq ($(findstring chan_h323,$(MENUSELECT_CHANNELS)),)
-	$(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS)
+	$(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS) $(LIBEDIT_LIB)
 else
-	$(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS)
+	$(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS) $(LIBEDIT_LIB)
 endif
 	$(CMD_PREFIX) $(ASTTOPDIR)/build_tools/strip_nonapi $@ || rm $@
 
diff --git a/main/cli.c b/main/cli.c
index f6982ad..286d775 100644
--- a/main/cli.c
+++ b/main/cli.c
@@ -34,6 +34,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #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 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/utils.h"
 #include "asterisk/app.h"
 #include "asterisk/lock.h"
-#include "editline/readline/readline.h"
 #include "asterisk/threadstorage.h"
 
 /*!
diff --git a/makeopts.in b/makeopts.in
index a5b2a5f..e2a8306 100644
--- a/makeopts.in
+++ b/makeopts.in
@@ -249,3 +249,7 @@ TINFO_DIR=@TINFO_DIR@
 
 # if poll is not present, let the makefile know.
 POLL_AVAILABLE=@HAS_POLL@
+
+LIBEDIT_INCLUDE=@LIBEDIT_INCLUDE@
+LIBEDIT_LIB=@LIBEDIT_LIB@
+LIBEDIT_OBJ=@LIBEDIT_OBJ@
-- 
1.6.1


0006-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch:

--- NEW FILE 0006-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch ---
>From eb9cc1a836086024bb619948468a80c4ff75bed9 Mon Sep 17 00:00:00 2001
From: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Fri, 10 Oct 2008 11:54:10 -0500
Subject: [PATCH 06/10] Revert changes to pbx_lua from rev 126363 that cause some problems.

---
 pbx/pbx_lua.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pbx/pbx_lua.c b/pbx/pbx_lua.c
index 7bc1a8a..2e2e5e8 100644
--- a/pbx/pbx_lua.c
+++ b/pbx/pbx_lua.c
@@ -42,9 +42,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/paths.h"
 #include "asterisk/hashtab.h"
 
-#include <lua5.1/lua.h>
-#include <lua5.1/lauxlib.h>
-#include <lua5.1/lualib.h>
+#include <lua.h>
+#include <lauxlib.h>
+#include <lualib.h>
 
 static char *config = "extensions.lua";
 static char *registrar = "pbx_lua";
-- 
1.6.1


0007-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch:

--- NEW FILE 0007-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch ---
>From 2a41fe1ca393e2c74157dd800b225fad6b04f628 Mon Sep 17 00:00:00 2001
From: Caolan McNamara <caolanm at redhat.com>
Date: Sat, 3 Jan 2009 19:06:18 -0600
Subject: [PATCH 07/10] change configure.ac to look for pkg-config gmime-2.4 instead of gmime-2.4 gmime-config

---
 configure.ac |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index 891548f..5cfc205 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1475,7 +1475,17 @@ then
     AST_EXT_LIB_CHECK([OSPTK], [osptk], [OSPPCryptoDecrypt], [osp/osp.h], [-lcrypto -lssl])
 fi
 
-AST_EXT_TOOL_CHECK([GMIME], [gmime], [], [], [#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.4 --cflags 2>/dev/null)
+   GMIME_LIB=$(${PKGCONFIG} gmime-2.4 --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], [])
 
-- 
1.6.1


0008-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch:

--- NEW FILE 0008-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch ---
>From b68f0fd7319a1b8593aa57fc08825d50a617d29a Mon Sep 17 00:00:00 2001
From: Caolan McNamara <caolanm at redhat.com>
Date: Sat, 3 Jan 2009 19:12:18 -0600
Subject: [PATCH 08/10] fix the AST_PROG_SED problem that makes ./bootstrap.sh fail

Need to regenerate configure from configure.ac after patch one with
./bootsrap.sh, so fix the broken .m4 in the autoconfig dir. (alternatively
change AST_PROG_SED to AC_PROG_SED as it is the same thing in the other .m4 in
the autoconf dir)
---
 autoconf/ast_prog_sed.m4 |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/autoconf/ast_prog_sed.m4 b/autoconf/ast_prog_sed.m4
index 283d52f..ae6cfc0 100644
--- a/autoconf/ast_prog_sed.m4
+++ b/autoconf/ast_prog_sed.m4
@@ -12,7 +12,7 @@ AC_DEFUN([AST_PROG_SED],
      done
      echo "$ac_script" | sed 99q >conftest.sed
      $as_unset ac_script || ac_script=
-     _AC_PATH_PROG_FEATURE_CHECK(SED, [sed gsed],
+     _AC_PATH_PROGS_FEATURE_CHECK(SED, [sed gsed],
 	[_AC_FEATURE_CHECK_LENGTH([ac_path_SED], [ac_cv_path_SED],
 		["$ac_path_SED" -f conftest.sed])])])
  SED="$ac_cv_path_SED"
-- 
1.6.1


0009-my-guess-as-replacements-for-the-missing-broken-stuf.patch:

--- NEW FILE 0009-my-guess-as-replacements-for-the-missing-broken-stuf.patch ---
>From 15d7fcf0c1ce6b73bddd3ad3b145290c14bb47bb Mon Sep 17 00:00:00 2001
From: Caolan McNamara <caolanm at redhat.com>
Date: Sat, 3 Jan 2009 19:15:12 -0600
Subject: [PATCH 09/10] my guess as replacements for the missing/broken stuff against the new gmime api

---
 res/res_http_post.c |   12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/res/res_http_post.c b/res/res_http_post.c
index deab15c..563ab9c 100644
--- a/res/res_http_post.c
+++ b/res/res_http_post.c
@@ -119,14 +119,10 @@ static void process_message_callback(GMimeObject *part, gpointer user_data)
 		ast_log(LOG_WARNING, "Got unexpected GMIME_IS_MESSAGE_PARTIAL\n");
 		return;
 	} else if (GMIME_IS_MULTIPART(part)) {
-		GList *l;
-		
 		ast_log(LOG_WARNING, "Got unexpected GMIME_IS_MULTIPART, trying to process subparts\n");
-		l = GMIME_MULTIPART(part)->subparts;
-		while (l) {
-			process_message_callback(l->data, cbinfo);
-			l = l->next;
-		}
+
+		g_mime_multipart_foreach(GMIME_MULTIPART(part), process_message_callback,
+                               cbinfo);
 	} else if (GMIME_IS_PART(part)) {
 		const char *filename;
 
@@ -148,7 +144,7 @@ static int process_message(GMimeMessage *message, const char *post_dir)
 		.post_dir = post_dir,
 	};
 
-	g_mime_message_foreach_part(message, process_message_callback, &cbinfo);
+	g_mime_message_foreach(message, process_message_callback, &cbinfo);
 
 	return cbinfo.count;
 }
-- 
1.6.1


0010-Update-autoconf.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.2 -r 1.3 0010-Update-autoconf.patch
Index: 0010-Update-autoconf.patch
===================================================================
RCS file: 0010-Update-autoconf.patch
diff -N 0010-Update-autoconf.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ 0010-Update-autoconf.patch	4 Jan 2009 05:05:41 -0000	1.3
@@ -0,0 +1,45956 @@
+From ef71d723c2623962f0685b80091d427f9eb307fa Mon Sep 17 00:00:00 2001
+From: Jeffrey C. Ollie <jeff at ocjtech.us>
+Date: Sat, 3 Jan 2009 22:26:11 -0600
+Subject: [PATCH 10/10] Update autoconf.
+
+---
+ configure                        |23473 ++++++++++++++++++++------------------
+ include/asterisk/autoconfig.h.in |   60 +-
+ 2 files changed, 12574 insertions(+), 10959 deletions(-)
+
+diff --git a/configure b/configure
+index 45c9f2a..b21b693 100755
+--- a/configure
++++ b/configure
+@@ -1,12 +1,12 @@
+ #! /bin/sh
+-# From configure.ac Revision: 163170 .
++# From configure.ac Revision.
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.61 for asterisk 1.6.
++# Generated by GNU Autoconf 2.63 for asterisk 1.6.
+ #
+ # Report bugs to <www.asterisk.org>.
+ #
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # This configure script is free software; the Free Software Foundation
+ # gives unlimited permission to copy, distribute and modify it.
+ #
+@@ -20,7 +20,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+   emulate sh
+   NULLCMD=:
+-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
++  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+   # is contrary to our usage.  Disable this feature.
+   alias -g '${1+"$@"}'='"$@"'
+   setopt NO_GLOB_SUBST
+@@ -42,17 +42,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+ as_cr_digits='0123456789'
+ as_cr_alnum=$as_cr_Letters$as_cr_digits
+ 
+-# The user is always right.
+-if test "${PATH_SEPARATOR+set}" != set; then
+-  echo "#! /bin/sh" >conf$$.sh
+-  echo  "exit 0"   >>conf$$.sh
+-  chmod +x conf$$.sh
+-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+-    PATH_SEPARATOR=';'
++as_nl='
++'
++export as_nl
++# Printing a long string crashes Solaris 7 /usr/bin/printf.
++as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
++as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
++as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
++if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
++  as_echo='printf %s\n'
++  as_echo_n='printf %s'
++else
++  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
++    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
++    as_echo_n='/usr/ucb/echo -n'
+   else
+-    PATH_SEPARATOR=:
++    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
++    as_echo_n_body='eval
++      arg=$1;
++      case $arg in
++      *"$as_nl"*)
++	expr "X$arg" : "X\\(.*\\)$as_nl";
++	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
++      esac;
++      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
++    '
++    export as_echo_n_body
++    as_echo_n='sh -c $as_echo_n_body as_echo'
+   fi
+-  rm -f conf$$.sh
++  export as_echo_body
++  as_echo='sh -c $as_echo_body as_echo'
++fi
++
++# The user is always right.
++if test "${PATH_SEPARATOR+set}" != set; then
++  PATH_SEPARATOR=:
++  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
++    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
++      PATH_SEPARATOR=';'
++  }
+ fi
+ 
+ # Support unset when possible.
+@@ -68,8 +96,6 @@ fi
+ # there to prevent editors from complaining about space-tab.
+ # (If _AS_PATH_WALK were called with IFS unset, it would disable word
+ # splitting by setting IFS to empty value.)
+-as_nl='
+-'
+ IFS=" ""	$as_nl"
+ 
+ # Find who we are.  Look in the path if we contain no directory separator.
+@@ -92,7 +118,7 @@ if test "x$as_myself" = x; then
+   as_myself=$0
+ fi
+ if test ! -f "$as_myself"; then
+-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
++  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+   { (exit 1); exit 1; }
+ fi
+ 
+@@ -105,17 +131,10 @@ PS2='> '
+ PS4='+ '
+ 
+ # NLS nuisances.
+-for as_var in \
+-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
+-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
+-  LC_TELEPHONE LC_TIME
+-do
+-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+-    eval $as_var=C; export $as_var
+-  else
+-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+-  fi
+-done
++LC_ALL=C
++export LC_ALL
++LANGUAGE=C
++export LANGUAGE
+ 
+ # Required to use basename.
+ if expr a : '\(a\)' >/dev/null 2>&1 &&
+@@ -137,7 +156,7 @@ as_me=`$as_basename -- "$0" ||
+ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ 	 X"$0" : 'X\(//\)$' \| \
+ 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+-echo X/"$0" |
++$as_echo X/"$0" |
+     sed '/^.*\/\([^/][^/]*\)\/*$/{
+ 	    s//\1/
+ 	    q
+@@ -163,7 +182,7 @@ else
+   as_have_required=no
+ fi
+ 
+-  if test $as_have_required = yes && 	 (eval ":
++  if test $as_have_required = yes &&	 (eval ":
+ (as_func_return () {
+   (exit \$1)
+ }
+@@ -245,7 +264,7 @@ IFS=$as_save_IFS
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+   emulate sh
+   NULLCMD=:
+-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
++  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+   # is contrary to our usage.  Disable this feature.
+   alias -g '${1+"$@"}'='"$@"'
+   setopt NO_GLOB_SUBST
+@@ -266,7 +285,7 @@ _ASEOF
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+   emulate sh
+   NULLCMD=:
+-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
++  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+   # is contrary to our usage.  Disable this feature.
+   alias -g '${1+"$@"}'='"$@"'
+   setopt NO_GLOB_SUBST
+@@ -346,10 +365,10 @@ fi
+ 
+       if test "x$CONFIG_SHELL" != x; then
+   for as_var in BASH_ENV ENV
+-        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+-        done
+-        export CONFIG_SHELL
+-        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
++	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
++	done
++	export CONFIG_SHELL
++	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+ fi
+ 
+ 
+@@ -418,9 +437,10 @@ fi
+ 
+ test \$exitcode = 0") || {
+   echo No shell found that supports shell functions.
+-  echo Please tell autoconf at gnu.org about your system,
+-  echo including any error possibly output before this
+-  echo message
++  echo Please tell bug-autoconf at gnu.org about your system,
[...45563 lines suppressed...]
+     else
+-      rm -f $ac_file
+-      mv "$tmp/config.h" $ac_file
++      rm -f "$ac_file"
++      mv "$tmp/config.h" "$ac_file" \
++	|| { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
++$as_echo "$as_me: error: could not create $ac_file" >&2;}
++   { (exit 1); exit 1; }; }
+     fi
+   else
+-    echo "/* $configure_input  */"
+-    cat "$ac_result"
++    $as_echo "/* $configure_input  */" \
++      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
++      || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
++$as_echo "$as_me: error: could not create -" >&2;}
++   { (exit 1); exit 1; }; }
+   fi
+-  rm -f "$tmp/out12"
+  ;;
+ 
+ 
+@@ -51933,6 +53545,11 @@ _ACEOF
+ chmod +x $CONFIG_STATUS
+ ac_clean_files=$ac_clean_files_save
+ 
++test $ac_write_fail = 0 ||
++  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
++$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
++   { (exit 1); exit 1; }; }
++
+ 
+ # configure is writing to config.log, and then calls config.status.
+ # config.status does its own redirection, appending to config.log.
+@@ -51954,6 +53571,10 @@ if test "$no_create" != yes; then
+   # would make configure fail if this is the last instruction.
+   $ac_cs_success || { (exit 1); exit 1; }
+ fi
++if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
++  { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
++$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
++fi
+ 
+ 
+ if test "x${silent}" != "xyes" ; then
+@@ -51982,17 +53603,17 @@ echo "       \$\$\$\$\$\$\$\$\$\$\$\$\$\$\$\$.                "
+ echo
+ fi
+ 
+-{ echo "$as_me:$LINENO: Package configured for: " >&5
+-echo "$as_me: Package configured for: " >&6;}
+-{ echo "$as_me:$LINENO: OS type  : $host_os" >&5
+-echo "$as_me: OS type  : $host_os" >&6;}
+-{ echo "$as_me:$LINENO: Host CPU : $host_cpu" >&5
+-echo "$as_me: Host CPU : $host_cpu" >&6;}
+-{ echo "$as_me:$LINENO: build-cpu:vendor:os: $build_cpu : $build_vendor : $build_os :" >&5
+-echo "$as_me: build-cpu:vendor:os: $build_cpu : $build_vendor : $build_os :" >&6;}
+-{ echo "$as_me:$LINENO: host-cpu:vendor:os: $host_cpu : $host_vendor : $host_os :" >&5
+-echo "$as_me: host-cpu:vendor:os: $host_cpu : $host_vendor : $host_os :" >&6;}
++{ $as_echo "$as_me:$LINENO: Package configured for: " >&5
++$as_echo "$as_me: Package configured for: " >&6;}
++{ $as_echo "$as_me:$LINENO: OS type  : $host_os" >&5
++$as_echo "$as_me: OS type  : $host_os" >&6;}
++{ $as_echo "$as_me:$LINENO: Host CPU : $host_cpu" >&5
++$as_echo "$as_me: Host CPU : $host_cpu" >&6;}
++{ $as_echo "$as_me:$LINENO: build-cpu:vendor:os: $build_cpu : $build_vendor : $build_os :" >&5
++$as_echo "$as_me: build-cpu:vendor:os: $build_cpu : $build_vendor : $build_os :" >&6;}
++{ $as_echo "$as_me:$LINENO: host-cpu:vendor:os: $host_cpu : $host_vendor : $host_os :" >&5
++$as_echo "$as_me: host-cpu:vendor:os: $host_cpu : $host_vendor : $host_os :" >&6;}
+ if test "${cross_compiling}" = "yes"; then
+-   { echo "$as_me:$LINENO: Cross Compilation = YES" >&5
+-echo "$as_me: Cross Compilation = YES" >&6;}
++   { $as_echo "$as_me:$LINENO: Cross Compilation = YES" >&5
++$as_echo "$as_me: Cross Compilation = YES" >&6;}
+ fi
+diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in
+index e567f45..2cd6e64 100644
+--- a/include/asterisk/autoconfig.h.in
++++ b/include/asterisk/autoconfig.h.in
+@@ -126,6 +126,12 @@
+ /* Define to indicate the ${BKTR_DESCRIP} library version */
+ #undef HAVE_BKTR_VERSION
+ 
++/* Define this to indicate the ${BLUETOOTH_DESCRIP} library */
++#undef HAVE_BLUETOOTH
++
++/* Define to indicate the ${BLUETOOTH_DESCRIP} library version */
++#undef HAVE_BLUETOOTH_VERSION
++
+ /* Define to 1 if byteswap.h macros are available. */
+ #undef HAVE_BYTESWAP_H
+ 
+@@ -407,6 +413,9 @@
+ /* Define to indicate the ${LDAP_DESCRIP} library version */
+ #undef HAVE_LDAP_VERSION
+ 
++/* Define if your system has the NetBSD Editline libraries. */
++#undef HAVE_LIBEDIT
++
+ /* Define to 1 if you have the <libintl.h> header file. */
+ #undef HAVE_LIBINTL_H
+ 
+@@ -464,12 +473,9 @@
+ /* Define to indicate the ${LTDL_DESCRIP} library version */
+ #undef HAVE_LTDL_VERSION
+ 
+-/* Define this to indicate the ${LUA_DESCRIP} library */
++/* Define if your system has the LUA libraries. */
+ #undef HAVE_LUA
+ 
+-/* Define to indicate the ${LUA_DESCRIP} library version */
+-#undef HAVE_LUA_VERSION
+-
+ /* Define to 1 if you have the <malloc.h> header file. */
+ #undef HAVE_MALLOC_H
+ 
+@@ -1115,9 +1121,6 @@
+ /* Define to the version of this package. */
+ #undef PACKAGE_VERSION
+ 
+-/* Define to 1 if the C compiler supports function prototypes. */
+-#undef PROTOTYPES
+-
+ /* Define to necessary symbol if this constant uses a non-standard name on
+    your system. */
+ #undef PTHREAD_CREATE_JOINABLE
+@@ -1134,11 +1137,6 @@
+ /* Define to the type of arg 5 for `select'. */
+ #undef SELECT_TYPE_ARG5
+ 
+-/* Define to 1 if the `setvbuf' function takes the buffering type as its
+-   second argument and the buffer pointer as the third, as on System V before
+-   release 3. */
+-#undef SETVBUF_REVERSED
+-
+ /* The size of `int', as computed by sizeof. */
+ #undef SIZEOF_INT
+ 
+@@ -1159,20 +1157,30 @@
+ /* Define to 1 if your <sys/time.h> declares `struct tm'. */
+ #undef TM_IN_SYS_TIME
+ 
+-/* Define to 1 if on AIX 3.
+-   System headers sometimes define this.
+-   We just want to avoid a redefinition error message.  */
++/* Enable extensions on AIX 3, Interix.  */
+ #ifndef _ALL_SOURCE
+ # undef _ALL_SOURCE
+ #endif
+-
+-/* Number of bits in a file offset, on hosts where this is settable. */
+-#undef _FILE_OFFSET_BITS
+-
+ /* Enable GNU extensions on systems that have them.  */
+ #ifndef _GNU_SOURCE
+ # undef _GNU_SOURCE
+ #endif
++/* Enable threading extensions on Solaris.  */
++#ifndef _POSIX_PTHREAD_SEMANTICS
++# undef _POSIX_PTHREAD_SEMANTICS
++#endif
++/* Enable extensions on HP NonStop.  */
++#ifndef _TANDEM_SOURCE
++# undef _TANDEM_SOURCE
++#endif
++/* Enable general extensions on Solaris.  */
++#ifndef __EXTENSIONS__
++# undef __EXTENSIONS__
++#endif
++
++
++/* Number of bits in a file offset, on hosts where this is settable. */
++#undef _FILE_OFFSET_BITS
+ 
+ /* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
+ #undef _LARGEFILE_SOURCE
+@@ -1190,20 +1198,6 @@
+ /* Define to 1 if you need to in order for `stat' and other things to work. */
+ #undef _POSIX_SOURCE
+ 
+-/* Enable extensions on Solaris.  */
+-#ifndef __EXTENSIONS__
+-# undef __EXTENSIONS__
+-#endif
+-#ifndef _POSIX_PTHREAD_SEMANTICS
+-# undef _POSIX_PTHREAD_SEMANTICS
+-#endif
+-#ifndef _TANDEM_SOURCE
+-# undef _TANDEM_SOURCE
+-#endif
+-
+-/* Define like PROTOTYPES; this can be used by system headers. */
+-#undef __PROTOTYPES
+-
+ /* Define to empty if `const' does not conform to ANSI C. */
+ #undef const
+ 
+-- 
+1.6.1
+


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	7 Nov 2008 16:39:49 -0000	1.18
+++ .cvsignore	4 Jan 2009 05:05:40 -0000	1.19
@@ -1 +1 @@
-asterisk-1.6.1-beta2-stripped.tar.gz
+asterisk-1.6.1-beta4-stripped.tar.gz

0001-Modify-init-scripts-for-better-Fedora-compatibility.patch:

Index: 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0001-Modify-init-scripts-for-better-Fedora-compatibility.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch	7 Nov 2008 16:39:49 -0000	1.5
+++ 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch	4 Jan 2009 05:05:40 -0000	1.6
@@ -1,7 +1,7 @@
-From 174c9bf143c066f5670dde47559ed3d9d8d0c28f Mon Sep 17 00:00:00 2001
+From d397bc03e86335ed571121fa501dfefdc2ddbd4c Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Sun, 18 Nov 2007 21:47:59 -0600
-Subject: [PATCH] Modify init scripts for better Fedora compatibility.
+Subject: [PATCH 01/10] Modify init scripts for better Fedora compatibility.
 
 ---
  contrib/init.d/rc.redhat.asterisk |   61 +++++++++++++++++-------------------
@@ -151,5 +151,5 @@
 +# be initialized.
 +#AST_GROUP="asterisk"
 -- 
-1.5.6.5
+1.6.1
 

0002-Modify-modules.conf-so-that-different-voicemail-modu.patch:

Index: 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0002-Modify-modules.conf-so-that-different-voicemail-modu.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch	7 Nov 2008 16:39:49 -0000	1.5
+++ 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch	4 Jan 2009 05:05:40 -0000	1.6
@@ -1,7 +1,7 @@
-From a45cb3fffcafefae5bcd96061d23fe44ebc61990 Mon Sep 17 00:00:00 2001
+From e5d3f951bfa543e5d8b8cf85535f80b1d1143e09 Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jcollie at pc21224.campus.dmacc.edu>
 Date: Thu, 8 Nov 2007 15:52:36 -0600
-Subject: [PATCH] Modify modules.conf so that different voicemail modules can be loaded.
+Subject: [PATCH 02/10] Modify modules.conf so that different voicemail modules can be loaded.
 
 ---
  configs/modules.conf.sample |   26 ++++++++++++++++++++++++++
@@ -42,5 +42,5 @@
 +;noload => app_directory_plain.so
 +;noload => app_voicemail_plain.so
 -- 
-1.5.6.5
+1.6.1
 

0003-Add-chan_mobile-from-asterisk-addons.patch:

Index: 0003-Add-chan_mobile-from-asterisk-addons.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0003-Add-chan_mobile-from-asterisk-addons.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0003-Add-chan_mobile-from-asterisk-addons.patch	7 Nov 2008 16:39:49 -0000	1.1
+++ 0003-Add-chan_mobile-from-asterisk-addons.patch	4 Jan 2009 05:05:40 -0000	1.2
@@ -1,17 +1,17 @@
-From e4ca1e4c009965df9e7b230c4c8bddc645aaaf9c Mon Sep 17 00:00:00 2001
+From aeb688bc0889a4b035fd1590ba8df85af6e0a38c Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
-Date: Fri, 7 Nov 2008 07:52:23 -0600
-Subject: [PATCH] Add chan_mobile from asterisk-addons.
+Date: Thu, 16 Oct 2008 16:12:01 -0500
+Subject: [PATCH 03/10] Add chan_mobile from asterisk-addons.
 
 ---
  build_tools/menuselect-deps.in |    1 +
  channels/Makefile              |    1 +
- channels/chan_mobile.c         | 2150 ++++++++++++++++++++++++++++++++++++++++
+ channels/chan_mobile.c         | 2148 ++++++++++++++++++++++++++++++++++++++++
  configs/mobile.conf.sample     |   60 ++
  configure.ac                   |    4 +
  doc/chan_mobile.txt            |  240 +++++
  makeopts.in                    |    3 +
- 7 files changed, 2459 insertions(+), 0 deletions(-)
+ 7 files changed, 2457 insertions(+), 0 deletions(-)
  create mode 100644 channels/chan_mobile.c
  create mode 100644 configs/mobile.conf.sample
  create mode 100644 doc/chan_mobile.txt
@@ -38,10 +38,10 @@
 +chan_mobile.so: LIBS+=$(BLUETOOTH_LIB)
 diff --git a/channels/chan_mobile.c b/channels/chan_mobile.c
 new file mode 100644
-index 0000000..22692ec
+index 0000000..42659b2
 --- /dev/null
 +++ b/channels/chan_mobile.c
-@@ -0,0 +1,2150 @@
+@@ -0,0 +1,2148 @@
 +/*
 + * Asterisk -- An open source telephony toolkit.
 + *
@@ -612,7 +612,7 @@
 +	struct mbl_pvt *pvt;
 +	char *dest_dev = NULL;
 +	char *dest_num = NULL;
-+	int oldformat, group = -1;
++	int oldformat, group;
 +
 +	if (!data) {
 +		ast_log(LOG_WARNING, "Channel requested with no data\n");
@@ -634,15 +634,13 @@
 +	if (dest_num)
 +		*dest_num++ = 0x00;
 +
-+	if (((dest_dev[0] == 'g') || (dest_dev[0] == 'G')) && ((dest_dev[1] >= '0') && (dest_dev[1] <= '9'))) {
-+		group = atoi(&dest_dev[1]);
-+	}
-+
-+	/* Find requested device and make sure it's connected. */
++	/* Find requested device and make sure its connected. */
 +	AST_RWLIST_RDLOCK(&devices);
 +	AST_RWLIST_TRAVERSE(&devices, pvt, entry) {
-+		if (group > -1 && pvt->group == group && pvt->connected && !pvt->owner) {
-+			break;
++		if (((dest_dev[0] == 'g') || (dest_dev[0] == 'G')) && ((dest_dev[1] >= '0') && (dest_dev[1] <= '9'))) {
++			group = atoi(dest_dev+1);
++			if (pvt->group == group)
++				break;
 +		} else if (!strcmp(pvt->id, dest_dev)) {
 +			break;
 +		}
@@ -655,14 +653,14 @@
 +	}
 +
 +	if ((pvt->type == MBL_TYPE_PHONE) && !dest_num) {
-+		ast_log(LOG_WARNING, "Can't determine destination number.\n");
++		ast_log(LOG_WARNING, "Cant determine destination number.\n");
 +		*cause = AST_CAUSE_INCOMPATIBLE_DESTINATION;
 +		return NULL;
 +	}
 +
 +	chn = mbl_new(AST_STATE_DOWN, pvt, NULL);
 +	if (!chn) {
-+		ast_log(LOG_WARNING, "Unable to allocate channel structure.\n");
++		ast_log(LOG_WARNING, "Unable to allocate channel structure\n");
 +		*cause = AST_CAUSE_REQUESTED_CHAN_UNAVAIL;
 +		return NULL;
 +	}
@@ -2259,10 +2257,10 @@
 +type=headset
 +adapter=dlink
 diff --git a/configure.ac b/configure.ac
-index 036e692..ebb5fe9 100644
+index e0d0466..31b512f 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -205,6 +205,8 @@ AST_EXT_LIB_SETUP([ALSA], [Advanced Linux Sound Architecture], [asound])
+@@ -211,6 +211,8 @@ AST_EXT_LIB_SETUP([ALSA], [Advanced Linux Sound Architecture], [asound])
  # BKTR is used for backtrace support on platforms that do not
  # have it natively.
  AST_EXT_LIB_SETUP([BKTR], [Stack Backtrace support], [execinfo])
@@ -2271,7 +2269,7 @@
  AST_EXT_LIB_SETUP([CAP], [POSIX 1.e capabilities], [cap])
  AST_EXT_LIB_SETUP([CURL], [cURL], [curl])
  AST_EXT_LIB_SETUP([CURSES], [curses], [curses])
-@@ -570,6 +572,8 @@ AC_CHECK_SIZEOF(int)
+@@ -588,6 +590,8 @@ AC_CHECK_SIZEOF(int)
  
  AST_EXT_LIB_CHECK([ALSA], [asound], [snd_spcm_init], [alsa/asoundlib.h], [-lm -ldl])
  
@@ -2527,10 +2525,10 @@
 +
 +email me at   david.bowerman at gmail.com   or dseeb_ on #asterisk & #asterisk-dev irc.
 diff --git a/makeopts.in b/makeopts.in
-index 57d7fed..d037525 100644
+index 6a24183..a5b2a5f 100644
 --- a/makeopts.in
 +++ b/makeopts.in
-@@ -70,6 +70,9 @@ AST_SHADOW_WARNINGS=@AST_SHADOW_WARNINGS@
+@@ -72,6 +72,9 @@ AST_FORTIFY_SOURCE=@AST_FORTIFY_SOURCE@
  ASOUND_INCLUDE=@ALSA_INCLUDE@
  ASOUND_LIB=@ALSA_LIB@
  
@@ -2541,5 +2539,5 @@
  CURL_LIB=@CURL_LIB@
  
 -- 
-1.5.6.5
+1.6.1
 

0004-Use-pkgconfig-to-check-for-Lua.patch:

Index: 0004-Use-pkgconfig-to-check-for-Lua.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0004-Use-pkgconfig-to-check-for-Lua.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0004-Use-pkgconfig-to-check-for-Lua.patch	7 Nov 2008 16:39:49 -0000	1.1
+++ 0004-Use-pkgconfig-to-check-for-Lua.patch	4 Jan 2009 05:05:40 -0000	1.2
@@ -1,17 +1,17 @@
-From 2134757713eeb6dd4cd7645c37b71ebe1eeedeb1 Mon Sep 17 00:00:00 2001
+From 24b4e78b81a06375e233ccc7745d5d3bc5b1cc7e Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Mon, 25 Feb 2008 13:14:23 -0600
-Subject: [PATCH] Use pkgconfig to check for Lua.
+Subject: [PATCH 04/10] Use pkgconfig to check for Lua.
 
 ---
  configure.ac |    9 ++++++++-
  1 files changed, 8 insertions(+), 1 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index ebb5fe9..78c2137 100644
+index 31b512f..4519ec9 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1378,7 +1378,14 @@ if test "${PBX_PWLIB}" = "1" -a "${USE_OPENH323}" != "no" ; then
+@@ -1406,7 +1406,14 @@ if test "${PBX_PWLIB}" = "1" -a "${USE_OPENH323}" != "no" ; then
  		[${PWLIB_INCLUDE}], [${PWLIB_LIB}])
  fi
  
@@ -28,5 +28,5 @@
  AST_EXT_LIB_CHECK([RADIUS], [radiusclient-ng], [rc_read_config], [radiusclient-ng.h])
  
 -- 
-1.5.6.5
+1.6.1
 


Index: asterisk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/asterisk.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- asterisk.spec	9 Dec 2008 13:40:18 -0000	1.42
+++ asterisk.spec	4 Jan 2009 05:05:42 -0000	1.43
@@ -1,9 +1,9 @@
 %define with_apidoc %{?_with_apidoc: 1} %{!?_with_apidoc: 0}
-%define beta 2
+%define beta 4
 Summary: The Open Source PBX
 Name: asterisk
 Version: 1.6.1
-Release: 0.6%{?beta:beta%{beta}}%{?dist}
+Release: 0.8%{?beta:beta%{beta}}%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.asterisk.org/
@@ -19,13 +19,13 @@
 
 # MD5 Sums
 # ========
-# 7dbcff5fb2d591b5b122ccb62909f641  asterisk-1.6.1-beta2.tar.gz
-# e2de68706687da9cce78d6f1e5e8d680  asterisk-1.6.1-beta2-stripped.tar.gz
+# 6ed4cad3cea37fc0c9bbcc3579a782ff  asterisk-1.6.1-beta4.tar.gz
+# ea9b4e1988c92cf40a913cb9e5fb32ef  asterisk-1.6.1-beta4-stripped.tar.gz
 #
 # SHA1 Sums
 # =========
-# 3ca20384c469c86aa87abb51f147ca6543740b72  asterisk-1.6.1-beta2.tar.gz
-# 8bcc273d4f499a974dd7df7b9c328e2cba4e75db  asterisk-1.6.1-beta2-stripped.tar.gz
+# 2b73ba5b94af16709f41ddeba7d9d93d7d5848af  asterisk-1.6.1-beta4.tar.gz
+# 1a5d21df9097baa28d44285a8e9b2e602e3b92ce  asterisk-1.6.1-beta4-stripped.tar.gz
 
 Source0: asterisk-%{version}%{?beta:-beta%{beta}}-stripped.tar.gz
 Source1: asterisk-logrotate
@@ -37,11 +37,12 @@
 Patch2:  0002-Modify-modules.conf-so-that-different-voicemail-modu.patch
 Patch3:  0003-Add-chan_mobile-from-asterisk-addons.patch
 Patch4:  0004-Use-pkgconfig-to-check-for-Lua.patch
-Patch5:  0005-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch
-Patch6:  0006-Build-using-external-libedit.patch
-Patch7:  0007-Update-autoconf.patch
-Patch8:  0008-sys-io.h-is-not-available-on-PPC-systems.patch
-Patch9:  0009-Define-missing-variable-when-compiling-on-PPC.patch
+Patch5:  0005-Build-using-external-libedit.patch
+Patch6:  0006-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch
+Patch7:  0007-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch
+Patch8:  0008-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch
+Patch9:  0009-my-guess-as-replacements-for-the-missing-broken-stuf.patch
+Patch10: 0010-Update-autoconf.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
@@ -427,6 +428,7 @@
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
 
 cp %{SOURCE2} menuselect.makedeps
 cp %{SOURCE3} menuselect.makeopts
@@ -745,14 +747,14 @@
 %{_libdir}/asterisk/modules/res_timing_pthread.so
 %{_libdir}/asterisk/modules/test_dlinklists.so
 
-#%{_sbindir}/aelparse
+%{_sbindir}/aelparse
 %{_sbindir}/astcanary
 %{_sbindir}/asterisk
 %{_sbindir}/astgenkey
 %{_sbindir}/astman
 %{_sbindir}/autosupport
 %{_sbindir}/check_expr
-#%{_sbindir}/conf2ael
+%{_sbindir}/conf2ael
 %{_sbindir}/muted
 %{_sbindir}/rasterisk
 %{_sbindir}/refcounter
@@ -1053,6 +1055,12 @@
 %{_libdir}/asterisk/modules/app_voicemail_plain.so
 
 %changelog
+* Sat Jan  3 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1-0.8.beta4
+- Update to 1.6.1-beta4
+
+* Tue Dec  9 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1-0.7.beta3
+- Update to 1.6.1-beta3
+
 * Tue Dec  9 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.6.1-0.6.beta2
 - Rebuild for new gmime
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	7 Nov 2008 16:39:49 -0000	1.18
+++ sources	4 Jan 2009 05:05:42 -0000	1.19
@@ -1 +1 @@
-e2de68706687da9cce78d6f1e5e8d680  asterisk-1.6.1-beta2-stripped.tar.gz
+ea9b4e1988c92cf40a913cb9e5fb32ef  asterisk-1.6.1-beta4-stripped.tar.gz


--- 0005-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch DELETED ---


--- 0006-Build-using-external-libedit.patch DELETED ---


--- 0007-Update-autoconf.patch DELETED ---


--- 0008-sys-io.h-is-not-available-on-PPC-systems.patch DELETED ---


--- 0009-Define-missing-variable-when-compiling-on-PPC.patch DELETED ---


