Sun Oct 2 13:55:26 CEST 2016

pkg/slackpkg+-1.7.0d1-noarch-1mt.txz
  - Added SBo support. This does not replace sbopkg. It just search in
    SlackBuilds.org and report the url to download to build and install
    packages yourself.
+-------------------------+

ChangeLog.txt

@@ -1,3 +1,10 @@
+Sun Oct  2 13:55:26 CEST 2016
+pkg/slackpkg+-1.7.0d1-noarch-1mt.txz
+  - Added SBo support. This does not replace sbopkg. It just search in
+    SlackBuilds.org and report the url to download to build and install
+    packages yourself.
++-------------------------+
+
 Fri Jul  8 19:18:29 CEST 2016
 pkg/slackpkg+-1.7.0d0-noarch-4mt.txz
   - Slackware 14.2 was finally released. Updated repository list.

src/CHANGES

@@ -2,7 +2,37 @@
 
 == From 1.7 to mainline ==
 
-- Nothing (just setting up branch)
+*Configuration file:
+
+- USEBL now accepts 'on'/'off' values instead '0'/'1'
+
+- Changed some default settings in sample configuration file
+
+
+*New features:
+
+- Added manpages (italian and english) for slackpkgplus.conf
+
+
+*Improvements
+
+- Improved checkrepos.sh
+
+
+*BugFixes
+
+- 'slackpkg search' did not honor the '+' symbol
+
+- Issues when an invalid repository is configured
+
+
+*Various
+
+- Suppress wget output in ChangeLog downloading
+
+- Bash completation enabled by default (if you have bash_completation package
+    installed) 
+
 
 == From 1.6 and 1.7 ==
 

src/ChangeLog.txt

@@ -1,3 +1,10 @@
+Sun Oct  2 13:55:26 CEST 2016
+pkg/slackpkg+-1.7.0d1-noarch-1mt.txz
+  - Added SBo support. This does not replace sbopkg. It just search in
+    SlackBuilds.org and report the url to download to build and install
+    packages yourself.
++-------------------------+
+
 Fri Jul  8 19:18:29 CEST 2016
 pkg/slackpkg+-1.7.0d0-noarch-4mt.txz
   - Slackware 14.2 was finally released. Updated repository list.

src/repositories.txt

@@ -9,12 +9,12 @@ Supported Repositories:
 > mleddesktop:   http://www.microlinux.fr/microlinux/desktop-{14.1,14.2}-{32,64}bit/
 > mledextras:    http://www.microlinux.fr/microlinux/extras-{14.1,14.2}-{32,64}bit/
 > mles:          http://www.microlinux.fr/microlinux/server-{14.0,14.1,14.2}-{32,64}bit/
-> msb:           http://slackware.uk/msb/{14.0,14.1,14.2,current}/{1.6,1.8,1.10,1.12,1.14,1.15,1.15-gtk3,latest}/{x86,x86_64}/
+> msb:           http://slackware.uk/msb/{14.0,14.1,14.2,current}/{1.6,1.8,1.10,1.12,1.14,1.16,latest}/{x86,x86_64}/
 > csb:           http://slackware.uk/csb/{14.1,14.2}/{x86,x86_64}/
 > slackers:      http://slack.conraid.net/repository/slackware64-current/
 > slacke18:      http://ngc891.blogdns.net/pub/slacke18/slackware{,64}-{14.1,14.2}/
 > studioware:    http://studioware.org/files/packages/slackware{,64}-{14.0,14.1,14.2}/
-> slackonly:     http://panos.slackonly.com/pub/packages/{14.1,14.2,current}-{x86,x86_64}/
+> slackonly:     http://packages.slackonly.com/pub/packages/{14.1,14.2,current}-{x86,x86_64}/
 > rlworkman:     http://rlworkman.net/pkgs/{14.0,14.1,14.2,current}/
 > slackel:       http://www.slackel.gr/repo/{i486,x86_64}/current/
 > connochaetos:  http://connochaetos.org/slack-n-free/slack-n-free{,64}-{14.1,14.2}/

src/slackpkgplus.sh

@@ -393,18 +393,17 @@ if [ "$SLACKPKGPLUS" = "on" ];then
       ChangeLog.txt) TOCACHE=1 ; CURREPO=$(basename $1|sed -e "s/ChangeLog-//" -e "s/^-//" -e "s/\.txt//") ;;
       GPG-KEY) TOCACHE=0 ; CURREPO=${1/*gpgkey-tmp-/};;
       FILELIST.TXT) TOCACHE=1 ;;
+      SLACKBUILDS.TXT.gz) TOCACHE=1 ; CURREPO=SBo ;;
     esac
     if [ -z "$CURREPO" ]; then
       CURREPO=slackware
     fi
 
-    [ $SRCBASE != "ChangeLog.txt" ]||[ -z "$LEVEL" -o "$LEVEL" == "1" ]&&echo -n "    File: $CURREPO->$SRCBASE .."
+    [ $SRCBASE != "ChangeLog.txt" ]||[ -z "$LEVEL" -o "$LEVEL" == "1" ]&&printf "    File: %-20s -> %-20s .." "$CURREPO" "$SRCBASE"
     [ $VERBOSE -eq 3 ]&&echo -n " ($CACHEFILE) "
     if [ $TOCACHE -eq 1 ];then
-      echo -n "." # ... -> tocache=1
       curl --max-time 10 --location --head $SRCURL 2>/dev/null|grep -v -e ^Date: -e ^Set-Cookie: -e ^Expires: -e ^X-Varnish:|sed 's/
//' > $TMPDIR/cache.head
       echo "Url: $SRCURL" >> $TMPDIR/cache.head
-      #grep -q "200 OK" $TMPDIR/cache.head || echo "Header or Url Invalid!!! (`date`)"
       [ $VERBOSE -eq 3 ]&&(echo;cat $TMPDIR/cache.head|sed 's/^/  /')
       if grep -q "^HTTP/.* 404" $TMPDIR/cache.head;then
         if [ $SRCBASE == "ChangeLog.txt" ]&&[ $LEVEL -lt $LIMIT ];then
@@ -415,18 +414,16 @@ if [ "$SLACKPKGPLUS" = "on" ];then
         return 8 # wget return 8 if server return error so we return 8
       fi
       if [ -e $CACHEDIR/$CACHEFILE -a -e $CACHEDIR/$CACHEFILE.head ];then
-        echo -n " ." # ... . -> is in cache
         [ $VERBOSE -eq 3 ]&&(echo;cat $CACHEDIR/$CACHEFILE.head|sed 's/^/  /')
         if diff $CACHEDIR/$CACHEFILE.head $TMPDIR/cache.head >/dev/null;then
           [ $VERBOSE -eq 3 ]&&echo "Cache valid!   If not please remove manually $CACHEDIR/$CACHEFILE !"
-          echo " Cached." # ... . Cached.
+          echo " Cached."
           cp $CACHEDIR/$CACHEFILE $1
           return $?
         fi
-        echo -n ". " # ... .. -> cache older or corrupted
         rm -f $CACHEDIR/$CACHEFILE $CACHEDIR/$CACHEFILE.head 2>/dev/null
       fi
-      echo -n " Downloading... " # ... -> needed  # ... .. -> re-needed
+      echo -n " Downloading... "
       [ $VERBOSE -gt 1 ]&&echo
       $CACHEDOWNLOADER $1 $SRCURL
       ERR=$?
@@ -436,7 +433,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then
         cp $TMPDIR/cache.head $CACHEDIR/$CACHEFILE.head 2>/dev/null
       fi
     else
-      echo " Downloading..." # .. -> tocache=0
+      echo " Downloading... "
       $CACHEDOWNLOADER $1 $SRCURL
       ERR=$?
       echo
@@ -457,6 +454,10 @@ if [ "$SLACKPKGPLUS" = "on" ];then
     local URLFILE
     URLFILE=$1
 
+    if [ $(basename $1) = "ChangeLog.txt" ];then
+      echo "                ChangeLogs"
+    fi
+
     if echo $1|egrep -q '/SLACKPKGPLUS_(file|dir|http|https|ftp)[0-9].*\.asc$';then
       return 0
     fi
@@ -510,6 +511,19 @@ if [ "$SLACKPKGPLUS" = "on" ];then
       fi
     fi
 
+    if [ $(basename $1) = "FILELIST.TXT" ];then
+      if [ ! -z "$SBOURL" ];then
+        SBOURL=${SBOURL%/}/
+        $DOWNLOADER $TMPDIR/SLACKBUILDS.TXT.gz ${SBOURL}SLACKBUILDS.TXT.gz
+        zcat $TMPDIR/SLACKBUILDS.TXT.gz |awk '{
+                                                if($2=="NAME:")       name=$3
+                                                if($2=="LOCATION:")   location=$3
+                                                if($2=="VERSION:")    version=$3
+                                                if($1=="")            print name,version,location
+                                              }' > $WORKDIR/sbolist
+      fi
+    fi
+
     if [ $(basename $1) = "MANIFEST.bz2" ];then
       rm -f $WORKDIR/*-filelist.gz 2>/dev/null
       if [ ! -s $2 ];then
@@ -632,10 +646,8 @@ if [ "$SLACKPKGPLUS" = "on" ];then
         done
 
         if [ -s ${TMPDIR}/$CLOGNAM ] ; then
-          echo -e "                Saving ChangeLog.txt from repository $PREPO ...\n"
           cat ${TMPDIR}/$CLOGNAM >> ${TMPDIR}/ChangeLogs/$CLOGNAM
         else
-          echo -e "                Repository $PREPO has no ChangeLog.txt.\n"
           touch ${TMPDIR}/ChangeLogs/$CLOGNAM
         fi
       done
@@ -1549,7 +1561,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then
   fi
 
 
-  SPKGPLUS_VERSION="1.7.0d0"
+  SPKGPLUS_VERSION="1.7.0d1"
   VERSION="$VERSION / slackpkg+ $SPKGPLUS_VERSION"
   
 
@@ -1947,6 +1959,17 @@ if [ "$SLACKPKGPLUS" = "on" ];then
           searchlistEX "$LIST"
           echo -e "\nYou can search specific files using \"slackpkg file-search file\".\n"
         fi
+        if [ ! -z "$SBOURL" ];then
+          SBORESULT="$(grep -E -i "^[^ ]*$PATTERN" $WORKDIR/sbolist 2>/dev/null|sed -e 's/ /-/' -e "s#\./#$SBOURL#" -e 's/$/.tar.gz/')"
+          if [ ! -z "$SBORESULT" ];then
+            echo
+            echo "Also found in SBo:"
+            echo
+            echo -e "[package] [url]\n$SBORESULT"|column -t|sed -e 's/  /    /' -e 's/^/  /' -e 's/  \[/[ /g' -e 's/\]/ ]/g'|grep --color -E -i -e "$PATTERN" -e ^
+            echo
+         fi
+       fi
+
       ;;
 
       file-search)

src/slackpkgplus.x86.sample

@@ -113,6 +113,10 @@ MIRRORPLUS['slackpkgplus']=http://slakfinder.org/slackpkg+dev/
 # Local packages (you do not need metadata nor 'slackpkg update' command):
 #MIRRORPLUS['myrepo']=dir://repositories/mypackages/
 
+# SBo SlackBuilds. Uncomment it to allow slackpkg to search SlackBuilds on SlackBuilds.org
+# This does not repleace sbopkg; slackpkg just report the package, version and url; you must
+# download and build it yourself or via sbopkg.
+#SBOURL=https://www.slackbuilds.org/slackbuilds/14.2/
 
 #
 # Supported Repositories (see /usr/doc/slackpkg+-* for details and notes):

src/slackpkgplus.x86_64.sample

@@ -134,6 +134,10 @@ MIRRORPLUS['slackpkgplus']=http://slakfinder.org/slackpkg+dev/
 # Local packages (you do not need metadata nor 'slackpkg update' command):
 #MIRRORPLUS['myrepo']=dir://repositories/mypackages/
 
+# SBo SlackBuilds. Uncomment it to allow slackpkg to search SlackBuilds on SlackBuilds.org
+# This does not repleace sbopkg; slackpkg just report the package, version and url; you must
+# download and build it yourself or via sbopkg.
+#SBOURL=https://www.slackbuilds.org/slackbuilds/14.2/
 
 #
 # Supported Repositories (see /usr/doc/slackpkg+-* for details and notes):