From c0ce76652a30f7ea69b2167feff47e1e71486810 Mon Sep 17 00:00:00 2001 From: Matteo Rossini Date: Mon, 15 Feb 2021 21:34:25 +0100 Subject: [PATCH] Mon Feb 15 21:14:31 CET 2021 pkg/slackpkg+-1.7.1-noarch-1mt.txz: Rebuilt - This is a temporary release - Slackpkg+ devel no longer supports slackware 14.2 --- ChangeLog.txt | 6 ++++++ src/ChangeLog.txt | 6 ++++++ src/slackpkgplus.sh | 32 +++++++++++++++++++++++++++++++- src/slackpkgplus.x86.sample | 4 ++-- src/slackpkgplus.x86_64.sample | 4 ++-- 5 files changed, 47 insertions(+), 5 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 33d26e4..c60c2f0 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,9 @@ +Mon Feb 15 21:14:31 CET 2021 +pkg/slackpkg+-1.7.1-noarch-1mt.txz: Rebuilt + - This is a temporary release + - Slackpkg+ devel no longer supports slackware 14.2 ++-------------------------+ + Mon Feb 8 18:41:17 CET 2021 pkg/slackpkg+-1.7.0d1-noarch-13mt.txz: Rebuilt - Fixed some regression on blacklist with slackpkg-15 diff --git a/src/ChangeLog.txt b/src/ChangeLog.txt index 33d26e4..c60c2f0 100644 --- a/src/ChangeLog.txt +++ b/src/ChangeLog.txt @@ -1,3 +1,9 @@ +Mon Feb 15 21:14:31 CET 2021 +pkg/slackpkg+-1.7.1-noarch-1mt.txz: Rebuilt + - This is a temporary release + - Slackpkg+ devel no longer supports slackware 14.2 ++-------------------------+ + Mon Feb 8 18:41:17 CET 2021 pkg/slackpkg+-1.7.0d1-noarch-13mt.txz: Rebuilt - Fixed some regression on blacklist with slackpkg-15 diff --git a/src/slackpkgplus.sh b/src/slackpkgplus.sh index 393768b..43cb7a8 100755 --- a/src/slackpkgplus.sh +++ b/src/slackpkgplus.sh @@ -1738,9 +1738,39 @@ if [ "$SLACKPKGPLUS" = "on" ];then LEGACYBLACKLIST="-w" fi - SPKGPLUS_VERSION="1.7.0d1" + SPKGPLUS_VERSION="1.7.1" VERSION="$VERSION / slackpkg+ $SPKGPLUS_VERSION" + if [ ${VERSION:0:4} == "2.82" ];then + echo " ! ! ! WARNING ! ! ! " + echo " You are using slackpkg+ $SPKGPLUS_VERSION release with Slackware 14.2" + echo + echo " It no longer supports Slackware 14.2 and should be used with" + echo " Slackware current only." + echo " Using it with Slackware 14.2 may no work properly" + echo " Use slackpkg+ 1.7.0 instead" + echo + SLPMIR="$(cat $CONF/slackpkgplus.conf|grep -E ^MIRRORPLUS.*slackpkg)" + if [ "$SLPMIR" != "MIRRORPLUS['slackpkgplus']=http://slakfinder.org/slackpkg+1.7/" ];then + echo " Please replace" + cat $CONF/slackpkgplus.conf|grep -E ^MIRRORPLUS.*slackpkg + echo " with" + echo "MIRRORPLUS['slackpkgplus']=http://slakfinder.org/slackpkg+1.7/" + echo " then run 'slackpkg update && slackpkg upgrade slackpkg+' to downgrade it" + echo + echo + echo -n "Do you want continue anyway? (Y/[N]) " + read ANSW + if [ "$ANSW" != "Y" ];then + cleanup + fi + else + echo " run 'slackpkg update && slackpkg upgrade slackpkg+' to downgrade it" + echo + sleep 5 + fi + + fi if [ ! -e "$WORKDIR" ];then mkdir -p "$WORKDIR" diff --git a/src/slackpkgplus.x86.sample b/src/slackpkgplus.x86.sample index c272cef..e7a8b04 100644 --- a/src/slackpkgplus.x86.sample +++ b/src/slackpkgplus.x86.sample @@ -106,10 +106,10 @@ REPOPLUS=( slackpkgplus ) #MIRRORPLUS['slacky']=http://repository.slacky.eu/slackware-14.2/ # use this to keep the slackpkg+ package updated to the latest stable release -#MIRRORPLUS['slackpkgplus']=http://slakfinder.org/slackpkg+/ +MIRRORPLUS['slackpkgplus']=http://slakfinder.org/slackpkg+15/ # use the development branch to use the mainline version and help develop by reporting bugs. -MIRRORPLUS['slackpkgplus']=http://slakfinder.org/slackpkg+dev/ +#MIRRORPLUS['slackpkgplus']=http://slakfinder.org/slackpkg+dev/ # Local repository: #MIRRORPLUS['alienbob']=file://repositories/alien/sbrepos/14.2/x86/ diff --git a/src/slackpkgplus.x86_64.sample b/src/slackpkgplus.x86_64.sample index c969bf7..ff82c36 100644 --- a/src/slackpkgplus.x86_64.sample +++ b/src/slackpkgplus.x86_64.sample @@ -120,10 +120,10 @@ REPOPLUS=( slackpkgplus ) #MIRRORPLUS['slacky']=http://repository.slacky.eu/slackware64-14.2/ # use this to keep the slackpkg+ package updated to the latest stable release -#MIRRORPLUS['slackpkgplus']=http://slakfinder.org/slackpkg+/ +MIRRORPLUS['slackpkgplus']=http://slakfinder.org/slackpkg+15/ # use the development branch to use the mainline version and help develop by reporting bugs. -MIRRORPLUS['slackpkgplus']=http://slakfinder.org/slackpkg+dev/ +#MIRRORPLUS['slackpkgplus']=http://slakfinder.org/slackpkg+dev/ # Slackware current - x86_64