From f26844a3be74c1da31d6ec59bd8ebef3e1cf5b3b Mon Sep 17 00:00:00 2001 From: Matteo Rossini Date: Tue, 29 Dec 2015 23:36:48 +0100 Subject: [PATCH] added repositories improved checkrepos.sh rebuild repositories.lst --- src/checkrepos.sh | 27 +++++-- src/repositories.lst | 185 +++++++++++++++++++++---------------------- src/repositories.txt | 11 +-- 3 files changed, 118 insertions(+), 105 deletions(-) diff --git a/src/checkrepos.sh b/src/checkrepos.sh index c676d17..1a32e23 100755 --- a/src/checkrepos.sh +++ b/src/checkrepos.sh @@ -21,6 +21,7 @@ Or: urls and check if it is a repository. -q print non-verbose progress + -v print more verbose info The repository url can use the syntax '{ ... }' to specify multiple repository in one row. The script expand it and @@ -50,6 +51,10 @@ if [ "$1" == "-q" ];then V="" shift fi +if [ "$1" == "-v" ];then + V=2 + shift +fi if [ -f "$1" ];then REPOS=$(cat $1|egrep -o 'http://[^ ]*') @@ -59,8 +64,8 @@ fi REPOS=$(eval echo $REPOS|sed -e 's/{//g' -e 's/}//g') -[ $V ]&&echo "Expanded repositories" -[ $V ]&&echo $REPOS|sed 's/ /\n/g' +[ $V ]&&echo "Expanded repositories" >&2 +[ $V ]&&echo $REPOS|sed 's/ /\n/g' >&2 TMP=$(mktemp -d) cd $TMP @@ -156,13 +161,19 @@ for R in $REPOS;do [ $V ]&&echo "invalid"|grep --color . GPG=bad else - ID=$(echo $(cat GPG-KEY|grep -m1 ^uid|cut -c4-)) + ID=$(gpg --list-packets GPG-KEY|grep ":user ID packet:"|head -1|cut -f2 -d'"') if [ -z "$ID" ];then [ $V ]&&echo "Unable to get UID"|grep --color . + GPG=yes else [ $V ]&&echo $ID + GPG=$ID fi - GPG=yes + if [ "$V" == "2" ];then + ( gpg --list-packets GPG-KEY + cat GPG-KEY + )|sed 's/^/ /' + fi fi elif grep -q "404 Not Found" wget.log;then [ $V ]&&echo "not present"|grep --color . @@ -182,7 +193,7 @@ for R in $REPOS;do echo "Done" fi - echo -e "$REPO\t$MD5\t$GPG\t$PACK" >> repositories.txt + echo -e "$REPO#$MD5#$PACK#$GPG" >> repositories.tmp done @@ -190,9 +201,11 @@ echo echo "========================================================" ) >&2 -echo -e "url\tmd5\tgpg\tpack" +( +echo -e "url#md5#pack#gpg" echo -cat repositories.txt|sort +cat repositories.tmp|sort +)|LANG=C.utf8 column -t -s '#' cd #rm -rf $TMP diff --git a/src/repositories.lst b/src/repositories.lst index 02cdd97..6fb6372 100644 --- a/src/repositories.lst +++ b/src/repositories.lst @@ -1,93 +1,92 @@ -url md5 gpg pack - -http://download.salixos.org/i486/13.37 yes yes yes -http://download.salixos.org/i486/14.0 yes yes yes -http://download.salixos.org/i486/14.1 yes yes yes -http://download.salixos.org/x86_64/13.37 yes yes yes -http://download.salixos.org/x86_64/14.0 yes yes yes -http://download.salixos.org/x86_64/14.1 yes yes yes -http://ngc891.blogdns.net/pub/slacke18/slackware-14.1 yes yes yes -http://ngc891.blogdns.net/pub/slacke18/slackware64-14.1 yes yes yes -http://ngc891.blogdns.net/pub/slacke18/slackwarearm-14.1 yes yes yes -http://packages.slackonly.com/pub/packages/14.1-x86 yes yes yes -http://packages.slackonly.com/pub/packages/14.1-x86_64 yes yes yes -http://packages.slackonly.com/pub/packages/current-x86 yes yes yes -http://packages.slackonly.com/pub/packages/current-x86_64 yes yes yes -http://ponce.cc/slackers/repository yes yes yes -http://repository.slacky.eu/slackware-13.37 yes no yes -http://repository.slacky.eu/slackware-14.0 yes yes yes -http://repository.slacky.eu/slackware-14.1 yes yes yes -http://repository.slacky.eu/slackware64-13.37 yes no yes -http://repository.slacky.eu/slackware64-14.0 yes yes yes -http://repository.slacky.eu/slackware64-14.1 yes yes yes -http://rlworkman.net/pkgs/13.37 yes yes yes -http://rlworkman.net/pkgs/14.0 yes yes yes -http://rlworkman.net/pkgs/14.1 yes yes yes -http://rlworkman.net/pkgs/current yes yes yes -http://slackware.org.uk/msb/14.0/1.6/x86 yes yes yes -http://slackware.org.uk/msb/14.0/1.6/x86_64 yes yes yes -http://slackware.org.uk/msb/14.1/1.10/x86 yes yes yes -http://slackware.org.uk/msb/14.1/1.10/x86_64 yes yes yes -http://slackware.org.uk/msb/14.1/1.12/x86 yes yes yes -http://slackware.org.uk/msb/14.1/1.12/x86_64 yes yes yes -http://slackware.org.uk/msb/14.1/1.6/x86 yes yes yes -http://slackware.org.uk/msb/14.1/1.6/x86_64 yes yes yes -http://slackware.org.uk/msb/14.1/1.8/x86 yes yes yes -http://slackware.org.uk/msb/14.1/1.8/x86_64 yes yes yes -http://slackware.org.uk/msb/testing/1.12/x86 yes yes yes -http://slackware.org.uk/msb/testing/1.12/x86_64 yes yes yes -http://slakfinder.org/slackpkg+ yes yes yes -http://studioware.org/files/packages/slackware-13.37 yes yes yes -http://studioware.org/files/packages/slackware-14.0 yes yes yes -http://studioware.org/files/packages/slackware-14.1 yes yes yes -http://studioware.org/files/packages/slackware64-13.37 yes yes yes -http://studioware.org/files/packages/slackware64-14.0 yes yes yes -http://studioware.org/files/packages/slackware64-14.1 yes yes yes -http://taper.alienbase.nl/mirrors/alien-kde/13.37/latest/x86 yes yes yes -http://taper.alienbase.nl/mirrors/alien-kde/13.37/latest/x86_64 yes yes yes -http://taper.alienbase.nl/mirrors/alien-kde/14.0/latest/x86 yes yes yes -http://taper.alienbase.nl/mirrors/alien-kde/14.0/latest/x86_64 yes yes yes -http://taper.alienbase.nl/mirrors/alien-kde/14.1/latest/x86 yes yes yes -http://taper.alienbase.nl/mirrors/alien-kde/14.1/latest/x86_64 yes yes yes -http://taper.alienbase.nl/mirrors/alien-kde/current/latest/x86 yes yes yes -http://taper.alienbase.nl/mirrors/alien-kde/current/latest/x86_64 yes yes yes -http://taper.alienbase.nl/mirrors/alien-kde/current/testing/x86 yes yes yes -http://taper.alienbase.nl/mirrors/alien-kde/current/testing/x86_64 yes yes yes -http://taper.alienbase.nl/mirrors/people/alien/multilib/13.37 yes yes yes -http://taper.alienbase.nl/mirrors/people/alien/multilib/14.0 yes yes yes -http://taper.alienbase.nl/mirrors/people/alien/multilib/14.1 yes yes yes -http://taper.alienbase.nl/mirrors/people/alien/multilib/current yes yes yes -http://taper.alienbase.nl/mirrors/people/alien/restricted_sbrepos/13.37/x86 yes yes yes -http://taper.alienbase.nl/mirrors/people/alien/restricted_sbrepos/13.37/x86_64 yes yes yes -http://taper.alienbase.nl/mirrors/people/alien/restricted_sbrepos/14.0/x86 yes yes yes -http://taper.alienbase.nl/mirrors/people/alien/restricted_sbrepos/14.0/x86_64 yes yes yes -http://taper.alienbase.nl/mirrors/people/alien/restricted_sbrepos/14.1/x86 yes yes yes -http://taper.alienbase.nl/mirrors/people/alien/restricted_sbrepos/14.1/x86_64 yes yes yes -http://taper.alienbase.nl/mirrors/people/alien/restricted_sbrepos/current/x86 yes yes yes -http://taper.alienbase.nl/mirrors/people/alien/restricted_sbrepos/current/x86_64 yes yes yes -http://taper.alienbase.nl/mirrors/people/alien/sbrepos/13.37/x86 yes yes yes -http://taper.alienbase.nl/mirrors/people/alien/sbrepos/13.37/x86_64 yes yes yes -http://taper.alienbase.nl/mirrors/people/alien/sbrepos/14.0/x86 yes yes yes -http://taper.alienbase.nl/mirrors/people/alien/sbrepos/14.0/x86_64 yes yes yes -http://taper.alienbase.nl/mirrors/people/alien/sbrepos/14.1/x86 yes yes yes -http://taper.alienbase.nl/mirrors/people/alien/sbrepos/14.1/x86_64 yes yes yes -http://taper.alienbase.nl/mirrors/people/alien/sbrepos/current/x86 yes yes yes -http://taper.alienbase.nl/mirrors/people/alien/sbrepos/current/x86_64 yes yes yes -http://www.microlinux.fr/microlinux/desktop-14.1-32bit yes yes yes -http://www.microlinux.fr/microlinux/desktop-14.1-64bit yes yes yes -http://www.microlinux.fr/microlinux/desktop-14.2-32bit yes yes yes -http://www.microlinux.fr/microlinux/desktop-14.2-64bit yes yes yes -http://www.microlinux.fr/microlinux/extras-14.1-32bit yes yes yes -http://www.microlinux.fr/microlinux/extras-14.1-64bit yes yes yes -http://www.microlinux.fr/microlinux/extras-14.2-32bit yes yes yes -http://www.microlinux.fr/microlinux/extras-14.2-64bit yes yes yes -http://www.microlinux.fr/microlinux/server-14.0-32bit yes yes yes -http://www.microlinux.fr/microlinux/server-14.0-64bit yes yes yes -http://www.microlinux.fr/microlinux/server-14.1-32bit yes yes yes -http://www.microlinux.fr/microlinux/server-14.1-64bit yes yes yes -http://www.microlinux.fr/microlinux/server-14.2-32bit yes yes yes -http://www.microlinux.fr/microlinux/server-14.2-64bit yes yes yes -http://www.slackel.gr/repo/i486/current yes yes yes -http://www.slackel.gr/repo/i486/kde5 yes yes yes -http://www.slackel.gr/repo/x86_64/current yes yes yes -http://www.slackel.gr/repo/x86_64/kde5 yes yes yes +url md5 pack gpg +http://connochaetos.org/slack-n-free/slack-n-free-14.1 yes yes Henry Jensen +http://connochaetos.org/slack-n-free/slack-n-free64-14.1 yes yes Henry Jensen +http://download.salixos.org/i486/13.37 yes yes Salix Admin (The Bonsai OS) +http://download.salixos.org/i486/14.0 yes yes Salix Admin (The Bonsai OS) +http://download.salixos.org/i486/14.1 yes yes Salix Admin (The Bonsai OS) +http://download.salixos.org/x86_64/13.37 yes yes Salix Admin (The Bonsai OS) +http://download.salixos.org/x86_64/14.0 yes yes Salix Admin (The Bonsai OS) +http://download.salixos.org/x86_64/14.1 yes yes Salix Admin (The Bonsai OS) +http://ngc891.blogdns.net/pub/slacke18/slackware-14.1 yes yes Jérôme Pinot +http://ngc891.blogdns.net/pub/slacke18/slackware64-14.1 yes yes Jérôme Pinot +http://ngc891.blogdns.net/pub/slacke18/slackwarearm-14.1 yes yes Jérôme Pinot +http://packages.slackonly.com/pub/packages/14.1-x86 yes yes Panagiotis Nikolaou (slackware user) +http://packages.slackonly.com/pub/packages/14.1-x86_64 yes yes Panagiotis Nikolaou (slackware user) +http://packages.slackonly.com/pub/packages/current-x86 yes yes Panagiotis Nikolaou (slackware user) +http://packages.slackonly.com/pub/packages/current-x86_64 yes yes Panagiotis Nikolaou (slackware user) +http://ponce.cc/slackers/repository yes yes Corrado Franco (Conraid) +http://repository.slacky.eu/slackware-13.37 yes yes Slacky.eu packagers (packages by Slacky.eu) +http://repository.slacky.eu/slackware-14.0 yes yes Slacky.eu packagers (packages by Slacky.eu) +http://repository.slacky.eu/slackware-14.1 yes yes Slacky.eu packagers (packages by Slacky.eu) +http://repository.slacky.eu/slackware64-13.37 yes yes Slacky.eu packagers (packages by Slacky.eu) +http://repository.slacky.eu/slackware64-14.0 yes yes Slacky.eu packagers (packages by Slacky.eu) +http://repository.slacky.eu/slackware64-14.1 yes yes Slacky.eu packagers (packages by Slacky.eu) +http://rlworkman.net/pkgs/13.37 yes yes Robby Workman +http://rlworkman.net/pkgs/14.0 yes yes Robby Workman +http://rlworkman.net/pkgs/14.1 yes yes Robby Workman +http://rlworkman.net/pkgs/current yes yes Robby Workman +http://slackware.org.uk/msb/14.0/1.6/x86 yes yes MATE SlackBuilds +http://slackware.org.uk/msb/14.0/1.6/x86_64 yes yes MATE SlackBuilds +http://slackware.org.uk/msb/14.1/1.10/x86 yes yes MATE SlackBuilds +http://slackware.org.uk/msb/14.1/1.10/x86_64 yes yes MATE SlackBuilds +http://slackware.org.uk/msb/14.1/1.12/x86 yes yes MATE SlackBuilds +http://slackware.org.uk/msb/14.1/1.12/x86_64 yes yes MATE SlackBuilds +http://slackware.org.uk/msb/14.1/1.6/x86 yes yes MATE SlackBuilds +http://slackware.org.uk/msb/14.1/1.6/x86_64 yes yes MATE SlackBuilds +http://slackware.org.uk/msb/14.1/1.8/x86 yes yes MATE SlackBuilds +http://slackware.org.uk/msb/14.1/1.8/x86_64 yes yes MATE SlackBuilds +http://slackware.org.uk/msb/testing/1.12/x86 yes yes MATE SlackBuilds +http://slackware.org.uk/msb/testing/1.12/x86_64 yes yes MATE SlackBuilds +http://slakfinder.org/slackpkg+ yes yes Matteo Rossini +http://studioware.org/files/packages/slackware-13.37 yes yes Studioware +http://studioware.org/files/packages/slackware-14.0 yes yes Studioware +http://studioware.org/files/packages/slackware-14.1 yes yes Studioware +http://studioware.org/files/packages/slackware64-13.37 yes yes Studioware +http://studioware.org/files/packages/slackware64-14.0 yes yes Studioware +http://studioware.org/files/packages/slackware64-14.1 yes yes Studioware +http://taper.alienbase.nl/mirrors/alien-kde/13.37/latest/x86 yes yes Eric Hameleers (IBM Linux) +http://taper.alienbase.nl/mirrors/alien-kde/13.37/latest/x86_64 yes yes Eric Hameleers (IBM Linux) +http://taper.alienbase.nl/mirrors/alien-kde/14.0/latest/x86 yes yes Eric Hameleers (IBM Linux) +http://taper.alienbase.nl/mirrors/alien-kde/14.0/latest/x86_64 yes yes Eric Hameleers (IBM Linux) +http://taper.alienbase.nl/mirrors/alien-kde/14.1/latest/x86 yes yes Eric Hameleers (IBM Linux) +http://taper.alienbase.nl/mirrors/alien-kde/14.1/latest/x86_64 yes yes Eric Hameleers (IBM Linux) +http://taper.alienbase.nl/mirrors/alien-kde/current/5/x86 yes yes Eric Hameleers (IBM Linux) +http://taper.alienbase.nl/mirrors/alien-kde/current/5/x86_64 yes yes Eric Hameleers (IBM Linux) +http://taper.alienbase.nl/mirrors/alien-kde/current/latest/x86 yes yes Eric Hameleers (IBM Linux) +http://taper.alienbase.nl/mirrors/alien-kde/current/latest/x86_64 yes yes Eric Hameleers (IBM Linux) +http://taper.alienbase.nl/mirrors/people/alien/multilib/13.37 yes yes Eric Hameleers (IBM Linux) +http://taper.alienbase.nl/mirrors/people/alien/multilib/14.0 yes yes Eric Hameleers (IBM Linux) +http://taper.alienbase.nl/mirrors/people/alien/multilib/14.1 yes yes Eric Hameleers (IBM Linux) +http://taper.alienbase.nl/mirrors/people/alien/multilib/current yes yes Eric Hameleers (IBM Linux) +http://taper.alienbase.nl/mirrors/people/alien/restricted_sbrepos/13.37/x86 yes yes Eric Hameleers (IBM Linux) +http://taper.alienbase.nl/mirrors/people/alien/restricted_sbrepos/13.37/x86_64 yes yes Eric Hameleers (IBM Linux) +http://taper.alienbase.nl/mirrors/people/alien/restricted_sbrepos/14.0/x86 yes yes Eric Hameleers (IBM Linux) +http://taper.alienbase.nl/mirrors/people/alien/restricted_sbrepos/14.0/x86_64 yes yes Eric Hameleers (IBM Linux) +http://taper.alienbase.nl/mirrors/people/alien/restricted_sbrepos/14.1/x86 yes yes Eric Hameleers (IBM Linux) +http://taper.alienbase.nl/mirrors/people/alien/restricted_sbrepos/14.1/x86_64 yes yes Eric Hameleers (IBM Linux) +http://taper.alienbase.nl/mirrors/people/alien/restricted_sbrepos/current/x86 yes yes Eric Hameleers (IBM Linux) +http://taper.alienbase.nl/mirrors/people/alien/restricted_sbrepos/current/x86_64 yes yes Eric Hameleers (IBM Linux) +http://taper.alienbase.nl/mirrors/people/alien/sbrepos/13.37/x86 yes yes Eric Hameleers (IBM Linux) +http://taper.alienbase.nl/mirrors/people/alien/sbrepos/13.37/x86_64 yes yes Eric Hameleers (IBM Linux) +http://taper.alienbase.nl/mirrors/people/alien/sbrepos/14.0/x86 yes yes Eric Hameleers (IBM Linux) +http://taper.alienbase.nl/mirrors/people/alien/sbrepos/14.0/x86_64 yes yes Eric Hameleers (IBM Linux) +http://taper.alienbase.nl/mirrors/people/alien/sbrepos/14.1/x86 yes yes Eric Hameleers (IBM Linux) +http://taper.alienbase.nl/mirrors/people/alien/sbrepos/14.1/x86_64 yes yes Eric Hameleers (IBM Linux) +http://taper.alienbase.nl/mirrors/people/alien/sbrepos/current/x86 yes yes Eric Hameleers (IBM Linux) +http://taper.alienbase.nl/mirrors/people/alien/sbrepos/current/x86_64 yes yes Eric Hameleers (IBM Linux) +http://www.microlinux.fr/microlinux/desktop-14.1-32bit yes yes Niki Kovacs +http://www.microlinux.fr/microlinux/desktop-14.1-64bit yes yes Niki Kovacs +http://www.microlinux.fr/microlinux/desktop-14.2-32bit yes yes Niki Kovacs +http://www.microlinux.fr/microlinux/desktop-14.2-64bit yes yes Niki Kovacs +http://www.microlinux.fr/microlinux/extras-14.1-32bit yes yes Niki Kovacs +http://www.microlinux.fr/microlinux/extras-14.1-64bit yes yes Niki Kovacs +http://www.microlinux.fr/microlinux/extras-14.2-32bit yes yes Niki Kovacs +http://www.microlinux.fr/microlinux/extras-14.2-64bit yes yes Niki Kovacs +http://www.microlinux.fr/microlinux/server-14.0-32bit yes yes Niki Kovacs +http://www.microlinux.fr/microlinux/server-14.0-64bit yes yes Niki Kovacs +http://www.microlinux.fr/microlinux/server-14.1-32bit yes yes Niki Kovacs +http://www.microlinux.fr/microlinux/server-14.1-64bit yes yes Niki Kovacs +http://www.microlinux.fr/microlinux/server-14.2-32bit yes yes Niki Kovacs +http://www.microlinux.fr/microlinux/server-14.2-64bit yes yes Niki Kovacs +http://www.slackel.gr/repo/i486/current yes yes Dimitris Tzemos (Slackel Creator) +http://www.slackel.gr/repo/x86_64/current yes yes Dimitris Tzemos (Slackel Creator) diff --git a/src/repositories.txt b/src/repositories.txt index 22eb91d..e05d37e 100644 --- a/src/repositories.txt +++ b/src/repositories.txt @@ -4,7 +4,7 @@ Supported Repositories: > 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,testing}/{x86,x86_64}/ +> ktown: http://taper.alienbase.nl/mirrors/alien-kde/{13.37,14.0,14.1,current}/{latest,5}/{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}/ > mleddesktop: http://www.microlinux.fr/microlinux/desktop-{14.1,14.2}-{32,64}bit/ @@ -16,17 +16,18 @@ Supported Repositories: > 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}/ -> slackel: http://www.slackel.gr/repo/{i486,x86_64}/{current,kde5}/ +> slackel: http://www.slackel.gr/repo/{i486,x86_64}/current/ +> connochaetos: http://connochaetos.org/slack-n-free/slack-n-free{,64}-14.1/ > -> Does NOT support GPG +> Partial GPG support > salixos(*): http://download.salixos.org/{i486,x86_64}/{13.37,14.0,14.1}/ -(*) salixos and slackel partially supports GPG. These repositories contains the .asc file +(*) salixos partially supports GPG. These repositories contains the .asc file for CHECKSUMS.md5, so the 'update' process works with CHECKGPG=on and repository authenticity is guaranteed. Unfortunately the single packages do not include the related .asc file, so you must install the packages with 'slackpkg -checkgpg=off install ', but the - authenticity is guaranteed by the md5 authenticity. + integrity is guaranteed by the md5 authenticity. You can find a larger list at http://slakfinder.org