From 2a61214e1969193ef4a32cd284eaa74884a0a50f Mon Sep 17 00:00:00 2001
From: Matteo Rossini <zerouno@slacky.it>
Date: Fri, 15 Jan 2016 16:08:40 +0100
Subject: [PATCH] Bugfix: greylist did not work properly

---
 src/greylist        | 2 +-
 src/slackpkgplus.sh | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/greylist b/src/greylist
index 01cd67e..4667a09 100644
--- a/src/greylist
+++ b/src/greylist
@@ -17,4 +17,4 @@
 #kdei
 #
 #do not upgrade packages installed with sbopkg; use it instead
-#_SBo
+#[0-9]+_SBo
diff --git a/src/slackpkgplus.sh b/src/slackpkgplus.sh
index 9bfc7f1..0d81470 100755
--- a/src/slackpkgplus.sh
+++ b/src/slackpkgplus.sh
@@ -1032,7 +1032,6 @@ if [ "$SLACKPKGPLUS" = "on" ];then
       if [ "$GREYLIST" == "off" ];then
         >$TMPDIR/greylist
       fi
-      grep -Ew -f $TMPDIR/greylist $TMPDIR/pkglist|awk '{print $2}' >$TMPDIR/unchecklist
       rm -f $TMPDIR/dialog.tmp
       
       if [ "$2" = "upgrade" ]; then
@@ -1046,7 +1045,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then
           PKGVER=$(echo $i|rev|cut -f3 -d-|rev)
           ALLFOUND=$(echo $(grep " ${BASENAME} " $TMPDIR/pkglist|sed -r -e 's/SLACKPKGPLUS_//' -e 's/^([^ ]*) [^ ]* ([^ ]*) [^ ]* ([^ ]*) .*/\2-\3(\1) ,/')|sed 's/,$//')
 
-          grep -q "^$(echo $i|rev|cut -f4- -d-|rev)$" $TMPDIR/unchecklist && TMPONOFF="off"
+          grep -m1 " ${BASENAME} " $TMPDIR/pkglist|grep -q -Ew -f $TMPDIR/greylist && TMPONOFF="off"
           echo "$REPOPOSFULL $i \"$REPOPOS\" $TMPONOFF \"installed: $PKGFOUND  -->  available: $ALLFOUND\"" >>$TMPDIR/dialog.tmp.1
         done
 
@@ -1068,7 +1067,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then
         for i in $1; do
           TMPONOFF=$ONOFF
           REPOPOS=$(grep -m1 " $(echo $i|sed 's/\.t.z//') "  $TMPDIR/pkglist|awk '{print $1}'|sed 's/SLACKPKGPLUS_//')
-          grep -q "^$(echo $i|rev|cut -f4- -d-|rev)$" $TMPDIR/unchecklist && TMPONOFF="off"
+          grep -m1 " $(echo $i|sed 's/\.t.z//') "  $TMPDIR/pkglist| grep -q -Ew -f $TMPDIR/greylist && TMPONOFF="off"
           echo "$i \"$REPOPOS\" $TMPONOFF" >>$TMPDIR/dialog.tmp
         done
         HINT=""