Menu
▾
▴
[Astlinux-commits] SF.net SVN: astlinux:[7908] branches/1.0
|
From: <abe...@us...> - 2016-11-02 15:26:04
|
Revision: 7908
http://sourceforge.net/p/astlinux/code/7908
Author: abelbeck
Date: 2016-11-02 15:26:01 +0000 (Wed, 02 Nov 2016)
Log Message:
-----------
Remove Asterisk 1.8 support, also remove related packages: asterisk-app_notify and asterisk-gui
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux-ast13.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-codec-silk/Config.in
branches/1.0/package/webinterface/webinterface.mk
branches/1.0/scripts/beta-run-image-upload
branches/1.0/scripts/master-build
branches/1.0/scripts/master-upload
branches/1.0/x86_64-configs/astlinux-ast11.config
branches/1.0/x86_64-configs/astlinux-ast13.config
Removed Paths:
-------------
branches/1.0/astlinux18.config
branches/1.0/package/asterisk/asterisk-1.8-AST-2016-001-1.8.patch
branches/1.0/package/asterisk/asterisk-1.8-AST-2016-002-1.8.patch
branches/1.0/package/asterisk/asterisk-1.8-AST-2016-003-1.8.patch
branches/1.0/package/asterisk/asterisk-1.8-configure-cross-fix.patch
branches/1.0/package/asterisk/asterisk-1.8-extension-changed-verbosity-chan_sip.patch
branches/1.0/package/asterisk/asterisk-1.8-srtp-openssl-random.patch
branches/1.0/package/asterisk/asterisk-1.8-voicemail-multiple-recipients.patch
branches/1.0/package/asterisk-app_notify/
branches/1.0/package/asterisk-gui/
branches/1.0/project/astlinux/asterisk.makeopts-1
branches/1.0/x86_64-configs/astlinux18.config
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2016-11-01 12:48:25 UTC (rev 7907)
+++ branches/1.0/astlinux-ast11.config 2016-11-02 15:26:01 UTC (rev 7908)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7702-dirty Configuration
-# Sat Jun 4 17:22:10 2016
+# Buildroot astlinux-1.x-svn7907-dirty Configuration
+# Wed Nov 2 08:46:10 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -157,7 +157,6 @@
# Asterisk, XMPP and telephony applications
#
BR2_PACKAGE_ASTERISK=y
-# BR2_PACKAGE_ASTERISK_v1_8 is not set
BR2_PACKAGE_ASTERISK_v11=y
# BR2_PACKAGE_ASTERISK_v13 is not set
@@ -171,7 +170,6 @@
# BR2_PACKAGE_ASTERISK_MENUSELECT is not set
BR2_PACKAGE_ASTERISK_CODEC_SILK=y
BR2_PACKAGE_ASTERISK_FOP2=y
-# BR2_PACKAGE_ASTERISK_GUI is not set
BR2_PACKAGE_PHONEPROV_TOOLS=y
BR2_PACKAGE_DAHDI_LINUX=y
BR2_PACKAGE_DAHDI_OSLEC=y
Modified: branches/1.0/astlinux-ast13.config
===================================================================
--- branches/1.0/astlinux-ast13.config 2016-11-01 12:48:25 UTC (rev 7907)
+++ branches/1.0/astlinux-ast13.config 2016-11-02 15:26:01 UTC (rev 7908)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7702-dirty Configuration
-# Sat Jun 4 17:22:15 2016
+# Buildroot astlinux-1.x-svn7907-dirty Configuration
+# Wed Nov 2 08:46:10 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -157,7 +157,6 @@
# Asterisk, XMPP and telephony applications
#
BR2_PACKAGE_ASTERISK=y
-# BR2_PACKAGE_ASTERISK_v1_8 is not set
# BR2_PACKAGE_ASTERISK_v11 is not set
BR2_PACKAGE_ASTERISK_v13=y
@@ -171,7 +170,6 @@
# BR2_PACKAGE_ASTERISK_MENUSELECT is not set
BR2_PACKAGE_ASTERISK_CODEC_SILK=y
BR2_PACKAGE_ASTERISK_FOP2=y
-# BR2_PACKAGE_ASTERISK_GUI is not set
BR2_PACKAGE_PHONEPROV_TOOLS=y
BR2_PACKAGE_DAHDI_LINUX=y
BR2_PACKAGE_DAHDI_OSLEC=y
Deleted: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2016-11-01 12:48:25 UTC (rev 7907)
+++ branches/1.0/astlinux18.config 2016-11-02 15:26:01 UTC (rev 7908)
@@ -1,929 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7702-dirty Configuration
-# Sat Jun 4 17:22:04 2016
-#
-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="iweb"
-BR2_KERNEL_MIRROR="http://www.kernel.org/pub"
-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-1.20.0-3.2p1/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 is not set
-BR2_BUSYBOX_VERSION_1_19_X=y
-# BR2_PACKAGE_BUSYBOX_SNAPSHOT is not set
-BR2_BUSYBOX_VERSION="1.19.4"
-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_8=y
-# BR2_PACKAGE_ASTERISK_v11 is not set
-# BR2_PACKAGE_ASTERISK_v13 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_APP_NOTIFY=y
-BR2_PACKAGE_ASTERISK_FOP2=y
-# BR2_PACKAGE_ASTERISK_GUI is not set
-BR2_PACKAGE_PHONEPROV_TOOLS=y
-BR2_PACKAGE_DAHDI_LINUX=y
-BR2_PACKAGE_DAHDI_OSLEC=y
-BR2_PACKAGE_DAHDI_HFCS=y
-# 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_KAMAILIO is not set
-# BR2_PACKAGE_OPENSIPS is not set
-BR2_PACKAGE_PROSODY=y
-# BR2_PACKAGE_RTPPROXY is not set
-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_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_FOSSIL=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
-#
-
-#
-# Network Interface Kernel Drivers
-#
-BR2_PACKAGE_E1000E=y
-BR2_PACKAGE_IGB=y
-BR2_PACKAGE_R8168=y
-BR2_PACKAGE_TG3=y
-
-#
-# Other Hardware
-#
-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_DMIDECODE 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_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_FLASHROM 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_MONIT=y
-# 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_RNG_TOOLS is not set
-# BR2_PACKAGE_SDPARM is not set
-# BR2_PACKAGE_SETSERIAL is not set
-BR2_PACKAGE_SMARTMONTOOLS=y
-# 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_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_CGI=y
-# BR2_PACKAGE_PHP_SAPI_CLI is not set
-# BR2_PACKAGE_PHP_SAPI_FPM is not set
-# BR2_PACKAGE_PHP_SAPI_CLI_CGI is not set
-# BR2_PACKAGE_PHP_SAPI_CLI_FPM is not set
-
-#
-# PHP Extensions
-#
-BR2_PACKAGE_PHP_EXT_TIMEZONEDB=y
-# BR2_PACKAGE_PHP_EXT_SOCKETS is not set
-BR2_PACKAGE_PHP_EXT_POSIX=y
-BR2_PACKAGE_PHP_EXT_SESSION=y
-BR2_PACKAGE_PHP_EXT_HASH=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=y
-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_TOKENIZER=y
-# BR2_PACKAGE_PHP_EXT_READLINE is not set
-# 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_CTYPE=y
-BR2_PACKAGE_PHP_EXT_FILTER=y
-# BR2_PACKAGE_PHP_EXT_CALENDAR is not set
-
-#
-# Database extensions
-#
-BR2_PACKAGE_PHP_EXT_PDO=y
-BR2_PACKAGE_PHP_EXT_PDO_SQLITE=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_ZLIB=y
-
-#
-# Crypto
-#
-# BR2_PACKAGE_BEECRYPT is not set
-BR2_PACKAGE_CA_CERTIFICATES=y
-# 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_LIBSODIUM=y
-BR2_PACKAGE_LIBSRTP=y
-
-#
-# 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=y
-BR2_PACKAGE_UNIXODBC=y
-
-#
-# 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=y
-BR2_PACKAGE_NEON_ZLIB=y
-BR2_PACKAGE_NEON_SSL=y
-# BR2_PACKAGE_NEON_NOXML is not set
-# BR2_PACKAGE_NEON_EXPAT is not set
-BR2_PACKAGE_NEON_LIBXML2=y
-BR2_PACKAGE_LIBMNL=y
-# BR2_PACKAGE_LIBNET is not set
-# BR2_PACKAGE_LIBNFNETLINK is not set
-# BR2_PACKAGE_LIBNL is not set
-BR2_PACKAGE_LIBPCAP=y
-# BR2_PACKAGE_PJSIP is not set
-# 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_LIBURIPARSER 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=y
-# 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_JANSSON is not set
-# 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_QEMU is not set
-# BR2_PACKAGE_SHARED_MIME_INFO is not set
-BR2_PACKAGE_ZONEINFO=y
-
-#
-# Networking applications
-#
-# BR2_PACKAGE_APCUPSD is not set
-# BR2_PACKAGE_ARGUS is not set
-BR2_PACKAGE_ARNOFW=y
-BR2_PACKAGE_ARP_SCAN=y
-BR2_PACKAGE_AVAHI=y
-# BR2_PACKAGE_AVAHI_AUTOIPD is not set
-BR2_PACKAGE_AVAHI_DAEMON=y
-# BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY 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_DDCLIENT=y
-BR2_PACKAGE_DHCPDUMP=y
-# BR2_PACKAGE_DIBBLER is not set
-BR2_PACKAGE_DNSCRYPT_PROXY=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_IPERF=y
-BR2_PACKAGE_IPERF3=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=y
-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 is not set
-# BR2_PACKAGE_LRZSZ is not set
-# 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=y
-# BR2_PACKAGE_NUT_SERIAL_DRIVERS 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_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_SIPGREP=y
-BR2_PACKAGE_SIPSAK=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_UNBOUND=y
-# 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_WIDE_DHCPV6=y
-# 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_BASH_DEFAULT_SHELL=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=y
-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_JOE is not set
-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="https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.80.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/package/Config.in
===================================================================
--- branches/1.0/package/Config.in 2016-11-01 12:48:25 UTC (rev 7907)
+++ branches/1.0/package/Config.in 2016-11-02 15:26:01 UTC (rev 7908)
@@ -5,10 +5,8 @@
menu "Asterisk, XMPP and telephony applications"
source "package/asterisk/Config.in"
-source "package/asterisk-app_notify/Config.in"
source "package/asterisk-codec-silk/Config.in"
source "package/asterisk-fop2/Config.in"
-source "package/asterisk-gui/Config.in"
source "package/phoneprov-tools/Config.in"
source "package/dahdi-linux/Config.in"
source "package/dahdi-tools/Config.in"
Modified: branches/1.0/package/asterisk/Config.in
===================================================================
--- branches/1.0/package/asterisk/Config.in 2016-11-01 12:48:25 UTC (rev 7907)
+++ branches/1.0/package/asterisk/Config.in 2016-11-02 15:26:01 UTC (rev 7908)
@@ -14,24 +14,19 @@
choice
prompt "Asterisk Version"
depends on BR2_PACKAGE_ASTERISK
- default BR2_PACKAGE_ASTERISK_v1_8
+ default BR2_PACKAGE_ASTERISK_v11
help
Select which version of Asterisk to compile and install.
- config BR2_PACKAGE_ASTERISK_v1_8
- bool "Asterisk v1.8.x"
- help
- Asterisk Long Term Stable Release.
-
config BR2_PACKAGE_ASTERISK_v11
bool "Asterisk v11.x"
help
- Asterisk Long Term Release.
+ Asterisk LTS Series
config BR2_PACKAGE_ASTERISK_v13
bool "Asterisk v13.x"
help
- Asterisk Long Term Release.
+ Asterisk LTS Series
endchoice
comment "cdr_mysql, app_mysql and res_config_mysql - disabled (requires MYSQL_CLIENT)"
Deleted: branches/1.0/package/asterisk/asterisk-1.8-AST-2016-001-1.8.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-1.8-AST-2016-001-1.8.patch 2016-11-01 12:48:25 UTC (rev 7907)
+++ branches/1.0/package/asterisk/asterisk-1.8-AST-2016-001-1.8.patch 2016-11-02 15:26:01 UTC (rev 7908)
@@ -1,140 +0,0 @@
-diff --git a/configs/http.conf.sample b/configs/http.conf.sample
-index 1a7f4fd..9a06fcf 100644
---- a/configs/http.conf.sample
-+++ b/configs/http.conf.sample
-@@ -67,10 +67,31 @@ bindaddr=127.0.0.1
- ; If no path is given for tlscertfile or tlsprivatekey, default is to look in current
- ; directory. If no tlsprivatekey is given, default is to search tlscertfile for private key.
- ;
-+;
- ; To produce a certificate you can e.g. use openssl. This places both the cert and
- ; private in same .pem file.
- ; openssl req -new -x509 -days 365 -nodes -out /tmp/foo.pem -keyout /tmp/foo.pem
- ;
-+; tlscipher= ; The list of allowed ciphers
-+; ; if none are specified the following cipher
-+; ; list will be used instead:
-+; ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:
-+; ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:
-+; kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:
-+; ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:
-+; ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:
-+; DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:
-+; AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:
-+; AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:
-+; !EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA
-+;
-+; tlsdisablev1=yes ; Disable TLSv1 support - if not set this defaults to "yes"
-+; tlsdisablev11=yes ; Disable TLSv1.1 support - if not set this defaults to "no"
-+; tlsdisablev12=yes ; Disable TLSv1.2 support - if not set this defaults to "no"
-+;
-+; tlsservercipherorder=yes ; Use the server preference order instead of the client order
-+; ; Defaults to "yes"
-+;
- ; The post_mappings section maps URLs to real paths on the filesystem. If a
- ; POST is done from within an authenticated manager session to one of the
- ; configured POST mappings, then any files in the POST will be placed in the
-diff --git a/include/asterisk/tcptls.h b/include/asterisk/tcptls.h
-index f3f5e1f..eb7166f 100644
---- a/include/asterisk/tcptls.h
-+++ b/include/asterisk/tcptls.h
-@@ -79,7 +79,15 @@ enum ast_ssl_flags {
- /*! Use SSLv3 for outgoing client connections */
- AST_SSL_SSLV3_CLIENT = (1 << 4),
- /*! Use TLSv1 for outgoing client connections */
-- AST_SSL_TLSV1_CLIENT = (1 << 5)
-+ AST_SSL_TLSV1_CLIENT = (1 << 5),
-+ /*! Use server cipher order instead of the client order */
-+ AST_SSL_SERVER_CIPHER_ORDER = (1 << 6),
-+ /*! Disable TLSv1 support */
-+ AST_SSL_DISABLE_TLSV1 = (1 << 7),
-+ /*! Disable TLSv1.1 support */
-+ AST_SSL_DISABLE_TLSV11 = (1 << 8),
-+ /*! Disable TLSv1.2 support */
-+ AST_SSL_DISABLE_TLSV12 = (1 << 9),
- };
-
- struct ast_tls_config {
-diff --git a/main/http.c b/main/http.c
-index 9bebbe7..4bfa985 100644
---- a/main/http.c
-+++ b/main/http.c
-@@ -1118,10 +1118,13 @@ static int __ast_http_load(int reload)
- }
- http_tls_cfg.pvtfile = ast_strdup("");
-
-+ /* Apply modern intermediate settings according to the Mozilla OpSec team as of July 30th, 2015 but disable TLSv1 */
-+ ast_set_flag(&http_tls_cfg.flags, AST_SSL_DISABLE_TLSV1 | AST_SSL_SERVER_CIPHER_ORDER);
-+
- if (http_tls_cfg.cipher) {
- ast_free(http_tls_cfg.cipher);
- }
-- http_tls_cfg.cipher = ast_strdup("");
-+ http_tls_cfg.cipher = ast_strdup("ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA");
-
- AST_RWLIST_WRLOCK(&uri_redirects);
- while ((redirect = AST_RWLIST_REMOVE_HEAD(&uri_redirects, entry))) {
-@@ -1146,8 +1149,6 @@ static int __ast_http_load(int reload)
- && strcasecmp(v->name, "tlsdontverifyserver")
- && strcasecmp(v->name, "tlsclientmethod")
- && strcasecmp(v->name, "sslclientmethod")
-- && strcasecmp(v->name, "tlscipher")
-- && strcasecmp(v->name, "sslcipher")
- && !ast_tls_read_conf(&http_tls_cfg, &https_desc, v->name, v->value)) {
- continue;
- }
-diff --git a/main/tcptls.c b/main/tcptls.c
-index a5a2af6..f73c2aa 100644
---- a/main/tcptls.c
-+++ b/main/tcptls.c
-@@ -749,6 +749,7 @@ static int __ssl_setup(struct ast_tls_config *cfg, int client)
- return 0;
- #else
- int disable_ssl = 0;
-+ long ssl_opts = 0;
-
- if (!cfg->enabled)
- return 0;
-@@ -793,11 +794,24 @@ static int __ssl_setup(struct ast_tls_config *cfg, int client)
- * them. SSLv23_*_method supports TLSv1+.
- */
- if (disable_ssl) {
-- long ssl_opts;
-+ ssl_opts |= SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3;
-+ }
-+
-+ if (ast_test_flag(&cfg->flags, AST_SSL_SERVER_CIPHER_ORDER)) {
-+ ssl_opts |= SSL_OP_CIPHER_SERVER_PREFERENCE;
-+ }
-
-- ssl_opts = SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3;
-- SSL_CTX_set_options(cfg->ssl_ctx, ssl_opts);
-+ if (ast_test_flag(&cfg->flags, AST_SSL_DISABLE_TLSV1)) {
-+ ssl_opts |= SSL_OP_NO_TLSv1;
- }
-+ if (ast_test_flag(&cfg->flags, AST_SSL_DISABLE_TLSV11)) {
-+ ssl_opts |= SSL_OP_NO_TLSv1_1;
-+ }
-+ if (ast_test_flag(&cfg->flags, AST_SSL_DISABLE_TLSV12)) {
-+ ssl_opts |= SSL_OP_NO_TLSv1_2;
-+ }
-+
-+ SSL_CTX_set_options(cfg->ssl_ctx, ssl_opts);
-
- SSL_CTX_set_verify(cfg->ssl_ctx,
- ast_test_flag(&cfg->flags, AST_SSL_VERIFY_CLIENT) ? SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT : SSL_VERIFY_NONE,
-@@ -1109,6 +1123,14 @@ int ast_tls_read_conf(struct ast_tls_config *tls_cfg, struct ast_tcptls_session_
- ast_clear_flag(&tls_cfg->flags, AST_SSL_TLSV1_CLIENT);
- ast_clear_flag(&tls_cfg->flags, AST_SSL_SSLV3_CLIENT);
- }
-+ } else if (!strcasecmp(varname, "tlsservercipherorder")) {
-+ ast_set2_flag(&tls_cfg->flags, ast_true(value), AST_SSL_SERVER_CIPHER_ORDER);
-+ } else if (!strcasecmp(varname, "tlsdisablev1")) {
-+ ast_set2_flag(&tls_cfg->flags, ast_true(value), AST_SSL_DISABLE_TLSV1);
-+ } else if (!strcasecmp(varname, "tlsdisablev11")) {
-+ ast_set2_flag(&tls_cfg->flags, ast_true(value), AST_SSL_DISABLE_TLSV11);
-+ } else if (!strcasecmp(varname, "tlsdisablev12")) {
-+ ast_set2_flag(&tls_cfg->flags, ast_true(value), AST_SSL_DISABLE_TLSV12);
- } else {
- return -1;
- }
Deleted: branches/1.0/package/asterisk/asterisk-1.8-AST-2016-002-1.8.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-1.8-AST-2016-002-1.8.patch 2016-11-01 12:48:25 UTC (rev 7907)
+++ branches/1.0/package/asterisk/asterisk-1.8-AST-2016-002-1.8.patch 2016-11-02 15:26:01 UTC (rev 7908)
@@ -1,18 +0,0 @@
-diff --git a/channels/chan_sip.c b/channels/chan_sip.c
-index 5de304a..277eec7 100644
---- a/channels/chan_sip.c
-+++ b/channels/chan_sip.c
-@@ -3771,6 +3771,13 @@ static int retrans_pkt(const void *data)
- }
-
- /* For non-invites, a maximum of 4 secs */
-+ if (INT_MAX / pkt->timer_a < pkt->timer_t1) {
-+ /*
-+ * Uh Oh, we will have an integer overflow.
-+ * Recalculate previous timeout time instead.
-+ */
-+ pkt->timer_a = pkt->timer_a / 2;
-+ }
- siptimer_a = pkt->timer_t1 * pkt->timer_a; /* Double each time */
- if (pkt->method != SIP_INVITE && siptimer_a > 4000) {
- siptimer_a = 4000;
Deleted: branches/1.0/package/asterisk/asterisk-1.8-AST-2016-003-1.8.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-1.8-AST-2016-003-1.8.patch 2016-11-01 12:48:25 UTC (rev 7907)
+++ branches/1.0/package/asterisk/asterisk-1.8-AST-2016-003-1.8.patch 2016-11-02 15:26:01 UTC (rev 7908)
@@ -1,28 +0,0 @@
-diff --git a/main/udptl.c b/main/udptl.c
-index a8244e8..6960487 100644
---- a/main/udptl.c
-+++ b/main/udptl.c
-@@ -231,16 +231,15 @@ static int decode_open_type(uint8_t *buf, unsigned int limit, unsigned int *len,
- if (decode_length(buf, limit, len, &octet_cnt) != 0)
- return -1;
-
-- if (octet_cnt > 0) {
-- /* Make sure the buffer contains at least the number of bits requested */
-- if ((*len + octet_cnt) > limit)
-- return -1;
--
-- *p_num_octets = octet_cnt;
-- *p_object = &buf[*len];
-- *len += octet_cnt;
-+ /* Make sure the buffer contains at least the number of bits requested */
-+ if ((*len + octet_cnt) > limit) {
-+ return -1;
- }
-
-+ *p_num_octets = octet_cnt;
-+ *p_object = &buf[*len];
-+ *len += octet_cnt;
-+
- return 0;
- }
- /*- End of function --------------------------------------------------------*/
Deleted: branches/1.0/package/asterisk/asterisk-1.8-configure-cross-fix.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-1.8-configure-cross-fix.patch 2016-11-01 12:48:25 UTC (rev 7907)
+++ branches/1.0/package/asterisk/asterisk-1.8-configure-cross-fix.patch 2016-11-02 15:26:01 UTC (rev 7908)
@@ -1,16 +0,0 @@
---- asterisk-1.8.25.0/configure.ac.orig 2014-01-24 16:52:23.000000000 -0600
-+++ asterisk-1.8.25.0/configure.ac 2014-01-24 16:55:14.000000000 -0600
-@@ -2319,11 +2319,13 @@
- AC_OUTPUT
-
- ${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.acbak2
-+if test "${cross_compiling}" = "no"; then
- if test "x${ac_cv_path_CMP}" = "x:"; then
- ( cd `pwd`/menuselect && ./configure )
- else if ${ac_cv_path_CMP} -s makeopts.acbak makeopts.acbak2; then : ; else
- ( cd `pwd`/menuselect && ./configure )
- fi ; fi
-+fi
-
- rm makeopts.acbak makeopts.acbak2
-
Deleted: branches/1.0/package/asterisk/asterisk-1.8-extension-changed-verbosity-chan_sip.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-1.8-extension-changed-verbosity-chan_sip.patch 2016-11-01 12:48:25 UTC (rev 7907)
+++ branches/1.0/package/asterisk/asterisk-1.8-extension-changed-verbosity-chan_sip.patch 2016-11-02 15:26:01 UTC (rev 7908)
@@ -1,11 +0,0 @@
---- asterisk-1.8.32.3/channels/chan_sip.c.orig 2015-04-23 10:15:19.000000000 -0500
-+++ asterisk-1.8.32.3/channels/chan_sip.c 2015-04-23 10:15:40.000000000 -0500
-@@ -15128,7 +15128,7 @@
- ast_set_flag(&p->flags[1], SIP_PAGE2_STATECHANGEQUEUE);
- }
- }
-- ast_verb(2, "Extension Changed %s[%s] new state %s for Notify User %s %s\n", exten, context, ast_extension_state2str(state), p->username,
-+ ast_verb(5, "Extension Changed %s[%s] new state %s for Notify User %s %s\n", exten, context, ast_extension_state2str(state), p->username,
- ast_test_flag(&p->flags[1], SIP_PAGE2_STATECHANGEQUEUE) ? "(queued)" : "");
-
- sip_pvt_unlock(p);
Deleted: branches/1.0/package/asterisk/asterisk-1.8-srtp-openssl-random.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-1.8-srtp-openssl-random.patch 2016-11-01 12:48:25 UTC (rev 7907)
+++ branches/1.0/package/asterisk/asterisk-1.8-srtp-openssl-random.patch 2016-11-02 15:26:01 UTC (rev 7908)
@@ -1,30 +0,0 @@
-X-Git-Url: http://git.asterisk.org/gitweb/?p=asterisk%2Fasterisk.git;a=blobdiff_plain;f=res%2Fres_srtp.c;h=0193eb6036d2b29b32ffc9a00888503b6c7748b0;hp=54ce9e77d88f43768aedc040f5a52318512cd16a;hb=effa207bc420893d7d62e2acc674746b888d09eb;hpb=99efb23d111f596dadfeaa09c5710987fa03261c
-
-diff --git a/res/res_srtp.c b/res/res_srtp.c
-index 54ce9e7..0193eb6 100644
---- a/res/res_srtp.c
-+++ b/res/res_srtp.c
-@@ -41,6 +41,10 @@
-
- #include <srtp/srtp.h>
-+#ifdef HAVE_OPENSSL
-+#include <openssl/rand.h>
-+#else
- #include <srtp/crypto_kernel.h>
-+#endif
-
- #include "asterisk/lock.h"
- #include "asterisk/sched.h"
-@@ -305,7 +309,11 @@ static int ast_srtp_policy_set_master_key(struct ast_srtp_policy *policy, const
-
- static int ast_srtp_get_random(unsigned char *key, size_t len)
- {
-+#ifdef HAVE_OPENSSL
-+ return RAND_bytes(key, len) > 0 ? 0: -1;
-+#else
- return crypto_get_random(key, len) != err_status_ok ? -1: 0;
-+#endif
- }
-
- static void ast_srtp_set_cb(struct ast_srtp *srtp, const struct ast_srtp_cb *cb, void *data)
-
Deleted: branches/1.0/package/asterisk/asterisk-1.8-voicemail-multiple-recipients.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-1.8-voicemail-multiple-recipients.patch 2016-11-01 12:48:25 UTC (rev 7907)
+++ branches/1.0/package/asterisk/asterisk-1.8-voicemail-multiple-recipients.patch 2016-11-02 15:26:01 UTC (rev 7908)
@@ -1,155 +0,0 @@
---- asterisk-1.8.29.0/apps/app_voicemail.c.orig 2014-05-09 17:18:59.000000000 -0500
-+++ asterisk-1.8.29.0/apps/app_voicemail.c 2014-08-09 11:49:46.000000000 -0500
-@@ -643,7 +643,7 @@
- char mailbox[AST_MAX_EXTENSION]; /*!< Mailbox id, unique within vm context */
- char password[80]; /*!< Secret pin code, numbers only */
- char fullname[80]; /*!< Full name, for directory app */
-- char email[80]; /*!< E-mail address */
-+ char *email; /*!< E-mail address */
- char *emailsubject; /*!< E-mail subject */
- char *emailbody; /*!< E-mail body */
- char pager[80]; /*!< E-mail address to pager (no attachment) */
-@@ -1044,6 +1044,8 @@
- vmu->maxdeletedmsg = maxdeletedmsg;
- }
- vmu->volgain = volgain;
-+ ast_free(vmu->email);
-+ vmu->email = NULL;
- ast_free(vmu->emailsubject);
- vmu->emailsubject = NULL;
- ast_free(vmu->emailbody);
-@@ -1340,7 +1342,8 @@
- } else if (!strcasecmp(var->name, "pager")) {
- ast_copy_string(retval->pager, var->value, sizeof(retval->pager));
- } else if (!strcasecmp(var->name, "email")) {
-- ast_copy_string(retval->email, var->value, sizeof(retval->email));
-+ ast_free(retval->email);
-+ retval->email = ast_strdup(var->value);
- } else if (!strcasecmp(var->name, "fullname")) {
- ast_copy_string(retval->fullname, var->value, sizeof(retval->fullname));
- } else if (!strcasecmp(var->name, "context")) {
-@@ -1467,6 +1470,7 @@
- if ((vmu = (ivm ? ivm : ast_malloc(sizeof(*vmu))))) {
- *vmu = *cur;
- if (!ivm) {
-+ vmu->email = ast_strdup(cur->email);
- vmu->emailbody = ast_strdup(cur->emailbody);
- vmu->emailsubject = ast_strdup(cur->emailsubject);
- }
-@@ -1762,6 +1766,9 @@
- {
- if (ast_test_flag(vmu, VM_ALLOCED)) {
-
-+ ast_free(vmu->email);
-+ vmu->email = NULL;
-+
- ast_free(vmu->emailbody);
- vmu->emailbody = NULL;
-
-@@ -2299,7 +2306,7 @@
- * of this function, we will revert back to an empty string if tempcopy
- * is 1.
- */
-- ast_copy_string(vmu->email, vmu->imapuser, sizeof(vmu->email));
-+ vmu->email = ast_strdup(vmu->imapuser);
- tempcopy = 1;
- }
-
-@@ -2311,8 +2318,10 @@
- command hangs. */
- if (!(p = vm_mkftemp(tmp))) {
- ast_log(AST_LOG_WARNING, "Unable to store '%s' (can't create temporary file)\n", fn);
-- if (tempcopy)
-- *(vmu->email) = '\0';
-+ if (tempcopy) {
-+ ast_free(vmu->email);
-+ vmu->email = NULL;
-+ }
- return -1;
- }
-
-@@ -4584,6 +4593,9 @@
- struct ast_str *str1 = ast_str_create(16), *str2 = ast_str_create(16);
- char *greeting_attachment;
- char filename[256];
-+ int first_line;
-+ char *emailsbuf;
-+ char *email;
-
- if (!str1 || !str2) {
- ast_free(str1);
-@@ -4625,7 +4637,7 @@
- ast_str_substitute_variables(&str1, 0, ast, fromstring);
-
- if (check_mime(ast_str_buffer(str1))) {
-- int first_line = 1;
-+ first_line = 1;
- ast_str_encode_mime(&str2, 0, ast_str_buffer(str1), strlen("From: "), strlen(who) + 3);
- while ((ptr = strchr(ast_str_buffer(str2), ' '))) {
- *ptr = '\0';
-@@ -4646,20 +4658,25 @@
- fprintf(p, "From: Asterisk PBX <%s>" ENDL, who);
- }
-
-- if (check_mime(vmu->fullname)) {
-- int first_line = 1;
-- char *ptr;
-- ast_str_encode_mime(&str2, 0, vmu->fullname, strlen("To: "), strlen(vmu->email) + 3);
-- while ((ptr = strchr(ast_str_buffer(str2), ' '))) {
-- *ptr = '\0';
-- fprintf(p, "%s %s" ENDL, first_line ? "To:" : "", ast_str_buffer(str2));
-- first_line = 0;
-- /* Substring is smaller, so this will never grow */
-- ast_str_set(&str2, 0, "%s", ptr + 1);
-+ emailsbuf = ast_strdupa(vmu->email);
-+ fprintf(p, "To:");
-+ first_line = 1;
-+ while ((email = strsep(&emailsbuf, "|"))) {
-+ char *next = emailsbuf;
-+ if (check_mime(vmu->fullname)) {
-+ char *ptr;
-+ ast_str_encode_mime(&str2, 0, vmu->fullname, first_line ? strlen("To: ") : 0, strlen(email) + 3 + (next ? strlen(",") : 0));
-+ while ((ptr = strchr(ast_str_buffer(str2), ' '))) {
-+ *ptr = '\0';
-+ fprintf(p, " %s" ENDL, ast_str_buffer(str2));
-+ /* Substring is smaller, so this will never grow */
-+ ast_str_set(&str2, 0, "%s", ptr + 1);
-+ }
-+ fprintf(p, " %s <%s>%s" ENDL, ast_str_buffer(str2), email, next ? "," : "");
-+ } else {
-+ fprintf(p, " %s <%s>%s" ENDL, ast_str_quote(&str2, 0, vmu->fullname), email, next ? "," : "");
- }
-- fprintf(p, "%s %s <%s>" ENDL, first_line ? "To:" : "", ast_str_buffer(str2), vmu->email);
-- } else {
-- fprintf(p, "To: %s <%s>" ENDL, ast_str_quote(&str2, 0, vmu->fullname), vmu->email);
-+ first_line = 0;
- }
-
- if (!ast_strlen_zero(emailsubject) || !ast_strlen_zero(vmu->emailsubject)) {
-@@ -4669,7 +4686,7 @@
- prep_email_sub_vars(ast, vmu, msgnum + 1, context, mailbox, fromfolder, cidnum, cidname, dur, date, category, flag);
- ast_str_substitute_variables(&str1, 0, ast, e_subj);
- if (check_mime(ast_str_buffer(str1))) {
-- int first_line = 1;
-+ first_line = 1;
- char *ptr;
- ast_str_encode_mime(&str2, 0, ast_str_buffer(str1), strlen("Subject: "), 0);
- while ((ptr = strchr(ast_str_buffer(str2), ' '))) {
-@@ -10841,7 +10858,7 @@
- ast_copy_string(vmu->fullname, s, sizeof(vmu->fullname));
- }
- if (stringp && (s = strsep(&stringp, ","))) {
-- ast_copy_string(vmu->email, s, sizeof(vmu->email));
-+ vmu->email = ast_strdup(s);
- }
- if (stringp && (s = strsep(&stringp, ","))) {
- ast_copy_string(vmu->pager, s, sizeof(vmu->pager));
-@@ -13001,7 +13018,7 @@
- }
-
- populate_defaults(vmu);
-- ast_copy_string(vmu->email, "te...@ex...", sizeof(vmu->email));
-+ vmu->email = ast_strdup("te...@ex...");
- #ifdef IMAP_STORAGE
- /* TODO When we set up the IMAP server test, we'll need to have credentials for the VMU structure added here */
- #endif
Modified: branches/1.0/package/asterisk/asterisk.mk
===================================================================
--- branches/1.0/package/asterisk/asterisk.mk 2016-11-01 12:48:25 UTC (rev 7907)
+++ branches/1.0/package/asterisk/asterisk.mk 2016-11-02 15:26:01 UTC (rev 7908)
@@ -3,13 +3,13 @@
# asterisk
#
##############################################################
-ifeq ($(BR2_PACKAGE_ASTERISK_v1_8),y)
-ASTERISK_VERSION := 1.8.32.3
+ifeq ($(BR2_PACKAGE_ASTERISK_v11),y)
+ASTERISK_VERSION := 11.23.1
else
- ifeq ($(BR2_PACKAGE_ASTERISK_v11),y)
-ASTERISK_VERSION := 11.23.1
+ ifeq ($(BR2_PACKAGE_ASTERISK_v13),y)
+ASTERISK_VERSION := 13.11.2
else
-ASTERISK_VERSION := 13.11.2
+ASTERISK_VERSION := 15.0.0
endif
endif
ASTERISK_SOURCE := asterisk-$(ASTERISK_VERSION).tar.gz
@@ -30,7 +30,6 @@
##
ASTERISK_VERSION_SINGLE := $(call ndots,1,1,$(ASTERISK_VERSION))
ASTERISK_VERSION_TUPLE := $(call ndots,1,2,$(ASTERISK_VERSION))
-ASTERISK_VERSION_TRIPLE := $(call ndots,1,3,$(ASTERISK_VERSION))
ASTERISK_GLOBAL_MAKEOPTS := $(BASE_DIR)/../project/astlinux/asterisk.makeopts-$(ASTERISK_VERSION_SINGLE)
@@ -159,7 +158,6 @@
endif
endif
-ifneq ($(ASTERISK_VERSION_SINGLE),1)
ifneq ($(ASTERISK_VERSION_SINGLE),11)
ifeq ($(strip $(BR2_PACKAGE_PJSIP)),y)
@@ -193,7 +191,6 @@
endif
endif
-endif
$(DL_DIR)/$(ASTERISK_SOURCE):
$(WGET) -P $(DL_DIR) $(ASTERISK_SITE)/$(ASTERISK_SOURCE)
@@ -203,14 +200,8 @@
touch $@
$(ASTERISK_DIR)/.patched: $(ASTERISK_DIR)/.source
-ifeq ($(ASTERISK_VERSION_SINGLE),1)
- toolchain/patch-kernel.sh $(ASTERISK_DIR) package/asterisk/ asterisk-$(ASTERISK_VERSION_TUPLE)-\*.patch
- toolchain/patch-kernel.sh $(ASTERISK_DIR) package/asterisk/ asterisk-$(ASTERISK_VERSION_TRIPLE)-\*.patch
-else
toolchain/patch-kernel.sh $(ASTERISK_DIR) package/asterisk/ asterisk-$(ASTERISK_VERSION_SINGLE)-\*.patch
toolchain/patch-kernel.sh $(ASTERISK_DIR) package/asterisk/ asterisk-$(ASTERISK_VERSION_TUPLE)-\*.patch
-endif
-
touch $@
$(ASTERISK_DIR)/.configured: $(ASTERISK_DIR)/.patched | host-automake host-pkg-config host-ncurses host-bison host-flex host-libxml2 \
@@ -263,12 +254,8 @@
menuselect/menuselect --enable IMAP_STORAGE menuselect.makeopts; \
)
endif
- ifneq ($(ASTERISK_VERSION_SINGLE),1)
(cd $(ASTERISK_DIR); \
menuselect/menuselect --enable app_meetme --enable app_page menuselect.makeopts; \
- )
- endif
- (cd $(ASTERISK_DIR); \
menuselect/menuselect --enable res_pktccops menuselect.makeopts; \
menuselect/menuselect --disable CORE-SOUNDS-EN-GSM --disable MOH-OPSOUND-WAV menuselect.makeopts; \
menuselect/menuselect --disable BUILD_NATIVE menuselect.makeopts; \
@@ -308,10 +295,8 @@
rmdir $(TARGET_DIR)/var/lib/asterisk
rm -f $(TARGET_DIR)/stat/var/lib/asterisk/astdb
ln -sf /var/db/astdb $(TARGET_DIR)/stat/var/lib/asterisk/astdb
-ifneq ($(ASTERISK_VERSION_SINGLE),1)
rm -f $(TARGET_DIR)/stat/var/lib/asterisk/astdb.sqlite3
ln -sf /var/db/astdb.sqlite3 $(TARGET_DIR)/stat/var/lib/asterisk/astdb.sqlite3
-endif
mkdir -p $(TARGET_DIR)/stat/var/spool
mv $(TARGET_DIR)/var/spool/asterisk $(TARGET_DIR)/stat/var/spool/
touch -c $(TARGET_DIR)/$(ASTERISK_TARGET_BINARY)
Modified: branches/1.0/package/asterisk-codec-silk/Config.in
===================================================================
--- branches/1.0/package/asterisk-codec-silk/Config.in 2016-11-01 12:48:25 UTC (rev 7907)
+++ branches/1.0/package/asterisk-codec-silk/Config.in 2016-11-02 15:26:01 UTC (rev 7908)
@@ -1,7 +1,7 @@
config BR2_PACKAGE_ASTERISK_CODEC_SILK
bool "asterisk-codec-silk"
default n
- depends on BR2_PACKAGE_ASTERISK && ( ! BR2_PACKAGE_ASTERISK_v1_8 )
+ depends on BR2_PACKAGE_ASTERISK
help
SILK CODEC developed by Skype (owned by Microsoft)
License supplied by Digium in x86 binary form.
Modified: branches/1.0/package/webinterface/webinterface.mk
===================================================================
--- branches/1.0/package/webinterface/webinterface.mk 2016-11-01 12:48:25 UTC (rev 7907)
+++ branches/1.0/package/webinterface/webinterface.mk 2016-11-02 15:26:01 UTC (rev 7908)
@@ -12,11 +12,7 @@
endif
ifeq ($(strip $(BR2_PACKAGE_ASTERISK)),y)
-ifeq ($(strip $(BR2_PACKAGE_ASTERISK_GUI)),y)
-webinterface-install: asterisk asterisk-gui
-else
webinterface-install: asterisk
-endif
else
webinterface-install:
endif
Deleted: branches/1.0/project/astlinux/asterisk.makeopts-1
===================================================================
--- branches/1.0/project/astlinux/asterisk.makeopts-1 2016-11-01 12:48:25 UTC (rev 7907)
+++ branches/1.0/project/astlinux/asterisk.makeopts-1 2016-11-02 15:26:01 UTC (rev 7908)
@@ -1,31 +0,0 @@
-MENUSELECT_APPS=app_ivrdemo app_osplookup app_skel
-MENUSELECT_CDR=cdr_odbc cdr_pgsql cdr_radius cdr_sqlite cdr_tds
-MENUSELECT_CHANNELS=chan_alsa chan_h323 chan_nbs chan_vpb
-MENUSELECT_CODECS=codec_speex
-MENUSELECT_FORMATS=format_ogg_vorbis
-MENUSELECT_FUNCS=func_odbc
-MENUSELECT_RES=res_config_odbc res_config_pgsql res_odbc res_snmp
-MENUSELECT_OPTS_app_voicemail=
-MENUSELECT_CFLAGS=LOADABLE_MODULES
-MENUSELECT_EMBED=
-MENUSELECT_CORE_SOUNDS=
-MENUSELECT_MOH=
-MENUSELECT_EXTRA_SOUNDS=
-MENUSELECT_BUILD_DEPS=res_adsi chan_local app_meetme res_monitor res_smdi res_features DEBUG_THREADS
-MENUSELECT_DEPSFAILED=MENUSELECT_APPS=app_osplookup
-MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_odbc
-MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_pgsql
-MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_radius
-MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_sqlite
-MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_tds
-MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_alsa
-MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_h323
-MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_nbs
-MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_vpb
-MENUSELECT_DEPSFAILED=MENUSELECT_CODECS=codec_speex
-MENUSELECT_DEPSFAILED=MENUSELECT_FORMATS=format_ogg_vorbis
-MENUSELECT_DEPSFAILED=MENUSELECT_FUNCS=func_odbc
-MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_config_odbc
-MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_config_pgsql
-MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_odbc
-MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_snmp
Modified: branches/1.0/scripts/beta-run-image-upload
===================================================================
--- branches/1.0/scripts/beta-run-image-upload 2016-11-01 12:48:25 UTC (rev 7907)
+++ branches/1.0/scripts/beta-run-image-upload 2016-11-02 15:26:01 UTC (rev 7908)
@@ -84,10 +84,6 @@
set_asterisk_version()
{
case $1 in
- ast18)
- FIRMWARE="ast18-firmware-1.x"
- MIRROR_FIRMWARE="$FIRMWARE"
- ;;
ast11)
FIRMWARE="ast11-firmware-1.x"
MIRROR_FIRMWARE="$FIRMWARE"
@@ -137,7 +133,7 @@
# Remove pre-existing ChangeLog.txt and version.txt
delete_dir "$CHANGELOG_DIR"
-for asterisk in ast18 ast11 ast13; do
+for asterisk in ast11 ast13; do
set_asterisk_version $asterisk
Modified: branches/1.0/scripts/master-build
===================================================================
--- branches/1.0/scripts/master-build 2016-11-01 12:48:25 UTC (rev 7907)
+++ branches/1.0/scripts/master-build 2016-11-02 15:26:01 UTC (rev 7908)
@@ -78,12 +78,6 @@
set_asterisk_version()
{
case $1 in
- ast18)
- CONFIG="astlinux18.config"
- ASTERISK_VERSION="$(awk -F'=' '/^ASTERISK_VERSION/ { if ($2 ~ /^ *1.8/) {print $2; exit} }' package/asterisk/asterisk.mk)"
- ASTERISK_VERSION="asterisk-${ASTERISK_VERSION// /}"
- FIRMWARE="ast18-firmware-1.x"
- ;;
ast11)
CONFIG="astlinux-ast11.config"
ASTERISK_VERSION="$(awk -F'=' '/^ASTERISK_VERSION/ { if ($2 ~ /^ *11./) {print $2; exit} }' package/asterisk/asterisk.mk)"
@@ -161,10 +155,10 @@
rm -f initrd.img
#
-# Build Asterisk 1.8, 11 and 13 versions of AstLinux
+# Build Asterisk 11 and 13 versions of AstLinux
#
-for asterisk in ast18 ast11 ast13; do
+for asterisk in ast11 ast13; do
set_asterisk_version $asterisk
Modified: branches/1.0/scripts/master-upload
===================================================================
--- branches/1.0/scripts/master-upload 2016-11-01 12:48:25 UTC (rev 7907)
+++ branches/1.0/scripts/master-upload 2016-11-02 15:26:01 UTC (rev 7908)
@@ -78,10 +78,6 @@
set_asterisk_version()
{
case $1 in
- ast18)
- FIRMWARE="ast18-firmware-1.x"
- MIRROR_FIRMWARE="$FIRMWARE"
- ;;
ast11)
FIRMWARE="ast11-firmware-1.x"
MIRROR_FIRMWARE="$FIRMWARE"
@@ -128,7 +124,7 @@
fi
-for asterisk in ast18 ast11 ast13; do
+for asterisk in ast11 ast13; do
set_asterisk_version $asterisk
Modified: branches/1.0/x86_64-configs/astlinux-ast11.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast11.config 2016-11-01 12:48:25 UTC (rev 7907)
+++ branches/1.0/x86_64-configs/astlinux-ast11.config 2016-11-02 15:26:01 UTC (rev 7908)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7702-dirty Configuration
-# Sat Jun 4 17:22:35 2016
+# Buildroot astlinux-1.x-svn7907-dirty Configuration
+# Wed Nov 2 08:46:11 2016
#
BR2_HAVE_DOT_CONFIG=y
BR2_ARCH_IS_64=y
@@ -138,7 +138,6 @@
# Asterisk, XMPP and telephony applications
#
BR2_PACKAGE_ASTERISK=y
-# BR2_PACKAGE_ASTERISK_v1_8 is not set
BR2_PACKAGE_ASTERISK_v11=y
# BR2_PACKAGE_ASTERISK_v13 is not set
@@ -152,7 +151,6 @@
# BR2_PACKAGE_ASTERISK_MENUSELECT is not set
BR2_PACKAGE_ASTERISK_CODEC_SILK=y
BR2_PACKAGE_ASTERISK_FOP2=y
-# BR2_PACKAGE_ASTERISK_GUI is not set
BR2_PACKAGE_PHONEPROV_TOOLS=y
BR2_PACKAGE_DAHDI_LINUX=y
BR2_PACKAGE_DAHDI_OSLEC=y
Modified: branches/1.0/x86_64-configs/astlinux-ast13.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast13.config 2016-11-01 12:48:25 UTC (rev 7907)
+++ branches/1.0/x86_64-configs/astlinux-ast13.config 2016-11-02 15:26:01 UTC (rev 7908)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7702-dirty Configuration
-# Sat Jun 4 17:22:37 2016
+# Buildroot astlinux-1.x-svn7907-dirty Configuration
+# Wed Nov 2 08:46:11 2016
#
BR2_HAVE_DOT_CONFIG=y
BR2_ARCH_IS_64=y
@@ -138,7 +138,6 @@
# Asterisk, XMPP and telephony applications
#
BR2_PACKAGE_ASTERISK=y
-# BR2_PACKAGE_ASTERISK_v1_8 is not set
# BR2_PACKAGE_ASTERISK_v11 is not set
BR2_PACKAGE_ASTERISK_v13=y
@@ -152,7 +151,6 @@
# BR2_PACKAGE_ASTERISK_MENUSELECT is not set
BR2_PACKAGE_ASTERISK_CODEC_SILK=y
BR2_PACKAGE_ASTERISK_FOP2=y
-# BR2_PACKAGE_ASTERISK_GUI is not set
BR2_PACKAGE_PHONEPROV_TOOLS=y
BR2_PACKAGE_DAHDI_LINUX=y
BR2_PACKAGE_DAHDI_OSLEC=y
Deleted: branches/1.0/x86_64-configs/astlinux18.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux18.config 20...
[truncated message content] |
