rpms/asterisk/F-10 0008-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch, NONE, 1.1 0009-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch, NONE, 1.1 0010-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch, NONE, 1.1 0011-Merged-revisions-160170-160172-via-svnmerge-from.patch, NONE, 1.1 0012-Update-autoconf.patch, 1.2, 1.3 .cvsignore, 1.17, 1.18 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch, 1.4, 1.5 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch, 1.4, 1.5 0003-Allow-alternate-extensions-to-be-specified-in-users.patch, 1.3, 1.4 0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch, 1.3, 1.4 0005-Add-chan_mobile-from-asterisk-addons.patch, 1.3, 1.4 0006-Use-pkgconfig-to-check-for-Lua.patch, 1.3, 1.4 0007-Build-using-external-libedit.patch, 1.3, 1.4 asterisk.spec, 1.37, 1.38 sources, 1.17, 1.18 0008-Update-autoconf.patch, 1.2, NONE 0009-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch, 1.2, NONE

Jeffrey C. Ollie jcollie at fedoraproject.org
Sun Jan 4 14:48:28 UTC 2009


Author: jcollie

Update of /cvs/pkgs/rpms/asterisk/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18844

Modified Files:
	.cvsignore 
	0001-Modify-init-scripts-for-better-Fedora-compatibility.patch 
	0002-Modify-modules.conf-so-that-different-voicemail-modu.patch 
	0003-Allow-alternate-extensions-to-be-specified-in-users.patch 
	0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch 
	0005-Add-chan_mobile-from-asterisk-addons.patch 
	0006-Use-pkgconfig-to-check-for-Lua.patch 
	0007-Build-using-external-libedit.patch asterisk.spec sources 
Added Files:
	0008-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch 
	0009-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch 
	0010-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch 
	0011-Merged-revisions-160170-160172-via-svnmerge-from.patch 
	0012-Update-autoconf.patch 
Removed Files:
	0008-Update-autoconf.patch 
	0009-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch 
Log Message:
* Sun Jan  4 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0.2-1
- Update to 1.6.0.2


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

--- NEW FILE 0008-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch ---
>From a092080315b7bfa9b7d174b6114cb957ac1590d8 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 08/12] 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 6a600a4..a803bd5 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


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

--- NEW FILE 0009-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch ---
>From 7719af5a016f40f573c90aae17910f7f77b9b4e6 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 09/12] 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 12065a4..08f142d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1425,7 +1425,17 @@ then
     AST_EXT_LIB_CHECK([OSPTK], [osptk], [OSPPCryptoDecrypt], [osp/osp.h], [-lcrypto -lssl])
 fi
 
-AST_EXT_TOOL_CHECK([GMIME], [gmime])
+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)
 
 if test "$PBX_GMIME" = "1";
 then
-- 
1.6.1


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

--- NEW FILE 0010-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch ---
>From 9a6c4641b2aa353c9076df9794d72fba5acdafb0 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 10/12] 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


0011-Merged-revisions-160170-160172-via-svnmerge-from.patch:

--- NEW FILE 0011-Merged-revisions-160170-160172-via-svnmerge-from.patch ---
>From c38fa4eb3cf989c110a737058c46a916ebab19c8 Mon Sep 17 00:00:00 2001
From: seanbright <seanbright at f38db490-d61c-443f-a65b-d21fe96a405b>
Date: Mon, 1 Dec 2008 23:41:16 +0000
Subject: [PATCH 11/12] Merged revisions 160170-160172 via svnmerge from
 https://origsvn.digium.com/svn/asterisk/trunk

................
  r160170 | seanbright | 2008-12-01 18:08:24 -0500 (Mon, 01 Dec 2008) | 1 line

  Pay attention to the return value of system(), even if we basically ignore it.
................
  r160171 | seanbright | 2008-12-01 18:18:48 -0500 (Mon, 01 Dec 2008) | 1 line

  Silence a build warning. (chan_phone.c:810: warning: value computed is not used)
................
  r160172 | seanbright | 2008-12-01 18:37:49 -0500 (Mon, 01 Dec 2008) | 10 lines

  Merged revisions 159976 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r159976 | mvanbaak | 2008-12-01 11:08:36 -0500 (Mon, 01 Dec 2008) | 3 lines

    Get rid of the useless format string and argument in the Bogus/ manager channelname.
    Noted by kpfleming and name Bogus/manager suggested by eliel
  ........
................

git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@160173 f38db490-d61c-443f-a65b-d21fe96a405b
---
 main/manager.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/main/manager.c b/main/manager.c
index 6c28fed..bcf222f 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -1729,7 +1729,7 @@ static int action_getvar(struct mansession *s, const struct message *m)
 
 	if (varname[strlen(varname) - 1] == ')') {
 		if (!c) {
-			c = ast_channel_alloc(0, 0, "", "", "", "", "", 0, "Bogus/%p", SENTINEL);
+			c = ast_channel_alloc(0, 0, "", "", "", "", "", 0, "Bogus/manager");
 			if (c) {
 				ast_func_read(c, (char *) varname, workspace, sizeof(workspace));
 				ast_channel_free(c);
-- 
1.6.1


0012-Update-autoconf.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.2 -r 1.3 0012-Update-autoconf.patch
Index: 0012-Update-autoconf.patch
===================================================================
RCS file: 0012-Update-autoconf.patch
diff -N 0012-Update-autoconf.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ 0012-Update-autoconf.patch	4 Jan 2009 14:48:27 -0000	1.3
@@ -0,0 +1,45038 @@
+From 91db0f005bd6818bbd2eade2b79ac430d884971c Mon Sep 17 00:00:00 2001
+From: Jeffrey C. Ollie <jeff at ocjtech.us>
+Date: Sun, 4 Jan 2009 00:37:02 -0600
+Subject: [PATCH 12/12] Update autoconf.
+
+---
+ configure                        |23025 ++++++++++++++++++++------------------
+ include/asterisk/autoconfig.h.in |   60 +-
+ 2 files changed, 12340 insertions(+), 10745 deletions(-)
+
+diff --git a/configure b/configure
+index f997451..e40ba2c 100755
+--- a/configure
++++ b/configure
+@@ -1,12 +1,12 @@
+ #! /bin/sh
+-# From configure.ac Revision: 159855 .
++# 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,
[...44645 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"
+  ;;
+ 
+ 
+@@ -50858,6 +52450,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.
+@@ -50879,6 +52476,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
+@@ -50907,17 +52508,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 60f497d..1e4c5a6 100644
+--- a/include/asterisk/autoconfig.h.in
++++ b/include/asterisk/autoconfig.h.in
+@@ -119,6 +119,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
+ 
+@@ -391,6 +397,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
+ 
+@@ -448,12 +457,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
+ 
+@@ -1087,9 +1093,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
+@@ -1106,11 +1109,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
+ 
+@@ -1131,20 +1129,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
+@@ -1162,20 +1170,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/F-10/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	10 Oct 2008 22:58:57 -0000	1.17
+++ .cvsignore	4 Jan 2009 14:48:26 -0000	1.18
@@ -1 +1 @@
-asterisk-1.6.0.1-stripped.tar.gz
+asterisk-1.6.0.2-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/F-10/0001-Modify-init-scripts-for-better-Fedora-compatibility.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch	5 Nov 2008 14:58:10 -0000	1.4
+++ 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch	4 Jan 2009 14:48:26 -0000	1.5
@@ -1,7 +1,7 @@
-From efe583b4fb0722cc56e52ff8bbadd06ccc312409 Mon Sep 17 00:00:00 2001
+From 0040bd97782e9db8c341af9ffe171749644e35f1 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/12] 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/F-10/0002-Modify-modules.conf-so-that-different-voicemail-modu.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch	5 Nov 2008 14:58:10 -0000	1.4
+++ 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch	4 Jan 2009 14:48:26 -0000	1.5
@@ -1,7 +1,7 @@
-From de8c8daa4f1ad9647fd9be2196b1ca4ba6e3955a Mon Sep 17 00:00:00 2001
+From 42cd072beba88049783a7bedb029760a5952706e 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/12] Modify modules.conf so that different voicemail modules can be loaded.
 
 ---
  configs/modules.conf.sample |   27 +++++++++++++++++++++++++++
@@ -43,5 +43,5 @@
 +;noload => app_voicemail_plain.so
 +
 -- 
-1.5.6.5
+1.6.1
 

0003-Allow-alternate-extensions-to-be-specified-in-users.patch:

Index: 0003-Allow-alternate-extensions-to-be-specified-in-users.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0003-Allow-alternate-extensions-to-be-specified-in-users.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 0003-Allow-alternate-extensions-to-be-specified-in-users.patch	5 Nov 2008 14:58:10 -0000	1.3
+++ 0003-Allow-alternate-extensions-to-be-specified-in-users.patch	4 Jan 2009 14:48:26 -0000	1.4
@@ -1,17 +1,17 @@
-From 2bc910c60188c668d7ad530a61eeacdac8ac9ee6 Mon Sep 17 00:00:00 2001
+From a9d27e3b5f93ff8658fa06a0c454140f27244363 Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jcollie at pc21224.campus.dmacc.edu>
 Date: Thu, 8 Nov 2007 16:32:56 -0600
-Subject: [PATCH] Allow alternate extensions to be specified in users.conf
+Subject: [PATCH 03/12] Allow alternate extensions to be specified in users.conf
 
 ---
  pbx/pbx_config.c |   14 ++++++++++++++
  1 files changed, 14 insertions(+), 0 deletions(-)
 
 diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c
-index b63fedd..3574d0d 100644
+index dc48136..6c6ba87 100644
 --- a/pbx/pbx_config.c
 +++ b/pbx/pbx_config.c
-@@ -1562,11 +1562,14 @@ static void pbx_load_users(void)
+@@ -1568,11 +1568,14 @@ static void pbx_load_users(void)
  {
  	struct ast_config *cfg;
  	char *cat, *chan;
@@ -26,7 +26,7 @@
  	char *c;
  	int len;
  	int hasvoicemail;
-@@ -1647,6 +1650,17 @@ static void pbx_load_users(void)
+@@ -1653,6 +1656,17 @@ static void pbx_load_users(void)
  			} else {
  				ast_add_extension2(con, 0, cat, 1, NULL, NULL, "Dial", strdup("${HINT}"), ast_free_ptr, registrar);
  			}
@@ -45,5 +45,5 @@
  	}
  	ast_config_destroy(cfg);
 -- 
-1.5.6.5
+1.6.1
 

0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch:

Index: 0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch	5 Nov 2008 14:58:10 -0000	1.3
+++ 0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch	4 Jan 2009 14:48:26 -0000	1.4
@@ -1,7 +1,7 @@
-From 28e48a2b0b1b50a4dc09051f1250ae667614bedb Mon Sep 17 00:00:00 2001
+From 42991016984f9e7930686527706ab0f36baa41d1 Mon Sep 17 00:00:00 2001
 From: tilghman <tilghman at 614ede4d-c843-0410-af14-a771ab80d22e>
 Date: Tue, 29 Jul 2008 23:00:45 +0000
-Subject: [PATCH] Minor changes to reduce packaging changes made by the Fedora maintainer.
+Subject: [PATCH 04/12] Minor changes to reduce packaging changes made by the Fedora maintainer.
  (closes issue #12974)
   Reported by: jcollie
   Patches:
@@ -13,10 +13,10 @@
  1 files changed, 12 insertions(+), 4 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index a874a7c..f82602c 100644
+index 788e524..05a58d1 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -221,10 +221,16 @@ ifeq ($(OSARCH),linux-gnu)
+@@ -222,10 +222,16 @@ ifeq ($(OSARCH),linux-gnu)
  endif
  
  ifeq ($(findstring -save-temps,$(ASTCFLAGS)),)
@@ -33,9 +33,9 @@
 -ASTCFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG)
 +ASTCFLAGS+=-Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG)
  
- ASTCFLAGS+=-include $(ASTTOPDIR)/include/asterisk/autoconfig.h
- 
-@@ -237,8 +243,10 @@ ifneq ($(findstring BSD,$(OSARCH)),)
+ ifeq ($(AST_DEVMODE),yes)
+   ASTCFLAGS+=-Werror
+@@ -242,8 +248,10 @@ ifneq ($(findstring BSD,$(OSARCH)),)
    ASTLDFLAGS+=-L/usr/local/lib
  endif
  
@@ -49,5 +49,5 @@
  
  ifeq ($(PROC),ppc)
 -- 
-1.5.6.5
+1.6.1
 

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

Index: 0005-Add-chan_mobile-from-asterisk-addons.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0005-Add-chan_mobile-from-asterisk-addons.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 0005-Add-chan_mobile-from-asterisk-addons.patch	5 Nov 2008 14:58:10 -0000	1.3
+++ 0005-Add-chan_mobile-from-asterisk-addons.patch	4 Jan 2009 14:48:26 -0000	1.4
@@ -1,7 +1,7 @@
-From f3c9272a15f71e3dc084fad107eceb92d8a19475 Mon Sep 17 00:00:00 2001
+From 8cc8002094fe880d374a727aa0be389ca68b0342 Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Mon, 25 Feb 2008 09:23:28 -0600
-Subject: [PATCH] Add chan_mobile from asterisk-addons.
+Subject: [PATCH 05/12] Add chan_mobile from asterisk-addons.
 
 ---
  build_tools/menuselect-deps.in |    1 +
@@ -2228,10 +2228,10 @@
 +type=headset
 +adapter=dlink
 diff --git a/configure.ac b/configure.ac
-index 33b40a2..f86e8f5 100644
+index 20e8e33..b8ebbf5 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])
@@ -2240,7 +2240,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])
-@@ -556,6 +558,8 @@ AC_CHECK_SIZEOF(int)
+@@ -574,6 +576,8 @@ AC_CHECK_SIZEOF(int)
  
  AST_EXT_LIB_CHECK([ALSA], [asound], [snd_spcm_init], [alsa/asoundlib.h], [-lm -ldl])
  
@@ -2496,10 +2496,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 b3e5c49..05de366 100644
+index 018bc6c..039525d 100644
 --- a/makeopts.in
 +++ b/makeopts.in
-@@ -69,6 +69,9 @@ AST_NO_STRICT_OVERFLOW=@AST_NO_STRICT_OVERFLOW@
+@@ -71,6 +71,9 @@ AST_FORTIFY_SOURCE=@AST_FORTIFY_SOURCE@
  ASOUND_INCLUDE=@ALSA_INCLUDE@
  ASOUND_LIB=@ALSA_LIB@
  
@@ -2510,5 +2510,5 @@
  CURL_LIB=@CURL_LIB@
  
 -- 
-1.5.6.5
+1.6.1
 

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

Index: 0006-Use-pkgconfig-to-check-for-Lua.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0006-Use-pkgconfig-to-check-for-Lua.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 0006-Use-pkgconfig-to-check-for-Lua.patch	5 Nov 2008 14:58:10 -0000	1.3
+++ 0006-Use-pkgconfig-to-check-for-Lua.patch	4 Jan 2009 14:48:26 -0000	1.4
@@ -1,17 +1,17 @@
-From 81bf87aedbf0f1ad5b8ecc97e3012821207445ca Mon Sep 17 00:00:00 2001
+From d633181f75ea7dc879e8ac9d014cf1fc0fe364ef 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 06/12] 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 f86e8f5..f4e445c 100644
+index b8ebbf5..d3e4054 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1364,7 +1364,14 @@ if test "${PBX_PWLIB}" = "1" -a "${USE_OPENH323}" != "no" ; then
+@@ -1382,7 +1382,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
 

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

Index: 0007-Build-using-external-libedit.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0007-Build-using-external-libedit.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 0007-Build-using-external-libedit.patch	5 Nov 2008 14:58:10 -0000	1.3
+++ 0007-Build-using-external-libedit.patch	4 Jan 2009 14:48:27 -0000	1.4
@@ -1,7 +1,7 @@
-From bbdbf8b43a846dd5f84cee581cb43eae7fc57c87 Mon Sep 17 00:00:00 2001
+From a50090dc47540b5c3df28c9846fe753f5476c4fc 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] Build using external libedit.
+Subject: [PATCH 07/12] Build using external libedit.
 
 ---
  build_tools/menuselect-deps.in |    1 +
@@ -24,10 +24,10 @@
  LUA=@PBX_LUA@
  MISDN=@PBX_MISDN@
 diff --git a/configure.ac b/configure.ac
-index f4e445c..40f8d6e 100644
+index d3e4054..12065a4 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -223,6 +223,7 @@ AST_EXT_LIB_SETUP([IMAP_TK], [UW IMAP Toolkit], [imap])
+@@ -229,6 +229,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])
@@ -35,7 +35,7 @@
  AST_EXT_LIB_SETUP([LTDL], [libtool], [ltdl])
  AST_EXT_LIB_SETUP([LUA], [Lua], [lua])
  AST_EXT_LIB_SETUP([MISDN], [mISDN User Library], [misdn])
-@@ -1530,6 +1531,27 @@ AC_SUBST(PBX_GTK2)
+@@ -1576,6 +1577,27 @@ AC_SUBST(PBX_GTK2)
  AC_SUBST(GTK2_INCLUDE)
  AC_SUBST(GTK2_LIB)
  
@@ -64,10 +64,10 @@
     AC_PATH_TOOL([CURL_CONFIG], [curl-config], No)
     if test ! x"${CURL_CONFIG}" = xNo; then
 diff --git a/main/Makefile b/main/Makefile
-index b3a53a3..996ddf6 100644
+index 14fa19a..9d3e9e4 100644
 --- a/main/Makefile
 +++ b/main/Makefile
-@@ -132,6 +132,7 @@ testexpr2: ast_expr2f.c ast_expr2.c ast_expr2.h
+@@ -135,6 +135,7 @@ testexpr2: ast_expr2f.c ast_expr2.c ast_expr2.h
  channel.o: ASTCFLAGS+=$(DAHDI_INCLUDE)
  asterisk.o: ASTCFLAGS+=$(DAHDI_INCLUDE)
  
@@ -75,7 +75,7 @@
  
  ifneq ($(findstring ENABLE_UPLOADS,$(MENUSELECT_CFLAGS)),)
  http.o: ASTCFLAGS+=$(GMIME_INCLUDE)
-@@ -165,13 +166,13 @@ ifneq ($(findstring ENABLE_UPLOADS,$(MENUSELECT_CFLAGS)),)
+@@ -168,13 +169,13 @@ ifneq ($(findstring ENABLE_UPLOADS,$(MENUSELECT_CFLAGS)),)
  GMIMELDFLAGS+=$(GMIME_LIB)
  endif
  
@@ -93,7 +93,7 @@
  	$(CMD_PREFIX) $(ASTTOPDIR)/build_tools/strip_nonapi $@ || rm $@
  
 diff --git a/main/cli.c b/main/cli.c
-index 70d26e1..90454d8 100644
+index 6b129bc..cc838d5 100644
 --- a/main/cli.c
 +++ b/main/cli.c
 @@ -34,6 +34,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
@@ -114,10 +114,10 @@
  
  /*!
 diff --git a/makeopts.in b/makeopts.in
-index 05de366..72d5315 100644
+index 039525d..9eef75e 100644
 --- a/makeopts.in
 +++ b/makeopts.in
-@@ -241,3 +241,7 @@ TINFO_DIR=@TINFO_DIR@
+@@ -243,3 +243,7 @@ TINFO_DIR=@TINFO_DIR@
  
  # if poll is not present, let the makefile know.
  POLL_AVAILABLE=@HAS_POLL@
@@ -126,5 +126,5 @@
 +LIBEDIT_LIB=@LIBEDIT_LIB@
 +LIBEDIT_OBJ=@LIBEDIT_OBJ@
 -- 
-1.5.6.5
+1.6.1
 


Index: asterisk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/asterisk.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- asterisk.spec	5 Nov 2008 14:58:10 -0000	1.37
+++ asterisk.spec	4 Jan 2009 14:48:27 -0000	1.38
@@ -2,8 +2,8 @@
 
 Summary: The Open Source PBX
 Name: asterisk
-Version: 1.6.0.1
-Release: 3%{?dist}
+Version: 1.6.0.2
+Release: 1%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.asterisk.org/
@@ -19,13 +19,13 @@
 
 # MD5 Sums
 # ========
-# 5277db1134f0dc736932279c6a25c29a  asterisk-1.6.0.1.tar.gz
-# 00465d571b2cd9fd49c86b753aa3a551  asterisk-1.6.0.1-stripped.tar.gz
+# 22068805be6b11831c507861293fc1f5  asterisk-1.6.0.2.tar.gz
+# 6782a95a088a78ebb52252926e94a186  asterisk-1.6.0.2-stripped.tar.gz
 #
 # SHA1 Sums
 # =========
-# 20d77f6a08a8d755eeadf431c1f692d5adeadde8  asterisk-1.6.0.1.tar.gz
-# 4f5d1f436ba1119db9dfea072b1e6ac59c9eebd5  asterisk-1.6.0.1-stripped.tar.gz
+# 7d7c63f5c8ad17cc7dfd1bdd0fd27eea4fcef2c1  asterisk-1.6.0.2.tar.gz
+# 9aa182314ed4cc72bd39c7bd6897812b22bde2a2  asterisk-1.6.0.2-stripped.tar.gz
 
 Source0: asterisk-%{version}-stripped.tar.gz
 Source1: asterisk-logrotate
@@ -40,8 +40,11 @@
 Patch5:  0005-Add-chan_mobile-from-asterisk-addons.patch
 Patch6:  0006-Use-pkgconfig-to-check-for-Lua.patch
 Patch7:  0007-Build-using-external-libedit.patch
-Patch8:  0008-Update-autoconf.patch
-Patch9:	 0009-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch
+Patch8:  0008-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch
+Patch9:  0009-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch
+Patch10: 0010-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch
+Patch11: 0011-Merged-revisions-160170-160172-via-svnmerge-from.patch
+Patch12: 0012-Update-autoconf.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
@@ -415,6 +418,9 @@
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
 
 cp %{SOURCE2} menuselect.makedeps
 cp %{SOURCE3} menuselect.makeopts
@@ -727,14 +733,14 @@
 %{_libdir}/asterisk/modules/res_smdi.so
 %{_libdir}/asterisk/modules/res_speech.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}/safe_asterisk
@@ -1024,6 +1030,9 @@
 %{_libdir}/asterisk/modules/app_voicemail_plain.so
 
 %changelog
+* Sun Jan  4 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0.2-1
+- Update to 1.6.0.2
+
 * Wed Nov  5 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0.1-3
 - Fix issue with init script giving wrong path to config file.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	10 Oct 2008 22:58:57 -0000	1.17
+++ sources	4 Jan 2009 14:48:27 -0000	1.18
@@ -1 +1 @@
-00465d571b2cd9fd49c86b753aa3a551  asterisk-1.6.0.1-stripped.tar.gz
+6782a95a088a78ebb52252926e94a186  asterisk-1.6.0.2-stripped.tar.gz


--- 0008-Update-autoconf.patch DELETED ---


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




More information about the fedora-extras-commits mailing list