From 582416e29e10bce4a2f25ceaabe807ff4100f9ea Mon Sep 17 00:00:00 2001 From: Matteo Rossini Date: Tue, 13 Jul 2021 21:38:05 +0200 Subject: [PATCH] Merge master Fri Jul 9 00:47:35 CEST 2021 pkg/slackpkg+-1.7.7-noarch-1mt.txz: - Added support for SBo-current repository (by cgit ponce) - slackpkg download can download SBo scripts - Replaced SBOURL with array SBO to allow multiple repository. please do not change the default value. +-------------------------+ Sun Jul 4 23:51:46 CEST 2021 pkg/slackpkg+-1.7.6-noarch-9mt.txz: Rebuilt - Just updated repositories in documentation and in sample config file. Note that some repository now force ssl, and bear.alienbase.ln moved to slackware.nl and www.slakfinder.org moved to slakfinder.org. If not explicitly put it in configuration files, the cached downloader may not work properly. So it's important update slackpkgplus.conf +-------------------------+ Sun Jul 4 19:57:22 CEST 2021 pkg/slackpkg+-1.7.6-noarch-8mt.txz: Rebuilt - slackpkg update now force to download all metadata if conf file change (thanks to chrisretusn) - 'slackpkg download ' works +-------------------------+ --- ChangeLog.txt | 24 ++++++++ src/CHANGES | 11 ++-- src/ChangeLog.txt | 24 ++++++++ src/README | 18 ++++-- src/repositories.lst | 100 ++++++++++++++++++++------------- src/repositories.txt | 12 ++-- src/slackpkgplus.conf.5 | 16 +++--- src/slackpkgplus.conf.5.it | 14 ++--- src/slackpkgplus.sh | 14 ++--- src/slackpkgplus.x86.sample | 20 +++---- src/slackpkgplus.x86_64.sample | 25 ++++----- src/zchangelog.sh | 8 +-- 12 files changed, 178 insertions(+), 108 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index f3e7d48..f598d04 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,27 @@ +Fri Jul 9 00:47:35 CEST 2021 +pkg/slackpkg+-1.7.7-noarch-1mt.txz: + - Added support for SBo-current repository (by cgit ponce) + - slackpkg download can download SBo scripts + - Replaced SBOURL with array SBO to allow multiple repository. please + do not change the default value. ++-------------------------+ + +Sun Jul 4 23:51:46 CEST 2021 +pkg/slackpkg+-1.7.6-noarch-9mt.txz: Rebuilt + - Just updated repositories in documentation and in sample config + file. Note that some repository now force ssl, and bear.alienbase.ln + moved to slackware.nl and www.slakfinder.org moved to slakfinder.org. + If not explicitly put it in configuration files, the cached downloader + may not work properly. So it's important update slackpkgplus.conf ++-------------------------+ + +Sun Jul 4 19:57:22 CEST 2021 +pkg/slackpkg+-1.7.6-noarch-8mt.txz: Rebuilt + - slackpkg update now force to download all metadata if conf file + change (thanks to chrisretusn) + - 'slackpkg download ' works ++-------------------------+ + Fri Jun 11 16:25:43 CEST 2021 pkg/slackpkg+-1.7.6-noarch-7mt.txz: Rebuilt - Removed bash completion file (already included in slackpkg) diff --git a/src/CHANGES b/src/CHANGES index 61f2375..b82cdbd 100644 --- a/src/CHANGES +++ b/src/CHANGES @@ -1,6 +1,6 @@ = Full Changes list = -== From 1.7 to 1.7.6 == +== From 1.7 to 1.7.7 == *Configuration file: @@ -8,7 +8,8 @@ - Changed some default settings in sample configuration file -- Added SBOURL to configure the SlackBuild.org repository (search only) +- Added SBO to configure the SlackBuild.org repository (search and download). + Please do not touch the default values. - Added USETERSE to use the --terse mode for pkgtools @@ -33,8 +34,9 @@ ignore. For example a failure installing packages. - Added SBo support. This does not replace sbopkg. It just search in - SlackBuilds.org and report the url to download to build and install - packages yourself. + SlackBuilds.org and report the presence of the package; he can download + if via 'slackpkg download ', then build and install + packages himself. - Added httpdir/httpsdir/ftpdir repositories. These repositories does not need metadatas (CHECKSUMS.md5 ...), simple a remote directory listing @@ -59,6 +61,7 @@ set PLUGIN_ZCHANGELOG_SHOW=on to print changelog on stdout For details read notes in the code: /usr/libexec/slackpkg/functions.d/zchangelog.sh + It does not support SBo repositories *BugFixes diff --git a/src/ChangeLog.txt b/src/ChangeLog.txt index f3e7d48..f598d04 100644 --- a/src/ChangeLog.txt +++ b/src/ChangeLog.txt @@ -1,3 +1,27 @@ +Fri Jul 9 00:47:35 CEST 2021 +pkg/slackpkg+-1.7.7-noarch-1mt.txz: + - Added support for SBo-current repository (by cgit ponce) + - slackpkg download can download SBo scripts + - Replaced SBOURL with array SBO to allow multiple repository. please + do not change the default value. ++-------------------------+ + +Sun Jul 4 23:51:46 CEST 2021 +pkg/slackpkg+-1.7.6-noarch-9mt.txz: Rebuilt + - Just updated repositories in documentation and in sample config + file. Note that some repository now force ssl, and bear.alienbase.ln + moved to slackware.nl and www.slakfinder.org moved to slakfinder.org. + If not explicitly put it in configuration files, the cached downloader + may not work properly. So it's important update slackpkgplus.conf ++-------------------------+ + +Sun Jul 4 19:57:22 CEST 2021 +pkg/slackpkg+-1.7.6-noarch-8mt.txz: Rebuilt + - slackpkg update now force to download all metadata if conf file + change (thanks to chrisretusn) + - 'slackpkg download ' works ++-------------------------+ + Fri Jun 11 16:25:43 CEST 2021 pkg/slackpkg+-1.7.6-noarch-7mt.txz: Rebuilt - Removed bash completion file (already included in slackpkg) diff --git a/src/README b/src/README index b79e12b..f111059 100644 --- a/src/README +++ b/src/README @@ -308,11 +308,11 @@ You can: For example, you may use this function to install a snapshot of slackpkg+ (that is not available with 'slackpkg upgrade slackpkg+' because it is a beta version): - # slackpkg upgrade http://www.slakfinder.org/slackpkg+/pkg/slackpkg+-1.7.0-noarch-1mt.txz + # slackpkg upgrade https://slakfinder.org/slackpkg+/pkg/slackpkg+-1.7.0-noarch-1mt.txz 2) install/upgrade/reinstall all packages in a single remote directory (but not in a subtree) even if the site owner does not create metadata: - # slackpkg install http://www.slakfinder.org/slackpkg+/pkg/ + # slackpkg install https://slakfinder.org/slackpkg+/pkg/ Note: this function requires lftp and may fail if the server does not support Directory Listing or if there is a index.html in the path. @@ -412,9 +412,9 @@ 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/ + https://slackware.nl/people/alien/multilib/current/ has not the ChangeLog.txt in tree, but it is placed in parent directory: - http://bear.alienbase.nl/mirrors/people/alien/multilib/ChangeLog.txt + https://slackware.nl/people/alien/multilib/current/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 @@ -535,12 +535,18 @@ Note that a short pattern may match many many packages. ----- -SBOURL +SBO -'slackpkg search' allow you to search packages in SlackBuilds.org. +'slackpkg search' allow you to search packages in SlackBuilds.org 14.2 and +current. Note that slackpkg+ does not replace sbopkg or other similar tools. slackpkg+ show you the url of the SlackBuild, then you have to manually download, build and install it, or use sbopkg to do that. +Note that slackpkg+ does not replace sbopkg o similar tools, but is only +useful to know if a package is present on SBo. +The user can download it via 'slackpkg download ', then build it, +or he can use sbopkg instead. + ----- diff --git a/src/repositories.lst b/src/repositories.lst index c291464..0154df3 100644 --- a/src/repositories.lst +++ b/src/repositories.lst @@ -1,40 +1,62 @@ -Wed Feb 24 21:28:19 CET 2021 +Fri Jul 9 00:02:44 CEST 2021 -url size date gpg -http://mirrors.slackware.com/slackware/slackware-14.2 702459 2016/06/29 21:42:35 Slackware Linux Project -http://mirrors.slackware.com/slackware/slackware-current 839576 2021/02/23 23:06:14 Slackware Linux Project -http://mirrors.slackware.com/slackware/slackware64-14.2 704195 2016/06/29 21:49:56 Slackware Linux Project -http://mirrors.slackware.com/slackware/slackware64-current 842306 2021/02/23 23:08:39 Slackware Linux Project -http://slakfinder.org/slackpkg+ 625 2021/02/15 23:06:35 Matteo Rossini -http://slakfinder.org/slackpkg+1.7 625 2021/02/15 23:06:35 Matteo Rossini -http://slakfinder.org/slackpkg+15 45 2021/02/15 21:34:44 Matteo Rossini -http://slakfinder.org/slackpkg+dev 45 2021/02/15 21:34:44 Matteo Rossini -http://www.slackel.gr/repo/i486/current 662147 2021/02/24 20:18:05 Dimitris Tzemos (Slackel Creator) -http://www.slackel.gr/repo/x86_64/current 705798 2021/02/24 20:10:29 Dimitris Tzemos (Slackel Creator) -https://alien.slackbook.org/ktown 5061 2020/12/08 17:59:06 Eric Hameleers (Alien BOB) -https://bear.alienbase.nl/mirrors/alien-kde/current/5/x86 528 2020/12/27 14:41:14 Eric Hameleers (Alien BOB) -https://bear.alienbase.nl/mirrors/alien-kde/current/5/x86_64 530 2020/12/27 14:41:13 Eric Hameleers (Alien BOB) -https://bear.alienbase.nl/mirrors/people/alien/multilib/14.2 144621 2021/02/16 08:03:11 Eric Hameleers (IBM Linux) -https://bear.alienbase.nl/mirrors/people/alien/multilib/current 185561 2021/02/16 08:05:26 Eric Hameleers (IBM Linux) -https://bear.alienbase.nl/mirrors/people/alien/restricted_sbrepos/14.2/x86 3754 2021/01/26 09:41:50 Eric Hameleers -https://bear.alienbase.nl/mirrors/people/alien/restricted_sbrepos/14.2/x86_64 3767 2021/01/26 09:41:58 Eric Hameleers -https://bear.alienbase.nl/mirrors/people/alien/restricted_sbrepos/current/x86 3754 2021/01/26 09:41:59 Eric Hameleers -https://bear.alienbase.nl/mirrors/people/alien/restricted_sbrepos/current/x86_64 3767 2021/01/26 09:42:01 Eric Hameleers -https://bear.alienbase.nl/mirrors/people/alien/sbrepos/14.2/x86 229758 2021/02/18 17:10:09 Eric Hameleers -https://bear.alienbase.nl/mirrors/people/alien/sbrepos/14.2/x86_64 230635 2021/02/18 17:11:30 Eric Hameleers -https://bear.alienbase.nl/mirrors/people/alien/sbrepos/current/x86 294665 2021/02/18 17:12:48 Eric Hameleers -https://bear.alienbase.nl/mirrors/people/alien/sbrepos/current/x86_64 296081 2021/02/18 17:13:40 Eric Hameleers -https://download.salixos.org/i486/14.2 542435 2021/02/23 11:48:27 Salix Admin (The Bonsai OS) -https://download.salixos.org/i486/15.0 85428 2021/02/23 11:44:13 no -https://download.salixos.org/i486/extra-14.2 1922858 2020/12/23 23:29:27 Salix Admin (The Bonsai OS) -https://download.salixos.org/x86_64/14.2 548225 2021/02/23 11:49:11 Salix Admin (The Bonsai OS) -https://download.salixos.org/x86_64/15.0 86590 2021/02/23 11:44:54 no -https://download.salixos.org/x86_64/extra-14.2 1922728 2020/12/23 23:30:51 Salix Admin (The Bonsai OS) -https://packages.slackonly.com/pub/packages/14.2-x86 4525711 2017/08/07 00:38:53 Panagiotis Nikolaou (slackware user) -https://packages.slackonly.com/pub/packages/14.2-x86_64 5078675 2020/04/28 00:56:41 Panagiotis Nikolaou (slackware user) -https://packages.slackonly.com/pub/packages/current-x86 2795351 2017/05/08 05:25:15 Panagiotis Nikolaou (slackware user) -https://packages.slackonly.com/pub/packages/current-x86_64 3215041 2017/09/11 20:00:50 Panagiotis Nikolaou (slackware user) -https://rlworkman.net/pkgs/14.2 53979 2017/12/22 09:39:05 Robby Workman -https://rlworkman.net/pkgs/current 45 2020/12/28 08:05:02 Robby Workman -https://slacky.eu/repository/slackware-14.2 28134 2020/01/31 01:13:00 Slacky.eu packagers (packages by Slacky.eu) -https://slacky.eu/repository/slackware64-14.2 42698 2020/01/31 05:29:10 Slacky.eu packagers (packages by Slacky.eu) +url size date gpg +http://www.slackel.gr/repo/i486/current 666967 2021/07/01 21:05:18 Dimitris Tzemos (Slackel Creator) +http://www.slackel.gr/repo/x86_64/current 711274 2021/07/02 08:11:56 Dimitris Tzemos (Slackel Creator) +https://alien.slackbook.org/ktown 5061 2020/12/08 17:59:06 Eric Hameleers (Alien BOB) +https://download.salixos.org/i486/14.2 543479 2021/06/01 11:17:04 Salix Admin (The Bonsai OS) +https://download.salixos.org/i486/15.0 85429 2021/06/01 11:14:45 no +https://download.salixos.org/i486/extra-14.2 1922858 2020/12/23 23:29:27 Salix Admin (The Bonsai OS) +https://download.salixos.org/x86_64/14.2 549271 2021/06/01 11:17:53 Salix Admin (The Bonsai OS) +https://download.salixos.org/x86_64/15.0 86591 2021/06/01 11:15:25 no +https://download.salixos.org/x86_64/extra-14.2 1922728 2020/12/23 23:30:51 Salix Admin (The Bonsai OS) +https://mirrors.slackware.com/slackware/slackware-14.2 702459 2016/06/29 21:42:35 Slackware Linux Project +https://mirrors.slackware.com/slackware/slackware-current 848431 2021/07/07 22:52:20 Slackware Linux Project +https://mirrors.slackware.com/slackware/slackware64-14.2 704195 2016/06/29 21:49:56 Slackware Linux Project +https://mirrors.slackware.com/slackware/slackware64-current 851214 2021/07/07 22:54:48 Slackware Linux Project +https://packages.slackonly.com/pub/packages/14.2-x86 4525711 2017/08/07 00:38:53 Panagiotis Nikolaou (slackware user) +https://packages.slackonly.com/pub/packages/14.2-x86_64 5078675 2020/04/28 00:56:41 Panagiotis Nikolaou (slackware user) +https://packages.slackonly.com/pub/packages/current-x86 2795351 2017/05/08 05:25:15 Panagiotis Nikolaou (slackware user) +https://packages.slackonly.com/pub/packages/current-x86_64 3215041 2017/09/11 20:00:50 Panagiotis Nikolaou (slackware user) +https://rlworkman.net/pkgs/14.2 53979 2017/12/22 09:39:05 Robby Workman +https://rlworkman.net/pkgs/current 45 2020/12/28 08:05:02 Robby Workman +https://slack.conraid.net/repository/slackware64-current-extra 45 2020/12/07 16:24:07 Corrado Franco (Conraid) +https://slack.conraid.net/repository/slackware64-current-testing 9708 2021/07/07 08:21:18 Corrado Franco (Conraid) +https://slackware.nl/alien-kde/current/5/x86 528 2020/12/27 14:41:14 Eric Hameleers (Alien BOB) +https://slackware.nl/alien-kde/current/5/x86_64 530 2020/12/27 14:41:13 Eric Hameleers (Alien BOB) +https://slackware.nl/people/alien/multilib/14.2 144621 2021/06/16 22:08:26 Eric Hameleers (IBM Linux) +https://slackware.nl/people/alien/multilib/current 189479 2021/06/16 22:09:26 Eric Hameleers (IBM Linux) +https://slackware.nl/people/alien/restricted_sbrepos/14.2/x86 3754 2021/06/23 21:41:57 Eric Hameleers +https://slackware.nl/people/alien/restricted_sbrepos/14.2/x86_64 3767 2021/06/23 21:41:56 Eric Hameleers +https://slackware.nl/people/alien/restricted_sbrepos/current/x86 3752 2021/06/23 21:41:47 Eric Hameleers +https://slackware.nl/people/alien/restricted_sbrepos/current/x86_64 3765 2021/06/23 21:41:46 Eric Hameleers +https://slackware.nl/people/alien/sbrepos/14.2/x86 230219 2021/07/08 07:48:45 Eric Hameleers +https://slackware.nl/people/alien/sbrepos/14.2/x86_64 234386 2021/07/08 07:46:42 Eric Hameleers +https://slackware.nl/people/alien/sbrepos/current/x86 304497 2021/07/08 07:44:37 Eric Hameleers +https://slackware.nl/people/alien/sbrepos/current/x86_64 307814 2021/07/08 07:43:07 Eric Hameleers +https://slackware.uk/csb/14.2/x86 29003 2017/12/09 20:21:22 Willy Sudiarto Raharjo +https://slackware.uk/csb/14.2/x86_64 28392 2017/12/09 20:21:12 Willy Sudiarto Raharjo +https://slackware.uk/csb/current/x86_64 20601 2021/06/08 12:36:04 Willy Sudiarto Raharjo +https://slackware.uk/microlinux/desktop-14.2-32bit 151132 2017/04/27 16:16:44 Niki Kovacs +https://slackware.uk/microlinux/desktop-14.2-64bit 151985 2017/04/27 16:16:54 Niki Kovacs +https://slackware.uk/microlinux/extras-14.2-32bit 13626 2017/02/20 19:56:17 Niki Kovacs +https://slackware.uk/microlinux/extras-14.2-64bit 13696 2017/02/20 19:56:29 Niki Kovacs +https://slackware.uk/microlinux/server-14.2-32bit 32597 2017/02/03 09:17:01 Niki Kovacs +https://slackware.uk/microlinux/server-14.2-64bit 32787 2017/02/03 09:17:12 Niki Kovacs +https://slackware.uk/msb/14.2/1.18/x86 30258 2018/05/22 17:28:29 MATE SlackBuilds +https://slackware.uk/msb/14.2/1.18/x86_64 30364 2018/05/22 17:28:40 MATE SlackBuilds +https://slackware.uk/msb/14.2/latest/x86 30258 2018/05/22 17:28:29 MATE SlackBuilds +https://slackware.uk/msb/14.2/latest/x86_64 30364 2018/05/22 17:28:40 MATE SlackBuilds +https://slackware.uk/msb/current/1.24/x86_64 26454 2021/04/09 03:43:29 MATE SlackBuilds +https://slackware.uk/msb/current/latest/x86_64 26454 2021/04/09 03:43:29 MATE SlackBuilds +https://slackware.uk/slint/i586/slint-14.2 40483 2021/06/29 15:11:51 Didier Spaier +https://slackware.uk/slint/x86_64/slint-14.2 41273 2021/06/29 15:12:07 Didier Spaier +https://slackware.uk/slint/x86_64/slint-14.2.1 756414 2021/06/29 15:12:44 Didier Spaier +https://slackware.uk/slint/x86_64/slint-wip 5195 2021/06/29 15:12:51 Didier Spaier +https://slackware.uk/studioware/14.2 112985 2018/01/13 03:11:17 Studioware +https://slacky.eu/repository/slackware-14.2 28134 2020/01/31 01:13:00 Slacky.eu packagers (packages by Slacky.eu) +https://slacky.eu/repository/slackware64-14.2 42698 2020/01/31 05:29:10 Slacky.eu packagers (packages by Slacky.eu) +https://slakfinder.org/slackpkg+ 625 2021/02/15 23:06:35 Matteo Rossini +https://slakfinder.org/slackpkg+1.7 625 2021/02/15 23:06:35 Matteo Rossini +https://slakfinder.org/slackpkg+15 45 2021/07/04 00:53:58 Matteo Rossini +https://slakfinder.org/slackpkg+dev 624 2021/07/07 19:23:52 Matteo Rossini diff --git a/src/repositories.txt b/src/repositories.txt index 5d01a67..2d28534 100644 --- a/src/repositories.txt +++ b/src/repositories.txt @@ -1,10 +1,10 @@ Supported Repositories: -> slackpkgplus: http://slakfinder.org/slackpkg+{,dev,1.7,15}/ -> multilib: https://bear.alienbase.nl/mirrors/people/alien/multilib/{14.2,current}/ -> alienbob: https://bear.alienbase.nl/mirrors/people/alien/sbrepos/{14.2,current}/{x86,x86_64}/ -> ktown: https://bear.alienbase.nl/mirrors/alien-kde/{14.2,current}/5/{x86,x86_64}/ -> restricted: https://bear.alienbase.nl/mirrors/people/alien/restricted_sbrepos/{14.2,current}/{x86,x86_64}/ +> slackpkgplus: https://slakfinder.org/slackpkg+{,dev,1.7,15}/ +> multilib: https://slackware.nl/people/alien/multilib/{14.2,current}/ +> alienbob: https://slackware.nl/people/alien/sbrepos/{14.2,current}/{x86,x86_64}/ +> ktown: https://slackware.nl/alien-kde/{14.2,current}/5/{x86,x86_64}/ +> restricted: https://slackware.nl/people/alien/restricted_sbrepos/{14.2,current}/{x86,x86_64}/ > slacky: https://slacky.eu/repository/slackware{,64}-{14.2}/ > mleddesktop: https://slackware.uk/microlinux/desktop-{14.2}-{32,64}bit/ > mledextras: https://slackware.uk/microlinux/extras-{14.2}-{32,64}bit/ @@ -58,4 +58,4 @@ Please read /usr/doc/slackpkg+-*/README for more details Slackware repositories: -http://mirrors.slackware.com/slackware/slackware{,64}-{14.2,current} +https://mirrors.slackware.com/slackware/slackware{,64}-{14.2,current} diff --git a/src/slackpkgplus.conf.5 b/src/slackpkgplus.conf.5 index 260f07f..d6f764d 100644 --- a/src/slackpkgplus.conf.5 +++ b/src/slackpkgplus.conf.5 @@ -34,7 +34,7 @@ Here is the list of available settings: \fBMain settings\fP .ds 1 SLACKPKGPLUS\t\t\ton/off\t\ton\t\tyes -.ds 2 MIRRORPLUS\t\t\tstring\t\t-\t\tno +.ds 2 MIRRORPLUS[]\t\t\tstrings\t\t-\t\tno .ds 3 REPOPLUS\t\t\t\tlist\t\t\t-\t\tno .ds 4 PKGS_PRIORITY\t\t\tlist\t\t\t-\t\tno .ds 5 TAG_PRIORITY\t\t\ton/off\t\toff\t\tyes @@ -54,7 +54,7 @@ Here is the list of available settings: \fBDownload settings\fP .ds 1 VERBOSE\t\t\t\t0,1,2,3\t\t1\t\tyes .ds 2 USETERSE\t\t\t\ton/off\t\toff\t\tyes -.ds 3 PROXY\t\t\t\tstrings\t\t-\t\tyes +.ds 3 PROXY\t\t\t\tstring\t\t-\t\tyes .ds 4 WGETOPTS\t\t\t\tstring\t\t-\t\tyes .ds 5 DOWNLOADCMD\t\t\tstring\t\twget\t\tyes .ds 6 DOWNLOADONLY\t\t\ton/off\t\toff\t\tyes @@ -89,7 +89,7 @@ Here is the list of available settings: .ds 4 GREYLIST\t\t\t\ton/off\t\ton\t\tyes .ds 5 SENSITIVE_SEARCH\t\ton/off\t\ton\t\tyes .ds 6 WW_FILE_SEARCH\t\t\ton/off\t\ton\t\tyes -.ds 7 SBOURL\t\t\t\tstring\t\t-\t\tno +.ds 7 SBO[]\t\t\t\tstrings\t\t-\t\tno .in +2 \*1 .br @@ -144,7 +144,7 @@ You can specify more than one repository by adding multiple lines. Each repository has a name that have must be specified in square brackets. .in +4 -MIRRORPLUS['slackpkgplus']=http://slakfinder.org/slackpkg+/ +MIRRORPLUS['slackpkgplus']=https://slakfinder.org/slackpkg+/ .in You can specify remote repositories in http/https/ftp or local repositories (with or without metadata). @@ -404,13 +404,13 @@ Setting \fB\%WW_FILE_SEARCH\fP=\fIoff\fP command \fB\%file-search\fP will also l Note that the search for too short strings can pull out hundreds and hundreds of results and take a long time. .TP 5 -\fBSBOURL\fP +\fBSBO\fP .br -The \fB\%slackpkg\ search\fP command allow you to search packages in the SlackBuilds.org repository. +The \fB\%slackpkg\ search\fP command allow you to search packages in the SlackBuilds.org repositories for 14.2 and current -\fB\%SBOURL\fP contains the url of SlackBuilds.org repository. It it is not set, the search will be skipped. +\fB\%SBO\fP contains the urls of SlackBuilds.org repository. It it is not set, the search will be skipped. -Note that slackpkg+ does not replace \fB\%sbopkg\fP o similar tools, but is only useful to know if a package is present on SBo. slackpkg+ show you the url, so the user can manually download and compile it, or he can use sbopkg instead. +Note that slackpkg+ does not replace \fB\%sbopkg\fP o similar tools, but is only useful to know if a package is present on SBo. The user can download it via \fB\%slackpkg\ download\ \fP, then build it, or he can use sbopkg instead. .TP 5 diff --git a/src/slackpkgplus.conf.5.it b/src/slackpkgplus.conf.5.it index 99fa6d6..f0f3371 100644 --- a/src/slackpkgplus.conf.5.it +++ b/src/slackpkgplus.conf.5.it @@ -34,7 +34,7 @@ Seguono le differenti impostazioni disponibili: \fBImpostazioni principali\fP .ds 1 SLACKPKGPLUS\t\t\ton/off\t\ton\t\tsi -.ds 2 MIRRORPLUS\t\t\tstringa\t\t-\t\tno +.ds 2 MIRRORPLUS[]\t\t\tstringhe\t\t-\t\tno .ds 3 REPOPLUS\t\t\t\telenco\t\t-\t\tno .ds 4 PKGS_PRIORITY\t\t\telenco\t\t-\t\tno .ds 5 TAG_PRIORITY\t\t\ton/off\t\toff\t\tsi @@ -54,7 +54,7 @@ Seguono le differenti impostazioni disponibili: \fBImpostazioni di download\fP .ds 1 VERBOSE\t\t\t\t0,1,2,3\t\t1\t\tsi .ds 2 USETERSE\t\t\t\ton/off\t\toff\t\tsi -.ds 3 PROXY\t\t\t\tstrings\t\t-\t\tsi +.ds 3 PROXY\t\t\t\tstringa\t\t-\t\tsi .ds 4 WGETOPTS\t\t\t\tstringa\t\t-\t\tsi .ds 5 DOWNLOADCMD\t\t\tstringa\t\twget\t\tsi .ds 6 DOWNLOADONLY\t\t\ton/off\t\toff\t\tsi @@ -89,7 +89,7 @@ Seguono le differenti impostazioni disponibili: .ds 4 GREYLIST\t\t\t\ton/off\t\ton\t\tsi .ds 5 SENSITIVE_SEARCH\t\ton/off\t\ton\t\tsi .ds 6 WW_FILE_SEARCH\t\t\ton/off\t\ton\t\tsi -.ds 7 SBOURL\t\t\t\tstringa\t\t-\t\tno +.ds 7 SBO[]\t\t\t\tstringhe\t\t-\t\tno .in +2 \*1 .br @@ -145,7 +145,7 @@ E' possibile specificare pi Ogni repository ha un nome che va specificato tra parentesi quadre. .in +4 -MIRRORPLUS['slackpkgplus']=http://slakfinder.org/slackpkg+/ +MIRRORPLUS['slackpkgplus']=https://slakfinder.org/slackpkg+/ .in E' possibile specificare repository remoti in http/https/ftp o repository locali (con o senza metadati). @@ -404,11 +404,11 @@ Nota che la ricerca per stringhe troppo corte pu .TP 5 \fBSBOURL\fP .br -Il comando \fB\%slackpkg\ search\fP consente di effettuare la ricerca anche nel repository di SlackBuilds.org. +Il comando \fB\%slackpkg\ search\fP consente di effettuare la ricerca anche nei repository di SlackBuilds.org 14.2 e current. -\fB\%SBOURL\fP contiene l'indirizzo del repository di SlackBuilds.org. Se non viene settata la ricerca non verrà effettuata. +\fB\%SBO\fP contiene gli indirizzi dei repository di SlackBuilds.org. Se non viene settata la ricerca non verrà effettuata. -Nota che slackpkg+ non sostituisce \fB\%sbopkg\fP o altri tool, ma serve solo per sapere se un pacchetto è presente o meno su SBo. slackpkg+ mostra l'url, poi l'utente dovrà scaricarlo e compilarlo manualmente oppure affidarsi a sbopkg. +Nota che slackpkg+ non sostituisce \fB\%sbopkg\fP o altri tool, ma serve solo per sapere se un pacchetto è presente o meno su SBo. L'utente potrà scaricarlo via \fB\%slackpkg\ download\ \fP, poi compilarlo manualmente oppure affidarsi a sbopkg. .TP 5 diff --git a/src/slackpkgplus.sh b/src/slackpkgplus.sh index 2f6c9eb..c83b242 100755 --- a/src/slackpkgplus.sh +++ b/src/slackpkgplus.sh @@ -653,7 +653,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then SBOURL=${SBO[$SBOKEY]} if [ "$SBOKEY" == "current" ];then SBOURL=${SBOURL%/}/ - SBOtag=$(basename $(curl -s $SBOURL|grep "/slackbuilds/tag/?h=" |head -1|grep -oE "href='[^']+'"|cut -f2 -d"'"|grep tar.gz)) + SBOtag=$(basename $(curl --max-time 10 --location -s $SBOURL|grep "/slackbuilds/tag/?h=" |head -1|grep -oE "href='[^']+'"|cut -f2 -d"'"|grep tar.gz)) SBOlast=$(cat $WORKDIR/sbolist_${SBOKEY}.tag 2>/dev/null) if echo $SBOtag|grep -q slackbuilds-current-.*tar.gz && [ "$SBOtag" != "$SBOlast" ];then $DOWNLOADER $TMPDIR/$SBOtag ${SBOURL}snapshot/$SBOtag @@ -1880,7 +1880,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then cleanup fi - SPKGPLUS_VERSION="1.7.6" + SPKGPLUS_VERSION="1.7.7" VERSION="$VERSION / slackpkg+ $SPKGPLUS_VERSION" if [ ${VERSION:0:4} == "2.82" ];then @@ -1893,11 +1893,11 @@ if [ "$SLACKPKGPLUS" = "on" ];then 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 + if [ "$SLPMIR" != "MIRRORPLUS['slackpkgplus']=https://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 "MIRRORPLUS['slackpkgplus']=https://slakfinder.org/slackpkg+1.7/" echo " then run 'slackpkg update && slackpkg upgrade slackpkg+' to downgrade it" echo echo @@ -1927,12 +1927,6 @@ if [ "$SLACKPKGPLUS" = "on" ];then find $TEMP ! -type d|sort|tac|awk '{if($1~/\.asc$/)f[$1]++;if($1~/\.t.z$/ && !f[$1".asc"])print $1}' |xargs -r rm -f fi -# if [ "$CMD" == "update" -o "$CMD" == "check-updates" ];then -# # answer to "Do you really want to download all other files" -# # if there are new changes -# ANSWER="Y" -# fi - if [ "$UPARG" != "gpg" ]&&[ "$CHECKGPG" = "on" ]&& ! ls -l $WORKDIR/gpg/GPG-KEY-slackware*.gpg >/dev/null 2>&1;then echo "FATAL! No Slackware GPG-KEY imported." if [ -e "$WORKDIR/ChangeLog.txt" ];then diff --git a/src/slackpkgplus.x86.sample b/src/slackpkgplus.x86.sample index 4fff4d9..c913ced 100644 --- a/src/slackpkgplus.x86.sample +++ b/src/slackpkgplus.x86.sample @@ -114,19 +114,18 @@ REPOPLUS=( slackpkgplus ) # some repositories as salixos, have a partial GPG support; # for that repositories you may need to run slackpkg with 'slackpkg -checkgpg=off ...' -# Slackware 14.2 - i386 -#MIRRORPLUS['alienbob']=http://bear.alienbase.nl/mirrors/people/alien/sbrepos/14.2/x86/ -#MIRRORPLUS['restricted']=http://bear.alienbase.nl/mirrors/people/alien/restricted_sbrepos/14.2/x86/ -#MIRRORPLUS['slacky']=http://repository.slacky.eu/slackware-14.2/ +# Slackware current - i386 +#MIRRORPLUS['alienbob']=https://slackware.nl/people/alien/sbrepos/current/x86/ +#MIRRORPLUS['restricted']=https://slackware.nl/people/alien/restricted_sbrepos/current/x86/ # use this to keep the slackpkg+ package updated to the latest stable release -MIRRORPLUS['slackpkgplus']=http://slakfinder.org/slackpkg+15/ +MIRRORPLUS['slackpkgplus']=https://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']=https://slakfinder.org/slackpkg+dev/ # Local repository: -#MIRRORPLUS['alienbob']=file://repositories/alien/sbrepos/14.2/x86/ +#MIRRORPLUS['alienbob']=file://repositories/alien/sbrepos/current/x86/ # # Local packages (you do not need metadata nor 'slackpkg update' command): #MIRRORPLUS['myrepo']=dir://repositories/mypackages/ @@ -136,9 +135,10 @@ MIRRORPLUS['slackpkgplus']=http://slakfinder.org/slackpkg+15/ # SBo SlackBuilds. Uncomment it to allow slackpkg to search SlackBuilds on SlackBuilds.org -# This does not repleace sbopkg; slackpkg just report the package, version and url; you must -# download and build it yourself or via sbopkg. -#SBOURL=https://www.slackbuilds.org/slackbuilds/14.2/ +# This does not repleace sbopkg; slackpkg just report the package, version and url; you may +# download it via 'slackpkg download ' and build it yourself or via sbopkg. +#SBO['14.2']=https://www.slackbuilds.org/slackbuilds/14.2/ +#SBO['current']=https://cgit.ponce.cc/slackbuilds/ # Plugin section: diff --git a/src/slackpkgplus.x86_64.sample b/src/slackpkgplus.x86_64.sample index 541a682..c39b65f 100644 --- a/src/slackpkgplus.x86_64.sample +++ b/src/slackpkgplus.x86_64.sample @@ -127,24 +127,20 @@ REPOPLUS=( slackpkgplus ) # some repositories as salixos, have a partial GPG support; # for that repositories you may need to run slackpkg with 'slackpkg -checkgpg=off ...' -# Slackware 14.2 - x86_64 -#MIRRORPLUS['multilib']=http://bear.alienbase.nl/mirrors/people/alien/multilib/14.2/ -#MIRRORPLUS['alienbob']=http://bear.alienbase.nl/mirrors/people/alien/sbrepos/14.2/x86_64/ -#MIRRORPLUS['restricted']=http://bear.alienbase.nl/mirrors/people/alien/restricted_sbrepos/14.2/x86_64/ -#MIRRORPLUS['slacky']=http://repository.slacky.eu/slackware64-14.2/ +# Slackware current - x86_64 +#MIRRORPLUS['multilib']=https://slackware.nl/people/alien/multilib/current/ +#MIRRORPLUS['alienbob']=https://slackware.nl/people/alien/sbrepos/current/x86_64 +#MIRRORPLUS['restricted']=https://slackware.nl/people/alien/restricted_sbrepos/current/x86_64 # use this to keep the slackpkg+ package updated to the latest stable release -MIRRORPLUS['slackpkgplus']=http://slakfinder.org/slackpkg+15/ +MIRRORPLUS['slackpkgplus']=https://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']=https://slakfinder.org/slackpkg+dev/ -# Slackware current - x86_64 -#MIRRORPLUS['multilib']=http://bear.alienbase.nl/mirrors/people/alien/multilib/current/ - # Local repository: -#MIRRORPLUS['alienbob']=file://repositories/alien/sbrepos/14.2/x86/ +#MIRRORPLUS['alienbob']=file://repositories/alien/sbrepos/current/x86/ # # Local packages (you do not need metadata nor 'slackpkg update' command): #MIRRORPLUS['myrepo']=dir://repositories/mypackages/ @@ -154,9 +150,10 @@ MIRRORPLUS['slackpkgplus']=http://slakfinder.org/slackpkg+15/ # SBo SlackBuilds. Uncomment it to allow slackpkg to search SlackBuilds on SlackBuilds.org -# This does not repleace sbopkg; slackpkg just report the package, version and url; you must -# download and build it yourself or via sbopkg. -#SBOURL=https://www.slackbuilds.org/slackbuilds/14.2/ +# This does not repleace sbopkg; slackpkg just report the package, version and url; you may +# download it via 'slackpkg download ' and build it yourself or via sbopkg. +#SBO['14.2']=https://www.slackbuilds.org/slackbuilds/14.2/ +#SBO['current']=https://cgit.ponce.cc/slackbuilds/ # Plugin section: diff --git a/src/zchangelog.sh b/src/zchangelog.sh index ffc194d..de8598b 100755 --- a/src/zchangelog.sh +++ b/src/zchangelog.sh @@ -35,7 +35,7 @@ test -n "$(declare -f cleanup)" # || return eval "${_/cleanup/cleanup_orig}" function pkglistdiff (){ - diff $WORKDIR/pkglist.copy $WORKDIR/pkglist| + diff $WORKDIR/pkglist.copy $WORKDIR/pkglist|grep -v " SBO_"| grep -e "^>" -e "^<"| sed 's/SLACKPKGPLUS_//'| sort -k2| @@ -49,8 +49,8 @@ function makepkglog(){ if [ -z "$TMPDIR" ];then TMPDIR=/tmp;fi if [ -z "$WORKDIR" ];then WORKDIR=/var/lib/slackpkg;fi IGNORE="$( ( - cat $WORKDIR/pkglist.copy|awk '{print $1}'|sort -u|sed 's/SLACKPKGPLUS_//'|sed 's/^/Removed /' - cat $WORKDIR/pkglist |awk '{print $1}'|sort -u|sed 's/SLACKPKGPLUS_//'|sed 's/^/Added /' + cat $WORKDIR/pkglist.copy|grep -v ^SBO_|awk '{print $1}'|sort -u|sed 's/SLACKPKGPLUS_//'|sed 's/^/Removed /' + cat $WORKDIR/pkglist |grep -v ^SBO_|awk '{print $1}'|sort -u|sed 's/SLACKPKGPLUS_//'|sed 's/^/Added /' )|sort -k2|uniq -f1 -u)" echo "$IGNORE"|awk '{print $1": "$2}'|column -t |sort -k2|grep ...&&echo echo "$IGNORE"|awk '{print " "$2" "}'|grep ... >$TMPDIR/ignorerepos @@ -84,7 +84,7 @@ function cleanup(){ cat $WORKDIR/RepoChangeLog.txt >> $TMPDIR/RepoChangeLog.txt cp $TMPDIR/RepoChangeLog.txt $WORKDIR/RepoChangeLog.txt fi - cp $WORKDIR/pkglist $WORKDIR/pkglist.copy + cat $WORKDIR/pkglist|grep -v ^SBO_ > $WORKDIR/pkglist.copy fi fi cleanup_orig