Update to new vendor version and adjust patch logic accordingly. default tip

Mon, 01 Sep 2014 21:57:20 +0200

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Mon, 01 Sep 2014 21:57:20 +0200
changeset 798
4ef5d37e8bb2
parent 797
ded2db56a196

Update to new vendor version and adjust patch logic accordingly.

asterisk/asterisk.patch file | annotate | diff | comparison | revisions
asterisk/asterisk.patch.proxymwi file | annotate | diff | comparison | revisions
asterisk/asterisk.patch.xfersips file | annotate | diff | comparison | revisions
asterisk/asterisk.spec file | annotate | diff | comparison | revisions
     1.1 --- a/asterisk/asterisk.patch	Mon Sep 01 21:55:47 2014 +0200
     1.2 +++ b/asterisk/asterisk.patch	Mon Sep 01 21:57:20 2014 +0200
     1.3 @@ -2,9 +2,9 @@
     1.4  diff -Nau addons/chan_ooh323.c.orig addons/chan_ooh323.c
     1.5  --- addons/chan_ooh323.c.orig	2012-01-26 21:14:50.000000000 +0100
     1.6  +++ addons/chan_ooh323.c	2012-03-18 17:47:07.875949857 +0100
     1.7 -@@ -24,6 +24,12 @@
     1.8 - 
     1.9 +@@ -25,6 +25,12 @@
    1.10   #include "chan_ooh323.h"
    1.11 + #include "asterisk/paths.h"
    1.12   #include <math.h>
    1.13  +#if defined __SVR4 && defined __sun
    1.14  +#include <sys/sockio.h>
    1.15 @@ -198,15 +198,15 @@
    1.16  diff -Nau apps/app_meetme.c.orig apps/app_meetme.c
    1.17  --- apps/app_meetme.c.orig	2012-01-09 16:37:12.000000000 +0100
    1.18  +++ apps/app_meetme.c	2012-03-18 17:47:07.875949857 +0100
    1.19 -@@ -614,6 +614,7 @@
    1.20 +@@ -624,6 +624,7 @@
    1.21   
    1.22   /*! Do not write any audio to this channel until the state is up. */
    1.23   #define CONFFLAG_NO_AUDIO_UNTIL_UP  (1ULL << 31)
    1.24  +#define CONFFLAG_USERNAME (1 << 32)
    1.25   /*! If set play an intro announcement at start of conference */
    1.26   #define CONFFLAG_INTROMSG           (1ULL << 32)
    1.27 - 
    1.28 -@@ -625,6 +626,7 @@
    1.29 + /*! If set, don't enable a denoiser for the channel */
    1.30 +@@ -637,6 +638,7 @@
    1.31   	OPT_ARG_MOH_CLASS = 4,
    1.32   	OPT_ARG_INTROMSG = 5,
    1.33   	OPT_ARG_ARRAY_SIZE = 6,
    1.34 @@ -214,7 +214,7 @@
    1.35   };
    1.36   
    1.37   AST_APP_OPTIONS(meetme_opts, BEGIN_OPTIONS
    1.38 -@@ -658,6 +660,7 @@
    1.39 +@@ -671,6 +673,7 @@
    1.40   	AST_APP_OPTION('1', CONFFLAG_NOONLYPERSON ),
    1.41    	AST_APP_OPTION_ARG('S', CONFFLAG_DURATION_STOP, OPT_ARG_DURATION_STOP),
    1.42   	AST_APP_OPTION_ARG('L', CONFFLAG_DURATION_LIMIT, OPT_ARG_DURATION_LIMIT),
    1.43 @@ -222,7 +222,7 @@
    1.44   END_OPTIONS );
    1.45   
    1.46   static const char * const app = "MeetMe";
    1.47 -@@ -2453,6 +2456,12 @@
    1.48 +@@ -3014,6 +3017,12 @@
    1.49   		ast_test_flag64(confflags, CONFFLAG_INTROUSERNOREVIEW))) {
    1.50   		char destdir[PATH_MAX];
    1.51   
    1.52 @@ -235,7 +235,7 @@
    1.53   		snprintf(destdir, sizeof(destdir), "%s/meetme", ast_config_AST_SPOOL_DIR);
    1.54   
    1.55   		if (ast_mkdir(destdir, 0777) != 0) {
    1.56 -@@ -2469,6 +2478,7 @@
    1.57 +@@ -3030,6 +3039,7 @@
    1.58   			res = ast_record_review(chan, "vm-rec-name", user->namerecloc, 10, "sln", &duration, NULL);
    1.59   		if (res == -1)
    1.60   			goto outrun;
    1.61 @@ -255,7 +255,7 @@
    1.62   static char imapparentfolder[64] = "\0";
    1.63   static char greetingfolder[64];
    1.64   static char authuser[32];
    1.65 -@@ -2527,7 +2528,7 @@
    1.66 +@@ -2550,7 +2551,7 @@
    1.67   	}
    1.68   
    1.69   	/* Build up server information */
    1.70 @@ -264,7 +264,7 @@
    1.71   
    1.72   	/* Add authentication user if present */
    1.73   	if (!ast_strlen_zero(authuser))
    1.74 -@@ -6193,6 +6194,7 @@
    1.75 +@@ -6220,6 +6221,7 @@
    1.76   	/* simple. huh? */
    1.77   	char sequence[10];
    1.78   	char mailbox[256];
    1.79 @@ -272,7 +272,7 @@
    1.80   	int res;
    1.81   
    1.82   	/* get the real IMAP message number for this message */
    1.83 -@@ -6208,10 +6210,24 @@
    1.84 +@@ -6235,10 +6237,24 @@
    1.85   		mail_setflag(vms->mailstream, sequence, "\\Unseen");
    1.86   		mail_clearflag(vms->mailstream, sequence, "\\Seen");
    1.87   	}
    1.88 @@ -299,7 +299,7 @@
    1.89   	/* Create the folder if it don't exist */
    1.90   	imap_mailbox_name(mailbox, sizeof(mailbox), vms, box, 1); /* Get the full mailbox name */
    1.91   	ast_debug(5, "Checking if folder exists: %s\n", mailbox);
    1.92 -@@ -7290,7 +7306,11 @@
    1.93 +@@ -7317,7 +7333,11 @@
    1.94   				int oldmsgs;
    1.95   				int newmsgs;
    1.96   				int capacity;
    1.97 @@ -312,7 +312,7 @@
    1.98   					ast_log(LOG_ERROR, "Problem in calculating number of voicemail messages available for extension %s\n", s);
    1.99   					/* Shouldn't happen, but allow trying another extension if it does */
   1.100   					res = ast_play_and_wait(chan, "pbx-invalid");
   1.101 -@@ -10281,7 +10301,7 @@
   1.102 +@@ -10308,7 +10328,7 @@
   1.103   
   1.104   				case '5': /* Leave VoiceMail */
   1.105   					if (ast_test_flag(vmu, VM_SVMAIL)) {
   1.106 @@ -321,7 +321,7 @@
   1.107   						if (cmd == ERROR_LOCK_PATH || cmd == OPERATOR_EXIT) {
   1.108   							res = cmd;
   1.109   							goto out;
   1.110 -@@ -10464,7 +10484,7 @@
   1.111 +@@ -10491,7 +10511,7 @@
   1.112   	
   1.113   		case '8': /* Forward the current message */
   1.114   			if (vms.lastmsg > -1) {
   1.115 @@ -330,7 +330,7 @@
   1.116   				if (cmd == ERROR_LOCK_PATH) {
   1.117   					res = cmd;
   1.118   					goto out;
   1.119 -@@ -10517,6 +10537,10 @@
   1.120 +@@ -10544,6 +10564,10 @@
   1.121   #ifndef IMAP_STORAGE
   1.122   				} else if (!cmd) {
   1.123   					vms.deleted[vms.curmsg] = 1;
   1.124 @@ -341,7 +341,7 @@
   1.125   #endif
   1.126   				} else {
   1.127   					vms.deleted[vms.curmsg] = 0;
   1.128 -@@ -12046,6 +12070,15 @@
   1.129 +@@ -12071,6 +12095,15 @@
   1.130   		} else {
   1.131   			ast_copy_string(imapfolder, "INBOX", sizeof(imapfolder));
   1.132   		}
   1.133 @@ -361,7 +361,7 @@
   1.134  diff -Nau cdr/cdr_radius.c.orig cdr/cdr_radius.c
   1.135  --- cdr/cdr_radius.c.orig	2011-07-14 22:13:06.000000000 +0200
   1.136  +++ cdr/cdr_radius.c	2012-03-18 17:47:07.888451260 +0100
   1.137 -@@ -106,10 +106,18 @@
   1.138 +@@ -114,10 +114,18 @@
   1.139   	if (!rc_avpair_add(rh, tosend, PW_AST_SRC, &cdr->src, strlen(cdr->src), VENDOR_CODE))
   1.140   		return -1;
   1.141   
   1.142 @@ -380,7 +380,7 @@
   1.143    	/* Destination context */
   1.144   	if (!rc_avpair_add(rh, tosend, PW_AST_DST_CTX, &cdr->dcontext, strlen(cdr->dcontext), VENDOR_CODE))
   1.145   		return -1;
   1.146 -@@ -164,6 +172,10 @@
   1.147 +@@ -172,6 +180,10 @@
   1.148   	if (!rc_avpair_add(rh, tosend, PW_AST_BILL_SEC, &cdr->billsec, 0, VENDOR_CODE))
   1.149   		return -1;
   1.150   
   1.151 @@ -391,7 +391,7 @@
   1.152   	/* Disposition */
   1.153   	tmp = ast_cdr_disp2str(cdr->disposition);
   1.154   	if (!rc_avpair_add(rh, tosend, PW_AST_DISPOSITION, tmp, strlen(tmp), VENDOR_CODE))
   1.155 -@@ -187,10 +199,14 @@
   1.156 +@@ -195,10 +207,14 @@
   1.157   	}
   1.158   
   1.159   	/* Setting Acct-Session-Id & User-Name attributes for proper generation
   1.160 @@ -785,7 +785,7 @@
   1.161  diff -Nau channels/chan_sip.c.orig channels/chan_sip.c
   1.162  --- channels/chan_sip.c.orig	2012-02-28 18:53:34.000000000 +0100
   1.163  +++ channels/chan_sip.c	2012-03-18 17:47:07.898462166 +0100
   1.164 -@@ -12150,7 +12150,16 @@
   1.165 +@@ -12483,7 +12483,16 @@
   1.166    	} else {
   1.167    		if (sipmethod == SIP_NOTIFY && !ast_strlen_zero(p->theirtag)) {
   1.168    			/* If this is a NOTIFY, use the From: tag in the subscribe (RFC 3265) */
   1.169 @@ -823,7 +823,7 @@
   1.170  diff -Nau configure.orig configure
   1.171  --- configure.orig	2012-01-14 17:40:17.000000000 +0100
   1.172  +++ configure	2012-03-18 17:47:32.518450837 +0100
   1.173 -@@ -4711,11 +4711,6 @@
   1.174 +@@ -4743,11 +4743,6 @@
   1.175   esac
   1.176   
   1.177   case "${host_os}" in
   1.178 @@ -835,7 +835,7 @@
   1.179        openbsd*)
   1.180        ac_default_prefix=/usr/local
   1.181        if test ${prefix} = '/usr/local' || test ${prefix} = 'NONE'; then
   1.182 -@@ -18994,8 +18989,8 @@
   1.183 +@@ -19261,8 +19256,8 @@
   1.184   		if test -f "${IMAP_TK_DIR}/c-client/LDFLAGS"; then
   1.185         		imap_ldflags=`cat ${IMAP_TK_DIR}/c-client/LDFLAGS`
   1.186   		fi
   1.187 @@ -846,8 +846,8 @@
   1.188         	CPPFLAGS="${CPPFLAGS} ${imap_include}"
   1.189   	  	LIBS="${LIBS} ${imap_libs} "`echo ${imap_ldflags}`
   1.190   	  	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
   1.191 -@@ -26771,7 +26766,7 @@
   1.192 -       	 pbxlibdir="-L${SQLITE_DIR}"
   1.193 +@@ -27359,7 +27354,7 @@
   1.194 +          pbxlibdir="-L${SQLITE_DIR}"
   1.195         fi
   1.196      fi
   1.197  -   pbxfuncname="sqlite_exec"
   1.198 @@ -922,7 +922,7 @@
   1.199  diff -Nau main/features.c.orig main/features.c
   1.200  --- main/features.c.orig	2012-01-23 21:30:21.000000000 +0100
   1.201  +++ main/features.c	2012-03-18 17:47:07.898462166 +0100
   1.202 -@@ -2158,6 +2158,10 @@
   1.203 +@@ -2163,6 +2163,10 @@
   1.204   		snprintf(args, len, "%s,%s,m", S_OR(touch_format, "wav"), touch_filename);
   1.205   	}
   1.206   
   1.207 @@ -933,7 +933,7 @@
   1.208   	for(x = 0; x < strlen(args); x++) {
   1.209   		if (args[x] == '/')
   1.210   			args[x] = '-';
   1.211 -@@ -2270,6 +2274,10 @@
   1.212 +@@ -2275,6 +2279,10 @@
   1.213   		snprintf(args, len, "%s.%s,b", touch_filename, S_OR(touch_format, "wav"));
   1.214   	}
   1.215   
   1.216 @@ -956,7 +956,7 @@
   1.217  +		ext = "wav";
   1.218   
   1.219   	if (filename[0] == '/') {
   1.220 - 		if (asprintf(&fn, "%s.%s", filename, ext) < 0) {
   1.221 + 		if (ast_asprintf(&fn, "%s.%s", filename, ext) < 0) {
   1.222  Index: main/Makefile
   1.223  diff -Nau main/Makefile.orig main/Makefile
   1.224  --- main/Makefile.orig	2011-09-19 22:27:03.000000000 +0200
   1.225 @@ -977,7 +977,7 @@
   1.226  diff -Nau main/tcptls.c.orig main/tcptls.c
   1.227  --- main/tcptls.c.orig	2011-11-30 22:41:31.000000000 +0100
   1.228  +++ main/tcptls.c	2012-03-18 17:47:07.898462166 +0100
   1.229 -@@ -391,6 +391,7 @@
   1.230 +@@ -821,6 +821,7 @@
   1.231   	if (!ast_strlen_zero(cfg->cafile) || !ast_strlen_zero(cfg->capath)) {
   1.232   		if (SSL_CTX_load_verify_locations(cfg->ssl_ctx, S_OR(cfg->cafile, NULL), S_OR(cfg->capath,NULL)) == 0)
   1.233   			ast_verb(0, "SSL CA file(%s)/path(%s) error\n", cfg->cafile, cfg->capath);
   1.234 @@ -1012,7 +1012,7 @@
   1.235  diff -Nau Makefile.orig Makefile
   1.236  --- Makefile.orig	2011-10-05 00:54:15.000000000 +0200
   1.237  +++ Makefile	2012-03-18 17:47:07.898462166 +0100
   1.238 -@@ -186,12 +186,6 @@
   1.239 +@@ -185,12 +185,6 @@
   1.240     _ASTCFLAGS+=-isystem /usr/local/include
   1.241   endif
   1.242   
     2.1 --- a/asterisk/asterisk.patch.proxymwi	Mon Sep 01 21:55:47 2014 +0200
     2.2 +++ b/asterisk/asterisk.patch.proxymwi	Mon Sep 01 21:57:20 2014 +0200
     2.3 @@ -2,7 +2,7 @@
     2.4  diff -Nau channels/chan_sip.c.orig channels/chan_sip.c
     2.5  --- channels/chan_sip.c.orig	2011-01-14 18:32:52.000000000 +0100
     2.6  +++ channels/chan_sip.c	2011-03-13 14:34:29.000000000 +0100
     2.7 -@@ -25791,6 +25791,7 @@
     2.8 +@@ -26449,6 +26449,7 @@
     2.9   	struct sip_pvt *p;
    2.10   	int newmsgs = 0, oldmsgs = 0;
    2.11   	const char *vmexten = NULL;
    2.12 @@ -10,7 +10,7 @@
    2.13   
    2.14   	ao2_lock(peer);
    2.15   
    2.16 -@@ -25852,6 +25853,11 @@
    2.17 +@@ -26510,6 +26511,11 @@
    2.18   		}
    2.19   		/* Recalculate our side, and recalculate Call ID */
    2.20   		ast_sip_ouraddrfor(&p->sa, &p->ourip, p);
     3.1 --- a/asterisk/asterisk.patch.xfersips	Mon Sep 01 21:55:47 2014 +0200
     3.2 +++ b/asterisk/asterisk.patch.xfersips	Mon Sep 01 21:57:20 2014 +0200
     3.3 @@ -2,7 +2,7 @@
     3.4  diff -Nau channels/chan_sip.c.orig channels/chan_sip.c
     3.5  --- channels/chan_sip.c.orig	2011-05-23 17:35:28.358543497 +0200
     3.6  +++ channels/chan_sip.c	2011-05-23 17:57:05.948534524 +0200
     3.7 -@@ -29733,6 +29733,7 @@
     3.8 +@@ -30388,6 +30388,7 @@
     3.9   \todo	Fix this function so that we wait for reply to the REFER and
    3.10   	react to errors, denials or other issues the other end might have.
    3.11    */
    3.12 @@ -10,7 +10,7 @@
    3.13   static int sip_sipredirect(struct sip_pvt *p, const char *dest)
    3.14   {
    3.15   	char *cdest;
    3.16 -@@ -29741,7 +29742,7 @@
    3.17 +@@ -30396,7 +30397,7 @@
    3.18   	cdest = ast_strdupa(dest);
    3.19   
    3.20   	extension = strsep(&cdest, "@");
    3.21 @@ -19,7 +19,7 @@
    3.22   	if (ast_strlen_zero(extension)) {
    3.23   		ast_log(LOG_ERROR, "Missing mandatory argument: extension\n");
    3.24   		return 0;
    3.25 -@@ -29773,7 +29774,14 @@
    3.26 +@@ -30428,7 +30429,14 @@
    3.27   		}
    3.28   	}
    3.29   
     4.1 --- a/asterisk/asterisk.spec	Mon Sep 01 21:55:47 2014 +0200
     4.2 +++ b/asterisk/asterisk.spec	Mon Sep 01 21:57:20 2014 +0200
     4.3 @@ -22,19 +22,19 @@
     4.4  ##
     4.5  
     4.6  #   package version
     4.7 -%define       V_opkg                     1.8.20.2
     4.8 -%define       V_asterisk                 1.8.20.2
     4.9 +%define       V_opkg                     1.8.30.0
    4.10 +%define       V_asterisk                 1.8.30.0
    4.11  %define       V_asterisk_fax_subdir      1.8.4
    4.12  %define       V_asterisk_fax_digium      1.8.4_1.3.1
    4.13 -%define       V_asterisk_sounds_core     1.4.23
    4.14 -%define       V_asterisk_sounds_extra    1.4.13
    4.15 +%define       V_asterisk_sounds_core     1.4.25
    4.16 +%define       V_asterisk_sounds_extra    1.4.14
    4.17  %define       V_asterisk_sounds_amoogab  1.4
    4.18  %define       V_asterisk_sounds_amootts  current
    4.19  %define       V_asterisk_sounds_custom   1.0
    4.20  %define       V_asterisk_sounds_mohop    2.03
    4.21  %define       V_asterisk_sounds_newpro   july_2012
    4.22  %define       V_asterisk_addons_mp3dec   1
    4.23 -%define       V_fswitch_sounds_en        1.0.24
    4.24 +%define       V_fswitch_sounds_en        1.0.25
    4.25  %define       V_fswitch_sounds_fr        1.0.18
    4.26  %define       V_fswitch_sounds_ru        1.0.13
    4.27  %define       V_fswitch_music            1.0.8
    4.28 @@ -52,14 +52,15 @@
    4.29  Group:        VoIP
    4.30  License:      GPL
    4.31  Version:      %{V_opkg}
    4.32 -Release:      20120800
    4.33 +Release:      20140800
    4.34  
    4.35  #   package options
    4.36  %option       with_dahdi   no
    4.37  %option       with_capi    no
    4.38  %option       with_ogg     no
    4.39  %option       with_mp3     no
    4.40 -%option       with_fax     no
    4.41 +%option       with_faxmod  no
    4.42 +%option       with_faxarch generic
    4.43  %option       with_avcodec no
    4.44  %option       with_ldap    no
    4.45  %option       with_radius  no
    4.46 @@ -123,6 +124,8 @@
    4.47  Patch2:       asterisk.patch.proxymwi
    4.48  
    4.49  #   build information
    4.50 +Prefix:       %{l_prefix}
    4.51 +BuildRoot:    %{l_buildroot}
    4.52  BuildPreReq:  OpenPKG, openpkg >= 20100101, bison, gcc, make, grep, pkgconfig
    4.53  PreReq:       OpenPKG, openpkg >= 20100101, MTA
    4.54  BuildPreReq:  zlib, curl, openssl, ncurses, speex, sox, popt, gmime, libxml
    4.55 @@ -184,6 +187,8 @@
    4.56  %if "%{with_esounds}" == "yes"
    4.57  BuildPreReq:  sox, infozip
    4.58  %endif
    4.59 +AutoReq:      no
    4.60 +AutoReqProv:  no
    4.61  
    4.62  %description
    4.63      Asterisk is a complete Private Branch Exchange (PBX) in software.
    4.64 @@ -278,7 +283,7 @@
    4.65      %setup -q -n asterisk-%{V_asterisk}
    4.66      %setup -q -n asterisk-%{V_asterisk} -D -T -a 1
    4.67      %setup -q -n asterisk-%{V_asterisk} -D -T -a 2
    4.68 -%if "%{with_fax}" == "yes"
    4.69 +%if "%{with_faxmod}" == "yes"
    4.70      %setup -q -n asterisk-%{V_asterisk} -D -T -a 23
    4.71      %setup -q -n asterisk-%{V_asterisk} -D -T -a 24
    4.72  %endif
    4.73 @@ -311,7 +316,8 @@
    4.74          -e 's;lua5\.1;lua;g' \
    4.75          -e 's;-I${IMAP_TK_DIR}/c-client;-DUSE_SYSTEM_IMAP -I${IMAP_TK_DIR}/include/imap;g' \
    4.76          -e 's;${IMAP_TK_DIR}/c-client/c-client\.a;-limap -lssl -lcrypto -lcrypt;g' \
    4.77 -        -e 's;LIBXML2_INCLUDE="-I\${LIBXML2_DIR}/include";echo "Removing really buggy hard coded LibXML include defs.";' \
    4.78 +        -e 's;LIBXML2_INCLUDE=\$(echo \${LIBXML2_INCLUDE} | \$SED -e "s|-I|-I\${LIBXML2_DIR}|g");echo "Removing really buggy hard coded LibXML include defs.";' \
    4.79 +        -e 's;LIBXML2_LIB=\$(echo \${LIBXML2_LIB} | \$SED -e "s|-L|-L\${LIBXML2_DIR}|g");echo "Removing really buggy hard coded LibXML linkage defs.";' \
    4.80          -e 's;\(for ver in 2\.0 2\.2 2\.4\);\1 2.6;' \
    4.81          -e 's;\(\-lpq.*\-lz.*\)";\1 ${PTHREAD_LIBS}";g'\
    4.82          configure
    4.83 @@ -397,6 +403,13 @@
    4.84      %{l_shtool} subst \
    4.85          -e 's;#ifdef CC_AST_HAS_VERSION_1_6$;#if (defined(CC_AST_HAS_VERSION_1_6) \&\& !defined(CC_AST_HAS_VERSION_1_8));g' \
    4.86          chan_capi-%{V_chan_capi}/chan_capi_devstate.c
    4.87 +    %{l_shtool} subst \
    4.88 +        -e "s;^\(NCURSES_INCLUDE=\).*;\1%{l_cppflags ncurses};" \
    4.89 +        -e "s;^\(NCURSES_LIB=\);\1%{l_ldflags} ;" \
    4.90 +        menuselect/makeopts.in
    4.91 +    %{l_shtool} subst \
    4.92 +        -e 's; *\.lastclean;;g' \
    4.93 +        Makefile
    4.94      case "%{l_platform -t}" in
    4.95          *-sunos* )
    4.96              %{l_shtool} subst \
    4.97 @@ -619,6 +632,9 @@
    4.98  %endif
    4.99  
   4.100  %install
   4.101 +    #   remove build cruft
   4.102 +    rm -rf $RPM_BUILD_ROOT
   4.103 +
   4.104      #   install program
   4.105      %{l_make} %{l_mflags} install \
   4.106          DESTDIR=$RPM_BUILD_ROOT \
   4.107 @@ -634,7 +650,7 @@
   4.108      ) || exit $?
   4.109  %endif
   4.110  
   4.111 -%if "%{with_fax}" == "yes"
   4.112 +%if "%{with_faxmod}" == "yes"
   4.113      #   install fax support
   4.114      case "%{l_platform -t}" in
   4.115          amd64*-* )
   4.116 @@ -713,7 +729,7 @@
   4.117        cd $RPM_BUILD_ROOT%{l_prefix}/share/asterisk
   4.118        for highfile in `find . -name '*.wav'`; do
   4.119            lowfile=`echo $highfile | sed -e 's;\(.*\)\.wav;\1.sln16;'`
   4.120 -          %{l_prefix}/bin/sox $highfile -t raw -r 16000 -s -2 -c 1 $lowfile
   4.121 +          %{l_prefix}/bin/sox $highfile -t raw -r 16000 -e signed-integer -b 16 -c 1 $lowfile
   4.122            rm $highfile
   4.123        done
   4.124  %endif
   4.125 @@ -857,6 +873,7 @@
   4.126  %files -f files
   4.127  
   4.128  %clean
   4.129 +    rm -rf $RPM_BUILD_ROOT
   4.130  
   4.131  %post
   4.132  %if "%{with_dahdi}" == "yes"
   4.133 @@ -893,7 +910,7 @@
   4.134          ) || exit $?
   4.135      fi
   4.136  %endif
   4.137 -%if "%{with_fax}" == "yes"
   4.138 +%if "%{with_faxmod}" == "yes"
   4.139      ( echo "Asterisk has been installed with proprietary Digium fax support."
   4.140        echo "The responsible module is called res_fax_digium and requires a"
   4.141        echo "valid license. The license must be found in the directory"

mercurial