Version 1.7.b4.2 - 18/Apr/2016

- Improved cached downloader with specifics output for ChangeLogs
  - Fixed a bug in TAG_PRIORITY when the package is not installed
  - Improved performance in upgrade by skipping priority check for
    not installed packages
This commit is contained in:
Matteo Rossini 2016-04-18 23:52:52 +02:00
parent 221bcde357
commit 0fce4c3a19
5 changed files with 119 additions and 95 deletions

View file

@ -1,3 +1,9 @@
Version 1.7.b4.2 - 18/Apr/2016
- Improved cached downloader with specifics output for ChangeLogs
- Fixed a bug in TAG_PRIORITY when the package is not installed
- Improved performance in upgrade by skipping priority check for
not installed packages
Version 1.7.b4.1 - 15/Apr/2016
- slackpkg allow ChangeLog for third-party repositories too.
- Reduced verbosity in cached downloader == most clear output.

View file

@ -1,3 +1,9 @@
Version 1.7.b4.2 - 18/Apr/2016
- Improved cached downloader with specifics output for ChangeLogs
- Fixed a bug in TAG_PRIORITY when the package is not installed
- Improved performance in upgrade by skipping priority check for
not installed packages
Version 1.7.b4.1 - 15/Apr/2016
- slackpkg allow ChangeLog for third-party repositories too.
- Reduced verbosity in cached downloader == most clear output.

View file

@ -1,54 +1,4 @@
url md5 pack gpg
http://connochaetos.org/slack-n-free/slack-n-free-14.1 yes yes Henry Jensen <hjensen@connochaetos.org>
http://connochaetos.org/slack-n-free/slack-n-free64-14.1 yes yes Henry Jensen <hjensen@connochaetos.org>
http://download.salixos.org/i486/13.37 yes yes Salix Admin (The Bonsai OS) <salix.admin@gmail.com>
http://download.salixos.org/i486/14.0 yes yes Salix Admin (The Bonsai OS) <salix.admin@gmail.com>
http://download.salixos.org/i486/14.1 yes yes Salix Admin (The Bonsai OS) <salix.admin@gmail.com>
http://download.salixos.org/x86_64/13.37 yes yes Salix Admin (The Bonsai OS) <salix.admin@gmail.com>
http://download.salixos.org/x86_64/14.0 yes yes Salix Admin (The Bonsai OS) <salix.admin@gmail.com>
http://download.salixos.org/x86_64/14.1 yes yes Salix Admin (The Bonsai OS) <salix.admin@gmail.com>
http://ngc891.blogdns.net/pub/slacke18/slackware-14.1 yes yes Jérôme Pinot <ngc891@gmail.com>
http://ngc891.blogdns.net/pub/slacke18/slackware64-14.1 yes yes Jérôme Pinot <ngc891@gmail.com>
http://ngc891.blogdns.net/pub/slacke18/slackwarearm-14.1 yes yes Jérôme Pinot <ngc891@gmail.com>
http://packages.slackonly.com/pub/packages/14.1-x86 yes yes Panagiotis Nikolaou (slackware user) <hostmaster@slackonly.com>
http://packages.slackonly.com/pub/packages/14.1-x86_64 yes yes Panagiotis Nikolaou (slackware user) <hostmaster@slackonly.com>
http://packages.slackonly.com/pub/packages/current-x86 yes yes Panagiotis Nikolaou (slackware user) <hostmaster@slackonly.com>
http://packages.slackonly.com/pub/packages/current-x86_64 yes yes Panagiotis Nikolaou (slackware user) <hostmaster@slackonly.com>
http://ponce.cc/slackers/repository yes yes Corrado Franco (Conraid) <conraid@gmail.com>
http://repository.slacky.eu/slackware-13.37 yes yes Slacky.eu packagers (packages by Slacky.eu) <packages@slacky.it>
http://repository.slacky.eu/slackware-14.0 yes yes Slacky.eu packagers (packages by Slacky.eu) <packages@slacky.it>
http://repository.slacky.eu/slackware-14.1 yes yes Slacky.eu packagers (packages by Slacky.eu) <packages@slacky.it>
http://repository.slacky.eu/slackware64-13.37 yes yes Slacky.eu packagers (packages by Slacky.eu) <packages@slacky.it>
http://repository.slacky.eu/slackware64-14.0 yes yes Slacky.eu packagers (packages by Slacky.eu) <packages@slacky.it>
http://repository.slacky.eu/slackware64-14.1 yes yes Slacky.eu packagers (packages by Slacky.eu) <packages@slacky.it>
http://rlworkman.net/pkgs/13.37 yes yes Robby Workman <rworkman@slackware.com>
http://rlworkman.net/pkgs/14.0 yes yes Robby Workman <rworkman@slackware.com>
http://rlworkman.net/pkgs/14.1 yes yes Robby Workman <rworkman@slackware.com>
http://rlworkman.net/pkgs/current yes yes Robby Workman <rworkman@slackware.com>
http://slackware.org.uk/msb/14.0/1.6/x86 yes yes MATE SlackBuilds <mateslackbuilds@gmail.com>
http://slackware.org.uk/msb/14.0/1.6/x86_64 yes yes MATE SlackBuilds <mateslackbuilds@gmail.com>
http://slackware.org.uk/msb/14.1/1.10/x86 yes yes MATE SlackBuilds <mateslackbuilds@gmail.com>
http://slackware.org.uk/msb/14.1/1.10/x86_64 yes yes MATE SlackBuilds <mateslackbuilds@gmail.com>
http://slackware.org.uk/msb/14.1/1.12/x86 yes yes MATE SlackBuilds <mateslackbuilds@gmail.com>
http://slackware.org.uk/msb/14.1/1.12/x86_64 yes yes MATE SlackBuilds <mateslackbuilds@gmail.com>
http://slackware.org.uk/msb/14.1/1.6/x86 yes yes MATE SlackBuilds <mateslackbuilds@gmail.com>
http://slackware.org.uk/msb/14.1/1.6/x86_64 yes yes MATE SlackBuilds <mateslackbuilds@gmail.com>
http://slackware.org.uk/msb/14.1/1.8/x86 yes yes MATE SlackBuilds <mateslackbuilds@gmail.com>
http://slackware.org.uk/msb/14.1/1.8/x86_64 yes yes MATE SlackBuilds <mateslackbuilds@gmail.com>
http://slackware.org.uk/msb/testing/1.12/x86 yes yes MATE SlackBuilds <mateslackbuilds@gmail.com>
http://slackware.org.uk/msb/testing/1.12/x86_64 yes yes MATE SlackBuilds <mateslackbuilds@gmail.com>
http://slakfinder.org/slackpkg+ yes yes Matteo Rossini <zerouno@slacky.it>
http://slakfinder.org/slackpkg+dev yes yes Matteo Rossini <zerouno@slacky.it>
http://slint.fr/packages/14.0-i486 yes yes Didier Spaier <didier@slint.fr>
http://slint.fr/packages/14.0-x86_64 yes yes Didier Spaier <didier@slint.fr>
http://slint.fr/packages/14.1-i486 yes yes Didier Spaier <didier@slint.fr>
http://slint.fr/packages/14.1-x86_64 yes yes Didier Spaier <didier@slint.fr>
http://studioware.org/files/packages/slackware-13.37 yes yes Studioware <info@studioware.org>
http://studioware.org/files/packages/slackware-14.0 yes yes Studioware <info@studioware.org>
http://studioware.org/files/packages/slackware-14.1 yes yes Studioware <info@studioware.org>
http://studioware.org/files/packages/slackware64-13.37 yes yes Studioware <info@studioware.org>
http://studioware.org/files/packages/slackware64-14.0 yes yes Studioware <info@studioware.org>
http://studioware.org/files/packages/slackware64-14.1 yes yes Studioware <info@studioware.org>
url md5 pack gpg
http://bear.alienbase.nl/mirrors/alien-kde/13.37/latest/x86 yes yes Eric Hameleers (IBM Linux) <alien@linux.vnet.ibm.com>
http://bear.alienbase.nl/mirrors/alien-kde/13.37/latest/x86_64 yes yes Eric Hameleers (IBM Linux) <alien@linux.vnet.ibm.com>
http://bear.alienbase.nl/mirrors/alien-kde/14.0/latest/x86 yes yes Eric Hameleers (IBM Linux) <alien@linux.vnet.ibm.com>
@ -79,27 +29,73 @@ http://bear.alienbase.nl/mirrors/people/alien/sbrepos/14.1/x86
http://bear.alienbase.nl/mirrors/people/alien/sbrepos/14.1/x86_64 yes yes Eric Hameleers (IBM Linux) <alien@linux.vnet.ibm.com>
http://bear.alienbase.nl/mirrors/people/alien/sbrepos/current/x86 yes yes Eric Hameleers (IBM Linux) <alien@linux.vnet.ibm.com>
http://bear.alienbase.nl/mirrors/people/alien/sbrepos/current/x86_64 yes yes Eric Hameleers (IBM Linux) <alien@linux.vnet.ibm.com>
http://www.microlinux.fr/microlinux/desktop-14.1-32bit yes yes Niki Kovacs <info@microlinux.fr>
http://www.microlinux.fr/microlinux/desktop-14.1-64bit yes yes Niki Kovacs <info@microlinux.fr>
http://www.microlinux.fr/microlinux/desktop-14.2-32bit yes yes Niki Kovacs <info@microlinux.fr>
http://www.microlinux.fr/microlinux/desktop-14.2-64bit yes yes Niki Kovacs <info@microlinux.fr>
http://www.microlinux.fr/microlinux/extras-14.1-32bit yes yes Niki Kovacs <info@microlinux.fr>
http://www.microlinux.fr/microlinux/extras-14.1-64bit yes yes Niki Kovacs <info@microlinux.fr>
http://www.microlinux.fr/microlinux/extras-14.2-32bit yes yes Niki Kovacs <info@microlinux.fr>
http://www.microlinux.fr/microlinux/extras-14.2-64bit yes yes Niki Kovacs <info@microlinux.fr>
http://www.microlinux.fr/microlinux/server-14.0-32bit yes yes Niki Kovacs <info@microlinux.fr>
http://www.microlinux.fr/microlinux/server-14.0-64bit yes yes Niki Kovacs <info@microlinux.fr>
http://www.microlinux.fr/microlinux/server-14.1-32bit yes yes Niki Kovacs <info@microlinux.fr>
http://www.microlinux.fr/microlinux/server-14.1-64bit yes yes Niki Kovacs <info@microlinux.fr>
http://www.microlinux.fr/microlinux/server-14.2-32bit yes yes Niki Kovacs <info@microlinux.fr>
http://www.microlinux.fr/microlinux/server-14.2-64bit yes yes Niki Kovacs <info@microlinux.fr>
http://www.slackel.gr/repo/i486/current yes yes Dimitris Tzemos (Slackel Creator) <djemos@slackel.gr>
http://www.slackel.gr/repo/x86_64/current yes yes Dimitris Tzemos (Slackel Creator) <djemos@slackel.gr>
http://slackware.osuosl.org/slackware-13.37 yes yes Slackware Linux Project <security@slackware.com>
http://slackware.osuosl.org/slackware-14.0 yes yes Slackware Linux Project <security@slackware.com>
http://slackware.osuosl.org/slackware64-13.37 yes yes Slackware Linux Project <security@slackware.com>
http://slackware.osuosl.org/slackware64-14.0 yes yes Slackware Linux Project <security@slackware.com>
http://slackware.osuosl.org/slackware-14.1 yes yes Slackware Linux Project <security@slackware.com>
http://slackware.osuosl.org/slackware-current yes yes Slackware Linux Project <security@slackware.com>
http://slackware.osuosl.org/slackware64-14.1 yes yes Slackware Linux Project <security@slackware.com>
http://slackware.osuosl.org/slackware64-current yes yes Slackware Linux Project <security@slackware.com>
http://connochaetos.org/slack-n-free/slack-n-free-14.1 yes yes Henry Jensen <hjensen@connochaetos.org>
http://connochaetos.org/slack-n-free/slack-n-free64-14.1 yes yes Henry Jensen <hjensen@connochaetos.org>
http://download.salixos.org/i486/13.37 yes yes Salix Admin (The Bonsai OS) <salix.admin@gmail.com>
http://download.salixos.org/i486/14.0 yes yes Salix Admin (The Bonsai OS) <salix.admin@gmail.com>
http://download.salixos.org/i486/14.1 yes yes Salix Admin (The Bonsai OS) <salix.admin@gmail.com>
http://download.salixos.org/i486/14.2 yes yes Salix Admin (The Bonsai OS) <salix.admin@gmail.com>
http://download.salixos.org/x86_64/13.37 yes yes Salix Admin (The Bonsai OS) <salix.admin@gmail.com>
http://download.salixos.org/x86_64/14.0 yes yes Salix Admin (The Bonsai OS) <salix.admin@gmail.com>
http://download.salixos.org/x86_64/14.1 yes yes Salix Admin (The Bonsai OS) <salix.admin@gmail.com>
http://download.salixos.org/x86_64/14.2 yes yes Salix Admin (The Bonsai OS) <salix.admin@gmail.com>
http://ngc891.blogdns.net/pub/slacke18/slackware-14.1 yes yes Jérôme Pinot <ngc891@gmail.com>
http://ngc891.blogdns.net/pub/slacke18/slackware64-14.1 yes yes Jérôme Pinot <ngc891@gmail.com>
http://ngc891.blogdns.net/pub/slacke18/slackwarearm-14.1 yes yes Jérôme Pinot <ngc891@gmail.com>
http://panos.slackonly.com/pub/packages/14.1-x86 yes yes Panagiotis Nikolaou (slackware user) <hostmaster@slackonly.com>
http://panos.slackonly.com/pub/packages/14.1-x86_64 yes yes Panagiotis Nikolaou (slackware user) <hostmaster@slackonly.com>
http://panos.slackonly.com/pub/packages/current-x86 yes yes Panagiotis Nikolaou (slackware user) <hostmaster@slackonly.com>
http://panos.slackonly.com/pub/packages/current-x86_64 yes yes Panagiotis Nikolaou (slackware user) <hostmaster@slackonly.com>
http://repository.slacky.eu/slackware-13.37 yes yes Slacky.eu packagers (packages by Slacky.eu) <packages@slacky.it>
http://repository.slacky.eu/slackware-14.0 yes yes Slacky.eu packagers (packages by Slacky.eu) <packages@slacky.it>
http://repository.slacky.eu/slackware-14.1 yes yes Slacky.eu packagers (packages by Slacky.eu) <packages@slacky.it>
http://repository.slacky.eu/slackware64-13.37 yes yes Slacky.eu packagers (packages by Slacky.eu) <packages@slacky.it>
http://repository.slacky.eu/slackware64-14.0 yes yes Slacky.eu packagers (packages by Slacky.eu) <packages@slacky.it>
http://repository.slacky.eu/slackware64-14.1 yes yes Slacky.eu packagers (packages by Slacky.eu) <packages@slacky.it>
http://rlworkman.net/pkgs/13.37 yes yes Robby Workman <rworkman@slackware.com>
http://rlworkman.net/pkgs/14.0 yes yes Robby Workman <rworkman@slackware.com>
http://rlworkman.net/pkgs/14.1 yes yes Robby Workman <rworkman@slackware.com>
http://rlworkman.net/pkgs/current yes yes Robby Workman <rworkman@slackware.com>
http://slack.conraid.net/repository yes yes Corrado Franco (Conraid) <conraid@gmail.com>
http://slackware.org.uk/msb/14.0/1.6/x86 yes yes MATE SlackBuilds <mateslackbuilds@gmail.com>
http://slackware.org.uk/msb/14.0/1.6/x86_64 yes yes MATE SlackBuilds <mateslackbuilds@gmail.com>
http://slackware.org.uk/msb/14.1/1.10/x86 yes yes MATE SlackBuilds <mateslackbuilds@gmail.com>
http://slackware.org.uk/msb/14.1/1.10/x86_64 yes yes MATE SlackBuilds <mateslackbuilds@gmail.com>
http://slackware.org.uk/msb/14.1/1.12/x86 yes yes MATE SlackBuilds <mateslackbuilds@gmail.com>
http://slackware.org.uk/msb/14.1/1.12/x86_64 yes yes MATE SlackBuilds <mateslackbuilds@gmail.com>
http://slackware.org.uk/msb/14.1/1.6/x86 yes yes MATE SlackBuilds <mateslackbuilds@gmail.com>
http://slackware.org.uk/msb/14.1/1.6/x86_64 yes yes MATE SlackBuilds <mateslackbuilds@gmail.com>
http://slackware.org.uk/msb/14.1/1.8/x86 yes yes MATE SlackBuilds <mateslackbuilds@gmail.com>
http://slackware.org.uk/msb/14.1/1.8/x86_64 yes yes MATE SlackBuilds <mateslackbuilds@gmail.com>
http://slackware.org.uk/msb/testing/1.12/x86_64 yes yes MATE SlackBuilds <mateslackbuilds@gmail.com>
http://slackware.org.uk/msb/testing/1.14/x86_64 yes yes MATE SlackBuilds <mateslackbuilds@gmail.com>
http://slakfinder.org/slackpkg+ yes yes Matteo Rossini <zerouno@slacky.it>
http://slakfinder.org/slackpkg+dev yes yes Matteo Rossini <zerouno@slacky.it>
http://slint.fr/packages/14.0-i486 yes yes Didier Spaier <didier@slint.fr>
http://slint.fr/packages/14.0-x86_64 yes yes Didier Spaier <didier@slint.fr>
http://slint.fr/packages/14.1-i486 yes yes Didier Spaier <didier@slint.fr>
http://slint.fr/packages/14.1-x86_64 yes yes Didier Spaier <didier@slint.fr>
http://slint.fr/packages/14.2-i486 yes yes bad
http://slint.fr/packages/14.2-x86_64 yes yes bad
http://studioware.org/files/packages/slackware-13.37 yes yes Studioware <info@studioware.org>
http://studioware.org/files/packages/slackware-14.0 yes yes Studioware <info@studioware.org>
http://studioware.org/files/packages/slackware-14.1 yes yes Studioware <info@studioware.org>
http://studioware.org/files/packages/slackware64-13.37 yes yes Studioware <info@studioware.org>
http://studioware.org/files/packages/slackware64-14.0 yes yes Studioware <info@studioware.org>
http://studioware.org/files/packages/slackware64-14.1 yes yes Studioware <info@studioware.org>
http://www.microlinux.fr/microlinux/desktop-14.1-32bit yes yes Niki Kovacs <info@microlinux.fr>
http://www.microlinux.fr/microlinux/desktop-14.1-64bit yes yes Niki Kovacs <info@microlinux.fr>
http://www.microlinux.fr/microlinux/desktop-14.2-32bit yes yes Niki Kovacs <info@microlinux.fr>
http://www.microlinux.fr/microlinux/desktop-14.2-64bit yes yes Niki Kovacs <info@microlinux.fr>
http://www.microlinux.fr/microlinux/extras-14.1-32bit yes yes Niki Kovacs <info@microlinux.fr>
http://www.microlinux.fr/microlinux/extras-14.1-64bit yes yes Niki Kovacs <info@microlinux.fr>
http://www.microlinux.fr/microlinux/extras-14.2-32bit yes yes Niki Kovacs <info@microlinux.fr>
http://www.microlinux.fr/microlinux/extras-14.2-64bit yes yes Niki Kovacs <info@microlinux.fr>
http://www.microlinux.fr/microlinux/server-14.0-32bit yes yes Niki Kovacs <info@microlinux.fr>
http://www.microlinux.fr/microlinux/server-14.0-64bit yes yes Niki Kovacs <info@microlinux.fr>
http://www.microlinux.fr/microlinux/server-14.1-32bit yes yes Niki Kovacs <info@microlinux.fr>
http://www.microlinux.fr/microlinux/server-14.1-64bit yes yes Niki Kovacs <info@microlinux.fr>
http://www.microlinux.fr/microlinux/server-14.2-32bit yes yes Niki Kovacs <info@microlinux.fr>
http://www.microlinux.fr/microlinux/server-14.2-64bit yes yes Niki Kovacs <info@microlinux.fr>
http://www.slackel.gr/repo/i486/current yes yes Dimitris Tzemos (Slackel Creator) <djemos@slackel.gr>
http://www.slackel.gr/repo/x86_64/current yes yes Dimitris Tzemos (Slackel Creator) <djemos@slackel.gr>

View file

@ -2,26 +2,26 @@ Supported Repositories:
> Supports GPG
> slackpkgplus: http://slakfinder.org/slackpkg+{,dev}/
> multilib: http://bear.alienbase.nl/mirrors/people/alien/multilib/{13.37,14.0,14.1,current}/
> alienbob: http://bear.alienbase.nl/mirrors/people/alien/sbrepos/{13.37,14.0,14.1,current}/{x86,x86_64}/
> ktown: http://bear.alienbase.nl/mirrors/alien-kde/{13.37,14.0,14.1,current}/{latest,5}/{x86,x86_64}/
> restricted: http://bear.alienbase.nl/mirrors/people/alien/restricted_sbrepos/{13.37,14.0,14.1,current}/{x86,x86_64}/
> slacky: http://repository.slacky.eu/slackware{,64}-{13.37,14.0,14.1}/
> multilib: http://bear.alienbase.nl/mirrors/people/alien/multilib/{13.37,14.0,14.1,14.2,current}/
> alienbob: http://bear.alienbase.nl/mirrors/people/alien/sbrepos/{13.37,14.0,14.1,14.2,current}/{x86,x86_64}/
> ktown: http://bear.alienbase.nl/mirrors/alien-kde/{13.37,14.0,14.1,14.2,current}/{latest,5}/{x86,x86_64}/
> restricted: http://bear.alienbase.nl/mirrors/people/alien/restricted_sbrepos/{13.37,14.0,14.1,14.2,current}/{x86,x86_64}/
> slacky: http://repository.slacky.eu/slackware{,64}-{13.37,14.0,14.1,14.2}/
> 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.org.uk/msb/{14.0,14.1,testing}/{1.6,1.8,1.10,1.12}/{x86,x86_64}/
> slackers: http://ponce.cc/slackers/repository/
> slacke18: http://ngc891.blogdns.net/pub/slacke18/slackware{,64,arm}-14.1/
> studioware: http://studioware.org/files/packages/slackware{,64}-{13.37,14.0,14.1}/
> slackonly: http://packages.slackonly.com/pub/packages/{14.1,current}-{x86,x86_64}/
> rlworkman: http://rlworkman.net/pkgs/{13.37,14.0,14.1,current}/
> msb: http://slackware.org.uk/msb/{14.0,14.1,14.2,testing}/{1.6,1.8,1.10,1.12,1.14}/{x86,x86_64}/
> slackers: http://slack.conraid.net/repository/
> slacke18: http://ngc891.blogdns.net/pub/slacke18/slackware{,64,arm}-{14.1,14.2}/
> studioware: http://studioware.org/files/packages/slackware{,64}-{13.37,14.0,14.1,14.2}/
> slackonly: http://panos.slackonly.com/pub/packages/{14.1,14.2,current}-{x86,x86_64}/
> rlworkman: http://rlworkman.net/pkgs/{13.37,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/
> slint: http://slint.fr/packages/{14.0,14.1}-{i486,x86_64}/
> connochaetos: http://connochaetos.org/slack-n-free/slack-n-free{,64}-{14.1,14.2}/
> slint: http://slint.fr/packages/{14.0,14.1,14.2}-{i486,x86_64}/
>
> Partial GPG support
> salixos(*): http://download.salixos.org/{i486,x86_64}/{13.37,14.0,14.1}/
> salixos(*): http://download.salixos.org/{i486,x86_64}/{13.37,14.0,14.1,14.2}/
(*) salixos partially supports GPG. These repositories contains the .asc file
for CHECKSUMS.md5, so the 'update' process works with CHECKGPG=on and repository authenticity

View file

@ -371,9 +371,9 @@ if [ "$SLACKPKGPLUS" = "on" ];then
TOCACHE=0
case $SRCBASE in
CHECKSUMS.md5|CHECKSUMS.md5.asc) TOCACHE=1 ; CURREPO=$(basename $1|sed -r -e "s/CHECKSUMS.md5-?//" -e "s/\.asc//") ;;
CHECKSUMS.md5|CHECKSUMS.md5.asc|CHECKSUMS.md5.gz|CHECKSUMS.md5.gz.asc) TOCACHE=1 ; CURREPO=$(basename $1|sed -r -e "s/CHECKSUMS.md5-?//" -e "s/\.asc//" -e "s/\.gz//") ;;
MANIFEST.bz2|PACKAGES.TXT) TOCACHE=1 ; CURREPO=$(basename $1|sed -e "s/-$SRCBASE//" -e "s/SLACKPKGPLUS_//");;
ChangeLog.txt) TOCACHE=1 ; CURREPO=$(basename $1|sed -e "s/ChangeLog-//" -e "s/\.txt//") ;;
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 ;;
esac
@ -385,10 +385,18 @@ if [ "$SLACKPKGPLUS" = "on" ];then
[ $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 ^Date:|sed 's/ //' > $TMPDIR/cache.head
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
echo " Trying parent URL ($LEVEL) "
else
echo " Not Found."
fi
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/^/ /')
@ -534,6 +542,9 @@ if [ "$SLACKPKGPLUS" = "on" ];then
echo " Remember to import keys by launching 'slackpkg update gpg'."
echo
sleep 5
echo "Repository '$PREPO' FAILS the CHECKSUMS.md5 signature check." >> $TMPDIR/error.log
echo "Try to run 'slackpkg update gpg'" >> $TMPDIR/error.log
echo >> $TMPDIR/error.log
echo > ${TMPDIR}/CHECKSUMS.md5-$PREPO
fi
else
@ -562,6 +573,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then
cat $WORKDIR/ChangeLog.txt > $WORKDIR/Unified-ChangeLog.txt
for PREPO in ${REPOPLUS[*]}; do
echo "======== Repository: $PREPO ========" >>${WORKDIR}/Unified-ChangeLog.txt
BASEDIR=${MIRRORPLUS[${PREPO/SLACKPKGPLUS_}]%}
CLOGNAM=ChangeLog-$PREPO.txt
@ -576,7 +588,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then
LEVEL=1
while [ ! -s ${TMPDIR}/$CLOGNAM ] && [ $LEVEL -le $LIMIT ] ; do
URLFILE=$BASEDIR/ChangeLog.txt
URLFILE=${BASEDIR%/}/ChangeLog.txt
if echo $URLFILE | grep -q "^file://" ; then
URLFILE=${URLFILE:6}
@ -815,6 +827,9 @@ if [ "$SLACKPKGPLUS" = "on" ];then
AUTOP=no
if [[ "$CMD" == "upgrade" || "$CMD" == "upgrade-all" ]];then
( cd $ROOT/var/log/packages
ls $ARGUMENT-*-*-* 2>/dev/null|sed 's/$/.txz/' | awk -f /usr/libexec/slackpkg/pkglist.awk|awk '{print $1}'|grep -q " $ARGUMENT "
)||return
if [ ! -z "$AUTOPRIORITY" ];then
if echo "$ARGUMENT"|grep -wq $AUTOPRIORITY;then
AUTOP=$TAG_PRIORITY
@ -832,9 +847,10 @@ if [ "$SLACKPKGPLUS" = "on" ];then
cd $ROOT/var/log/packages
ls $ARGUMENT-* 2>/dev/null |sed 's/$/.txz/' | awk -f /usr/libexec/slackpkg/pkglist.awk|
grep " $ARGUMENT "|awk '{print $1,$4}'|
( read X
( read X && (
echo "$X"|sed -r -e 's/ [0-9]+([^0-9].*)*$/ [^ ]\\+ [^ ]\\+ [0-9]\\+\1 /' -e 's/^/ /'
echo "$X"|sed -r -e 's/ [0-9]+([^0-9].*)*$/ [^ ]\\+ [^ ]\\+ [0-9]\\+\1_slack[0-9]/' -e 's/^/ /'
)
)| grep -f - -n -m 1 ${TMPDIR}/pkglist
)
fi
@ -1488,7 +1504,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then
fi
SPKGPLUS_VERSION="1.7.b4.1"
SPKGPLUS_VERSION="1.7.b4.2"
VERSION="$VERSION / slackpkg+ $SPKGPLUS_VERSION"