From d57f97ec584566894ff036d0758411170c0df619 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Wed, 28 Nov 2012 09:26:34 -0600
Subject: pacman: 4.0.3  recompile

---
 ...pgrade-scriptlet-gets-old-package-version.patch | 29 ++++++++++++++++++++++
 abs/core/pacman/PKGBUILD                           |  7 ++++--
 2 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 abs/core/pacman/0003-Ensure-pre_upgrade-scriptlet-gets-old-package-version.patch

diff --git a/abs/core/pacman/0003-Ensure-pre_upgrade-scriptlet-gets-old-package-version.patch b/abs/core/pacman/0003-Ensure-pre_upgrade-scriptlet-gets-old-package-version.patch
new file mode 100644
index 0000000..ae3a57e
--- /dev/null
+++ b/abs/core/pacman/0003-Ensure-pre_upgrade-scriptlet-gets-old-package-version.patch
@@ -0,0 +1,29 @@
+From 1bf05e706b5edac92e9c913a69ca8686c6440f8b Mon Sep 17 00:00:00 2001
+From: Dan McGee <dan@archlinux.org>
+Date: Fri, 04 May 2012 16:41:40 +0000
+Subject: Ensure pre_upgrade scriptlet gets old package version
+
+This was accidentally broken in the refactor done in commit 73139ccb.
+
+Fixes FS#29371.
+
+Signed-off-by: Dan McGee <dan@archlinux.org>
+---
+diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c
+index 6c2f0cb..c49d99b 100644
+--- a/lib/libalpm/add.c
++++ b/lib/libalpm/add.c
+@@ -488,8 +488,9 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg,
+ 	if(alpm_pkg_has_scriptlet(newpkg) &&
+ 			!(trans->flags & ALPM_TRANS_FLAG_NOSCRIPTLET)) {
+ 		const char *scriptlet_name = is_upgrade ? "pre_upgrade" : "pre_install";
+-		_alpm_runscriptlet(handle, pkgfile,
+-				scriptlet_name, newpkg->version, NULL, 1);
++
++		_alpm_runscriptlet(handle, pkgfile, scriptlet_name,
++				newpkg->version, oldpkg ? oldpkg->version : NULL, 1);
+ 	}
+ 
+ 	/* we override any pre-set reason if we have alldeps or allexplicit set */
+--
+cgit v0.9.0.2-13-g2bd3
diff --git a/abs/core/pacman/PKGBUILD b/abs/core/pacman/PKGBUILD
index 623f4cc..6ee826d 100644
--- a/abs/core/pacman/PKGBUILD
+++ b/abs/core/pacman/PKGBUILD
@@ -1,11 +1,11 @@
 # vim: set ts=2 sw=2 et:
-# $Id: PKGBUILD 163493 2012-07-13 12:31:08Z allan $
+# $Id: PKGBUILD 171528 2012-11-18 11:37:56Z allan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 
 pkgname=pacman
 pkgver=4.0.3
-pkgrel=3
+pkgrel=5
 pkgdesc="A library-based package manager with dependency support"
 arch=('i686' 'x86_64')
 url="http://www.archlinux.org/pacman/"
@@ -21,6 +21,7 @@ options=(!libtool)
 source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig}
         0001-Add-conflict-for-replacing-owned-empty-directory.patch
         0002-Check-empty-subdirectory-ownership.patch
+        0003-Ensure-pre_upgrade-scriptlet-gets-old-package-version.patch
         pacman.conf
         pacman.conf.x86_64
         makepkg.conf)
@@ -28,6 +29,7 @@ md5sums=('387965c7125e60e5f0b9ff3b427fe0f9'
          '1a70392526c8768470da678b31905a6e'
          '1a9b79788640907a2b34e8671cacc94a'
          'a9ddd43891bed364e1e97d27b2887bf1'
+         '2e8cbf55a94b1954b167c5dee6b62317'
          '99734ea46795f466d41c503e9e23b6d4'
          '556d49489e82b5750cf026d3b18c8f4f'
          '589cd34eb9d5b678455e8289394f523e')
@@ -37,6 +39,7 @@ build() {
 
   patch -p1 -i $srcdir/0001-Add-conflict-for-replacing-owned-empty-directory.patch
   patch -p1 -i $srcdir/0002-Check-empty-subdirectory-ownership.patch
+  patch -p1 -i $srcdir/0003-Ensure-pre_upgrade-scriptlet-gets-old-package-version.patch
 
   ./configure --prefix=/usr --sysconfdir=/etc \
     --localstatedir=/var --enable-doc
-- 
cgit v0.12

