From 22d259e0ed85408067427e099339eec346e16cc1 Mon Sep 17 00:00:00 2001
From: Maxim Sobolev <sobomax@FreeBSD.org>
Date: Sun, 22 Jul 2007 10:40:35 +0000
Subject: o Update to 1.4.8, which fixes some security issues.

PR:		114720, 114712

o Enable zaptel channel and friends on AMD64.

PR:		112624

o Improve startup script.

PR:		107222
---
 net/asterisk/files/patch-configure | 93 ++++++++++++++++++++++++++++++--------
 1 file changed, 74 insertions(+), 19 deletions(-)

(limited to 'net/asterisk/files/patch-configure')

diff --git a/net/asterisk/files/patch-configure b/net/asterisk/files/patch-configure
index 9a62851600a8..21df7182f365 100644
--- a/net/asterisk/files/patch-configure
+++ b/net/asterisk/files/patch-configure
@@ -3,25 +3,80 @@ $FreeBSD$
 
 --- configure.orig
 +++ configure
-@@ -23776,7 +23776,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lodbc ${pbxlibdir} -lltdl $LIBS"
-+LIBS="-lodbc ${pbxlibdir} $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -23855,7 +23855,7 @@
- 
- 
-    if test "${AST_UNIXODBC_FOUND}" = "yes"; then
--      UNIXODBC_LIB="-lodbc -lltdl"
-+      UNIXODBC_LIB="-lodbc"
-       UNIXODBC_HEADER_FOUND="1"
-       if test "x${UNIXODBC_DIR}" != "x"; then
-          UNIXODBC_LIB="${pbxlibdir} ${UNIXODBC_LIB}"
-@@ -28065,7 +28065,7 @@
+@@ -3926,8 +3926,6 @@
+ case "${host_os}" in
+      freebsd*)
+      ac_default_prefix=/usr/local
+-     CPPFLAGS=-I/usr/local/include
+-     LDFLAGS=-L/usr/local/lib
+      ;;
+      *)
+      ac_default_prefix=/usr
+@@ -26066,6 +26064,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++#include <ptlib.h>
+ #include <${OPENH323DIR}/include/h323.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+@@ -26106,6 +26105,7 @@
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
++#include <ptlib.h>
+ #include <${OPENH323DIR}/include/h323.h>
+ _ACEOF
+ if { (ac_try="$ac_cpp conftest.$ac_ext"
+@@ -26202,6 +26202,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++#include <ptlib.h>
+ #include <${HOME}/openh323/include/h323.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+@@ -26242,6 +26243,7 @@
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
++#include <ptlib.h>
+ #include <${HOME}/openh323/include/h323.h>
+ _ACEOF
+ if { (ac_try="$ac_cpp conftest.$ac_ext"
+@@ -26336,6 +26338,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++#include <ptlib.h>
+ #include </usr/local/include/openh323/h323.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+@@ -26376,6 +26379,7 @@
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
++#include <ptlib.h>
+ #include </usr/local/include/openh323/h323.h>
+ _ACEOF
+ if { (ac_try="$ac_cpp conftest.$ac_ext"
+@@ -26475,6 +26479,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++#include <ptlib.h>
+ #include </usr/include/openh323/h323.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+@@ -26515,6 +26520,7 @@
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
++#include <ptlib.h>
+ #include </usr/include/openh323/h323.h>
+ _ACEOF
+ if { (ac_try="$ac_cpp conftest.$ac_ext"
+@@ -26700,7 +26706,7 @@
  
  	fi
  
-- 
cgit v1.2.3