Thu Jan 31 20:53:00 UTC 2008

Author: sandeen

Update of /cvs/pkgs/rpms/e2fsprogs/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23291

Modified Files:
	.cvsignore e2fsprogs-1.39-mkinstalldirs.patch e2fsprogs.spec 
	sources 
Added Files:
	e2fsprogs-1.40.4-no-static-e2fsck.patch 
	e2fsprogs-1.40.4-sb_feature_check_ignore.patch 
	e2fsprogs-1.40.4-uuidd-tidy.patch uuidd.init 
Removed Files:
	e2fsprogs-1.38-no_pottcdate.patch 
	e2fsprogs-1.38-resize-inode.patch 
	e2fsprogs-1.39-multilib.patch 
	e2fsprogs-1.40.2-blkid-FAT-magic-not-on-strict-position.patch 
	e2fsprogs-1.40.2-blkid-squashfs.patch 
	e2fsprogs-1.40.2-fix-open-create-modes.patch 
	e2fsprogs-1.40.2-integer-overflows.patch 
	e2fsprogs-1.40.2-protect-open-ops.patch 
	e2fsprogs-1.40.2-swapfs.patch 
	e2fsprogs-1.40.2-warning-fixes.patch 
Log Message:
* Thu Jan 31 2008 Eric Sandeen <esandeen at redhat.com> 1.40.4-1
- New upstream version, drop several now-upstream patches.
- New uuidd subpackage
- Build e2fsck as a dynamically linked binary, and clobber e2fsck.static
- Fix uidd manpage default paths.
- Ignore some primary/backup superblock flag differences (#428893)
- Make (more) file timestamps match those in tarball for multilib tidiness 
- Fix e2fsprogs-libs summary (shared libs not static)


e2fsprogs-1.40.4-no-static-e2fsck.patch:

--- NEW FILE e2fsprogs-1.40.4-no-static-e2fsck.patch ---
Index: e2fsprogs-1.40.4/e2fsck/Makefile.in
===================================================================
--- e2fsprogs-1.40.4.orig/e2fsck/Makefile.in
+++ e2fsprogs-1.40.4/e2fsck/Makefile.in
@@ -104,7 +104,7 @@ SRCS= $(srcdir)/e2fsck.c \
 	prof_err.c \
 	$(MTRACE_SRC)
 
-all:: profiled $(PROGS) e2fsck.static e2fsck.shared $(MANPAGES) $(FMANPAGES)
+all:: profiled $(PROGS) e2fsck. at E2FSCK_TYPE@ $(MANPAGES) $(FMANPAGES)
 
 @PROFILE_CMT at all:: e2fsck.profiled
 

e2fsprogs-1.40.4-sb_feature_check_ignore.patch:

--- NEW FILE e2fsprogs-1.40.4-sb_feature_check_ignore.patch ---
Index: e2fsprogs-1.40.4/e2fsck/super.c
===================================================================
--- e2fsprogs-1.40.4.orig/e2fsck/super.c
+++ e2fsprogs-1.40.4/e2fsck/super.c
@@ -814,10 +814,32 @@ int check_backup_super_block(e2fsck_t ct
 			continue;
 		}
 
-#define SUPER_DIFFERENT(x) (fs->super->x != tfs->super->x)
-		if (SUPER_DIFFERENT(s_feature_compat) ||
-		    SUPER_DIFFERENT(s_feature_incompat) ||
-		    SUPER_DIFFERENT(s_feature_ro_compat) ||
+		/*
+		 * A few flags are set on the fly by the kernel, but
+		 * only in the primary superblock.  They are safe
+	 	 * to copy even if they differ.
+	 	 */ 
+
+#define FEATURE_COMPAT_IGNORE		(EXT2_FEATURE_COMPAT_EXT_ATTR)
+#define FEATURE_RO_COMPAT_IGNORE	(EXT2_FEATURE_RO_COMPAT_LARGE_FILE| \
+					 EXT4_FEATURE_RO_COMPAT_DIR_NLINK)
+#define FEATURE_INCOMPAT_IGNORE		(EXT3_FEATURE_INCOMPAT_EXTENTS)
+
+#define SUPER_COMPAT_DIFFERENT(x)	\
+	(( fs->super->x & ~FEATURE_COMPAT_IGNORE) !=	\
+	 (tfs->super->x & ~FEATURE_COMPAT_IGNORE))
+#define SUPER_INCOMPAT_DIFFERENT(x)	\
+	(( fs->super->x & ~FEATURE_INCOMPAT_IGNORE) !=	\
+	 (tfs->super->x & ~FEATURE_INCOMPAT_IGNORE))
+#define SUPER_RO_COMPAT_DIFFERENT(x)	\
+	(( fs->super->x & ~FEATURE_RO_COMPAT_IGNORE) !=	\
+	 (tfs->super->x & ~FEATURE_RO_COMPAT_IGNORE))
+#define SUPER_DIFFERENT(x)		\
+	(fs->super->x != tfs->super->x)
+
+		if (SUPER_COMPAT_DIFFERENT(s_feature_compat) ||
+		    SUPER_INCOMPAT_DIFFERENT(s_feature_incompat) ||
+		    SUPER_RO_COMPAT_DIFFERENT(s_feature_ro_compat) ||
 		    SUPER_DIFFERENT(s_blocks_count) ||
 		    SUPER_DIFFERENT(s_inodes_count) ||
 		    memcmp(fs->super->s_uuid, tfs->super->s_uuid,

e2fsprogs-1.40.4-uuidd-tidy.patch:

--- NEW FILE e2fsprogs-1.40.4-uuidd-tidy.patch ---
Index: e2fsprogs-1.39/misc/uuidd.8.in
===================================================================
--- e2fsprogs-1.39.orig/misc/uuidd.8.in
+++ e2fsprogs-1.39/misc/uuidd.8.in
@@ -64,11 +64,11 @@ UUID's.
 .TP
 .BI \-p  " pidfile"
 Specify the pathname where the pid file should be written.  By default,
-the pid file is written to /var/run/uuidd.pid.
+the pid file is written to /var/lib/libuuid/uuidd.pid.
 .TP
 .BI \-s " socketpath"
 Specify the pathname used for the unix-domain socket used by uuidd.  By
-qdefault, the pathname used is /var/run/uuidd.sock.  This is primarily
+default, the pathname used is /var/lib/libuuid/request.  This is primarily
 for debugging purposes, since the pathname is hard-coded in the libuuid
 library.
 .TP


--- NEW FILE uuidd.init ---
#!/bin/bash
#
# uuidd		uuidd daemon for unique time-based UUID generation
#
# Author:	Eric Sandeen <sandeen at redhat.com>
#
# chkconfig:	2345 60 99
#
# description:  uuidd is a helper daemon to guarantee uniqueness of \
#		time-based UUIDs when using libuuid.
# processname:  uuidd
# pidfile: /var/lib/libuuid/uuidd.pid
#

### BEGIN INIT INFO
# Provides: uuidd
# Required-Start: $time $local_fs
# Required-Stop: $time $local_fs
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Short-Description: UUID daemon
# Description: Daemon which guarantees uniqueness of time-based UUIDS
#     when using libuuid.
### END INIT INFO


# source function library
. /etc/rc.d/init.d/functions

RETVAL=0
DAEMON=uuidd

start() {
	echo -n $"Starting uuidd: "
	daemon --user uuidd --pidfile /var/lib/libuuid/uuidd.pid /usr/sbin/uuidd
	RETVAL=$?
	echo
	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/uuidd
}

stop() {
	echo -n $"Stopping uuidd: "
	killproc uuidd
	echo
	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/uuidd
}

restart() {
	stop
	start
}

case "$1" in
  start)
	start
	;;
  stop) 
	stop
	;;
  restart|force-reload|reload)
	restart
	;;
  condrestart)
	[ -f /var/lock/subsys/uuidd ] && restart
	;;
  status)
	status -p /var/lib/libuuid/uuidd.pid uuidd uuidd
	REVAL=$?
	;;
  *)
	echo $"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart}"
	exit 1
esac

exit $RETVAL


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/e2fsprogs/F-8/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	17 Jul 2007 19:14:44 -0000	1.16
+++ .cvsignore	31 Jan 2008 20:52:22 -0000	1.17
@@ -1 +1 @@
-e2fsprogs-1.40.2.tar.gz
+e2fsprogs-1.40.4.tar.gz

e2fsprogs-1.39-mkinstalldirs.patch:

Index: e2fsprogs-1.39-mkinstalldirs.patch
===================================================================
RCS file: /cvs/pkgs/rpms/e2fsprogs/F-8/e2fsprogs-1.39-mkinstalldirs.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- e2fsprogs-1.39-mkinstalldirs.patch	25 Dec 2006 22:41:46 -0000	1.2
+++ e2fsprogs-1.39-mkinstalldirs.patch	31 Jan 2008 20:52:22 -0000	1.3
@@ -89,13 +89,13 @@
  	      if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
 --- e2fsprogs-1.39/misc/Makefile.in.mkinstalldirs	2006-12-25 23:04:27.000000000 +0100
 +++ e2fsprogs-1.39/misc/Makefile.in	2006-12-25 23:04:27.000000000 +0100
-@@ -223,8 +223,8 @@
+@@ -246,8 +246,8 @@ filefrag.8: $(DEP_SUBSTITUTE) $(srcdir)/
  	@$(SUBSTITUTE_UPTIME) $(srcdir)/filefrag.8.in filefrag.8
  
  installdirs:
--	@echo "	MKINSTALLDIRS $(sbindir) $(root_sbindir) $(bindir) $(man1dir) $(man8dir) $(libdir)"
+-	@echo "	MKINSTALLDIRS $(sbindir) $(root_sbindir) $(bindir) $(man1dir) $(man8dir) $(libdir) $(root_sysconfdir)"
 -	@$(MKINSTALLDIRS) $(DESTDIR)$(sbindir) \
-+	@echo "	MKDIR_P $(sbindir) $(root_sbindir) $(bindir) $(man1dir) $(man8dir) $(libdir)"
++	@echo "	MKDIR_P $(sbindir) $(root_sbindir) $(bindir) $(man1dir) $(man8dir) $(libdir) $(root_sysconfdir)"
 +	@$(MKDIR_P) $(DESTDIR)$(sbindir) \
  		$(DESTDIR)$(root_sbindir) $(DESTDIR)$(bindir) \
  		$(DESTDIR)$(man1dir) $(DESTDIR)$(man8dir) \


Index: e2fsprogs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/e2fsprogs/F-8/e2fsprogs.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- e2fsprogs.spec	12 Dec 2007 20:19:11 -0000	1.86
+++ e2fsprogs.spec	31 Jan 2008 20:52:22 -0000	1.87
@@ -3,8 +3,8 @@
 
 Summary: Utilities for managing the second and third extended (ext2/ext3) filesystems
 Name: e2fsprogs
-Version: 1.40.2
-Release: 12%{?dist}
+Version: 1.40.4
+Release: 1%{?dist}
 # License based on upstream-modified COPYING file,
 # which clearly states "V2" intent.
 License: GPLv2
@@ -12,19 +12,13 @@
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Source1: ext2_types-wrapper.h
 Source2: blkid_types-wrapper.h
-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
-Patch39: e2fsprogs-1.39-multilib.patch
-Patch62: e2fsprogs-1.39-mkinstalldirs.patch
-Patch63: e2fsprogs-1.40.2-warning-fixes.patch
-Patch64: e2fsprogs-1.40.2-swapfs.patch
-Patch65: e2fsprogs-1.40.2-fix-open-create-modes.patch
-Patch66: e2fsprogs-1.40.2-protect-open-ops.patch
-Patch67: e2fsprogs-1.40.2-blkid-FAT-magic-not-on-strict-position.patch
-Patch68: e2fsprogs-1.40.2-blkid-squashfs.patch
-Patch69: e2fsprogs-1.40.2-integer-overflows.patch
+Source3: uuidd.init
+Patch1: e2fsprogs-1.39-blkid-devmapper.patch
+Patch2: e2fsprogs-1.38-etcblkid.patch
+Patch3: e2fsprogs-1.39-mkinstalldirs.patch
+Patch4: e2fsprogs-1.40.4-uuidd-tidy.patch
+Patch5: e2fsprogs-1.40.4-sb_feature_check_ignore.patch
+Patch7: e2fsprogs-1.40.4-no-static-e2fsck.patch
 
 Url: http://e2fsprogs.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -49,7 +43,7 @@
 performance of an ext2 and/or ext3 filesystem.
 
 %package libs
-Summary: Ext2/3 filesystem-specific static libraries and headers
+Summary: Ext2/3 filesystem-specific shared libraries and headers
 Group: Development/Libraries
 # License based on upstream-modified COPYING file,
 # which clearly states "V2" intent as well as other
@@ -68,6 +62,7 @@
 # licenses for various libs, which also have in-source specification.
 License: GPLv2 and LGPLv2 and BSD and MIT
 Requires: e2fsprogs-libs = %{version}-%{release}
+Requires: device-mapper-devel >= 1.02.02-3
 Requires: gawk
 Requires(post): /sbin/install-info
 Requires(postun): /sbin/install-info
@@ -81,56 +76,58 @@
 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-libs = %{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-%{version}
-# enable tune2fs to set and clear the resize inode (#167816)
-%patch30 -p1 -b .resize-inode
-# drop timestamp from mo files (#168815/168814/245653)
-%patch32 -p1 -b .pottcdate
 # look at device mapper devices
-%patch34 -p1 -b .dm
+%patch1 -p1 -b .dm
 # put blkid.tab in /etc/blkid/
-%patch36 -p1 -b .etcblkid
-# Fix multilib conflicts (#192665)
-%patch39 -p1 -b .multilib
+%patch2 -p1 -b .etcblkid
 # Fix for newer autoconf (#220715)
-%patch62 -p1 -b .mkinstalldirs
-# Fix type warning in badblocks
-%patch63 -p1 -b .warnings
-# Fix ext2fs_swap_inode_full() on bigendian boxes
-%patch64 -p1 -b .swapfs
-# fix one open("foo", O_CREAT) caller with no mode
-%patch65 -p1 -b .creatmode
-# protect ->open ops from glibc open-create-mode-checker
-%patch66 -p1 -b .open
-# fix fat probe when there is a real MBR
-%patch67 -p1 -b .blkid-fat
-# detect squashfs in libblkid (#305151)
-%patch68 -p1 -b .blkid-squashfs
-# prevent integer overflows (#414581 / CVE-2007-5497)
-%patch69 -p1 -b .overflows
+%patch3 -p1 -b .mkinstalldirs
+# uuidd manpage tidyup
+%patch4 -p1 -b .uuidd-tidy
+# ignore some flag differences on primary/backup sb feature checks
+%patch5 -p1 -b .featurecheck
+# completely clobber e2fsck.static build
+%patch7 -p1 -b .e2fsck-static
 
 %build
 aclocal
 autoconf
-%configure --enable-elf-shlibs --enable-nls --disable-e2initrd-helper  --enable-blkid-devmapper --enable-blkid-selinux
-make -C po update-po
+%configure --enable-elf-shlibs --enable-nls --disable-e2initrd-helper  --enable-blkid-devmapper --enable-blkid-selinux --enable-dynamic-e2fsck
 make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
 export PATH=/sbin:$PATH
-make install install-libs DESTDIR="%{buildroot}" \
+make install install-libs DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p" \
 	root_sbindir=%{_root_sbindir} root_libdir=%{_root_libdir}
 
 # ugly hack to allow parallel install of 32-bit 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 %{SOURCE1} $RPM_BUILD_ROOT%{_includedir}/ext2fs/ext2_types.h
+install -p -m 644 %{SOURCE1} $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 %{SOURCE2} $RPM_BUILD_ROOT%{_includedir}/blkid/blkid_types.h
+install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_includedir}/blkid/blkid_types.h
+
+# Our own initscript for uuidd
+install -m 755 %{SOURCE3} $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}
 
@@ -160,6 +157,23 @@
 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
@@ -269,9 +283,37 @@
 %{_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 Dec 11 2007 Eric Sandeen <esandeen at redhat.com> 1.40.2-12
-- Fix integer overflows (#414581 / CVE-2007-5497)
+* Thu Jan 31 2008 Eric Sandeen <esandeen at redhat.com> 1.40.4-1
+- New upstream version, drop several now-upstream patches.
+- New uuidd subpackage
+- Build e2fsck as a dynamically linked binary, and clobber e2fsck.static
+- Fix uidd manpage default paths.
+- Ignore some primary/backup superblock flag differences (#428893)
+- Make (more) file timestamps match those in tarball for multilib tidiness 
+- Fix e2fsprogs-libs summary (shared libs not static)
+
+* Tue Jan 01 2008 Eric Sandeen <esandeen at redhat.com> 1.40.2-15
+- Drop resize_inode removal patch from tune2fs; ostensibly was
+  for old kernels which could not mount, but seems to be fine.
+- Drop pottcdate removal patch, and don't rebuild .po files,
+  causes multilib problems and we generally shouldn't rebuild.
+- Drop multilib patch; wrapper header should take care of this now.
+- Drop ->open rename, Fedora seems ok with this now.
+
+* Tue Dec 11 2007 Eric Sandeen <esandeen at redhat.com> 1.40.2-14
+- Fix integer overflows (#414591 / CVE-2007-5497)
+
+* Tue Dec  4 2007 Stepan Kasal <skasal at redhat.com> 1.40.2-13
+- The -devel package now requires device-mapper-devel, to match
+  the dependency in blkid.pc (#410791)
 
 * Tue Nov 27 2007 Eric Sandeen <esandeen at redhat.com> 1.40.2-11
 - Use upstream patch for blkid fat detection, avoids div-by-zero


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/e2fsprogs/F-8/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	17 Jul 2007 19:14:44 -0000	1.16
+++ sources	31 Jan 2008 20:52:22 -0000	1.17
@@ -1 +1 @@
-130ce559a0f311ea2bc04a47b4982d0a  e2fsprogs-1.40.2.tar.gz
+124d744bdf9d443591eb8193c085944b  e2fsprogs-1.40.4.tar.gz


--- e2fsprogs-1.38-no_pottcdate.patch DELETED ---


--- e2fsprogs-1.38-resize-inode.patch DELETED ---


--- e2fsprogs-1.39-multilib.patch DELETED ---


--- e2fsprogs-1.40.2-blkid-FAT-magic-not-on-strict-position.patch DELETED ---


--- e2fsprogs-1.40.2-blkid-squashfs.patch DELETED ---


--- e2fsprogs-1.40.2-fix-open-create-modes.patch DELETED ---


--- e2fsprogs-1.40.2-integer-overflows.patch DELETED ---


--- e2fsprogs-1.40.2-protect-open-ops.patch DELETED ---


--- e2fsprogs-1.40.2-swapfs.patch DELETED ---


--- e2fsprogs-1.40.2-warning-fixes.patch DELETED ---


