~ubuntu-branches/ubuntu/karmic/asterisk/karmic

« back to all changes in this revision

Viewing changes to debian/patches/bristuff/configurable-AST_SYSTEM_NAME

  • Committer: Bazaar Package Importer
  • Author(s): Faidon Liambotis, Tzafrir Cohen, Faidon Liambotis
  • Date: 2007-12-06 17:20:21 UTC
  • mfrom: (1.1.19 upstream)
  • Revision ID: james.westby@ubuntu.com-20071206172021-pd0wrjirz3os7hia
Tags: 1:1.4.15~dfsg-1
* New upstream release (Closes: #452054)
  - Fix a potential corrupt of voicemail.conf on simultaneous PIN updates
    (Closes: #353227)

[ Tzafrir Cohen ]
* Add some sample/reference config files as documentation.
* Provide asterisk-bristuff for upgrading from Etch.
* Move libc-client to not be last, so debian/backports/xorcom.etch would
  still work.

[ Faidon Liambotis ]
* Really enable the libcap/ToS functionality; the previous patch didn't
  enable the functionality, even though the code and the libcap.so
  dependency were there. (Closes: #454342)
* Fix a minor issue with init script's stop target when running with
  safe_asterisk.
* Add chan_vpb, adding support for VoiceTronix OpenSwitch and OpenLine
  cards. (Closes: #396499)
* Fix debian/watch by using a pkg-voip wrapper to avoid upstream's silly
  redirections. (Closes: #449706)
* Use DEBVERSION as asterisk's version string.
* Disable the MD5 build sum that breaks all out-of-tree plugins (duh!).
* Create /usr/local/share/asterisk/sounds to put all site-specific
  non-modifiable sounds.
* Add a note about bugs.debian.org to the banner.
* Add noload for res_config_* since loading them results in errors and
  doesn't provide any functionality.
* News entries were added but we never shipped the file; ship NEWS.Debian.
* Add an entry to NEWS.Debian warning users about app_voicemail_*.so
  (Closes: #452596)
* Provide options in /etc/default/asterisk for configuring safe_asterisk.
  (Closes: #381786)

[ Tzafrir Cohen ]
* Provide a custom sounds directory under /var/lib - user-modifieble at
  runtime and hence not under /usr. (Closes: #337209)

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
--- asterisk-1.4.8~dfsg.orig/build_tools/make_defaults_h
2
 
+++ asterisk-1.4.8~dfsg/build_tools/make_defaults_h
 
1
--- a/build_tools/make_defaults_h
 
2
+++ b/build_tools/make_defaults_h
3
3
@@ -17,6 +17,7 @@ cat << END
4
 
 #define AST_KEY_DIR    "${INSTALL_PATH}${ASTVARLIBDIR}/keys"
 
4
 #define AST_KEY_DIR    "${INSTALL_PATH}${ASTDATADIR}/keys"
5
5
 #define AST_DB         "${INSTALL_PATH}${ASTVARLIBDIR}/astdb"
6
6
 #define AST_TMP_DIR    "${INSTALL_PATH}${ASTSPOOLDIR}/tmp"
7
7
+#define AST_SYSTEM_NAME        "asterisk"
8
8
 
9
9
 #define AST_CONFIG_FILE "${INSTALL_PATH}${ASTCONFPATH}"
10
10
 
11
 
--- asterisk-1.4.8~dfsg.orig/main/asterisk.c
12
 
+++ asterisk-1.4.8~dfsg/main/asterisk.c
13
 
@@ -2368,6 +2368,7 @@ static void ast_readconfig(void) 
 
11
--- a/main/asterisk.c
 
12
+++ b/main/asterisk.c
 
13
@@ -2387,6 +2387,7 @@ static void ast_readconfig(void) 
14
14
        ast_copy_string(ast_config_AST_PID, AST_PID, sizeof(ast_config_AST_PID));
15
15
        ast_copy_string(ast_config_AST_SOCKET, AST_SOCKET, sizeof(ast_config_AST_SOCKET));
16
16
        ast_copy_string(ast_config_AST_RUN_DIR, AST_RUN_DIR, sizeof(ast_config_AST_RUN_DIR));
18
18
 
19
19
        /* no asterisk.conf? no problem, use buildtime config! */
20
20
        if (!cfg) {
21
 
@@ -2492,6 +2493,8 @@ static void ast_readconfig(void) 
 
21
@@ -2511,6 +2512,8 @@ static void ast_readconfig(void) 
22
22
                        ast_copy_string(ast_config_AST_RUN_GROUP, v->value, sizeof(ast_config_AST_RUN_GROUP));
23
23
                } else if (!strcasecmp(v->name, "systemname")) {
24
24
                        ast_copy_string(ast_config_AST_SYSTEM_NAME, v->value, sizeof(ast_config_AST_SYSTEM_NAME));