Slackpkg+ 0.9.3 Released

Version 0.9.3 - 25/Aug/2013
  - fixed md5 check (thanks to AlienBob)

ChangeLog.txt

@@ -1,3 +1,6 @@
+Version 0.9.3 - 25/Aug/2013
+  - fixed md5 check (thanks to AlienBob)
+  
 Version 0.9.2 - 01/Aug/2013
   - allow to search the non $ARCH packages
   - speed up the update process

src/ChangeLog.txt

@@ -1,3 +1,6 @@
+Version 0.9.3 - 25/Aug/2013
+  - fixed md5 check (thanks to AlienBob)
+  
 Version 0.9.2 - 01/Aug/2013
   - allow to search the non $ARCH packages
   - speed up the update process

src/repositories.txt

@@ -3,8 +3,8 @@ Supported Repositories:
 Supports GPG
 slackpkgplus: http://slakfinder.org/slackpkg+/
 multilib:   http://taper.alienbase.nl/mirrors/people/alien/multilib/{13.37,14.0,current}/
-alienbob:   http://taper.alienbase.nl/mirrors/people/alien/sbrepos/{13.37,14.0}/{x86,x86_64}/
+alienbob:   http://taper.alienbase.nl/mirrors/people/alien/sbrepos/{13.37,14.0,current}/{x86,x86_64}/
-restricted: http://taper.alienbase.nl/mirrors/people/alien/restricted_sbrepos/{13.37,14.0}/{x86,x86_64}/
+restricted: http://taper.alienbase.nl/mirrors/people/alien/restricted_sbrepos/{13.37,14.0,current}/{x86,x86_64}/
 slacky:     http://repository.slacky.eu/slackware{,64}-{13.37,14.0}/
 zerouno:    http://www.z01.eu/repo-slack/slackware64-current/
 mled:       http://www.microlinux.fr/slackware/MLED-14.0-{32,64}bit/
@@ -34,10 +34,14 @@ alienbob     |  X   |      |         |   X  |        |  X  | http://taper.alienb
 alienbob     |  X   |      |         |      |    X   |  X  | http://taper.alienbase.nl/mirrors/people/alien/sbrepos/13.37/x86_64/
 alienbob     |      |  X   |         |   X  |        |  X  | http://taper.alienbase.nl/mirrors/people/alien/sbrepos/14.0/x86
 alienbob     |      |  X   |         |      |    X   |  X  | http://taper.alienbase.nl/mirrors/people/alien/sbrepos/14.0/x86_64/
+alienbob     |      |      |    X    |   X  |        |  X  | http://taper.alienbase.nl/mirrors/people/alien/sbrepos/current/x86
+alienbob     |      |      |    X    |      |    X   |  X  | http://taper.alienbase.nl/mirrors/people/alien/sbrepos/current/x86_64/
 restricted   |  X   |      |         |  X   |        |  X  | http://taper.alienbase.nl/mirrors/people/alien/restricted_sbrepos/13.37/x86/
 restricted   |  X   |      |         |      |    X   |  X  | http://taper.alienbase.nl/mirrors/people/alien/restricted_sbrepos/13.37/x86_64/
 restricted   |      |  X   |         |  X   |        |  X  | http://taper.alienbase.nl/mirrors/people/alien/restricted_sbrepos/14.0/x86/
 restricted   |      |  X   |         |      |    X   |  X  | http://taper.alienbase.nl/mirrors/people/alien/restricted_sbrepos/14.0/x86_64/
+restricted   |      |      |    X    |  X   |        |  X  | http://taper.alienbase.nl/mirrors/people/alien/restricted_sbrepos/current/x86/
+restricted   |      |      |    X    |      |    X   |  X  | http://taper.alienbase.nl/mirrors/people/alien/restricted_sbrepos/current/x86_64/
 slacky       |  X   |      |         |  X   |        |  X  | http://repository.slacky.eu/slackware-13.37/
 slacky       |  X   |      |         |      |    X   |  X  | http://repository.slacky.eu/slackware64-13.37/
 slacky       |      |  X   |         |  X   |        |  X  | http://repository.slacky.eu/slackware-14.0/

src/slackpkg+.SlackBuild

@@ -2,7 +2,7 @@
 
 set -e 
 
-VERSION=0.9.2
+VERSION=0.9.3
 BUILD=1mt
 
 CWD=`pwd`

src/slackpkgplus.sh

@@ -64,8 +64,8 @@ if [ "$SLACKPKGPLUS" = "on" ];then
 	  else
 	    echo
 	    echo "                   !!! W A R N I N G !!!"
-	    echo "    Repository '$PREPO' does NOT supports signature checking"
+	    echo "    Repository '$PREPO' does NOT support signature checking"
-	    echo "    You SHOULD to disable GPG check by setting 'CHECKGPG=off'"
+	    echo "    You SHOULD disable GPG check by setting 'CHECKGPG=off'"
 	    echo "    in /etc/slackpkg/slackpkg.conf"
 	    echo
 	    sleep 5
@@ -102,8 +102,8 @@ if [ "$SLACKPKGPLUS" = "on" ];then
 	else
 	  echo 
 	  echo "                   !!! W A R N I N G !!!"
-	  echo "    Repository '$PREPO' does NOT contains the GPG-KEY"
+	  echo "    Repository '$PREPO' does NOT contain the GPG-KEY"
-	  echo "    You SHOULD to disable GPG check by setting 'CHECKGPG=off'"
+	  echo "    You SHOULD disable GPG check by setting 'CHECKGPG=off'"
 	  echo "    in /etc/slackpkg/slackpkg.conf"
 	  echo
 	  sleep 5
@@ -129,6 +129,26 @@ if [ "$SLACKPKGPLUS" = "on" ];then
     fi
   }
 
+# override slackpkg checkmd5()
+# Verify if the package was corrupted by checking md5sum
+function checkmd5() {
+  local MD5ORIGINAL
+  local MD5DOWNLOAD
+  local PREPO
+
+  PREPO=$(echo $1 | rev | cut -f3 -d/ | rev)
+
+  MD5ORIGINAL=$(  grep -v "/source/" ${CHECKSUMSFILE} |\
+    grep -w $PREPO |\
+    grep -m1 "/$(basename $1)$" | cut -f1 -d \ )
+  MD5DOWNLOAD=$(md5sum ${1} | cut -f1 -d \ )
+  if [ "$MD5ORIGINAL" = "$MD5DOWNLOAD" ]; then
+    echo 1
+  else
+    echo 0
+  fi
+}
+
   # Found packages in repository. 
   # This function selects the package from the higher priority
   # repository directories.