rpms/asterisk/F-9 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 0012-Merged-revisions-162275-via-svnmerge-from.patch, NONE, 1.1 0013-Update-autoconf.patch, NONE, 1.1 0014-Fix-up-some-paths.patch, NONE, 1.1 0015-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch, NONE, 1.1 .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.33, 1.34 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
Thu Jan 8 22:30:37 UTC 2009
Author: jcollie
Update of /cvs/pkgs/rpms/asterisk/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8103
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
0012-Merged-revisions-162275-via-svnmerge-from.patch
0013-Update-autoconf.patch 0014-Fix-up-some-paths.patch
0015-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch
Removed Files:
0008-Update-autoconf.patch
0009-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch
Log Message:
* Thu Jan 8 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0.3-1
- Update to 1.6.0.3 to fix AST-2009-001/CVE-2009-0041
- http://downloads.digium.com/pub/security/AST-2009-001.html
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/15] 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/15] 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/15] 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
0012-Merged-revisions-162275-via-svnmerge-from.patch:
--- NEW FILE 0012-Merged-revisions-162275-via-svnmerge-from.patch ---
>From 986c677766137383378252947eafb3eb8c86718a Mon Sep 17 00:00:00 2001
From: file <file at f38db490-d61c-443f-a65b-d21fe96a405b>
Date: Tue, 9 Dec 2008 20:47:11 +0000
Subject: [PATCH 12/15] Merged revisions 162275 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r162275 | file | 2008-12-09 16:46:11 -0400 (Tue, 09 Dec 2008) | 11 lines
Merged revisions 162273 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r162273 | file | 2008-12-09 16:44:32 -0400 (Tue, 09 Dec 2008) | 4 lines
Fix double declaration of 'x' on the PPC platform.
(closes issue #14038)
Reported by: ffloimair
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@162276 f38db490-d61c-443f-a65b-d21fe96a405b
---
apps/app_festival.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/apps/app_festival.c b/apps/app_festival.c
index de8c618..4e1e47e 100644
--- a/apps/app_festival.c
+++ b/apps/app_festival.c
@@ -121,7 +121,6 @@ static int send_waveform_to_fd(char *waveform, int length, int fd)
int x;
#ifdef __PPC__
char c;
- int x;
#endif
sigset_t fullset, oldset;
--
1.6.1
0013-Update-autoconf.patch:
--- NEW FILE 0013-Update-autoconf.patch ---
>From 249cd4bd1b4b9a0b99a07d44359e098c10dacbdb 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 13/15] 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,
+ echo including any error possibly output before this message.
+ echo This can help us improve future autoconf versions.
+ echo Configuration will now proceed without shell functions.
}
[...44639 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
0014-Fix-up-some-paths.patch:
--- NEW FILE 0014-Fix-up-some-paths.patch ---
>From 57e9e58cb5d501da652d227eb8c07b2593d333ff Mon Sep 17 00:00:00 2001
From: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Sun, 4 Jan 2009 12:51:05 -0600
Subject: [PATCH 14/15] Fix up some paths.
---
UPGRADE-1.4.txt | 2 +-
configs/festival.conf.sample | 2 +-
configs/http.conf.sample | 6 ++--
configs/iax.conf.sample | 4 +-
configs/musiconhold.conf.sample | 10 ++++----
configs/osp.conf.sample | 4 +-
configs/phoneprov.conf.sample | 2 +-
contrib/scripts/astgenkey | 2 +-
contrib/scripts/astgenkey.8 | 6 ++--
doc/osp.txt | 8 +++---
doc/tex/phoneprov.tex | 2 +-
doc/tex/privacy.tex | 6 ++--
pbx/ael/ael-test/ael-test3/extensions.ael | 28 +++++++++++++-------------
pbx/ael/ael-test/ael-vtest13/extensions.ael | 28 +++++++++++++-------------
pbx/ael/ael-test/ref.ael-vtest13 | 26 ++++++++++++------------
15 files changed, 68 insertions(+), 68 deletions(-)
diff --git a/UPGRADE-1.4.txt b/UPGRADE-1.4.txt
index 4f82694..69bf322 100644
--- a/UPGRADE-1.4.txt
+++ b/UPGRADE-1.4.txt
@@ -92,7 +92,7 @@ sound packages in the 'sounds' subdirectory to be used later during installation
WARNING: Asterisk 1.4 supports a new layout for sound files in multiple languages;
instead of the alternate-language files being stored in subdirectories underneath
the existing files (for French, that would be digits/fr, letters/fr, phonetic/fr,
-etc.) the new layout creates one directory under /var/lib/asterisk/sounds for the
+etc.) the new layout creates one directory under /usr/share/asterisk/sounds for the
language itself, then places all the sound files for that language under that
directory and its subdirectories. This is the layout that will be created if you
select non-English languages to be installed via menuselect, HOWEVER Asterisk does
diff --git a/configs/festival.conf.sample b/configs/festival.conf.sample
index 774f1a1..815f11d 100644
--- a/configs/festival.conf.sample
+++ b/configs/festival.conf.sample
@@ -21,7 +21,7 @@
; THIS DIRECTORY *MUST* EXIST and must be writable from the asterisk process.
; Defaults to /tmp/
;
-;cachedir=/var/lib/asterisk/festivalcache/
+;cachedir=/var/spool/asterisk/festival/
;
; Festival command to send to the server.
; Defaults to: (tts_textasterisk "%s" 'file)(quit)\n
diff --git a/configs/http.conf.sample b/configs/http.conf.sample
index f15c9cf..6349905 100644
--- a/configs/http.conf.sample
+++ b/configs/http.conf.sample
@@ -5,7 +5,7 @@
; Note about Asterisk documentation:
; If Asterisk was installed from a tarball, then the HTML documentation should
; be installed in the static-http/docs directory which is
-; (/var/lib/asterisk/static-http/docs) on linux by default. If the Asterisk
+; (/usr/share/asterisk/static-http/docs) on linux by default. If the Asterisk
; HTTP server is enabled in this file by setting the "enabled", "bindaddr",
; and "bindport" options, then you should be able to view the documentation
; remotely by browsing to:
@@ -66,6 +66,6 @@ bindaddr=127.0.0.1
;[post_mappings]
;
; In this example, if the prefix option is set to "asterisk", then using the
-; POST URL: /asterisk/uploads will put files in /var/lib/asterisk/uploads/.
-;uploads = /var/lib/asterisk/uploads/
+; POST URL: /asterisk/uploads will put files in /var/spool/asterisk/uploads/.
+;uploads = /var/spool/asterisk/uploads/
;
diff --git a/configs/iax.conf.sample b/configs/iax.conf.sample
index 854a243..ab2938e 100644
--- a/configs/iax.conf.sample
+++ b/configs/iax.conf.sample
@@ -348,8 +348,8 @@ inkeys=freeworlddialup
; authentication is used, "inkeys" is a list of acceptable public keys on the
; local system that can be used to authenticate the remote peer, separated by
; the ":" character. "outkey" is a single, private key to use to authenticate
-; to the other side. Public keys are named /var/lib/asterisk/keys/<name>.pub
-; while private keys are named /var/lib/asterisk/keys/<name>.key. Private
+; to the other side. Public keys are named /usr/share/asterisk/keys/<name>.pub
+; while private keys are named /usr/share/asterisk/keys/<name>.key. Private
; keys should always be 3DES encrypted.
;
;
diff --git a/configs/musiconhold.conf.sample b/configs/musiconhold.conf.sample
index 4df1afd..b730335 100644
--- a/configs/musiconhold.conf.sample
+++ b/configs/musiconhold.conf.sample
@@ -39,11 +39,11 @@
[default]
mode=files
-directory=/var/lib/asterisk/moh
+directory=/usr/share/asterisk/moh
;
;[native-random]
;mode=files
-;directory=/var/lib/asterisk/moh
+;directory=/usr/share/asterisk/moh
;digit=# ; If this option is set for a class, then when callers are
; ; listening to music on hold, they can press this digit, and
; ; they will switch to listening to this music class.
@@ -51,7 +51,7 @@ directory=/var/lib/asterisk/moh
;[native-alphabetical]
;mode=files
-;directory=/var/lib/asterisk/moh
+;directory=/usr/share/asterisk/moh
;sort=alpha ; Sort the files in alphabetical order. If this option is
; ; not specified, the sort order is undefined.
@@ -63,7 +63,7 @@ directory=/var/lib/asterisk/moh
;mode=custom
; Note that with mode=custom, a directory is not required, such as when reading
; from a stream.
-;directory=/var/lib/asterisk/mohmp3
+;directory=/usr/share/asterisk/mohmp3
;application=/usr/bin/mpg123 -q -r 8000 -f 8192 -b 2048 --mono -s
;[ulawstream]
@@ -75,5 +75,5 @@ directory=/var/lib/asterisk/moh
; choice
;[solaris]
;mode=custom
-;directory=/var/lib/asterisk/mohmp3
+;directory=/usr/share/asterisk/mohmp3
;application=/site/sw/bin/madplay -Q -o raw:- --mono -R 8000 -a -12
diff --git a/configs/osp.conf.sample b/configs/osp.conf.sample
index e342337..2e346e6 100644
--- a/configs/osp.conf.sample
+++ b/configs/osp.conf.sample
@@ -36,8 +36,8 @@
;source=domain name or [IP address in brackets]
;
; Define path and file name of crypto files.
-; The default path for crypto file is /var/lib/asterisk/keys. If no path is
-; defined, crypto files will in /var/lib/asterisk/keys directory.
+; The default path for crypto file is /usr/share/asterisk/keys. If no path is
+; defined, crypto files will in /usr/share/asterisk/keys directory.
;
; Specify the private key file name.
; If this parameter is unspecified or not present, the default name will be the
diff --git a/configs/phoneprov.conf.sample b/configs/phoneprov.conf.sample
index 8f55fa8..2608914 100644
--- a/configs/phoneprov.conf.sample
+++ b/configs/phoneprov.conf.sample
@@ -57,4 +57,4 @@ ${TOLOWER(${MAC})}.cfg => 000000000000.cfg ; Dynamically generated
${TOLOWER(${MAC})}-phone.cfg => 000000000000-phone.cfg ; (relative to AST_DATA_DIR/phoneprov)
config/${TOLOWER(${MAC})} => polycom.xml ; Dynamic Filename => template file
${TOLOWER(${MAC})}-directory.xml => 000000000000-directory.xml
-setvar => CUSTOM_CONFIG=/var/lib/asterisk/phoneprov/configs/custom.cfg ; Custom variable
+setvar => CUSTOM_CONFIG=/usr/share/asterisk/phoneprov/configs/custom.cfg ; Custom variable
diff --git a/contrib/scripts/astgenkey b/contrib/scripts/astgenkey
index 6376048..e4a5a80 100644
--- a/contrib/scripts/astgenkey
+++ b/contrib/scripts/astgenkey
@@ -29,7 +29,7 @@ if [ "$QUIET" != 'y' ]; then
echo "in PEM format for use by Asterisk. You will be asked to"
echo "enter a passcode for your key multiple times. Please"
echo "enter the same code each time. The resulting files will"
- echo "need to be moved to /var/lib/asterisk/keys if you want"
+ echo "need to be moved to /usr/share/asterisk/keys if you want"
echo "to use them, and any private keys (.key files) will"
echo "need to be initialized at runtime either by running"
echo "Asterisk with the '-i' option, or with the 'init keys'"
diff --git a/contrib/scripts/astgenkey.8 b/contrib/scripts/astgenkey.8
index 328a4d2..ac6feae 100644
--- a/contrib/scripts/astgenkey.8
+++ b/contrib/scripts/astgenkey.8
@@ -88,7 +88,7 @@ The private key: secret.
.RE
Those files should be copied to
-.I /var/lib/asterisk/keys
+.I /usr/share/asterisk/keys
(The private key: on your system. The public key: on other systems)
@@ -122,10 +122,10 @@ readable, such as with the following commands:
And then make the key accessible to Asterisk (assuming you run it as
user "asterisk").
- chown asterisk /var/lib/asterisk/keys/yourname.*
+ chown asterisk /usr/share/asterisk/keys/yourname.*
.SH FILES
-.I /var/lib/asterisk/keys
+.I /usr/share/asterisk/keys
.RS
.RE
diff --git a/doc/osp.txt b/doc/osp.txt
index a0cd429..932f214 100644
--- a/doc/osp.txt
+++ b/doc/osp.txt
@@ -136,7 +136,7 @@ make clean; make linux
Compilation is successful if there are no errors in the compiler output. The enroll program is now located in the OSP Toolkit/bin directory (example: /usr/src/ TK-3_3_6-20060303/bin).
2.2 Obtain Crypto Files
-The OSP module in Asterisk requires three crypto files containing a local certificate (localcert.pem), private key (pkey.pem), and CA certificate (cacert_0.pem). Asterisk will try to load the files from the Asterisk public/private key directory - /var/lib/asterisk/keys. If the files are not present, the OSP module will not start and the Asterisk will not support the OSP protocol. Use the enroll.sh script from the toolkit distribution to enroll Asterisk with an OSP server and obtain the crypto files. Documentation explaining how to use the enroll.sh script (Device Enrollment) to enroll with an OSP server is available at http://www.transnexus.com/OSP%20Toolkit/OSP%20Toolkit%20Documents/Device_Enrollment.pdf. Copy the files generated by the enrollment process to the Asterisk /var/lib/asterisk/keys directory.
+The OSP module in Asterisk requires three crypto files containing a local certificate (localcert.pem), private key (pkey.pem), and CA certificate (cacert_0.pem). Asterisk will try to load the files from the Asterisk public/private key directory - /usr/share/asterisk/keys. If the files are not present, the OSP module will not start and the Asterisk will not support the OSP protocol. Use the enroll.sh script from the toolkit distribution to enroll Asterisk with an OSP server and obtain the crypto files. Documentation explaining how to use the enroll.sh script (Device Enrollment) to enroll with an OSP server is available at http://www.transnexus.com/OSP%20Toolkit/OSP%20Toolkit%20Documents/Device_Enrollment.pdf. Copy the files generated by the enrollment process to the Asterisk /usr/share/asterisk/keys directory.
Note: The osptestserver.transnexus.com is configured only for sending and receiving non-SSL messages, and issuing signed tokens. If you need help, post a message on the OSP mailing list at https://lists.sourceforge.net/lists/listinfo/osp-toolkit-client..
@@ -183,7 +183,7 @@ depth=0 /CN=osptestserver.transnexus.com/O=OSPServer
verify return:1
The certificate request was successful.
Error Code returned from localcert command : 0
-The files generated should be copied to the /var/lib/asterisk/keys directory.
+The files generated should be copied to the /usr/share/asterisk/keys directory.
Note: The script enroll.sh requires AT&T korn shell (ksh) or any of its compatible variants. The /usr/src/TK-3_3_6-20060303/bin directory should be in the PATH variable. Otherwise, enroll.sh cannot find the enroll file.
3 Asterisk
@@ -247,9 +247,9 @@ servicepoint=http://OSP server IP:1080/osp
source=[host IP]
;
; Define path and file name of crypto files.
-; The default path for crypto file is /var/lib/asterisk/keys. If no
+; The default path for crypto file is /usr/share/asterisk/keys. If no
; path is defined, crypto files should be in
-; /var/lib/asterisk/keys directory.
+; /usr/share/asterisk/keys directory.
;
; Specify the private key file name.
; If this parameter is unspecified or not present, the default name
diff --git a/doc/tex/phoneprov.tex b/doc/tex/phoneprov.tex
index cb236a8..be01d34 100644
--- a/doc/tex/phoneprov.tex
+++ b/doc/tex/phoneprov.tex
@@ -58,7 +58,7 @@ files, respectively. A sample profile:
[polycom]
staticdir => configs/
mime_type => text/xml
-setvar => CUSTOM_CONFIG=/var/lib/asterisk/phoneprov/configs/custom.cfg
+setvar => CUSTOM_CONFIG=/usr/share/asterisk/phoneprov/configs/custom.cfg
static_file => bootrom.ld,application/octet-stream
static_file => bootrom.ver,plain/text
static_file => sip.ld,application/octet-stream
diff --git a/doc/tex/privacy.tex b/doc/tex/privacy.tex
index 81b2fac..9971641 100644
--- a/doc/tex/privacy.tex
+++ b/doc/tex/privacy.tex
@@ -204,7 +204,7 @@ helpful.
When there is no CallerID, P and p options will always record an intro
for the incoming caller. This intro will be stored temporarily in the
-\path{/var/lib/asterisk/sounds/priv-callerintros} dir, under the name
+\path{/usr/share/asterisk/sounds/priv-callerintros} dir, under the name
NOCALLERID\_$<$extension$>$ $<$channelname$>$ and will be erased after the
callee decides what to do with the call.
@@ -239,7 +239,7 @@ introductions are stored and re-used for the convenience of the CALLER.
\subsubsection{Introductions}
Unless instructed to not save introductions (see the 'n' option above),
the screening modes will save the recordings of the caller's names in
-the directory \path{/var/lib/asterisk/sounds/priv-callerintros}, if they have
+the directory \path{/usr/share/asterisk/sounds/priv-callerintros}, if they have
a CallerID. Just the 10-digit callerid numbers are used as filenames,
with a ".gsm" at the end.
@@ -254,7 +254,7 @@ loudspeakers, and perhaps other nifty things. For instance:
\begin{astlisting}
\begin{verbatim}
-exten => s,6,Set(PATH=/var/lib/asterisk/sounds/priv-callerintros)
+exten => s,6,Set(PATH=/usr/share/asterisk/sounds/priv-callerintros)
exten => s,7,System(/usr/bin/play ${PATH}/${CALLERID(num)}.gsm&,0)
\end{verbatim}
\end{astlisting}
diff --git a/pbx/ael/ael-test/ael-test3/extensions.ael b/pbx/ael/ael-test/ael-test3/extensions.ael
index ff1f6ae..53fb918 100755
--- a/pbx/ael/ael-test/ael-test3/extensions.ael
+++ b/pbx/ael/ael-test/ael-test3/extensions.ael
@@ -2049,7 +2049,7 @@ macro ciddial2(dialnum, lookup, waittime, dialopts, ddev) // give priority to tc
macro callerid-liar()
{
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/priv-callerintros/LIAR.gsm&);
+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/priv-callerintros/LIAR.gsm&);
Background(priv-liar); // Script: OOOps! Sorry! I don't allow men with ski masks pulled over their
// faces to get in the front door, and unidentified callers won't fair
// any better. You entered *MY* phone number. That won't work.
@@ -2106,7 +2106,7 @@ context homeline {
PrivacyManager();
if( "${PRIVACYMGRSTATUS}" = "FAILED" )
{
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/privmanfailed.gsm);
+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/privmanfailed.gsm);
&std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket);
Hangup();
return;
@@ -2138,7 +2138,7 @@ context homeline {
verbose(direct is XXX#${direct}XXXX);
Playback(greetings/direct); // Welcome to the Murphy residence. This system will automatically try to connect you to...
Playback(/var/spool/asterisk/voicemail/default/${direct}/greet);
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/${direct}/greet.wav&);
switch(${direct})
{
@@ -2223,7 +2223,7 @@ context homeline {
}
1 => { // Sonya
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/2/greet.wav&);
&std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket);
goto s|loopback;
@@ -2421,51 +2421,51 @@ context homeline-kids {
Background(murphy-homeline-kids); // Which Kid? 1=Sean, 2:Eric, 3:Ryan, 4:Kyle, 5:Amber, 6:Alex, 7:Neal
}
1 => { // SEAN
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/3/greet.wav&);
// &std-priv-exten(Zap/3r2&Zap/5r2,3,35,mtw,telemarket,telemarket);
&std-priv-exten(IAX2/seaniax&Zap/5r2,3,35,mtw,telemarket,telemarket);
goto homeline|s|loopback;
}
2 => { // ERIC
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&);
Voicemail(u4);
goto homeline|s|loopback;
// SetMusicOnHold(erics);
- // TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+ // TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
// TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&);
// &std-priv-exten(Zap/3r2&Zap/5r2,4,35,mtw,telemarket,telemarket);
// goto homeline|s|loopback;
}
3 => { // RYAN
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/5/greet.wav&);
&std-priv-exten(Zap/3r2&Zap/5r2,5,35,mtw,telemarket,telemarket);
goto homeline|s|loopback;
}
4 => { // KYLE
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/6/greet.wav&);
&std-priv-exten(Zap/3r2&Zap/5r2,6,35,mtw,telemarket,telemarket);
goto homeline|s|loopback;
}
5 => {
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/7/greet.wav&);
&std-priv-exten(Zap/3r2&Zap/5r2,7,35,mtw,telemarket,telemarket);
goto homeline|s|loopback;
}
6 => {
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/8/greet.wav&);
&std-priv-exten(Zap/3r2&Zap/5r2,8,35,mtw,telemarket,telemarket);
goto homeline|s|loopback;
}
7 => {
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/9/greet.wav&);
&std-priv-exten(Zap/3r2&Zap/5r2,9,35,mtw,telemarket,telemarket);
goto homeline|s|loopback;
@@ -2517,7 +2517,7 @@ context workline {
// Otherwise, dial 1, and hopefully, you will reach Steve.
}
1 => {
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/1/greet.wav&);
&std-priv-exten(Zap/6&Sip/murf,1,30,mtw,telemarket,telemarket);
@@ -2778,7 +2778,7 @@ context homeext {
}
761 => {
Record(announcement:gsm);
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/announcement.gsm&);
+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/announcement.gsm&);
goto s|loopback;
}
762 => {
diff --git a/pbx/ael/ael-test/ael-vtest13/extensions.ael b/pbx/ael/ael-test/ael-vtest13/extensions.ael
index b7e953e..48baaef 100755
--- a/pbx/ael/ael-test/ael-vtest13/extensions.ael
+++ b/pbx/ael/ael-test/ael-vtest13/extensions.ael
@@ -2048,7 +2048,7 @@ macro ciddial2(dialnum, lookup, waittime, dialopts, ddev) // give priority to tc
macro callerid-liar()
{
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/priv-callerintros/LIAR.gsm&);
+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/priv-callerintros/LIAR.gsm&);
Background(priv-liar); // Script: OOOps! Sorry! I don't allow men with ski masks pulled over their
// faces to get in the front door, and unidentified callers won't fair
// any better. You entered *MY* phone number. That won't work.
@@ -2105,7 +2105,7 @@ context homeline {
PrivacyManager();
if( "${PRIVACYMGRSTATUS}" = "FAILED" )
{
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/privmanfailed.gsm);
+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/privmanfailed.gsm);
&std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket);
Hangup();
return;
@@ -2137,7 +2137,7 @@ context homeline {
verbose(direct is XXX#${direct}XXXX);
Playback(greetings/direct); // Welcome to the Murphy residence. This system will automatically try to connect you to...
Playback(/var/spool/asterisk/voicemail/default/${direct}/greet);
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/${direct}/greet.wav&);
switch(${direct})
{
@@ -2222,7 +2222,7 @@ context homeline {
}
1 => { // Sonya
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/2/greet.wav&);
&std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket);
goto s|loopback;
@@ -2420,51 +2420,51 @@ context homeline-kids {
Background(murphy-homeline-kids); // Which Kid? 1=Sean, 2:Eric, 3:Ryan, 4:Kyle, 5:Amber, 6:Alex, 7:Neal
}
1 => { // SEAN
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/3/greet.wav&);
// &std-priv-exten(Zap/3r2&Zap/5r2,3,35,mtw,telemarket,telemarket);
&std-priv-exten(IAX2/seaniax&Zap/5r2,3,35,mtw,telemarket,telemarket);
goto homeline|s|loopback;
}
2 => { // ERIC
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&);
Voicemail(u4);
goto homeline|s|loopback;
// SetMusicOnHold(erics);
- // TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+ // TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
// TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&);
// &std-priv-exten(Zap/3r2&Zap/5r2,4,35,mtw,telemarket,telemarket);
// goto homeline|s|loopback;
}
3 => { // RYAN
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/5/greet.wav&);
&std-priv-exten(Zap/3r2&Zap/5r2,5,35,mtw,telemarket,telemarket);
goto homeline|s|loopback;
}
4 => { // KYLE
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/6/greet.wav&);
&std-priv-exten(Zap/3r2&Zap/5r2,6,35,mtw,telemarket,telemarket);
goto homeline|s|loopback;
}
5 => {
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/7/greet.wav&);
&std-priv-exten(Zap/3r2&Zap/5r2,7,35,mtw,telemarket,telemarket);
goto homeline|s|loopback;
}
6 => {
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/8/greet.wav&);
&std-priv-exten(Zap/3r2&Zap/5r2,8,35,mtw,telemarket,telemarket);
goto homeline|s|loopback;
}
7 => {
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/9/greet.wav&);
&std-priv-exten(Zap/3r2&Zap/5r2,9,35,mtw,telemarket,telemarket);
goto homeline|s|loopback;
@@ -2516,7 +2516,7 @@ context workline {
// Otherwise, dial 1, and hopefully, you will reach Steve.
}
1 => {
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/1/greet.wav&);
&std-priv-exten(Zap/6&Sip/murf,1,30,mtw,telemarket,telemarket);
@@ -2777,7 +2777,7 @@ context homeext {
}
761 => {
Record(announcement:gsm);
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/announcement.gsm&);
+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/announcement.gsm&);
goto s|loopback;
}
762 => {
diff --git a/pbx/ael/ael-test/ref.ael-vtest13 b/pbx/ael/ael-test/ref.ael-vtest13
index 79a5e48..cf1d255 100644
--- a/pbx/ael/ael-test/ref.ael-vtest13
+++ b/pbx/ael/ael-test/ref.ael-vtest13
@@ -2107,7 +2107,7 @@ exten => s,20,Return()
[callerid-liar]
-exten => s,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/priv-callerintros/LIAR.gsm&)
+exten => s,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/priv-callerintros/LIAR.gsm&)
exten => s,2,Background(priv-liar)
exten => s,3,Hangup()
exten => s,4,Return()
@@ -2142,7 +2142,7 @@ exten => s,3,Set(repeatcount=0)
exten => s,4,Zapateller(nocallerid)
exten => s,5,PrivacyManager()
exten => s,6,GotoIf($["${PRIVACYMGRSTATUS}" = "FAILED" ]?7:11)
-exten => s,7,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/privmanfailed.gsm)
+exten => s,7,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/privmanfailed.gsm)
exten => s,8,Gosub(std-priv-exten,s,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket))
exten => s,9,Hangup()
exten => s,10,Return()
@@ -2168,7 +2168,7 @@ exten => s,29,GotoIf($["${direct}" != "" & ${direct} != 0 ]?30:37)
exten => s,30,verbose(direct is XXX#${direct}XXXX)
exten => s,31,Playback(greetings/direct)
exten => s,32,Playback(/var/spool/asterisk/voicemail/default/${direct}/greet)
-exten => s,33,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
+exten => s,33,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
exten => s,34,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/${direct}/greet.wav&)
exten => s,35,Goto(sw-92-${direct},10)
exten => s,36,NoOp(Finish switch-if-homeline-91-92)
@@ -2247,7 +2247,7 @@ exten => sw-92-2,10,Gosub(std-priv-exten,s,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket
exten => sw-92-2,11,Goto(s,loopback)
exten => sw-92-1,10,Gosub(std-priv-exten,s,1(Zap/6r3&Sip/murf,1,25,mpA(beep)tw,telemarket,telemarket))
exten => sw-92-1,11,Goto(s,loopback)
-exten => 1,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
+exten => 1,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
exten => 1,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/2/greet.wav&)
exten => 1,3,Gosub(std-priv-exten,s,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket))
exten => 1,4,Goto(s,loopback)
@@ -2324,31 +2324,31 @@ exten => o,1,Goto(s,begin)
[homeline-kids]
exten => s,1(begin),Background(murphy-homeline-kids)
-exten => 1,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
+exten => 1,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
exten => 1,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/3/greet.wav&)
exten => 1,3,Gosub(std-priv-exten,s,1(IAX2/seaniax&Zap/5r2,3,35,mtw,telemarket,telemarket))
exten => 1,4,Goto(homeline,s,loopback)
-exten => 2,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
+exten => 2,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
exten => 2,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&)
exten => 2,3,Voicemail(u4)
exten => 2,4,Goto(homeline,s,loopback)
-exten => 3,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
+exten => 3,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
exten => 3,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/5/greet.wav&)
exten => 3,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,5,35,mtw,telemarket,telemarket))
exten => 3,4,Goto(homeline,s,loopback)
-exten => 4,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
+exten => 4,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
exten => 4,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/6/greet.wav&)
exten => 4,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,6,35,mtw,telemarket,telemarket))
exten => 4,4,Goto(homeline,s,loopback)
-exten => 5,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
+exten => 5,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
exten => 5,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/7/greet.wav&)
exten => 5,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,7,35,mtw,telemarket,telemarket))
exten => 5,4,Goto(homeline,s,loopback)
-exten => 6,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
+exten => 6,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
exten => 6,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/8/greet.wav&)
exten => 6,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,8,35,mtw,telemarket,telemarket))
exten => 6,4,Goto(homeline,s,loopback)
-exten => 7,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
+exten => 7,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
exten => 7,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/9/greet.wav&)
exten => 7,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,9,35,mtw,telemarket,telemarket))
exten => 7,4,Goto(homeline,s,loopback)
@@ -2376,7 +2376,7 @@ exten => s,5,Gosub(fillcidname,s,1)
exten => s,6,TrySystem(/usr/local/bin/who-is-it ${CALLERID(num)} "${CALLERID(name)}"&)
exten => s,7(loopback),Background(greetings/greeting)
exten => s,8,Background(murphy-office-intro1)
-exten => 1,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
+exten => 1,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
exten => 1,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/1/greet.wav&)
exten => 1,3,Gosub(std-priv-exten,s,1(Zap/6&Sip/murf,1,30,mtw,telemarket,telemarket))
exten => 1,4,Goto(s,loopback)
@@ -2502,7 +2502,7 @@ exten => 6,1,Background(recording)
exten => 760,1,DateTime()
exten => 760,2,Goto(s,loopback)
exten => 761,1,Record(announcement:gsm)
-exten => 761,2,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/announcement.gsm&)
+exten => 761,2,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/announcement.gsm&)
exten => 761,3,Goto(s,loopback)
exten => 762,1,agi(tts-riddle.agi)
exten => 762,2,Background(gsm/what-time-it-is2)
--
1.6.1
0015-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch:
--- NEW FILE 0015-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch ---
>From f8a1e831086e6022b69773826f75f8bb759a40b5 Mon Sep 17 00:00:00 2001
From: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Sun, 4 Jan 2009 19:22:39 -0600
Subject: [PATCH 15/15] Add LDAP schema that is compatible with Fedora Directory Server.
---
contrib/scripts/99asterisk.ldif | 489 +++++++++++++++++++++++++++++++++++++++
1 files changed, 489 insertions(+), 0 deletions(-)
create mode 100644 contrib/scripts/99asterisk.ldif
diff --git a/contrib/scripts/99asterisk.ldif b/contrib/scripts/99asterisk.ldif
new file mode 100644
index 0000000..ef878a8
--- /dev/null
+++ b/contrib/scripts/99asterisk.ldif
@@ -0,0 +1,489 @@
+dn: cn=schema
+#
+attributeTypes: (
+
+ NAME 'AstContext'
+ DESC 'Asterisk Context'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstExtension'
+ DESC 'Asterisk Extension'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstPriority'
+ DESC 'Asterisk Priority'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstApplication'
+ DESC 'Asterisk Application'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstApplicationData'
+ DESC 'Asterisk Application Data'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountAMAFlags'
+ DESC 'Asterisk Account AMA Flags'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountCallerID'
+ DESC 'Asterisk Account CallerID'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountContext'
+ DESC 'Asterisk Account Context'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountMailbox'
+ DESC 'Asterisk Account Mailbox'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstMD5secret'
+ DESC 'Asterisk Account MD5 Secret'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountDeny'
+ DESC 'Asterisk Account Deny'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountPermit'
+ DESC 'Asterisk Account Permit'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountQualify'
+ DESC 'Asterisk Account Qualify'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountType'
+ DESC 'Asterisk Account Type'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountDisallowedCodec'
+ DESC 'Asterisk Account Disallowed Codec'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountExpirationTimestamp'
+ DESC 'Asterisk Account Allowed Codec'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountRegistrationContext'
+ DESC 'Asterisk Account AMA Flags'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountRegistrationExten'
+ DESC 'Asterisk Account AMA Flags'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountNoTransfer'
+ DESC 'Asterisk Account AMA Flags'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountCallGroup'
+ DESC 'Asterisk Account Call Group'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountCanReinvite'
+ DESC 'Asterisk Account Can Reinvite'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountDTMFMode'
+ DESC 'Asterisk Account DTMF Flags'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountFromUser'
+ DESC 'Asterisk Account From User'
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountFromDomain'
+ DESC 'Asterisk Account From Domain'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountFullContact'
+ DESC 'Asterisk Account Full Contact'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountHost'
+ DESC 'Asterisk Account Host'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountInsecure'
+ DESC 'Asterisk Account Insecure'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountNAT'
+ DESC 'Asterisk Account NAT'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountPickupGroup'
+ DESC 'Asterisk Account PickupGroup'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountPort'
+ DESC 'Asterisk Account Port'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountRestrictCID'
+ DESC 'Asterisk Restrict CallerID'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountRTPTimeout'
+ DESC 'Asterisk RTP Timeout'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountRTPHoldTimeout'
+ DESC 'Asterisk RTP Hold Timeout'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountRealmedPassword'
+ DESC 'Asterisk RTP Hold Timeout'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountAllowedCodec'
+ DESC 'Asterisk Account Allowed Codec'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountMusicOnHold'
+ DESC 'Asterisk Account Allowed Codec'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountCanCallForward'
+ DESC 'Asterisk Can CAll Forward'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountSecret'
+ DESC 'Asterisk Can CAll Forward'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountName'
+ DESC 'Asterisk Account Username'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstConfigFilename'
+ DESC 'Asterisk LDAP Configuration Filename'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstConfigCategory'
+ DESC 'Asterisk LDAP Configuration Category'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstConfigCategoryMetric'
+ DESC 'Asterisk LDAP Configuration Category Metric'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstConfigVariableName'
+ DESC 'Asterisk LDAP Configuration Variable Name'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstConfigVariableValue'
+ DESC 'Asterisk LDAP Configuration Variable Value'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstConfigCommented'
+ DESC 'Asterisk LDAP Configuration Commented'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountIPAddress'
+ DESC 'Asterisk Account IP Address'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountDefaultUser'
+ DESC 'Asterisk Account Default User'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountRegistrationServer'
+ DESC 'Asterisk Account Registration Server'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+objectClasses: (
+
+ NAME 'AsteriskExtension'
+ DESC 'PBX Extension Information for Asterisk'
+ SUP top
+ AUXILIARY
+ MUST cn
+ MAY ( AstContext $ AstExtension $ AstPriority $ AstApplication
+ $ AstApplicationData )
+ )
+#
+objectClasses: (
+
+ NAME 'AsteriskIAXUser'
+ DESC 'IAX2 User information for Asterisk'
+ SUP AsteriskExtension
+ AUXILIARY
+ MUST cn
+ MAY ( AstAccountAMAFlags $ AstAccountCallerID $ AstAccountContext
+ $ AstAccountFullContact $ AstAccountHost $ AstAccountMailbox $ AstMD5secret
+ $ AstAccountDeny $ AstAccountPermit $ AstAccountPort $ AstAccountQualify
+ $ AstAccountType $ AstAccountDisallowedCodec $ AstAccountExpirationTimestamp
+ $ AstAccountRegistrationContext$ AstAccountRegistrationExten
+ $ AstAccountNoTransfer $ AstAccountName )
+ )
+#
+objectClasses: (
+
+ NAME 'AsteriskSIPUser'
+ DESC 'SIP User information for Asterisk'
+ SUP AsteriskExtension
+ AUXILIARY
+ MUST cn
+ MAY ( AstAccountAMAFlags $ AstAccountCallGroup $ AstAccountCallerID
+ $ AstAccountCanReinvite $ AstAccountContext $ AstAccountDefaultUser
+ $ AstAccountDTMFMode $ AstAccountFromUser $ AstAccountFromDomain
+ $ AstAccountFullContact $ AstAccountHost $ AstAccountInsecure
+ $ AstAccountIPAddress $ AstAccountMailbox $ AstAccountRealmedPassword
+ $ AstAccountNAT $ AstAccountDeny $ AstAccountPermit $ AstAccountPickupGroup
+ $ AstAccountPort $ AstAccountQualify $ AstAccountRestrictCID
+ $ AstAccountRTPTimeout $ AstAccountRTPHoldTimeout $ AstAccountType
+ $ AstAccountDisallowedCodec $ AstAccountAllowedCodec $ AstAccountMusicOnHold
+ $ AstAccountExpirationTimestamp $ AstAccountRegistrationContext
+ $ AstAccountRegistrationExten $ AstAccountRegistrationServer
+ $ AstAccountCanCallForward $ AstAccountSecret $ AstAccountName )
+ )
+#
+objectClasses: (
+
+ NAME 'AsteriskConfig'
+ DESC 'Asterisk configuration Information'
+ SUP top
+ AUXILIARY
+ MUST cn
+ MAY ( AstConfigFilename $ AstConfigCategory $ AstConfigCategoryMetric
+ $ AstConfigVariableName $ AstConfigVariableValue $ AstConfigCommented )
+ )
--
1.6.1
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-9/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore 10 Oct 2008 22:59:56 -0000 1.17
+++ .cvsignore 8 Jan 2009 22:30:35 -0000 1.18
@@ -1 +1 @@
-asterisk-1.6.0.1-stripped.tar.gz
+asterisk-1.6.0.3-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-9/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 15:37:26 -0000 1.4
+++ 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch 8 Jan 2009 22:30:35 -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/15] 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-9/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 15:37:26 -0000 1.4
+++ 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch 8 Jan 2009 22:30:35 -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/15] 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-9/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 15:37:26 -0000 1.3
+++ 0003-Allow-alternate-extensions-to-be-specified-in-users.patch 8 Jan 2009 22:30:35 -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/15] 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-9/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 15:37:26 -0000 1.3
+++ 0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch 8 Jan 2009 22:30:35 -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/15] 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-9/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 15:37:26 -0000 1.3
+++ 0005-Add-chan_mobile-from-asterisk-addons.patch 8 Jan 2009 22:30:35 -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/15] 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-9/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 15:37:26 -0000 1.3
+++ 0006-Use-pkgconfig-to-check-for-Lua.patch 8 Jan 2009 22:30:35 -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/15] 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-9/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 15:37:26 -0000 1.3
+++ 0007-Build-using-external-libedit.patch 8 Jan 2009 22:30:35 -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/15] 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-9/asterisk.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- asterisk.spec 5 Nov 2008 15:37:26 -0000 1.33
+++ asterisk.spec 8 Jan 2009 22:30:36 -0000 1.34
@@ -2,8 +2,8 @@
Summary: The Open Source PBX
Name: asterisk
-Version: 1.6.0.1
-Release: 3%{?dist}
+Version: 1.6.0.3
+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
+# 0797cfc8834b06e5a0169b2fda6f7bb9 asterisk-1.6.0.3.tar.gz
+# eefe39842fac3f5bd3c7b3a6c378bb5c asterisk-1.6.0.3-stripped.tar.gz
#
# SHA1 Sums
# =========
-# 20d77f6a08a8d755eeadf431c1f692d5adeadde8 asterisk-1.6.0.1.tar.gz
-# 4f5d1f436ba1119db9dfea072b1e6ac59c9eebd5 asterisk-1.6.0.1-stripped.tar.gz
+# bdede6d5113a5b0006b186a72e81c886d48ae4db asterisk-1.6.0.3.tar.gz
+# e14b25b16d49a8b7400353e0588cc8e8d1768c5c asterisk-1.6.0.3-stripped.tar.gz
Source0: asterisk-%{version}-stripped.tar.gz
Source1: asterisk-logrotate
@@ -40,8 +40,13 @@
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
+Patch12: 0012-Merged-revisions-162275-via-svnmerge-from.patch
+Patch13: 0013-Update-autoconf.patch
+Patch14: 0014-Fix-up-some-paths.patch
+Patch15: 0015-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
@@ -230,6 +235,16 @@
%description ldap
LDAP resources for Asterisk.
+%package ldap-fds
+Summary: LDAP resources for Asterisk and the Fedora Directory Server
+Group: Applications/Internet
+Requires: asterisk = %{version}-%{release}
+Requires: asterisk-ldap = %{version}-%{release}
+Requires: fedora-ds-base
+
+%description ldap-fds
+LDAP resources for Asterisk and the Fedora Directory Server.
+
%package misdn
Summary: mISDN channel for Asterisk
Group: Applications/Internet
@@ -415,6 +430,11 @@
%patch7 -p1
%patch8 -p1
%patch9 -p1
+%patch10 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
cp %{SOURCE2} menuselect.makedeps
cp %{SOURCE3} menuselect.makeopts
@@ -495,6 +515,7 @@
install -D -p -m 0755 contrib/init.d/rc.redhat.asterisk %{buildroot}%{_initrddir}/asterisk
install -D -p -m 0644 contrib/sysconfig/asterisk %{buildroot}%{_sysconfdir}/sysconfig/asterisk
+install -D -p -m 0644 contrib/scripts/99asterisk.ldif %{buildroot}%{_sysconfdir}/dirsrv/schema/99asterisk.ldif
install -D -p -m 0644 %{S:1} %{buildroot}%{_sysconfdir}/logrotate.d/asterisk
install -D -p -m 0644 doc/asterisk-mib.txt %{buildroot}%{_datadir}/snmp/mibs/ASTERISK-MIB.txt
install -D -p -m 0644 doc/digium-mib.txt %{buildroot}%{_datadir}/snmp/mibs/DIGIUM-MIB.txt
@@ -513,8 +534,10 @@
mkdir -p %{buildroot}%{_datadir}/asterisk/sounds/
mkdir -p %{buildroot}%{_localstatedir}/lib/asterisk
mkdir -p %{buildroot}%{_localstatedir}/log/asterisk/cdr-custom/
+mkdir -p %{buildroot}%{_localstatedir}/spool/asterisk/festival/
mkdir -p %{buildroot}%{_localstatedir}/spool/asterisk/monitor/
mkdir -p %{buildroot}%{_localstatedir}/spool/asterisk/outgoing/
+mkdir -p %{buildroot}%{_localstatedir}/spool/asterisk/uploads/
# We're not going to package any of the sample AGI scripts
rm -f %{buildroot}%{_datadir}/asterisk/agi-bin/*
@@ -679,7 +702,6 @@
%{_libdir}/asterisk/modules/func_callerid.so
%{_libdir}/asterisk/modules/func_cdr.so
%{_libdir}/asterisk/modules/func_channel.so
-%{_libdir}/asterisk/modules/func_curl.so
%{_libdir}/asterisk/modules/func_cut.so
%{_libdir}/asterisk/modules/func_db.so
%{_libdir}/asterisk/modules/func_devstate.so
@@ -727,14 +749,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
@@ -817,6 +839,7 @@
%attr(0770,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/monitor/
%attr(0770,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/outgoing/
%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/tmp/
+%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/uploads/
%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/voicemail/
%attr(0755,asterisk,asterisk) %dir %{_localstatedir}/run/asterisk
@@ -878,6 +901,7 @@
%files festival
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/asterisk/festival.conf
+%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/festival/
%{_libdir}/asterisk/modules/app_festival.so
%files firmware
@@ -915,6 +939,10 @@
%config(noreplace) %{_sysconfdir}/asterisk/res_ldap.conf
%{_libdir}/asterisk/modules/res_config_ldap.so
+%files ldap-fds
+%defattr(-,root,root,-)
+%{_sysconfdir}/dirsrv/schema/99asterisk.ldif
+
%files minivm
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/asterisk/extensions_minivm.conf
@@ -1024,6 +1052,23 @@
%{_libdir}/asterisk/modules/app_voicemail_plain.so
%changelog
+* Thu Jan 8 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0.3-1
+- Update to 1.6.0.3 to fix AST-2009-001/CVE-2009-0041
+- http://downloads.digium.com/pub/security/AST-2009-001.html
+
+* Sun Jan 4 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0.2-4
+- Fedora Directory Server compatibility patch/subpackage. BZ#452176
+
+* Sun Jan 4 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0.2-3
+- Don't package func_curl in the main package. BZ#475910
+- Fix up paths. BZ#477238
+
+* Sun Jan 4 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0.2-2
+- Add patch to fix compilation on PPC
+
+* 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-9/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources 10 Oct 2008 22:59:56 -0000 1.17
+++ sources 8 Jan 2009 22:30:36 -0000 1.18
@@ -1 +1 @@
-00465d571b2cd9fd49c86b753aa3a551 asterisk-1.6.0.1-stripped.tar.gz
+eefe39842fac3f5bd3c7b3a6c378bb5c asterisk-1.6.0.3-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 scm-commits
mailing list