OpenPKG Specs / changeset

     1.1 --- a/asterisk/asterisk.patch	Mon Jan 09 22:36:23 2012 +0100
     1.2 +++ b/asterisk/asterisk.patch	Sun Mar 18 18:45:29 2012 +0100
     1.3 @@ -1,7 +1,7 @@
     1.4  Index: addons/chan_ooh323.c
     1.5  diff -Nau addons/chan_ooh323.c.orig addons/chan_ooh323.c
     1.6 ---- addons/chan_ooh323.c.orig	2011-08-09 18:13:09.000000000 +0200
     1.7 -+++ addons/chan_ooh323.c	2011-09-14 14:29:50.740457577 +0200
     1.8 +--- addons/chan_ooh323.c.orig	2012-01-26 21:14:50.000000000 +0100
     1.9 ++++ addons/chan_ooh323.c	2012-03-18 17:47:07.875949857 +0100
    1.10  @@ -24,6 +24,12 @@
    1.11   
    1.12   #include "chan_ooh323.h"
    1.13 @@ -18,7 +18,7 @@
    1.14  Index: addons/ooh323c/src/ooCmdChannel.c
    1.15  diff -Nau addons/ooh323c/src/ooCmdChannel.c.orig addons/ooh323c/src/ooCmdChannel.c
    1.16  --- addons/ooh323c/src/ooCmdChannel.c.orig	2011-08-04 21:37:16.000000000 +0200
    1.17 -+++ addons/ooh323c/src/ooCmdChannel.c	2011-09-14 14:29:50.740457577 +0200
    1.18 ++++ addons/ooh323c/src/ooCmdChannel.c	2012-03-18 17:47:07.875949857 +0100
    1.19  @@ -25,6 +25,10 @@
    1.20   #include "ooCalls.h"
    1.21   #include "ooCmdChannel.h"
    1.22 @@ -33,7 +33,7 @@
    1.23  Index: addons/ooh323c/src/ooSocket.c
    1.24  diff -Nau addons/ooh323c/src/ooSocket.c.orig addons/ooh323c/src/ooSocket.c
    1.25  --- addons/ooh323c/src/ooSocket.c.orig	2011-05-04 22:50:18.000000000 +0200
    1.26 -+++ addons/ooh323c/src/ooSocket.c	2011-09-14 14:29:50.740457577 +0200
    1.27 ++++ addons/ooh323c/src/ooSocket.c	2012-03-18 17:47:07.875949857 +0100
    1.28  @@ -24,6 +24,9 @@
    1.29   
    1.30   #include "ooSocket.h"
    1.31 @@ -47,7 +47,7 @@
    1.32  Index: addons/ooh323cDriver.c
    1.33  diff -Nau addons/ooh323cDriver.c.orig addons/ooh323cDriver.c
    1.34  --- addons/ooh323cDriver.c.orig	2011-02-18 01:07:20.000000000 +0100
    1.35 -+++ addons/ooh323cDriver.c	2011-09-14 14:29:50.740457577 +0200
    1.36 ++++ addons/ooh323cDriver.c	2012-03-18 17:47:07.875949857 +0100
    1.37  @@ -27,6 +27,11 @@
    1.38   
    1.39   #define SEC_TO_HOLD_THREAD 24
    1.40 @@ -63,7 +63,7 @@
    1.41  Index: apps/app_backticks.c
    1.42  diff -Nau apps/app_backticks.c.orig apps/app_backticks.c
    1.43  --- apps/app_backticks.c.orig	1970-01-01 01:00:00.000000000 +0100
    1.44 -+++ apps/app_backticks.c	2011-09-14 14:29:50.740457577 +0200
    1.45 ++++ apps/app_backticks.c	2012-03-18 17:47:07.875949857 +0100
    1.46  @@ -0,0 +1,129 @@
    1.47  +
    1.48  +#include "asterisk.h"
    1.49 @@ -196,9 +196,9 @@
    1.50  +
    1.51  Index: apps/app_meetme.c
    1.52  diff -Nau apps/app_meetme.c.orig apps/app_meetme.c
    1.53 ---- apps/app_meetme.c.orig	2011-07-19 17:43:32.000000000 +0200
    1.54 -+++ apps/app_meetme.c	2011-09-14 14:29:50.747960016 +0200
    1.55 -@@ -607,6 +607,7 @@
    1.56 +--- apps/app_meetme.c.orig	2012-01-09 16:37:12.000000000 +0100
    1.57 ++++ apps/app_meetme.c	2012-03-18 17:47:07.875949857 +0100
    1.58 +@@ -614,6 +614,7 @@
    1.59   
    1.60   /*! Do not write any audio to this channel until the state is up. */
    1.61   #define CONFFLAG_NO_AUDIO_UNTIL_UP  (1ULL << 31)
    1.62 @@ -206,7 +206,7 @@
    1.63   /*! If set play an intro announcement at start of conference */
    1.64   #define CONFFLAG_INTROMSG           (1ULL << 32)
    1.65   
    1.66 -@@ -618,6 +619,7 @@
    1.67 +@@ -625,6 +626,7 @@
    1.68   	OPT_ARG_MOH_CLASS = 4,
    1.69   	OPT_ARG_INTROMSG = 5,
    1.70   	OPT_ARG_ARRAY_SIZE = 6,
    1.71 @@ -214,7 +214,7 @@
    1.72   };
    1.73   
    1.74   AST_APP_OPTIONS(meetme_opts, BEGIN_OPTIONS
    1.75 -@@ -651,6 +653,7 @@
    1.76 +@@ -658,6 +660,7 @@
    1.77   	AST_APP_OPTION('1', CONFFLAG_NOONLYPERSON ),
    1.78    	AST_APP_OPTION_ARG('S', CONFFLAG_DURATION_STOP, OPT_ARG_DURATION_STOP),
    1.79   	AST_APP_OPTION_ARG('L', CONFFLAG_DURATION_LIMIT, OPT_ARG_DURATION_LIMIT),
    1.80 @@ -222,7 +222,7 @@
    1.81   END_OPTIONS );
    1.82   
    1.83   static const char * const app = "MeetMe";
    1.84 -@@ -2446,6 +2449,12 @@
    1.85 +@@ -2453,6 +2456,12 @@
    1.86   		ast_test_flag64(confflags, CONFFLAG_INTROUSERNOREVIEW))) {
    1.87   		char destdir[PATH_MAX];
    1.88   
    1.89 @@ -235,7 +235,7 @@
    1.90   		snprintf(destdir, sizeof(destdir), "%s/meetme", ast_config_AST_SPOOL_DIR);
    1.91   
    1.92   		if (ast_mkdir(destdir, 0777) != 0) {
    1.93 -@@ -2462,6 +2471,7 @@
    1.94 +@@ -2469,6 +2478,7 @@
    1.95   			res = ast_record_review(chan, "vm-rec-name", user->namerecloc, 10, "sln", &duration, NULL);
    1.96   		if (res == -1)
    1.97   			goto outrun;
    1.98 @@ -245,9 +245,9 @@
    1.99   	ast_mutex_lock(&conf->playlock);
   1.100  Index: apps/app_voicemail.c
   1.101  diff -Nau apps/app_voicemail.c.orig apps/app_voicemail.c
   1.102 ---- apps/app_voicemail.c.orig	2011-07-26 16:04:55.000000000 +0200
   1.103 -+++ apps/app_voicemail.c	2011-09-14 14:29:50.747960016 +0200
   1.104 -@@ -373,6 +373,7 @@
   1.105 +--- apps/app_voicemail.c.orig	2012-01-25 23:21:30.000000000 +0100
   1.106 ++++ apps/app_voicemail.c	2012-03-18 17:47:07.888451260 +0100
   1.107 +@@ -376,6 +376,7 @@
   1.108   static char imapport[8];
   1.109   static char imapflags[128];
   1.110   static char imapfolder[64];
   1.111 @@ -255,7 +255,7 @@
   1.112   static char imapparentfolder[64] = "\0";
   1.113   static char greetingfolder[64];
   1.114   static char authuser[32];
   1.115 -@@ -2517,7 +2518,7 @@
   1.116 +@@ -2524,7 +2525,7 @@
   1.117   	}
   1.118   
   1.119   	/* Build up server information */
   1.120 @@ -264,7 +264,7 @@
   1.121   
   1.122   	/* Add authentication user if present */
   1.123   	if (!ast_strlen_zero(authuser))
   1.124 -@@ -6176,6 +6177,7 @@
   1.125 +@@ -6186,6 +6187,7 @@
   1.126   	/* simple. huh? */
   1.127   	char sequence[10];
   1.128   	char mailbox[256];
   1.129 @@ -272,7 +272,7 @@
   1.130   	int res;
   1.131   
   1.132   	/* get the real IMAP message number for this message */
   1.133 -@@ -6191,10 +6193,24 @@
   1.134 +@@ -6201,10 +6203,24 @@
   1.135   		mail_setflag(vms->mailstream, sequence, "\\Unseen");
   1.136   		mail_clearflag(vms->mailstream, sequence, "\\Seen");
   1.137   	}
   1.138 @@ -299,7 +299,7 @@
   1.139   	/* Create the folder if it don't exist */
   1.140   	imap_mailbox_name(mailbox, sizeof(mailbox), vms, box, 1); /* Get the full mailbox name */
   1.141   	ast_debug(5, "Checking if folder exists: %s\n", mailbox);
   1.142 -@@ -10469,6 +10485,10 @@
   1.143 +@@ -10478,6 +10494,10 @@
   1.144   #ifndef IMAP_STORAGE
   1.145   				} else if (!cmd) {
   1.146   					vms.deleted[vms.curmsg] = 1;
   1.147 @@ -310,7 +310,7 @@
   1.148   #endif
   1.149   				} else {
   1.150   					vms.deleted[vms.curmsg] = 0;
   1.151 -@@ -11965,6 +11985,15 @@
   1.152 +@@ -11996,6 +12016,15 @@
   1.153   		} else {
   1.154   			ast_copy_string(imapfolder, "INBOX", sizeof(imapfolder));
   1.155   		}
   1.156 @@ -329,7 +329,7 @@
   1.157  Index: cdr/cdr_radius.c
   1.158  diff -Nau cdr/cdr_radius.c.orig cdr/cdr_radius.c
   1.159  --- cdr/cdr_radius.c.orig	2011-07-14 22:13:06.000000000 +0200
   1.160 -+++ cdr/cdr_radius.c	2011-09-14 14:29:50.777958246 +0200
   1.161 ++++ cdr/cdr_radius.c	2012-03-18 17:47:07.888451260 +0100
   1.162  @@ -106,10 +106,18 @@
   1.163   	if (!rc_avpair_add(rh, tosend, PW_AST_SRC, &cdr->src, strlen(cdr->src), VENDOR_CODE))
   1.164   		return -1;
   1.165 @@ -381,8 +381,8 @@
   1.166   	if (!rc_avpair_add(rh, tosend, PW_ACCT_SESSION_ID, &cdr->uniqueid, strlen(cdr->uniqueid), 0))
   1.167  Index: chan_capi-1.1.5.20110914/chan_capi20.h
   1.168  diff -Nau chan_capi-1.1.5.20110914/chan_capi20.h.orig chan_capi-1.1.5.20110914/chan_capi20.h
   1.169 ---- chan_capi-1.1.5.20110914/chan_capi20.h.orig	2011-01-07 02:29:32.000000000 +0100
   1.170 -+++ chan_capi-1.1.5.20110914/chan_capi20.h	2011-05-23 17:35:28.348531751 +0200
   1.171 +--- chan_capi-1.1.5.20110914/chan_capi20.h.orig	2005-09-20 20:33:40.000000000 +0200
   1.172 ++++ chan_capi-1.1.5.20110914/chan_capi20.h	2012-03-18 17:47:07.888451260 +0100
   1.173  @@ -4,10 +4,13 @@
   1.174    * first. Else the checks below will fail.
   1.175    */
   1.176 @@ -408,8 +408,8 @@
   1.177   #endif
   1.178  Index: chan_capi-1.1.5.20110914/chan_capi_utils.c
   1.179  diff -Nau chan_capi-1.1.5.20110914/chan_capi_utils.c.orig chan_capi-1.1.5.20110914/chan_capi_utils.c
   1.180 ---- chan_capi-1.1.5.20110914/chan_capi_utils.c.orig	2011-01-07 02:29:32.000000000 +0100
   1.181 -+++ chan_capi-1.1.5.20110914/chan_capi_utils.c	2011-05-23 17:35:28.348531751 +0200
   1.182 +--- chan_capi-1.1.5.20110914/chan_capi_utils.c.orig	2011-08-07 16:31:05.000000000 +0200
   1.183 ++++ chan_capi-1.1.5.20110914/chan_capi_utils.c	2012-03-18 17:47:07.888451260 +0100
   1.184  @@ -1158,6 +1158,9 @@
   1.185   {
   1.186   	MESSAGE_EXCHANGE_ERROR error;
   1.187 @@ -422,8 +422,8 @@
   1.188   
   1.189  Index: chan_capi-1.1.5.20110914/libcapi20/capi20.c
   1.190  diff -Nau chan_capi-1.1.5.20110914/libcapi20/capi20.c.orig chan_capi-1.1.5.20110914/libcapi20/capi20.c
   1.191 ---- chan_capi-1.1.5.20110914/libcapi20/capi20.c.orig	2011-01-07 02:29:31.000000000 +0100
   1.192 -+++ chan_capi-1.1.5.20110914/libcapi20/capi20.c	2011-05-23 17:35:28.348531751 +0200
   1.193 +--- chan_capi-1.1.5.20110914/libcapi20/capi20.c.orig	2010-02-17 20:10:53.000000000 +0100
   1.194 ++++ chan_capi-1.1.5.20110914/libcapi20/capi20.c	2012-03-18 17:47:07.888451260 +0100
   1.195  @@ -19,8 +19,10 @@
   1.196   #include <stdio.h>
   1.197   #include <ctype.h>
   1.198 @@ -719,8 +719,8 @@
   1.199    * functions added to the CAPI2.0 spec
   1.200  Index: chan_capi-1.1.5.20110914/libcapi20/convert.c
   1.201  diff -Nau chan_capi-1.1.5.20110914/libcapi20/convert.c.orig chan_capi-1.1.5.20110914/libcapi20/convert.c
   1.202 ---- chan_capi-1.1.5.20110914/libcapi20/convert.c.orig	2011-01-07 02:29:31.000000000 +0100
   1.203 -+++ chan_capi-1.1.5.20110914/libcapi20/convert.c	2011-05-23 17:35:28.348531751 +0200
   1.204 +--- chan_capi-1.1.5.20110914/libcapi20/convert.c.orig	2010-09-14 21:54:25.000000000 +0200
   1.205 ++++ chan_capi-1.1.5.20110914/libcapi20/convert.c	2012-03-18 17:47:07.888451260 +0100
   1.206  @@ -11,7 +11,14 @@
   1.207   #include <stddef.h>
   1.208   #include <time.h>
   1.209 @@ -738,8 +738,8 @@
   1.210   
   1.211  Index: chan_capi-1.1.5.20110914/Makefile
   1.212  diff -Nau chan_capi-1.1.5.20110914/Makefile.orig chan_capi-1.1.5.20110914/Makefile
   1.213 ---- chan_capi-1.1.5.20110914/Makefile.orig	2011-01-07 02:29:32.000000000 +0100
   1.214 -+++ chan_capi-1.1.5.20110914/Makefile	2011-05-23 17:35:28.348531751 +0200
   1.215 +--- chan_capi-1.1.5.20110914/Makefile.orig	2011-02-04 18:41:46.000000000 +0100
   1.216 ++++ chan_capi-1.1.5.20110914/Makefile	2012-03-18 17:47:07.888451260 +0100
   1.217  @@ -114,6 +114,9 @@
   1.218   CFLAGS+=-O2
   1.219   CFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
   1.220 @@ -752,9 +752,9 @@
   1.221   endif
   1.222  Index: channels/chan_sip.c
   1.223  diff -Nau channels/chan_sip.c.orig channels/chan_sip.c
   1.224 ---- channels/chan_sip.c.orig	2011-08-10 00:12:59.000000000 +0200
   1.225 -+++ channels/chan_sip.c	2011-09-14 14:29:50.757959000 +0200
   1.226 -@@ -11676,7 +11676,16 @@
   1.227 +--- channels/chan_sip.c.orig	2012-02-28 18:53:34.000000000 +0100
   1.228 ++++ channels/chan_sip.c	2012-03-18 17:47:07.898462166 +0100
   1.229 +@@ -12034,7 +12034,16 @@
   1.230    	} else {
   1.231    		if (sipmethod == SIP_NOTIFY && !ast_strlen_zero(p->theirtag)) {
   1.232    			/* If this is a NOTIFY, use the From: tag in the subscribe (RFC 3265) */
   1.233 @@ -775,7 +775,7 @@
   1.234  Index: channels/console_video.h
   1.235  diff -Nau channels/console_video.h.orig channels/console_video.h
   1.236  --- channels/console_video.h.orig	2008-06-30 17:45:15.000000000 +0200
   1.237 -+++ channels/console_video.h	2011-09-14 14:29:50.767970949 +0200
   1.238 ++++ channels/console_video.h	2012-03-18 17:47:07.898462166 +0100
   1.239  @@ -28,10 +28,7 @@
   1.240   		"console {device}"
   1.241   #else
   1.242 @@ -790,9 +790,9 @@
   1.243   	"console {videodevice|videocodec"	\
   1.244  Index: configure
   1.245  diff -Nau configure.orig configure
   1.246 ---- configure.orig	2011-08-25 21:08:04.000000000 +0200
   1.247 -+++ configure	2011-09-14 14:29:50.767970949 +0200
   1.248 -@@ -4447,11 +4447,6 @@
   1.249 +--- configure.orig	2012-01-14 17:40:17.000000000 +0100
   1.250 ++++ configure	2012-03-18 17:47:32.518450837 +0100
   1.251 +@@ -4716,11 +4716,6 @@
   1.252   esac
   1.253   
   1.254   case "${host_os}" in
   1.255 @@ -804,7 +804,7 @@
   1.256        openbsd*)
   1.257        ac_default_prefix=/usr/local
   1.258        if test ${prefix} = '/usr/local' || test ${prefix} = 'NONE'; then
   1.259 -@@ -31424,8 +31419,8 @@
   1.260 +@@ -18904,8 +18899,8 @@
   1.261   		if test -f "${IMAP_TK_DIR}/c-client/LDFLAGS"; then
   1.262         		imap_ldflags=`cat ${IMAP_TK_DIR}/c-client/LDFLAGS`
   1.263   		fi
   1.264 @@ -814,8 +814,8 @@
   1.265  +	  	imap_include="-DUSE_SYSTEM_IMAP -I${IMAP_TK_DIR}/include/imap"
   1.266         	CPPFLAGS="${CPPFLAGS} ${imap_include}"
   1.267   	  	LIBS="${LIBS} ${imap_libs} "`echo ${imap_ldflags}`
   1.268 - 	  	cat >conftest.$ac_ext <<_ACEOF
   1.269 -@@ -49375,7 +49370,7 @@
   1.270 + 	  	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
   1.271 +@@ -26681,7 +26676,7 @@
   1.272         	 pbxlibdir="-L${SQLITE_DIR}"
   1.273         fi
   1.274      fi
   1.275 @@ -824,142 +824,10 @@
   1.276      if test "x${pbxfuncname}" = "x" ; then   # empty lib, assume only headers
   1.277         AST_SQLITE_FOUND=yes
   1.278      else
   1.279 -@@ -51127,16 +51122,16 @@
   1.280 -     if test "x${PBX_GMIME}" != "x1" -a "${USE_GMIME}" != "no"; then
   1.281 - 	PBX_GMIME=0
   1.282 - 	if test -n "$ac_tool_prefix"; then
   1.283 --  # Extract the first word of "${ac_tool_prefix}gmime-config", so it can be a program name with args.
   1.284 --set dummy ${ac_tool_prefix}gmime-config; ac_word=$2
   1.285 -+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
   1.286 -+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
   1.287 - { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
   1.288 - $as_echo_n "checking for $ac_word... " >&6; }
   1.289 --if test "${ac_cv_path_CONFIG_GMIME+set}" = set; then
   1.290 -+if test "${ac_cv_path_PKGCONFIG+set}" = set; then
   1.291 -   $as_echo_n "(cached) " >&6
   1.292 - else
   1.293 --  case $CONFIG_GMIME in
   1.294 -+  case $PKGCONFIG in
   1.295 -   [\\/]* | ?:[\\/]*)
   1.296 --  ac_cv_path_CONFIG_GMIME="$CONFIG_GMIME" # Let the user override the test with a path.
   1.297 -+  ac_cv_path_PKGCONFIG="$PKGCONFIG" # Let the user override the test with a path.
   1.298 -   ;;
   1.299 -   *)
   1.300 -   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
   1.301 -@@ -51147,7 +51142,7 @@
   1.302 -   test -z "$as_dir" && as_dir=.
   1.303 -   for ac_exec_ext in '' $ac_executable_extensions; do
   1.304 -   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
   1.305 --    ac_cv_path_CONFIG_GMIME="$as_dir/$ac_word$ac_exec_ext"
   1.306 -+    ac_cv_path_PKGCONFIG="$as_dir/$ac_word$ac_exec_ext"
   1.307 -     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
   1.308 -     break 2
   1.309 -   fi
   1.310 -@@ -51158,10 +51153,10 @@
   1.311 -   ;;
   1.312 - esac
   1.313 - fi
   1.314 --CONFIG_GMIME=$ac_cv_path_CONFIG_GMIME
   1.315 --if test -n "$CONFIG_GMIME"; then
   1.316 --  { $as_echo "$as_me:$LINENO: result: $CONFIG_GMIME" >&5
   1.317 --$as_echo "$CONFIG_GMIME" >&6; }
   1.318 -+PKGCONFIG=$ac_cv_path_PKGCONFIG
   1.319 -+if test -n "$PKGCONFIG"; then
   1.320 -+  { $as_echo "$as_me:$LINENO: result: $PKGCONFIG" >&5
   1.321 -+$as_echo "$PKGCONFIG" >&6; }
   1.322 - else
   1.323 -   { $as_echo "$as_me:$LINENO: result: no" >&5
   1.324 - $as_echo "no" >&6; }
   1.325 -@@ -51169,18 +51164,18 @@
   1.326 - 
   1.327 - 
   1.328 - fi
   1.329 --if test -z "$ac_cv_path_CONFIG_GMIME"; then
   1.330 --  ac_pt_CONFIG_GMIME=$CONFIG_GMIME
   1.331 -+if test -z "$ac_cv_path_PKGCONFIG"; then
   1.332 -+  ac_pt_PKGCONFIG=$PKGCONFIG
   1.333 -   # Extract the first word of "gmime-config", so it can be a program name with args.
   1.334 --set dummy gmime-config; ac_word=$2
   1.335 -+set dummy pkg-config; ac_word=$2
   1.336 - { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
   1.337 - $as_echo_n "checking for $ac_word... " >&6; }
   1.338 --if test "${ac_cv_path_ac_pt_CONFIG_GMIME+set}" = set; then
   1.339 -+if test "${ac_cv_path_ac_pt_PKGCONFIG+set}" = set; then
   1.340 -   $as_echo_n "(cached) " >&6
   1.341 - else
   1.342 --  case $ac_pt_CONFIG_GMIME in
   1.343 -+  case $ac_pt_PKGCONFIG in
   1.344 -   [\\/]* | ?:[\\/]*)
   1.345 --  ac_cv_path_ac_pt_CONFIG_GMIME="$ac_pt_CONFIG_GMIME" # Let the user override the test with a path.
   1.346 -+  ac_cv_path_ac_pt_PKGCONFIG="$ac_pt_PKGCONFIG" # Let the user override the test with a path.
   1.347 -   ;;
   1.348 -   *)
   1.349 -   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
   1.350 -@@ -51191,7 +51186,7 @@
   1.351 -   test -z "$as_dir" && as_dir=.
   1.352 -   for ac_exec_ext in '' $ac_executable_extensions; do
   1.353 -   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
   1.354 --    ac_cv_path_ac_pt_CONFIG_GMIME="$as_dir/$ac_word$ac_exec_ext"
   1.355 -+    ac_cv_path_ac_pt_PKGCONFIG="$as_dir/$ac_word$ac_exec_ext"
   1.356 -     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
   1.357 -     break 2
   1.358 -   fi
   1.359 -@@ -51202,17 +51197,17 @@
   1.360 -   ;;
   1.361 - esac
   1.362 - fi
   1.363 --ac_pt_CONFIG_GMIME=$ac_cv_path_ac_pt_CONFIG_GMIME
   1.364 --if test -n "$ac_pt_CONFIG_GMIME"; then
   1.365 --  { $as_echo "$as_me:$LINENO: result: $ac_pt_CONFIG_GMIME" >&5
   1.366 --$as_echo "$ac_pt_CONFIG_GMIME" >&6; }
   1.367 -+ac_pt_PKGCONFIG=$ac_cv_path_ac_pt_PKGCONFIG
   1.368 -+if test -n "$ac_pt_PKGCONFIG"; then
   1.369 -+  { $as_echo "$as_me:$LINENO: result: $ac_pt_PKGCONFIG" >&5
   1.370 -+$as_echo "$ac_pt_PKGCONFIG" >&6; }
   1.371 - else
   1.372 -   { $as_echo "$as_me:$LINENO: result: no" >&5
   1.373 - $as_echo "no" >&6; }
   1.374 - fi
   1.375 - 
   1.376 --  if test "x$ac_pt_CONFIG_GMIME" = x; then
   1.377 --    CONFIG_GMIME="No"
   1.378 -+  if test "x$ac_pt_PKGCONFIG" = x; then
   1.379 -+    PKGCONFIG="No"
   1.380 -   else
   1.381 -     case $cross_compiling:$ac_tool_warned in
   1.382 - yes:)
   1.383 -@@ -51220,22 +51215,17 @@
   1.384 - $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
   1.385 - ac_tool_warned=yes ;;
   1.386 - esac
   1.387 --    CONFIG_GMIME=$ac_pt_CONFIG_GMIME
   1.388 -+    PKGCONFIG=$ac_pt_PKGCONFIG
   1.389 -   fi
   1.390 - else
   1.391 --  CONFIG_GMIME="$ac_cv_path_CONFIG_GMIME"
   1.392 -+  PKGCONFIG="$ac_cv_path_PKGCONFIG"
   1.393 - fi
   1.394 - 
   1.395 --	if test ! "x${CONFIG_GMIME}" = xNo; then
   1.396 --	    if test x"" = x ; then A=--cflags ; else A="" ; fi
   1.397 --	    GMIME_INCLUDE=$(${CONFIG_GMIME} $A)
   1.398 --	    if test x"" = x ; then A=--libs ; else A="" ; fi
   1.399 --	    GMIME_LIB=$(${CONFIG_GMIME} $A)
   1.400 -+	if test ! "x${PKGCONFIG}" = xNo; then
   1.401 -+	    GMIME_INCLUDE=$(${PKGCONFIG} gmime-2.4 --cflags 2>/dev/null)
   1.402 -+	    GMIME_LIB=$(${PKGCONFIG} gmime-2.4 --libs)
   1.403 - 	    if test x"#include <gmime/gmime.h>" != x ; then
   1.404 - 		saved_cppflags="${CPPFLAGS}"
   1.405 --		if test "x${GMIME_DIR}" != "x"; then
   1.406 --		    GMIME_INCLUDE="-I${GMIME_DIR}/include"
   1.407 --		fi
   1.408 - 		CPPFLAGS="${CPPFLAGS} ${GMIME_INCLUDE}"
   1.409 - 
   1.410 - 		saved_libs="${LIBS}"
   1.411  Index: formats/format_pcm.c
   1.412  diff -Nau formats/format_pcm.c.orig formats/format_pcm.c
   1.413  --- formats/format_pcm.c.orig	2011-07-14 22:13:06.000000000 +0200
   1.414 -+++ formats/format_pcm.c	2011-09-14 14:29:50.767970949 +0200
   1.415 ++++ formats/format_pcm.c	2012-03-18 17:47:07.898462166 +0100
   1.416  @@ -354,6 +354,7 @@
   1.417   		ast_log(LOG_WARNING, "Unable to write header\n");
   1.418   		return -1;
   1.419 @@ -970,8 +838,8 @@
   1.420   
   1.421  Index: formats/format_wav.c
   1.422  diff -Nau formats/format_wav.c.orig formats/format_wav.c
   1.423 ---- formats/format_wav.c.orig	2011-07-29 19:18:56.000000000 +0200
   1.424 -+++ formats/format_wav.c	2011-09-14 14:29:50.767970949 +0200
   1.425 +--- formats/format_wav.c.orig	2011-11-09 16:25:33.000000000 +0100
   1.426 ++++ formats/format_wav.c	2012-03-18 17:47:07.898462166 +0100
   1.427  @@ -308,6 +308,7 @@
   1.428   		ast_log(LOG_WARNING, "Unable to write header\n");
   1.429   		return -1;
   1.430 @@ -983,7 +851,7 @@
   1.431  Index: formats/format_wav_gsm.c
   1.432  diff -Nau formats/format_wav_gsm.c.orig formats/format_wav_gsm.c
   1.433  --- formats/format_wav_gsm.c.orig	2011-07-14 22:13:06.000000000 +0200
   1.434 -+++ formats/format_wav_gsm.c	2011-09-14 14:29:50.767970949 +0200
   1.435 ++++ formats/format_wav_gsm.c	2012-03-18 17:47:07.898462166 +0100
   1.436  @@ -366,6 +366,7 @@
   1.437   		ast_log(LOG_WARNING, "Unable to write header\n");
   1.438   		return -1;
   1.439 @@ -995,7 +863,7 @@
   1.440  Index: main/db1-ast/hash/hash.h
   1.441  diff -Nau main/db1-ast/hash/hash.h.orig main/db1-ast/hash/hash.h
   1.442  --- main/db1-ast/hash/hash.h.orig	2006-08-21 04:11:39.000000000 +0200
   1.443 -+++ main/db1-ast/hash/hash.h	2011-09-14 14:29:50.767970949 +0200
   1.444 ++++ main/db1-ast/hash/hash.h	2012-03-18 17:47:07.898462166 +0100
   1.445  @@ -36,6 +36,8 @@
   1.446    *	@(#)hash.h	8.3 (Berkeley) 5/31/94
   1.447    */
   1.448 @@ -1008,7 +876,7 @@
   1.449  Index: main/db1-ast/hash/ndbm.c
   1.450  diff -Nau main/db1-ast/hash/ndbm.c.orig main/db1-ast/hash/ndbm.c
   1.451  --- main/db1-ast/hash/ndbm.c.orig	2006-08-21 04:11:39.000000000 +0200
   1.452 -+++ main/db1-ast/hash/ndbm.c	2011-09-14 14:29:50.767970949 +0200
   1.453 ++++ main/db1-ast/hash/ndbm.c	2012-03-18 17:47:07.898462166 +0100
   1.454  @@ -49,7 +49,8 @@
   1.455   #include <string.h>
   1.456   #include <stdlib.h>
   1.457 @@ -1021,9 +889,9 @@
   1.458   /*
   1.459  Index: main/features.c
   1.460  diff -Nau main/features.c.orig main/features.c
   1.461 ---- main/features.c.orig	2011-08-10 00:12:59.000000000 +0200
   1.462 -+++ main/features.c	2011-09-14 14:29:50.777958246 +0200
   1.463 -@@ -1928,6 +1928,10 @@
   1.464 +--- main/features.c.orig	2012-01-23 21:30:21.000000000 +0100
   1.465 ++++ main/features.c	2012-03-18 17:47:07.898462166 +0100
   1.466 +@@ -2067,6 +2067,10 @@
   1.467   			snprintf(args, len, "%s,%s,m", S_OR(touch_format, "wav"), touch_filename);
   1.468   		}
   1.469   
   1.470 @@ -1034,7 +902,7 @@
   1.471   		for(x = 0; x < strlen(args); x++) {
   1.472   			if (args[x] == '/')
   1.473   				args[x] = '-';
   1.474 -@@ -2044,6 +2048,10 @@
   1.475 +@@ -2183,6 +2187,10 @@
   1.476   			snprintf(args, len, "%s.%s,b", touch_filename, S_OR(touch_format, "wav"));
   1.477   		}
   1.478   
   1.479 @@ -1047,8 +915,8 @@
   1.480   				args[x] = '-';
   1.481  Index: main/file.c
   1.482  diff -Nau main/file.c.orig main/file.c
   1.483 ---- main/file.c.orig	2011-07-05 15:23:57.000000000 +0200
   1.484 -+++ main/file.c	2011-09-14 14:29:50.777958246 +0200
   1.485 +--- main/file.c.orig	2012-01-05 23:06:46.000000000 +0100
   1.486 ++++ main/file.c	2012-03-18 17:47:07.898462166 +0100
   1.487  @@ -256,7 +256,7 @@
   1.488   	char *fn = NULL;
   1.489   
   1.490 @@ -1060,8 +928,8 @@
   1.491   		if (asprintf(&fn, "%s.%s", filename, ext) < 0) {
   1.492  Index: main/Makefile
   1.493  diff -Nau main/Makefile.orig main/Makefile
   1.494 ---- main/Makefile.orig	2011-08-03 17:14:36.000000000 +0200
   1.495 -+++ main/Makefile	2011-09-14 14:29:50.777958246 +0200
   1.496 +--- main/Makefile.orig	2011-09-19 22:27:03.000000000 +0200
   1.497 ++++ main/Makefile	2012-03-18 17:47:07.898462166 +0100
   1.498  @@ -69,10 +69,7 @@
   1.499   endif
   1.500   
   1.501 @@ -1076,9 +944,9 @@
   1.502   ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
   1.503  Index: main/tcptls.c
   1.504  diff -Nau main/tcptls.c.orig main/tcptls.c
   1.505 ---- main/tcptls.c.orig	2011-05-23 18:18:33.000000000 +0200
   1.506 -+++ main/tcptls.c	2011-09-14 14:29:50.777958246 +0200
   1.507 -@@ -357,6 +357,7 @@
   1.508 +--- main/tcptls.c.orig	2011-11-30 22:41:31.000000000 +0100
   1.509 ++++ main/tcptls.c	2012-03-18 17:47:07.898462166 +0100
   1.510 +@@ -372,6 +372,7 @@
   1.511   	if (!ast_strlen_zero(cfg->cafile) || !ast_strlen_zero(cfg->capath)) {
   1.512   		if (SSL_CTX_load_verify_locations(cfg->ssl_ctx, S_OR(cfg->cafile, NULL), S_OR(cfg->capath,NULL)) == 0)
   1.513   			ast_verb(0, "SSL CA file(%s)/path(%s) error\n", cfg->cafile, cfg->capath);
   1.514 @@ -1088,8 +956,8 @@
   1.515   	ast_verb(0, "SSL certificate ok\n");
   1.516  Index: main/udptl.c
   1.517  diff -Nau main/udptl.c.orig main/udptl.c
   1.518 ---- main/udptl.c.orig	2011-05-03 21:55:49.000000000 +0200
   1.519 -+++ main/udptl.c	2011-09-14 14:29:50.777958246 +0200
   1.520 +--- main/udptl.c.orig	2011-10-06 19:49:38.000000000 +0200
   1.521 ++++ main/udptl.c	2012-03-18 17:47:07.898462166 +0100
   1.522  @@ -98,6 +98,18 @@
   1.523   
   1.524   #define UDPTL_BUF_MASK              15
   1.525 @@ -1111,8 +979,8 @@
   1.526   	uint8_t buf[LOCAL_FAX_MAX_DATAGRAM];
   1.527  Index: Makefile
   1.528  diff -Nau Makefile.orig Makefile
   1.529 ---- Makefile.orig	2011-08-25 21:08:04.000000000 +0200
   1.530 -+++ Makefile	2011-09-14 14:29:50.777958246 +0200
   1.531 +--- Makefile.orig	2011-10-05 00:54:15.000000000 +0200
   1.532 ++++ Makefile	2012-03-18 17:47:07.898462166 +0100
   1.533  @@ -230,15 +230,6 @@
   1.534     _ASTCFLAGS+=-fsigned-char
   1.535   endif

     2.1 --- a/asterisk/asterisk.spec	Mon Jan 09 22:36:23 2012 +0100
     2.2 +++ b/asterisk/asterisk.spec	Sun Mar 18 18:45:29 2012 +0100
     2.3 @@ -22,11 +22,10 @@
     2.4  ##
     2.5  
     2.6  #   package version
     2.7 -%define       V_opkg                     1.8.8.1
     2.8 -%define       V_asterisk                 1.8.8.1
     2.9 +%define       V_opkg                     1.8.10.1
    2.10 +%define       V_asterisk                 1.8.10.1
    2.11  %define       V_asterisk_fax_subdir      1.8.4
    2.12  %define       V_asterisk_fax_digium      1.8.4_1.3.0
    2.13 -%define       V_asterisk_sounds_old      1.4.21
    2.14  %define       V_asterisk_sounds_core     1.4.22
    2.15  %define       V_asterisk_sounds_extra    1.4.11
    2.16  %define       V_asterisk_sounds_amoogab  1.4
    2.17 @@ -52,7 +51,7 @@
    2.18  Group:        VoIP
    2.19  License:      GPL
    2.20  Version:      %{V_opkg}
    2.21 -Release:      20120106
    2.22 +Release:      20120316
    2.23  
    2.24  #   package options
    2.25  %option       with_dahdi   no
    2.26 @@ -85,9 +84,9 @@
    2.27  Source3:      http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-sln16-%{V_asterisk_sounds_mohop}.tar.gz
    2.28  Source4:      http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-sln16-%{V_asterisk_sounds_core}.tar.gz
    2.29  Source5:      http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-sln16-%{V_asterisk_sounds_core}.tar.gz
    2.30 -Source6:      http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en_AU-sln16-%{V_asterisk_sounds_old}.tar.gz
    2.31 +Source6:      http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en_AU-sln16-%{V_asterisk_sounds_core}.tar.gz
    2.32  Source7:      http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-sln16-%{V_asterisk_sounds_core}.tar.gz
    2.33 -Source8:      http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ru-sln16-%{V_asterisk_sounds_old}.tar.gz
    2.34 +Source8:      http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ru-sln16-%{V_asterisk_sounds_core}.tar.gz
    2.35  Source9:      http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-sln16-%{V_asterisk_sounds_extra}.tar.gz
    2.36  Source10:     http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-fr-sln16-%{V_asterisk_sounds_extra}.tar.gz
    2.37  Source11:     http://www.amooma.de/asterisk/sprachbausteine/asterisk-%{V_asterisk_sounds_amoogab}-de-prompts.tar.gz
    2.38 @@ -664,7 +663,7 @@
    2.39  
    2.40        #   install australian nonversioned sound prompt files
    2.41        cd $RPM_BUILD_ROOT%{l_prefix}/share/asterisk/sounds/en_AU
    2.42 -      %{l_tar} zxf %{_sourcedir}/asterisk-core-sounds-en_AU-current.tar.gz
    2.43 +      %{l_tar} zxf %%{_sourcedir}/asterisk-core-sounds-en_AU-sln16-%{V_asterisk_sounds_core}.tar.gz
    2.44  
    2.45        #   install main sound prompt files
    2.46        #for codec in alaw ulaw g722 g729 gsm; do