rpms/asterisk/devel 0008-change-configure.ac-to-look-for-pkg-config-gmime-2.0.patch, NONE, 1.1 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch, 1.10, 1.11 asterisk.spec, 1.61, 1.62 0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch, 1.6, NONE 0010-my-guess-as-replacements-for-the-missing-broken-stuf.patch, 1.5, NONE

Jeffrey C. Ollie jcollie at fedoraproject.org
Sun Oct 25 01:25:57 UTC 2009 

Author: jcollie

Update of /cvs/pkgs/rpms/asterisk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22681

Modified Files:
	0001-Modify-init-scripts-for-better-Fedora-compatibility.patch 
	asterisk.spec 
Added Files:
	0008-change-configure.ac-to-look-for-pkg-config-gmime-2.0.patch 
Removed Files:
	0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch 
	0010-my-guess-as-replacements-for-the-missing-broken-stuf.patch 
Log Message:
* Sat Oct 24 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.2.0-0.8.rc3
- Add an AST_EXTRA_ARGS option to the init script
- have the init script to cd to /var/spool/asterisk to prevent annoying message


0008-change-configure.ac-to-look-for-pkg-config-gmime-2.0.patch:
 configure.ac |   12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

--- NEW FILE 0008-change-configure.ac-to-look-for-pkg-config-gmime-2.0.patch ---
Index: configure.ac
===================================================================
--- configure.ac	(revision 221084)
+++ configure.ac	(working copy)
@@ -1520,7 +1520,17 @@
     AST_CHECK_OSPTK([3], [5], [0])
 fi
 
-AST_EXT_TOOL_CHECK([GMIME], [gmime], [], [], [#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
+   GMIME_INCLUDE=$(${PKGCONFIG} gmime-2.0 --cflags 2>/dev/null)
+   GMIME_LIB=$(${PKGCONFIG} gmime-2.0 --libs)
+   PBX_GMIME=1
+   AC_DEFINE([HAVE_GMIME], 1, [Define if your system has the GMIME libraries.])
+fi
+AC_SUBST(PBX_GMIME)
+AC_SUBST(GMIME_INCLUDE)
+AC_SUBST(GMIME_LIB)
 
 AST_EXT_LIB_CHECK([HOARD], [hoard], [malloc], [])
 

0001-Modify-init-scripts-for-better-Fedora-compatibility.patch:
 init.d/rc.redhat.asterisk |   68 ++++++++++++++++++++++------------------------
 sysconfig/asterisk        |   19 ++++++++++++
 2 files changed, 52 insertions(+), 35 deletions(-)

Index: 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0001-Modify-init-scripts-for-better-Fedora-compatibility.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch	9 Feb 2009 05:54:21 -0000	1.10
+++ 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch	25 Oct 2009 01:25:55 -0000	1.11
@@ -1,18 +1,7 @@
-From 6cd5722ba64b7cb24b8475395edcc6555e2326d4 Mon Sep 17 00:00:00 2001
-From: Jeffrey C. Ollie <jeff at ocjtech.us>
-Date: Sun, 18 Nov 2007 21:47:59 -0600
-Subject: [PATCH 01/15] Modify init scripts for better Fedora compatibility.
-
----
- contrib/init.d/rc.redhat.asterisk |   61 +++++++++++++++++-------------------
- contrib/sysconfig/asterisk        |   16 ++++++++++
- 2 files changed, 45 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 d2a630e..7ac830d 100755
---- a/contrib/init.d/rc.redhat.asterisk
-+++ b/contrib/init.d/rc.redhat.asterisk
+Index: contrib/init.d/rc.redhat.asterisk
+===================================================================
+--- contrib/init.d/rc.redhat.asterisk	(revision 225759)
++++ contrib/init.d/rc.redhat.asterisk	(working copy)
 @@ -3,7 +3,7 @@
  #
  # asterisk    Starts, Stops and Reloads Asterisk.
@@ -30,10 +19,10 @@ index d2a630e..7ac830d 100755
 -#AST_CONFIG=/etc/asterisk
 +# Do not modify this script to change any of the settings, instead
 +# edit /etc/sysconfig/asterisk
-+
+ 
 +# Specify the configuration file
 +AST_CONFIG=/etc/asterisk/asterisk.conf
- 
++
  # Installation directory
  AST_SBIN=/usr/sbin
  
@@ -50,7 +39,7 @@ index d2a630e..7ac830d 100755
 +# as to the primary group of the user, as well as initialize the
 +# supplementary groups.  If you want to run Asterisk as a different
 +# group, set AST_GROUP to the group that Asterisk should run as.  Note
-+# that this may break Zaptel devices as supplementary groups will not
++# that this may break DAHDI devices as supplementary groups will not
 +# be initialized.
  #AST_GROUP="asterisk"
  
@@ -100,7 +89,7 @@ index d2a630e..7ac830d 100755
  RETVAL=0
  
  start() {
-@@ -78,9 +78,6 @@ start() {
+@@ -78,19 +78,17 @@
  
  	# Start daemons.
  	echo -n $"Starting asterisk: "
@@ -108,18 +97,24 @@ index d2a630e..7ac830d 100755
 -		DAEMON=$SAFE_ASTERISK
 -	fi
  	if [ $AST_USER ] ; then
- 		ASTARGS="-U $AST_USER"
+-		ASTARGS="-U $AST_USER"
++		AST_ARGS="-U $AST_USER"
  	fi
-@@ -88,7 +85,7 @@ start() {
- 		ASTARGS="$ASTARGS -G $AST_GROUP"
+ 	if [ $AST_GROUP ] ; then
+-		ASTARGS="$ASTARGS -G $AST_GROUP"
++		AST_ARGS="$AST_ARGS -G $AST_GROUP"
  	fi
  	if [ $AST_CONFIG ]; then
 -		ASTARGS="$ASTARGS -C $AST_CONFIG/asterisk.conf"
-+		ASTARGS="$ASTARGS -C $AST_CONFIG"
++		AST_ARGS="$AST_ARGS -C $AST_CONFIG"
  	fi
- 	daemon $DAEMON $ASTARGS
+-	daemon $DAEMON $ASTARGS
++	cd /var/spool/asterisk
++	daemon $DAEMON $AST_ARGS $AST_EXTRA_ARGS
  	RETVAL=$?
-@@ -99,7 +96,7 @@ start() {
+ 	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/asterisk
+ 	echo
+@@ -99,7 +97,7 @@
  
  stop() {
  	# Stop daemons.
@@ -128,12 +123,11 @@ index d2a630e..7ac830d 100755
  	killproc asterisk
  	RETVAL=$?
  	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/asterisk
-diff --git a/contrib/sysconfig/asterisk b/contrib/sysconfig/asterisk
-new file mode 100644
-index 0000000..2d3598a
---- /dev/null
-+++ b/contrib/sysconfig/asterisk
-@@ -0,0 +1,16 @@
+Index: contrib/sysconfig/asterisk
+===================================================================
+--- contrib/sysconfig/asterisk	(revision 225759)
++++ contrib/sysconfig/asterisk	(working copy)
+@@ -0,0 +1,19 @@
 +# Specify the configuration file
 +AST_CONFIG=/etc/asterisk/asterisk.conf
 +
@@ -150,6 +144,6 @@ index 0000000..2d3598a
 +# that this may break Zaptel devices as supplementary groups will not
 +# be initialized.
 +#AST_GROUP="asterisk"
--- 
-1.6.1
-
++
++# A place to specify extra arguments for the Asterisk command line
++AST_EXTRA_ARGS=""


Index: asterisk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/asterisk.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- asterisk.spec	9 Oct 2009 14:15:21 -0000	1.61
+++ asterisk.spec	25 Oct 2009 01:25:56 -0000	1.62
@@ -2,7 +2,7 @@
 Summary: The Open Source PBX
 Name: asterisk
 Version: 1.6.2.0
-Release: 0.6%{?_rc:.rc%{_rc}}%{?dist}
+Release: 0.8%{?_rc:.rc%{_rc}}%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.asterisk.org/
@@ -17,8 +17,7 @@ Source6: asterisk-developer-pubring.gpg
 Patch1:  0001-Modify-init-scripts-for-better-Fedora-compatibility.patch
 Patch2:  0002-Modify-modules.conf-so-that-different-voicemail-modu.patch
 Patch5:  0005-Build-using-external-libedit.patch
-Patch8:  0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch
-Patch10: 0010-my-guess-as-replacements-for-the-missing-broken-stuf.patch
+Patch8:  0008-change-configure.ac-to-look-for-pkg-config-gmime-2.0.patch
 Patch11: 0011-Fix-up-some-paths.patch
 Patch12: 0012-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch
 
@@ -38,7 +37,7 @@ BuildRequires: libcap-devel
 BuildRequires: gtk2-devel
 
 # for res_http_post
-BuildRequires: gmime-devel
+BuildRequires: gmime22-devel
 
 # for building docs
 BuildRequires: doxygen
@@ -381,11 +380,10 @@ local filesystem.
 
 %prep
 %setup0 -q -n asterisk-%{version}%{?_rc:-rc%{_rc}}
-%patch1 -p1
+%patch1 -p0
 %patch2 -p0
 %patch5 -p0
 %patch8 -p0
-%patch10 -p0
 %patch11 -p0
 %patch12 -p1
 
@@ -1011,6 +1009,13 @@ fi
 %{_libdir}/asterisk/modules/app_voicemail_plain.so
 
 %changelog
+* Sat Oct 24 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.2.0-0.8.rc3
+- Add an AST_EXTRA_ARGS option to the init script
+- have the init script to cd to /var/spool/asterisk to prevent annoying message
+
+* Sat Oct 24 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.2.0-0.7.rc3
+- Compile against gmime 2.2 instead of gmime 2.4 because the patch to convert the API calls from 2.2 to 2.4 caused crashes.
+
 * Fri Oct  9 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.2.0-0.6.rc3
 - Require latex2html used in static-http documents
 


--- 0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch DELETED ---


--- 0010-my-guess-as-replacements-for-the-missing-broken-stuf.patch DELETED ---

More information about the fedora-extras-commits mailing list