@@ -2255,12 +2255,8 @@ phreak_patches() { # $1 = $PATCH_DIR, $2 = $AST_SRC_DIR
22552255 phreak_tree_module " funcs/func_query.c"
22562256 phreak_tree_module " funcs/func_resonance.c"
22572257 phreak_tree_module " funcs/func_tech.c"
2258- phreak_tree_module " res/res_coindetect.c"
2259-
2260- if [ " $DEVMODE " = " 1" ]; then
2261- phreak_tree_module " res/res_deadlock.c" # this is not possibly useful to non-developers
2262- fi
22632258
2259+ phreak_tree_module " res/res_coindetect.c"
22642260 phreak_tree_module " res/res_alarmsystem.c"
22652261 phreak_tree_module " res/res_digitmap.c"
22662262 phreak_tree_module " res/res_irc.c"
@@ -2270,6 +2266,9 @@ phreak_patches() { # $1 = $PATCH_DIR, $2 = $AST_SRC_DIR
22702266 phreak_tree_module " res/res_pjsip_presence.c"
22712267 phreak_tree_module " res/res_smdr_whozz.c"
22722268
2269+ if [ " $DEVMODE " = " 1" ]; then
2270+ phreak_tree_module " res/res_deadlock.c" # this is not possibly useful to non-developers
2271+ fi
22732272 if [ -d /etc/dahdi ]; then
22742273 phreak_tree_module " apps/app_loopdisconnect.c"
22752274 if [ " $RTPULSING " = " 1" ]; then
@@ -2326,6 +2325,11 @@ phreak_patches() { # $1 = $PATCH_DIR, $2 = $AST_SRC_DIR
23262325 asterisk_pr_unconditional 971 # config.c fix issues w/ whitespace in comments
23272326 asterisk_pr_unconditional 1030 # chan_dahdi: Fix wrong channel state when RINGING recieved
23282327
2328+ # asterisk_pr_unconditional 272 # Call Waiting Deluxe. This also now conflicts (with the latest revisions), so temp. disabled.
2329+ # asterisk_pr_unconditional 438 # Last Number Redial. This now conflicts with 272, so temp. disabled.
2330+ asterisk_pr_unconditional 292 # GROUP VARs
2331+ git_custom_patch " https://code.phreaknet.org/asterisk/dahdicleanup.diff"
2332+
23292333 if [ $AST_MAJOR_VER -lt 21 ]; then
23302334 if [ " $EXTERNAL_CODECS " = " 1" ]; then
23312335 phreak_nontree_patch " main/translate.c" " translate.diff" " https://issues.asterisk.org/jira/secure/attachment/60464/translate.diff" # Bug fix to translation code
@@ -2336,39 +2340,23 @@ phreak_patches() { # $1 = $PATCH_DIR, $2 = $AST_SRC_DIR
23362340 fi
23372341 fi
23382342
2339- # Unmerged patches
2340- git_patch " app_confbridge_Fix_bridge_shutdown_race_condition.patch" # app_confbridge: Fix bridge shutdown race condition
2341-
2342- # # WIP
2343- asterisk_pr_unconditional 292 # GROUP VARs
2344-
2345- # Unmerged
2346- # asterisk_pr_unconditional 272 # Call Waiting Deluxe. This also now conflicts (with the latest revisions), so temp. disabled.
2347- # asterisk_pr_unconditional 438 # Last Number Redial. This now conflicts with 272, so temp. disabled.
2348-
2349- # ## TODO: Include ASTERISK-30339 and ASTERISK-30374 once resubmitted on GitHub
2350-
23512343 if [ " $RTPULSING " = " 1" ]; then
23522344 # Patches split up to make it easier to selectively redo the 2nd one if a patch conflict occurs and the patch needs to be rebased.
23532345 git_patch " ast_rtoutpulsing1.diff" # chan_dahdi: add rtoutpulsing
23542346 git_patch " ast_rtoutpulsing2.diff" # chan_dahdi: add rtoutpulsing
23552347 fi
23562348
2349+ # Out of tree patches
2350+ git_patch " app_confbridge_Fix_bridge_shutdown_race_condition.patch" # app_confbridge: Fix bridge shutdown race condition
23572351 git_patch " blueboxing.diff" # dsp: make blue boxing easier
23582352 git_patch " prefixinclude.diff" # pbx: prefix includes
23592353 git_patch " agi_record_noisefirst.diff" # res_agi: Add noise before silence detection option to Record AGI
2360-
2361- git_custom_patch " https://code.phreaknet.org/asterisk/dahdicleanup.diff"
2354+ git_patch " 19655-asterisk.c-Prevent-duplicate-Asterisk-processes-fro.patch" # Prevent duplicate Asterisk process creation
23622355
23632356 if [ " $EXPERIMENTAL_FEATURES " = " 1" ] && [ $AST_MAJOR_VER -ge 21 ]; then
23642357 printf " Installing 21+ patches for experimental features\n"
23652358 add_experimental
23662359 fi
2367-
2368- if [ " $DEVMODE " = " 1" ]; then # highly experimental
2369- # res_pbx_validate
2370- :
2371- fi
23722360}
23732361
23742362freebsd_port_patch () {
0 commit comments