Skip to content

Commit

Permalink
PATCH: config.c: problems with #tryinclude statements, whitespace (#48)
Browse files Browse the repository at this point in the history
Pull in Asterisk pull requests for the following issues :

1. asterisk/asterisk#920
   asterisk/asterisk#918

   Correct an issue in ast_config_text_file_save2() when updating configuration
   files with "#tryinclude" statements. The API currently replaces "#tryinclude"
   with "#include". The API also creates empty template files if the referenced
   files do not exist. This patch resolves these problems.

2. asterisk/asterisk#970
   asterisk/asterisk#971

   Configurations loaded with the ast_config_load2() API and later written
   out with ast_config_text_file_save2() will have any leading whitespace
   stripped away.  The APIs should make reasonable efforts to maintain the
   content and formatting of the configuration files.
  • Loading branch information
Allan-N authored Nov 9, 2024
1 parent f67a2d8 commit 5c172b3
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions phreaknet.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2207,6 +2207,8 @@ phreak_patches() { # $1 = $PATCH_DIR, $2 = $AST_SRC_DIR
asterisk_pr_unconditional 917 # FreeBSD compilation fixes
git_patch "config_c_fix_template_inheritance_overrides.patch" # config.c: fix template inheritance/overrides
git_patch "config_c_fix_template_writing.patch" # config.c: fix template inheritance/overrides
asterisk_pr_unconditional 918 # config.c #tryinclude fixes
asterisk_pr_unconditional 971 # config.c fix issues w/ whitespace in comments

if [ $AST_MAJOR_VER -lt 21 ]; then
if [ "$EXTERNAL_CODECS" = "1" ]; then
Expand Down

0 comments on commit 5c172b3

Please sign in to comment.