Skip to content

Commit 1398661

Browse files
committed
install: Update patch targets for master.
PR 245 and 414 have been merged, so move to asterisk_pr_if.
1 parent b314286 commit 1398661

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

phreaknet.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2322,9 +2322,10 @@ phreak_patches() { # $1 = $PATCH_DIR, $2 = $AST_SRC_DIR
23222322
## merged into master, not yet in a release version (use asterisk_pr_if, e.g. asterisk_pr_if 399 210100 200600 182100)
23232323
asterisk_pr_if 961 220200 210700 201200 182700 # config.c: fix template inheritance/overrides
23242324
asterisk_pr_if 994 220200 210700 201200 182700 # FGD regression fix
2325+
asterisk_pr_if 245 220200 210700 201200 182700 # config.c: fix template inheritance/overrides
2326+
asterisk_pr_if 414 220200 210700 201200 182700 # IAX2 loopback warning
23252327

23262328
## Unmerged patches: remove or switch to asterisk_pr_if once merged
2327-
asterisk_pr_unconditional 245 # config.c: fix template inheritance/overrides
23282329
asterisk_pr_unconditional 918 # config.c #tryinclude fixes
23292330
asterisk_pr_unconditional 971 # config.c fix issues w/ whitespace in comments
23302331

@@ -2343,7 +2344,6 @@ phreak_patches() { # $1 = $PATCH_DIR, $2 = $AST_SRC_DIR
23432344

23442345
## WIP
23452346
asterisk_pr_unconditional 292 # GROUP VARs
2346-
asterisk_pr_unconditional 414 # IAX2 loopback warning
23472347

23482348
# Unmerged
23492349
#asterisk_pr_unconditional 272 # Call Waiting Deluxe. This also now conflicts (with the latest revisions), so temp. disabled.
@@ -3754,6 +3754,8 @@ elif [ "$cmd" = "docgen" ]; then
37543754
fi
37553755
rm /tmp/astdocgen.xml
37563756
printf "HTML documentation has been generated and is now saved to %s%s\n" "$AST_SOURCE_PARENT_DIR/$AST_SRC_DIR" "doc/index.html"
3757+
# To remove any packages installed purely for astdocgen:
3758+
# apt-get remove apache2 apache2-bin apache2-data apache2-utils libapache2-mod-php8.2 libaprutil1-dbd-sqlite3 libaprutil1-ldap liblua5.3-0 php php8.2 php8.2-xml
37573759
elif [ "$cmd" = "mkdocs" ]; then
37583760
cd $AST_SOURCE_PARENT_DIR
37593761
AST_SRC_DIR=`get_newest_astdir`

0 commit comments

Comments
 (0)