.github: Minor tweak to Asterisk Releaser

Also allow CreateDocs job to be run manually with default branches.

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -0,0 +1,87 @@
+name: Bug
+description: File a bug report
+title: "[bug]: "
+labels: ["bug", "triage"]
+#assignees:
+#  - octocat
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for creating a report! The issue has entered the triage process. That means the issue will wait in this status until a Bug Marshal has an opportunity to review the issue. Once the issue has been reviewed you will receive comments regarding the next steps towards resolution. Please note that log messages and other files should not be sent to the Sangoma Asterisk Team unless explicitly asked for. All files should be placed on this issue in a sanitized fashion as needed.
+
+        A good first step is for you to review the Asterisk Issue Guidelines if you haven't already. The guidelines detail what is expected from an Asterisk issue report.
+
+        Then, if you are submitting a patch, please review the Patch Contribution Process.
+
+        Please note that once your issue enters an open state it has been accepted. As Asterisk is an open source project there is no guarantee or timeframe on when your issue will be looked into. If you need expedient resolution you will need to find and pay a suitable developer. Asking for an update on your issue will not yield any progress on it and will not result in a response. All updates are posted to the issue when they occur.
+
+        Please note that by submitting data, code, or documentation to Sangoma through GitHub, you accept the Terms of Use present at
+        https://www.asterisk.org/terms-of-use/.      
+        Thanks for taking the time to fill out this bug report!
+  - type: dropdown
+    id: severity
+    attributes:
+      label: Severity
+      options:
+        - Trivial
+        - Minor
+        - Major
+        - Critical
+        - Blocker
+    validations:
+      required: true
+  - type: input
+    id: versions
+    attributes:
+      label: Versions
+      description: Enter one or more versions separated by commas.
+    validations:
+      required: true
+  - type: input
+    id: components
+    attributes:
+      label: Components/Modules
+      description: Enter one or more components or modules separated by commas.
+    validations:
+      required: true
+  - type: textarea
+    id: environment
+    attributes:
+      label: Operating Environment
+      description: OS,  Disribution, Version, etc.
+    validations:
+      required: true
+  - type: dropdown
+    id: frequency
+    attributes:
+      label: Frequency of Occurrence
+      options:
+        - "Never"
+        - "One Time"
+        - "Occasional"
+        - "Frequent"
+        - "Constant"
+  - type: textarea
+    id: description
+    attributes:
+      label: Issue Description
+    validations:
+      required: true
+  - type: textarea
+    id: logs
+    attributes:
+      label: Relevant log output
+      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
+      render: shell
+  - type: markdown
+    attributes:
+      value: |
+        [Asterisk Issue Guidelines](https://wiki.asterisk.org/wiki/display/AST/Asterisk+Issue+Guidelines)
+  - type: checkboxes
+    id: guidelines
+    attributes:
+      label: Asterisk Issue Guidelines
+      options:
+        - label: Yes, I have read the Asterisk Issue Guidelines
+          required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Asterisk Community Support
+    url: https://community.asterisk.org
+    about: Please ask and answer questions here.
+  - name: Feature Requests
+    url: https://github.com/asterisk/asterisk-feature-requests/issues
+    about: Please submit feature requests here.

.github/ISSUE_TEMPLATE/improvement.yml

@@ -0,0 +1,27 @@
+name: Improvement
+description: Submit an improvement to existing functionality
+title: "[improvement]: "
+labels: ["improvement", "triage"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for creating a report! The issue has entered the triage process. That means the issue will wait in this status until a Bug Marshal has an opportunity to review the issue. Once the issue has been reviewed you will receive comments regarding the next steps towards resolution. Please note that log messages and other files should not be sent to the Sangoma Asterisk Team unless explicitly asked for. All files should be placed on this issue in a sanitized fashion as needed.
+
+        A good first step is for you to review the Asterisk Issue Guidelines if you haven't already. The guidelines detail what is expected from an Asterisk issue report.
+
+        Then, if you are submitting a patch, please review the Patch Contribution Process.
+
+        Please note that once your issue enters an open state it has been accepted. As Asterisk is an open source project there is no guarantee or timeframe on when your issue will be looked into. If you need expedient resolution you will need to find and pay a suitable developer. Asking for an update on your issue will not yield any progress on it and will not result in a response. All updates are posted to the issue when they occur.
+
+        Please note that by submitting data, code, or documentation to Sangoma through GitHub, you accept the Terms of Use present at
+        https://www.asterisk.org/terms-of-use/.      
+        Thanks for taking the time to fill out this bug report!
+  - type: textarea
+    id: description
+    attributes:
+      label: Improvement Description
+      description: Describe the improvement in as much detail as possible
+    validations:
+      required: true
+      

.github/ISSUE_TEMPLATE/new-feature.yml

@@ -0,0 +1,27 @@
+name: New Feature Submission
+description: Submit a New Feature
+title: "[new-feature]: "
+labels: ["new-feature", "triage"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for creating a report! The issue has entered the triage process. That means the issue will wait in this status until a Bug Marshal has an opportunity to review the issue. Once the issue has been reviewed you will receive comments regarding the next steps towards resolution. Please note that log messages and other files should not be sent to the Sangoma Asterisk Team unless explicitly asked for. All files should be placed on this issue in a sanitized fashion as needed.
+
+        A good first step is for you to review the Asterisk Issue Guidelines if you haven't already. The guidelines detail what is expected from an Asterisk issue report.
+
+        Then, if you are submitting a patch, please review the Patch Contribution Process.
+
+        Please note that once your issue enters an open state it has been accepted. As Asterisk is an open source project there is no guarantee or timeframe on when your issue will be looked into. If you need expedient resolution you will need to find and pay a suitable developer. Asking for an update on your issue will not yield any progress on it and will not result in a response. All updates are posted to the issue when they occur.
+
+        Please note that by submitting data, code, or documentation to Sangoma through GitHub, you accept the Terms of Use present at
+        https://www.asterisk.org/terms-of-use/.      
+        Thanks for taking the time to fill out this bug report!
+  - type: textarea
+    id: description
+    attributes:
+      label: Feature Description
+      description: Describe the new feature in as much detail as possible
+    validations:
+      required: true
+

.github/workflows/CherryPickTest.yml

@@ -0,0 +1,167 @@
+name: CherryPickTest
+run-name: "Cherry-Pick Tests for PR ${{github.event.number}}"
+on:
+  pull_request_target:
+    types: [ labeled ]
+
+concurrency:
+  group: ${{github.workflow}}-${{github.event.number}}
+  cancel-in-progress: true
+
+env:
+  PR_NUMBER:          ${{ github.event.number }}
+  MODULES_BLACKLIST:  ${{ vars.GATETEST_MODULES_BLACKLIST }} ${{ vars.UNITTEST_MODULES_BLACKLIST }}
+
+jobs:
+  IdentifyBranches:
+    name: IdentifyBranches
+    if: ${{ github.event.label.name == vars.CHERRY_PICK_TEST_LABEL }}
+    outputs:
+      branches:     ${{ steps.getbranches.outputs.branches }}
+      branch_count: ${{ steps.getbranches.outputs.branch_count }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Remove Trigger Label, Add InProgress Label
+        env:
+          GH_TOKEN:          ${{ secrets.GITHUB_TOKEN }}
+        run: | 
+          gh pr edit --repo ${{github.repository}} \
+            --remove-label ${{vars.CHERRY_PICK_TEST_LABEL}} \
+            --remove-label ${{vars.CHERRY_PICK_CHECKS_PASSED_LABEL}} \
+            --remove-label ${{vars.CHERRY_PICK_CHECKS_FAILED_LABEL}} \
+            --remove-label ${{vars.CHERRY_PICK_GATES_PASSED_LABEL}} \
+            --remove-label ${{vars.CHERRY_PICK_GATES_FAILED_LABEL}} \
+            --remove-label ${{vars.CHERRY_PICK_TESTING_IN_PROGRESS}} \
+            ${{env.PR_NUMBER}} || :
+
+      - name: Get cherry-pick branches
+        uses: asterisk/asterisk-ci-actions/GetCherryPickBranchesFromPR@main
+        id: getbranches
+        with:
+          repo:                    ${{github.repository}}
+          pr_number:               ${{env.PR_NUMBER}}
+          cherry_pick_regex:       ${{vars.CHERRY_PICK_REGEX}}
+          github_token:            ${{secrets.GITHUB_TOKEN}}
+
+      - name: Check Branch Count
+        if: ${{ steps.getbranches.outputs.branch_count > 0 }}
+        env:
+          GH_TOKEN:          ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          gh pr edit --repo ${{github.repository}} \
+          --add-label ${{vars.CHERRY_PICK_TESTING_IN_PROGRESS}} \
+          ${{env.PR_NUMBER}} || :
+
+  CherryPickUnitTestMatrix:
+    needs: [ IdentifyBranches ]
+    if: ${{ needs.IdentifyBranches.outputs.branch_count > 0 && ( success() || failure() ) }}
+    continue-on-error: false
+    strategy:
+      fail-fast: false
+      matrix:
+        branch: ${{ fromJSON(needs.IdentifyBranches.outputs.branches) }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Run Unit Tests for branch ${{matrix.branch}}
+        uses: asterisk/asterisk-ci-actions/AsteriskUnitComposite@main
+        with:
+          asterisk_repo:     ${{github.repository}}
+          pr_number:         ${{env.PR_NUMBER}}
+          base_branch:       ${{matrix.branch}}
+          is_cherry_pick:    true
+          modules_blacklist: ${{env.MODULES_BLACKLIST}}
+          github_token:      ${{secrets.GITHUB_TOKEN}}
+          unittest_command:  ${{vars.UNITTEST_COMMAND}}
+
+  CherryPickUnitTests:
+    needs: [ IdentifyBranches, CherryPickUnitTestMatrix ]
+    if: ${{ needs.IdentifyBranches.outputs.branch_count > 0 && ( success() || failure() ) }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check unit test matrix status
+        env:
+          RESULT:    ${{needs.CherryPickUnitTestMatrix.result}}
+          GH_TOKEN:  ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          case $RESULT in
+            success)
+              gh pr edit --repo ${{github.repository}} \
+                --add-label ${{vars.CHERRY_PICK_CHECKS_PASSED_LABEL}} \
+                ${{env.PR_NUMBER}} || :
+              echo "::notice::All tests passed"
+              exit 0
+              ;;
+            skipped)
+              gh pr edit --repo ${{github.repository}} \
+                --remove-label ${{vars.CHERRY_PICK_TESTING_IN_PROGRESS}} \
+                --add-label ${{vars.CHERRY_PICK_CHECKS_FAILED_LABEL}} \
+                ${{env.PR_NUMBER}} || :
+              echo "::notice::Unit tests were skipped because of an earlier failure"
+              exit 1
+              ;;
+            *)
+              gh pr edit --repo ${{github.repository}} \
+                --remove-label ${{vars.CHERRY_PICK_TESTING_IN_PROGRESS}} \
+                --add-label ${{vars.CHERRY_PICK_CHECKS_FAILED_LABEL}} \
+                ${{env.PR_NUMBER}} || :
+              echo "::error::One or more tests failed ($RESULT)"
+              exit 1
+          esac
+
+  CherryPickGateTestMatrix:
+    needs: [ IdentifyBranches, CherryPickUnitTests ]
+    if: ${{ success() }}
+    continue-on-error: false
+    strategy:
+      fail-fast: false
+      matrix:
+        branch: ${{ fromJSON(needs.IdentifyBranches.outputs.branches) }}
+        group: ${{ fromJSON(vars.GATETEST_LIST) }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Run Gate Tests for ${{ matrix.group }}-${{matrix.branch}}
+        uses: asterisk/asterisk-ci-actions/AsteriskGateComposite@main
+        with:
+          test_type:         Gate
+          asterisk_repo:     ${{github.repository}}
+          pr_number:         ${{env.PR_NUMBER}}
+          base_branch:       ${{matrix.branch}}
+          is_cherry_pick:    true
+          modules_blacklist: ${{env.MODULES_BLACKLIST}}
+          github_token:      ${{secrets.GITHUB_TOKEN}}
+          testsuite_repo:    ${{vars.TESTSUITE_REPO}}
+          gatetest_group:    ${{matrix.group}}
+          gatetest_commands: ${{vars.GATETEST_COMMANDS}}
+
+  CherryPickGateTests:
+    needs: [ IdentifyBranches, CherryPickGateTestMatrix ]
+    if: ${{ success() || failure() }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check test matrix status
+        env:
+          RESULT:    ${{needs.CherryPickGateTestMatrix.result}}
+          GH_TOKEN:  ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          gh pr edit --repo ${{github.repository}} \
+            --remove-label ${{vars.CHERRY_PICK_TESTING_IN_PROGRESS}} \
+            ${{env.PR_NUMBER}} || :
+          case $RESULT in
+            success)
+              gh pr edit --repo ${{github.repository}} \
+                --add-label ${{vars.CHERRY_PICK_GATES_PASSED_LABEL}} \
+                ${{env.PR_NUMBER}} || :
+              echo "::notice::All Testsuite tests passed"
+              exit 0
+              ;;
+            skipped)
+              echo "::error::Testsuite tests were skipped because of an earlier failure"
+              exit 1
+              ;;
+            *)
+              gh pr edit --repo ${{github.repository}} \
+                --add-label ${{vars.CHERRY_PICK_GATES_FAILED_LABEL}} \
+                ${{env.PR_NUMBER}} || :
+              echo "::error::One or more Testsuite tests failed ($RESULT)"
+              exit 1
+          esac

.github/workflows/CreateDocs.yml

@@ -0,0 +1,123 @@
+name: CreateDocs
+on:
+  workflow_dispatch:
+    inputs:
+      branches:
+        description: "JSON array of branches: ['18','20'] (no spaces)"
+        required:    false
+        type:        string
+  schedule:
+#           Times are UTC
+    - cron: '0 04 * * *'
+
+env:
+  ASTERISK_REPO:     ${{ github.repository }}
+  GITHUB_TOKEN:      ${{ secrets.GITHUB_TOKEN }}
+  GH_TOKEN:          ${{ secrets.GITHUB_TOKEN }}
+  DEFAULT_BRANCHES:  ${{ vars.WIKIDOC_BRANCHES }}
+  INPUT_BRANCHES:    ${{ inputs.branches }}
+
+jobs:
+  
+  CreateDocsDebug:
+    runs-on: ubuntu-latest
+    outputs:
+      manual_branches:     ${{ steps.setup.outputs.manual_branches }}
+    steps:
+      - name: setup
+        run: |
+          MANUAL_BRANCHES="$INPUT_BRANCHES"
+          [ -z "$MANUAL_BRANCHES" ] && MANUAL_BRANCHES="$DEFAULT_BRANCHES" || :
+          echo "manual_branches=${MANUAL_BRANCHES}"
+          echo "manual_branches=${MANUAL_BRANCHES}" >>${GITHUB_OUTPUT}
+          exit 0
+        
+      - name: DumpEnvironment
+        uses: asterisk/asterisk-ci-actions/DumpEnvironmentAction@main
+        with:
+          action-inputs: ${{toJSON(inputs)}}
+          action-vars: ${{ toJSON(steps.setup.outputs) }}
+
+  CreateDocsScheduledMatrix:
+    needs: [ CreateDocsDebug ]
+    if: ${{github.event_name == 'schedule' && fromJSON(vars.WIKIDOCS_ENABLE) == true }}
+    continue-on-error: false
+    strategy:
+      fail-fast: false
+      matrix:
+        branch: ${{ fromJSON(vars.WIKIDOC_BRANCHES) }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: CreateDocs for ${{matrix.branch}}
+        uses: asterisk/asterisk-ci-actions/CreateAsteriskDocsComposite@main
+        with:
+          asterisk_repo:     ${{env.ASTERISK_REPO}}
+          base_branch:       ${{matrix.branch}}
+          docs_dir:          docs_dir/${{matrix.branch}}
+          github_token:      ${{secrets.GITHUB_TOKEN}}
+
+  CreateDocsScheduled:
+    needs: [ CreateDocsScheduledMatrix ]
+    if: ${{  success() || failure() }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check CreateDocsScheduledMatrix status
+        env:
+          RESULT:    ${{needs.CreateDocsScheduledMatrix.result}}
+          GH_TOKEN:  ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          case $RESULT in
+            success)
+              echo "::notice::Docs created"
+              exit 0
+              ;;
+            skipped)
+              echo "::notice::Skipped"
+              exit 1
+              ;;
+            *)
+              echo "::error::One or CreateDocs failed ($RESULT)"
+              exit 1
+          esac
+
+  CreateDocsManualMatrix:
+    needs: [ CreateDocsDebug ]
+    if: ${{github.event_name == 'workflow_dispatch'}}
+    continue-on-error: false
+    strategy:
+      fail-fast: false
+      matrix:
+        branch: ${{ fromJSON(vars.WIKIDOC_MANUAL_BRANCHES) }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: CreateDocs for ${{matrix.branch}}
+        uses: asterisk/asterisk-ci-actions/CreateAsteriskDocsComposite@main
+        with:
+          asterisk_repo:     ${{env.ASTERISK_REPO}}
+          base_branch:       ${{matrix.branch}}
+          docs_dir:          docs_dir/${{matrix.branch}}
+          github_token:      ${{secrets.GITHUB_TOKEN}}
+
+  CreateDocsManual:
+    needs: [ CreateDocsManualMatrix ]
+    if: ${{  success() || failure() }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check CreateDocsManualMatrix status
+        env:
+          RESULT:    ${{needs.CreateDocsManualMatrix.result}}
+          GH_TOKEN:  ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          case $RESULT in
+            success)
+              echo "::notice::Docs created"
+              exit 0
+              ;;
+            skipped)
+              echo "::notice::Skipped"
+              exit 1
+              ;;
+            *)
+              echo "::error::One or CreateDocs failed ($RESULT)"
+              exit 1
+          esac

.github/workflows/IssueOpened.yml

@@ -0,0 +1,15 @@
+name: Issue Opened
+run-name: "Issue ${{github.event.number}} ${{github.event.action}} by ${{github.actor}}"
+on:
+  issues:
+    types: opened
+
+jobs:
+  triage:
+    runs-on: ubuntu-latest
+    steps:
+      - name: initial labeling
+        uses: andymckay/labeler@master
+        with:
+          add-labels: "triage"
+          ignore-if-labeled: true

.github/workflows/MergeApproved.yml

@@ -0,0 +1,190 @@
+name: MergeApproved
+run-name: "Merge Approved for PR ${{github.event.number}}"
+on:
+  pull_request_target:
+    types: [labeled]
+
+env:
+  PR_NUMBER:          ${{ github.event.number }}
+  BASE_BRANCH:        ${{github.event.pull_request.base.ref}}
+  MODULES_BLACKLIST:  ${{ vars.GATETEST_MODULES_BLACKLIST }} ${{ vars.UNITTEST_MODULES_BLACKLIST }}
+  FORCE:              ${{ endsWith(github.event.label.name, '-force') }}
+
+jobs:
+  IdentifyBranches:
+    if: contains(fromJSON(vars.MERGE_APPROVED_LABELS), github.event.label.name)
+    outputs:
+      branches:     ${{ steps.getbranches.outputs.branches }}
+      all_branches: ${{ steps.checkbranches.outputs.all_branches }}
+      branch_count: ${{ steps.getbranches.outputs.branch_count }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Clean up labels
+        env:
+          GH_TOKEN:          ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          gh pr edit --repo ${{github.repository}} \
+            --remove-label ${{github.event.label.name}} \
+            --remove-label ${{vars.PRE_MERGE_CHECKS_PASSED_LABEL}} \
+            --remove-label ${{vars.PRE_MERGE_CHECKS_FAILED_LABEL}} \
+            --remove-label ${{vars.PRE_MERGE_GATES_PASSED_LABEL}} \
+            --remove-label ${{vars.PRE_MERGE_GATES_FAILED_LABEL}} \
+            --remove-label ${{vars.PRE_MERGE_TESTING_IN_PROGRESS}} \
+            ${{env.PR_NUMBER}} || :
+
+      - name: Get cherry-pick branches
+        uses: asterisk/asterisk-ci-actions/GetCherryPickBranchesFromPR@main
+        id: getbranches
+        with:
+          repo:                   ${{github.repository}}
+          pr_number:              ${{env.PR_NUMBER}}
+          cherry_pick_regex:      ${{vars.CHERRY_PICK_REGEX}}
+          github_token:           ${{secrets.GITHUB_TOKEN}}
+
+      - name: Check Branch Count
+        id: checkbranches
+        env:
+          BRANCH_COUNT:  ${{ steps.getbranches.outputs.branch_count }}
+          BRANCHES:  ${{ steps.getbranches.outputs.branches }}
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          gh pr edit --repo ${{github.repository}} \
+          --add-label ${{vars.PRE_MERGE_TESTING_IN_PROGRESS}} \
+          ${{env.PR_NUMBER}} || :
+          all_branches=$(echo "$BRANCHES" | jq -c "[ \"$BASE_BRANCH\" ] + .")
+          echo "all_branches=${all_branches}" >>${GITHUB_OUTPUT}
+
+      - name: Pre Check Cherry-Picks
+        if: ${{ steps.getbranches.outputs.branch_count > 0 }}
+        uses: asterisk/asterisk-ci-actions/CherryPick@main
+        with:
+          repo:              ${{github.repository}}
+          pr_number:         ${{env.PR_NUMBER}}
+          branches:          ${{steps.getbranches.outputs.branches}}
+          github_token:      ${{secrets.GITHUB_TOKEN}}
+          push:              false
+
+  PreMergeUnitTestMatrix:
+    needs: [ IdentifyBranches ]
+    if: success()
+    continue-on-error: false
+    strategy:
+      fail-fast: false
+      matrix:
+        branch: ${{ fromJSON(needs.IdentifyBranches.outputs.all_branches) }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Run Unit Tests for branch ${{matrix.branch}}
+        uses: asterisk/asterisk-ci-actions/AsteriskUnitComposite@main
+        with:
+          asterisk_repo:     ${{github.repository}}
+          pr_number:         ${{env.PR_NUMBER}}
+          base_branch:       ${{matrix.branch}}
+          is_cherry_pick:    true
+          modules_blacklist: ${{env.MODULES_BLACKLIST}}
+          github_token:      ${{secrets.GITHUB_TOKEN}}
+          unittest_command:  ${{vars.UNITTEST_COMMAND}}
+
+  PreMergeUnitTests:
+    needs: [ IdentifyBranches, PreMergeUnitTestMatrix ]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check unit test matrix status
+        env:
+          RESULT:    ${{needs.PreMergeUnitTestMatrix.result}}
+          GH_TOKEN:  ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          case $RESULT in
+            success)
+              gh pr edit --repo ${{github.repository}} \
+                --remove-label ${{vars.PRE_MERGE_TESTING_IN_PROGRESS}} \
+                --add-label ${{vars.PRE_MERGE_CHECKS_PASSED_LABEL}} \
+                ${{env.PR_NUMBER}} || :
+              echo "::notice::All tests passed"
+              exit 0
+              ;;
+            skipped)
+              gh pr edit --repo ${{github.repository}} \
+                --remove-label ${{vars.PRE_MERGE_TESTING_IN_PROGRESS}} \
+                --add-label ${{vars.PRE_MERGE_CHECKS_FAILED_LABEL}} \
+                ${{env.PR_NUMBER}} || :
+              echo "::notice::Unit tests were skipped because of an earlier failure"
+              exit 1
+              ;;
+            *)
+              gh pr edit --repo ${{github.repository}} \
+                --remove-label ${{vars.PRE_MERGE_TESTING_IN_PROGRESS}} \
+                --add-label ${{vars.PRE_MERGE_CHECKS_FAILED_LABEL}} \
+                ${{env.PR_NUMBER}} || :
+              echo "::error::One or more tests failed ($RESULT)"
+              exit 1
+          esac
+
+  MergeAndCherryPick:
+    needs: [ IdentifyBranches, PreMergeUnitTests ]
+    if: success()
+    concurrency:
+      group: MergeAndCherryPick
+      cancel-in-progress: false
+    runs-on: ubuntu-latest
+    steps:
+      - name: Start Merge
+        env:
+          GH_TOKEN:  ${{ secrets.GITHUB_TOKEN }}
+        run: |
+            gh pr edit --repo ${{github.repository}} \
+              --add-label ${{vars.MERGE_IN_PROGRESS_LABEL}} \
+              ${{env.PR_NUMBER}} || :
+
+      - name: Get Token needed to push cherry-picks
+        id: get_workflow_token
+        uses: peter-murray/workflow-application-token-action@v2
+        with:
+          application_id: ${{secrets.ASTERISK_ORG_ACCESS_APP_ID}}
+          application_private_key: ${{secrets.ASTERISK_ORG_ACCESS_APP_PRIV_KEY}}
+          organization: asterisk
+
+      - name: Merge and Cherry Pick to ${{needs.IdentifyBranches.outputs.branches}}
+        id: mergecp
+        uses: asterisk/asterisk-ci-actions/MergeAndCherryPickComposite@main
+        with:
+          repo:          ${{github.repository}}
+          pr_number:     ${{env.PR_NUMBER}}
+          branches:      ${{needs.IdentifyBranches.outputs.branches}}
+          force:         ${{env.FORCE}}
+          github_token:  ${{steps.get_workflow_token.outputs.token}}
+
+      - name: Merge Cleanup
+        if: always()
+        env:
+          RESULT:    ${{ steps.mergecp.outcome }}
+          GH_TOKEN:  ${{ secrets.GITHUB_TOKEN }}
+          BRANCH_COUNT: ${{ needs.IdentifyBranches.outputs.branch_count }}
+          BRANCHES:     ${{ needs.IdentifyBranches.outputs.branches }}
+
+        run: |
+          case $RESULT in
+            success)
+              gh pr edit --repo ${{github.repository}} \
+                --remove-label ${{vars.MERGE_IN_PROGRESS_LABEL}} \
+                ${{env.PR_NUMBER}} || :
+              if [ $BRANCH_COUNT -eq 0 ] ; then
+                gh pr comment --repo ${{github.repository}} \
+                  -b "Successfully merged to branch $BASE_BRANCH." \
+                  ${{env.PR_NUMBER}} || :
+              else
+                gh pr comment --repo ${{github.repository}} \
+                  -b "Successfully merged to branch $BASE_BRANCH and cherry-picked to $BRANCHES" \
+                  ${{env.PR_NUMBER}} || :
+              fi
+              exit 0
+              ;;
+            failure)
+              gh pr edit --repo ${{github.repository}} \
+                --remove-label ${{vars.MERGE_IN_PROGRESS_LABEL}} \
+                --add-label ${{vars.MERGE_FAILED_LABEL}} \
+                ${{env.PR_NUMBER}} || :
+              exit 1
+              ;;
+              *)
+          esac

.github/workflows/NightlyAdmin.yml

@@ -0,0 +1,28 @@
+name: Nightly Admin
+on:
+  schedule:
+    - cron: '30 1 * * *'
+
+env:
+  ASTERISK_REPO:     ${{ github.repository }}
+  PR_NUMBER:         0
+  PR_COMMIT:         ''
+  GITHUB_TOKEN:      ${{ secrets.GITHUB_TOKEN }}
+  GH_TOKEN:          ${{ secrets.GITHUB_TOKEN }}
+  MODULES_BLACKLIST: ${{ vars.GATETEST_MODULES_BLACKLIST }} ${{ vars.UNITTEST_MODULES_BLACKLIST }}
+
+jobs:
+  CloseStaleIssues:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Close Stale Issues
+        uses: actions/stale@v7
+        with:
+          stale-issue-message: 'This issue is stale because it has been open 7 days with no activity. Remove stale label or comment or this will be closed in 14 days.'
+          stale-issue-label: stale
+          close-issue-message: 'This issue was closed because it has been stalled for 14 days with no activity.'
+          days-before-stale: 7
+          days-before-close: 14
+          days-before-pr-close: -1
+          only-labels: triage,feedback-required
+

.github/workflows/NightlyTests.yml

@@ -0,0 +1,59 @@
+name: NightlyTests
+on:
+  workflow_dispatch:
+
+  schedule:
+    - cron: '0 2 * * *'
+
+env:
+  ASTERISK_REPO:     ${{ github.repository }}
+  PR_NUMBER:         0
+  PR_COMMIT:         ''
+  GITHUB_TOKEN:      ${{ secrets.GITHUB_TOKEN }}
+  GH_TOKEN:          ${{ secrets.GITHUB_TOKEN }}
+  MODULES_BLACKLIST: ${{ vars.GATETEST_MODULES_BLACKLIST }}
+
+jobs:
+  AsteriskNightly:
+    strategy:
+      fail-fast: false
+      matrix:
+        branch: ${{ fromJSON(vars.NIGHTLYTEST_BRANCHES) }}
+        group: ${{ fromJSON(vars.NIGHTLYTEST_LIST) }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Run Nightly Tests for ${{ matrix.group }}/${{ matrix.branch }}
+        uses: asterisk/asterisk-ci-actions/AsteriskGateComposite@main
+        with:
+          test_type:         Nightly
+          asterisk_repo:     ${{env.ASTERISK_REPO}}
+          pr_number:         ${{env.PR_NUMBER}}
+          base_branch:       ${{matrix.branch}}
+          modules_blacklist: ${{env.MODULES_BLACKLIST}}
+          github_token:      ${{secrets.GITHUB_TOKEN}}
+          testsuite_repo:    ${{vars.TESTSUITE_REPO}}
+          gatetest_group:    ${{matrix.group}}
+          gatetest_commands: ${{vars.GATETEST_COMMANDS}}
+
+  AsteriskNightlyTests:
+    if: ${{ always() }}
+    runs-on: ubuntu-latest
+    needs: AsteriskNightly
+    steps:
+      - name: Check test matrix status
+        env:
+          RESULT: ${{needs.AsteriskNightly.result}}
+        run: |
+          case $RESULT in
+            success)
+              echo "::notice::All Testsuite tests passed"
+              exit 0
+              ;;
+            skipped)
+              echo "::error::Testsuite tests were skipped because of an earlier failure"
+              exit 1
+              ;;
+              *)
+              echo "::error::One or more Testsuite tests failed"
+              exit 1
+          esac

.github/workflows/PRMerged.yml

@@ -0,0 +1,32 @@
+name: PRMerged
+run-name: "PR ${{github.event.number || inputs.pr_number}} ${{github.event.action || 'MANUAL POST MERGE'}} by ${{ github.actor }}"
+on:
+  pull_request_target:
+    types: [closed]
+  workflow_dispatch:
+    inputs:
+      pr_number:
+        description: 'PR number'
+        required: true
+        type: number
+
+concurrency:
+  group: ${{github.workflow}}-${{github.event.number || inputs.pr_number}}
+  cancel-in-progress: true
+
+env:
+  REPO:              ${{github.repository}}
+  PR_NUMBER:         ${{github.event.number || inputs.pr_number}}
+  GITHUB_TOKEN:      ${{secrets.GITHUB_TOKEN}}
+
+jobs:
+  CloseIssues:
+    if: github.event.pull_request.merged == true
+    runs-on: ubuntu-latest
+    steps:
+      - uses: wow-actions/auto-close-fixed-issues@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+

.github/workflows/PROpenedOrUpdated.yml

@@ -0,0 +1,199 @@
+name: PROpenedOrUpdated
+run-name: "PR ${{github.event.number}} ${{github.event.action}} by ${{ github.actor }}"
+on:
+#  workflow_dispatch:
+  pull_request_target:
+#    types: [opened, reopened, synchronize]
+    types: [labeled]
+
+env:
+  ASTERISK_REPO:     ${{github.repository}}
+  PR_NUMBER:         ${{github.event.number}}
+  PR_COMMIT:         ${{github.event.pull_request.head.sha}}
+  BRANCH:            ${{github.event.pull_request.base.ref}}
+  GITHUB_TOKEN:      ${{secrets.GITHUB_TOKEN}}
+  MODULES_BLACKLIST: ${{vars.GATETEST_MODULES_BLACKLIST}} ${{vars.UNITTEST_MODULES_BLACKLIST}}
+
+jobs:
+
+  PRTestSetup:
+    if: ${{ github.event.label.name == vars.PR_ACCEPTANCE_TEST_LABEL }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Job Start Delay
+        env:
+          JOB_START_DELAY_SEC:       ${{vars.PR_JOB_START_DELAY_SEC}}
+        run: |
+          # Give the user a chance to add their "cherry-pick-to" comments
+          sleep ${JOB_START_DELAY_SEC:-60}
+
+      - name: Get Token needed to add reviewers
+        if: github.event.action == 'opened'
+        id: get_workflow_token
+        uses: peter-murray/workflow-application-token-action@v2
+        with:
+          application_id: ${{secrets.ASTERISK_ORG_ACCESS_APP_ID}}
+          application_private_key: ${{secrets.ASTERISK_ORG_ACCESS_APP_PRIV_KEY}}
+          organization: asterisk
+
+      - name: Get cherry-pick branches
+        uses: asterisk/asterisk-ci-actions/GetCherryPickBranchesFromPR@main
+        id: getbranches
+        with:
+          repo:                    ${{github.repository}}
+          pr_number:               ${{env.PR_NUMBER}}
+          cherry_pick_regex:       ${{vars.CHERRY_PICK_REGEX}}
+          github_token:            ${{secrets.GITHUB_TOKEN}}
+
+      - name: Add cherry-pick reminder
+        env:
+          GITHUB_TOKEN: ${{steps.get_workflow_token.outputs.token}}
+          GH_TOKEN: ${{steps.get_workflow_token.outputs.token}}
+          CHERRY_PICK_REMINDER: ${{vars.CHERRY_PICK_REMINDER}}
+          BRANCHES_OUTPUT: ${{toJSON(steps.getbranches.outputs)}}
+          BRANCH_COUNT: ${{steps.getbranches.outputs.branch_count}}
+          FORCED_NONE:  ${{steps.getbranches.outputs.forced_none}}
+        run: |
+          # If the user already added "cherry-pick-to" comments
+          # we don't need to remind them.
+          ( $FORCED_NONE || [ $BRANCH_COUNT -gt 0 ] ) && { echo "No reminder needed." ; exit 0 ; }
+          IFS=$'; \n'
+          # If there's already a reminder comment, don't add another one.
+          ADD_COMMENT=true
+          # This query will FAIL if it finds the comment.
+          gh pr view --repo ${{github.repository}} --json comments \
+            --jq '.comments[].body | select(. | startswith("<!--CPR-->")) | halt_error(1)' \
+            ${{env.PR_NUMBER}} >/dev/null 2>&1 || ADD_COMMENT=false
+          if $ADD_COMMENT ; then
+            echo "Adding CPR comment"
+            gh pr comment --repo ${{github.repository}} \
+              -b "${CHERRY_PICK_REMINDER}" ${{env.PR_NUMBER}}
+          else
+            echo "CPR comment already present"
+          fi
+
+      - name: Add reviewers
+        if: github.event.action == 'opened'
+        env:
+          GH_TOKEN: ${{steps.get_workflow_token.outputs.token}}
+          REVIEWERS: ${{vars.PR_REVIEWERS}}
+        run: |
+          IFS=$'; \n'
+          for r in $REVIEWERS ; do
+            echo "Adding reviewer $r"
+            gh pr edit --repo ${{github.repository}} ${PR_NUMBER} --add-reviewer $r || :
+          done
+
+      - name: Set Labels
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          gh pr edit --repo ${{github.repository}} \
+            --remove-label ${{vars.TEST_CHECKS_PASSED_LABEL}} \
+            --remove-label ${{vars.TEST_CHECKS_FAILED_LABEL}} \
+            --remove-label ${{vars.TEST_GATES_PASSED_LABEL}} \
+            --remove-label ${{vars.TEST_GATES_FAILED_LABEL}} \
+            --remove-label ${{vars.CHERRY_PICK_CHECKS_PASSED_LABEL}} \
+            --remove-label ${{vars.CHERRY_PICK_CHECKS_FAILED_LABEL}} \
+            --remove-label ${{vars.CHERRY_PICK_GATES_PASSED_LABEL}} \
+            --remove-label ${{vars.CHERRY_PICK_GATES_FAILED_LABEL}} \
+            --remove-label ${{vars.PR_ACCEPTANCE_TEST_LABEL}} \
+            --add-label ${{vars.TESTING_IN_PROGRESS}} \
+            ${{env.PR_NUMBER}} || :
+
+  PRUnitTest:
+    needs: PRTestSetup
+    runs-on: ubuntu-latest
+    steps:
+      - name: Run Unit Tests
+        id: run_unit_tests
+        uses: asterisk/asterisk-ci-actions/AsteriskUnitComposite@main
+        with:
+          asterisk_repo:     ${{env.ASTERISK_REPO}}
+          pr_number:         ${{env.PR_NUMBER}}
+          base_branch:       ${{env.BRANCH}}
+          modules_blacklist: ${{env.MODULES_BLACKLIST}}
+          github_token:      ${{secrets.GITHUB_TOKEN}}
+          unittest_command:  ${{vars.UNITTEST_COMMAND}}
+        continue-on-error: true
+
+      - name: Post Unit Test
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          CONCLUSION: ${{ steps.run_unit_tests.conclusion }}
+          OUTCOME:    ${{ steps.run_unit_tests.outcome }}
+        run: |
+          if [ "$OUTCOME" == "success" ] ; then
+            gh pr edit --repo ${{github.repository}} \
+              --add-label ${{vars.TEST_CHECKS_PASSED_LABEL}} \
+              ${{env.PR_NUMBER}} || :
+            exit 0
+          fi
+          gh pr edit --repo ${{github.repository}} \
+            --remove-label ${{vars.TESTING_IN_PROGRESS}} \
+            --add-label ${{vars.TEST_CHECKS_FAILED_LABEL}} \
+            ${{env.PR_NUMBER}} || :
+          exit 1
+
+  PRGateTestMatrix:
+    needs: PRUnitTest
+    continue-on-error: false
+    strategy:
+      fail-fast: false
+      matrix:
+        group: ${{ fromJSON(vars.GATETEST_LIST) }}
+    runs-on: ubuntu-latest
+    steps:
+      - id: runtest
+        name: Run Gate Tests for ${{ matrix.group }}
+        uses: asterisk/asterisk-ci-actions/AsteriskGateComposite@main
+        with:
+          test_type:         Gate
+          asterisk_repo:     ${{env.ASTERISK_REPO}}
+          pr_number:         ${{env.PR_NUMBER}}
+          base_branch:       ${{env.BRANCH}}
+          modules_blacklist: ${{env.MODULES_BLACKLIST}}
+          github_token:      ${{secrets.GITHUB_TOKEN}}
+          testsuite_repo:    ${{vars.TESTSUITE_REPO}}
+          gatetest_group:    ${{matrix.group}}
+          gatetest_commands: ${{vars.GATETEST_COMMANDS}}
+
+  PRPRGateTests:
+    if: ${{ always() && github.event.label.name == vars.PR_ACCEPTANCE_TEST_LABEL }}
+    runs-on: ubuntu-latest
+    needs: PRGateTestMatrix
+    steps:
+      - name: Check gate test matrix status
+        env:
+          RESULT: ${{ needs.PRGateTestMatrix.result }}
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          echo "all results: ${{ toJSON(needs.*.result) }}"
+          echo "composite result: $RESULT"
+
+          gh pr edit --repo ${{github.repository}} \
+            --remove-label ${{vars.TESTING_IN_PROGRESS}} \
+            ${{env.PR_NUMBER}} || :
+
+          case $RESULT in
+            success)
+              gh pr edit --repo ${{github.repository}} \
+                --add-label ${{vars.TEST_GATES_PASSED_LABEL}} \
+                ${{env.PR_NUMBER}} || :
+              echo "::notice::All Testsuite tests passed"
+              exit 0
+              ;;
+            skipped)
+              gh pr edit --repo ${{github.repository}} \
+                --add-label ${{vars.TEST_CHECKS_FAILED_LABEL}} \
+                ${{env.PR_NUMBER}} || :
+              echo "::error::Testsuite tests were skipped because of an earlier failure"
+              exit 1
+              ;;
+            *)
+              gh pr edit --repo ${{github.repository}} \
+                --add-label ${{vars.TEST_GATES_FAILED_LABEL}} \
+                ${{env.PR_NUMBER}} || :
+              echo "::error::One or more Testsuite tests failed ($RESULT)"
+              exit 1
+          esac

.github/workflows/Releaser.yml

@@ -0,0 +1,101 @@
+# yaml-language-server: $schema=https://json.schemastore.org/github-workflow.json
+name: Releaser
+run-name: ${{ github.actor }} is creating ${{vars.PRODUCT_NAME}} release ${{inputs.new_version}}
+on:
+  workflow_dispatch:
+    inputs:
+      new_version:
+        description: |
+          New Version:
+          Examples:
+            20.4.0-rc1, 20.4.0-rc2, 20.4.0, 20.4.1
+            certified-20.4-cert1-rc1, certified-20.4-cert1
+        required: true
+        type: string
+#      start_version:
+#        description: |
+#          Last Version:
+#          Only use when you KNOW that the automated
+#          process won't get it right.
+#        required: false
+#        type: string
+      is_security:
+        description: |
+          Security?
+          (No prev RCs)
+        required: true
+        type: boolean
+        default: false
+      advisories:
+        description: |
+          Comma separated list of advisories.
+          NO SPACES
+          Example: GHSA-4xjp-22g4-9fxm,GHSA-4xjp-22g4-zzzz
+        required: false
+        type: string
+      is_hotfix:
+        description: |
+          Hotfix?
+          (A patch release but not security.  No prev RCs)
+        required: true
+        type: boolean
+        default: false
+      push_release_branches:
+        description: |
+          Push release branches live?
+        required: true
+        type: boolean
+        default: false
+      create_github_release:
+        description: |
+          Create the GitHub release?
+        required: true
+        type: boolean
+        default: false
+      push_tarballs:
+        description: |
+          Push tarballs to downloads server?
+        required: true
+        type: boolean
+        default: false
+      send_email:
+        description: |
+          Send announcement emails?
+        required: true
+        type: boolean
+        default: false
+
+jobs:
+  ReleaseAsterisk:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Run Releaser
+        uses: asterisk/asterisk-ci-actions/ReleaserComposite@main
+        with:
+          product: ${{vars.PRODUCT_NAME}}
+          is_security: ${{inputs.is_security}}
+          advisories: ${{inputs.advisories}}
+          is_hotfix: ${{inputs.is_hotfix}}
+          new_version: ${{inputs.new_version}}
+#          start_version: ${{inputs.start_version}}
+          push_release_branches: ${{inputs.push_release_branches}}
+          create_github_release: ${{inputs.create_github_release}}
+          push_tarballs: ${{inputs.push_tarballs}}
+          send_email: ${{inputs.send_email}}
+          repo: ${{github.repository}}
+          mail_list_ga: ${{vars.MAIL_LIST_GA}}
+          mail_list_rc: ${{vars.MAIL_LIST_RC}}
+          mail_list_cert_ga: ${{vars.MAIL_LIST_CERT_GA}}
+          mail_list_cert_rc: ${{vars.MAIL_LIST_CERT_RC}}
+          mail_list_sec: ${{vars.MAIL_LIST_SEC_ADV}}
+          sec_adv_url_base: ${{vars.SEC_ADV_URL_BASE}}
+          gpg_private_key: ${{secrets.ASTDEV_GPG_PRIV_KEY}}
+          github_token: ${{secrets.GITHUB_TOKEN}}
+          application_id: ${{secrets.ASTERISK_ORG_ACCESS_APP_ID}}
+          application_private_key: ${{secrets.ASTERISK_ORG_ACCESS_APP_PRIV_KEY}}
+          asteriskteamsa_username: ${{secrets.ASTERISKTEAMSA_GMAIL_ACCT}}
+          asteriskteamsa_token: ${{secrets.ASTERISKTEAMSA_GMAIL_TOKEN}}
+          deploy_ssh_priv_key: ${{secrets.DOWNLOADS_DEPLOY_SSH_PRIV_KEY}}
+          deploy_ssh_username: ${{secrets.DOWNLOADS_DEPLOY_SSH_USERNAME}}
+          deploy_host: ${{vars.DEPLOY_HOST}}
+          deploy_dir: ${{vars.DEPLOY_DIR}}

.lastclean

@@ -1 +0,0 @@
-40

.version

@@ -1 +0,0 @@
-19.8.1

CHANGES.md

@@ -1 +0,0 @@
-ChangeLogs/ChangeLog-19.8.1.md

ChangeLogs/ChangeLog-19.8.1.md

@@ -1,99 +0,0 @@
-
-Change Log for Release 19.8.1
-========================================
-
-Links:
-----------------------------------------
-
- - [Full ChangeLog](https://downloads.asterisk.org/pub/telephony/asterisk/releases/ChangeLog-19.8.1.md)  
- - [GitHub Diff](https://github.com/asterisk/asterisk/compare/19.8.0...19.8.1)  
- - [Tarball](https://downloads.asterisk.org/pub/telephony/asterisk/asterisk-19.8.1.tar.gz)  
- - [Downloads](https://downloads.asterisk.org/pub/telephony/asterisk)  
-
-Summary:
-----------------------------------------
-
-- apply_patches: Use globbing instead of file/sort.
-- bundled_pjproject: Backport 2 SSL patches from upstream
-- bundled_pjproject: Backport security fixes from pjproject 2.13.1
-- apply_patches: Sort patch list before applying
-
-User Notes:
-----------------------------------------
-
-
-Upgrade Notes:
-----------------------------------------
-
-
-Closed Issues:
-----------------------------------------
-
-  - #188: [improvement]:  pjsip: Upgrade bundled version to pjproject 2.13.1 #187 
-  - #193: [bug]: third-party/apply-patches doesn't sort the patch file list before applying
-  - #194: [bug]: Segfault/double-free in bundled pjproject using TLS transport
-
-Commits By Author:
-----------------------------------------
-
-- ### George Joseph (3):
-  - apply_patches: Sort patch list before applying
-  - bundled_pjproject: Backport security fixes from pjproject 2.13.1
-  - bundled_pjproject: Backport 2 SSL patches from upstream
-
-- ### Sean Bright (1):
-  - apply_patches: Use globbing instead of file/sort.
-
-
-Detail:
-----------------------------------------
-
-- ### apply_patches: Use globbing instead of file/sort.
-  Author: Sean Bright  
-  Date:   2023-07-06  
-
-  This accomplishes the same thing as a `find ... | sort` but with the
-  added benefit of clarity and avoiding a call to a subshell.
-
-  Additionally drop the -s option from call to patch as it is not POSIX.
-
-- ### bundled_pjproject: Backport 2 SSL patches from upstream
-  Author: George Joseph  
-  Date:   2023-07-06  
-
-  * Fix double free of ossock->ossl_ctx in case of errors
-  https://github.com/pjsip/pjproject/commit/863629bc65d6
-
-  * free SSL context and reset context pointer when setting the cipher
-    list fails
-  https://github.com/pjsip/pjproject/commit/0fb32cd4c0b2
-
-  Resolves: #194
-
-- ### bundled_pjproject: Backport security fixes from pjproject 2.13.1
-  Author: George Joseph  
-  Date:   2023-07-05  
-
-  Merge-pull-request-from-GHSA-9pfh-r8x4-w26w.patch
-  Merge-pull-request-from-GHSA-cxwq-5g9x-x7fr.patch
-  Locking-fix-so-that-SSL_shutdown-and-SSL_write-are-n.patch
-  Don-t-call-SSL_shutdown-when-receiving-SSL_ERROR_SYS.patch
-
-  Resolves: #188
-
-- ### apply_patches: Sort patch list before applying
-  Author: George Joseph  
-  Date:   2023-07-06  
-
-  The apply_patches script wasn't sorting the list of patches in
-  the "patches" directory before applying them. This left the list
-  in an indeterminate order. In most cases, the list is actually
-  sorted but rarely, they can be out of order and cause dependent
-  patches to fail to apply.
-
-  We now sort the list but the "sort" program wasn't in the
-  configure scripts so we needed to add that and regenerate
-  the scripts as well.
-
-  Resolves: #193
-

Makefile

@@ -1119,7 +1119,8 @@ ifeq ($(PYTHON),:)
 else
 	@$(INSTALL) -d doc/rest-api
 	$(PYTHON) rest-api-templates/make_ari_stubs.py \
-		rest-api/resources.json .
+		--resources rest-api/resources.json --source-dir $(ASTTOPDIR) \
+		--dest-dir $(ASTTOPDIR)/doc/rest-api --docs-prefix ../
 endif
 
 check-alembic: makeopts

UPGRADE.txt

@@ -1,6 +1,3 @@
-===== WARNING, THIS FILE IS OBSOLETE AND WILL BE REMOVED IN A FUTURE VERSION =====
-See 'Upgrade Notes' in the CHANGES file
-
 ===========================================================
 ===
 === THIS FILE IS AUTOMATICALLY GENERATED DURING THE RELEASE

contrib/ast-db-manage/config/versions/539f68bede2c_add_peer_supported_to_100rel.py

@@ -33,9 +33,9 @@ def upgrade():
         enum = ENUM(*NEW_ENUM, name='pjsip_100rel_values_v2')
         enum.create(op.get_bind(), checkfirst=False)
 
-        op.execute('ALTER TABLE ps_endpoints ALTER COLUMN 100rel TYPE'
+        op.execute('ALTER TABLE ps_endpoints ALTER COLUMN "100rel" TYPE'
                    ' pjsip_100rel_values_v2 USING'
-                   ' 100rel::text::pjsip_100rel_values_v2')
+                   ' "100rel"::text::pjsip_100rel_values_v2')
 
         ENUM(name="pjsip_100rel_values").drop(op.get_bind(), checkfirst=False)
 
@@ -50,8 +50,8 @@ def downgrade():
         enum = ENUM(*OLD_ENUM, name='pjsip_100rel_values')
         enum.create(op.get_bind(), checkfirst=False)
 
-        op.execute('ALTER TABLE ps_endpoints ALTER COLUMN 100rel TYPE'
+        op.execute('ALTER TABLE ps_endpoints ALTER COLUMN "100rel" TYPE'
                    ' pjsip_100rel_values USING'
-                   ' 100rel::text::pjsip_100rel_values')
+                   ' "100rel"::text::pjsip_100rel_values')
 
         ENUM(name="pjsip_100rel_values_v2").drop(op.get_bind(), checkfirst=False)

contrib/realtime/mysql/mysql_cdr.sql

@@ -1,41 +0,0 @@
-CREATE TABLE alembic_version (
-    version_num VARCHAR(32) NOT NULL, 
-    CONSTRAINT alembic_version_pkc PRIMARY KEY (version_num)
-);
-
--- Running upgrade  -> 210693f3123d
-
-CREATE TABLE cdr (
-    accountcode VARCHAR(20), 
-    src VARCHAR(80), 
-    dst VARCHAR(80), 
-    dcontext VARCHAR(80), 
-    clid VARCHAR(80), 
-    channel VARCHAR(80), 
-    dstchannel VARCHAR(80), 
-    lastapp VARCHAR(80), 
-    lastdata VARCHAR(80), 
-    start DATETIME, 
-    answer DATETIME, 
-    end DATETIME, 
-    duration INTEGER, 
-    billsec INTEGER, 
-    disposition VARCHAR(45), 
-    amaflags VARCHAR(45), 
-    userfield VARCHAR(256), 
-    uniqueid VARCHAR(150), 
-    linkedid VARCHAR(150), 
-    peeraccount VARCHAR(20), 
-    sequence INTEGER
-);
-
-INSERT INTO alembic_version (version_num) VALUES ('210693f3123d');
-
--- Running upgrade 210693f3123d -> 54cde9847798
-
-ALTER TABLE cdr MODIFY accountcode VARCHAR(80) NULL;
-
-ALTER TABLE cdr MODIFY peeraccount VARCHAR(80) NULL;
-
-UPDATE alembic_version SET version_num='54cde9847798' WHERE alembic_version.version_num = '210693f3123d';
-

contrib/realtime/mysql/mysql_queue_log.sql

@@ -1,29 +0,0 @@
-BEGIN;
-
-CREATE TABLE alembic_version (
-    version_num VARCHAR(32) NOT NULL, 
-    CONSTRAINT alembic_version_pkc PRIMARY KEY (version_num)
-);
-
--- Running upgrade  -> 4105ee839f58
-
-CREATE TABLE queue_log (
-    id BIGSERIAL NOT NULL, 
-    time TIMESTAMP WITHOUT TIME ZONE, 
-    callid VARCHAR(80), 
-    queuename VARCHAR(256), 
-    agent VARCHAR(80), 
-    event VARCHAR(32), 
-    data1 VARCHAR(100), 
-    data2 VARCHAR(100), 
-    data3 VARCHAR(100), 
-    data4 VARCHAR(100), 
-    data5 VARCHAR(100), 
-    PRIMARY KEY (id), 
-    UNIQUE (id)
-);
-
-INSERT INTO alembic_version (version_num) VALUES ('4105ee839f58');
-
-COMMIT;
-

contrib/realtime/mysql/mysql_voicemail.sql

@@ -1,35 +0,0 @@
-CREATE TABLE alembic_version (
-    version_num VARCHAR(32) NOT NULL, 
-    CONSTRAINT alembic_version_pkc PRIMARY KEY (version_num)
-);
-
--- Running upgrade  -> a2e9769475e
-
-CREATE TABLE voicemail_messages (
-    dir VARCHAR(255) NOT NULL, 
-    msgnum INTEGER NOT NULL, 
-    context VARCHAR(80), 
-    macrocontext VARCHAR(80), 
-    callerid VARCHAR(80), 
-    origtime INTEGER, 
-    duration INTEGER, 
-    recording BLOB, 
-    flag VARCHAR(30), 
-    category VARCHAR(30), 
-    mailboxuser VARCHAR(30), 
-    mailboxcontext VARCHAR(30), 
-    msg_id VARCHAR(40)
-);
-
-ALTER TABLE voicemail_messages ADD CONSTRAINT voicemail_messages_dir_msgnum PRIMARY KEY (dir, msgnum);
-
-CREATE INDEX voicemail_messages_dir ON voicemail_messages (dir);
-
-INSERT INTO alembic_version (version_num) VALUES ('a2e9769475e');
-
--- Running upgrade a2e9769475e -> 39428242f7f5
-
-ALTER TABLE voicemail_messages MODIFY recording BLOB(4294967295) NULL;
-
-UPDATE alembic_version SET version_num='39428242f7f5' WHERE alembic_version.version_num = 'a2e9769475e';
-

contrib/realtime/postgresql/postgresql_cdr.sql

@@ -1,45 +0,0 @@
-BEGIN;
-
-CREATE TABLE alembic_version (
-    version_num VARCHAR(32) NOT NULL, 
-    CONSTRAINT alembic_version_pkc PRIMARY KEY (version_num)
-);
-
--- Running upgrade  -> 210693f3123d
-
-CREATE TABLE cdr (
-    accountcode VARCHAR(20), 
-    src VARCHAR(80), 
-    dst VARCHAR(80), 
-    dcontext VARCHAR(80), 
-    clid VARCHAR(80), 
-    channel VARCHAR(80), 
-    dstchannel VARCHAR(80), 
-    lastapp VARCHAR(80), 
-    lastdata VARCHAR(80), 
-    start TIMESTAMP WITHOUT TIME ZONE, 
-    answer TIMESTAMP WITHOUT TIME ZONE, 
-    "end" TIMESTAMP WITHOUT TIME ZONE, 
-    duration INTEGER, 
-    billsec INTEGER, 
-    disposition VARCHAR(45), 
-    amaflags VARCHAR(45), 
-    userfield VARCHAR(256), 
-    uniqueid VARCHAR(150), 
-    linkedid VARCHAR(150), 
-    peeraccount VARCHAR(20), 
-    sequence INTEGER
-);
-
-INSERT INTO alembic_version (version_num) VALUES ('210693f3123d');
-
--- Running upgrade 210693f3123d -> 54cde9847798
-
-ALTER TABLE cdr ALTER COLUMN accountcode TYPE VARCHAR(80);
-
-ALTER TABLE cdr ALTER COLUMN peeraccount TYPE VARCHAR(80);
-
-UPDATE alembic_version SET version_num='54cde9847798' WHERE alembic_version.version_num = '210693f3123d';
-
-COMMIT;
-

contrib/realtime/postgresql/postgresql_queue_log.sql

@@ -1,29 +0,0 @@
-BEGIN;
-
-CREATE TABLE alembic_version (
-    version_num VARCHAR(32) NOT NULL, 
-    CONSTRAINT alembic_version_pkc PRIMARY KEY (version_num)
-);
-
--- Running upgrade  -> 4105ee839f58
-
-CREATE TABLE queue_log (
-    id BIGSERIAL NOT NULL, 
-    time TIMESTAMP WITHOUT TIME ZONE, 
-    callid VARCHAR(80), 
-    queuename VARCHAR(256), 
-    agent VARCHAR(80), 
-    event VARCHAR(32), 
-    data1 VARCHAR(100), 
-    data2 VARCHAR(100), 
-    data3 VARCHAR(100), 
-    data4 VARCHAR(100), 
-    data5 VARCHAR(100), 
-    PRIMARY KEY (id), 
-    UNIQUE (id)
-);
-
-INSERT INTO alembic_version (version_num) VALUES ('4105ee839f58');
-
-COMMIT;
-

contrib/realtime/postgresql/postgresql_voicemail.sql

@@ -1,39 +0,0 @@
-BEGIN;
-
-CREATE TABLE alembic_version (
-    version_num VARCHAR(32) NOT NULL, 
-    CONSTRAINT alembic_version_pkc PRIMARY KEY (version_num)
-);
-
--- Running upgrade  -> a2e9769475e
-
-CREATE TABLE voicemail_messages (
-    dir VARCHAR(255) NOT NULL, 
-    msgnum INTEGER NOT NULL, 
-    context VARCHAR(80), 
-    macrocontext VARCHAR(80), 
-    callerid VARCHAR(80), 
-    origtime INTEGER, 
-    duration INTEGER, 
-    recording BYTEA, 
-    flag VARCHAR(30), 
-    category VARCHAR(30), 
-    mailboxuser VARCHAR(30), 
-    mailboxcontext VARCHAR(30), 
-    msg_id VARCHAR(40)
-);
-
-ALTER TABLE voicemail_messages ADD CONSTRAINT voicemail_messages_dir_msgnum PRIMARY KEY (dir, msgnum);
-
-CREATE INDEX voicemail_messages_dir ON voicemail_messages (dir);
-
-INSERT INTO alembic_version (version_num) VALUES ('a2e9769475e');
-
--- Running upgrade a2e9769475e -> 39428242f7f5
-
-ALTER TABLE voicemail_messages ALTER COLUMN recording TYPE BYTEA;
-
-UPDATE alembic_version SET version_num='39428242f7f5' WHERE alembic_version.version_num = 'a2e9769475e';
-
-COMMIT;
-

rest-api-templates/api.wiki.mustache

@@ -1,73 +1,75 @@
 {{#api_declaration}}
-h1. {{name_title}}
-
-|| Method || Path<br>h5. Parameters are case-sensitive || Return Model || Summary ||
+# {{name_title}}
 
+| Method | Path (Parameters are case-sensitive) | Return Model | Summary |
+|:------ |:------------------------------------ |:------------ |:------- |
 {{#apis}}
 {{#operations}}
-| {{http_method}} | [{{wiki_path}}|#{{nickname}}] | {{#response_class}}{{#is_primitive}}{{name}}{{/is_primitive}}{{^is_primitive}}[{{wiki_name}}|{{wiki_prefix}} REST Data Models#{{singular_name}}]{{/is_primitive}}{{/response_class}} | {{{summary}}} |
+| {{http_method}} | [{{wiki_path}}](#{{nickname_lc}}) | {{#response_class}}{{#is_primitive}}{{name}}{{/is_primitive}}{{^is_primitive}}[{{wiki_name}}]({{wiki_prefix}}Asterisk_REST_Data_Models#{{lc_singular_name}}){{/is_primitive}}{{/response_class}} | {{{summary}}} |
 {{/operations}}
 {{/apis}}
 {{#apis}}
 {{#operations}}
 
-{anchor:{{nickname}}}
-h2. {{nickname}}: {{http_method}} {{wiki_path}}
-
+---
+[//]: # (anchor:{{nickname_lc}})
+## {{nickname}}
+### {{http_method}} {{wiki_path}}
 {{{wiki_summary}}}{{#wiki_notes}} {{{wiki_notes}}}{{/wiki_notes}}
 {{#has_path_parameters}}
 
-h3. Path parameters
+### Path parameters
 Parameters are case-sensitive.
 {{#path_parameters}}
 * {{name}}: _{{data_type}}_ - {{{wiki_description}}}
 {{#default_value}}
-** Default: {{default_value}}
+  * Default: {{default_value}}
 {{/default_value}}
 {{#wiki_allowable_values}}
-** {{wiki_allowable_values}}
+  * {{wiki_allowable_values}}
 {{/wiki_allowable_values}}
 {{/path_parameters}}
 {{/has_path_parameters}}
 {{#has_query_parameters}}
 
-h3. Query parameters
+### Query parameters
 {{#query_parameters}}
 * {{name}}: _{{data_type}}_ -{{#required}} *(required)*{{/required}} {{{wiki_description}}}
 {{#default_value}}
-** Default: {{default_value}}
+  * Default: {{default_value}}
 {{/default_value}}
 {{#wiki_allowable_values}}
-** {{wiki_allowable_values}}
+  * {{wiki_allowable_values}}
 {{/wiki_allowable_values}}
 {{#allow_multiple}}
-** Allows comma separated values.
+  * Allows comma separated values.
 {{/allow_multiple}}
 {{/query_parameters}}
 {{/has_query_parameters}}
 {{#has_body_parameter}}
 
-h3. Body parameter
+
+### Body parameter
 {{#body_parameter}}
 * {{name}}: {{data_type}}{{#default_value}} = {{default_value}}{{/default_value}} -{{#required}} *(required)*{{/required}} {{{wiki_description}}}
 {{#allow_multiple}}
-** Allows comma separated values.
+  * Allows comma separated values.
 {{/allow_multiple}}
 {{/body_parameter}}
 {{/has_body_parameter}}
 {{#has_header_parameters}}
 
-h3. Header parameters
+### Header parameters
 {{#header_parameters}}
 * {{name}}: {{data_type}}{{#default_value}} = {{default_value}}{{/default_value}} -{{#required}} *(required)*{{/required}} {{{wiki_description}}}
 {{#allow_multiple}}
-** Allows comma separated values.
+  * Allows comma separated values.
 {{/allow_multiple}}
 {{/header_parameters}}
 {{/has_header_parameters}}
 {{#has_error_responses}}
 
-h3. Error Responses
+### Error Responses
 {{#error_responses}}
 * {{code}} - {{{wiki_reason}}}
 {{/error_responses}}

rest-api-templates/make_ari_stubs.py

@@ -28,7 +28,7 @@ except ImportError:
 import os.path
 
 from asterisk_processor import AsteriskProcessor
-from optparse import OptionParser
+from argparse import ArgumentParser as ArgParser
 from swagger_model import ResourceListing
 from transform import Transform
 
@@ -42,55 +42,61 @@ def rel(file):
     """
     return os.path.join(TOPDIR, file)
 
-WIKI_PREFIX = 'Asterisk 19'
-
-API_TRANSFORMS = [
-    Transform(rel('api.wiki.mustache'),
-              'doc/rest-api/%s {{name_title}} REST API.wiki' % WIKI_PREFIX),
-    Transform(rel('res_ari_resource.c.mustache'),
-              'res/res_ari_{{c_name}}.c'),
-    Transform(rel('ari_resource.h.mustache'),
-              'res/ari/resource_{{c_name}}.h'),
-    Transform(rel('ari_resource.c.mustache'),
-              'res/ari/resource_{{c_name}}.c', overwrite=False),
-]
-
-RESOURCES_TRANSFORMS = [
-    Transform(rel('models.wiki.mustache'),
-              'doc/rest-api/%s REST Data Models.wiki' % WIKI_PREFIX),
-    Transform(rel('ari.make.mustache'), 'res/ari.make'),
-    Transform(rel('ari_model_validators.h.mustache'),
-              'res/ari/ari_model_validators.h'),
-    Transform(rel('ari_model_validators.c.mustache'),
-              'res/ari/ari_model_validators.c'),
-]
-
-
 def main(argv):
-    parser = OptionParser(usage="Usage %prog [resources.json] [destdir]")
+    description = (
+        'Command line utility to export ARI documentation to markdown'
+    )
 
-    (options, args) = parser.parse_args(argv)
+    parser = ArgParser(description=description)
+    parser.add_argument('--resources', type=str, default="rest-api/resources.json",
+                        help="resources.json file to process", required=False)
+    parser.add_argument('--source-dir', type=str, default=".",
+                        help="Asterisk source directory", required=False)
+    parser.add_argument('--dest-dir', type=str, default="doc/rest-api",
+                        help="Destination directory", required=False)
+    parser.add_argument('--docs-prefix', type=str, default="../",
+                        help="Prefix to apply to links", required=False)
 
-    if len(args) != 3:
-        parser.error("Wrong number of arguments")
+    args = parser.parse_args()
+    if not args:
+        return
 
-    source = args[1]
-    dest_dir = args[2]
     renderer = pystache.Renderer(search_dirs=[TOPDIR], missing_tags='strict')
-    processor = AsteriskProcessor(wiki_prefix=WIKI_PREFIX)
+    processor = AsteriskProcessor(wiki_prefix=args.docs_prefix)
+
+    API_TRANSFORMS = [
+        Transform(rel('api.wiki.mustache'),
+                  '%s/{{name_title}}_REST_API.md' % args.dest_dir),
+        Transform(rel('res_ari_resource.c.mustache'),
+                  'res/res_ari_{{c_name}}.c'),
+        Transform(rel('ari_resource.h.mustache'),
+                  'res/ari/resource_{{c_name}}.h'),
+        Transform(rel('ari_resource.c.mustache'),
+                  'res/ari/resource_{{c_name}}.c', overwrite=False),
+    ]
+
+    RESOURCES_TRANSFORMS = [
+        Transform(rel('models.wiki.mustache'),
+                  '%s/Asterisk_REST_Data_Models.md' % args.dest_dir),
+        Transform(rel('ari.make.mustache'), 'res/ari.make'),
+        Transform(rel('ari_model_validators.h.mustache'),
+                  'res/ari/ari_model_validators.h'),
+        Transform(rel('ari_model_validators.c.mustache'),
+                  'res/ari/ari_model_validators.c'),
+    ]
 
     # Build the models
-    base_dir = os.path.dirname(source)
-    resources = ResourceListing().load_file(source, processor)
+    base_dir = os.path.dirname(args.resources)
+    resources = ResourceListing().load_file(args.resources, processor)
     for api in resources.apis:
         api.load_api_declaration(base_dir, processor)
 
     # Render the templates
     for api in resources.apis:
         for transform in API_TRANSFORMS:
-            transform.render(renderer, api, dest_dir)
+            transform.render(renderer, api, args.source_dir)
     for transform in RESOURCES_TRANSFORMS:
-        transform.render(renderer, resources, dest_dir)
+        transform.render(renderer, resources, args.source_dir)
 
 if __name__ == "__main__":
     sys.exit(main(sys.argv) or 0)

rest-api-templates/models.wiki.mustache

@@ -1,18 +1,18 @@
-{toc}
-
+---
+title: Asterisk REST Data Models
+---
+# Asterisk REST Data Models
 {{#apis}}
 {{#api_declaration}}
 {{#models}}
-h1. {{id}}
-{{#extends}}Base type: [{{extends}}|#{{extends}}]{{/extends}}
-{{#has_subtypes}}Subtypes:{{#all_subtypes}} [{{id}}|#{{id}}]{{/all_subtypes}}{{/has_subtypes}}
-{{#wiki_description}}
-
-{{{wiki_description}}}
-{{/wiki_description}}
-{code:language=javascript|collapse=true}
+## {{id}}
+{{#extends}}Base type: [{{extends}}](#{{extends_lc}}){{/extends}}
+{{#has_subtypes}}Subtypes:{{#all_subtypes}} [{{id}}](#{{id_lc}}){{/all_subtypes}}{{/has_subtypes}}
+### Model
+``` javascript title="{{id}}" linenums="1"
 {{{model_json}}}
-{code}
+```
+### Properties
 {{#properties}}
 * {{name}}: {{#type}}{{#is_primitive}}{{wiki_name}}{{/is_primitive}}{{^is_primitive}}[{{wiki_name}}|#{{singular_name}}]{{/is_primitive}}{{/type}}{{^required}} _(optional)_{{/required}}{{#wiki_description}} - {{{wiki_description}}}{{/wiki_description}}
 {{/properties}}

rest-api-templates/swagger_model.py

@@ -332,6 +332,7 @@ class SwaggerType(Stringify):
         self.is_discriminator = None
         self.is_list = None
         self.singular_name = None
+        self.lc_singular_name = None
         self.is_primitive = None
         self.is_binary = None
 
@@ -345,8 +346,10 @@ class SwaggerType(Stringify):
         self.is_list = type_param is not None
         if self.is_list:
             self.singular_name = type_param
+            self.lc_singular_name = type_param.lower()
         else:
             self.singular_name = self.name
+            self.lc_singular_name = self.name.lower()
         self.is_primitive = self.singular_name in SWAGGER_PRIMITIVES
         self.is_binary = (self.singular_name == 'binary')
         processor.process_type(self, context)
@@ -364,6 +367,7 @@ class Operation(Stringify):
     def __init__(self):
         self.http_method = None
         self.nickname = None
+        self.nickname_lc = None
         self.response_class = None
         self.parameters = []
         self.summary = None
@@ -375,6 +379,7 @@ class Operation(Stringify):
         validate_required_fields(op_json, self.required_fields, context)
         self.http_method = op_json.get('httpMethod')
         self.nickname = op_json.get('nickname')
+        self.nickname_lc = self.nickname.lower() 
         response_class = op_json.get('responseClass')
         self.response_class = response_class and SwaggerType().load(
             response_class, processor, context)
@@ -498,6 +503,7 @@ class Model(Stringify):
 
     def __init__(self):
         self.id = None
+        self.id_lc = None
         self.subtypes = []
         self.__subtype_types = []
         self.notes = None
@@ -511,6 +517,7 @@ class Model(Stringify):
         validate_required_fields(model_json, self.required_fields, context)
         # The duplication of the model's id is required by the Swagger spec.
         self.id = model_json.get('id')
+        self.id_lc = self.id.lower() 
         if id != self.id:
             raise SwaggerError("Model id doesn't match name", context)
         self.subtypes = model_json.get('subTypes') or []
@@ -548,6 +555,9 @@ class Model(Stringify):
     def extends(self):
         return self.__extends_type and self.__extends_type.id
 
+    def extends_lc(self):
+        return self.__extends_type and self.__extends_type.id_lc
+
     def set_extends_type(self, extends_type):
         self.__extends_type = extends_type
 

tests/test_stasis_endpoints.c

@@ -212,7 +212,11 @@ AST_TEST_DEFINE(channel_messages)
 	struct stasis_message *msg;
 	struct stasis_message_type *type;
 	struct ast_endpoint_snapshot *actual_snapshot;
+	int expected_count;
 	int actual_count;
+	int i;
+	int channel_index = -1;
+	int endpoint_index = -1;
 
 	switch (cmd) {
 	case TEST_INIT:
@@ -255,19 +259,23 @@ AST_TEST_DEFINE(channel_messages)
 	ast_hangup(chan);
 	chan = NULL;
 
-	actual_count = stasis_message_sink_wait_for_count(sink, 3,
+	expected_count = 3;
+	actual_count = stasis_message_sink_wait_for_count(sink, expected_count,
 		STASIS_SINK_DEFAULT_WAIT);
-	ast_test_validate(test, 3 == actual_count);
+	ast_test_validate(test, expected_count == actual_count);
 
-	msg = sink->messages[1];
-	type = stasis_message_type(msg);
-	ast_test_validate(test, ast_channel_snapshot_type() == type);
-
-	msg = sink->messages[2];
-	type = stasis_message_type(msg);
-	ast_test_validate(test, ast_endpoint_snapshot_type() == type);
-
-	actual_snapshot = stasis_message_data(msg);
+	for (i = 0; i < expected_count; i++) {
+		msg = sink->messages[i];
+		type = stasis_message_type(msg);
+		if (type == ast_channel_snapshot_type()) {
+			channel_index = i;
+		}
+		if (type == ast_endpoint_snapshot_type()) {
+			endpoint_index = i;
+		}
+	}
+	ast_test_validate(test, channel_index >= 0 && endpoint_index >= 0);
+	actual_snapshot = stasis_message_data(sink->messages[endpoint_index]);
 	ast_test_validate(test, 0 == actual_snapshot->num_channels);
 
 	return AST_TEST_PASS;