[Pkg-voip-commits] r8856 - in /asterisk/trunk/debian: asterisk.docs changelog patches/openssl10 patches/series

[tzafrir at alioth.debian.org]

Author: tzafrir
Date: Mon Apr 11 10:04:26 2011
New Revision: 8856

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8856
Log:
* Patch openssl10: Fix detection of openssl 1.0.
* include menuselect.makeopts in the docs directory - let us know what
  modules were not built.

Added:
    asterisk/trunk/debian/patches/openssl10
Modified:
    asterisk/trunk/debian/asterisk.docs
    asterisk/trunk/debian/changelog
    asterisk/trunk/debian/patches/series

Modified: asterisk/trunk/debian/asterisk.docs
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/asterisk.docs?rev=8856&op=diff
==============================================================================
--- asterisk/trunk/debian/asterisk.docs (original)
+++ asterisk/trunk/debian/asterisk.docs Mon Apr 11 10:04:26 2011
@@ -2,3 +2,4 @@
 README
 CREDITS
 CHANGES
+menuselect.makeopts

Modified: asterisk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/changelog?rev=8856&op=diff
==============================================================================
--- asterisk/trunk/debian/changelog (original)
+++ asterisk/trunk/debian/changelog Mon Apr 11 10:04:26 2011
@@ -26,6 +26,9 @@
     - Patch mpglib: mpglib from asterisk-addons, originally.
   * Patch gmime-2.4: fixes building with gmime 2.4 (Closes: #549054).
     - Requires re-generating configure script.
+  * Patch openssl10: Fix detection of openssl 1.0.
+  * include menuselect.makeopts in the docs directory - let us know what
+    modules were not built.
 
   [ Paul Belanger ]
   * Depend on libneon27-dev and libical-dev for calendar support.
@@ -34,7 +37,7 @@
     debugging tools.  Specifically DONT_OPTIMIZE, DEBUG_THREADS and
     --enable-dev-mode.
 
- -- Paul Belanger <pabelanger at digium.com>  Thu, 07 Apr 2011 19:34:18 -0400
+ -- Tzafrir Cohen <tzafrir at debian.org>  Mon, 11 Apr 2011 12:44:47 +0300
 
 asterisk (1:1.6.2.9-2) unstable; urgency=high
 

Added: asterisk/trunk/debian/patches/openssl10
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/openssl10?rev=8856&op=file
==============================================================================
--- asterisk/trunk/debian/patches/openssl10 (added)
+++ asterisk/trunk/debian/patches/openssl10 Mon Apr 11 10:04:26 2011
@@ -1,0 +1,15 @@
+Author: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
+Description: Fix detection of openssl for openssl 1.0
+Bug: https://issues.asterisk.org/view.php?id=19093
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -1947,7 +1947,7 @@ AST_EXT_LIB_CHECK([CRYPTO], [crypto], [A
+ 
+ if test "$PBX_CRYPTO" = "1";
+ then
+-    AST_EXT_LIB_CHECK([OPENSSL], [ssl], [ssl2_connect], [openssl/ssl.h], [-lcrypto])
++    AST_EXT_LIB_CHECK([OPENSSL], [ssl], [SSL_connect], [openssl/ssl.h], [-lcrypto])
+ fi
+ 
+ if test "$PBX_OPENSSL" = "1";

Modified: asterisk/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/series?rev=8856&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/series (original)
+++ asterisk/trunk/debian/patches/series Mon Apr 11 10:04:26 2011
@@ -19,3 +19,4 @@
 mpglib
 enable_addons
 gmime-2.4
+openssl10