[Pkg-voip-commits] [asterisk] 01/01: start packaging asterisk 11.13.0

Fri Sep 26 08:11:07 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 402a0a876077afe75bd8eb921ee00e50e1b9bb17
Author: Jeremy Lainé <jeremy.laine at m4x.org>
Date:   Fri Sep 26 10:10:52 2014 +0200

    start packaging asterisk 11.13.0
---
 debian/changelog                      |   8 ++
 debian/patches/aelparse_manpage.patch |  39 ---------
 debian/patches/res_fax_bounds.patch   |  17 ++++
 debian/patches/series                 |   3 +-
 debian/patches/smsq_manpage.patch     | 157 ----------------------------------
 5 files changed, 26 insertions(+), 198 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6dc23ea..1263865 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+asterisk (1:11.13.0~dfsg-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+    - Drop aelparse_manpage.patch and smsq_manpage.patch, fixed upstream.
+  * Fix an out of bounds error in res_fax.c.
+
+ -- Jeremy Lainé <jeremy.laine at m4x.org>  Fri, 26 Sep 2014 09:56:15 +0200
+
 asterisk (1:11.12.1~dfsg-1) unstable; urgency=high
 
   * New upstream security release, fixes:
diff --git a/debian/patches/aelparse_manpage.patch b/debian/patches/aelparse_manpage.patch
deleted file mode 100644
index 19759d7..0000000
--- a/debian/patches/aelparse_manpage.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From: Jeremy Lainé <jeremy.laine at m4x.org>
-Bug: https://issues.asterisk.org/jira/browse/ASTERISK-24171
-
-Provide a manpage for the aelparse application.
-
-diff --git a/doc/aelparse.8 b/doc/aelparse.8
-new file mode 100644
-index 0000000..912ab02
---- /dev/null
-+++ b/doc/aelparse.8
-@@ -0,0 +1,28 @@
-+.TH AELPARSE "8" "Jul 2014" "Asterisk 11" ""
-+.SH NAME
-+aelparse \- utility to check extensions.ael for errors
-+.SH SYNOPSIS
-+.B aelparse
-+[\-d] [\-n] [\-q] [\-w]
-+.SH DESCRIPTION
-+aelparse is a utility to check the extensions.ael configuration file before
-+feeding it to asterisk.
-+.SH OPTIONS
-+.TP
-+\fB\-d\fR
-+Use the current working directory as the CONFIG_DIR.
-+.TP
-+\fB\-n\fR
-+Do not display the instructions generated by the compiler.
-+.TP
-+\fB\-q\fR
-+Suppress progress and non-error messages.
-+.TP
-+\fB\-w\fR
-+Dump extensions.conf format to extensions.conf.aeldump.
-+
-+.SH SEE ALSO
-+.B asterisk(8)
-+
-+.SH AUTHOR
-+This manual page was written by Jeremy Lainé <jeremy.laine at m4x.org>.
diff --git a/debian/patches/res_fax_bounds.patch b/debian/patches/res_fax_bounds.patch
new file mode 100644
index 0000000..a2f8fcc
--- /dev/null
+++ b/debian/patches/res_fax_bounds.patch
@@ -0,0 +1,17 @@
+From: Jeremy Lainé <jeremy.laine at m4x.org>
+Subject: out of bounds error in update_modem_bits
+Bug: https://issues.asterisk.org/jira/browse/ASTERISK-24357
+
+diff --git a/res/res_fax.c b/res/res_fax.c
+index 1678256..5413fa5 100644
+--- a/res/res_fax.c
++++ b/res/res_fax.c
+@@ -585,7 +585,7 @@ static int update_modem_bits(enum ast_fax_modems *bits, const char *value)
+ 		m[i] = NULL;
+ 	} else {
+ 		tok = strtok(v, ", ");
+-		while (tok && (i < 5)) {
++		while (tok && (i < 4)) {
+ 			m[i++] = tok;
+ 			tok = strtok(NULL, ", ");
+ 		}
diff --git a/debian/patches/series b/debian/patches/series
index fe958d0..b609ab5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -29,7 +29,6 @@ sigpri_handle_enodev_1.patch
 reenable
 ignore_failed_channels.patch
 smsq_enable.patch
-smsq_manpage.patch
 escape_manpage_hyphen.patch
 aelparse_enable.patch
-aelparse_manpage.patch
+res_fax_bounds.patch
diff --git a/debian/patches/smsq_manpage.patch b/debian/patches/smsq_manpage.patch
deleted file mode 100644
index 20dd744..0000000
--- a/debian/patches/smsq_manpage.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-From: Jeremy Lainé <jeremy.laine at m4x.org>
-Bug: https://issues.asterisk.org/jira/browse/ASTERISK-24170
-
-Provide a manpage for the smsq application.
-
-diff --git a/doc/smsq.8 b/doc/smsq.8
-new file mode 100644
-index 0000000..d8b0406
---- /dev/null
-+++ b/doc/smsq.8
-@@ -0,0 +1,146 @@
-+.TH SMSQ "8" "May 2014" "Asterisk 11" ""
-+.SH NAME
-+smsq \- helper to send SMS messages
-+.SH SYNOPSIS
-+.B smsq
-+\fI\,<oa/da> <message>\/\fR
-+.SH DESCRIPTION
-+smsq is a simple helper application designed to make it easy to send messages
-+from a command line. it is intended to run on the Asterisk box and have direct
-+access to the queue directories for SMS and for Asterisk.
-+.SH OPTIONS
-+.TP
-+\fB\-q\fR, \fB\-\-queue\fR=\fI\,number[\-X]\/\fR
-+Queue [inc sub address] (default: "")
-+.TP
-+\fB\-d\fR, \fB\-\-da\fR=\fI\,number\/\fR
-+Destination address
-+.TP
-+\fB\-o\fR, \fB\-\-oa\fR=\fI\,number\/\fR
-+Origination address
-+.TP
-+\fB\-m\fR, \fB\-\-ud\fR=\fI\,text\/\fR
-+Message
-+.TP
-+\fB\-f\fR, \fB\-\-ud\-file\fR=\fI\,filename\/\fR
-+Message file
-+.TP
-+\fB\-\-UTF\-8\fR
-+File treated as null terminated UTF\-8
-+(default)
-+.TP
-+\fB\-\-UCS\-1\fR
-+File treated as UCS\-1
-+.TP
-+\fB\-\-UCS\-2\fR
-+File treated as UCS\-2
-+.TP
-+\fB\-t\fR, \fB\-\-mt\fR
-+Mobile Terminated
-+.TP
-+\fB\-\-mo\fR
-+Mobile Originated
-+.TP
-+\fB\-\-tx\fR
-+Send message
-+.TP
-+\fB\-r\fR, \fB\-\-rx\fR
-+Queue for receipt
-+.TP
-+\fB\-e\fR, \fB\-\-process\fR=\fI\,command\/\fR
-+Rx queue process command
-+.TP
-+\fB\-x\fR, \fB\-\-no\-dial\fR
-+Do not dial
-+.TP
-+\fB\-\-no\-wait\fR
-+Do not wait if already calling
-+.TP
-+\fB\-\-concurrent\fR=\fI\,n\/\fR
-+Number of concurrent calls to allow
-+(default: 1)
-+.TP
-+\fB\-\-motx\-channel\fR=\fI\,channel\/\fR
-+Channel for motx calls (default:
-+"Local/1709400X")
-+.TP
-+\fB\-\-motx\-callerid\fR=\fI\,number\/\fR
-+Caller ID for motx calls (default is
-+queue name without sub address)
-+.TP
-+\fB\-\-motx\-wait\fR=\fI\,seconds\/\fR
-+Time to wait for motx call to answer
-+(default: 10)
-+.TP
-+\fB\-\-motx\-delay\fR=\fI\,seconds\/\fR
-+Time between motx call retries (default:
-+1)
-+.TP
-+\fB\-\-motx\-retries\fR=\fI\,n\/\fR
-+Number of retries for motx call (default:
-+10)
-+.TP
-+\fB\-\-mttx\-channel\fR=\fI\,channel\/\fR
-+Channel for mttx calls (default is Local/
-+and queue name without sub address)
-+.TP
-+\fB\-\-mttx\-callerid\fR=\fI\,number\/\fR
-+Caller ID for mttx calls (default is
-+queue name without sub address) (default:
-+"080058752X0")
-+.TP
-+\fB\-\-mttx\-wait\fR=\fI\,seconds\/\fR
-+Time to wait for mttx call to answer
-+(default: 10)
-+.TP
-+\fB\-\-mttx\-delay\fR=\fI\,seconds\/\fR
-+Time between mttx call retries (default:
-+30)
-+.TP
-+\fB\-\-mttx\-retries\fR=\fI\,n\/\fR
-+Number of retries for mttx call (default:
-+100)
-+.TP
-+\fB\-n\fR, \fB\-\-mr\fR=\fI\,n\/\fR
-+Message reference
-+.TP
-+\fB\-p\fR, \fB\-\-pid\fR=\fI\,n\/\fR
-+Protocol ID
-+.TP
-+\fB\-c\fR, \fB\-\-dcs\fR=\fI\,n\/\fR
-+Data Coding Scheme
-+.TP
-+\fB\-\-udh\fR=\fI\,hex\/\fR
-+User data header
-+.TP
-+\fB\-\-srr\fR
-+Status Report Request
-+.TP
-+\fB\-\-rp\fR
-+Return Path request
-+.TP
-+\fB\-\-v\fR=\fI\,seconds\/\fR
-+Validity Period
-+.TP
-+\fB\-\-scts\fR=\fI\,YYYY\-MM\-SSTHH\/\fR:MM:SS
-+Timestamp
-+.TP
-+\fB\-\-default\-sub\-address\fR=\fI\,X\/\fR
-+Default sub address (default: "9")
-+.TP
-+\fB\-\-spool\-dir\fR=\fI\,dirname\/\fR
-+Asterisk spool dir (default:
-+"/var/spool/asterisk")
-+.SS "Help options:"
-+.TP
-+\-?, \fB\-\-help\fR
-+Show this help message
-+.TP
-+\fB\-\-usage\fR
-+Display brief usage message
-+
-+.SH SEE ALSO
-+.B asterisk(8)
-+
-+.SH AUTHOR
-+This manual page was written by Jeremy Lainé <jeremy.laine at m4x.org>.

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

