Author: arekm Date: Sun May 27 21:18:13 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 1.42.2 but unfortunately doesn't build with initrd
---- Files affected:
packages/e2fsprogs:
e2fsprogs-diet.patch (1.10 -> 1.11) , e2fsprogs.spec (1.241 -> 1.242)
---- Diffs:
================================================================
Index: packages/e2fsprogs/e2fsprogs-diet.patch
diff -u packages/e2fsprogs/e2fsprogs-diet.patch:1.10
packages/e2fsprogs/e2fsprogs-diet.patch:1.11
--- packages/e2fsprogs/e2fsprogs-diet.patch:1.10 Wed Dec 15 18:45:26 2010
+++ packages/e2fsprogs/e2fsprogs-diet.patch Sun May 27 23:18:07 2012
@@ -18,36 +18,33 @@
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 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
-diff -ur e2fsprogs-1.41.3/misc/util.c e2fsprogs-1.41.3-diet/misc/util.c
---- e2fsprogs-1.41.3/misc/util.c 2008-10-07 16:22:39.000000000 +0200
-+++ e2fsprogs-1.41.3-diet/misc/util.c 2009-03-17 22:01:31.000000000 +0100
-@@ -79,7 +79,7 @@
- void check_plausibility(const char *device)
+@@ -988,6 +988,7 @@
+ setresgid
+ setresuid
+ srandom
++ stat64
+ strcasecmp
+ strdup
+ strnlen
+--- e2fsprogs-1.42.2/lib/ext2fs/unix_io.c~ 2012-03-18 19:18:33.000000000
+0100
++++ e2fsprogs-1.42.2/lib/ext2fs/unix_io.c 2012-03-30 18:55:04.613560295
+0200
+@@ -888,7 +888,7 @@
+ unsigned long long count)
{
- int val;
--#ifdef HAVE_OPEN64
-+#ifdef HAVE_STAT64
- struct stat64 s;
+ struct unix_private_data *data;
+- __uint64_t range[2];
++ u_int64_t range[2];
+ int ret;
- val = stat64(device, &s);
-
---- 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 @@
- int ret;
- int blocksize;
- __u64 blocks;
-- __uint64_t range[2];
-+ uint64_t range[2];
+ EXT2_CHECK_MAGIC(channel, EXT2_ET_MAGIC_IO_CHANNEL);
+@@ -897,8 +897,8 @@
- blocks = fs->super->s_blocks_count;
- blocksize = EXT2_BLOCK_SIZE(fs->super);
+ if (channel->flags & CHANNEL_FLAGS_BLOCK_DEVICE) {
+ #ifdef BLKDISCARD
+- range[0] = (__uint64_t)(block) * channel->block_size;
+- range[1] = (__uint64_t)(count) * channel->block_size;
++ range[0] = (u_int64_t)(block) * channel->block_size;
++ range[1] = (u_int64_t)(count) * channel->block_size;
+
+ ret = ioctl(data->dev, BLKDISCARD, &range);
+ #else
================================================================
Index: packages/e2fsprogs/e2fsprogs.spec
diff -u packages/e2fsprogs/e2fsprogs.spec:1.241
packages/e2fsprogs/e2fsprogs.spec:1.242
--- packages/e2fsprogs/e2fsprogs.spec:1.241 Wed Jan 18 13:50:54 2012
+++ packages/e2fsprogs/e2fsprogs.spec Sun May 27 23:18:07 2012
@@ -48,12 +48,12 @@
Summary(zh_CN.UTF-8): 管理第二扩展（ext2）文件系统的工具。
Summary(zh_TW.UTF-8): 用於管理 ext2 檔案系統的工具程式。
Name: e2fsprogs
-Version: 1.41.14
-Release: 4
+Version: 1.42.2
+Release: 0.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: 05f70470aea2ef7efbb0845b2b116720
+# Source0-md5: 04f4561a54ad0419248316a00c016baa
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
@@ -798,6 +798,7 @@
%attr(755,root,root) /sbin/e2image
%attr(755,root,root) /sbin/e2label
%attr(755,root,root) /sbin/e2undo
+%attr(755,root,root) /sbin/e4defrag
%attr(755,root,root) /sbin/fsck.ext2
%attr(755,root,root) /sbin/fsck.ext3
%attr(755,root,root) /sbin/fsck.ext4
@@ -830,6 +831,7 @@
%{_mandir}/man8/e2image.8*
%{_mandir}/man8/e2label.8*
%{_mandir}/man8/e2undo.8*
+%{_mandir}/man8/e4defrag.8*
%{_mandir}/man8/filefrag.8*
%{_mandir}/man8/fsck.ext2.8*
%{_mandir}/man8/fsck.ext3.8*
@@ -1018,6 +1020,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.242 2012/05/27 21:18:07 arekm
+- up to 1.42.2 but unfortunately doesn't build with initrd
+
Revision 1.241 2012/01/18 12:50:54 glen
- release 4
================================================================
---- CVS-web:
http://cvs.pld-linux.org/packages/e2fsprogs/e2fsprogs-diet.patch?r1=1.10&r2=1.11
http://cvs.pld-linux.org/packages/e2fsprogs/e2fsprogs.spec?r1=1.241&r2=1.242
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
