[Pkg-voip-commits] r9595 - in /asterisk/trunk/debian: changelog patches/gmime2.6 patches/series

[tzafrir at alioth.debian.org]

Author: tzafrir
Date: Sun Mar 18 23:41:28 2012
New Revision: 9595

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9595
Log:
Patch gmime2.6 (Closes: #663998, #664004), also fixed Build-Depends.

Added:
    asterisk/trunk/debian/patches/gmime2.6
Modified:
    asterisk/trunk/debian/changelog
    asterisk/trunk/debian/patches/series

Modified: asterisk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/changelog?rev=9595&op=diff
==============================================================================
--- asterisk/trunk/debian/changelog (original)
+++ asterisk/trunk/debian/changelog Sun Mar 18 23:41:28 2012
@@ -3,8 +3,9 @@
   * New upstrean bug-fix release.
     - Fixes "[CVE-2012-1183 - CVE-2012-1184] Asterisk: AST-2012-002 and 
       AST-2012-003 flaws" (Closes: #664411).
-
- -- Tzafrir Cohen <tzafrir at debian.org>  Sun, 18 Mar 2012 17:02:24 +0200
+  * Patch gmime2.6 (Closes: #663998, #664004), also fixed Build-Depends.
+
+ -- Tzafrir Cohen <tzafrir at debian.org>  Mon, 19 Mar 2012 01:25:07 +0200
 
 asterisk (1:1.8.10.0~dfsg-1) unstable; urgency=low
 
@@ -28,7 +29,6 @@
     - Fixes "Why using version 1.6.2.9 - it's not LTS" (Closes: #612147)
     - Fixes "SRTP/ZRTP support for Asterisk" (Closes: #577686)
     - Fixes "fails to register SIP channels on ARM"  (Closes: #660240)
-  * Fix "Planned gmime 2.4 removal" Updated Build-Depends: (Closes: #663998)
   * export CFLAGS LDFLAGS
     - Fixes "Hardening flags missing for menuselect" (Closes: #664086)
     - Fixes "enable hardening options" (Closes: #542741)

Added: asterisk/trunk/debian/patches/gmime2.6
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/gmime2.6?rev=9595&op=file
==============================================================================
--- asterisk/trunk/debian/patches/gmime2.6 (added)
+++ asterisk/trunk/debian/patches/gmime2.6 Sun Mar 18 23:41:28 2012
@@ -1,0 +1,19 @@
+Author: Michael Biebl <biebl at debian.org>
+Description: Support detection of libgmime 2.6 as well.
+Bug: http://bugs.debian.org/663998
+
+Patch should be uploaded upstream.
+
+Index: asterisk-1.8.8.2~dfsg/configure.ac
+===================================================================
+--- asterisk-1.8.8.2~dfsg.orig/configure.ac	2011-10-18 23:26:48.000000000 +0200
++++ asterisk-1.8.8.2~dfsg/configure.ac	2012-03-14 22:52:09.629478712 +0100
+@@ -2019,7 +2019,7 @@
+ AST_EXT_TOOL_CHECK([GMIME], [gmime-config], [], [], [#include <gmime/gmime.h>], [gboolean q = g_mime_check_version(0,0,0);])
+ if test "x${PBX_GMIME}" = "x0" -a "${PKGCONFIG}" != "No"; then
+ 	# Later versions of GMime use pkg-config
+-	for ver in 2.0 2.2 2.4; do
++	for ver in 2.0 2.2 2.4 2.6; do
+ 		if ! ${PKGCONFIG} --exists gmime-$ver; then
+ 			continue
+ 		fi

Modified: asterisk/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/series?rev=9595&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/series (original)
+++ asterisk/trunk/debian/patches/series Sun Mar 18 23:41:28 2012
@@ -23,3 +23,4 @@
 kfreebsd
 
 sparc32_disable
+gmime2.6