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

Dan McGee dan at archlinux.org
Sun Jan 20 20:34:10 UTC 2008


    Date: Sunday, January 20, 2008 @ 15:34:10
  Author: dan
    Path: /home/cvs-core/core/base/pacman

   Added: mirrorlist (1.1)
Modified: PKGBUILD (1.152 -> 1.153) pacman.conf (1.2 -> 1.3)

upgpkg: pacman 3.1.1-1


-------------+
 PKGBUILD    |   32 ++++++++++++++-------
 mirrorlist  |   86 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 pacman.conf |   64 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 172 insertions(+), 10 deletions(-)


Index: core/base/pacman/PKGBUILD
diff -u core/base/pacman/PKGBUILD:1.152 core/base/pacman/PKGBUILD:1.153
--- core/base/pacman/PKGBUILD:1.152	Wed Jan  9 21:34:47 2008
+++ core/base/pacman/PKGBUILD	Sun Jan 20 15:34:09 2008
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD,v 1.152 2008/01/10 02:34:47 dan Exp $
+# $Id: PKGBUILD,v 1.153 2008/01/20 20:34:09 dan Exp $
 # Maintainer: Aaron Griffin <aaron at archlinux.org>
 # Maintainer: Dan McGee <dan at archlinux.org>
 
 pkgname=pacman
-pkgver=3.1.0
+pkgver=3.1.1
 pkgrel=1
 pkgdesc="A library-based package manager with dependency support"
 arch=('i686' 'x86_64')
@@ -15,8 +15,12 @@
         etc/pacman.d/{mirrorlist,core,release,extra,unstable,community,testing})
 install=pacman.install
 options=(!libtool)
-source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz)
-md5sums=('6c60c72c276c575775c9d6cafa22b1b1')
+source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz
+        pacman.conf
+        mirrorlist)
+md5sums=('cf349ce217b96180db09d65821df7e29'
+         'a960bb221183782e44886555d2dc54a6'
+         '44693a46d7523a3fe94e6f8a051deb34')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
@@ -25,11 +29,19 @@
   make || return 1
   make DESTDIR=$startdir/pkg install || return 1
 
-	# 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
+  # 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}/" ${startdir}/pkg/etc/pacman.d/mirrorlist
+
+  # 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
 }
 
-# vim: set ts=2 sw=2 noet:
+# vim: set ts=2 sw=2 et:
Index: core/base/pacman/mirrorlist
diff -u /dev/null core/base/pacman/mirrorlist:1.1
--- /dev/null	Sun Jan 20 15:34:10 2008
+++ core/base/pacman/mirrorlist	Sun Jan 20 15:34:09 2008
@@ -0,0 +1,86 @@
+#
+# Arch Linux repository mirrorlist
+#
+
+# United States
+Server = ftp://ftp.archlinux.org/$repo/os/@carch@
+Server = ftp://ftp.nethat.com/pub/linux/archlinux/$repo/os/@carch@
+Server = ftp://locke.suu.edu/linux/dist/archlinux/$repo/os/@carch@
+Server = ftp://mirrors.unixheads.org/archlinux/$repo/os/@carch@
+Server = ftp://ftp-linux.cc.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://holmes.umflint.edu/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@
+
+# 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@
+# - 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@
+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@
+# - Germany
+Server = ftp://ftp.tu-chemnitz.de/pub/linux/sunsite.unc-mirror/distributions/archlinux/$repo/os/@carch@
+Server = ftp://ftp.hosteurope.de/mirror/ftp.archlinux.org/$repo/os/@carch@
+Server = ftp://ftp.archlinuxppc.org/@carch@/$repo/os/@carch@
+# - Great Britain
+Server = http://www.mirrorservice.org/sites/ftp.archlinux.org/$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@
+# - Poland
+Server = ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/archlinux/$repo/os/@carch@
+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@
+# - 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://archlinux.org.ru/pub/archlinux/$repo/os/@carch@
+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 = ftp://archlinux.puzzle.ch/$repo/os/@carch@
+# - Turkey
+Server = http://server.elsistech.com/archlinux/$repo/os/@carch@
+# - Ukraine
+Server = ftp://hell.org.ua/archlinux/$repo/os/@carch@
+Server = ftp://ftp.linux.kiev.ua/pub/Linux/ArchLinux/$repo/os/@carch@
+
+# Asia
+# - Israel
+Server = http://mirror.isoc.org.il/pub/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@
+
Index: core/base/pacman/pacman.conf
diff -u /dev/null core/base/pacman/pacman.conf:1.3
--- /dev/null	Sun Jan 20 15:34:10 2008
+++ core/base/pacman/pacman.conf	Sun Jan 20 15:34:09 2008
@@ -0,0 +1,64 @@
+#
+# /etc/pacman.conf
+#
+# See the pacman manpage for option directives
+
+#
+# GENERAL OPTIONS
+#
+[options]
+# The following paths are commented out with their default values listed.
+# If you wish to use different paths, uncomment and update the paths.
+#RootDir     = /
+#DBPath      = /var/lib/pacman/
+#CacheDir    = /var/cache/pacman/pkg/
+#LogFile     = /var/log/pacman.log
+HoldPkg     = pacman glibc
+#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
+
+#
+# REPOSITORIES
+#   - can be defined here or included from another file
+#   - pacman will search repositories in the order defined here
+#   - local/custom mirrors can be added here or in separate files
+#   - repositories listed first will take precedence when packages
+#     have identical names, regardless of version number
+#
+# Repository entries are of the format:
+#       [repo-name]
+#       Server = ServerName
+#       Include = IncludePath
+#
+# The header [repo-name] is crucial - it must be present and
+# uncommented to enable the repo.
+#
+
+# Testing is disabled by default.  To enable, uncomment the following
+# two lines.  You can add preferred servers immediately after the header,
+# and they will be used before the default mirrors.
+#[testing]
+#Include = /etc/pacman.d/mirrorlist
+
+[core]
+# Add your preferred servers here, they will be used first
+Include = /etc/pacman.d/mirrorlist
+
+[extra]
+# Add your preferred servers here, they will be used first
+Include = /etc/pacman.d/mirrorlist
+
+[community]
+# Add your preferred servers here, they will be used first
+Include = /etc/pacman.d/mirrorlist
+
+# Unstable is disabled by default.  To enable, uncomment the following
+# two lines.  You can add preferred servers immediately after the header,
+# and they will be used before the default mirrors.
+#[unstable]
+#Include = /etc/pacman.d/mirrorlist
+
+# An example of a custom package repository.  See the pacman manpage for
+# tips on creating your own repositories.
+#[custom]
+#Server = file:///home/custompkgs
+




More information about the arch-commits mailing list