-diff -Nur e2fsprogs-1.22.orig/doc/e2compr.texinfo e2fsprogs-1.22/doc/e2compr.texinfo
---- e2fsprogs-1.22.orig/doc/e2compr.texinfo Sat Aug 4 19:09:19 2001
-+++ e2fsprogs-1.22/doc/e2compr.texinfo Sat Aug 4 19:11:36 2001
-@@ -24,9 +24,8 @@
+--- e2fsprogs-1.42.12/doc/e2compr.texinfo.orig 2014-10-24 16:56:18.270058857 +0200
++++ e2fsprogs-1.42.12/doc/e2compr.texinfo 2014-10-24 18:30:24.926488556 +0200
+@@ -24,11 +24,10 @@
@c %**end of header
@c What to put in info directory (e.g. /usr/info/dir).
+* e2bitmap: (e2compr)e2bitmap. Display which clusters are compressed
+* e2ratio: (e2compr)e2ratio. Ext2 compression statistics
@end direntry
+ @c :vers: Grab the stuff about e2compress from an old manual,
+ @c once it is ready for 0.4. Also get the direntry stuff for it.
+@@ -986,8 +985,7 @@
+ @c Should be both unindented and in fixed-width font.
+ @c How do I do this?
+ @c `@format' is suitable for info.
+-@t{
+-@format
++@verbatim
+ ch+ du tar (read) ch- cs alg
+ ~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~ ~~ ~~~~~
+ 0.16u 203.9s 3:51 2257 0.16u 0.84s 0.59u 93.88s 1:49 0.17u 20.09s 0:36 32 gzip9
+@@ -1039,8 +1037,7 @@
+ 0.19u 32.3s 1:10 3965 0.16u 0.71s 0.64u 17.71s 0:40 0.21u 16.35s 0:58 04 lzrw3a
+
+ 0.17u 19.3s 1:00 4025 0.11u 0.74s 0.66u 10.36s 0:34 0.26u 9.33s 0:45 04 lzv1
+-@end format
+-}
++@end verbatim
+
+ @c ------------------------------------------------------------------
+ @node none, future methods, Compression choices, Algorithms
+@@ -1340,7 +1337,7 @@
+ are) tend to have a high turnover of files (deleting files to make way
+ for new files, which have to be written in the cracks occupied by the
+ files just deleted), which causes high fragmentation.
+-@xref{defragmenter} for comments on using a defragmenter.
++For comments on using a defragmenter, @pxref{defragmenter}.
+
+
+ @c ------------------------------------------------------------------
---- 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
-@@ -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)
- {
- struct unix_private_data *data;
-- __uint64_t range[2];
-+ u_int64_t range[2];
- int ret;
-
- EXT2_CHECK_MAGIC(channel, EXT2_ET_MAGIC_IO_CHANNEL);
-@@ -897,8 +897,8 @@
-
- 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
+--- e2fsprogs-1.42.12/configure.in.orig 2014-10-24 16:44:31.846755169 +0200
++++ e2fsprogs-1.42.12/configure.in 2014-10-24 16:51:58.003403107 +0200
+@@ -69,7 +69,6 @@
+ WITH_DIET_LIBC=
+ AC_ARG_WITH([diet-libc],
+ [ --with-diet-libc use diet libc],
+-CC="diet cc -nostdinc"
+ WITH_DIET_LIBC=yes
+ if test -z "$LIBS"
+ then
Summary(zh_CN.UTF-8): 管理第二扩展（ext2）文件系统的工具。
Summary(zh_TW.UTF-8): 用於管理 ext2 檔案系統的工具程式。
Name: e2fsprogs
-Version: 1.42.6
+Version: 1.42.12
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: 9e444c240c1001b3292d108fbad0f49c
+# Source0-md5: 68255f51be017a93f2f6402fab06c2bf
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
Patch2: %{name}-498381.patch
Patch3: %{name}-diet.patch
URL: http://e2fsprogs.sourceforge.net/
-BuildRequires: autoconf >= 2.50
+BuildRequires: autoconf >= 2.54
BuildRequires: automake
BuildRequires: gettext-devel >= 0.11
BuildRequires: libblkid-devel
%patch2 -p1
%patch3 -p1
-sed -i -e '/AC_SUBST(DO_TEST_SUITE/a\MKINSTALLDIRS="install -d"\nAC_SUBST(MKINSTALLDIRS)\n' configure.in
-
-# AX_TLS
-tail -n +2604 aclocal.m4 > acinclude.m4
-
%build
cp -f /usr/share/automake/config.sub .
-%{__gettextize}
%{__aclocal}
%{__autoconf}
%if %{with initrd}
-%if %{with dietlibc}
-# needed for syscall()
-cp -a MCONFIG.in MCONFIG.in.org
-sed -i -e 's|\(^LIBUUID = .*\)|\1 -lcompat|g' \
- -e 's|\(^STATIC_LIBUUID = .*\)|\1 -lcompat|g' MCONFIG.in
-%endif
%configure \
ac_cv_lib_dl_dlopen=no \
%{?with_uClibc:CC="%{_target_cpu}-uclibc-gcc"} \
%{?with_dietlibc:CC="diet %{__cc}"} \
CFLAGS="%{rpmcflags} -Os" \
LDFLAGS="%{rpmldflags} -static" \
-%if %{with dietlibc}
- LIBUUID_LIBADD="-lcompat" \
- LIBBLKID_LIBADD="-luuid -lcompat" \
-%else
- LIBBLKID_LIBADD="-luuid" \
-%endif
--disable-elf-shlibs \
--disable-fsck \
--disable-libblkid \
V=1
mv -f misc/mke2fs initrd-mke2fs
%{__make} clean
-%{?with_dietlibc:mv MCONFIG.in.org MCONFIG.in}
%endif
%configure \
--disable-uuidd \
--enable-compression \
%{!?with_allstatic:--enable-elf-shlibs} \
- --enable-htree
+ --enable-htree \
+ --enable-quota
%{__make} -j1 libs \
LDFLAGS="%{rpmldflags}" \
%{_mandir}/man1/chattr.1*
%{_mandir}/man1/lsattr.1*
%{_mandir}/man5/e2fsck.conf.5*
+%{_mandir}/man5/ext2.5*
+%{_mandir}/man5/ext3.5*
+%{_mandir}/man5/ext4.5*
%{_mandir}/man5/mke2fs.conf.5*
%{_mandir}/man8/badblocks.8*
%{_mandir}/man8/debugfs.8*
%defattr(644,root,root,755)
%{_libdir}/libss.a
+%if 0
+# was installed in >= 1.42.2, since 1.42.12 is private only
%files -n libquota-devel
%defattr(644,root,root,755)
%{_libdir}/libquota.a
%{_includedir}/quota
%{_pkgconfigdir}/quota.pc
+%endif
%if %{with initrd}
%files initrd
projects / packages / e2fsprogs.git / commitdiff