From 74176e40da7b7b75009a3b7ad66f7a0e97172b2a Mon Sep 17 00:00:00 2001 From: Eric Sandeen Date: Mon, 20 Dec 2010 12:09:06 -0600 Subject: [PATCH] New upstream release 1.41.13 --- .gitignore | 1 + e2fpsrogs-1.41.12-EOFBLOCKS-test.patch | 32 -- e2fsprogs-1.41.12-UTF8-chars.patch | 574 ---------------------- e2fsprogs-1.41.12-e4defrag.patch | 36 +- e2fsprogs-1.41.12-relax-resize2fs-P.patch | 33 -- e2fsprogs.spec | 23 +- sources | 2 +- 7 files changed, 28 insertions(+), 673 deletions(-) delete mode 100644 e2fpsrogs-1.41.12-EOFBLOCKS-test.patch delete mode 100644 e2fsprogs-1.41.12-UTF8-chars.patch delete mode 100644 e2fsprogs-1.41.12-relax-resize2fs-P.patch diff --git a/.gitignore b/.gitignore index 751b117..d5148bd 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ e2fsprogs-1.41.12.tar.gz +/e2fsprogs-1.41.13.tar.gz diff --git a/e2fpsrogs-1.41.12-EOFBLOCKS-test.patch b/e2fpsrogs-1.41.12-EOFBLOCKS-test.patch deleted file mode 100644 index 1d27de9..0000000 --- a/e2fpsrogs-1.41.12-EOFBLOCKS-test.patch +++ /dev/null @@ -1,32 +0,0 @@ -From: Eric Sandeen -Date: Wed, 19 May 2010 18:20:13 +0000 (-0500) -Subject: e2fsck: correct test for EOFBLOCKS -X-Git-Url: http://git.kernel.org/?p=fs%2Fext2%2Fe2fsprogs.git;a=commitdiff_plain;h=ae2272f8459f75c064b2644320db4ec5213d40a9 - -e2fsck: correct test for EOFBLOCKS - -This test, added to e2fsprogs-1.41.12, is backwards. - -If EOFBLOCKS is set, then the size -should- be less than -the last physical block... - -xfstests 013 caught this. - -Signed-off-by: Eric Sandeen -Signed-off-by: Theodore Ts'o ---- - -diff --git a/e2fsck/pass1.c b/e2fsck/pass1.c -index c35937f..4bf80d2 100644 ---- a/e2fsck/pass1.c -+++ b/e2fsck/pass1.c -@@ -2013,7 +2013,7 @@ static void check_blocks(e2fsck_t ctx, struct problem_context *pctx, - * doesn't need to be. - */ - if ((inode->i_flags & EXT4_EOFBLOCKS_FL) && -- (size <= (((__u64)pb.last_block + 1) * fs->blocksize))) { -+ (size >= (((__u64)pb.last_block + 1) * fs->blocksize))) { - pctx->blkcount = pb.last_block; - if (fix_problem(ctx, PR_1_EOFBLOCKS_FL_SET, pctx)) { - inode->i_flags &= ~EXT4_EOFBLOCKS_FL; - diff --git a/e2fsprogs-1.41.12-UTF8-chars.patch b/e2fsprogs-1.41.12-UTF8-chars.patch deleted file mode 100644 index 396992e..0000000 --- a/e2fsprogs-1.41.12-UTF8-chars.patch +++ /dev/null @@ -1,574 +0,0 @@ -commit 61ef2474c24c80a5bf0e24ba85a7506fd7651a5c -Author: Theodore Ts'o -Date: Sun Aug 1 22:30:33 2010 -0400 - - badblocks: Deal with UTF-8 characters in progress message - - Addresses-Gentoo-Bug: #309909 - Addresses-Debian-Bug: #583782 - Addresses-Debian-Bug: #587834 - - Signed-off-by: "Theodore Ts'o" - -Index: e2fsprogs-1.41.12/configure -=================================================================== ---- e2fsprogs-1.41.12.orig/configure -+++ e2fsprogs-1.41.12/configure -@@ -1,10 +1,12 @@ - #! /bin/sh - # Guess values for system-dependent variables and create Makefiles. --# Generated by GNU Autoconf 2.64. -+# Generated by GNU Autoconf 2.65. -+# - # - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, --# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software --# Foundation, Inc. -+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -+# Inc. -+# - # - # This configure script is free software; the Free Software Foundation - # gives unlimited permission to copy, distribute and modify it. -@@ -524,7 +526,8 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P - as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - --exec 7<&0 &1 -+test -n "$DJDIR" || exec 7<&0 &1 - - # Name of the host. - # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, -@@ -588,6 +591,7 @@ ac_includes_default="\ - # include - #endif" - -+ac_header_list= - ac_subst_vars='LTLIBOBJS - LIBOBJS - BUILD_LDFLAGS -@@ -1478,7 +1482,7 @@ Some influential environment variables: - LDFLAGS linker flags, e.g. -L if you have libraries in a - nonstandard directory - LIBS libraries to pass to the linker, e.g. -l -- CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if -+ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if - you have headers in a nonstandard directory - CPP C preprocessor - PKG_CONFIG path to pkg-config utility -@@ -1550,7 +1554,7 @@ test -n "$ac_init_help" && exit $ac_stat - if $ac_init_version; then - cat <<\_ACEOF - configure --generated by GNU Autoconf 2.64 -+generated by GNU Autoconf 2.65 - - Copyright (C) 2009 Free Software Foundation, Inc. - This configure script is free software; the Free Software Foundation -@@ -1597,7 +1601,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 - ac_retval=1 - fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} -- return $ac_retval -+ as_fn_set_status $ac_retval - - } # ac_fn_c_try_compile - -@@ -1643,7 +1647,7 @@ fi - # left behind by Apple's compiler. We do this before executing the actions. - rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} -- return $ac_retval -+ as_fn_set_status $ac_retval - - } # ac_fn_c_try_link - -@@ -1680,7 +1684,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 - ac_retval=1 - fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} -- return $ac_retval -+ as_fn_set_status $ac_retval - - } # ac_fn_c_try_cpp - -@@ -1809,7 +1813,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 - fi - rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} -- return $ac_retval -+ as_fn_set_status $ac_retval - - } # ac_fn_c_try_run - -@@ -2139,7 +2143,7 @@ rm -f conftest.val - - fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} -- return $ac_retval -+ as_fn_set_status $ac_retval - - } # ac_fn_c_compute_int - -@@ -2243,7 +2247,7 @@ This file contains any messages produced - running configure, to aid debugging if configure makes a mistake. - - It was created by $as_me, which was --generated by GNU Autoconf 2.64. Invocation command line was -+generated by GNU Autoconf 2.65. Invocation command line was - - $ $0 $@ - -@@ -2496,7 +2500,7 @@ fi - for ac_site_file in "$ac_site_file1" "$ac_site_file2" - do - test "x$ac_site_file" = xNONE && continue -- if test -r "$ac_site_file"; then -+ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 - $as_echo "$as_me: loading site script $ac_site_file" >&6;} - sed 's/^/| /' "$ac_site_file" >&5 -@@ -2505,9 +2509,9 @@ $as_echo "$as_me: loading site script $a - done - - if test -r "$cache_file"; then -- # Some versions of bash will fail to source /dev/null (special -- # files actually), so we avoid doing that. -- if test -f "$cache_file"; then -+ # Some versions of bash will fail to source /dev/null (special files -+ # actually), so we avoid doing that. DJGPP emulates it as a regular file. -+ if test /dev/null != "$cache_file" && test -f "$cache_file"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 - $as_echo "$as_me: loading cache $cache_file" >&6;} - case $cache_file in -@@ -2521,6 +2525,9 @@ $as_echo "$as_me: creating cache $cache_ - >$cache_file - fi - -+as_fn_append ac_header_list " stdlib.h" -+as_fn_append ac_header_list " unistd.h" -+as_fn_append ac_header_list " sys/param.h" - # Check that the precious variables saved in the cache have kept the same - # value. - ac_cache_corrupted=false -@@ -3067,32 +3074,30 @@ $as_echo "$ac_try_echo"; } >&5 - ... rest of stderr output deleted ... - 10q' conftest.err >conftest.er1 - cat conftest.er1 >&5 -- rm -f conftest.er1 conftest.err - fi -+ rm -f conftest.er1 conftest.err - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - done - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --#include -+ - int - main () - { --FILE *f = fopen ("conftest.out", "w"); -- return ferror (f) || fclose (f) != 0; - - ; - return 0; - } - _ACEOF - ac_clean_files_save=$ac_clean_files --ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out" -+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" - # Try to create an executable without -o first, disregard a.out. - # It will help us diagnose broken compilers, and finding out an intuition - # of exeext. --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 --$as_echo_n "checking for C compiler default output file name... " >&6; } -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 -+$as_echo_n "checking whether the C compiler works... " >&6; } - ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` - - # The possible output files: -@@ -3154,10 +3159,10 @@ test "$ac_cv_exeext" = no && ac_cv_exeex - else - ac_file='' - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 --$as_echo "$ac_file" >&6; } - if test -z "$ac_file"; then : -- $as_echo "$as_me: failed program was:" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+$as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -@@ -3165,51 +3170,18 @@ $as_echo "$as_me: error: in \`$ac_pwd':" - { as_fn_set_status 77 - as_fn_error "C compiler cannot create executables - See \`config.log' for more details." "$LINENO" 5; }; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } - fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 -+$as_echo_n "checking for C compiler default output file name... " >&6; } -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 -+$as_echo "$ac_file" >&6; } - ac_exeext=$ac_cv_exeext - --# Check that the compiler produces executables we can run. If not, either --# the compiler is broken, or we cross compile. --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 --$as_echo_n "checking whether the C compiler works... " >&6; } --# If not cross compiling, check that we can run a simple program. --if test "$cross_compiling" != yes; then -- if { ac_try='./$ac_file' -- { { case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" --$as_echo "$ac_try_echo"; } >&5 -- (eval "$ac_try") 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; }; then -- cross_compiling=no -- else -- if test "$cross_compiling" = maybe; then -- cross_compiling=yes -- else -- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --as_fn_error "cannot run C compiled programs. --If you meant to cross compile, use \`--host'. --See \`config.log' for more details." "$LINENO" 5; } -- fi -- fi --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; } -- --rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out -+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out - ac_clean_files=$ac_clean_files_save --# Check that the compiler produces executables we can run. If not, either --# the compiler is broken, or we cross compile. --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 --$as_echo_n "checking whether we are cross compiling... " >&6; } --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 --$as_echo "$cross_compiling" >&6; } -- - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 - $as_echo_n "checking for suffix of executables... " >&6; } - if { { ac_try="$ac_link" -@@ -3242,13 +3214,72 @@ $as_echo "$as_me: error: in \`$ac_pwd':" - as_fn_error "cannot compute suffix of executables: cannot compile and link - See \`config.log' for more details." "$LINENO" 5; } - fi --rm -f conftest$ac_cv_exeext -+rm -f conftest conftest$ac_cv_exeext - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 - $as_echo "$ac_cv_exeext" >&6; } - - rm -f conftest.$ac_ext - EXEEXT=$ac_cv_exeext - ac_exeext=$EXEEXT -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+int -+main () -+{ -+FILE *f = fopen ("conftest.out", "w"); -+ return ferror (f) || fclose (f) != 0; -+ -+ ; -+ return 0; -+} -+_ACEOF -+ac_clean_files="$ac_clean_files conftest.out" -+# Check that the compiler produces executables we can run. If not, either -+# the compiler is broken, or we cross compile. -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 -+$as_echo_n "checking whether we are cross compiling... " >&6; } -+if test "$cross_compiling" != yes; then -+ { { ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_link") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if { ac_try='./conftest$ac_cv_exeext' -+ { { case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_try") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; }; then -+ cross_compiling=no -+ else -+ if test "$cross_compiling" = maybe; then -+ cross_compiling=yes -+ else -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error "cannot run C compiled programs. -+If you meant to cross compile, use \`--host'. -+See \`config.log' for more details." "$LINENO" 5; } -+ fi -+ fi -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 -+$as_echo "$cross_compiling" >&6; } -+ -+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out -+ac_clean_files=$ac_clean_files_save - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 - $as_echo_n "checking for suffix of object files... " >&6; } - if test "${ac_cv_objext+set}" = set; then : -@@ -3905,8 +3936,8 @@ $as_echo "$ac_try_echo"; } >&5 - ... rest of stderr output deleted ... - 10q' conftest.err >conftest.er1 - cat conftest.er1 >&5 -- rm -f conftest.er1 conftest.err - fi -+ rm -f conftest.er1 conftest.err - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - done -@@ -6792,10 +6823,14 @@ _ACEOF - - fi - --for ac_header in stdlib.h unistd.h -+ -+ -+ -+ for ac_header in $ac_header_list - do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` --ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default -+" - eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : - cat >>confdefs.h <<_ACEOF -@@ -6806,6 +6841,13 @@ fi - - done - -+ -+ -+ -+ -+ -+ -+ - for ac_func in getpagesize - do : - ac_fn_c_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize" -@@ -6862,11 +6904,6 @@ char *malloc (); - - /* This mess was copied from the GNU getpagesize.h. */ - #ifndef HAVE_GETPAGESIZE --/* Assume that all systems that can run configure have sys/param.h. */ --# ifndef HAVE_SYS_PARAM_H --# define HAVE_SYS_PARAM_H 1 --# endif -- - # ifdef _SC_PAGESIZE - # define getpagesize() sysconf(_SC_PAGESIZE) - # else /* no _SC_PAGESIZE */ -@@ -6901,8 +6938,9 @@ int - main () - { - char *data, *data2, *data3; -+ const char *cdata2; - int i, pagesize; -- int fd; -+ int fd, fd2; - - pagesize = getpagesize (); - -@@ -6915,27 +6953,41 @@ main () - umask (0); - fd = creat ("conftest.mmap", 0600); - if (fd < 0) -- return 1; -+ return 2; - if (write (fd, data, pagesize) != pagesize) -- return 1; -+ return 3; - close (fd); - -+ /* Next, check that the tail of a page is zero-filled. File must have -+ non-zero length, otherwise we risk SIGBUS for entire page. */ -+ fd2 = open ("conftest.txt", O_RDWR | O_CREAT | O_TRUNC, 0600); -+ if (fd2 < 0) -+ return 4; -+ cdata2 = ""; -+ if (write (fd2, cdata2, 1) != 1) -+ return 5; -+ data2 = (char *) mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0L); -+ if (data2 == MAP_FAILED) -+ return 6; -+ for (i = 0; i < pagesize; ++i) -+ if (*(data2 + i)) -+ return 7; -+ close (fd2); -+ if (munmap (data2, pagesize)) -+ return 8; -+ - /* Next, try to mmap the file at a fixed address which already has - something else allocated at it. If we can, also make sure that - we see the same garbage. */ - fd = open ("conftest.mmap", O_RDWR); - if (fd < 0) -- return 1; -- data2 = (char *) malloc (2 * pagesize); -- if (!data2) -- return 1; -- data2 += (pagesize - ((long int) data2 & (pagesize - 1))) & (pagesize - 1); -+ return 9; - if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_FIXED, fd, 0L)) -- return 1; -+ return 10; - for (i = 0; i < pagesize; ++i) - if (*(data + i) != *(data2 + i)) -- return 1; -+ return 11; - - /* Finally, make sure that changes to the mapped area do not - percolate back to the file as seen by read(). (This is a bug on -@@ -6944,12 +6996,12 @@ main () - *(data2 + i) = *(data2 + i) + 1; - data3 = (char *) malloc (pagesize); - if (!data3) -- return 1; -+ return 12; - if (read (fd, data3, pagesize) != pagesize) -- return 1; -+ return 13; - for (i = 0; i < pagesize; ++i) - if (*(data + i) != *(data3 + i)) -- return 1; -+ return 14; - close (fd); - return 0; - } -@@ -6971,7 +7023,7 @@ if test $ac_cv_func_mmap_fixed_mapped = - $as_echo "#define HAVE_MMAP 1" >>confdefs.h - - fi --rm -f conftest.mmap -+rm -f conftest.mmap conftest.txt - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C Library 2.1 or newer" >&5 -@@ -10647,7 +10699,7 @@ if test "$ac_res" != no; then : - fi - - fi --for ac_func in chflags getrusage llseek lseek64 open64 fstat64 ftruncate64 getmntinfo strtoull strcasecmp srandom jrand48 fchown mallinfo fdatasync strnlen strptime strdup sysconf pathconf posix_memalign memalign valloc __secure_getenv prctl mmap utime setresuid setresgid usleep nanosleep getdtablesize getrlimit sync_file_range posix_fadvise fallocate blkid_probe_get_topology -+for ac_func in chflags getrusage llseek lseek64 open64 fstat64 ftruncate64 getmntinfo strtoull strcasecmp srandom jrand48 fchown mallinfo fdatasync strnlen strptime strdup sysconf pathconf posix_memalign memalign valloc __secure_getenv prctl mmap utime setresuid setresgid usleep nanosleep getdtablesize getrlimit sync_file_range posix_fadvise fallocate blkid_probe_get_topology mbstowcs - do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` - ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -@@ -11593,7 +11645,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri - # values after options handling. - ac_log=" - This file was extended by $as_me, which was --generated by GNU Autoconf 2.64. Invocation command line was -+generated by GNU Autoconf 2.65. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS -@@ -11629,6 +11681,7 @@ Usage: $0 [OPTION]... [TAG]... - - -h, --help print this help, then exit - -V, --version print version number and configuration settings, then exit -+ --config print configuration, then exit - -q, --quiet, --silent - do not print progress messages - -d, --debug don't remove temporary files -@@ -11646,10 +11699,11 @@ Report bugs to the package provider." - - _ACEOF - cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" - ac_cs_version="\\ - config.status --configured by $0, generated by GNU Autoconf 2.64, -- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" -+configured by $0, generated by GNU Autoconf 2.65, -+ with options \\"\$ac_cs_config\\" - - Copyright (C) 2009 Free Software Foundation, Inc. - This config.status script is free software; the Free Software Foundation -@@ -11686,6 +11740,8 @@ do - ac_cs_recheck=: ;; - --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) - $as_echo "$ac_cs_version"; exit ;; -+ --config | --confi | --conf | --con | --co | --c ) -+ $as_echo "$ac_cs_config"; exit ;; - --debug | --debu | --deb | --de | --d | -d ) - debug=: ;; - --file | --fil | --fi | --f ) -@@ -11894,7 +11950,7 @@ s/'"$ac_delim"'$// - t delim - :nl - h --s/\(.\{148\}\).*/\1/ -+s/\(.\{148\}\)..*/\1/ - t more1 - s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ - p -@@ -11908,7 +11964,7 @@ s/.\{148\}// - t nl - :delim - h --s/\(.\{148\}\).*/\1/ -+s/\(.\{148\}\)..*/\1/ - t more2 - s/["\\]/\\&/g; s/^/"/; s/$/"/ - p -Index: e2fsprogs-1.41.12/configure.in -=================================================================== ---- e2fsprogs-1.41.12.orig/configure.in -+++ e2fsprogs-1.41.12/configure.in -@@ -853,7 +853,7 @@ if test -n "$BLKID_CMT"; then - AC_SEARCH_LIBS([blkid_probe_all], [blkid]) - fi - dnl --AC_CHECK_FUNCS(chflags getrusage llseek lseek64 open64 fstat64 ftruncate64 getmntinfo strtoull strcasecmp srandom jrand48 fchown mallinfo fdatasync strnlen strptime strdup sysconf pathconf posix_memalign memalign valloc __secure_getenv prctl mmap utime setresuid setresgid usleep nanosleep getdtablesize getrlimit sync_file_range posix_fadvise fallocate blkid_probe_get_topology) -+AC_CHECK_FUNCS(chflags getrusage llseek lseek64 open64 fstat64 ftruncate64 getmntinfo strtoull strcasecmp srandom jrand48 fchown mallinfo fdatasync strnlen strptime strdup sysconf pathconf posix_memalign memalign valloc __secure_getenv prctl mmap utime setresuid setresgid usleep nanosleep getdtablesize getrlimit sync_file_range posix_fadvise fallocate blkid_probe_get_topology mbstowcs) - dnl - dnl Check to see if -lsocket is required (solaris) to make something - dnl that uses socket() to compile; this is needed for the UUID library -Index: e2fsprogs-1.41.12/misc/badblocks.c -=================================================================== ---- e2fsprogs-1.41.12.orig/misc/badblocks.c -+++ e2fsprogs-1.41.12/misc/badblocks.c -@@ -203,6 +203,9 @@ static void print_status(void) - calc_percent((unsigned long) currently_testing, - (unsigned long) num_blocks), - time_diff_format(&time_end, &time_start, diff_buf)); -+#ifdef HAVE_MBSTOWCS -+ len = mbstowcs(NULL, line_buf, sizeof(line_buf)); -+#endif - fputs(line_buf, stderr); - memset(line_buf, '\b', len); - line_buf[len] = 0; diff --git a/e2fsprogs-1.41.12-e4defrag.patch b/e2fsprogs-1.41.12-e4defrag.patch index 16171cd..6c15122 100644 --- a/e2fsprogs-1.41.12-e4defrag.patch +++ b/e2fsprogs-1.41.12-e4defrag.patch @@ -1,33 +1,33 @@ -Index: e2fsprogs-1.41.12/configure +Index: e2fsprogs-1.41.13/configure =================================================================== ---- e2fsprogs-1.41.12.orig/configure -+++ e2fsprogs-1.41.12/configure -@@ -10647,7 +10647,7 @@ if test "$ac_res" != no; then : +--- e2fsprogs-1.41.13.orig/configure ++++ e2fsprogs-1.41.13/configure +@@ -10699,7 +10699,7 @@ if test "$ac_res" != no; then : fi fi --for ac_func in chflags getrusage llseek lseek64 open64 fstat64 ftruncate64 getmntinfo strtoull strcasecmp srandom jrand48 fchown mallinfo fdatasync strnlen strptime strdup sysconf pathconf posix_memalign memalign valloc __secure_getenv prctl mmap utime setresuid setresgid usleep nanosleep getdtablesize getrlimit blkid_probe_get_topology -+for ac_func in chflags getrusage llseek lseek64 open64 fstat64 ftruncate64 getmntinfo strtoull strcasecmp srandom jrand48 fchown mallinfo fdatasync strnlen strptime strdup sysconf pathconf posix_memalign memalign valloc __secure_getenv prctl mmap utime setresuid setresgid usleep nanosleep getdtablesize getrlimit sync_file_range posix_fadvise fallocate blkid_probe_get_topology +-for ac_func in chflags getrusage llseek lseek64 open64 fstat64 ftruncate64 getmntinfo strtoull strcasecmp srandom jrand48 fchown mallinfo fdatasync strnlen strptime strdup sysconf pathconf posix_memalign memalign valloc __secure_getenv prctl mmap utime setresuid setresgid usleep nanosleep getdtablesize getrlimit blkid_probe_get_topology mbstowcs ++for ac_func in chflags getrusage llseek lseek64 open64 fstat64 ftruncate64 getmntinfo strtoull strcasecmp srandom jrand48 fchown mallinfo fdatasync strnlen strptime strdup sysconf pathconf posix_memalign memalign valloc __secure_getenv prctl mmap utime setresuid setresgid usleep nanosleep getdtablesize getrlimit sync_file_range posix_fadvise fallocate blkid_probe_get_topology mbstowcs do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -Index: e2fsprogs-1.41.12/configure.in +Index: e2fsprogs-1.41.13/configure.in =================================================================== ---- e2fsprogs-1.41.12.orig/configure.in -+++ e2fsprogs-1.41.12/configure.in +--- e2fsprogs-1.41.13.orig/configure.in ++++ e2fsprogs-1.41.13/configure.in @@ -853,7 +853,7 @@ if test -n "$BLKID_CMT"; then AC_SEARCH_LIBS([blkid_probe_all], [blkid]) fi dnl --AC_CHECK_FUNCS(chflags getrusage llseek lseek64 open64 fstat64 ftruncate64 getmntinfo strtoull strcasecmp srandom jrand48 fchown mallinfo fdatasync strnlen strptime strdup sysconf pathconf posix_memalign memalign valloc __secure_getenv prctl mmap utime setresuid setresgid usleep nanosleep getdtablesize getrlimit blkid_probe_get_topology) -+AC_CHECK_FUNCS(chflags getrusage llseek lseek64 open64 fstat64 ftruncate64 getmntinfo strtoull strcasecmp srandom jrand48 fchown mallinfo fdatasync strnlen strptime strdup sysconf pathconf posix_memalign memalign valloc __secure_getenv prctl mmap utime setresuid setresgid usleep nanosleep getdtablesize getrlimit sync_file_range posix_fadvise fallocate blkid_probe_get_topology) +-AC_CHECK_FUNCS(chflags getrusage llseek lseek64 open64 fstat64 ftruncate64 getmntinfo strtoull strcasecmp srandom jrand48 fchown mallinfo fdatasync strnlen strptime strdup sysconf pathconf posix_memalign memalign valloc __secure_getenv prctl mmap utime setresuid setresgid usleep nanosleep getdtablesize getrlimit blkid_probe_get_topology mbstowcs) ++AC_CHECK_FUNCS(chflags getrusage llseek lseek64 open64 fstat64 ftruncate64 getmntinfo strtoull strcasecmp srandom jrand48 fchown mallinfo fdatasync strnlen strptime strdup sysconf pathconf posix_memalign memalign valloc __secure_getenv prctl mmap utime setresuid setresgid usleep nanosleep getdtablesize getrlimit sync_file_range posix_fadvise fallocate blkid_probe_get_topology mbstowcs) dnl dnl Check to see if -lsocket is required (solaris) to make something dnl that uses socket() to compile; this is needed for the UUID library -Index: e2fsprogs-1.41.12/misc/Makefile.in +Index: e2fsprogs-1.41.13/misc/Makefile.in =================================================================== ---- e2fsprogs-1.41.12.orig/misc/Makefile.in -+++ e2fsprogs-1.41.12/misc/Makefile.in +--- e2fsprogs-1.41.13.orig/misc/Makefile.in ++++ e2fsprogs-1.41.13/misc/Makefile.in @@ -11,6 +11,9 @@ INSTALL = @INSTALL@ @MCONFIG@ @@ -110,10 +110,10 @@ Index: e2fsprogs-1.41.12/misc/Makefile.in dumpe2fs.8: $(DEP_SUBSTITUTE) $(srcdir)/dumpe2fs.8.in $(E) " SUBST $@" $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/dumpe2fs.8.in dumpe2fs.8 -Index: e2fsprogs-1.41.12/misc/e4defrag.8.in +Index: e2fsprogs-1.41.13/misc/e4defrag.8.in =================================================================== --- /dev/null -+++ e2fsprogs-1.41.12/misc/e4defrag.8.in ++++ e2fsprogs-1.41.13/misc/e4defrag.8.in @@ -0,0 +1,76 @@ +.TH E4DEFRAG 8 "May 2009" "e4defrag version 2.0" +.SH NAME @@ -191,10 +191,10 @@ Index: e2fsprogs-1.41.12/misc/e4defrag.8.in +.BR mke2fs (8), +.BR mount (8). + -Index: e2fsprogs-1.41.12/misc/e4defrag.c +Index: e2fsprogs-1.41.13/misc/e4defrag.c =================================================================== --- /dev/null -+++ e2fsprogs-1.41.12/misc/e4defrag.c ++++ e2fsprogs-1.41.13/misc/e4defrag.c @@ -0,0 +1,2168 @@ +/* + * e4defrag.c - ext4 filesystem defragmenter diff --git a/e2fsprogs-1.41.12-relax-resize2fs-P.patch b/e2fsprogs-1.41.12-relax-resize2fs-P.patch deleted file mode 100644 index 3fa25c7..0000000 --- a/e2fsprogs-1.41.12-relax-resize2fs-P.patch +++ /dev/null @@ -1,33 +0,0 @@ -(sent upstream, not yet merged/committed) - -[PATCH] resize2fs: relax requirements for -P output a bit - -Requiring an immediate pre-fsck before printing a minimum -resize size seems a bit draconian; if the fs isn't clean or marked -with error, then certainly, but for an informational minimum -size, I don't think we need to require a fsck since last mount. - -I had simply copied the checks from the actual resize path, -previously. - -Installers use this option (-P) to gather minimum resize info, -and requiring an actual fsck before use just seems to go too far. - -Signed-off-by: Eric Sandeen ---- - -diff --git a/resize/main.c b/resize/main.c -index 7c4f4dd..7d8b287 100644 ---- a/resize/main.c -+++ b/resize/main.c -@@ -345,8 +345,7 @@ int main (int argc, char ** argv) - min_size = calculate_minimum_resize_size(fs); - - if (print_min_size) { -- if (!force && ((fs->super->s_lastcheck < fs->super->s_mtime) || -- (fs->super->s_state & EXT2_ERROR_FS) || -+ if (!force && ((fs->super->s_state & EXT2_ERROR_FS) || - ((fs->super->s_state & EXT2_VALID_FS) == 0))) { - fprintf(stderr, - _("Please run 'e2fsck -f %s' first.\n\n"), - diff --git a/e2fsprogs.spec b/e2fsprogs.spec index 920368b..b4a2f8c 100644 --- a/e2fsprogs.spec +++ b/e2fsprogs.spec @@ -3,8 +3,8 @@ Summary: Utilities for managing ext2, ext3, and ext4 filesystems Name: e2fsprogs -Version: 1.41.12 -Release: 7%{?dist} +Version: 1.41.13 +Release: 1%{?dist} # License tags based on COPYING file distinctions for various components License: GPLv2 @@ -13,10 +13,7 @@ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: ext2_types-wrapper.h Patch1: e2fsprogs-1.40.4-sb_feature_check_ignore.patch -Patch2: e2fpsrogs-1.41.12-EOFBLOCKS-test.patch -Patch3: e2fsprogs-1.41.12-relax-resize2fs-P.patch -Patch4: e2fsprogs-1.41.12-e4defrag.patch -Patch5: e2fsprogs-1.41.12-UTF8-chars.patch +Patch2: e2fsprogs-1.41.12-e4defrag.patch Url: http://e2fsprogs.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -151,15 +148,8 @@ It was originally inspired by the Multics SubSystem library. # mildly unsafe but 'til I get something better, avoid full fsck # after an selinux install... %patch1 -p1 -b .featurecheck - -# Test for EOFBLOCKS was backwards -%patch2 -p1 -b .EOFBLOCKS -# relax resize2fs -P requirements a bit -%patch3 -p1 -b .resize2fs -# e4defrag for testing -%patch4 -p1 -# Fix up UTF8 formatting -%patch5 -p1 -b .utf8 +# Enable e4defrag for testing +%patch2 -p1 -b .e4defrag %build %configure --enable-elf-shlibs --enable-nls --disable-uuidd --disable-fsck \ @@ -326,6 +316,9 @@ exit 0 %{_libdir}/pkgconfig/ss.pc %changelog +* Mon Dec 20 2010 Eric Sandeen 1.41.13-1 +- New upstream release + * Tue Dec 07 2010 Eric Sandeen 1.41.12-7 - Fix up UTF-8 formatting in e2fsck output (#655227) diff --git a/sources b/sources index 874db99..5bfb971 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1b24a21fc0c2381ef420961cbfec733f e2fsprogs-1.41.12.tar.gz +7508a192c7a9471e2128424f4eafac1c e2fsprogs-1.41.13.tar.gz