rpms/asterisk/devel asterisk-1.6.0-beta6-editline.patch, NONE, 1.1 asterisk-1.6.0-beta6-alternate-extensions.patch, 1.1, 1.2 asterisk-1.6.0-beta6-appconference.patch, 1.1, 1.2 asterisk-1.6.0-beta6-autoconf.patch, 1.1, 1.2 asterisk-1.6.0-beta6-chanmobile.patch, 1.1, 1.2 asterisk-1.6.0-beta6-lua.patch, 1.1, 1.2 asterisk-1.6.0-beta6-optimization.patch, 1.1, 1.2 asterisk.spec, 1.18, 1.19

Jeffrey C. Ollie (jcollie) fedora-extras-commits at redhat.com
Tue Mar 25 20:20:36 UTC 2008 

Author: jcollie

Update of /cvs/pkgs/rpms/asterisk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22005

Modified Files:
	asterisk-1.6.0-beta6-alternate-extensions.patch 
	asterisk-1.6.0-beta6-appconference.patch 
	asterisk-1.6.0-beta6-autoconf.patch 
	asterisk-1.6.0-beta6-chanmobile.patch 
	asterisk-1.6.0-beta6-lua.patch 
	asterisk-1.6.0-beta6-optimization.patch asterisk.spec 
Added Files:
	asterisk-1.6.0-beta6-editline.patch 
Log Message:
* Tue Mar 25 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0-0.8.beta6
- Update patches.
- Add patch to compile against external libedit rather than using the
  in-tree version.
- Add -Werror-implicit-function-declaration to optflags.
- Get rid of hashtest and hashtest2 binaries that link to unfortified
  versions of *printf functions.  They are compiled with -O0 which
  somehow pulls in the wrong versions.  These programs aren't
  necessary to the operation of the package anyway.


asterisk-1.6.0-beta6-editline.patch:

--- NEW FILE asterisk-1.6.0-beta6-editline.patch ---
>From 8b6b3cb3a6df009235b3fc9862947d0996cfdc13 Mon Sep 17 00:00:00 2001
From: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Tue, 25 Mar 2008 00:50:27 -0500
Subject: [PATCH] Build using external libedit.

---
 build_tools/menuselect-deps.in |    1 +
 configure.ac                   |   22 ++++++++++++++++++++++
 main/Makefile                  |    7 ++++---
 main/cli.c                     |    3 ++-
 makeopts.in                    |    4 ++++
 5 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/build_tools/menuselect-deps.in b/build_tools/menuselect-deps.in
index 6349e71..d4a9fe2 100644
--- a/build_tools/menuselect-deps.in
+++ b/build_tools/menuselect-deps.in
@@ -16,6 +16,7 @@ ISDNNET=@PBX_ISDNNET@
 IXJUSER=@PBX_IXJUSER@
 JACK=@PBX_JACK@
 LDAP=@PBX_LDAP@
+LIBEDIT=@PBX_LIBEDIT@
 LTDL=@PBX_LTDL@
 LUA=@PBX_LUA@
 MISDN=@PBX_MISDN@
diff --git a/configure.ac b/configure.ac
index 6d84d1e..18f4e2b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -220,6 +220,7 @@ AST_EXT_LIB_SETUP([IMAP_TK], [UW IMAP Toolkit], [imap])
 AST_EXT_LIB_SETUP([ISDNNET], [ISDN4Linux Library], [isdnnet])
 AST_EXT_LIB_SETUP([JACK], [Jack Audio Connection Kit], [jack])
 AST_EXT_LIB_SETUP([LDAP], [OpenLDAP], [ldap])
+AST_EXT_LIB_SETUP([LIBEDIT], [NetBSD Editline library], [libedit])
 AST_EXT_LIB_SETUP([LTDL], [libtool], [ltdl])
 AST_EXT_LIB_SETUP([LUA], [Lua], [lua])
 AST_EXT_LIB_SETUP([MISDN], [mISDN User Library], [misdn])
@@ -1525,6 +1526,27 @@ AC_SUBST(PBX_GTK2)
 AC_SUBST(GTK2_INCLUDE)
 AC_SUBST(GTK2_LIB)
 
+PBX_LIBEDIT=0
+LIBEDIT_INCLUDE=-Ieditline/readline
+LIBEDIT_LIB=
+LIBEDIT_OBJ=editline/libedit.a
+if test  "${USE_LIBEDIT}" != "no"; then
+   AC_CHECK_TOOL(PKGCONFIG, pkg-config, no)
+   if test "${PKGCONFIG}" != "no"; then
+      if ${PKGCONFIG} --exists libedit; then
+         LIBEDIT_INCLUDE=$(${PKGCONFIG} libedit --cflags)
+	 LIBEDIT_LIB=$(${PKGCONFIG} libedit --libs)
+         LIBEDIT_OBJ=
+         PBX_LIBEDIT=1
+         AC_DEFINE([HAVE_LIBEDIT], 1, [Define if your system has the NetBSD Editline libraries.])
+      fi
+   fi
+fi
+AC_SUBST(PBX_LIBEDIT)
+AC_SUBST(LIBEDIT_INCLUDE)
+AC_SUBST(LIBEDIT_LIB)
+AC_SUBST(LIBEDIT_OBJ)
+
 if test "${USE_CURL}" != "no"; then
    AC_PATH_TOOL([CURL_CONFIG], [curl-config], No)
    if test ! x"${CURL_CONFIG}" = xNo; then
diff --git a/main/Makefile b/main/Makefile
index b24e19e..92bf508 100644
--- a/main/Makefile
+++ b/main/Makefile
@@ -132,6 +132,7 @@ testexpr2: ast_expr2f.c ast_expr2.c ast_expr2.h
 
 channel.o: ASTCFLAGS+=$(ZAPTEL_INCLUDE)
 
+cli.o: ASTCFLAGS+=$(LIBEDIT_INCLUDE)
 
 ifneq ($(findstring ENABLE_UPLOADS,$(MENUSELECT_CFLAGS)),)
 http.o: ASTCFLAGS+=$(GMIME_INCLUDE)
@@ -165,13 +166,13 @@ ifneq ($(findstring ENABLE_UPLOADS,$(MENUSELECT_CFLAGS)),)
 GMIMELDFLAGS+=$(GMIME_LIB)
 endif
 
-$(MAIN_TGT): $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS)
+$(MAIN_TGT): $(OBJS) $(LIBEDIT_OBJ) db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS)
 	@$(CC) -c -o buildinfo.o $(ASTCFLAGS) buildinfo.c
 	$(ECHO_PREFIX) echo "   [LD] $^ -> $@"
 ifneq ($(findstring chan_h323,$(MENUSELECT_CHANNELS)),)
-	$(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS)
+	$(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS) $(LIBEDIT_LIB)
 else
-	$(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS)
+	$(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS) $(LIBEDIT_LIB)
 endif
 	$(CMD_PREFIX) $(ASTTOPDIR)/build_tools/strip_nonapi $@ || rm $@
 
diff --git a/main/cli.c b/main/cli.c
index 11d6671..dce7950 100644
--- a/main/cli.c
+++ b/main/cli.c
@@ -34,6 +34,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <ctype.h>
 #include <regex.h>
 
+#include <readline.h>
+
 #include "asterisk/cli.h"
 #include "asterisk/linkedlists.h"
 #include "asterisk/module.h"
@@ -42,7 +44,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/utils.h"
 #include "asterisk/app.h"
 #include "asterisk/lock.h"
-#include "editline/readline/readline.h"
 #include "asterisk/threadstorage.h"
 
 /*!
diff --git a/makeopts.in b/makeopts.in
index a394c18..ad7a94d 100644
--- a/makeopts.in
+++ b/makeopts.in
@@ -238,3 +238,7 @@ TINFO_DIR=@TINFO_DIR@
 
 # if poll is not present, let the makefile know.
 POLL_AVAILABLE=@HAS_POLL@
+
+LIBEDIT_INCLUDE=@LIBEDIT_INCLUDE@
+LIBEDIT_LIB=@LIBEDIT_LIB@
+LIBEDIT_OBJ=@LIBEDIT_OBJ@
-- 
1.5.4.3


asterisk-1.6.0-beta6-alternate-extensions.patch:

Index: asterisk-1.6.0-beta6-alternate-extensions.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/asterisk-1.6.0-beta6-alternate-extensions.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- asterisk-1.6.0-beta6-alternate-extensions.patch	19 Mar 2008 17:41:15 -0000	1.1
+++ asterisk-1.6.0-beta6-alternate-extensions.patch	25 Mar 2008 20:20:22 -0000	1.2
@@ -1,4 +1,4 @@
-From 5762c367cd6c0a07c95d46a9ff49a4aee98affbd Mon Sep 17 00:00:00 2001
+From 51c5f852d6918d39d382f19e74e69d90b8cb318b Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jcollie at pc21224.campus.dmacc.edu>
 Date: Thu, 8 Nov 2007 16:32:56 -0600
 Subject: [PATCH] Allow alternate extensions to be specified in users.conf

asterisk-1.6.0-beta6-appconference.patch:

Index: asterisk-1.6.0-beta6-appconference.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/asterisk-1.6.0-beta6-appconference.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- asterisk-1.6.0-beta6-appconference.patch	19 Mar 2008 17:41:15 -0000	1.1
+++ asterisk-1.6.0-beta6-appconference.patch	25 Mar 2008 20:20:22 -0000	1.2
@@ -1,3 +1,48 @@
+From 45933f50742575621d0be7c0a439d26c7211f930 Mon Sep 17 00:00:00 2001
+From: Jeffrey C. Ollie <jeff at ocjtech.us>
+Date: Mon, 24 Mar 2008 23:25:39 -0500
+Subject: [PATCH] Applying latest appconference.
+
+---
+ apps/Makefile                      |   13 +
+ apps/app_conference.c              |  106 ++
+ apps/conference/CLI.txt            |   96 +
+ apps/conference/Flags.txt          |   35 +
+ apps/conference/LICENSE            |  341 ++++
+ apps/conference/README             |  125 ++
+ apps/conference/README.videoswitch |   87 +
+ apps/conference/TODO               |    4 +
+ apps/conference/app_conference.h   |  249 +++
+ apps/conference/cli.c              | 1116 ++++++++++++
+ apps/conference/cli.h              |   51 +
+ apps/conference/common.h           |   63 +
+ apps/conference/conf_frame.h       |   73 +
+ apps/conference/conference.c       | 3024 ++++++++++++++++++++++++++++++++
+ apps/conference/conference.h       |  190 ++
+ apps/conference/frame.c            |  683 ++++++++
+ apps/conference/frame.h            |   75 +
+ apps/conference/member.c           | 3379 ++++++++++++++++++++++++++++++++++++
+ apps/conference/member.h           |  336 ++++
+ 19 files changed, 10046 insertions(+), 0 deletions(-)
+ create mode 100644 apps/app_conference.c
+ create mode 100644 apps/conference/CLI.txt
+ create mode 100644 apps/conference/Flags.txt
+ create mode 100644 apps/conference/LICENSE
+ create mode 100644 apps/conference/README
+ create mode 100644 apps/conference/README.videoswitch
+ create mode 100644 apps/conference/TODO
+ create mode 100644 apps/conference/app_conference.h
+ create mode 100644 apps/conference/cli.c
+ create mode 100644 apps/conference/cli.h
+ create mode 100644 apps/conference/common.h
+ create mode 100644 apps/conference/conf_frame.h
+ create mode 100644 apps/conference/conference.c
+ create mode 100644 apps/conference/conference.h
+ create mode 100644 apps/conference/frame.c
+ create mode 100644 apps/conference/frame.h
+ create mode 100644 apps/conference/member.c
+ create mode 100644 apps/conference/member.h
+
 diff --git a/apps/Makefile b/apps/Makefile
 index 22b8f6d..d2be277 100644
 --- a/apps/Makefile
@@ -2439,7 +2484,7 @@
 +#endif
 diff --git a/apps/conference/conference.c b/apps/conference/conference.c
 new file mode 100644
-index 0000000..824363a
+index 0000000..4d82633
 --- /dev/null
 +++ b/apps/conference/conference.c
 @@ -0,0 +1,3024 @@
@@ -4520,7 +4565,7 @@
 +		if ( longest_speaking_member )
 +			// Somebody is talking, switch to that member
 +			new_id = longest_speaking_member->id;
-+		else if ( conf->default_video_source_id &&
++		else if ( conf->default_video_source_id >= 0  &&
 +		          (!default_no_video || default_force_switch)
 +		        )
 +			// No talking, but we have a default that can send video
@@ -10160,3 +10205,6 @@
 +extern int ast_packer_feed(struct ast_packer *s, const struct ast_frame *f);
 +extern struct ast_frame *ast_packer_read(struct ast_packer *s);
 +#endif
+-- 
+1.5.4.3
+

asterisk-1.6.0-beta6-autoconf.patch:

Index: asterisk-1.6.0-beta6-autoconf.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/asterisk-1.6.0-beta6-autoconf.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- asterisk-1.6.0-beta6-autoconf.patch	19 Mar 2008 17:41:15 -0000	1.1
+++ asterisk-1.6.0-beta6-autoconf.patch	25 Mar 2008 20:20:22 -0000	1.2
@@ -1,15 +1,15 @@
-From b289fe040480f9a9e923b50e568e18f70f1cc824 Mon Sep 17 00:00:00 2001
+From b308f69dd658b51c5535251b7296d5680d421e52 Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
-Date: Mon, 25 Feb 2008 13:15:55 -0600
+Date: Tue, 25 Mar 2008 00:51:35 -0500
 Subject: [PATCH] Update autoconf.
 
 ---
- configure                        |  808 ++++++++++++++++++++++++++++++--------
- include/asterisk/autoconfig.h.in |   17 +-
- 2 files changed, 650 insertions(+), 175 deletions(-)
+ configure                        |  983 +++++++++++++++++++++++++++++++-------
+ include/asterisk/autoconfig.h.in |   20 +-
+ 2 files changed, 820 insertions(+), 183 deletions(-)
 
 diff --git a/configure b/configure
-index 4199e72..9ecb39b 100755
+index 4199e72..011c661 100755
 --- a/configure
 +++ b/configure
 @@ -1,5 +1,5 @@
@@ -42,7 +42,18 @@
  CURSES_LIB
  CURSES_INCLUDE
  CURSES_DIR
-@@ -872,6 +876,10 @@ SDL_IMAGE_LIB
+@@ -788,6 +792,10 @@ LDAP_LIB
+ LDAP_INCLUDE
+ LDAP_DIR
+ PBX_LDAP
++LIBEDIT_LIB
++LIBEDIT_INCLUDE
++LIBEDIT_DIR
++PBX_LIBEDIT
+ LTDL_LIB
+ LTDL_INCLUDE
+ LTDL_DIR
+@@ -872,6 +880,10 @@ SDL_IMAGE_LIB
  SDL_IMAGE_INCLUDE
  SDL_IMAGE_DIR
  PBX_SDL_IMAGE
@@ -53,7 +64,7 @@
  SPEEX_LIB
  SPEEX_INCLUDE
  SPEEX_DIR
-@@ -963,6 +971,7 @@ OPENH323_INCDIR
+@@ -963,6 +975,7 @@ OPENH323_INCDIR
  OPENH323_LIBDIR
  OPENH323_SUFFIX
  OPENH323_BUILD
@@ -61,15 +72,16 @@
  CONFIG_GMIME
  PBX_ZAPTEL_VLDTMF
  PBX_ZAPTEL_ECHOCANPARAMS
-@@ -974,7 +983,6 @@ PBX_H323
+@@ -974,7 +987,7 @@ PBX_H323
  PBX_IXJUSER
  CONFIG_SDL
  CONFIG_GTK
 -PKGCONFIG
++LIBEDIT_OBJ
  CURL_CONFIG
  LTLIBOBJS'
  ac_subst_files=''
-@@ -1574,8 +1582,9 @@ Optional Packages:
+@@ -1574,8 +1587,9 @@ Optional Packages:
    --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
    --with-asound=PATH      use Advanced Linux Sound Architecture files in PATH
    --with-execinfo=PATH    use Stack Backtrace support files in PATH
@@ -80,7 +92,15 @@
    --with-curses=PATH      use curses files in PATH
    --with-crypto=PATH      use OpenSSL Cryptography support files in PATH
    --with-avcodec=PATH     use Ffmpeg and avcodec library files in PATH
-@@ -1611,6 +1620,7 @@ Optional Packages:
+@@ -1590,6 +1604,7 @@ Optional Packages:
+   --with-isdnnet=PATH     use ISDN4Linux Library files in PATH
+   --with-jack=PATH        use Jack Audio Connection Kit files in PATH
+   --with-ldap=PATH        use OpenLDAP files in PATH
++  --with-libedit=PATH     use NetBSD Editline library files in PATH
+   --with-ltdl=PATH        use libtool files in PATH
+   --with-lua=PATH         use Lua files in PATH
+   --with-misdn=PATH       use mISDN User Library files in PATH
+@@ -1611,6 +1626,7 @@ Optional Packages:
    --with-radius=PATH      use Radius Client files in PATH
    --with-sdl=PATH         use Sdl files in PATH
    --with-SDL_image=PATH   use Sdl Image library files in PATH
@@ -88,7 +108,7 @@
    --with-speex=PATH       use Speex files in PATH
    --with-speexdsp=PATH    use Speexdsp files in PATH
    --with-sqlite=PATH      use SQLite files in PATH
-@@ -7940,6 +7950,62 @@ fi
+@@ -7940,6 +7956,62 @@ fi
  
  
  
@@ -151,7 +171,42 @@
      CAP_DESCRIP="POSIX 1.e capabilities"
      CAP_OPTION="cap"
  
-@@ -8948,6 +9014,34 @@ fi
+@@ -8360,6 +8432,34 @@ fi
+ 
+ 
+ 
++    LIBEDIT_DESCRIP="NetBSD Editline library"
++    LIBEDIT_OPTION="libedit"
++
++# Check whether --with-libedit was given.
++if test "${with_libedit+set}" = set; then
++  withval=$with_libedit;
++	case ${withval} in
++	n|no)
++	USE_LIBEDIT=no
++	;;
++	y|ye|yes)
++	ac_mandatory_list="${ac_mandatory_list} LIBEDIT"
++	;;
++	*)
++	LIBEDIT_DIR="${withval}"
++	ac_mandatory_list="${ac_mandatory_list} LIBEDIT"
++	;;
++	esac
++
++fi
++
++    PBX_LIBEDIT=0
++
++
++
++
++
++
+     LTDL_DESCRIP="libtool"
+     LTDL_OPTION="ltdl"
+ 
+@@ -8948,6 +9048,34 @@ fi
  
  
  
@@ -186,7 +241,7 @@
      SPEEX_DESCRIP="Speex"
      SPEEX_OPTION="speex"
  
-@@ -12769,13 +12863,11 @@ _ACEOF
+@@ -12769,13 +12897,11 @@ _ACEOF
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -202,7 +257,7 @@
    ;
    return 0;
  }
-@@ -12815,13 +12907,11 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -12815,13 +12941,11 @@ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #define _LARGEFILE_SOURCE 1
@@ -218,7 +273,7 @@
    ;
    return 0;
  }
-@@ -18120,6 +18210,268 @@ fi
+@@ -18120,6 +18244,268 @@ fi
  
  
  
@@ -487,7 +542,7 @@
  if test "x${PBX_CURSES}" != "x1" -a "${USE_CURSES}" != "no"; then
     pbxlibdir=""
     # if --with-CURSES=DIR has been specified, use it.
-@@ -40874,31 +41226,137 @@ _ACEOF
+@@ -40874,31 +41260,137 @@ _ACEOF
  
  fi
  
@@ -531,8 +586,7 @@
 +echo "${ECHO_T}no" >&6; }
 +fi
 +
- 
--if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; then
++
 +fi
 +if test -z "$ac_cv_prog_PKGCONFIG"; then
 +  ac_ct_PKGCONFIG=$PKGCONFIG
@@ -602,7 +656,8 @@
 +
 +fi
 +
-+
+ 
+-if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; then
 +if test "x${PBX_RADIUS}" != "x1" -a "${USE_RADIUS}" != "no"; then
     pbxlibdir=""
 -   # if --with-LUA=DIR has been specified, use it.
@@ -639,7 +694,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -40955,38 +41413,38 @@ ac_res=`eval echo '${'$as_ac_Lib'}'`
+@@ -40955,38 +41447,38 @@ ac_res=`eval echo '${'$as_ac_Lib'}'`
  	       { echo "$as_me:$LINENO: result: $ac_res" >&5
  echo "${ECHO_T}$ac_res" >&6; }
  if test `eval echo '${'$as_ac_Lib'}'` = yes; then
@@ -698,7 +753,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -40994,7 +41452,7 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -40994,7 +41486,7 @@ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -707,7 +762,7 @@
  _ACEOF
  rm -f conftest.$ac_objext
  if { (ac_try="$ac_compile"
-@@ -41026,15 +41484,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+@@ -41026,15 +41518,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  echo "${ECHO_T}$ac_header_compiler" >&6; }
  
  # Is the header present?
@@ -726,7 +781,7 @@
  _ACEOF
  if { (ac_try="$ac_cpp conftest.$ac_ext"
  case "(($ac_try" in
-@@ -41067,25 +41525,25 @@ echo "${ECHO_T}$ac_header_preproc" >&6; }
+@@ -41067,25 +41559,25 @@ echo "${ECHO_T}$ac_header_preproc" >&6; }
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
    yes:no: )
@@ -768,7 +823,7 @@
      ( cat <<\_ASBOX
  ## ------------------------------- ##
  ## Report this to www.asterisk.org ##
-@@ -41094,43 +41552,43 @@ _ASBOX
+@@ -41094,43 +41586,43 @@ _ASBOX
       ) | sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
@@ -828,7 +883,7 @@
  _ACEOF
  
        fi
-@@ -41139,28 +41597,28 @@ fi
+@@ -41139,28 +41631,28 @@ fi
  
  
  
@@ -869,7 +924,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -41217,38 +41675,38 @@ ac_res=`eval echo '${'$as_ac_Lib'}'`
+@@ -41217,38 +41709,38 @@ ac_res=`eval echo '${'$as_ac_Lib'}'`
  	       { echo "$as_me:$LINENO: result: $ac_res" >&5
  echo "${ECHO_T}$ac_res" >&6; }
  if test `eval echo '${'$as_ac_Lib'}'` = yes; then
@@ -928,7 +983,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -41256,7 +41714,7 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -41256,7 +41748,7 @@ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -937,7 +992,7 @@
  _ACEOF
  rm -f conftest.$ac_objext
  if { (ac_try="$ac_compile"
-@@ -41288,15 +41746,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+@@ -41288,15 +41780,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  echo "${ECHO_T}$ac_header_compiler" >&6; }
  
  # Is the header present?
@@ -956,7 +1011,7 @@
  _ACEOF
  if { (ac_try="$ac_cpp conftest.$ac_ext"
  case "(($ac_try" in
-@@ -41329,25 +41787,25 @@ echo "${ECHO_T}$ac_header_preproc" >&6; }
+@@ -41329,25 +41821,25 @@ echo "${ECHO_T}$ac_header_preproc" >&6; }
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
    yes:no: )
@@ -998,7 +1053,7 @@
      ( cat <<\_ASBOX
  ## ------------------------------- ##
  ## Report this to www.asterisk.org ##
-@@ -41356,43 +41814,43 @@ _ASBOX
+@@ -41356,43 +41848,43 @@ _ASBOX
       ) | sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
@@ -1058,7 +1113,134 @@
  _ACEOF
  
        fi
-@@ -50320,14 +50778,18 @@ BKTR_LIB!$BKTR_LIB$ac_delim
+@@ -49346,6 +49838,126 @@ fi
+ 
+ 
+ 
++PBX_LIBEDIT=0
++LIBEDIT_INCLUDE=-Ieditline/readline
++LIBEDIT_LIB=
++LIBEDIT_OBJ=editline/libedit.a
++if test  "${USE_LIBEDIT}" != "no"; then
++   if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
++set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_prog_PKGCONFIG+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$PKGCONFIG"; then
++  ac_cv_prog_PKGCONFIG="$PKGCONFIG" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_PKGCONFIG="${ac_tool_prefix}pkg-config"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++IFS=$as_save_IFS
++
++fi
++fi
++PKGCONFIG=$ac_cv_prog_PKGCONFIG
++if test -n "$PKGCONFIG"; then
++  { echo "$as_me:$LINENO: result: $PKGCONFIG" >&5
++echo "${ECHO_T}$PKGCONFIG" >&6; }
++else
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++
++fi
++if test -z "$ac_cv_prog_PKGCONFIG"; then
++  ac_ct_PKGCONFIG=$PKGCONFIG
++  # Extract the first word of "pkg-config", so it can be a program name with args.
++set dummy pkg-config; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_prog_ac_ct_PKGCONFIG+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$ac_ct_PKGCONFIG"; then
++  ac_cv_prog_ac_ct_PKGCONFIG="$ac_ct_PKGCONFIG" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_ac_ct_PKGCONFIG="pkg-config"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++IFS=$as_save_IFS
++
++fi
++fi
++ac_ct_PKGCONFIG=$ac_cv_prog_ac_ct_PKGCONFIG
++if test -n "$ac_ct_PKGCONFIG"; then
++  { echo "$as_me:$LINENO: result: $ac_ct_PKGCONFIG" >&5
++echo "${ECHO_T}$ac_ct_PKGCONFIG" >&6; }
++else
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++  if test "x$ac_ct_PKGCONFIG" = x; then
++    PKGCONFIG="no"
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++    PKGCONFIG=$ac_ct_PKGCONFIG
++  fi
++else
++  PKGCONFIG="$ac_cv_prog_PKGCONFIG"
++fi
++
++   if test "${PKGCONFIG}" != "no"; then
++      if ${PKGCONFIG} --exists libedit; then
++         LIBEDIT_INCLUDE=$(${PKGCONFIG} libedit --cflags)
++	 LIBEDIT_LIB=$(${PKGCONFIG} libedit --libs)
++         LIBEDIT_OBJ=
++         PBX_LIBEDIT=1
++
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_LIBEDIT 1
++_ACEOF
++
++      fi
++   fi
++fi
++
++
++
++
++
+ if test "${USE_CURL}" != "no"; then
+    if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}curl-config", so it can be a program name with args.
+@@ -50320,14 +50932,18 @@ BKTR_LIB!$BKTR_LIB$ac_delim
  BKTR_INCLUDE!$BKTR_INCLUDE$ac_delim
  BKTR_DIR!$BKTR_DIR$ac_delim
  PBX_BKTR!$PBX_BKTR$ac_delim
@@ -1081,10 +1263,25 @@
  CURSES_LIB!$CURSES_LIB$ac_delim
  CURSES_INCLUDE!$CURSES_INCLUDE$ac_delim
  CURSES_DIR!$CURSES_DIR$ac_delim
-@@ -50401,10 +50863,6 @@ NCURSES_INCLUDE!$NCURSES_INCLUDE$ac_delim
- NCURSES_DIR!$NCURSES_DIR$ac_delim
- PBX_NCURSES!$PBX_NCURSES$ac_delim
- NETSNMP_LIB!$NETSNMP_LIB$ac_delim
+@@ -50380,6 +50996,10 @@ LDAP_LIB!$LDAP_LIB$ac_delim
+ LDAP_INCLUDE!$LDAP_INCLUDE$ac_delim
+ LDAP_DIR!$LDAP_DIR$ac_delim
+ PBX_LDAP!$PBX_LDAP$ac_delim
++LIBEDIT_LIB!$LIBEDIT_LIB$ac_delim
++LIBEDIT_INCLUDE!$LIBEDIT_INCLUDE$ac_delim
++LIBEDIT_DIR!$LIBEDIT_DIR$ac_delim
++PBX_LIBEDIT!$PBX_LIBEDIT$ac_delim
+ LTDL_LIB!$LTDL_LIB$ac_delim
+ LTDL_INCLUDE!$LTDL_INCLUDE$ac_delim
+ LTDL_DIR!$LTDL_DIR$ac_delim
+@@ -50397,14 +51017,6 @@ NBS_INCLUDE!$NBS_INCLUDE$ac_delim
+ NBS_DIR!$NBS_DIR$ac_delim
+ PBX_NBS!$PBX_NBS$ac_delim
+ NCURSES_LIB!$NCURSES_LIB$ac_delim
+-NCURSES_INCLUDE!$NCURSES_INCLUDE$ac_delim
+-NCURSES_DIR!$NCURSES_DIR$ac_delim
+-PBX_NCURSES!$PBX_NCURSES$ac_delim
+-NETSNMP_LIB!$NETSNMP_LIB$ac_delim
 -NETSNMP_INCLUDE!$NETSNMP_INCLUDE$ac_delim
 -NETSNMP_DIR!$NETSNMP_DIR$ac_delim
 -PBX_NETSNMP!$PBX_NETSNMP$ac_delim
@@ -1092,10 +1289,14 @@
  _ACEOF
  
    if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -50446,6 +50904,10 @@ _ACEOF
+@@ -50446,6 +51058,14 @@ _ACEOF
  ac_delim='%!_!# '
  for ac_last_try in false false false false false :; do
    cat >conf$$subs.sed <<_ACEOF
++NCURSES_INCLUDE!$NCURSES_INCLUDE$ac_delim
++NCURSES_DIR!$NCURSES_DIR$ac_delim
++PBX_NCURSES!$PBX_NCURSES$ac_delim
++NETSNMP_LIB!$NETSNMP_LIB$ac_delim
 +NETSNMP_INCLUDE!$NETSNMP_INCLUDE$ac_delim
 +NETSNMP_DIR!$NETSNMP_DIR$ac_delim
 +PBX_NETSNMP!$PBX_NETSNMP$ac_delim
@@ -1103,7 +1304,7 @@
  NEWT_INCLUDE!$NEWT_INCLUDE$ac_delim
  NEWT_DIR!$NEWT_DIR$ac_delim
  PBX_NEWT!$PBX_NEWT$ac_delim
-@@ -50505,6 +50967,10 @@ SDL_IMAGE_LIB!$SDL_IMAGE_LIB$ac_delim
+@@ -50505,6 +51125,10 @@ SDL_IMAGE_LIB!$SDL_IMAGE_LIB$ac_delim
  SDL_IMAGE_INCLUDE!$SDL_IMAGE_INCLUDE$ac_delim
  SDL_IMAGE_DIR!$SDL_IMAGE_DIR$ac_delim
  PBX_SDL_IMAGE!$PBX_SDL_IMAGE$ac_delim
@@ -1114,10 +1315,14 @@
  SPEEX_LIB!$SPEEX_LIB$ac_delim
  SPEEX_INCLUDE!$SPEEX_INCLUDE$ac_delim
  SPEEX_DIR!$SPEEX_DIR$ac_delim
-@@ -50535,14 +51001,6 @@ FREETDS_DIR!$FREETDS_DIR$ac_delim
- PBX_FREETDS!$PBX_FREETDS$ac_delim
- TERMCAP_LIB!$TERMCAP_LIB$ac_delim
- TERMCAP_INCLUDE!$TERMCAP_INCLUDE$ac_delim
+@@ -50531,18 +51155,6 @@ OPENSSL_DIR!$OPENSSL_DIR$ac_delim
+ PBX_OPENSSL!$PBX_OPENSSL$ac_delim
+ FREETDS_LIB!$FREETDS_LIB$ac_delim
+ FREETDS_INCLUDE!$FREETDS_INCLUDE$ac_delim
+-FREETDS_DIR!$FREETDS_DIR$ac_delim
+-PBX_FREETDS!$PBX_FREETDS$ac_delim
+-TERMCAP_LIB!$TERMCAP_LIB$ac_delim
+-TERMCAP_INCLUDE!$TERMCAP_INCLUDE$ac_delim
 -TERMCAP_DIR!$TERMCAP_DIR$ac_delim
 -PBX_TERMCAP!$PBX_TERMCAP$ac_delim
 -TINFO_LIB!$TINFO_LIB$ac_delim
@@ -1129,10 +1334,14 @@
  _ACEOF
  
    if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -50584,6 +51042,14 @@ _ACEOF
+@@ -50584,6 +51196,18 @@ _ACEOF
  ac_delim='%!_!# '
  for ac_last_try in false false false false false :; do
    cat >conf$$subs.sed <<_ACEOF
++FREETDS_DIR!$FREETDS_DIR$ac_delim
++PBX_FREETDS!$PBX_FREETDS$ac_delim
++TERMCAP_LIB!$TERMCAP_LIB$ac_delim
++TERMCAP_INCLUDE!$TERMCAP_INCLUDE$ac_delim
 +TERMCAP_DIR!$TERMCAP_DIR$ac_delim
 +PBX_TERMCAP!$PBX_TERMCAP$ac_delim
 +TINFO_LIB!$TINFO_LIB$ac_delim
@@ -1144,7 +1353,7 @@
  TONEZONE_DIR!$TONEZONE_DIR$ac_delim
  PBX_TONEZONE!$PBX_TONEZONE$ac_delim
  USB_LIB!$USB_LIB$ac_delim
-@@ -50637,6 +51103,7 @@ OPENH323_INCDIR!$OPENH323_INCDIR$ac_delim
+@@ -50637,6 +51261,7 @@ OPENH323_INCDIR!$OPENH323_INCDIR$ac_delim
  OPENH323_LIBDIR!$OPENH323_LIBDIR$ac_delim
  OPENH323_SUFFIX!$OPENH323_SUFFIX$ac_delim
  OPENH323_BUILD!$OPENH323_BUILD$ac_delim
@@ -1152,22 +1361,23 @@
  CONFIG_GMIME!$CONFIG_GMIME$ac_delim
  PBX_ZAPTEL_VLDTMF!$PBX_ZAPTEL_VLDTMF$ac_delim
  PBX_ZAPTEL_ECHOCANPARAMS!$PBX_ZAPTEL_ECHOCANPARAMS$ac_delim
-@@ -50648,12 +51115,11 @@ PBX_H323!$PBX_H323$ac_delim
+@@ -50648,12 +51273,12 @@ PBX_H323!$PBX_H323$ac_delim
  PBX_IXJUSER!$PBX_IXJUSER$ac_delim
  CONFIG_SDL!$CONFIG_SDL$ac_delim
  CONFIG_GTK!$CONFIG_GTK$ac_delim
 -PKGCONFIG!$PKGCONFIG$ac_delim
++LIBEDIT_OBJ!$LIBEDIT_OBJ$ac_delim
  CURL_CONFIG!$CURL_CONFIG$ac_delim
  LTLIBOBJS!$LTLIBOBJS$ac_delim
  _ACEOF
  
 -  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 67; then
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 75; then
++  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 80; then
      break
    elif $ac_last_try; then
      { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
 diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in
-index 087a6a0..8b3d70a 100644
+index 087a6a0..1fb7355 100644
 --- a/include/asterisk/autoconfig.h.in
 +++ b/include/asterisk/autoconfig.h.in
 @@ -113,6 +113,12 @@
@@ -1183,7 +1393,17 @@
  /* Define to 1 if byteswap.h macros are available. */
  #undef HAVE_BYTESWAP_H
  
-@@ -439,12 +445,9 @@
+@@ -382,6 +388,9 @@
+ /* Define to indicate the ${LDAP_DESCRIP} library version */
+ #undef HAVE_LDAP_VERSION
+ 
++/* Define if your system has the NetBSD Editline libraries. */
++#undef HAVE_LIBEDIT
++
+ /* Define to 1 if you have the <libintl.h> header file. */
+ #undef HAVE_LIBINTL_H
+ 
+@@ -439,12 +448,9 @@
  /* Define to indicate the ${LTDL_DESCRIP} library version */
  #undef HAVE_LTDL_VERSION
  
@@ -1197,7 +1417,7 @@
  /* Define to 1 if you have the <malloc.h> header file. */
  #undef HAVE_MALLOC_H
  
-@@ -712,6 +715,12 @@
+@@ -712,6 +718,12 @@
  /* Define to 1 if your system has soxmix application. */
  #undef HAVE_SOXMIX
  

asterisk-1.6.0-beta6-chanmobile.patch:

Index: asterisk-1.6.0-beta6-chanmobile.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/asterisk-1.6.0-beta6-chanmobile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- asterisk-1.6.0-beta6-chanmobile.patch	19 Mar 2008 17:41:15 -0000	1.1
+++ asterisk-1.6.0-beta6-chanmobile.patch	25 Mar 2008 20:20:22 -0000	1.2
@@ -1,4 +1,4 @@
-From 38296a8480f5a77ff31086cddbd5c3828f782116 Mon Sep 17 00:00:00 2001
+From 3f5b21bd6efb829d144605c431a87c13936ecb5e Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Mon, 25 Feb 2008 09:23:28 -0600
 Subject: [PATCH] Add chan_mobile from asterisk-addons.

asterisk-1.6.0-beta6-lua.patch:

Index: asterisk-1.6.0-beta6-lua.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/asterisk-1.6.0-beta6-lua.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- asterisk-1.6.0-beta6-lua.patch	19 Mar 2008 17:41:15 -0000	1.1
+++ asterisk-1.6.0-beta6-lua.patch	25 Mar 2008 20:20:22 -0000	1.2
@@ -1,4 +1,4 @@
-From deaa6ef7c67297cda351f888fba4c195295a0bca Mon Sep 17 00:00:00 2001
+From 5e2202876cb8ab3f2e43bd2111884913c81a8186 Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Mon, 25 Feb 2008 13:14:23 -0600
 Subject: [PATCH] Use pkgconfig to check for Lua.

asterisk-1.6.0-beta6-optimization.patch:

Index: asterisk-1.6.0-beta6-optimization.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/asterisk-1.6.0-beta6-optimization.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- asterisk-1.6.0-beta6-optimization.patch	19 Mar 2008 17:41:15 -0000	1.1
+++ asterisk-1.6.0-beta6-optimization.patch	25 Mar 2008 20:20:22 -0000	1.2
@@ -1,4 +1,4 @@
-From 52f8aa407e85fdf83496fe86cdf379cb5cdf35a4 Mon Sep 17 00:00:00 2001
+From 5400c5cf975c1735a4189fa211a06e7772611451 Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jcollie at pc21224.campus.dmacc.edu>
 Date: Thu, 8 Nov 2007 16:42:14 -0600
 Subject: [PATCH] Pick proper optimization flags for Fedora.


Index: asterisk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/asterisk.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- asterisk.spec	19 Mar 2008 17:41:15 -0000	1.18
+++ asterisk.spec	25 Mar 2008 20:20:22 -0000	1.19
@@ -4,7 +4,7 @@
 Summary: The Open Source PBX
 Name: asterisk
 Version: 1.6.0
-Release: 0.6.beta%{beta}%{?dist}
+Release: 0.8.beta%{beta}%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.asterisk.org/
@@ -40,7 +40,8 @@
 Patch6:  asterisk-1.6.0-beta6-optimization.patch
 Patch7:  asterisk-1.6.0-beta6-chanmobile.patch
 Patch8:  asterisk-1.6.0-beta6-lua.patch
-Patch9:  asterisk-1.6.0-beta6-autoconf.patch
+Patch9:  asterisk-1.6.0-beta6-editline.patch
+Patch10: asterisk-1.6.0-beta6-autoconf.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
@@ -74,6 +75,9 @@
 # codec_gsm
 BuildRequires: gsm-devel
 
+# cli
+BuildRequires: libedit-devel
+
 Requires(pre): %{_sbindir}/useradd
 Requires(pre): %{_sbindir}/groupadd
 Requires(post): /sbin/chkconfig
@@ -403,6 +407,7 @@
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
 
 cp %{SOURCE2} menuselect.makedeps
 cp %{SOURCE3} menuselect.makeopts
@@ -421,7 +426,9 @@
 
 # if we are building for i386 promote the CPU arch to i486 for atomic operations support
 %ifarch i386
-%define optflags %{__global_cflags} -m32 -march=i486 -mtune=generic -fasynchronous-unwind-tables
+%define optflags %{__global_cflags} -m32 -march=i486 -mtune=generic -fasynchronous-unwind-tables -Werror-implicit-function-declaration
+%else
+%define optflags %(rpm --eval %%{optflags}) -Werror-implicit-function-declaration
 %endif
 
 #aclocal
@@ -440,7 +447,7 @@
 %configure
 popd
 
-%configure --with-imap=system --with-gsm=/usr
+%configure --with-imap=system --with-gsm=/usr --with-libedit=yes
 
 ASTCFLAGS="%{optflags}" make DEBUG= OPTIMIZE= ASTVARRUNDIR=%{_localstatedir}/run/asterisk ASTDATADIR=%{_datadir}/asterisk NOISY_BUILD=1
 
@@ -511,6 +518,10 @@
 # Don't package example phone provision configs
 rm -rf %{buildroot}%{_datadir}/asterisk/phoneprov/*
 
+# these are compiled with -O0 and thus include unfortified code.
+rm -rf %{buildroot}%{_sbindir}/hashtest
+rm -rf %{buildroot}%{_sbindir}/hashtest2
+
 %if %{with_apidoc}
 find doc/api/html -name \*.map -size 0 -delete
 %endif
@@ -717,8 +728,6 @@
 %{_sbindir}/autosupport
 %{_sbindir}/check_expr
 %{_sbindir}/conf2ael
-%{_sbindir}/hashtest
-%{_sbindir}/hashtest2
 %{_sbindir}/muted
 %{_sbindir}/rasterisk
 %{_sbindir}/safe_asterisk
@@ -1008,6 +1017,16 @@
 %{_libdir}/asterisk/modules/codec_zap.so
 
 %changelog
+* Tue Mar 25 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0-0.8.beta6
+- Update patches.
+- Add patch to compile against external libedit rather than using the
+  in-tree version.
+- Add -Werror-implicit-function-declaration to optflags.
+- Get rid of hashtest and hashtest2 binaries that link to unfortified
+  versions of *printf functions.  They are compiled with -O0 which
+  somehow pulls in the wrong versions.  These programs aren't
+  necessary to the operation of the package anyway.
+
 * Wed Mar 19 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0-0.6.beta6
 - Update to 1.6.0-beta6 to fix some security issues.
 -

More information about the fedora-extras-commits mailing list