Thread: [Astlinux-commits] SF.net SVN: astlinux:[5193] branches/1.0/package/asterisk

Brought to you by: dhartman, krisk84

astlinux-commits

[Astlinux-commits] SF.net SVN: astlinux:[5193] branches/1.0/package/asterisk

From: <abe...@us...> - 2011-10-16 23:26:15

Revision: 5193
          http://astlinux.svn.sourceforge.net/astlinux/?rev=5193&view=rev
Author:   abelbeck
Date:     2011-10-16 23:26:08 +0000 (Sun, 16 Oct 2011)
Log Message:
-----------
asterisk, remove uClibc related patches

Removed Paths:
-------------
    branches/1.0/package/asterisk/asterisk-1.4-autoconf-glob.patch
    branches/1.0/package/asterisk/asterisk-1.8-autoconf-glob.patch

Deleted: branches/1.0/package/asterisk/asterisk-1.4-autoconf-glob.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-1.4-autoconf-glob.patch	2011-10-16 23:16:09 UTC (rev 5192)
+++ branches/1.0/package/asterisk/asterisk-1.4-autoconf-glob.patch	2011-10-16 23:26:08 UTC (rev 5193)
@@ -1,27 +0,0 @@
---- asterisk-1.4.36/configure.ac.orig	2010-10-23 22:20:17.000000000 -0500
-+++ asterisk-1.4.36/configure.ac	2010-10-23 22:21:09.000000000 -0500
-@@ -550,24 +550,6 @@
- 	AC_MSG_RESULT(no)
- )
- 
--AC_MSG_CHECKING(for GLOB_NOMAGIC)
--AC_LINK_IFELSE(
--	AC_LANG_PROGRAM([#include <glob.h>],
--			[int foo = GLOB_NOMAGIC;]),
--	AC_MSG_RESULT(yes)
--	AC_DEFINE([HAVE_GLOB_NOMAGIC], 1, [Define to 1 if your glob function supports GLOB_NOMAGIC option.]),
--	AC_MSG_RESULT(no)
--)
--
--AC_MSG_CHECKING(for GLOB_BRACE)
--AC_LINK_IFELSE(
--	AC_LANG_PROGRAM([#include <glob.h>],
--			[int foo = GLOB_BRACE;]),
--	AC_MSG_RESULT(yes)
--	AC_DEFINE([HAVE_GLOB_BRACE], 1, [Define to 1 if your glob function supports GLOB_BRACE option.]),
--	AC_MSG_RESULT(no)
--)
--
- AC_MSG_CHECKING(for IP_MTU_DISCOVER)
- AC_LINK_IFELSE(
- 	AC_LANG_PROGRAM([#include <netinet/in.h>],

Deleted: branches/1.0/package/asterisk/asterisk-1.8-autoconf-glob.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-1.8-autoconf-glob.patch	2011-10-16 23:16:09 UTC (rev 5192)
+++ branches/1.0/package/asterisk/asterisk-1.8-autoconf-glob.patch	2011-10-16 23:26:08 UTC (rev 5193)
@@ -1,13 +0,0 @@
---- asterisk-1.8.0/configure.ac.orig	2010-10-23 21:50:18.000000000 -0500
-+++ asterisk-1.8.0/configure.ac	2010-10-23 21:50:35.000000000 -0500
-@@ -972,10 +972,6 @@
- 	AC_MSG_RESULT(no)
- )
- 
--AST_C_DEFINE_CHECK([GLOB_NOMAGIC], [GLOB_NOMAGIC], [glob.h])
--
--AST_C_DEFINE_CHECK([GLOB_BRACE], [GLOB_BRACE], [glob.h])
--
- AST_C_DEFINE_CHECK([IP_MTU_DISCOVER], [IP_MTU_DISCOVER], [netinet/in.h])
- 
- AC_CHECK_HEADER([libkern/OSAtomic.h],

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

[Astlinux-commits] SF.net SVN: astlinux:[5307] branches/1.0/package/asterisk

From: <abe...@us...> - 2011-12-14 00:25:14

Revision: 5307
          http://astlinux.svn.sourceforge.net/astlinux/?rev=5307&view=rev
Author:   abelbeck
Date:     2011-12-14 00:25:06 +0000 (Wed, 14 Dec 2011)
Log Message:
-----------
cleanup, remove mISDN references from asterisk package

Modified Paths:
--------------
    branches/1.0/package/asterisk/Config.in
    branches/1.0/package/asterisk/asterisk.mk

Removed Paths:
-------------
    branches/1.0/package/asterisk/asterisk-1.4-misdn-digium-suppserv.patch
    branches/1.0/package/asterisk/asterisk-1.6-misdn-digium-suppserv.patch

Modified: branches/1.0/package/asterisk/Config.in
===================================================================
--- branches/1.0/package/asterisk/Config.in	2011-12-13 23:37:59 UTC (rev 5306)
+++ branches/1.0/package/asterisk/Config.in	2011-12-14 00:25:06 UTC (rev 5307)
@@ -37,36 +37,6 @@
 			Asterisk Standard Release.
 endchoice
 
-config BR2_PACKAGE_ASTERISK_CHANMISDN
-	bool "Asterisk chan_misdn Support"
-	default n
-	depends on BR2_FLYING_PIGS
-	depends on BR2_PACKAGE_ASTERISK
-	select BR2_PACKAGE_ASTERISK_APP_BUNDLE if BR2_PACKAGE_ASTERISK_v1_4
-	help
-	  Compile Asterisk with chan_misdn Support
-
-choice
-	prompt "mISDN/mISDNuser Version"
-	depends on BR2_PACKAGE_ASTERISK_CHANMISDN
-	default BR2_PACKAGE_MISDN_DIGIUM
-	help
-		Select which version of mISDN/mISDNuser
-
-	config BR2_PACKAGE_MISDN_DIGIUM
-		bool "misdn-digium"
-       		select BR2_PACKAGE_BC
-       		select BR2_PACKAGE_USBUTILS
-       		select BR2_PACKAGE_PCIUTILS
-		help
-			Digium supported in thirdparty repository
-                	mISDN drivers v1.x in Digium's Thirdparty Repo
-
-                	http://svn.digium.com/svn/thirdparty/mISDN/
-                	http://svn.digium.com/svn/thirdparty/mISDNuser/
-
-endchoice
-
 config BR2_PACKAGE_ASTERISK_MENUSELECT
 	bool "Asterisk custom configure"
 	default n

Deleted: branches/1.0/package/asterisk/asterisk-1.4-misdn-digium-suppserv.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-1.4-misdn-digium-suppserv.patch	2011-12-13 23:37:59 UTC (rev 5306)
+++ branches/1.0/package/asterisk/asterisk-1.4-misdn-digium-suppserv.patch	2011-12-14 00:25:06 UTC (rev 5307)
@@ -1,11 +0,0 @@
---- asterisk-1.4.36/channels/misdn/isdn_lib.h.orig	2010-12-04 17:17:02.000000000 -0600
-+++ asterisk-1.4.36/channels/misdn/isdn_lib.h	2010-12-04 17:19:06.000000000 -0600
-@@ -20,6 +20,8 @@
- #ifndef TE_LIB
- #define TE_LIB
- 
-+#define MISDN_NO_LONGER_IMPLEMENTED
-+
- #include <mISDNuser/suppserv.h>
- 
- /** For initialization usage **/

Deleted: branches/1.0/package/asterisk/asterisk-1.6-misdn-digium-suppserv.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-1.6-misdn-digium-suppserv.patch	2011-12-13 23:37:59 UTC (rev 5306)
+++ branches/1.0/package/asterisk/asterisk-1.6-misdn-digium-suppserv.patch	2011-12-14 00:25:06 UTC (rev 5307)
@@ -1,11 +0,0 @@
---- asterisk-1.4.36/channels/misdn/isdn_lib.h.orig	2010-12-04 17:17:02.000000000 -0600
-+++ asterisk-1.4.36/channels/misdn/isdn_lib.h	2010-12-04 17:19:06.000000000 -0600
-@@ -20,6 +20,8 @@
- #ifndef TE_LIB
- #define TE_LIB
- 
-+#define MISDN_NO_LONGER_IMPLEMENTED
-+
- #include <mISDNuser/suppserv.h>
- 
- /** For initialization usage **/

Modified: branches/1.0/package/asterisk/asterisk.mk
===================================================================
--- branches/1.0/package/asterisk/asterisk.mk	2011-12-13 23:37:59 UTC (rev 5306)
+++ branches/1.0/package/asterisk/asterisk.mk	2011-12-14 00:25:06 UTC (rev 5307)
@@ -115,19 +115,6 @@
 ASTERISK_EXTRAS+=spandsp
 endif
 
-ifeq ($(strip $(BR2_PACKAGE_ASTERISK_CHANMISDN)),y)
- ifeq ($(strip $(BR2_PACKAGE_MISDNV1)),y)
-ASTERISK_EXTRAS+=misdnv1
- endif
- ifeq ($(strip $(BR2_PACKAGE_MISDN_DIGIUM)),y)
-ASTERISK_EXTRAS+=misdn-digium
- endif
-ASTERISK_CONFIGURE_ARGS+= \
-			--with-misdn="$(STAGING_DIR)/usr" \
-			--with-isdnnet="$(STAGING_DIR)/usr" \
-			--with-suppserv="$(STAGING_DIR)/usr"
-endif
-
 ifeq ($(strip $(BR2_PACKAGE_DAHDI_LINUX)),y)
 ASTERISK_EXTRAS+=dahdi-tools
 ASTERISK_CONFIGURE_ARGS+= \

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

[Astlinux-commits] SF.net SVN: astlinux:[5311] branches/1.0/package/asterisk

From: <abe...@us...> - 2011-12-15 23:54:21

Revision: 5311
          http://astlinux.svn.sourceforge.net/astlinux/?rev=5311&view=rev
Author:   abelbeck
Date:     2011-12-15 23:54:15 +0000 (Thu, 15 Dec 2011)
Log Message:
-----------
asterisk, version bumps to 1.4.43, 1.6.2.21, 1.8.8.0 and 10.0.0

Modified Paths:
--------------
    branches/1.0/package/asterisk/asterisk.mk

Removed Paths:
-------------
    branches/1.0/package/asterisk/asterisk-1.8-makefile-moh.patch

Deleted: branches/1.0/package/asterisk/asterisk-1.8-makefile-moh.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-1.8-makefile-moh.patch	2011-12-15 22:24:50 UTC (rev 5310)
+++ branches/1.0/package/asterisk/asterisk-1.8-makefile-moh.patch	2011-12-15 23:54:15 UTC (rev 5311)
@@ -1,10 +0,0 @@
---- asterisk-1.8.6.0/Makefile.orig	2011-09-01 19:00:30.000000000 -0500
-+++ asterisk-1.8.6.0/Makefile	2011-09-01 19:01:17.000000000 -0500
-@@ -542,6 +542,7 @@
- 	$(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)/phoneprov"
- 	$(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)/static-http"
- 	$(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)/sounds"
-+	$(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)/moh"
- 	$(INSTALL) -d "$(DESTDIR)$(ASTMANDIR)/man8"
- 	$(INSTALL) -d "$(DESTDIR)$(AGI_DIR)"
- 	$(INSTALL) -d "$(DESTDIR)$(ASTDBDIR)"

Modified: branches/1.0/package/asterisk/asterisk.mk
===================================================================
--- branches/1.0/package/asterisk/asterisk.mk	2011-12-15 22:24:50 UTC (rev 5310)
+++ branches/1.0/package/asterisk/asterisk.mk	2011-12-15 23:54:15 UTC (rev 5311)
@@ -4,15 +4,15 @@
 #
 ##############################################################
 ifeq ($(BR2_PACKAGE_ASTERISK_v1_4),y)
-ASTERISK_VERSION := 1.4.42
+ASTERISK_VERSION := 1.4.43
 else
  ifeq ($(BR2_PACKAGE_ASTERISK_v1_6),y)
-ASTERISK_VERSION := 1.6.2.20
+ASTERISK_VERSION := 1.6.2.21
  else
   ifeq ($(BR2_PACKAGE_ASTERISK_v1_8),y)
-ASTERISK_VERSION := 1.8.7.1
+ASTERISK_VERSION := 1.8.8.0
   else
-ASTERISK_VERSION := 10.0.0-rc2
+ASTERISK_VERSION := 10.0.0
   endif
  endif
 endif

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

[Astlinux-commits] SF.net SVN: astlinux:[5395] branches/1.0/package/asterisk

From: <abe...@us...> - 2012-01-18 23:47:15

Revision: 5395
          http://astlinux.svn.sourceforge.net/astlinux/?rev=5395&view=rev
Author:   abelbeck
Date:     2012-01-18 23:47:06 +0000 (Wed, 18 Jan 2012)
Log Message:
-----------
ilbc-codec, add patch to silence gcc warning as per asterisk review board:
https://reviewboard.asterisk.org/r/1675/

Modified Paths:
--------------
    branches/1.0/package/asterisk/asterisk.mk

Added Paths:
-----------
    branches/1.0/package/asterisk/ilbc-codec-gcc-warning.patch

Modified: branches/1.0/package/asterisk/asterisk.mk
===================================================================
--- branches/1.0/package/asterisk/asterisk.mk	2012-01-18 22:55:00 UTC (rev 5394)
+++ branches/1.0/package/asterisk/asterisk.mk	2012-01-18 23:47:06 UTC (rev 5395)
@@ -160,6 +160,7 @@
 
 ifeq ($(strip $(BR2_PACKAGE_ASTERISK_ILBC)),y)
 	zcat package/asterisk/ilbc-codec.tar.gz | tar -C $(ASTERISK_DIR) $(TAR_OPTIONS) -
+	toolchain/patch-kernel.sh $(ASTERISK_DIR) package/asterisk/ ilbc-codec-\*.patch
 	$(SED) 's:<defaultenabled>no</defaultenabled>:<defaultenabled>yes</defaultenabled>:' \
 		$(ASTERISK_DIR)/codecs/codec_ilbc.c
 endif

Added: branches/1.0/package/asterisk/ilbc-codec-gcc-warning.patch
===================================================================
--- branches/1.0/package/asterisk/ilbc-codec-gcc-warning.patch	                        (rev 0)
+++ branches/1.0/package/asterisk/ilbc-codec-gcc-warning.patch	2012-01-18 23:47:06 UTC (rev 5395)
@@ -0,0 +1,24 @@
+--- asterisk-1.8.8.1/codecs/ilbc/iCBSearch.c.orig	2011-12-14 09:35:14.000000000 -0600
++++ asterisk-1.8.8.1/codecs/ilbc/iCBSearch.c	2012-01-18 17:03:30.000000000 -0600
+@@ -126,8 +126,8 @@
+ 
+                *ppe=0.0;
+                pp=buf+LPC_FILTERORDER+lMem-lTarget;
+-               for (j=0; j<lTarget; j++) {
+-                   *ppe+=(*pp)*(*pp++);
++               for (j=0; j<lTarget; j++, pp++) {
++                   *ppe+=(*pp)*(*pp);
+                }
+ 
+                if (*ppe>0.0) {
+@@ -321,8 +321,8 @@
+                *ppe=0.0;
+ 
+                pp=cbvectors+lMem-lTarget;
+-               for (j=0; j<lTarget; j++) {
+-                   *ppe+=(*pp)*(*pp++);
++               for (j=0; j<lTarget; j++, pp++) {
++                   *ppe+=(*pp)*(*pp);
+                }
+ 
+                ppi = cbvectors + lMem - 1 - lTarget;

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

[Astlinux-commits] SF.net SVN: astlinux:[5462] branches/1.0/package/asterisk

From: <abe...@us...> - 2012-02-21 18:00:13

Revision: 5462
          http://astlinux.svn.sourceforge.net/astlinux/?rev=5462&view=rev
Author:   abelbeck
Date:     2012-02-21 18:00:01 +0000 (Tue, 21 Feb 2012)
Log Message:
-----------
asterisk, add custom build support for mysql modules: cdr_mysql, app_mysql and res_config_mysql

Modified Paths:
--------------
    branches/1.0/package/asterisk/Config.in
    branches/1.0/package/asterisk/asterisk.mk

Modified: branches/1.0/package/asterisk/Config.in
===================================================================
--- branches/1.0/package/asterisk/Config.in	2012-02-21 17:51:58 UTC (rev 5461)
+++ branches/1.0/package/asterisk/Config.in	2012-02-21 18:00:01 UTC (rev 5462)
@@ -37,6 +37,11 @@
 			Asterisk Standard Release.
 endchoice
 
+comment "cdr_mysql, app_mysql and res_config_mysql - disabled (requires MYSQL_CLIENT)"
+        depends on !BR2_PACKAGE_MYSQL_CLIENT && BR2_PACKAGE_ASTERISK
+comment "cdr_mysql, app_mysql and res_config_mysql - enabled"
+        depends on BR2_PACKAGE_MYSQL_CLIENT && BR2_PACKAGE_ASTERISK
+
 config BR2_PACKAGE_ASTERISK_MENUSELECT
 	bool "Asterisk custom configure"
 	default n

Modified: branches/1.0/package/asterisk/asterisk.mk
===================================================================
--- branches/1.0/package/asterisk/asterisk.mk	2012-02-21 17:51:58 UTC (rev 5461)
+++ branches/1.0/package/asterisk/asterisk.mk	2012-02-21 18:00:01 UTC (rev 5462)
@@ -99,6 +99,12 @@
 #			CONFIG_NETSNMP="$(STAGING_DIR)/usr/bin/net-snmp-config"
 #endif
 
+ifeq ($(strip $(BR2_PACKAGE_MYSQL_CLIENT)),y)
+ASTERISK_EXTRAS+=mysql_client
+ASTERISK_CONFIGURE_ARGS+= \
+			--with-mysqlclient="$(STAGING_DIR)/usr"
+endif
+
 ifeq ($(strip $(BR2_PACKAGE_UNIXODBC)),y)
 ASTERISK_EXTRAS+=unixodbc
 ASTERISK_CONFIGURE_ARGS+= \
@@ -205,6 +211,11 @@
 		GLOBAL_MAKEOPTS=$(BASE_DIR)/../project/astlinux/asterisk.makeopts \
 		USER_MAKEOPTS= \
 		menuselect.makeopts
+ ifeq ($(strip $(BR2_PACKAGE_MYSQL_CLIENT)),y)
+	(cd $(ASTERISK_DIR); \
+		menuselect/menuselect --enable app_mysql --enable cdr_mysql --enable res_config_mysql menuselect.makeopts; \
+	)
+ endif
 endif
 	touch $@
 

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

[Astlinux-commits] SF.net SVN: astlinux:[5632] branches/1.0/package/asterisk

From: <abe...@us...> - 2012-08-13 22:58:48

Revision: 5632
          http://astlinux.svn.sourceforge.net/astlinux/?rev=5632&view=rev
Author:   abelbeck
Date:     2012-08-13 22:58:42 +0000 (Mon, 13 Aug 2012)
Log Message:
-----------
asterisk, add v11.0.x using 11.0.0-beta1 for testing

Modified Paths:
--------------
    branches/1.0/package/asterisk/Config.in
    branches/1.0/package/asterisk/asterisk.mk

Modified: branches/1.0/package/asterisk/Config.in
===================================================================
--- branches/1.0/package/asterisk/Config.in	2012-08-09 18:38:48 UTC (rev 5631)
+++ branches/1.0/package/asterisk/Config.in	2012-08-13 22:58:42 UTC (rev 5632)
@@ -31,10 +31,10 @@
 		help
 			Asterisk Long Term Stable Release.
 
-	config BR2_PACKAGE_ASTERISK_v10_0
-		bool "Asterisk v10.0.x"
+	config BR2_PACKAGE_ASTERISK_v11_0
+		bool "Asterisk v11.0.x"
 		help
-			Asterisk Standard Release.
+			Asterisk Long Term Release.
 endchoice
 
 comment "cdr_mysql, app_mysql and res_config_mysql - disabled (requires MYSQL_CLIENT)"

Modified: branches/1.0/package/asterisk/asterisk.mk
===================================================================
--- branches/1.0/package/asterisk/asterisk.mk	2012-08-09 18:38:48 UTC (rev 5631)
+++ branches/1.0/package/asterisk/asterisk.mk	2012-08-13 22:58:42 UTC (rev 5632)
@@ -12,7 +12,7 @@
   ifeq ($(BR2_PACKAGE_ASTERISK_v1_8),y)
 ASTERISK_VERSION := 1.8.15.0
   else
-ASTERISK_VERSION := 10.5.0
+ASTERISK_VERSION := 11.0.0-beta1
   endif
  endif
 endif
@@ -235,7 +235,7 @@
  endif
  ifneq ($(ASTERISK_VERSION_SINGLE),1)
 	(cd $(ASTERISK_DIR); \
-		menuselect/menuselect --enable app_meetme --enable app_page --enable chan_jingle menuselect.makeopts; \
+		menuselect/menuselect --enable app_meetme --enable app_page menuselect.makeopts; \
 	)
  endif
 endif

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

[Astlinux-commits] SF.net SVN: astlinux:[5907] branches/1.0/package/asterisk

From: <abe...@us...> - 2013-01-16 20:45:04

Revision: 5907
          http://astlinux.svn.sourceforge.net/astlinux/?rev=5907&view=rev
Author:   abelbeck
Date:     2013-01-16 20:44:56 +0000 (Wed, 16 Jan 2013)
Log Message:
-----------
asterisk, version bump to 1.8.20.0 and 11.2.0

Modified Paths:
--------------
    branches/1.0/package/asterisk/asterisk.mk

Added Paths:
-----------
    branches/1.0/package/asterisk/asterisk-11.2-revert-378582.patch

Added: branches/1.0/package/asterisk/asterisk-11.2-revert-378582.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11.2-revert-378582.patch	                        (rev 0)
+++ branches/1.0/package/asterisk/asterisk-11.2-revert-378582.patch	2013-01-16 20:44:56 UTC (rev 5907)
@@ -0,0 +1,50 @@
+--- asterisk-11.2.0/res/pjproject/aconfigure	2013/01/04 22:18:11	378582
++++ asterisk-11.2.0/res/pjproject/aconfigure	2013/01/04 22:18:21	378581
+@@ -2401,7 +2401,7 @@
+   program_prefix=${target_alias}-
+ ac_config_headers="$ac_config_headers pjlib/include/pj/compat/os_auto.h pjlib/include/pj/compat/m_auto.h pjmedia/include/pjmedia/config_auto.h pjmedia/include/pjmedia-codec/config_auto.h pjsip/include/pjsip/sip_autoconf.h"
+ 
+-ac_config_files="$ac_config_files build.mak build/os-auto.mak pjlib/build/os-auto.mak pjlib-util/build/os-auto.mak pjmedia/build/os-auto.mak pjsip/build/os-auto.mak third_party/build/os-auto.mak third_party/build/portaudio/os-auto.mak"
++ac_config_files="$ac_config_files build.mak build/os-auto.mak build/cc-auto.mak pjlib/build/os-auto.mak pjlib-util/build/os-auto.mak pjmedia/build/os-auto.mak pjsip/build/os-auto.mak third_party/build/os-auto.mak third_party/build/portaudio/os-auto.mak"
+ 
+ 
+ 
+@@ -7799,6 +7799,7 @@
+     "pjsip/include/pjsip/sip_autoconf.h") CONFIG_HEADERS="$CONFIG_HEADERS pjsip/include/pjsip/sip_autoconf.h" ;;
+     "build.mak") CONFIG_FILES="$CONFIG_FILES build.mak" ;;
+     "build/os-auto.mak") CONFIG_FILES="$CONFIG_FILES build/os-auto.mak" ;;
++    "build/cc-auto.mak") CONFIG_FILES="$CONFIG_FILES build/cc-auto.mak" ;;
+     "pjlib/build/os-auto.mak") CONFIG_FILES="$CONFIG_FILES pjlib/build/os-auto.mak" ;;
+     "pjlib-util/build/os-auto.mak") CONFIG_FILES="$CONFIG_FILES pjlib-util/build/os-auto.mak" ;;
+     "pjmedia/build/os-auto.mak") CONFIG_FILES="$CONFIG_FILES pjmedia/build/os-auto.mak" ;;
+
+--- asterisk-11.2.0/res/pjproject/aconfigure.ac	2013/01/04 22:18:11	378582
++++ asterisk-11.2.0/res/pjproject/aconfigure.ac	2013/01/04 22:18:21	378581
+@@ -13,6 +13,7 @@
+ 		 ])
+ AC_CONFIG_FILES([build.mak 
+ 		 build/os-auto.mak 
++		 build/cc-auto.mak
+ 		 pjlib/build/os-auto.mak 
+ 		 pjlib-util/build/os-auto.mak 
+ 		 pjmedia/build/os-auto.mak
+
+
+--- asterisk-11.2.0/res/pjproject/build/common.mak	2013/01/04 22:18:11	378582
++++ asterisk-11.2.0/res/pjproject/build/common.mak	2013/01/04 22:18:21	378581
+@@ -17,6 +17,15 @@
+ -include cc-$(CC_NAME).mak
+ 
+ #
++# Include auto configured compiler specification.
++# This will override the compiler settings above.
++# Currently this is made OPTIONAL, to prevent people
++# from getting errors because they don't re-run ./configure
++# after downloading new PJSIP.
++#
++-include $(PJDIR)/build/cc-auto.mak
++
++#
+ # Include global machine specific definitions
+ #
+ include $(PJDIR)/build/m-$(MACHINE_NAME).mak

Modified: branches/1.0/package/asterisk/asterisk.mk
===================================================================
--- branches/1.0/package/asterisk/asterisk.mk	2013-01-16 18:15:49 UTC (rev 5906)
+++ branches/1.0/package/asterisk/asterisk.mk	2013-01-16 20:44:56 UTC (rev 5907)
@@ -10,9 +10,9 @@
 ASTERISK_VERSION := 1.6.2.21
  else
   ifeq ($(BR2_PACKAGE_ASTERISK_v1_8),y)
-ASTERISK_VERSION := 1.8.19.1
+ASTERISK_VERSION := 1.8.20.0
   else
-ASTERISK_VERSION := 11.1.2
+ASTERISK_VERSION := 11.2.0
   endif
  endif
 endif

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

[Astlinux-commits] SF.net SVN: astlinux:[6019] branches/1.0/package/asterisk

From: <abe...@us...> - 2013-03-29 01:35:10

Revision: 6019
          http://astlinux.svn.sourceforge.net/astlinux/?rev=6019&view=rev
Author:   abelbeck
Date:     2013-03-29 01:35:00 +0000 (Fri, 29 Mar 2013)
Log Message:
-----------
asterisk, version bump to 1.8.21.0 and 11.3.0, additionally for Asterisk 11 include
Asterisk upstream branches/11 revisions: 380671, 380672, 380673 and 380816 to fix the res/pjproject cross-compile issues

Modified Paths:
--------------
    branches/1.0/package/asterisk/asterisk.mk

Added Paths:
-----------
    branches/1.0/package/asterisk/asterisk-11.3-pjproject-r380671.patch
    branches/1.0/package/asterisk/asterisk-11.3-pjproject-r380672.patch
    branches/1.0/package/asterisk/asterisk-11.3-pjproject-r380673.patch
    branches/1.0/package/asterisk/asterisk-11.3-pjproject-r380816.patch

Added: branches/1.0/package/asterisk/asterisk-11.3-pjproject-r380671.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11.3-pjproject-r380671.patch	                        (rev 0)
+++ branches/1.0/package/asterisk/asterisk-11.3-pjproject-r380671.patch	2013-03-29 01:35:00 UTC (rev 6019)
@@ -0,0 +1,292 @@
+Index: res/pjproject/aconfigure
+===================================================================
+--- asterisk-11.3.0/res/pjproject/aconfigure	(revision 380670)
++++ asterisk-11.3.0/res/pjproject/aconfigure	(revision 380671)
+@@ -649,10 +649,12 @@
+ CC_OUT
+ LIBEXT2
+ LIBEXT
+-RANLIB
+ LDOUT
+ LD
++AR_FLAGS
++ac_ct_AR
+ AR
++RANLIB
+ ac_ct_CXX
+ CXXFLAGS
+ CXX
+@@ -3468,18 +3470,205 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ 
+-if test -z "$CROSS_COMPILE"; then
+-    CROSS_COMPILE=`echo ${CC} | sed 's/gcc//'`
++if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
++set dummy ${ac_tool_prefix}ranlib; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_RANLIB+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  if test -n "$RANLIB"; then
++  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
++
+ fi
++fi
++RANLIB=$ac_cv_prog_RANLIB
++if test -n "$RANLIB"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
++$as_echo "$RANLIB" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
+ 
+-if test "$AR" = ""; then AR="${CROSS_COMPILE}ar rv"; fi
+ 
++fi
++if test -z "$ac_cv_prog_RANLIB"; then
++  ac_ct_RANLIB=$RANLIB
++  # Extract the first word of "ranlib", so it can be a program name with args.
++set dummy ranlib; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  if test -n "$ac_ct_RANLIB"; then
++  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_ac_ct_RANLIB="ranlib"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
++
++fi
++fi
++ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
++if test -n "$ac_ct_RANLIB"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
++$as_echo "$ac_ct_RANLIB" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++  if test "x$ac_ct_RANLIB" = x; then
++    RANLIB=":"
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++ac_tool_warned=yes ;;
++esac
++    RANLIB=$ac_ct_RANLIB
++  fi
++else
++  RANLIB="$ac_cv_prog_RANLIB"
++fi
++
++if test -n "$ac_tool_prefix"; then
++  for ac_prog in ar gar
++  do
++    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
++set dummy $ac_tool_prefix$ac_prog; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_AR+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  if test -n "$AR"; then
++  ac_cv_prog_AR="$AR" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
++
++fi
++fi
++AR=$ac_cv_prog_AR
++if test -n "$AR"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
++$as_echo "$AR" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++
++    test -n "$AR" && break
++  done
++fi
++if test -z "$AR"; then
++  ac_ct_AR=$AR
++  for ac_prog in ar gar
++do
++  # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  if test -n "$ac_ct_AR"; then
++  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_ac_ct_AR="$ac_prog"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
++
++fi
++fi
++ac_ct_AR=$ac_cv_prog_ac_ct_AR
++if test -n "$ac_ct_AR"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
++$as_echo "$ac_ct_AR" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++
++  test -n "$ac_ct_AR" && break
++done
++
++  if test "x$ac_ct_AR" = x; then
++    AR=":"
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++ac_tool_warned=yes ;;
++esac
++    AR=$ac_ct_AR
++  fi
++fi
++
++
++if test "$AR_FLAGS" = ""; then AR_FLAGS="rv"; fi
++
+ if test "$LD" = ""; then LD="$CC"; fi
+ 
+ if test "$LDOUT" = ""; then LDOUT="-o "; fi
+ 
+-if test "$RANLIB" = ""; then RANLIB="${CROSS_COMPILE}ranlib"; fi
+-
+ if test "$OBJEXT" = ""; then OBJEXT='o'; fi
+ 
+ if test "$LIBEXT" = ""; then LIBEXT='a'; fi
+Index: res/pjproject/build/rules.mak
+===================================================================
+--- asterisk-11.3.0/res/pjproject/build/rules.mak	(revision 380670)
++++ asterisk-11.3.0/res/pjproject/build/rules.mak	(revision 380671)
+@@ -72,6 +72,7 @@
+ 	@echo DEPFLAGS=$(DEPFLAGS)
+ 	@echo CC=$(CC)
+ 	@echo AR=$(AR)
++	@echo AR_FLAGS=$(AR_FLAGS)
+ 	@echo RANLIB=$(RANLIB)
+ 
+ print_bin: print_common
+@@ -84,7 +85,7 @@
+ 
+ $(LIB): $(OBJDIRS) $(OBJS) $($(APP)_EXTRA_DEP)
+ 	if test ! -d $(LIBDIR); then $(subst @@,$(subst /,$(HOST_PSEP),$(LIBDIR)),$(HOST_MKDIR)); fi
+-	$(AR) $(LIB) $(OBJS)
++	$(AR) $(AR_FLAGS) $(LIB) $(OBJS)
+ 	$(RANLIB) $(LIB)
+ 
+ $(SHLIB): $(OBJDIRS) $(OBJS) $($(APP)_EXTRA_DEP)
+Index: res/pjproject/build/cc-auto.mak.in
+===================================================================
+--- asterisk-11.3.0/res/pjproject/build/cc-auto.mak.in	(revision 380670)
++++ asterisk-11.3.0/res/pjproject/build/cc-auto.mak.in	(revision 380671)
+@@ -1,6 +1,7 @@
+ export CC = @CC@ -c
+ export CXX = @CXX@ -c
+ export AR = @AR@
++export AR_FLAGS = @AR_FLAGS@
+ export LD = @LD@
+ export LDOUT = -o 
+ export RANLIB = @RANLIB@
+Index: res/pjproject/aconfigure.ac
+===================================================================
+--- asterisk-11.3.0/res/pjproject/aconfigure.ac	(revision 380670)
++++ asterisk-11.3.0/res/pjproject/aconfigure.ac	(revision 380671)
+@@ -40,21 +40,15 @@
+ AC_PROG_CXX
+ AC_LANG_C
+ 
+-dnl #
+-dnl # Setup CROSS_COMPILE variable
+-dnl #
+-if test -z "$CROSS_COMPILE"; then 
+-    CROSS_COMPILE=`echo ${CC} | sed 's/gcc//'`
+-fi
++AC_PROG_RANLIB
++AC_CHECK_TOOLS([AR], [ar gar], :)
+ 
+-if test "$AR" = ""; then AR="${CROSS_COMPILE}ar rv"; fi
+-AC_SUBST(AR)
++if test "$AR_FLAGS" = ""; then AR_FLAGS="rv"; fi
++AC_SUBST(AR_FLAGS)
+ if test "$LD" = ""; then LD="$CC"; fi
+ AC_SUBST(LD)
+ if test "$LDOUT" = ""; then LDOUT="-o "; fi
+ AC_SUBST(LDOUT)
+-if test "$RANLIB" = ""; then RANLIB="${CROSS_COMPILE}ranlib"; fi
+-AC_SUBST(RANLIB)
+ if test "$OBJEXT" = ""; then OBJEXT='o'; fi
+ AC_SUBST(OBJEXT)
+ if test "$LIBEXT" = ""; then LIBEXT='a'; fi

Added: branches/1.0/package/asterisk/asterisk-11.3-pjproject-r380672.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11.3-pjproject-r380672.patch	                        (rev 0)
+++ branches/1.0/package/asterisk/asterisk-11.3-pjproject-r380672.patch	2013-03-29 01:35:00 UTC (rev 6019)
@@ -0,0 +1,133 @@
+Index: res/pjproject/aconfigure
+===================================================================
+--- asterisk-11.3.0/res/pjproject/aconfigure	(revision 380671)
++++ asterisk-11.3.0/res/pjproject/aconfigure	(revision 380672)
+@@ -4079,6 +4079,51 @@
+ 
+ fi
+ 
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sin in -lm" >&5
++$as_echo_n "checking for sin in -lm... " >&6; }
++if test "${ac_cv_lib_m_sin+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lm  $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char sin ();
++int
++main ()
++{
++return sin ();
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_m_sin=yes
++else
++  ac_cv_lib_m_sin=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_sin" >&5
++$as_echo "$ac_cv_lib_m_sin" >&6; }
++if test "x$ac_cv_lib_m_sin" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_LIBM 1
++_ACEOF
++
++  LIBS="-lm $LIBS"
++
++fi
++
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_generate in -luuid" >&5
+ $as_echo_n "checking for uuid_generate in -luuid... " >&6; }
+ if test "${ac_cv_lib_uuid_uuid_generate+set}" = set; then :
+@@ -4865,56 +4910,11 @@
+ 
+ 	        { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if floating point is disabled... no" >&5
+ $as_echo "Checking if floating point is disabled... no" >&6; }
+-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fmod in -lm" >&5
+-$as_echo_n "checking for fmod in -lm... " >&6; }
+-if test "${ac_cv_lib_m_fmod+set}" = set; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lm  $LIBS"
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+ 
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char fmod ();
+-int
+-main ()
+-{
+-return fmod ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_lib_m_fmod=yes
+-else
+-  ac_cv_lib_m_fmod=no
+ fi
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_fmod" >&5
+-$as_echo "$ac_cv_lib_m_fmod" >&6; }
+-if test "x$ac_cv_lib_m_fmod" = x""yes; then :
+-  cat >>confdefs.h <<_ACEOF
+-#define HAVE_LIBM 1
+-_ACEOF
+ 
+-  LIBS="-lm $LIBS"
+ 
+-fi
+ 
+-
+-fi
+-
+-
+-
+ ac_fn_c_check_header_mongrel "$LINENO" "arpa/inet.h" "ac_cv_header_arpa_inet_h" "$ac_includes_default"
+ if test "x$ac_cv_header_arpa_inet_h" = x""yes; then :
+   $as_echo "#define PJ_HAS_ARPA_INET_H 1" >>confdefs.h
+Index: res/pjproject/aconfigure.ac
+===================================================================
+--- asterisk-11.3.0/res/pjproject/aconfigure.ac	(revision 380671)
++++ asterisk-11.3.0/res/pjproject/aconfigure.ac	(revision 380672)
+@@ -106,6 +106,7 @@
+ AC_CHECK_LIB(socket,puts)
+ AC_CHECK_LIB(rt,puts)
+ AC_CHECK_LIB(nsl,puts)
++AC_CHECK_LIB(m,sin)
+ AC_CHECK_LIB(uuid,uuid_generate)
+ AC_CHECK_LIB(uuid,uuid_generate,[ac_has_uuid_lib=1])
+ 
+@@ -178,7 +179,6 @@
+ 	      [
+ 		AC_DEFINE(PJ_HAS_FLOATING_POINT,1)
+ 	        AC_MSG_RESULT([Checking if floating point is disabled... no]) 
+-		AC_CHECK_LIB(m,fmod)
+ 	      ])
+ 
+ 

Added: branches/1.0/package/asterisk/asterisk-11.3-pjproject-r380673.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11.3-pjproject-r380673.patch	                        (rev 0)
+++ branches/1.0/package/asterisk/asterisk-11.3-pjproject-r380673.patch	2013-03-29 01:35:00 UTC (rev 6019)
@@ -0,0 +1,213 @@
+Index: res/pjproject/pjnath/build/Makefile
+===================================================================
+--- asterisk-11.3.0/res/pjproject/pjnath/build/Makefile	(revision 380672)
++++ asterisk-11.3.0/res/pjproject/pjnath/build/Makefile	(revision 380673)
+@@ -92,18 +92,24 @@
+ dep: depend
+ distclean: realclean
+ 
+-.PHONY: dep depend pjlib pjlib-test clean realclean distclean
++.PHONY: dep depend clean realclean distclean
++.PHONY: $(TARGETS)
++.PHONY: $(PJNATH_LIB) $(PJNATH_TEST_EXE) $(PJTURN_CLIENT_EXE) $(PJTURN_SRV_EXE)
+ 
+-pjnath:
++pjnath: $(PJNATH_LIB)
++$(PJNATH_LIB):
+ 	$(MAKE) -f $(RULES_MAK) APP=PJNATH app=pjnath $(PJNATH_LIB)
+ 
+-pjnath-test: $(PJLIB_LIB) $(PJLIB_UTIL_LIB) $(PJNATH_LIB)
++pjnath-test: $(PJNATH_TEST_EXE)
++$(PJNATH_TEST_EXE): $(PJNATH_LIB)
+ 	$(MAKE) -f $(RULES_MAK) APP=PJNATH_TEST app=pjnath-test $(PJNATH_TEST_EXE)
+ 
+-pjturn-client: $(PJLIB_LIB) $(PJLIB_UTIL_LIB) $(PJNATH_LIB)
++pjturn-client: $(PJTURN_CLIENT_EXE)
++$(PJTURN_CLIENT_EXE): $(PJNATH_LIB)
+ 	$(MAKE) -f $(RULES_MAK) APP=PJTURN_CLIENT app=pjturn-client $(PJTURN_CLIENT_EXE)
+ 
+-pjturn-srv: $(PJLIB_LIB) $(PJLIB_UTIL_LIB) $(PJNATH_LIB)
++pjturn-srv: $(PJTURN_SRV_EXE)
++$(PJTURN_SRV_EXE): $(PJNATH_LIB)
+ 	$(MAKE) -f $(RULES_MAK) APP=PJTURN_SRV app=pjturn-srv $(PJTURN_SRV_EXE)
+ 
+ .PHONY: ../lib/pjnath.ko
+Index: res/pjproject/pjsip/build/Makefile
+===================================================================
+--- asterisk-11.3.0/res/pjproject/pjsip/build/Makefile	(revision 380672)
++++ asterisk-11.3.0/res/pjproject/pjsip/build/Makefile	(revision 380673)
+@@ -106,8 +106,6 @@
+ #
+ TARGETS := pjsip pjsip-ua pjsip-simple pjsua-lib pjsip-test
+ 
+-.PHONY: $(TARGETS)
+-
+ all: $(TARGETS)
+ 
+ doc:
+@@ -124,21 +122,28 @@
+ dep: depend
+ distclean: realclean
+ 
+-.PHONY: dep depend pjsip pjsip-ua pjsua-lib clean realclean distclean
++.PHONY: dep depend clean realclean distclean
++.PHONY: $(TARGETS)
++.PHONY: $(PJSIP_LIB) $(PJSIP_UA_LIB) $(PJSIP_SIMPLE_LIB) $(PJSUA_LIB_LIB) $(TEST_EXE)
+ 
+-pjsip:
++pjsip: $(PJSIP_LIB)
++$(PJSIP_LIB):
+ 	$(MAKE) -f $(RULES_MAK) APP=PJSIP app=pjsip $(PJSIP_LIB)
+ 
+-pjsip-ua:
++pjsip-ua: $(PJSIP_UA_LIB)
++$(PJSIP_UA_LIB):
+ 	$(MAKE) -f $(RULES_MAK) APP=PJSIP_UA app=pjsip-ua $(PJSIP_UA_LIB)
+ 
+-pjsip-simple:
++pjsip-simple: $(PJSIP_SIMPLE_LIB)
++$(PJSIP_SIMPLE_LIB):
+ 	$(MAKE) -f $(RULES_MAK) APP=PJSIP_SIMPLE app=pjsip-simple $(PJSIP_SIMPLE_LIB)
+ 
+-pjsua-lib: 
++pjsua-lib: $(PJSUA_LIB_LIB)
++$(PJSUA_LIB_LIB): 
+ 	$(MAKE) -f $(RULES_MAK) APP=PJSUA_LIB app=pjsua-lib $(PJSUA_LIB_LIB)
+ 
+-pjsip-test:
++pjsip-test: $(TEST_EXE)
++$(TEST_EXE): $(PJSUA_LIB_LIB) $(PJSIP_SIMPLE_LIB) $(PJSIP_UA_LIB) $(PJSIP_LIB)
+ 	$(MAKE) -f $(RULES_MAK) APP=TEST app=pjsip-test $(TEST_EXE)
+ 
+ .PHONY: ../lib/pjsip.ko
+Index: res/pjproject/pjsip-apps/build/Makefile
+===================================================================
+--- asterisk-11.3.0/res/pjproject/pjsip-apps/build/Makefile	(revision 380672)
++++ asterisk-11.3.0/res/pjproject/pjsip-apps/build/Makefile	(revision 380673)
+@@ -57,8 +57,6 @@
+ #
+ TARGETS := pjsua pjsystest samples
+ 
+-.PHONY: $(TARGETS)
+-
+ all: $(TARGETS)
+ 
+ doc:
+@@ -66,12 +64,16 @@
+ dep: depend
+ distclean: realclean
+ 
+-.PHONY: dep depend pjsua clean realclean distclean
++.PHONY: dep depend clean realclean distclean
++.PHONY: $(TARGETS)
++.PHONY: $(PJSUA_EXE) $(PJSYSTEST_EXE)
+ 
+-pjsua:
++pjsua: $(PJSUA_EXE)
++$(PJSUA_EXE):
+ 	$(MAKE) -f $(RULES_MAK) APP=PJSUA app=pjsua $(PJSUA_EXE)
+ 
+-pjsystest:
++pjsystest: $(PJSYSTEST_EXE)
++$(PJSYSTEST_EXE):
+ 	$(MAKE) -f $(RULES_MAK) APP=PJSYSTEST app=pjsystest $(PJSYSTEST_EXE)
+ 
+ samples:
+Index: res/pjproject/pjmedia/build/Makefile
+===================================================================
+--- asterisk-11.3.0/res/pjproject/pjmedia/build/Makefile	(revision 380672)
++++ asterisk-11.3.0/res/pjproject/pjmedia/build/Makefile	(revision 380673)
+@@ -156,24 +156,32 @@
+ dep: depend
+ distclean: realclean
+ 
+-.PHONY: dep depend pjmedia pjmedia-codec pjmedia-videodev pjmedia-audiodev pjmedia-test clean realclean distclean
++.PHONY: dep depend clean realclean distclean
++.PHONY: $(TARGETS)
++.PHONY: $(PJMEDIA_LIB) $(PJMEDIA_CODEC_LIB) $(PJMEDIA_VIDEODEV_LIB) $(PJMEDIA_AUDIODEV_LIB) $(PJSDP_LIB) $(PJMEDIA_TEST_EXE)
+ 
+-pjmedia:
++pjmedia: $(PJMEDIA_LIB)
++$(PJMEDIA_LIB):
+ 	$(MAKE) -f $(RULES_MAK) APP=PJMEDIA app=pjmedia $(PJMEDIA_LIB)
+ 
+-pjmedia-codec:
++pjmedia-codec: $(PJMEDIA_CODEC_LIB)
++$(PJMEDIA_CODEC_LIB):
+ 	$(MAKE) -f $(RULES_MAK) APP=PJMEDIA_CODEC app=pjmedia-codec $(PJMEDIA_CODEC_LIB)
+ 
+-pjmedia-videodev:
++pjmedia-videodev: $(PJMEDIA_VIDEODEV_LIB)
++$(PJMEDIA_VIDEODEV_LIB):
+ 	$(MAKE) -f $(RULES_MAK) APP=PJMEDIA_VIDEODEV app=pjmedia-videodev $(PJMEDIA_VIDEODEV_LIB)
+ 
+-pjmedia-audiodev:
++pjmedia-audiodev: $(PJMEDIA_AUDIODEV_LIB)
++$(PJMEDIA_AUDIODEV_LIB):
+ 	$(MAKE) -f $(RULES_MAK) APP=PJMEDIA_AUDIODEV app=pjmedia-audiodev $(PJMEDIA_AUDIODEV_LIB)
+ 
+-pjsdp:
++pjsdp: $(PJSDP_LIB)
++$(PJSDP_LIB):
+ 	$(MAKE) -f $(RULES_MAK) APP=PJSDP app=pjsdp $(PJSDP_LIB)
+ 
+-pjmedia-test: $(PJMEDIA_LIB)
++pjmedia-test: $(PJMEDIA_TEST_EXE)
++$(PJMEDIA_TEST_EXE): $(PJMEDIA_LIB) $(PJMEDIA_CODEC_LIB)
+ 	$(MAKE) -f $(RULES_MAK) APP=PJMEDIA_TEST app=pjmedia-test $(PJMEDIA_TEST_EXE)
+ 
+ .PHONY: ../lib/pjmedia.ko
+Index: res/pjproject/pjlib/build/Makefile
+===================================================================
+--- asterisk-11.3.0/res/pjproject/pjlib/build/Makefile	(revision 380672)
++++ asterisk-11.3.0/res/pjproject/pjlib/build/Makefile	(revision 380673)
+@@ -77,17 +77,21 @@
+ 	echo '$(TEST_EXE): $(PJLIB_LIB)' >> .pjlib-test-$(TARGET_NAME).depend
+ 
+ 
+-.PHONY: dep depend pjlib pjlib-test clean realclean distclean
++.PHONY: dep depend clean realclean distclean
++.PHONY: $(TARGETS)
++.PHONY: $(PJLIB_LIB) $(TEST_EXE)
+ 
+ dep: depend
+ 
+-pjlib: ../include/pj/config_site.h
++pjlib: $(PJLIB_LIB)
++$(PJLIB_LIB): ../include/pj/config_site.h
+ 	$(MAKE) -f $(RULES_MAK) APP=PJLIB app=pjlib $(PJLIB_LIB)
+ 
+ ../include/pj/config_site.h:
+ 	touch ../include/pj/config_site.h
+-	
+-pjlib-test: 
++
++pjlib-test: $(TEST_EXE)
++$(TEST_EXE): $(PJLIB_LIB)
+ 	$(MAKE) -f $(RULES_MAK) APP=TEST app=pjlib-test $(TEST_EXE)
+ 
+ .PHONY: ../lib/pjlib.ko
+Index: res/pjproject/pjlib-util/build/Makefile
+===================================================================
+--- asterisk-11.3.0/res/pjproject/pjlib-util/build/Makefile	(revision 380672)
++++ asterisk-11.3.0/res/pjproject/pjlib-util/build/Makefile	(revision 380673)
+@@ -69,12 +69,16 @@
+ dep: depend
+ distclean: realclean
+ 
+-.PHONY: dep depend pjlib pjlib-test clean realclean distclean
++.PHONY: dep depend clean realclean distclean
++.PHONY: $(TARGETS)
++.PHONY: $(PJLIB_UTIL_LIB) $(UTIL_TEST_EXE)
+ 
+-pjlib-util:
++pjlib-util: $(PJLIB_UTIL_LIB)
++$(PJLIB_UTIL_LIB):
+ 	$(MAKE) -f $(RULES_MAK) APP=PJLIB_UTIL app=pjlib-util $(PJLIB_UTIL_LIB)
+ 
+-pjlib-util-test:
++pjlib-util-test: $(UTIL_TEST_EXE)
++$(UTIL_TEST_EXE): $(PJLIB_UTIL_LIB)
+ 	$(MAKE) -f $(RULES_MAK) APP=UTIL_TEST app=pjlib-util-test $(UTIL_TEST_EXE)
+ 
+ .PHONY: ../lib/pjlib-util.ko

Added: branches/1.0/package/asterisk/asterisk-11.3-pjproject-r380816.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11.3-pjproject-r380816.patch	                        (rev 0)
+++ branches/1.0/package/asterisk/asterisk-11.3-pjproject-r380816.patch	2013-03-29 01:35:00 UTC (rev 6019)
@@ -0,0 +1,258 @@
+Index: Makefile
+===================================================================
+--- asterisk-11.3.0/Makefile	(revision 380815)
++++ asterisk-11.3.0/Makefile	(revision 380816)
+@@ -98,12 +98,7 @@
+ export LDCONFIG_FLAGS
+ export PYTHON
+ 
+-# even though we could use '-include makeopts' here, use a wildcard
+-# lookup anyway, so that make won't try to build makeopts if it doesn't
+-# exist (other rules will force it to be built if needed)
+-ifneq ($(wildcard makeopts),)
+-  include makeopts
+-endif
++-include makeopts
+ 
+ # start the primary CFLAGS and LDFLAGS with any that were provided
+ # to the configure script
+@@ -311,7 +306,7 @@
+ 	mK=" make"
+ endif
+ 
+-all: _cleantest_all
++all: _all
+ 	@echo " +--------- Asterisk Build Complete ---------+"
+ 	@echo " + Asterisk has successfully been built, and +"
+ 	@echo " + can be installed by running:              +"
+@@ -319,7 +314,7 @@
+ 	@echo " +               $(mK) install               +"
+ 	@echo " +-------------------------------------------+"
+ 
+-full: _cleantest_all_full
++full: _full
+ 	@echo " +--------- Asterisk Build Complete ---------+"
+ 	@echo " + Asterisk has successfully been built, and +"
+ 	@echo " + can be installed by running:              +"
+@@ -328,19 +323,9 @@
+ 	@echo " +-------------------------------------------+"
+ 
+ 
+-# For parallel builds, we must call cleantest *before* running the
+-# other dependencies on _all.
+-_cleantest_all: cleantest
+-	@$(MAKE) _all
+-
+-# For parallel builds, we must call cleantest *before* running the
+-# other dependencies on _all.
+-_cleantest_all_full: cleantest
+-	@$(MAKE) _all_full
+-
+ _all: makeopts $(SUBDIRS) doc/core-en_US.xml $(ADDL_TARGETS)
+ 
+-_all_full: makeopts $(SUBDIRS) doc/full-en_US.xml $(ADDL_TARGETS)
++_full: makeopts $(SUBDIRS) doc/full-en_US.xml $(ADDL_TARGETS)
+ 
+ makeopts: configure
+ 	@echo "****"
+@@ -375,7 +360,7 @@
+ 	+@$(SUBMAKE) $(MOD_SUBDIRS_EMBED_LDFLAGS)
+ 	+@$(SUBMAKE) $(MOD_SUBDIRS_EMBED_LIBS)
+ 
+-$(SUBDIRS): main/version.c include/asterisk/build.h include/asterisk/buildopts.h defaults.h makeopts.embed_rules
++$(SUBDIRS): makeopts cleantest main/version.c include/asterisk/build.h include/asterisk/buildopts.h defaults.h makeopts.embed_rules
+ 
+ ifeq ($(findstring $(OSARCH), mingw32 cygwin ),)
+     # Non-windows:
+@@ -395,10 +380,10 @@
+ res:	main
+ endif
+ 
+-$(MOD_SUBDIRS):
++$(MOD_SUBDIRS): makeopts
+ 	+@_ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(_ASTCFLAGS)" ASTCFLAGS="$(ASTCFLAGS)" _ASTLDFLAGS="$(_ASTLDFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(SUBMAKE) --no-builtin-rules -C $@ SUBDIR=$@ all
+ 
+-$(OTHER_SUBDIRS):
++$(OTHER_SUBDIRS): makeopts
+ 	+@_ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(_ASTCFLAGS)" ASTCFLAGS="$(ASTCFLAGS)" _ASTLDFLAGS="$(_ASTLDFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(SUBMAKE) --no-builtin-rules -C $@ SUBDIR=$@ all
+ 
+ defaults.h: makeopts build_tools/make_defaults_h
+@@ -452,7 +437,7 @@
+ 	rm -rf doc/api
+ 	rm -f build_tools/menuselect-deps
+ 
+-datafiles: _cleantest_all doc/core-en_US.xml
++datafiles: _all doc/core-en_US.xml
+ 	CFLAGS="$(_ASTCFLAGS) $(ASTCFLAGS)" build_tools/mkpkgconfig "$(DESTDIR)$(libdir)/pkgconfig";
+ # Should static HTTP be installed during make samples or even with its own target ala
+ # webvoicemail?  There are portions here that *could* be customized but might also be
+@@ -473,7 +458,7 @@
+ 	done
+ 	$(MAKE) -C sounds install
+ 
+-doc/core-en_US.xml: $(foreach dir,$(MOD_SUBDIRS),$(shell $(GREP) -l "language=\"en_US\"" $(dir)/*.c $(dir)/*.cc 2>/dev/null))
++doc/core-en_US.xml: makeopts $(foreach dir,$(MOD_SUBDIRS),$(shell $(GREP) -l "language=\"en_US\"" $(dir)/*.c $(dir)/*.cc 2>/dev/null))
+ 	@printf "Building Documentation For: "
+ 	@echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" > $@
+ 	@echo "<!DOCTYPE docs SYSTEM \"appdocsxml.dtd\">" >> $@
+@@ -487,7 +472,7 @@
+ 	@echo
+ 	@echo "</docs>" >> $@
+ 
+-doc/full-en_US.xml: $(foreach dir,$(MOD_SUBDIRS),$(shell $(GREP) -l "language=\"en_US\"" $(dir)/*.c $(dir)/*.cc 2>/dev/null))
++doc/full-en_US.xml: makeopts $(foreach dir,$(MOD_SUBDIRS),$(shell $(GREP) -l "language=\"en_US\"" $(dir)/*.c $(dir)/*.cc 2>/dev/null))
+ ifeq ($(PYTHON),:)
+ 	@echo "--------------------------------------------------------------------------"
+ 	@echo "---        Please install python to build full documentation           ---"
+@@ -561,7 +546,7 @@
+ main-bininstall:
+ 	+@DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" ASTLIBDIR="$(ASTLIBDIR)" $(SUBMAKE) -C main bininstall
+ 
+-bininstall: _cleantest_all installdirs $(SUBDIRS_INSTALL) main-bininstall
++bininstall: _all installdirs $(SUBDIRS_INSTALL) main-bininstall
+ 	$(INSTALL) -m 755 contrib/scripts/astgenkey "$(DESTDIR)$(ASTSBINDIR)/"
+ 	$(INSTALL) -m 755 contrib/scripts/autosupport "$(DESTDIR)$(ASTSBINDIR)/"
+ 	if [ ! -f "$(DESTDIR)$(ASTSBINDIR)/safe_asterisk" -a ! -f /sbin/launchd ]; then \
+@@ -916,19 +901,19 @@
+ 		CFLAGS="$(BUILD_CFLAGS)" LDFLAGS="$(BUILD_LDFLAGS)" \
+ 		$(MAKE) -C menuselect CONFIGURE_SILENT="--silent"
+ 
+-menuselect/menuselect: menuselect/makeopts
++menuselect/menuselect: menuselect/makeopts cleantest
+ 	+$(MAKE_MENUSELECT) menuselect
+ 
+-menuselect/cmenuselect: menuselect/makeopts
++menuselect/cmenuselect: menuselect/makeopts cleantest
+ 	+$(MAKE_MENUSELECT) cmenuselect
+ 
+-menuselect/gmenuselect: menuselect/makeopts
++menuselect/gmenuselect: menuselect/makeopts cleantest
+ 	+$(MAKE_MENUSELECT) gmenuselect
+ 
+-menuselect/nmenuselect: menuselect/makeopts
++menuselect/nmenuselect: menuselect/makeopts cleantest
+ 	+$(MAKE_MENUSELECT) nmenuselect
+ 
+-menuselect/makeopts: makeopts
++menuselect/makeopts: makeopts cleantest
+ 	+$(MAKE_MENUSELECT) makeopts
+ 
+ menuselect-tree: $(foreach dir,$(filter-out main,$(MOD_SUBDIRS)),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) build_tools/cflags.xml build_tools/cflags-devmode.xml sounds/sounds.xml build_tools/embed_modules.xml utils/utils.xml agi/agi.xml configure makeopts
+@@ -956,7 +941,8 @@
+ .PHONY: distclean
+ .PHONY: all
+ .PHONY: _all
+-.PHONY: _cleantest_all
++.PHONY: full
++.PHONY: _full
+ .PHONY: prereqs
+ .PHONY: cleantest
+ .PHONY: uninstall
+Index: res/Makefile
+===================================================================
+--- asterisk-11.3.0/res/Makefile	(revision 380815)
++++ asterisk-11.3.0/res/Makefile	(revision 380816)
+@@ -67,21 +67,25 @@
+ ael/pval.o: ael/pval.c
+ 
+ clean::
+-	$(MAKE) -C pjproject realclean
++	@if [ -f pjproject/build.mak ]; then $(MAKE) -C pjproject realclean; fi
+ 	rm -f snmp/*.o snmp/*.i ael/*.o ael/*.i ais/*.o ais/*.i
+ 
+-pjproject/build.mak:
+-	cd pjproject && ./configure AR="" CFLAGS=-fPIC  --disable-floating-point --disable-sound --disable-oss --disable-speex-aec --disable-l16-codec --disable-gsm-codec --disable-g722-codec --disable-g7221-codec --disable-speex-codec --disable-ilbc-codec --disable-g711-codec
++dist-clean::
++	rm -f pjproject/build.mak
+ 
+-.PHONY : pjproject
+-pjproject: pjproject/build.mak
+-	# Make sure we always build pjproject with a single job.
+-	$(MAKE) -j1 -C pjproject dep
+-	$(MAKE) -j1 -C pjproject
++pjproject/build.mak: pjproject/aconfigure
++	(cd pjproject && CFLAGS="-fPIC" ./configure --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --disable-floating-point --disable-sound --disable-oss --disable-speex-aec --disable-l16-codec --disable-gsm-codec --disable-g722-codec --disable-g7221-codec --disable-speex-codec --disable-ilbc-codec --disable-g711-codec)
+ 
+-include pjproject/build.mak
++ifneq ($(findstring $(MAKECMDGOALS),all),)
++-include pjproject/build.mak
++endif
+ 
+-$(PJ_LIB_FILES): pjproject
++.PHONY: FORCE
++FORCE:
++
++$(PJ_LIB_FILES): FORCE
++	$(MAKE) -C $(patsubst %/lib/,%,$(dir $@))/build/ ../lib/$(notdir $@)
++
+ res_rtp_asterisk.o: $(PJ_LIB_FILES)
+ res_rtp_asterisk.o: _ASTCFLAGS+=$(PJ_CFLAGS)
+ res_rtp_asterisk.so: _ASTLDFLAGS+=$(PJ_LDFLAGS)
+Index: res/pjproject/aconfigure
+===================================================================
+--- asterisk-11.3.0/res/pjproject/aconfigure	(revision 380815)
++++ asterisk-11.3.0/res/pjproject/aconfigure	(revision 380816)
+@@ -2403,7 +2403,7 @@
+   program_prefix=${target_alias}-
+ ac_config_headers="$ac_config_headers pjlib/include/pj/compat/os_auto.h pjlib/include/pj/compat/m_auto.h pjmedia/include/pjmedia/config_auto.h pjmedia/include/pjmedia-codec/conf...
 
[truncated message content]

[Astlinux-commits] SF.net SVN: astlinux:[6074] branches/1.0/package/asterisk

From: <abe...@us...> - 2013-05-05 21:17:49

Revision: 6074
          http://sourceforge.net/p/astlinux/code/6074
Author:   abelbeck
Date:     2013-05-05 21:17:46 +0000 (Sun, 05 May 2013)
Log Message:
-----------
asterisk, add and install ASTERISK-MIB.txt and DIGIUM-MIB.txt mib files when netsnmp is selected

Modified Paths:
--------------
    branches/1.0/package/asterisk/asterisk.mk

Added Paths:
-----------
    branches/1.0/package/asterisk/mibs/
    branches/1.0/package/asterisk/mibs/ASTERISK-MIB.txt
    branches/1.0/package/asterisk/mibs/DIGIUM-MIB.txt

Modified: branches/1.0/package/asterisk/asterisk.mk
===================================================================
--- branches/1.0/package/asterisk/asterisk.mk	2013-05-05 01:47:36 UTC (rev 6073)
+++ branches/1.0/package/asterisk/asterisk.mk	2013-05-05 21:17:46 UTC (rev 6074)
@@ -324,6 +324,11 @@
 	ln -sf /tmp/etc/asterisk $(TARGET_DIR)/etc/asterisk
 	ln -sf /mnt/kd/custom-sounds $(TARGET_DIR)/stat/var/lib/asterisk/sounds/custom-sounds
 
+	if [ -d $(TARGET_DIR)/usr/share/snmp/mibs ]; then \
+	  $(INSTALL) -D -m 0644 package/asterisk/mibs/ASTERISK-MIB.txt $(TARGET_DIR)/usr/share/snmp/mibs/ ; \
+	  $(INSTALL) -D -m 0644 package/asterisk/mibs/DIGIUM-MIB.txt $(TARGET_DIR)/usr/share/snmp/mibs/ ; \
+	fi
+
 asterisk: $(TARGET_DIR)/$(ASTERISK_TARGET_BINARY)
 
 asterisk-source: $(ASTERISK_DIR)/.patched
@@ -349,6 +354,8 @@
 	rm -Rf $(TARGET_DIR)/stat/var/lib/asterisk
 	rm -Rf $(TARGET_DIR)/stat/var/spool/asterisk
 	rm -Rf $(TARGET_DIR)/stat/etc/asterisk
+	rm -f $(TARGET_DIR)/usr/share/snmp/mibs/ASTERISK-MIB.txt
+	rm -f $(TARGET_DIR)/usr/share/snmp/mibs/DIGIUM-MIB.txt
 	-$(MAKE) -C $(ASTERISK_DIR) clean
 	rm -rf $(BUILD_DIR)/asterisk
 	rm -rf $(BUILD_DIR)/asterisk-$(ASTERISK_VERSION)

Added: branches/1.0/package/asterisk/mibs/ASTERISK-MIB.txt
===================================================================
--- branches/1.0/package/asterisk/mibs/ASTERISK-MIB.txt	                        (rev 0)
+++ branches/1.0/package/asterisk/mibs/ASTERISK-MIB.txt	2013-05-05 21:17:46 UTC (rev 6074)
@@ -0,0 +1,778 @@
+ASTERISK-MIB DEFINITIONS ::= BEGIN
+
+IMPORTS
+	OBJECT-TYPE, MODULE-IDENTITY, Integer32, Counter32, TimeTicks,
+	Unsigned32, Gauge32
+		FROM SNMPv2-SMI
+
+	TEXTUAL-CONVENTION, DisplayString, TruthValue
+		FROM SNMPv2-TC
+
+	digium
+		FROM DIGIUM-MIB;
+
+asterisk MODULE-IDENTITY
+	LAST-UPDATED	"200806202025Z"
+	ORGANIZATION	"Digium, Inc."
+	CONTACT-INFO
+		"Mark A. Spencer
+		Postal: Digium, Inc.
+		        445 Jan Davis Drive
+		        Huntsville, AL 35806
+		        USA
+		   Tel: +1 256 428 6000
+		 Email: mar...@di...
+
+		Thorsten Lockert
+		Postal: Voop AS
+		        Boehmergaten 42
+			NO-5057 Bergen
+			Norway
+		   Tel: +47 5598 7200
+		 Email: th...@vo..."
+	DESCRIPTION
+		"Asterisk is an Open Source PBX.  This MIB defined
+		objects for managing Asterisk instances."
+	REVISION	"200806202025Z"
+	DESCRIPTION
+		"smilint police --
+		 Add missing imports; fix initial capitalization
+		 of enumeration elements; add missing range
+		 restrictions for Integer32 indices, correct
+		 spelling of astChanCidANI in its definition.
+		 Addresses bug 12905. - je...@op..."
+	REVISION	"200708211450Z"
+	DESCRIPTION
+		"Add total and current call counter statistics."
+	REVISION	"200603061840Z"
+	DESCRIPTION
+		"Change audio codec identification from 3kAudio to
+		Audio3k to conform better with specification.
+
+		Expand on contact information."
+	REVISION	"200602041900Z"
+	DESCRIPTION
+		"Initial published revision."
+	::= { digium 1 }
+
+asteriskVersion		OBJECT IDENTIFIER ::= { asterisk 1 }
+asteriskConfiguration	OBJECT IDENTIFIER ::= { asterisk 2 }
+asteriskModules		OBJECT IDENTIFIER ::= { asterisk 3 }
+asteriskIndications	OBJECT IDENTIFIER ::= { asterisk 4 }
+asteriskChannels	OBJECT IDENTIFIER ::= { asterisk 5 }
+
+-- asteriskVersion
+
+astVersionString OBJECT-TYPE
+	SYNTAX		DisplayString
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"Text version string of the version of Asterisk that
+		the SNMP Agent was compiled to run against."
+	::= { asteriskVersion 1 }
+
+astVersionTag OBJECT-TYPE
+	SYNTAX		Unsigned32
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"SubVersion revision of the version of Asterisk that
+		the SNMP Agent was compiled to run against -- this is
+		typically 0 for release-versions of Asterisk."
+	::= { asteriskVersion 2 }
+
+-- asteriskConfiguration
+
+astConfigUpTime OBJECT-TYPE
+	SYNTAX		TimeTicks
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"Time ticks since Asterisk was started."
+	::= { asteriskConfiguration 1 }
+
+astConfigReloadTime OBJECT-TYPE
+	SYNTAX		TimeTicks
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"Time ticks since Asterisk was last reloaded."
+	::= { asteriskConfiguration 2 }
+
+astConfigPid OBJECT-TYPE
+	SYNTAX		Integer32
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"The process id of the running Asterisk process."
+	::= { asteriskConfiguration 3 }
+
+astConfigSocket OBJECT-TYPE
+	SYNTAX		DisplayString
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"The control socket for giving Asterisk commands."
+	::= { asteriskConfiguration 4 }
+
+astConfigCallsActive OBJECT-TYPE
+	SYNTAX		Gauge32
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"The number of calls currently active on the Asterisk PBX."
+	::= { asteriskConfiguration 5 }
+
+astConfigCallsProcessed OBJECT-TYPE
+	SYNTAX		Counter32
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"The total number of calls processed through the Asterisk PBX since last
+		restart."
+	::= { asteriskConfiguration 6 }
+
+-- asteriskModules
+
+astNumModules OBJECT-TYPE
+	SYNTAX		Integer32
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"Number of modules currently loaded into Asterisk."
+	::= { asteriskModules 1 }
+
+-- asteriskIndications
+
+astNumIndications OBJECT-TYPE
+	SYNTAX		Integer32
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"Number of indications currently defined in Asterisk."
+	::= { asteriskIndications 1 }
+
+astCurrentIndication OBJECT-TYPE
+	SYNTAX		DisplayString
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"Default indication zone to use."
+	::= { asteriskIndications 2 }
+
+astIndicationsTable OBJECT-TYPE
+	SYNTAX		SEQUENCE OF AstIndicationsEntry
+	MAX-ACCESS	not-accessible
+	STATUS		current
+	DESCRIPTION
+		"Table with all the indication zones currently know to
+		the running Asterisk instance."
+	::= { asteriskIndications 3 }
+
+astIndicationsEntry OBJECT-TYPE
+	SYNTAX		AstIndicationsEntry
+	MAX-ACCESS	not-accessible
+	STATUS		current
+	DESCRIPTION
+		"Information about a single indication zone."
+	INDEX		{ astIndIndex }
+	::= { astIndicationsTable 1 }
+
+AstIndicationsEntry ::= SEQUENCE {
+	astIndIndex		Integer32,
+	astIndCountry		DisplayString,
+	astIndAlias		DisplayString,
+	astIndDescription	DisplayString
+}
+
+astIndIndex OBJECT-TYPE
+	SYNTAX		Integer32 (1 .. 2147483647)
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"Numerical index into the table of indication zones."
+	::= { astIndicationsEntry 1 }
+
+astIndCountry OBJECT-TYPE
+	SYNTAX		DisplayString
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"Country for which the indication zone is valid,
+		typically this is the ISO 2-letter code of the country."
+	::= { astIndicationsEntry 2 }
+
+astIndAlias OBJECT-TYPE
+	SYNTAX		DisplayString
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		""
+	::= { astIndicationsEntry 3 }
+
+astIndDescription OBJECT-TYPE
+	SYNTAX		DisplayString
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"Description of the indication zone, usually the full
+		name of the country it is valid for."
+	::= { astIndicationsEntry 4 }
+
+-- asteriskChannels
+
+astNumChannels OBJECT-TYPE
+	SYNTAX		Gauge32
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"Current number of active channels."
+	::= { asteriskChannels 1 }
+
+astChanTable OBJECT-TYPE
+	SYNTAX		SEQUENCE OF AstChanEntry
+	MAX-ACCESS	not-accessible
+	STATUS		current
+	DESCRIPTION
+		"Table with details of the currently active channels
+		in the Asterisk instance."
+	::= { asteriskChannels 2 }
+
+astChanEntry OBJECT-TYPE
+	SYNTAX		AstChanEntry
+	MAX-ACCESS	not-accessible
+	STATUS		current
+	DESCRIPTION
+		"Details of a single channel."
+	INDEX		{ astChanIndex }
+	::= { astChanTable 1 }
+
+AstChanEntry ::= SEQUENCE {
+	astChanIndex		Integer32,
+	astChanName		DisplayString,
+	astChanLanguage		DisplayString,
+	astChanType		DisplayString,
+	astChanMusicClass	DisplayString,
+	astChanBridge		DisplayString,
+	astChanMasq		DisplayString,
+	astChanMasqr		DisplayString,
+	astChanWhenHangup	TimeTicks,
+	astChanApp		DisplayString,
+	astChanData		DisplayString,
+	astChanContext		DisplayString,
+	astChanMacroContext	DisplayString,
+	astChanMacroExten	DisplayString,
+	astChanMacroPri		Integer32,
+	astChanExten		DisplayString,
+	astChanPri		Integer32,
+	astChanAccountCode	DisplayString,
+	astChanForwardTo	DisplayString,
+	astChanUniqueId		DisplayString,
+	astChanCallGroup	Unsigned32,
+	astChanPickupGroup	Unsigned32,
+	astChanState		INTEGER,
+	astChanMuted		TruthValue,
+	astChanRings		Integer32,
+	astChanCidDNID		DisplayString,
+	astChanCidNum		DisplayString,
+	astChanCidName		DisplayString,
+	astChanCidANI		DisplayString,
+	astChanCidRDNIS		DisplayString,
+	astChanCidPresentation	DisplayString,
+	astChanCidANI2		Integer32,
+	astChanCidTON		Integer32,
+	astChanCidTNS		Integer32,
+	astChanAMAFlags		INTEGER,
+	astChanADSI		INTEGER,
+	astChanToneZone		DisplayString,
+	astChanHangupCause	INTEGER,
+	astChanVariables	DisplayString,
+	astChanFlags		BITS,
+	astChanTransferCap	INTEGER
+}
+
+astChanIndex OBJECT-TYPE
+	SYNTAX		Integer32 (1 .. 2147483647)
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"Index into the channel table."
+	::= { astChanEntry 1 }
+
+astChanName OBJECT-TYPE
+	SYNTAX		DisplayString
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"Name of the current channel."
+	::= { astChanEntry 2 }
+
+astChanLanguage OBJECT-TYPE
+	SYNTAX		DisplayString
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"Which language the current channel is configured to
+		use -- used mainly for prompts."
+	::= { astChanEntry 3 }
+
+astChanType OBJECT-TYPE
+	SYNTAX		DisplayString
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"Underlying technology for the current channel."
+	::= { astChanEntry 4 }
+
+astChanMusicClass OBJECT-TYPE
+	SYNTAX		DisplayString
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"Music class to be used for Music on Hold for this
+		channel."
+	::= { astChanEntry 5 }
+
+astChanBridge OBJECT-TYPE
+	SYNTAX		DisplayString
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"Which channel this channel is currently bridged (in a
+		conversation) with."
+	::= { astChanEntry 6 }
+
+astChanMasq OBJECT-TYPE
+	SYNTAX		DisplayString
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"Channel masquerading for us."
+	::= { astChanEntry 7 }
+
+astChanMasqr OBJECT-TYPE
+	SYNTAX		DisplayString
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"Channel we are masquerading for."
+	::= { astChanEntry 8 }
+
+astChanWhenHangup OBJECT-TYPE
+	SYNTAX		TimeTicks
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"How long until this channel will be hung up."
+	::= { astChanEntry 9 }
+
+astChanApp OBJECT-TYPE
+	SYNTAX		DisplayString
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"Current application for the channel."
+	::= { astChanEntry 10 }
+
+astChanData OBJECT-TYPE
+	SYNTAX		DisplayString
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"Arguments passed to the current application."
+	::= { astChanEntry 11 }
+
+astChanContext OBJECT-TYPE
+	SYNTAX		DisplayString
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"Current extension context."
+	::= { astChanEntry 12 }
+
+astChanMacroContext OBJECT-TYPE
+	SYNTAX		DisplayString
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"Current macro context."
+	::= { astChanEntry 13 }
+
+astChanMacroExten OBJECT-TYPE
+	SYNTAX		DisplayString
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"Current macro extension."
+	::= { astChanEntry 14 }
+
+astChanMacroPri OBJECT-TYPE
+	SYNTAX		Integer32
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"Current macro priority."
+	::= { astChanEntry 15 }
+
+astChanExten OBJECT-TYPE
+	SYNTAX		DisplayString
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"Current extension."
+	::= { astChanEntry 16 }
+
+astChanPri OBJECT-TYPE
+	SYNTAX		Integer32
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"Current priority."
+	::= { astChanEntry 17 }
+
+astChanAccountCode OBJECT-TYPE
+	SYNTAX		DisplayString
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"Account Code for billing."
+	::= { astChanEntry 18 }
+
+astChanForwardTo OBJECT-TYPE
+	SYNTAX		DisplayString
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"Where to forward to if asked to dial on this
+		interface."
+	::= { astChanEntry 19 }
+
+astChanUniqueId OBJECT-TYPE
+	SYNTAX		DisplayString
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"Unique Channel Identifier."
+	::= { astChanEntry 20 }
+
+astChanCallGroup OBJECT-TYPE
+	SYNTAX		Unsigned32
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"Call Group."
+	::= { astChanEntry 21 }
+
+astChanPickupGroup OBJECT-TYPE
+	SYNTAX		Unsigned32
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"Pickup Group."
+	::= { astChanEntry 22 }
+
+astChanState OBJECT-TYPE
+	SYNTAX		INTEGER {
+		stateDown(0),
+		stateReserved(1),
+		stateOffHook(2),
+		stateDialing(3),
+		stateRing(4),
+		stateRinging(5),
+		stateUp(6),
+		stateBusy(7),
+		stateDialingOffHook(8),
+		statePreRing(9)
+	}
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"Channel state."
+	::= { astChanEntry 23 }
+
+astChanMuted OBJECT-TYPE
+	SYNTAX		TruthValue
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"Transmission of voice data has been muted."
+	::= { astChanEntry 24 }
+
+astChanRings OBJECT-TYPE
+	SYNTAX		Integer32
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"Number of rings so far."
+	::= { astChanEntry 25 }
+
+astChanCidDNID OBJECT-TYPE
+	SYNTAX		DisplayString
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"Dialled Number ID."
+	::= { astChanEntry 26 }
+
+astChanCidNum OBJECT-TYPE
+	SYNTAX		DisplayString
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"Caller Number."
+	::= { astChanEntry 27 }
+
+astChanCidName OBJECT-TYPE
+	SYNTAX		DisplayString
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"Caller Name."
+	::= { astChanEntry 28 }
+
+astChanCidANI OBJECT-TYPE
+	SYNTAX		DisplayString
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"ANI"
+	::= { astChanEntry 29 }
+
+astChanCidRDNIS OBJECT-TYPE
+	SYNTAX		DisplayString
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"Redirected Dialled Number Service."
+	::= { astChanEntry 30 }
+
+astChanCidPresentation OBJECT-TYPE
+	SYNTAX		DisplayString
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"Number Presentation/Screening."
+	::= { astChanEntry 31 }
+
+astChanCidANI2 OBJECT-TYPE
+	SYNTAX		Integer32
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"ANI 2 (info digit)."
+	::= { astChanEntry 32 }
+
+astChanCidTON OBJECT-TYPE
+	SYNTAX		Integer32
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"Type of Number."
+	::= { astChanEntry 33 }
+
+astChanCidTNS OBJECT-TYPE
+	SYNTAX		Integer32
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"Transit Network Select."
+	::= { astChanEntry 34 }
+
+astChanAMAFlags OBJECT-TYPE
+	SYNTAX		INTEGER {
+		default(0),
+		omit(1),
+		billing(2),
+		documentation(3)
+	}
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"AMA Flags."
+	::= { astChanEntry 35 }
+
+astChanADSI OBJECT-TYPE
+	SYNTAX		INTEGER {
+		unknown(0),
+		available(1),
+		unavailable(2),
+		offHookOnly(3)
+	}
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"Whether or not ADSI is detected on CPE."
+	::= { astChanEntry 36 }
+
+astChanToneZone OBJECT-TYPE
+	SYNTAX		DisplayString
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"Indication zone to use for channel."
+	::= { astChanEntry 37 }
+
+astChanHangupCause OBJECT-TYPE
+	SYNTAX		INTEGER {
+		notDefined(0),
+		unregistered(3),
+		normal(16),
+		busy(17),
+		noAnswer(19),
+		congestion(34),
+		failure(38),
+		noSuchDriver(66)
+	}
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"Why is the channel hung up."
+	::= { astChanEntry 38 }
+
+astChanVariables OBJECT-TYPE
+	SYNTAX		DisplayString
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"Channel Variables defined for this channel."
+	::= { astChanEntry 39 }
+
+astChanFlags OBJECT-TYPE
+	SYNTAX		BITS {
+		wantsJitter(0),
+		deferDTMF(1),
+		writeInterrupt(2),
+		blocking(3),
+		zombie(4),
+		exception(5),
+		musicOnHold(6),
+		spying(7),
+		nativeBridge(8),
+		autoIncrementingLoop(9)
+	}
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"Flags set on this channel."
+	::= { astChanEntry 40 }
+
+astChanTransferCap OBJECT-TYPE
+	SYNTAX		INTEGER {
+		speech(0),
+		digital(8),
+		restrictedDigital(9),
+		audio3k(16),
+		digitalWithTones(17),
+		video(24)
+	}
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"Transfer Capabilities for this channel."
+	::= { astChanEntry 41 }
+
+astNumChanTypes OBJECT-TYPE
+	SYNTAX		Integer32
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"Number of channel types (technologies) supported."
+	::= { asteriskChannels 3 }
+
+astChanTypeTable OBJECT-TYPE
+	SYNTAX		SEQUENCE OF AstChanTypeEntry
+	MAX-ACCESS	not-accessible
+	STATUS		current
+	DESCRIPTION
+		"Table with details of the supported channel types."
+	::= { asteriskChannels 4 }
+
+astChanTypeEntry OBJECT-TYPE
+	SYNTAX		AstChanTypeEntry
+	MAX-ACCESS	not-accessible
+	STATUS		current
+	DESCRIPTION
+		"Information about a technology we support, including
+		how many channels are currently using this technology."
+	INDEX		{ astChanTypeIndex }
+	::= { astChanTypeTable 1 }
+
+AstChanTypeEntry ::= SEQUENCE {
+	astChanTypeIndex	Integer32,
+	astChanTypeName		DisplayString,
+	astChanTypeDesc		DisplayString,
+	astChanTypeDeviceState	Integer32,
+	astChanTypeIndications	Integer32,
+	astChanTypeTransfer	Integer32,
+	astChanTypeChannels	Gauge32
+}
+
+astChanTypeIndex OBJECT-TYPE
+	SYNTAX		Integer32 (1 .. 2147483647)
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"Index into the table of channel types."
+	::= { astChanTypeEntry 1 }
+
+astChanTypeName OBJECT-TYPE
+	SYNTAX		DisplayString
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"Unique name of the technology we are describing."
+	::= { astChanTypeEntry 2 }
+
+astChanTypeDesc OBJECT-TYPE
+	SYNTAX		DisplayString
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"Description of the channel type (technology)."
+	::= { astChanTypeEntry 3 }
+
+astChanTypeDeviceState OBJECT-TYPE
+	SYNTAX		TruthValue
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"Whether the current technology can hold device states."
+	::= { astChanTypeEntry 4 }
+
+astChanTypeIndications OBJECT-TYPE
+	SYNTAX		TruthValue
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"Whether the current technology supports progress indication."
+	::= { astChanTypeEntry 5 }
+
+astChanTypeTransfer OBJECT-TYPE
+	SYNTAX		TruthValue
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"Whether the current technology supports transfers, where
+		Asterisk can get out from inbetween two bridged channels."
+	::= { astChanTypeEntry 6 }
+
+astChanTypeChannels OBJECT-TYPE
+	SYNTAX		Gauge32
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION
+		"Number of active channels using the current technology."
+	::= { astChanTypeEntry 7 }
+
+astChanScalars OBJECT IDENTIFIER ::= { asteriskChannels 5 }
+
+astNumChanBridge OBJECT-TYPE
+       SYNTAX          Gauge32
+       MAX-ACCESS      read-only
+       STATUS          current
+       DESCRIPTION
+               "Number of channels currently in a bridged state."
+       ::= { astChanScalars 1 }
+
+END

Added: branches/1.0/package/asterisk/mibs/DIGIUM-MIB.txt
===================================================================
--- branches/1.0/package/asterisk/mibs/DIGIUM-MIB.txt	                        (rev 0)
+++ branches/1.0/package/asterisk/mibs/DIGIUM-MIB.txt	2013-05-05 21:17:46 UTC (rev 6074)
@@ -0,0 +1,24 @@
+DIGIUM-MIB DEFINITIONS ::= BEGIN
+
+IMPORTS
+	enterprises, MODULE-IDENTITY
+		FROM SNMPv2-SMI;
+
+digium MODULE-IDENTITY
+	LAST-UPDATED	"200806202000Z"
+	ORGANIZATION	"Digium, Inc."
+	CONTACT-INFO
+		"Mark Spencer
+		Email: mar...@di..."
+	DESCRIPTION
+		"The Digium private-enterprise MIB"
+	REVISION	"200806202000Z"
+	DESCRIPTION
+		"Corrected imports and missing revision for last update.
+		 Addresses bug 12905. - je...@op..."
+	REVISION	"200602041900Z"
+	DESCRIPTION
+		"Initial revision."
+	::= { enterprises 22736 }
+
+END

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

[Astlinux-commits] SF.net SVN: astlinux:[6093] branches/1.0/package/asterisk

From: <abe...@us...> - 2013-05-18 22:03:38

Revision: 6093
          http://sourceforge.net/p/astlinux/code/6093
Author:   abelbeck
Date:     2013-05-18 22:03:36 +0000 (Sat, 18 May 2013)
Log Message:
-----------
asterisk, version bump to 1.8.22.0 and 11.4.0

Modified Paths:
--------------
    branches/1.0/package/asterisk/asterisk.mk

Removed Paths:
-------------
    branches/1.0/package/asterisk/asterisk-11.2-revert-378582.patch
    branches/1.0/package/asterisk/asterisk-11.3-pjproject-r380671.patch
    branches/1.0/package/asterisk/asterisk-11.3-pjproject-r380672.patch
    branches/1.0/package/asterisk/asterisk-11.3-pjproject-r380673.patch
    branches/1.0/package/asterisk/asterisk-11.3-pjproject-r380816.patch

Deleted: branches/1.0/package/asterisk/asterisk-11.2-revert-378582.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11.2-revert-378582.patch	2013-05-18 19:56:07 UTC (rev 6092)
+++ branches/1.0/package/asterisk/asterisk-11.2-revert-378582.patch	2013-05-18 22:03:36 UTC (rev 6093)
@@ -1,50 +0,0 @@
---- asterisk-11.2.0/res/pjproject/aconfigure	2013/01/04 22:18:11	378582
-+++ asterisk-11.2.0/res/pjproject/aconfigure	2013/01/04 22:18:21	378581
-@@ -2401,7 +2401,7 @@
-   program_prefix=${target_alias}-
- ac_config_headers="$ac_config_headers pjlib/include/pj/compat/os_auto.h pjlib/include/pj/compat/m_auto.h pjmedia/include/pjmedia/config_auto.h pjmedia/include/pjmedia-codec/config_auto.h pjsip/include/pjsip/sip_autoconf.h"
- 
--ac_config_files="$ac_config_files build.mak build/os-auto.mak pjlib/build/os-auto.mak pjlib-util/build/os-auto.mak pjmedia/build/os-auto.mak pjsip/build/os-auto.mak third_party/build/os-auto.mak third_party/build/portaudio/os-auto.mak"
-+ac_config_files="$ac_config_files build.mak build/os-auto.mak build/cc-auto.mak pjlib/build/os-auto.mak pjlib-util/build/os-auto.mak pjmedia/build/os-auto.mak pjsip/build/os-auto.mak third_party/build/os-auto.mak third_party/build/portaudio/os-auto.mak"
- 
- 
- 
-@@ -7799,6 +7799,7 @@
-     "pjsip/include/pjsip/sip_autoconf.h") CONFIG_HEADERS="$CONFIG_HEADERS pjsip/include/pjsip/sip_autoconf.h" ;;
-     "build.mak") CONFIG_FILES="$CONFIG_FILES build.mak" ;;
-     "build/os-auto.mak") CONFIG_FILES="$CONFIG_FILES build/os-auto.mak" ;;
-+    "build/cc-auto.mak") CONFIG_FILES="$CONFIG_FILES build/cc-auto.mak" ;;
-     "pjlib/build/os-auto.mak") CONFIG_FILES="$CONFIG_FILES pjlib/build/os-auto.mak" ;;
-     "pjlib-util/build/os-auto.mak") CONFIG_FILES="$CONFIG_FILES pjlib-util/build/os-auto.mak" ;;
-     "pjmedia/build/os-auto.mak") CONFIG_FILES="$CONFIG_FILES pjmedia/build/os-auto.mak" ;;
-
---- asterisk-11.2.0/res/pjproject/aconfigure.ac	2013/01/04 22:18:11	378582
-+++ asterisk-11.2.0/res/pjproject/aconfigure.ac	2013/01/04 22:18:21	378581
-@@ -13,6 +13,7 @@
- 		 ])
- AC_CONFIG_FILES([build.mak 
- 		 build/os-auto.mak 
-+		 build/cc-auto.mak
- 		 pjlib/build/os-auto.mak 
- 		 pjlib-util/build/os-auto.mak 
- 		 pjmedia/build/os-auto.mak
-
-
---- asterisk-11.2.0/res/pjproject/build/common.mak	2013/01/04 22:18:11	378582
-+++ asterisk-11.2.0/res/pjproject/build/common.mak	2013/01/04 22:18:21	378581
-@@ -17,6 +17,15 @@
- -include cc-$(CC_NAME).mak
- 
- #
-+# Include auto configured compiler specification.
-+# This will override the compiler settings above.
-+# Currently this is made OPTIONAL, to prevent people
-+# from getting errors because they don't re-run ./configure
-+# after downloading new PJSIP.
-+#
-+-include $(PJDIR)/build/cc-auto.mak
-+
-+#
- # Include global machine specific definitions
- #
- include $(PJDIR)/build/m-$(MACHINE_NAME).mak

Deleted: branches/1.0/package/asterisk/asterisk-11.3-pjproject-r380671.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11.3-pjproject-r380671.patch	2013-05-18 19:56:07 UTC (rev 6092)
+++ branches/1.0/package/asterisk/asterisk-11.3-pjproject-r380671.patch	2013-05-18 22:03:36 UTC (rev 6093)
@@ -1,292 +0,0 @@
-Index: res/pjproject/aconfigure
-===================================================================
---- asterisk-11.3.0/res/pjproject/aconfigure	(revision 380670)
-+++ asterisk-11.3.0/res/pjproject/aconfigure	(revision 380671)
-@@ -649,10 +649,12 @@
- CC_OUT
- LIBEXT2
- LIBEXT
--RANLIB
- LDOUT
- LD
-+AR_FLAGS
-+ac_ct_AR
- AR
-+RANLIB
- ac_ct_CXX
- CXXFLAGS
- CXX
-@@ -3468,18 +3470,205 @@
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
- 
--if test -z "$CROSS_COMPILE"; then
--    CROSS_COMPILE=`echo ${CC} | sed 's/gcc//'`
-+if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_RANLIB+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$RANLIB"; then
-+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
- fi
-+fi
-+RANLIB=$ac_cv_prog_RANLIB
-+if test -n "$RANLIB"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
-+$as_echo "$RANLIB" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
- 
--if test "$AR" = ""; then AR="${CROSS_COMPILE}ar rv"; fi
- 
-+fi
-+if test -z "$ac_cv_prog_RANLIB"; then
-+  ac_ct_RANLIB=$RANLIB
-+  # Extract the first word of "ranlib", so it can be a program name with args.
-+set dummy ranlib; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$ac_ct_RANLIB"; then
-+  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_ac_ct_RANLIB="ranlib"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-+if test -n "$ac_ct_RANLIB"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
-+$as_echo "$ac_ct_RANLIB" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+  if test "x$ac_ct_RANLIB" = x; then
-+    RANLIB=":"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    RANLIB=$ac_ct_RANLIB
-+  fi
-+else
-+  RANLIB="$ac_cv_prog_RANLIB"
-+fi
-+
-+if test -n "$ac_tool_prefix"; then
-+  for ac_prog in ar gar
-+  do
-+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_AR+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$AR"; then
-+  ac_cv_prog_AR="$AR" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+AR=$ac_cv_prog_AR
-+if test -n "$AR"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-+$as_echo "$AR" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+    test -n "$AR" && break
-+  done
-+fi
-+if test -z "$AR"; then
-+  ac_ct_AR=$AR
-+  for ac_prog in ar gar
-+do
-+  # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$ac_ct_AR"; then
-+  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_ac_ct_AR="$ac_prog"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_AR=$ac_cv_prog_ac_ct_AR
-+if test -n "$ac_ct_AR"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-+$as_echo "$ac_ct_AR" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+  test -n "$ac_ct_AR" && break
-+done
-+
-+  if test "x$ac_ct_AR" = x; then
-+    AR=":"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    AR=$ac_ct_AR
-+  fi
-+fi
-+
-+
-+if test "$AR_FLAGS" = ""; then AR_FLAGS="rv"; fi
-+
- if test "$LD" = ""; then LD="$CC"; fi
- 
- if test "$LDOUT" = ""; then LDOUT="-o "; fi
- 
--if test "$RANLIB" = ""; then RANLIB="${CROSS_COMPILE}ranlib"; fi
--
- if test "$OBJEXT" = ""; then OBJEXT='o'; fi
- 
- if test "$LIBEXT" = ""; then LIBEXT='a'; fi
-Index: res/pjproject/build/rules.mak
-===================================================================
---- asterisk-11.3.0/res/pjproject/build/rules.mak	(revision 380670)
-+++ asterisk-11.3.0/res/pjproject/build/rules.mak	(revision 380671)
-@@ -72,6 +72,7 @@
- 	@echo DEPFLAGS=$(DEPFLAGS)
- 	@echo CC=$(CC)
- 	@echo AR=$(AR)
-+	@echo AR_FLAGS=$(AR_FLAGS)
- 	@echo RANLIB=$(RANLIB)
- 
- print_bin: print_common
-@@ -84,7 +85,7 @@
- 
- $(LIB): $(OBJDIRS) $(OBJS) $($(APP)_EXTRA_DEP)
- 	if test ! -d $(LIBDIR); then $(subst @@,$(subst /,$(HOST_PSEP),$(LIBDIR)),$(HOST_MKDIR)); fi
--	$(AR) $(LIB) $(OBJS)
-+	$(AR) $(AR_FLAGS) $(LIB) $(OBJS)
- 	$(RANLIB) $(LIB)
- 
- $(SHLIB): $(OBJDIRS) $(OBJS) $($(APP)_EXTRA_DEP)
-Index: res/pjproject/build/cc-auto.mak.in
-===================================================================
---- asterisk-11.3.0/res/pjproject/build/cc-auto.mak.in	(revision 380670)
-+++ asterisk-11.3.0/res/pjproject/build/cc-auto.mak.in	(revision 380671)
-@@ -1,6 +1,7 @@
- export CC = @CC@ -c
- export CXX = @CXX@ -c
- export AR = @AR@
-+export AR_FLAGS = @AR_FLAGS@
- export LD = @LD@
- export LDOUT = -o 
- export RANLIB = @RANLIB@
-Index: res/pjproject/aconfigure.ac
-===================================================================
---- asterisk-11.3.0/res/pjproject/aconfigure.ac	(revision 380670)
-+++ asterisk-11.3.0/res/pjproject/aconfigure.ac	(revision 380671)
-@@ -40,21 +40,15 @@
- AC_PROG_CXX
- AC_LANG_C
- 
--dnl #
--dnl # Setup CROSS_COMPILE variable
--dnl #
--if test -z "$CROSS_COMPILE"; then 
--    CROSS_COMPILE=`echo ${CC} | sed 's/gcc//'`
--fi
-+AC_PROG_RANLIB
-+AC_CHECK_TOOLS([AR], [ar gar], :)
- 
--if test "$AR" = ""; then AR="${CROSS_COMPILE}ar rv"; fi
--AC_SUBST(AR)
-+if test "$AR_FLAGS" = ""; then AR_FLAGS="rv"; fi
-+AC_SUBST(AR_FLAGS)
- if test "$LD" = ""; then LD="$CC"; fi
- AC_SUBST(LD)
- if test "$LDOUT" = ""; then LDOUT="-o "; fi
- AC_SUBST(LDOUT)
--if test "$RANLIB" = ""; then RANLIB="${CROSS_COMPILE}ranlib"; fi
--AC_SUBST(RANLIB)
- if test "$OBJEXT" = ""; then OBJEXT='o'; fi
- AC_SUBST(OBJEXT)
- if test "$LIBEXT" = ""; then LIBEXT='a'; fi

Deleted: branches/1.0/package/asterisk/asterisk-11.3-pjproject-r380672.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11.3-pjproject-r380672.patch	2013-05-18 19:56:07 UTC (rev 6092)
+++ branches/1.0/package/asterisk/asterisk-11.3-pjproject-r380672.patch	2013-05-18 22:03:36 UTC (rev 6093)
@@ -1,133 +0,0 @@
-Index: res/pjproject/aconfigure
-===================================================================
---- asterisk-11.3.0/res/pjproject/aconfigure	(revision 380671)
-+++ asterisk-11.3.0/res/pjproject/aconfigure	(revision 380672)
-@@ -4079,6 +4079,51 @@
- 
- fi
- 
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sin in -lm" >&5
-+$as_echo_n "checking for sin in -lm... " >&6; }
-+if test "${ac_cv_lib_m_sin+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lm  $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char sin ();
-+int
-+main ()
-+{
-+return sin ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_m_sin=yes
-+else
-+  ac_cv_lib_m_sin=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_sin" >&5
-+$as_echo "$ac_cv_lib_m_sin" >&6; }
-+if test "x$ac_cv_lib_m_sin" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBM 1
-+_ACEOF
-+
-+  LIBS="-lm $LIBS"
-+
-+fi
-+
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_generate in -luuid" >&5
- $as_echo_n "checking for uuid_generate in -luuid... " >&6; }
- if test "${ac_cv_lib_uuid_uuid_generate+set}" = set; then :
-@@ -4865,56 +4910,11 @@
- 
- 	        { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if floating point is disabled... no" >&5
- $as_echo "Checking if floating point is disabled... no" >&6; }
--		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fmod in -lm" >&5
--$as_echo_n "checking for fmod in -lm... " >&6; }
--if test "${ac_cv_lib_m_fmod+set}" = set; then :
--  $as_echo_n "(cached) " >&6
--else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-lm  $LIBS"
--cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
- 
--/* Override any GCC internal prototype to avoid an error.
--   Use char because int might match the return type of a GCC
--   builtin and then its argument prototype would still apply.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--char fmod ();
--int
--main ()
--{
--return fmod ();
--  ;
--  return 0;
--}
--_ACEOF
--if ac_fn_c_try_link "$LINENO"; then :
--  ac_cv_lib_m_fmod=yes
--else
--  ac_cv_lib_m_fmod=no
- fi
--rm -f core conftest.err conftest.$ac_objext \
--    conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_fmod" >&5
--$as_echo "$ac_cv_lib_m_fmod" >&6; }
--if test "x$ac_cv_lib_m_fmod" = x""yes; then :
--  cat >>confdefs.h <<_ACEOF
--#define HAVE_LIBM 1
--_ACEOF
- 
--  LIBS="-lm $LIBS"
- 
--fi
- 
--
--fi
--
--
--
- ac_fn_c_check_header_mongrel "$LINENO" "arpa/inet.h" "ac_cv_header_arpa_inet_h" "$ac_includes_default"
- if test "x$ac_cv_header_arpa_inet_h" = x""yes; then :
-   $as_echo "#define PJ_HAS_ARPA_INET_H 1" >>confdefs.h
-Index: res/pjproject/aconfigure.ac
-===================================================================
---- asterisk-11.3.0/res/pjproject/aconfigure.ac	(revision 380671)
-+++ asterisk-11.3.0/res/pjproject/aconfigure.ac	(revision 380672)
-@@ -106,6 +106,7 @@
- AC_CHECK_LIB(socket,puts)
- AC_CHECK_LIB(rt,puts)
- AC_CHECK_LIB(nsl,puts)
-+AC_CHECK_LIB(m,sin)
- AC_CHECK_LIB(uuid,uuid_generate)
- AC_CHECK_LIB(uuid,uuid_generate,[ac_has_uuid_lib=1])
- 
-@@ -178,7 +179,6 @@
- 	      [
- 		AC_DEFINE(PJ_HAS_FLOATING_POINT,1)
- 	        AC_MSG_RESULT([Checking if floating point is disabled... no]) 
--		AC_CHECK_LIB(m,fmod)
- 	      ])
- 
- 

Deleted: branches/1.0/package/asterisk/asterisk-11.3-pjproject-r380673.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11.3-pjproject-r380673.patch	2013-05-18 19:56:07 UTC (rev 6092)
+++ branches/1.0/package/asterisk/asterisk-11.3-pjproject-r380673.patch	2013-05-18 22:03:36 UTC (rev 6093)
@@ -1,213 +0,0 @@
-Index: res/pjproject/pjnath/build/Makefile
-===================================================================
---- asterisk-11.3.0/res/pjproject/pjnath/build/Makefile	(revision 380672)
-+++ asterisk-11.3.0/res/pjproject/pjnath/build/Makefile	(revision 380673)
-@@ -92,18 +92,24 @@
- dep: depend
- distclean: realclean
- 
--.PHONY: dep depend pjlib pjlib-test clean realclean distclean
-+.PHONY: dep depend clean realclean distclean
-+.PHONY: $(TARGETS)
-+.PHONY: $(PJNATH_LIB) $(PJNATH_TEST_EXE) $(PJTURN_CLIENT_EXE) $(PJTURN_SRV_EXE)
- 
--pjnath:
-+pjnath: $(PJNATH_LIB)
-+$(PJNATH_LIB):
- 	$(MAKE) -f $(RULES_MAK) APP=PJNATH app=pjnath $(PJNATH_LIB)
- 
--pjnath-test: $(PJLIB_LIB) $(PJLIB_UTIL_LIB) $(PJNATH_LIB)
-+pjnath-test: $(PJNATH_TEST_EXE)
-+$(PJNATH_TEST_EXE): $(PJNATH_LIB)
- 	$(MAKE) -f $(RULES_MAK) APP=PJNATH_TEST app=pjnath-test $(PJNATH_TEST_EXE)
- 
--pjturn-client: $(PJLIB_LIB) $(PJLIB_UTIL_LIB) $(PJNATH_LIB)
-+pjturn-client: $(PJTURN_CLIENT_EXE)
-+$(PJTURN_CLIENT_EXE): $(PJNATH_LIB)
- 	$(MAKE) -f $(RULES_MAK) APP=PJTURN_CLIENT app=pjturn-client $(PJTURN_CLIENT_EXE)
- 
--pjturn-srv: $(PJLIB_LIB) $(PJLIB_UTIL_LIB) $(PJNATH_LIB)
-+pjturn-srv: $(PJTURN_SRV_EXE)
-+$(PJTURN_SRV_EXE): $(PJNATH_LIB)
- 	$(MAKE) -f $(RULES_MAK) APP=PJTURN_SRV app=pjturn-srv $(PJTURN_SRV_EXE)
- 
- .PHONY: ../lib/pjnath.ko
-Index: res/pjproject/pjsip/build/Makefile
-===================================================================
---- asterisk-11.3.0/res/pjproject/pjsip/build/Makefile	(revision 380672)
-+++ asterisk-11.3.0/res/pjproject/pjsip/build/Makefile	(revision 380673)
-@@ -106,8 +106,6 @@
- #
- TARGETS := pjsip pjsip-ua pjsip-simple pjsua-lib pjsip-test
- 
--.PHONY: $(TARGETS)
--
- all: $(TARGETS)
- 
- doc:
-@@ -124,21 +122,28 @@
- dep: depend
- distclean: realclean
- 
--.PHONY: dep depend pjsip pjsip-ua pjsua-lib clean realclean distclean
-+.PHONY: dep depend clean realclean distclean
-+.PHONY: $(TARGETS)
-+.PHONY: $(PJSIP_LIB) $(PJSIP_UA_LIB) $(PJSIP_SIMPLE_LIB) $(PJSUA_LIB_LIB) $(TEST_EXE)
- 
--pjsip:
-+pjsip: $(PJSIP_LIB)
-+$(PJSIP_LIB):
- 	$(MAKE) -f $(RULES_MAK) APP=PJSIP app=pjsip $(PJSIP_LIB)
- 
--pjsip-ua:
-+pjsip-ua: $(PJSIP_UA_LIB)
-+$(PJSIP_UA_LIB):
- 	$(MAKE) -f $(RULES_MAK) APP=PJSIP_UA app=pjsip-ua $(PJSIP_UA_LIB)
- 
--pjsip-simple:
-+pjsip-simple: $(PJSIP_SIMPLE_LIB)
-+$(PJSIP_SIMPLE_LIB):
- 	$(MAKE) -f $(RULES_MAK) APP=PJSIP_SIMPLE app=pjsip-simple $(PJSIP_SIMPLE_LIB)
- 
--pjsua-lib: 
-+pjsua-lib: $(PJSUA_LIB_LIB)
-+$(PJSUA_LIB_LIB): 
- 	$(MAKE) -f $(RULES_MAK) APP=PJSUA_LIB app=pjsua-lib $(PJSUA_LIB_LIB)
- 
--pjsip-test:
-+pjsip-test: $(TEST_EXE)
-+$(TEST_EXE): $(PJSUA_LIB_LIB) $(PJSIP_SIMPLE_LIB) $(PJSIP_UA_LIB) $(PJSIP_LIB)
- 	$(MAKE) -f $(RULES_MAK) APP=TEST app=pjsip-test $(TEST_EXE)
- 
- .PHONY: ../lib/pjsip.ko
-Index: res/pjproject/pjsip-apps/build/Makefile
-===================================================================
---- asterisk-11.3.0/res/pjproject/pjsip-apps/build/Makefile	(revision 380672)
-+++ asterisk-11.3.0/res/pjproject/pjsip-apps/build/Makefile	(revision 380673)
-@@ -57,8 +57,6 @@
- #
- TARGETS := pjsua pjsystest samples
- 
--.PHONY: $(TARGETS)
--
- all: $(TARGETS)
- 
- doc:
-@@ -66,12 +64,16 @@
- dep: depend
- distclean: realclean
- 
--.PHONY: dep depend pjsua clean realclean distclean
-+.PHONY: dep depend clean realclean distclean
-+.PHONY: $(TARGETS)
-+.PHONY: $(PJSUA_EXE) $(PJSYSTEST_EXE)
- 
--pjsua:
-+pjsua: $(PJSUA_EXE)
-+$(PJSUA_EXE):
- 	$(MAKE) -f $(RULES_MAK) APP=PJSUA app=pjsua $(PJSUA_EXE)
- 
--pjsystest:
-+pjsystest: $(PJSYSTEST_EXE)
-+$(PJSYSTEST_EXE):
- 	$(MAKE) -f $(RULES_MAK) APP=PJSYSTEST app=pjsystest $(PJSYSTEST_EXE)
- 
- samples:
-Index: res/pjproject/pjmedia/build/Makefile
-===================================================================
---- asterisk-11.3.0/res/pjproject/pjmedia/build/Makefile	(revision 380672)
-+++ asterisk-11.3.0/res/pjproject/pjmedia/build/Makefile	(revision 380673)
-@@ -156,24 +156,32 @@
- dep: depend
- distclean: realclean
- 
--.PHONY: dep depend pjmedia pjmedia-codec pjmedia-videodev pjmedia-audiodev pjmedia-test clean realclean distclean
-+.PHONY: dep depend clean realclean distclean
-+.PHONY: $(TARGETS)
-+.PHONY: $(PJMEDIA_LIB) $(PJMEDIA_CODEC_LIB) $(PJMEDIA_VIDEODEV_LIB) $(PJMEDIA_AUDIODEV_LIB) $(PJSDP_LIB) $(PJMEDIA_TEST_EXE)
- 
--pjmedia:
-+pjmedia: $(PJMEDIA_LIB)
-+$(PJMEDIA_LIB):
- 	$(MAKE) -f $(RULES_MAK) APP=PJMEDIA app=pjmedia $(PJMEDIA_LIB)
- 
--pjmedia-codec:
-+pjmedia-codec: $(PJMEDIA_CODEC_LIB)
-+$(PJMEDIA_CODEC_LIB):
- 	$(MAKE) -f $(RULES_MAK) APP=PJMEDIA_CODEC app=pjmedia-codec $(PJMEDIA_CODEC_LIB)
- 
--pjmedia-videodev:
-+pjmedia-videodev: $(PJMEDIA_VIDEODEV_LIB)
-+$(PJMEDIA_VIDEODEV_LIB):
- 	$(MAKE) -f $(RULES_MAK) APP=PJMEDIA_VIDEODEV app=pjmedia-videodev $(PJMEDIA_VIDEODEV_LIB)
- 
--pjmedia-audiodev:
-+pjmedia-audiodev: $(PJMEDIA_AUDIODEV_LIB)
-+$(PJMEDIA_AUDIODEV_LIB):
- 	$(MAKE) -f $(RULES_MAK) APP=PJMEDIA_AUDIODEV app=pjmedia-audiodev $(PJMEDIA_AUDIODEV_LIB)
- 
--pjsdp:
-+pjsdp: $(PJSDP_LIB)
-+$(PJSDP_LIB):
- 	$(MAKE) -f $(RULES_MAK) APP=PJSDP app=pjsdp $(PJSDP_LIB)
- 
--pjmedia-test: $(PJMEDIA_LIB)
-+pjmedia-test: $(PJMEDIA_TEST_EXE)
-+$(PJMEDIA_TEST_EXE): $(PJMEDIA_LIB) $(PJMEDIA_CODEC_LIB)
- 	$(MAKE) -f $(RULES_MAK) APP=PJMEDIA_TEST app=pjmedia-test $(PJMEDIA_TEST_EXE)
- 
- .PHONY: ../lib/pjmedia.ko
-Index: res/pjproject/pjlib/build/Makefile
-===================================================================
---- asterisk-11.3.0/res/pjproject/pjlib/build/Makefile	(revision 380672)
-+++ asterisk-11.3.0/res/pjproject/pjlib/build/Makefile	(revision 380673)
-@@ -77,17 +77,21 @@
- 	echo '$(TEST_EXE): $(PJLIB_LIB)' >> .pjlib-test-$(TARGET_NAME).depend
- 
- 
--.PHONY: dep depend pjlib pjlib-test clean realclean distclean
-+.PHONY: dep depend clean realclean distclean
-+.PHONY: $(TARGETS)
-+.PHONY: $(PJLIB_LIB) $(TEST_EXE)
- 
- dep: depend
- 
--pjlib: ../include/pj/config_site.h
-+pjlib: $(PJLIB_LIB)
-+$(PJLIB_LIB): ../include/pj/config_site.h
- 	$(MAKE) -f $(RULES_MAK) APP=PJLIB app=pjlib $(PJLIB_LIB)
- 
- ../include/pj/config_site.h:
- 	touch ../include/pj/config_site.h
--	
--pjlib-test: 
-+
-+pjlib-test: $(TEST_EXE)
-+$(TEST_EXE): $(PJLIB_LIB)
- 	$(MAKE) -f $(RULES_MAK) APP=TEST app=pjlib-test $(TEST_EXE)
- 
- .PHONY: ../lib/pjlib.ko
-Index: res/pjproject/pjlib-util/build/Makefile
-===================================================================
---- asterisk-11.3.0/res/pjproject/pjlib-util/build/Makefile	(revision 380672)
-+++ asterisk-11.3.0/res/pjproject/pjlib-util/build/Makefile	(revision 380673)
-@@ -69,12 +69,16 @@
- dep: depend
- distclean: realclean
- 
--.PHONY: dep depend pjlib pjlib-test clean realclean distclean
-+.PHONY: dep depend clean realclean distclean
-+.PHONY: $(TARGETS)
-+.PHONY: $(PJLIB_UTIL_LIB) $(UTIL_TEST_EXE)
- 
--pjlib-util:
-+pjlib-util: $(PJLIB_UTIL_LIB)
-+$(PJLIB_UTIL_LIB):
- 	$(MAKE) -f $(RULES_MAK) APP=PJLIB_UTIL app=pjlib-util $(PJLIB_UTIL_LIB)
- 
--pjlib-util-test:
-+pjlib-util-test: $(UTIL_TEST_EXE)
-+$(UTIL_TEST_EXE): $(PJLIB_UTIL_LIB)
- 	$(MAKE) -f $(RULES_MAK) APP=UTIL_TEST app=pjlib-util-test $(UTIL_TEST_EXE)
- 
- .PHONY: ../lib/pjlib-util.ko

Deleted: branches/1.0/package/asterisk/asterisk-11.3-pjproject-r380816.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11.3-pjproject-r380816.patch	2013-05-18 19:56:07 UTC (rev 6092)
+++ branches/1.0/package/asterisk/asterisk-11.3-pjproject-r380816.patch	2013-05-18 22:03:36 UTC (rev 6093)
@@ -1,258 +0,0 @@
-Index: Makefile
-===================================================================
---- asterisk-11.3.0/Makefile	(revision 380815)
-+++ asterisk-11.3.0/Makefile	(revision 380816)
-@@ -98,12 +98,7 @@
- export LDCONFIG_FLAGS
- export PYTHON
- 
--# even though we could use '-include makeopts' here, use a wildcard
--# lookup anyway, so that make won't try to build makeopts if it doesn't
--# exist (other rules will force it to be built if needed)
--ifneq ($(wildcard makeopts),)
--  include makeopts
--endif
-+-include makeopts
- 
- # start the primary CFLAGS and LDFLAGS with any that were provided
- # to the configure script
-@@ -311,7 +306,7 @@
- 	mK=" make"
- endif
- 
--all: _cleantest_all
-+all: _all
- 	@echo " +--------- Asterisk Build Complete ---------+"
- 	@echo " + Asterisk has successfully been built, and +"
- 	@echo " + can be installed by running:              +"
-@@ -319,7 +314,7 @@
- 	@echo " +               $(mK) install               +"
- 	@echo " +-------------------------------------------+"
- 
--full: _cleantest_all_full
-+full: _full
- 	@echo " +--------- Asterisk Build Complete ---------+"
- 	@echo " + Asterisk has successfully been built, and +"
- 	@echo " + can be installed by running:              +"
-@@ -328,19 +323,9 @@
- 	@echo " +-------------------------------------------+"
- 
- 
--# For parallel builds, we must call cleantest *before* running the
--# other dependencies on _all.
--_cleantest_all: cleantest
--	@$(MAKE) _all
--
--# For parallel builds, we must call cleantest *before* running the
--# other dependencies on _all.
--_cleantest_all_full: cleantest
--	@$(MAKE) _all_full
--
- _all: makeopts $(SUBDIRS) doc/core-en_US.xml $(ADDL_TARGETS)
- 
--_all_full: makeopts $(SUBDIRS) doc/full-en_US.xml $(ADDL_TARGETS)
-+_full: makeopts $(SUBDIRS) doc/full-en_US.xml $(ADDL_TARGETS)
- 
- makeopts: configure
- 	@echo "****"
-@@ -375,7 +360,7 @@
- 	+@$(SUBMAKE) $(MOD_SUBDIRS_EMBED_LDFLAGS)
- 	+@$(SUBMAKE) $(MOD_SUBDIRS_EMBED_LIBS)
- 
--$(SUBDIRS): main/version.c include/asterisk/build.h include/asterisk/buildopts.h defaults.h makeopts.embed_rules
-+$(SUBDIRS): makeopts cleantest main/version.c include/asterisk/build.h include/asterisk/buildopts.h defaults.h makeopts.embed_rules
- 
- ifeq ($(findstring $(OSARCH), mingw32 cygwin ),)
-     # Non-windows:
-@@ -395,10 +380,10 @@
- res:	main
- endif
- 
--$(MOD_SUBDIRS):
-+$(MOD_SUBDIRS): makeopts
- 	+@_ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(_ASTCFLAGS)" ASTCFLAGS="$(ASTCFLAGS)" _ASTLDFLAGS="$(_ASTLDFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(SUBMAKE) --no-builtin-rules -C $@ SUBDIR=$@ all
- 
--$(OTHER_SUBDIRS):
-+$(OTHER_SUBDIRS): makeopts
- 	+@_ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(_ASTCFLAGS)" ASTCFLAGS="$(ASTCFLAGS)" _ASTLDFLAGS="$(_ASTLDFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(SUBMAKE) --no-builtin-rules -C $@ SUBDIR=$@ all
- 
- defaults.h: makeopts build_tools/make_defaults_h
-@@ -452,7 +437,7 @@
- 	rm -rf doc/api
- 	rm -f build_tools/menuselect-deps
- 
--datafiles: _cleantest_all doc/core-en_US.xml
-+datafiles: _all doc/core-en_US.xml
- 	CFLAGS="$(_ASTCFLAGS) $(ASTCFLAGS)" build_tools/mkpkgconfig "$(DESTDIR)$(libdir)/pkgconfig";
- # Should static HTTP be installed during make samples or even with its own target ala
- # webvoicemail?  There are portions here that *could* be customized but might also be
-@@ -473,7 +458,7 @@
- 	done
- 	$(MAKE) -C sounds install
- 
--doc/core-en_US.xml: $(foreach dir,$(MOD_SUBDIRS),$(shell $(GREP) -l "language=\"en_US\"" $(dir)/*.c $(dir)/*.cc 2>/dev/null))
-+doc/core-en_US.xml: makeopts $(foreach dir,$(MOD_SUBDIRS),$(shell $(GREP) -l "language=\"en_US\"" $(dir)/*.c $(dir)/*.cc 2>/dev/null))
- 	@printf "Building Documentation For: "
- 	@echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" > $@
- 	@echo "<!DOCTYPE docs SYSTEM \"appdocsxml.dtd\">" >> $@
-@@ -487,7 +472,7 @@
- 	@echo
- 	@echo "</docs>" >> $@
- 
--doc/full-en_US.xml: $(foreach dir,$(MOD_SUBDIRS),$(shell $(GREP) -l "language=\"en_US\"" $(dir)/*.c $(dir)/*.cc 2>/dev/null))
-+doc/full-en_US.xml: makeopts $(foreach dir,$(MOD_SUBDIRS),$(shell $(GREP) -l "language=\"en_US\"" $(dir)/*.c $(dir)/*.cc 2>/dev/null))
- ifeq ($(PYTHON),:)
- 	@echo "--------------------------------------------------------------------------"
- 	@echo "---        Please install python to build full documentation           ---"
-@@ -561,7 +546,7 @@
- main-bininstall:
- 	+@DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" ASTLIBDIR="$(ASTLIBDIR)" $(SUBMAKE) -C main bininstall
- 
--bininstall: _cleantest_all installdirs $(SUBDIRS_INSTALL) main-bininstall
-+bininstall: _all installdirs $(SUBDIRS_INSTALL) main-bininstall
- 	$(INSTALL) -m 755 contrib/scripts/astgenkey "$(DESTDIR)$(ASTSBINDIR)/"
- 	$(INSTALL) -m 755 contrib/scripts/autosupport "$(DESTDIR)$(ASTSBINDIR)/"
- 	if [ ! -f "$(DESTDIR)$(ASTSBINDIR)/safe_asterisk" -a ! -f /sbin/launchd ]; then \
-@@ -916,19 +901,19 @@
- 		CFLAGS="$(BUILD_CFLAGS)" LDFLAGS="$(BUILD_LDFLAGS)" \
- 		$(MAKE) -C menuselect CONFIGURE_SILENT="--silent"
- 
--menuselect/menuselect: menuselect/makeopts
-+menuselect/menuselect: menuselect/makeopts cleantest
- 	+$(MAKE_MENUSELECT) menuselect
- 
--menuselect/cmenuselect: menuselect/makeopts
-+menuselect/cmenuselect: menuselect/makeopts cleantest
- 	+$(MAKE_MENUSELECT) cmenuselect
- 
--menuselect/gmenuselect: menuselect/makeopts
-+menuselect/gmenuselect: menuselect/makeopts cleantest
- 	+$(MAKE_MENUSELECT) gmenuselect
- 
--menuselect/nmenuselect: menuselect/makeopts
-+menuselect/n...
 
[truncated message content]

[Astlinux-commits] SF.net SVN: astlinux:[6147] branches/1.0/package/asterisk

From: <abe...@us...> - 2013-07-22 19:30:25

Revision: 6147
          http://sourceforge.net/p/astlinux/code/6147
Author:   abelbeck
Date:     2013-07-22 19:30:23 +0000 (Mon, 22 Jul 2013)
Log Message:
-----------
asterisk, version bump to 1.8.23.0 and 11.5.0

Modified Paths:
--------------
    branches/1.0/package/asterisk/asterisk.mk

Removed Paths:
-------------
    branches/1.0/package/asterisk/asterisk-11-ASTERISK-21785-tmp-refs-astobj2.patch

Deleted: branches/1.0/package/asterisk/asterisk-11-ASTERISK-21785-tmp-refs-astobj2.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11-ASTERISK-21785-tmp-refs-astobj2.patch	2013-07-22 18:20:23 UTC (rev 6146)
+++ branches/1.0/package/asterisk/asterisk-11-ASTERISK-21785-tmp-refs-astobj2.patch	2013-07-22 19:30:23 UTC (rev 6147)
@@ -1,144 +0,0 @@
-Index: include/asterisk/astobj2.h
-===================================================================
---- asterisk-11.3.0/include/asterisk/astobj2.h	(revision 388691)
-+++ asterisk-11.3.0/include/asterisk/astobj2.h	(working copy)
-@@ -625,11 +625,20 @@
-  *
-  * \return Nothing
-  */
-+#ifdef REF_DEBUG
- #define ao2_t_global_obj_release(holder, tag)	\
- 	__ao2_global_obj_release(&holder, (tag), __FILE__, __LINE__, __PRETTY_FUNCTION__, #holder)
- #define ao2_global_obj_release(holder)	\
- 	__ao2_global_obj_release(&holder, "", __FILE__, __LINE__, __PRETTY_FUNCTION__, #holder)
- 
-+#else
-+
-+#define ao2_t_global_obj_release(holder, tag)	\
-+	__ao2_global_obj_release(&holder, NULL, __FILE__, __LINE__, __PRETTY_FUNCTION__, #holder)
-+#define ao2_global_obj_release(holder)	\
-+	__ao2_global_obj_release(&holder, NULL, __FILE__, __LINE__, __PRETTY_FUNCTION__, #holder)
-+#endif
-+
- void __ao2_global_obj_release(struct ao2_global_obj *holder, const char *tag, const char *file, int line, const char *func, const char *name);
- 
- /*!
-@@ -647,11 +656,20 @@
-  * \retval Reference to previous global ao2 object stored.
-  * \retval NULL if no object available.
-  */
-+#ifdef REF_DEBUG
- #define ao2_t_global_obj_replace(holder, obj, tag)	\
- 	__ao2_global_obj_replace(&holder, (obj), (tag), __FILE__, __LINE__, __PRETTY_FUNCTION__, #holder)
- #define ao2_global_obj_replace(holder, obj)	\
- 	__ao2_global_obj_replace(&holder, (obj), "", __FILE__, __LINE__, __PRETTY_FUNCTION__, #holder)
- 
-+#else
-+
-+#define ao2_t_global_obj_replace(holder, obj, tag)	\
-+	__ao2_global_obj_replace(&holder, (obj), NULL, __FILE__, __LINE__, __PRETTY_FUNCTION__, #holder)
-+#define ao2_global_obj_replace(holder, obj)	\
-+	__ao2_global_obj_replace(&holder, (obj), NULL, __FILE__, __LINE__, __PRETTY_FUNCTION__, #holder)
-+#endif
-+
- void *__ao2_global_obj_replace(struct ao2_global_obj *holder, void *obj, const char *tag, const char *file, int line, const char *func, const char *name);
- 
- /*!
-@@ -670,10 +688,20 @@
-  * \retval 0 The global object was previously empty
-  * \retval 1 The global object was not previously empty
-  */
-+#ifdef REF_DEBUG
- #define ao2_t_global_obj_replace_unref(holder, obj, tag)	\
- 	__ao2_global_obj_replace_unref(&holder, (obj), (tag), __FILE__, __LINE__, __PRETTY_FUNCTION__, #holder)
- #define ao2_global_obj_replace_unref(holder, obj)	\
- 	__ao2_global_obj_replace_unref(&holder, (obj), "", __FILE__, __LINE__, __PRETTY_FUNCTION__, #holder)
-+
-+#else
-+
-+#define ao2_t_global_obj_replace_unref(holder, obj, tag)	\
-+	__ao2_global_obj_replace_unref(&holder, (obj), NULL, __FILE__, __LINE__, __PRETTY_FUNCTION__, #holder)
-+#define ao2_global_obj_replace_unref(holder, obj)	\
-+	__ao2_global_obj_replace_unref(&holder, (obj), NULL, __FILE__, __LINE__, __PRETTY_FUNCTION__, #holder)
-+#endif
-+
- int __ao2_global_obj_replace_unref(struct ao2_global_obj *holder, void *obj, const char *tag, const char *file, int line, const char *func, const char *name);
- 
- /*!
-@@ -686,11 +714,20 @@
-  * \retval Reference to current ao2 object stored in the holder.
-  * \retval NULL if no object available.
-  */
-+#ifdef REF_DEBUG
- #define ao2_t_global_obj_ref(holder, tag)	\
- 	__ao2_global_obj_ref(&holder, (tag), __FILE__, __LINE__, __PRETTY_FUNCTION__, #holder)
- #define ao2_global_obj_ref(holder)	\
- 	__ao2_global_obj_ref(&holder, "", __FILE__, __LINE__, __PRETTY_FUNCTION__, #holder)
- 
-+#else
-+
-+#define ao2_t_global_obj_ref(holder, tag)	\
-+	__ao2_global_obj_ref(&holder, NULL, __FILE__, __LINE__, __PRETTY_FUNCTION__, #holder)
-+#define ao2_global_obj_ref(holder)	\
-+	__ao2_global_obj_ref(&holder, NULL, __FILE__, __LINE__, __PRETTY_FUNCTION__, #holder)
-+#endif
-+
- void *__ao2_global_obj_ref(struct ao2_global_obj *holder, const char *tag, const char *file, int line, const char *func, const char *name);
- 
- 
-Index: main/astobj2.c
-===================================================================
---- asterisk-11.3.0/main/astobj2.c	(revision 388691)
-+++ asterisk-11.3.0/main/astobj2.c	(working copy)
-@@ -656,7 +656,11 @@
- 
- 	/* Release the held ao2 object. */
- 	if (holder->obj) {
--		__ao2_ref_debug(holder->obj, -1, tag, file, line, func);
-+		if (tag) {
-+			__ao2_ref_debug(holder->obj, -1, tag, file, line, func);
-+		} else {
-+			__ao2_ref(holder->obj, -1);
-+		}
- 		holder->obj = NULL;
- 	}
- 
-@@ -678,7 +682,11 @@
- 	}
- 
- 	if (obj) {
--		__ao2_ref_debug(obj, +1, tag, file, line, func);
-+		if (tag) {
-+			__ao2_ref_debug(obj, +1, tag, file, line, func);
-+		} else {
-+			__ao2_ref(obj, +1);
-+		}
- 	}
- 	obj_old = holder->obj;
- 	holder->obj = obj;
-@@ -694,7 +702,11 @@
- 
- 	obj_old = __ao2_global_obj_replace(holder, obj, tag, file, line, func, name);
- 	if (obj_old) {
--		__ao2_ref_debug(obj_old, -1, tag, file, line, func);
-+		if (tag) {
-+			__ao2_ref_debug(obj_old, -1, tag, file, line, func);
-+		} else {
-+			__ao2_ref(obj_old, -1);
-+		}
- 		return 1;
- 	}
- 	return 0;
-@@ -717,7 +729,11 @@
- 
- 	obj = holder->obj;
- 	if (obj) {
--		__ao2_ref_debug(obj, +1, tag, file, line, func);
-+		if (tag) {
-+			__ao2_ref_debug(obj, +1, tag, file, line, func);
-+		} else {
-+			__ao2_ref(obj, +1);
-+		}
- 	}
- 
- 	__ast_rwlock_unlock(file, line, func, &holder->lock, name);

Modified: branches/1.0/package/asterisk/asterisk.mk
===================================================================
--- branches/1.0/package/asterisk/asterisk.mk	2013-07-22 18:20:23 UTC (rev 6146)
+++ branches/1.0/package/asterisk/asterisk.mk	2013-07-22 19:30:23 UTC (rev 6147)
@@ -10,9 +10,9 @@
 ASTERISK_VERSION := 1.6.2.21
  else
   ifeq ($(BR2_PACKAGE_ASTERISK_v1_8),y)
-ASTERISK_VERSION := 1.8.22.0
+ASTERISK_VERSION := 1.8.23.0
   else
-ASTERISK_VERSION := 11.4.0
+ASTERISK_VERSION := 11.5.0
   endif
  endif
 endif

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

[Astlinux-commits] SF.net SVN: astlinux:[6150] branches/1.0/package/asterisk

From: <abe...@us...> - 2013-07-23 04:16:29

Revision: 6150
          http://sourceforge.net/p/astlinux/code/6150
Author:   abelbeck
Date:     2013-07-23 04:16:26 +0000 (Tue, 23 Jul 2013)
Log Message:
-----------
asterisk, add dependency for util-linux, starting with Asterisk 11.5.0 libuuid is required at build time to build res_rtp_asterisk.  Since we build libuuid as a part of util-linux for all configs anyway, it does no harm to make all versions of Asterisk dependent on util-linux so util-linux is built earlier

Modified Paths:
--------------
    branches/1.0/package/asterisk/Config.in
    branches/1.0/package/asterisk/asterisk.mk

Modified: branches/1.0/package/asterisk/Config.in
===================================================================
--- branches/1.0/package/asterisk/Config.in	2013-07-22 20:29:44 UTC (rev 6149)
+++ branches/1.0/package/asterisk/Config.in	2013-07-23 04:16:26 UTC (rev 6150)
@@ -6,6 +6,7 @@
 	select BR2_PACKAGE_OPENSSL
 	select BR2_PACKAGE_LIBELF
 	select BR2_PACKAGE_LIBTOOL
+	select BR2_PACKAGE_UTIL_LINUX
 	select BR2_PACKAGE_SQLITE
 	help
 		Asterisk - the Open Source PBX

Modified: branches/1.0/package/asterisk/asterisk.mk
===================================================================
--- branches/1.0/package/asterisk/asterisk.mk	2013-07-22 20:29:44 UTC (rev 6149)
+++ branches/1.0/package/asterisk/asterisk.mk	2013-07-23 04:16:26 UTC (rev 6150)
@@ -210,7 +210,7 @@
 	touch $@
 
 $(ASTERISK_DIR)/.configured: $(ASTERISK_DIR)/.patched | libelf ncurses zlib \
-				openssl libtool $(ASTERISK_EXTRAS)
+				openssl libtool util-linux $(ASTERISK_EXTRAS)
 	(cd $(ASTERISK_DIR); rm -rf config.cache configure; \
 		./bootstrap.sh; \
 		$(TARGET_CONFIGURE_OPTS) \

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

[Astlinux-commits] SF.net SVN: astlinux:[6170] branches/1.0/package/asterisk

From: <abe...@us...> - 2013-08-07 17:50:42

Revision: 6170
          http://sourceforge.net/p/astlinux/code/6170
Author:   abelbeck
Date:     2013-08-07 17:50:39 +0000 (Wed, 07 Aug 2013)
Log Message:
-----------
logrotate, add logrotate.d rules for asterisk, Thanks Michael

Modified Paths:
--------------
    branches/1.0/package/asterisk/asterisk.mk

Added Paths:
-----------
    branches/1.0/package/asterisk/asterisk.logrotate

Added: branches/1.0/package/asterisk/asterisk.logrotate
===================================================================
--- branches/1.0/package/asterisk/asterisk.logrotate	                        (rev 0)
+++ branches/1.0/package/asterisk/asterisk.logrotate	2013-08-07 17:50:39 UTC (rev 6170)
@@ -0,0 +1,11 @@
+#
+/var/log/asterisk/messages /var/log/asterisk/full /var/log/asterisk/debug /var/log/asterisk/*log {
+  missingok
+  size 100k
+  rotate 1
+  sharedscripts
+  postrotate
+    /usr/sbin/asterisk -rx 'logger reload' >/dev/null 2>&1
+  endscript
+}
+

Modified: branches/1.0/package/asterisk/asterisk.mk
===================================================================
--- branches/1.0/package/asterisk/asterisk.mk	2013-08-07 17:22:24 UTC (rev 6169)
+++ branches/1.0/package/asterisk/asterisk.mk	2013-08-07 17:50:39 UTC (rev 6170)
@@ -285,6 +285,7 @@
 	   $(STAGING_DIR)/usr/include/
 	rm -Rf $(TARGET_DIR)/usr/share/man
 	$(INSTALL) -D -m 0755 package/asterisk/asterisk.init $(TARGET_DIR)/etc/init.d/asterisk
+	$(INSTALL) -D -m 0644 package/asterisk/asterisk.logrotate $(TARGET_DIR)/etc/logrotate.d/asterisk
 	$(INSTALL) -D -m 0755 package/asterisk/upgrade-asterisk-sounds $(TARGET_DIR)/usr/sbin/upgrade-asterisk-sounds
 	$(INSTALL) -D -m 0755 package/asterisk/safe_asterisk $(TARGET_DIR)/usr/sbin/safe_asterisk
 	$(INSTALL) -D -m 0755 package/asterisk/asterisk-sip-monitor $(TARGET_DIR)/usr/sbin/asterisk-sip-monitor

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

[Astlinux-commits] SF.net SVN: astlinux:[6178] branches/1.0/package/asterisk

From: <abe...@us...> - 2013-08-27 03:16:05

Revision: 6178
          http://sourceforge.net/p/astlinux/code/6178
Author:   abelbeck
Date:     2013-08-27 03:16:01 +0000 (Tue, 27 Aug 2013)
Log Message:
-----------
asterisk, change a jabber/xmpp error log to a debug log.  The Prosody pubsub service does not support some optional features and as a result asterisk generates annoying errors, but the asterisk distributed devstate feature still works.

Added Paths:
-----------
    branches/1.0/package/asterisk/asterisk-1.8-res_jabber-log-nonpubsub-error-to-debug.patch
    branches/1.0/package/asterisk/asterisk-11-res_xmpp-log-nonpubsub-error-to-debug.patch

Added: branches/1.0/package/asterisk/asterisk-1.8-res_jabber-log-nonpubsub-error-to-debug.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-1.8-res_jabber-log-nonpubsub-error-to-debug.patch	                        (rev 0)
+++ branches/1.0/package/asterisk/asterisk-1.8-res_jabber-log-nonpubsub-error-to-debug.patch	2013-08-27 03:16:01 UTC (rev 6178)
@@ -0,0 +1,11 @@
+--- asterisk-1.8.23.0/res/res_jabber.c.orig	2013-08-26 21:01:37.000000000 -0500
++++ asterisk-1.8.23.0/res/res_jabber.c	2013-08-26 21:10:23.000000000 -0500
+@@ -3507,7 +3507,7 @@
+ 	iks *orig_pubsub = iks_find(pak->x, "pubsub");
+ 	struct aji_client *client;
+ 	if (!orig_pubsub) {
+-		ast_log(LOG_ERROR, "Error isn't a PubSub error, why are we here?\n");
++		ast_debug(1, "Error isn't a PubSub error, why are we here?\n");
+ 		return IKS_FILTER_EAT;
+ 	}
+ 	orig_request = iks_child(orig_pubsub);

Added: branches/1.0/package/asterisk/asterisk-11-res_xmpp-log-nonpubsub-error-to-debug.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11-res_xmpp-log-nonpubsub-error-to-debug.patch	                        (rev 0)
+++ branches/1.0/package/asterisk/asterisk-11-res_xmpp-log-nonpubsub-error-to-debug.patch	2013-08-27 03:16:01 UTC (rev 6178)
@@ -0,0 +1,11 @@
+--- asterisk-11.5.0/res/res_xmpp.c.orig	2013-08-26 21:37:44.000000000 -0500
++++ asterisk-11.5.0/res/res_xmpp.c	2013-08-26 21:39:26.000000000 -0500
+@@ -1381,7 +1381,7 @@
+ 	}
+ 
+ 	if (!orig_pubsub) {
+-		ast_log(LOG_ERROR, "Error isn't a PubSub error, why are we here?\n");
++		ast_debug(1, "Error isn't a PubSub error, why are we here?\n");
+ 		return IKS_FILTER_EAT;
+ 	}
+ 

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

[Astlinux-commits] SF.net SVN: astlinux:[6183] branches/1.0/package/asterisk

From: <abe...@us...> - 2013-08-31 17:41:22

Revision: 6183
          http://sourceforge.net/p/astlinux/code/6183
Author:   abelbeck
Date:     2013-08-31 17:41:19 +0000 (Sat, 31 Aug 2013)
Log Message:
-----------
asterisk, fix jabber/xmpp MWI pubsub issue where the mailbox and context got swapped on the remote end.  Thanks Michael.

Added Paths:
-----------
    branches/1.0/package/asterisk/asterisk-1.8-res_jabber-aji_handle_pubsub_event.patch
    branches/1.0/package/asterisk/asterisk-11-res_xmpp-xmpp_pubsub_handle_event.patch

Added: branches/1.0/package/asterisk/asterisk-1.8-res_jabber-aji_handle_pubsub_event.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-1.8-res_jabber-aji_handle_pubsub_event.patch	                        (rev 0)
+++ branches/1.0/package/asterisk/asterisk-1.8-res_jabber-aji_handle_pubsub_event.patch	2013-08-31 17:41:19 UTC (rev 6183)
@@ -0,0 +1,27 @@
+--- asterisk-1.8.23.1/res/res_jabber.c.orig	2013-08-31 11:54:46.000000000 -0500
++++ asterisk-1.8.23.1/res/res_jabber.c	2013-08-31 11:57:41.000000000 -0500
+@@ -3260,7 +3260,7 @@
+  */
+ static int aji_handle_pubsub_event(void *data, ikspak *pak)
+ {
+-	char *item_id, *device_state, *context, *cachable_str;
++	char *item_id, *device_state, *mailbox, *cachable_str;
+ 	int oldmsgs, newmsgs;
+ 	iks *item, *item_content;
+ 	struct ast_eid pubsub_eid;
+@@ -3293,12 +3293,12 @@
+ 			return IKS_FILTER_EAT;
+ 		}
+ 	} else if (!strcasecmp(iks_name(item_content), "mailbox")) {
+-		context = strsep(&item_id, "@");
++		mailbox = strsep(&item_id, "@");
+ 		sscanf(iks_find_cdata(item_content, "OLDMSGS"), "%10d", &oldmsgs);
+ 		sscanf(iks_find_cdata(item_content, "NEWMSGS"), "%10d", &newmsgs);
+ 		if (!(event = ast_event_new(AST_EVENT_MWI, AST_EVENT_IE_MAILBOX,
+-			AST_EVENT_IE_PLTYPE_STR, item_id, AST_EVENT_IE_CONTEXT,
+-			AST_EVENT_IE_PLTYPE_STR, context, AST_EVENT_IE_OLDMSGS,
++			AST_EVENT_IE_PLTYPE_STR, mailbox, AST_EVENT_IE_CONTEXT,
++			AST_EVENT_IE_PLTYPE_STR, item_id, AST_EVENT_IE_OLDMSGS,
+ 			AST_EVENT_IE_PLTYPE_UINT, oldmsgs, AST_EVENT_IE_NEWMSGS,
+ 			AST_EVENT_IE_PLTYPE_UINT, newmsgs, AST_EVENT_IE_EID, AST_EVENT_IE_PLTYPE_RAW,
+ 			&pubsub_eid, sizeof(pubsub_eid), AST_EVENT_IE_END))) {

Added: branches/1.0/package/asterisk/asterisk-11-res_xmpp-xmpp_pubsub_handle_event.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11-res_xmpp-xmpp_pubsub_handle_event.patch	                        (rev 0)
+++ branches/1.0/package/asterisk/asterisk-11-res_xmpp-xmpp_pubsub_handle_event.patch	2013-08-31 17:41:19 UTC (rev 6183)
@@ -0,0 +1,27 @@
+--- asterisk-11.5.1/res/res_xmpp.c.orig	2013-08-31 12:04:32.000000000 -0500
++++ asterisk-11.5.1/res/res_xmpp.c	2013-08-31 12:06:47.000000000 -0500
+@@ -1309,7 +1309,7 @@
+  */
+ static int xmpp_pubsub_handle_event(void *data, ikspak *pak)
+ {
+-	char *item_id, *device_state, *context, *cachable_str;
++	char *item_id, *device_state, *mailbox, *cachable_str;
+ 	int oldmsgs, newmsgs;
+ 	iks *item, *item_content;
+ 	struct ast_eid pubsub_eid;
+@@ -1341,12 +1341,12 @@
+ 			return IKS_FILTER_EAT;
+ 		}
+ 	} else if (!strcasecmp(iks_name(item_content), "mailbox")) {
+-		context = strsep(&item_id, "@");
++		mailbox = strsep(&item_id, "@");
+ 		sscanf(iks_find_cdata(item_content, "OLDMSGS"), "%10d", &oldmsgs);
+ 		sscanf(iks_find_cdata(item_content, "NEWMSGS"), "%10d", &newmsgs);
+ 		if (!(event = ast_event_new(AST_EVENT_MWI, AST_EVENT_IE_MAILBOX,
+-					    AST_EVENT_IE_PLTYPE_STR, item_id, AST_EVENT_IE_CONTEXT,
+-					    AST_EVENT_IE_PLTYPE_STR, context, AST_EVENT_IE_OLDMSGS,
++					    AST_EVENT_IE_PLTYPE_STR, mailbox, AST_EVENT_IE_CONTEXT,
++					    AST_EVENT_IE_PLTYPE_STR, item_id, AST_EVENT_IE_OLDMSGS,
+ 					    AST_EVENT_IE_PLTYPE_UINT, oldmsgs, AST_EVENT_IE_NEWMSGS,
+ 					    AST_EVENT_IE_PLTYPE_UINT, newmsgs, AST_EVENT_IE_EID, AST_EVENT_IE_PLTYPE_RAW,
+ 					    &pubsub_eid, sizeof(pubsub_eid), AST_EVENT_IE_END))) {

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

[Astlinux-commits] SF.net SVN: astlinux:[6239] branches/1.0/package/asterisk

From: <abe...@us...> - 2013-10-22 16:49:07

Revision: 6239
          http://sourceforge.net/p/astlinux/code/6239
Author:   abelbeck
Date:     2013-10-22 16:49:02 +0000 (Tue, 22 Oct 2013)
Log Message:
-----------
asterisk, version bump to 1.8.24.0 and 11.6.0, now including our XMPP PubSub patches

Modified Paths:
--------------
    branches/1.0/package/asterisk/asterisk.mk

Removed Paths:
-------------
    branches/1.0/package/asterisk/asterisk-1.8-res_jabber-aji_handle_pubsub_event.patch
    branches/1.0/package/asterisk/asterisk-11-res_xmpp-xmpp_pubsub_handle_event.patch

Deleted: branches/1.0/package/asterisk/asterisk-1.8-res_jabber-aji_handle_pubsub_event.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-1.8-res_jabber-aji_handle_pubsub_event.patch	2013-10-22 15:07:05 UTC (rev 6238)
+++ branches/1.0/package/asterisk/asterisk-1.8-res_jabber-aji_handle_pubsub_event.patch	2013-10-22 16:49:02 UTC (rev 6239)
@@ -1,27 +0,0 @@
---- asterisk-1.8.23.1/res/res_jabber.c.orig	2013-08-31 11:54:46.000000000 -0500
-+++ asterisk-1.8.23.1/res/res_jabber.c	2013-08-31 11:57:41.000000000 -0500
-@@ -3260,7 +3260,7 @@
-  */
- static int aji_handle_pubsub_event(void *data, ikspak *pak)
- {
--	char *item_id, *device_state, *context, *cachable_str;
-+	char *item_id, *device_state, *mailbox, *cachable_str;
- 	int oldmsgs, newmsgs;
- 	iks *item, *item_content;
- 	struct ast_eid pubsub_eid;
-@@ -3293,12 +3293,12 @@
- 			return IKS_FILTER_EAT;
- 		}
- 	} else if (!strcasecmp(iks_name(item_content), "mailbox")) {
--		context = strsep(&item_id, "@");
-+		mailbox = strsep(&item_id, "@");
- 		sscanf(iks_find_cdata(item_content, "OLDMSGS"), "%10d", &oldmsgs);
- 		sscanf(iks_find_cdata(item_content, "NEWMSGS"), "%10d", &newmsgs);
- 		if (!(event = ast_event_new(AST_EVENT_MWI, AST_EVENT_IE_MAILBOX,
--			AST_EVENT_IE_PLTYPE_STR, item_id, AST_EVENT_IE_CONTEXT,
--			AST_EVENT_IE_PLTYPE_STR, context, AST_EVENT_IE_OLDMSGS,
-+			AST_EVENT_IE_PLTYPE_STR, mailbox, AST_EVENT_IE_CONTEXT,
-+			AST_EVENT_IE_PLTYPE_STR, item_id, AST_EVENT_IE_OLDMSGS,
- 			AST_EVENT_IE_PLTYPE_UINT, oldmsgs, AST_EVENT_IE_NEWMSGS,
- 			AST_EVENT_IE_PLTYPE_UINT, newmsgs, AST_EVENT_IE_EID, AST_EVENT_IE_PLTYPE_RAW,
- 			&pubsub_eid, sizeof(pubsub_eid), AST_EVENT_IE_END))) {

Deleted: branches/1.0/package/asterisk/asterisk-11-res_xmpp-xmpp_pubsub_handle_event.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11-res_xmpp-xmpp_pubsub_handle_event.patch	2013-10-22 15:07:05 UTC (rev 6238)
+++ branches/1.0/package/asterisk/asterisk-11-res_xmpp-xmpp_pubsub_handle_event.patch	2013-10-22 16:49:02 UTC (rev 6239)
@@ -1,27 +0,0 @@
---- asterisk-11.5.1/res/res_xmpp.c.orig	2013-08-31 12:04:32.000000000 -0500
-+++ asterisk-11.5.1/res/res_xmpp.c	2013-08-31 12:06:47.000000000 -0500
-@@ -1309,7 +1309,7 @@
-  */
- static int xmpp_pubsub_handle_event(void *data, ikspak *pak)
- {
--	char *item_id, *device_state, *context, *cachable_str;
-+	char *item_id, *device_state, *mailbox, *cachable_str;
- 	int oldmsgs, newmsgs;
- 	iks *item, *item_content;
- 	struct ast_eid pubsub_eid;
-@@ -1341,12 +1341,12 @@
- 			return IKS_FILTER_EAT;
- 		}
- 	} else if (!strcasecmp(iks_name(item_content), "mailbox")) {
--		context = strsep(&item_id, "@");
-+		mailbox = strsep(&item_id, "@");
- 		sscanf(iks_find_cdata(item_content, "OLDMSGS"), "%10d", &oldmsgs);
- 		sscanf(iks_find_cdata(item_content, "NEWMSGS"), "%10d", &newmsgs);
- 		if (!(event = ast_event_new(AST_EVENT_MWI, AST_EVENT_IE_MAILBOX,
--					    AST_EVENT_IE_PLTYPE_STR, item_id, AST_EVENT_IE_CONTEXT,
--					    AST_EVENT_IE_PLTYPE_STR, context, AST_EVENT_IE_OLDMSGS,
-+					    AST_EVENT_IE_PLTYPE_STR, mailbox, AST_EVENT_IE_CONTEXT,
-+					    AST_EVENT_IE_PLTYPE_STR, item_id, AST_EVENT_IE_OLDMSGS,
- 					    AST_EVENT_IE_PLTYPE_UINT, oldmsgs, AST_EVENT_IE_NEWMSGS,
- 					    AST_EVENT_IE_PLTYPE_UINT, newmsgs, AST_EVENT_IE_EID, AST_EVENT_IE_PLTYPE_RAW,
- 					    &pubsub_eid, sizeof(pubsub_eid), AST_EVENT_IE_END))) {

Modified: branches/1.0/package/asterisk/asterisk.mk
===================================================================
--- branches/1.0/package/asterisk/asterisk.mk	2013-10-22 15:07:05 UTC (rev 6238)
+++ branches/1.0/package/asterisk/asterisk.mk	2013-10-22 16:49:02 UTC (rev 6239)
@@ -10,9 +10,9 @@
 ASTERISK_VERSION := 1.6.2.21
  else
   ifeq ($(BR2_PACKAGE_ASTERISK_v1_8),y)
-ASTERISK_VERSION := 1.8.23.1
+ASTERISK_VERSION := 1.8.24.0
   else
-ASTERISK_VERSION := 11.5.1
+ASTERISK_VERSION := 11.6.0
   endif
  endif
 endif

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

[Astlinux-commits] SF.net SVN: astlinux:[6313] branches/1.0/package/asterisk

From: <abe...@us...> - 2013-12-19 16:04:52

Revision: 6313
          http://sourceforge.net/p/astlinux/code/6313
Author:   abelbeck
Date:     2013-12-19 16:04:49 +0000 (Thu, 19 Dec 2013)
Log Message:
-----------
asterisk, version bump to 1.8.25.0 and 11.7.0

Modified Paths:
--------------
    branches/1.0/package/asterisk/asterisk.mk

Removed Paths:
-------------
    branches/1.0/package/asterisk/asterisk-1.8-res_jabber-log-nonpubsub-error-to-debug.patch
    branches/1.0/package/asterisk/asterisk-11-res_xmpp-log-nonpubsub-error-to-debug.patch

Deleted: branches/1.0/package/asterisk/asterisk-1.8-res_jabber-log-nonpubsub-error-to-debug.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-1.8-res_jabber-log-nonpubsub-error-to-debug.patch	2013-12-13 18:44:42 UTC (rev 6312)
+++ branches/1.0/package/asterisk/asterisk-1.8-res_jabber-log-nonpubsub-error-to-debug.patch	2013-12-19 16:04:49 UTC (rev 6313)
@@ -1,11 +0,0 @@
---- asterisk-1.8.23.0/res/res_jabber.c.orig	2013-08-26 21:01:37.000000000 -0500
-+++ asterisk-1.8.23.0/res/res_jabber.c	2013-08-26 21:10:23.000000000 -0500
-@@ -3507,7 +3507,7 @@
- 	iks *orig_pubsub = iks_find(pak->x, "pubsub");
- 	struct aji_client *client;
- 	if (!orig_pubsub) {
--		ast_log(LOG_ERROR, "Error isn't a PubSub error, why are we here?\n");
-+		ast_debug(1, "Error isn't a PubSub error, why are we here?\n");
- 		return IKS_FILTER_EAT;
- 	}
- 	orig_request = iks_child(orig_pubsub);

Deleted: branches/1.0/package/asterisk/asterisk-11-res_xmpp-log-nonpubsub-error-to-debug.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11-res_xmpp-log-nonpubsub-error-to-debug.patch	2013-12-13 18:44:42 UTC (rev 6312)
+++ branches/1.0/package/asterisk/asterisk-11-res_xmpp-log-nonpubsub-error-to-debug.patch	2013-12-19 16:04:49 UTC (rev 6313)
@@ -1,11 +0,0 @@
---- asterisk-11.5.0/res/res_xmpp.c.orig	2013-08-26 21:37:44.000000000 -0500
-+++ asterisk-11.5.0/res/res_xmpp.c	2013-08-26 21:39:26.000000000 -0500
-@@ -1381,7 +1381,7 @@
- 	}
- 
- 	if (!orig_pubsub) {
--		ast_log(LOG_ERROR, "Error isn't a PubSub error, why are we here?\n");
-+		ast_debug(1, "Error isn't a PubSub error, why are we here?\n");
- 		return IKS_FILTER_EAT;
- 	}
- 

Modified: branches/1.0/package/asterisk/asterisk.mk
===================================================================
--- branches/1.0/package/asterisk/asterisk.mk	2013-12-13 18:44:42 UTC (rev 6312)
+++ branches/1.0/package/asterisk/asterisk.mk	2013-12-19 16:04:49 UTC (rev 6313)
@@ -10,9 +10,9 @@
 ASTERISK_VERSION := 1.6.2.21
  else
   ifeq ($(BR2_PACKAGE_ASTERISK_v1_8),y)
-ASTERISK_VERSION := 1.8.24.0
+ASTERISK_VERSION := 1.8.25.0
   else
-ASTERISK_VERSION := 11.6.0
+ASTERISK_VERSION := 11.7.0
   endif
  endif
 endif

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

[Astlinux-commits] SF.net SVN: astlinux:[6345] branches/1.0/package/asterisk

From: <abe...@us...> - 2014-01-06 20:05:13

Revision: 6345
          http://sourceforge.net/p/astlinux/code/6345
Author:   abelbeck
Date:     2014-01-06 20:05:09 +0000 (Mon, 06 Jan 2014)
Log Message:
-----------
asterisk, add Asterisk upstream patches r404861 and r404888 for logging live_dangerously
https://reviewboard.asterisk.org/r/3101/

Revision Links:
--------------
    http://sourceforge.net/p/astlinux/code/404861
    http://sourceforge.net/p/astlinux/code/404888

Added Paths:
-----------
    branches/1.0/package/asterisk/asterisk-1.8.25-r404861-live_dangerously.patch
    branches/1.0/package/asterisk/asterisk-11.7-r404888-live_dangerously.patch

Added: branches/1.0/package/asterisk/asterisk-1.8.25-r404861-live_dangerously.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-1.8.25-r404861-live_dangerously.patch	                        (rev 0)
+++ branches/1.0/package/asterisk/asterisk-1.8.25-r404861-live_dangerously.patch	2014-01-06 20:05:09 UTC (rev 6345)
@@ -0,0 +1,13 @@
+--- asterisk-1.8.25.0/main/asterisk.c.orig	2013/12/16 16:36:52	403913
++++ asterisk-1.8.25.0/main/asterisk.c	2014/01/03 22:06:02	404861
+@@ -3251,7 +3251,9 @@
+ 			live_dangerously = ast_true(v->value);
+ 		}
+ 	}
+-	pbx_live_dangerously(live_dangerously);
++	if (!ast_opt_remote) {
++		pbx_live_dangerously(live_dangerously);
++	}
+ 	for (v = ast_variable_browse(cfg, "compat"); v; v = v->next) {
+ 		float version;
+ 		if (sscanf(v->value, "%30f", &version) != 1) {

Added: branches/1.0/package/asterisk/asterisk-11.7-r404888-live_dangerously.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11.7-r404888-live_dangerously.patch	                        (rev 0)
+++ branches/1.0/package/asterisk/asterisk-11.7-r404888-live_dangerously.patch	2014-01-06 20:05:09 UTC (rev 6345)
@@ -0,0 +1,13 @@
+--- asterisk-11.7.0/main/asterisk.c.orig      2013/12/16 16:36:52     403913
++++ asterisk-11.7.0/main/asterisk.c   2014/01/03 22:06:02     404861
+@@ -3421,7 +3421,9 @@
+ 			live_dangerously = ast_true(v->value);
+ 		}
+ 	}
+-	pbx_live_dangerously(live_dangerously);
++	if (!ast_opt_remote) {
++		pbx_live_dangerously(live_dangerously);
++	}
+ 	for (v = ast_variable_browse(cfg, "compat"); v; v = v->next) {
+ 		float version;
+ 		if (sscanf(v->value, "%30f", &version) != 1) {

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

[Astlinux-commits] SF.net SVN: astlinux:[6379] branches/1.0/package/asterisk

From: <abe...@us...> - 2014-01-24 23:33:31

Revision: 6379
          http://sourceforge.net/p/astlinux/code/6379
Author:   abelbeck
Date:     2014-01-24 23:33:27 +0000 (Fri, 24 Jan 2014)
Log Message:
-----------
asterisk, fix 3+ year old error message near the end of the main ./configure which attempts to run ./menuselect/configure but if cross compiling CC is incorrect and it fails, but fortunately ./menuselect/configure is later executed when ./menuselect/Makefile is called.  This patch skips calling the error generating ./menuselect/configure from the main ./configure, a cleanup.

Added Paths:
-----------
    branches/1.0/package/asterisk/asterisk-1.8-configure-cross-fix.patch
    branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch

Added: branches/1.0/package/asterisk/asterisk-1.8-configure-cross-fix.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-1.8-configure-cross-fix.patch	                        (rev 0)
+++ branches/1.0/package/asterisk/asterisk-1.8-configure-cross-fix.patch	2014-01-24 23:33:27 UTC (rev 6379)
@@ -0,0 +1,16 @@
+--- 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
+@@ -2283,11 +2283,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
+ 

Added: branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch	                        (rev 0)
+++ branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch	2014-01-24 23:33:27 UTC (rev 6379)
@@ -0,0 +1,16 @@
+--- 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
+@@ -2382,11 +2382,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
+ 

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

[Astlinux-commits] SF.net SVN: astlinux:[6511] branches/1.0/package/asterisk

From: <abe...@us...> - 2014-04-30 14:47:18

Revision: 6511
          http://sourceforge.net/p/astlinux/code/6511
Author:   abelbeck
Date:     2014-04-30 14:47:15 +0000 (Wed, 30 Apr 2014)
Log Message:
-----------
asterisk, version bump to 1.8.27.0 and 11.9.0

Modified Paths:
--------------
    branches/1.0/package/asterisk/asterisk.mk

Removed Paths:
-------------
    branches/1.0/package/asterisk/asterisk-1.8.25-r404861-live_dangerously.patch
    branches/1.0/package/asterisk/asterisk-11.7-r404888-live_dangerously.patch

Deleted: branches/1.0/package/asterisk/asterisk-1.8.25-r404861-live_dangerously.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-1.8.25-r404861-live_dangerously.patch	2014-04-29 18:11:41 UTC (rev 6510)
+++ branches/1.0/package/asterisk/asterisk-1.8.25-r404861-live_dangerously.patch	2014-04-30 14:47:15 UTC (rev 6511)
@@ -1,13 +0,0 @@
---- asterisk-1.8.25.0/main/asterisk.c.orig	2013/12/16 16:36:52	403913
-+++ asterisk-1.8.25.0/main/asterisk.c	2014/01/03 22:06:02	404861
-@@ -3251,7 +3251,9 @@
- 			live_dangerously = ast_true(v->value);
- 		}
- 	}
--	pbx_live_dangerously(live_dangerously);
-+	if (!ast_opt_remote) {
-+		pbx_live_dangerously(live_dangerously);
-+	}
- 	for (v = ast_variable_browse(cfg, "compat"); v; v = v->next) {
- 		float version;
- 		if (sscanf(v->value, "%30f", &version) != 1) {

Deleted: branches/1.0/package/asterisk/asterisk-11.7-r404888-live_dangerously.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11.7-r404888-live_dangerously.patch	2014-04-29 18:11:41 UTC (rev 6510)
+++ branches/1.0/package/asterisk/asterisk-11.7-r404888-live_dangerously.patch	2014-04-30 14:47:15 UTC (rev 6511)
@@ -1,13 +0,0 @@
---- asterisk-11.7.0/main/asterisk.c.orig      2013/12/16 16:36:52     403913
-+++ asterisk-11.7.0/main/asterisk.c   2014/01/03 22:06:02     404861
-@@ -3421,7 +3421,9 @@
- 			live_dangerously = ast_true(v->value);
- 		}
- 	}
--	pbx_live_dangerously(live_dangerously);
-+	if (!ast_opt_remote) {
-+		pbx_live_dangerously(live_dangerously);
-+	}
- 	for (v = ast_variable_browse(cfg, "compat"); v; v = v->next) {
- 		float version;
- 		if (sscanf(v->value, "%30f", &version) != 1) {

Modified: branches/1.0/package/asterisk/asterisk.mk
===================================================================
--- branches/1.0/package/asterisk/asterisk.mk	2014-04-29 18:11:41 UTC (rev 6510)
+++ branches/1.0/package/asterisk/asterisk.mk	2014-04-30 14:47:15 UTC (rev 6511)
@@ -4,9 +4,9 @@
 #
 ##############################################################
 ifeq ($(BR2_PACKAGE_ASTERISK_v1_8),y)
-ASTERISK_VERSION := 1.8.26.1
+ASTERISK_VERSION := 1.8.27.0
 else
-ASTERISK_VERSION := 11.8.1
+ASTERISK_VERSION := 11.9.0
 endif
 ASTERISK_SOURCE := asterisk-$(ASTERISK_VERSION).tar.gz
 ASTERISK_SITE := http://downloads.asterisk.org/pub/telephony/asterisk/releases

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

[Astlinux-commits] SF.net SVN: astlinux:[6622] branches/1.0/package/asterisk

From: <abe...@us...> - 2014-08-09 22:59:36

Revision: 6622
          http://sourceforge.net/p/astlinux/code/6622
Author:   abelbeck
Date:     2014-08-09 22:59:26 +0000 (Sat, 09 Aug 2014)
Log Message:
-----------
asterisk, back-port Asterisk 13 r420577 (plus minor fix) to allow voicemail to include multiple recipients

Revision Links:
--------------
    http://sourceforge.net/p/astlinux/code/420577

Added Paths:
-----------
    branches/1.0/package/asterisk/asterisk-1.8-voicemail-multiple-recipients.patch
    branches/1.0/package/asterisk/asterisk-11-voicemail-multiple-recipients.patch

Added: branches/1.0/package/asterisk/asterisk-1.8-voicemail-multiple-recipients.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-1.8-voicemail-multiple-recipients.patch	                        (rev 0)
+++ branches/1.0/package/asterisk/asterisk-1.8-voicemail-multiple-recipients.patch	2014-08-09 22:59:26 UTC (rev 6622)
@@ -0,0 +1,155 @@
+--- 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) */
+@@ -1043,6 +1043,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);
+@@ -1339,7 +1341,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")) {
+@@ -1466,6 +1469,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);
+ 			}
+@@ -1761,6 +1765,9 @@
+ {
+ 	if (ast_test_flag(vmu, VM_ALLOCED)) {
+ 
++		ast_free(vmu->email);
++		vmu->email = NULL;
++
+ 		ast_free(vmu->emailbody);
+ 		vmu->emailbody = NULL;
+ 
+@@ -2297,7 +2304,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;
+ 	}
+ 
+@@ -2309,8 +2316,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;
+ 	}
+ 
+@@ -4563,6 +4572,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);
+@@ -4604,7 +4616,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';
+@@ -4625,20 +4637,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)) {
+@@ -4648,7 +4665,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), ' '))) {
+@@ -10825,7 +10842,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));
+@@ -12985,7 +13002,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

Added: branches/1.0/package/asterisk/asterisk-11-voicemail-multiple-recipients.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11-voicemail-multiple-recipients.patch	                        (rev 0)
+++ branches/1.0/package/asterisk/asterisk-11-voicemail-multiple-recipients.patch	2014-08-09 22:59:26 UTC (rev 6622)
@@ -0,0 +1,155 @@
+--- asterisk-11.11.0/apps/app_voicemail.c.orig	2014-05-09 17:28:40.000000000 -0500
++++ asterisk-11.11.0/apps/app_voicemail.c	2014-08-09 11:29:01.000000000 -0500
+@@ -748,7 +748,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) */
+@@ -1188,6 +1188,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);
+@@ -1499,7 +1501,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")) {
+@@ -1636,6 +1639,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);
+ 			}
+@@ -1918,6 +1922,9 @@
+ {
+ 	if (ast_test_flag(vmu, VM_ALLOCED)) {
+ 
++		ast_free(vmu->email);
++		vmu->email = NULL;
++
+ 		ast_free(vmu->emailbody);
+ 		vmu->emailbody = NULL;
+ 
+@@ -2538,7 +2545,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;
+ 	}
+ 
+@@ -2550,8 +2557,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;
+ 	}
+ 
+@@ -4873,6 +4882,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);
+@@ -4914,7 +4926,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';
+@@ -4935,20 +4947,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)) {
+@@ -4958,7 +4975,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), ' '))) {
+@@ -11713,7 +11730,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));
+@@ -13982,7 +13999,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

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

[Astlinux-commits] SF.net SVN: astlinux:[6769] branches/1.0/package/asterisk

From: <abe...@us...> - 2014-10-16 15:48:30

Revision: 6769
          http://sourceforge.net/p/astlinux/code/6769
Author:   abelbeck
Date:     2014-10-16 15:48:26 +0000 (Thu, 16 Oct 2014)
Log Message:
-----------
asterisk, add jabber/xmpp patches to use TLS instead of SSLv3, security fix POODLE (CVE-2014-3566)

Added Paths:
-----------
    branches/1.0/package/asterisk/asterisk-1.8-jabber-tls.patch
    branches/1.0/package/asterisk/asterisk-11-jabber-xmpp-tls.patch

Added: branches/1.0/package/asterisk/asterisk-1.8-jabber-tls.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-1.8-jabber-tls.patch	                        (rev 0)
+++ branches/1.0/package/asterisk/asterisk-1.8-jabber-tls.patch	2014-10-16 15:48:26 UTC (rev 6769)
@@ -0,0 +1,21 @@
+--- asterisk-1.8.31.0/res/res_jabber.c.orig	2014-10-16 08:45:07.000000000 -0500
++++ asterisk-1.8.31.0/res/res_jabber.c	2014-10-16 08:51:36.000000000 -0500
+@@ -1240,14 +1240,17 @@
+ {
+ 	int ret;
+ 	int sock;
++	long ssl_opts;
+ 
+ 	ast_debug(1, "Starting TLS handshake\n");
+ 
+ 	/* Choose an SSL/TLS protocol version, create SSL_CTX */
+-	client->ssl_method = SSLv3_method();
++	client->ssl_method = SSLv23_method();
+ 	if (!(client->ssl_context = SSL_CTX_new((SSL_METHOD *) client->ssl_method))) {
+ 		return IKS_NET_TLSFAIL;
+ 	}
++	ssl_opts = SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3;
++	SSL_CTX_set_options(client->ssl_context, ssl_opts);
+ 
+ 	/* Create new SSL session */
+ 	if (!(client->ssl_session = SSL_new(client->ssl_context))) {

Added: branches/1.0/package/asterisk/asterisk-11-jabber-xmpp-tls.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11-jabber-xmpp-tls.patch	                        (rev 0)
+++ branches/1.0/package/asterisk/asterisk-11-jabber-xmpp-tls.patch	2014-10-16 15:48:26 UTC (rev 6769)
@@ -0,0 +1,45 @@
+--- asterisk-11.13.0/res/res_jabber.c.orig	2014-10-16 10:05:57.000000000 -0500
++++ asterisk-11.13.0/res/res_jabber.c	2014-10-16 10:04:51.000000000 -0500
+@@ -1282,14 +1282,17 @@
+ static int aji_tls_handshake(struct aji_client *client)
+ {
+ 	int sock;
++	long ssl_opts;
+ 
+ 	ast_debug(1, "Starting TLS handshake\n");
+ 
+ 	/* Choose an SSL/TLS protocol version, create SSL_CTX */
+-	client->ssl_method = SSLv3_method();
++	client->ssl_method = SSLv23_method();
+ 	if (!(client->ssl_context = SSL_CTX_new((SSL_METHOD *) client->ssl_method))) {
+ 		return IKS_NET_TLSFAIL;
+ 	}
++	ssl_opts = SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3;
++	SSL_CTX_set_options(client->ssl_context, ssl_opts);
+ 
+ 	/* Create new SSL session */
+ 	if (!(client->ssl_session = SSL_new(client->ssl_context))) {
+--- asterisk-11.13.0/res/res_xmpp.c.orig	2014-10-16 10:13:57.000000000 -0500
++++ asterisk-11.13.0/res/res_xmpp.c	2014-10-16 10:16:49.000000000 -0500
+@@ -2501,6 +2501,7 @@
+ {
+ #ifdef HAVE_OPENSSL
+ 	int sock;
++	long ssl_opts;
+ #endif
+ 
+ 	if (!strcmp(iks_name(node), "success")) {
+@@ -2519,10 +2520,12 @@
+ 	ast_log(LOG_ERROR, "Somehow we managed to try to start TLS negotiation on client '%s' without OpenSSL support, disconnecting\n", client->name);
+ 	return -1;
+ #else
+-	client->ssl_method = SSLv3_method();
++	client->ssl_method = SSLv23_method();
+ 	if (!(client->ssl_context = SSL_CTX_new((SSL_METHOD *) client->ssl_method))) {
+ 		goto failure;
+ 	}
++	ssl_opts = SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3;
++	SSL_CTX_set_options(client->ssl_context, ssl_opts);
+ 
+ 	if (!(client->ssl_session = SSL_new(client->ssl_context))) {
+ 		goto failure;

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

[Astlinux-commits] SF.net SVN: astlinux:[6814] branches/1.0/package/asterisk

From: <abe...@us...> - 2014-11-10 19:02:34

Revision: 6814
          http://sourceforge.net/p/astlinux/code/6814
Author:   abelbeck
Date:     2014-11-10 19:02:25 +0000 (Mon, 10 Nov 2014)
Log Message:
-----------
asterisk, version bump to 1.8.32.0 and 11.14.0

Modified Paths:
--------------
    branches/1.0/package/asterisk/asterisk-1.8-configure-cross-fix.patch
    branches/1.0/package/asterisk/asterisk-1.8-voicemail-multiple-recipients.patch
    branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch
    branches/1.0/package/asterisk/asterisk-11-voicemail-multiple-recipients.patch
    branches/1.0/package/asterisk/asterisk.mk

Removed Paths:
-------------
    branches/1.0/package/asterisk/asterisk-1.8-srtp-crypto_kernel-include.patch
    branches/1.0/package/asterisk/asterisk-11-srtp-crypto_kernel-include.patch

Modified: branches/1.0/package/asterisk/asterisk-1.8-configure-cross-fix.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-1.8-configure-cross-fix.patch	2014-11-10 15:37:36 UTC (rev 6813)
+++ branches/1.0/package/asterisk/asterisk-1.8-configure-cross-fix.patch	2014-11-10 19:02:25 UTC (rev 6814)
@@ -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
-@@ -2283,11 +2283,13 @@
+@@ -2319,11 +2319,13 @@
  AC_OUTPUT
  
  ${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.acbak2

Deleted: branches/1.0/package/asterisk/asterisk-1.8-srtp-crypto_kernel-include.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-1.8-srtp-crypto_kernel-include.patch	2014-11-10 15:37:36 UTC (rev 6813)
+++ branches/1.0/package/asterisk/asterisk-1.8-srtp-crypto_kernel-include.patch	2014-11-10 19:02:25 UTC (rev 6814)
@@ -1,9 +0,0 @@
---- asterisk-1.8.31.0/res/res_srtp.c.orig	2014-10-13 22:34:16.000000000 -0500
-+++ asterisk-1.8.31.0/res/res_srtp.c	2014-10-13 22:37:49.000000000 -0500
-@@ -41,5 +41,6 @@
- 
- #include <srtp/srtp.h>
-+#include <srtp/crypto_kernel.h>
- 
- #include "asterisk/lock.h"
- #include "asterisk/sched.h"

Modified: branches/1.0/package/asterisk/asterisk-1.8-voicemail-multiple-recipients.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-1.8-voicemail-multiple-recipients.patch	2014-11-10 15:37:36 UTC (rev 6813)
+++ branches/1.0/package/asterisk/asterisk-1.8-voicemail-multiple-recipients.patch	2014-11-10 19:02:25 UTC (rev 6814)
@@ -9,7 +9,7 @@
  	char *emailsubject;              /*!< E-mail subject */
  	char *emailbody;                 /*!< E-mail body */
  	char pager[80];                  /*!< E-mail address to pager (no attachment) */
-@@ -1043,6 +1043,8 @@
+@@ -1044,6 +1044,8 @@
  		vmu->maxdeletedmsg = maxdeletedmsg;
  	}
  	vmu->volgain = volgain;
@@ -18,7 +18,7 @@
  	ast_free(vmu->emailsubject);
  	vmu->emailsubject = NULL;
  	ast_free(vmu->emailbody);
-@@ -1339,7 +1341,8 @@
+@@ -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")) {
@@ -28,7 +28,7 @@
  		} else if (!strcasecmp(var->name, "fullname")) {
  			ast_copy_string(retval->fullname, var->value, sizeof(retval->fullname));
  		} else if (!strcasecmp(var->name, "context")) {
-@@ -1466,6 +1469,7 @@
+@@ -1467,6 +1470,7 @@
  		if ((vmu = (ivm ? ivm : ast_malloc(sizeof(*vmu))))) {
  			*vmu = *cur;
  			if (!ivm) {
@@ -36,7 +36,7 @@
  				vmu->emailbody = ast_strdup(cur->emailbody);
  				vmu->emailsubject = ast_strdup(cur->emailsubject);
  			}
-@@ -1761,6 +1765,9 @@
+@@ -1762,6 +1766,9 @@
  {
  	if (ast_test_flag(vmu, VM_ALLOCED)) {
  
@@ -46,7 +46,7 @@
  		ast_free(vmu->emailbody);
  		vmu->emailbody = NULL;
  
-@@ -2297,7 +2304,7 @@
+@@ -2299,7 +2306,7 @@
  		 * of this function, we will revert back to an empty string if tempcopy
  		 * is 1.
  		 */
@@ -55,7 +55,7 @@
  		tempcopy = 1;
  	}
  
-@@ -2309,8 +2316,10 @@
+@@ -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);
@@ -68,7 +68,7 @@
  		return -1;
  	}
  
-@@ -4563,6 +4572,9 @@
+@@ -4584,6 +4593,9 @@
  	struct ast_str *str1 = ast_str_create(16), *str2 = ast_str_create(16);
  	char *greeting_attachment; 
  	char filename[256];
@@ -78,7 +78,7 @@
  
  	if (!str1 || !str2) {
  		ast_free(str1);
-@@ -4604,7 +4616,7 @@
+@@ -4625,7 +4637,7 @@
  			ast_str_substitute_variables(&str1, 0, ast, fromstring);
  
  			if (check_mime(ast_str_buffer(str1))) {
@@ -87,7 +87,7 @@
  				ast_str_encode_mime(&str2, 0, ast_str_buffer(str1), strlen("From: "), strlen(who) + 3);
  				while ((ptr = strchr(ast_str_buffer(str2), ' '))) {
  					*ptr = '\0';
-@@ -4625,20 +4637,25 @@
+@@ -4646,20 +4658,25 @@
  		fprintf(p, "From: Asterisk PBX <%s>" ENDL, who);
  	}
  
@@ -126,7 +126,7 @@
  	}
  
  	if (!ast_strlen_zero(emailsubject) || !ast_strlen_zero(vmu->emailsubject)) {
-@@ -4648,7 +4665,7 @@
+@@ -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))) {
@@ -135,7 +135,7 @@
  				char *ptr;
  				ast_str_encode_mime(&str2, 0, ast_str_buffer(str1), strlen("Subject: "), 0);
  				while ((ptr = strchr(ast_str_buffer(str2), ' '))) {
-@@ -10825,7 +10842,7 @@
+@@ -10841,7 +10858,7 @@
  		ast_copy_string(vmu->fullname, s, sizeof(vmu->fullname));
  	}
  	if (stringp && (s = strsep(&stringp, ","))) {
@@ -144,7 +144,7 @@
  	}
  	if (stringp && (s = strsep(&stringp, ","))) {
  		ast_copy_string(vmu->pager, s, sizeof(vmu->pager));
-@@ -12985,7 +13002,7 @@
+@@ -13001,7 +13018,7 @@
  	}
  
  	populate_defaults(vmu);

Modified: branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch	2014-11-10 15:37:36 UTC (rev 6813)
+++ branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch	2014-11-10 19:02:25 UTC (rev 6814)
@@ -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
-@@ -2382,11 +2382,13 @@
+@@ -2406,11 +2406,13 @@
  AC_OUTPUT
  
  ${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.acbak2

Deleted: branches/1.0/package/asterisk/asterisk-11-srtp-crypto_kernel-include.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11-srtp-crypto_kernel-include.patch	2014-11-10 15:37:36 UTC (rev 6813)
+++ branches/1.0/package/asterisk/asterisk-11-srtp-crypto_kernel-include.patch	2014-11-10 19:02:25 UTC (rev 6814)
@@ -1,9 +0,0 @@
---- asterisk-11.13.0/res/res_srtp.c.orig	2014-10-13 22:34:16.000000000 -0500
-+++ asterisk-11.13.0/res/res_srtp.c	2014-10-13 22:37:49.000000000 -0500
-@@ -41,5 +41,6 @@
- 
- #include <srtp/srtp.h>
-+#include <srtp/crypto_kernel.h>
- 
- #include "asterisk/lock.h"
- #include "asterisk/sched.h"

Modified: branches/1.0/package/asterisk/asterisk-11-voicemail-multiple-recipients.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11-voicemail-multiple-recipients.patch	2014-11-10 15:37:36 UTC (rev 6813)
+++ branches/1.0/package/asterisk/asterisk-11-voicemail-multiple-recipients.patch	2014-11-10 19:02:25 UTC (rev 6814)
@@ -9,7 +9,7 @@
  	char *emailsubject;              /*!< E-mail subject */
  	char *emailbody;                 /*!< E-mail body */
  	char pager[80];                  /*!< E-mail address to pager (no attachment) */
-@@ -1188,6 +1188,8 @@
+@@ -1189,6 +1189,8 @@
  		vmu->maxdeletedmsg = maxdeletedmsg;
  	}
  	vmu->volgain = volgain;
@@ -18,7 +18,7 @@
  	ast_free(vmu->emailsubject);
  	vmu->emailsubject = NULL;
  	ast_free(vmu->emailbody);
-@@ -1499,7 +1501,8 @@
+@@ -1500,7 +1502,8 @@
  		} else if (!strcasecmp(var->name, "pager")) {
  			ast_copy_string(retval->pager, var->value, sizeof(retval->pager));
  		} else if (!strcasecmp(var->name, "email")) {
@@ -28,7 +28,7 @@
  		} else if (!strcasecmp(var->name, "fullname")) {
  			ast_copy_string(retval->fullname, var->value, sizeof(retval->fullname));
  		} else if (!strcasecmp(var->name, "context")) {
-@@ -1636,6 +1639,7 @@
+@@ -1637,6 +1640,7 @@
  		if ((vmu = (ivm ? ivm : ast_malloc(sizeof(*vmu))))) {
  			*vmu = *cur;
  			if (!ivm) {
@@ -36,7 +36,7 @@
  				vmu->emailbody = ast_strdup(cur->emailbody);
  				vmu->emailsubject = ast_strdup(cur->emailsubject);
  			}
-@@ -1918,6 +1922,9 @@
+@@ -1919,6 +1923,9 @@
  {
  	if (ast_test_flag(vmu, VM_ALLOCED)) {
  
@@ -46,7 +46,7 @@
  		ast_free(vmu->emailbody);
  		vmu->emailbody = NULL;
  
-@@ -2538,7 +2545,7 @@
+@@ -2540,7 +2547,7 @@
  		 * of this function, we will revert back to an empty string if tempcopy
  		 * is 1.
  		 */
@@ -55,7 +55,7 @@
  		tempcopy = 1;
  	}
  
-@@ -2550,8 +2557,10 @@
+@@ -2552,8 +2559,10 @@
  	   command hangs. */
  	if (!(p = vm_mkftemp(tmp))) {
  		ast_log(AST_LOG_WARNING, "Unable to store '%s' (can't create temporary file)\n", fn);
@@ -68,7 +68,7 @@
  		return -1;
  	}
  
-@@ -4873,6 +4882,9 @@
+@@ -4894,6 +4903,9 @@
  	struct ast_str *str1 = ast_str_create(16), *str2 = ast_str_create(16);
  	char *greeting_attachment; 
  	char filename[256];
@@ -78,7 +78,7 @@
  
  	if (!str1 || !str2) {
  		ast_free(str1);
-@@ -4914,7 +4926,7 @@
+@@ -4935,7 +4947,7 @@
  			ast_str_substitute_variables(&str1, 0, ast, fromstring);
  
  			if (check_mime(ast_str_buffer(str1))) {
@@ -87,7 +87,7 @@
  				ast_str_encode_mime(&str2, 0, ast_str_buffer(str1), strlen("From: "), strlen(who) + 3);
  				while ((ptr = strchr(ast_str_buffer(str2), ' '))) {
  					*ptr = '\0';
-@@ -4935,20 +4947,25 @@
+@@ -4956,20 +4968,25 @@
  		fprintf(p, "From: Asterisk PBX <%s>" ENDL, who);
  	}
  
@@ -126,7 +126,7 @@
  	}
  
  	if (!ast_strlen_zero(emailsubject) || !ast_strlen_zero(vmu->emailsubject)) {
-@@ -4958,7 +4975,7 @@
+@@ -4979,7 +4996,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))) {
@@ -135,7 +135,7 @@
  				char *ptr;
  				ast_str_encode_mime(&str2, 0, ast_str_buffer(str1), strlen("Subject: "), 0);
  				while ((ptr = strchr(ast_str_buffer(str2), ' '))) {
-@@ -11713,7 +11730,7 @@
+@@ -11730,7 +11747,7 @@
  		ast_copy_string(vmu->fullname, s, sizeof(vmu->fullname));
  	}
  	if (stringp && (s = strsep(&stringp, ","))) {
@@ -144,7 +144,7 @@
  	}
  	if (stringp && (s = strsep(&stringp, ","))) {
  		ast_copy_string(vmu->pager, s, sizeof(vmu->pager));
-@@ -13982,7 +13999,7 @@
+@@ -13999,7 +14016,7 @@
  	}
  
  	populate_defaults(vmu);

Modified: branches/1.0/package/asterisk/asterisk.mk
===================================================================
--- branches/1.0/package/asterisk/asterisk.mk	2014-11-10 15:37:36 UTC (rev 6813)
+++ branches/1.0/package/asterisk/asterisk.mk	2014-11-10 19:02:25 UTC (rev 6814)
@@ -4,9 +4,9 @@
 #
 ##############################################################
 ifeq ($(BR2_PACKAGE_ASTERISK_v1_8),y)
-ASTERISK_VERSION := 1.8.31.1
+ASTERISK_VERSION := 1.8.32.0
 else
-ASTERISK_VERSION := 11.13.1
+ASTERISK_VERSION := 11.14.0
 endif
 ASTERISK_SOURCE := asterisk-$(ASTERISK_VERSION).tar.gz
 ASTERISK_SITE := http://downloads.asterisk.org/pub/telephony/asterisk/releases

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

[Astlinux-commits] SF.net SVN: astlinux:[6901] branches/1.0/package/asterisk

From: <abe...@us...> - 2015-01-04 02:06:47

Revision: 6901
          http://sourceforge.net/p/astlinux/code/6901
Author:   abelbeck
Date:     2015-01-04 02:06:37 +0000 (Sun, 04 Jan 2015)
Log Message:
-----------
asterisk, make /mnt/kd/custom-sounds a symlink at runtime so /var/lib/asterisk/sounds/custom-sounds is always a valid symlink or directory on tmpfs, this is more consistent and keep Asterisk 13 from complaining

Modified Paths:
--------------
    branches/1.0/package/asterisk/asterisk.init
    branches/1.0/package/asterisk/asterisk.mk

Modified: branches/1.0/package/asterisk/asterisk.init
===================================================================
--- branches/1.0/package/asterisk/asterisk.init	2015-01-04 01:09:07 UTC (rev 6900)
+++ branches/1.0/package/asterisk/asterisk.init	2015-01-04 02:06:37 UTC (rev 6901)
@@ -27,6 +27,8 @@
 
   mkdir -p /var/run/asterisk
 
+  mkdir -p /var/tmp/asterisk/sounds
+
   if [ ! -d /var/log/asterisk ]; then
     mkdir /var/log/asterisk
   fi
@@ -67,6 +69,8 @@
     cp -a /stat/etc/asterisk/* /tmp/etc/asterisk/
   fi
 
+  make_symlink_or_dir "/mnt/kd/custom-sounds" "/var/tmp/asterisk/sounds/custom-sounds"
+
   if [ -f /mnt/kd/astdb -o -f /mnt/kd/astdb.sqlite3 ]; then
     ln -sf /mnt/kd/astdb /var/db/astdb
 

Modified: branches/1.0/package/asterisk/asterisk.mk
===================================================================
--- branches/1.0/package/asterisk/asterisk.mk	2015-01-04 01:09:07 UTC (rev 6900)
+++ branches/1.0/package/asterisk/asterisk.mk	2015-01-04 02:06:37 UTC (rev 6901)
@@ -328,7 +328,7 @@
 	chmod -R 750 $(TARGET_DIR)/stat/etc/asterisk
 	rm -rf $(TARGET_DIR)/etc/asterisk
 	ln -sf /tmp/etc/asterisk $(TARGET_DIR)/etc/asterisk
-	ln -sf /mnt/kd/custom-sounds $(TARGET_DIR)/stat/var/lib/asterisk/sounds/custom-sounds
+	ln -sf /var/tmp/asterisk/sounds/custom-sounds $(TARGET_DIR)/stat/var/lib/asterisk/sounds/custom-sounds
 
 	if [ -d $(TARGET_DIR)/usr/share/snmp/mibs ]; then \
 	  $(INSTALL) -D -m 0644 package/asterisk/mibs/ASTERISK-MIB.txt $(TARGET_DIR)/usr/share/snmp/mibs/ ; \

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

[Astlinux-commits] SF.net SVN: astlinux:[6909] branches/1.0/package/asterisk

From: <abe...@us...> - 2015-01-05 22:15:50

Revision: 6909
          http://sourceforge.net/p/astlinux/code/6909
Author:   abelbeck
Date:     2015-01-05 22:15:42 +0000 (Mon, 05 Jan 2015)
Log Message:
-----------
asterisk, rework asterisk-13-anonymous-semaphores.patch

Modified Paths:
--------------
    branches/1.0/package/asterisk/asterisk-13-anonymous-semaphores.patch
    branches/1.0/package/asterisk/asterisk-13-configure-menuselect-cross-fix.patch

Modified: branches/1.0/package/asterisk/asterisk-13-anonymous-semaphores.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-13-anonymous-semaphores.patch	2015-01-05 15:32:40 UTC (rev 6908)
+++ branches/1.0/package/asterisk/asterisk-13-anonymous-semaphores.patch	2015-01-05 22:15:42 UTC (rev 6909)
@@ -1,18 +1,14 @@
---- asterisk-13.1.0/configure.ac.orig	2015-01-02 12:41:14.000000000 -0600
-+++ asterisk-13.1.0/configure.ac	2015-01-02 12:43:39.000000000 -0600
-@@ -877,14 +877,7 @@
+--- asterisk-13.1.0/configure.ac.orig	2015-01-05 15:32:02.000000000 -0600
++++ asterisk-13.1.0/configure.ac	2015-01-05 15:41:42.000000000 -0600
+@@ -883,7 +883,10 @@
+ 		[sem_t sem; return sem_init(&sem, 0, 0);])],
+ 	AC_MSG_RESULT(yes)
+ 	AC_DEFINE([HAS_WORKING_SEMAPHORE], 1, [Define to 1 if anonymous semaphores work.]),
+-	AC_MSG_RESULT(no)
++	AC_MSG_RESULT(no),
++	AC_MSG_RESULT(cross-compile)
++	AC_MSG_NOTICE([WARNING: result yes guessed because of cross compilation])
++	AC_DEFINE([HAS_WORKING_SEMAPHORE], 1, [Define to 1 if anonymous semaphores work.])
  )
  
- # Some platforms define sem_init(), but only support sem_open(). joyous.
--AC_MSG_CHECKING(for working unnamed semaphores)
--AC_RUN_IFELSE(
--	[AC_LANG_PROGRAM([#include <semaphore.h>],
--		[sem_t sem; return sem_init(&sem, 0, 0);])],
--	AC_MSG_RESULT(yes)
--	AC_DEFINE([HAS_WORKING_SEMAPHORE], 1, [Define to 1 if anonymous semaphores work.]),
--	AC_MSG_RESULT(no)
--)
-+AC_DEFINE([HAS_WORKING_SEMAPHORE], 1, [Define to 1 if anonymous semaphores work.])
- 
  LIBS="$save_LIBS"
- CFLAGS="$save_CFLAGS"

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-01-05 15:32:40 UTC (rev 6908)
+++ branches/1.0/package/asterisk/asterisk-13-configure-menuselect-cross-fix.patch	2015-01-05 22:15:42 UTC (rev 6909)
@@ -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
-@@ -2487,11 +2487,13 @@
+@@ -2497,11 +2497,13 @@
  AC_OUTPUT
  
  ${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.acbak2

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

1 2 > >> (Page 1 of 2)