diff --git a/ChangeLog.txt b/ChangeLog.txt index 8333682..c59df12 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,19 @@ +Thu Feb 3 11:18:01 CET 2022 +pkg/slackpkg+-1.8.0-noarch-1mt.txz: Upgrade + Hello, World! Slackware 15.0 was finally released so slackpkg+ has + been adapted, so we can release Slackpkg+ 1.8.0 final release. Also + some third party repositories are ready. A notice: starting from now + /slackpkg+/ official repository will contain slackpkg+ 1.8 (an alias + o /slackpkg+15/ repository, unless you are using wget/curl/lftp from + slackware 14.2; in this case the site automatically show slackpkg+1.7. + You can put https://slakfinder.org/slackpkg+/ for historical reason + in slackpkgplus.conf, but you are encouraged to use + https://slakfinder.org/slackpkg+15/ or /slackpkg+dev/ instead it. + I thank everyone for contributing by reporting bugs or new proposal. + Special thanks to those who maintain the repositories, that make + slackpkg+ useful. ++-------------------------+ + Sat Jan 29 16:42:01 CET 2022 pkg/slackpkg+-1.8.rc3-noarch-1mt.txz: Upgrade - Give a chance to disable the packages cache purge. diff --git a/src/ChangeLog.txt b/src/ChangeLog.txt index 8333682..c59df12 100644 --- a/src/ChangeLog.txt +++ b/src/ChangeLog.txt @@ -1,3 +1,19 @@ +Thu Feb 3 11:18:01 CET 2022 +pkg/slackpkg+-1.8.0-noarch-1mt.txz: Upgrade + Hello, World! Slackware 15.0 was finally released so slackpkg+ has + been adapted, so we can release Slackpkg+ 1.8.0 final release. Also + some third party repositories are ready. A notice: starting from now + /slackpkg+/ official repository will contain slackpkg+ 1.8 (an alias + o /slackpkg+15/ repository, unless you are using wget/curl/lftp from + slackware 14.2; in this case the site automatically show slackpkg+1.7. + You can put https://slakfinder.org/slackpkg+/ for historical reason + in slackpkgplus.conf, but you are encouraged to use + https://slakfinder.org/slackpkg+15/ or /slackpkg+dev/ instead it. + I thank everyone for contributing by reporting bugs or new proposal. + Special thanks to those who maintain the repositories, that make + slackpkg+ useful. ++-------------------------+ + Sat Jan 29 16:42:01 CET 2022 pkg/slackpkg+-1.8.rc3-noarch-1mt.txz: Upgrade - Give a chance to disable the packages cache purge. diff --git a/src/checkrepos.sh b/src/checkrepos.sh index 66cb21e..a85e817 100755 --- a/src/checkrepos.sh +++ b/src/checkrepos.sh @@ -28,13 +28,13 @@ Or: check if the expanded repository exists. Example: - http://slackware.osuosl.org/slackware{,64}-{12.2,14.1,current}/ + http://slackware.osuosl.org/slackware{,64}-{12.2,15.0,current}/ will be expanded as http://slackware.osuosl.org/slackware-12.2/ - http://slackware.osuosl.org/slackware-14.1/ + http://slackware.osuosl.org/slackware-15.0/ http://slackware.osuosl.org/slackware-current/ http://slackware.osuosl.org/slackware64-12.2/ - http://slackware.osuosl.org/slackware64-14.1/ + http://slackware.osuosl.org/slackware64-15.0/ http://slackware.osuosl.org/slackware64-current/ Next, when the script will validate the repositories, it will remove slackware64-12.2 that does NOT exists. diff --git a/src/repositories.lst b/src/repositories.lst index 0762716..6d8fa00 100644 --- a/src/repositories.lst +++ b/src/repositories.lst @@ -1,19 +1,21 @@ -Fri Jan 14 20:23:05 CET 2022 +Thu Feb 3 23:04:00 CET 2022 url size date gpg -http://www.slackel.gr/repo/i486/current 666844 2022/01/12 22:54:02 Dimitris Tzemos (Slackel Creator) -http://www.slackel.gr/repo/x86_64/current 706817 2022/01/14 15:54:10 Dimitris Tzemos (Slackel Creator) +http://www.slackel.gr/repo/i486/current 667230 2022/02/03 18:18:11 Dimitris Tzemos (Slackel Creator) +http://www.slackel.gr/repo/x86_64/current 707165 2022/02/03 18:15:33 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 543877 2022/01/11 08:43:00 Salix Admin (The Bonsai OS) -https://download.salixos.org/i486/15.0 262638 2022/01/13 22:48:41 Salix Admin (The Bonsai OS) +https://download.salixos.org/i486/14.2 544904 2022/02/01 21:26:17 Salix Admin (The Bonsai OS) +https://download.salixos.org/i486/15.0 313407 2022/02/01 21:01:22 Salix Admin (The Bonsai OS) https://download.salixos.org/i486/extra-14.2 1922947 2021/12/19 23:34:08 Salix Admin (The Bonsai OS) -https://download.salixos.org/x86_64/14.2 548938 2022/01/11 08:41:45 Salix Admin (The Bonsai OS) -https://download.salixos.org/x86_64/15.0 265457 2022/01/13 22:49:45 Salix Admin (The Bonsai OS) +https://download.salixos.org/x86_64/14.2 549967 2022/02/01 21:26:41 Salix Admin (The Bonsai OS) +https://download.salixos.org/x86_64/15.0 315796 2022/02/01 21:01:11 Salix Admin (The Bonsai OS) https://download.salixos.org/x86_64/extra-14.2 1922817 2021/12/19 23:37:03 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 861873 2022/01/14 06:25:10 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 864740 2022/01/14 06:26:46 Slackware Linux Project +https://ftp.osuosl.org/pub/slackware/slackware-14.2 702459 2016/06/29 21:42:35 Slackware Linux Project +https://ftp.osuosl.org/pub/slackware/slackware-15.0 861877 2022/02/02 09:23:14 Slackware Linux Project +https://ftp.osuosl.org/pub/slackware/slackware-current 861877 2022/02/02 09:23:14 Slackware Linux Project +https://ftp.osuosl.org/pub/slackware/slackware64-14.2 704195 2016/06/29 21:49:56 Slackware Linux Project +https://ftp.osuosl.org/pub/slackware/slackware64-15.0 864745 2022/02/02 09:25:12 Slackware Linux Project +https://ftp.osuosl.org/pub/slackware/slackware64-current 864745 2022/02/02 09:25:12 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) @@ -24,16 +26,21 @@ https://slack.conraid.net/repository/slackware64-current-extra 45 2 https://slack.conraid.net/repository/slackware64-current-testing 13868 2021/09/09 15:31:03 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 145556 2022/01/05 09:11:17 Eric Hameleers (IBM Linux) -https://slackware.nl/people/alien/multilib/current 198757 2022/01/05 09:12:24 Eric Hameleers (IBM Linux) -https://slackware.nl/people/alien/restricted_sbrepos/14.2/x86 5291 2022/01/11 13:29:59 Eric Hameleers -https://slackware.nl/people/alien/restricted_sbrepos/14.2/x86_64 5310 2022/01/11 13:29:55 Eric Hameleers -https://slackware.nl/people/alien/restricted_sbrepos/current/x86 5820 2022/01/11 13:29:49 Eric Hameleers -https://slackware.nl/people/alien/restricted_sbrepos/current/x86_64 5841 2022/01/11 13:29:48 Eric Hameleers -https://slackware.nl/people/alien/sbrepos/14.2/x86 221400 2022/01/13 15:55:55 Eric Hameleers -https://slackware.nl/people/alien/sbrepos/14.2/x86_64 223356 2022/01/13 15:53:50 Eric Hameleers -https://slackware.nl/people/alien/sbrepos/current/x86 303691 2022/01/13 15:52:06 Eric Hameleers -https://slackware.nl/people/alien/sbrepos/current/x86_64 309486 2022/01/13 15:50:36 Eric Hameleers +https://slackware.nl/people/alien/multilib/14.2 150168 2022/02/02 10:41:14 Eric Hameleers (IBM Linux) +https://slackware.nl/people/alien/multilib/15.0 198756 2022/01/30 20:03:56 Eric Hameleers (IBM Linux) +https://slackware.nl/people/alien/multilib/current 198756 2022/02/02 10:42:10 Eric Hameleers (IBM Linux) +https://slackware.nl/people/alien/restricted_sbrepos/14.2/x86 5291 2022/02/02 23:55:36 Eric Hameleers +https://slackware.nl/people/alien/restricted_sbrepos/14.2/x86_64 5310 2022/02/02 23:55:31 Eric Hameleers +https://slackware.nl/people/alien/restricted_sbrepos/15.0/x86 5820 2022/02/02 23:55:26 Eric Hameleers +https://slackware.nl/people/alien/restricted_sbrepos/15.0/x86_64 5841 2022/02/02 23:55:25 Eric Hameleers +https://slackware.nl/people/alien/restricted_sbrepos/current/x86 5820 2022/02/02 23:55:21 Eric Hameleers +https://slackware.nl/people/alien/restricted_sbrepos/current/x86_64 5841 2022/02/02 23:55:19 Eric Hameleers +https://slackware.nl/people/alien/sbrepos/14.2/x86 221400 2022/02/02 23:23:37 Eric Hameleers +https://slackware.nl/people/alien/sbrepos/14.2/x86_64 223356 2022/02/02 23:21:32 Eric Hameleers +https://slackware.nl/people/alien/sbrepos/15.0/x86 305988 2022/02/02 23:19:42 Eric Hameleers +https://slackware.nl/people/alien/sbrepos/15.0/x86_64 310879 2022/02/02 23:18:12 Eric Hameleers +https://slackware.nl/people/alien/sbrepos/current/x86 305988 2022/02/02 23:17:05 Eric Hameleers +https://slackware.nl/people/alien/sbrepos/current/x86_64 310879 2022/02/02 23:15:31 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 20166 2022/01/06 03:42:19 Willy Sudiarto Raharjo @@ -47,14 +54,15 @@ https://slackware.uk/msb/14.2/1.18/x86 30258 2 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.26/x86_64 28372 2021/11/04 14:22:05 MATE SlackBuilds https://slackware.uk/msb/current/latest/x86_64 28372 2021/11/04 14:22:05 MATE SlackBuilds -https://slackware.uk/slint/i586/slint-14.2 40483 2021/12/29 19:43:40 Didier Spaier -https://slackware.uk/slint/x86_64/slint-14.2.1 828121 2021/12/29 19:44:03 Didier Spaier +https://slackware.uk/slint/i586/slint-14.2 40483 2022/02/02 19:55:28 Didier Spaier +https://slackware.uk/slint/x86_64/slint-14.2.1 828642 2022/02/02 19:56:27 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+ 45 2022/01/14 20:00:33 Matteo Rossini https://slakfinder.org/slackpkg+1.7 45 2022/01/14 20:00:33 Matteo Rossini -https://slakfinder.org/slackpkg+1.8 626 2022/01/13 11:14:45 Matteo Rossini -https://slakfinder.org/slackpkg+15 626 2022/01/13 11:19:04 Matteo Rossini -https://slakfinder.org/slackpkg+dev 626 2022/01/13 11:14:45 Matteo Rossini +https://slakfinder.org/slackpkg+1.8 626 2022/01/29 17:07:08 Matteo Rossini +https://slakfinder.org/slackpkg+15 626 2022/01/29 17:08:44 Matteo Rossini +https://slakfinder.org/slackpkg+dev 626 2022/01/29 17:04:47 Matteo Rossini diff --git a/src/repositories.txt b/src/repositories.txt index 5e8bf99..43a67a1 100644 --- a/src/repositories.txt +++ b/src/repositories.txt @@ -9,7 +9,7 @@ Supported Repositories: > mleddesktop: https://slackware.uk/microlinux/desktop-{14.2,15.0}-{32,64}bit/ > mledextras: https://slackware.uk/microlinux/extras-{14.2,15.0}-{32,64}bit/ > mles: https://slackware.uk/microlinux/server-{14.2,15.0}-{32,64}bit/ -> msb: https://slackware.uk/msb/{14.2,15.0,current}/{1.18,1.24,latest}/{x86,x86_64}/ +> msb: https://slackware.uk/msb/{14.2,15.0,current}/{1.18,1.26,latest}/{x86,x86_64}/ > csb: https://slackware.uk/csb/{14.2,15.0,current}/{x86,x86_64}/ > slackers: https://slack.conraid.net/repository/slackware64-current{-testing,-extra}/ > studioware: https://slackware.uk/studioware/{14.2,15.0} @@ -61,4 +61,4 @@ Please read /usr/doc/slackpkg+-*/README for more details Slackware repositories: -https://mirrors.slackware.com/slackware/slackware{,64}-{14.2,15.0,current} +https://ftp.osuosl.org/pub/slackware/slackware{,64}-{14.2,15.0,current}/ diff --git a/src/setupmultilib.sh b/src/setupmultilib.sh index 22f2e25..c440743 100755 --- a/src/setupmultilib.sh +++ b/src/setupmultilib.sh @@ -15,13 +15,13 @@ if [ $ISX64 -ne 1 ];then echo "Slackware multilib's are supported only from slackware x86_64!" exit 1 fi -SVER=$(grep -v ^\# $CONF/mirrors|sed -r 's,^.*/slackware64-(current|14.2|14.1|14.0)/,\1,'|head -1) +SVER=$(grep -v ^\# $CONF/mirrors|sed -r 's,^.*/slackware64-(current|15.0)/,\1,'|head -1) if [ -z "$SVER" ];then echo "I can't detect your Slackware version." - echo "Which Slackware version are you running? (current/14.2/14.1/14.0)" + echo "Which Slackware version are you running? (current/15.0)" read $SVER fi -if ! echo $SVER|egrep -q '^(current|14.2|14.1|14.0|13.37|13.0)$';then +if ! echo $SVER|egrep -q '^(current|15.0)$';then echo "Invalid Slackware version ($SVER)" exit 1 fi diff --git a/src/slackpkgplus.sh b/src/slackpkgplus.sh index ececaee..e993b0c 100755 --- a/src/slackpkgplus.sh +++ b/src/slackpkgplus.sh @@ -1991,7 +1991,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then cleanup fi - SPKGPLUS_VERSION="1.8.rc3" + SPKGPLUS_VERSION="1.8.0" VERSION="$VERSION / slackpkg+ $SPKGPLUS_VERSION" if [ ${VERSION:0:4} == "2.82" ];then diff --git a/src/slackpkgplus.x86.sample b/src/slackpkgplus.x86.sample index 98d8c7c..1cc80db 100644 --- a/src/slackpkgplus.x86.sample +++ b/src/slackpkgplus.x86.sample @@ -118,9 +118,9 @@ 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 current - i386 -#MIRRORPLUS['alienbob']=https://slackware.nl/people/alien/sbrepos/current/x86/ -#MIRRORPLUS['restricted']=https://slackware.nl/people/alien/restricted_sbrepos/current/x86/ +# Slackware 15.0 - i386 +#MIRRORPLUS['alienbob']=https://slackware.nl/people/alien/sbrepos/15.0/x86/ +#MIRRORPLUS['restricted']=https://slackware.nl/people/alien/restricted_sbrepos/15.0/x86/ # use this to keep the slackpkg+ package updated to the latest stable release MIRRORPLUS['slackpkgplus']=https://slakfinder.org/slackpkg+15/ @@ -129,7 +129,7 @@ MIRRORPLUS['slackpkgplus']=https://slakfinder.org/slackpkg+15/ #MIRRORPLUS['slackpkgplus']=https://slakfinder.org/slackpkg+dev/ # Local repository: -#MIRRORPLUS['alienbob']=file://repositories/alien/sbrepos/current/x86/ +#MIRRORPLUS['alienbob']=file://repositories/alien/sbrepos/15.0/x86/ # # Local packages (you do not need metadata nor 'slackpkg update' command): #MIRRORPLUS['myrepo']=dir://repositories/mypackages/ diff --git a/src/slackpkgplus.x86_64.sample b/src/slackpkgplus.x86_64.sample index 3b835eb..3bdaa8b 100644 --- a/src/slackpkgplus.x86_64.sample +++ b/src/slackpkgplus.x86_64.sample @@ -131,10 +131,10 @@ 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 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 +# Slackware 15.0 - x86_64 +#MIRRORPLUS['multilib']=https://slackware.nl/people/alien/multilib/15.0/ +#MIRRORPLUS['alienbob']=https://slackware.nl/people/alien/sbrepos/15.0/x86_64 +#MIRRORPLUS['restricted']=https://slackware.nl/people/alien/restricted_sbrepos/15.0/x86_64 # use this to keep the slackpkg+ package updated to the latest stable release MIRRORPLUS['slackpkgplus']=https://slakfinder.org/slackpkg+15/ @@ -144,7 +144,7 @@ MIRRORPLUS['slackpkgplus']=https://slakfinder.org/slackpkg+15/ # Local repository: -#MIRRORPLUS['alienbob']=file://repositories/alien/sbrepos/current/x86/ +#MIRRORPLUS['alienbob']=file://repositories/alien/sbrepos/15.0/x86/ # # Local packages (you do not need metadata nor 'slackpkg update' command): #MIRRORPLUS['myrepo']=dir://repositories/mypackages/