Skip to content

Commit 99d63e3

Browse files
authored
install: Update patches to target 22.1.0. (#54)
* Remove patches merged in 22.1.0. * Slipstream merged but not yet released patches. * Enable EMPULSE in DAHDI builds, since it is typically needed/desired for E&M signaling, and there is little downside in it being enabled. PHREAKSCRIPT-59 #close
1 parent fc1dddd commit 99d63e3

File tree

3 files changed

+9
-100
lines changed

3 files changed

+9
-100
lines changed

patches/config_c_fix_template_inheritance_overrides.patch

Lines changed: 0 additions & 69 deletions
This file was deleted.

patches/config_c_fix_template_writing.patch

Lines changed: 0 additions & 25 deletions
This file was deleted.

phreaknet.sh

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,7 @@ SIP_CISCO=0
242242
CHAN_SCCP=0
243243
CHAN_DAHDI=0
244244
DAHDI_OLD_DRIVERS=0
245+
EMPULSE=1 # Automatically enable EMPULSE, cause why not?
245246
DAHDI_WANPIPE=0 # wanpipe only needed for Sangoma cards
246247
DEVMODE=0
247248
TEST_SUITE=0
@@ -1907,6 +1908,10 @@ install_dahdi() {
19071908
if [ "$HEARPULSING" = "1" ]; then
19081909
git_patch "hearpulsing-dahlin.diff"
19091910
fi
1911+
if [ "$EMPULSE" = "1" ]; then
1912+
printf "Enabling EMPULSE for this build\n"
1913+
sed -i 's|/\* #define EMPULSE \*/|#define EMPULSE|g' include/dahdi/dahdi_config.h # Enable EMPULSE by default. Note that the * must be escaped for sed.
1914+
fi
19101915
else
19111916
echoerr "Skipping DAHDI Linux feature patches..."
19121917
fi
@@ -2309,13 +2314,11 @@ phreak_patches() { # $1 = $PATCH_DIR, $2 = $AST_SRC_DIR
23092314
printf "Applying patches applicable to %s -> %d (~%s)\n" "$AST_ALT_VER" "$AST_MM_VER" "$AST_MAJOR_VER"
23102315

23112316
## merged into master, not yet in a release version (use asterisk_pr_if, e.g. asterisk_pr_if 399 210100 200600 182100)
2312-
asterisk_pr_if 901 220100 210600 182600 # astfd compiler fix
2313-
asterisk_pr_if 903 220100 210600 182600 # voicemail pager email fix
2314-
asterisk_pr_if 917 220100 210600 182600 # FreeBSD compilation fixes
2317+
asterisk_pr_if 961 220200 210700 201200 182700 # config.c: fix template inheritance/overrides
2318+
asterisk_pr_if 994 220200 210700 201200 182700 # FGD regression fix
23152319

2316-
## Unmerged patches: remove once merged
2317-
git_patch "config_c_fix_template_inheritance_overrides.patch" # config.c: fix template inheritance/overrides
2318-
git_patch "config_c_fix_template_writing.patch" # config.c: fix template inheritance/overrides
2320+
## Unmerged patches: remove or switch to asterisk_pr_if once merged
2321+
asterisk_pr_unconditional 245 # config.c: fix template inheritance/overrides
23192322
asterisk_pr_unconditional 918 # config.c #tryinclude fixes
23202323
asterisk_pr_unconditional 971 # config.c fix issues w/ whitespace in comments
23212324

0 commit comments

Comments
 (0)