update pacman to 3.4.1

This commit is contained in:
philm 2010-10-24 17:15:47 +00:00
parent a5806d280c
commit 851ebcc827
3 changed files with 9 additions and 43 deletions

View File

@ -1,11 +1,12 @@
#!/bin/sh
AUFS2VERSION="-33"
KERNELVERSION=2.6.33
GITSNAPSHOT=20100420
AUFS2VERSION="-36"
KERNELVERSION=2.6.36
GITSNAPSHOT=20101021
# aufs2 (no -xx) for the latest -rc version.
git clone http://git.c3sl.ufpr.br/pub/scm/aufs/aufs2-standalone.git aufs2-standalone.git
cd aufs2-standalone.git
git checkout origin/aufs2${AUFS2VERSION}
#git checkout origin/aufs2${AUFS2VERSION}
git checkout origin/aufs2
#*** apply "aufs2-base.patch" and "aufs2-standalone.patch" to your kernel source files.
cd ..
rm -rf aufs2-${KERNELVERSIN}_${GITSNAPSHOT}

View File

@ -1,32 +0,0 @@
From dc817a2061699cd1f33ca93f0d93a1fbc2f33ea1 Mon Sep 17 00:00:00 2001
From: Allan McRae <allan@archlinux.org>
Date: Thu, 17 Jun 2010 14:32:08 +1000
Subject: [PATCH] makepkg: fallback to sane defaults for library stripping
If the library stripping variables are not defined in makepkg.conf,
libraries will be fully stripped and become broken. Fallback to a
sane default stripping level.
Signed-off-by: Allan McRae <allan@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
---
scripts/makepkg.sh.in | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index d986701..e64b564 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -864,6 +864,9 @@ tidy_install() {
if [[ $(check_option strip) = y && -n ${STRIP_DIRS[*]} ]]; then
msg2 "$(gettext "Stripping unneeded symbols from binaries and libraries...")"
+ # make sure library stripping variables are defined to prevent excess stripping
+ [[ -z ${STRIP_SHARED+x} ]] && STRIP_SHARED="-S"
+ [[ -z ${STRIP_STATIC+x} ]] && STRIP_STATIC="-S"
local binary
find ${STRIP_DIRS[@]} -type f -perm -u+w 2>/dev/null | while read binary ; do
case "$(file -bi "$binary")" in
--
1.7.1

View File

@ -8,7 +8,7 @@
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=pacman
pkgver=3.4.0
pkgver=3.4.1
pkgrel=1
pkgdesc="A library-based package manager with dependency support"
arch=('i686' 'x86_64')
@ -22,19 +22,16 @@ 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'
makepkg.conf)
md5sums=('4e4e8e4f636d9878fbed9cf840f162cf'
'78bd7ff2abd68a8e854441cfd26ad3d2'
'aef317285c7d16ac495b0e53deeb948d'
'f8c4a3cc7702a7a70d177659441495c5')
'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
}