From 3643b14668d89872778c73d7bceb11fe935e3962 Mon Sep 17 00:00:00 2001 From: Matteo Rossini Date: Sun, 5 May 2013 16:43:46 +0200 Subject: [PATCH] Slackpkg+ 0.9.1 released --- ChangeLog.txt | 2 +- src/ChangeLog.txt | 47 ++++++++++++++++++++++++++++++++++ src/README | 10 +++++--- src/doinst.sh | 2 +- src/repositories.txt | 7 +++-- src/slackpkg+.SlackBuild | 10 +++++--- src/slackpkgplus.x86.sample | 10 +++++--- src/slackpkgplus.x86_64.sample | 13 ++++++---- 8 files changed, 82 insertions(+), 19 deletions(-) create mode 100644 src/ChangeLog.txt diff --git a/ChangeLog.txt b/ChangeLog.txt index 3bc4278..8157180 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,4 +1,4 @@ -Current +Version 0.9.1 - 05/May/2013 - fixed an error when a folder is missing in the slackware mirror (as /testing). - fixed a conflict searching the package 'slackpkg' diff --git a/src/ChangeLog.txt b/src/ChangeLog.txt new file mode 100644 index 0000000..8157180 --- /dev/null +++ b/src/ChangeLog.txt @@ -0,0 +1,47 @@ +Version 0.9.1 - 05/May/2013 + - fixed an error when a folder is missing in the slackware mirror (as + /testing). + - fixed a conflict searching the package 'slackpkg' + - added file-search function + +Version 0.9rc3 - 01/May/2013 + - added more config file checks + - fixed a bug that does not allow to use the gpg check + - fixed a bug that deny to use local slackware mirror + +Version 0.9rc2 - 30/Apr/2013 + - added config file checks + - fixed a bug that try to check gpg even if CHECKGPG is set to off + - fixed a bug that show compat32 packages as duplicated + - implemented 'slackpkg search' + +Version 0.9rc1 - 29/Apr/2013 + - added some repository + +Version 0.9beta2 - 27/Apr/2013 + - fixed a 'package' bug that override slackpkgplus.conf (instead .new) + - added doinst.sh that auto-select a configuration file depending $ARCH + - fixed priority system bug when two repositories have package with the same + full name + +Version 0.9beta1 - 26/Apr/2013 + - added repositories in conf file + - added a priority system for repository only + - added support to local repository + +Version 0.9test1 - 26/Apr/2013 + - added a priority system for repository and single packages + - added gpg support + - added explicit support for alienbob multilibs + +Version 0.3beta - 10/Oct/2012 + - Added slackware 14.0 in default configuration + +Version 0.2beta - 28/Sep/2012 + - renamed in 'slackpkg+' + - allow to add multiple repositories + - extends the slackpkg 'PRIORITY' + +Version 0.1 - 12/Jul/2011 + First release. + - added slacky repository to slackpkg diff --git a/src/README b/src/README index f21067a..f3c2f02 100644 --- a/src/README +++ b/src/README @@ -19,7 +19,8 @@ slackpkg update gpg slackpkg update -This is a beta version. +To keep slackpkg+ updated, uncomment the 'slackpkgplus' repository. +then 'slackpkg upgrade-all' will upgrade it. @@ -61,6 +62,7 @@ next: Supported repository are (for now): +slackpkgplus: http://slakfinder.org/slackpkg+/ multilib: http://taper.alienbase.nl/mirrors/people/alien/multilib/ alienbob: http://taper.alienbase.nl/mirrors/people/alien/sbrepos/ alien restricted: http://taper.alienbase.nl/mirrors/people/alien/restricted_sbrepos/ @@ -77,8 +79,7 @@ but you can add other yourself. See repositories.txt for details. -Currently only the alien repositories (multilib, alienbob and restricted) and the slacky repositories does supports GPG. -If configure the other repositories, you may need to set "CHECKGPG=off" in slackpkg.conf +If you configure repositories that does not supports gpg, you may need to set "CHECKGPG=off" in slackpkg.conf @@ -87,3 +88,6 @@ For questions, suggests or contributes, you can email me to zerouno@slacky.it or http://www.linuxquestions.org/questions/showthread.php?p=4940074 +You can found slackpkg+ +- the develop version (source): https://github.com/zuno/slackpkgplus.git +- the released version (source and package): http://www.slakfinder.org/slackpkg+/ diff --git a/src/doinst.sh b/src/doinst.sh index 3cd52a2..8f7e7b8 100644 --- a/src/doinst.sh +++ b/src/doinst.sh @@ -30,7 +30,7 @@ copy_config_file() { SRCMIRROR=slackpkgplus.x86.sample ;; esac - cp usr/doc/slackpkg+-0.9rc3/$SRCMIRROR etc/slackpkg/slackpkgplus.conf.new + cp usr/doc/slackpkg+-SLPVERSION/$SRCMIRROR etc/slackpkg/slackpkgplus.conf.new } copy_config_file diff --git a/src/repositories.txt b/src/repositories.txt index f2733a8..bd06d6e 100644 --- a/src/repositories.txt +++ b/src/repositories.txt @@ -1,18 +1,20 @@ 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}/{x86,x86_64}/ restricted: http://taper.alienbase.nl/mirrors/people/alien/restricted_sbrepos/{13.37,14.0}/{x86,x86_64}/ slacky: http://repository.slacky.eu/slackware{,64}-{13.37,14.0}/ ponce: http://ponce.cc/slackware/slackware{,64}-{13.37,14.0,current}/packages/ +zerouno: http://www.z01.eu/repo-slack/slackware64-current/ + Does NOT supports GPG salixos: http://download.salixos.org/{i486,x86_64}/{13.37,14.0}/ salixext: http://people.salixos.org/ralvex/packages/{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/ slackers: http://www.slackers.it/repository/ -zerouno: http://www.z01.eu/repo-slack/slackware64-current/ @@ -22,6 +24,7 @@ Details: name |13.37 | 14.0 | current | i386 | x86_64 | GPG |url -------------|------+------+---------+------+--------+-----+---------------------------------------------------------- +slackpkgplus | X | X | X | | | X | http://slakfinder.org/slackpkg+/ multilib | X | | | | X | X | http://taper.alienbase.nl/mirrors/people/alien/multilib/13.37/ multilib | | X | | | X | X | http://taper.alienbase.nl/mirrors/people/alien/multilib/14.0/ multilib | | | X | | X | X | http://taper.alienbase.nl/mirrors/people/alien/multilib/current/ @@ -41,6 +44,7 @@ ponce | X | | | | X | X | http://ponce.cc/sla ponce | | X | | X | | X | http://ponce.cc/slackware/slackware-current/packages/ ponce | | | X | X | | X | http://ponce.cc/slackware/slackware64-14.0/packages/ ponce | | | X | | X | X | http://ponce.cc/slackware/slackware64-current/packages/ +zerouno | | | X | | X | X | http://www.z01.eu/repo-slack/slackware64-current/ salixos | X | | | X | | | http://download.salixos.org/i486/13.37/ salixos | X | | | | X | | http://download.salixos.org/x86_64/13.37/ salixos | | X | | X | | | http://download.salixos.org/i486/14.0/ @@ -54,7 +58,6 @@ rlworkman | | X | | X | X | | http://rlworkman.ne slackel | | | X | X | | | http://www.slackel.gr/repo/i486/current/ slackel | | | X | | X | | http://www.slackel.gr/repo/x86_64/current/ slackers | | | X | X | X | | http://www.slackers.it/repository/ -zerouno | | | X | | X | | http://www.z01.eu/repo-slack/slackware64-current/ You can found a larger list at http://slakfinder.org diff --git a/src/slackpkg+.SlackBuild b/src/slackpkg+.SlackBuild index c1b5c35..f1152f5 100644 --- a/src/slackpkg+.SlackBuild +++ b/src/slackpkg+.SlackBuild @@ -2,11 +2,14 @@ set -e -VERSION=0.9rc3 +VERSION=0.9.1 BUILD=1mt CWD=`pwd` -PKG=$CWD/../slackpkg+-$VERSION +TMP=${TMP:-/tmp} +PKG=$TMP/slackpkg+-$VERSION + +OUTPUT=${OUTPUT:-$TMP} rm -rf $PKG mkdir -p $PKG @@ -19,6 +22,7 @@ mkdir -p install/ cp $CWD/slackpkgplus.sh usr/libexec/slackpkg/functions.d/ cp $CWD/README usr/doc/slackpkg+-$VERSION/ +cp $CWD/ChangeLog.txt usr/doc/slackpkg+-$VERSION/ cp $CWD/repositories.txt usr/doc/slackpkg+-$VERSION/ cp $CWD/slackpkg+.SlackBuild usr/doc/slackpkg+-$VERSION/ cp $CWD/slackpkgplus.*.sample usr/doc/slackpkg+-$VERSION/ @@ -28,7 +32,7 @@ cat $CWD/doinst.sh|sed "s/SLPVERSION/$VERSION/" > install/doinst.sh chmod +x usr/libexec/slackpkg/functions.d/slackpkgplus.sh -makepkg -l y -c y ../slackpkg+-$VERSION-noarch-$BUILD.txz +makepkg -l y -c y $OUTPUT/slackpkg+-$VERSION-noarch-$BUILD.txz diff --git a/src/slackpkgplus.x86.sample b/src/slackpkgplus.x86.sample index 44a18f9..8ae27b3 100644 --- a/src/slackpkgplus.x86.sample +++ b/src/slackpkgplus.x86.sample @@ -13,7 +13,7 @@ SLACKPKGPLUS=on # List repository you want to use (defined below). # remember to launch 'slackpkg update' if you modify that row. -REPOPLUS=( alienbob restricted slacky ponce ) +REPOPLUS=( slackpkgplus alienbob restricted slacky ) @@ -25,7 +25,9 @@ REPOPLUS=( alienbob restricted slacky ponce ) 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/ -MIRRORPLUS['ponce']=http://ponce.cc/slackware/slackware-14.0/packages/ + +# use this to keep updated the slackpkg+ package +MIRRORPLUS['slackpkgplus']=http://slakfinder.org/slackpkg+/ # Slackware current - i386 #MIRRORPLUS['ponce']=http://ponce.cc/slackware/slackware-current/packages/ @@ -35,11 +37,12 @@ MIRRORPLUS['ponce']=http://ponce.cc/slackware/slackware-14.0/packages/ # 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}/{x86,x86_64}/ # restricted: http://taper.alienbase.nl/mirrors/people/alien/restricted_sbrepos/{13.37,14.0}/{x86,x86_64}/ # slacky: http://repository.slacky.eu/slackware{,64}-{13.37,14.0}/ -# ponce: http://ponce.cc/slackware/slackware{,64}-{14.0,current}/packages/ +# zerouno: http://www.z01.eu/repo-slack/slackware64-current/ # # Does NOT supports GPG # salixos: http://download.salixos.org/{i486,x86_64}/{13.37,14.0}/ @@ -47,4 +50,3 @@ MIRRORPLUS['ponce']=http://ponce.cc/slackware/slackware-14.0/packages/ # rlworkman: http://rlworkman.net/pkgs/{13.37,14.0}/ # slackel: http://www.slackel.gr/repo/{i486,x86_64}/current/ # slackers: http://www.slackers.it/repository/ -# zerouno: http://www.z01.eu/repo-slack/slackware64-current/ diff --git a/src/slackpkgplus.x86_64.sample b/src/slackpkgplus.x86_64.sample index dbd8513..56990ae 100644 --- a/src/slackpkgplus.x86_64.sample +++ b/src/slackpkgplus.x86_64.sample @@ -15,8 +15,8 @@ SLACKPKGPLUS=on # # List repository you want to use (defined below) -# # remember to launch 'slackpkg update' if you modify that row. -REPOPLUS=( alienbob restricted slacky ponce ) +# remember to launch 'slackpkg update' if you modify that row. +REPOPLUS=( slackpkgplus alienbob restricted slacky ) # Define mirrors (uncomment one or more mirror; remember to add it to REPOPLUS) @@ -28,22 +28,26 @@ REPOPLUS=( alienbob restricted slacky ponce ) 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/ -MIRRORPLUS['ponce']=http://ponce.cc/slackware/slackware64-14.0/packages/ + +# use this to keep updated the slackpkg+ package +MIRRORPLUS['slackpkgplus']=http://slakfinder.org/slackpkg+/ # Slackware current - x86_64 #MIRRORPLUS['multilib']=http://taper.alienbase.nl/mirrors/people/alien/multilib/current/ #MIRRORPLUS['ponce']=http://ponce.cc/slackware/slackware64-current/packages/ +#MIRRORPLUS['zerouno']=http://www.z01.eu/repo-slack/slackware64-current/ # 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}/{x86,x86_64}/ # restricted: http://taper.alienbase.nl/mirrors/people/alien/restricted_sbrepos/{13.37,14.0}/{x86,x86_64}/ # slacky: http://repository.slacky.eu/slackware{,64}-{13.37,14.0}/ -# ponce: http://ponce.cc/slackware/slackware{,64}-{14.0,current}/packages/ +# zerouno: http://www.z01.eu/repo-slack/slackware64-current/ # # Does NOT supports GPG # salixos: http://download.salixos.org/{i486,x86_64}/{13.37,14.0}/ @@ -51,4 +55,3 @@ MIRRORPLUS['ponce']=http://ponce.cc/slackware/slackware64-14.0/packages/ # rlworkman: http://rlworkman.net/pkgs/{13.37,14.0}/ # slackel: http://www.slackel.gr/repo/{i486,x86_64}/current/ # slackers: http://www.slackers.it/repository/ -# zerouno: http://www.z01.eu/repo-slack/slackware64-current/