From d48b03f40f6acf0e8ccf0494b8331a5b23c77992 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 12 Apr 2021 17:15:14 -0400
Subject: [PATCH] Update CRUD to 3.2.0.  Allow overriding of VERSION for deb

---
 utils/packpack/startpackpack.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/utils/packpack/startpackpack.sh b/utils/packpack/startpackpack.sh
index 6a51e2995..fdbbf91c1 100755
--- a/utils/packpack/startpackpack.sh
+++ b/utils/packpack/startpackpack.sh
@@ -91,12 +91,12 @@ commonprep () {
 
     # The rpm specfile requires we download each submodule as a tarball then manually move it into place
     # Might as well do this for Debian as well, rather than git submodule init
-    CRUDVER="3.1.0-zm"
+    CRUDVER="3.2.0"
     if [ -e "build/crud-${CRUDVER}.tar.gz" ]; then
         echo "Found existing Crud ${CRUDVER} tarball..."
     else
         echo "Retrieving Crud ${CRUDVER} submodule..."
-        curl -L https://github.com/ZoneMinder/crud/archive/v${CRUDVER}.tar.gz > build/crud-${CRUDVER}.tar.gz
+        curl -L https://github.com/FriendsOfCake/crud/archive/v${CRUDVER}.tar.gz > build/crud-${CRUDVER}.tar.gz
         if [ $? -ne 0 ]; then
             echo "ERROR: Crud tarball retreival failed..."
             exit 1
@@ -197,7 +197,9 @@ setdebpkgname () {
 
     # Set VERSION to {zm version}~{today's date}.{number of commits} e.g. 1.31.0~20170605.82
     # Set RELEASE to the packpack DIST variable e.g. Trusty
-    export VERSION="${versionfile}~${thedate}.${numcommits}"
+    if [ "" == "$VERSION" ]; then
+      export VERSION="${versionfile}~${thedate}.${numcommits}"
+    fi
     export RELEASE="${DIST}"
 
     checkvars