From 229d43e4e8af0c6bb6e082dee7766a6fb7cd3d4de394ad5b541e5d10fe474243 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Wed, 23 Sep 2009 19:17:34 +0000 Subject: [PATCH] Accepting request 20914 from Base:System Copy from Base:System/quota based on submit request 20914 from user mseben OBS-URL: https://build.opensuse.org/request/show/20914 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/quota?expand=0&rev=20 --- quota-3.17-nfs-mntpoint.patch | 31 ++++ quota.changes | 5 + quota.spec | 333 +--------------------------------- 3 files changed, 40 insertions(+), 329 deletions(-) create mode 100644 quota-3.17-nfs-mntpoint.patch diff --git a/quota-3.17-nfs-mntpoint.patch b/quota-3.17-nfs-mntpoint.patch new file mode 100644 index 0000000..6c1b5f7 --- /dev/null +++ b/quota-3.17-nfs-mntpoint.patch @@ -0,0 +1,31 @@ +Index: quotasys.c +=================================================================== +RCS file: /cvsroot/linuxquota/quota-tools/quotasys.c,v +retrieving revision 1.59 +retrieving revision 1.60 +diff -u -r1.59 -r1.60 +--- quotasys.c 17 Dec 2008 12:40:07 -0000 1.59 ++++ quotasys.c 21 Sep 2009 15:14:48 -0000 1.60 +@@ -606,6 +606,10 @@ + hlist_allocated = START_MNT_POINTS; + } + ++ /* If directories are specified, cache all NFS mountpoints */ ++ if (count && !(mntflags & MS_LOCALONLY)) ++ mntflags |= MS_NFS_ALL; ++ + if (init_mounts_scan(count, mntpoints, mntflags) < 0) + die(2, _("Cannot initialize mountpoint scan.\n")); + while ((mnt = get_next_mount())) { +@@ -987,9 +991,9 @@ + continue; + } + if (nfs_fstype(mnt->mnt_type)) { ++ /* For network filesystems we must get device from root */ ++ dev = st.st_dev; + if (!(flags & MS_NFS_ALL)) { +- /* For network filesystems we must get device from root */ +- dev = st.st_dev; + for (i = 0; i < mnt_entries_cnt && mnt_entries[i].me_dev != dev; i++); + } + else /* Always behave as if the device was unique */ diff --git a/quota.changes b/quota.changes index 175dfed..2d49fcf 100644 --- a/quota.changes +++ b/quota.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Sep 22 09:17:57 CEST 2009 - mseben@novell.com + +- fixed mountpoint scanning when NFS mountpoint is specified on command line + ------------------------------------------------------------------- Fri Jan 9 15:03:46 CET 2009 - mseben@suse.cz diff --git a/quota.spec b/quota.spec index 2936325..414f423 100644 --- a/quota.spec +++ b/quota.spec @@ -21,7 +21,7 @@ Name: quota BuildRequires: dbus-1-devel e2fsprogs-devel libnl-devel pkg-config tcpd-devel Version: 3.17 -Release: 1 +Release: 2 PreReq: %insserv_prereq %fillup_prereq AutoReqProv: on Group: System/Filesystems @@ -34,6 +34,8 @@ Patch1: %{name}-%{version}-makefile.patch Patch2: %{name}-%{version}-man.patch Patch3: %{name}-%{version}-warnquota.patch Patch7: %{name}-%{version}-install_nld.patch +# PATCH-FIX-UPSTREAM fixed mountpoint scanning when NFS mountpoint is specified on command line +Patch8: %{name}-%{version}-nfs-mntpoint.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -80,6 +82,7 @@ Authors: %patch2 %patch3 %patch7 +%patch8 find -type d -name CVS -exec rm -rf {} \; -prune find -type d | xargs chmod 755 @@ -151,331 +154,3 @@ rm -rf $RPM_BUILD_ROOT %exclude /usr/include/rpcsvc/* %changelog -* Fri Jan 09 2009 mseben@suse.cz -- update to version 3.17 - - changes in quota-tools from 3.16 to 3.17 - * do not allow setting of user's grace time when softlimit is not exceeded (Jan Kara) - * fix reference to rpc manpage (anonymous reporter) - * add EXT4 (not only EXT4DEV) to the list of supported filesystems (Mingming Cao) - * fix setting of more than 31-bit block and inode limits (Gui Xiaohua) - * fixed bug in error reporting when quota reading fails (Jan Kara) - * added support for quota formats with hidden quota files (Jan Kara) - * remove IMMUTABLE flag from quota file in quotacheck (Jan Kara) - * fix bug in warnquota which could result in bogus hostname and domainname (anonymous reporter) - * implemented writing of messages that user got below hard/soft limits to quota_nld (Jan Kara) - * use PKG_CHECK_MODULES to check for DBUS (Ladislav Michnovic) - * Implement setting of charset for emails sent by warnquota (Michael Meskes) - * Added quota_nld to the list of installed programs (Jan Kara) - * some typos fixes (Matthew Boyle) - * fixed possible segfault when unpriviledged user run edquota (Matthew Boyle) - * fixed format strings to use "%%llu" and "%%lld" instead of "%%Lu" and "%%Ld" (Ladislav Michnovic) - * removed ssl, resolv, lber from the list of LDAP libraries since we don't need them directly (Jan Kara) - * added limits.h include to quota_nld (Jan Kara) - * fixed repquota to work with limits over 4 TB (Jan Kara, Michael Meier) -- deprecated *-dbus_header_check.patch, *-glibc2_8.patch, *-type.patch, quota-tools-meta.diff -* Tue Nov 11 2008 nadvornik@suse.cz -- requires nfs-kernel-server [bnc#431212] -* Mon Oct 20 2008 nadvornik@suse.cz -- added support for quota formats with hidden quota files - (Jan Kara) [fate#302681] -* Mon Aug 25 2008 lmichnovic@suse.cz -- added $local_fs for Required-Stop in boot.quota, quotad scripts -* Tue Aug 19 2008 lmichnovic@suse.cz -- added $remote_fs for Required-Stop in quotad init script -* Mon Aug 18 2008 lmichnovic@suse.cz -- added $null for stop service in init.d script -* Mon May 05 2008 lmichnovic@suse.cz -- installing missing quota_nld binary (*install_nld.patch) - [bnc#386754] -* Tue Apr 15 2008 lmichnovic@suse.cz -- fixed missing inclusion of limits.h (glibc2_8.patch) -* Mon Apr 14 2008 lmichnovic@suse.cz -- enabled compilation with netlink -- needed rewrite of configure check (*dbus_header_check.patch) -- added pkg-config into BuildReq -* Fri Mar 14 2008 lmichnovic@suse.cz -- excluding files /usr/include/rpcsvc/rquota.* -* Thu Mar 13 2008 lmichnovic@suse.cz -- update to version 3.16 - + quota_nld should be now usable. It parses messages about - + exceeded quotas sent by kernel via netlink (works for kernel - + 2.6.24 and newer) and currently supports printing of these - + messages to console and/or system DBUS. If someone wanted to - + write support for GNOME/KDE/other desktop which would show a - + dialog in case message comes over DBUS, he is most welcome. -- Changes: - * added information message about journaled quota to quotacheck - * added pointers to quota_nld and warnquota to some manpages - * ported quota_nld to libnl-1.1 - * let setquota batch mode accept comments and blank lines, - add -c option - * print more verbose list of compile options when --version - specified - * quotaon(8) should work only on local filesystems - * made possible to use quota rpc in mixed NFSv3 and NFSv4 - environments - * fixed compilation with openLDAP library versions 2.1 and 2.2 - * always define allow_severity and deny_severity for older - versions of libwrap - * cleaned up host_access() handling - * configure script now correctly reports checking of libwrap - * added MPFS to the list of supported filesystems - * updated Polish translations - * fixed typo in a quotaon message - * fixed warnquota to check URI only if LDAP enabled -- obsoletes *ignore_nfs.patch, mode.patch changed to makefile.patch -* Fri Dec 07 2007 lmichnovic@suse.cz -- quotad service is not enabled during installation any more - [#346541] -- split off quota-nfs which contains only quotad related files -- added Requires on packages with services needed to start - quotad service -- updated README.SUSE and created README.quotad.SUSE -* Wed Nov 14 2007 lmichnovic@suse.cz -- fixed typo in SUSE/README [#341453] and written additional info - regarding managing quota support within YaST since openSUSE 10.3 -* Thu Sep 13 2007 lmichnovic@suse.cz -- Ignoring NFS mount points when shutting down quota with quotaoff - [#310426] (ignore_nfs.patch) -* Thu Aug 09 2007 lmichnovic@suse.cz -- fixed running quotacheck on mounted partition [#298713] -- added $network should be enabled when stoping quota service - because nfs mounts are still mounted and cause time out -* Tue Jul 17 2007 lmichnovic@suse.cz -- update to 3.15 final. Changes since 3.15 beta: - * added a wrapper script around setquota which also updates LDAP -- installing ldap-scripts -* Mon Jul 02 2007 lmichnovic@suse.cz -- adjusted print formatting (*type.patch) -* Thu Jun 21 2007 lmichnovic@suse.cz -- rewritten headers of init scripts to fulfill LSB - (quota-SUSE.tar.bz2); obsoletes patch lsb -- now starting boot.quota script during boot automatically - FATE #120106 -- update to version 3.15 beta - - obsoletes patches: cflags, pie - - netlink feature is disabled now (needs kernel patch) - * implemented quota netlink daemon to listen to kernel netlink - messages and send them to DBUS or write them to the console - * modified configure scripts and warnquota to check for new LDAP - library and allow use of URI - * fix LDAP scripts to set VISUAL instead of EDITOR - * added ext4 filesystem to the list of supported filesystems - * pot.o is now compiled with CFLAGS - * use -fPIE for compilation when available - * fixed some more problems XFS quotaon - * fixed two mistakes in quotaon(8) manpage - * added option -A to quota(1) to report all NFS mountpoints - * fixed XFS handling to work with loopback mounted devices - * fixed mountpoints scanning to make XFS -x delete command work - * fixes of signed vs unsigned int issues - * fixed a format string bug in reporting of raw grace times in repquota - * added repquota(8) and quota(1) option for better parsable output - * fixed error handling in edquota(8) when creating tmp file -* Tue Apr 24 2007 lmichnovic@suse.cz -- added Short-Description into quotad script to fulfill LSB - specification (lsb.diff) -* Mon Mar 19 2007 lmichnovic@suse.cz -- fixed compiling some files without RPM_OPT_FLAGS and -fPIE - (cflags.diff) -- patch quota-%%{version}.diff renamed to quota-%%{version}-mode.diff -* Thu Oct 05 2006 mjancar@suse.cz -- update to 3.14 - * updated Polish translations (Jakub Bogusz) - * print user/group names in error messages when cannot get quota information (Michal Marek, Jan Kara) - * added option --always-resolve to force resolving even names with digits only (Jan Kara) - * minor language corrections in manpages (Jan Kara) - * implemented long options parsing for all quota tools (Jan Kara) - * quota(1) has -f option to specify filesystem list (Jan Kara) - * corrected some informal language in messages (Jan Kara) - * we cannot even stat NFS mounts in local mode as server may be unreachable (Jan Kara) - * fixed error messages in getprivs() (Jan Kara, Brian Morris) - * made UID/GID prints unsigned (Matthew Kent) - * fixed very verbose printing for quotacheck (Jan Kara) - * fixed off-by-one bug in mount options parsing (Jan Kara) - * implemented nicer message formatting for warnquota(8) (Jan Kara) - * quota(1) has -w option to supress line wrapping for long device names (Jan Kara) - * quota(1) prints grace time even if hard limit is reached (Jan Kara) - * fixed journaled quota format detection in quotacheck (Jan Kara) -* Fri Jul 28 2006 olh@suse.de -- boot.swap, boot.clock and boot.localfs are optional for boot.quota (#181972) -* Fri Apr 07 2006 mjancar@suse.cz -- fix garbage in error messages (#164377) -* Fri Jan 27 2006 mls@suse.de -- converted neededforbuild to BuildRequires -* Wed Jan 25 2006 mjancar@suse.cz -- ask kernel instead of runfile for status (#58564) -* Fri Jan 20 2006 mjancar@suse.cz -- verbose quotacheck on boot (#71077) -* Fri Jan 20 2006 schwab@suse.de -- Don't strip binaries. -* Wed Nov 02 2005 dmueller@suse.de -- don't build as root -* Wed Jul 13 2005 mjancar@suse.cz -- update to 3.13 -- run quotacheck only when fsck returns error or quota files are missing -* Thu Jun 23 2005 ro@suse.de -- added pie patch from FC -* Mon Mar 07 2005 mjancar@suse.cz -- use RPM_OPT_FLAGS -* Thu Feb 17 2005 mjancar@suse.cz -- update to 3.12 -* Mon Nov 01 2004 tcrhak@suse.cz -- removed the hard coded limit (256) of mounted file systems, - by making the array dynamic (bug #47259, patch maxmntpoints) -* Thu Sep 23 2004 tcrhak@suse.cz -- merged init.d/quota into boot.quota, run quotacheck always (bug #43564) -- added nfsserver to Required-Start to quotad (bug #41800) -- added new variable FAIL to warnquota.conf (bug #45782) -* Tue Jun 01 2004 meissner@suse.de -- removed typedef which is no longer needed and causes - problems on ppc64. -* Mon Mar 08 2004 tcrhak@suse.cz -- update to version 3.11 -* Wed Oct 08 2003 tcrhak@suse.cz -- use 'rcnfsserver status' rather then 'rcnfs status' - in script rcquotad (bug #32131) -* Wed Jul 30 2003 tcrhak@suse.cz -- update to version 3.10pre1 -* Wed Jul 23 2003 tcrhak@suse.cz -- update to version 3.09 -* Fri Mar 07 2003 kukuk@suse.de -- Fix path in init scripts [Bug #24849] -- Move quotacheck binary to /sbin (boot.quota expects it here, - /usr/sbin must not be accesible at this time) -* Fri Jan 17 2003 kukuk@suse.de -- Use own rquota.[xh] for building -* Thu Jan 09 2003 tcrhak@suse.cz -- use glibc-devel's rquota.h and rquota.x for building -- removed rquota.h and rquota.x from the filelist -* Mon Dec 16 2002 tcrhak@suse.cz -- update to version 3.08 -* Wed Oct 02 2002 tcrhak@suse.cz -- fixed bugs #20275 and #20278: - - added warnquota configuration files - - added /etc/quotatab to warnquota manual page - - fixed README.SuSE -- removed quotad and colon patches and applied - them to the SuSE tarball -* Tue Sep 17 2002 ro@suse.de -- removed bogus self-provides -* Fri Sep 06 2002 tcrhak@suse.cz -- further to the previous fix: really do not start - quotad unless all the services are running -* Thu Sep 05 2002 tcrhak@suse.cz -- fixed rcquotad script (bug #17319) - - use rc... status to test whether required services - are running - - go through these tests only for `start' - - exit with 1 rather then 0 when some service is - not running -* Tue Aug 20 2002 mmj@suse.de -- Correct PreReq -* Sat Jul 27 2002 adrian@suse.de -- really do not source rc.config ;) -* Wed Jul 24 2002 kukuk@suse.de -- Don't source rc.config -* Sun Jun 23 2002 ro@suse.de -- fixed directory permissions -* Wed May 29 2002 ro@suse.de -- define FIOSIZE ioctl for x86_64 -* Wed Mar 20 2002 tcrhak@suse.cz -- put SuSE files into a tarball -- removed colons from quota and quotad init scripts (bug #14704) -- renamed quota.patch to quota-%%{version}.patch -* Sat Feb 16 2002 ro@suse.de -- moved boot.quota from aaa_base to this package -* Tue Jan 08 2002 vinil@suse.cz -- init scripts LSBed #12696 -- removed START_QUOTA{,D} variables -- update to 3.03 -- removed quotatool utility -* Tue Nov 20 2001 vinil@suse.cz -- update to 3.02 -> provides 'convertquota -e' for bad compiled 7.3 -- get rid of wrong quota_byteswap.h; byteswap.h is provided by glibc - bug #12229 -* Wed Oct 31 2001 vinil@suse.cz -- update to 3.01-final -- QUOTAOFF_BIN corrected to quotaoff in rcquota -- URL fixed for uptodate path -* Tue Aug 14 2001 dan@suse.cz -- ppc architecture dependent patch removed -* Mon Aug 13 2001 dan@suse.cz -- update to 3.01-pre8 -- convertquota listed in spec file (#9403) -* Thu Jul 05 2001 olh@suse.de -- seems to work with stock 2.4.6 on ppc and 2.4.6ac1 on i386 -* Wed Jul 04 2001 olh@suse.de -- update to 3.01-pre7 and fix compile on ppc -* Fri Jun 29 2001 pblaha@suse.cz -- rewrite init script to LSB -* Mon Jun 18 2001 poeml@suse.de -- correct pathnames in README.SuSE -- add conveniency links to init scripts -* Wed May 02 2001 pblaha@suse.cz -- update for better quota support in reiser fs -* Sun Apr 15 2001 schwab@suse.de -- Add %%suse_update_config. -* Thu Mar 29 2001 pblaha@suse.cz -- add quotatool utility for set qouta from command line -* Wed Mar 21 2001 schwab@suse.de -- Don't use _syscallX on ia64. -* Mon Jan 29 2001 pblaha@suse.cz -- update on current stable 2.00 and add doc -* Thu Jan 11 2001 ro@suse.de -- replace linux/quota.h by sys/quota.h to make it compile -* Tue Jan 02 2001 olh@suse.de -- use script name in %%post -* Fri Dec 15 2000 pblaha@suse.cz -- applied patch for support upport multiple NFS servers -* Sun Dec 10 2000 schwab@suse.de -- Don't use _syscallX on ia64. -* Fri Dec 08 2000 kukuk@suse.de -- Fix Provides of init.d scripts -* Fri Dec 01 2000 kukuk@suse.de -- Add info section to init scripts -- Move init scripts sbin/init.d -> etc/init.d -* Fri Oct 27 2000 bg@suse.de -- changed return value of getopt from char to int for all occurances - (Fix Bug #4122) -* Tue Oct 03 2000 smid@suse.cz -- bug in warnquota fixed [#4052] -* Thu Jun 08 2000 cihlar@suse.cz -- added %%clean -* Wed Jun 07 2000 dipa@suse.de -- fix for 4 GB limit in quota.c, repquota.c, edquota.c and warnquota.c - from Debian Bug report logs - #39249: - "quota programs overflow at about 3GB" -* Fri Apr 28 2000 kukuk@suse.de -- Fix buildroot -- Don't use kernel header files -* Tue Apr 11 2000 smid@suse.cz -- buildroot added -* Wed Feb 16 2000 kukuk@suse.de -- Fill in the Group tag. -* Thu Jan 27 2000 kukuk@suse.de -- Use %%{_mandir} macro -* Mon Jan 24 2000 kukuk@suse.de -- Add patch for SPARC -- Fix 4GB limit -* Mon Sep 13 1999 bs@suse.de -- ran old prepare_spec on spec file to switch to new prepare_spec. -* Sat Mar 27 1999 kukuk@suse.de -- Show quota on NFS automounted filesystems -- Update rc scripts -- Fix some compiler warnings -* Thu Oct 29 1998 ro@suse.de -- added MNTOPT_xxx if not defined (for glibc) -- only use -lbsd if available -* Thu Jul 16 1998 tmg@suse.de -- fixed install section -* Tue Jul 07 1998 tmg@suse.de -- updated to quota 1.70 (new program setquota) -- added rc-scripts and quota check support for /sbin/init.d/boot -* Wed Nov 19 1997 florian@suse.de -- do not install include files -- compile with -DRPC -* Tue Jun 03 1997 bs@suse.de - removed man page quotactl.2.gz (included in ldpman) -* Thu Jan 02 1997 florian@suse.de - new version 1.55