From 75976a93588e1ed56e3700dff6693d3e61436c93 Mon Sep 17 00:00:00 2001
From: Matteo Rossini <info@slakfinder.org>
Date: Tue, 11 May 2021 23:37:59 +0200
Subject: [PATCH] LEGACYBL documentation

---
 src/CHANGES                    |  6 +++++-
 src/README                     | 28 ++++++++++++++++++++++++++++
 src/greylist                   |  6 +++---
 src/slackpkgplus.x86.sample    |  6 ++++++
 src/slackpkgplus.x86_64.sample |  6 ++++++
 5 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/src/CHANGES b/src/CHANGES
index bfc54d3..c52bfe2 100644
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -1,6 +1,6 @@
 = Full Changes list =
 
-== From 1.7 to 1.7.5 ==
+== From 1.7 to 1.7.6 ==
 
 *Configuration file:
 
@@ -22,6 +22,7 @@
   Currently zlookkernel and zchangelog
   Note that some plugin may be experimental
 
+- Added LEGACYBL to allow slackpkg+ to use blacklist syntax from slackware 14.2
 
 *New features:
 
@@ -38,6 +39,9 @@
 - Added httpdir/httpsdir/ftpdir repositories. These repositories does not
   need metadatas (CHECKSUMS.md5 ...), simple a remote directory listing
 
+- Allow slackpkg+ to use the blacklist system from slackware 14.2; the new
+  blacklist system from slackware 15.0 may not work properly with third party
+  repositories
 
 *Improvements
 
diff --git a/src/README b/src/README
index ae5d54a..b79e12b 100644
--- a/src/README
+++ b/src/README
@@ -458,6 +458,34 @@ package.
 Do not forget to install the multilibs.
 
 
+-----
+
+BLACKLIST
+
+Slackpkg+ uses the same slackpkg system. See /etc/slackpkg/blacklist for details.
+Starting from slackpkg 15, the new system was improved. To blacklist a package
+you have to put its entire name, so 'kernel' does not blacklist 'kernel-modules',
+or a regular expression to match it, as 'kernel-.*'. Also you can blacklist an
+entire package series specifing  the entire name followed by /, as 'kde/'.
+In this way you are more sure to exclude exactly the packages you want.
+
+However this may be inefficient with third party repository.
+You can set LEGACYBL=on to allow slackpkg+ to use the previous (14.2) blacklist system.
+It apply a regex to the entire pkglist row with 'grep -wE'. A row is similar to
+
+SLACKPKGPLUS_slackpkgplus slackpkg+ 1.7.5 noarch 2mt slackpkg+-1.7.5-noarch-2mt ./SLACKPKGPLUS_slackpkgplus/pkg txz
+
+consider that to avoid false positive.
+Test your blacklist file with the command:
+$ grep -wE -f <(grep -v ^$ /etc/slackpkg/blacklist) /var/lib/slackpkg/pkglist
+
+You can use USEBL=off to totally disable blacklist.
+
+Also you can use both settings as temporary from cmdlisne
+
+USEBL=off slackpkg search kernel
+LEGACYBL=on slackpkg search kernel
+
 -----
 
 GREYLIST
diff --git a/src/greylist b/src/greylist
index 4667a09..c4a0736 100644
--- a/src/greylist
+++ b/src/greylist
@@ -3,9 +3,9 @@
 #
 # You can greylist using regular expressions.
 #
-# Don't use *full* regex here, because all of the following
-# will be checked for the regex: series, name, version, arch,
-# build, fullname and repository name.
+# Note that the regex will be applied with the command 'grep -wE'
+# at the entire pkglist row
+# SLACKPKGPLUS_slackpkgplus slackpkg+ 1.7.5 noarch 2mt slackpkg+-1.7.5-noarch-2mt ./SLACKPKGPLUS_slackpkgplus/pkg txz
 #
 # Also you may want to greylist ALL slackpkgplus repository;
 # useful if you want to run slackpkg install alienbob and select
diff --git a/src/slackpkgplus.x86.sample b/src/slackpkgplus.x86.sample
index 0fd966b..9c93cf8 100644
--- a/src/slackpkgplus.x86.sample
+++ b/src/slackpkgplus.x86.sample
@@ -29,6 +29,12 @@ TERSESEARCH=on
 # 'USEBL=off slackpkg upgrade-all'
 USEBL=on
 
+# Enable (on) / Disable (off) the legacy blacklist system ignoring the improvement
+# from slackpkg 15. Some improvement are not useful with thirdy party repositories
+# Note that the legacy system does apply it as regex to the entire pkglist row
+# repository, name, version, arch, build, fullname, series/path, extension.
+LEGACYBL=off
+
 # Add custom option to 'wget'.
 # You can solve the repository indisponibility issue by set a timeout here
 WGETOPTS="--timeout=20 --tries=2"
diff --git a/src/slackpkgplus.x86_64.sample b/src/slackpkgplus.x86_64.sample
index 7b62b63..11d6f16 100644
--- a/src/slackpkgplus.x86_64.sample
+++ b/src/slackpkgplus.x86_64.sample
@@ -37,6 +37,12 @@ ALLOW32BIT=off
 # 'USEBL=off slackpkg upgrade-all'
 USEBL=on
 
+# Enable (on) / Disable (off) the legacy blacklist system ignoring the improvement
+# from slackpkg 15. Some improvement are not useful with thirdy party repositories
+# Note that the legacy system does apply it as regex to the entire pkglist row
+# repository, name, version, arch, build, fullname, series/path, extension.
+LEGACYBL=off
+
 # Add custom option to 'wget'.
 # You can solve the repository indisponibility issue by set a timeout here
 WGETOPTS="--timeout=20 --tries=2"