[arch-commits] Commit in pacman/trunk (2 files)

[Dan McGee]

    Date: Friday, September 3, 2010 @ 21:05:26
  Author: dan
Revision: 89780

upgpkg: pacman 3.4.1-1
verbump 3.4.1

Modified:
  pacman/trunk/PKGBUILD
Deleted:
  pacman/trunk/0001-makepkg-fallback-to-sane-defaults-for-library-stripp.patch

-----------------------------------------------------------------+
 0001-makepkg-fallback-to-sane-defaults-for-library-stripp.patch |   32 ----------
 PKGBUILD                                                        |   22 ++----
 2 files changed, 7 insertions(+), 47 deletions(-)

Deleted: 0001-makepkg-fallback-to-sane-defaults-for-library-stripp.patch
===================================================================
--- 0001-makepkg-fallback-to-sane-defaults-for-library-stripp.patch	2010-09-04 00:49:34 UTC (rev 89779)
+++ 0001-makepkg-fallback-to-sane-defaults-for-library-stripp.patch	2010-09-04 01:05:26 UTC (rev 89780)
@@ -1,32 +0,0 @@
-From dc817a2061699cd1f33ca93f0d93a1fbc2f33ea1 Mon Sep 17 00:00:00 2001
-From: Allan McRae <allan at 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 at archlinux.org>
-Signed-off-by: Dan McGee <dan at 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
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-09-04 00:49:34 UTC (rev 89779)
+++ PKGBUILD	2010-09-04 01:05:26 UTC (rev 89780)
@@ -1,42 +1,34 @@
 # $Id$
-# Maintainer: Aaron Griffin <aaron at archlinux.org>
 # Maintainer: Dan McGee <dan at 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
         pacman.conf.x86_64
-        makepkg.conf
-        0001-makepkg-fallback-to-sane-defaults-for-library-stripp.patch)
-md5sums=('50ad71be1faaad84842c576e239d1bb5'
+        makepkg.conf)
+md5sums=('4e4e8e4f636d9878fbed9cf840f162cf'
          'eda9cbdb47f85fabda2e7e63801e3e16'
          '9ba146b4fa7bcb3cc18204b06d1f6157'
-         'aef317285c7d16ac495b0e53deeb948d'
-         'f8c4a3cc7702a7a70d177659441495c5')
-sha256sums=('cd80e206ee653ce337555c73b7064088e672e9341245317fe09dc52d06bff3c3'
-            'cc5b197d50739ecd5e757b95d19ba5936782f8b588260e3ec063f2ae383ff6a1'
-            '816655f858cf5d4950a284ed6ca5fc52ab3abc81f6618d3a8b3644f4f2d03242'
-            '3a60e1f895c90c8e74f5ca389fa05fb3328745e9873c5452b8cd1b2e68bee418'
-            '99f1d108f930b134cfb4c1ca8c86cd282fe9efb69de39cd747218f3d448dda44')
+         '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
 }