diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-11-24 14:34:05 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-11-24 14:34:05 +0100 |
| commit | ee6ba8d4dcf31aa630641953009a27b3fd700faa (patch) | |
| tree | e0b23465af10683570926837a56ade01adc17307 /community/pkgfile | |
| parent | d090dd0cd7b9488aebc92281720a0c5804950f32 (diff) | |
| parent | c65624e6d74bffd70dcd67cc28448b5a50596efb (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/ecryptfs-utils/PKGBUILD
community/pylibacl/PKGBUILD
extra/kwebkitpart/PKGBUILD
extra/php/PKGBUILD
extra/qhull/PKGBUILD
kde-unstable/kdegames-kigo/PKGBUILD
kde-unstable/kdeutils-print-manager/PKGBUILD
Diffstat (limited to 'community/pkgfile')
| -rw-r--r-- | community/pkgfile/0001-update-fix-use-after-free.patch | 27 | ||||
| -rw-r--r-- | community/pkgfile/PKGBUILD | 13 |
2 files changed, 36 insertions, 4 deletions
diff --git a/community/pkgfile/0001-update-fix-use-after-free.patch b/community/pkgfile/0001-update-fix-use-after-free.patch new file mode 100644 index 000000000..4494224c5 --- /dev/null +++ b/community/pkgfile/0001-update-fix-use-after-free.patch @@ -0,0 +1,27 @@ +From 60559a15e170ad49b388ee442eb2ccbe483bc9aa Mon Sep 17 00:00:00 2001 +From: Dave Reisner <dreisner@archlinux.org> +Date: Mon, 19 Nov 2012 19:50:47 -0500 +Subject: [PATCH] update: fix use after free + +mark the address space as unread so that we don't attempt a double free +on a repo download failure during the final cleanup. +--- + src/update.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/update.c b/src/update.c +index c2e76e5..0b4fb8a 100644 +--- a/src/update.c ++++ b/src/update.c +@@ -552,7 +552,7 @@ static int add_repo_download(CURLM *multi, struct repo_t *repo) + } else { + curl_multi_remove_handle(multi, repo->curl); + FREE(repo->url); +- free(repo->data); ++ FREE(repo->data); + repo->buflen = 0; + repo->server_idx++; + } +-- +1.8.0 + diff --git a/community/pkgfile/PKGBUILD b/community/pkgfile/PKGBUILD index 486a2381d..73be9ebf8 100644 --- a/community/pkgfile/PKGBUILD +++ b/community/pkgfile/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 80220 2012-11-17 22:28:33Z dreisner $ +# $Id: PKGBUILD 80498 2012-11-23 00:24:41Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> pkgname=pkgfile pkgver=7 -pkgrel=1 +pkgrel=2 pkgdesc="a pacman .files metadata explorer" arch=('i686' 'x86_64' 'mips64el') url="http://github.com/falconindy/pkgfile" @@ -11,13 +11,18 @@ license=('MIT') depends=('libarchive' 'curl' 'pcre' 'pacman') conflicts=('pkgtools<24-2') makedepends=('perl') -source=("https://github.com/downloads/falconindy/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig}) +source=("https://github.com/downloads/falconindy/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig} + '0001-update-fix-use-after-free.patch') install=pkgfile.install md5sums=('f1dc0052b1c21597ea2fa0f0ce05608c' - '28599a9b6e56860a9cba1c95ec797551') + '28599a9b6e56860a9cba1c95ec797551' + 'a4f505d080795fd0c10fd1d93b4520f6') build() { cd "$pkgname-$pkgver" + + patch -Np1 <"$srcdir/0001-update-fix-use-after-free.patch" + ./configure make |