Libhtp rs v12

.github/PULL_REQUEST_TEMPLATE.md

@@ -18,13 +18,11 @@ Describe changes:
 
 ### Provide values to any of the below to override the defaults.
 
-- To use an LibHTP, Suricata-Verify or Suricata-Update pull request,
+- To use a Suricata-Verify or Suricata-Update pull request,
   link to the pull request in the respective `_BRANCH` variable.
 - Leave unused overrides blank or remove.
 
 SV_REPO=
 SV_BRANCH=
 SU_REPO=
 SU_BRANCH=
-LIBHTP_REPO=
-LIBHTP_BRANCH=

.github/workflows/build-centos-7.yml

@@ -5,8 +5,6 @@ on:
   pull_request:
   workflow_dispatch:
     inputs:
-      LIBHTP_REPO:
-      LIBHTP_BRANCH:
       SU_REPO:
       SU_BRANCH:
       SV_REPO:
@@ -89,38 +87,27 @@ jobs:
               echo "Parsing branch and PR info from:"
               echo "${body}"
 
-              LIBHTP_REPO=$(echo "${body}" | awk -F = '/^LIBHTP_REPO=/ { print $2 }')
-              LIBHTP_BRANCH=$(echo "${body}" | awk -F = '/^LIBHTP_BRANCH=/ { print $2 }')
-
               SU_REPO=$(echo "${body}" | awk -F = '/^SU_REPO=/ { print $2 }')
               SU_BRANCH=$(echo "${body}" | awk -F = '/^SU_BRANCH=/ { print $2 }')
 
               SV_REPO=$(echo "${body}" | awk -F = '/^SV_REPO=/ { print $2 }')
               SV_BRANCH=$(echo "${body}" | awk -F = '/^SV_BRANCH=/ { print $2 }')
           else
               echo "No pull request body, will use inputs or defaults."
-              LIBHTP_REPO=${{ inputs.LIBHTP_REPO }}
-              LIBHTP_BRANCH=${{ inputs.LIBHTP_BRANCH }}
               SU_REPO=${{ inputs.SU_REPO }}
               SU_BRANCH=${{ inputs.SU_BRANCH }}
               SV_REPO=${{ inputs.SV_REPO }}
               SV_BRANCH=${{ inputs.SV_BRANCH }}
           fi
 
           # If the _REPO variables don't contain a full URL, add GitHub.
-          if [ "${LIBHTP_REPO}" ] && ! echo "${LIBHTP_REPO}" | grep -q '^https://'; then
-              LIBHTP_REPO="https://github.com/${LIBHTP_REPO}"
-          fi
           if [ "${SU_REPO}" ] && ! echo "${SU_REPO}" | grep -q '^https://'; then
               SU_REPO="https://github.com/${SU_REPO}"
           fi
           if [ "${SV_REPO}" ] && ! echo "${SV_REPO}" | grep -q '^https://'; then
               SV_REPO="https://github.com/${SV_REPO}"
           fi
 
-          echo LIBHTP_REPO=${LIBHTP_REPO} | tee -a ${GITHUB_ENV}
-          echo LIBHTP_BRANCH=${LIBHTP_BRANCH} | tee -a ${GITHUB_ENV}
-
           echo SU_REPO=${SU_REPO} | tee -a ${GITHUB_ENV}
           echo SU_BRANCH=${SU_BRANCH} | tee -a ${GITHUB_ENV}
 
@@ -129,8 +116,6 @@ jobs:
 
       - name: Annotate output
         run: |
-          echo "::notice:: LIBHTP_REPO=${LIBHTP_REPO}"
-          echo "::notice:: LIBHTP_BRANCH=${LIBHTP_BRANCH}"
           echo "::notice:: SU_REPO=${SU_REPO}"
           echo "::notice:: SU_BRANCH=${SU_BRANCH}"
           echo "::notice:: SV_REPO=${SV_REPO}"