[arch-commits] CVS update of core/base/pacman (PKGBUILD mirrorlist)

[Dan McGee]

    Date: Wednesday, February 20, 2008 @ 20:35:19
  Author: dan
    Path: /home/cvs-core/core/base/pacman

Modified: PKGBUILD (1.153 -> 1.154) mirrorlist (1.3 -> 1.4)

upgpkg: pacman 3.1.2-1


------------+
 PKGBUILD   |   13 ++++++-------
 mirrorlist |    6 +++---
 2 files changed, 9 insertions(+), 10 deletions(-)


Index: core/base/pacman/PKGBUILD
diff -u core/base/pacman/PKGBUILD:1.153 core/base/pacman/PKGBUILD:1.154
--- core/base/pacman/PKGBUILD:1.153	Sun Jan 20 15:34:09 2008
+++ core/base/pacman/PKGBUILD	Wed Feb 20 20:35:19 2008
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD,v 1.153 2008/01/20 20:34:09 dan Exp $
+# $Id: PKGBUILD,v 1.154 2008/02/21 01:35:19 dan Exp $
 # Maintainer: Aaron Griffin <aaron at archlinux.org>
 # Maintainer: Dan McGee <dan at archlinux.org>
 
 pkgname=pacman
-pkgver=3.1.1
+pkgver=3.1.2
 pkgrel=1
 pkgdesc="A library-based package manager with dependency support"
 arch=('i686' 'x86_64')
@@ -11,16 +11,15 @@
 license=('GPL')
 groups=('base')
 depends=('gcc-libs' 'bash' 'libarchive>=2.4.11' 'libdownload>=1.3')
-backup=(etc/pacman.conf etc/makepkg.conf
-        etc/pacman.d/{mirrorlist,core,release,extra,unstable,community,testing})
+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=('cf349ce217b96180db09d65821df7e29'
+md5sums=('fb1ef744d2a2b82ec386add8bedb9d28'
          'a960bb221183782e44886555d2dc54a6'
-         '44693a46d7523a3fe94e6f8a051deb34')
+         '1b5210989548a6d432a0d7fe7196869b')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
@@ -35,7 +34,7 @@
   install -m644 ${startdir}/src/mirrorlist ${startdir}/pkg/etc/pacman.d/
 
   # customize mirrorlist to architecture
-  sed -i -e "s/@carch@/${CARCH}/" ${startdir}/pkg/etc/pacman.d/mirrorlist
+  sed -i -e "s/@carch@/${CARCH}/g" ${startdir}/pkg/etc/pacman.d/mirrorlist
 
   # install completion files
   mkdir -p $startdir/pkg/etc/bash_completion.d/
Index: core/base/pacman/mirrorlist
diff -u core/base/pacman/mirrorlist:1.3 core/base/pacman/mirrorlist:1.4
--- core/base/pacman/mirrorlist:1.3	Thu Feb 14 18:48:12 2008
+++ core/base/pacman/mirrorlist	Wed Feb 20 20:35:19 2008
@@ -28,8 +28,6 @@
 Server = ftp://ftp.sh.cvut.cz/MIRRORS/arch/$repo/os/@carch@
 # - Estonia
 Server = ftp://ftp.estpak.ee/pub/archlinux/$repo/os/@carch@
-# - Finland
-Server = ftp://ftp.sixnix.net/pub/archlinux/$repo/os/@carch@
 # - France
 Server = ftp://mir1.archlinuxfr.org/archlinux/$repo/os/@carch@
 Server = ftp://mir2.archlinuxfr.org/archlinux/$repo/os/@carch@
@@ -38,8 +36,10 @@
 Server = ftp://ftp.free.fr/mirrors/ftp.archlinux.org/$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/sunsite.unc-mirror/distributions/archlinux/$repo/os/@carch@
+Server = ftp://ftp.tu-chemnitz.de/pub/linux/archlinux/$repo/os/@carch@
 # - Great Britain
 Server = http://www.mirrorservice.org/sites/ftp.archlinux.org/$repo/os/@carch@
 # - Greece