diff --git a/ChangeLog.txt b/ChangeLog.txt index 4e254a6..a19f566 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,12 @@ +Thu Jan 13 10:48:24 CET 2022 +pkg/slackpkg+-1.8.rc1-noarch-1mt.txz: + Slackware 15.0 rc3 has been released, declared as 99% freezed. + Slackpkg too has had many changes, fix and improvement, and it's the + time for slackpkg+ 1.8 to be declared ready. See the CHANGES in + documentation for all improvements. + - Regression on (not-needed) gpg key check on dir:/ repository ++-------------------------+ + Tue Jan 11 21:42:33 CET 2022 pkg/slackpkg+-1.7.11-noarch-2mt.txz: - Automatically download gpg key if needed if STRICTGPG=on. diff --git a/src/CHANGES b/src/CHANGES index 1a8ead6..51d5a3c 100644 --- a/src/CHANGES +++ b/src/CHANGES @@ -1,6 +1,6 @@ = Full Changes list = -== From 1.7 to 1.7.11 == +== From 1.7 to 1.8 == *Configuration file: diff --git a/src/ChangeLog.txt b/src/ChangeLog.txt index 4e254a6..a19f566 100644 --- a/src/ChangeLog.txt +++ b/src/ChangeLog.txt @@ -1,3 +1,12 @@ +Thu Jan 13 10:48:24 CET 2022 +pkg/slackpkg+-1.8.rc1-noarch-1mt.txz: + Slackware 15.0 rc3 has been released, declared as 99% freezed. + Slackpkg too has had many changes, fix and improvement, and it's the + time for slackpkg+ 1.8 to be declared ready. See the CHANGES in + documentation for all improvements. + - Regression on (not-needed) gpg key check on dir:/ repository ++-------------------------+ + Tue Jan 11 21:42:33 CET 2022 pkg/slackpkg+-1.7.11-noarch-2mt.txz: - Automatically download gpg key if needed if STRICTGPG=on. diff --git a/src/slackpkgplus.sh b/src/slackpkgplus.sh index 8c7ec50..66604f9 100755 --- a/src/slackpkgplus.sh +++ b/src/slackpkgplus.sh @@ -1935,7 +1935,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then cleanup fi - SPKGPLUS_VERSION="1.7.11" + SPKGPLUS_VERSION="1.8.rc1" VERSION="$VERSION / slackpkg+ $SPKGPLUS_VERSION" if [ ${VERSION:0:4} == "2.82" ];then @@ -1998,7 +1998,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then if [ "$UPARG" != "gpg" ]&&[ "$CHECKGPG" = "on" ]&&[ "$STRICTGPG" = "on" ];then ls -l $WORKDIR/gpg/GPG-KEY-slackware*.gpg >/dev/null 2>&1 || GPGFIRSTTIME=0 for PREPO in "${!MIRRORPLUS[@]}" ; do - if ! echo "${MIRRORPLUS[$PREPO]}"|grep -q -e "^httpdir://" -e "^httpsdir://" -e "^ftpdir://" 2>/dev/null ; then + if ! echo "${MIRRORPLUS[$PREPO]}"|grep -q -e "^dir:/" -e "^httpdir://" -e "^httpsdir://" -e "^ftpdir://" 2>/dev/null ; then ls -l $WORKDIR/gpg/GPG-KEY-${PREPO}.gpg >/dev/null 2>&1 || GPGFIRSTTIME=0 fi done