[Pkg-voip-commits] [asterisk] 01/01: start working on asterisk 11.8.0
Jeremy Lainé
sharky at moszumanska.debian.org
Tue Mar 4 10:03:40 UTC 2014
This is an automated email from the git hooks/post-receive script.
sharky pushed a commit to branch master
in repository asterisk.
commit 8d78356fa7d2b765d94103edc4404a7938a28ec5
Author: Jeremy Lainé <jeremy.laine at m4x.org>
Date: Tue Mar 4 11:03:26 2014 +0100
start working on asterisk 11.8.0
---
debian/changelog | 8 ++---
debian/patches/freeradius-client | 4 +--
debian/patches/pjproject | 13 ++++----
debian/patches/series | 1 -
debian/patches/suppress_warning_rasterisk.patch | 42 -------------------------
5 files changed, 12 insertions(+), 56 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a5af70f..9de2b07 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-asterisk (1:11.7.0~dfsg-2) UNRELEASED; urgency=low
+asterisk (1:11.8.0~dfsg-1) UNRELEASED; urgency=low
- [ Tzafrir Cohen ]
- * suppress_warning_rasterisk.patch: rasterisk should not print a
- warning.
+ [ Jeremy Lainé ]
+ * New upstream release.
+ - rasterisk no longer prints a warning when live_dangerously is set.
[ Frederic Van Espen ]
* smsq_enable.patch: enable smsq compilation (Closes: #738588)
diff --git a/debian/patches/freeradius-client b/debian/patches/freeradius-client
index 490f910..19cdb2d 100644
--- a/debian/patches/freeradius-client
+++ b/debian/patches/freeradius-client
@@ -56,9 +56,9 @@ Bug: https://issues.asterisk.org/jira/browse/ASTERISK-22980
--- a/configure.ac 2013-12-11 10:08:13.537159711 +0100
+++ b/configure.ac 2013-12-11 10:11:02.420053317 +0100
-@@ -2103,7 +2103,14 @@
+@@ -2114,7 +2117,14 @@ fi
# Some distributions (like SuSE) remove the 5.1 suffix.
- AST_EXT_LIB_CHECK([LUA], [lua], [luaL_register], [lua.h], [-lm])
+ AST_EXT_LIB_CHECK([LUA], [lua], [luaL_openlib], [lua.h], [-lm])
-AST_EXT_LIB_CHECK([RADIUS], [radiusclient-ng], [rc_read_config], [radiusclient-ng.h])
+# Accept either RADIUS client library, their APIs are fully compatible,
diff --git a/debian/patches/pjproject b/debian/patches/pjproject
index 2b609b3..87870ed 100644
--- a/debian/patches/pjproject
+++ b/debian/patches/pjproject
@@ -63,14 +63,15 @@ ICE/STUN/TURN support in res_rtp_asterisk is also now optional.
--- a/res/Makefile
+++ b/res/Makefile
-@@ -67,29 +67,8 @@ endif
+@@ -67,31 +67,9 @@ endif
ael/pval.o: ael/pval.c
clean::
- @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
--dist-clean::
+-dist-clean:: distclean
+-distclean::
- rm -f pjproject/build.mak
-
-pjproject/build.mak: pjproject/aconfigure
@@ -86,16 +87,14 @@ ICE/STUN/TURN support in res_rtp_asterisk is also now optional.
-$(PJ_LIB_FILES): FORCE
- $(MAKE) -C $(patsubst %/lib/,%,$(dir $@))/build/ ../lib/$(notdir $@)
-
--ifeq ($(subst 1:0,1,$(UUID)), 1)
-+ifeq ($(subst 1:0,1,$(PJPROJECT)), 1)
+ ifeq ($(subst 1:0,1,$(UUID)), 1)
-res_rtp_asterisk.o: $(PJ_LIB_FILES)
res_rtp_asterisk.o: _ASTCFLAGS+=-DUSE_PJPROJECT
-res_rtp_asterisk.o: _ASTCFLAGS+=$(PJ_CFLAGS)
-res_rtp_asterisk.so: _ASTLDFLAGS+=$(PJ_LDFLAGS)
-res_rtp_asterisk.so: LIBS+=$(PJ_LDLIBS)
--endif
-\ No newline at end of file
-+endif
+ endif
+
--- a/res/res_rtp_asterisk.c
+++ b/res/res_rtp_asterisk.c
@@ -29,7 +29,7 @@
diff --git a/debian/patches/series b/debian/patches/series
index a14091c..3f6837d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -31,5 +31,4 @@ hyphen
reenable
freeradius-client
ignore_failed_channels.patch
-suppress_warning_rasterisk.patch
smsq_enable.patch
diff --git a/debian/patches/suppress_warning_rasterisk.patch b/debian/patches/suppress_warning_rasterisk.patch
deleted file mode 100644
index e2020be..0000000
--- a/debian/patches/suppress_warning_rasterisk.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
-Date: Fri, 3 Jan 2014 22:24:18 +0000
-Subject: suppress live_dangerously warning on rasterisk
-Bug: https://issues.asterisk.org/jira/browse/ASTERISK-23084
-Origin: http://svnview.digium.com/svn/asterisk?view=rev&rev=404888
-
-Even since the fixes of AST-2013-007, Asterisk prints the following
-warning on startup if the user decided to live dangerously:
-
- Privilege escalation protection disabled!
- See https://wiki.asterisk.org/wiki/x/1gKfAQ for more details.
-
-This message is intended for the logs and interactive startup. No need
-for it to appear on a remote console. This commit removes it from there.
-
-Patch included upstream and wil be part of version 11.8.0 .
-
-Review: https://reviewboard.asterisk.org/r/3101/
-
-Merged revisions 404861 from http://svn.asterisk.org/svn/asterisk/branches/1.8
----
- main/asterisk.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/main/asterisk.c b/main/asterisk.c
-index 0ed1b2b..b8bd4be 100644
---- a/main/asterisk.c
-+++ b/main/asterisk.c
-@@ -3421,7 +3421,9 @@ static void ast_readconfig(void)
- 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) {
---
-1.7.10.4
-
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/asterisk.git
More information about the Pkg-voip-commits
mailing list