From 72b205aad8d625963a9fd07679c7d766a79e3106 Mon Sep 17 00:00:00 2001 From: Matteo Rossini Date: Sun, 12 Jun 2016 20:33:02 +0200 Subject: [PATCH] pkg/slackpkg+-1.7.0d0-noarch-1mt.txz: Upgraded Setting up mainline branch. - Fixed some typos and missed SEARCH_CLOG_INPARENT documentation in README --- ChangeLog.txt | 8 +++++++- src/CHANGES | 8 ++++++-- src/ChangeLog.txt | 8 +++++++- src/README | 29 ++++++++++++++++++++++++++++- src/slackpkg+.SlackBuild | 9 +++++---- src/slackpkgplus.sh | 2 +- src/slackpkgplus.x86.sample | 7 +++++-- src/slackpkgplus.x86_64.sample | 8 ++++++-- 8 files changed, 65 insertions(+), 14 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 7ade6a2..a4bb8e9 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,9 @@ +Tue Jun 12 20:11:00 CEST 2016 +pkg/slackpkg+-1.7.0d0-noarch-1mt.txz: Upgraded + Setting up mainline branch. + - Fixed some typos and missed SEARCH_CLOG_INPARENT documentation in README ++-------------------------+ + Version 1.7.0rc3 - 03/Jun/2016 This could be the last batch of updates before 1.7.0 stable, so please test! - dialog did no more trap develop errors (but if occurs please report it) @@ -93,7 +99,7 @@ Version 1.7.a1 - 04/Jan/2016 - Added repositories; improved checkrepos.sh - Strict GPG Check: Packages and metadata in one repository should be signed with just the root GPG-KEY. This improve security. Some repository might - want to contains eterogeneous package. In this case, set STRICTGPG=off. + want to contains heterogeneous package. In this case, set STRICTGPG=off. See README. - New repository for slackpkg+ development version diff --git a/src/CHANGES b/src/CHANGES index df15d90..df35617 100644 --- a/src/CHANGES +++ b/src/CHANGES @@ -1,5 +1,9 @@ = Full Changes list = +== From 1.7 to mainline == + +- Nothing (just setting up branch) + == From 1.6 and 1.7 == *Configuration file: @@ -40,7 +44,7 @@ - slackpkg+ now uses a Strict GPG Check for packages and metadata .asc files. This is a security fix. - slackpkg was bird to install slackware packages from official mirrors; they + slackpkg was born to install slackware packages from official mirrors; they are signed with the official slackware GPG-KEY, so no other packages may be added (unless you disable GPG check). slackpkg+ introduces the ability to download keys from many repositories; as @@ -264,7 +268,7 @@ Version 1.7.a1 - 04/Jan/2016 - Added repositories; improved checkrepos.sh - Strict GPG Check: Packages and metadata in one repository should be signed with just the root GPG-KEY. This improve security. Some repository might - want to contains eterogeneous package. In this case, set STRICTGPG=off. + want to contains heterogeneous package. In this case, set STRICTGPG=off. See README. - New repository for slackpkg+ development version diff --git a/src/ChangeLog.txt b/src/ChangeLog.txt index 7ade6a2..a4bb8e9 100644 --- a/src/ChangeLog.txt +++ b/src/ChangeLog.txt @@ -1,3 +1,9 @@ +Tue Jun 12 20:11:00 CEST 2016 +pkg/slackpkg+-1.7.0d0-noarch-1mt.txz: Upgraded + Setting up mainline branch. + - Fixed some typos and missed SEARCH_CLOG_INPARENT documentation in README ++-------------------------+ + Version 1.7.0rc3 - 03/Jun/2016 This could be the last batch of updates before 1.7.0 stable, so please test! - dialog did no more trap develop errors (but if occurs please report it) @@ -93,7 +99,7 @@ Version 1.7.a1 - 04/Jan/2016 - Added repositories; improved checkrepos.sh - Strict GPG Check: Packages and metadata in one repository should be signed with just the root GPG-KEY. This improve security. Some repository might - want to contains eterogeneous package. In this case, set STRICTGPG=off. + want to contains heterogeneous package. In this case, set STRICTGPG=off. See README. - New repository for slackpkg+ development version diff --git a/src/README b/src/README index b41768e..7451f73 100644 --- a/src/README +++ b/src/README @@ -434,6 +434,33 @@ the file. Set CACHEUPDATE=on to enable it. Default is 'off' +----- + +SEARCH_CLOG_INPARENT Option + +Starting from 1.7.0, slackpkg+ allow you to see the ChangeLog in dialog box. +When you run 'slackpkg update' it download all ChangeLog.txt from all +repositories (if available). +Then when you go to in install/upgrade a package, you have a chance to +read it before install the package. +Note that the ChangeLog must be in the same Slackware changelog format. + +Some repository does not have the ChangeLog.txt in the main url but has it +in a parent url. + +For example the alienbob multilib repository: + http://bear.alienbase.nl/mirrors/people/alien/multilib/14.1/ +has not the ChangeLog.txt in tree, but it is placed in parent directory: + http://bear.alienbase.nl/mirrors/people/alien/multilib/ChangeLog.txt + +Be sure to set SEARCH_CLOG_INPARENT to 'on' to search it in parent. +Note that ascend out of main url sometime may be unsafe; so if it does not +work reset it to 'off'. +Also note that slackpkg+ use wget as default downloader and when the +ChangeLog.txt is not found it return "ERROR 404: Not Found" before try +again in the parent url. +You may avoid it by use the Cached Updates downloader that trap it for a +quick output. So you are encouraged to set CACHEUPDATE=on ----- @@ -546,7 +573,7 @@ DETAILED_INFO=filelist also show the full file list of the package. STRICTGPG -slackpkg was bird to install slackware packages from official mirrors; they +slackpkg was born to install slackware packages from official mirrors; they are signed with the official slackware GPG-KEY, so no other packages may be added (unless you disable GPG check). slackpkg+ introduces the ability to download keys from many repositories; as diff --git a/src/slackpkg+.SlackBuild b/src/slackpkg+.SlackBuild index 274bad2..b80afb4 100644 --- a/src/slackpkg+.SlackBuild +++ b/src/slackpkg+.SlackBuild @@ -2,8 +2,9 @@ set -e -VERSION=$(head -1 ChangeLog.txt|awk '{print $2}') -BUILD=${BUILD:-1mt} +TXZ=$(head -2 ChangeLog.txt|cut -f1 -d:|cut -f2 -d/|tail -1) +VERSION=$(echo $TXZ|cut -f2 -d-) +BUILD=$(echo $TXZ|cut -f4 -d-|sed 's/.txz//') CWD=`pwd` TMP=${TMP:-/tmp} @@ -33,7 +34,7 @@ if [ ! -z "$INST" ];then fi fi -SPKGPLUS_VERSION=$(grep 'SPKGPLUS_VERSION="'$VERSION'"' slackpkgplus.sh|cut -f2 -d'"') +SPKGPLUS_VERSION=$(grep 'SPKGPLUS_VERSION="' slackpkgplus.sh|cut -f2 -d'"') if [ "$SPKGPLUS_VERSION" != "$VERSION" ];then echo "WARNING: slackpkg+ version in ChangeLog.txt ($VERSION) does not match with" echo " slackpkg+ version in slackpkgplus.sh ($SPKGPLUS_VERSION)" @@ -78,7 +79,7 @@ chmod +x usr/libexec/slackpkg/zchangelog.sh chmod +x usr/doc/slackpkg+-$VERSION/setupmultilib.sh -makepkg -l y -c y $OUTPUT/slackpkg+-$VERSION-noarch-$BUILD.txz +makepkg -l y -c y $OUTPUT/$TXZ diff --git a/src/slackpkgplus.sh b/src/slackpkgplus.sh index 2311e85..52f9886 100755 --- a/src/slackpkgplus.sh +++ b/src/slackpkgplus.sh @@ -1545,7 +1545,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then fi - SPKGPLUS_VERSION="1.7.0rc3" + SPKGPLUS_VERSION="1.7.0d0" VERSION="$VERSION / slackpkg+ $SPKGPLUS_VERSION" diff --git a/src/slackpkgplus.x86.sample b/src/slackpkgplus.x86.sample index af7f6b4..53fa1a6 100644 --- a/src/slackpkgplus.x86.sample +++ b/src/slackpkgplus.x86.sample @@ -54,7 +54,7 @@ SHOWORDER=package DETAILED_INFO=none # Enable (on) / Disable (off) a Strict GPG Check. A repository should contains packages signed -# with the only original GPG-KEY. In some custom repository may be wanted to mix eterogeneous +# with the only original GPG-KEY. In some custom repository may be wanted to mix heterogeneous # packages; to use that repository set Strict GPG Check to off. P.S: a repository can # contain just ONE gpg-key; you may manually import the other. STRICTGPG=on @@ -100,7 +100,10 @@ REPOPLUS=( slackpkgplus ) #MIRRORPLUS['restricted']=http://bear.alienbase.nl/mirrors/people/alien/restricted_sbrepos/14.2/x86/ #MIRRORPLUS['slacky']=http://repository.slacky.eu/slackware-14.2/ -# use this to keep the slackpkg+ package updated +# use this to keep the slackpkg+ package updated to the latest stable release +#MIRRORPLUS['slackpkgplus']=http://slakfinder.org/slackpkg+/ + +# use the development branch to use the mainline version and help develop by reporting bugs. MIRRORPLUS['slackpkgplus']=http://slakfinder.org/slackpkg+dev/ # Local repository: diff --git a/src/slackpkgplus.x86_64.sample b/src/slackpkgplus.x86_64.sample index 2fe4d30..f39eff0 100644 --- a/src/slackpkgplus.x86_64.sample +++ b/src/slackpkgplus.x86_64.sample @@ -62,7 +62,7 @@ SHOWORDER=package DETAILED_INFO=none # Enable (on) / Disable (off) a Strict GPG Check. A repository should contains packages signed -# with the only original GPG-KEY. In some custom repository may be wanted to mix eterogeneous +# with the only original GPG-KEY. In some custom repository may be wanted to mix heterogeneous # packages; to use that repository set Strict GPG Check to off. P.S: a repository can # contain just ONE gpg-key; you may manually import the other. STRICTGPG=on @@ -117,9 +117,13 @@ REPOPLUS=( slackpkgplus ) #MIRRORPLUS['restricted']=http://bear.alienbase.nl/mirrors/people/alien/restricted_sbrepos/14.2/x86_64/ #MIRRORPLUS['slacky']=http://repository.slacky.eu/slackware64-14.2/ -# use this to keep the slackpkg+ package updated +# use this to keep the slackpkg+ package updated to the latest stable release +#MIRRORPLUS['slackpkgplus']=http://slakfinder.org/slackpkg+/ + +# use the development branch to use the mainline version and help develop by reporting bugs. MIRRORPLUS['slackpkgplus']=http://slakfinder.org/slackpkg+dev/ + # Slackware current - x86_64 #MIRRORPLUS['multilib']=http://bear.alienbase.nl/mirrors/people/alien/multilib/current/