diff --git a/ChangeLog.txt b/ChangeLog.txt index c60c2f0..c98053c 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,33 @@ +Wed Feb 24 22:07:25 CET 2021 +pkg/slackpkg+-1.7.2-noarch-1mt.txz: Rebuilt + It's the time to summarize all changes. + As always, a big thanks goes to phenixia2003 and all other contributor + Now we can summarise the changes. You can find a full list in the CHANGES + documentation file + slackpkg+ 1.7.2 adds new features with some new entries in configuration file + that you should merge in your old slackpkgplus.conf: + SBOURL , USETERSE , PROXY , USEBL (not new but changed the values) + also some default values was changed from 1.7 to 1.7.2 + see README for details. + New features: + - Now slackpkgplus.conf has a manpage, also available in italian + - Now we have a "fatal log". If it occurs please does not ignore it! + - Now we can search packages in SBo repository. (does not replace sbopkg) + - Now we can use httpdir/httpsdir/ftpdir repositories without metadata + - Added an optional zlookkernel script to allow slackpkg to update initrd + Improvements: + - Quick output for Cached Download for a most clear output. + - Improved output for 'slackpkg search' + - Replaced Spinning with Percentage + - Better output for download/install process + - Now cachedupdate support HTTP/2 servers + - bash_completion is now enabled by default + Note: + - slackpkg+ currently does not support $ROOT + - slackpkg-15 uses a new blacklist syntax; this works fine with slackpkg+ + but just for blacklist; don't use it for greylist ++-------------------------+ + Mon Feb 15 21:14:31 CET 2021 pkg/slackpkg+-1.7.1-noarch-1mt.txz: Rebuilt - This is a temporary release diff --git a/src/CHANGES b/src/CHANGES index 1141775..53f8a4a 100644 --- a/src/CHANGES +++ b/src/CHANGES @@ -1,6 +1,6 @@ = Full Changes list = -== From 1.7 to mainline == +== From 1.7 to 1.7.2 == *Configuration file: @@ -14,10 +14,12 @@ - Added PROXY to specify a proxy server +- Removed ktown samples since kde5 is in slackware 15.0 *New features: - Added manpages (italian and english) for slackpkgplus.conf + to read the italian manpage be sure to export LANG=it_IT.UTF8 - Added a 'fatal log' to show some serious error that the users should not ignore. For example a failure installing packages. @@ -26,8 +28,6 @@ SlackBuilds.org and report the url to download to build and install packages yourself. -- Added optional script to configure lilo/elilo/initrd after a kernel upgrade - - Added httpdir/httpsdir/ftpdir repositories. These repositories does not need metadatas (CHECKSUMS.md5 ...), simple a remote directory listing @@ -40,6 +40,10 @@ - Replaced Spinning with Percentage +- Better output for download/install process + +- 'slackpkg search' show more info on column Status + *BugFixes @@ -60,27 +64,39 @@ - 'slackpkg search' did not show duplicated packages (as ffmpeg in alienbob and restricted repositories) +- Handle the case where /var/log/packages is a symlink + + *Various - Suppress wget output in ChangeLog downloading -- Bash completation enabled by default (if you have bash_completation package - installed) +- Catch errors and return exit status: 1 for warning, 2 for fatal + after run slackpkg you can read the exit status with echo $? + 1 => WARNING! One or more errors occurred while slackpkg was running + 2 => FATAL! Some operation has failed and need attention -- Works with slackpkg-2.84 (development release). - This is not officially released, so not all regressions can be solved. - Currently slackpkg+ does not work with slackpkg-2.84 if $ROOT is non-empty. - slackpkg 2.84 introduces a new blacklist system. slackpkg+ uses it in - install/upgrade/remove options; not 'search' and does not impact greylist. +- Bash completation enabled by default + note that you need to install bash_completation + slackpkg install bash_completation +- Works with slackpkg-15 + Unfortunately it does not work if $ROOT is non-empty + Also slackpkg-15 introduces a new blacklist system and seems to work fine + but greylist system use the older syntax + +- Added zlookkernel.sh + It help you to reconfigure initrd. It does support lilo and elilo (EFI) + For instructions read notes in the code: + /usr/libexec/slackpkg/zlookkernel.sh == From 1.6 and 1.7 == *Configuration file: - Added SEARCH_CLOG_INPARENT: available 'on'/'off'; default is 'off' - Allow/disallow to search ChangeLog.txt in parent url. May be unsafe. + Allow/disallow to search ChangeLog.txt in parent url. May be unsafe. - Added WW_FILE_SEARCH: available 'on'/'off'; default is 'off' Allow you to enable or disable the Whole Word search in 'slackpkg file-search' @@ -108,7 +124,7 @@ - 'slackpkg info' allows you to see more details about the package. By default slackpkg info shows you the slackware metadata and package - description. Set DETAILED_INFO to 'basic' and you can also see the + description. Set DETAILED_INFO to 'basic' and you can also see the repository and url. Set it to 'filelist' and you will see the full file listing in the package. Note that packages as kernel-source or other big packages give you a loooong list. @@ -133,7 +149,7 @@ Now it gives you a quick output for a most clear output. Now you can use it in slackpkg check-updates. Now it caches most metadata file. - + - Performance: slackpkg now is faster when search packages or prepare the package list in large install/upgrade @@ -159,11 +175,11 @@ Allow to choose the repository as in install/upgrade; this becouse there are more than one repository containing packages with identical name (but different packages, i.e. chromium for slackware 14.1 and the same version for current). - + - dir:/ repositories: * dir:/ repositories and inline repositories has most priority * slackpkg search does search in dir:/ repositories - * now dir:/ allows subdirectories; note that EVERYTIME you run slackpkg, it + * now dir:/ allows subdirectories; note that EVERYTIME you run slackpkg, it scan for all subdirectories of any dir:/ repositoies, even if you does not use that repository. It uses the 'find' command, so be sure to not select largest directories. @@ -214,132 +230,3 @@ Copy /usr/src/slackpkg+-*/slackpkg.bash_completation in /etc/bash_completation.d -== The track of the 1.7 developments == - -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) - - givepriority did drop matched package if it is the first in pkglist - - Added /usr/src/slackpkg+-*/slackpkg.bash_completation. Edit it for - instructions. - -Version 1.7.0rc2 - 02/Jun/2016 - - ChangeLog did not skipped for dir:/ repositories - - ChangeLog did not show correctly certain slackware changelog - - dir:/ repositories does not need STRICTGPG nor GPG key; however remember - that if .asc file exists a key must be manually imported - - Removed makeinstlog.sh since it was bugged and no longer supported - - Repositories in default configuration file are bumped to 14.2 - - Full 1.7.0 changes tracked in CHANGES file - - Added /usr/libexec/slackpkg/zchangelog.sh tool. Edit it to see instructions. - -Version 1.7.0rc1 - 19/May/2016 - - WW_FILE_SEARCH did affect file search AND package search - - fixed warning in update when one repository does not have the changelog - - ignore the package extension in package selection - - fixed a regression in dir: repository - -Version 1.7.b4.3 - 02/May/2016 - - Optimized code for generating ChangeLogs. (phenixia2003) - -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. - -Version 1.7.b4 - 14/Mar/2016 - - slackpkg search now search in dir:// repositories too. - - subdirectory allowed in dir:// repositories. - - slackpkg search honour correctly the '+' character - - Added 'ChangeLog' dialog box to show the changelog of selected packages - (thanks to phenixia2003) - -Version 1.7.b3 - 27/Feb/2016 - - Added WW_FILE_SEARCH to file-search whole-words o not (thanks to yars068) - - Colorized the slackpkg search results - - Added DETAILED_INFO to allow slackpkg info to show many details on the - package - - slackpkg reinstall fixed; also now allow to choose the repository as in - install/upgrade; this becouse there more than one repository containing - identicals packages. - - dir:// repositories and inline repositories has most priority - -Version 1.7.b2 - 29/Jan/2016 - - Avoid slackpkg to corrupt the slackware database if there are some manual - upgrade in progress. - - Fixed a regression in TAG_PRIORITY. - - Added spinning in check-updates. - - Fixed bad trap CTRL+C when spinning is on. - - Fixed a regression in SENSITIVE_SEARCH. - - Cached Download works with check-updates too. - - check-updates shows downloader output if VERBOSE=3 - -Version 1.7.b1 - 18/Jan/2016 - Well, I think that we can mark that version as Beta. It does not contains - new features, but it was done a large work of bugfixes and improvements. - A special thanks is for phenixia2003 and yars068 for code contributing and - for many other for ideas and testing. It's the time for the tests, to find - for bugs or someother improvement. - - Improved greylist. Now it allow to match the name in installed packages, - so it also impact remove and clean-system actions. - - Improved performance searching packages and preparing the package list in - large install/upgrade. - - Improved 'slackpkg search' that now shows all packages matching from all - repositories, not just that in priority; it will mark as 'masked' the - packages that would not selected in install/upgrade mode. Also always show - repository source for official packages. - - Quick output for Cached Download.. - - Does not show notices to remember to run 'slackpkg update' when running - slackpkg check-updates. - - Fixed Download Only when upgrade base packages (aaa_base, pkgtools...). - - Fixed a bug in slackpkg upgrade when used with $ROOT. - - Repositories now can contains letters, numbers, minus and underscore - - Fixed a bug on x86 hosts when a repository contains also x86_64 packages - - Some fix in Strict GPG Check. - -Version 1.7.a6 - 17/Jan/2016 - - 'slackpkg search' if finds more duplicated packages with different - versions from many repository, now show all, marking it as "masked" the - packages that will not be installed due the priority - - Fixed a regression that drop PKGS_PRIORITY function in slackpkg upgrade - -Version 1.7.a5 - 16/Jan/2016 - - Improved greylist. Also, now it allow to match the name in installed packages - - Fixed download GPG-KEY; it did not show the correct repository for gpg key - - Fixed previous patch for $ROOT problem (did broke 'slackpkg search command') - -Version 1.7.a4 - 12/Jan/2016 - - Improved performance - - Fixed search that may fails to detect repository in certain conditions - - slackpkg search shows the repository name for the official repository - - Fixed a bug in gpg check when a repository name contains a '-' character - - Fixed a bug in slackpkg upgrade when used with $ROOT - -Version 1.7.a3 - 10/Jan/2015 - - Do not show notices when running slackpkg update or slackpkg check-updates - (thanks to yars068) - - Fixed a bug on x86 hosts when a repository contains also x86_64 packages - -Version 1.7.a2 - 06/Jan/2015 - - Remember user to (re)run 'slackpkg update gpg' - - Fixed Download Only when upgrade base packages (aaa_base, pkgtools...) - - Quick output on Cached Download - -Version 1.7.a1 - 04/Jan/2016 - It's the time for a stable version of slackpkg+. Currently it is just a - development version to fix older feature and add/test new. I'll need more - test possible to make it bugfree ;). - - Code reordering; now slackpkg+ is only slackpkgplus.sh - - BugFix: slackpkg did give 'grep: write error' when running with "sudo su -". - - 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 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 c60c2f0..c98053c 100644 --- a/src/ChangeLog.txt +++ b/src/ChangeLog.txt @@ -1,3 +1,33 @@ +Wed Feb 24 22:07:25 CET 2021 +pkg/slackpkg+-1.7.2-noarch-1mt.txz: Rebuilt + It's the time to summarize all changes. + As always, a big thanks goes to phenixia2003 and all other contributor + Now we can summarise the changes. You can find a full list in the CHANGES + documentation file + slackpkg+ 1.7.2 adds new features with some new entries in configuration file + that you should merge in your old slackpkgplus.conf: + SBOURL , USETERSE , PROXY , USEBL (not new but changed the values) + also some default values was changed from 1.7 to 1.7.2 + see README for details. + New features: + - Now slackpkgplus.conf has a manpage, also available in italian + - Now we have a "fatal log". If it occurs please does not ignore it! + - Now we can search packages in SBo repository. (does not replace sbopkg) + - Now we can use httpdir/httpsdir/ftpdir repositories without metadata + - Added an optional zlookkernel script to allow slackpkg to update initrd + Improvements: + - Quick output for Cached Download for a most clear output. + - Improved output for 'slackpkg search' + - Replaced Spinning with Percentage + - Better output for download/install process + - Now cachedupdate support HTTP/2 servers + - bash_completion is now enabled by default + Note: + - slackpkg+ currently does not support $ROOT + - slackpkg-15 uses a new blacklist syntax; this works fine with slackpkg+ + but just for blacklist; don't use it for greylist ++-------------------------+ + Mon Feb 15 21:14:31 CET 2021 pkg/slackpkg+-1.7.1-noarch-1mt.txz: Rebuilt - This is a temporary release diff --git a/src/README b/src/README index 4ebbe6c..f4f1f35 100644 --- a/src/README +++ b/src/README @@ -63,6 +63,7 @@ The MIRRORPLUS array defines all mirrors. It accepts these protocols: The mirror must contains all metadata files (CHECKSUMS.md5 ...) You must run 'slackpkg update' after adding/removing a repository. + You may also need 'slackpkg update gpg' 2) Local mirror: for example, @@ -177,7 +178,7 @@ you do not explicitly exclude it: that means 'all alienbob packages except harfbuzz' -Also you can set TAG_PRIORITY=on to allow slackpkg+ to select repository +Also you can set TAG_PRIORITY=on to allow slackpkg+ to try select repository from where the package was previously installed. This method is based from tag of the installed package. slackpkg+ search a package with the same tag in all repositories and use it. @@ -211,7 +212,7 @@ To install multilib manually, launch: After that, you can keep multilib up-to-date by launching: # slackpkg update # slackpkg upgrade-all -periodically lauch +periodically launch: # slackpkg install multilib to check for new multilib packages availability @@ -311,7 +312,7 @@ You can: 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://site/path/ + # slackpkg install http://www.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. diff --git a/src/repositories.lst b/src/repositories.lst index 7b9f135..c291464 100644 --- a/src/repositories.lst +++ b/src/repositories.lst @@ -1,35 +1,34 @@ -Sun Jan 24 21:31:35 CET 2021 +Wed Feb 24 21:28:19 CET 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 841846 2021/01/23 20:56:59 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 844578 2021/01/23 20:58:59 Slackware Linux Project -http://slack.conraid.net/repository/slackware64-current-extra 16133 2020/10/22 11:18:05 Corrado Franco (Conraid) -http://slack.conraid.net/repository/slackware64-current-testing 6661 2020/12/06 16:59:28 Corrado Franco (Conraid) -http://slakfinder.org/slackpkg+ 625 2019/01/03 12:36:29 Matteo Rossini -http://slakfinder.org/slackpkg+1.7 625 2019/01/03 12:36:29 Matteo Rossini -http://slakfinder.org/slackpkg+dev 45 2020/03/15 22:02:54 Matteo Rossini -http://www.slackel.gr/repo/i486/current 660466 2021/01/24 07:28:55 Dimitris Tzemos (Slackel Creator) -http://www.slackel.gr/repo/x86_64/current 703771 2021/01/24 07:29:19 Dimitris Tzemos (Slackel Creator) +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/01/20 08:25:16 Eric Hameleers (IBM Linux) -https://bear.alienbase.nl/mirrors/people/alien/multilib/current 188380 2021/01/20 08:26:38 Eric Hameleers (IBM Linux) -https://bear.alienbase.nl/mirrors/people/alien/restricted_sbrepos/14.2/x86 3756 2020/11/17 14:58:20 Eric Hameleers -https://bear.alienbase.nl/mirrors/people/alien/restricted_sbrepos/14.2/x86_64 3769 2020/11/17 14:58:27 Eric Hameleers -https://bear.alienbase.nl/mirrors/people/alien/restricted_sbrepos/current/x86 3756 2020/11/17 14:58:28 Eric Hameleers -https://bear.alienbase.nl/mirrors/people/alien/restricted_sbrepos/current/x86_64 3769 2020/11/17 14:58:31 Eric Hameleers -https://bear.alienbase.nl/mirrors/people/alien/sbrepos/14.2/x86 230327 2021/01/21 19:33:08 Eric Hameleers -https://bear.alienbase.nl/mirrors/people/alien/sbrepos/14.2/x86_64 230636 2021/01/21 19:34:43 Eric Hameleers -https://bear.alienbase.nl/mirrors/people/alien/sbrepos/current/x86 295233 2021/01/21 19:35:53 Eric Hameleers -https://bear.alienbase.nl/mirrors/people/alien/sbrepos/current/x86_64 296081 2021/01/21 19:36:59 Eric Hameleers -https://download.salixos.org/i486/14.2 541269 2021/01/22 00:26:08 Salix Admin (The Bonsai OS) -https://download.salixos.org/i486/15.0 85942 2021/01/10 23:41:49 no +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 547056 2021/01/22 00:27:18 Salix Admin (The Bonsai OS) -https://download.salixos.org/x86_64/15.0 87104 2021/01/10 23:42:03 no +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) @@ -37,25 +36,5 @@ https://packages.slackonly.com/pub/packages/current-x86 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://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 20674 2021/01/15 04:04:20 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 27077 2020/12/10 17:38:56 MATE SlackBuilds -https://slackware.uk/msb/current/latest/x86_64 27077 2020/12/10 17:38:56 MATE SlackBuilds -https://slackware.uk/slint/i586/slint-14.2 40483 2021/01/23 18:41:13 Didier Spaier -https://slackware.uk/slint/x86_64/slint-14.2 41273 2021/01/23 18:41:15 Didier Spaier -https://slackware.uk/slint/x86_64/slint-14.2.1 718839 2021/01/23 18:40:49 Didier Spaier -https://slackware.uk/slint/x86_64/slint-wip 3312 2021/01/23 18:41:16 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) diff --git a/src/repositories.txt b/src/repositories.txt index 4368358..5d01a67 100644 --- a/src/repositories.txt +++ b/src/repositories.txt @@ -1,6 +1,6 @@ Supported Repositories: -> slackpkgplus: http://slakfinder.org/slackpkg+{,dev,1.7}/ +> 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}/ @@ -11,7 +11,7 @@ Supported Repositories: > mles: https://slackware.uk/microlinux/server-{14.2}-{32,64}bit/ > msb: https://slackware.uk/msb/{14.2,current}/{1.18,1.24,latest}/{x86,x86_64}/ > csb: https://slackware.uk/csb/{14.2,current}/{x86,x86_64}/ -> slackers: http://slack.conraid.net/repository/slackware64-current{-testing,-extra}/ +> slackers: https://slack.conraid.net/repository/slackware64-current{-testing,-extra}/ > studioware: https://slackware.uk/studioware/{14.2} > slackonly: https://packages.slackonly.com/pub/packages/{14.2,current}-{x86,x86_64}/ > rlworkman: https://rlworkman.net/pkgs/{14.2,current}/ @@ -33,6 +33,14 @@ See /usr/doc/slackpkg+-*/repositories.lst for an expanded list. Some specific notes: +* slackpkgplus: + This is the official repository to keep slackpkg+ updated. We have 4 branch: + /slackpkg+1.7/ -> the latest release working with slackware 14.2 (only) + /slackpkg+15/ -> the latest stable release working with slackware 15 + /slackpkg+dev/ -> the development release; please consider to test it and report bugs + /slackpkg+/ -> currently an alias for /slackpkg+1.7/ + will change to an alias for /slackpkg+15/ when slackware 15.0 will be released + * multilib: Please, run /usr/doc/slackpkg+-*/setupmultilib.sh to setup it. Periodically you should run "slackpkg install multilib" diff --git a/src/slackpkgplus.sh b/src/slackpkgplus.sh index 43cb7a8..b8c9cc6 100755 --- a/src/slackpkgplus.sh +++ b/src/slackpkgplus.sh @@ -6,8 +6,6 @@ declare -A MIRRORPLUS declare -A NOTIFYMSG -CONF=${CONF:-/etc/slackpkg} # needed if you're running slackpkg 2.28.0-12 - # regular expression used to distinguish the 3rd party repositories from the standard slackware directories. # SLACKDIR_REGEXP="^((slackware)|(slackware64)|(extra)|(pasture)|(patches)|(testing))$" @@ -128,12 +126,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then if ! $USEBLACKLIST ;then >${TMPDIR}/blacklist fi - if $MLREPO_SELELECTED && grep -q "^aaa_elflibs$" ${TMPDIR}/blacklist && ! grep -q "^aaa_elflibs-compat32$" ${TMPDIR}/blacklist ; then - sed -i --expression "s/^aaa_elflibs/#aaa_elflibs/" ${TMPDIR}/blacklist - grep -vE $LEGACYBLACKLIST -f ${TMPDIR}/blacklist -f ${TMPDIR}/blacklist.slackpkgplus | grep -v "[ ]aaa_elflibs[ ]" >${TMPDIR}/blacklist.tmp - else - grep -vE $LEGACYBLACKLIST -f ${TMPDIR}/blacklist -f ${TMPDIR}/blacklist.slackpkgplus >${TMPDIR}/blacklist.tmp - fi + grep -vE -f ${TMPDIR}/blacklist -f ${TMPDIR}/blacklist.slackpkgplus >${TMPDIR}/blacklist.tmp if [ "$(head -1 ${TMPDIR}/blacklist.tmp|awk '{print $1}')" != "local" ];then cat ${TMPDIR}/pkglist-pre fi @@ -954,7 +947,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then if [ -z "$TOPROCESS" ];then case "$CMD" in upgrade-all) TOPROCESS=$(comm -1 -2 ${TMPDIR}/lpkg ${TMPDIR}/dpkg | comm -1 -2 - ${TMPDIR}/spkg|wc -l);; - install-new) TOPROCESS=$[$(awk -f /usr/libexec/slackpkg/install-new.awk ${ROOT}/${WORKDIR}/ChangeLog.txt|sort -u|wc -l)+7];; + install-new) TOPROCESS=$[$(awk -f /usr/libexec/slackpkg/install-new.awk ${WORKDIR}/ChangeLog.txt|sort -u|wc -l)+7];; install|upgrade|reinstall|download) TOPROCESS=0 for TMPARGUMENT in $(echo $INPUTLIST); do @@ -1719,6 +1712,14 @@ if [ "$SLACKPKGPLUS" = "on" ];then VERBOSE=1 fi + if [ ! -z "$ROOT" ];then + echo "! ! ! FATAL ! ! !" + echo + echo "slackpkg+ does not support installation via \$ROOT" + echo + echo "please unset it" + cleanup + fi if [ "$CMD" == "upgrade" -o "$CMD" == "upgrade-all" ]&&ls $ROOT/var/log/packages/*:* >/dev/null 2>&1;then echo "FATAL! There is some problem in packages database" @@ -1732,13 +1733,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then cleanup fi - if [ ${VERSION:0:4} == "2.84" ]||[ ${VERSION:0:4} == "15.0" ];then - LEGACYBLACKLIST="" - else - LEGACYBLACKLIST="-w" - fi - - SPKGPLUS_VERSION="1.7.1" + SPKGPLUS_VERSION="1.7.2" VERSION="$VERSION / slackpkg+ $SPKGPLUS_VERSION" if [ ${VERSION:0:4} == "2.82" ];then