From 8adea2703679af41eb55e26ba7863523dc6db867 Mon Sep 17 00:00:00 2001 From: Petr Písař Date: Oct 21 2013 13:36:34 +0000 Subject: Document quotagrpadmins(5), quotatab(5), warnquota.conf(5), rcp.rquota(8) --- diff --git a/quota-4.01-Add-quotagrpadmins-5-manual-page.patch b/quota-4.01-Add-quotagrpadmins-5-manual-page.patch new file mode 100644 index 0000000..fdf5d0a --- /dev/null +++ b/quota-4.01-Add-quotagrpadmins-5-manual-page.patch @@ -0,0 +1,96 @@ +From 2e0023997cf6fe1e2eee678ba66371642e212829 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= +Date: Wed, 16 Oct 2013 16:48:26 +0200 +Subject: [PATCH 1/4] Add quotagrpadmins(5) manual page +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Petr Písař +--- + Makefile.in | 2 ++ + quotagrpadmins.5 | 28 ++++++++++++++++++++++++++++ + warnquota.8 | 5 ++++- + 3 files changed, 34 insertions(+), 1 deletion(-) + create mode 100644 quotagrpadmins.5 + +diff --git a/Makefile.in b/Makefile.in +index 84fafce..5800029 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -90,6 +90,7 @@ install: all @INSTMO@ + -$(INSTALL) -m $(DEF_CONF_MODE) quotagrpadmins $(ROOTDIR)$(sysconfdir) + -mkdir -p $(ROOTDIR)$(mandir)/man1 + -mkdir -p $(ROOTDIR)$(mandir)/man3 ++ -mkdir -p $(ROOTDIR)$(mandir)/man5 + -mkdir -p $(ROOTDIR)$(mandir)/man8 + -$(INSTALL) -m 755 -d $(ROOTDIR)$(includedir)/rpcsvc + -$(INSTALL) -m 644 rquota.h rquota.x $(ROOTDIR)$(includedir)/rpcsvc +@@ -100,6 +101,7 @@ ifneq ($(NETLINKLIBS),) + endif + -$(INSTALL) -m $(DEF_MAN_MODE) *.1 $(ROOTDIR)$(mandir)/man1 + -$(INSTALL) -m $(DEF_MAN_MODE) *.3 $(ROOTDIR)$(mandir)/man3 ++ -$(INSTALL) -m $(DEF_MAN_MODE) *.5 $(ROOTDIR)$(mandir)/man5 + -$(INSTALL) -m $(DEF_MAN_MODE) *.8 $(ROOTDIR)$(mandir)/man8 + + quotaon: quotaon.o quotaon_xfs.o $(LIBOBJS) +diff --git a/quotagrpadmins.5 b/quotagrpadmins.5 +new file mode 100644 +index 0000000..fef1e3a +--- /dev/null ++++ b/quotagrpadmins.5 +@@ -0,0 +1,28 @@ ++.TH QUOTAGRPADMINS 5 ++.SH NAME ++quotagrpadmins \- users responsible for group disk usage ++.SH SYNOPSIS ++.B /etc/quotagrpadmins ++.SH DESCRIPTION ++The ++.B quotagrpadmins ++file lists administrators of user groups who will receive a warning if ++.B warnquota --group ++command finds a group exceeding its disk usage limits. ++.P ++Each line consists of a group name followed by a colon and an user name. White ++space characters surrounding the names are allowed. Empty lines or lines ++starting with a hash sign or a semicolon are ignored. ++.SH EXAMPLE ++.PP ++# comment ++.RS 0 ++users: root ++.SH FILES ++.PD 0 ++.TP 20 ++.B /etc/quotagrpadmins ++list of group administrators ++.PD ++.SH SEE ALSO ++.BR warnquota (8). +diff --git a/warnquota.8 b/warnquota.8 +index 8427488..836290d 100644 +--- a/warnquota.8 ++++ b/warnquota.8 +@@ -58,7 +58,9 @@ Use + .I adminsfile + instead of + .I /etc/quotagrpadmins +-as a file with administrators of the groups. ++as a file with administrators of the groups (see ++.BR quotagrpadmins (5) ++for syntax). + .TP + .B -u, --user + check whether users are not exceeding quotas (default). +@@ -102,6 +104,7 @@ default set of users + .PD + .SH "SEE ALSO" + .BR quota (1), ++.BR quotagrpadmins (5), + .BR cron (8), + .BR edquota (8). + .SH AUTHORS +-- +1.8.3.1 + diff --git a/quota-4.01-Add-quotatab-5-manual-page.patch b/quota-4.01-Add-quotatab-5-manual-page.patch new file mode 100644 index 0000000..f1edbbc --- /dev/null +++ b/quota-4.01-Add-quotatab-5-manual-page.patch @@ -0,0 +1,78 @@ +From e0d078f1fdf1c91602d72b402e3accc3b7c8cb58 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= +Date: Thu, 17 Oct 2013 14:40:35 +0200 +Subject: [PATCH 2/4] Add quotatab(5) manual page +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Petr Písař +--- + quotatab.5 | 31 +++++++++++++++++++++++++++++++ + warnquota.8 | 5 ++++- + 2 files changed, 35 insertions(+), 1 deletion(-) + create mode 100644 quotatab.5 + +diff --git a/quotatab.5 b/quotatab.5 +new file mode 100644 +index 0000000..96d3608 +--- /dev/null ++++ b/quotatab.5 +@@ -0,0 +1,31 @@ ++.TH QUOTATAB 5 ++.SH NAME ++quotatab \- Descriptions of devices with disk quotas ++.SH SYNOPSIS ++.B /etc/quotatab ++.SH DESCRIPTION ++The ++.B quotatab ++file lists human descriptions of devices for the purpose of ++.BR warnquota (8) ++notifications. ++.P ++Each line consists of a device path name followed by a colon and ++a description. White space, apostrophe, and double quote characters ++surrounding the names and descriptions will be stripped. The description field ++can encode a new-line as a pipe character. ++.P ++Empty lines or lines starting with a hash sign or a semicolon are ignored. ++.SH EXAMPLE ++.PP ++# comment ++.RS 0 ++/dev/sda2: Home directories.|This becomes second line. ++.SH FILES ++.PD 0 ++.TP 20 ++.B /etc/quotatab ++list of device descriptions ++.PD ++.SH SEE ALSO ++.BR warnquota (8). +diff --git a/warnquota.8 b/warnquota.8 +index 836290d..b998f19 100644 +--- a/warnquota.8 ++++ b/warnquota.8 +@@ -44,7 +44,9 @@ Use + .I quotatab + instead of + .I /etc/quotatab +-as file with device description strings (see example file for syntax). ++as file with device description strings (see ++.BR quotatab (5) ++for syntax). + .TP + .B -c, --config=\f2configfile\f1 + Use +@@ -104,6 +106,7 @@ default set of users + .PD + .SH "SEE ALSO" + .BR quota (1), ++.BR quotatab (5), + .BR quotagrpadmins (5), + .BR cron (8), + .BR edquota (8). +-- +1.8.3.1 + diff --git a/quota-4.01-Add-warnquota.conf-5-manual-page.patch b/quota-4.01-Add-warnquota.conf-5-manual-page.patch new file mode 100644 index 0000000..08fc2ff --- /dev/null +++ b/quota-4.01-Add-warnquota.conf-5-manual-page.patch @@ -0,0 +1,231 @@ +From 91db972ea2f4065974811655847be4d52b7caee9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= +Date: Thu, 17 Oct 2013 17:01:07 +0200 +Subject: [PATCH 3/4] Add warnquota.conf(5) manual page +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Petr Písař +--- + warnquota.8 | 5 +- + warnquota.conf.5 | 184 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 188 insertions(+), 1 deletion(-) + create mode 100644 warnquota.conf.5 + +diff --git a/warnquota.8 b/warnquota.8 +index b998f19..e675f4a 100644 +--- a/warnquota.8 ++++ b/warnquota.8 +@@ -53,7 +53,9 @@ Use + .I configfile + instead of + .I /etc/warnquota.conf +-as configuration file (see example file for syntax). ++as configuration file (see ++.BR warnquota.conf (5) ++for syntax). + .TP + .B -a, --admins-file=\f2adminsfile\f1 + Use +@@ -108,6 +110,7 @@ default set of users + .BR quota (1), + .BR quotatab (5), + .BR quotagrpadmins (5), ++.BR warnquota.conf (5), + .BR cron (8), + .BR edquota (8). + .SH AUTHORS +diff --git a/warnquota.conf.5 b/warnquota.conf.5 +new file mode 100644 +index 0000000..56e1439 +--- /dev/null ++++ b/warnquota.conf.5 +@@ -0,0 +1,184 @@ ++.TH WARNQUOTA.CONF 5 ++.SH NAME ++warnquota.conf \- configuration for warnquota ++.SH SYNOPSIS ++.B /etc/warnquota.conf ++.SH DESCRIPTION ++The ++.B warnquota.conf ++file stores a configuration for ++.BR warnquota (8) ++tool which is used to notify an user or a group who exceeds its disk quota ++limits. ++.P ++The syntax is an option name followed by a equal sign and the option value. ++White space characters surrounding the option names and values are allowed. ++.P ++Empty lines or lines starting with a hash sign or a semicolon are ignored. ++.P ++An option value can but does not have to be quoted. The value can span ++across multiple lines provided each previous line ends with a backslash. ++.P ++Some option values can contain formatting sequences which will be expanded to ++their respective values. Following sequences are recognizes: ++.P ++.PD 0 ++.TP 20 ++.B %d ++domain name ++.TP ++.B %h ++host name ++.TP ++.BR "%i" ", " "%s" ++user or group name ++.TP ++.B %% ++literal % character ++.TP ++.B | ++new-line character ++.PD ++.SH OPTIONS ++.PD 0 ++.TP 20 ++.B CC_BEFORE ++Send to copy-carbon address only when an user has less than specified grace time ++left. Value is a number followed by a time unit. Known units are ++.IR seconds , ++.IR minutes , ++.IR hours ", and" ++.IR days . ++Example: ++.I 5 days ++.TP ++.B CC_TO ++An e-mail address to put into copy-carbon (CC:) recipient header. Default ++value is ++.IR root . ++.TP ++.B CHARSET ++Defines character set for sent e-mails. Default value will be current locale ++character set used when executing warnquota command, if locale is not either ++.I C ++or ++.IR POSIX . ++Otherwise none character set will be specified in the e-mails. ++.TP ++.B FROM ++Defines From: e-email address. Default value is ++.IR "support@localhost" . ++.TP ++.B GROUP_MESSAGE ++A text sent as an e-mail body if a group exceeds its limits. This option ++recognizes formatting sequences. ++.TP ++.B GROUP_SIGNATURE ++A signature text appended to notification for a group. Default value is ++a general explanation utilizing ++.B SUPPORT ++and ++.B PHONE ++values. This option recognizes formatting sequences. ++.TP ++.B LDAP_BASEDN ++Base distinguished name for LDAP queries. ++.TP ++.B LDAP_BINDDN ++Bind distinguished name for LDAP queries. ++.TP ++.B LDAP_BINDPW ++Bind password for LDAP queries. ++.TP ++.B LDAP_DEFAULT_MAIL_DOMAIN ++Default e-mail address domain of searched user if given LDAP attribute does ++not specify any. ++.TP ++.B LDAP_HOST ++LDAP server name to connect to if ++.B LDAP_URI ++is not defined. ++.TP ++.B LDAP_MAIL ++A boolean controlling if LDAP has to be used to look up an user's e-mail ++address. Possible values are ++.I true ++and ++.IR false . ++Default value is ++.IR false . ++.TP ++.B LDAP_MAIL_ATTRIBUTE ++The LDAP attribute which holds user's e-mail address. ++.TP ++.B LDAP_PORT ++LDAP server port number to connect to if ++.B LDAP_URI ++is not defined. ++.TP ++.B LDAP_SEARCH_ATTRIBUTE ++The LDAP attribute which holds user's ID to look up. ++.TP ++.B LDAP_URI ++The URL of LDAP server to use to search user's e-mail addresses. This option ++takes preference over ++.B LDAP_HOST ++and ++.BR LDAP_PORT . ++Example: ++.I ldaps://example.com:389/ ++.TP ++.B MESSAGE ++A beginning of text sent as an e-mail body if a user exceeds his limits. This ++option recognizes formatting sequences. ++.TP ++.B MAIL_CMD ++The command to execute to send an e-mail. The e-mail text including all ++headers is passed to the standard input of the command. Default value is ++.IR "/usr/lib/sendmail -t" . ++.TP ++.B MAILDEV ++The device with disk quotas to exclude from sending notifications if there are ++exceeded limits. This option should identify the device where mail boxes are ++stored to prevent from bouncing the warnquota notification by local MDA due to ++no space for storing new e-mails. Special value ++.I any ++denotes all devices. ++.TP ++.B PHONE ++The telephone contact to the user support. Default value is ++.IR "(xxx) xxx-xxxx or (yyy) yyy-yyyy" . ++.TP ++.B SIGNATURE ++The end of e-mail body if a user exceeds its limits. Default value is ++a general explanation utilizing ++.B SUPPORT ++and ++.B PHONE ++values. This option recognizes formatting sequences. ++.TP ++.B SUBJECT ++The text to put into Subject: header. Default value is ++.IR "Disk Quota usage on system" . ++.TP ++.B SUPPORT ++The contact to the user support. Default value is ++.IR "support@localhost" . ++.SH EXAMPLE ++.PP ++# comment ++.RS 0 ++FROM = root@example.com ++.RS 0 ++SUPPORT = support@example.com ++.RS 0 ++PHONE = 1234 ++.SH FILES ++.PD 0 ++.TP 20 ++.B /etc/warnquota.conf ++configuration for ++.BR warnquota (8) ++.PD ++.SH SEE ALSO ++.BR warnquota (8). +-- +1.8.3.1 + diff --git a/quota-4.01-Improve-rcp.rquota-8-manual-page.patch b/quota-4.01-Improve-rcp.rquota-8-manual-page.patch new file mode 100644 index 0000000..0c48e36 --- /dev/null +++ b/quota-4.01-Improve-rcp.rquota-8-manual-page.patch @@ -0,0 +1,241 @@ +From e4e473c7bb8f30604d763074a6d04e2854249552 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= +Date: Mon, 21 Oct 2013 14:24:52 +0200 +Subject: [PATCH 4/4] Improve rcp.rquota(8) manual page +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This patch renames rquotad(8) to rpc.rquotad(8) to reflect the +executable name. It also shows completes synopsis and documents --help option. + +Signed-off-by: Petr Písař +--- + rpc.rquotad.8 | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + rquotad.8 | 95 ------------------------------------------------- + 2 files changed, 112 insertions(+), 95 deletions(-) + create mode 100644 rpc.rquotad.8 + delete mode 100644 rquotad.8 + +diff --git a/rpc.rquotad.8 b/rpc.rquotad.8 +new file mode 100644 +index 0000000..a045dba +--- /dev/null ++++ b/rpc.rquotad.8 +@@ -0,0 +1,112 @@ ++.TH RQUOTAD 8 ++.SH NAME ++rpc.rquotad \- remote quota server ++.SH SYNOPSIS ++.B /usr/sbin/rpc.rquotad ++[ ++.BR \-FI ++] [ ++.B \-p ++.I port ++] [ ++.B \-s ++| ++.B \-S ++] [ ++.B \-x ++.I path ++] ++.LP ++.B /usr/sbin/rpc.rquotad ++[ ++.B \-h ++| ++.B \-V ++] ++.SH DESCRIPTION ++.LP ++.IX "rquotad daemon" "" "\fLrquotad\fP \(em remote quota server" ++.IX daemons "rquotad daemon" "" "\fLrquotad\fP \(em remote quota server" ++.IX "user quotas" "rquotad daemon" "" "\fLrquotad\fP \(em remote quota server" ++.IX "disk quotas" "rquotad daemon" "" "\fLrquotad\fP \(em remote quota server" ++.IX "quotas" "rquotad daemon" "" "\fLrquotad\fP \(em remote quota server" ++.IX "filesystem" "rquotad daemon" "" "\fLrquotad\fP \(em remote quota server" ++.IX "remote procedure call services" "rquotad" "" "\fLrquotad\fP \(em remote quota server" ++.B rpc.rquotad ++is an ++.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. ++It also allows setting of quotas on ++.SM NFS ++mounted filesystem (if configured during compilation and allowed by a command line option ++.BR \-S ). ++The results are used by ++.BR quota (1) ++to display user quotas for remote filesystems and by ++.BR edquota (8) ++to set quotas on remote filesystems. ++.B rquotad ++daemon uses tcp-wrappers library (under service name ++.IR rquotad ) ++which allows you to specify hosts allowed/disallowed to use ++the daemon (see ++.BR hosts.allow (5) ++manpage for more information). The ++.B rquotad ++daemon is normally started at boot time from the ++system startup scripts. ++.SH OPTIONS ++.TP ++.B \-h, \-\-help ++Show program usage and exit. ++.B \-V, \-\-version ++Show version of quota tools. ++.TP ++.B \-s, \-\-no-setquota ++Don't allow setting of quotas (default). This option is available only ++if utilities were compiled with the ++.I rpcsetquota ++option. ++.TP ++.B \-S, \-\-setquota ++Allow setting of quotas. This option is available only ++if utilities were compiled with the ++.I rpcsetquota ++option. ++.TP ++.B \-F, \-\-foreground ++Run daemon in foreground (may be useful for debugging purposes). ++.TP ++.B \-I, \-\-autofs ++Do not ignore autofs mountpoints. ++.TP ++.B \-p \f2port\f3, \-\-port \f2port\f1 ++Listen on alternate port ++.IR port. ++.TP ++.B \-x \f2path\f3, \-\-xtab \f2path\f1 ++Set an alternative file with NFSD export table. This file is used to ++determine pseudoroot of NFSv4 exports. The pseudoroot is then prepended ++to each relative path (i.e. a path not beginning by '/') received in a ++quota RPC request. ++ ++.SH FILES ++.PD 0 ++.TP 20 ++.B aquota.user or aquota.group ++quota file at the filesystem root (version 2 quota, non-XFS filesystems) ++.TP ++.B quota.user or quota.group ++quota file at the filesystem root (version 1 quota, non-XFS filesystems) ++.TP ++.B /etc/mtab ++default filesystems ++.PD ++.SH "SEE ALSO" ++.BR quota (1), ++.BR rpc (3), ++.BR nfs (5), ++.BR services (5), ++.BR inetd (8) +diff --git a/rquotad.8 b/rquotad.8 +deleted file mode 100644 +index f18bdcc..0000000 +--- a/rquotad.8 ++++ /dev/null +@@ -1,95 +0,0 @@ +-.TH RQUOTAD 8 +-.SH NAME +-rquotad, rpc.rquotad \- remote quota server +-.SH SYNOPSIS +-.B rpc.rquotad +-[ +-.B \-sSFI +-] [ +-.B \-p \f2port\f1 +-] +-.SH DESCRIPTION +-.LP +-.IX "rquotad daemon" "" "\fLrquotad\fP \(em remote quota server" +-.IX daemons "rquotad daemon" "" "\fLrquotad\fP \(em remote quota server" +-.IX "user quotas" "rquotad daemon" "" "\fLrquotad\fP \(em remote quota server" +-.IX "disk quotas" "rquotad daemon" "" "\fLrquotad\fP \(em remote quota server" +-.IX "quotas" "rquotad daemon" "" "\fLrquotad\fP \(em remote quota server" +-.IX "filesystem" "rquotad daemon" "" "\fLrquotad\fP \(em remote quota server" +-.IX "remote procedure call services" "rquotad" "" "\fLrquotad\fP \(em remote quota server" +-.B rquotad +-is an +-.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. +-It also allows setting of quotas on +-.SM NFS +-mounted filesystem (if configured during compilation and allowed by a command line option +-.BR \-S ). +-The results are used by +-.BR quota (1) +-to display user quotas for remote filesystems and by +-.BR edquota (8) +-to set quotas on remote filesystems. +-.B rquotad +-daemon uses tcp-wrappers library (under service name +-.IR rquotad ) +-which allows you to specify hosts allowed/disallowed to use +-the daemon (see +-.BR hosts.allow (5) +-manpage for more information). The +-.B rquotad +-daemon is normally started at boot time from the +-system startup scripts. +-.SH OPTIONS +-.TP +-.B \-V, \-\-version +-Shows version of quota tools. +-.TP +-.B \-s, \-\-no-setquota +-Don't allow setting of quotas (default). This option is available only +-if utilities were compiled with the +-.I rpcsetquota +-option. +-.TP +-.B \-S, \-\-setquota +-Allow setting of quotas. This option is available only +-if utilities were compiled with the +-.I rpcsetquota +-option. +-.TP +-.B \-F, \-\-foreground +-Run daemon in foreground (may be useful for debugging purposes). +-.TP +-.B \-I, \-\-autofs +-Do not ignore autofs mountpoints. +-.TP +-.B \-p \f2port\f3, \-\-port \f2port\f1 +-Listen on alternate port +-.IR port. +-.TP +-.B \-x \f2path\f3, \-\-xtab \f2path\f1 +-Set an alternative file with NFSD export table. This file is used to +-determine pseudoroot of NFSv4 exports. The pseudoroot is then prepended +-to each relative path (i.e. a path not beginning by '/') received in a +-quota RPC request. +- +-.SH FILES +-.PD 0 +-.TP 20 +-.B aquota.user or aquota.group +-quota file at the filesystem root (version 2 quota, non-XFS filesystems) +-.TP +-.B quota.user or quota.group +-quota file at the filesystem root (version 1 quota, non-XFS filesystems) +-.TP +-.B /etc/mtab +-default filesystems +-.PD +-.SH "SEE ALSO" +-.BR quota (1), +-.BR rpc (3), +-.BR nfs (5), +-.BR services (5), +-.BR inetd (8) +-- +1.8.3.1 + diff --git a/quota-4.01-Remove-installation-of-manpages-into-section-2.patch b/quota-4.01-Remove-installation-of-manpages-into-section-2.patch new file mode 100644 index 0000000..03e8357 --- /dev/null +++ b/quota-4.01-Remove-installation-of-manpages-into-section-2.patch @@ -0,0 +1,41 @@ +From 246dd4960e6878f3ff2e1fe34ef978bcb21e8d03 Mon Sep 17 00:00:00 2001 +From: Carsten Grohmann +Date: Wed, 14 Aug 2013 18:16:46 +0200 +Subject: [PATCH] Remove installation of manpages into section 2 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +There are no manpages in this section in quota tools anymore. So just +remove the installation commands. + +Signed-off-by: Carsten Grohmann +Signed-off-by: Jan Kara +Signed-off-by: Petr Písař +--- + Makefile.in | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index c81d7a9..84fafce 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -89,7 +89,6 @@ install: all @INSTMO@ + -$(INSTALL) -m $(DEF_CONF_MODE) quotatab $(ROOTDIR)$(sysconfdir) + -$(INSTALL) -m $(DEF_CONF_MODE) quotagrpadmins $(ROOTDIR)$(sysconfdir) + -mkdir -p $(ROOTDIR)$(mandir)/man1 +- -mkdir -p $(ROOTDIR)$(mandir)/man2 + -mkdir -p $(ROOTDIR)$(mandir)/man3 + -mkdir -p $(ROOTDIR)$(mandir)/man8 + -$(INSTALL) -m 755 -d $(ROOTDIR)$(includedir)/rpcsvc +@@ -100,7 +99,6 @@ ifneq ($(NETLINKLIBS),) + -$(INSTALL) $(STRIP) -m $(DEF_SBIN_MODE) quota_nld $(ROOTDIR)$(sbindir) + endif + -$(INSTALL) -m $(DEF_MAN_MODE) *.1 $(ROOTDIR)$(mandir)/man1 +- -$(INSTALL) -m $(DEF_MAN_MODE) *.2 $(ROOTDIR)$(mandir)/man2 + -$(INSTALL) -m $(DEF_MAN_MODE) *.3 $(ROOTDIR)$(mandir)/man3 + -$(INSTALL) -m $(DEF_MAN_MODE) *.8 $(ROOTDIR)$(mandir)/man8 + +-- +1.8.3.1 + diff --git a/quota.spec b/quota.spec index 2c99998..95908a4 100644 --- a/quota.spec +++ b/quota.spec @@ -56,7 +56,16 @@ Patch15: quota-4.01-Recognize-units-at-inode-limits-by-setquota.patch Patch16: quota-4.01-Recognize-units-at-inode-limits-by-edquota.patch # In upstream after 4.01 Patch17: quota-4.01-Close-FILE-handles-on-error.patch - +# In upstream after 4.01 +Patch18: quota-4.01-Remove-installation-of-manpages-into-section-2.patch +# Submitted to upstream, +Patch19: quota-4.01-Add-quotagrpadmins-5-manual-page.patch +# Submitted to upstream, +Patch20: quota-4.01-Add-quotatab-5-manual-page.patch +# Submitted to upstream, +Patch21: quota-4.01-Add-warnquota.conf-5-manual-page.patch +# Submitted to upstream, +Patch22: quota-4.01-Improve-rcp.rquota-8-manual-page.patch %description The quota package contains system administration tools for monitoring @@ -145,6 +154,11 @@ Linux/UNIX environment. %patch15 -p1 -b .setquota_inode_units %patch16 -p1 -b .edquota_inode_units %patch17 -p1 -b .close_file_handles +%patch18 -p1 -b .remove_man2 +%patch19 -p1 -b .doc_quotagrpadmins +%patch20 -p1 -b .doc_quotatab +%patch21 -p1 -b .doc_warnquota +%patch22 -p1 -b .doc_rquota #fix typos/mistakes in localized documentation for pofile in $(find ./po/*.p*) @@ -178,13 +192,11 @@ make mkdir -p %{buildroot}%{_sysconfdir} mkdir -p %{buildroot}%{_sbindir} mkdir -p %{buildroot}%{_bindir} -mkdir -p %{buildroot}%{_mandir}/{man1,man3,man8} +mkdir -p %{buildroot}%{_mandir}/{man1,man3,man5,man8} make install INSTALL='install -p' ROOTDIR=%{buildroot} install -m 644 warnquota.conf %{buildroot}%{_sysconfdir} ln -s quotaon.8.gz \ %{buildroot}%{_mandir}/man8/quotaoff.8 -ln -s rquotad.8.gz \ - %{buildroot}%{_mandir}/man8/rpc.rquotad.8 install -p -m644 -D %{SOURCE1} $RPM_BUILD_ROOT%{_unitdir}/quota_nld.service install -p -m644 -D %{SOURCE2} \ @@ -226,6 +238,7 @@ install -p -m644 -D %{SOURCE2} \ %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/quotatab %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/warnquota.conf %attr(0755,root,root) %{_sbindir}/warnquota +%attr(0644,root,root) %{_mandir}/man5/* %attr(0644,root,root) %{_mandir}/man8/warnquota.8* %doc Changelog README.ldap-support README.mailserver @@ -245,6 +258,8 @@ install -p -m644 -D %{SOURCE2} \ * Wed Oct 16 2013 Petr Pisar - 1:4.01-11 - Move /sbin/* files under /usr (bug #983179) - Harden executables due to rpc.rquotad and quota_nld daemons (bug #983179) +- Document quotagrpadmins(5), quotatab(5), warnquota.conf(5), rcp.rquota(8) + (bug #983179) * Sun Aug 04 2013 Fedora Release Engineering - 1:4.01-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild