@@ -1757,6 +1757,8 @@ install_dahdi() {
1757
1757
fi
1758
1758
fi
1759
1759
1760
+ instantiate_repo
1761
+
1760
1762
if [ " $KSRC " != " " ]; then
1761
1763
if [ ! -d " $KSRC " ]; then
1762
1764
die " KSRC directory does not exist: $KSRC "
@@ -1870,8 +1872,6 @@ install_dahdi() {
1870
1872
dahdi_unpurge $DAHDI_LIN_SRC_DIR # for some reason, this needs to be applied before the next branch patches
1871
1873
fi
1872
1874
1873
- instantiate_repo
1874
-
1875
1875
# Compiler fixes for 5.17/5.18:
1876
1876
if [ $DAHDI_MM_VER -lt 33 ]; then
1877
1877
phreak_fuzzy_patch " dahdi_pci.diff"
@@ -2399,19 +2399,16 @@ phreak_patches() { # $1 = $PATCH_DIR, $2 = $AST_SRC_DIR
2399
2399
2400
2400
printf " Applying patches applicable to %s -> %d (~%s)\n" " $AST_ALT_VER " " $AST_MM_VER " " $AST_MAJOR_VER "
2401
2401
2402
- # # merged into master, not yet in a release version (use asterisk_pr_if, e.g. asterisk_pr_if 399 210100 200600 182100)
2403
- asterisk_pr_if 961 220200 210700 201200 182700 # config.c: fix template inheritance/overrides
2404
- asterisk_pr_if 994 220200 210700 201200 182700 # FGD regression fix
2405
- asterisk_pr_if 245 220200 210700 201200 182700 # config.c: fix template inheritance/overrides
2406
- asterisk_pr_if 971 220200 210700 201200 182700 # config.c fix issues w/ whitespace in comments
2407
- asterisk_pr_if 414 220200 210700 201200 182700 # IAX2 loopback warning
2408
- asterisk_pr_if 1030 220200 210700 201200 182700 # chan_dahdi: Fix wrong channel state when RINGING recieved
2409
- asterisk_pr_if 1055 220200 210700 201200 182700 # chan_iax2: Avoid unnecessarily backlogging frames
2410
- # asterisk_pr_if 918 220200 210700 201200 182700 # config.c #tryinclude fixes. Temporarily disabled since patch fails to apply: main/config.c:2750
2411
- # asterisk_pr_if 438 220200 210700 201200 182700 # Last Number Redial. This now conflicts with 272, so temp. disabled.
2402
+ # # Merged into master, but master only (won't be in a release version until next standard release)
2403
+ if [ $AST_MAJOR_VER -lt 23 ]; then
2404
+ asterisk_pr_unconditional 961 # config.c: fix template inheritance/overrides.
2405
+ asterisk_pr_unconditional 245 # config.c: fix template inheritance/overrides.
2406
+ fi
2407
+
2408
+ # # Merged into master, not yet in a release version (use asterisk_pr_if, e.g. asterisk_pr_if 1234 220300 210800 201300)
2409
+ asterisk_pr_unconditional 1086 220300 210800 201300 # Fix for Fedora 42 (old style definitions for libdb)
2412
2410
2413
2411
# # Unmerged patches: remove or switch to asterisk_pr_if once merged
2414
- asterisk_pr_unconditional 1086 # Fix for Fedora 42 (old style definitions for libdb)
2415
2412
asterisk_pr_unconditional 1089 # app_sms: Ignore false positive gcc warning
2416
2413
# asterisk_pr_unconditional 272 # Call Waiting Deluxe. This also now conflicts (with the latest revisions), so temp. disabled.
2417
2414
# asterisk_pr_unconditional 292 # GROUP VARs # Disabled temporarily as patch does not apply anymore
0 commit comments