rpms/quota/F-10 quota-3.16-manpageconsistency.patch, NONE, 1.1 quota-3.16-quotaoffhelp.patch, NONE, 1.1 quota-3.06-warnquota.patch, 1.5, 1.6 quota.spec, 1.47, 1.48

[Ondrej Vasik]

Author: ovasik

Update of /cvs/extras/rpms/quota/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23428

Modified Files:
	quota-3.06-warnquota.patch quota.spec 
Added Files:
	quota-3.16-manpageconsistency.patch 
	quota-3.16-quotaoffhelp.patch 
Log Message:
fix quotaoff --help output, fix documentation inconsistency (rpc(3) instead of rpc(3N), add buildrequires for LDAP, clarify statements about LDAP in warnquota sample configuration file(#490106), fix parsing issue in warnquota.c(#490125)

quota-3.16-manpageconsistency.patch:

--- NEW FILE quota-3.16-manpageconsistency.patch ---
diff -urNp quota-tools-orig/rquotad.8 quota-tools/rquotad.8
--- quota-tools-orig/rquotad.8	2007-08-27 14:46:50.000000000 +0200
+++ quota-tools/rquotad.8	2009-03-13 14:54:37.000000000 +0100
@@ -19,7 +19,7 @@ rquotad, rpc.rquotad \- remote quota ser
 .IX  "remote procedure call services"  "rquotad"  ""  "\fLrquotad\fP \(em remote quota server"
 .B rquotad
 is an
-.BR rpc (3N)
+.BR rpc (3)
 server which returns quotas for a user of a local filesystem
 which is mounted by a remote machine over the
 .SM NFS\s0.
@@ -89,7 +89,7 @@ default filesystems
 .PD
 .SH "SEE ALSO"
 .BR quota (1),
-.BR rpc (3N),
+.BR rpc (3),
 .BR nfs (5),
 .BR services (5),
 .BR inetd (8)

quota-3.16-quotaoffhelp.patch:

--- NEW FILE quota-3.16-quotaoffhelp.patch ---
diff -urNp quota-tools-orig/quotaon.c quota-tools/quotaon.c
--- quota-tools-orig/quotaon.c	2008-03-13 15:49:33.000000000 +0100
+++ quota-tools/quotaon.c	2008-11-14 13:05:53.000000000 +0100
@@ -66,7 +66,7 @@ static void usage(void)
 {
 	errstr(_("Usage:\n\t%s [-guvp] [-F quotaformat] [-x state] -a\n\
 \t%s [-guvp] [-F quotaformat] [-x state] filesys ...\n\n\
--a, --all                turn quotas on for all filesystems\n\
+-a, --all                turn quotas %s for all filesystems\n\
 -f, --off                turn quotas off\n\
 -u, --user               operate on user quotas\n\
 -g, --group              operate on group quotas\n\
@@ -75,7 +75,8 @@ static void usage(void)
 -F, --format=formatname  operate on specific quota format\n\
 -v, --verbose            print more messages\n\
 -h, --help               display this help text and exit\n\
--V, --version            display version information and exit\n"), progname, progname);
+-V, --version            display version information and exit\n"),
+ progname, progname, strcmp (progname, "quotaon")?_("off"):_("on"));
 	exit(1);
 }
 

quota-3.06-warnquota.patch:

Index: quota-3.06-warnquota.patch
===================================================================
RCS file: /cvs/extras/rpms/quota/F-10/quota-3.06-warnquota.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- quota-3.06-warnquota.patch	15 Feb 2007 22:42:05 -0000	1.5
+++ quota-3.06-warnquota.patch	13 Mar 2009 14:02:48 -0000	1.6
@@ -37,3 +37,29 @@
  # Following text is used for mails about group exceeding quotas
  GROUP_MESSAGE	= Hello, a group '%i' you're member of use too much space at %h.|\
  I chose you to do the cleanup.|Delete group files on the following filesystems:|
+@@ -52,10 +52,10 @@ GROUP_SIGNATURE	= See you!|			Your admin
+ #    if the attribute isn't found
+ # if binddn and bindpw are blank or left out, an anonymous bind is used
+ # 
+-# LDAP_MAIL = false # or false if you don't want to use it
+-# If you have at least LDAP 2.3 installed, you can use LDAP_URI
++# LDAP_MAIL = false # or true if you want to use it
++# If you have at least LDAP 2.3 installed, you should use LDAP_URI
+ # LDAP_URI = ldaps://my.server:389
+-# Otherwise you can specify LDAP_HOST and LDAP_PORT
++# Otherwise you should specify LDAP_HOST and LDAP_PORT
+ # LDAP_HOST = ldap
+ # LDAP_PORT = 389
+ # LDAP_BINDDN = uid=ReadOnlyUser,o=YourOrg
+diff -urNp quota-tools-orig/warnquota.c quota-tools/warnquota.c
+--- quota-tools-orig/warnquota.c	2008-10-13 19:29:18.000000000 +0200
++++ quota-tools/warnquota.c	2009-03-13 14:26:33.000000000 +0100
+@@ -806,7 +806,7 @@ static int readconfigfile(const char *fi
+ 				verify_format(config->group_signature, "GROUP_SIGNATURE");
+ 			}
+ 			else if (!strcmp(var, "LDAP_MAIL")) {
+-				if(strcasecmp(value, "true") == 0) 
++				if(strncasecmp(value, "true", 4) == 0) 
+ 					config->use_ldap_mail = 1;
+ 				else
+ 					config->use_ldap_mail = 0;


Index: quota.spec
===================================================================
RCS file: /cvs/extras/rpms/quota/F-10/quota.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- quota.spec	30 Oct 2008 08:30:22 -0000	1.47
+++ quota.spec	13 Mar 2009 14:02:49 -0000	1.48
@@ -5,7 +5,7 @@
 Summary: System administration tools for monitoring users' disk usage
 Epoch: 1
 Version: 3.16
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: BSD and GPLv2+
 URL: http://sourceforge.net/projects/linuxquota/
 Group: System Environment/Base
@@ -13,6 +13,7 @@
 Requires: initscripts >= 6.38 tcp_wrappers e2fsprogs
 Conflicts: kernel < 2.4
 BuildRequires: e2fsprogs-devel gettext tcp_wrappers-devel nss-devel
+BuildRequires: openldap-devel openssl-devel
 Source0: http://downloads.sourceforge.net/linuxquota/%{name}-%{version}.tar.gz
 Patch0:	quota-3.06-warnquota.patch
 Patch1: quota-3.06-no-stripping.patch
@@ -23,6 +24,8 @@
 Patch6: quota-3.16-helpoption.patch
 Patch7: quota-3.16-upstreampatches.patch
 Patch8: quota-3.16-ext4support.patch
+Patch9: quota-3.16-quotaoffhelp.patch
+Patch10: quota-3.16-manpageconsistency.patch
 
 %description
 The quota package contains system administration tools for monitoring
@@ -54,6 +57,8 @@
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1 -b .ext4
+%patch9 -p1 -b .usage
+%patch10 -p1 -b .3N
 
 #fix typos/mistakes in localized documentation
 for pofile in $(find ./po/*.p*)
@@ -113,6 +118,16 @@
 %attr(0644,root,root) %{_mandir}/man3/*
 
 %changelog
+* Fri Mar 13 2009 Ondrej Vasik <ovasik at redhat.com> 1:3.16-7
+- fix quotaoff --help output (was same as quotaon output)
+- fix documentation inconsistency (now rpc(3) instead of
+  rpc(3N) in rquotad manpage) (#474836)
+- add missing buildrequires needed to compile with
+  enable-ldapmail=try option with LDAP(#490106)
+- clarify statements about LDAP in warnquota conf
+  (related to #490106)
+- fix parsing issue in warnquota.c(#490125)
+
 * Thu Oct 30 2008 Ondrej Vasik <ovasik at redhat.com> 1:3.16-6
 - fix implementation of ext4 support
   (by Mingming Cao, #469127)