From 6d33ca9cbcabb9e24dd928aae0f44616d976a1b3 Mon Sep 17 00:00:00 2001 From: Michael Hanson <hansonorders@verizon.net> Date: Wed, 3 Aug 2011 02:10:38 +0000 Subject: parted: Update to latest. Ref #775 & Ref #736 --- abs/core/parted/PKGBUILD | 24 +++++++++++++++--------- abs/core/parted/linux.c.patch | 25 +++++++++++++++++++++++++ abs/core/parted/parted-3.0-3.src.tar.gz | 1 + 3 files changed, 41 insertions(+), 9 deletions(-) create mode 100644 abs/core/parted/linux.c.patch create mode 120000 abs/core/parted/parted-3.0-3.src.tar.gz diff --git a/abs/core/parted/PKGBUILD b/abs/core/parted/PKGBUILD index d166fd8..6bb7ce0 100644 --- a/abs/core/parted/PKGBUILD +++ b/abs/core/parted/PKGBUILD @@ -1,31 +1,37 @@ -# $Id: PKGBUILD 82289 2010-06-10 01:52:54Z andrea $ +# $Id$ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=parted -pkgver=2.3 -pkgrel=1 +pkgver=3.0 +pkgrel=3 pkgdesc="A program for creating, destroying, resizing, checking and copying partitions" arch=('i686' 'x86_64') license=('GPL3') url="http://www.gnu.org/software/parted/parted.html" depends=('device-mapper' 'e2fsprogs') +makedepends=('pkgconfig') options=('!libtool') install=${pkgname}.install -source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('30ceb6df7e8681891e865e2fe5a7903d') +source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz" + linux.c.patch) +md5sums=('c415e5c97f86b5ff65a2d925e5a3feb7' + '08c942e212424e238271217f52c59706') build() { cd "${srcdir}/${pkgname}-${pkgver}" + # FS#25307 + patch -Np1 -i ${srcdir}/linux.c.patch + ./configure --prefix=/usr \ --disable-debug \ - --disable-rpath \ - --disable-Werror || return 1 - make || return 1 + --disable-rpath + make } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 + + make DESTDIR="${pkgdir}" install } diff --git a/abs/core/parted/linux.c.patch b/abs/core/parted/linux.c.patch new file mode 100644 index 0000000..c9feea1 --- /dev/null +++ b/abs/core/parted/linux.c.patch @@ -0,0 +1,25 @@ +--- a/libparted/arch/linux.c 2011-05-27 14:52:37.000000000 +0200 ++++ b/libparted/arch/linux.c 2011-07-29 20:25:38.000000000 +0200 +@@ -601,17 +601,17 @@ + static int kver = -1; + + struct utsname uts; +- int major; +- int minor; +- int teeny; ++ int major = 0; ++ int minor = 0; ++ int teeny = 0; + + if (kver != -1) + return kver; + + if (uname (&uts)) + return kver = 0; +- if (sscanf (uts.release, "%u.%u.%u", &major, &minor, &teeny) != 3) +- return kver = 0; ++ int n = sscanf (uts.release, "%u.%u.%u", &major, &minor, &teeny); ++ assert (n == 2 || n == 3); + + return kver = KERNEL_VERSION (major, minor, teeny); + } diff --git a/abs/core/parted/parted-3.0-3.src.tar.gz b/abs/core/parted/parted-3.0-3.src.tar.gz new file mode 120000 index 0000000..0aea576 --- /dev/null +++ b/abs/core/parted/parted-3.0-3.src.tar.gz @@ -0,0 +1 @@ +/data/pkg_repo/packages/parted-3.0-3.src.tar.gz \ No newline at end of file -- cgit v0.12