update pacman to 3.4.3

This commit is contained in:
Phil 2011-02-06 16:25:02 +00:00
parent 341c64afc2
commit bcb632a487
6 changed files with 127 additions and 47 deletions

View File

@ -8,7 +8,7 @@
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=pacman-mirrorlist
pkgver=20100829
pkgver=20110206
pkgrel=1
pkgdesc="Chakra Linux mirror list for use by pacman"
arch=('i686' 'x86_64')
@ -18,17 +18,6 @@ groups=('base')
backup=(etc/pacman.d/mirrorlist)
source=(mirrorlist)
# 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/@carch@/' mirrorlist
}
build() {
mkdir -p $pkgdir/etc/pacman.d
install -m644 $srcdir/mirrorlist $pkgdir/etc/pacman.d/
@ -36,4 +25,5 @@ build() {
sed -i -e "s/@carch@/${CARCH}/g" $pkgdir/etc/pacman.d/mirrorlist
}
md5sums=('0940b2a66de2ca7f9466b3477977ea8d')
md5sums=('ffe7036ed79ef42585818d915ccd6bee')
sha1sums=('86132454fcebe2f111151ac31c7d8ef51541fd3b')

View File

@ -1,19 +1,16 @@
#
# Chakra Linux repository mirrorlist
# Generated on 2010-08-29
# Generated on 2011-02-06
#
# China
#Server = http://debian.cn99.com/kdemod/$repo/@carch@
# Germany
#Server = http://chakra-project.org/repo/$repo/@carch@
#Server = http://mirror.selfnet.de/kdemod/$repo/@carch@
#Server = ftp://mirror.selfnet.de/kdemod/$repo/@carch@
# Kazakhstan
#Server = http://kdemod.archlinux.kz/$repo/@carch@
# Norway
#Server = http://kdemod.iskrembilen.com/$repo/@carch@
# Switzerland
#Server = http://archlinux.puzzle.ch/kdemod/$repo/@carch@

View File

@ -4,11 +4,8 @@
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# include global config
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=pacman
pkgver=3.4.1
pkgver=3.4.3
pkgrel=1
pkgdesc="A library-based package manager with dependency support"
arch=('i686' 'x86_64')
@ -16,47 +13,51 @@ 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')
optdepends=('fakeroot: for makepkg usage as normal user'
'curl: for rankmirrors usage')
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.x86_64
pacman.conf
makepkg.conf)
md5sums=('4e4e8e4f636d9878fbed9cf840f162cf'
'78bd7ff2abd68a8e854441cfd26ad3d2'
'aef317285c7d16ac495b0e53deeb948d')
md5sums=('3656a4a05346e28bafa5342879fa278a'
'e391898d4c50e25c86dddf39316feea4'
'55edaccb8b5f94530207150faa65daa5'
'5beebe36bfc1e1f677d5ae12fcff8083')
# keep an upgrade path for older installations
# PKGEXT='.pkg.tar.gz'
PKGEXT='.pkg.tar.gz'
build() {
cd $srcdir/$pkgname-$pkgver
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --enable-doc
make || return 1
make
}
package() {
cd $srcdir/$pkgname-$pkgver
make DESTDIR=$pkgdir install || return 1
make DESTDIR=$pkgdir install
# install Chakra specific stuff
mkdir -p $pkgdir/etc
install -m644 $srcdir/pacman.conf $pkgdir/etc/
install -m644 $srcdir/makepkg.conf $pkgdir/etc/
# set things correctly in the default conf file
case "$CARCH" in
i686)
install -m644 $srcdir/pacman.conf $pkgdir/etc/pacman.conf
mycarch="i686"
mychost="i686-pc-linux-gnu"
myflags="-march=i686 "
;;
x86_64)
install -m644 $srcdir/pacman.conf.x86_64 $pkgdir/etc/pacman.conf
mycarch="x86_64"
mychost="x86_64-unknown-linux-gnu"
myflags="-march=x86-64 "
;;
esac
install -m644 $srcdir/makepkg.conf $pkgdir/etc/
# set things correctly in the default conf file
sed -i $pkgdir/etc/makepkg.conf \
-e "s|@CARCH[@]|$mycarch|g" \
-e "s|@CHOST[@]|$mychost|g" \
@ -69,4 +70,4 @@ package() {
install -m644 contrib/zsh_completion $pkgdir/usr/share/zsh/site-functions/_pacman
}
# vim: set ts=2 sw=2 et:
# vim: set ts=2 sw=2 et:

View File

@ -83,7 +83,7 @@ MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info})
#-- Doc directories to remove (if !docs is specified)
DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc})
#-- Directories to be searched for the strip option (if strip is specified)
STRIP_DIRS=(bin lib sbin usr/{bin,lib,sbin,local/{bin,lib,sbin}} opt/*/{bin,lib,sbin})
STRIP_DIRS=(bin lib sbin usr/{bin,lib,lib32,sbin,local/{bin,lib,sbin}} opt/*/{bin,lib,sbin})
#-- Files to be removed from all packages (if purge is specified)
PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod)

View File

@ -57,28 +57,28 @@ Architecture = auto
# repo name header and Include 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
[games]
Include = /etc/pacman.d/mirrorlist
[core-testing]
#[apps-unstable]
#Include = /etc/pacman.d/mirrorlist
[apps]
Include = /etc/pacman.d/mirrorlist
[desktop]
Include = /etc/pacman.d/mirrorlist
#[desktop-testing]
#Include = /etc/pacman.d/mirrorlist
[platform-testing]
[platform]
Include = /etc/pacman.d/mirrorlist
[apps]
[core]
Include = /etc/pacman.d/mirrorlist
#[apps-testing]
#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
#Server = file:///home/custompkgs

92
pacman/pacman.conf.x86_64 Normal file
View File

@ -0,0 +1,92 @@
#
# /etc/pacman.conf
#
# See the pacman.conf(5) manpage for option and repository 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
# 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 -C - %u > %o
#CleanMethod = KeepInstalled
Architecture = auto
# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
#IgnorePkg =
#IgnoreGroup =
#NoUpgrade =
#NoExtract =
# Misc options (all disabled by default)
#UseSyslog
#ShowSize
#UseDelta
#TotalDownload
#
# 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
# - 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]
# Server = ServerName
# Include = IncludePath
#
# The header [repo-name] is crucial - it must be present and
# uncommented to enable the repo.
#
# The testing repositories are disabled by default. To enable, uncomment the
# repo name header and Include 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
[games]
Include = /etc/pacman.d/mirrorlist
#[apps-unstable]
#Include = /etc/pacman.d/mirrorlist
[apps]
Include = /etc/pacman.d/mirrorlist
[desktop]
Include = /etc/pacman.d/mirrorlist
[platform]
Include = /etc/pacman.d/mirrorlist
[core]
Include = /etc/pacman.d/mirrorlist
# If you want to run 32 bit applications on your x86_64 system,
# enable the lib32 repositories here.
#[lib32-testing]
#Include = /etc/pacman.d/mirrorlist
#[lib32]
#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