diff options
| author | root <root@rshg054.dnsready.net> | 2011-08-02 04:35:55 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2011-08-02 04:35:55 +0000 |
| commit | bf35116f9d203dcafce808a6c7b3dd5a0db8afbc (patch) | |
| tree | f9551a1d3c67d2113cc5fc5c3f8816bcbaad0540 /extra/parted | |
| parent | 1173ff2dba7d0fd3c45f170a5e353a76b7a5da2f (diff) | |
Tue Aug 2 04:35:55 UTC 2011
Diffstat (limited to 'extra/parted')
| -rw-r--r-- | extra/parted/PKGBUILD | 13 | ||||
| -rw-r--r-- | extra/parted/linux.c.patch | 25 |
2 files changed, 34 insertions, 4 deletions
diff --git a/extra/parted/PKGBUILD b/extra/parted/PKGBUILD index a83bc0eca..8c8d7f3b1 100644 --- a/extra/parted/PKGBUILD +++ b/extra/parted/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 132447 2011-07-24 17:00:59Z giovanni $ +# $Id: PKGBUILD 133576 2011-07-29 18:39:57Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=parted pkgver=3.0 -pkgrel=2 +pkgrel=3 pkgdesc="A program for creating, destroying, resizing, checking and copying partitions" arch=('i686' 'x86_64') license=('GPL3') @@ -13,12 +13,17 @@ depends=('device-mapper' 'e2fsprogs') makedepends=('pkgconfig') options=('!libtool') install=${pkgname}.install -source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz") -md5sums=('c415e5c97f86b5ff65a2d925e5a3feb7') +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 diff --git a/extra/parted/linux.c.patch b/extra/parted/linux.c.patch new file mode 100644 index 000000000..c9feea142 --- /dev/null +++ b/extra/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); + } |