FHS-paths.patch

   1 diff -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/UPGRADE-1.4.txt asterisk-1.8.6.0/UPGRADE-1.4.txt
   2 --- asterisk-1.8.6.0.orig/UPGRADE-1.4.txt       2009-08-18 22:29:37.000000000 +0200
   3 +++ asterisk-1.8.6.0/UPGRADE-1.4.txt    2011-09-07 14:09:30.000000000 +0200
   4 @@ -92,7 +92,7 @@
   5  WARNING: Asterisk 1.4 supports a new layout for sound files in multiple languages;
   6  instead of the alternate-language files being stored in subdirectories underneath
   7  the existing files (for French, that would be digits/fr, letters/fr, phonetic/fr,
   8 -etc.) the new layout creates one directory under /var/lib/asterisk/sounds for the
   9 +etc.) the new layout creates one directory under /usr/share/asterisk/sounds for the
  10  language itself, then places all the sound files for that language under that
  11  directory and its subdirectories. This is the layout that will be created if you
  12  select non-English languages to be installed via menuselect, HOWEVER Asterisk does
  13 diff -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/agi/DialAnMp3.agi asterisk-1.8.6.0/agi/DialAnMp3.agi
  14 --- asterisk-1.8.6.0.orig/agi/DialAnMp3.agi     2006-02-14 20:14:15.000000000 +0100
  15 +++ asterisk-1.8.6.0/agi/DialAnMp3.agi  2011-09-07 14:09:30.000000000 +0200
  16 @@ -17,7 +17,7 @@
  17         print STDERR " -- $i = $AGI{$i}\n";
  18  }
  19
  20 -dbmopen(%DIGITS, "/var/lib/asterisk/mp3list", 0644) || die("Unable to open mp3list");;
  21 +dbmopen(%DIGITS, "/usr/share/asterisk/mp3list", 0644) || die("Unable to open mp3list");;
  22
  23  sub checkresult {
  24         my ($res) = @_;
  25 diff -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/agi/jukebox.agi asterisk-1.8.6.0/agi/jukebox.agi
  26 --- asterisk-1.8.6.0.orig/agi/jukebox.agi       2006-03-07 00:45:37.000000000 +0100
  27 +++ asterisk-1.8.6.0/agi/jukebox.agi    2011-09-07 14:09:30.000000000 +0200
  28 @@ -17,7 +17,7 @@
  29  #
  30  # Uses festival to list off all your MP3 music files over a channel in
  31  # a hierarchical fashion.  Put this file in your agi-bin folder which
  32 -# is located at: /var/lib/asterisk/agi-bin  Be sure to chmod +x it!
  33 +# is located at: /usr/share/asterisk/agi-bin  Be sure to chmod +x it!
  34  #
  35  # Invocation Example:
  36  #   exten => 68742,1,Answer()
  37 diff -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/agi/numeralize asterisk-1.8.6.0/agi/numeralize
  38 --- asterisk-1.8.6.0.orig/agi/numeralize        2006-02-14 20:14:15.000000000 +0100
  39 +++ asterisk-1.8.6.0/agi/numeralize     2011-09-07 14:09:30.000000000 +0200
  40 @@ -6,7 +6,7 @@
  41
  42  $mp3dir="/usr/media/mpeg3";
  43
  44 -dbmopen(%DIGITS, "/var/lib/asterisk/mp3list", 0644) || die("Unable to open mp3list");;
  45 +dbmopen(%DIGITS, "/usr/share/asterisk/mp3list", 0644) || die("Unable to open mp3list");;
  46  sub process_dir {
  47         my ($dir) = @_;
  48         my $file;
  49 diff -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/apps/app_rpt.c asterisk-1.8.6.0/apps/app_rpt.c
  50 --- asterisk-1.8.6.0.orig/apps/app_rpt.c        2011-07-14 22:13:06.000000000 +0200
  51 +++ asterisk-1.8.6.0/apps/app_rpt.c     2011-09-07 14:09:30.000000000 +0200
  52 @@ -242,7 +242,7 @@
  53  #define        TONEMACRO "tonemacro"
  54  #define        FUNCCHAR '*'
  55  #define        ENDCHAR '#'
  56 -#define        EXTNODEFILE "/var/lib/asterisk/rpt_extnodes"
  57 +#define        EXTNODEFILE "/usr/share/asterisk/rpt_extnodes"
  58  #define        NODENAMES "rpt/nodenames"
  59  #define        PARROTFILE "/tmp/parrot_%s_%u"
  60
  61 diff -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/configs/festival.conf.sample asterisk-1.8.6.0/configs/festival.conf.sample
  62 --- asterisk-1.8.6.0.orig/configs/festival.conf.sample  2009-05-28 16:39:21.000000000 +0200
  63 +++ asterisk-1.8.6.0/configs/festival.conf.sample       2011-09-07 14:09:30.000000000 +0200
  64 @@ -21,7 +21,7 @@
  65  ; THIS DIRECTORY *MUST* EXIST and must be writable from the asterisk process.
  66  ; Defaults to /tmp/
  67  ;
  68 -;cachedir=/var/lib/asterisk/festivalcache/
  69 +;cachedir=/var/spool/asterisk/festival/
  70  ;
  71  ; Festival command to send to the server.
  72  ; Defaults to: (tts_textasterisk "%s" 'file)(quit)\n
  73 diff -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/configs/http.conf.sample asterisk-1.8.6.0/configs/http.conf.sample
  74 --- asterisk-1.8.6.0.orig/configs/http.conf.sample      2011-04-21 20:24:05.000000000 +0200
  75 +++ asterisk-1.8.6.0/configs/http.conf.sample   2011-09-07 14:09:30.000000000 +0200
  76 @@ -5,7 +5,7 @@
  77  ; Note about Asterisk documentation:
  78  ;   If Asterisk was installed from a tarball, then the HTML documentation should
  79  ;   be installed in the static-http/docs directory which is
  80 -;   (/var/lib/asterisk/static-http/docs) on linux by default.  If the Asterisk
  81 +;   (/usr/share/asterisk/static-http/docs) on linux by default.  If the Asterisk
  82  ;   HTTP server is enabled in this file by setting the "enabled", "bindaddr",
  83  ;   and "bindport" options, then you should be able to view the documentation
  84  ;   remotely by browsing to:
  85 @@ -74,6 +74,6 @@
  86  ;[post_mappings]
  87  ;
  88  ; In this example, if the prefix option is set to "asterisk", then using the
  89 -; POST URL: /asterisk/uploads will put files in /var/lib/asterisk/uploads/.
  90 -;uploads = /var/lib/asterisk/uploads/
  91 +; POST URL: /asterisk/uploads will put files in /var/spool/asterisk/uploads/.
  92 +;uploads = /var/spool/asterisk/uploads/
  93  ;
  94 diff -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/configs/iax.conf.sample asterisk-1.8.6.0/configs/iax.conf.sample
  95 --- asterisk-1.8.6.0.orig/configs/iax.conf.sample       2011-02-02 20:27:19.000000000 +0100
  96 +++ asterisk-1.8.6.0/configs/iax.conf.sample    2011-09-07 14:09:30.000000000 +0200
  97 @@ -456,8 +456,8 @@
  98  ; authentication is used, "inkeys" is a list of acceptable public keys on the
  99  ; local system that can be used to authenticate the remote peer, separated by
 100  ; the ":" character.  "outkey" is a single, private key to use to authenticate
 101 -; to the other side.  Public keys are named /var/lib/asterisk/keys/<name>.pub
 102 -; while private keys are named /var/lib/asterisk/keys/<name>.key.  Private
 103 +; to the other side.  Public keys are named /usr/share/asterisk/keys/<name>.pub
 104 +; while private keys are named /usr/share/asterisk/keys/<name>.key.  Private
 105  ; keys should always be 3DES encrypted.
 106  ;
 107  ;
 108 diff -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/configs/musiconhold.conf.sample asterisk-1.8.6.0/configs/musiconhold.conf.sample
 109 --- asterisk-1.8.6.0.orig/configs/musiconhold.conf.sample       2010-10-16 12:47:00.000000000 +0200
 110 +++ asterisk-1.8.6.0/configs/musiconhold.conf.sample    2011-09-07 14:09:30.000000000 +0200
 111 @@ -32,7 +32,7 @@
 112  ; The path specified can be either an absolute path (starts with '/'),
 113  ; or a relative path; relative paths are interpreted as being relative
 114  ; to the 'astdatalibdir' in asterisk.conf, which defaults to
 115 -; /var/lib/asterisk.
 116 +; /usr/share/asterisk.
 117  ;
 118  ; NOTE:
 119  ; If you are not using "autoload" in modules.conf, then you
 120 @@ -68,7 +68,7 @@
 121  ;mode=custom
 122  ; Note that with mode=custom, a directory is not required, such as when reading
 123  ; from a stream.
 124 -;directory=/var/lib/asterisk/mohmp3
 125 +;directory=/usr/share/asterisk/mohmp3
 126  ;application=/usr/bin/mpg123 -q -r 8000 -f 8192 -b 2048 --mono -s
 127
 128  ;[ulawstream]
 129 @@ -80,5 +80,5 @@
 130  ; choice
 131  ;[solaris]
 132  ;mode=custom
 133 -;directory=/var/lib/asterisk/mohmp3
 134 +;directory=/usr/share/asterisk/mohmp3
 135  ;application=/site/sw/bin/madplay -Q -o raw:- --mono -R 8000 -a -12
 136 diff -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/configs/osp.conf.sample asterisk-1.8.6.0/configs/osp.conf.sample
 137 --- asterisk-1.8.6.0.orig/configs/osp.conf.sample       2010-07-12 06:16:18.000000000 +0200
 138 +++ asterisk-1.8.6.0/configs/osp.conf.sample    2011-09-07 14:09:30.000000000 +0200
 139 @@ -45,8 +45,8 @@
 140  ;source=domain name or [IP address in brackets]
 141  ;
 142  ; Define path and file name of crypto files.
 143 -; The default path for crypto file is /var/lib/asterisk/keys.  If no path is
 144 -; defined, crypto files will in /var/lib/asterisk/keys directory.
 145 +; The default path for crypto file is /user/share/asterisk/keys.  If no path is
 146 +; defined, crypto files will in /user/share/asterisk/keys directory.
 147  ;
 148  ; Specify the private key file name.
 149  ; If this parameter is unspecified or not present, the default name will be the
 150 diff -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/configs/phoneprov.conf.sample asterisk-1.8.6.0/configs/phoneprov.conf.sample
 151 --- asterisk-1.8.6.0.orig/configs/phoneprov.conf.sample 2011-02-03 16:50:35.000000000 +0100
 152 +++ asterisk-1.8.6.0/configs/phoneprov.conf.sample      2011-09-07 14:10:47.000000000 +0200
 153 @@ -130,7 +130,7 @@
 154  ${MAC}-phone.cfg => 000000000000-phone.cfg   ; (relative to AST_DATA_DIR/phoneprov)
 155  config/${MAC} => polycom.xml                 ; Dynamic Filename => template file
 156  ${MAC}-directory.xml => 000000000000-directory.xml
 157 -setvar => CUSTOM_CONFIG=/var/lib/asterisk/phoneprov/configs/custom.cfg  ; Custom variable
 158 +setvar => CUSTOM_CONFIG=/usr/share/asterisk/phoneprov/configs/custom.cfg  ; Custom variable
 159
 160  ;snom 300, 320, 360, 370, 820, 821, 870 support
 161  snom-${MAC}.xml => snom-mac.xml
 162 diff -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/configs/res_config_sqlite.conf.sample asterisk-1.8.6.0/configs/res_config_sqlite.conf.sample
 163 --- asterisk-1.8.6.0.orig/configs/res_config_sqlite.conf.sample 2009-06-30 19:22:16.000000000 +0200
 164 +++ asterisk-1.8.6.0/configs/res_config_sqlite.conf.sample      2011-09-07 14:09:30.000000000 +0200
 165 @@ -1,7 +1,7 @@
 166  [general]
 167
 168  ; The database file.
 169 -dbfile => /var/lib/asterisk/sqlite.db
 170 +dbfile => /var/spool/asterisk/sqlite.db
 171
 172  ; Both config_table and cdr_table are optional. If config_table is omitted,
 173  ; you must specify it in extconfig.conf. If it is both provided here and in
 174 diff -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/contrib/scripts/astgenkey asterisk-1.8.6.0/contrib/scripts/astgenkey
 175 --- asterisk-1.8.6.0.orig/contrib/scripts/astgenkey     2006-02-14 20:14:15.000000000 +0100
 176 +++ asterisk-1.8.6.0/contrib/scripts/astgenkey  2011-09-07 14:09:30.000000000 +0200
 177 @@ -29,7 +29,7 @@
 178         echo "in PEM format for use by Asterisk.  You will be asked to"
 179         echo "enter a passcode for your key multiple times.  Please"
 180         echo "enter the same code each time.  The resulting files will"
 181 -       echo "need to be moved to /var/lib/asterisk/keys if you want"
 182 +       echo "need to be moved to /usr/share/asterisk/keys if you want"
 183         echo "to use them, and any private keys (.key files) will"
 184         echo "need to be initialized at runtime either by running"
 185         echo "Asterisk with the '-i' option, or with the 'init keys'"
 186 diff -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/contrib/scripts/astgenkey.8 asterisk-1.8.6.0/contrib/scripts/astgenkey.8
 187 --- asterisk-1.8.6.0.orig/contrib/scripts/astgenkey.8   2010-04-10 10:33:57.000000000 +0200
 188 +++ asterisk-1.8.6.0/contrib/scripts/astgenkey.8        2011-09-07 14:09:30.000000000 +0200
 189 @@ -87,7 +87,7 @@
 190  .RE
 191
 192  Those files should be copied to
 193 -.I /var/lib/asterisk/keys
 194 +.I /usr/share/asterisk/keys
 195
 196  (The private key: on your system. The public key: on other systems)
 197
 198 @@ -121,10 +121,10 @@
 199  And then make the key accessible to Asterisk (assuming you run it as
 200  user "asterisk").
 201
 202 -  chown asterisk /var/lib/asterisk/keys/yourname.*
 203 +  chown asterisk /usr/share/asterisk/keys/yourname.*
 204
 205  .SH FILES
 206 -.I /var/lib/asterisk/keys
 207 +.I /usr/share/asterisk/keys
 208  .RS
 209  .RE
 210
 211 diff -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/contrib/utils/README.rawplayer asterisk-1.8.6.0/contrib/utils/README.rawplayer
 212 --- asterisk-1.8.6.0.orig/contrib/utils/README.rawplayer        2006-02-14 20:14:15.000000000 +0100
 213 +++ asterisk-1.8.6.0/contrib/utils/README.rawplayer     2011-09-07 14:09:30.000000000 +0200
 214 @@ -16,11 +16,11 @@
 215  sox -c 1 track01.wav -t raw -r 8000 -c 1 -s -w track01.raw
 216
 217
 218 -Once you have the raw files put them in any dir on your system (eg /var/lib/asterisk/holdmusic_raw).
 219 +Once you have the raw files put them in any dir on your system (eg /usr/share/asterisk/holdmusic_raw).
 220  and set up a class in musiconhold.conf like so:
 221
 222  [classes]
 223 -default => custom:/var/lib/asterisk/holdmusic_raw,/usr/bin/rawplayer
 224 +default => custom:/usr/share/asterisk/holdmusic_raw,/usr/bin/rawplayer
 225
 226
 227  This is the most efficient way to implement moh because no cpu usage is required to
 228 diff -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/pbx/ael/ael-test/ael-test3/extensions.ael asterisk-1.8.6.0/pbx/ael/ael-test/ael-test3/extensions.ael
 229 --- asterisk-1.8.6.0.orig/pbx/ael/ael-test/ael-test3/extensions.ael     2007-11-27 00:15:53.000000000 +0100
 230 +++ asterisk-1.8.6.0/pbx/ael/ael-test/ael-test3/extensions.ael  2011-09-07 14:09:30.000000000 +0200
 231 @@ -2049,7 +2049,7 @@
 232
 233  macro callerid-liar()
 234  {
 235 -       TrySystem(/usr/bin/play /var/lib/asterisk/sounds/priv-callerintros/LIAR.gsm&);
 236 +       TrySystem(/usr/bin/play /usr/share/asterisk/sounds/priv-callerintros/LIAR.gsm&);
 237         Background(priv-liar);  // Script: OOOps! Sorry! I don't allow men with ski masks pulled over their
 238                              //         faces to get in the front door, and unidentified callers won't fair
 239                              //         any better. You entered *MY* phone number. That won't work.
 240 @@ -2106,7 +2106,7 @@
 241                 PrivacyManager();
 242                 if( "${PRIVACYMGRSTATUS}" = "FAILED" )
 243                 {
 244 -                       TrySystem(/usr/bin/play /var/lib/asterisk/sounds/privmanfailed.gsm);
 245 +                       TrySystem(/usr/bin/play /usr/share/asterisk/sounds/privmanfailed.gsm);
 246                         &std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket);
 247                         Hangup();
 248                         return;
 249 @@ -2138,7 +2138,7 @@
 250                         verbose(direct is XXX#${direct}XXXX);
 251                         Playback(greetings/direct); // Welcome to the Murphy residence. This system will automatically try to connect you to...
 252                         Playback(/var/spool/asterisk/voicemail/default/${direct}/greet);
 253 -                       TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
 254 +                       TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 255                         TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/${direct}/greet.wav&);
 256                         switch(${direct})
 257                         {
 258 @@ -2223,7 +2223,7 @@
 259
 260         }
 261         1 => {  // Sonya
 262 -                       TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
 263 +                       TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 264                         TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/2/greet.wav&);
 265                         &std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket);
 266                         goto s|loopback;
 267 @@ -2421,51 +2421,51 @@
 268                 Background(murphy-homeline-kids);        //  Which Kid? 1=Sean, 2:Eric, 3:Ryan, 4:Kyle, 5:Amber, 6:Alex, 7:Neal
 269         }
 270         1 => {  // SEAN
 271 -                       TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
 272 +                       TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 273                         TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/3/greet.wav&);
 274                         // &std-priv-exten(Zap/3r2&Zap/5r2,3,35,mtw,telemarket,telemarket);
 275                         &std-priv-exten(IAX2/seaniax&Zap/5r2,3,35,mtw,telemarket,telemarket);
 276                         goto homeline|s|loopback;
 277         }
 278         2 => {  // ERIC
 279 -                       TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
 280 +                       TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 281                         TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&);
 282                         Voicemail(u4);
 283                         goto homeline|s|loopback;
 284
 285                         // SetMusicOnHold(erics);
 286 -                       // TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
 287 +                       // TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 288                         // TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&);
 289                         // &std-priv-exten(Zap/3r2&Zap/5r2,4,35,mtw,telemarket,telemarket);
 290                         // goto homeline|s|loopback;
 291         }
 292         3 => {  // RYAN
 293 -                       TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
 294 +                       TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 295                         TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/5/greet.wav&);
 296                         &std-priv-exten(Zap/3r2&Zap/5r2,5,35,mtw,telemarket,telemarket);
 297                         goto homeline|s|loopback;
 298         }
 299         4 => {  // KYLE
 300 -                       TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
 301 +                       TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 302                         TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/6/greet.wav&);
 303                         &std-priv-exten(Zap/3r2&Zap/5r2,6,35,mtw,telemarket,telemarket);
 304                         goto homeline|s|loopback;
 305         }
 306         5 => {
 307 -                       TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
 308 +                       TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 309                         TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/7/greet.wav&);
 310                         &std-priv-exten(Zap/3r2&Zap/5r2,7,35,mtw,telemarket,telemarket);
 311                         goto homeline|s|loopback;
 312
 313         }
 314         6 => {
 315 -                       TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
 316 +                       TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 317                         TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/8/greet.wav&);
 318                         &std-priv-exten(Zap/3r2&Zap/5r2,8,35,mtw,telemarket,telemarket);
 319                         goto homeline|s|loopback;
 320         }
 321         7 => {
 322 -                       TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
 323 +                       TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 324                         TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/9/greet.wav&);
 325                         &std-priv-exten(Zap/3r2&Zap/5r2,9,35,mtw,telemarket,telemarket);
 326                         goto homeline|s|loopback;
 327 @@ -2517,7 +2517,7 @@
 328                                                // Otherwise, dial 1, and hopefully, you will reach Steve.
 329         }
 330         1 => {
 331 -               TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
 332 +               TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 333                 TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/1/greet.wav&);
 334
 335                 &std-priv-exten(Zap/6&Sip/murf,1,30,mtw,telemarket,telemarket);
 336 @@ -2778,7 +2778,7 @@
 337         }
 338         761 => {
 339                 Record(announcement:gsm);
 340 -               TrySystem(/usr/bin/play /var/lib/asterisk/sounds/announcement.gsm&);
 341 +               TrySystem(/usr/bin/play /usr/share/asterisk/sounds/announcement.gsm&);
 342                 goto s|loopback;
 343         }
 344         762 => {
 345 diff -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/pbx/ael/ael-test/ael-vtest13/extensions.ael asterisk-1.8.6.0/pbx/ael/ael-test/ael-vtest13/extensions.ael
 346 --- asterisk-1.8.6.0.orig/pbx/ael/ael-test/ael-vtest13/extensions.ael   2007-11-27 00:15:53.000000000 +0100
 347 +++ asterisk-1.8.6.0/pbx/ael/ael-test/ael-vtest13/extensions.ael        2011-09-07 14:09:30.000000000 +0200
 348 @@ -2048,7 +2048,7 @@
 349
 350  macro callerid-liar()
 351  {
 352 -       TrySystem(/usr/bin/play /var/lib/asterisk/sounds/priv-callerintros/LIAR.gsm&);
 353 +       TrySystem(/usr/bin/play /usr/share/asterisk/sounds/priv-callerintros/LIAR.gsm&);
 354         Background(priv-liar);  // Script: OOOps! Sorry! I don't allow men with ski masks pulled over their
 355                              //         faces to get in the front door, and unidentified callers won't fair
 356                              //         any better. You entered *MY* phone number. That won't work.
 357 @@ -2105,7 +2105,7 @@
 358                 PrivacyManager();
 359                 if( "${PRIVACYMGRSTATUS}" = "FAILED" )
 360                 {
 361 -                       TrySystem(/usr/bin/play /var/lib/asterisk/sounds/privmanfailed.gsm);
 362 +                       TrySystem(/usr/bin/play /usr/share/asterisk/sounds/privmanfailed.gsm);
 363                         &std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket);
 364                         Hangup();
 365                         return;
 366 @@ -2137,7 +2137,7 @@
 367                         verbose(direct is XXX#${direct}XXXX);
 368                         Playback(greetings/direct); // Welcome to the Murphy residence. This system will automatically try to connect you to...
 369                         Playback(/var/spool/asterisk/voicemail/default/${direct}/greet);
 370 -                       TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
 371 +                       TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 372                         TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/${direct}/greet.wav&);
 373                         switch(${direct})
 374                         {
 375 @@ -2222,7 +2222,7 @@
 376
 377         }
 378         1 => {  // Sonya
 379 -                       TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
 380 +                       TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 381                         TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/2/greet.wav&);
 382                         &std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket);
 383                         goto s|loopback;
 384 @@ -2420,51 +2420,51 @@
 385                 Background(murphy-homeline-kids);        //  Which Kid? 1=Sean, 2:Eric, 3:Ryan, 4:Kyle, 5:Amber, 6:Alex, 7:Neal
 386         }
 387         1 => {  // SEAN
 388 -                       TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
 389 +                       TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 390                         TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/3/greet.wav&);
 391                         // &std-priv-exten(Zap/3r2&Zap/5r2,3,35,mtw,telemarket,telemarket);
 392                         &std-priv-exten(IAX2/seaniax&Zap/5r2,3,35,mtw,telemarket,telemarket);
 393                         goto homeline|s|loopback;
 394         }
 395         2 => {  // ERIC
 396 -                       TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
 397 +                       TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 398                         TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&);
 399                         Voicemail(u4);
 400                         goto homeline|s|loopback;
 401
 402                         // SetMusicOnHold(erics);
 403 -                       // TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
 404 +                       // TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 405                         // TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&);
 406                         // &std-priv-exten(Zap/3r2&Zap/5r2,4,35,mtw,telemarket,telemarket);
 407                         // goto homeline|s|loopback;
 408         }
 409         3 => {  // RYAN
 410 -                       TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
 411 +                       TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 412                         TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/5/greet.wav&);
 413                         &std-priv-exten(Zap/3r2&Zap/5r2,5,35,mtw,telemarket,telemarket);
 414                         goto homeline|s|loopback;
 415         }
 416         4 => {  // KYLE
 417 -                       TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
 418 +                       TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 419                         TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/6/greet.wav&);
 420                         &std-priv-exten(Zap/3r2&Zap/5r2,6,35,mtw,telemarket,telemarket);
 421                         goto homeline|s|loopback;
 422         }
 423         5 => {
 424 -                       TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
 425 +                       TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 426                         TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/7/greet.wav&);
 427                         &std-priv-exten(Zap/3r2&Zap/5r2,7,35,mtw,telemarket,telemarket);
 428                         goto homeline|s|loopback;
 429
 430         }
 431         6 => {
 432 -                       TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
 433 +                       TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 434                         TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/8/greet.wav&);
 435                         &std-priv-exten(Zap/3r2&Zap/5r2,8,35,mtw,telemarket,telemarket);
 436                         goto homeline|s|loopback;
 437         }
 438         7 => {
 439 -                       TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
 440 +                       TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 441                         TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/9/greet.wav&);
 442                         &std-priv-exten(Zap/3r2&Zap/5r2,9,35,mtw,telemarket,telemarket);
 443                         goto homeline|s|loopback;
 444 @@ -2516,7 +2516,7 @@
 445                                                // Otherwise, dial 1, and hopefully, you will reach Steve.
 446         }
 447         1 => {
 448 -               TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
 449 +               TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 450                 TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/1/greet.wav&);
 451
 452                 &std-priv-exten(Zap/6&Sip/murf,1,30,mtw,telemarket,telemarket);
 453 @@ -2777,7 +2777,7 @@
 454         }
 455         761 => {
 456                 Record(announcement:gsm);
 457 -               TrySystem(/usr/bin/play /var/lib/asterisk/sounds/announcement.gsm&);
 458 +               TrySystem(/usr/bin/play /usr/share/asterisk/sounds/announcement.gsm&);
 459                 goto s|loopback;
 460         }
 461         762 => {
 462 diff -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/pbx/ael/ael-test/ref.ael-vtest13 asterisk-1.8.6.0/pbx/ael/ael-test/ref.ael-vtest13
 463 --- asterisk-1.8.6.0.orig/pbx/ael/ael-test/ref.ael-vtest13      2010-12-22 21:05:02.000000000 +0100
 464 +++ asterisk-1.8.6.0/pbx/ael/ael-test/ref.ael-vtest13   2011-09-07 14:09:30.000000000 +0200
 465 @@ -2182,7 +2182,7 @@
 466
 467
 468  [callerid-liar]
 469 -exten => ~~s~~,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/priv-callerintros/LIAR.gsm&)
 470 +exten => ~~s~~,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/priv-callerintros/LIAR.gsm&)
 471  exten => ~~s~~,2,Background(priv-liar)
 472  exten => ~~s~~,3,Hangup()
 473  exten => ~~s~~,4,Return()
 474 @@ -2217,7 +2217,7 @@
 475  exten => s,4,Zapateller(nocallerid)
 476  exten => s,5,PrivacyManager()
 477  exten => s,6,GotoIf($["${PRIVACYMGRSTATUS}" = "FAILED" ]?7:11)
 478 -exten => s,7,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/privmanfailed.gsm)
 479 +exten => s,7,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/privmanfailed.gsm)
 480  exten => s,8,Gosub(std-priv-exten,~~s~~,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket))
 481  exten => s,9,Hangup()
 482  exten => s,10,Return()
 483 @@ -2243,7 +2243,7 @@
 484  exten => s,30,verbose(direct is XXX#${direct}XXXX)
 485  exten => s,31,Playback(greetings/direct)
 486  exten => s,32,Playback(/var/spool/asterisk/voicemail/default/${direct}/greet)
 487 -exten => s,33,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
 488 +exten => s,33,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
 489  exten => s,34,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/${direct}/greet.wav&)
 490  exten => s,35,Goto(sw_92_${direct},10)
 491  exten => s,36,NoOp(Finish switch_if_homeline_91_92)
 492 @@ -2322,7 +2322,7 @@
 493  exten => sw_92_2,11,Goto(s,loopback)
 494  exten => sw_92_1,10,Gosub(std-priv-exten,~~s~~,1(Zap/6r3&Sip/murf,1,25,mpA(beep)tw,telemarket,telemarket))
 495  exten => sw_92_1,11,Goto(s,loopback)
 496 -exten => 1,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
 497 +exten => 1,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
 498  exten => 1,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/2/greet.wav&)
 499  exten => 1,3,Gosub(std-priv-exten,~~s~~,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket))
 500  exten => 1,4,Goto(s,loopback)
 501 @@ -2399,31 +2399,31 @@
 502
 503  [homeline-kids]
 504  exten => s,1(begin),Background(murphy-homeline-kids)
 505 -exten => 1,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
 506 +exten => 1,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
 507  exten => 1,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/3/greet.wav&)
 508  exten => 1,3,Gosub(std-priv-exten,~~s~~,1(IAX2/seaniax&Zap/5r2,3,35,mtw,telemarket,telemarket))
 509  exten => 1,4,Goto(homeline,s,loopback)
 510 -exten => 2,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
 511 +exten => 2,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
 512  exten => 2,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&)
 513  exten => 2,3,Voicemail(u4)
 514  exten => 2,4,Goto(homeline,s,loopback)
 515 -exten => 3,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
 516 +exten => 3,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
 517  exten => 3,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/5/greet.wav&)
 518  exten => 3,3,Gosub(std-priv-exten,~~s~~,1(Zap/3r2&Zap/5r2,5,35,mtw,telemarket,telemarket))
 519  exten => 3,4,Goto(homeline,s,loopback)
 520 -exten => 4,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
 521 +exten => 4,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
 522  exten => 4,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/6/greet.wav&)
 523  exten => 4,3,Gosub(std-priv-exten,~~s~~,1(Zap/3r2&Zap/5r2,6,35,mtw,telemarket,telemarket))
 524  exten => 4,4,Goto(homeline,s,loopback)
 525 -exten => 5,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
 526 +exten => 5,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
 527  exten => 5,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/7/greet.wav&)
 528  exten => 5,3,Gosub(std-priv-exten,~~s~~,1(Zap/3r2&Zap/5r2,7,35,mtw,telemarket,telemarket))
 529  exten => 5,4,Goto(homeline,s,loopback)
 530 -exten => 6,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
 531 +exten => 6,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
 532  exten => 6,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/8/greet.wav&)
 533  exten => 6,3,Gosub(std-priv-exten,~~s~~,1(Zap/3r2&Zap/5r2,8,35,mtw,telemarket,telemarket))
 534  exten => 6,4,Goto(homeline,s,loopback)
 535 -exten => 7,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
 536 +exten => 7,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
 537  exten => 7,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/9/greet.wav&)
 538  exten => 7,3,Gosub(std-priv-exten,~~s~~,1(Zap/3r2&Zap/5r2,9,35,mtw,telemarket,telemarket))
 539  exten => 7,4,Goto(homeline,s,loopback)
 540 @@ -2451,7 +2451,7 @@
 541  exten => s,6,TrySystem(/usr/local/bin/who-is-it ${CALLERID(num)} "${CALLERID(name)}"&)
 542  exten => s,7(loopback),Background(greetings/greeting)
 543  exten => s,8,Background(murphy-office-intro1)
 544 -exten => 1,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
 545 +exten => 1,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
 546  exten => 1,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/1/greet.wav&)
 547  exten => 1,3,Gosub(std-priv-exten,~~s~~,1(Zap/6&Sip/murf,1,30,mtw,telemarket,telemarket))
 548  exten => 1,4,Goto(s,loopback)
 549 @@ -2577,7 +2577,7 @@
 550  exten => 760,1,DateTime()
 551  exten => 760,2,Goto(s,loopback)
 552  exten => 761,1,Record(announcement:gsm)
 553 -exten => 761,2,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/announcement.gsm&)
 554 +exten => 761,2,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/announcement.gsm&)
 555  exten => 761,3,Goto(s,loopback)
 556  exten => 762,1,agi(tts-riddle.agi)
 557  exten => 762,2,Background(gsm/what-time-it-is2)
 558 diff -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/utils/ael_main.c asterisk-1.8.6.0/utils/ael_main.c
 559 --- asterisk-1.8.6.0.orig/utils/ael_main.c      2011-07-14 22:13:06.000000000 +0200
 560 +++ asterisk-1.8.6.0/utils/ael_main.c   2011-09-07 14:09:30.000000000 +0200
 561 @@ -503,7 +503,7 @@
 562                 strcpy(config_dir, "/etc/asterisk");
 563                 localized_use_conf_dir();
 564         }
 565 -       strcpy(var_dir, "/var/lib/asterisk");
 566 +       strcpy(var_dir, "/usr/share/asterisk");
 567
 568         if( dump_extensions ) {
 569                 dumpfile = fopen("extensions.conf.aeldump","w");