rpms/e2fsprogs/devel e2fsprogs-1.38-etcblkid.patch, 1.1, 1.2 e2fsprogs-1.39-mkinstalldirs.patch, 1.2, 1.3 e2fsprogs.spec, 1.89, 1.90 e2fsprogs-1.40.2-blkid-FAT-magic-not-on-strict-position.patch, 1.2, NONE e2fsprogs-1.40.2-blkid-squashfs.patch, 1.2, NONE e2fsprogs-1.40.2-fix-open-create-modes.patch, 1.1, NONE e2fsprogs-1.40.2-integer-overflows.patch, 1.1, NONE e2fsprogs-1.40.2-swapfs.patch, 1.1, NONE e2fsprogs-1.40.2-warning-fixes.patch, 1.1, NONE

Eric Sandeen (sandeen) fedora-extras-commits at redhat.com
Tue Jan 1 22:23:23 UTC 2008 

Author: sandeen

Update of /cvs/pkgs/rpms/e2fsprogs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23319

Modified Files:
	e2fsprogs-1.38-etcblkid.patch 
	e2fsprogs-1.39-mkinstalldirs.patch e2fsprogs.spec 
Removed Files:
	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-swapfs.patch 
	e2fsprogs-1.40.2-warning-fixes.patch 
Log Message:
* Tue Jan 01 2008 Eric Sandeen <esandeen at redhat.com> 1.40.4-1
- New upstream version, drop several now-upstream patches.


e2fsprogs-1.38-etcblkid.patch:

Index: e2fsprogs-1.38-etcblkid.patch
===================================================================
RCS file: /cvs/pkgs/rpms/e2fsprogs/devel/e2fsprogs-1.38-etcblkid.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- e2fsprogs-1.38-etcblkid.patch	8 Mar 2006 20:17:01 -0000	1.1
+++ e2fsprogs-1.38-etcblkid.patch	1 Jan 2008 22:23:16 -0000	1.2
@@ -40,15 +40,15 @@
  If not specified it will be the same file as that given by the
 --- e2fsprogs-1.38/misc/blkid.c.etcblkid	2006-03-08 15:02:39.000000000 -0500
 +++ e2fsprogs-1.38/misc/blkid.c	2006-03-08 15:04:19.000000000 -0500
-@@ -39,7 +39,7 @@
+@@ -40,7 +40,7 @@ static void usage(int error)
  	fprintf(out,
- 		"usage:\t%s [-c <file>] [-hl] [-o format] "
+ 		"usage:\t%s [-c <file>] [-ghl] [-o format] "
  		"[-s <tag>] [-t <token>]\n    [-v] [-w <file>] [dev ...]\n"
 -		"\t-c\tcache file (default: /etc/blkid.tab, /dev/null = none)\n"
 +		"\t-c\tcache file (default: /etc/blkid/blkid.tab, /dev/null = none)\n"
  		"\t-h\tprint this usage message and exit\n"
+ 		"\t-g\tgarbage collect the blkid cache\n"
  		"\t-s\tshow specified tag(s) (default show all tags)\n"
- 		"\t-t\tfind device with a specific token (NAME=value pair)\n"
 --- e2fsprogs-1.38/lib/blkid/Makefile.in.etcblkid	2006-03-08 15:04:56.000000000 -0500
 +++ e2fsprogs-1.38/lib/blkid/Makefile.in	2006-03-08 15:05:59.000000000 -0500
 @@ -129,9 +129,10 @@

e2fsprogs-1.39-mkinstalldirs.patch:

Index: e2fsprogs-1.39-mkinstalldirs.patch
===================================================================
RCS file: /cvs/pkgs/rpms/e2fsprogs/devel/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	1 Jan 2008 22:23:16 -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/devel/e2fsprogs.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- e2fsprogs.spec	1 Jan 2008 19:22:37 -0000	1.89
+++ e2fsprogs.spec	1 Jan 2008 22:23:16 -0000	1.90
@@ -3,8 +3,8 @@
 
 Summary: Utilities for managing the second and third extended (ext2/ext3) filesystems
 Name: e2fsprogs
-Version: 1.40.2
-Release: 15%{?dist}
+Version: 1.40.4
+Release: 1%{?dist}
 # License based on upstream-modified COPYING file,
 # which clearly states "V2" intent.
 License: GPLv2
@@ -15,12 +15,6 @@
 Patch34: e2fsprogs-1.39-blkid-devmapper.patch
 Patch36: e2fsprogs-1.38-etcblkid.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
-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
 
 Url: http://e2fsprogs.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -86,18 +80,6 @@
 %patch36 -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
-# 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 (#414591 / CVE-2007-5497)
-%patch69 -p1 -b .overflows
 
 %build
 aclocal
@@ -258,6 +240,9 @@
 %{_mandir}/man3/uuid_unparse.3*
 
 %changelog
+* Tue Jan 01 2008 Eric Sandeen <esandeen at redhat.com> 1.40.4-1
+- New upstream version, drop several now-upstream patches.
+
 * 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.


--- 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-swapfs.patch DELETED ---


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

More information about the fedora-extras-commits mailing list