@@ -2255,12 +2255,8 @@ phreak_patches() { # $1 = $PATCH_DIR, $2 = $AST_SRC_DIR
2255
2255
phreak_tree_module " funcs/func_query.c"
2256
2256
phreak_tree_module " funcs/func_resonance.c"
2257
2257
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
2263
2258
2259
+ phreak_tree_module " res/res_coindetect.c"
2264
2260
phreak_tree_module " res/res_alarmsystem.c"
2265
2261
phreak_tree_module " res/res_digitmap.c"
2266
2262
phreak_tree_module " res/res_irc.c"
@@ -2270,6 +2266,9 @@ phreak_patches() { # $1 = $PATCH_DIR, $2 = $AST_SRC_DIR
2270
2266
phreak_tree_module " res/res_pjsip_presence.c"
2271
2267
phreak_tree_module " res/res_smdr_whozz.c"
2272
2268
2269
+ if [ " $DEVMODE " = " 1" ]; then
2270
+ phreak_tree_module " res/res_deadlock.c" # this is not possibly useful to non-developers
2271
+ fi
2273
2272
if [ -d /etc/dahdi ]; then
2274
2273
phreak_tree_module " apps/app_loopdisconnect.c"
2275
2274
if [ " $RTPULSING " = " 1" ]; then
@@ -2326,6 +2325,11 @@ phreak_patches() { # $1 = $PATCH_DIR, $2 = $AST_SRC_DIR
2326
2325
asterisk_pr_unconditional 971 # config.c fix issues w/ whitespace in comments
2327
2326
asterisk_pr_unconditional 1030 # chan_dahdi: Fix wrong channel state when RINGING recieved
2328
2327
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
+
2329
2333
if [ $AST_MAJOR_VER -lt 21 ]; then
2330
2334
if [ " $EXTERNAL_CODECS " = " 1" ]; then
2331
2335
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
2336
2340
fi
2337
2341
fi
2338
2342
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
-
2351
2343
if [ " $RTPULSING " = " 1" ]; then
2352
2344
# 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.
2353
2345
git_patch " ast_rtoutpulsing1.diff" # chan_dahdi: add rtoutpulsing
2354
2346
git_patch " ast_rtoutpulsing2.diff" # chan_dahdi: add rtoutpulsing
2355
2347
fi
2356
2348
2349
+ # Out of tree patches
2350
+ git_patch " app_confbridge_Fix_bridge_shutdown_race_condition.patch" # app_confbridge: Fix bridge shutdown race condition
2357
2351
git_patch " blueboxing.diff" # dsp: make blue boxing easier
2358
2352
git_patch " prefixinclude.diff" # pbx: prefix includes
2359
2353
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
2362
2355
2363
2356
if [ " $EXPERIMENTAL_FEATURES " = " 1" ] && [ $AST_MAJOR_VER -ge 21 ]; then
2364
2357
printf " Installing 21+ patches for experimental features\n"
2365
2358
add_experimental
2366
2359
fi
2367
-
2368
- if [ " $DEVMODE " = " 1" ]; then # highly experimental
2369
- # res_pbx_validate
2370
- :
2371
- fi
2372
2360
}
2373
2361
2374
2362
freebsd_port_patch () {
0 commit comments