* Tue Jul 17 2007 Eric Sandeen <esandeen@redhat.com> 1.40.2-1
- New version 1.40.2 - Fix up warning in badblocks
This commit is contained in:
Eric Sandeen
parent
1a15738bde
commit
f535445610
|
|
@ -1 +1 @@
|
|||
e2fsprogs-1.39.tar.gz
|
||||
e2fsprogs-1.40.2.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,68 +1,3 @@
|
|||
--- e2fsprogs-1.39/debugfs/Makefile.in.dm 2005-09-06 05:40:13.000000000 -0400
|
||||
+++ e2fsprogs-1.39/debugfs/Makefile.in 2006-07-06 14:11:32.000000000 -0400
|
||||
@@ -27,7 +27,7 @@
|
||||
|
||||
LIBS= $(LIBEXT2FS) $(LIBE2P) $(LIBSS) $(LIBCOM_ERR) $(LIBBLKID) \
|
||||
$(LIBUUID) $(DLOPEN_LIB)
|
||||
-DEPLIBS= $(LIBEXT2FS) $(LIBE2P) $(LIBSS) $(LIBCOM_ERR) $(LIBBLKID) $(DEPLIBUUID)
|
||||
+DEPLIBS= $(LIBEXT2FS) $(LIBE2P) $(LIBSS) $(LIBCOM_ERR) $(DEPLIBBLKID) $(DEPLIBUUID)
|
||||
|
||||
.c.o:
|
||||
@echo " CC $<"
|
||||
--- e2fsprogs-1.39/MCONFIG.in.dm 2006-03-22 20:19:19.000000000 -0500
|
||||
+++ e2fsprogs-1.39/MCONFIG.in 2006-07-06 14:11:32.000000000 -0400
|
||||
@@ -79,6 +79,7 @@
|
||||
LIBBLKID = $(LIB)/libblkid@LIB_EXT@ $(DEVMAPPER_LIBS)
|
||||
LIBINTL = @LIBINTL@
|
||||
DEPLIBUUID = $(LIB)/libuuid@LIB_EXT@
|
||||
+DEPLIBBLKID = $(LIB)/libblkid@LIB_EXT@
|
||||
|
||||
STATIC_LIBSS = $(LIB)/libss@STATIC_LIB_EXT@
|
||||
STATIC_LIBCOM_ERR = $(LIB)/libcom_err@STATIC_LIB_EXT@
|
||||
@@ -87,6 +88,7 @@
|
||||
STATIC_LIBUUID = $(LIB)/libuuid@STATIC_LIB_EXT@ @SOCKET_LIB@
|
||||
STATIC_LIBBLKID = $(LIB)/libblkid@STATIC_LIB_EXT@ $(STATIC_DEVMAPPER_LIBS)
|
||||
DEPSTATIC_LIBUUID = $(LIB)/libuuid@STATIC_LIB_EXT@
|
||||
+DEPSTATIC_LIBBLKID = $(LIB)/libblkid@STATIC_LIB_EXT@
|
||||
|
||||
PROFILED_LIBSS = $(LIB)/libss@PROFILED_LIB_EXT@
|
||||
PROFILED_LIBCOM_ERR = $(LIB)/libcom_err@PROFILED_LIB_EXT@
|
||||
--- e2fsprogs-1.39/misc/Makefile.in.dm 2006-07-06 14:13:57.000000000 -0400
|
||||
+++ e2fsprogs-1.39/misc/Makefile.in 2006-07-06 14:14:27.000000000 -0400
|
||||
@@ -55,7 +55,7 @@
|
||||
STATIC_DEPLIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR)
|
||||
|
||||
LIBS_BLKID= $(LIBBLKID) $(LIBUUID)
|
||||
-DEPLIBS_BLKID= $(LIBBLKID) $(DEPLIBUUID)
|
||||
+DEPLIBS_BLKID= $(DEPLIBBLKID) $(DEPLIBUUID)
|
||||
|
||||
LIBS_E2P= $(LIBE2P) $(LIBCOM_ERR)
|
||||
DEPLIBS_E2P= $(LIBE2P) $(LIBCOM_ERR)
|
||||
--- e2fsprogs-1.39/e2fsck/Makefile.in.dm 2006-03-27 00:44:11.000000000 -0500
|
||||
+++ e2fsprogs-1.39/e2fsck/Makefile.in 2006-07-06 14:11:32.000000000 -0400
|
||||
@@ -18,11 +18,11 @@
|
||||
XTRA_CFLAGS= -DRESOURCE_TRACK -I.
|
||||
|
||||
LIBS= $(LIBEXT2FS) $(LIBCOM_ERR) $(LIBBLKID) $(LIBUUID) $(LIBINTL)
|
||||
-DEPLIBS= $(LIBEXT2FS) $(LIBCOM_ERR) $(LIBBLKID) $(DEPLIBUUID)
|
||||
+DEPLIBS= $(LIBEXT2FS) $(LIBCOM_ERR) $(DEPLIBBLKID) $(DEPLIBUUID)
|
||||
|
||||
STATIC_LIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) $(STATIC_LIBBLKID) \
|
||||
$(STATIC_LIBUUID) $(LIBINTL)
|
||||
-STATIC_DEPLIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) $(STATIC_LIBBLKID) \
|
||||
+STATIC_DEPLIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) $(DEPSTATIC_LIBBLKID) \
|
||||
$(DEPSTATIC_LIBUUID)
|
||||
|
||||
PROFILED_LIBS= $(PROFILED_LIBEXT2FS) $(PROFILED_LIBCOM_ERR) \
|
||||
@@ -119,7 +119,7 @@
|
||||
e2fsck.static: $(OBJS) $(STATIC_DEPLIBS)
|
||||
@echo " LD $@"
|
||||
@$(LD) $(ALL_LDFLAGS) $(LDFLAG_STATIC) -o e2fsck.static $(OBJS) \
|
||||
- $(STATIC_LIBS)
|
||||
+ $(STATIC_LIBS)
|
||||
|
||||
e2fsck.shared: $(OBJS) $(DEPLIBS)
|
||||
@echo " LD $@"
|
||||
--- e2fsprogs-1.39/configure.in.dm 2006-04-08 21:36:21.000000000 -0400
|
||||
+++ e2fsprogs-1.39/configure.in 2006-07-06 14:11:32.000000000 -0400
|
||||
@@ -494,11 +494,15 @@
|
||||
|
|
@ -71,8 +6,8 @@
|
|||
|
||||
- DEVMAPPER_REQ='libselinux libsepol'
|
||||
- DEVMAPPER_PC_LIBS='-ldevmapper'
|
||||
- DEVMAPPER_LIBS='-ldevmapper -lselinux -lsepol'
|
||||
- STATIC_DEVMAPPER_LIBS='/usr/lib/libdevmapper.a /usr/lib/libselinux.a /usr/lib/libsepol.a'
|
||||
- DEVMAPPER_LIBS='-ldevmapper -lselinux -lsepol -lpthread'
|
||||
- STATIC_DEVMAPPER_LIBS='/usr/lib/libdevmapper.a /usr/lib/libselinux.a /usr/lib/libsepol.a -lpthread'
|
||||
-
|
||||
+ PKG_PROG_PKG_CONFIG()
|
||||
+
|
||||
|
|
|
|||
|
|
@ -0,0 +1,22 @@
|
|||
Index: e2fsprogs-1.40.2/misc/badblocks.c
|
||||
===================================================================
|
||||
--- e2fsprogs-1.40.2.orig/misc/badblocks.c
|
||||
+++ e2fsprogs-1.40.2/misc/badblocks.c
|
||||
@@ -992,7 +992,7 @@ int main (int argc, char ** argv)
|
||||
last_block = strtoul (argv[optind], &tmp, 0);
|
||||
printf("last_block = %d (%s)\n", last_block, argv[optind]);
|
||||
if (*tmp || errno ||
|
||||
- (last_block == ULONG_MAX && errno == ERANGE)) {
|
||||
+ (last_block == UINT_MAX && errno == ERANGE)) {
|
||||
com_err (program_name, 0, _("invalid blocks count - %s"),
|
||||
argv[optind]);
|
||||
exit (1);
|
||||
@@ -1005,7 +1005,7 @@ int main (int argc, char ** argv)
|
||||
from_count = strtoul (argv[optind], &tmp, 0);
|
||||
printf("from_count = %d\n", from_count);
|
||||
if (*tmp || errno ||
|
||||
- (from_count == ULONG_MAX && errno == ERANGE)) {
|
||||
+ (from_count == UINT_MAX && errno == ERANGE)) {
|
||||
com_err (program_name, 0, _("invalid starting block - %s"),
|
||||
argv[optind]);
|
||||
exit (1);
|
||||
|
|
@ -3,42 +3,18 @@
|
|||
|
||||
Summary: Utilities for managing the second and third extended (ext2/ext3) filesystems
|
||||
Name: e2fsprogs
|
||||
Version: 1.39
|
||||
Release: 15%{?dist}
|
||||
Version: 1.40.2
|
||||
Release: 1%{?dist}
|
||||
License: GPL
|
||||
Group: System Environment/Base
|
||||
Source: ftp://download.sourceforge.net/pub/sourceforge/e2fsprogs/e2fsprogs-%{version}.tar.gz
|
||||
Patch29: e2fsprogs-1.39-close-on-error.patch
|
||||
Patch30: e2fsprogs-1.38-resize-inode.patch
|
||||
Patch32: e2fsprogs-1.38-no_pottcdate.patch
|
||||
Patch34: e2fsprogs-1.39-blkid-devmapper.patch
|
||||
Patch36: e2fsprogs-1.38-etcblkid.patch
|
||||
Patch37: e2fsprogs-1.39-blkid-gfs.patch
|
||||
Patch38: e2fsprogs-1.39-blkid-devname.patch
|
||||
Patch39: e2fsprogs-1.39-multilib.patch
|
||||
Patch40: e2fsprogs-1.39-leak.patch
|
||||
Patch41: e2fsprogs-1.39-blkid-fatlabel.patch
|
||||
Patch50: e2fsprogs-1.39-ext2fs_div_ceil.patch
|
||||
Patch51: e2fsprogs-1.39-fix-loop-wraps.patch
|
||||
Patch52: e2fsprogs-1.39-e2p_percent.patch
|
||||
Patch53: e2fsprogs-1.39-group_desc_loops.patch
|
||||
Patch54: e2fsprogs-1.39-unused_group_blocks.patch
|
||||
Patch55: e2fsprogs-1.39-fix_formats.patch
|
||||
Patch56: e2fsprogs-1.39-group_block_inlines.patch
|
||||
Patch57: e2fsprogs-1.39-32_bit_inodes.patch
|
||||
Patch58: e2fsprogs-1.39-more_rounding_overflows.patch
|
||||
Patch59: e2fsprogs-1.39-large_file_size.patch
|
||||
Patch60: e2fsprogs-1.39-e2p_percent_div.patch
|
||||
Patch61: e2fsprogs-1.39-uuid.patch
|
||||
Patch62: e2fsprogs-1.39-mkinstalldirs.patch
|
||||
Patch63: e2fsprogs-1.39-LUKS-blkid.patch
|
||||
Patch64: e2fsprogs-1.39-coverity.patch
|
||||
Patch65: e2fsprogs-1.39-dump_unused-segfault.patch
|
||||
Patch66: e2fsprogs-1.39-lsdel-segfault.patch
|
||||
Patch67: e2fsprogs-1.39-logdump-symlinks.patch
|
||||
Patch68: e2fsprogs-1.39-save-backup-sbs.patch
|
||||
Patch69: e2fsprogs-1.39-symlink-byteswap.patch
|
||||
Patch70: e2fsprogs-1.39-xattr-sanity.patch
|
||||
Patch63: e2fsprogs-1.40.2-warning-fixes.patch
|
||||
Url: http://e2fsprogs.sourceforge.net/
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
Requires: e2fsprogs-libs = %{version}-%{release}, device-mapper
|
||||
|
|
@ -87,55 +63,20 @@ also want to install e2fsprogs.
|
|||
|
||||
%prep
|
||||
%setup -q -n e2fsprogs-%{version}
|
||||
# close fd's on error
|
||||
%patch29 -p1 -b .close-on-error
|
||||
# enable tune2fs to set and clear the resize inode
|
||||
# enable tune2fs to set and clear the resize inode (#167816)
|
||||
%patch30 -p1 -b .resize-inode
|
||||
# drop timestamp from mo files
|
||||
# drop timestamp from mo files (#168815/168814/245653)
|
||||
%patch32 -p1 -b .pottcdate
|
||||
# look at device mapper devices
|
||||
%patch34 -p1 -b .dm
|
||||
# put blkid.tab in /etc/blkid/
|
||||
%patch36 -p1 -b .etcblkid
|
||||
# GFS/GFS2 detection
|
||||
%patch37 -p1 -b .gfs
|
||||
# Fix device mapper names in blkid
|
||||
%patch38 -p1 -b .devname
|
||||
# Fix multilib conflicts
|
||||
# Fix multilib conflicts (#192665)
|
||||
%patch39 -p1 -b .multilib
|
||||
# Fix probing from leaking memory in error cases.
|
||||
%patch40 -p1 -b .leak
|
||||
# Fix poblem with empty FAT label.
|
||||
%patch41 -p1 -b .fatlabel
|
||||
# 32-bit 16T fixups
|
||||
%patch50 -p1 -b .ext2fs_div_ceil
|
||||
%patch51 -p1 -b .fix-loop-wraps
|
||||
%patch52 -p1 -b .e2p_percent
|
||||
%patch53 -p1 -b .group_desc_loops
|
||||
%patch54 -p1 -b .unused_group_blocks
|
||||
%patch55 -p1 -b .fix_formats
|
||||
%patch56 -p1 -b .group_block_inlines
|
||||
%patch57 -p1 -b .32_bit_inodes
|
||||
%patch58 -p1 -b .more_rounding_overflows
|
||||
%patch59 -p1 -b .large_file_size
|
||||
%patch60 -p1 -b .e2p_percent_div
|
||||
%patch61 -p1 -b .uuid
|
||||
# Fix for newer autoconf (#220715)
|
||||
%patch62 -p1 -b .mkinstalldirs
|
||||
# Teach blkid about luks
|
||||
%patch63 -p1 -b .LUKS
|
||||
# Fix many coverity-found leaks etc
|
||||
%patch64 -p1 -b .coverity
|
||||
# A couple of segfaults in debugfs if no fs is open
|
||||
%patch65 -p1 -b .dump_unused
|
||||
%patch66 -p1 -b .lsdel
|
||||
# Avoid recursive loops due to symlinks in /dev
|
||||
%patch67 -p1 -b .dev-symlinks
|
||||
# Don't write changes to the backup superblocks by default
|
||||
%patch68 -p1 -b .backup-sbs
|
||||
# Correct byteswapping for fast symlinks with xattrs
|
||||
%patch69 -p1 -b .symlink-byteswap
|
||||
# e2fsck: added sanity check for xattr validation
|
||||
%patch70 -p1 -b .xattr-sanity
|
||||
# Fix type warning in badblocks
|
||||
%patch63 -p1 -b .warnings
|
||||
%build
|
||||
aclocal
|
||||
autoconf
|
||||
|
|
@ -286,6 +227,10 @@ exit 0
|
|||
%{_mandir}/man3/uuid_unparse.3*
|
||||
|
||||
%changelog
|
||||
* Tue Jul 17 2007 Eric Sandeen <esandeen@redhat.com> 1.40.2-1
|
||||
- New version 1.40.2
|
||||
- Fix up warning in badblocks
|
||||
|
||||
* Mon Jun 25 2007 Eric Sandeen <esandeen@redhat.com> 1.39-15
|
||||
- Fix up .po files to remove timestamps; multilib issues (#245653)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue