diff --git a/quota-3.15-ext4support.patch b/quota-3.15-ext4support.patch new file mode 100644 index 0000000..82caf69 --- /dev/null +++ b/quota-3.15-ext4support.patch @@ -0,0 +1,24 @@ +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/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) || diff --git a/quota.spec b/quota.spec index 236dec6..64fec09 100644 --- a/quota.spec +++ b/quota.spec @@ -5,7 +5,7 @@ Name: quota Summary: System administration tools for monitoring users' disk usage Epoch: 1 Version: 3.15 -Release: 7%{?dist} +Release: 8%{?dist} License: BSD and GPLv2+ URL: http://sourceforge.net/projects/linuxquota/ Group: System Environment/Base @@ -21,6 +21,7 @@ Patch3: quota-3.06-pie.patch Patch4: quota-3.13-wrong-ports.patch Patch5: quota-3.15-manpages.patch Patch6: quota-3.15-helpoption.patch +Patch7: quota-3.15-ext4support.patch %description The quota package contains system administration tools for monitoring @@ -38,6 +39,7 @@ and limiting user and or group disk usage per filesystem. %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 -b .ext4 %build @@ -90,6 +92,10 @@ rm -rf %{buildroot} %changelog +* Thu Nov 10 2008 Ondrej Vasik 1:3.15-8 +- fix implementation of ext4 support + (by Mingming Cao, #472050) + * Tue Aug 05 2008 Ondrej Vasik 3.15-7 - Add support for -h option (do not show invalid option error) at edquota,setquota and quota (#457898)