Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c6c7bc6ae72d0ab24f9246b20968c19f796d3361
commit c6c7bc6ae72d0ab24f9246b20968c19f796d3361 Author: crazy <[email protected]> Date: Tue May 24 03:37:53 2016 +0200 e2fsprogs-1.43-1-x86_64 * Version bump diff --git a/source/base/e2fsprogs/FrugalBuild b/source/base/e2fsprogs/FrugalBuild index 4d08267..bc6ae2c 100644 --- a/source/base/e2fsprogs/FrugalBuild +++ b/source/base/e2fsprogs/FrugalBuild @@ -1,24 +1,27 @@ # Compiling time: 0.18 SBU -# Maintainer: James Buren <[email protected]> +# Maintainer: crazy <[email protected]> # Contributor: Miklos Vajna <[email protected]> pkgname=e2fsprogs -pkgver=1.42.13 -pkgrel=4 +pkgver=1.43 +pkgrel=1 pkgdesc="Utilities needed to create and maintain ext2 and ext3 filesystems" depends=('glibc>=2.22-7' 'libuuid>=2.27.1-3' 'libblkid>=2.27.1-3') makedepends=('util-linux>=2.27.1-3') rodepends=('coreutils>=8.24-4' 'util-linux>=2.27.1-3') groups=('base' 'chroot-core') -archs=('i686' 'x86_64' 'arm') +archs=('i686' 'x86_64') _F_sourceforge_prefix="libs-" _F_archive_grepv="WIP" Finclude sourceforge +source+=(testsuite.patch) url="http://e2fsprogs.sourceforge.net/"; -signatures=($source.asc) +signatures=("$source.asc" '') build() { + Fcd + Fpatchall Fmake \ --enable-elf-shlibs \ --enable-symlink-install \ @@ -29,14 +32,15 @@ build() --disable-libuuid \ --disable-uuidd \ --disable-fsck \ - --disable-e2initrd-helper + --disable-e2initrd-helper \ + --enable-threads=posix - ## BROKEN IN CHROTT .. make a build with -H and enable this - # it seems building the test binaries fails - #if [ "$CARCH" != "arm" ]; then - # make check || return 1 - #fi - make DESTDIR=$Fdestdir install install-libs + ## DO NOT BUMP BEFORE enabling this local + ## sometimes it hangs the chroot so we just test local + ## before pushing + ## make check || Fdie + + make DESTDIR=$Fdestdir install install-libs || Fdie # conflicts with util-linux Frm usr/sbin/uuidd usr/share/man/man8/uuidd.8 diff --git a/source/base/e2fsprogs/testsuite.patch b/source/base/e2fsprogs/testsuite.patch new file mode 100644 index 0000000..2723a87 --- /dev/null +++ b/source/base/e2fsprogs/testsuite.patch @@ -0,0 +1,36 @@ +From e7d848266a224cc1ed3c74c6746b5c779a5f55ce Mon Sep 17 00:00:00 2001 +From: Theodore Ts'o <[email protected]> +Date: Fri, 20 May 2016 21:02:09 -0400 +Subject: tests: fix filter.sed to filter out version numbers of the form 1.43 + +The regular expression worked for version numbers such as 1.42.12, but +not if there isn't a third component in the version number. + +Signed-off-by: Theodore Ts'o <[email protected]> +--- + tests/filter.sed | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/tests/filter.sed b/tests/filter.sed +index bec899c..628309d 100644 +--- a/tests/filter.sed ++++ b/tests/filter.sed +@@ -1,10 +1,10 @@ +-/^debugfs [1-9]\.[0-9]*[.-][^ ]* ([0-9]*-[A-Za-z]*-[0-9]*)/d +-/^dumpe2fs [1-9]\.[0-9]*[.-][^ ]* ([0-9]*-[A-Za-z]*-[0-9]*)/d +-/^e2fsck [1-9]\.[0-9]*[.-][^ ]* ([0-9]*-[A-Za-z]*-[0-9]*)/d +-/^mke2fs [1-9]\.[0-9]*[.-][^ ]* ([0-9]*-[A-Za-z]*-[0-9]*)/d +-/^resize2fs [1-9]\.[0-9]*[.-][^ ]* ([0-9]*-[A-Za-z]*-[0-9]*)/d +-/^tune2fs [1-9]\.[0-9]*[.-][^ ]* ([0-9]*-[A-Za-z]*-[0-9]*)/d +-/^e2image [1-9]\.[0-9]*[.-][^ ]* ([0-9]*-[A-Za-z]*-[0-9]*)/d ++/^debugfs [1-9]\.[0-9]*[^ ]* ([0-9]*-[A-Za-z]*-[0-9]*)/d ++/^dumpe2fs [1-9]\.[0-9]*[^ ]* ([0-9]*-[A-Za-z]*-[0-9]*)/d ++/^e2fsck [1-9]\.[0-9]*[^ ]* ([0-9]*-[A-Za-z]*-[0-9]*)/d ++/^mke2fs [1-9]\.[0-9]*[^ ]* ([0-9]*-[A-Za-z]*-[0-9]*)/d ++/^resize2fs [1-9]\.[0-9]*[^ ]* ([0-9]*-[A-Za-z]*-[0-9]*)/d ++/^tune2fs [1-9]\.[0-9]*[^ ]* ([0-9]*-[A-Za-z]*-[0-9]*)/d ++/^e2image [1-9]\.[0-9]*[^ ]* ([0-9]*-[A-Za-z]*-[0-9]*)/d + s/\\015//g + /automatically checked/d + /^Directory Hash Seed:/d +-- _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
