[Pkg-voip-commits] [asterisk] 01/02: Allow res_calendar_ews to work with neon 0.30.x

[Jeremy Lainé]

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

sharky pushed a commit to branch master
in repository asterisk.

commit fb53b262b78f3ce5f276a978b113a2965d2e6314
Author: Jeremy Lainé <jeremy.laine at m4x.org>
Date:   Fri Sep 26 11:39:01 2014 +0200

    Allow res_calendar_ews to work with neon 0.30.x
---
 debian/changelog                        |  1 +
 debian/patches/neon_version_check.patch | 19 +++++++++++++++++++
 debian/patches/series                   |  1 +
 3 files changed, 21 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 1263865..10bbd8a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ 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.
+  * Allow res_calendar_ews to work with neon 0.30.x (Closes: #761677).
 
  -- Jeremy Lainé <jeremy.laine at m4x.org>  Fri, 26 Sep 2014 09:56:15 +0200
 
diff --git a/debian/patches/neon_version_check.patch b/debian/patches/neon_version_check.patch
new file mode 100644
index 0000000..5a1b3e8
--- /dev/null
+++ b/debian/patches/neon_version_check.patch
@@ -0,0 +1,19 @@
+From: Jeremy Lainé <jeremy.laine at m4x.org>
+Subject: relax neon version check
+Bug: https://issues.asterisk.org/jira/browse/ASTERISK-24325
+
+Relax the neon version check to also accept version 0.30.x
+
+diff --git a/res/res_calendar_ews.c b/res/res_calendar_ews.c
+index 0f8b0c2..a617790 100644
+--- a/res/res_calendar_ews.c
++++ b/res/res_calendar_ews.c
+@@ -907,7 +907,7 @@ static int load_module(void)
+ {
+ 	/* Actualy, 0.29.1 is required (because of NTLM authentication), but this
+ 	 * function does not support matching patch version. */
+-	if (ne_version_match(0, 29)) {
++	if (ne_version_match(0, 29) && ne_version_match(0, 30)) {
+ 		ast_log(LOG_ERROR, "Exchange Web Service calendar module require neon >= 0.29.1, but %s is installed.\n", ne_version_string());
+ 		return AST_MODULE_LOAD_DECLINE;
+ 	}
diff --git a/debian/patches/series b/debian/patches/series
index 500cb11..ceeb089 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -33,3 +33,4 @@ escape_manpage_hyphen.patch
 aelparse_enable.patch
 res_fax_bounds.patch
 buildflags.patch
+neon_version_check.patch

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