[asterisk] * Mon Aug 2 2010 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.8.0-0.1.beta2 - Update to 1.8.0-beta2 - Dis

Jeffrey C. Ollie jcollie at fedoraproject.org
Mon Aug 2 19:20:09 UTC 2010 

commit a4d5529d82088fafbdc9f5b7a0db306e5f135c29
Author: Jeffrey C. Ollie <jeff at ocjtech.us>
Date:   Mon Aug 2 14:19:54 2010 -0500

    * Mon Aug  2 2010 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.8.0-0.1.beta2
    - Update to 1.8.0-beta2
    - Disable building chan_misdn until compilation errors are figured out (https://issues.asterisk.org/view.php?id=14333)
    - Start stripping tarballs again because Digium added MP3 code :(

 .gitignore                                         |    2 +
 ...it-scripts-for-better-Fedora-compatibilty.patch |   69 ++++----
 ...les.conf-so-that-different-voicemail-modu.patch |    6 +-
 ...king-building-against-an-external-libedit.patch |   51 +++---
 ...rary-function-for-loading-command-history.patch |    6 +-
 ...igure.ac-to-look-for-pkg-config-gmime-2.0.patch |   12 +-
 0006-Fix-up-some-paths.patch                       |   40 +++---
 ...hema-that-is-compatible-with-Fedora-Direc.patch |    2 +-
 ...2html-to-copy-icons-when-building-documen.patch |    4 +-
 asterisk-strip.sh                                  |   54 ++++++
 asterisk.spec                                      |  181 +++++++++++++++++---
 menuselect.makeopts                                |    9 +-
 sources                                            |    4 +-
 13 files changed, 315 insertions(+), 125 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4c8f5db..1ff251c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 asterisk-1.6.2.10.tar.gz
 asterisk-1.6.2.10.tar.gz.asc
+asterisk-1.8.0-beta2-stripped.tar.gz
+asterisk-1.8.0-beta2.tar.gz.asc
diff --git a/0001-Modify-init-scripts-for-better-Fedora-compatibilty.patch b/0001-Modify-init-scripts-for-better-Fedora-compatibilty.patch
index 46c6e72..7fc5f1a 100644
--- a/0001-Modify-init-scripts-for-better-Fedora-compatibilty.patch
+++ b/0001-Modify-init-scripts-for-better-Fedora-compatibilty.patch
@@ -1,16 +1,16 @@
-From ed8a94405e46074833a9fc0e7b09db428d3afecd Mon Sep 17 00:00:00 2001
+From 117f836971018ca793a205482b93179734ef987c Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Wed, 28 Jul 2010 07:22:21 -0500
 Subject: [PATCH 1/8] Modify init scripts for better Fedora compatibilty.
 
 ---
- contrib/init.d/rc.redhat.asterisk |   75 +++++++++++++++++--------------------
- contrib/sysconfig/asterisk        |   19 +++++++++
- 2 files changed, 53 insertions(+), 41 deletions(-)
+ contrib/init.d/rc.redhat.asterisk |   70 ++++++++++++++++++++-----------------
+ contrib/sysconfig/asterisk        |   19 ++++++++++
+ 2 files changed, 57 insertions(+), 32 deletions(-)
  create mode 100644 contrib/sysconfig/asterisk
 
 diff --git a/contrib/init.d/rc.redhat.asterisk b/contrib/init.d/rc.redhat.asterisk
-index 3841afe..a72ea2a 100755
+index abf3951..0d53a57 100755
 --- a/contrib/init.d/rc.redhat.asterisk
 +++ b/contrib/init.d/rc.redhat.asterisk
 @@ -3,7 +3,7 @@
@@ -22,9 +22,9 @@ index 3841afe..a72ea2a 100755
  # description: Asterisk PBX and telephony daemon.
  # processname: asterisk
  # pidfile: __ASTERISK_VARRUN_DIR__/asterisk.pid
-@@ -20,51 +20,51 @@
- # - Added support for -U and -G command line options
- # - Modified "reload" to call asterisk -rx 'reload' 
+@@ -32,8 +32,11 @@
+ # Description:		the Asterisk Open Source PBX
+ ### END INIT INFO
  
 +# Do not modify this script to change any of the settings, instead
 +# edit /etc/sysconfig/asterisk
@@ -35,13 +35,10 @@ index 3841afe..a72ea2a 100755
  
  # Installation directory
  AST_SBIN=__ASTERISK_SBIN_DIR__
+@@ -41,31 +44,39 @@ AST_SBIN=__ASTERISK_SBIN_DIR__
+ # Source function library.
+ . /etc/rc.d/init.d/functions
  
--# Uncomment the following and set them to the user/groups that you
--# want to run Asterisk as. NOTE: this requires substantial work to
--# be sure that Asterisk's environment has permission to write the
--# files required  for  its  operation, including logs, its comm
--# socket, the asterisk database, etc.
--#AST_USER="asterisk"
 +# The user that Asterisk will run as.
 +AST_USER="asterisk"
 +
@@ -51,10 +48,8 @@ index 3841afe..a72ea2a 100755
 +# group, set AST_GROUP to the group that Asterisk should run as.  Note
 +# that this may break DAHDI devices as supplementary groups will not
 +# be initialized.
- #AST_GROUP="asterisk"
- 
--# Source function library.
--. /etc/rc.d/init.d/functions
++#AST_GROUP="asterisk"
++
 +# Allow configuration overrides in /etc/sysconfig/asterisk
 +CONFIG0=`readlink $0`
 +if [ "$CONFIG0" = "" ]; then
@@ -63,7 +58,7 @@ index 3841afe..a72ea2a 100755
 +	CONFIGFILE=/etc/sysconfig/`basename $CONFIG0`
 +fi
 +[ -f $CONFIGFILE ] && . $CONFIGFILE
- 
++
  if ! [ -x $AST_SBIN/asterisk ] ; then
  	echo "ERROR: $AST_SBIN/asterisk not found"
  	exit 0
@@ -76,11 +71,6 @@ index 3841afe..a72ea2a 100755
  	exit 0
  fi
  
--# Uncomment this ONLY if you know what you are doing.
--# export LD_ASSUME_KERNEL=2.4.1
-+# Source function library.
-+. /etc/rc.d/init.d/functions
- 
  # Full path to asterisk binary
  DAEMON=$AST_SBIN/asterisk
  
@@ -94,21 +84,25 @@ index 3841afe..a72ea2a 100755
 -else
 -	CONFIGFILE=/etc/sysconfig/`basename $CONFIG0`
 -fi
--[ -x $CONFIGFILE ] && . $CONFIGFILE
+-[ -r $CONFIGFILE ] && . $CONFIGFILE
 -
  RETVAL=0
  
  start() {
-@@ -78,19 +78,18 @@ start() {
+@@ -79,17 +90,18 @@ start() {
  
  	# Start daemons.
  	echo -n $"Starting asterisk: "
 -        if [ -f $SAFE_ASTERISK ] ; then
 -		DAEMON=$SAFE_ASTERISK
 -	fi
++
++	export HOME=~asterisk
++	cd $HOME
++
  	if [ $AST_USER ] ; then
 -		ASTARGS="-U $AST_USER"
-+		AST_ARGS="-U $AST_USER"
++		AST_ARGS="$AST_ARGS -U $AST_USER"
  	fi
  	if [ $AST_GROUP ] ; then
 -		ASTARGS="$ASTARGS -G $AST_GROUP"
@@ -116,16 +110,23 @@ index 3841afe..a72ea2a 100755
  	fi
  	if [ $AST_CONFIG ]; then
 -		ASTARGS="$ASTARGS -C $AST_CONFIG/asterisk.conf"
-+		AST_ARGS="$AST_ARGS -C $AST_CONFIG"
++		ASTARGS="$ASTARGS -C $AST_CONFIG"
+ 	elif [ $ALTCONF ]; then
+ 		ASTARGS="$ASTARGS -C $ALTCONF"
+ 	fi
+@@ -115,9 +127,9 @@ start() {
+ 	fi
+ 	if [ "x$COLOR" = "xyes" ]; then
+ 		export TERM=linux
+-		daemon sh -c "$DAEMON $ASTARGS -c" >/dev/null </dev/null 2>&1 &
++		daemon sh -c "$DAEMON $ASTARGS $AST_EXTRA_ARGS -c" >/dev/null </dev/null 2>&1 &
+ 	else
+-		daemon $DAEMON $ASTARGS
++		daemon $DAEMON $ASTARGS $AST_EXTRA_ARGS
  	fi
--	daemon $DAEMON $ASTARGS
-+	export HOME=~asterisk
-+	cd $HOME
-+	daemon $DAEMON $AST_ARGS $AST_EXTRA_ARGS
  	RETVAL=$?
  	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/asterisk
- 	echo
-@@ -98,14 +97,8 @@ start() {
+@@ -126,14 +138,8 @@ start() {
  }
  
  stop() {
diff --git a/0002-Modify-modules.conf-so-that-different-voicemail-modu.patch b/0002-Modify-modules.conf-so-that-different-voicemail-modu.patch
index 7f96be4..04fddc5 100644
--- a/0002-Modify-modules.conf-so-that-different-voicemail-modu.patch
+++ b/0002-Modify-modules.conf-so-that-different-voicemail-modu.patch
@@ -1,4 +1,4 @@
-From d21028cd015ad28165533a007d49377cbec11bac Mon Sep 17 00:00:00 2001
+From 48bcab5e25117894619e063c3a881fa9cca4b8c8 Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Wed, 28 Jul 2010 07:23:49 -0500
 Subject: [PATCH 2/8] Modify modules.conf so that different voicemail modules don't load at the same time.
@@ -8,10 +8,10 @@ Subject: [PATCH 2/8] Modify modules.conf so that different voicemail modules don
  1 files changed, 26 insertions(+), 0 deletions(-)
 
 diff --git a/configs/modules.conf.sample b/configs/modules.conf.sample
-index 5b553a4..39645c3 100644
+index 38e33e1..9a1c1c3 100644
 --- a/configs/modules.conf.sample
 +++ b/configs/modules.conf.sample
-@@ -35,3 +35,29 @@ noload => chan_alsa.so
+@@ -43,3 +43,29 @@ noload => chan_alsa.so
  ;noload => chan_oss.so
  noload => chan_console.so
  ;
diff --git a/0003-Allow-linking-building-against-an-external-libedit.patch b/0003-Allow-linking-building-against-an-external-libedit.patch
index 7cd8ab9..cb2c05f 100644
--- a/0003-Allow-linking-building-against-an-external-libedit.patch
+++ b/0003-Allow-linking-building-against-an-external-libedit.patch
@@ -1,4 +1,4 @@
-From 61006b2d0679cadf369ce6028cf98ebf722db600 Mon Sep 17 00:00:00 2001
+From 15f7cc517ffd300c7606031fa5b2eae4959cd481 Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Fri, 5 Mar 2010 14:10:52 -0600
 Subject: [PATCH 3/8] Allow linking/building against an external libedit.
@@ -13,36 +13,36 @@ the libedit library.
 ---
  build_tools/menuselect-deps.in |    1 +
  configure.ac                   |   22 ++++++++++++++++++++++
- main/Makefile                  |    8 +++++---
+ main/Makefile                  |   10 ++++++----
  main/cli.c                     |    3 ++-
  makeopts.in                    |    4 ++++
- 5 files changed, 34 insertions(+), 4 deletions(-)
+ 5 files changed, 35 insertions(+), 5 deletions(-)
 
 diff --git a/build_tools/menuselect-deps.in b/build_tools/menuselect-deps.in
-index 5f399fc..695622c 100644
+index 2a5bcd7..a0f4e16 100644
 --- a/build_tools/menuselect-deps.in
 +++ b/build_tools/menuselect-deps.in
-@@ -21,6 +21,7 @@ ISDNNET=@PBX_ISDNNET@
- IXJUSER=@PBX_IXJUSER@
- JACK=@PBX_JACK@
+@@ -24,6 +24,7 @@ JACK=@PBX_JACK@
+ KQUEUE=@PBX_KQUEUE@
  LDAP=@PBX_LDAP@
+ LIBXML2=@PBX_LIBXML2@
 +LIBEDIT=@PBX_LIBEDIT@
  LTDL=@PBX_LTDL@
  LUA=@PBX_LUA@
  MISDN=@PBX_MISDN@
 diff --git a/configure.ac b/configure.ac
-index 0b6748e..1b3f9c7 100644
+index b0adfd7..44ed33f 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -315,6 +315,7 @@ AST_EXT_LIB_SETUP([ISDNNET], [ISDN4Linux], [isdnnet])
- AST_EXT_LIB_SETUP([JACK], [Jack Audio Connection Kit], [jack])
+@@ -325,6 +325,7 @@ AST_EXT_LIB_SETUP([JACK], [Jack Audio Connection Kit], [jack])
+ AST_EXT_LIB_SETUP([KQUEUE], [kqueue support], [kqueue])
  AST_EXT_LIB_SETUP([LDAP], [OpenLDAP], [ldap])
  AST_LIBCURL_CHECK_CONFIG([], [7.10.1])
 +AST_EXT_LIB_SETUP([LIBEDIT], [NetBSD Editline library], [libedit])
  AST_EXT_LIB_SETUP([LIBXML2], [LibXML2], [libxml2])
  AST_EXT_LIB_SETUP([LTDL], [libtool], [ltdl])
  AST_EXT_LIB_SETUP([LUA], [Lua], [lua])
-@@ -1778,6 +1779,27 @@ AC_SUBST(PBX_GTK2)
+@@ -1948,6 +1949,27 @@ AC_SUBST(PBX_GTK2)
  AC_SUBST(GTK2_INCLUDE)
  AC_SUBST(GTK2_LIB)
  
@@ -71,10 +71,10 @@ index 0b6748e..1b3f9c7 100644
  # or iODBC
  
 diff --git a/main/Makefile b/main/Makefile
-index 6e61808..ec2c2bc 100644
+index 8175f1e..34cac4b 100644
 --- a/main/Makefile
 +++ b/main/Makefile
-@@ -145,6 +145,8 @@ testexpr2: ast_expr2f.c ast_expr2.c ast_expr2.h
+@@ -139,6 +139,8 @@ testexpr2: ast_expr2f.c ast_expr2.c ast_expr2.h
  	$(CC) -g -o testexpr2 ast_expr2f.o ast_expr2.o -lm
  	rm ast_expr2.o ast_expr2f.o 
  
@@ -83,25 +83,26 @@ index 6e61808..ec2c2bc 100644
  ifneq ($(findstring ENABLE_UPLOADS,$(MENUSELECT_CFLAGS)),)
  http.o: _ASTCFLAGS+=$(GMIME_INCLUDE)
  endif
-@@ -177,13 +179,13 @@ ifneq ($(findstring ENABLE_UPLOADS,$(MENUSELECT_CFLAGS)),)
- GMIMELDFLAGS+=$(GMIME_LIB)
- endif
+@@ -173,13 +175,13 @@ endif
+ 
+ $(OBJS): _ASTCFLAGS+=-DAST_MODULE=\"core\"
  
 -$(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 $(ASTCFLAGS)
- 	$(ECHO_PREFIX) echo "   [LD] $^ -> $@"
+-	$(ECHO_PREFIX) echo "   [LD] $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) -> $@"
++	$(ECHO_PREFIX) echo "   [LD] $(OBJS) $(LIBEDIT_OBJ) db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) -> $@"
  ifneq ($(findstring chan_h323,$(MENUSELECT_CHANNELS)),)
--	$(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS)
-+	$(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS) $(LIBEDIT_LIB)
+-	$(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS)
++	$(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $(OBJS) $(LIBEDIT_OBJ) db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS) $(LIBEDIT_LIB)
  else
--	$(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS)
-+	$(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS) $(LIBEDIT_LIB)
+-	$(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS)
++	$(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $(OBJS) $(LIBEDIT_OBJ) db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS) $(LIBEDIT_LIB)
  endif
- 	$(CMD_PREFIX) $(ASTTOPDIR)/build_tools/strip_nonapi $@ || rm $@
  
+ ifeq ($(GNU_LD),1)
 diff --git a/main/cli.c b/main/cli.c
-index 8361e4e..4655ae3 100644
+index c9dbc6d..ec801d6 100644
 --- a/main/cli.c
 +++ b/main/cli.c
 @@ -36,6 +36,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
@@ -122,10 +123,10 @@ index 8361e4e..4655ae3 100644
  
  /*!
 diff --git a/makeopts.in b/makeopts.in
-index 8de43af..9b6f757 100644
+index e425dbc..2a74ee8 100644
 --- a/makeopts.in
 +++ b/makeopts.in
-@@ -260,3 +260,7 @@ TINFO_DIR=@TINFO_DIR@
+@@ -288,3 +288,7 @@ TINFO_DIR=@TINFO_DIR@
  # if poll is not present, let the makefile know.
  POLL_AVAILABLE=@HAS_POLL@
  TIMERFD_INCLUDE=@TIMERFD_INCLUDE@
diff --git a/0004-Use-the-library-function-for-loading-command-history.patch b/0004-Use-the-library-function-for-loading-command-history.patch
index 393ba4f..2f58dac 100644
--- a/0004-Use-the-library-function-for-loading-command-history.patch
+++ b/0004-Use-the-library-function-for-loading-command-history.patch
@@ -1,4 +1,4 @@
-From 98d1fbfcafae782ac728c0e0445917aaf20f37e1 Mon Sep 17 00:00:00 2001
+From 983250cd3e8dfb8cf48125106381e59e9ccb184d Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Mon, 8 Mar 2010 12:38:56 -0600
 Subject: [PATCH 4/8] Use the library function for loading command history rather than implementing our own.
@@ -8,10 +8,10 @@ Subject: [PATCH 4/8] Use the library function for loading command history rather
  1 files changed, 2 insertions(+), 19 deletions(-)
 
 diff --git a/main/asterisk.c b/main/asterisk.c
-index 67dbfa8..4327d99 100644
+index d8d3aeb..041ae8c 100644
 --- a/main/asterisk.c
 +++ b/main/asterisk.c
-@@ -2596,29 +2596,12 @@ static int ast_el_write_history(char *filename)
+@@ -2612,29 +2612,12 @@ static int ast_el_write_history(char *filename)
  
  static int ast_el_read_history(char *filename)
  {
diff --git a/0005-Change-configure.ac-to-look-for-pkg-config-gmime-2.0.patch b/0005-Change-configure.ac-to-look-for-pkg-config-gmime-2.0.patch
index 814add4..f270cb1 100644
--- a/0005-Change-configure.ac-to-look-for-pkg-config-gmime-2.0.patch
+++ b/0005-Change-configure.ac-to-look-for-pkg-config-gmime-2.0.patch
@@ -1,4 +1,4 @@
-From e9e1c379941a4de1e0c1e63df81f44d9c0562ad9 Mon Sep 17 00:00:00 2001
+From 5985aeec2d8a09bf453a58befabbb7b5d245c65c Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Wed, 28 Jul 2010 07:26:02 -0500
 Subject: [PATCH 5/8] Change configure.ac to look for pkg-config gmime-2.0
@@ -8,14 +8,14 @@ Subject: [PATCH 5/8] Change configure.ac to look for pkg-config gmime-2.0
  1 files changed, 11 insertions(+), 1 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 1b3f9c7..ce02844 100644
+index 44ed33f..6e1b035 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1631,7 +1631,17 @@ then
-     AST_CHECK_OSPTK([3], [5], [0])
- fi
+@@ -1797,7 +1797,17 @@ fi
  
--AST_EXT_TOOL_CHECK([GMIME], [gmime], [], [], [#include <gmime/gmime.h>], [gboolean q = g_mime_check_version(0,0,0);])
+ AST_EXT_LIB_CHECK([SRTP], [srtp], [srtp_init], [srtp/srtp.h])
+ 
+-AST_EXT_TOOL_CHECK([GMIME], [gmime-config], [], [], [#include <gmime/gmime.h>], [gboolean q = g_mime_check_version(0,0,0);])
 +PBX_GMIME=0
 +AC_CHECK_TOOL(PKGCONFIG, pkg-config, No)
 +if test ! "x${PKGCONFIG}" = xNo; then
diff --git a/0006-Fix-up-some-paths.patch b/0006-Fix-up-some-paths.patch
index 3c090bc..5167d52 100644
--- a/0006-Fix-up-some-paths.patch
+++ b/0006-Fix-up-some-paths.patch
@@ -1,4 +1,4 @@
-From 366115a2031ce0f388826216a8602e2fc2d47fcf Mon Sep 17 00:00:00 2001
+From 03c1fa739fd7dc6b9086c129d19e42903157d211 Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Wed, 28 Jul 2010 07:27:48 -0500
 Subject: [PATCH 6/8] Fix up some paths
@@ -36,7 +36,7 @@ index f99f937..981bca7 100644
  directory and its subdirectories. This is the layout that will be created if you
  select non-English languages to be installed via menuselect, HOWEVER Asterisk does
 diff --git a/configs/festival.conf.sample b/configs/festival.conf.sample
-index 774f1a1..815f11d 100644
+index e918217..31d5fc2 100644
 --- a/configs/festival.conf.sample
 +++ b/configs/festival.conf.sample
 @@ -21,7 +21,7 @@
@@ -49,7 +49,7 @@ index 774f1a1..815f11d 100644
  ; Festival command to send to the server.
  ; Defaults to: (tts_textasterisk "%s" 'file)(quit)\n
 diff --git a/configs/http.conf.sample b/configs/http.conf.sample
-index f15c9cf..6349905 100644
+index 6f10de7..e956a8f 100644
 --- a/configs/http.conf.sample
 +++ b/configs/http.conf.sample
 @@ -5,7 +5,7 @@
@@ -61,7 +61,7 @@ index f15c9cf..6349905 100644
  ;   HTTP server is enabled in this file by setting the "enabled", "bindaddr",
  ;   and "bindport" options, then you should be able to view the documentation
  ;   remotely by browsing to:
-@@ -66,6 +66,6 @@ bindaddr=127.0.0.1
+@@ -69,6 +69,6 @@ bindaddr=127.0.0.1
  ;[post_mappings]
  ;
  ; In this example, if the prefix option is set to "asterisk", then using the
@@ -71,11 +71,11 @@ index f15c9cf..6349905 100644
 +;uploads = /var/spool/asterisk/uploads/
  ;
 diff --git a/configs/iax.conf.sample b/configs/iax.conf.sample
-index 76194fa..beb2bc5 100644
+index b516d4b..27a1b1b 100644
 --- a/configs/iax.conf.sample
 +++ b/configs/iax.conf.sample
-@@ -443,8 +443,8 @@ inkeys=freeworlddialup
- ; authentication is used, "inkeys" is a list of acceptable public keys on the 
+@@ -447,8 +447,8 @@ inkeys=freeworlddialup
+ ; authentication is used, "inkeys" is a list of acceptable public keys on the
  ; local system that can be used to authenticate the remote peer, separated by
  ; the ":" character.  "outkey" is a single, private key to use to authenticate
 -; to the other side.  Public keys are named /var/lib/asterisk/keys/<name>.pub
@@ -86,7 +86,7 @@ index 76194fa..beb2bc5 100644
  ;
  ;
 diff --git a/configs/musiconhold.conf.sample b/configs/musiconhold.conf.sample
-index 8ccc851..10c066e 100644
+index 714e264..2354379 100644
 --- a/configs/musiconhold.conf.sample
 +++ b/configs/musiconhold.conf.sample
 @@ -32,7 +32,7 @@
@@ -115,27 +115,27 @@ index 8ccc851..10c066e 100644
 +;directory=/usr/share/asterisk/mohmp3
  ;application=/site/sw/bin/madplay -Q -o raw:- --mono -R 8000 -a -12
 diff --git a/configs/osp.conf.sample b/configs/osp.conf.sample
-index e342337..bab1b18 100644
+index e72aa32..f7ee625 100644
 --- a/configs/osp.conf.sample
 +++ b/configs/osp.conf.sample
-@@ -36,8 +36,8 @@
+@@ -45,8 +45,8 @@
  ;source=domain name or [IP address in brackets]
  ;
  ; Define path and file name of crypto files.
--; The default path for crypto file is /var/lib/asterisk/keys.  If no path is 
+-; The default path for crypto file is /var/lib/asterisk/keys.  If no path is
 -; defined, crypto files will in /var/lib/asterisk/keys directory.
 +; The default path for crypto file is /usr/share/asterisk/keys.  If no path is
 +; defined, crypto files will in /usr/share/asterisk/keys directory.
  ;
- ; Specify the private key file name.  
- ; If this parameter is unspecified or not present, the default name will be the 
+ ; Specify the private key file name.
+ ; If this parameter is unspecified or not present, the default name will be the
 diff --git a/configs/phoneprov.conf.sample b/configs/phoneprov.conf.sample
-index cb1acec..dba6b46 100644
+index c819d6d..4ee5684 100644
 --- a/configs/phoneprov.conf.sample
 +++ b/configs/phoneprov.conf.sample
 @@ -114,4 +114,4 @@ ${MAC}.cfg => 000000000000.cfg               ; Dynamically generated files.
  ${MAC}-phone.cfg => 000000000000-phone.cfg   ; (relative to AST_DATA_DIR/phoneprov)
- config/${MAC} => polycom.xml                 ; Dynamic Filename => template file 
+ config/${MAC} => polycom.xml                 ; Dynamic Filename => template file
  ${MAC}-directory.xml => 000000000000-directory.xml
 -setvar => CUSTOM_CONFIG=/var/lib/asterisk/phoneprov/configs/custom.cfg  ; Custom variable
 +setvar => CUSTOM_CONFIG=/usr/share/asterisk/phoneprov/configs/custom.cfg  ; Custom variable
@@ -153,10 +153,10 @@ index 6376048..e4a5a80 100644
  	echo "need to be initialized at runtime either by running"
  	echo "Asterisk with the '-i' option, or with the 'init keys'"
 diff --git a/contrib/scripts/astgenkey.8 b/contrib/scripts/astgenkey.8
-index 328a4d2..ac6feae 100644
+index 063feca..9ace9f2 100644
 --- a/contrib/scripts/astgenkey.8
 +++ b/contrib/scripts/astgenkey.8
-@@ -88,7 +88,7 @@ The private key: secret.
+@@ -87,7 +87,7 @@ The private key: secret.
  .RE
  
  Those files should be copied to 
@@ -165,7 +165,7 @@ index 328a4d2..ac6feae 100644
  
  (The private key: on your system. The public key: on other systems)
  
-@@ -122,10 +122,10 @@ readable, such as with the following commands:
+@@ -121,10 +121,10 @@ readable, such as with the following commands:
  And then make the key accessible to Asterisk (assuming you run it as
  user "asterisk").
  
@@ -179,7 +179,7 @@ index 328a4d2..ac6feae 100644
  .RE
  
 diff --git a/doc/osp.txt b/doc/osp.txt
-index a0cd429..c865cd2 100644
+index 9d059f0..f07e9f0 100644
 --- a/doc/osp.txt
 +++ b/doc/osp.txt
 @@ -136,7 +136,7 @@ make clean; make linux
@@ -200,7 +200,7 @@ index a0cd429..c865cd2 100644
  Note: The script enroll.sh requires AT&T korn shell (ksh) or any of its compatible variants. The /usr/src/TK-3_3_6-20060303/bin directory should be in the PATH variable. Otherwise, enroll.sh cannot find the enroll file.
  
  3 Asterisk
-@@ -247,9 +247,9 @@ servicepoint=http://OSP server IP:1080/osp
+@@ -247,9 +247,9 @@ servicepoint=http://OSP server IP:5045/osp
  source=[host IP]
  ;
  ; Define path and file name of crypto files.
diff --git a/0007-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch b/0007-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch
index 6248c9d..2e61c5f 100644
--- a/0007-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch
+++ b/0007-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch
@@ -1,4 +1,4 @@
-From 88a8723215b9c27ece6c18d7ef6019a50b0178af Mon Sep 17 00:00:00 2001
+From 857362629fd6f5c47c86516d9759b18ddb120730 Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Sun, 4 Jan 2009 19:22:39 -0600
 Subject: [PATCH 7/8] Add LDAP schema that is compatible with Fedora Directory Server.
diff --git a/0008-Tell-laxtex2html-to-copy-icons-when-building-documen.patch b/0008-Tell-laxtex2html-to-copy-icons-when-building-documen.patch
index 46c49bc..0d6fc99 100644
--- a/0008-Tell-laxtex2html-to-copy-icons-when-building-documen.patch
+++ b/0008-Tell-laxtex2html-to-copy-icons-when-building-documen.patch
@@ -1,4 +1,4 @@
-From 9bba846cd52ec6d026daec14b8c65bb1a38711b3 Mon Sep 17 00:00:00 2001
+From 2928abf791ff5329c9bfa91165c54af3873eb517 Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Wed, 28 Jul 2010 07:32:19 -0500
 Subject: [PATCH 8/8] Tell laxtex2html to copy icons when building documentation so that we don't have run-time dependencies on latex2html.
@@ -8,7 +8,7 @@ Subject: [PATCH 8/8] Tell laxtex2html to copy icons when building documentation
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/doc/tex/Makefile b/doc/tex/Makefile
-index 4add45a..e448c95 100644
+index c36b3a8..76d67d2 100644
 --- a/doc/tex/Makefile
 +++ b/doc/tex/Makefile
 @@ -41,7 +41,7 @@ html:
diff --git a/asterisk-strip.sh b/asterisk-strip.sh
new file mode 100644
index 0000000..89b91ad
--- /dev/null
+++ b/asterisk-strip.sh
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+version=$1
+
+if [ -z $version ]; then
+    echo "Please specify a version!"
+    exit 1
+fi
+
+wget --continue --timestamping http://downloads.digium.com/pub/telephony/asterisk/releases/asterisk-$version.tar.gz \
+                               http://downloads.digium.com/pub/telephony/asterisk/releases/asterisk-$version.tar.gz.asc
+
+if [ ! $? ]; then
+    echo "Unable to download!"
+    exit 1
+fi
+
+if [ ! -f asterisk-$version.tar.gz ]; then
+    echo "Can't find asterisk-$version.tar.gz!"
+    exit 1
+fi
+
+if [ ! -f asterisk-$version.tar.gz.asc ]; then
+    echo "Can't find asterisk-$version.tar.gz.asc!"
+    exit 1
+fi
+
+gpg --verify asterisk-$version.tar.gz.asc asterisk-$version.tar.gz
+
+if [ ! $? ]; then
+    echo "Bad signature!!!!"
+    exit 1
+fi
+
+echo
+read -p "Does the GPG signature look OK? " -n 1
+echo
+
+if [ $REPLY != "Y" -a $REPLY != "y" ]; then
+    exit 1
+fi
+
+tar xf asterisk-$version.tar.gz
+rm asterisk-$version/addons/format_mp3.c
+rm -rf asterisk-$version/addons/mp3
+tar czf asterisk-$version-stripped.tar.gz asterisk-$version
+rm -rf asterisk-$version
+
+echo "#"
+echo "# SHA256 Sums"
+echo "# ========="
+sha256sum -b asterisk-$version.tar.gz  asterisk-$version-stripped.tar.gz asterisk-$version.tar.gz.asc  | sed -e 's/^/# /'
+
+fedpkg new-sources asterisk-$version-stripped.tar.gz asterisk-$version.tar.gz.asc
diff --git a/asterisk.spec b/asterisk.spec
index 0412d22..f4ebfa1 100644
--- a/asterisk.spec
+++ b/asterisk.spec
@@ -1,17 +1,39 @@
 #global _rc 1
+%global _beta 2
 Summary: The Open Source PBX
 Name: asterisk
-Version: 1.6.2.10
-Release: 1%{?_rc:.rc%{_rc}}%{?dist}
+Version: 1.8.0
+Release: 0.1%{?_rc:.rc%{_rc}}%{?_beta:.beta%{_beta}}%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.asterisk.org/
 
-Source0: http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-%{version}%{?_rc:-rc%{_rc}}.tar.gz
-Source1: asterisk-logrotate
-Source2: menuselect.makedeps
-Source3: menuselect.makeopts
-Source5: http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-%{version}%{?_rc:-rc%{_rc}}.tar.gz.asc
+#Source0: http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-%{version}%{?_rc:-rc%{_rc}}%{?_beta:-beta%{_beta}}.tar.gz
+#Source1: http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-%{version}%{?_rc:-rc%{_rc}}%{?_beta:-beta%{_beta}}.tar.gz.asc
+
+# The Asterisk tarball contains some items that we don't want in there,
+# so start with the original tarball from here:
+#
+# http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-%{version}%{?_rc:-rc%{_rc}}%{?_beta:-beta%{_beta}}.tar.gz
+# http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-%{version}%{?_rc:-rc%{_rc}}%{?_beta:-beta%{_beta}}.tar.gz.asc
+#
+# Then run the included script file to build the stripped tarball:
+#
+# sh asterisk-strip.sh %{version}
+
+#
+# SHA256 Sums
+# =========
+# 4ece4a654e36513b195c518e217ec3dfba206ee7492332dd2e5ec54c9339a2a0 *asterisk-1.8.0-beta2.tar.gz
+# b4de3f943128bef4760c1b8c925dbf3724e2a3478ec3e0fbb9e5c3e99ff9fb80 *asterisk-1.8.0-beta2-stripped.tar.gz
+# 8b5d12291972eaa59737e3399fb437dd3a995c2a7c966c2f4da563f2dfa4de7b *asterisk-1.8.0-beta2.tar.gz.asc
+
+Source0: asterisk-%{version}%{?_rc:-rc%{_rc}}%{?_beta:-beta%{_beta}}-stripped.tar.gz
+Source1: asterisk-%{version}%{?_rc:-rc%{_rc}}%{?_beta:-beta%{_beta}}.tar.gz.asc
+Source2: asterisk-logrotate
+Source3: menuselect.makedeps
+Source4: menuselect.makeopts
+Source5: asterisk-strip.sh
 
 Patch1:  0001-Modify-init-scripts-for-better-Fedora-compatibilty.patch
 Patch2:  0002-Modify-modules.conf-so-that-different-voicemail-modu.patch
@@ -54,6 +76,10 @@ BuildRequires: graphviz-gd
 BuildRequires: libxml2-devel
 BuildRequires: latex2html
 
+# for building res_calendar_caldav
+BuildRequires: neon-devel
+BuildRequires: libical-devel
+
 # for codec_speex
 BuildRequires: speex-devel >= 1.2
 
@@ -111,6 +137,14 @@ Requires: asterisk = %{version}-%{release}
 %description apidoc
 API documentation for Asterisk.
 
+%package calendar
+Summary: Calendar applications for Asterisk
+Group: Applications/Internet
+Requires: asterisk = %{version}-%{release}
+
+%description calendar
+Calendar applications for Asterisk.
+
 %package curl
 Summary: Modules for Asterisk that use cURL
 Group: Applications/Internet
@@ -230,6 +264,16 @@ BuildRequires: mISDN-devel
 %description misdn
 mISDN channel for Asterisk.
 
+%package mobile
+Summary: Mobile (BlueTooth) channel for Asterisk
+Group: Applications/Internet
+Requires: asterisk = %{version}-%{release}
+Requires(pre): %{_sbindir}/usermod
+BuildRequires: bluez-libs-devel
+
+%description mobile
+Mobile (BlueTooth) channel for Asterisk.
+
 %package minivm
 Summary: MiniVM applicaton for Asterisk
 Group: Applications/Internet
@@ -238,6 +282,15 @@ Requires: asterisk = %{version}-%{release}
 %description minivm
 MiniVM application for Asterisk.
 
+%package mysql
+Summary: Applications for Asterisk that use MySQL
+Group: Applications/Internet
+Requires: asterisk = %{version}-%{release}
+BuildRequires: mysql-devel
+
+%description mysql
+Applications for Asterisk that use MySQL.
+
 %package odbc
 Summary: Applications for Asterisk that use ODBC (except voicemail)
 Group: Applications/Internet
@@ -248,6 +301,16 @@ BuildRequires: unixODBC-devel
 %description odbc
 Applications for Asterisk that use ODBC (except voicemail)
 
+%package ooh323
+Summary: H.323 channel for Asterisk using the Objective Systems Open H.323 for C library
+Group: Applications/Internet
+Requires: asterisk = %{version}-%{release}
+BuildRequires: libtool-ltdl-devel
+BuildRequires: unixODBC-devel
+
+%description ooh323
+H.323 channel for Asterisk using the Objective Systems Open H.323 for C library.
+
 %package oss
 Summary: Modules for Asterisk that use OSS sound drivers
 Group: Applications/Internet
@@ -387,7 +450,7 @@ Voicemail implementation for Asterisk that stores voicemail on the
 local filesystem.
 
 %prep
-%setup0 -q -n asterisk-%{version}%{?_rc:-rc%{_rc}}
+%setup0 -q -n asterisk-%{version}%{?_rc:-rc%{_rc}}%{?_beta:-beta%{_beta}}
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
@@ -397,8 +460,8 @@ local filesystem.
 %patch7 -p1
 %patch8 -p1
 
-cp %{SOURCE2} menuselect.makedeps
-cp %{SOURCE3} menuselect.makeopts
+cp %{S:3} menuselect.makedeps
+cp %{S:4} menuselect.makeopts
 
 # Fixup makefile so sound archives aren't downloaded/installed
 %{__perl} -pi -e 's/^all:.*$/all:/' sounds/Makefile
@@ -485,7 +548,7 @@ ASTCFLAGS="%{optflags}" make samples DEBUG= OPTIMIZE= DESTDIR=%{buildroot} ASTVA
 install -D -p -m 0755 contrib/init.d/rc.redhat.asterisk %{buildroot}%{_initrddir}/asterisk
 install -D -p -m 0644 contrib/sysconfig/asterisk %{buildroot}%{_sysconfdir}/sysconfig/asterisk
 install -D -p -m 0644 contrib/scripts/99asterisk.ldif %{buildroot}%{_sysconfdir}/dirsrv/schema/99asterisk.ldif
-install -D -p -m 0644 %{S:1} %{buildroot}%{_sysconfdir}/logrotate.d/asterisk
+install -D -p -m 0644 %{S:2} %{buildroot}%{_sysconfdir}/logrotate.d/asterisk
 install -D -p -m 0644 doc/asterisk-mib.txt %{buildroot}%{_datadir}/snmp/mibs/ASTERISK-MIB.txt
 install -D -p -m 0644 doc/digium-mib.txt %{buildroot}%{_datadir}/snmp/mibs/DIGIUM-MIB.txt
 
@@ -581,6 +644,7 @@ fi
 %{_libdir}/asterisk/modules/app_amd.so
 %{_libdir}/asterisk/modules/app_authenticate.so
 %{_libdir}/asterisk/modules/app_cdr.so
+%{_libdir}/asterisk/modules/app_celgenuserevent.so
 %{_libdir}/asterisk/modules/app_chanisavail.so
 %{_libdir}/asterisk/modules/app_channelredirect.so
 %{_libdir}/asterisk/modules/app_chanspy.so
@@ -614,6 +678,8 @@ fi
 %{_libdir}/asterisk/modules/app_readfile.so
 %{_libdir}/asterisk/modules/app_read.so
 %{_libdir}/asterisk/modules/app_record.so
+%{_libdir}/asterisk/modules/app_saycounted.so
+%{_libdir}/asterisk/modules/app_saycountpl.so
 %{_libdir}/asterisk/modules/app_sayunixtime.so
 %{_libdir}/asterisk/modules/app_senddtmf.so
 %{_libdir}/asterisk/modules/app_sendtext.so
@@ -641,11 +707,15 @@ fi
 %{_libdir}/asterisk/modules/cdr_csv.so
 %{_libdir}/asterisk/modules/cdr_custom.so
 %{_libdir}/asterisk/modules/cdr_manager.so
+%{_libdir}/asterisk/modules/cdr_syslog.so
+%{_libdir}/asterisk/modules/cel_custom.so
+%{_libdir}/asterisk/modules/cel_manager.so
 %{_libdir}/asterisk/modules/chan_agent.so
 %{_libdir}/asterisk/modules/chan_bridge.so
 %{_libdir}/asterisk/modules/chan_iax2.so
 %{_libdir}/asterisk/modules/chan_local.so
 %{_libdir}/asterisk/modules/chan_mgcp.so
+%{_libdir}/asterisk/modules/chan_multicast_rtp.so
 %{_libdir}/asterisk/modules/chan_phone.so
 %{_libdir}/asterisk/modules/chan_sip.so
 %{_libdir}/asterisk/modules/codec_adpcm.so
@@ -658,6 +728,7 @@ fi
 %{_libdir}/asterisk/modules/codec_resample.so
 %{_libdir}/asterisk/modules/codec_speex.so
 %{_libdir}/asterisk/modules/codec_ulaw.so
+%{_libdir}/asterisk/modules/format_g719.so
 %{_libdir}/asterisk/modules/format_g723.so
 %{_libdir}/asterisk/modules/format_g726.so
 %{_libdir}/asterisk/modules/format_g729.so
@@ -678,6 +749,7 @@ fi
 %{_libdir}/asterisk/modules/func_audiohookinherit.so
 %{_libdir}/asterisk/modules/func_base64.so
 %{_libdir}/asterisk/modules/func_blacklist.so
+%{_libdir}/asterisk/modules/func_callcompletion.so
 %{_libdir}/asterisk/modules/func_callerid.so
 %{_libdir}/asterisk/modules/func_cdr.so
 %{_libdir}/asterisk/modules/func_channel.so
@@ -698,12 +770,14 @@ fi
 %{_libdir}/asterisk/modules/func_math.so
 %{_libdir}/asterisk/modules/func_md5.so
 %{_libdir}/asterisk/modules/func_module.so
+%{_libdir}/asterisk/modules/func_pitchshift.so
 %{_libdir}/asterisk/modules/func_rand.so
 %{_libdir}/asterisk/modules/func_realtime.so
 %{_libdir}/asterisk/modules/func_sha1.so
 %{_libdir}/asterisk/modules/func_shell.so
 %{_libdir}/asterisk/modules/func_speex.so
 %{_libdir}/asterisk/modules/func_sprintf.so
+%{_libdir}/asterisk/modules/func_srv.so
 %{_libdir}/asterisk/modules/func_strings.so
 %{_libdir}/asterisk/modules/func_sysinfo.so
 %{_libdir}/asterisk/modules/func_timeout.so
@@ -727,8 +801,13 @@ fi
 %{_libdir}/asterisk/modules/res_limit.so
 %{_libdir}/asterisk/modules/res_monitor.so
 %{_libdir}/asterisk/modules/res_musiconhold.so
+%{_libdir}/asterisk/modules/res_mutestream.so
 %{_libdir}/asterisk/modules/res_phoneprov.so
+%{_libdir}/asterisk/modules/res_pktccops.so
 %{_libdir}/asterisk/modules/res_realtime.so
+%{_libdir}/asterisk/modules/res_rtp_asterisk.so
+%{_libdir}/asterisk/modules/res_rtp_multicast.so
+%{_libdir}/asterisk/modules/res_security_log.so
 %{_libdir}/asterisk/modules/res_smdi.so
 %{_libdir}/asterisk/modules/res_speech.so
 %{_libdir}/asterisk/modules/res_timing_pthread.so
@@ -736,20 +815,20 @@ fi
 %{_libdir}/asterisk/modules/res_timing_timerfd.so
 %endif
 
-%{_sbindir}/aelparse
-%{_sbindir}/astcanary
+#%{_sbindir}/aelparse
+#%{_sbindir}/astcanary
 %{_sbindir}/asterisk
 %{_sbindir}/astgenkey
-%{_sbindir}/astman
+#%{_sbindir}/astman
 %{_sbindir}/autosupport
-%{_sbindir}/conf2ael
-%{_sbindir}/muted
+#%{_sbindir}/conf2ael
+#%{_sbindir}/muted
 %{_sbindir}/rasterisk
-%{_sbindir}/refcounter
+#%{_sbindir}/refcounter
 %{_sbindir}/safe_asterisk
-%{_sbindir}/smsq
-%{_sbindir}/stereorize
-%{_sbindir}/streamplayer
+#%{_sbindir}/smsq
+#%{_sbindir}/stereorize
+#%{_sbindir}/streamplayer
 
 %{_mandir}/man8/asterisk.8*
 %{_mandir}/man8/astgenkey.8*
@@ -758,15 +837,19 @@ fi
 
 %attr(0750,asterisk,asterisk) %dir %{_sysconfdir}/asterisk
 %attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/adsi.conf
-%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/adtranvofr.conf
+#%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/adtranvofr.conf
 %attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/agents.conf
 %attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/alarmreceiver.conf
 %attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/amd.conf
 %attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/asterisk.adsi
 %attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/asterisk.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/ccss.conf
 %attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/cdr.conf
 %attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/cdr_custom.conf
 %attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/cdr_manager.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/cdr_syslog.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/cel.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/cel_custom.conf
 %attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/cli.conf
 %attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/cli_aliases.conf
 %attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/cli_permissions.conf
@@ -796,6 +879,7 @@ fi
 %attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/phoneprov.conf
 %attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/queuerules.conf
 %attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/queues.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/res_pktccops.conf
 %attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/rpt.conf
 %attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/rtp.conf
 %attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/say.conf
@@ -851,6 +935,15 @@ fi
 %defattr(-,root,root,-)
 %doc doc/api/html/*
 
+%files calendar
+%defattr(-,root,root,-)
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/calendar.conf
+%{_libdir}/asterisk/modules/res_calendar.so
+%{_libdir}/asterisk/modules/res_calendar_caldav.so
+%{_libdir}/asterisk/modules/res_calendar_ews.so
+%{_libdir}/asterisk/modules/res_calendar_exchange.so
+%{_libdir}/asterisk/modules/res_calendar_icalendar.so
+
 %files curl
 %defattr(-,root,root,-)
 %doc contrib/scripts/dbsep.cgi
@@ -868,7 +961,7 @@ fi
 %{_libdir}/asterisk/modules/app_page.so
 %{_libdir}/asterisk/modules/app_dahdibarge.so
 %{_libdir}/asterisk/modules/app_dahdiras.so
-%{_libdir}/asterisk/modules/app_dahdiscan.so
+#%{_libdir}/asterisk/modules/app_dahdiscan.so
 %{_libdir}/asterisk/modules/chan_dahdi.so
 %{_libdir}/asterisk/modules/codec_dahdi.so
 %{_libdir}/asterisk/modules/res_timing_dahdi.so
@@ -881,12 +974,16 @@ fi
 %doc doc/valgrind.txt
 
 %dir %{_includedir}/asterisk
+%dir %{_includedir}/asterisk/doxygen
 %{_includedir}/asterisk.h
 %{_includedir}/asterisk/*.h
+%{_includedir}/asterisk/doxygen/*.h
 
 %files fax
 %defattr(-,root,root,-)
-%{_libdir}/asterisk/modules/app_fax.so
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/res_fax.conf
+%{_libdir}/asterisk/modules/res_fax.so
+%{_libdir}/asterisk/modules/res_fax_spandsp.so
 
 %files festival
 %defattr(-,root,root,-)
@@ -938,20 +1035,42 @@ fi
 %files misdn
 %defattr(-,root,root,-)
 %attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/misdn.conf
-%{_libdir}/asterisk/modules/chan_misdn.so
+#%{_libdir}/asterisk/modules/chan_misdn.so
+
+%files mobile
+%defattr(-,root,root,-)
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/chan_mobile.conf
+%{_libdir}/asterisk/modules/chan_mobile.so
+
+%files mysql
+%defattr(-,root,root,-)
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/app_mysql.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/cdr_mysql.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/res_config_mysql.conf
+%doc contrib/realtime/mysql/*.sql
+%{_libdir}/asterisk/modules/app_mysql.so
+%{_libdir}/asterisk/modules/cdr_mysql.so
+%{_libdir}/asterisk/modules/res_config_mysql.so
 
 %files odbc
 %defattr(-,root,root,-)
 %attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/cdr_adaptive_odbc.conf
 %attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/cdr_odbc.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/cel_adaptive_odbc.conf
 %attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/func_odbc.conf
 %attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/res_odbc.conf
 %{_libdir}/asterisk/modules/cdr_adaptive_odbc.so
 %{_libdir}/asterisk/modules/cdr_odbc.so
+%{_libdir}/asterisk/modules/cel_adaptive_odbc.so
 %{_libdir}/asterisk/modules/func_odbc.so
 %{_libdir}/asterisk/modules/res_config_odbc.so
 %{_libdir}/asterisk/modules/res_odbc.so
 
+%files ooh323
+%defattr(-,root,root,-)
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/chan_ooh323.conf
+%{_libdir}/asterisk/modules/chan_ooh323.so
+
 %files oss
 %defattr(-,root,root,-)
 %attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/oss.conf
@@ -965,14 +1084,17 @@ fi
 %files postgresql
 %defattr(-,root,root,-)
 %attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/cdr_pgsql.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/cel_pgsql.conf
 %attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/res_pgsql.conf
-%doc contrib/scripts/realtime_pgsql.sql
+%doc contrib/realtime/postgresql/*.sql
 %{_libdir}/asterisk/modules/cdr_pgsql.so
+%{_libdir}/asterisk/modules/cel_pgsql.so
 %{_libdir}/asterisk/modules/res_config_pgsql.so
 
 %files radius
 %defattr(-,root,root,-)
 %{_libdir}/asterisk/modules/cdr_radius.so
+%{_libdir}/asterisk/modules/cel_radius.so
 
 %files skinny
 %defattr(-,root,root,-)
@@ -992,13 +1114,17 @@ fi
 %files sqlite
 %defattr(-,root,root,-)
 %attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/cdr_sqlite3_custom.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/cel_sqlite3_custom.conf
 %attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/res_config_sqlite.conf
 %{_libdir}/asterisk/modules/cdr_sqlite3_custom.so
+%{_libdir}/asterisk/modules/cel_sqlite3_custom.so
 
 %files tds
 %defattr(-,root,root,-)
 %attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/cdr_tds.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/cel_tds.conf
 %{_libdir}/asterisk/modules/cdr_tds.so
+%{_libdir}/asterisk/modules/cel_tds.so
 
 %files unistim
 %defattr(-,root,root,-)
@@ -1035,6 +1161,11 @@ fi
 %{_libdir}/asterisk/modules/app_voicemail_plain.so
 
 %changelog
+* Mon Aug  2 2010 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.8.0-0.1.beta2
+- Update to 1.8.0-beta2
+- Disable building chan_misdn until compilation errors are figured out (https://issues.asterisk.org/view.php?id=14333)
+- Start stripping tarballs again because Digium added MP3 code :(
+
 * Sat Jul 31 2010 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.2.10-1
 - Update to 1.6.2.10
 
diff --git a/menuselect.makeopts b/menuselect.makeopts
index b47ae03..8452f5e 100644
--- a/menuselect.makeopts
+++ b/menuselect.makeopts
@@ -1,18 +1,19 @@
+MENUSELECT_ADDONS=format_mp3
 MENUSELECT_APPS=app_ivrdemo app_mp3 app_osplookup app_rpt app_skel 
 MENUSELECT_CDR=cdr_sqlite
-MENUSELECT_CHANNELS=chan_h323 chan_nbs chan_vpb 
+MENUSELECT_CHANNELS=chan_h323 chan_nbs chan_vpb chan_misdn
 MENUSELECT_CODECS=codec_ilbc
 MENUSELECT_FORMATS=format_ilbc
 MENUSELECT_FUNCS=
-MENUSELECT_PBX=pbx_gtkconsole
-MENUSELECT_RES=res_config_sqlite
+MENUSELECT_PBX=
+MENUSELECT_RES=res_config_sqlite res_srtp res_timing_kqueue
 MENUSELECT_OPTS_app_voicemail=
 MENUSELECT_CFLAGS=LOADABLE_MODULES 
 MENUSELECT_EMBED=
 MENUSELECT_CORE_SOUNDS=
 MENUSELECT_MOH=
 MENUSELECT_EXTRA_SOUNDS=
-MENUSELECT_TESTS=test_skel test_heap test_sched test_astobj2 test_dlinklists
+MENUSELECT_TESTS=test_skel test_heap test_sched test_astobj2 test_dlinklists test_acl test_aoc test_app test_ast_format_str_reduce test_devicestate test_event test_func_file test_gosub test_pbx test_stringfields test_strings test_substitution test_time test_utils test_amihooks test_locale test_logger test_security_events
 MENUSELECT_DEPSFAILED=MENUSELECT_APPS=app_osplookup
 MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_h323
 MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_nbs
diff --git a/sources b/sources
index d286555..a1eba07 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-50412a90942ae7306fb8dcc31a05c2ce  asterisk-1.6.2.10.tar.gz
-c04a5e701ef88fda2ebff04cd32428ce  asterisk-1.6.2.10.tar.gz.asc
+0e75b70e6f7e8381a5a8813343fcb4ed  asterisk-1.8.0-beta2-stripped.tar.gz
+0c7d15d79fb9fb07af5c379522de47bd  asterisk-1.8.0-beta2.tar.gz.asc

More information about the scm-commits mailing list