[Pkg-voip-commits] [asterisk] 01/01: AST-2013-007: patch out from asterisk.conf, document

[tzafrir at debian.org]

This is an automated email from the git hooks/post-receive script.

tzafrir pushed a commit to branch wheezy
in repository asterisk.

commit 65e711982b7176e211f67221a4833dda5ec3caf2
Author: Tzafrir Cohen <tzafrir at debian.org>
Date:   Thu Dec 19 14:21:15 2013 +0200

    AST-2013-007: patch out from asterisk.conf, document
    
    * Patch out the fix in AST-2013-007 from the installed asterisk.conf so
      the upgrade won't invoke a needless question (the only change is in
      lines that are remmed-out).
    * Document the change in README.Debian.
---
 debian/README.Debian | 15 +++++++++++++--
 debian/changelog     |  1 +
 debian/control       |  2 ++
 debian/rules         |  5 +++++
 4 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index 336a5be..2657a15 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -303,6 +303,17 @@ update something in the source, just re-run the 'install' command.
 live/asterisk is a wrapper to that private copy of Asterisk.
 
 
-Enjoy your PBX!
+Live Dangarously
+================
+AST-2013-007 disallows running several functions (such as SHELL) when
+run from remote interfaces (AMI, realtime), unless the user decides to
+"live_dangerously". However, in order to support backward compatibility,
+the stable versions default to the "live_dangerously" setting enabled.
+
+If you want to disable it, add the following line to the section
+'[options]' in /etc/asterisk/asterisk.conf:
 
- -- Lionel Elie Mamane <lmamane at debian.org>, Fri, 29 Jul 2011 19:21:06 +0200
+live_dangerously = no
+
+
+Enjoy your PBX!
diff --git a/debian/changelog b/debian/changelog
index 9d16a6c..b8abe35 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ asterisk (1:1.8.13.1~dfsg-3+deb7u2) UNRELEASED; urgency=high
   * Patch AST-2013-006: fixes a buffer overflow in app_sms.
   * Patch ASTERISK-20658: fixes potential crash with asterisk-realtime
   * Patch AST-2013-007: guards access to code execution from remote interfaces
+    - but patch out the change in asterisk.conf.
 
  -- Tzafrir Cohen <tzafrir at debian.org>  Tue, 17 Dec 2013 02:05:19 +0200
 
diff --git a/debian/control b/debian/control
index e1f7640..8e7eee9 100644
--- a/debian/control
+++ b/debian/control
@@ -21,6 +21,8 @@ Build-Depends: debhelper (>= 6.0.7),
  autotools-dev,
  autoconf,
  automake,
+ patch,
+ patchutils,
  libnewt-dev,
  libsqlite0-dev | libsqlite-dev,
  libsqlite3-dev,
diff --git a/debian/rules b/debian/rules
index b92d244..ea955cf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -192,6 +192,11 @@ install-indep: build-indep
 	# create a simple config
 	echo "; please read the documentation regarding the Manager Interface (asterisk-doc package)" > \
 		$(CURDIR)/debian/asterisk-config/etc/asterisk/manager.d/README.conf
+	# Unapply the changes in AST-2013-007 to config file asterisk.conf:
+	# (Changes left in the patch as we do want to keep the sample config
+	# files fixed)
+	filterdiff -i '*/configs/asterisk.conf.sample' $(CURDIR)/debian/patches/AST-2013-007 \
+		| patch -R $(CURDIR)/debian/asterisk-config/etc/asterisk/asterisk.conf
 	touch $@
 
 binary: binary-indep binary-arch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/asterisk.git