pacman & helpers: update pacman to lastest version from archlinux

10 files changed, 430 insertions, 22 deletions

diff --git a/abs/core-testing/pacman/PKGBUILD b/abs/core-testing/pacman/PKGBUILD
index b18009b..27dd4ca 100644
--- a/abs/core-testing/pacman/PKGBUILD
+++ b/abs/core-testing/pacman/PKGBUILD
@@ -1,39 +1,34 @@
-# $Id: PKGBUILD 83376 2010-06-21 12:52:09Z dan $
-# Maintainer: Aaron Griffin <aaron@archlinux.org>
+# $Id: PKGBUILD 89780 2010-09-04 01:05:26Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgname=pacman
-pkgver=3.4.0
-pkgrel=2
+pkgver=3.4.1
+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.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
-        makepkg.conf
-        0001-makepkg-fallback-to-sane-defaults-for-library-stripp.patch)
-md5sums=('50ad71be1faaad84842c576e239d1bb5'
-         '80f5bb2a606553512d0db857f78d9ac2'
-         'aef317285c7d16ac495b0e53deeb948d'
-         'f8c4a3cc7702a7a70d177659441495c5')
-sha256sums=('cd80e206ee653ce337555c73b7064088e672e9341245317fe09dc52d06bff3c3'
-            '97fb68536c1179a7de52dfb8a107c6e9bf3a71eaa6a98d6ae74dc224d4ca5838'
-            '3a60e1f895c90c8e74f5ca389fa05fb3328745e9873c5452b8cd1b2e68bee418'
-            '99f1d108f930b134cfb4c1ca8c86cd282fe9efb69de39cd747218f3d448dda44')
+        pacman.conf.x86_64
+        makepkg.conf)
+md5sums=('4e4e8e4f636d9878fbed9cf840f162cf'
+         'eda9cbdb47f85fabda2e7e63801e3e16'
+         '9ba146b4fa7bcb3cc18204b06d1f6157'
+         'aef317285c7d16ac495b0e53deeb948d')
 
 # keep an upgrade path for older installations
 PKGEXT='.pkg.tar.gz'
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  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
 }
@@ -44,7 +39,14 @@ package() {
 
   # install Arch specific stuff
   mkdir -p $pkgdir/etc
-  install -m644 $srcdir/pacman.conf $pkgdir/etc/
+  case "$CARCH" in
+    i686)
+      install -m644 $srcdir/pacman.conf $pkgdir/etc/pacman.conf
+      ;;
+    x86_64)
+      install -m644 $srcdir/pacman.conf.x86_64 $pkgdir/etc/pacman.conf
+      ;;
+  esac
   install -m644 $srcdir/makepkg.conf $pkgdir/etc/
   # set things correctly in the default conf file
   case "$CARCH" in
diff --git a/abs/core-testing/pacman/0001-makepkg-fallback-to-sane-defaults-for-library-stripp.patch b/abs/core-testing/pacman/old/0001-makepkg-fallback-to-sane-defaults-for-library-stripp.patch
index 8baa35e..8baa35e 100644
--- a/abs/core-testing/pacman/0001-makepkg-fallback-to-sane-defaults-for-library-stripp.patch
+++ b/abs/core-testing/pacman/old/0001-makepkg-fallback-to-sane-defaults-for-library-stripp.patch
diff --git a/abs/core-testing/pacman/old/PKGBUILD b/abs/core-testing/pacman/old/PKGBUILD
new file mode 100644
index 0000000..a138950
--- /dev/null
+++ b/abs/core-testing/pacman/old/PKGBUILD
@@ -0,0 +1,74 @@
+# $Id: PKGBUILD 83376 2010-06-21 12:52:09Z dan $
+# Maintainer: Aaron Griffin <aaron@archlinux.org>
+# Maintainer: Dan McGee <dan@archlinux.org>
+
+pkgname=pacman
+pkgver=3.4.0
+pkgrel=3
+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')
+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
+        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
+  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
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install || return 1
+
+  # install Arch 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)
+      mycarch="i686"
+      mychost="i686-pc-linux-gnu"
+      myflags="-march=i686 "
+      ;;
+    x86_64)
+      mycarch="x86_64"
+      mychost="x86_64-unknown-linux-gnu"
+      myflags="-march=x86-64 "
+      ;;
+  esac
+  sed -i $pkgdir/etc/makepkg.conf \
+    -e "s|@CARCH[@]|$mycarch|g" \
+    -e "s|@CHOST[@]|$mychost|g" \
+    -e "s|@CARCHFLAGS[@]|$myflags|g"
+
+  # install completion files
+  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/old/makepkg.conf b/abs/core-testing/pacman/old/makepkg.conf
new file mode 100644
index 0000000..ff08a0f
--- /dev/null
+++ b/abs/core-testing/pacman/old/makepkg.conf
@@ -0,0 +1,115 @@
+#
+# /etc/makepkg.conf
+#
+
+#########################################################################
+# SOURCE ACQUISITION
+#########################################################################
+#
+#-- The download utilities that makepkg should use to acquire sources
+#  Format: 'protocol::agent'
+DLAGENTS=('ftp::/usr/bin/wget -c --passive-ftp -t 3 --waitretry=3 -O %o %u'
+          'http::/usr/bin/wget -c -t 3 --waitretry=3 -O %o %u'
+          'https::/usr/bin/wget -c -t 3 --waitretry=3 --no-check-certificate -O %o %u'
+          'rsync::/usr/bin/rsync -z %u %o'
+          'scp::/usr/bin/scp -C %u %o')
+
+# Other common tools:
+# /usr/bin/snarf
+# /usr/bin/lftpget -c
+# /usr/bin/curl
+
+#########################################################################
+# ARCHITECTURE, COMPILE FLAGS
+#########################################################################
+#
+CARCH="@CARCH@"
+CHOST="@CHOST@"
+
+#-- Exclusive: will only run on @CARCH@
+# -march (or -mcpu) builds exclusively for an architecture
+# -mtune optimizes for an architecture, but builds for whole processor family
+CFLAGS="@CARCHFLAGS@-mtune=generic -O2 -pipe"
+CXXFLAGS="@CARCHFLAGS@-mtune=generic -O2 -pipe"
+LDFLAGS="-Wl,--hash-style=gnu -Wl,--as-needed"
+#-- Make Flags: change this for DistCC/SMP systems
+#MAKEFLAGS="-j2"
+
+#########################################################################
+# BUILD ENVIRONMENT
+#########################################################################
+#
+# Defaults: BUILDENV=(fakeroot !distcc color !ccache)
+#  A negated environment option will do the opposite of the comments below.
+#
+#-- fakeroot: Allow building packages as a non-root user
+#-- distcc:   Use the Distributed C/C++/ObjC compiler
+#-- color:    Colorize output messages
+#-- ccache:   Use ccache to cache compilation
+#
+BUILDENV=(fakeroot !distcc color !ccache)
+#
+#-- If using DistCC, your MAKEFLAGS will also need modification. In addition,
+#-- specify a space-delimited list of hosts running in the DistCC cluster.
+#DISTCC_HOSTS=""
+
+#########################################################################
+# GLOBAL PACKAGE OPTIONS
+#   These are default values for the options=() settings
+#########################################################################
+#
+# Default: OPTIONS=(strip docs libtool emptydirs zipman purge)
+#  A negated option will do the opposite of the comments below.
+#
+#-- strip:     Strip symbols from binaries/libraries in STRIP_DIRS
+#-- docs:      Save doc directories specified by DOC_DIRS
+#-- libtool:   Leave libtool (.la) files in packages
+#-- emptydirs: Leave empty directories in packages
+#-- zipman:    Compress manual (man and info) pages in MAN_DIRS with gzip
+#-- purge:     Remove files specified by PURGE_TARGETS
+#
+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)
+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})
+#-- Files to be removed from all packages (if purge is specified)
+PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod)
+
+#########################################################################
+# PACKAGE OUTPUT
+#########################################################################
+#
+# Default: put built package and cached source in build directory
+#
+#-- Destination: specify a fixed directory where all packages will be placed
+#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 <john@doe.com>"
+
+#########################################################################
+# EXTENSION DEFAULTS
+#########################################################################
+#
+# WARNING: Do NOT modify these variables unless you know what you are
+#          doing.
+#
+PKGEXT='.pkg.tar.xz'
+SRCEXT='.src.tar.gz'
+
+# vim: set ft=sh ts=2 sw=2 et:
diff --git a/abs/core-testing/pacman/mirrorlist b/abs/core-testing/pacman/old/mirrorlist
index 83e75ae..83e75ae 100644
--- a/abs/core-testing/pacman/mirrorlist
+++ b/abs/core-testing/pacman/old/mirrorlist
diff --git a/abs/core-testing/pacman/old/pacman.conf b/abs/core-testing/pacman/old/pacman.conf
new file mode 100644
index 0000000..911c23d
--- /dev/null
+++ b/abs/core-testing/pacman/old/pacman.conf
@@ -0,0 +1,84 @@
+#
+# /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]
+## Add your preferred servers here, they will be used first
+#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-testing]
+## 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
+
+# An example of a custom package repository.  See the pacman manpage for
+# tips on creating your own repositories.
+#[custom]
+#Server = file:///home/custompkgs
+
diff --git a/abs/core-testing/pacman/old/pacman.install b/abs/core-testing/pacman/old/pacman.install
new file mode 100644
index 0000000..294222e
--- /dev/null
+++ b/abs/core-testing/pacman/old/pacman.install
@@ -0,0 +1,53 @@
+#!/bin/sh
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_upgrade() {
+	# one time stuff for md5sum issue with older pacman versions
+	if [ "$(vercmp $2 3.0.2)" -lt 0 ]; then
+		_resetbackups
+	fi
+}
+
+_resetbackups() {
+	echo ">>> Performing one-time reset of NoUpgrade md5sums. After this reset"
+	echo ">>> you are able to remove all NoUpgrade lines of already protected"
+	echo ">>> files from pacman.conf."
+	echo ">>>"
+
+	# path variables
+    pacconf="/etc/pacman.conf"
+    dbpath="/var/lib/pacman/local"
+
+    # get a list of NoUpgrade files from the user's pacman.conf
+    echo ">>> Retrieving pacman.conf NoUpgrade list..."
+    config=$(grep "^NoUpgrade" $pacconf | cut -d'=' -f2)
+    # add the standard list of files, even if they are already above
+    config="$config \
+    etc/passwd etc/group etc/shadow etc/sudoers \
+    etc/fstab etc/raidtab etc/ld.so.conf \
+    etc/rc.conf etc/rc.local \
+    etc/modprobe.conf etc/modules.conf \
+    etc/lilo.conf boot/grub/menu.lst"
+
+    # blank md5sum for use in sed expression
+    zeroes='00000000000000000000000000000000'
+
+    for file in $config; do
+        echo ">>> -> finding owner of /$file..."
+        line=$(LC_ALL=C LANG=C pacman -Qo /$file 2>/dev/null)
+        # if file is owned by a package, go find its incorrectly stored sum
+        if [ ! -z "$line" ]; then
+            # get the name and version of the package owning file
+            name=$(echo $line | awk '{print $5}')
+            version=$(echo $line | awk '{print $6}')
+            # set the path to the backup array holding the md5sum
+            path="$dbpath/$name-$version/files"
+            # run a sed on the path to reset the line containing $file
+            # NOTE: literal tab characters in sed expression after $file
+            echo ">>> -> resetting sum of /$file..."
+            sed -i "s#$file [0-9a-fA-F]*#$file  $zeroes#" $path
+        else
+            echo ">>> -> $file is unowned."
+        fi
+    done
+}
diff --git a/abs/core-testing/pacman/pacman-3.4.1-1-i686.pkg.tar.gz b/abs/core-testing/pacman/pacman-3.4.1-1-i686.pkg.tar.gz
new file mode 120000
index 0000000..5d96387
--- /dev/null
+++ b/abs/core-testing/pacman/pacman-3.4.1-1-i686.pkg.tar.gz
@@ -0,0 +1 @@
+/data/pkg_repo/packages/pacman-3.4.1-1-i686.pkg.tar.gz
\ No newline at end of file
diff --git a/abs/core-testing/pacman/pacman.conf b/abs/core-testing/pacman/pacman.conf
index 911c23d..3a5d875 100644
--- a/abs/core-testing/pacman/pacman.conf
+++ b/abs/core-testing/pacman/pacman.conf
@@ -58,23 +58,18 @@ Architecture = auto
 # after the header, and they will be used before the default mirrors.
 
 #[testing]
-## Add your preferred servers here, they will be used first
 #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-testing]
-## 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
 
 # An example of a custom package repository.  See the pacman manpage for
diff --git a/abs/core-testing/pacman/pacman.conf.x86_64 b/abs/core-testing/pacman/pacman.conf.x86_64
new file mode 100644
index 0000000..e825b4b
--- /dev/null
+++ b/abs/core-testing/pacman/pacman.conf.x86_64
@@ -0,0 +1,84 @@
+#
+# /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
+
+[core]
+Include = /etc/pacman.d/mirrorlist
+
+[extra]
+Include = /etc/pacman.d/mirrorlist
+
+#[community-testing]
+#Include = /etc/pacman.d/mirrorlist
+
+[community]
+Include = /etc/pacman.d/mirrorlist
+
+# If you want to run 32 bit applications on your x86_64 system,
+# enable the multilib repository here.
+#[multilib]
+#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
+