[SSI] openssi/specs e2fsprogs.spec,1.1.15.1,1.1.15.2

Update of /cvsroot/ssic-linux/openssi/specs
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv8770

Modified Files:
      Tag: CENTOS
	e2fsprogs.spec 
Log Message:
from e2fsprogs-1.35-12.24.el4.src.rpm


Index: e2fsprogs.spec
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/specs/e2fsprogs.spec,v
retrieving revision 1.1.15.1
retrieving revision 1.1.15.2
diff -u -d -r1.1.15.1 -r1.1.15.2
--- e2fsprogs.spec	5 Jul 2010 01:04:40 -0000	1.1.15.1
+++ e2fsprogs.spec	20 Jul 2010 03:14:08 -0000	1.1.15.2
@@ -4,12 +4,16 @@
 Summary: Utilities for managing the second extended (ext2) filesystem.
 Name: e2fsprogs
 Version: 1.35
-Release: 12.11.el4
+Release: 12.24.el4
 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
 Source2: tests_f_bad_disconnected_inode_image.gz
+Source3: ext2_types-wrapper.h
+Source4: blkid_types-wrapper.h
+Source5: uuid_types-wrapper.h
+Source6: uuidd.init
 Patch2: e2fsprogs-1.27-nostrip.patch
 Patch6: e2fsprogs-1.32-nosync.patch
 Patch7: e2fsprogs-1.35-next_check.patch
@@ -44,6 +48,17 @@
 Patch40: e2fsprogs-1.39-logdump-symlinks.patch
 Patch41: e2fsprogs-1.35-e2fsck_resize_inode.patch
 Patch42: ext2resize-only-ext3-online.patch
+Patch43: e2fsprogs-1.39-journal-block-check.patch
+Patch44: e2fsprogs-1.40.2-integer-overflows.patch
+Patch45: e2fsprogs-1.39-type-punning.patch
+Patch46: e2fsprogs-1.40-fsck-uninit.patch
+Patch47: e2fsprogs-1.40-replay-corruption.patch
+Patch48: e2fsprogs-1.40.4-uuidd.patch
+Patch49: e2fsprogs-1.35-swap-label.patch
+Patch50: e2fsprogs-1.35-fix-uuid-compile.patch
+Patch51: e2fsprogs-1.35-dirlimit.patch
+Patch52: ext2resize-multipath-fix.patch
+Patch53: e2fsprogs-tls-config-option.patch
 
 Url: http://e2fsprogs.sourceforge.net/
 Prereq: /sbin/ldconfig
@@ -81,6 +96,18 @@
 filesystem-specific programs. If you install e2fsprogs-devel, you'll
 also want to install e2fsprogs.
 
+%package -n uuidd
+Summary: helper daemon to guarantee uniqueness of time-based UUIDs
+Group: System Environment/Daemons
+Requires: e2fsprogs = %{version}-%{release}
+License: GPLv2
+Requires(pre): shadow-utils
+
+%description -n uuidd
+The uuidd package contains a userspace daemon (uuidd) which guarantees
+uniqueness of time-based UUID generation even at very high rates on
+SMP systems.
+
 %prep
 %setup -q -n e2fsprogs-1.35
 %patch2 -p1 -b .nostrip
@@ -117,6 +144,26 @@
 %patch40 -p1 -b .dev-symlinks
 # don't offer to update or clone resize inode with dup blocks
 %patch41 -p1 -b .resize_inode_e2fsck
+# e2fsck: Check all journal blocks for validity
+%patch43 -p1 -b .journal-check
+# prevent integer overflows (#414631 / CVE-2007-5497)
+%patch44 -p1 -b .overflows
+# Fix aliasing violation / dumpe2fs segfault (#433784)
+%patch45 -p1 -b .punning
+# coverity fix-fix.
+%patch46 -p1 -b .e2fsck-uninit
+# fix (very rare) data corruption on e2fsck log replay
+%patch47 -p1 -b .replay-corruption
+# uuidd daemon
+%patch48 -p1 -b .uuidd
+# blkid recognize swap
+%patch49 -p1 -b .swaplabel
+# work around gcc compilation error on ia64
+%patch50 -p1 -b .uuidgcc
+# Allow > 32M directory size (bytes) in fsck
+%patch51 -p1 -b .dirlimit
+# Allow --disable-tls
+%patch53 -p1 -b .tls-opt
 
 # Now unpack the ext2resize online resize tarball...
 %setup -T -D -q -a 1
@@ -140,7 +187,8 @@
 %patch21 -p2 -b .nowrite
 # Change ext2online man page to reflect only ext3 support
 %patch42 -p1 -b .no_ext2_online
-# remove ext2resize from man pages
+# Fix for multipath resize (path canonicalization)
+%patch52 -p1 -b .resize-mpath
 popd
 
 %patch29 -p1 -b .man_no_ext2resize
@@ -151,6 +199,15 @@
 # --enable-dynamic-e2fsck
 make
 
+# Build libuuid again, this time w/o TLS
+mkdir build-notls
+mkdir -p build-notls/lib/uuid/elfshared
+cd build-notls
+cp -a ../configure .
+%configure --srcdir=.. --enable-elf-shlibs --enable-nls --disable-tls
+make -C lib/uuid libuuid.a
+cd ..
+
 pushd %{ext2resize_name}
 # The byteorder patch adds a new file to the ext2online source tree, so
 # we need to rebuild the Makefiles from automake.
@@ -167,7 +224,38 @@
 export PATH=/sbin:$PATH
 make install install-libs DESTDIR="$RPM_BUILD_ROOT" \
 	root_sbindir=%{_root_sbindir} root_libdir=%{_root_libdir}
-/sbin/ldconfig -n ${RPM_BUILD_ROOT}%{_libdir}
+mkdir ${RPM_BUILD_ROOT}%{_libdir}/tls
+
+# Put tls-built libuuid into /lib/tls
+make -C lib/uuid install-lib install-shlibs DESTDIR="$RPM_BUILD_ROOT" \
+	root_sbindir=%{_root_sbindir} root_libdir=%{_root_libdir}/tls
+
+# And install non-tls libuuid into /lib
+cd build-notls
+make -C lib/uuid install-lib install-shlibs DESTDIR="$RPM_BUILD_ROOT" \
+	root_sbindir=%{_root_sbindir} root_libdir=%{_root_libdir}
+cd ..
+
+/sbin/ldconfig -n ${RPM_BUILD_ROOT}%{_libdir} $RPM_BUILD_ROOT/%{_libdir}/tls
+
+# wrapper headers to allow parallel install of 32- and 64-bit devel packages:
+mv -f $RPM_BUILD_ROOT%{_includedir}/ext2fs/ext2_types.h \
+      $RPM_BUILD_ROOT%{_includedir}/ext2fs/ext2_types-%{_arch}.h
+install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_includedir}/ext2fs/ext2_types.h
+
+mv -f $RPM_BUILD_ROOT%{_includedir}/blkid/blkid_types.h \
+      $RPM_BUILD_ROOT%{_includedir}/blkid/blkid_types-%{_arch}.h
+install -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_includedir}/blkid/blkid_types.h
+
+mv -f $RPM_BUILD_ROOT%{_includedir}/uuid/uuid_types.h \
+      $RPM_BUILD_ROOT%{_includedir}/uuid/uuid_types-%{_arch}.h
+install -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_includedir}/uuid/uuid_types.h
+
+# Our own initscript for uuidd
+install -m 755 %{SOURCE6} $RPM_BUILD_ROOT/etc/init.d/uuidd
+# And a dir uuidd needs that the makefiles don't create
+install -d $RPM_BUILD_ROOT/var/lib/libuuid
+
 %find_lang %{name}
 
 pushd %{ext2resize_name}
@@ -206,6 +294,24 @@
 fi
 exit 0
 
+%pre -n uuidd
+getent group uuidd >/dev/null || groupadd -r uuidd
+getent passwd uuidd >/dev/null || \
+useradd -r -g uuidd -d /var/lib/libuuid -s /sbin/nologin \
+    -c "UUID generator helper daemon" uuidd
+exit 0
+
+%post -n uuidd
+/sbin/chkconfig --add uuidd
+
+%preun -n uuidd
+if [ "$1" = 0 ]
+then
+	/sbin/service uuidd stop > /dev/null 2>&1 || :
+	/sbin/chkconfig --del uuidd
+fi
+
+
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc README RELEASE-NOTES
@@ -241,6 +347,7 @@
 %{_root_libdir}/libext2fs.so.*
 %{_root_libdir}/libss.so.*
 %{_root_libdir}/libuuid.so.*
+%{_root_libdir}/tls/libuuid.so.*
 %dir %{_root_libdir}/evms
 %{_root_libdir}/evms/libe2fsim.1.2.1.so
 
@@ -317,7 +424,53 @@
 %{_mandir}/man3/uuid_time.3*
 %{_mandir}/man3/uuid_unparse.3*
 
+%files -n uuidd
+%defattr(-,root,root)
+/etc/init.d/uuidd
+%{_mandir}/man8/uuidd.8*
+%attr(-, uuidd, uuidd) %{_sbindir}/uuidd
+%dir %attr(2775, uuidd, uuidd) /var/lib/libuuid
+
 %changelog
+* Tue Jan 27 2009 Eric Sandeen <[email protected]> 1.35-12.24.EL4
+- Add non-tls version of libuuid (#481466)
+
+* Wed Jan 21 2009 Eric Sandeen <[email protected]> 1.35-12.23.EL4
+- Fix resizing of multipath devices (#480338)
+
+* Tue Dec 16 2008 Eric Sandeen <[email protected]> 1.35-12.22.EL4
+- Lift 32Mb directory size restriction in e2fsck (#476601)
+
+* Thu Dec 04 2008 Eric Sandeen <[email protected]> 1.35-12.21.EL4
+- Work around gcc compilation error on ia64
+
+* Wed Dec 03 2008 Eric Sandeen <[email protected]> 1.35-12.20.EL4
+- Add swap label recognition to blkid (#467679)
+
+* Wed Sep 24 2008 Eric Sandeen <[email protected]> 1.35-12.19.EL4
+- New uuidd subpackage for unique time-based UUID generation (#457417)
+
+* Mon Sep 22 2008 Eric Sandeen <[email protected]> 1.35-12.18.EL4
+- Fix potential (but rare) data corruption on log replay (#450767)
+
+* Fri May 23 2008 Eric Sandeen <[email protected]> 1.35-12.17.EL4
+- Add missing part of fix for e2fsck journal recovery (#241239)
+
+* Thu Apr 10 2008 Eric Sandeen <[email protected]> 1.35-12.16.EL4
+- Fix potential uninitialized reference in e2fsck (#441606)
+
+* Thu Mar 20 2008 Eric Sandeen <[email protected]> 1.35-12.15.EL4
+- Fix aliasing violation causing dumpe2fs segfaults in ia64 (#433784)
+
+* Tue Jan 08 2008 Eric Sandeen <[email protected]> 1.35-12.14.EL4
+- wrap some devel headers to fix multilib issues (#416001)
+
+* Tue Dec 11 2007 Eric Sandeen <[email protected]> 1.35-12.13.EL4
+- Fix integer overflows (#414631 / CVE-2007-5497)
+
+* Thu Nov 29 2007 Eric Sandeen <[email protected]> 1.35-12.12.EL4
+- e2fsck: Check all journal blocks for validity (#241239)
+
 * Thu Aug 30 2007 Eric Sandeen <[email protected]> 1.35-12.11.EL4
 - Document in manpage that ext2online can only resize ext3 (#178927)
 


------------------------------------------------------------------------------
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first