Changes in bldpkg:

* Added code to validate app, version, homepage, download and desc variables
* Updated TODO
* Readjusted location of code that outputs current package being built
Readjusted description length in several packages in base section

base/brotli/brotli.SMBuild

@@ -4,7 +4,7 @@ build=1sml
 homepage="https://github.com/google/brotli"
 download="https://github.com/google/brotli/archive/refs/tags/v1.0.7.tar.gz"
 requires="musl"
-desc="Generic-purpose lossless compression algorithm based on LZ77, Huffman coding and 2nd order context modeling"
+desc="Lossless compression algorithm based on LZ77, Huffman coding and 2nd order context modeling"
 
 build() {
   mkandenterbuilddir

base/fftw/fftw.SMBuild

@@ -3,7 +3,7 @@ version=3.3.8
 build=1sml
 homepage='http://www.fftw.org/'
 download='https://www.fftw.org/fftw-3.3.8.tar.gz'
-desc="Free collection of fast C routines for computing the Discrete Fourier Transform in one or more dimensions"
+desc="Collection of fast C routines for computing the Discrete Fourier Transform in multiple dimensions"
 requires="gcc-libs"
 
 build() {

base/lvm/lvm.SMBuild

@@ -3,7 +3,7 @@ version=2.2.02.168
 build=1sml
 homepage='http://www.sourceware.org/lvm2/'
 download='ftp://sources.redhat.com/pub/lvm2/releases/LVM2.2.02.168.tgz'
-desc="Adds an additional layer between physical peripherals and low-level I/O to get logical view of disks"
+desc="Collection of logical volume utilities"
 requires="eudev util-linux"
 
 build() {

base/nodejs/nodejs.SMBuild

@@ -2,7 +2,7 @@ app=nodejs
 version=16.4.2
 build=1sml
 homepage='https://nodejs.org/en/'
-desc="Asynchronous Chrome-based, event-driven Javascript engine designed to build scalable network applications"
+desc="Asynchronous event-driven Javascript engine designed to build scalable network applications"
 requires="openssl"
 
 build() {

base/npth/npth.SMBuild

@@ -3,7 +3,7 @@ version=1.6
 build=1sml
 homepage='https://gnupg.org/software/npth/index.html'
 download='https://gnupg.org/ftp/gcrypt/npth/npth-1.6.tar.bz2'
-desc="library that provides non-premptive priority-based scheduling for multiple threads in event-driven applications"
+desc="Provides non-premptive priority-based scheduling for multiple threads in event-driven programs"
 requires="musl"
 
 build() {

base/openssl/openssl.SMBuild

@@ -3,7 +3,7 @@ version=1.1.1k
 build=1sml
 homepage='https://www.openssl.org/'
 download='https://www.openssl.org/source/openssl-1.1.1k.tar.gz'
-desc="commercial-grade, robust, fully featured crypto library from OpenSSL Project that implements TLS and SSLv3"
+desc="Commercial-grade, full-featured crypto library from OpenSSL Project that implements TLS and SSLv3"
 requires="perl"
 
 build() {

bldpkg

@@ -21,9 +21,6 @@
 # -> Find a better way to communicate to the build monitor, by, for example, 
 # "catting" important build info into a unique build file and then 
 # the build monitor sources from that file
-# -> Sanitise build variables, add restrictions such as length of app name variable which should
-# only be in lower case and less than 50 characters, validate whether a string defined in homepage 
-# and download is indeed a valid url
 # -> Fix comments explaining how tmpfs is being validated
 # -> Add extra comments about how the build logic switches from tmpfs directory to non-tmpfs 
 # directory if tmpfs directory validation fails
@@ -31,6 +28,7 @@
 # in the test files and also add suitable bldpkg.conf switches for it
 # Add code to unset CFLAGS and CXXFLAGS when $arch is set to noarch
 # Remove redundant distcc and ccache checks when preparing summary 
+# Come up with a mechanism to notify which patch failed to apply for a given package
 
 # Begin subshell
 (
@@ -111,10 +109,38 @@ for buildvariables in app version build homepage desc requires ; do
     exit 1
   fi
 done
-   
+
-# Display the package and its version we are building
+# Validate $app
-echo "[INFO] Building package $app version $version ..."
+if ! echo $app | egrep -q '^[a-z0-9]+$' ; then
-sleep 0.5
+  echo "Only lower case and numeric characters allowed in the '"'app'"' variable in the build file. Aborting!" 
+  exit 1
+fi
+
+# Validate $version 
+if ! echo $version | egrep -q '^[a-z0-9.]+$' ; then
+  echo "Only lower case, numeric characters and a period allowed in the '"'version'"' variable in the build file. Aborting!"
+  exit 1
+fi
+
+# Validate $homepage
+if ! echo $homepage | egrep -q '^http://|^https://|^ftp://' ; then
+  echo "Invalid URL in the '"'homepage'"' variable in the build file. Aborting!"
+  exit 1
+fi
+
+# Validate $download
+if [ -n "$download" ]; then
+  if ! echo $download | egrep -q '^http://|^https://|^ftp://' ; then
+    echo "Invalid URL in the '"'download'"' variable in the build file. Aborting!"
+    exit 1
+  fi
+fi
+
+# Validate $desc
+if [ $(echo $desc | wc -c) -gt 100 ] ; then
+  echo "Package description exceeds 100 characters in the build file. Aborting!"
+  exit 1
+fi
 
 # Check if build() function exists in the build file
 if [[ ! "$(grep '^build()' "$srcdirpath".SMBuild)" ]] ; then
@@ -122,6 +148,10 @@ if [[ ! "$(grep '^build()' "$srcdirpath".SMBuild)" ]] ; then
   exit 1
 fi
 
+# Display the package and its version we are building
+echo "[INFO] Building package $app version $version ..."
+sleep 0.5
+
 # Only verify source checksums if skipchecksum is not set in the build file
 if [ -z "$skipchecksum" ] ; then
   if [ -z "$sha512sums" ] ; then