diff -ruBN asterisk-10.2.0-rc1.orig//configure asterisk-10.2.0-rc1/configure --- asterisk-10.2.0-rc1.orig//configure 2012-01-14 11:41:55.000000000 -0500 +++ asterisk-10.2.0-rc1/configure 2012-02-03 17:55:29.632237654 -0500 @@ -4762,7 +4762,7 @@ fi if test ! x"${UNAME}" = xNo; then - PBX_OSREV=$(${UNAME} -r) + PBX_OSREV=`${UNAME} -r` fi @@ -11947,9 +11947,9 @@ if test ! "x${CONFIG_LIBXML2}" = xNo; then if test x"" = x ; then A=--cflags ; else A="" ; fi - LIBXML2_INCLUDE=$(${CONFIG_LIBXML2} $A) + LIBXML2_INCLUDE=`${CONFIG_LIBXML2} $A` if test x"" = x ; then A=--libs ; else A="" ; fi - LIBXML2_LIB=$(${CONFIG_LIBXML2} $A) + LIBXML2_LIB=`${CONFIG_LIBXML2} $A` if test x"#include #include " != x ; then saved_cppflags="${CPPFLAGS}" @@ -15961,7 +15961,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -Wdeclaration-after-statement support" >&5 $as_echo_n "checking for -Wdeclaration-after-statement support... " >&6; } -if $(${CC} -Wdeclaration-after-statement -S -o /dev/null -xc /dev/null > /dev/null 2>&1); then +if `${CC} -Wdeclaration-after-statement -S -o /dev/null -xc /dev/null > /dev/null 2>&1`; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } AST_DECLARATION_AFTER_STATEMENT=-Wdeclaration-after-statement @@ -15974,7 +15974,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FORTIFY_SOURCE support" >&5 $as_echo_n "checking for _FORTIFY_SOURCE support... " >&6; } -if $(${CC} -D_FORTIFY_SOURCE=2 -S -o /dev/null -xc /dev/null > /dev/null 2>&1); then +if `${CC} -D_FORTIFY_SOURCE=2 -S -o /dev/null -xc /dev/null > /dev/null 2>&1`; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } AST_FORTIFY_SOURCE=-D_FORTIFY_SOURCE=2 @@ -15987,7 +15987,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fno-strict-overflow" >&5 $as_echo_n "checking for -fno-strict-overflow... " >&6; } -if $(${CC} -O2 -fno-strict-overflow -S -o /dev/null -xc /dev/null > /dev/null 2>&1); then +if `${CC} -O2 -fno-strict-overflow -S -o /dev/null -xc /dev/null > /dev/null 2>&1`; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } AST_NO_STRICT_OVERFLOW=-fno-strict-overflow @@ -16000,7 +16000,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -Wshadow" >&5 $as_echo_n "checking for -Wshadow... " >&6; } -if $(${CC} -Wshadow -S -o /dev/null -xc /dev/null > /dev/null 2>&1); then +if `${CC} -Wshadow -S -o /dev/null -xc /dev/null > /dev/null 2>&1`; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } AST_SHADOW_WARNINGS=-Wshadow @@ -16013,7 +16013,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -march=native" >&5 $as_echo_n "checking for -march=native... " >&6; } -if $(${CC} -march=native -S -o /dev/null -xc /dev/null > /dev/null 2>&1); then +if `${CC} -march=native -S -o /dev/null -xc /dev/null > /dev/null 2>&1`; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } AST_MARCH_NATIVE="-march=native" @@ -20044,9 +20044,9 @@ if test ! "x${CONFIG_MYSQLCLIENT}" = xNo; then if test x"" = x ; then A=--cflags ; else A="" ; fi - MYSQLCLIENT_INCLUDE=$(${CONFIG_MYSQLCLIENT} $A) + MYSQLCLIENT_INCLUDE=`${CONFIG_MYSQLCLIENT} $A` if test x"" = x ; then A=--libs ; else A="" ; fi - MYSQLCLIENT_LIB=$(${CONFIG_MYSQLCLIENT} $A) + MYSQLCLIENT_LIB=`${CONFIG_MYSQLCLIENT} $A` if test x"" != x ; then saved_cppflags="${CPPFLAGS}" if test "x${MYSQLCLIENT_DIR}" != "x"; then @@ -20300,9 +20300,9 @@ if test ! "x${CONFIG_NEON}" = xNo; then if test x"" = x ; then A=--cflags ; else A="" ; fi - NEON_INCLUDE=$(${CONFIG_NEON} $A) + NEON_INCLUDE=`${CONFIG_NEON} $A` if test x"" = x ; then A=--libs ; else A="" ; fi - NEON_LIB=$(${CONFIG_NEON} $A) + NEON_LIB=`${CONFIG_NEON} $A` if test x"" != x ; then saved_cppflags="${CPPFLAGS}" if test "x${NEON_DIR}" != "x"; then @@ -20451,9 +20451,9 @@ if test ! "x${CONFIG_NEON29}" = xNo; then if test x"" = x ; then A=--cflags ; else A="" ; fi - NEON29_INCLUDE=$(${CONFIG_NEON29} $A) + NEON29_INCLUDE=`${CONFIG_NEON29} $A` if test x"--libs" = x ; then A=--libs ; else A="--libs" ; fi - NEON29_LIB=$(${CONFIG_NEON29} $A) + NEON29_LIB=`${CONFIG_NEON29} $A` if test x"#include " != x ; then saved_cppflags="${CPPFLAGS}" if test "x${NEON29_DIR}" != "x"; then @@ -20604,9 +20604,9 @@ if test ! "x${CONFIG_NETSNMP}" = xNo; then if test x"" = x ; then A=--cflags ; else A="" ; fi - NETSNMP_INCLUDE=$(${CONFIG_NETSNMP} $A) + NETSNMP_INCLUDE=`${CONFIG_NETSNMP} $A` if test x"--agent-libs" = x ; then A=--libs ; else A="--agent-libs" ; fi - NETSNMP_LIB=$(${CONFIG_NETSNMP} $A) + NETSNMP_LIB=`${CONFIG_NETSNMP} $A` if test x"#include #include #include " != x ; then @@ -25056,12 +25056,15 @@ PWLIB_MAJOR_VERSION=`echo ${PWLIB_VERSION} | cut -f1 -d.` PWLIB_MINOR_VERSION=`echo ${PWLIB_VERSION} | cut -f2 -d.` PWLIB_BUILD_NUMBER=`echo ${PWLIB_VERSION} | cut -f3 -d.` - PWLIB_VER=$((${PWLIB_MAJOR_VERSION}*10000+${PWLIB_MINOR_VERSION}*100+${PWLIB_BUILD_NUMBER})) - PWLIB_REQ=$((1*10000+9*100+2)) + PWLIB_VER=`expr ${PWLIB_MAJOR_VERSION} * 10000 + ${PWLIB_MINOR_VERSION} * 100 + ${PWLIB_BUILD_NUMBER}` + #PWLIB_REQ=$((1*10000+9*100+2)) # QQQ why math ? jkister 2012.02.01 + PWLIB_REQ=10902 + # QQQ is this logic really right ? if x = x ? jkister 2012.02.01 if test "x" = "x"; then PWLIB_MAX=9999999 else - PWLIB_MAX=$((*10000+*100+)) + PWLIB_MAX=0 + #PWLIB_MAX=$((*10000+*100+)) # QQQ no idea what this is supposed to do jkister 2012.02.01 fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking if PWLib version ${PWLIB_VERSION} is compatible with chan_h323" >&5 @@ -25389,12 +25392,16 @@ OPENH323_MAJOR_VERSION=`echo ${OPENH323_VERSION} | cut -f1 -d.` OPENH323_MINOR_VERSION=`echo ${OPENH323_VERSION} | cut -f2 -d.` OPENH323_BUILD_NUMBER=`echo ${OPENH323_VERSION} | cut -f3 -d.` - OPENH323_VER=$((${OPENH323_MAJOR_VERSION}*10000+${OPENH323_MINOR_VERSION}*100+${OPENH323_BUILD_NUMBER})) - OPENH323_REQ=$((1*10000+17*100+3)) + OPENH323_VER=`expr ${OPENH323_MAJOR_VERSION} * 10000 + ${OPENH323_MINOR_VERSION} * 100 + ${OPENH323_BUILD_NUMBER}` + # QQQ more why math? jkister 2012.02.01 + #OPENH323_REQ=$((1*10000+17*100+3)) + OPENH323_REQ=11703 + # QQQ logic issues again? jk if test "x0" = "x"; then OPENH323_MAX=9999999 else - OPENH323_MAX=$((1*10000+19*100+0)) + #OPENH323_MAX=$((1*10000+19*100+0)) + OPENH323_MAX=11900 fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking if OpenH323 version ${OPENH323_VERSION} is compatible with chan_h323" >&5 @@ -27166,9 +27173,9 @@ if test ! "x${CONFIG_GMIME}" = xNo; then if test x"" = x ; then A=--cflags ; else A="" ; fi - GMIME_INCLUDE=$(${CONFIG_GMIME} $A) + GMIME_INCLUDE=`${CONFIG_GMIME} $A` if test x"" = x ; then A=--libs ; else A="" ; fi - GMIME_LIB=$(${CONFIG_GMIME} $A) + GMIME_LIB=`${CONFIG_GMIME} $A` if test x"#include " != x ; then saved_cppflags="${CPPFLAGS}" if test "x${GMIME_DIR}" != "x"; then @@ -27218,8 +27225,8 @@ continue fi # If we got here, we have this version: - GMIME_INCLUDE=$(${PKGCONFIG} gmime-$ver --cflags 2>/dev/null) - GMIME_LIB=$(${PKGCONFIG} gmime-$ver --libs) + GMIME_INCLUDE=`${PKGCONFIG} gmime-$ver --cflags 2>/dev/null` + GMIME_LIB=`${PKGCONFIG} gmime-$ver --libs` PBX_GMIME=1 $as_echo "#define HAVE_GMIME 1" >>confdefs.h @@ -28352,9 +28359,9 @@ if test ! "x${CONFIG_SDL}" = xNo; then if test x"" = x ; then A=--cflags ; else A="" ; fi - SDL_INCLUDE=$(${CONFIG_SDL} $A) + SDL_INCLUDE=`${CONFIG_SDL} $A` if test x"" = x ; then A=--libs ; else A="" ; fi - SDL_LIB=$(${CONFIG_SDL} $A) + SDL_LIB=`${CONFIG_SDL} $A` if test x"" != x ; then saved_cppflags="${CPPFLAGS}" if test "x${SDL_DIR}" != "x"; then @@ -28866,8 +28873,8 @@ PBX_GTK2=0 if test "${PKGCONFIG}" != "No"; then - GTK2_INCLUDE=$(${PKGCONFIG} gtk+-2.0 --cflags 2>/dev/null) - GTK2_LIB=$(${PKGCONFIG} gtk+-2.0 --libs) + GTK2_INCLUDE=`${PKGCONFIG} gtk+-2.0 --cflags 2>/dev/null` + GTK2_LIB=`${PKGCONFIG} gtk+-2.0 --libs` PBX_GTK2=1 $as_echo "#define HAVE_GTK2 1" >>confdefs.h diff -ruBN asterisk-10.2.0-rc1.orig//configure.ac asterisk-10.2.0-rc1/configure.ac --- asterisk-10.2.0-rc1.orig//configure.ac 2012-01-14 11:41:55.000000000 -0500 +++ asterisk-10.2.0-rc1/configure.ac 2012-02-03 17:55:38.418519740 -0500 @@ -193,7 +193,7 @@ # check for uname AC_PATH_TOOL([UNAME], [uname], No) if test ! x"${UNAME}" = xNo; then - PBX_OSREV=$(${UNAME} -r) + PBX_OSREV=`${UNAME} -r` fi AC_SUBST(PBX_OSREV) @@ -955,7 +955,7 @@ AC_SUBST(GC_LDFLAGS) AC_MSG_CHECKING(for -Wdeclaration-after-statement support) -if $(${CC} -Wdeclaration-after-statement -S -o /dev/null -xc /dev/null > /dev/null 2>&1); then +if `${CC} -Wdeclaration-after-statement -S -o /dev/null -xc /dev/null > /dev/null 2>&1`; then AC_MSG_RESULT(yes) AST_DECLARATION_AFTER_STATEMENT=-Wdeclaration-after-statement else @@ -965,7 +965,7 @@ AC_SUBST(AST_DECLARATION_AFTER_STATEMENT) AC_MSG_CHECKING(for _FORTIFY_SOURCE support) -if $(${CC} -D_FORTIFY_SOURCE=2 -S -o /dev/null -xc /dev/null > /dev/null 2>&1); then +if `${CC} -D_FORTIFY_SOURCE=2 -S -o /dev/null -xc /dev/null > /dev/null 2>&1`; then AC_MSG_RESULT(yes) AST_FORTIFY_SOURCE=-D_FORTIFY_SOURCE=2 else @@ -975,7 +975,7 @@ AC_SUBST(AST_FORTIFY_SOURCE) AC_MSG_CHECKING(for -fno-strict-overflow) -if $(${CC} -O2 -fno-strict-overflow -S -o /dev/null -xc /dev/null > /dev/null 2>&1); then +if `${CC} -O2 -fno-strict-overflow -S -o /dev/null -xc /dev/null > /dev/null 2>&1`; then AC_MSG_RESULT(yes) AST_NO_STRICT_OVERFLOW=-fno-strict-overflow else @@ -985,7 +985,7 @@ AC_SUBST(AST_NO_STRICT_OVERFLOW) AC_MSG_CHECKING(for -Wshadow) -if $(${CC} -Wshadow -S -o /dev/null -xc /dev/null > /dev/null 2>&1); then +if `${CC} -Wshadow -S -o /dev/null -xc /dev/null > /dev/null 2>&1`; then AC_MSG_RESULT(yes) AST_SHADOW_WARNINGS=-Wshadow else @@ -995,7 +995,7 @@ AC_SUBST(AST_SHADOW_WARNINGS) AC_MSG_CHECKING(for -march=native) -if $(${CC} -march=native -S -o /dev/null -xc /dev/null > /dev/null 2>&1); then +if `${CC} -march=native -S -o /dev/null -xc /dev/null > /dev/null 2>&1`; then AC_MSG_RESULT(yes) AST_MARCH_NATIVE="-march=native" else @@ -2084,8 +2084,8 @@ continue fi # If we got here, we have this version: - GMIME_INCLUDE=$(${PKGCONFIG} gmime-$ver --cflags 2>/dev/null) - GMIME_LIB=$(${PKGCONFIG} gmime-$ver --libs) + GMIME_INCLUDE=`${PKGCONFIG} gmime-$ver --cflags 2>/dev/null` + GMIME_LIB=`${PKGCONFIG} gmime-$ver --libs` PBX_GMIME=1 AC_DEFINE([HAVE_GMIME], 1, [Define if your system has the GMIME libraries.]) break; diff -ruBN asterisk-10.2.0-rc1.orig//contrib/scripts/autosupport asterisk-10.2.0-rc1/contrib/scripts/autosupport --- asterisk-10.2.0-rc1.orig//contrib/scripts/autosupport 2012-01-04 15:01:27.000000000 -0500 +++ asterisk-10.2.0-rc1/contrib/scripts/autosupport 2012-02-03 18:05:23.364888739 -0500 @@ -21,7 +21,7 @@ # Ensure the PATH variable includes '/usr/sbin' and '/sbin' PATH=/usr/sbin:/sbin:${PATH} -DATE_STAMP=$(date +%Y%m%d) +DATE_STAMP=`date +%Y%m%d` OUTPUT_FILE=digiuminfo.txt TARBALL_OUTPUT_FILE="digium-info_${DATE_STAMP}.tar" VAR_LIB_LIST_FILE="list-of-varlibasterisk.txt" @@ -61,7 +61,7 @@ fi fi -MYUID=$(id -u); +MYUID=`id -u` if [ $MYUID -ne 0 ]; then echo "You must be root to run this." @@ -84,7 +84,7 @@ # function not implemented yet determine_paths() { - ASTERISK_PROCESS=$(ps -o cmd -C asterisk | grep asterisk 2> /dev/null) + ASTERISK_PROCESS=`ps -o cmd -C asterisk | grep asterisk 2> /dev/null` echo "detected process: $ASTERISK_PROCESS"; # split on whitespace? or use sed/awk to parse # get first arg which will be path to Asterisk binary - add this to PATH @@ -199,9 +199,9 @@ echo "------------------" >> $OUTPUT; echo "OTHER INFO : cat /etc/*{issue,release,version}*" >> $OUTPUT; echo "------------------" >> $OUTPUT; -for file in $(ls /etc/*issue* /etc/*release* /etc/*version* \ +for file in `ls /etc/*issue* /etc/*release* /etc/*version* \ /etc/*motd* /etc/asterisknow-version /dev/zap/ /dev/dahdi/ \ - 2> /dev/null); do + 2> /dev/null`; do if [ -f $file ]; then echo "$file:" >> $OUTPUT; cat $file >> $OUTPUT; @@ -252,7 +252,7 @@ echo "----------------------------" >> $OUTPUT; for tech in dahdi zaptel zap; do if [ -d /proc/$tech/ ]; then - for file in $(ls /proc/$tech/ 2> /dev/null); do + for file in `ls /proc/$tech/ 2> /dev/null`; do echo "----------------------------" >> $OUTPUT; echo "/proc/$tech/$file:" >> $OUTPUT; cat /proc/$tech/$file >> $OUTPUT; @@ -286,7 +286,7 @@ echo "$mod parameters" >> $OUTPUT echo "------------------" >> $OUTPUT echo "/sys/module/$mod/parameters:" >> $OUTPUT - for param in $(ls /sys/module/$mod/parameters/ /sys/module/$mod/ 2> /dev/null); do + for param in `ls /sys/module/$mod/parameters/ /sys/module/$mod/ 2> /dev/null`; do if [ -f /sys/module/$mod/parameters/$param ]; then echo -n "$param: " >> $OUTPUT cat /sys/module/$mod/parameters/$param 2> /dev/null >> $OUTPUT @@ -304,12 +304,12 @@ echo "------------------------" >> $OUTPUT; echo "DAHDI/ZAPTEL MODULE INFO : modinfo" >> $OUTPUT; echo "------------------------" >> $OUTPUT; -for file in $(ls /lib/modules/$(uname -r)/dahdi/*.ko \ - /lib/modules/$(uname -r)/dahdi/*/*.ko\ - /lib/modules/$(uname -r)/extra/*.ko \ - /lib/modules/$(uname -r)/extra/*/*.ko \ - /lib/modules/$(uname -r)/misc/*.ko \ - /lib/modules/$(uname -r)/misc/*/*.ko 2> /dev/null); do +for file in `ls /lib/modules/`uname -r`/dahdi/*.ko \ + /lib/modules/`uname -r`/dahdi/*/*.ko\ + /lib/modules/`uname -r`/extra/*.ko \ + /lib/modules/`uname -r`/extra/*/*.ko \ + /lib/modules/`uname -r`/misc/*.ko \ + /lib/modules/`uname -r`/misc/*/*.ko 2> /dev/null`; do if [ -f $file ]; then echo "------------------------" >> $OUTPUT; modinfo $file >> $OUTPUT; @@ -347,7 +347,7 @@ echo "----------------------" >> $OUTPUT; echo "VPM FIRMWARE INSTALLED : ls -la /lib/firmware" >> $OUTPUT; echo "----------------------" >> $OUTPUT; -$(ls -la /lib/firmware 2> /dev/null >> $OUTPUT); +ls -la /lib/firmware 2> /dev/null >> $OUTPUT echo >> $OUTPUT; echo >> $OUTPUT; echo -n "." @@ -377,7 +377,7 @@ echo "------------------" >> $OUTPUT; echo "KERNEL CONFIG : cat /path/.config" >> $OUTPUT; echo "------------------" >> $OUTPUT; -for file in /lib/modules/$(uname -r)/build/.config /usr/src/linux/.config; do +for file in /lib/modules/`uname -r`/build/.config /usr/src/linux/.config; do if [ -f $file ]; then echo "------------------" >> $OUTPUT; echo "$file:" >> $OUTPUT; @@ -403,7 +403,7 @@ DIR_LISTING="/usr/lib/asterisk/modules/ ${DIR_LISTING}" fi echo "ls -1aAR $DIR_LISTING > $VAR_LIB_LIST" - $(ls -1aR ${DIR_LISTING} | sed -e '/^\.\.*$/d' > $VAR_LIB_LIST); + ls -1aR ${DIR_LISTING} | sed -e '/^\.\.*$/d' >> $VAR_LIB_LIST } collect_config_backup() diff -ruBN asterisk-10.2.0-rc1.orig//contrib/scripts/safe_asterisk asterisk-10.2.0-rc1/contrib/scripts/safe_asterisk --- asterisk-10.2.0-rc1.orig//contrib/scripts/safe_asterisk 2011-05-05 11:06:59.000000000 -0400 +++ asterisk-10.2.0-rc1/contrib/scripts/safe_asterisk 2012-02-03 18:02:00.366148029 -0500 @@ -162,7 +162,7 @@ message "Asterisk shutdown normally." exit 0 elif test "0$EXITSTATUS" -gt "128" ; then - EXITSIGNAL=$(($EXITSTATUS - 128)) + EXITSIGNAL=`expr $EXITSTATUS - 128` echo "Asterisk exited on signal $EXITSIGNAL." if test "x$NOTIFY" != "x" ; then echo "Asterisk on $MACHINE exited on signal $EXITSIGNAL. Might want to take a peek." | \ diff -ruBN asterisk-10.2.0-rc1.orig//menuselect/configure asterisk-10.2.0-rc1/menuselect/configure --- asterisk-10.2.0-rc1.orig//menuselect/configure 2011-12-19 16:31:04.000000000 -0500 +++ asterisk-10.2.0-rc1/menuselect/configure 2012-02-03 17:56:12.263061618 -0500 @@ -5971,8 +5971,8 @@ fi if test ! "x${PKGCONFIG}" = xNo; then - GTK2_INCLUDE=$(${PKGCONFIG} gtk+-2.0 --cflags 2>/dev/null) - GTK2_LIB=$(${PKGCONFIG} gtk+-2.0 --libs) + GTK2_INCLUDE=`${PKGCONFIG} gtk+-2.0 --cflags 2>/dev/null` + GTK2_LIB=`${PKGCONFIG} gtk+-2.0 --libs` PBX_GTK2=1 cat >>confdefs.h <<\_ACEOF diff -ruBN asterisk-10.2.0-rc1.orig//menuselect/configure.ac asterisk-10.2.0-rc1/menuselect/configure.ac --- asterisk-10.2.0-rc1.orig//menuselect/configure.ac 2011-12-19 16:31:04.000000000 -0500 +++ asterisk-10.2.0-rc1/menuselect/configure.ac 2012-02-03 18:00:06.562696250 -0500 @@ -128,8 +128,8 @@ PBX_GTK2=0 AC_CHECK_TOOL(PKGCONFIG, pkg-config, No) if test ! "x${PKGCONFIG}" = xNo; then - GTK2_INCLUDE=$(${PKGCONFIG} gtk+-2.0 --cflags 2>/dev/null) - GTK2_LIB=$(${PKGCONFIG} gtk+-2.0 --libs) + GTK2_INCLUDE=`${PKGCONFIG} gtk+-2.0 --cflags 2>/dev/null` + GTK2_LIB=`${PKGCONFIG} gtk+-2.0 --libs` PBX_GTK2=1 AC_DEFINE([HAVE_GTK2], 1, [Define if your system has the GTK2 libraries.]) fi