diff options
| -rw-r--r-- | libre/pacman/0003-Ensure-pre_upgrade-scriptlet-gets-old-package-version.patch | 29 | ||||
| -rwxr-xr-x | libre/pacman/PKGBUILD | 9 |
2 files changed, 35 insertions, 3 deletions
diff --git a/libre/pacman/0003-Ensure-pre_upgrade-scriptlet-gets-old-package-version.patch b/libre/pacman/0003-Ensure-pre_upgrade-scriptlet-gets-old-package-version.patch new file mode 100644 index 000000000..ae3a57ecd --- /dev/null +++ b/libre/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/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD index 4f05be586..85ae5cc5f 100755 --- a/libre/pacman/PKGBUILD +++ b/libre/pacman/PKGBUILD @@ -1,11 +1,11 @@ # vim: set ts=2 sw=2 et: -# $Id: PKGBUILD 150148 2012-02-13 14:49:35Z dreisner $ +# $Id: PKGBUILD 171482 2012-11-18 01:57:51Z allan $ # Maintainer: Dan McGee <dan@archlinux.org> -# Maintainer: Dave Reisner <dave@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' 'mips64el') 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 pacman.conf.mips64el @@ -29,6 +30,7 @@ md5sums=('387965c7125e60e5f0b9ff3b427fe0f9' '1a70392526c8768470da678b31905a6e' '1a9b79788640907a2b34e8671cacc94a' 'a9ddd43891bed364e1e97d27b2887bf1' + '2e8cbf55a94b1954b167c5dee6b62317' '080d9f76f56e135cc62205874636aa0f' 'ce9943fc8086d491890565e91ea1a0d8' 'eb8dba9bd0b315230fbf0e5dc0a7335b' @@ -39,6 +41,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 |