rpms/quota/devel quota-3.16-ext4support.patch, NONE, 1.1 quota.spec, 1.46, 1.47

[Ondrej Vasik]

Author: ovasik

Update of /cvs/extras/rpms/quota/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15146

Modified Files:
	quota.spec 
Added Files:
	quota-3.16-ext4support.patch 
Log Message:
fix ext4 support (#469127)

quota-3.16-ext4support.patch:

--- NEW FILE quota-3.16-ext4support.patch ---
diff -urNp quota-tools-orig/mntopt.h quota-tools/mntopt.h
--- quota-tools-orig/mntopt.h	2007-08-22 13:26:55.000000000 +0200
+++ quota-tools/mntopt.h	2008-10-30 09:13:35.000000000 +0100
@@ -6,7 +6,8 @@
 /* filesystem type */
 #define MNTTYPE_EXT2		"ext2"	/* 2nd Extended file system */
 #define MNTTYPE_EXT3		"ext3"	/* ext2 + journaling */
-#define MNTTYPE_EXT4		"ext4dev"	/* ext4 filesystem */
+#define MNTTYPE_EXT4		"ext4"	/* ext4 filesystem */
+#define MNTTYPE_EXT4DEV "ext4dev" /* ext4dev filesystem */
 #define MNTTYPE_MINIX		"minix"	/* MINIX file system */
 #define MNTTYPE_UFS		"ufs"	/* UNIX file system */
 #define MNTTYPE_UDF		"udf"	/* OSTA UDF file system */
diff -urNp quota-tools-orig/quotacheck.c quota-tools/quotacheck.c
--- quota-tools-orig/quotacheck.c	2008-10-30 09:11:13.000000000 +0100
+++ quota-tools/quotacheck.c	2008-10-30 09:14:20.000000000 +0100
@@ -1077,6 +1077,7 @@ static void check_all(void)
 		    !hasmntopt(mnt, MNTOPT_GRPJQUOTA) && !warned &&
 		    (!strcmp(mnt->mnt_type, MNTTYPE_EXT3) ||
 		     !strcmp(mnt->mnt_type, MNTTYPE_EXT4) ||
+         !strcmp(mnt->mnt_type, MNTTYPE_EXT4DEV) ||
 		     !strcmp(mnt->mnt_type, MNTTYPE_REISER))) {
 			struct utsname stats;
 
diff -urNp quota-tools-orig/quotasys.c quota-tools/quotasys.c
--- quota-tools-orig/quotasys.c	2008-10-30 09:11:12.000000000 +0100
+++ quota-tools/quotasys.c	2008-10-30 09:14:49.000000000 +0100
@@ -63,6 +63,7 @@ static int correct_fstype(char *type)
 		if (!strcmp(type, MNTTYPE_EXT2) ||
 		    !strcmp(type, MNTTYPE_EXT3) ||
 		    !strcmp(type, MNTTYPE_EXT4) ||
+        !strcmp(type, MNTTYPE_EXT4DEV) ||
 		    !strcmp(type, MNTTYPE_JFS) ||
 		    !strcmp(type, MNTTYPE_MINIX) ||
 		    !strcmp(type, MNTTYPE_UFS) ||


Index: quota.spec
===================================================================
RCS file: /cvs/extras/rpms/quota/devel/quota.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- quota.spec	10 Sep 2008 10:19:28 -0000	1.46
+++ quota.spec	30 Oct 2008 08:30:22 -0000	1.47
@@ -5,7 +5,7 @@
 Summary: System administration tools for monitoring users' disk usage
 Epoch: 1
 Version: 3.16
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: BSD and GPLv2+
 URL: http://sourceforge.net/projects/linuxquota/
 Group: System Environment/Base
@@ -22,6 +22,7 @@
 Patch5: quota-3.16-formatstring.patch
 Patch6: quota-3.16-helpoption.patch
 Patch7: quota-3.16-upstreampatches.patch
+Patch8: quota-3.16-ext4support.patch
 
 %description
 The quota package contains system administration tools for monitoring
@@ -52,6 +53,7 @@
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1 -b .ext4
 
 #fix typos/mistakes in localized documentation
 for pofile in $(find ./po/*.p*)
@@ -65,7 +67,7 @@
 %if %{rpcsetquota}
 	--enable-rpcsetquota=yes \
 %endif
-	--enable-rootsbin 
+	--enable-rootsbin
 make
 
 
@@ -111,6 +113,10 @@
 %attr(0644,root,root) %{_mandir}/man3/*
 
 %changelog
+* Thu Oct 30 2008 Ondrej Vasik <ovasik at redhat.com> 1:3.16-6
+- fix implementation of ext4 support
+  (by Mingming Cao, #469127)
+
 * Wed Sep 10 2008 Ondrej Vasik <ovasik at redhat.com> 1:3.16-5
 - fix rpmlint warnings - absolute symlink and not using epoch
   in version in changelog (#226353)