- updated to 1.41.13

- updated diet patch
- requires dietlibc with posix_memalign() (0.32-9)

Changed files:
    e2fsprogs-diet.patch -> 1.10
    e2fsprogs.spec -> 1.234

diff --git a/e2fsprogs-diet.patch b/e2fsprogs-diet.patch
index 1a6c5b0b8f4f2881671f0435e39ef905d989feaa..3e5db000f4ba74dd69a6003b2f7d40c0a2fe128e 100644 (file)
--- a/e2fsprogs-diet.patch
+++ b/e2fsprogs-diet.patch
@@ -1,12 +1,29 @@
-diff -ur e2fsprogs-1.41.3/configure.in e2fsprogs-1.41.3-diet/configure.in
---- e2fsprogs-1.41.3/configure.in      2009-03-17 22:03:38.000000000 +0100
-+++ e2fsprogs-1.41.3-diet/configure.in 2009-03-17 22:01:22.000000000 +0100
-@@ -817,7 +817,7 @@
+--- e2fsprogs-1.41.13/configure.in.orig        2010-12-15 17:40:23.706122774 +0100
++++ e2fsprogs-1.41.13/configure.in     2010-12-15 17:43:42.738121936 +0100
+@@ -441,7 +441,7 @@
+               [LIBUUID=`$PKG_CONFIG --libs uuid`;
+                STATIC_LIBUUID=`$PKG_CONFIG --static --libs uuid`],
+               [AC_MSG_ERROR([external uuid library not found])],
+-              [$LIBUUID])
++              [$LIBUUID_LIBADD])
+       UUID_CMT=#
+       AC_MSG_RESULT([Disabling private uuid library])
+ else
+@@ -492,7 +492,7 @@
+               [LIBBLKID=`$PKG_CONFIG --libs blkid`;
+                STATIC_LIBBLKID=`$PKG_CONFIG --static --libs blkid`],
+               [AC_MSG_ERROR([external blkid library not found])],
+-              [$LIBBLKID])
++              [$LIBBLKID_LIBADD])
+       BLKID_CMT=#
+       AC_MSG_RESULT([Disabling private blkid library])
+ else
+@@ -853,7 +853,7 @@
    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 stat64 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 blkid_probe_get_topology mbstowcs)
++AC_CHECK_FUNCS(chflags getrusage llseek lseek64 open64 fstat64 stat64 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)
  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
@@ -23,26 +40,6 @@ diff -ur e2fsprogs-1.41.3/misc/util.c e2fsprogs-1.41.3-diet/misc/util.c
  
        val = stat64(device, &s);
 
---- e2fsprogs-1.41.11/configure.in.orig        2010-05-09 13:54:54.850935070 +0200
-+++ e2fsprogs-1.41.11/configure.in     2010-05-09 20:34:13.650932556 +0200
-@@ -405,7 +405,7 @@
-               [LIBUUID=`$PKG_CONFIG --libs uuid`;
-                STATIC_LIBUUID=`$PKG_CONFIG --static --libs uuid`],
-               [AC_MSG_ERROR([external uuid library not found])],
--              [$LIBUUID])
-+              [$LIBUUID_LIBADD])
-       UUID_CMT=#
-       AC_MSG_RESULT([Disabling private uuid library])
- else
-@@ -456,7 +456,7 @@
-               [LIBBLKID=`$PKG_CONFIG --libs blkid`;
-                STATIC_LIBBLKID=`$PKG_CONFIG --static --libs blkid`],
-               [AC_MSG_ERROR([external blkid library not found])],
--              [$LIBBLKID])
-+              [$LIBBLKID_LIBADD])
-       BLKID_CMT=#
-       AC_MSG_RESULT([Disabling private blkid library])
- else
 --- e2fsprogs-1.41.11/misc/mke2fs.c.orig       2010-03-15 05:13:56.000000000 +0100
 +++ e2fsprogs-1.41.11/misc/mke2fs.c    2010-05-09 20:44:41.178938422 +0200
 @@ -1927,7 +1927,7 @@

diff --git a/e2fsprogs.spec b/e2fsprogs.spec
index 749db10ac1c720256677f86a2d5ec4277217be30..884b5b626aa491194689436094161f1e60014dab 100644 (file)
--- a/e2fsprogs.spec
+++ b/e2fsprogs.spec
@@ -35,12 +35,12 @@ Summary(uk.UTF-8):  Утиліти для роботи з файловою сис
 Summary(zh_CN.UTF-8):  管理第二扩展（ext2）文件系统的工具。
 Summary(zh_TW.UTF-8):  用於管理 ext2 檔案系統的工具程式。
 Name:          e2fsprogs
-Version:       1.41.12
+Version:       1.41.13
 Release:       1
 License:       GPL v2 (with LGPL v2 and BSD parts)
 Group:         Applications/System
 Source0:       http://downloads.sourceforge.net/e2fsprogs/%{name}-%{version}.tar.gz
-# Source0-md5: 1b24a21fc0c2381ef420961cbfec733f
+# Source0-md5: 7508a192c7a9471e2128424f4eafac1c
 Source1:       e2compr-0.4.texinfo.gz
 # Source1-md5: c3c59ff37e49d8759abb1ef95a8d3abf
 Source2:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
@@ -67,7 +67,7 @@ BuildRequires:        glibc-static
 BuildRequires: uClibc-static >= 2:0.9.29
        %else
                %if %{with dietlibc}
-BuildRequires: dietlibc-static
+BuildRequires: dietlibc-static >= 2:0.32-9
 BuildRequires: libblkid-dietlibc
 BuildRequires: libuuid-dietlibc
                %else