OpenPKG Specs: comparison asterisk/asterisk.patch

-:3971a38d4385
+:b04f8acf4558
 +
 Index: apps/app_meetme.c
 diff -Nau apps/app_meetme.c.orig apps/app_meetme.c
 --- apps/app_meetme.c.orig	2011-07-19 17:43:32.000000000 +0200
 +++ apps/app_meetme.c	2011-09-14 14:29:50.747960016 +0200
-@@ -606,6 +606,7 @@
+@@ -607,6 +607,7 @@
-	CONFFLAG_DURATION_LIMIT = (1 << 30),
-	/*! Do not write any audio to this channel until the state is up. */
+/*! Do not write any audio to this channel until the state is up. */
-	CONFFLAG_NO_AUDIO_UNTIL_UP = (1 << 31),
+#define CONFFLAG_NO_AUDIO_UNTIL_UP  (1ULL << 31)
-+	CONFFLAG_USERNAME = (1 << 32),
++#define CONFFLAG_USERNAME (1 << 32)
-};
+/*! If set play an intro announcement at start of conference */
+#define CONFFLAG_INTROMSG           (1ULL << 32)
-/* !If set play an intro announcement at start of conference */
-@@ -619,6 +620,7 @@
+@@ -618,6 +619,7 @@
 	OPT_ARG_MOH_CLASS = 4,
 	OPT_ARG_INTROMSG = 5,
 	OPT_ARG_ARRAY_SIZE = 6,
 +	OPT_ARG_USERNAME = 7,
 };
 AST_APP_OPTIONS(meetme_opts, BEGIN_OPTIONS
-@@ -652,6 +654,7 @@
+@@ -651,6 +653,7 @@
 	AST_APP_OPTION('1', CONFFLAG_NOONLYPERSON ),
 	AST_APP_OPTION_ARG('S', CONFFLAG_DURATION_STOP, OPT_ARG_DURATION_STOP),
 	AST_APP_OPTION_ARG('L', CONFFLAG_DURATION_LIMIT, OPT_ARG_DURATION_LIMIT),
 +	AST_APP_OPTION_ARG('n', CONFFLAG_USERNAME, OPT_ARG_USERNAME),
 END_OPTIONS );
 static const char * const app = "MeetMe";
-@@ -2447,6 +2450,12 @@
+@@ -2446,6 +2449,12 @@
 		ast_test_flag64(confflags, CONFFLAG_INTROUSERNOREVIEW))) {
 		char destdir[PATH_MAX];
 + 	    if (!ast_test_flag64(confflags, CONFFLAG_USERNAME)
 + 		&& !ast_strlen_zero(optargs[OPT_ARG_USERNAME])
 + 	    else {
 +
 		snprintf(destdir, sizeof(destdir), "%s/meetme", ast_config_AST_SPOOL_DIR);
 		if (ast_mkdir(destdir, 0777) != 0) {
-@@ -2463,6 +2472,7 @@
+@@ -2462,6 +2471,7 @@
 			res = ast_record_review(chan, "vm-rec-name", user->namerecloc, 10, "sln", &duration, NULL);
 		if (res == -1)
 			goto outrun;
 +	    }
 	}
 static char imapfolder[64];
 +static int  imapsubfold = 0;
 static char imapparentfolder[64] = "\0";
 static char greetingfolder[64];
 static char authuser[32];
-@@ -2504,7 +2505,7 @@
+@@ -2517,7 +2518,7 @@
 	}
 	/* Build up server information */
 -	ast_build_string(&t, &left, "{%s:%s/imap", imapserver, imapport);
 +	ast_build_string(&t, &left, "{%s:%s", imapserver, imapport);
 	/* Add authentication user if present */
 	if (!ast_strlen_zero(authuser))
-@@ -6161,6 +6162,7 @@
+@@ -6174,6 +6175,7 @@
 	/* simple. huh? */
 	char sequence[10];
 	char mailbox[256];
 +	char folder[256];
 	int res;
 	/* get the real IMAP message number for this message */
-@@ -6176,10 +6178,24 @@
+@@ -6189,10 +6191,24 @@
 		mail_setflag(vms->mailstream, sequence, "\\Unseen");
 		mail_clearflag(vms->mailstream, sequence, "\\Seen");
 	}
 -	if (!strcasecmp(mbox(vmu, NEW_FOLDER), vms->curbox) && (box == NEW_FOLDER || box == OLD_FOLDER)) {
 -		ast_mutex_unlock(&vms->lock);
 	}
 +
 	/* Create the folder if it don't exist */
 	imap_mailbox_name(mailbox, sizeof(mailbox), vms, box, 1); /* Get the full mailbox name */
 	ast_debug(5, "Checking if folder exists: %s\n", mailbox);
-@@ -10383,6 +10399,10 @@
+@@ -10467,6 +10483,10 @@
 #ifndef IMAP_STORAGE
 				} else if (!cmd) {
 					vms.deleted[vms.curmsg] = 1;
 +#else
 +				} else if (!cmd && (folder_int(vms.curbox) > 1  || box > 1)) {
 +					vms.deleted[vms.curmsg] = 1;  /* Enforce deletion after */
 +					deleted = 1;                  /* successful copy op */
 #endif
 				} else {
 					vms.deleted[vms.curmsg] = 0;
-@@ -11874,6 +11894,15 @@
+@@ -11963,6 +11983,15 @@
 		} else {
 			ast_copy_string(imapfolder, "INBOX", sizeof(imapfolder));
 		}
 +		/* IMAP saved (sub)folder location policy */
 +		if ((val = ast_variable_retrieve(cfg, "general", "imapsubfold"))) {
 endif
 Index: channels/chan_sip.c
 diff -Nau channels/chan_sip.c.orig channels/chan_sip.c
 --- channels/chan_sip.c.orig	2011-08-10 00:12:59.000000000 +0200
 +++ channels/chan_sip.c	2011-09-14 14:29:50.757959000 +0200
-@@ -11647,7 +11647,16 @@
+@@ -11650,7 +11650,16 @@
 	} else {
 		if (sipmethod == SIP_NOTIFY && !ast_strlen_zero(p->theirtag)) {
 			/* If this is a NOTIFY, use the From: tag in the subscribe (RFC 3265) */
 -			snprintf(to, sizeof(to), "<%s%s>;tag=%s", (strncasecmp(p->uri, "sip:", 4) ? "sip:" : ""), p->uri, p->theirtag);
 +			if (strncasecmp(p->uri, "sip:", strlen("sip:")))
 	"console {videodevice|videocodec"	\
 Index: configure
 diff -Nau configure.orig configure
 --- configure.orig	2011-08-25 21:08:04.000000000 +0200
 +++ configure	2011-09-14 14:29:50.767970949 +0200
-@@ -4704,11 +4704,6 @@
+@@ -4244,11 +4244,6 @@
 esac
 case "${host_os}" in
 -     freebsd*)
 -     ac_default_prefix=/usr/local
 -     LDFLAGS=-L/usr/local/lib
 -     ;;
 openbsd*)
 ac_default_prefix=/usr/local
 if test ${prefix} = '/usr/local' || test ${prefix} = 'NONE'; then
-@@ -18308,8 +18303,8 @@
+@@ -29617,8 +29612,8 @@
 		if test -f "${IMAP_TK_DIR}/c-client/LDFLAGS"; then
 		imap_ldflags=`cat ${IMAP_TK_DIR}/c-client/LDFLAGS`
 		fi
 -		imap_libs="${IMAP_TK_DIR}/c-client/c-client.a"
 -	  	imap_include="-I${IMAP_TK_DIR}/c-client"
 +		imap_libs="-limap -lssl -lcrypto -lcrypt"
 +	  	imap_include="-DUSE_SYSTEM_IMAP -I${IMAP_TK_DIR}/include/imap"
 	CPPFLAGS="${CPPFLAGS} ${imap_include}"
 	  	LIBS="${LIBS} ${imap_libs} "`echo ${imap_ldflags}`
-	  	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	  	cat >conftest.$ac_ext <<_ACEOF
-@@ -25541,19 +25536,19 @@
+@@ -47493,7 +47488,7 @@
-# now check for the header.
-if test "${AST_LUA_FOUND}" = "yes"; then
--      LUA_LIB="${pbxlibdir} -llua5.1 -lm"
-+      LUA_LIB="${pbxlibdir} -llua -lm"
-# if --with-LUA=DIR has been specified, use it.
-if test "x${LUA_DIR}" != "x"; then
-LUA_INCLUDE="-I${LUA_DIR}/include"
-fi
-LUA_INCLUDE="${LUA_INCLUDE} "
--      if test "xlua5.1/lua.h" = "x" ; then	# no header, assume found
-+      if test "xlua/lua.h" = "x" ; then	# no header, assume found
-LUA_HEADER_FOUND="1"
-else				# check for the header
-ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
-CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE}"
--         ac_fn_c_check_header_mongrel "$LINENO" "lua5.1/lua.h" "ac_cv_header_lua5_1_lua_h" "$ac_includes_default"
--if test "x$ac_cv_header_lua5_1_lua_h" = x""yes; then :
-+         ac_fn_c_check_header_mongrel "$LINENO" "lua/lua.h" "ac_cv_header_lua_lua_h" "$ac_includes_default"
-+if test "x$ac_cv_header_lua_lua_h" = x""yes; then :
-LUA_HEADER_FOUND=1
-else
-LUA_HEADER_FOUND=0
-@@ -25581,9 +25576,9 @@
-if test "x${PBX_LUA}" = "x1" ; then
-	if test x"${LUA_DIR}" = x; then
--		LUA_INCLUDE="${LUA_INCLUDE} -I/usr/include/lua5.1"
-+		LUA_INCLUDE="${LUA_INCLUDE} -I/usr/include/lua"
-	else
--		LUA_INCLUDE="${LUA_INCLUDE} -I${LUA_DIR}/lua5.1"
-+		LUA_INCLUDE="${LUA_INCLUDE} -I${LUA_DIR}/lua"
-	fi
-fi
-@@ -26262,7 +26257,7 @@
 	 pbxlibdir="-L${SQLITE_DIR}"
 fi
 fi
 -   pbxfuncname="sqlite_exec"
 +   pbxfuncname="sqlite3_exec"
 if test "x${pbxfuncname}" = "x" ; then   # empty lib, assume only headers
 AST_SQLITE_FOUND=yes
 else
-@@ -26976,16 +26971,16 @@
+@@ -49185,16 +49180,16 @@
 if test "x${PBX_GMIME}" != "x1" -a "${USE_GMIME}" != "no"; then
 	PBX_GMIME=0
 	if test -n "$ac_tool_prefix"; then
 -  # Extract the first word of "${ac_tool_prefix}gmime-config", so it can be a program name with args.
 -set dummy ${ac_tool_prefix}gmime-config; ac_word=$2
-+   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
++  # 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
++set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
--if test "${ac_cv_path_CONFIG_GMIME+set}" = set; then :
+-if test "${ac_cv_path_CONFIG_GMIME+set}" = set; then
-+if test "${ac_cv_prog_PKGCONFIG+set}" = set; then
++if test "${ac_cv_path_PKGCONFIG+set}" = set; then
-$as_echo_n "(cached) " >&6
+echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 -  case $CONFIG_GMIME in
 +  case $PKGCONFIG in
 [\\/]* | ?:[\\/]*)
 -  ac_cv_path_CONFIG_GMIME="$CONFIG_GMIME" # Let the user override the test with a path.
 +  ac_cv_path_PKGCONFIG="$PKGCONFIG" # Let the user override the test with a path.
 ;;
 *)
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -26996,7 +26991,7 @@
+@@ -49205,7 +49200,7 @@
 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_path_CONFIG_GMIME="$as_dir/$ac_word$ac_exec_ext"
 +    ac_cv_path_PKGCONFIG="$as_dir/$ac_word$ac_exec_ext"
-$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
 fi
-@@ -27007,10 +27002,10 @@
+@@ -49216,10 +49211,10 @@
 ;;
 esac
 fi
 -CONFIG_GMIME=$ac_cv_path_CONFIG_GMIME
 -if test -n "$CONFIG_GMIME"; then
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CONFIG_GMIME" >&5
+-  { echo "$as_me:$LINENO: result: $CONFIG_GMIME" >&5
--$as_echo "$CONFIG_GMIME" >&6; }
+-echo "${ECHO_T}$CONFIG_GMIME" >&6; }
 +PKGCONFIG=$ac_cv_path_PKGCONFIG
 +if test -n "$PKGCONFIG"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKGCONFIG" >&5
++  { echo "$as_me:$LINENO: result: $PKGCONFIG" >&5
-+$as_echo "$PKGCONFIG" >&6; }
++echo "${ECHO_T}$PKGCONFIG" >&6; }
 else
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+{ echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+echo "${ECHO_T}no" >&6; }
-@@ -27018,18 +27013,18 @@
+@@ -49227,18 +49222,18 @@
 fi
 -if test -z "$ac_cv_path_CONFIG_GMIME"; then
 -  ac_pt_CONFIG_GMIME=$CONFIG_GMIME
 -set dummy gmime-config; ac_word=$2
 +if test -z "$ac_cv_path_PKGCONFIG"; then
 +  ac_pt_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
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
--if test "${ac_cv_path_ac_pt_CONFIG_GMIME+set}" = set; then :
+-if test "${ac_cv_path_ac_pt_CONFIG_GMIME+set}" = set; then
-+if test "${ac_cv_path_ac_pt_PKGCONFIG+set}" = set; then :
++if test "${ac_cv_path_ac_pt_PKGCONFIG+set}" = set; then
-$as_echo_n "(cached) " >&6
+echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 -  case $ac_pt_CONFIG_GMIME in
 +  case $ac_pt_PKGCONFIG in
 [\\/]* | ?:[\\/]*)
 -  ac_cv_path_ac_pt_CONFIG_GMIME="$ac_pt_CONFIG_GMIME" # Let the user override the test with a path.
 +  ac_cv_path_ac_pt_PKGCONFIG="$ac_pt_PKGCONFIG" # Let the user override the test with a path.
 ;;
 *)
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -27040,7 +27035,7 @@
+@@ -49249,7 +49244,7 @@
 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_path_ac_pt_CONFIG_GMIME="$as_dir/$ac_word$ac_exec_ext"
 +    ac_cv_path_ac_pt_PKGCONFIG="$as_dir/$ac_word$ac_exec_ext"
-$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
 fi
-@@ -27051,17 +27046,17 @@
+@@ -49260,17 +49255,17 @@
 ;;
 esac
 fi
 -ac_pt_CONFIG_GMIME=$ac_cv_path_ac_pt_CONFIG_GMIME
 -if test -n "$ac_pt_CONFIG_GMIME"; then
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_CONFIG_GMIME" >&5
+-  { echo "$as_me:$LINENO: result: $ac_pt_CONFIG_GMIME" >&5
--$as_echo "$ac_pt_CONFIG_GMIME" >&6; }
+-echo "${ECHO_T}$ac_pt_CONFIG_GMIME" >&6; }
 +ac_pt_PKGCONFIG=$ac_cv_path_ac_pt_PKGCONFIG
 +if test -n "$ac_pt_PKGCONFIG"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKGCONFIG" >&5
++  { echo "$as_me:$LINENO: result: $ac_pt_PKGCONFIG" >&5
-+$as_echo "${ECHO_T}$ac_pt_PKGCONFIG" >&6; }
++echo "${ECHO_T}$ac_pt_PKGCONFIG" >&6; }
 else
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+{ echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+echo "${ECHO_T}no" >&6; }
 fi
 -  if test "x$ac_pt_CONFIG_GMIME" = x; then
 -    CONFIG_GMIME="No"
 +  if test "x$ac_pt_PKGCONFIG" = x; then
 +    PKGCONFIG="No"
 else
 case $cross_compiling:$ac_tool_warned in
 yes:)
-@@ -27069,17 +27064,15 @@
+@@ -49282,22 +49277,17 @@
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 ac_tool_warned=yes ;;
 esac
 -    CONFIG_GMIME=$ac_pt_CONFIG_GMIME
 +    PKGCONFIG=$ac_pt_PKGCONFIG
 fi
 +	if test ! "x${PKGCONFIG}" = xNo; then
 +	    GMIME_INCLUDE=$(${PKGCONFIG} gmime-2.4 --cflags 2>/dev/null)
 +	    GMIME_LIB=$(${PKGCONFIG} gmime-2.4 --libs)
 	    if test x"#include <gmime/gmime.h>" != x ; then
 		saved_cppflags="${CPPFLAGS}"
-		if test "x${GMIME_DIR}" != "x"; then
+-		if test "x${GMIME_DIR}" != "x"; then
+-		    GMIME_INCLUDE="-I${GMIME_DIR}/include"
+-		fi
+		CPPFLAGS="${CPPFLAGS} ${GMIME_INCLUDE}"
+		saved_libs="${LIBS}"
 Index: formats/format_pcm.c
 diff -Nau formats/format_pcm.c.orig formats/format_pcm.c
 --- formats/format_pcm.c.orig	2011-07-14 22:13:06.000000000 +0200
 +++ formats/format_pcm.c	2011-09-14 14:29:50.767970949 +0200
 @@ -354,6 +354,7 @@
 /*
 Index: main/features.c
 diff -Nau main/features.c.orig main/features.c
 --- main/features.c.orig	2011-08-10 00:12:59.000000000 +0200
 +++ main/features.c	2011-09-14 14:29:50.777958246 +0200
-@@ -1646,6 +1646,10 @@
+@@ -1922,6 +1922,10 @@
 			snprintf(args, len, "%s,%s,m", S_OR(touch_format, "wav"), touch_filename);
 		}
 +		for(x = 0; x < strlen(touch_filename); x++) {
 +			if (args[x] == '/')
 +				args[x] = '-';
 +		}
 		for(x = 0; x < strlen(args); x++) {
 			if (args[x] == '/')
 				args[x] = '-';
-@@ -1762,6 +1766,10 @@
+@@ -2038,6 +2042,10 @@
 			snprintf(args, len, "%s.%s,b", touch_filename, S_OR(touch_format, "wav"));
 		}
 +		for( x = 0; x < strlen(touch_filename); x++) {
 +			if (args[x] == '/')

OpenPKG Specs / file comparison

comparison: asterisk/asterisk.patch

asterisk/asterisk.patch