Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=fd5b46d5f4aac0e4ddc2c004b937a8e464149471
commit fd5b46d5f4aac0e4ddc2c004b937a8e464149471 Author: Melko <[email protected]> Date: Thu Aug 25 15:13:20 2011 +0200 parted-2.4-2-i686 * fix crash due to kernel version numbering diff --git a/source/base/parted/FrugalBuild b/source/base/parted/FrugalBuild index ba89d9e..e53f33b 100644 --- a/source/base/parted/FrugalBuild +++ b/source/base/parted/FrugalBuild @@ -3,7 +3,7 @@ pkgname=parted pkgver=2.4 -pkgrel=1 +pkgrel=2 pkgdesc="A program for creating, destroying, resizing, checking and copying partitions" url="http://www.gnu.org/software/parted/parted.html"; depends=('e2fsprogs>=1.41.14' 'readline>=5.2-4') @@ -11,8 +11,8 @@ rodepends=('gawk>=3.1.8' 'gzip>=1.4' 'shadow>=4.1.2.2-8' 'texinfo>=4.11-4') groups=('base') archs=('i686' 'x86_64' 'ppc' 'arm') Fup2gnugz -source=(http://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz) -signatures=($source.sig) +source=(http://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz kernel3.patch) +signatures=("$source.sig" '') Fconfopts="$Fconfopts --disable-Werror --with-readline --disable-device-mapper" Finclude texinfo diff --git a/source/base/parted/kernel3.patch b/source/base/parted/kernel3.patch new file mode 100644 index 0000000..ca4de7e --- /dev/null +++ b/source/base/parted/kernel3.patch @@ -0,0 +1,17 @@ +diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c +index aeaf98f..111816c 100644 +--- a/libparted/arch/linux.c ++++ b/libparted/arch/linux.c +@@ -610,7 +610,11 @@ _get_linux_version () + + if (uname (&uts)) + return kver = 0; +- if (sscanf (uts.release, "%u.%u.%u", &major, &minor, &teeny) != 3) ++ if (sscanf (uts.release, "%u.%u.%u", &major, &minor, &teeny) == 3) ++ ; /* ok */ ++ else if (sscanf (uts.release, "%u.%u", &major, &minor) == 2) ++ teeny = 0; ++ else + return kver = 0; + + return kver = KERNEL_VERSION (major, minor, teeny); _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
