summaryrefslogtreecommitdiff
path: root/net/asterisk11/files
diff options
context:
space:
mode:
Diffstat (limited to 'net/asterisk11/files')
-rw-r--r--net/asterisk11/files/patch-Makefile14
-rw-r--r--net/asterisk11/files/patch-agi__Makefile6
-rw-r--r--net/asterisk11/files/patch-channels-chan_dahdi.c10
-rw-r--r--net/asterisk11/files/patch-channels__Makefile8
-rw-r--r--net/asterisk11/files/patch-channels__sip__include__sip.h6
-rw-r--r--net/asterisk11/files/patch-channels_h323_Makefile.in6
-rw-r--r--net/asterisk11/files/patch-configure20
-rw-r--r--net/asterisk11/files/patch-include-asterisk-astobj2.h6
-rw-r--r--net/asterisk11/files/patch-include-asterisk-config.h6
-rw-r--r--net/asterisk11/files/patch-main__asterisk.exports.in4
-rw-r--r--net/asterisk11/files/patch-main__http.c6
-rw-r--r--net/asterisk11/files/patch-main__utils.c6
12 files changed, 49 insertions, 49 deletions
diff --git a/net/asterisk11/files/patch-Makefile b/net/asterisk11/files/patch-Makefile
index 5f7da666be09..fcf836a2a627 100644
--- a/net/asterisk11/files/patch-Makefile
+++ b/net/asterisk11/files/patch-Makefile
@@ -1,4 +1,4 @@
---- Makefile.orig 2014-10-31 16:40:55 UTC
+--- Makefile.orig 2015-07-24 22:06:05 UTC
+++ Makefile
@@ -126,7 +126,7 @@ ASTTOPDIR:=$(subst $(space),\$(space),$(
OVERWRITE=y
@@ -9,7 +9,7 @@
# Asterisk.conf is located in ASTETCDIR or by using the -C flag
# when starting Asterisk
-@@ -202,7 +202,7 @@ endif
+@@ -209,7 +209,7 @@ endif
ifeq ($(OSARCH),FreeBSD)
# -V is understood by BSD Make, not by GNU make.
@@ -18,7 +18,7 @@
_ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
# flag to tell 'ldconfig' to only process specified directories
LDCONFIG_FLAGS=-m
-@@ -456,8 +456,12 @@ datafiles: _all doc/core-en_US.xml
+@@ -466,8 +466,12 @@ datafiles: _all doc/core-en_US.xml
$(INSTALL) -m 644 $$n "$(DESTDIR)$(ASTDATADIR)/static-http/docs" ; \
done \
fi
@@ -32,7 +32,7 @@
done
$(MAKE) -C sounds install
-@@ -537,7 +541,7 @@ INSTALLDIRS="$(ASTLIBDIR)" "$(ASTMODDIR)
+@@ -547,7 +551,7 @@ INSTALLDIRS="$(ASTLIBDIR)" "$(ASTMODDIR)
"$(ASTDATADIR)/documentation/thirdparty" "$(ASTDATADIR)/firmware" \
"$(ASTDATADIR)/firmware/iax" "$(ASTDATADIR)/images" "$(ASTDATADIR)/keys" \
"$(ASTDATADIR)/phoneprov" "$(ASTDATADIR)/static-http" "$(ASTDATADIR)/sounds" \
@@ -41,7 +41,7 @@
installdirs:
@for i in $(INSTALLDIRS); do \
-@@ -606,7 +610,7 @@ ifneq ($(filter ~%,$(DESTDIR)),)
+@@ -616,7 +620,7 @@ ifneq ($(filter ~%,$(DESTDIR)),)
@exit 1
endif
@@ -50,7 +50,7 @@
@if [ -x /usr/sbin/asterisk-post-install ]; then \
/usr/sbin/asterisk-post-install "$(DESTDIR)" . ; \
fi
-@@ -615,21 +619,7 @@ install: badshell bininstall datafiles
+@@ -625,21 +629,7 @@ install: badshell bininstall datafiles
@echo " + YOU MUST READ THE SECURITY DOCUMENT +"
@echo " + +"
@echo " + Asterisk has successfully been installed. +"
@@ -72,7 +72,7 @@
@echo " +-------------------------------------------+"
@$(MAKE) -s oldmodcheck
-@@ -648,45 +638,30 @@ adsi:
+@@ -658,45 +648,30 @@ adsi:
else \
echo "Installing $$x" ; \
fi ; \
diff --git a/net/asterisk11/files/patch-agi__Makefile b/net/asterisk11/files/patch-agi__Makefile
index 277e18e70b08..8137c4f54741 100644
--- a/net/asterisk11/files/patch-agi__Makefile
+++ b/net/asterisk11/files/patch-agi__Makefile
@@ -1,6 +1,6 @@
---- ./agi/Makefile.orig 2010-07-23 15:26:41.000000000 +0200
-+++ ./agi/Makefile 2010-11-06 14:54:36.000000000 +0100
-@@ -16,7 +16,9 @@
+--- agi/Makefile.orig 2015-07-24 22:06:05 UTC
++++ agi/Makefile
+@@ -16,7 +16,9 @@ ASTTOPDIR?=..
.PHONY: clean all uninstall
diff --git a/net/asterisk11/files/patch-channels-chan_dahdi.c b/net/asterisk11/files/patch-channels-chan_dahdi.c
index ef904b48472e..1aa9540d67f2 100644
--- a/net/asterisk11/files/patch-channels-chan_dahdi.c
+++ b/net/asterisk11/files/patch-channels-chan_dahdi.c
@@ -1,6 +1,6 @@
---- channels/chan_dahdi.c.orig 2010-11-09 11:18:39.000000000 +0100
-+++ channels/chan_dahdi.c 2010-11-09 11:22:15.000000000 +0100
-@@ -4688,6 +4688,8 @@
+--- channels/chan_dahdi.c.orig 2015-07-24 22:06:05 UTC
++++ channels/chan_dahdi.c
+@@ -5030,6 +5030,8 @@ static void dahdi_enable_ec(struct dahdi
return;
}
if (p->echocancel.head.tap_length) {
@@ -9,7 +9,7 @@
#if defined(HAVE_PRI) || defined(HAVE_SS7)
switch (p->sig) {
#if defined(HAVE_PRI)
-@@ -4718,7 +4720,9 @@
+@@ -5060,7 +5062,9 @@ static void dahdi_enable_ec(struct dahdi
break;
}
#endif /* defined(HAVE_PRI) || defined(HAVE_SS7) */
@@ -20,7 +20,7 @@
if (res) {
ast_log(LOG_WARNING, "Unable to enable echo cancellation on channel %d (%s)\n", p->channel, strerror(errno));
} else {
-@@ -4752,8 +4756,9 @@
+@@ -5094,8 +5098,9 @@ static void dahdi_disable_ec(struct dahd
if (p->echocanon) {
struct dahdi_echocanparams ecp = { .tap_length = 0 };
diff --git a/net/asterisk11/files/patch-channels__Makefile b/net/asterisk11/files/patch-channels__Makefile
index 323c78d86f9a..200a97166e86 100644
--- a/net/asterisk11/files/patch-channels__Makefile
+++ b/net/asterisk11/files/patch-channels__Makefile
@@ -1,6 +1,6 @@
---- ./channels/Makefile.orig 2010-06-07 22:04:42.000000000 +0200
-+++ ./channels/Makefile 2010-11-06 14:54:36.000000000 +0100
-@@ -27,9 +27,10 @@
+--- channels/Makefile.orig 2015-07-24 22:06:05 UTC
++++ channels/Makefile
+@@ -27,9 +27,10 @@ ifeq ($(OSARCH),linux-gnu)
endif
ifeq ($(OSARCH),FreeBSD)
@@ -13,7 +13,7 @@
endif
ifeq ($(OSARCH),NetBSD)
-@@ -86,9 +87,13 @@
+@@ -86,9 +87,13 @@ chan_h323.so: chan_h323.o h323/libchanh3
else
chan_h323.so: chan_h323.o h323/libchanh323.a
$(ECHO_PREFIX) echo " [LD] $^ -> $@"
diff --git a/net/asterisk11/files/patch-channels__sip__include__sip.h b/net/asterisk11/files/patch-channels__sip__include__sip.h
index f19fbf763646..0158fd5f0a5e 100644
--- a/net/asterisk11/files/patch-channels__sip__include__sip.h
+++ b/net/asterisk11/files/patch-channels__sip__include__sip.h
@@ -1,6 +1,6 @@
---- ./channels/sip/include/sip.h.orig 2010-11-08 04:46:46.000000000 +0100
-+++ ./channels/sip/include/sip.h 2010-11-08 04:47:07.000000000 +0100
-@@ -180,7 +180,7 @@
+--- channels/sip/include/sip.h.orig 2015-07-24 22:06:05 UTC
++++ channels/sip/include/sip.h
+@@ -190,7 +190,7 @@
#define DEFAULT_MOHINTERPRET "default" /*!< The default music class */
#define DEFAULT_MOHSUGGEST ""
#define DEFAULT_VMEXTEN "asterisk" /*!< Default voicemail extension */
diff --git a/net/asterisk11/files/patch-channels_h323_Makefile.in b/net/asterisk11/files/patch-channels_h323_Makefile.in
index d5d5c99300c1..1c8a5fae138e 100644
--- a/net/asterisk11/files/patch-channels_h323_Makefile.in
+++ b/net/asterisk11/files/patch-channels_h323_Makefile.in
@@ -1,6 +1,6 @@
---- ./channels/h323/Makefile.in.orig 2010-06-03 16:48:09.000000000 +0200
-+++ ./channels/h323/Makefile.in 2010-11-06 14:54:36.000000000 +0100
-@@ -13,7 +13,7 @@
+--- channels/h323/Makefile.in.orig 2015-07-24 22:06:05 UTC
++++ channels/h323/Makefile.in
+@@ -13,7 +13,7 @@ STDCCFLAGS = -DNDEBUG
STDCCFLAGS += -I../../include -include ../../include/asterisk/autoconfig.h
STDCCFLAGS += -fPIC
#OPTCCFLAGS +=
diff --git a/net/asterisk11/files/patch-configure b/net/asterisk11/files/patch-configure
index 1be4c2908f13..488b0015a3a1 100644
--- a/net/asterisk11/files/patch-configure
+++ b/net/asterisk11/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig 2014-06-21 01:14:52.000000000 +0200
-+++ configure 2014-07-29 23:59:12.060900744 +0200
-@@ -4616,9 +4616,9 @@
+--- configure.orig 2015-07-24 22:06:05 UTC
++++ configure
+@@ -4619,9 +4619,9 @@ astheaderdir='${includedir}/asterisk'
astlibdir='${libdir}'
astmoddir='${libdir}/asterisk/modules'
astmandir='${mandir}'
@@ -12,7 +12,7 @@
astkeydir='${astvarlibdir}'
astspooldir='${localstatedir}/spool/asterisk'
astlogdir='${localstatedir}/log/asterisk'
-@@ -4641,8 +4641,6 @@
+@@ -4644,8 +4644,6 @@ esac
case "${host_os}" in
freebsd*)
ac_default_prefix=/usr/local
@@ -21,7 +21,7 @@
;;
openbsd*)
ac_default_prefix=/usr/local
-@@ -18084,6 +18082,8 @@
+@@ -18202,6 +18200,8 @@ $as_echo_n "checking if \"struct ifaddrs
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -30,7 +30,7 @@
#include <ifaddrs.h>
int
main ()
-@@ -26385,7 +26385,7 @@
+@@ -26503,7 +26503,7 @@ $as_echo "${OPENH323_BUILD}" >&6; }
fi
@@ -39,7 +39,7 @@
if test "${HAS_OPENH323:-unset}" != "unset"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking OpenH323 installation validity" >&5
-@@ -26483,13 +26483,13 @@
+@@ -26601,13 +26601,13 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
as_ac_Lib=`$as_echo "ac_cv_lib_lua5.2_${pbxfuncname}" | $as_tr_sh`
@@ -56,7 +56,7 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -26531,18 +26531,18 @@
+@@ -26649,18 +26649,18 @@ fi
# now check for the header.
if test "${AST_LUA_FOUND}" = "yes"; then
@@ -78,7 +78,7 @@
if test "x$ac_cv_header_lua5_2_lua_h" = xyes; then :
LUA_HEADER_FOUND=1
else
-@@ -26595,13 +26595,13 @@
+@@ -26713,13 +26713,13 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
as_ac_Lib=`$as_echo "ac_cv_lib_lua5.1_${pbxfuncname}" | $as_tr_sh`
@@ -95,7 +95,7 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -26643,18 +26643,18 @@
+@@ -26761,18 +26761,18 @@ fi
# now check for the header.
if test "${AST_LUA_FOUND}" = "yes"; then
diff --git a/net/asterisk11/files/patch-include-asterisk-astobj2.h b/net/asterisk11/files/patch-include-asterisk-astobj2.h
index 3fda6433d941..4c1628eaf643 100644
--- a/net/asterisk11/files/patch-include-asterisk-astobj2.h
+++ b/net/asterisk11/files/patch-include-asterisk-astobj2.h
@@ -1,6 +1,6 @@
---- include/asterisk/astobj2.h.orig 2013-07-02 12:30:02.000000000 +0200
-+++ include/asterisk/astobj2.h 2013-07-02 12:31:39.000000000 +0200
-@@ -1472,5 +1472,7 @@
+--- include/asterisk/astobj2.h.orig 2015-07-24 22:06:05 UTC
++++ include/asterisk/astobj2.h
+@@ -1520,5 +1520,7 @@ void __ao2_cleanup_debug(void *obj, cons
#else
#define ao2_cleanup(obj) __ao2_cleanup(obj)
#endif
diff --git a/net/asterisk11/files/patch-include-asterisk-config.h b/net/asterisk11/files/patch-include-asterisk-config.h
index 0829eb6fd0f0..cff3d02e1711 100644
--- a/net/asterisk11/files/patch-include-asterisk-config.h
+++ b/net/asterisk11/files/patch-include-asterisk-config.h
@@ -1,6 +1,6 @@
---- include/asterisk/config.h.orig 2013-07-02 12:26:35.000000000 +0200
-+++ include/asterisk/config.h 2013-07-02 12:29:07.000000000 +0200
-@@ -481,6 +481,8 @@
+--- include/asterisk/config.h.orig 2015-07-24 22:06:05 UTC
++++ include/asterisk/config.h
+@@ -491,6 +491,8 @@ struct ast_variable *ast_variables_rever
* This function frees a list of variables.
*/
void ast_variables_destroy(struct ast_variable *var);
diff --git a/net/asterisk11/files/patch-main__asterisk.exports.in b/net/asterisk11/files/patch-main__asterisk.exports.in
index 185c0c8f1e6c..0d112c2f6d08 100644
--- a/net/asterisk11/files/patch-main__asterisk.exports.in
+++ b/net/asterisk11/files/patch-main__asterisk.exports.in
@@ -1,5 +1,5 @@
---- main/asterisk.exports.in.orig 2013-08-22 10:22:39.000000000 +0200
-+++ main/asterisk.exports.in 2013-10-27 13:38:56.825678450 +0100
+--- main/asterisk.exports.in.orig 2015-07-24 22:06:05 UTC
++++ main/asterisk.exports.in
@@ -65,6 +65,8 @@
*/
diff --git a/net/asterisk11/files/patch-main__http.c b/net/asterisk11/files/patch-main__http.c
index f82a52bb8470..df838e5b74e6 100644
--- a/net/asterisk11/files/patch-main__http.c
+++ b/net/asterisk11/files/patch-main__http.c
@@ -1,6 +1,6 @@
---- main/http.c.orig 2013-12-17 23:42:58.982720307 +0100
-+++ main/http.c 2013-12-17 23:43:16.054863909 +0100
-@@ -1024,7 +1024,7 @@
+--- main/http.c.orig 2015-07-24 22:06:05 UTC
++++ main/http.c
+@@ -1072,7 +1072,7 @@ static int __ast_http_load(int reload)
struct http_uri_redirect *redirect;
struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 };
uint32_t bindport = DEFAULT_PORT;
diff --git a/net/asterisk11/files/patch-main__utils.c b/net/asterisk11/files/patch-main__utils.c
index 8b6e268d1cb9..26f6ed6cce39 100644
--- a/net/asterisk11/files/patch-main__utils.c
+++ b/net/asterisk11/files/patch-main__utils.c
@@ -1,6 +1,6 @@
---- ./main/utils.c.orig 2010-08-06 20:57:10.000000000 +0200
-+++ ./main/utils.c 2010-11-06 14:54:37.000000000 +0100
-@@ -990,8 +990,8 @@
+--- main/utils.c.orig 2015-07-24 22:06:05 UTC
++++ main/utils.c
+@@ -1242,8 +1242,8 @@ int ast_pthread_create_stack(pthread_t *
pthread_attr_init(attr);
}