Menu
▾
▴
[Astlinux-commits] SF.net SVN: astlinux:[6325] branches/1.0
|
From: <abe...@us...> - 2013-12-26 21:55:32
|
Revision: 6325
http://sourceforge.net/p/astlinux/code/6325
Author: abelbeck
Date: 2013-12-26 21:55:27 +0000 (Thu, 26 Dec 2013)
Log Message:
-----------
Remove old Asterisk 1.4 bits and pieces, now clean Asterisk 1.8 and Asterisk 11 support
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux18.config
branches/1.0/package/Config.in
branches/1.0/package/asterisk/Config.in
branches/1.0/package/asterisk/asterisk.mk
branches/1.0/package/asterisk-app_notify/Config.in
branches/1.0/package/asterisk-app_notify/asterisk-app_notify.mk
branches/1.0/package/spandsp/Config.in
branches/1.0/scripts/master-build
branches/1.0/scripts/master-upload
Added Paths:
-----------
branches/1.0/package/asterisk-app_notify/Makefile.module
Removed Paths:
-------------
branches/1.0/astlinux.config
branches/1.0/package/asterisk/Makefile.module
branches/1.0/package/asterisk/app_fax.c
branches/1.0/package/asterisk/app_pagecon.c
branches/1.0/package/asterisk/app_reload.c
branches/1.0/package/asterisk/asterisk-1.4-bugid11969.patch
branches/1.0/package/asterisk/asterisk-1.4-cflags.patch
branches/1.0/package/asterisk/asterisk-1.4-configure.patch
branches/1.0/package/asterisk/ilbc-codec-gcc-warning.patch
branches/1.0/package/asterisk/ilbc-codec.tar.gz
branches/1.0/package/asterisk/spandsp.patch
branches/1.0/package/asterisk-agi-audiotx/
branches/1.0/package/asterisk-app_nvfax/
branches/1.0/package/asterisk-app_waituntil/
branches/1.0/package/asterisk-func_devstate/
branches/1.0/package/asterisk-func_extstate/
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2013-12-25 20:32:52 UTC (rev 6324)
+++ branches/1.0/astlinux-ast11.config 2013-12-26 21:55:27 UTC (rev 6325)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6322-dirty Configuration
-# Wed Dec 25 14:09:50 2013
+# Buildroot 2011.08-svn6324-dirty Configuration
+# Thu Dec 26 12:28:02 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -156,8 +156,6 @@
# Asterisk, XMPP and telephony applications
#
BR2_PACKAGE_ASTERISK=y
-# BR2_PACKAGE_ASTERISK_v1_4 is not set
-# BR2_PACKAGE_ASTERISK_v1_6 is not set
# BR2_PACKAGE_ASTERISK_v1_8 is not set
BR2_PACKAGE_ASTERISK_v11=y
Deleted: branches/1.0/astlinux.config
===================================================================
--- branches/1.0/astlinux.config 2013-12-25 20:32:52 UTC (rev 6324)
+++ branches/1.0/astlinux.config 2013-12-26 21:55:27 UTC (rev 6325)
@@ -1,900 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6322-dirty Configuration
-# Wed Dec 25 14:09:47 2013
-#
-BR2_HAVE_DOT_CONFIG=y
-# BR2_arm is not set
-# BR2_armeb is not set
-# BR2_avr32 is not set
-# BR2_bfin is not set
-BR2_i386=y
-# BR2_mips is not set
-# BR2_mipsel is not set
-# BR2_powerpc is not set
-# BR2_sh is not set
-# BR2_sh64 is not set
-# BR2_sparc is not set
-# BR2_x86_64 is not set
-# BR2_xtensa is not set
-# BR2_x86_i386 is not set
-# BR2_x86_i486 is not set
-BR2_x86_i586=y
-# BR2_x86_i686 is not set
-# BR2_x86_pentiumpro is not set
-# BR2_x86_pentium_mmx is not set
-# BR2_x86_pentium_m is not set
-# BR2_x86_pentium2 is not set
-# BR2_x86_pentium3 is not set
-# BR2_x86_pentium4 is not set
-# BR2_x86_prescott is not set
-# BR2_x86_nocona is not set
-# BR2_x86_core2 is not set
-# BR2_x86_k6 is not set
-# BR2_x86_k6_2 is not set
-# BR2_x86_athlon is not set
-# BR2_x86_athlon_4 is not set
-# BR2_x86_opteron is not set
-# BR2_x86_opteron_sse3 is not set
-# BR2_x86_barcelona is not set
-# BR2_x86_geode is not set
-# BR2_x86_c3 is not set
-# BR2_x86_c32 is not set
-# BR2_x86_winchip_c6 is not set
-# BR2_x86_winchip2 is not set
-BR2_ARCH="i586"
-BR2_ENDIAN="LITTLE"
-BR2_GCC_TARGET_TUNE="i586"
-BR2_GCC_TARGET_ARCH="i586"
-
-#
-# Build options
-#
-
-#
-# Commands
-#
-BR2_WGET="toolchain/getter_script.sh"
-BR2_SVN="svn"
-BR2_BZR="bzr"
-BR2_GIT="git"
-BR2_ZCAT="gzip -d -c"
-BR2_BZCAT="bzcat"
-BR2_XZCAT="xzcat"
-BR2_TAR_OPTIONS=""
-BR2_DL_DIR="$(TOPDIR)/dl"
-BR2_HOST_DIR="$(BASE_DIR)/host"
-
-#
-# Mirrors and Download locations
-#
-BR2_PRIMARY_SITE=""
-BR2_BACKUP_SITE=""
-BR2_SOURCEFORGE_MIRROR="voxel"
-BR2_KERNEL_MIRROR="http://mirror.nexcess.net/kernel.org"
-BR2_GNU_MIRROR="http://ftp.gnu.org/pub/gnu"
-BR2_DEBIAN_MIRROR="http://ftp.debian.org"
-BR2_JLEVEL=1
-# BR2_CCACHE is not set
-# BR2_DEPRECATED is not set
-# BR2_ENABLE_DEBUG is not set
-BR2_STRIP_strip=y
-# BR2_STRIP_sstrip is not set
-# BR2_STRIP_none is not set
-# BR2_OPTIMIZE_0 is not set
-# BR2_OPTIMIZE_1 is not set
-# BR2_OPTIMIZE_2 is not set
-# BR2_OPTIMIZE_3 is not set
-BR2_OPTIMIZE_S=y
-# BR2_PREFER_STATIC_LIB is not set
-# BR2_HAVE_DOCUMENTATION is not set
-# BR2_HAVE_DEVFILES is not set
-
-#
-# Toolchain
-#
-# BR2_TOOLCHAIN_BUILDROOT is not set
-BR2_TOOLCHAIN_EXTERNAL=y
-# BR2_TOOLCHAIN_CTNG is not set
-BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
-BR2_TOOLCHAIN_EXTERNAL_PATH="$(HOME)/astlinux/x-tools/i586-unknown-linux-gnu"
-BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="i586-unknown-linux-gnu"
-BR2_TOOLCHAIN_EXTERNAL_PREFIX="i586-unknown-linux-gnu"
-BR2_TOOLCHAIN_EXTERNAL_GLIBC=y
-# BR2_TOOLCHAIN_EXTERNAL_CUSTOM_UCLIBC is not set
-BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
-BR2_TOOLCHAIN_EXTERNAL_CXX=y
-
-#
-# Gdb Options
-#
-# BR2_PACKAGE_GDB is not set
-# BR2_PACKAGE_GDB_SERVER is not set
-BR2_LARGEFILE=y
-BR2_INET_IPV6=y
-BR2_INET_RPC=y
-BR2_USE_WCHAR=y
-BR2_ENABLE_LOCALE=y
-BR2_INSTALL_LIBSTDCPP=y
-BR2_TOOLCHAIN_HAS_THREADS=y
-BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS=y
-BR2_ENABLE_LOCALE_PURGE=y
-BR2_ENABLE_LOCALE_WHITELIST=""
-BR2_USE_MMU=y
-BR2_TARGET_OPTIMIZATION="-pipe"
-BR2_TARGET_LDFLAGS=""
-
-#
-# System configuration
-#
-BR2_TARGET_GENERIC_HOSTNAME=""
-BR2_TARGET_GENERIC_ISSUE=""
-# BR2_ROOTFS_DEVICE_CREATION_STATIC is not set
-# BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS is not set
-# BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV is not set
-BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV=y
-BR2_ROOTFS_DEVICE_TABLE="project/astlinux/device_table.txt"
-# BR2_ROOTFS_SKELETON_DEFAULT is not set
-BR2_ROOTFS_SKELETON_CUSTOM=y
-BR2_ROOTFS_SKELETON_CUSTOM_PATH="project/astlinux/target_skeleton"
-BR2_ROOTFS_POST_BUILD_SCRIPT="scripts/astlinux-post-build"
-
-#
-# Package Selection for the target
-#
-BR2_PACKAGE_BUSYBOX=y
-# BR2_BUSYBOX_VERSION_1_16_X is not set
-# BR2_BUSYBOX_VERSION_1_17_X is not set
-BR2_BUSYBOX_VERSION_1_18_X=y
-# BR2_PACKAGE_BUSYBOX_SNAPSHOT is not set
-BR2_BUSYBOX_VERSION="1.18.5"
-BR2_PACKAGE_BUSYBOX_CONFIG="project/astlinux/busybox.config"
-# BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
-# BR2_PACKAGE_CUSTOMIZE is not set
-
-#
-# Asterisk, XMPP and telephony applications
-#
-BR2_PACKAGE_ASTERISK=y
-BR2_PACKAGE_ASTERISK_v1_4=y
-# BR2_PACKAGE_ASTERISK_v1_6 is not set
-# BR2_PACKAGE_ASTERISK_v1_8 is not set
-# BR2_PACKAGE_ASTERISK_v11 is not set
-
-#
-# cdr_mysql, app_mysql and res_config_mysql - disabled (requires MYSQL_CLIENT)
-#
-
-#
-# app_voicemail=IMAP_STORAGE - disabled (requires UW_IMAP)
-#
-# BR2_PACKAGE_ASTERISK_MENUSELECT is not set
-BR2_PACKAGE_ASTERISK_ILBC=y
-BR2_PACKAGE_ASTERISK-AGI-AUDIOTX=y
-BR2_PACKAGE_ASTERISK_APP_NOTIFY=y
-BR2_PACKAGE_ASTERISK_APP_NVFAX=y
-BR2_PACKAGE_ASTERISK_APP_WAITUNTIL=y
-BR2_PACKAGE_ASTERISK_FUNC_DEVSTATE=y
-BR2_PACKAGE_ASTERISK_FUNC_EXTSTATE=y
-BR2_PACKAGE_ASTERISK_FOP2=y
-BR2_PACKAGE_ASTERISK_GUI=y
-BR2_PACKAGE_DAHDI_LINUX=y
-BR2_PACKAGE_DAHDI_OSLEC=y
-# BR2_PACKAGE_DAHDI_HFCS is not set
-# BR2_PACKAGE_DAHDI_NO_CARD_FIRMWARE is not set
-BR2_PACKAGE_DAHDI_TOOLS=y
-# BR2_PACKAGE_FONULATOR is not set
-# BR2_PACKAGE_FREESWITCH is not set
-BR2_PACKAGE_CLIX=y
-BR2_PACKAGE_PROSODY=y
-BR2_PACKAGE_RHINO=y
-BR2_PACKAGE_WANPIPE=y
-
-#
-# Audio and video libraries and applications
-#
-# BR2_PACKAGE_ALSA_LIB is not set
-# BR2_PACKAGE_ALSA_UTILS is not set
-# BR2_PACKAGE_AUMIX is not set
-BR2_PACKAGE_BEEP=y
-# BR2_PACKAGE_FAAD2 is not set
-# BR2_PACKAGE_FLAC is not set
-# BR2_PACKAGE_FFMPEG is not set
-# BR2_PACKAGE_GSTREAMER is not set
-# BR2_PACKAGE_LAME is not set
-# BR2_PACKAGE_LIBAO is not set
-# BR2_PACKAGE_LIBCDAUDIO is not set
-# BR2_PACKAGE_LIBCUE is not set
-# BR2_PACKAGE_LIBCUEFILE is not set
-# BR2_PACKAGE_LIBDVDREAD is not set
-# BR2_PACKAGE_LIBDVDNAV is not set
-# BR2_PACKAGE_LIBID3TAG is not set
-BR2_PACKAGE_LIBMAD=y
-# BR2_PACKAGE_LIBMMS is not set
-# BR2_PACKAGE_LIBMPD is not set
-# BR2_PACKAGE_LIBMPEG2 is not set
-# BR2_PACKAGE_LIBOGG is not set
-# BR2_PACKAGE_LIBREPLAYGAIN is not set
-# BR2_PACKAGE_LIBSAMPLERATE is not set
-# BR2_PACKAGE_LIBSNDFILE is not set
-# BR2_PACKAGE_LIBTHEORA is not set
-# BR2_PACKAGE_LIBVORBIS is not set
-# BR2_PACKAGE_LIVE555 is not set
-# BR2_PACKAGE_MADPLAY is not set
-# BR2_PACKAGE_MPD is not set
-# BR2_PACKAGE_MPG123 is not set
-# BR2_PACKAGE_MPLAYER is not set
-# BR2_PACKAGE_MUSEPACK is not set
-BR2_PACKAGE_SOX=y
-BR2_PACKAGE_SOX_LIBMAD=y
-# BR2_PACKAGE_SPEEX is not set
-# BR2_PACKAGE_TAGLIB is not set
-# BR2_PACKAGE_TREMOR is not set
-# BR2_PACKAGE_VORBIS_TOOLS is not set
-# BR2_PACKAGE_WAVPACK is not set
-
-#
-# Compressors and decompressors
-#
-# BR2_PACKAGE_BZIP2 is not set
-# BR2_PACKAGE_LZOP is not set
-# BR2_PACKAGE_XZ is not set
-
-#
-# Debugging, profiling and benchmark
-#
-# BR2_PACKAGE_BONNIE is not set
-# BR2_PACKAGE_DHRYSTONE is not set
-# BR2_PACKAGE_DMALLOC is not set
-BR2_PACKAGE_KEXEC=y
-# BR2_PACKAGE_KEXEC_ZLIB is not set
-# BR2_PACKAGE_LMBENCH is not set
-# BR2_PACKAGE_LSOF is not set
-# BR2_PACKAGE_LTP_TESTSUITE is not set
-# BR2_PACKAGE_LTRACE is not set
-# BR2_PACKAGE_MEMSTAT is not set
-# BR2_PACKAGE_NETPERF is not set
-BR2_PACKAGE_STRACE=y
-# BR2_PACKAGE_WHETSTONE is not set
-# BR2_PACKAGE_VALGRIND is not set
-
-#
-# Development tools
-#
-# BR2_PACKAGE_AUTOCONF is not set
-# BR2_PACKAGE_AUTOMAKE is not set
-# BR2_PACKAGE_BISON is not set
-# BR2_PACKAGE_BSDIFF is not set
-# BR2_PACKAGE_CCACHE is not set
-# BR2_PACKAGE_CVS is not set
-# BR2_PACKAGE_DISTCC is not set
-BR2_PACKAGE_FLEX=y
-BR2_PACKAGE_FLEX_LIBFL=y
-# BR2_PACKAGE_GMP is not set
-# BR2_PACKAGE_GPERF is not set
-# BR2_PACKAGE_MAKE is not set
-# BR2_PACKAGE_MPC is not set
-# BR2_PACKAGE_MPFR is not set
-BR2_PACKAGE_LIBTOOL=y
-# BR2_PACKAGE_M4 is not set
-# BR2_PACKAGE_PKG_CONFIG is not set
-# BR2_PACKAGE_SSTRIP is not set
-
-#
-# Games
-#
-# BR2_PACKAGE_GNUCHESS is not set
-# BR2_PACKAGE_PRBOOM is not set
-
-#
-# Graphic libraries and applications (graphic/text)
-#
-
-#
-# Graphic applications
-#
-# BR2_PACKAGE_RRDTOOL is not set
-
-#
-# graphic libraries
-#
-# BR2_PACKAGE_DIRECTFB is not set
-# BR2_PACKAGE_FBDUMP is not set
-# BR2_PACKAGE_FBGRAB is not set
-# BR2_PACKAGE_FBV is not set
-# BR2_PACKAGE_IMAGEMAGICK is not set
-# BR2_PACKAGE_LINUX_FUSION is not set
-# BR2_PACKAGE_SDL is not set
-
-#
-# other GUIs
-#
-# BR2_PACKAGE_QT is not set
-
-#
-# X libraries and helper libraries
-#
-# BR2_PACKAGE_LIBERATION is not set
-
-#
-# X Window managers
-#
-
-#
-# X applications
-#
-# BR2_PACKAGE_GOB2 is not set
-
-#
-# midori requires C++, WCHAR in toolchain and libgtk2
-#
-
-#
-# Hardware handling
-#
-BR2_PACKAGE_ACPID=y
-BR2_PACKAGE_BFDETECT=y
-# BR2_PACKAGE_CDRKIT is not set
-# BR2_PACKAGE_CRAMFS is not set
-# BR2_PACKAGE_DBUS is not set
-# BR2_PACKAGE_DMRAID is not set
-BR2_PACKAGE_DOSFSTOOLS=y
-BR2_PACKAGE_DOSFSTOOLS_MKDOSFS=y
-BR2_PACKAGE_DOSFSTOOLS_DOSFSCK=y
-BR2_PACKAGE_DOSFSTOOLS_DOSFSLABEL=y
-BR2_PACKAGE_E1000=y
-BR2_PACKAGE_E1000E=y
-BR2_PACKAGE_E2FSPROGS=y
-BR2_PACKAGE_E2FSPROGS_BADBLOCKS=y
-BR2_PACKAGE_E2FSPROGS_CHATTR=y
-# BR2_PACKAGE_E2FSPROGS_DEBUGFS is not set
-BR2_PACKAGE_E2FSPROGS_DUMPE2FS=y
-BR2_PACKAGE_E2FSPROGS_E2FREEFRAG=y
-BR2_PACKAGE_E2FSPROGS_E2FSCK=y
-# BR2_PACKAGE_E2FSPROGS_E2IMAGE is not set
-BR2_PACKAGE_E2FSPROGS_E2LABEL=y
-BR2_PACKAGE_E2FSPROGS_E2UNDO=y
-BR2_PACKAGE_E2FSPROGS_FILEFRAG=y
-BR2_PACKAGE_E2FSPROGS_FSCK=y
-BR2_PACKAGE_E2FSPROGS_LOGSAVE=y
-BR2_PACKAGE_E2FSPROGS_LSATTR=y
-BR2_PACKAGE_E2FSPROGS_MKE2FS=y
-BR2_PACKAGE_E2FSPROGS_MKLOSTFOUND=y
-# BR2_PACKAGE_E2FSPROGS_RESIZE2FS is not set
-BR2_PACKAGE_E2FSPROGS_TUNE2FS=y
-# BR2_PACKAGE_EEPROG is not set
-# BR2_PACKAGE_FCONFIG is not set
-# BR2_PACKAGE_FIS is not set
-BR2_PACKAGE_FXLOAD=y
-# BR2_PACKAGE_GADGETFS_TEST is not set
-# BR2_PACKAGE_GDISK is not set
-# BR2_PACKAGE_GENEXT2FS is not set
-# BR2_PACKAGE_GENROMFS is not set
-# BR2_PACKAGE_GPSD is not set
-# BR2_PACKAGE_GVFS is not set
-# BR2_PACKAGE_HWDATA is not set
-# BR2_PACKAGE_I2C_TOOLS is not set
-# BR2_PACKAGE_INPUT_EVENT_DAEMON is not set
-# BR2_PACKAGE_INPUT_TOOLS is not set
-# BR2_PACKAGE_IOSTAT is not set
-# BR2_PACKAGE_IRDA_UTILS is not set
-# BR2_PACKAGE_KBD is not set
-# BR2_PACKAGE_LIBV4L is not set
-BR2_PACKAGE_LM_SENSORS=y
-
-#
-# lm-sensors tools
-#
-BR2_PACKAGE_LM_SENSORS_SENSORS=y
-# BR2_PACKAGE_LM_SENSORS_FANCONTROL is not set
-# BR2_PACKAGE_LM_SENSORS_ISADUMP is not set
-# BR2_PACKAGE_LM_SENSORS_ISASET is not set
-# BR2_PACKAGE_LM_SENSORS_PWMCONFIG is not set
-# BR2_PACKAGE_LM_SENSORS_SENSORS_DETECT is not set
-# BR2_PACKAGE_LSUIO is not set
-# BR2_PACKAGE_LVM2 is not set
-# BR2_PACKAGE_MAKEDEVS is not set
-# BR2_PACKAGE_MDADM is not set
-# BR2_PACKAGE_MEMTEST is not set
-# BR2_PACKAGE_MEMTESTER is not set
-# BR2_PACKAGE_MTD is not set
-# BR2_PACKAGE_NTFS_3G is not set
-# BR2_PACKAGE_NTFSPROGS is not set
-BR2_PACKAGE_PCIUTILS=y
-BR2_PACKAGE_R8168=y
-# BR2_PACKAGE_RNG_TOOLS is not set
-# BR2_PACKAGE_SDPARM is not set
-# BR2_PACKAGE_SETSERIAL is not set
-# BR2_PACKAGE_SMARTMONTOOLS is not set
-# BR2_PACKAGE_SQUASHFS is not set
-# BR2_PACKAGE_SREDIRD is not set
-# BR2_PACKAGE_SSHFS is not set
-BR2_PACKAGE_STATSERIAL=y
-# BR2_PACKAGE_SYSSTAT is not set
-BR2_PACKAGE_TG3=y
-# BR2_PACKAGE_TI_UTILS is not set
-# BR2_PACKAGE_UBOOT_TOOLS is not set
-BR2_PACKAGE_UDEV=y
-# BR2_PACKAGE_UDEV_ALL_EXTRAS is not set
-# BR2_PACKAGE_USB_MODESWITCH is not set
-# BR2_PACKAGE_USBMOUNT is not set
-BR2_PACKAGE_USBUTILS=y
-# BR2_PACKAGE_USBUTILS_ZLIB is not set
-# BR2_PACKAGE_WIPE is not set
-# BR2_PACKAGE_XFSPROGS is not set
-BR2_PACKAGE_ZABBIX=y
-BR2_PACKAGE_ZABBIX_PROXY=y
-
-#
-# Interpreter languages and scripting
-#
-BR2_PACKAGE_BC=y
-# BR2_PACKAGE_HASERL is not set
-BR2_PACKAGE_LUA=y
-
-#
-# LUA libraries/modules
-#
-# BR2_PACKAGE_CGILUA is not set
-# BR2_PACKAGE_COPAS is not set
-# BR2_PACKAGE_COXPCALL is not set
-BR2_PACKAGE_LUAEXPAT=y
-BR2_PACKAGE_LUAFILESYSTEM=y
-BR2_PACKAGE_LUASEC=y
-BR2_PACKAGE_LUASOCKET=y
-# BR2_PACKAGE_WSAPI is not set
-# BR2_PACKAGE_XAVANTE is not set
-BR2_PACKAGE_PERL=y
-BR2_PACKAGE_PHP=y
-BR2_PACKAGE_PHP_CGI=y
-# BR2_PACKAGE_PHP_SAPI_CLI is not set
-BR2_PACKAGE_PHP_SAPI_CGI=y
-# BR2_PACKAGE_PHP_SAPI_CLI_CGI is not set
-# BR2_PACKAGE_PHP_FASTCGI is not set
-
-#
-# PHP Extensions
-#
-BR2_PACKAGE_PHP_CONFIG="$(PHP_DIR)/php.ini-dist"
-# BR2_PACKAGE_PHP_EXT_SOCKETS is not set
-BR2_PACKAGE_PHP_EXT_POSIX=y
-# BR2_PACKAGE_PHP_EXT_SPL is not set
-BR2_PACKAGE_PHP_EXT_SESSION=y
-BR2_PACKAGE_PHP_EXT_OPENSSL=y
-# BR2_PACKAGE_PHP_EXT_CURL is not set
-BR2_PACKAGE_PHP_EXT_LIBXML2=y
-BR2_PACKAGE_PHP_EXT_XMLPARSER=y
-# BR2_PACKAGE_PHP_EXT_SIMPLEXML is not set
-BR2_PACKAGE_PHP_EXT_ZLIB=y
-# BR2_PACKAGE_PHP_EXT_EXIF is not set
-# BR2_PACKAGE_PHP_EXT_FTP is not set
-# BR2_PACKAGE_PHP_EXT_GETTEXT is not set
-# BR2_PACKAGE_PHP_EXT_GMP is not set
-BR2_PACKAGE_PHP_EXT_JSON=y
-# BR2_PACKAGE_PHP_EXT_READLINE is not set
-# BR2_PACKAGE_PHP_EXT_NCURSES is not set
-BR2_PACKAGE_PHP_EXT_PCRE=y
-# BR2_PACKAGE_PHP_EXT_PCNTL is not set
-# BR2_PACKAGE_PHP_EXT_SYSVMSG is not set
-# BR2_PACKAGE_PHP_EXT_SYSVSEM is not set
-# BR2_PACKAGE_PHP_EXT_SYSVSHM is not set
-BR2_PACKAGE_PHP_EXT_ZIP=y
-BR2_PACKAGE_PHP_EXT_FILTER=y
-# BR2_PACKAGE_PHP_EXT_CALENDAR is not set
-
-#
-# Database extensions
-#
-# BR2_PACKAGE_PHP_EXT_SQLITE is not set
-BR2_PACKAGE_PHP_EXT_PDO=y
-BR2_PACKAGE_PHP_EXT_PDO_SQLITE=y
-BR2_PACKAGE_PHP_EXT_PDO_SQLITE_EXTERNAL=y
-# BR2_PACKAGE_PHP_EXT_PDO_MYSQL is not set
-# BR2_PACKAGE_PYTHON is not set
-# BR2_PACKAGE_RUBY is not set
-# BR2_PACKAGE_TCL is not set
-BR2_PACKAGE_WEBINTERFACE=y
-# BR2_PACKAGE_WEBINTERFACE_v1 is not set
-BR2_PACKAGE_WEBINTERFACE_v2=y
-
-#
-# Libraries
-#
-
-#
-# Compression and decompression
-#
-# BR2_PACKAGE_LIBARCHIVE is not set
-BR2_PACKAGE_LZO=y
-BR2_PACKAGE_SPANDSP=y
-# BR2_PACKAGE_SPANDSP_APP_FAX is not set
-BR2_PACKAGE_ZLIB=y
-
-#
-# Crypto
-#
-# BR2_PACKAGE_BEECRYPT is not set
-# BR2_PACKAGE_GNUTLS is not set
-# BR2_PACKAGE_LIBGCRYPT is not set
-# BR2_PACKAGE_LIBGPG_ERROR is not set
-# BR2_PACKAGE_LIBNSS is not set
-BR2_PACKAGE_OPENSSL=y
-BR2_PACKAGE_OPENSSL_BIN=y
-BR2_PACKAGE_OPENSSL_ENGINES=y
-# BR2_PACKAGE_OPENSSL_OCF is not set
-# BR2_PACKAGE_LIBSRTP is not set
-
-#
-# Database
-#
-# BR2_PACKAGE_BERKELEYDB is not set
-# BR2_PACKAGE_MYSQL_CLIENT is not set
-BR2_PACKAGE_SQLITE=y
-BR2_PACKAGE_SQLITE_READLINE=y
-# BR2_PACKAGE_SQLITEODBC is not set
-# BR2_PACKAGE_UNIXODBC is not set
-
-#
-# Filesystem
-#
-# BR2_PACKAGE_GAMIN is not set
-# BR2_PACKAGE_LIBCONFIG is not set
-# BR2_PACKAGE_LIBCONFUSE is not set
-# BR2_PACKAGE_LIBFUSE is not set
-# BR2_PACKAGE_LIBLOCKFILE is not set
-BR2_PACKAGE_LIBSYSFS=y
-
-#
-# Graphics
-#
-# BR2_PACKAGE_ATK is not set
-# BR2_PACKAGE_CAIRO is not set
-# BR2_PACKAGE_FONTCONFIG is not set
-# BR2_PACKAGE_FREETYPE is not set
-BR2_PACKAGE_JPEG=y
-# BR2_PACKAGE_LIBART is not set
-# BR2_PACKAGE_LIBEXIF is not set
-# BR2_PACKAGE_GDK_PIXBUF is not set
-# BR2_PACKAGE_LIBPNG is not set
-# BR2_PACKAGE_LIBRAW is not set
-# BR2_PACKAGE_LIBSVGTINY is not set
-# BR2_PACKAGE_LIBUNGIF is not set
-# BR2_PACKAGE_PANGO is not set
-# BR2_PACKAGE_PIXMAN is not set
-BR2_PACKAGE_TIFF=y
-
-#
-# webkit requires C++, WCHAR in toolchain and libgtk2
-#
-
-#
-# Hardware handling
-#
-# BR2_PACKAGE_LIBAIO is not set
-# BR2_PACKAGE_LIBRAW1394 is not set
-# BR2_PACKAGE_TSLIB is not set
-# BR2_PACKAGE_LIBHID is not set
-# BR2_PACKAGE_LIBIQRF is not set
-BR2_PACKAGE_LIBUSB=y
-BR2_PACKAGE_LIBUSB_COMPAT=y
-
-#
-# Networking
-#
-# BR2_PACKAGE_LIBCGI is not set
-# BR2_PACKAGE_LIBCGICC is not set
-BR2_PACKAGE_LIBCURL=y
-BR2_PACKAGE_CURL=y
-# BR2_PACKAGE_LIBDNET is not set
-# BR2_PACKAGE_LIBEXOSIP2 is not set
-BR2_PACKAGE_LIBIDN=y
-# BR2_PACKAGE_LIBIDN_BINARY is not set
-# BR2_PACKAGE_LIBMICROHTTPD is not set
-# BR2_PACKAGE_NEON is not set
-# BR2_PACKAGE_LIBMNL is not set
-# BR2_PACKAGE_LIBNET is not set
-# BR2_PACKAGE_LIBNL is not set
-BR2_PACKAGE_LIBPCAP=y
-# BR2_PACKAGE_LIBOSIP2 is not set
-BR2_PACKAGE_LIBPRI=y
-# BR2_PACKAGE_LIBRSYNC is not set
-# BR2_PACKAGE_LIBSOUP is not set
-# BR2_PACKAGE_LIBUPNP is not set
-BR2_PACKAGE_LINUX_ATM=y
-
-#
-# Other
-#
-# BR2_PACKAGE_LIBARGTABLE2 is not set
-# BR2_PACKAGE_ARGP_STANDALONE is not set
-# BR2_PACKAGE_LIBATOMIC_OPS is not set
-# BR2_PACKAGE_LIBCAP is not set
-BR2_PACKAGE_LIBDAEMON=y
-BR2_PACKAGE_LIBELF=y
-# BR2_PACKAGE_LIBEVENT is not set
-# BR2_PACKAGE_LIBFB is not set
-# BR2_PACKAGE_LIBFFI is not set
-# BR2_PACKAGE_LIBGLIB2 is not set
-# BR2_PACKAGE_LIBICAL is not set
-# BR2_PACKAGE_LIBNSPR is not set
-# BR2_PACKAGE_LIBSIGC is not set
-# BR2_PACKAGE_ORC is not set
-
-#
-# Text and terminal handling
-#
-# BR2_PACKAGE_ENCHANT is not set
-# BR2_PACKAGE_ICU is not set
-BR2_PACKAGE_NCURSES=y
-# BR2_PACKAGE_NCURSES_TARGET_PANEL is not set
-# BR2_PACKAGE_NCURSES_TARGET_FORM is not set
-# BR2_PACKAGE_NCURSES_TARGET_MENU is not set
-BR2_PACKAGE_NEWT=y
-BR2_PACKAGE_PCRE=y
-BR2_PACKAGE_POPT=y
-BR2_PACKAGE_READLINE=y
-BR2_PACKAGE_SLANG=y
-
-#
-# JSON/XML
-#
-BR2_PACKAGE_EXPAT=y
-# BR2_PACKAGE_EZXML is not set
-BR2_PACKAGE_IKSEMEL=y
-# BR2_PACKAGE_LIBROXML is not set
-BR2_PACKAGE_LIBXML2=y
-# BR2_PACKAGE_LIBXSLT is not set
-# BR2_PACKAGE_LIBYAML is not set
-# BR2_PACKAGE_MXML is not set
-# BR2_PACKAGE_XERCES is not set
-# BR2_PACKAGE_YAJL is not set
-
-#
-# Miscellaneous
-#
-BR2_PACKAGE_HTPASSWD=y
-BR2_PACKAGE_MAC2VENDOR=y
-# BR2_PACKAGE_SHARED_MIME_INFO is not set
-BR2_PACKAGE_ZONEINFO=y
-
-#
-# Networking applications
-#
-BR2_PACKAGE_APCUPSD=y
-# BR2_PACKAGE_ARGUS is not set
-BR2_PACKAGE_ARNOFW=y
-# BR2_PACKAGE_AVAHI is not set
-# BR2_PACKAGE_AXEL is not set
-# BR2_PACKAGE_BLUEZ_UTILS is not set
-# BR2_PACKAGE_BIND is not set
-# BR2_PACKAGE_BMON is not set
-BR2_PACKAGE_BRIDGE=y
-# BR2_PACKAGE_BWM_NG is not set
-# BR2_PACKAGE_CAN_UTILS is not set
-# BR2_PACKAGE_CTORRENT is not set
-# BR2_PACKAGE_CUPS is not set
-BR2_PACKAGE_DARKSTAT=y
-BR2_PACKAGE_DHCPDUMP=y
-BR2_PACKAGE_DNSMASQ=y
-BR2_PACKAGE_DNSMASQ_TFTP=y
-BR2_PACKAGE_DNSMASQ_DHCP=y
-# BR2_PACKAGE_DNSMASQ_IDN is not set
-# BR2_PACKAGE_DROPBEAR is not set
-# BR2_PACKAGE_EBTABLES is not set
-BR2_PACKAGE_ETHTOOL=y
-BR2_PACKAGE_FPING=y
-# BR2_PACKAGE_HOSTAPD is not set
-# BR2_PACKAGE_IFPLUGD is not set
-BR2_PACKAGE_IFTOP=y
-BR2_PACKAGE_INADYN=y
-BR2_PACKAGE_IPERF=y
-BR2_PACKAGE_IPROUTE2=y
-BR2_PACKAGE_IPSEC_TOOLS=y
-BR2_PACKAGE_IPSEC_TOOLS_ADMINPORT=y
-BR2_PACKAGE_IPSEC_TOOLS_NATT=y
-BR2_PACKAGE_IPSEC_TOOLS_FRAG=y
-# BR2_PACKAGE_IPSEC_TOOLS_STATS is not set
-# BR2_PACKAGE_IPSEC_TOOLS_READLINE is not set
-BR2_PACKAGE_IPSEC_SECCTX_DISABLE=y
-# BR2_PACKAGE_IPSEC_SECCTX_ENABLE is not set
-# BR2_PACKAGE_IPSEC_SECCTX_KERNEL is not set
-# BR2_PACKAGE_IPSET is not set
-BR2_PACKAGE_IPTABLES=y
-# BR2_PACKAGE_IW is not set
-# BR2_PACKAGE_KISMET is not set
-# BR2_PACKAGE_XL2TP is not set
-BR2_PACKAGE_LIGHTTPD=y
-BR2_PACKAGE_LIGHTTPD_OPENSSL=y
-# BR2_PACKAGE_LIGHTTPD_ZLIB is not set
-# BR2_PACKAGE_LIGHTTPD_BZIP2 is not set
-BR2_PACKAGE_LIGHTTPD_PCRE=y
-# BR2_PACKAGE_LIGHTTPD_WEBDAV is not set
-BR2_PACKAGE_LINKS=y
-# BR2_PACKAGE_LINKS_GRAPHICS is not set
-# BR2_PACKAGE_LRZSZ is not set
-BR2_PACKAGE_MDNSRESPONDER=y
-# BR2_PACKAGE_MII_DIAG is not set
-BR2_PACKAGE_MINIUPNPD=y
-# BR2_PACKAGE_MROUTED is not set
-BR2_PACKAGE_MSMTP=y
-BR2_PACKAGE_MTR=y
-# BR2_PACKAGE_MUTT is not set
-# BR2_PACKAGE_NBD is not set
-# BR2_PACKAGE_NCFTP is not set
-# BR2_PACKAGE_NETPLUG is not set
-BR2_PACKAGE_NETSNMP=y
-# BR2_PACKAGE_NETSTAT_NAT is not set
-# BR2_PACKAGE_NFS_UTILS is not set
-# BR2_PACKAGE_NGIRCD is not set
-BR2_PACKAGE_NGREP=y
-# BR2_PACKAGE_NMAP is not set
-BR2_PACKAGE_NTP=y
-BR2_PACKAGE_NTP_SNTP=y
-# BR2_PACKAGE_NTP_NTP_KEYGEN is not set
-# BR2_PACKAGE_NTP_NTP_WAIT is not set
-BR2_PACKAGE_NTP_NTPD=y
-# BR2_PACKAGE_NTP_NTPDATE is not set
-# BR2_PACKAGE_NTP_NTPDC is not set
-BR2_PACKAGE_NTP_NTPQ=y
-# BR2_PACKAGE_NTP_NTPTRACE is not set
-# BR2_PACKAGE_NTP_TICKADJ is not set
-# BR2_PACKAGE_NUT is not set
-# BR2_PACKAGE_NUTTCP is not set
-# BR2_PACKAGE_OLSR is not set
-BR2_PACKAGE_OPENLDAP=y
-BR2_PACKAGE_OPENLDAP_SERVER=y
-# BR2_PACKAGE_OPENNTPD is not set
-BR2_PACKAGE_OPENSSH=y
-BR2_PACKAGE_OPENVPN=y
-BR2_PACKAGE_OPENVPN_LZO=y
-BR2_PACKAGE_OPENVPN_OPENSSL=y
-BR2_PACKAGE_P910ND=y
-# BR2_PACKAGE_PORTMAP is not set
-BR2_PACKAGE_PPPD=y
-# BR2_PACKAGE_PPPD_FILTER is not set
-# BR2_PACKAGE_PPPD_RADIUS is not set
-BR2_PACKAGE_RADVD=y
-BR2_PACKAGE_RP_PPPOE=y
-# BR2_PACKAGE_PPTP_LINUX is not set
-BR2_PACKAGE_PPTPD=y
-# BR2_PACKAGE_PROFTPD is not set
-# BR2_PACKAGE_QUAGGA is not set
-# BR2_PACKAGE_RSH_REDONE is not set
-BR2_PACKAGE_RSYNC=y
-# BR2_PACKAGE_SAMBA is not set
-# BR2_PACKAGE_SER2NET is not set
-BR2_PACKAGE_SHELLINABOX=y
-# BR2_PACKAGE_SOCAT is not set
-# BR2_PACKAGE_SPAWN_FCGI is not set
-# BR2_PACKAGE_SQUID is not set
-BR2_PACKAGE_STUNNEL=y
-BR2_PACKAGE_TCPDUMP=y
-# BR2_PACKAGE_TCPDUMP_SMB is not set
-# BR2_PACKAGE_TCPREPLAY is not set
-# BR2_PACKAGE_TINYPROXY is not set
-# BR2_PACKAGE_TN5250 is not set
-# BR2_PACKAGE_TTCP is not set
-# BR2_PACKAGE_UDPCAST is not set
-# BR2_PACKAGE_UW_IMAP is not set
-# BR2_PACKAGE_VPNC is not set
-BR2_PACKAGE_VSFTPD=y
-# BR2_PACKAGE_VTUN is not set
-# BR2_PACKAGE_WIRELESS_TOOLS is not set
-# BR2_PACKAGE_WPA_SUPPLICANT is not set
-
-#
-# Package managers
-#
-# BR2_PACKAGE_IPKG is not set
-
-#
-# Shell and utilities
-#
-# BR2_PACKAGE_AT is not set
-BR2_PACKAGE_BASH=y
-BR2_PACKAGE_DIALOG=y
-# BR2_PACKAGE_FILE is not set
-# BR2_PACKAGE_INOTIFY_TOOLS is not set
-# BR2_PACKAGE_LOCKFILE_PROGS is not set
-BR2_PACKAGE_LOGROTATE=y
-BR2_PACKAGE_SCREEN=y
-BR2_PACKAGE_SUDO=y
-# BR2_PACKAGE_WHICH is not set
-# BR2_PACKAGE_XMLSTARLET is not set
-
-#
-# System tools
-#
-# BR2_PACKAGE_ACL is not set
-# BR2_PACKAGE_ATTR is not set
-# BR2_PACKAGE_HTOP is not set
-BR2_PACKAGE_MODULE_INIT_TOOLS=y
-BR2_PACKAGE_UTIL_LINUX=y
-# BR2_PACKAGE_UTIL_LINUX_MOUNT is not set
-# BR2_PACKAGE_UTIL_LINUX_FSCK is not set
-# BR2_PACKAGE_UTIL_LINUX_LIBMOUNT is not set
-BR2_PACKAGE_UTIL_LINUX_LIBUUID=y
-# BR2_PACKAGE_UTIL_LINUX_UUIDD is not set
-BR2_PACKAGE_UTIL_LINUX_LIBBLKID=y
-# BR2_PACKAGE_UTIL_LINUX_AGETTY is not set
-# BR2_PACKAGE_UTIL_LINUX_CRAMFS is not set
-# BR2_PACKAGE_UTIL_LINUX_SWITCH_ROOT is not set
-# BR2_PACKAGE_UTIL_LINUX_PIVOT_ROOT is not set
-# BR2_PACKAGE_UTIL_LINUX_FALLOCATE is not set
-# BR2_PACKAGE_UTIL_LINUX_UNSHARE is not set
-# BR2_PACKAGE_UTIL_LINUX_RENAME is not set
-BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS=y
-# BR2_PACKAGE_UTIL_LINUX_WALL is not set
-# BR2_PACKAGE_UTIL_LINUX_ARCH is not set
-# BR2_PACKAGE_UTIL_LINUX_INIT is not set
-# BR2_PACKAGE_UTIL_LINUX_KILL is not set
-# BR2_PACKAGE_UTIL_LINUX_LAST is not set
-# BR2_PACKAGE_UTIL_LINUX_MESG is not set
-# BR2_PACKAGE_UTIL_LINUX_PARTX is not set
-# BR2_PACKAGE_UTIL_LINUX_RAW is not set
-# BR2_PACKAGE_UTIL_LINUX_RESET is not set
-# BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS is not set
-# BR2_PACKAGE_UTIL_LINUX_WRITE is not set
-
-#
-# Text editors and viewers
-#
-# BR2_PACKAGE_ED is not set
-BR2_PACKAGE_EX_VI=y
-BR2_PACKAGE_NANO=y
-# BR2_PACKAGE_UEMACS is not set
-
-#
-# Filesystem images
-#
-# BR2_TARGET_ROOTFS_CRAMFS is not set
-# BR2_TARGET_ROOTFS_CLOOP is not set
-BR2_TARGET_ROOTFS_EXT2=y
-BR2_TARGET_ROOTFS_EXT2_BLOCKS=0
-BR2_TARGET_ROOTFS_EXT2_INODES=0
-BR2_TARGET_ROOTFS_EXT2_RESBLKS=0
-BR2_TARGET_ROOTFS_EXT2_NONE=y
-# BR2_TARGET_ROOTFS_EXT2_GZIP is not set
-# BR2_TARGET_ROOTFS_EXT2_BZIP2 is not set
-# BR2_TARGET_ROOTFS_EXT2_LZMA is not set
-# BR2_TARGET_ROOTFS_JFFS2 is not set
-# BR2_TARGET_ROOTFS_UBIFS is not set
-BR2_TARGET_ROOTFS_SQUASHFS=y
-BR2_TARGET_ROOTFS_SQUASHFS4=y
-BR2_TARGET_ROOTFS_SQUASHFS4_GZIP=y
-# BR2_TARGET_ROOTFS_SQUASHFS4_LZMA is not set
-# BR2_TARGET_ROOTFS_SQUASHFS4_LZO is not set
-# BR2_TARGET_ROOTFS_SQUASHFS4_XZ is not set
-# BR2_TARGET_ROOTFS_TAR is not set
-# BR2_TARGET_ROOTFS_CPIO is not set
-# BR2_TARGET_ROOTFS_ISO9660 is not set
-# BR2_TARGET_ROOTFS_INITRAMFS is not set
-# BR2_TARGET_ROOTFS_ROMFS is not set
-
-#
-# Bootloaders
-#
-# BR2_TARGET_BAREBOX is not set
-# BR2_TARGET_GRUB is not set
-# BR2_TARGET_SYSLINUX is not set
-BR2_TARGET_RUNNIX=y
-BR2_TARGET_RUNNIX_NDEV=""
-# BR2_TARGET_UBOOT is not set
-
-#
-# Kernel
-#
-BR2_LINUX_KERNEL=y
-# BR2_LINUX_KERNEL_2_6_39 is not set
-# BR2_LINUX_KERNEL_CUSTOM_VERSION is not set
-BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-# BR2_LINUX_KERNEL_CUSTOM_GIT is not set
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="http://ftp.kernel.org/pub/linux/kernel/v2.6/longterm/v2.6.35/linux-2.6.35.14.tar.gz"
-BR2_LINUX_KERNEL_VERSION="custom"
-BR2_LINUX_KERNEL_PATCH="project/astlinux/kernel-patches"
-# BR2_LINUX_KERNEL_USE_DEFCONFIG is not set
-BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="project/astlinux/geni586/linux.config"
-BR2_LINUX_KERNEL_BZIMAGE=y
-# BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM is not set
-BR2_LINUX_KERNEL_INSTALL_TARGET=y
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2013-12-25 20:32:52 UTC (rev 6324)
+++ branches/1.0/astlinux18.config 2013-12-26 21:55:27 UTC (rev 6325)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6322-dirty Configuration
-# Wed Dec 25 14:09:48 2013
+# Buildroot 2011.08-svn6324-dirty Configuration
+# Thu Dec 26 12:28:02 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -156,8 +156,6 @@
# Asterisk, XMPP and telephony applications
#
BR2_PACKAGE_ASTERISK=y
-# BR2_PACKAGE_ASTERISK_v1_4 is not set
-# BR2_PACKAGE_ASTERISK_v1_6 is not set
BR2_PACKAGE_ASTERISK_v1_8=y
# BR2_PACKAGE_ASTERISK_v11 is not set
Modified: branches/1.0/package/Config.in
===================================================================
--- branches/1.0/package/Config.in 2013-12-25 20:32:52 UTC (rev 6324)
+++ branches/1.0/package/Config.in 2013-12-26 21:55:27 UTC (rev 6325)
@@ -5,13 +5,8 @@
menu "Asterisk, XMPP and telephony applications"
source "package/asterisk/Config.in"
-source "package/asterisk-agi-audiotx/Config.in"
source "package/asterisk-app_notify/Config.in"
-source "package/asterisk-app_nvfax/Config.in"
-source "package/asterisk-app_waituntil/Config.in"
source "package/asterisk-codec-silk/Config.in"
-source "package/asterisk-func_devstate/Config.in"
-source "package/asterisk-func_extstate/Config.in"
source "package/asterisk-fop2/Config.in"
source "package/asterisk-gui/Config.in"
source "package/dahdi-linux/Config.in"
Modified: branches/1.0/package/asterisk/Config.in
===================================================================
--- branches/1.0/package/asterisk/Config.in 2013-12-25 20:32:52 UTC (rev 6324)
+++ branches/1.0/package/asterisk/Config.in 2013-12-26 21:55:27 UTC (rev 6325)
@@ -14,20 +14,10 @@
choice
prompt "Asterisk Version"
depends on BR2_PACKAGE_ASTERISK
- default BR2_PACKAGE_ASTERISK_v1_4
+ default BR2_PACKAGE_ASTERISK_v1_8
help
Select which version of Asterisk to compile and install.
- config BR2_PACKAGE_ASTERISK_v1_4
- bool "Asterisk v1.4.x"
- help
- Asterisk Long Term Stable Release.
-
- config BR2_PACKAGE_ASTERISK_v1_6
- bool "Asterisk v1.6.x"
- help
- Deprecated Branch
-
config BR2_PACKAGE_ASTERISK_v1_8
bool "Asterisk v1.8.x"
help
@@ -56,12 +46,3 @@
help
Run interactive menuselect to select custom Asterisk options
-config BR2_PACKAGE_ASTERISK_ILBC
- bool "Asterisk iLBC CODEC"
- default n
- depends on BR2_PACKAGE_ASTERISK && (BR2_PACKAGE_ASTERISK_v1_4 || BR2_PACKAGE_ASTERISK_v1_6)
- help
- iLBC CODEC for Asterisk
-
- http://www.ietf.org/rfc/rfc3951.txt
-
Deleted: branches/1.0/package/asterisk/Makefile.module
===================================================================
--- branches/1.0/package/asterisk/Makefile.module 2013-12-25 20:32:52 UTC (rev 6324)
+++ branches/1.0/package/asterisk/Makefile.module 2013-12-26 21:55:27 UTC (rev 6325)
@@ -1,43 +0,0 @@
-#
-# Taken from:
-#
-# http://svncommunity.digium.com/view/tilghman/branches/1.4/Makefile?revision=11&view=markup
-#
-
-ifeq ($(origin ASTSRC),undefined)
-$(error Please set $$(ASTSRC))
-endif
-
-ifeq ($(origin LOADABLE_MODS),undefined)
-$(error Please set $$(LOADABLE_MODS))
-endif
-
-ifeq ($(origin LIBS),undefined)
-$(error Please set $$(LIBS))
-endif
-
--include $(ASTSRC)/menuselect.makeopts $(ASTSRC)/menuselect.makedeps
-
-ASTTOPDIR=$(ASTSRC)
-INCLUDE=-I$(ASTSRC)/include -I/usr/local/include
-
-ifneq ($(wildcard $(ASTSRC)/makeopts),)
- include $(ASTSRC)/makeopts
-endif
-
-ifeq ($(OSARCH),SunOS)
- ASTLIBDIR=/opt/asterisk/lib
-else
- ASTLIBDIR=$(libdir)/asterisk
-endif
-MODULES_DIR=$(ASTLIBDIR)/modules
-
-all: _all
-
-include $(ASTTOPDIR)/Makefile.moddir_rules
-
-%.so: %.o
- $(CC) -shared $(LIBS) -o $@ $<
-
-%.o: %.c
- $(CC) $(INCLUDE) -DAST_MODULE=\"$*\" -o $@ -c $<
Deleted: branches/1.0/package/asterisk/app_fax.c
===================================================================
--- branches/1.0/package/asterisk/app_fax.c 2013-12-25 20:32:52 UTC (rev 6324)
+++ branches/1.0/package/asterisk/app_fax.c 2013-12-26 21:55:27 UTC (rev 6325)
@@ -1,687 +0,0 @@
-/*
- * Application to send or receive a TIFF FAX file
- * based on app_rxfax.c from: Copyright (C) 2003, Steve Underwood <st...@co...>
- * based on app_rxfax.c from www.callweaver.org, Massimo Cetra & more.
- * based on app_rxfax.c from Antonio Gallo
- * thanks to all people who contributed to this project, for credits check SourceForge project page
- * (C) 2009 by Antonio Gallo <ag...@li...>
- */
-
-/*** MODULEINFO
- <depend>spandsp</depend>
- ***/
-
-#include "asterisk.h"
-
-ASTERISK_FILE_VERSION(__FILE__, "$Revision:$")
-
-#include <errno.h>
-
-#define SPANDSP_EXPOSE_INTERNAL_STRUCTURES
-#include <spandsp.h>
-#include <spandsp/version.h>
-#if SPANDSP_RELEASE_DATE < 20081212
-#error YOU NEED SPANDSP 0.0.6 pre12 to compile this
-#endif
-
-// #include "../addon_version.h"
-#define AGX_AST_ADDON_VERSION "1.4.24.5"
-#include "asterisk/version.h"
-#include "asterisk/pbx.h"
-#include "asterisk/file.h"
-#include "asterisk/module.h"
-#include "asterisk/manager.h"
-#include "asterisk/options.h"
-#include "asterisk/logger.h"
-#include "asterisk/threadstorage.h"
-
-#define fax_log(...) _fax_log(__VA_ARGS__)
-#define _fax_log(msg, level, file, line, function, fmt, ...) \
- ast_log(level, file, line, function, fmt, ## __VA_ARGS__); \
- if (msg && msg->log) do { \
- fprintf(msg->log, "[%d] %s:%d/%s: " fmt, level, file, line, function, ## __VA_ARGS__); \
- fflush(msg->log); \
- } while(0)
-
-#ifndef AST_MODULE
-#define AST_MODULE "app_fax"
-#endif
-
-static char *rxfax_app = "RxFAX";
-static char *txfax_app = "TxFAX";
-
-static char *rxfax_synopsis = "Receive a FAX to a file";
-static char *txfax_synopsis = "Send a FAX from a file";
-
-#define FAX_PROTOCOL_DESC "" \
- " DISABLE_V17 to disable V.17 only\n" \
- " FAX_FORCE_V17 to force V.17 only\n" \
- " FAX_FORCE_V27 to force V.27 only\n" \
- " FAX_FORCE_V29 to force V.29 only\n" \
- " FAX_FORCE_V34 to force V.34 only\n" \
- "\n"
-
-#define FAX_RESULT_DESC "" \
- "Sets REMOTESTATIONID to the sender CSID.\n" \
- " FAXPAGES to the number of pages received.\n" \
- " FAXBITRATE to the transmition rate.\n" \
- " FAXRESOLUTION to the resolution.\n" \
- " PHASEESTATUS to the phase E result status.\n" \
- " PHASEESTRING to the phase E result string.\n" \
- "\n"
-
-
-static char *rxfax_descrip =
- " RxFAX(filename[|debug][|log=logfile]): Receives a FAX from the channel into the\n"
- "given filename. If the file exists it will be overwritten. The file\n"
- "should be in TIFF/F format. Transfer log will be appended to logfile\n"
- "The \"ecm\" option enables ECM.\n"
- "\n"
- "Uses LOCALSTATIONID to identify itself to the remote end.\n"
- " LOCALSUBADDRESS to specify a sub-address to the remote end.\n"
- " LOCALHEADERINFO to generate a header line on each page.\n"
- FAX_PROTOCOL_DESC
- FAX_RESULT_DESC
- "Note that PHASEESTATUS=0 means that the fax was handled correctly. But that doesn't\n"
- "imply that any pages were sent. Actually you should also check FAXPAGES to be\n"
- "greater than zero.\n"
- "Returns -1 when the user hangs up.\n"
- "Returns 0 otherwise.\n";
-
-static char *txfax_descrip =
- " TxFAX(filename[|verbose][|debug][|ecm][|log=logfile]): Send a given TIFF file to the channel as a FAX.\n"
- "The \"ecm\" option enables ECM. Transfer log will be appended to logfile\n"
- "\n"
- "Uses LOCALSTATIONID to identify itself to the remote end.\n"
- " LOCALHEADERINFO to generate a header line on each page.\n"
- FAX_PROTOCOL_DESC
- FAX_RESULT_DESC
- "Returns -1 when the user hangs up, or if the file does not exist.\n"
- "Returns 0 otherwise.\n";
-
-#define MAX_BLOCK_SIZE 240
-
-typedef struct {
- struct ast_channel *chan;
- fax_state_t fax;
- volatile int sendfax;
- volatile int finished;
- FILE * log;
-} t_session;
-
-
-AST_THREADSTORAGE(cur_session, cur_session_init);
-
-static void span_message(int level, const char *msg)
-{
- t_session ** ppsession;
- t_session * psession = NULL;
- int ast_level;
- if (msg==NULL) return;
- if ((ppsession = ast_threadstorage_get(&cur_session, sizeof(*ppsession)))) psession = *ppsession;
- if ( (level == SPAN_LOG_ERROR) || (level == SPAN_LOG_PROTOCOL_ERROR) )
- ast_level = __LOG_ERROR;
- else if ( (level == SPAN_LOG_WARNING) || (level == SPAN_LOG_PROTOCOL_WARNING ) )
- ast_level = __LOG_WARNING;
- else if ( (level == SPAN_LOG_FLOW) || (level == SPAN_LOG_FLOW_2) || (level == SPAN_LOG_FLOW_3) ) {
- if (option_verbose>=255) {
- ast_verbose( VERBOSE_PREFIX_4 "%s", msg);
- }
- return;
- } else {
- if (option_verbose>=255) {
- ast_verbose( VERBOSE_PREFIX_4 VERBOSE_PREFIX_4 "%s", msg);
- }
- return;
- }
- fax_log(psession, ast_level, _A_, "%s", msg);
- ast_verbose( VERBOSE_PREFIX_3 "%s", msg);
-}
-
-/*- End of function --------------------------------------------------------*/
-
-static int phase_b_handler(t30_state_t *s, void *user_data, int result)
-{
- t_session *psession = (t_session *) user_data;
- char *appname = (psession->sendfax) ? "TXFAX" : "RXFAX";
- fax_log( psession, LOG_DEBUG, "[%s phase_b_handler] channel: %s\n", appname, psession->chan->name );
- return T30_ERR_OK;
-}
-
-/*- End of function --------------------------------------------------------*/
-
-static void phase_e_handler(t30_state_t *s, void *user_data, int result)
-{
- struct ast_channel *chan;
- const char *tx_ident;
- const char *rx_ident;
- char buf[128];
- t30_stats_t t;
-
- t_session *psession = (t_session *) user_data;
- chan = psession->chan;
- t30_get_transfer_statistics(s, &t);
-
- tx_ident = t30_get_tx_ident(s);
- if (tx_ident == NULL)
- tx_ident = "";
- rx_ident = t30_get_rx_ident(s);
- if (rx_ident == NULL)
- rx_ident = "";
- pbx_builtin_setvar_helper(chan, "REMOTESTATIONID", rx_ident);
- int tmp_pages = (psession->sendfax) ? t.pages_tx : t.pages_rx;
- snprintf(buf, sizeof(buf), "%d", tmp_pages);
- pbx_builtin_setvar_helper(chan, "FAXPAGES", buf);
- snprintf(buf, sizeof(buf), "%d", t.y_resolution);
- pbx_builtin_setvar_helper(chan, "FAXRESOLUTION", buf);
- snprintf(buf, sizeof(buf), "%d", t.bit_rate);
- pbx_builtin_setvar_helper(chan, "FAXBITRATE", buf);
- snprintf(buf, sizeof(buf), "%d", result);
- pbx_builtin_setvar_helper(chan, "PHASEESTATUS", buf);
- snprintf(buf, sizeof(buf), "%s", t30_completion_code_to_str(result));
- pbx_builtin_setvar_helper(chan, "PHASEESTRING", buf);
-
- // This is to tell asterisk later that the fax has finished (with or without error)
- char *direction = NULL;
- if (psession->sendfax) {
- psession->finished = TRUE;
- direction = "FaxSent";
- } else {
- direction = "FaxReceived";
- }
-
- if (result == T30_ERR_OK)
- {
- int tmp_pages = (psession->sendfax) ? t.pages_tx : t.pages_rx;
- char *tmp_fname = (psession->sendfax) ? s->tx_file : s->rx_file;
- manager_event(EVENT_FLAG_CALL,
- direction, "Channel: %s\nExten: %s\nCallerID: %s\nRemoteStationID: %s\nLocalStationID: %s\nPagesTransferred: %i\nResolution: %i\nTransferRate: %i\nFileName: %s\n",
- chan->name,
- chan->exten,
- (chan->cid.cid_num) ? chan->cid.cid_num : "",
- rx_ident,
- tx_ident,
- tmp_pages,
- t.y_resolution,
- t.bit_rate,
- tmp_fname);
- fax_log(psession, LOG_NOTICE, "[%s OK] Remote: %s Local: %s Pages: %i Speed: %i \n", direction, rx_ident, tx_ident, tmp_pages, t.bit_rate );
- ast_verbose(VERBOSE_PREFIX_1 "[%s OK] Remote: %s Local: %s Pages: %i Speed: %i \n", direction, rx_ident, tx_ident, tmp_pages, t.bit_rate );
- }
- else
- {
- fax_log(psession, LOG_ERROR, "[%s ERROR] result (%d) %s.\n", direction, result, t30_completion_code_to_str(result));
- ast_verbose(VERBOSE_PREFIX_1 "[%s ERROR] result (%d) %s.\n", direction, result, t30_completion_code_to_str(result));
- }
-}
-/*- End of function --------------------------------------------------------*/
-
-static int phase_d_handler(t30_state_t *s, void *user_data, int result)
-{
- if (result)
- {
- t30_stats_t t;
- t_session *psession = (t_session *) user_data;
- t30_get_transfer_statistics(s, &t);
- char *direction = (psession->sendfax) ? "TXFAX" : "RXFAX";
- int tmp_pages = (psession->sendfax) ? t.pages_tx : t.pages_rx;
- t30_get_transfer_statistics(s, &t);
- fax_log(psession, LOG_NOTICE, "[%s NEW PAGE]: Channel: %s Pages: %i Speed: %i\n", direction, psession->chan->name, tmp_pages, t.bit_rate );
- fax_log(psession, LOG_NOTICE, " Bad rows: %i - Longest bad row run: %i - Compression type: %s\n", t.bad_rows, t.longest_bad_row_run, t4_encoding_to_str(t.encoding));
- fax_log(psession, LOG_NOTICE, " Image size bytes: %i - Image size: %i x %i - Image resolution: %i x %i\n", t.image_size, t.width, t.length, t.x_resolution, t.y_resolution);
- ast_verbose(VERBOSE_PREFIX_3 "[%s NEW PAGE]: Channel: %s Pages: %i Speed: %i\n", direction, psession->chan->name, tmp_pages, t.bit_rate );
- }
- return T30_ERR_OK;
-}
-/*- End of function --------------------------------------------------------*/
-
-static int fax_run(struct ast_channel *chan, void *data, int sendfax)
-{
- int res = 0;
- char tiff_file[256];
- char template_file[256];
- int samples;
- char *s;
- char *t;
- char *v;
- const char *x;
- int option;
- int len;
- struct ast_frame *inf = NULL;
- struct ast_frame outf;
- int verbose;
- int ecm = FALSE;
-
- struct ast_module_user *u;
-
- int original_read_fmt;
- int original_write_fmt;
- int i;
-
- t_session session;
- t_session * psession;
- t_session ** ppsession;
- session.chan = chan;
- session.finished = FALSE;
- session.sendfax = sendfax;
- session.log = NULL;
- memset( &session.fax, 0, sizeof(fax_state_t));
- psession = &session;
- if ((ppsession = ast_threadstorage_get(&cur_session, sizeof(*ppsession)))) *ppsession = &session;
-
- // Indetify the app
- char *appname = (sendfax) ? "TXFAX" : "RXFAX";
-
- /* Basic initial checkings */
-
- if (chan == NULL) {
- ast_log(LOG_ERROR, "%s: channel is NULL. Giving up.\n", appname);
- return -1;
- }
-
-
- /* Resetting channel variables related to T38 */
- pbx_builtin_setvar_helper(chan, "REMOTESTATIONID", "");
- pbx_builtin_setvar_helper(chan, "FAXPAGES", "");
- pbx_builtin_setvar_helper(chan, "FAXRESOLUTION", "");
- pbx_builtin_setvar_helper(chan, "FAXBITRATE", "");
- pbx_builtin_setvar_helper(chan, "PHASEESTATUS", "");
- pbx_builtin_setvar_helper(chan, "PHASEESTRING", "");
-
- /* Parsig parameters */
-
- /* The next few lines of code parse out the filename and header from the input string */
- if (data == NULL)
- {
- /* No data implies no filename or anything is present */
- ast_log(LOG_ERROR, "%s: requires an argument (filename)\n", appname);
- return -1;
- }
-
- verbose = FALSE;
- tiff_file[0] = '\0';
-
- char tbuf[256];
- for (option = 0, v = s = data; v; option++, s++) {
- t = s;
- v = strchr(s, '|');
- s = (v) ? v : s + strlen(s);
- len = s - t;
- if (len > 255)
- len = 255;
- strncpy((char *) tbuf, t, len);
- tbuf[len] = '\0';
- if (option == 0) {
- /* The first option is always the file name */
- strncpy(tiff_file, t, len);
- tiff_file[len] = '\0';
- if (!sendfax) {
- /* Allow the use of %d in the file name for a wild card of sorts, to
- create a new file with the specified name scheme */
- if ((x = strchr(tiff_file, '%')) && x[1] == 'd') {
- strcpy(template_file, tiff_file);
- i = 0;
- do {
- snprintf(tiff_file, 256, template_file, 1);
- i++;
- } while (ast_fileexists(tiff_file, "", chan->language) != -1);
- }
- }
- } else if (strncmp("debug", t, len) == 0) {
- verbose = TRUE;
- } else if (strncmp("verbose", t, len) == 0) {
- verbose = TRUE;
- } else if (strncmp("ecm", t, len) == 0) {
- ecm = TRUE;
- } else if (strncmp("log=", t, 4) == 0) {
- session.log = fopen(tbuf+4, "a+");
- if (!session.log)
- ast_log(LOG_ERROR, "%s: Can't open log %s: %s\n", appname, tbuf+4, strerror(errno));
- }
- }
- /* Done parsing */
-
- u = ast_module_user_add(chan);
-
- // Answer the channel
- if (chan->_state != AST_STATE_UP)
- {
- fax_log(psession, LOG_DEBUG, "%s: TODO: answering channel '%s'\n", appname, chan->name);
- //res = ast_answer(chan);
- ast_answer(chan);
- }
-
- /* Setting read and write formats */
-
- original_read_fmt = chan->readformat;
- if (original_read_fmt != AST_FORMAT_SLINEAR)
- {
- res = ast_set_read_format(chan, AST_FORMAT_SLINEAR);
- if (res < 0)
- {
- fax_log(psession, LOG_WARNING, "%s: Unable to set to linear read mode, giving up\n", appname);
- ast_module_user_remove(u);
- return -1;
- }
- }
-
- original_write_fmt = chan->writeformat;
- if (original_write_fmt != AST_FORMAT_SLINEAR)
- {
- res = ast_set_write_format(chan, AST_FORMAT_SLINEAR);
- if (res < 0)
- {
- fax_log(psession, LOG_ERROR, "%s: Unable to set to linear write mode, giving up\n", appname);
- res = ast_set_read_format(chan, original_read_fmt);
- if (res)
- fax_log(psession, LOG_WARNING, "%s: Unable to restore read format on '%s'\n", appname, chan->name);
- ast_module_user_remove(u);
- return -1;
- }
- }
-
- /* Remove any app level gain adjustments and disable echo cancel. */
- signed char sc;
- sc = 0;
- ast_channel_setoption(chan, AST_OPTION_RXGAIN, &sc, sizeof(sc), 0);
- ast_channel_setoption(chan, AST_OPTION_TXGAIN, &sc, sizeof(sc), 0);
- ast_channel_setoption(chan, AST_OPTION_ECHOCAN, &sc, sizeof(sc), 0);
-
- /* This is the main loop */
-
- uint8_t __buf[sizeof(uint16_t)*MAX_BLOCK_SIZE + 2*AST_FRIENDLY_OFFSET];
- uint8_t *buf = __buf + AST_FRIENDLY_OFFSET;
-
-
- if (fax_init(&session.fax, sendfax) == NULL)
- {
- fax_log(psession, LOG_ERROR, "%s: fax_init() Unable to start\n", appname);
- ast_module_user_remove(u);
- return -1;
- }
- fax_set_transmit_on_idle(&session.fax, TRUE);
- span_log_set_message_handler(&session.fax.logging, span_message);
- span_log_set_message_handler(&session.fax.t30.logging, span_message);
- if (verbose)
- {
- span_log_set_level(&session.fax.logging, SPAN_LOG_SHOW_SEVERITY | SPAN_LOG_SHOW_PROTOCOL | SPAN_LOG_FLOW);
- span_log_set_level(&session.fax.t30.logging, SPAN_LOG_SHOW_SEVERITY | SPAN_LOG_SHOW_PROTOCOL | SPAN_LOG_FLOW);
- } else {
- span_log_set_level(&session.fax.logging, SPAN_LOG_ERROR | SPAN_LOG_WARNING | SPAN_LOG_PROTOCOL_ERROR | SPAN_LOG_PROTOCOL_WARNING );
- span_log_set_level(&session.fax.t30.logging, SPAN_LOG_ERROR | SPAN_LOG_WARNING | SPAN_LOG_PROTOCOL_ERROR | SPAN_LOG_PROTOCOL_WARNING );
- }
- x = pbx_builtin_getvar_helper(chan, "LOCALSTATIONID");
- if (x && x[0])
- t30_set_tx_ident(&session.fax.t30, x);
- x = pbx_builtin_getvar_helper(chan, "LOCALSUBADDRESS");
- if (x && x[0])
- t30_set_tx_sub_address(&session.fax.t30, x);
- x = pbx_builtin_getvar_helper(chan, "LOCALHEADERINFO");
- if (x && x[0])
- t30_set_tx_page_header_info(&session.fax.t30, x);
- t30_set_phase_b_handler(&session.fax.t30, phase_b_handler, &session);
- t30_set_phase_d_handler(&session.fax.t30, phase_d_handler, &session);
- t30_set_phase_e_handler(&session.fax.t30, phase_e_handler, &session);
- if (!sendfax) {
- t30_set_rx_file(&session.fax.t30, tiff_file, -1);
- } else {
- t30_set_tx_file(&session.fax.t30, tiff_file, -1, -1);
- }
-
- // Default Support ALL
- t30_set_supported_modems(&(session.fax.t30), T30_SUPPORT_V29 | T30_SUPPORT_V27TER | T30_SUPPORT_V17 );
-
- x = pbx_builtin_getvar_helper(chan, "FAX_DISABLE_V17");
- if (x && x[0])
- t30_set_supported_modems(&(session.fax.t30), T30_SUPPORT_V29 | T30_SUPPORT_V27TER);
- x = pbx_builtin_getvar_helper(chan, "FAX_FORCE_V17");
- if (x && x[0])
- t30_set_supported_modems(&(session.fax.t30), T30_SUPPORT_V17);
- x = pbx_builtin_getvar_helper(chan, "FAX_FORCE_V27");
- if (x && x[0])
- t30_set_supported_modems(&(session.fax.t30), T30_SUPPORT_V27TER);
- x = pbx_builtin_getvar_helper(chan, "FAX_FORCE_V29");
- if (x && x[0])
- t30_set_supported_modems(&(session.fax.t30), T30_SUPPORT_V29);
- x = pbx_builtin_getvar_helper(chan, "FAX_FORCE_V34");
- if (x && x[0])
- t30_set_supported_modems(&(session.fax.t30), T30_SUPPORT_V34);
-
- /* Support for different image sizes && resolutions*/
- t30_set_supported_image_sizes(&session.fax.t30, T30_SUPPORT_US_LETTER_LENGTH | T30_SUPPORT_US_LEGAL_LENGTH | T30_SUPPORT_UNLIMITED_LENGTH
- | T30_SUPPORT_215MM_WIDTH | T30_SUPPORT_255MM_WIDTH | T30_SUPPORT_303MM_WIDTH);
- t30_set_supported_resolutions(&session.fax.t30, T30_SUPPORT_STANDARD_RESOLUTION | T30_SUPPORT_FINE_RESOLUTION | T30_SUPPORT_SUPERFINE_RESOLUTION
- | T30_SUPPORT_R8_RESOLUTION | T30_SUPPORT_R16_RESOLUTION);
- if (ecm) {
- t30_set_ecm_capability(&(session.fax.t30), TRUE);
- t30_set_supported_compressions(&(session.fax.t30), T30_SUPPORT_T4_1D_COMPRESSION | T30_SUPPORT_T4_2D_COMPRESSION | T30_SUPPORT_T6_COMPRESSION);
- } else {
- t30_set_ecm_capability(&(session.fax.t30), FALSE);
- t30_set_supported_compressions(&(session.fax.t30), T30_SUPPORT_T4_1D_COMPRESSION | T30_SUPPORT_T4_2D_COMPRESSION );
- fax_log(psession, LOG_DEBUG, "%s: ECM mode is not enabled\n", appname );
- }
-
-
- /* This is the main loop */
-
- res = 0;
-
- /* temporary workwaround vars */
- int donotspam=10;
- int watchdog=256;
-
- while ( (!session.finished) && chan )
- {
- // new from 0.0.6
- if (!t30_call_active(&session.fax.t30)) {
- fax_log(psession, LOG_WARNING, "%s: t30_call_active is FALSE.\n", appname);
- res = 0;
- break;
- }
-
- if ((session.fax.t30.current_rx_type == T30_MODEM_DONE) || (session.fax.t30.current_tx_type == T30_MODEM_DONE)) {
- /* Avoid spamming debug info */
- if (donotspam>0) {
- fax_log(psession, LOG_WARNING, "%s: Channel T30 DONE < 0.\n", appname);
- donotspam--;
- }
- /*
- * Workaround: let 256 more packet to pass thru then definitively hangup
- */
- if (watchdog>0) {
- watchdog--;
- } else {
- break;
- }
- }
-
- if (ast_check_hangup(chan)) {
- fax_log(psession, LOG_WARNING, "%s: Channel has been hanged at fax.\n", appname);
- res = 0;
- break;
- }
-#define TESTING
-#ifdef TESTING
- if ((res = ast_waitfor(chan, 100)) < 0) {
-#else
- /* STABLE CODE */
- if ((res = ast_waitfor(chan, 20)) < 0) {
-#endif
- fax_log(psession, LOG_WARNING, "%s: Channel ast_waitfor < 0.\n", appname);
- res = 0;
- break;
- }
-
- /*
- * in asterisk 1.4.24 ast_waitfor has been changed
- * ast_read generate a warning in channel.c since now ast_waitfor returning 0
- * means "TIMEOUT"
- * so if the previous function return 0 we have to loop and try again
- */
- if (res == 0) {
-#undef EXPERIMENTAL
-#ifdef EXPERIMENTAL
-// fax_log(psession, LOG_WARNING, "%s: ast_waitfor returned 0, i will continue...\n", appname);
- samples = 20;
- // Queue empty frame?
- len = samples;
- memset(&outf, 0, sizeof(outf));
- outf.frametype = AST_FRAME_VOICE;
- outf.subclass = AST_FORMAT_SLINEAR;
- outf.datalen = len*sizeof(int16_t);
- outf.samples = len;
- outf.data = &buf[AST_FRIENDLY_OFFSET];
- outf.offset = AST_FRIENDLY_OFFSET;
- outf.src = appname;
- memset(&buf[AST_FRIENDLY_OFFSET], 0, outf.datalen);
- if (ast_write(chan, &outf) < 0)
- {
- fax_log(psession, LOG_WARNING, "%s: Unable to write frame to channel; %s\n", appname, strerror(errno));
- }
-#endif
- continue;
- }
-
- inf = ast_read(chan);
- if (inf == NULL)
- {
- fax_log(psession, LOG_WARNING, "%s: Channel INF is NULL, i will continue...\n", appname);
- // PROBABLY: While trasmiitting i got: Received a DCN from remote after sending a page at last page
- continue;
- }
-
- /* We got a frame */
- /* Check the frame type. Format also must be checked because there is a chance
- that a frame in old format was already queued before we set chanel format
- to slinear so it will still be received by ast_read */
- if (inf->frametype == AST_FRAME_VOICE && inf->subclass == AST_FORMAT_SLINEAR) {
- if (fax_rx(&session.fax, inf->data, inf->samples)) {
- fax_log(psession, LOG_WARNING, "%s: fax_rx returned error\n", appname);
- res = -1;
- break;
- }
-
- samples = (inf->samples <= MAX_BLOCK_SIZE) ? inf->samples : MAX_BLOCK_SIZE;
- len = fax_tx(&session.fax, (int16_t *) &buf[AST_FRIENDLY_OFFSET], samples);
- if (len>0) {
- memset(&outf, 0, sizeof(outf));
- outf.frametype = AST_FRAME_VOICE;
- outf.subclass = AST_FORMAT_SLINEAR;
- outf.datalen = len*sizeof(int16_t);
- outf.samples = len;
- outf.data = &buf[AST_FRIENDLY_OFFSET];
- outf.offset = AST_FRIENDLY_OFFSET;
- outf.src = appname;
- if (ast_write(chan, &outf) < 0)
- {
- fax_log(psession, LOG_WARNING, "%s: Unable to write frame to channel; %s\n", appname, strerror(errno));
- res = -1;
- break;
- }
- }
- else
- {
- // Queue empty frame?
- len = samples;
- memset(&outf, 0, sizeof(outf));
- outf.frametype = AST_FRAME_VOICE;
- outf.subclass = AST_FORMAT_SLINEAR;
- outf.datalen = len*sizeof(int16_t);
- outf.samples = len;
- outf.data = &buf[AST_FRIENDLY_OFFSET];
- outf.offset = AST_FRIENDLY_OFFSET;
- outf.src = appname;
- // clear data before to write
- memset(&buf[AST_FRIENDLY_OFFSET], 0, outf.datalen);
- if (ast_write(chan, &outf) < 0)
- {
- fax_log(psession, LOG_WARNING, "%s: Unable to write frame to channel; %s\n", appname, strerror(errno));
- res = -1;
- break;
- }
- }
- // end if: len>0
- }
- ast_frfree(inf);
- inf = NULL;
- /* TODO put a Watchdog here */
- }
-
- if (inf != NULL)
- {
- ast_frfree(inf);
- inf = NULL;
- }
-
- t30_terminate(&session.fax.t30);
- fax_release(&session.fax);
- if (sendfax) {
- if (session.finished) {
- fax_log(psession, LOG_WARNING, "TXFAX: Fax Transmission complete, check return code\n");
- res = 0;
- } else {
- fax_log(psession, LOG_WARNING, "TXFAX: Fax Transmission INCOMPLETE, check error code\n");
- res = -1;
- }
- if (res!=0) {
- fax_log(psession, LOG_WARNING, "TXFAX: Transmission RES error = %i\n", res);
- }
- }
-
- /* Restoring initial channel formats. */
-
- if (original_read_fmt && original_read_fmt != AST_FORMAT_SLINEAR)
- {
- res = ast_set_read_format(chan, original_read_fmt);
- if (res)
- fax_log(psession, LOG_WARNING, "%s: Unable to restore read format on '%s'\n", appname, chan->name);
- }
- if (original_write_fmt && original_write_fmt != AST_FORMAT_SLINEAR)
- {
- res = ast_set_write_format(chan, original_write_fmt);
- if (res)
- fax_log(psession, LOG_WARNING, "%s: Unable to restore write format on '%s'\n", appname, chan->name);
- }
- ast_module_user_remove(u);
- if(session.log) fclose(session.log);
- return res;
-}
-
-/*- End of function --------------------------------------------------------*/
-
-static int rxfax_exec(struct ast_channel *chan, void *data) {
- return fax_run(chan,data,FALSE);
-}
-
-static int txfax_exec(struct ast_channel *chan, void *data) {
- return fax_run(chan,data,TRUE);
-}
-
-/*- End of function --------------------------------------------------------*/
-
-static int unload_module(void)
-{
- int res = 0;
- ast_module_user_hangup_all();
- res = ast_unregister_application(rxfax_app);
- res |= ast_unregister_application(txfax_app);
- return res;
-}
-/*- End of function --------------------------------------------------------*/
-
-static int load_module(void)
-{
- ast_log(LOG_NOTICE, "app_fax %s using spandsp %s\n", AGX_AST_ADDON_VERSION, SPANDSP_RELEASE_DATETIME_STRING );
- if (ASTERISK_VERSION_NUM != 10424)
- ast_log(LOG_WARNING, "app_fax is untested with asterisk headers different from ASTERISK_VERSION_NUM = 10424\n");
- int res = 0;
- res = ast_register_application(rxfax_app, rxfax_exec, rxfax_synopsis, rxfax_descrip);
- res |= ast_register_application(txfax_app, txfax_exec, txfax_synopsis, txfax_descrip);
- return res;
-}
-
-/*- End of function --------------------------------------------------------*/
-
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "FAX Application based on SpanDSP");
-
-/*- End of file ------------------------------------------------------------*/
Deleted: branches/1.0/package/asterisk/app_pagecon.c
===================================================================
--- branches/1.0/package/asterisk/app_pagecon.c 2013-12-25 20:32:52 UTC (rev 6324)
+++ branches/1.0/package/asterisk/app_pagecon.c 2013-12-26 21:55:27 UTC (rev 6325)
@@ -1,278 +0,0 @@
-/*
- * Asterisk -- An open source telephony toolkit.
- *
- * Copyright (c) 2004 - 2006 Digium, Inc. All rights reserved.
- *
- * Mark Spencer <mar...@di...>
- * Nick D'Amato <nd...@st...>
- * Kristian Kielhofner <kr...@kr...>
- *
- * This code is released under the GNU General Public License
- * version 2.0. See LICENSE for more information.
- *
- * See http://www.asterisk.org for more information about
- * the Asterisk project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
- *
- */
-
-/*! \file
- *
- * \brief page() - Paging application
- *
- * \ingroup applications
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <errno.h>
-
-#include "asterisk.h"
-
-ASTERISK_FILE_VERSION(__FILE__, "$Revision: 19812 $")
-
-#include "asterisk/options.h"
-#include "asterisk/logger.h"
-#include "asterisk/channel.h"
-#include "asterisk/pbx.h"
-#include "asterisk/module.h"
-#include "asterisk/file.h"
-#include "asterisk/app.h"
-#include "asterisk/chanvars.h"
-
-
-static const char *tdesc = "Page Multiple Phones";
-
-static const char *app_pagecon = "PageCon";
-
-static const char *pagecon_synopsis = "Pages phones";
-
-static const char *pagecon_descrip =
-"PageCon(Technology/Resource&Technology2/Resource2[|options])\n"
-" Places outbound calls to the given technology / resource and dumps\n"
-"them into a conference bridge as muted participants. The original\n"
-"caller is dumped into the conference as a speaker and the room is\n"
-"destroyed when the original caller leaves. Valid options are:\n"
-" d - full duplex audio\n"
-" q - quiet, do not play beep to caller\n"
-" e - exclude channels in use\n";
-
-STANDARD_LOCAL_USER;
-
-LOCAL_USER_DECL;
-
-enum {
- PAGE_DUPLEX = (1 << 0),
- PAGE_QUIET = (1 << 1),
- PAGE_EXCLUDE = (1 << 2),
-} page_opt_flags;
-
-AST_APP_OPTIONS(page_opts, {
- AST_APP_OPTION('d', PAGE_DUPLEX),
- AST_APP_OPTION('q', PAGE_QUIET),
- AST_APP_OPTION('e', PAGE_EXCLUDE)
-});
-
-struct calloutdata {
- char cidnum[64];
- char cidname[64];
- char tech[64];
- char resource[256];
- char conferenceopts[64];
- struct ast_variable *variables;
-};
-
-static void *page_thread(void *data)
-{
- struct calloutdata *cd = data;
- ast_pbx_outgoing_app(cd->tech, AST_FORMAT_SLINEAR, cd->resource, 30000,
- "Conference", cd->conferenceopts, NULL, 0, cd->cidnum, cd->cidname, cd->variables, NULL, NULL);
- free(cd);
- return NULL;
-}
-
-static void launch_page(struct ast_channel *chan, const char *conferenceopts, const char *tech, const char *resource)
-{
- struct calloutdata *cd;
- const char *varname;
- struct ast_variable *lastvar = NULL;
- struct ast_var_t *varptr;
- pthread_t t;
- pthread_attr_t attr;
- cd = malloc(sizeof(struct calloutdata));
- if (cd) {
- memset(cd, 0, sizeof(struct calloutdata));
- ast_copy_string(cd->cidnum, chan->cid.cid_num ? chan->cid.cid_num : "", sizeof(cd->cidnum));
- ast_copy_string(cd->cidname, chan->cid.cid_name ? chan->cid.cid_name : "", sizeof(cd->cidname));
- ast_copy_string(cd->tech, tech, sizeof(cd->tech));
- ast_copy_string(cd->resource, resource, sizeof(cd->resource));
- ast_copy_string(cd->conferenceopts, conferenceopts, sizeof(cd->conferenceopts));
-
- AST_LIST_TRAVERSE(&chan->varshead, varptr, entries) {
- if (!(varname = ast_var_full_name(varptr)))
- continue;
- if (varname[0] == '_') {
- struct ast_variable *newvar = NULL;
-
- if (varname[1] == '_') {
- newvar = ast_variable_new(varname, ast_var_value(varptr));
- } else {
- newvar = ast_variable_new(&varname[1], ast_var_value(varptr));
- }
-
- if (newvar) {
- if (lastvar)
- lastvar->next = newvar;
- else
- cd->variables = newvar;
- lastvar = newvar;
- }
- }
- }
-
- pthread_attr_init(&attr);
- pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
- if (ast_pthread_create(&t, &attr, page_thread, cd)) {
- ast_log(LOG_WARNING, "Unable to create paging thread: %s\n", strerror(errno));
- free(cd);
- }
- }
-}
-
-static int pagecon_exec(struct ast_channel *chan, void *data)
-{
- struct localuser *u;
- char *options;
- char *tech, *resource;
- char conferenceopts[80];
- struct ast_flags flags = { 0 };
- unsigned int confid = rand();
- struct ast_app *app;
- char *tmp;
- int res=0;
- char originator[AST_CHANNEL_NAME];
- char exclude_list[1024] = "";
- struct ast_channel *c = NULL, *bc = NULL;
- char *cnameT;
- int numchans = 0;
-
-
- if (ast_strlen_zero(data)) {
- ast_log(LOG_WARNING, "This application requires at least one argument (destination(s) to page)\n");
- return -1;
- }
-
- LOCAL_USER_ADD(u);
-
- if (!(app = pbx_findapp("Conference"))) {
- ast_log(LOG_WARNING, "There is no Conference application available!\n");
- LOCAL_USER_REMOVE(u);
- return -1;
- };
-
- options = ast_strdupa(data);
- if (!options) {
- ast_log(LOG_ERROR, "Out of memory\n");
- LOCAL_USER_REMOVE(u);
- return -1;
- }
-
- ast_copy_string(originator, chan->name,...
[truncated message content] |
