From bdef8eb098314d2af4590d27e077e88466036861 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Fri, 30 Jan 2009 10:49:45 -0600
Subject: Upgrade pacman

---
 abs/core-testing/libarchive/PKGBUILD          |  13 +--
 abs/core-testing/pacman-mirrorlist/PKGBUILD   |  22 +++++
 abs/core-testing/pacman-mirrorlist/mirrorlist | 116 ++++++++++++++++++++++++++
 abs/core-testing/pacman/PKGBUILD              |  38 ++++-----
 abs/core-testing/pacman/pacman.conf           |   1 +
 5 files changed, 163 insertions(+), 27 deletions(-)
 create mode 100644 abs/core-testing/pacman-mirrorlist/PKGBUILD
 create mode 100644 abs/core-testing/pacman-mirrorlist/mirrorlist

diff --git a/abs/core-testing/libarchive/PKGBUILD b/abs/core-testing/libarchive/PKGBUILD
index b70f376..c8209a7 100644
--- a/abs/core-testing/libarchive/PKGBUILD
+++ b/abs/core-testing/libarchive/PKGBUILD
@@ -1,17 +1,16 @@
-# $Id: PKGBUILD 5444 2008-07-16 01:29:27Z dan $
+# $Id: PKGBUILD 24591 2009-01-18 20:59:48Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 # Maintainer: Aaron Griffin <aaron@archlinux.org>
 pkgname=libarchive
-pkgver=2.5.5
-pkgrel=10
+pkgver=2.6.1
+pkgrel=1
 pkgdesc="library that can create and read several streaming archive formats"
 arch=(i686 x86_64)
 url="http://people.freebsd.org/~kientzle/libarchive/"
 license=('BSD')
 groups=('base')
 depends=('zlib' 'bzip2' 'acl')
-source=(http://people.freebsd.org/~kientzle/libarchive/src/libarchive-$pkgver.tar.gz)
-md5sums=('ff6387de3a3830785b229d1e1f11f523')
+source=(http://libarchive.googlecode.com/files/libarchive-$pkgver.tar.gz)
 
 # pacman.static build fails unless we keep the libtool files (or unless we link
 # the missing symbols inside the libarchive .a static lib, but that is dirty)
@@ -19,7 +18,7 @@ options=(libtool)
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --without-lzmadec
 
   make || return 1
   make DESTDIR=$startdir/pkg install
@@ -29,3 +28,5 @@ build() {
   install -m644 COPYING $startdir/pkg/usr/share/licenses/libarchive/
 }
 
+md5sums=('9d9f83947ee9d5732289ed48d00e3743')
+sha256sums=('4d0ad4e5c33aa9725c7d92a42ae605815781372db949cd9906945e6c0d85c179')
diff --git a/abs/core-testing/pacman-mirrorlist/PKGBUILD b/abs/core-testing/pacman-mirrorlist/PKGBUILD
new file mode 100644
index 0000000..32bd639
--- /dev/null
+++ b/abs/core-testing/pacman-mirrorlist/PKGBUILD
@@ -0,0 +1,22 @@
+# $Id: PKGBUILD 23382 2009-01-08 14:18:33Z allan $
+# Maintainer: Dan McGee <dan@archlinux.org>
+
+pkgname=pacman-mirrorlist
+pkgver=20090108
+pkgrel=1
+pkgdesc="Arch Linux mirror list for use by pacman"
+arch=('i686' 'x86_64')
+url="http://www.archlinux.org/pacman/"
+license=('GPL')
+groups=('base')
+backup=(etc/pacman.d/mirrorlist)
+source=(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')
diff --git a/abs/core-testing/pacman-mirrorlist/mirrorlist b/abs/core-testing/pacman-mirrorlist/mirrorlist
new file mode 100644
index 0000000..ef691e9
--- /dev/null
+++ b/abs/core-testing/pacman-mirrorlist/mirrorlist
@@ -0,0 +1,116 @@
+#
+# Arch Linux repository mirrorlist
+#
+
+# 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@
+
+# 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@
+
diff --git a/abs/core-testing/pacman/PKGBUILD b/abs/core-testing/pacman/PKGBUILD
index ccd1857..ecb96c7 100644
--- a/abs/core-testing/pacman/PKGBUILD
+++ b/abs/core-testing/pacman/PKGBUILD
@@ -1,46 +1,42 @@
-# $Id: PKGBUILD 10342 2008-08-27 01:24:22Z dan $
+# $Id: PKGBUILD 23245 2009-01-07 02:10:32Z dan $
 # Maintainer: Aaron Griffin <aaron@archlinux.org>
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgname=pacman
-pkgver=3.2.1
-pkgrel=10
+pkgver=3.2.2
+pkgrel=1
 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.5.5' 'libdownload>=1.3')
+depends=('bash' 'libarchive>=2.6.0' 'libdownload>=1.3' 'pacman-mirrorlist')
+optdepends=('fakeroot: for makepkg usage as normal user'
+            'python: for rankmirrors script usage')
 backup=(etc/pacman.conf etc/makepkg.conf etc/pacman.d/mirrorlist)
 install=pacman.install
 options=(!libtool)
 source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz
-        pacman.conf
-        mirrorlist)
-md5sums=('5b133613cebd74aa8c199de049e25cc4'
-         '49b799e923933a30cdefcac06f530fb0'
-         'a16981c0fef957a95999550f68cdb0f8')
+        pacman.conf)
+md5sums=('8404fc38566bb52f8eee2ea483a41051'
+         '27271a59b9c9f748547ef4feae90bc5c')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
+  cd $srcdir/$pkgname-$pkgver
   
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
   make || return 1
-  make DESTDIR=$startdir/pkg install || return 1
+  make DESTDIR=$pkgdir install || return 1
 
   # install arch specific stuff
-  mkdir -p ${startdir}/pkg/etc/pacman.d
-  install -m644 ${startdir}/src/pacman.conf ${startdir}/pkg/etc/
-  install -m644 ${startdir}/src/mirrorlist ${startdir}/pkg/etc/pacman.d/
-
-  # customize mirrorlist to architecture
-  sed -i -e "s/@carch@/${CARCH}/g" ${startdir}/pkg/etc/pacman.d/mirrorlist
+  mkdir -p $pkgdir/etc
+  install -m644 $srcdir/pacman.conf $pkgdir/etc/
 
   # install completion files
-  mkdir -p $startdir/pkg/etc/bash_completion.d/
-  install -m644 contrib/bash_completion $startdir/pkg/etc/bash_completion.d/pacman
-  mkdir -p $startdir/pkg/usr/share/zsh/site-functions/
-  install -m644 contrib/zsh_completion $startdir/pkg/usr/share/zsh/site-functions/_pacman
+  mkdir -p $pkgdir/etc/bash_completion.d/
+  install -m644 contrib/bash_completion $pkgdir/etc/bash_completion.d/pacman
+  mkdir -p $pkgdir/usr/share/zsh/site-functions/
+  install -m644 contrib/zsh_completion $pkgdir/usr/share/zsh/site-functions/_pacman
 }
 
 # vim: set ts=2 sw=2 et:
diff --git a/abs/core-testing/pacman/pacman.conf b/abs/core-testing/pacman/pacman.conf
index 6a7bd54..6fe3d29 100644
--- a/abs/core-testing/pacman/pacman.conf
+++ b/abs/core-testing/pacman/pacman.conf
@@ -18,6 +18,7 @@ HoldPkg     = pacman glibc
 SyncFirst   = pacman
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #XferCommand = /usr/bin/curl %u > %o
+#CleanMethod = KeepInstalled
 
 # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
 #IgnorePkg   =
-- 
cgit v0.12

