From bf42ca4f68f9c1d66fc69a512b083ff9fc2f5778 Mon Sep 17 00:00:00 2001 From: Matteo Rossini Date: Mon, 21 Oct 2013 15:42:05 +0200 Subject: [PATCH] Version 1.0rc2 - 21/Oct/2013 - Looks like we get a slackpkg+ 1.0 release candidate 2... but things are pretty much nailed down at this point. Please test and report any last :D - Updated some repository to 14.1 --- ChangeLog.txt | 5 +++++ src/ChangeLog.txt | 5 +++++ src/doinst.sh | 1 + src/repositories.txt | 38 +++++++++++++++++----------------- src/slackpkgplus.x86.sample | 31 ++++++--------------------- src/slackpkgplus.x86_64.sample | 38 +++++++++++----------------------- 6 files changed, 48 insertions(+), 70 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 28f1758..6186aa9 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,8 @@ +Version 1.0rc2 - 21/Oct/2013 + - Looks like we get a slackpkg+ 1.0 release candidate 2... but things are + pretty much nailed down at this point. Please test and report any last :D + - Updated some repository to 14.1 + Version 1.0rc1 - 16/Oct/2013 - Slackware 14.1 is coming up. I think that also slackpkg+ is ready so as Slackware I mark it as rc1 :). slackpkg 2.82.0-11 added the 14.1 repositories. diff --git a/src/ChangeLog.txt b/src/ChangeLog.txt index 28f1758..6186aa9 100644 --- a/src/ChangeLog.txt +++ b/src/ChangeLog.txt @@ -1,3 +1,8 @@ +Version 1.0rc2 - 21/Oct/2013 + - Looks like we get a slackpkg+ 1.0 release candidate 2... but things are + pretty much nailed down at this point. Please test and report any last :D + - Updated some repository to 14.1 + Version 1.0rc1 - 16/Oct/2013 - Slackware 14.1 is coming up. I think that also slackpkg+ is ready so as Slackware I mark it as rc1 :). slackpkg 2.82.0-11 added the 14.1 repositories. diff --git a/src/doinst.sh b/src/doinst.sh index 0779e4c..b42126a 100644 --- a/src/doinst.sh +++ b/src/doinst.sh @@ -31,6 +31,7 @@ copy_config_file() { ;; esac cp usr/doc/slackpkg+-SLPVERSION/$SRCMIRROR etc/slackpkg/slackpkgplus.conf.new + cat usr/doc/slackpkg+-SLPVERSION/repositories.txt |grep '^> ' |sed 's/^> /#/' >> etc/slackpkg/slackpkgplus.conf.new } copy_config_file diff --git a/src/repositories.txt b/src/repositories.txt index 42bf89e..d75416e 100644 --- a/src/repositories.txt +++ b/src/repositories.txt @@ -1,24 +1,24 @@ Supported Repositories: -Supports GPG -slackpkgplus: http://slakfinder.org/slackpkg+/ -multilib: http://taper.alienbase.nl/mirrors/people/alien/multilib/{13.37,14.0,current}/ -alienbob: http://taper.alienbase.nl/mirrors/people/alien/sbrepos/{13.37,14.0,current}/{x86,x86_64}/ -ktown: http://taper.alienbase.nl/mirrors/alien-kde/{13.37,14.0,current}/latest/{x86,x86_64}/ -restricted: http://taper.alienbase.nl/mirrors/people/alien/restricted_sbrepos/{13.37,14.0,current}/{x86,x86_64}/ -slacky: http://repository.slacky.eu/slackware{,64}-{13.37,14.0}/ -zerouno: http://www.z01.eu/repo-slack/slackware64-current/ -mled: http://www.microlinux.fr/slackware/MLED-14.0-{32,64}bit/ -mles: http://www.microlinux.fr/slackware/MLES-14.0-{32,64}bit/ -mles: http://www.microlinux.fr/slackware/MLWS-14.0-{32,64}bit/ -msb: http://slackware.org.uk/msb/14.0/1.6/{x86,x86_64}/ -slackers: http://www.slackers.it/repository/ - -Does NOT supports GPG -salixos(*): http://download.salixos.org/{i486,x86_64}/{13.37,14.0}/ -salixext: http://people.salixos.org/ralvex/repository/x86_64/14.0/ -rlworkman: http://rlworkman.net/pkgs/{13.37,14.0}/ -slackel: http://www.slackel.gr/repo/{i486,x86_64}/current/ +> Supports GPG +> slackpkgplus: http://slakfinder.org/slackpkg+/ +> multilib: http://taper.alienbase.nl/mirrors/people/alien/multilib/{13.37,14.0,14.1,current}/ +> alienbob: http://taper.alienbase.nl/mirrors/people/alien/sbrepos/{13.37,14.0,14.1,current}/{x86,x86_64}/ +> ktown: http://taper.alienbase.nl/mirrors/alien-kde/{13.37,14.0,14.1,current}/latest/{x86,x86_64}/ +> restricted: http://taper.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}/ +> zerouno: http://www.z01.eu/repo-slack/slackware64-current/ +> mled: http://www.microlinux.fr/slackware/MLED-{14.0,14.1}-{32,64}bit/ +> mles: http://www.microlinux.fr/slackware/MLES-{14.0,14.1}-{32,64}bit/ +> mles: http://www.microlinux.fr/slackware/MLWS-{14.0,14.1}-{32,64}bit/ +> msb: http://slackware.org.uk/msb/{14.0,14.1}/1.6/{x86,x86_64}/ +> slackers: http://www.slackers.it/repository/ +> +> Does NOT supports GPG +> salixos(*): http://download.salixos.org/{i486,x86_64}/{13.37,14.0}/ +> salixext: http://people.salixos.org/ralvex/repository/x86_64/14.0/ +> rlworkman: http://rlworkman.net/pkgs/{13.37,14.0}/ +> slackel: http://www.slackel.gr/repo/{i486,x86_64}/current/ (*) salixos partially supports GPG. This repository contains the .asc file for CHECKSUMS.md5, so the 'update' process works with CHECKGPG=on and repository authenticity is guaranteed. diff --git a/src/slackpkgplus.x86.sample b/src/slackpkgplus.x86.sample index 34cc997..e148bc8 100644 --- a/src/slackpkgplus.x86.sample +++ b/src/slackpkgplus.x86.sample @@ -24,7 +24,7 @@ USEBL=1 # List repository you want to use (defined below). # remember to launch 'slackpkg update' if you modify that row. -REPOPLUS=( slackpkgplus alienbob restricted slacky ) +REPOPLUS=( slackpkgplus restricted alienbob slacky ) @@ -32,39 +32,20 @@ REPOPLUS=( slackpkgplus alienbob restricted slacky ) # Note: only multilib,alienbob,restricted,slacky repositories does supports GPG. If you add other # you may need to disable gpg check in slackpkg.conf -# Slackware 14.0 - i386 -MIRRORPLUS['alienbob']=http://taper.alienbase.nl/mirrors/people/alien/sbrepos/14.0/x86/ -MIRRORPLUS['restricted']=http://taper.alienbase.nl/mirrors/people/alien/restricted_sbrepos/14.0/x86/ -MIRRORPLUS['slacky']=http://repository.slacky.eu/slackware-14.0/ +# Slackware 14.1 - i386 +MIRRORPLUS['alienbob']=http://taper.alienbase.nl/mirrors/people/alien/sbrepos/14.1/x86/ +MIRRORPLUS['restricted']=http://taper.alienbase.nl/mirrors/people/alien/restricted_sbrepos/14.1/x86/ +MIRRORPLUS['slacky']=http://repository.slacky.eu/slackware-14.1/ # use this to keep updated the slackpkg+ package MIRRORPLUS['slackpkgplus']=http://slakfinder.org/slackpkg+/ -# Slackware current - i386 - # Local repository: -#MIRRORPLUS['alienbob']=file://repositories/alien/sbrepos/14.0/x86/ +#MIRRORPLUS['alienbob']=file://repositories/alien/sbrepos/14.1/x86/ # # Local packages (you do not need metadata nor 'slackpkg update' command): #MIRRORPLUS['myrepo']=dir://repositories/mypackages/ # Supported Repositories (see /usr/doc/slackpkg+-* for details): # -#Supports GPG -#slackpkgplus: http://slakfinder.org/slackpkg+/ -#alienbob: http://taper.alienbase.nl/mirrors/people/alien/sbrepos/{13.37,14.0,current}/{x86,x86_64}/ -#ktown: http://taper.alienbase.nl/mirrors/alien-kde/{13.37,14.0,current}/latest/{x86,x86_64}/ -#restricted: http://taper.alienbase.nl/mirrors/people/alien/restricted_sbrepos/{13.37,14.0,current}/{x86,x86_64}/ -#slacky: http://repository.slacky.eu/slackware{,64}-{13.37,14.0}/ -#zerouno: http://www.z01.eu/repo-slack/slackware64-current/ -#mled: http://www.microlinux.fr/slackware/MLED-14.0-{32,64}bit/ -#mles: http://www.microlinux.fr/slackware/MLES-14.0-{32,64}bit/ -#mles: http://www.microlinux.fr/slackware/MLWS-14.0-{32,64}bit/ -#msb: http://slackware.org.uk/msb/14.0/1.6/{x86,x86_64}/ -#slackers: http://www.slackers.it/repository/ -# -#Does NOT supports GPG -#salixos: http://download.salixos.org/{i486,x86_64}/{13.37,14.0}/ -#rlworkman: http://rlworkman.net/pkgs/{13.37,14.0}/ -#slackel: http://www.slackel.gr/repo/{i486,x86_64}/current/ diff --git a/src/slackpkgplus.x86_64.sample b/src/slackpkgplus.x86_64.sample index 582b4ba..01b7347 100644 --- a/src/slackpkgplus.x86_64.sample +++ b/src/slackpkgplus.x86_64.sample @@ -7,6 +7,11 @@ SLACKPKGPLUS=on # set to '2' to show always show the download bar VERBOSE=1 +# Enable (1) / Disable (0) the official slackpkg blacklist. May be useful to temporary skip +# the slackware blacklist. You can also ovverride it from command line: +# 'USEBL=0 slackpkg upgrade-all' +USEBL=1 + # If two or more repositories contains some same packages, you can specify # from which repository you prefer to search it. # The syntax is ":" @@ -22,18 +27,18 @@ VERBOSE=1 # List repository you want to use (defined below) # remember to launch 'slackpkg update' if you modify that row. -REPOPLUS=( slackpkgplus alienbob restricted slacky ) +REPOPLUS=( slackpkgplus restricted alienbob slacky ) # Define mirrors (uncomment one or more mirror; remember to add it to REPOPLUS) # Note: only multilib,alienbob,restricted,slacky repositories does supports GPG. If you add other # you may need to disable gpg check in slackpkg.conf -# Slackware 14.0 - x86_64 -#MIRRORPLUS['multilib']=http://taper.alienbase.nl/mirrors/people/alien/multilib/14.0/ -MIRRORPLUS['alienbob']=http://taper.alienbase.nl/mirrors/people/alien/sbrepos/14.0/x86_64/ -MIRRORPLUS['restricted']=http://taper.alienbase.nl/mirrors/people/alien/restricted_sbrepos/14.0/x86_64/ -MIRRORPLUS['slacky']=http://repository.slacky.eu/slackware64-14.0/ +# Slackware 14.1 - x86_64 +#MIRRORPLUS['multilib']=http://taper.alienbase.nl/mirrors/people/alien/multilib/14.1/ +MIRRORPLUS['alienbob']=http://taper.alienbase.nl/mirrors/people/alien/sbrepos/14.1/x86_64/ +MIRRORPLUS['restricted']=http://taper.alienbase.nl/mirrors/people/alien/restricted_sbrepos/14.1/x86_64/ +MIRRORPLUS['slacky']=http://repository.slacky.eu/slackware64-14.1/ # use this to keep updated the slackpkg+ package MIRRORPLUS['slackpkgplus']=http://slakfinder.org/slackpkg+/ @@ -43,7 +48,7 @@ MIRRORPLUS['slackpkgplus']=http://slakfinder.org/slackpkg+/ #MIRRORPLUS['zerouno']=http://www.z01.eu/repo-slack/slackware64-current/ # Local repository: -#MIRRORPLUS['alienbob']=file://repositories/alien/sbrepos/14.0/x86/ +#MIRRORPLUS['alienbob']=file://repositories/alien/sbrepos/14.1/x86/ # # Local packages (you do not need metadata nor 'slackpkg update' command): #MIRRORPLUS['myrepo']=dir://repositories/mypackages/ @@ -51,22 +56,3 @@ MIRRORPLUS['slackpkgplus']=http://slakfinder.org/slackpkg+/ # Supported Repositories (see /usr/doc/slackpkg+-* for details): # -#Supports GPG -#slackpkgplus: http://slakfinder.org/slackpkg+/ -#multilib: http://taper.alienbase.nl/mirrors/people/alien/multilib/{13.37,14.0,current}/ -#alienbob: http://taper.alienbase.nl/mirrors/people/alien/sbrepos/{13.37,14.0,current}/{x86,x86_64}/ -#ktown: http://taper.alienbase.nl/mirrors/alien-kde/{13.37,14.0,current}/latest/{x86,x86_64}/ -#restricted: http://taper.alienbase.nl/mirrors/people/alien/restricted_sbrepos/{13.37,14.0,current}/{x86,x86_64}/ -#slacky: http://repository.slacky.eu/slackware{,64}-{13.37,14.0}/ -#zerouno: http://www.z01.eu/repo-slack/slackware64-current/ -#mled: http://www.microlinux.fr/slackware/MLED-14.0-{32,64}bit/ -#mles: http://www.microlinux.fr/slackware/MLES-14.0-{32,64}bit/ -#mles: http://www.microlinux.fr/slackware/MLWS-14.0-{32,64}bit/ -#msb: http://slackware.org.uk/msb/14.0/1.6/{x86,x86_64}/ -#slackers: http://www.slackers.it/repository/ -# -#Does NOT supports GPG -#salixos: http://download.salixos.org/{i486,x86_64}/{13.37,14.0}/ -#salixext: http://people.salixos.org/ralvex/repository/x86_64/14.0/ -#rlworkman: http://rlworkman.net/pkgs/{13.37,14.0}/ -#slackel: http://www.slackel.gr/repo/{i486,x86_64}/current/