Menu
▾
▴
[Astlinux-commits] SF.net SVN: astlinux:[7676] branches/1.0/package
|
From: <abe...@us...> - 2016-05-13 20:31:55
|
Revision: 7676
http://sourceforge.net/p/astlinux/code/7676
Author: abelbeck
Date: 2016-05-13 20:31:53 +0000 (Fri, 13 May 2016)
Log Message:
-----------
asterisk, version bump to 13.9.1
Modified Paths:
--------------
branches/1.0/package/asterisk/asterisk-13-configure-menuselect-cross-fix.patch
branches/1.0/package/asterisk/asterisk.mk
branches/1.0/package/pjsip/asterisk-config_site.h
Removed Paths:
-------------
branches/1.0/package/asterisk/asterisk-13-app_queue-segfault-fix.patch
branches/1.0/package/asterisk/asterisk-13-main-Makefile-fix.patch
Deleted: branches/1.0/package/asterisk/asterisk-13-app_queue-segfault-fix.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-13-app_queue-segfault-fix.patch 2016-05-13 16:55:12 UTC (rev 7675)
+++ branches/1.0/package/asterisk/asterisk-13-app_queue-segfault-fix.patch 2016-05-13 20:31:53 UTC (rev 7676)
@@ -1,15 +0,0 @@
-X-Git-Url: http://git.asterisk.org/gitweb/?p=asterisk%2Fasterisk.git;a=blobdiff_plain;f=apps%2Fapp_queue.c;h=34fdfe7a3ea3296c27dfa814b368ef46d8b7dd4f;hp=939a0e2ad99e415037334bd7e0b377e377ef85e8;hb=3b9d8b60b211377f2023ebfbfdd157cfb668de6e;hpb=56c8182913b4df446e39ac76283dc7be355210f4
-
-diff --git a/apps/app_queue.c b/apps/app_queue.c
-index 939a0e2..34fdfe7 100644
---- a/apps/app_queue.c
-+++ b/apps/app_queue.c
-@@ -4164,7 +4164,7 @@ static int can_ring_entry(struct queue_ent *qe, struct callattempt *call)
- return 0;
- }
-
-- if (call->member->in_call && call->lastqueue->wrapuptime) {
-+ if (call->member->in_call && call->lastqueue && call->lastqueue->wrapuptime) {
- ast_debug(1, "%s is in call, so not available (wrapuptime %d)\n",
- call->interface, call->lastqueue->wrapuptime);
- return 0;
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 2016-05-13 16:55:12 UTC (rev 7675)
+++ branches/1.0/package/asterisk/asterisk-13-configure-menuselect-cross-fix.patch 2016-05-13 20:31:53 UTC (rev 7676)
@@ -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
-@@ -2631,11 +2631,13 @@
+@@ -2630,11 +2630,13 @@
AC_OUTPUT
${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.acbak2
Deleted: branches/1.0/package/asterisk/asterisk-13-main-Makefile-fix.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-13-main-Makefile-fix.patch 2016-05-13 16:55:12 UTC (rev 7675)
+++ branches/1.0/package/asterisk/asterisk-13-main-Makefile-fix.patch 2016-05-13 20:31:53 UTC (rev 7676)
@@ -1,61 +0,0 @@
-From: George Joseph <geo...@fa...>
-Date: Wed, 30 Mar 2016 23:34:42 +0000 (-0600)
-Subject: pjproject_bundled: Fix use of LDCONFIG for shared library link creation
-X-Git-Url: http://git.asterisk.org/gitweb/?p=asterisk%2Fasterisk.git;a=commitdiff_plain;h=304f81780dcb9702d46164d194b9fdd808c4b99f
-
-pjproject_bundled: Fix use of LDCONFIG for shared library link creation
-
-LDCONFIG apparently isn't set to something sane on all systems so the creation
-of the shared library links fails. Instead of just testing for non-blank,
-main/Makefile now checks that LDCONFIG is actually executable and reverts to
-LN if it isn't.
-
-This applies to both libasteriskpj and libasteriskssl.
-
-Thanks to 'abelbeck' for pointing out that the issue was LDCONFIG.
-
-ASTERISK-25873 #close
-Reported-by: Hans van Eijsden
-
-Change-Id: I25b76379bc637726ec044b2c0e709b56b3701729
----
-
-diff --git a/main/Makefile b/main/Makefile
-index 50fdc57..d52c3f0 100644
---- a/main/Makefile
-+++ b/main/Makefile
-@@ -224,11 +224,11 @@ endif
-
- $(ASTSSL_LIB): $(ASTSSL_LIB).$(ASTSSL_SO_VERSION)
- $(ECHO_PREFIX) echo " [LN] $< -> $@"
--ifneq ($(LDCONFIG),)
-- $(CMD_PREFIX) $(LDCONFIG) $(LDCONFIG_FLAGS) . 2>/dev/null
--else
-- $(CMD_PREFIX) $(LN) -sf $< $@
--endif
-+ $(CMD_PREFIX) if [ -x "$(LDCONFIG)" ] ; then \
-+ $(LDCONFIG) $(LDCONFIG_FLAGS) . 2>/dev/null ;\
-+ else \
-+ $(LN) -sf $< $@ ;\
-+ fi
-
- else # Darwin
- ASTSSL_LIB:=libasteriskssl.dylib
-@@ -304,11 +304,11 @@ $(ASTPJ_LIB).$(ASTPJ_SO_VERSION): libasteriskpj.o libasteriskpj.exports
-
- $(ASTPJ_LIB): $(ASTPJ_LIB).$(ASTPJ_SO_VERSION)
- $(ECHO_PREFIX) echo " [LN] $< -> $@"
--ifneq ($(LDCONFIG),)
-- $(CMD_PREFIX) $(LDCONFIG) $(LDCONFIG_FLAGS) . 2>/dev/null
--else
-- $(CMD_PREFIX) $(LN) -sf $< $@
--endif
-+ $(CMD_PREFIX) if [ -x "$(LDCONFIG)" ] ; then \
-+ $(LDCONFIG) $(LDCONFIG_FLAGS) . 2>/dev/null ;\
-+ else \
-+ $(LN) -sf $< $@ ;\
-+ fi
-
- else # Darwin
- ASTPJ_LIB:=libasteriskpj.dylib
-
Modified: branches/1.0/package/asterisk/asterisk.mk
===================================================================
--- branches/1.0/package/asterisk/asterisk.mk 2016-05-13 16:55:12 UTC (rev 7675)
+++ branches/1.0/package/asterisk/asterisk.mk 2016-05-13 20:31:53 UTC (rev 7676)
@@ -9,7 +9,7 @@
ifeq ($(BR2_PACKAGE_ASTERISK_v11),y)
ASTERISK_VERSION := 11.22.0
else
-ASTERISK_VERSION := 13.8.2
+ASTERISK_VERSION := 13.9.1
endif
endif
ASTERISK_SOURCE := asterisk-$(ASTERISK_VERSION).tar.gz
Modified: branches/1.0/package/pjsip/asterisk-config_site.h
===================================================================
--- branches/1.0/package/pjsip/asterisk-config_site.h 2016-05-13 16:55:12 UTC (rev 7675)
+++ branches/1.0/package/pjsip/asterisk-config_site.h 2016-05-13 20:31:53 UTC (rev 7676)
@@ -1,7 +1,5 @@
-/* Custom config for Asterisk
- *
- * https://wiki.asterisk.org/wiki/display/AST/Building+and+Installing+pjproject
- *
+/*
+ * Asterisk config_site.h
*/
#include <sys/select.h>
@@ -30,9 +28,12 @@
#define PJSIP_SAFE_MODULE 0
#define PJ_HAS_STRICMP_ALNUM 0
#define PJ_HASH_USE_OWN_TOLOWER 1
-#define PJSIP_UNESCAPE_IN_PLACE 1
+/*
+ It is imperative that PJSIP_UNESCAPE_IN_PLACE remain 0 or undefined.
+ Enabling it will result in SEGFAULTS when URIs containing escape sequences are encountered.
+*/
+#undef PJSIP_UNESCAPE_IN_PLACE
#define PJSIP_MAX_PKT_LEN 6000
#undef PJ_TODO
#define PJ_TODO(x)
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
