[Astlinux-commits] SF.net SVN: astlinux:[7098] branches/1.0

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 7098
          http://sourceforge.net/p/astlinux/code/7098
Author:   abelbeck
Date:     2015-06-05 16:22:40 +0000 (Fri, 05 Jun 2015)
Log Message:
-----------
asterisk, version bump to 11.18.0 and 13.4.0, pjsip version bump to 2.4 . Adjust for menuselect changing for no good reason in stable releases.

Modified Paths:
--------------
    branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch
    branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch
    branches/1.0/package/asterisk/asterisk-13-configure-menuselect-cross-fix.patch
    branches/1.0/package/asterisk/asterisk.mk
    branches/1.0/package/pjsip/pjsip.mk
    branches/1.0/project/astlinux/asterisk.makeopts-1
    branches/1.0/project/astlinux/asterisk.makeopts-11
    branches/1.0/project/astlinux/asterisk.makeopts-13

Modified: branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch
===================================================================

--- branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch	2015-06-04 23:31:54 UTC (rev 7097)
+++ branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch	2015-06-05 16:22:40 UTC (rev 7098)
@@ -1,6 +1,6 @@
 --- 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
-@@ -2431,11 +2431,13 @@
+@@ -2398,11 +2398,13 @@
  AC_OUTPUT
  
  ${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.acbak2

Modified: branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch	2015-06-04 23:31:54 UTC (rev 7097)
+++ branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch	2015-06-05 16:22:40 UTC (rev 7098)
@@ -1,6 +1,6 @@
 --- asterisk-11.17.1/channels/chan_sip.c.orig	2015-04-23 10:22:04.000000000 -0500
 +++ asterisk-11.17.1/channels/chan_sip.c	2015-04-23 10:22:40.000000000 -0500
-@@ -16733,7 +16733,7 @@
+@@ -16734,7 +16734,7 @@
  	}
  
  	if (!force) {

Modified: branches/1.0/package/asterisk/asterisk-13-configure-menuselect-cross-fix.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-13-configure-menuselect-cross-fix.patch	2015-06-04 23:31:54 UTC (rev 7097)
+++ branches/1.0/package/asterisk/asterisk-13-configure-menuselect-cross-fix.patch	2015-06-05 16:22:40 UTC (rev 7098)
@@ -1,6 +1,6 @@
 --- asterisk-13.1.0/configure.ac.orig	2014-01-24 16:52:23.000000000 -0600
 +++ asterisk-13.1.0/configure.ac	2014-01-24 16:55:14.000000000 -0600
-@@ -2544,11 +2544,13 @@
+@@ -2511,11 +2511,13 @@
  AC_OUTPUT
  
  ${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.acbak2

Modified: branches/1.0/package/asterisk/asterisk.mk
===================================================================
--- branches/1.0/package/asterisk/asterisk.mk	2015-06-04 23:31:54 UTC (rev 7097)
+++ branches/1.0/package/asterisk/asterisk.mk	2015-06-05 16:22:40 UTC (rev 7098)
@@ -7,9 +7,9 @@
 ASTERISK_VERSION := 1.8.32.3
 else
  ifeq ($(BR2_PACKAGE_ASTERISK_v11),y)
-ASTERISK_VERSION := 11.17.1
+ASTERISK_VERSION := 11.18.0
  else
-ASTERISK_VERSION := 13.3.2
+ASTERISK_VERSION := 13.4.0
  endif
 endif
 ASTERISK_SOURCE := asterisk-$(ASTERISK_VERSION).tar.gz
@@ -271,6 +271,7 @@
  endif
 	(cd $(ASTERISK_DIR); \
 		menuselect/menuselect --enable res_pktccops menuselect.makeopts; \
+		menuselect/menuselect --disable CORE-SOUNDS-EN-GSM --disable MOH-OPSOUND-WAV menuselect.makeopts; \
 	)
 endif
 	touch $@

Modified: branches/1.0/package/pjsip/pjsip.mk
===================================================================
--- branches/1.0/package/pjsip/pjsip.mk	2015-06-04 23:31:54 UTC (rev 7097)
+++ branches/1.0/package/pjsip/pjsip.mk	2015-06-05 16:22:40 UTC (rev 7098)
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PJSIP_VERSION = 2.3
+PJSIP_VERSION = 2.4
 PJSIP_SOURCE = pjproject-$(PJSIP_VERSION).tar.bz2
 PJSIP_SITE = http://www.pjsip.org/release/$(PJSIP_VERSION)
 PJSIP_INSTALL_STAGING = YES

Modified: branches/1.0/project/astlinux/asterisk.makeopts-1
===================================================================
--- branches/1.0/project/astlinux/asterisk.makeopts-1	2015-06-04 23:31:54 UTC (rev 7097)
+++ branches/1.0/project/astlinux/asterisk.makeopts-1	2015-06-05 16:22:40 UTC (rev 7098)
@@ -8,8 +8,8 @@
 MENUSELECT_OPTS_app_voicemail=
 MENUSELECT_CFLAGS=LOADABLE_MODULES 
 MENUSELECT_EMBED=
-MENUSELECT_CORE_SOUNDS=-CORE-SOUNDS-EN-GSM -CORE-SOUNDS-EN-ULAW -CORE-SOUNDS-EN-G729 
-MENUSELECT_MOH=-MOH-OPSOUND-ULAW -MOH-OPSOUND-G729 -MOH-OPSOUND-WAV 
+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

Modified: branches/1.0/project/astlinux/asterisk.makeopts-11
===================================================================
--- branches/1.0/project/astlinux/asterisk.makeopts-11	2015-06-04 23:31:54 UTC (rev 7097)
+++ branches/1.0/project/astlinux/asterisk.makeopts-11	2015-06-05 16:22:40 UTC (rev 7098)
@@ -15,8 +15,8 @@
 MENUSELECT_UTILS=astcanary astdb2sqlite3 astdb2bdb 
 MENUSELECT_AGIS=
 MENUSELECT_EMBED=
-MENUSELECT_CORE_SOUNDS=-CORE-SOUNDS-EN-GSM 
-MENUSELECT_MOH=-MOH-OPSOUND-WAV 
+MENUSELECT_CORE_SOUNDS=
+MENUSELECT_MOH=
 MENUSELECT_EXTRA_SOUNDS=
 MENUSELECT_BUILD_DEPS=chan_local app_voicemail res_monitor res_agi res_adsi res_smdi res_crypto res_jabber res_ael_share res_fax G711_NEW_ALGORITHM 
 MENUSELECT_DEPSFAILED=MENUSELECT_APPS=app_jack

Modified: branches/1.0/project/astlinux/asterisk.makeopts-13
===================================================================
--- branches/1.0/project/astlinux/asterisk.makeopts-13	2015-06-04 23:31:54 UTC (rev 7097)
+++ branches/1.0/project/astlinux/asterisk.makeopts-13	2015-06-05 16:22:40 UTC (rev 7098)
@@ -15,8 +15,8 @@
 MENUSELECT_UTILS=astcanary astdb2sqlite3 astdb2bdb 
 MENUSELECT_AGIS=
 MENUSELECT_EMBED=
-MENUSELECT_CORE_SOUNDS=-CORE-SOUNDS-EN-GSM 
-MENUSELECT_MOH=-MOH-OPSOUND-WAV 
+MENUSELECT_CORE_SOUNDS=
+MENUSELECT_MOH=
 MENUSELECT_EXTRA_SOUNDS=
 MENUSELECT_BUILD_DEPS=chan_local app_voicemail res_monitor res_agi res_adsi res_smdi res_crypto res_jabber res_ael_share res_fax G711_NEW_ALGORITHM 
 MENUSELECT_DEPSFAILED=MENUSELECT_APPS=app_jack

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



