From 8a97690513870c53fb460601fa66998cf66ba6fb Mon Sep 17 00:00:00 2001 From: Thomas Woerner Date: Thu, 6 Jul 2006 20:54:40 +0000 Subject: [PATCH] [tw] - new version 1.39 - dropped ext2online, because resize2fs is now able to do online resize - spec file cleanup - enabled checks for build --- .cvsignore | 5 +- e2fsprogs-1.39-blkid-devmapper.patch | 88 ++++++++++++++++++ e2fsprogs-1.39-close-on-error.patch | 28 ++++++ e2fsprogs.spec | 130 +++++---------------------- sources | 3 +- 5 files changed, 139 insertions(+), 115 deletions(-) create mode 100644 e2fsprogs-1.39-blkid-devmapper.patch create mode 100644 e2fsprogs-1.39-close-on-error.patch diff --git a/.cvsignore b/.cvsignore index 3626fda..ab4c9c5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,4 +1 @@ -e2fsprogs-1.36.tar.gz -ext2resize-1.1.17.tar.bz2 -e2fsprogs-1.37.tar.gz -e2fsprogs-1.38.tar.gz +e2fsprogs-1.39.tar.gz diff --git a/e2fsprogs-1.39-blkid-devmapper.patch b/e2fsprogs-1.39-blkid-devmapper.patch new file mode 100644 index 0000000..9406063 --- /dev/null +++ b/e2fsprogs-1.39-blkid-devmapper.patch @@ -0,0 +1,88 @@ +--- 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 @@ + AC_DEFINE(HAVE_DEVMAPPER) + echo "Enabling device-mapper support" + +- 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' +- ++ PKG_PROG_PKG_CONFIG() ++ ++ AC_CHECK_LIB(devmapper, dm_tree_create, ++ [DEVMAPPER_LIBS=`$PKG_CONFIG --libs devmapper`; ++ STATIC_DEVMAPPER_LIBS=`$PKG_CONFIG --static --libs devmapper`; ++ DEVMAPPER_REQ="devmapper"; ++ DEVMAPPER_PC_LIBS="-ldevmapper"], ++ [AC_MSG_ERROR([device-mapper library not found])], ++ [$DEVMAPPER_LIBS]) + fi] + , + echo "Disabling device-mapper support by default" diff --git a/e2fsprogs-1.39-close-on-error.patch b/e2fsprogs-1.39-close-on-error.patch new file mode 100644 index 0000000..33d2a06 --- /dev/null +++ b/e2fsprogs-1.39-close-on-error.patch @@ -0,0 +1,28 @@ +--- e2fsprogs-1.39/lib/ext2fs/getsize.c.close-on-error 2005-09-06 11:40:14.000000000 +0200 ++++ e2fsprogs-1.39/lib/ext2fs/getsize.c 2006-06-22 14:46:27.000000000 +0200 +@@ -169,8 +169,10 @@ + #ifdef DKIOCGETBLOCKCOUNT /* For Apple Darwin */ + if (ioctl(fd, DKIOCGETBLOCKCOUNT, &size64) >= 0) { + if ((sizeof(*retblocks) < sizeof(unsigned long long)) +- && ((size64 / (blocksize / 512)) > 0xFFFFFFFF)) +- return EFBIG; ++ && ((size64 / (blocksize / 512)) > 0xFFFFFFFF)) { ++ rc = EFBIG; ++ goto out; ++ } + *retblocks = size64 / (blocksize / 512); + goto out; + } +@@ -275,8 +277,10 @@ + valid_offset (fd, 0); + size64 = low + 1; + if ((sizeof(*retblocks) < sizeof(unsigned long long)) +- && ((size64 / blocksize) > 0xFFFFFFFF)) +- return EFBIG; ++ && ((size64 / blocksize) > 0xFFFFFFFF)) { ++ rc = EFBIG; ++ goto out; ++ } + *retblocks = size64 / blocksize; + out: + close(fd); diff --git a/e2fsprogs.spec b/e2fsprogs.spec index 00477b5..8b18676 100644 --- a/e2fsprogs.spec +++ b/e2fsprogs.spec @@ -3,43 +3,23 @@ Summary: Utilities for managing the second extended (ext2) filesystem. Name: e2fsprogs -Version: 1.38 -Release: 15 +Version: 1.39 +Release: 1 License: GPL Group: System Environment/Base Source: ftp://download.sourceforge.net/pub/sourceforge/e2fsprogs/e2fsprogs-%{version}.tar.gz -Source1: http://sourceforge.net/projects/ext2resize/ext2resize-1.1.17.tar.bz2 -Patch9: e2fsprogs-enable-resize.patch -Patch10: ext2resize-cvs-20040419.patch -Patch11: ext2resize-gcc34-fixes.patch -Patch12: ext2resize-printf-format-fixes.patch -Patch13: ext2resize-compiler-warning-fixes.patch -Patch14: ext2resize-canonicalise.patch -Patch19: ext2resize-byteorder.patch -Patch20: ext2resize-nofallback.patch -Patch21: ext2resize-nowrite.patch -Patch22: ext2resize-fixbuild.patch -Patch26: e2fsprogs-1.37-blkid-swsuspend.patch -Patch27: e2fsprogs-1.37-blkid-ext23.patch -Patch28: e2fsprogs-1.37-blkid-nomagicvfat.patch -Patch29: e2fsprogs-1.38-close-on-error.patch +Patch29: e2fsprogs-1.39-close-on-error.patch Patch30: e2fsprogs-1.38-resize-inode.patch -Patch31: e2fsprogs-1.38-man_no_ext2resize.patch Patch32: e2fsprogs-1.38-no_pottcdate.patch -Patch33: e2fsprogs-1.38-lost+found.patch -Patch34: e2fsprogs-1.38-blkid-devmapper.patch -Patch35: e2fsprogs-1.38-blkid-epoch.patch +Patch34: e2fsprogs-1.39-blkid-devmapper.patch Patch36: e2fsprogs-1.38-etcblkid.patch Url: http://e2fsprogs.sourceforge.net/ -BuildRoot: %{_tmppath}/%{name}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: e2fsprogs-libs = %{version}-%{release}, device-mapper BuildRequires: gettext, texinfo, autoconf, automake, libselinux-devel BuildRequires: libsepol-devel, gettext-devel, pkgconfig BuildRequires: device-mapper >= 1.02.02-3 -%define ext2resize_basever 1.1.17 -%define ext2resize_name ext2resize-%{ext2resize_basever} - %description The e2fsprogs package contains a number of utilities for creating, checking, modifying, and correcting any inconsistencies in second @@ -78,56 +58,14 @@ also want to install e2fsprogs. %prep %setup -q -n e2fsprogs-%{version} -# Enable the resize inode by default -%patch9 -p1 -b .resize-on -# fix swsuspend partition detection (#165863) -%patch26 -p1 -b .swsuspend -# fix revalidate from ext2 to ext3 (#162927) -%patch27 -p1 -b .ext23 -# fix vfat without magic detection (#161873) -%patch28 -p1 -b .vfatnomagic -# clode fd's on error +# close fd's on error %patch29 -p1 -b .close-on-error # enable tune2fs to set and clear the resize inode %patch30 -p1 -b .resize-inode - -# Now unpack the ext2resize online resize tarball... -%setup -T -D -q -a 1 -# And apply the patches we need for that: -pushd %{ext2resize_name} -# Update to 20040419 ext2resize CVS -%patch10 -p1 -b .cvs -# Fix for gcc34 incompatibilities -%patch11 -p1 -b .gcc34 -# Fix printk warnings on 64-bit archs -%patch12 -p1 -b .printf -# Fix misc compiler warnings -%patch13 -p1 -b .warnings -# Canonicalise device names to cope with (eg) LVM symlinks -%patch14 -p1 -b .canon -# Fix byte ordering problems on bigendian hosts -%patch19 -p2 -b .byteorder -# Disable fallback to old-style online resize -%patch20 -p2 -b .nofallback -# Disable the write path used by old-style online -%patch21 -p2 -b .nowrite -# Use the kernel prototypes, as they don't cause errors -%patch22 -p1 -b .fixbuild -popd - -# drop ext2resize, ext2prepare and e2fsadm from man page of ext2online -%patch31 -p1 -b .man_no_ext2resize # drop timestamp from mo files %patch32 -p1 -b .pottcdate -# fixed buffer overflow in mklost+found -%patch33 -p1 -b .lost+found - # look at device mapper devices %patch34 -p1 -b .dm - -# disable blkid.tab caching if time is set before epoch -%patch35 -p1 -b .epoch - # put blkid.tab in /etc/blkid/ %patch36 -p1 -b .etcblkid @@ -135,48 +73,21 @@ popd aclocal autoconf %configure --enable-elf-shlibs --enable-nls --disable-e2initrd-helper --enable-blkid-devmapper --enable-blkid-selinux -# --enable-dynamic-e2fsck make -C po update-po make -pushd %{ext2resize_name} -# The byteorder patch adds a new file to the ext2online source tree, so -# we need to rebuild the Makefiles from automake. -aclocal -automake -a -f -# There's a new configure test for byte-order, too. -autoconf -%configure -make -popd - %install -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} export PATH=/sbin:$PATH -make install install-libs DESTDIR="$RPM_BUILD_ROOT" \ +make install install-libs DESTDIR="%{buildroot}" \ root_sbindir=%{_root_sbindir} root_libdir=%{_root_libdir} -/sbin/ldconfig -n ${RPM_BUILD_ROOT}%{_libdir} %find_lang %{name} -pushd %{ext2resize_name} -make DESTDIR=$RPM_BUILD_ROOT install -# For now, we only want to package up the ext2online binary. Delete the -# others. -rm -f $RPM_BUILD_ROOT%{_sbindir}/ext2resize -rm -f $RPM_BUILD_ROOT%{_sbindir}/ext2prepare -rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/ext2resize* -rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/ext2prepare* -# We want some of the ext2resize doc files to be clearly identified as -# not being part of e2fsprogs! -mv AUTHORS AUTHORS.ext2resize -mv COPYING COPYING.ext2resize -mv NEWS NEWS.ext2resize -mv README README.ext2resize -mv doc/HOWTO doc/HOWTO.ext2resize -popd +%check +make check %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %post [ -e /etc/blkid.tab ] && mv /etc/blkid.tab /etc/blkid/blkid.tab || : @@ -201,13 +112,9 @@ exit 0 %files -f %{name}.lang %defattr(-,root,root) %doc README RELEASE-NOTES -%doc %{ext2resize_name}/AUTHORS.ext2resize -%doc %{ext2resize_name}/COPYING.ext2resize -%doc %{ext2resize_name}/NEWS.ext2resize -%doc %{ext2resize_name}/README.ext2resize -%doc %{ext2resize_name}/doc/HOWTO.ext2resize %dir /etc/blkid +%config(noreplace) /etc/mke2fs.conf %{_root_sbindir}/badblocks %{_root_sbindir}/blkid %{_root_sbindir}/debugfs @@ -235,6 +142,9 @@ exit 0 %{_mandir}/man1/lsattr.1* %{_mandir}/man1/uuidgen.1* +%{_mandir}/man5/e2fsck.conf.5* +%{_mandir}/man5/mke2fs.conf.5* + %{_mandir}/man8/badblocks.8* %{_mandir}/man8/blkid.8* %{_mandir}/man8/debugfs.8* @@ -255,10 +165,6 @@ exit 0 %{_mandir}/man8/resize2fs.8* %{_mandir}/man8/tune2fs.8* -# ext2resize files -%{_sbindir}/ext2online -%{_mandir}/man8/ext2online.8* - %files libs %defattr(-,root,root) %{_root_libdir}/libblkid.so.* @@ -313,6 +219,12 @@ exit 0 %{_mandir}/man3/uuid_unparse.3* %changelog +* Thu Jul 6 2006 Thomas Woerner - 1.39-1 +- new version 1.39 +- dropped ext2online, because resize2fs is now able to do online resize +- spec file cleanup +- enabled checks for build + * Tue Jun 13 2006 Bill Nottingham - 1.38-15 - prevent libblkid returning /dev/dm-X - fix build diff --git a/sources b/sources index 01060ca..3ee21d5 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -439bf19d6520194ca42b942f5b7a0703 ext2resize-1.1.17.tar.bz2 -d774d4412bfb80d12cf3a4fdfd59de5a e2fsprogs-1.38.tar.gz +06f7806782e357797fad1d34b7ced0c6 e2fsprogs-1.39.tar.gz