scripts/bundle: use git instead of tar.gz

To better fit with our current CI processes, use git to clone the
suricata-update and libhtp dependencies.  The requirements.txt file has
been modified to take a repo URL and a `-b` command line option for tag
or branch.

For the master branch we will use the libhtp 0.5.x branch and the
suricata-update master branch.

Also allows for repo and branch names to be overrided with environment
variables:
- SU_REPO
- SU_BRANCH
- LIBHTP_REPO
- LIBHTP_BRANCH

diff --git a/requirements.txt b/requirements.txt
index 4a1d9355835196e6c4a15e728c5e5c86764b9338..6df1358f075fca14efdcc0e93970a46d800f1a46 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,7 @@
-libhtp https://github.com/OISF/libhtp/archive/0.5.x.tar.gz
-suricata-update https://github.com/OISF/suricata-update/archive/master.tar.gz
+# Specify libhtp and suricata-update requirements.
+#
+# Format:
+#
+#   name {repo} {branch|tag}
+libhtp https://github.com/OISF/libhtp 0.5.x
+suricata-update https://github.com/OISF/suricata-update master

diff --git a/scripts/bundle.sh b/scripts/bundle.sh
index f630403990a6f319786ca5ee9400b31e4755e008..44f634fbc684fe3e570abe7f73e5f5abd03c0115 100755 (executable)
--- a/scripts/bundle.sh
+++ b/scripts/bundle.sh
@@ -1,18 +1,45 @@
 #! /usr/bin/env bash
+#
+# This script will bundle libhtp and/or suricata-update for you.
+#
+# To use, run from the top Suricata source directory:
+#
+#    ./scripts/bundle.sh
+
+what="$1"
 
 while IFS= read -r requirement; do
     set -- $requirement
+
+    # If a requirement was specified on the command line, skip all other
+    # requirements.
+    if [ "${what}" != "" ]; then
+        if [ "${what}" != "$1" ]; then
+            continue
+        fi
+    fi
     case "$1" in
         suricata-update)
-            echo "===> Fetching $1"
-            (cd suricata-update &&
-                 curl -Ls "$2" | tar zxf - --strip-components=1)
+            repo=${SU_REPO:-$2}
+            branch=${SU_BRANCH:-$3}
+            echo "===> Bundling ${repo} -b ${branch}"
+            rm -rf suricata-update.tmp
+            git clone "${repo}" -b "${branch}" suricata-update.tmp
+            cp -a suricata-update.tmp/* suricata-update/
+            rm -rf suricata-update.tmp
             ;;
         libhtp)
-            echo "===> Fetching $1"
-            mkdir -p libhtp
-            (cd libhtp &&
-                 curl -Ls "$2" | tar zxf - --strip-components=1)
+            repo=${LIBHTP_REPO:-$2}
+            branch=${LIBHTP_BRANCH:-$3}
+            echo "===> Bundling ${repo} -b ${branch}"
+            rm -rf libhtp
+            git clone "${repo}" -b "${branch}" libhtp
+            ;;
+        \#)
+            # Ignore comment.
+            ;;
+        "")
+            # Ignore blank line.
             ;;
         *)
             echo "error: unknown requirement: $1"