- restore todo (removed in r1.175), the problem is not fixed

[packages/asterisk.git] / FHS-paths.patch

diff --git a/FHS-paths.patch b/FHS-paths.patch
index f2c9231cd50d07f60337754d892c439f1c8a1b81..cdfa346c01928f80eb5a352adc74f3043bf37b58 100644 (file)
--- a/FHS-paths.patch
+++ b/FHS-paths.patch
@@ -545,40 +545,26 @@ Index: configs/phoneprov.conf.sample
 ===================================================================
 --- configs/phoneprov.conf.sample      (revision 222649)
 +++ configs/phoneprov.conf.sample      (working copy)
-@@ -57,4 +57,4 @@
- ${TOLOWER(${MAC})}-phone.cfg => 000000000000-phone.cfg   ; (relative to AST_DATA_DIR/phoneprov)
- config/${TOLOWER(${MAC})} => polycom.xml                 ; Dynamic Filename => template file 
- ${TOLOWER(${MAC})}-directory.xml => 000000000000-directory.xml
+@@ -114,4 +114,4 @@
+ ${MAC}-phone.cfg => 000000000000-phone.cfg   ; (relative to AST_DATA_DIR/phoneprov)
+ config/${MAC} => polycom.xml                 ; Dynamic Filename => template file 
+ ${MAC}-directory.xml => 000000000000-directory.xml
 -setvar => CUSTOM_CONFIG=/var/lib/asterisk/phoneprov/configs/custom.cfg  ; Custom variable
 +setvar => CUSTOM_CONFIG=/usr/share/asterisk/phoneprov/configs/custom.cfg  ; Custom variable
 Index: configs/musiconhold.conf.sample
 ===================================================================
 --- configs/musiconhold.conf.sample    (revision 222649)
 +++ configs/musiconhold.conf.sample    (working copy)
-@@ -39,11 +39,11 @@
- 
- [default]
- mode=files
--directory=/var/lib/asterisk/moh
-+directory=/usr/share/asterisk/moh
+@@ -32,7 +32,7 @@
+ ; The path specified can be either an absolute path (starts with '/'),
+ ; or a relative path; relative paths are interpreted as being relative
+ ; to the 'astvarlibdir' in asterisk.conf, which defaults to
+-; /var/lib/asterisk.
++; /usr/share/asterisk.
  ;
- ;[native-random]
- ;mode=files
--;directory=/var/lib/asterisk/moh
-+;directory=/usr/share/asterisk/moh
- ;digit=#        ; If this option is set for a class, then when callers are
- ;               ; listening to music on hold, they can press this digit, and
- ;               ; they will switch to listening to this music class.
-@@ -51,7 +51,7 @@
- 
- ;[native-alphabetical]
- ;mode=files
--;directory=/var/lib/asterisk/moh
-+;directory=/usr/share/asterisk/moh
- ;sort=alpha     ; Sort the files in alphabetical order.  If this option is
- ;               ; not specified, the sort order is undefined.
- 
-@@ -63,7 +63,7 @@
+ ; NOTE:
+ ; If you are not using "autoload" in modules.conf, then you
+@@ -68,7 +68,7 @@
  ;mode=custom
  ; Note that with mode=custom, a directory is not required, such as when reading
  ; from a stream.
@@ -587,7 +573,7 @@ Index: configs/musiconhold.conf.sample
  ;application=/usr/bin/mpg123 -q -r 8000 -f 8192 -b 2048 --mono -s
  
  ;[ulawstream]
-@@ -75,5 +75,5 @@
+@@ -80,5 +80,5 @@
  ; choice
  ;[solaris]
  ;mode=custom
@@ -609,10 +595,10 @@ Index: configs/osp.conf.sample
  ;
  ; Specify the private key file name.  
  ; If this parameter is unspecified or not present, the default name will be the 
-Index: configs/res_config_sqlite.conf
+Index: configs/res_config_sqlite.conf.sample
 ===================================================================
---- configs/res_config_sqlite.conf     (revision 222649)
-+++ configs/res_config_sqlite.conf     (working copy)
+--- configs/res_config_sqlite.conf.sample      (revision 222649)
++++ configs/res_config_sqlite.conf.sample      (working copy)
 @@ -1,7 +1,7 @@
  [general]