From 3f61d8348ecb847dcfc03cb2dd73c79bcd11712d Mon Sep 17 00:00:00 2001 From: Cecil Hugh Watson Date: Sat, 4 Sep 2010 22:51:32 -0700 Subject: pacman:Bumped/Updated for LinHES 7. --- abs/core-testing/pacman-mirrorlist/PKGBUILD | 26 +- abs/core-testing/pacman-mirrorlist/mirrorlist | 384 +++++++++++++++------ ...lback-to-sane-defaults-for-library-stripp.patch | 32 ++ abs/core-testing/pacman/PKGBUILD | 30 +- abs/core-testing/pacman/makepkg.conf | 10 +- abs/core-testing/pacman/pacman.conf | 4 +- abs/core-testing/pacman/pacman.install | 10 +- 7 files changed, 360 insertions(+), 136 deletions(-) create mode 100644 abs/core-testing/pacman/0001-makepkg-fallback-to-sane-defaults-for-library-stripp.patch diff --git a/abs/core-testing/pacman-mirrorlist/PKGBUILD b/abs/core-testing/pacman-mirrorlist/PKGBUILD index 32bd639..76aa033 100644 --- a/abs/core-testing/pacman-mirrorlist/PKGBUILD +++ b/abs/core-testing/pacman-mirrorlist/PKGBUILD @@ -1,22 +1,34 @@ -# $Id: PKGBUILD 23382 2009-01-08 14:18:33Z allan $ +# $Id: PKGBUILD 83368 2010-06-21 12:46:38Z dan $ # Maintainer: Dan McGee pkgname=pacman-mirrorlist -pkgver=20090108 +pkgver=20100621 pkgrel=1 pkgdesc="Arch Linux mirror list for use by pacman" -arch=('i686' 'x86_64') +arch=('any') url="http://www.archlinux.org/pacman/" license=('GPL') -groups=('base') backup=(etc/pacman.d/mirrorlist) source=(mirrorlist) +# keep an upgrade path for older installations +PKGEXT='.pkg.tar.gz' + +# NOTE on building this package: +# * Go to the trunk/ directory +# * Run bash -c ". PKGBUILD; updatelist" +# * Update the checksums, update pkgver +# * Build the package + +updatelist() { + wget -O mirrorlist http://www.archlinux.org/mirrorlist/i686/all/ + sed -i 's/i686/$arch/' mirrorlist +} + build() { mkdir -p $pkgdir/etc/pacman.d install -m644 $srcdir/mirrorlist $pkgdir/etc/pacman.d/ - # customize mirrorlist to architecture - sed -i -e "s/@carch@/${CARCH}/g" $pkgdir/etc/pacman.d/mirrorlist } -md5sums=('854aff1843e1cff2cf45aeef79a89279') +md5sums=('506e96c2c64c5dbea880112bc5070a22') +sha256sums=('03507e32ab9fc9988e0df164cb82c75316a0b043c584ae9240cf801600e55c31') diff --git a/abs/core-testing/pacman-mirrorlist/mirrorlist b/abs/core-testing/pacman-mirrorlist/mirrorlist index ef691e9..d8498f3 100644 --- a/abs/core-testing/pacman-mirrorlist/mirrorlist +++ b/abs/core-testing/pacman-mirrorlist/mirrorlist @@ -1,116 +1,282 @@ # # Arch Linux repository mirrorlist +# Generated on 2010-06-21 # -# North America -# - United States -Server = ftp://ftp.archlinux.org/$repo/os/@carch@ -Server = ftp://locke.suu.edu/linux/dist/archlinux/$repo/os/@carch@ -Server = http://archlinux.unixheads.org/$repo/os/@carch@ -Server = ftp://ftp.gtlib.gatech.edu/pub/linux/distributions/archlinux/$repo/os/@carch@ -Server = ftp://mirror.cs.vt.edu/pub/ArchLinux/$repo/os/@carch@ -Server = http://mirrors.easynews.com/linux/archlinux/$repo/os/@carch@ -Server = ftp://ftp.ibiblio.org/pub/linux/distributions/archlinux/$repo/os/@carch@ -Server = http://archlinux.umflint.edu/mirrors/archlinux/$repo/os/@carch@ -Server = http://mirror.neotuli.net/arch/$repo/os/@carch@ -Server = http://mirror.rit.edu/archlinux/$repo/os/@carch@ -Server = http://mirror.umoss.org/archlinux/$repo/os/@carch@ -Server = http://schlunix.org/archlinux/$repo/os/@carch@ -Server = http://mirror.archlinux.com.ve/$repo/os/@carch@ -Server = http://mirrors.gigenet.com/archlinux/$repo/os/@carch@ -# - Canada -Server = ftp://mirror.csclub.uwaterloo.ca/archlinux/$repo/os/@carch@ -Server = ftp://mirrors.portafixe.com/archlinux/$repo/os/@carch@ - -# South America -# - Brazil -Server = http://archlinux.c3sl.ufpr.br/$repo/os/@carch@ -Server = ftp://archlinux.c3sl.ufpr.br/archlinux/$repo/os/@carch@ -Server = ftp://ftp.las.ic.unicamp.br/pub/archlinux/$repo/os/@carch@ -# - Venezuela -Server = http://mirror2.archlinux.com.ve/$repo/os/@carch@ - -# Europe -# - Austria -Server = ftp://gd.tuwien.ac.at/opsys/linux/archlinux/$repo/os/@carch@ -# - Belgium -Server = ftp://ftp.belnet.be/mirror/archlinux.org/$repo/os/@carch@ -# - Czech Republic -Server = ftp://ftp.sh.cvut.cz/MIRRORS/arch/$repo/os/@carch@ -# - Denmark -Server = ftp://ftp.klid.dk/archlinux/$repo/os/@carch@ -# - Estonia -Server = ftp://ftp.estpak.ee/pub/archlinux/$repo/os/@carch@ -# - France -Server = ftp://mir1.archlinuxfr.org/archlinux/$repo/os/@carch@ -Server = ftp://mir2.archlinuxfr.org/archlinux/$repo/os/@carch@ -Server = ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/archlinux/$repo/os/@carch@ -Server = http://mir.archlinux.fr/$repo/os/@carch@ -Server = ftp://ftp.free.fr/mirrors/ftp.archlinux.org/$repo/os/@carch@ -Server = ftp://ftp.rez-gif.supelec.fr/Linux/archlinux/$repo/os/@carch@ -# - Germany -Server = ftp://ftp.hosteurope.de/mirror/ftp.archlinux.org/$repo/os/@carch@ -Server = ftp://ftp5.gwdg.de/pub/linux/archlinux/$repo/os/@carch@ -Server = ftp://ftp.uni-bayreuth.de/pub/linux/archlinux/$repo/os/@carch@ -Server = ftp://ftp.archlinuxppc.org/@carch@/$repo/os/@carch@ -Server = ftp://ftp.tu-chemnitz.de/pub/linux/archlinux/$repo/os/@carch@ -Server = http://ftp.uni-kl.de/pub/linux/archlinux/$repo/os/@carch@ -Server = ftp://mirrors.igprolin-online.org/archlinux/$repo/os/@carch@ -Server = ftp://ftp-stud.hs-esslingen.de/pub/Mirrors/archlinux/$repo/os/@carch@ -# - Great Britain -Server = http://www.mirrorservice.org/sites/ftp.archlinux.org/$repo/os/@carch@ -Server = ftp://mirrors.uk2.net/pub/archlinux/$repo/os/@carch@ -Server = http://archlinux.mirrors.uk2.net/$repo/os/@carch@ -Server = ftp://mirror.lividpenguin.com/pub/archlinux/$repo/os/@carch@ -# - Greece -Server = ftp://ftp.ntua.gr/pub/linux/archlinux/$repo/os/@carch@ -# - Hungary -Server = ftp://ftp.mfa.kfki.hu/pub/mirrors/ftp.archlinux.org/$repo/os/@carch@ -# - Ireland -Server = ftp://ftp.heanet.ie/mirrors/ftp.archlinux.org/$repo/os/@carch@ -# - Italy -Server = ftp://mi.mirror.garr.it/mirrors/archlinux/$repo/os/@carch@ -# - Netherlands -Server = ftp://ftp.nluug.nl/pub/metalab/distributions/archlinux/$repo/os/@carch@ -Server = ftp://ftp.surfnet.nl/pub/os/Linux/distr/archlinux/$repo/os/@carch@ -# - Norway -Server = http://mirror.archlinux.no/$repo/os/@carch@ -# - Poland -Server = ftp://mirror.icis.pcz.pl/archlinux/$repo/os/@carch@ -Server = http://piotrkosoft.net/pub/mirrors/ftp.archlinux.org/$repo/os/@carch@ -Server = ftp://ftp.piotrkosoft.net/pub/mirrors/ftp.archlinux.org/$repo/os/@carch@ -Server = http://unix.net.pl/archlinux.org/$repo/os/@carch@ -# - Portugal -Server = ftp://cesium.di.uminho.pt/pub/archlinux/$repo/os/@carch@ -# - Romania -Server = ftp://ftp.iasi.roedu.net/mirrors/archlinux.org/$repo/os/@carch@ -# - Russia -Server = ftp://mirror.yandex.ru/archlinux/$repo/os/@carch@ -Server = http://archlinux.freeside.ru/$repo/os/@carch@ -# - Sweden -Server = ftp://ftp.ds.hj.se/pub/os/linux/archlinux/$repo/os/@carch@ -Server = ftp://ftp.gigabit.nu/$repo/os/@carch@ -# - Switzerland -Server = http://archlinux.puzzle.ch/$repo/os/@carch@ -# - Turkey -Server = ftp://ftp.linux.org.tr/pub/mirrors/archlinux/$repo/os/@carch@ -# - Ukraine -Server = ftp://archlinux.hell.org.ua/archlinux/$repo/os/@carch@ -Server = ftp://ftp.linux.kiev.ua/pub/Linux/ArchLinux/$repo/os/@carch@ - -# Asia -# - Indonesia -Server = http://archlinux.cbn.net.id/$repo/os/@carch@ -Server = ftp://archlinux.cbn.net.id/pub/archlinux/$repo/os/@carch@ -# - Israel -Server = http://mirror.isoc.org.il/pub/archlinux/$repo/os/@carch@ -# - Vietnam -# Domain name is ftp.indochinalinux.com but there are frequent DNS problems -Server = ftp://202.78.230.5/archlinux/$repo/os/@carch@ +# Any +#Server = ftp://mirrors.kernel.org/archlinux/$repo/os/$arch +#Server = http://mirrors.kernel.org/archlinux/$repo/os/$arch # Australia -Server = ftp://mirror.pacific.net.au/linux/archlinux/$repo/os/@carch@ -Server = ftp://mirror.aarnet.edu.au/pub/archlinux/$repo/os/@carch@ -Server = ftp://ftp.iinet.net.au/pub/archlinux/$repo/os/@carch@ -Server = http://mirror.internode.on.net/pub/archlinux/$repo/os/@carch@ +#Server = ftp://mirror.aarnet.edu.au/pub/archlinux/$repo/os/$arch +#Server = http://mirror.aarnet.edu.au/pub/archlinux/$repo/os/$arch +#Server = ftp://ftp.iinet.net.au/pub/archlinux/$repo/os/$arch +#Server = http://ftp.iinet.net.au/pub/archlinux/$repo/os/$arch +#Server = ftp://mirror.internode.on.net/pub/archlinux/$repo/os/$arch +#Server = http://mirror.internode.on.net/pub/archlinux/$repo/os/$arch +#Server = ftp://ftp.netspace.net.au/pub/archlinux/$repo/os/$arch +#Server = http://ftp.netspace.net.au/pub/archlinux/$repo/os/$arch +#Server = ftp://mirror.optus.net/archlinux/$repo/os/$arch +#Server = http://mirror.optus.net/archlinux/$repo/os/$arch + +# Austria +#Server = ftp://gd.tuwien.ac.at/opsys/linux/archlinux/$repo/os/$arch +#Server = http://gd.tuwien.ac.at/opsys/linux/archlinux/$repo/os/$arch + +# Belgium +#Server = ftp://ftp.belnet.be/packages/archlinux/$repo/os/$arch +#Server = http://ftp.belnet.be/mirror/archlinux.org/$repo/os/$arch +#Server = ftp://archlinux.mirror.kangaroot.net/pub/archlinux/$repo/os/$arch +#Server = http://archlinux.mirror.kangaroot.net/$repo/os/$arch + +# Brazil +#Server = ftp://archlinux.c3sl.ufpr.br/archlinux/$repo/os/$arch +#Server = http://archlinux.c3sl.ufpr.br/$repo/os/$arch +#Server = ftp://ftp.las.ic.unicamp.br/pub/archlinux/$repo/os/$arch +#Server = http://www.las.ic.unicamp.br/pub/archlinux/$repo/os/$arch +#Server = http://pet.inf.ufsc.br/mirrors/archlinux/$repo/os/$arch + +# Bulgaria +#Server = http://archlinux.igor.onlinedirect.bg/$repo/os/$arch + +# Canada +#Server = ftp://mirror.csclub.uwaterloo.ca/archlinux/$repo/os/$arch +#Server = http://mirror.csclub.uwaterloo.ca/archlinux/$repo/os/$arch +#Server = ftp://mirror.its.dal.ca/archlinux/$repo/os/$arch +#Server = http://mirror.its.dal.ca/archlinux/$repo/os/$arch +#Server = http://mirror.twilightlair.net/arch/$repo/os/$arch + +# Chile +#Server = ftp://mirror.archlinux.cl/$repo/os/$arch + +# China +#Server = http://mirrors.163.com/archlinux/$repo/os/$arch +#Server = http://mirror.bjtu.edu.cn/archlinux/$repo/os/$arch +#Server = http://mirror6.bjtu.edu.cn/archlinux/$repo/os/$arch +#Server = ftp://mirrors.sohu.com/archlinux/$repo/os/$arch +#Server = http://mirrors.sohu.com/archlinux/$repo/os/$arch + +# Czech Republic +#Server = ftp://ftp.sh.cvut.cz/MIRRORS/arch/$repo/os/$arch +#Server = http://ftp.sh.cvut.cz/MIRRORS/arch/$repo/os/$arch + +# Denmark +#Server = ftp://mirrors.dotsrc.org/archlinux/$repo/os/$arch +#Server = http://mirrors.dotsrc.org/archlinux/$repo/os/$arch +#Server = ftp://ftp.klid.dk/archlinux/$repo/os/$arch + +# Estonia +#Server = ftp://ftp.eenet.ee/pub/archlinux/$repo/os/$arch +#Server = http://ftp.eenet.ee/pub/archlinux/$repo/os/$arch + +# Finland +#Server = ftp://mirror.archlinux.fi/archlinux/$repo/os/$arch +#Server = http://mirror.archlinux.fi/archlinux/$repo/os/$arch + +# France +#Server = http://mir.archlinux.fr/$repo/os/$arch +#Server = ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/archlinux/$repo/os/$arch +#Server = http://distrib-coffee.ipsl.jussieu.fr/pub/linux/archlinux/$repo/os/$arch +#Server = ftp://ftp.free.fr/mirrors/ftp.archlinux.org/$repo/os/$arch +#Server = ftp://mir1.archlinux.fr/archlinux/$repo/os/$arch +#Server = http://mir1.archlinux.fr/archlinux/$repo/os/$arch +#Server = ftp://archlinux.mirrors.ovh.net/archlinux/$repo/os/$arch +#Server = http://archlinux.mirrors.ovh.net/archlinux/$repo/os/$arch +#Server = ftp://ftp.rez-gif.supelec.fr/Linux/archlinux/$repo/os/$arch + +# Germany +#Server = http://archlinux.limun.org/$repo/os/$arch +#Server = ftp://artfiles.org/archlinux/$repo/os/$arch +#Server = http://artfiles.org/archlinux/$repo/os/$arch +#Server = http://archlinux.giantix-server.de/$repo/os/$arch +#Server = ftp://ftp5.gwdg.de/pub/linux/archlinux/$repo/os/$arch +#Server = http://ftp5.gwdg.de/pub/linux/archlinux/$repo/os/$arch +#Server = ftp://ftp.halifax.rwth-aachen.de/archlinux/$repo/os/$arch +#Server = http://ftp.halifax.rwth-aachen.de/archlinux/$repo/os/$arch +#Server = ftp://ftp.hosteurope.de/mirror/ftp.archlinux.org/$repo/os/$arch +#Server = http://ftp.hosteurope.de/mirror/ftp.archlinux.org/$repo/os/$arch +#Server = ftp://ftp-stud.hs-esslingen.de/pub/Mirrors/archlinux/$repo/os/$arch +#Server = http://ftp-stud.hs-esslingen.de/pub/Mirrors/archlinux/$repo/os/$arch +#Server = ftp://mirror.selfnet.de/archlinux/$repo/os/$arch +#Server = http://mirror.selfnet.de/archlinux/$repo/os/$arch +#Server = ftp://ftp.spline.inf.fu-berlin.de/mirrors/archlinux/$repo/os/$arch +#Server = http://ftp.spline.inf.fu-berlin.de/mirrors/archlinux/$repo/os/$arch +#Server = ftp://ftp.tu-chemnitz.de/pub/linux/archlinux/$repo/os/$arch +#Server = http://ftp.tu-chemnitz.de/pub/linux/archlinux/$repo/os/$arch +#Server = ftp://ftp.uni-bayreuth.de/pub/linux/archlinux/$repo/os/$arch +#Server = http://ftp.uni-bayreuth.de/linux/archlinux/$repo/os/$arch +#Server = ftp://ftp.uni-kl.de/pub/linux/archlinux/$repo/os/$arch +#Server = http://ftp.uni-kl.de/pub/linux/archlinux/$repo/os/$arch + +# Great Britain +#Server = ftp://mirror.lividpenguin.com/pub/archlinux/$repo/os/$arch +#Server = http://mirror.lividpenguin.com/pub/archlinux/$repo/os/$arch +#Server = http://www.mirrorservice.org/sites/ftp.archlinux.org/$repo/os/$arch +#Server = ftp://mirrors.uk2.net/pub/archlinux/$repo/os/$arch +#Server = http://archlinux.mirrors.uk2.net/$repo/os/$arch + +# Greece +#Server = ftp://ftp.cc.uoc.gr/mirrors/linux/archlinux/$repo/os/$arch +#Server = http://ftp.cc.uoc.gr/mirrors/linux/archlinux/$repo/os/$arch +#Server = ftp://ftp.ntua.gr/pub/linux/archlinux/$repo/os/$arch +#Server = http://ftp.ntua.gr/pub/linux/archlinux/$repo/os/$arch +#Server = ftp://ftp.otenet.gr/pub/linux/archlinux/$repo/os/$arch +#Server = http://ftp.otenet.gr/linux/archlinux/$repo/os/$arch + +# Hungary +#Server = ftp://ftp.mfa.kfki.hu/pub/mirrors/ftp.archlinux.org/$repo/os/$arch + +# India +#Server = ftp://mirror.cse.iitk.ac.in/archlinux/$repo/os/$arch +#Server = http://mirror.cse.iitk.ac.in/archlinux/$repo/os/$arch + +# Indonesia +#Server = ftp://archlinux.cbn.net.id/pub/archlinux/$repo/os/$arch +#Server = http://archlinux.cbn.net.id/$repo/os/$arch +#Server = ftp://mirror.unej.ac.id/archlinux/$repo/os/$arch +#Server = http://mirror.unej.ac.id/archlinux/$repo/os/$arch + +# Ireland +#Server = ftp://ftp.heanet.ie/mirrors/ftp.archlinux.org/$repo/os/$arch +#Server = http://ftp.heanet.ie/mirrors/ftp.archlinux.org/$repo/os/$arch + +# Israel +#Server = http://mirror.isoc.org.il/pub/archlinux/$repo/os/$arch + +# Italy +#Server = ftp://mi.mirror.garr.it/mirrors/archlinux/$repo/os/$arch +#Server = http://mi.mirror.garr.it/mirrors/archlinux/$repo/os/$arch + +# Japan +#Server = ftp://ftp.jaist.ac.jp/pub/Linux/ArchLinux/$repo/os/$arch +#Server = http://ftp.jaist.ac.jp/pub/Linux/ArchLinux/$repo/os/$arch +#Server = ftp://ftp.yz.yamagata-u.ac.jp/pub/linux/archlinux/$repo/os/$arch +#Server = http://ftp.yz.yamagata-u.ac.jp/pub/linux/archlinux/$repo/os/$arch + +# Kazakhstan +#Server = ftp://archlinux.linuxforum.kz/$repo/os/$arch +#Server = http://archlinux.linuxforum.kz/$repo/os/$arch + +# Latvia +#Server = http://archlinux.goodsoft.lv/$repo/os/$arch + +# Lithuania +#Server = ftp://atviras.lt/archmirror/$repo/os/$arch +#Server = http://atviras.lt/archmirror/$repo/os/$arch + +# Netherlands +#Server = ftp://mirror.leaseweb.com/archlinux/$repo/os/$arch +#Server = http://mirror.leaseweb.com/archlinux/$repo/os/$arch +#Server = ftp://ftp.nluug.nl/pub/metalab/distributions/archlinux/$repo/os/$arch +#Server = http://ftp.nluug.nl/pub/metalab/distributions/archlinux/$repo/os/$arch +#Server = ftp://ftp.surfnet.nl/pub/os/Linux/distr/archlinux/$repo/os/$arch +#Server = http://ftp.surfnet.nl/pub/os/Linux/distr/archlinux/$repo/os/$arch + +# New Caledonia +#Server = ftp://archlinux.nautile.nc/archlinux/$repo/os/$arch +#Server = http://archlinux.nautile.nc/archlinux/$repo/os/$arch + +# New Zealand +#Server = http://mirror.ihug.co.nz/archlinux/$repo/os/$arch +#Server = http://mirror.ihug.co.nz/archlinux/$repo/os/$arch + +# Norway +#Server = ftp://mirror.archlinux.no/$repo/os/$arch +#Server = http://mirror.archlinux.no/$repo/os/$arch + +# Poland +#Server = ftp://ftp.piotrkosoft.net/pub/mirrors/ftp.archlinux.org/$repo/os/$arch +#Server = http://piotrkosoft.net/pub/mirrors/ftp.archlinux.org/$repo/os/$arch +#Server = ftp://ftp.pwsz.elblag.pl/pub/linux/distributions/archlinux/$repo/os/$arch +#Server = http://ftp.pwsz.elblag.pl/pub/linux/distributions/archlinux/$repo/os/$arch +#Server = ftp://ftp.tpnet.pl/pub/linux/archlinux/$repo/os/$arch +#Server = http://unix.net.pl/archlinux.org/$repo/os/$arch + +# Portugal +#Server = ftp://cesium.di.uminho.pt/pub/archlinux/$repo/os/$arch +#Server = http://cesium.di.uminho.pt/pub/archlinux/$repo/os/$arch +#Server = http://darkstar.ist.utl.pt/archlinux/$repo/os/$arch +#Server = ftp://ftp.nux.ipb.pt/pub/dists/archlinux/$repo/os/$arch +#Server = http://ftp.nux.ipb.pt/pub/dists/archlinux/$repo/os/$arch +#Server = ftp://ftp.rnl.ist.utl.pt/pub/archlinux/$repo/os/$arch +#Server = http://ftp.rnl.ist.utl.pt/pub/archlinux/$repo/os/$arch + +# Romania +#Server = ftp://mirror.archlinux.ro/archlinux/$repo/os/$arch +#Server = http://mirror.archlinux.ro/archlinux/$repo/os/$arch +#Server = ftp://ftp.roedu.net/mirrors/archlinux.org/$repo/os/$arch +#Server = http://ftp.roedu.net/mirrors/archlinux.org/$repo/os/$arch + +# Russia +#Server = http://archlinux.freeside.ru/$repo/os/$arch +#Server = ftp://mirror.svk.su/archlinux/$repo/os/$arch +#Server = http://mirror.svk.su/archlinux/$repo/os/$arch +#Server = ftp://mirror.yandex.ru/archlinux/$repo/os/$arch +#Server = http://mirror.yandex.ru/archlinux/$repo/os/$arch + +# Spain +#Server = ftp://ftp.rediris.es/mirror/archlinux/$repo/os/$arch +#Server = http://sunsite.rediris.es/mirror/archlinux/$repo/os/$arch + +# Sweden +#Server = ftp://ftp.df.lth.se/pub/archlinux/$repo/os/$arch +#Server = http://ftp.df.lth.se/pub/archlinux/$repo/os/$arch +#Server = ftp://ftp.ds.hj.se/pub/os/linux/archlinux/$repo/os/$arch +#Server = http://ftp.ds.hj.se/pub/os/linux/archlinux/$repo/os/$arch +#Server = ftp://ftp.gigabit.nu/$repo/os/$arch +#Server = http://ftp.gigabit.nu/$repo/os/$arch +#Server = ftp://ftp.port80.se/archlinux/$repo/os/$arch +#Server = http://ftp.port80.se/archlinux/$repo/os/$arch + +# Switzerland +#Server = ftp://archlinux.puzzle.ch/$repo/os/$arch +#Server = http://archlinux.puzzle.ch/$repo/os/$arch + +# Taiwan +#Server = ftp://ftp.mirror.tw/pub/ArchLinux/$repo/os/$arch +#Server = http://www.mirror.tw/pub/ArchLinux/$repo/os/$arch +#Server = ftp://ftp.tku.edu.tw/Linux/ArchLinux/$repo/os/$arch +#Server = http://ftp.tku.edu.tw/Linux/ArchLinux/$repo/os/$arch + +# Turkey +#Server = ftp://ftp.linux.org.tr/archlinux/$repo/os/$arch + +# Ukraine +#Server = ftp://archlinux.hell.org.ua/archlinux/$repo/os/$arch +#Server = http://archlinux.hell.org.ua/archlinux/$repo/os/$arch +#Server = ftp://ftp.linux.kiev.ua/pub/Linux/ArchLinux/$repo/os/$arch +#Server = http://ftp.linux.kiev.ua/pub/Linux/ArchLinux/$repo/os/$arch + +# United States +#Server = http://mirror.ams.sunysb.edu/archlinux/$repo/os/$arch +#Server = ftp://mirror.cs.vt.edu/pub/ArchLinux/$repo/os/$arch +#Server = http://mirror.cs.vt.edu/pub/ArchLinux/$repo/os/$arch +#Server = ftp://mirrors.easynews.com/linux/archlinux/$repo/os/$arch +#Server = http://mirrors.easynews.com/linux/archlinux/$repo/os/$arch +#Server = ftp://ftp.archlinux.org/$repo/os/$arch +#Server = ftp://ftp.gtlib.gatech.edu/pub/linux/distributions/archlinux/$repo/os/$arch +#Server = http://www.gtlib.gatech.edu/pub/linux/distributions/archlinux/$repo/os/$arch +#Server = ftp://mirrors.hosef.org/archlinux/$repo/os/$arch +#Server = http://mirrors.hosef.org/archlinux/$repo/os/$arch +#Server = ftp://ibiblio.org/pub/linux/distributions/archlinux/$repo/os/$arch +#Server = http://distro.ibiblio.org/pub/linux/distributions/archlinux/$repo/os/$arch +#Server = http://archlinux.linuxfreedom.com/$repo/os/$arch +#Server = ftp://locke.suu.edu/linux/dist/archlinux/$repo/os/$arch +#Server = ftp://lug.mtu.edu/archlinux/ftpfull/$repo/os/$arch +#Server = http://lug.mtu.edu/archlinux/ftpfull/$repo/os/$arch +#Server = ftp://mirrors.xmission.com/archlinux/$repo/os/$arch +#Server = http://mirrors.xmission.com/archlinux/$repo/os/$arch +#Server = ftp://ftp.osuosl.org/pub/archlinux/$repo/os/$arch +#Server = http://ftp.osuosl.org/pub/archlinux/$repo/os/$arch +#Server = ftp://mirror.rit.edu/archlinux/$repo/os/$arch +#Server = http://mirror.rit.edu/archlinux/$repo/os/$arch +#Server = http://schlunix.org/archlinux/$repo/os/$arch +#Server = http://archlinux.umflint.edu/$repo/os/$arch +#Server = http://mirror.umoss.org/archlinux/$repo/os/$arch + +# Vietnam +#Server = ftp://202.78.230.5/archlinux/$repo/os/$arch +#Server = ftp://ftp.indochinalinux.com/archlinux/$repo/os/$arch +#Server = ftp://mirror-fpt-telecom.fpt.net/archlinux/$repo/os/$arch +#Server = http://mirror-fpt-telecom.fpt.net/archlinux/$repo/os/$arch diff --git a/abs/core-testing/pacman/0001-makepkg-fallback-to-sane-defaults-for-library-stripp.patch b/abs/core-testing/pacman/0001-makepkg-fallback-to-sane-defaults-for-library-stripp.patch new file mode 100644 index 0000000..8baa35e --- /dev/null +++ b/abs/core-testing/pacman/0001-makepkg-fallback-to-sane-defaults-for-library-stripp.patch @@ -0,0 +1,32 @@ +From dc817a2061699cd1f33ca93f0d93a1fbc2f33ea1 Mon Sep 17 00:00:00 2001 +From: Allan McRae +Date: Thu, 17 Jun 2010 14:32:08 +1000 +Subject: [PATCH] makepkg: fallback to sane defaults for library stripping + +If the library stripping variables are not defined in makepkg.conf, +libraries will be fully stripped and become broken. Fallback to a +sane default stripping level. + +Signed-off-by: Allan McRae +Signed-off-by: Dan McGee +--- + scripts/makepkg.sh.in | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in +index d986701..e64b564 100644 +--- a/scripts/makepkg.sh.in ++++ b/scripts/makepkg.sh.in +@@ -864,6 +864,9 @@ tidy_install() { + + if [[ $(check_option strip) = y && -n ${STRIP_DIRS[*]} ]]; then + msg2 "$(gettext "Stripping unneeded symbols from binaries and libraries...")" ++ # make sure library stripping variables are defined to prevent excess stripping ++ [[ -z ${STRIP_SHARED+x} ]] && STRIP_SHARED="-S" ++ [[ -z ${STRIP_STATIC+x} ]] && STRIP_STATIC="-S" + local binary + find ${STRIP_DIRS[@]} -type f -perm -u+w 2>/dev/null | while read binary ; do + case "$(file -bi "$binary")" in +-- +1.7.1 + diff --git a/abs/core-testing/pacman/PKGBUILD b/abs/core-testing/pacman/PKGBUILD index 239abb8..b18009b 100644 --- a/abs/core-testing/pacman/PKGBUILD +++ b/abs/core-testing/pacman/PKGBUILD @@ -1,32 +1,40 @@ -# $Id: PKGBUILD 58635 2009-11-11 00:00:52Z dan $ +# $Id: PKGBUILD 83376 2010-06-21 12:52:09Z dan $ # Maintainer: Aaron Griffin # Maintainer: Dan McGee pkgname=pacman -pkgver=3.3.3 -pkgrel=10 +pkgver=3.4.0 +pkgrel=2 pkgdesc="A library-based package manager with dependency support" arch=('i686' 'x86_64') url="http://www.archlinux.org/pacman/" license=('GPL') groups=('base') depends=('bash' 'libarchive>=2.7.1' 'libfetch>=2.25' 'pacman-mirrorlist') -optdepends=('fakeroot: for makepkg usage as normal user' - 'python: for rankmirrors script usage') +optdepends=('fakeroot: for makepkg usage as normal user') backup=(etc/pacman.conf etc/makepkg.conf) install=pacman.install options=(!libtool) source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz pacman.conf - makepkg.conf) -md5sums=('a8cef73d68e2a4c3a46fb46c33210719' - 'abe70dabacee7036368c7afeb686eb10' - '52c7bc651b107d73f9902755b7594458') + makepkg.conf + 0001-makepkg-fallback-to-sane-defaults-for-library-stripp.patch) +md5sums=('50ad71be1faaad84842c576e239d1bb5' + '80f5bb2a606553512d0db857f78d9ac2' + 'aef317285c7d16ac495b0e53deeb948d' + 'f8c4a3cc7702a7a70d177659441495c5') +sha256sums=('cd80e206ee653ce337555c73b7064088e672e9341245317fe09dc52d06bff3c3' + '97fb68536c1179a7de52dfb8a107c6e9bf3a71eaa6a98d6ae74dc224d4ca5838' + '3a60e1f895c90c8e74f5ca389fa05fb3328745e9873c5452b8cd1b2e68bee418' + '99f1d108f930b134cfb4c1ca8c86cd282fe9efb69de39cd747218f3d448dda44') + +# keep an upgrade path for older installations +PKGEXT='.pkg.tar.gz' build() { cd $srcdir/$pkgname-$pkgver - - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var + patch -Np1 < $srcdir/0001-makepkg-fallback-to-sane-defaults-for-library-stripp.patch + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --enable-doc make || return 1 } diff --git a/abs/core-testing/pacman/makepkg.conf b/abs/core-testing/pacman/makepkg.conf index 12cfebd..ff08a0f 100644 --- a/abs/core-testing/pacman/makepkg.conf +++ b/abs/core-testing/pacman/makepkg.conf @@ -72,6 +72,12 @@ OPTIONS=(strip docs libtool emptydirs zipman purge) #-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512 INTEGRITY_CHECK=(md5) +#-- Options to be used when stripping binaries. See `man strip' for details. +STRIP_BINARIES="--strip-all" +#-- Options to be used when stripping shared libraries. See `man strip' for details. +STRIP_SHARED="--strip-unneeded" +#-- Options to be used when stripping static libraries. See `man strip' for details. +STRIP_STATIC="--strip-debug" #-- Manual (man and info) directories to compress (if zipman is specified) MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info}) #-- Doc directories to remove (if !docs is specified) @@ -91,6 +97,8 @@ PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod) #PKGDEST=/home/packages #-- Source cache: specify a fixed directory where source files will be cached #SRCDEST=/home/sources +#-- Source packages: specify a fixed directory where all src packages will be placed +#SRCPKGDEST=/home/srcpackages #-- Packager: name/email of the person or organization building packages #PACKAGER="John Doe " @@ -101,7 +109,7 @@ PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod) # WARNING: Do NOT modify these variables unless you know what you are # doing. # -PKGEXT='.pkg.tar.gz' +PKGEXT='.pkg.tar.xz' SRCEXT='.src.tar.gz' # vim: set ft=sh ts=2 sw=2 et: diff --git a/abs/core-testing/pacman/pacman.conf b/abs/core-testing/pacman/pacman.conf index de7e17d..911c23d 100644 --- a/abs/core-testing/pacman/pacman.conf +++ b/abs/core-testing/pacman/pacman.conf @@ -17,8 +17,9 @@ HoldPkg = pacman glibc # If upgrades are available for these packages they will be asked for first SyncFirst = pacman #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u -#XferCommand = /usr/bin/curl %u > %o +#XferCommand = /usr/bin/curl -C - %u > %o #CleanMethod = KeepInstalled +Architecture = auto # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup #IgnorePkg = @@ -41,6 +42,7 @@ SyncFirst = pacman # - repositories listed first will take precedence when packages # have identical names, regardless of version number # - URLs will have $repo replaced by the name of the current repo +# - URLs will have $arch replaced by the name of the architecture # # Repository entries are of the format: # [repo-name] diff --git a/abs/core-testing/pacman/pacman.install b/abs/core-testing/pacman/pacman.install index ed10f0d..294222e 100644 --- a/abs/core-testing/pacman/pacman.install +++ b/abs/core-testing/pacman/pacman.install @@ -3,13 +3,9 @@ # arg 2: the old package version post_upgrade() { # one time stuff for md5sum issue with older pacman versions - if [ -f /usr/bin/vercmp ] - then - if [ "$(vercmp $2 3.0.2)" -lt 0 ] - then - _resetbackups - fi - fi + if [ "$(vercmp $2 3.0.2)" -lt 0 ]; then + _resetbackups + fi } _resetbackups() { -- cgit v0.12